Commit graph

2688 commits

Author SHA1 Message Date
John MacFarlane
91696c62c4 EPUB writer: Handle media in audio source tags.
This should resolve the rest of #1170, but it needs
extensive testing.

Note that we now use a 'media' directory rather than 'images'.
2014-03-14 15:30:11 -07:00
John MacFarlane
f6141aa241 EPUB writer: Incorporate files linked in <video> tags.
src and poster will both be incorporated into content.opf
and the epub container.

This partially address #1170.
Still need to do something similar for <audio>.
2014-03-14 15:18:43 -07:00
John MacFarlane
814af2002e RST writer: Avoid stack overflow with certain tables.
Closes #1197.

Note that there are still problems with the formatting of
the tables inside tables with output produced from the input
file in the original bug report.  But this fixes the stack
overflow problem.
2014-03-14 14:03:15 -07:00
John MacFarlane
76ef65f0b3 Man writer: Ensure that terms in definition lists aren't line wrapped.
Closes #1195.
2014-03-12 10:23:45 -07:00
Tim Lin
1aed9208f8 PDF: Use / as path separators in latex input only
Fixes compile error on Windows for 5040f3e
Reverted back to canonical file separators </> in all places except for
arguments to the LaTeX builder and in TEXINPUTS

See #1151.

Note: Temporary directories still fail to be removed in Windows due to
call of ByteString.Lazy.readFile creating process ownership of the
compiled pdf file.
2014-03-10 16:23:57 -07:00
John MacFarlane
5040f3ede0 PDF: Use / as path separators in tempdir on Windows.
This is needed for texlive.
Note that the / is used only in the body of withTempDir,
so when the directory is deleted, the original separators will
be used.

See #1151.
2014-03-10 11:16:50 -07:00
John MacFarlane
c026c16fa6 PDF: Use / as path separators even on Windows.
This seems to be necessary for texlive.
Closes #1151 (again!).
2014-03-09 21:26:25 -07:00
John MacFarlane
f3c9d37885 HTML writer: Add colgroup around col tags.
Also affects EPUB writer.
Closes #877.
2014-03-05 13:01:23 -08:00
John MacFarlane
6fda361977 SelfContained: Handle "poster" attribute in "video" tags.
Closes #1188.
2014-03-05 09:10:09 -08:00
John MacFarlane
3126b00f11 Templates: YAML objects resolve to "true" in conditionals.
Closes #1133.

Note:  If address is a YAML object and you just have $address$
in your template, the word "true" will appear, which may be
unexpected.  (Previously nothing would appear.)
2014-03-05 08:47:20 -08:00
John MacFarlane
ae86e24ff6 Merge branch 'master' of https://github.com/mb21/pandoc into mb21-master 2014-03-04 10:15:43 -08:00
Albert Krewinkel
24b2ac43b0 Add a simple Emacs Org-mode reader
The basic structure of org-mode documents is recognized; however,
org-mode features like todo markers, tags etc. are not supported yet.
2014-03-04 10:40:40 +01:00
mb21
80511f1b34 InDesign ICML Writer 2014-02-28 13:35:35 +01:00
John MacFarlane
4d0bf3c5d6 Markdown reader: Improved parsing of nested divs.
Formerly a closing div tag would be missed if it came right
after other block-level tags.
2014-02-26 22:53:12 -08:00
John MacFarlane
a208a972c3 Markdown parser: avoid backtracking when closing </div> not found. 2014-02-26 22:46:38 -08:00
John MacFarlane
581075a0ca Markdown reader: small efficiency improvement.
Switched `notFollewdBy' rawHtmlBlocks` ->
`notFollowedBy' (htmlTag isBlockTag)`, which is more
efficient.
2014-02-26 22:24:50 -08:00
John MacFarlane
69f7b1dbf3 Added readerTrace to ReaderOptions, --trace command line opt.
This is to debug backtracking-related parsing bugs.
So far it is only implemented for markdown, but it would
be good to extend it to latex and html readers.
2014-02-25 22:43:58 -08:00
John MacFarlane
19b127b898 PDF: Use ; for TEXINPUTS separator on Windows.
Closes #1151, I hope.  Testing needed.
2014-02-23 20:36:21 -08:00
John MacFarlane
a826d3936d Fixed bug in reference link parsing in markdown_mmd.
The bug was triggered by:

Link to [Google][]. Link to [twitter][].

[Google]: http://google.com
[twitter]: http://twitter.com
2014-02-21 17:32:02 -08:00
John MacFarlane
f3a062d5f9 Make rst figures true figures. Closes #1168.
Thanks to CasperVector.
2014-02-19 09:11:15 -08:00
John MacFarlane
c5dc801498 Merge pull request #1145 from wilx/en-dash-ligature-avoidance
Use \/ to avoid en-dash ligature instead of -{}-.
2014-02-17 16:03:27 -08:00
John MacFarlane
f6a020a906 HTML writer: Fixed bug with unnumbered section headings.
Unnumbered section headings (with class 'unnumbered') were getting
numbers.  This commit fixes the bug.
2014-02-17 15:18:52 -08:00
Merijn Verstraaten
66fd9bf759 Clarified field values in RstCustomRoles. 2014-02-15 17:57:08 +01:00
Merijn Verstraaten
fe246ce01c Enhanced Pandoc's support for rST roles.
rST parser now supports:
    - All built-in rST roles
    - New role definition
    - Role inheritance

