Commit graph

865 commits

Author SHA1 Message Date
John MacFarlane
cbfa932106 Adjustments for new Format newtype. 2013-08-10 17:24:54 -07:00
John MacFarlane
9aa9d5cf68 Revert "Textile reader: Removed raw LaTeX parsing."
This reverts commit bb61624bb2.
Apparently someone put this there for a reason, since it's in
the test suite.
2013-08-08 10:52:59 -07:00
John MacFarlane
12e7ec4070 Added Text.Pandoc.Compat.TagSoupEntity.
This allows pandoc to compile with tagsoup 0.13.x.
Thanks to Dirk Ullrich for the patch.
2013-08-08 10:42:52 -07:00
John MacFarlane
bb61624bb2 Textile reader: Removed raw LaTeX parsing.
This isn't part of Textile.
2013-08-07 14:30:47 -07:00
John MacFarlane
d44d166431 Allow YAML title blocks to contain only comments. 2013-08-07 08:43:42 -07:00
John MacFarlane
7d18770b00 Added support for MetaBool. 2013-08-06 23:31:16 -07:00
John MacFarlane
3c06e2692a Markdown atx headers: Allow . or ) after # if no fancy_lists. 2013-07-29 08:38:46 -07:00
John MacFarlane
fb9f2e4bd5 LaTeX reader: Support \v{} for hacek.
Closes #926.
2013-07-25 10:00:11 -07:00
John MacFarlane
85cc140744 Textile reader: Improved handling of <pre> blocks.
* Closed #927 (a bug in which `<pre>` in certain contexts was
  not recognized as a code block).
* Remove internal HTML tags in code blocks, rather than printing
  them verbatim.
* Parse attributes on `<pre>` tag for code blocks.
2013-07-25 09:45:23 -07:00
John MacFarlane
800c5490ec LaTeX reader: Don't add spurious ", " to citation suffixes.
This is added when needed in Text.Pandoc.Biblio anyway.
2013-07-21 11:44:49 -07:00
John MacFarlane
bd1979f1b7 Markdown reader: Improved strong/emph parsing.
Using technique from github.com/jgm/Markdown.

The new parsing algorithm requires no backtracking, and no keeping
track of nesting levels.

It will give different results in some edge cases but should not
affect most people.
2013-07-20 21:14:38 -07:00
John MacFarlane
6c2e76ac61 Added ignore_line_breaks markdown extension.
This causes intra-paragraph line breaks to be ignored,
rather than being treated as hard line breaks or spaces.
This is useful for some East Asian languages, where spaces
aren't used between words, but text is separated into lines
for readability.
2013-07-17 15:38:56 -07:00
John MacFarlane
94c9825468 HTML reader: read widths from col tags if present.
Closes #893.
2013-07-16 17:03:28 -07:00
John MacFarlane
8483b5756f HTML reader: Handle non-simple tables (#893).
Column widths are divided equally.

TODO:  Get column widths from col tags if present.
2013-07-16 15:50:39 -07:00
John MacFarlane
0bd5830ad4 HTML reader: Generalized table parser.
This commit doesn't change the present behavior at all, but
it will make it easier to support non-simple tables in the future.
2013-07-16 15:37:15 -07:00
John MacFarlane
3cd62d7c35 Rename Ext_yaml_title_block -> Ext_yaml_metadata_block. 2013-07-02 20:54:30 -07:00
John MacFarlane
e973bbbbc8 Markdown reader: Better error messages for yaml headers. 2013-07-02 09:23:43 -07:00
John MacFarlane
0fa5792790 Markdown reader: Ignore fields ending with _ in YAML headers. 2013-07-01 22:39:56 -07:00
John MacFarlane
f3f557d988 Emit warning instead of failing on invalid YAML header. 2013-07-01 22:29:04 -07:00
John MacFarlane
82e46bf385 LaTeX reader: Support alltt environment.
Closes  #892.
2013-06-27 18:54:31 -07:00
John MacFarlane
243c56a880 Fixed 'authors' metadata parsing in reST.
Semicolons separate different authors.
2013-06-25 22:32:50 -07:00
John MacFarlane
f869f7e08d Use new flexible metadata type.
* Depend on pandoc 1.12.
* Added yaml dependency.
* `Text.Pandoc.XML`: Removed `stripTags`.  (API change.)
* `Text.Pandoc.Shared`:  Added `metaToJSON`.
  This will be used in writers to create a JSON object for use
  in the templates from the pandoc metadata.
* Revised readers and writers to use the new Meta type.
* `Text.Pandoc.Options`: Added `Ext_yaml_title_block`.
* Markdown reader:  Added support for YAML metadata block.
  Note that it must come at the beginning of the document.
* `Text.Pandoc.Parsing.ParserState`:  Replace `stateTitle`,
  `stateAuthors`, `stateDate` with `stateMeta`.
* RST reader:  Improved metadata.
  Treat initial field list as metadata when standalone specified.
  Previously ALL fields "title", "author", "date" in field lists
  were treated as metadata, even if not at the beginning.
  Use `subtitle` metadata field for subtitle.
* `Text.Pandoc.Templates`:  Export `renderTemplate'` that takes a string
  instead of a compiled template..
* OPML template:  Use 'for' loop for authors.
* Org template: '#+TITLE:' is inserted before the title.
  Previously the writer did this.
2013-06-24 20:29:41 -07:00
John MacFarlane
e3b8b89d31 Markdown reader: Check for blank lines first in blocks.
(And skip them.  This might speed things up in some cases.)
2013-06-19 09:22:57 -07:00
John MacFarlane
f2c3335642 Properly handle blank line at beginning of input.
Closes #882.
2013-06-19 09:11:34 -07:00
John MacFarlane
b53ea23b3f Improved code readability. 2013-06-19 09:08:35 -07:00
John MacFarlane
e0832b0359 Markdown reader: fixed bug in unmatched reference links.
The input

    [*infile*] [*outfile*]

was getting improperly parsed:  "infile" was emphasized, but
"*outfile*" was literal.  This was due to failure to parse the
"fallback" in the reference link parser.

Closes #883.
2013-06-19 08:56:11 -07:00
John MacFarlane
b04dfde403 RST reader: don't insert paragraphs where docutils doesn't.
rst2html doesn't add `<p>` tags to list items (even when they are
separated by blank lines) unless there are multiple paragraphs in the
list.  This commit changes the RST reader to conform more closely to
what docutils does.

