aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2010-11-27Merge branch 'textile'John MacFarlane3-0/+418
Conflicts: README man/man1/pandoc.1.md pandoc.cabal
2010-11-27Use [] for superscripts and subscripts in textile writer.John MacFarlane1-2/+2
2010-11-27Fixed spacing problems in textile nested lists.John MacFarlane1-2/+4
2010-11-27Use parsec parsers to split locator.John MacFarlane1-27/+34
This is easier to read and maintain. Also, formatting is now stripped from the locator prefix, so you can write e.g. '*p.* 33'.
2010-11-27Added 'stringify' to Text.Pandoc.Shared.John MacFarlane1-0/+10
2010-11-26Markdown suffix parser fix.John MacFarlane1-2/+7
If suffix doesn't begin with punctuation, include opening comma and space in result. Previously, @item [only a suffix] would result in something like Doe (2002only a suffix) because there was no opening delimiter.
2010-11-26Split locator and suffix in Biblio rather than Markdown parser.John MacFarlane2-40/+36
Patch from Nathan Gass.
2010-11-23More flexible handling of --csl.John MacFarlane1-2/+10
Look for csl files in ~/.csl if not found locally. Add .csl extension if it is not provided.
2010-11-23Removed citeproc flag and CPP conditionals.John MacFarlane1-18/+0
2010-11-22Check biblio for all citations, not just textual.John MacFarlane1-5/+5
2010-11-20HTML reader: Export htmlTag.John MacFarlane1-0/+1
2010-11-20Biblio: Check for == rather than /=.John MacFarlane1-3/+3
This is more perspicuous.
2010-11-20Citation related changes.John MacFarlane3-36/+12
* Don't look for bibliography in ~/.pandoc. Reason: doing this requires a read + parse of the bibliography even when the document doesn't use citations. This is a big performance drag on regular pandoc invocations. * Only look for default.csl if the document contains references. Reason: avoids the need to read and parse csl file when the document contains no references anyway. * Removed findFirstFile from Shared.
2010-11-19Use default biblio.{xml,json,bib} in pandoc data dir if none specified.John MacFarlane1-21/+23
2010-11-19Shared: Added findFirstFile, findDataFile, refactored readDataFile.John MacFarlane1-5/+24
2010-11-18Markdown citation parser: small refactoring for clarity.John MacFarlane1-1/+5
2010-11-18If --csl not specified, read from data files or default.John MacFarlane2-11/+25
Thus --csl behaves like --reference-odt, --template, etc.
2010-11-18Markdown citation parser improvements and test updates.John MacFarlane1-13/+15
Now we handle a suffix after a bare locator, e.g. @item1 [p. 30, suffix] The suffix now includes any punctuation that introduces it. A few tests fail because of problems with citeproc (extra space before the suffix, missing space after comma separating multiple page ranges in the locator).
2010-11-18Markdown reader: Revised parser for new citation syntax.John MacFarlane1-56/+73
Suffixes and prefixes are now [Inline]. The locator is separated from the citation key by a blank space. The locator consists of one introductory word and any number of words containing at least one digit. The suffix, if any, is separated from the locator by a comma, and continues til the end of the citation.
2010-11-17Biblio: Removed stringify; pass inline list to citeproc.John MacFarlane1-12/+2
2010-11-17Don't pass a [Str ""] as citationPrefix.John MacFarlane1-1/+1
2010-11-16Updated for changes in Citaiton type.John MacFarlane2-12/+24
citationPrefix now [Inline] rather than String; citationSuffix added. This change presupposes no changes in citeproc-hs. It passes a string for these values to citeproc-hs. Eventually, citeproc-hs should use an [Inline] for these as well.
2010-11-16Removed unneeded format argument in call to readBiblioFile.John MacFarlane1-1/+1
2010-11-16Biblio: don't add footnote if empty.John MacFarlane1-3/+3
2010-11-13Improve handling of bibliography not found error.John MacFarlane1-1/+5
2010-11-13Replaced --biblio-file with --bibliography, removed --biblio-format.John MacFarlane1-18/+9
Bibliography format is guessed from the file extension of the bibliography. Also, the bibliography entries are now read during option parsing.
2010-11-12Repairs to citation parser + citation test suite.John MacFarlane1-8/+8
2010-11-12Merge branch 'master' into citeprocJohn MacFarlane1-3/+4
2010-11-12Treat argument as URI only if it has http(s) scheme.John MacFarlane1-3/+4
Previously pandoc would treat the c: in some windowns filespecs as a URI scheme and try to download... Thanks to Peter Wang for pointing this out.
2010-11-12Revised citation parsers for markdown reader.John MacFarlane1-44/+96
Added a form for in-text citations: @doe99 [30; see also @smith99].
2010-11-11Biblio: Use a Map for the lookup table.John MacFarlane1-3/+4
2010-11-11Merge branch 'master' into citeprocJohn MacFarlane1-2/+2
2010-11-11Added support for textual citations (but not yet markdown syntax).John MacFarlane2-19/+28
Patch from Andrea Rossato.
2010-11-11HTML reader: don't parse raw HTML inside <code> tag.John MacFarlane1-2/+2
Previously '<code><a>x</a></code>' would be parsed as Code "<a>x</a>", which is not what you want.
2010-11-09Merge branch 'master' into citeprocJohn MacFarlane2-13/+5
2010-11-09Allow HTML comments as inline elements in markdown.John MacFarlane1-1/+1
So, aaa <!-- comment --> bbb can be a single paragraph.
2010-11-06Removed CITEPROC CPP conditionals from library code.John MacFarlane2-8/+0
By Cabal policy, the API should not change depending on flags.
2010-11-06Changes to use citeproc-hs 0.3.John MacFarlane2-93/+26
2010-11-05Removed Text.Pandoc.Definition, bump version to 1.7.John MacFarlane1-165/+0
We now get Text.Pandoc.Definition from the new pandoc-types package. This will make it possible for other programs to supply output in Pandoc format, without depending on the whole pandoc package.
2010-11-04Biblio: small fix to detection of punctuation (A. Rossato).John MacFarlane1-4/+4
2010-11-03Biblio: Improve footnote generation.John MacFarlane1-10/+24
Patch from Andrea Rossato.
2010-11-02Improve footnote generation of in-text citations w/ note styles.John MacFarlane1-24/+118
Patch from Andrea Rossato.
2010-10-31--mathjax: Use mathjax with raw latex rather than mathml.John MacFarlane1-12/+4
It seems to work better, and the default config can be used.
2010-10-27Changes to use citeproc 0.3.John MacFarlane4-24/+101
Patch from Andrea Rossato. Note: the markdown syntax is preliminary and will probably change.
2010-10-26Added support for MathJax for displaying math in HTML.John MacFarlane3-2/+22
Added --mathjax option. Added MathJax to HTMLMathMethod. Supported MathJax in HTML writer. Resolves Issue #259.
2010-10-26Parse blanklines after macro definitions.John MacFarlane1-1/+1
2010-10-26Process LaTeX macros in markdown, and apply to TeX math.John MacFarlane3-7/+38
Example: \newcommand{\plus}[2]{#1 + #2} $\plus{3}{4}$ yields: 3+4
2010-10-24LaTeX & ConTeXt writers: escape [ and ] as {[} and {]}.John MacFarlane2-0/+4
This avoids unwanted interpretation as optional arguments in some contexts, which caused the brackets to silently disappear!
2010-10-24Changed --help message for --variable to KEY:VALUE.John MacFarlane1-1/+1
Was previously FILENAME.
2010-10-19TeXMath: handle variables modified with \acute, \bar, etc.John MacFarlane1-0/+15
Complete list: \acute, \grave, \breve, \check, \dot, \mathring, \vec, \overrightarrow, \overleftarrow, \hat, \tilde, \bar.