aboutsummaryrefslogtreecommitdiff
path: root/src/Text
AgeCommit message (Collapse)AuthorFilesLines
2014-05-14Move `citeKey` from Readers.Markdown to ParsingAlbert Krewinkel2-14/+13
The function can be used by other readers, so it is made accessible for all parsers.
2014-05-14Introduce class HasLastStrPosition, generalize functionsAlbert Krewinkel3-24/+30
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-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 MacFarlane46-93/+95
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 Krewinkel46-93/+95
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-04LaTeX writer: Fixed inconsistencies with reference escaping.John MacFarlane1-64/+67
- toLabel is now monadic, and it does the needed string escaping. - Closes #1130.
2014-05-04Docx writer: Fall back on distribution reference.docx.John MacFarlane1-14/+15
* Undid changes to parseXml in last commit. * Instead of a string fallback, we have parseXml fall back on the reference.docx that comes with pandoc if the user's reference.docx does not contain a needed file. * Closes #1185.
2014-05-04Docx writer: Added ability to give fallback in parseXml.John MacFarlane1-16/+17
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-03AsciiDoc writer: Handle multiblock table cells.John MacFarlane1-1/+2
Closes #1246.
2014-05-03AsciiDoc writer: Correctly handle empty table cells.John MacFarlane1-1/+2
Closes #1245.
2014-05-03DocBook writer: Small tweaks to last commit.John MacFarlane1-9/+3
* Use isTightList from Shared. * Adjust writer test, since isTightList is a bit different from what was used before. Closes #1250.
2014-05-03Distinguish tight and loose lists in Docbook outputNeil Mayhew1-8/+18
Determined by the first block of the first item being Plain.
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 MacFarlane2-56/+118
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-30ConTeXt writer: Improved autolinks.John MacFarlane1-11/+5
Closes #1270.
2014-04-27Fix #1267.John MacFarlane1-19/+16
We now check the writerName for a lua script in pandoc.hs, so that lowercasing and format parsing aren't done. Note this behavior change: getWriter in Text.Pandoc no longer returns a custom writer on input "foo.lua".
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-26HTML writer: improved detection of image links.John MacFarlane1-1/+5
Previously image links with queries were not recognized, leading to use of an embed tag rather than an img tag.
2014-04-25Merge pull request #1265 from tarleb/org-linksJohn MacFarlane3-21/+92
Improvements handling of internal links
2014-04-25LaTeX writer: Mark span contents with label if span has an IDAlbert Krewinkel1-7/+11
Prepend `\label{span-id}` to span contents iff `span-id` is defined.
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-24EPUB writer: Fixed some idrefs to match changes in ids.John MacFarlane1-3/+3
2014-04-24Markdown writer: Use proper escapes to avoid unwanted lists.John MacFarlane1-11/+16
Previously we used 0-width spaces, an ugly hack. Closes #980.
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-23EPUB writer: include extension in epub ids.John MacFarlane1-6/+11
This fixes a problem with duplicate extensions for fonts and images with the same base name but different extensions. Closes #1254.
2014-04-19Merge pull request #1256 from tarleb/org-reader-improvementsJohn MacFarlane3-224/+439
Org reader improvements