aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers
AgeCommit message (Collapse)AuthorFilesLines
2014-06-16Org reader: fixed #1342.John MacFarlane1-9/+5
This change rewrites `inlineLaTeXCommand` so that parsec will know when input is being consumed. Previously a run-time error would be produced with some input involving raw latex. (I believe this does not affect the last release, as the inline latex reading was added recently.)
2014-06-16Moved extractSpaces to Shared.hsmpickering1-13/+4
Generalised and move the extractSpaces function from `HTML.hs` to `Shared.hs` so that the docx reader can also use it.
2014-06-16Add DocX files to tree.Jesse Rosenthal3-0/+1291
This introduces Text.Pandoc.DocX, and its exported `readDocX` function.
2014-06-12allow (and discard) optional argument for \captionJames Aspnes1-1/+1
2014-06-03LaTeX reader: Handle comments at the end of tables.John MacFarlane1-0/+1
This resolves the issue illustrated in http://stackoverflow.com/questions/24009489/comments-in-latex-break-pandoc-table.
2014-05-28Merge pull request #1302 from tarleb/inline-latexJohn MacFarlane2-1/+32
Org reader: support for inline LaTeX
2014-05-27Markdown reader: Handle `c++` and `objective-c` as language identifiersJohn MacFarlane1-1/+8
in github-style fenced blocks. Closes #1318. Note: This is special-case handling of these two cases. It would be good to do something more systematic.
2014-05-20Org reader: support for inline LaTeXAlbert Krewinkel2-1/+32
Inline LaTeX is now accepted and parsed by the org-mode reader. Both, math symbols (like \tau) and LaTeX commands (like \cite{Coffee}), can be used without any further escaping.
2014-05-14Merge pull request #1297 from tarleb/citationsJohn MacFarlane2-30/+59
Org reader: support Pandocs citation extension
2014-05-14Org reader: support Pandocs citation extensionAlbert Krewinkel1-2/+53
Citations are defined via the "normal citation" syntax used in markdown, with the sole difference that newlines are not allowed between "[...]". This is for consistency, as org-mode generally disallows newlines between square brackets. The extension is turned on by default and can be turned off via the default syntax-extension mechanism, i.e. by specifying "org-citation" as the input format. Move `citeKey` from Readers.Markdown into Parsing The function can be used by other readers, so it is made accessible for all parsers.
2014-05-14Move `citeKey` from Readers.Markdown to ParsingAlbert Krewinkel1-14/+0
The function can be used by other readers, so it is made accessible for all parsers.
2014-05-14Introduce class HasLastStrPosition, generalize functionsAlbert Krewinkel2-15/+7
Both `ParserState` and `OrgParserState` keep track of the parser position at which the last string ended. This patch introduces a new class `HasLastStrPosition` and makes the above types instances of that class. This enables the generalization of functions updating the state or checking if one is right after a string.
2014-05-12LaTeX reader: Support `\addbibresource`.John MacFarlane1-0/+2
2014-05-11LaTeX reader: set `bibliography` in metadata from `\bibliography` cmd.John MacFarlane1-1/+6
2014-05-10LaTeX reader: Don't error on "%foo" with no newline.John MacFarlane1-1/+1
2014-05-10Org reader: Fix block parameter reader, relax constraintsAlbert Krewinkel1-6/+13
The reader produced wrong results for block containing non-letter chars in their parameter arguments. This patch relaxes constraints in that it allows block header arguments to contain any non-space character (except for ']' for inline blocks). Thanks to Xiao Hanyu for noticing this.
2014-05-09Merge pull request #1288 from tarleb/update-copyrightJohn MacFarlane8-16/+17
Update copyright notices for 2014, add missing notices
2014-05-09Org reader: Fix parsing of blank lines within blocksAlbert Krewinkel1-6/+2
Blank lines were parsed as two newlines instead of just one. Thanks to Xiao Hanyu (@xiaohanyu) for pointing this out.
2014-05-09Org reader: Support arguments for code blocksAlbert Krewinkel1-42/+56
The general form of source block headers (`#+BEGIN_SRC <language> <switches> <header arguments>`) was not recognized by the reader. This patch adds support for the above form, adds header arguments to the block's key-value pairs and marks the block as a rundoc block if header arguments are present. This closes #1286.
2014-05-09Org reader: refactor #+BEGIN..#+END block parsing codeAlbert Krewinkel1-42/+80
2014-05-09Update copyright notices for 2014, add missing noticesAlbert Krewinkel8-16/+17
2014-05-07Small improvement to textile reader fix. Removed 'try'.mpickering1-1/+1
2014-05-07Fix textile reader hanging.mpickering1-1/+2
Textile reader hung on pandoc -f textile http://johnmacfarlane.net/pandoc/demo/example25.textile The reader no longer hangs.
2014-05-06Textile reader: Rearranged inline parsers for performance.John MacFarlane1-4/+3
This is possible because of the rewrite of simpleInline. Also removed a redundant parser for grouped inlines.
2014-05-06Textile reader: Rewrote simpleInline for clarity and efficiency.John MacFarlane1-15/+7
This way we only look once for the opening `[`.
2014-05-06Textile reader: Disallow blank lines in inline contexts.John MacFarlane1-11/+20
@hi there@ should not be a single code span.
2014-05-06Make `--trace` work with textile reader.John MacFarlane1-2/+12
2014-05-06Textile reader: Rewrote some inline parsing code for clarity.John MacFarlane1-12/+8
(It seems clearer to put the whitespace parsing in the grouped parser. This also uses stateLastStrPos to determine when the border is adjacent to an alphanumeric.)
2014-05-06Org reader: Read inline code blocksAlbert Krewinkel1-3/+40
Org's inline code blocks take forms like `src_haskell(print "hi")` and are frequently used to include results from computations called from within the document. The blocks are read as inline code and marked with the special class `rundoc-block`. Proper handling and execution of these blocks is the subject of a separate library, rundoc, which is work in progress. This closes #1278.
2014-05-04Fixed the fix to #1154.John MacFarlane1-1/+1
We need to strip off up to 4 spaces, not up to 3.
2014-05-04Markdown reader: Fixed bug with unwanted code in lists.John MacFarlane1-0/+1
Closes #1154. When reading a raw list item, we now strip off nonindent spaces.
2014-05-03LaTeX reader: Fixed regression introduced with last commit.John MacFarlane1-10/+10
Tests now pass again.
2014-05-03LaTeX reader: Better error messages with include files.John MacFarlane1-55/+117
Closes #1274. Rewrote handleIncludes. We now report the actual source file and position where the error occurs, even if it is included. We do this by inserting special commands, `\PandocStartInclude` and `\PandocEndInclude`, that encode this information in the preprocessing phase. Also generalized the types of a couple functions from `Text.Pandoc.Parsing`.
2014-05-02Fixed empty reference links. Closes #1186.John MacFarlane1-3/+1
Includes test.
2014-05-01Markdown reader: Make one-column pipe tables work.John MacFarlane1-6/+16
Closes #1218.
2014-05-01Merge pull request #1272 from tarleb/link-typesJohn MacFarlane1-8/+60
Org reader: add support for custom link types
2014-05-01Org reader: Add support for custom link typesAlbert Krewinkel1-8/+60
Org allows users to define their own custom link types. E.g., in a document with a lot of links to Wikipedia articles, one can define a custom wikipedia link-type via #+LINK: wp https://en.wikipedia.org/wiki/ This allows to write [[wp:Org_mode][Org-mode]] instead of the equivallent [[https://en.wikipedia.org/wiki/Org_mode][Org-mode]].
2014-04-30RST reader: Some fixes to last change, and use "author" not "authors".John MacFarlane1-6/+7
(in metadata)
2014-04-30RST reader: Better handling of directives.John MacFarlane1-12/+15
* We now correctly handle field lists that are indented more than 3 spaces. * We treat an "aafig" directive as a code block with attributes, so it can be processed in a filter. (Closes #1212.)
2014-04-26LaTeX reader: Made `\nocite` work.John MacFarlane1-3/+6
This adds nocite citations to a metadata field, `nocite`. These will appear in the bibliography but not in the text (unless you use a `$nocite$` variable in your template, of course).
2014-04-25Merge pull request #1265 from tarleb/org-linksJohn MacFarlane2-14/+81
Improvements handling of internal links
2014-04-25Org reader: Enable internal linksAlbert Krewinkel1-12/+38
Internal links in Org are possible by using an anchor-name as the target of a link: [[some-anchor][This]] is an internal link. It links <<some-anchor>> here.
2014-04-24Render numbers in YAML metadata without decimals when possible.John MacFarlane1-1/+6
The change to aeson > 0.7 caused numbers to be rendered with decimals. This change causes them to be rendered without decimals wehn possible.
2014-04-24Org reader: Read anchors as empty spansAlbert Krewinkel1-0/+25
Anchors (like <<this>>) are parsed as empty spans.
2014-04-24Org reader: Recognize plain and angle linksAlbert Krewinkel1-9/+25
This adds support for plain links (like http://zeitlens.com) and angle links (like <http://moltkeplatz.de>).
2014-04-24RST reader: Remove duplicate 'http' in PEP linksAlbert Krewinkel1-1/+1
The generated link to PEPs had a duplicate 'http://' in its URL.
2014-04-19Org reader: Allow for compact definition listsAlbert Krewinkel1-2/+2
Use `Text.Pandoc.Shared.compactify'DL` to allow for compact definition lists.
2014-04-19Move `compactify'DL` from Markdown reader into SharedAlbert Krewinkel1-17/+0
The function `compactify'DL`, used to change the final definition item of a definition list into a `Plain` iff all other items are `Plain`s as well, is useful in many parsers and hence moved into Text.Pandoc.Shared.
2014-04-19Org reader: Fix parsing of footnotesAlbert Krewinkel1-2/+6
Footnotes can consist of multiple blocks and end only at a header or at the beginning of another footnote. This fixes the previous behavior, which restricted notes to a single paragraph.
2014-04-19Org reader: Fix distinction of images and normal linksAlbert Krewinkel1-2/+2
Fixed a false assumption about the precedence of (&&) vs (||).