Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
4025 commits 2 branches 0 tags 65 MiB
Commit graph

4025 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
80ab208b3d Removed obsolete comment. 2013-05-09 09:50:15 -07:00
John MacFarlane
f42ffcb710 Bump upper bound for criterion. 2013-05-07 20:42:38 -07:00
John MacFarlane
fa978e1365 Use latest highlighting-kate and texmath. 
Closes #849.
 2013-05-07 20:22:09 -07:00
John MacFarlane
816a5540f4 Updated tests for template changes. 2013-05-07 19:50:23 -07:00
John MacFarlane
2e3eb9ef6a Made \includegraphics more flexible in LaTeX template. 
Now it can be used with options, if needed.

Thanks to Bernhard Weichel.
 2013-05-07 17:42:35 -07:00
John MacFarlane
f63129040b Less verbose output from --self-contained. 
Now one gets "Fetching [URL]..." for each URL fetched, but not
the full header.
 2013-05-04 21:53:06 -07:00
John MacFarlane
008273ef67 RTF writer: Properly handle characters above the 0000-FFFF range. 
Uses surrogate pairs.  Thanks to Hiromi Ishii for the patch.
 2013-05-02 19:42:37 -07:00
John MacFarlane
9d01c45b01 Version bump to 1.11.2. 2013-05-01 12:54:19 -07:00
John MacFarlane
9b0bd19632 Fixed errors in revealjs template. 2013-05-01 12:45:49 -07:00
John MacFarlane
effc6a9ed4 Shared.openURL: Print diagnostic output to stderr, not stdout. 2013-05-01 10:55:06 -07:00
John MacFarlane
9cdc9a72e7 Merge pull request #841 from juhp/patch-2 
remove reference in pandoc.1 to markdown2pdf (1)
 2013-05-01 08:50:02 -07:00
Jens Petersen
7b25af213c remove reference in pandoc.1 to markdown2pdf (1) 2013-05-01 13:52:50 +09:00
John MacFarlane
c36f3b46e1 revealjs templates: use query hashes for defaults, include remotes. 2013-04-30 17:34:36 -07:00
John MacFarlane
1991edf9a5 Shared.openURL: URL-escape pipe characters. 
Even though these are legal, Network.URI doesn't regard them
as legal in URLs.  So we escape them first.

Closes #535.
 2013-04-28 22:57:17 -07:00
John MacFarlane
4edc97a921 pandoc --help now says something about pdf output. 
Closes #720.
 2013-04-26 21:13:42 -07:00
John MacFarlane
26fefa040a PDF: On Windows, create temdir in working directory. 
Reason:  the path to the system temp directory may contain tildes,
which causes problems in LaTeX when the username is more than
eight characters.

Closes #777.
 2013-04-26 20:36:06 -07:00
John MacFarlane
fdd5f26d14 Updated tests for changes in LaTeX template. 2013-04-26 08:59:18 -07:00