Issues/TODO:
    - Silently ignores illegal fields on roles
    - Silently drops class annotations for roles
    - Only supports :format: fields with a single format for :raw: roles,
      requires a change to Text.Pandoc.Definition.Format to support multiple
      formats.
    - Allows direct use of :raw: role, rST only allows indirect (i.e.,
      inherited use of :raw:).
2014-02-15 17:51:33 +01:00
Vaclav Zeman
1ba8066f67 Merge remote-tracking branch 'origin/master' into en-dash-ligature-avoidance. 2014-02-09 13:16:39 +01:00
Vaclav Zeman
3f0fe345f9
Use \/ to avoid en-dash ligature instead of -{}-.
This is to fix LuaLaTeX output. The -{}- sequence does not avoid the
ligature with LuaLaTeX but \/ does.
2014-02-08 13:40:04 +01:00
Merijn Verstraaten
286781f801 Removed RenderState datatype context.
Reasoning:
    - It's not Haskell2010
    - It breaks some tools
    - Doesn't actually do anything
    - RenderState doesn't even have a Monoid instance
2014-02-06 23:10:59 +01:00
John MacFarlane
3127ab2b5e Slight code reorganization in endline. 2014-02-04 10:05:52 -08:00
John MacFarlane
a333d9788e ImageSize: Avoid use of lookAhead, which is not in binary >= 0.6.
Closes #1124.
2014-01-24 16:00:53 -08:00
John MacFarlane
9f3b2f6f5d Fixed mediawiki ordered list parsing.
Closes #1122.
2014-01-22 22:07:13 -08:00
John MacFarlane
6c59f060a7 HTML reader: Fixed bug reading inline math with $$.
See #225.
2014-01-20 11:09:44 -08:00
John MacFarlane
1bc9cb4105 Merge pull request #974 from merijn/master
Added support for LaTeX style literate Haskell code blocks in rST.
2014-01-16 12:32:44 -08:00
John MacFarlane
a1abb3eeea Allow binary 0.5. Version bump to 1.12.3.1. 2014-01-14 10:13:08 -08:00
John MacFarlane
b4b16d5786 Minor improvement to exif parser. 2014-01-09 22:51:23 -08:00
John MacFarlane
b9b1546ed2 Markdown parser: be more permissive about citation keys.
Keys may now start with an underscore as well as a letter.
Underscores do not count as internal punctuation, but are
treated like alphanumerics, so "key:_2008" will work, as
it did not before.  (This change was necessary to use keys
generated by zotero.)

Closes #1111, closes #1011.
2014-01-09 11:25:24 -08:00
John MacFarlane
5c8c380a79 Better exif parsing, including image resolution.
This introduces a dependency on binary >= 0.6, but we depend
on binary >= 0.5 via zip-archive anyway.

Closes #976.
2014-01-09 11:16:55 -08:00
John MacFarlane
3bf8012bf6 Text.Pandoc.ImageSize: Parse EXIF format JPGs.
Note:  For now we just assign them all 72 dpi.  It wasn't
clear to me how to extract the resolution information.
At least the aspect ratio will be right, and 72 dpi is
the most common setting.

Closes #976.
2014-01-08 19:33:14 -08:00
John MacFarlane
aada7b495b fetchItem: Handle image URLs beginning with '//'. 2014-01-08 12:04:08 -08:00
John MacFarlane
d9eff99f27 Markdown reader: Allow hard line breaks in table cells.
The \-newline form must be used; the two-space+newline form
won't work, since in a table cell nearly every line ends with
two spaces.
2014-01-07 23:39:49 -08:00
John MacFarlane
2c7bf41d26 Added wmf and emf mime types. 2014-01-07 10:32:47 -08:00
John MacFarlane
002c8ce14c Fixed small regression in docx writer. 2014-01-07 09:01:32 -08:00
John MacFarlane
d97b1fd14c EPUB writer: Strip out footnotes from toc entries. 2014-01-06 21:51:11 -08:00
John MacFarlane
ba6a26b258 EPUB writer: Avoid duplicate notes when headings contain notes.
This arose because the headings are copied into the metadata
"title" field, and the note gets rendered twice.  We strip the
note now before putting the heading in "title".
2014-01-06 12:12:21 -08:00
John MacFarlane
2dd6d892fa HTML writer: Omit footnotes from TOC entries.
Otherwise we get doubled footnotes when headers have notes!
2014-01-06 10:17:31 -08:00
John MacFarlane
e7e76dbdd8 RST writer: Ensure no blank line after def in definition list.
Closes #992.
2014-01-02 21:10:14 -08:00
John MacFarlane
452a140d0c Pretty: Added nestle. API change, minor version bump to 1.12.3. 2014-01-02 21:09:39 -08:00
John MacFarlane
4e7aadb903 HTML writer: With --toc, headers no longer link to themselves.
Closes #1081.
2014-01-02 19:59:33 -08:00
John MacFarlane
b2db6979fe Use isHeaderBlock from Shared rather than defining it anew... 2014-01-02 19:32:13 -08:00
John MacFarlane
33955fd2ef ODT writer: Use mathml for proper rendering of formulas.
Note:  LibreOffice's support for this seems a bit buggy.  But
it should be better than what we had before.
2014-01-02 15:23:40 -08:00
John MacFarlane
ac100f2724 OpenDocument writer: Fixed RawInline, RawBlock so they don't escape. 2014-01-02 15:23:16 -08:00