Commit graph

1939 commits

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
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
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
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
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
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
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
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
effc6a9ed4 Shared.openURL: Print diagnostic output to stderr, not stdout. 2013-05-01 10:55:06 -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
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
d776ee191e Don't convert to lowercase in email obfuscation.
Closes #839.
2013-04-25 12:28:55 -07:00
John MacFarlane
031686bd35 Markdown reader: Implemented Ext_ascii_identifiers.
Closes #807.
2013-04-23 20:40:23 -07:00
John MacFarlane
fb237a8b15 Options: Added Ext_ascii_identifiers.
This will force `Ext_auto_identifiers` to use ASCII only.
Set as default for github markdown.

Note: API change.
2013-04-23 20:40:05 -07:00
John MacFarlane
cecceee0d3 Added Text.Pandoc.Asciify utility module.
This has functions to create ascii-only versions of identifiers.
2013-04-23 20:10:24 -07:00
John MacFarlane
a405b81459 Add slash in internal links in reveal.js.
Closes #835.
2013-04-20 14:59:39 -07:00
John MacFarlane
89d525e417 Shared: Fixed readDefaultDataFile so it works on Windows. 2013-04-20 13:07:50 -07:00
John MacFarlane
3c1a8d1924 Revert "Improved previous patch so it really solves the Windows issue."
This reverts commit e80116c813.
2013-04-20 10:09:17 -07:00
John MacFarlane
e80116c813 Improved previous patch so it really solves the Windows issue. 2013-04-19 23:24:06 -07:00
John MacFarlane
6bd686a4f6 Shared: readDefaultDataFile: normalize the paths.
This fixes bugs in `--self-contained` on pandoc compiled with
`embed_data_files`.  The bugs affect (a) paths containing `..`, (b)
Windows, where `\` is path separator.

Closes #833.
2013-04-19 23:03:59 -07:00
John MacFarlane
0ee081ef25 Markdown reader: minor code cleanup. 2013-04-19 20:23:50 -07:00
John MacFarlane
7d7c1f2f8e Fixed footnote numbers in LaTeX/PDF tables.
This fixes a bug wherein notes were numbered incorrectly
in tables.  Closes #827.

Now that we are using longtable, we can just use regular
`\footnote` commands for notes, which simplifies the code
considerably.
2013-04-15 09:10:29 -07:00
John MacFarlane
931b22184a Markdown/RST writers: Only autolink absolute URIs.
This fixes a regression and closes #830.

    $ echo '<a href="x">x</a>' | pandoc -f html -t markdown
    <x>
2013-04-14 22:37:46 -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
4fa2a94759 Added Text.Pandoc.Writers.Custom, --print-custom-lua-writer.
pandoc -t data/sample.lua

will load the script sample.lua and use it as a custom writer.
data/sample.lua is provided as an example.

Added `--print-custom-lua-writer` option to print the sample
script.
2013-04-14 00:31:39 -05:00
John MacFarlane
dede39452f Added comment/todo to SelfContained. 2013-04-10 10:22:00 -07:00
John MacFarlane
da13ad89ce Man writer: use one decimal place for column widths.
This, I hope, will fix test failures on GHC 7.6 due to
(presumably) different rounding or floating point multiplication.
2013-04-09 19:56:43 -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
John MacFarlane
ff6394171b Markdown writer: Put multiple authors on separate lines in titleblock.
Also, don't wrap long author entries, as new lines get treated
as new authors.
2013-04-08 09:51:10 -07:00
David Lazar
67b38fac64 Haddock reader: leaving Space alone in @...@ seems more semantically correct. 2013-04-04 23:11:43 -07:00