Closes #880.
2013-06-18 10:04:37 -07:00
John MacFarlane
50ba5a801a Textile reader: Correctly handle entities. 2013-06-11 10:16:54 -07:00
John MacFarlane
ca09c1ac3b MediaWiki reader: Ignore attributes on headers. 2013-05-20 11:08:27 -07:00
John MacFarlane
c63e490ab2 MediaWiki reader: Skip attributes on table rows.
Previously we just crashed if rows had attributes, now we
ignore them.
2013-05-20 10:43:12 -07:00
John MacFarlane
b89a443034 Markdown reader: Allow internal + in citation identifiers.
Closes #856.
2013-05-13 10:33:31 -07:00
John MacFarlane
d097734189 LaTeX reader: Skip positional options after \begin{figure}. 2013-05-12 16:11:35 -07:00
John MacFarlane
af6f216c96 Treat \textsl as emphasized text in LaTeX reader.
Closes #850.
2013-05-09 15:29:27 -07:00
John MacFarlane
031686bd35 Markdown reader: Implemented Ext_ascii_identifiers.
Closes #807.
2013-04-23 20:40:23 -07:00
John MacFarlane
0ee081ef25 Markdown reader: minor code cleanup. 2013-04-19 20:23:50 -07:00
John MacFarlane
5c03275a63 Haddock reader improvements.
- Correctly handle ghci sessions.
- Fixed spacing issues.
- Simplified code.
2013-04-14 21:39:05 -07:00
John MacFarlane
df1522e1eb Removed unnecessary OPTIONS flag in Haddock/Parse.y. 2013-04-09 19:53:48 -07:00
John MacFarlane
e938fc1ae2 Fixed Haddock reader bugs with list item spaces and examples.
Closes #824.
2013-04-09 18:12:54 -07:00
David Lazar
67b38fac64 Haddock reader: leaving Space alone in @...@ seems more semantically correct. 2013-04-04 23:11:43 -07:00
David Lazar
100f8df43e Haddock reader: derive Show for Token, making debugging easier. 2013-04-04 23:01:15 -07:00
John MacFarlane
7e4290561d LaTeX reader: Support \textasciitilde, \textasciicircum.
Closes #810.
2013-03-31 21:08:19 -07:00
David Lazar
8663667788 Haddock reader: make clearer which production the comment refers to. 2013-03-29 11:43:49 -07:00
David Lazar
d2704c2af1 Haddock reader: add the "haskell" attribute to code blocks so they are
highlighted. We reasonably assume that code blocks in Haddock markup
wont be used for anything but Haskell code.
2013-03-29 10:35:06 -07:00
David Lazar
7424454ace Haddock reader: improved error reporting. 2013-03-29 10:22:11 -07:00
John MacFarlane
7cb8b60910 Parsing: Better error reporting in readWith.
- Specialize readWith to String input.
- On error have it print the line in which the error occurred,
  with a caret pointing to the column.
- This should help diagnose parsing problems in LaTeX especially.
2013-03-28 22:20:05 -07:00
John MacFarlane
30969974f0 Haddock writer: use 'text' builder instead of 'str'.
This articulates strings into Str, Space, allowing them to be
hard-wrapped intelligently by the writers.

This patch also fixes a bug with trailing spaces and newlines.
(See #806.)
2013-03-28 20:09:06 -07:00
David Lazar
18459b95ba Add reader for Haddock markup based on Haddock's own lexer/parser. 2013-03-28 14:53:10 -07:00
John MacFarlane
e81b87c2dc Mediawiki reader: Fixed | links inside table cells.
Improved attribute parsing.
2013-03-28 11:26:22 -07:00
John MacFarlane
998695001a Mediawiki reader: Fixed last commit. 2013-03-28 10:51:14 -07:00
John MacFarlane
48b23d491d MediaWiki reader: Correctly handle indented preformatted text
without preceding or following blank line.
2013-03-28 10:48:00 -07:00