Commit Graph
10211 Commits
Author SHA1 Message Date
John MacFarlane 5cb0f0bbf1 ConTeXt writer: Properly handle tables without captions.
The old output only worked in MkII. This should work in MkIV
as well.

Closes #837.
2013-06-28 21:30:27 -07:00
John MacFarlane 644e3239a9 Custom writer: Pass full metadata, not just tit/auth/date. 2013-06-27 22:55:10 -07:00
John MacFarlane 899a65b7d1 Writers: Use defField for defaults.
This way explicitly specified fields not overridden.

Fixes a problem e.g. with specifying a documentclass via
the command line using -V.
2013-06-27 22:42:55 -07:00
John MacFarlane 9ab60a4d15 Shared: Added defField.
`defField` is like `setField`, but does nothing if the
field already has a value.
2013-06-27 21:13:18 -07:00
John MacFarlane dd96213c05 Man writer: give more fine-grained control in template.
Now the `title`, `section`, `header`, and `footer` can all be set
individually in metadata.  The `description` variable has been
removed.

Quotes have been added so that spaces are allowed in the title.

If you have a title that begins

    COMMAND(1) footer here | header here

pandoc will parse it as before into a title, section, header, and
footer.  But you can also specify these elements explicitly.

Closes #885.
2013-06-27 19:32:28 -07:00
John MacFarlane 0d246e8af5 man template: removed description, added header, footer.
Added quotes where needed.
2013-06-27 19:32:18 -07:00
John MacFarlane 82e46bf385 LaTeX reader: Support alltt environment.
Closes  #892.
2013-06-27 18:54:31 -07:00
John MacFarlane 79a4ea03e2 Stop escaping | in LaTeX math.
This caused problems with array environments.  Closes #891.
2013-06-26 20:54:31 -07:00
John MacFarlane f939dbdcc5 Require highlighting-kate 0.5.4. 2013-06-26 20:53:38 -07:00
John MacFarlane f7f32af293 Use latest chicago-author-date.csl. 2013-06-25 22:37:03 -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 70eeeb82b5 Fixed regression with RTF table of contents. 2013-06-25 22:32:50 -07:00
John MacFarlane 08631ef1a3 Some test suite fixes for new metadata. 2013-06-25 22:32:50 -07:00
John MacFarlane 3aa5733f30 Revised benchmark for new metadata. 2013-06-25 18:17:32 -07:00
John MacFarlane 16d6005ed9 Fixed merge bugs in Shared. 2013-06-25 18:15:22 -07:00
John MacFarlane f34232c934 Removed 'Functor' constraint. 2013-06-25 17:41:15 -07:00
John MacFarlane cdf356a331 Merge pull request #886 from aaronwolen/master
Document the `citecolor` variable added to the latex template
2013-06-25 11:16:33 -07:00
John MacFarlane aee3f3f8f3 Updated Makefile. 2013-06-25 10:39:08 -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 e32a8f5981 Revised Text.Pandoc.Templates to accept JSON contexts.
Currently the library is set up with a shim for association
lists, for compatibility, but this can change when the writers
are changed.

New export: `varListToJSON`.

Removed `Empty`.

Simplified template type to a newtype.
2013-06-24 20:27:37 -07:00
John MacFarlane 5f4a32e465 Use aeson for json.
Benchmarked:  about twice as slow as json!
2013-06-24 20:27:37 -07:00
John MacFarlane a578a490ee Parsing: Generalized state type on readWith. 2013-06-24 20:27:36 -07:00
Aaron Wolen 1364fb3f00 Documented citecolor variable 2013-06-24 17:49:06 -03:00
John MacFarlane 050ea0fa8d Merge pull request #31 from aaronwolen/master
Provide a variable to define citation color
2013-06-24 09:18:31 -07:00
John MacFarlane a313e1aa18 Added #TITLE: to title in org template.
Previously the writer inserted this.
2013-06-22 15:27:05 -07:00
John MacFarlane 66837d1727 OPML template: Use 'for' in author. 2013-06-22 11:41:51 -07:00
John MacFarlane 64544dea58 Added subtitle to html and latex formats. 2013-06-21 22:48:49 -07:00
John MacFarlane a2b98ba218 Added test for #882. 2013-06-19 09:27:11 -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 6c5ba22c96 Added a test for #833. 2013-06-19 09:00:37 -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
Aaron Wolen 796eb50f8d Add citecolor variable 2013-06-18 11:42:32 -05:00
John MacFarlane a43e0ad5d6 Markdown writer: Don't wrap attributes in fenced code blocks. 2013-06-11 10:17:12 -07:00
John MacFarlane 50ba5a801a Textile reader: Correctly handle entities. 2013-06-11 10:16:54 -07:00
John MacFarlane 96f25f924a Latest template changes: title attribute on title section in dzslides. 2013-06-02 14:39:26 -07:00
John MacFarlane 8d19e45b97 LaTeX writer: Always create labels for sections.
Previously the labels were only created when there were links to
the section in the document.

Closes #871.
2013-06-02 14:38:18 -07:00
John MacFarlane 05719b6491 Merge pull request #29 from abakst/patch-1
Add class attribute to title slide section tag
2013-06-01 12:33:48 -07:00
Alexander Bakst cd48200ceb Add class attribute to title slide section tag
It would be useful to have a class attribute for the title slide's section tag. For example, this is useful for setting a background image unique to the title slide.
2013-05-31 15:28:58 -06:00
John MacFarlane 768ddc3d56 README: Note that --atx-headers affects asciidoc as well as markdown. 2013-05-30 17:01:34 -07:00
John MacFarlane 4c8fda30e6 Merge pull request #868 from maxandersen/atxasciidoc
Add support for --atx-headers in asciidoc and remove unnecessary [[]] generation for headers.
2013-05-30 17:01:14 -07:00
Max Rydahl Andersen 2e868c8251 Add --atx-headers support to asciidoc and dont print empty identifier blocks ([[]]) on headers 2013-05-31 01:34:46 +02:00
John MacFarlane 7998587810 Added CPP directives to avoid warnings.
For 'import Prelude hiding (catch)'.  catch is no longer in
Prelude starting with base 4.6.
2013-05-29 20:21:32 -07:00
John MacFarlane b664068221 Set default stack size to 16M.
This is needed for some large conversions, esp. if pandoc
is compiled with 64-bit ghc.
2013-05-29 12:29:38 -07:00
John MacFarlane 0a6e9f048a Shared.openURL: Properly handle data: URIs. 2013-05-28 12:48:17 -07:00
John MacFarlane f8e6f9c215 EPUB writer: math with --webtex is automatically made self-contained.
And some code cleanup.
2013-05-22 14:51:47 -07:00
John MacFarlane 210855e03e EPUB writer: Download webtex images and include as data URLs.
This allows you to use `--webtex` in creating EPUBs.
2013-05-22 10:21:22 -07:00
John MacFarlane ca09c1ac3b MediaWiki reader: Ignore attributes on headers. 2013-05-20 11:08:27 -07:00