Jesse Rosenthal
a7c67c897e
Docx reader: Minor cleanup.
...
The previous commits had some code repetition. This just makes it a bit
easier to read.
2015-02-21 09:18:53 -05:00
Jesse Rosenthal
9654514e8a
Docx reader: add test for verbatim in sub/superscript.
2015-02-21 08:45:38 -05:00
Jesse Rosenthal
55d2ce751a
Docx reader: allow sub/superscript verbatims.
...
Verbatim usually shuts off all other run styles, but we don't want it to
shut off sub/superscript.
2015-02-21 08:41:09 -05:00
Matthew Pickering
3e81c3a0a6
Merge pull request #1964 from mpickering/latexfix
...
LaTeX Writer: Don't use listings in headers
2015-02-20 09:58:37 +00:00
Matthew Pickering
274efc4a71
LaTeX Writer: Don't use listings in headers
...
Fixes #1963
2015-02-20 09:35:36 +00:00
Jesse Rosenthal
2995526772
Docx reader: Add tests for new list style parsing.
2015-02-19 00:24:04 -05:00
Jesse Rosenthal
a01913b45c
Docx reader: Allow numbering in the style file.
...
This allows inherited styles with numbering (lists). It works like this:
1. check to see if the style has numbering info.
2. if the paragraph has explicit numbering info in the doc that takes
precedence.
3. if not we use the numbering info in the style, if it's there.
4. otherwise normal paragraph.
We no longer assume it's not a numbering element if it doesn't have an
explicit level---we just set that level to 1. (In the style files, the
examples I've seen don't have that explicit level.)
2015-02-19 00:17:04 -05:00
Matthew Pickering
ad39bc7009
Move utility error functions to Text.Pandoc.Shared
2015-02-18 21:09:07 +00:00
Matthew Pickering
48f442f477
Update haddocks and copyright notices
2015-02-18 21:09:07 +00:00
Matthew Pickering
f046531a6b
Update benchmarks
2015-02-18 21:09:07 +00:00
Matthew Pickering
1a7a99161a
Update tests
2015-02-18 21:09:07 +00:00
Matthew Pickering
70e0c4d41b
Update executable file
2015-02-18 21:09:07 +00:00
Matthew Pickering
be943a561f
Update Pandoc.hs
2015-02-18 21:09:07 +00:00
Matthew Pickering
615aa94c3d
Make safeRead safe.
...
Fixes #1801
2015-02-18 21:09:07 +00:00
Matthew Pickering
b02b5b9d5e
Change return type of Txt2Tags reader
2015-02-18 21:09:07 +00:00
Matthew Pickering
6de6eae737
Change return type of Textile reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
f61db38290
Change return type of TWiki reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
2b7073860b
Change return type of RST reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
4c91049345
Change return type of Org reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
db6baab217
Change return type of OPML reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
ef2a8107e2
Change return type of Native reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
41d9527533
Change return type of Mediawiki reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
acefbe99a9
Change return type of Markdown reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
b8acb9f541
Change return type of LaTeX reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
9f6a92d664
Change return type of Haddock reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
b9e04825cf
Change return type of HTML reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
b935ef6de5
Change return type of EPUB reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
1b12340859
Change return type of Docx reader
2015-02-18 21:09:06 +00:00
Matthew Pickering
dcb4951aad
Change return type of DocBook reader
2015-02-18 21:09:05 +00:00
Matthew Pickering
8381ac3b02
Add Text.Pandoc.Error module with PandocError type
2015-02-18 21:09:05 +00:00
Matthew Pickering
ef981492fd
Remove partial function from Pretty
2015-02-18 20:11:08 +00:00
Matthew Pickering
bf8667660d
Remove landmine from ImageSize
2015-02-18 20:11:08 +00:00
Matthew Pickering
9cd0bdb41a
Factor out "returnState" into Parsing module
2015-02-18 12:50:21 +00:00
Matthew Pickering
febe5112af
HLint changes
2015-02-18 12:50:21 +00:00
Matthew Pickering
13fb1d6101
Remove F Monad from Markdown reader
2015-02-18 12:50:21 +00:00
Matthew Pickering
dc450d80a1
Generalise signature of addWarning
2015-02-18 12:50:21 +00:00
Matthew Pickering
d4ab579dc3
Add check to see whether in a footnote to ParserState (to avoid circular footnotes)
2015-02-18 12:50:21 +00:00
Matthew Pickering
2b58060007
Remove F monad from Parsing
2015-02-18 12:50:21 +00:00
Matthew Pickering
9d77206827
Changed parseWithWarnings to the more general returnWarnings parser transformer
2015-02-18 12:50:21 +00:00
Matthew Pickering
e8677bae78
Remove F monad from Org Reader.
2015-02-18 12:50:21 +00:00
Matthew Pickering
7a649170be
Added generalize function which can be used to lift specialised parsers.
...
Monad m => Parsec s st a -> Parsec T s st m a
2015-02-18 12:50:20 +00:00
John MacFarlane
3480189e8e
ICML writer: Better handling of raw blocks and inlines.
...
Previously these were always escaped and printed verbatim.
Now they are ignored unless the format is "icml", in which
case they are passed through unescaped.
Closes #1951 .
2015-02-17 08:50:48 -08:00
John MacFarlane
e8cd53d1c9
Fixed revealjs template so style css is correctly included.
...
Closes #1949 .
2015-02-16 19:57:37 -08:00
John MacFarlane
e32227f744
Allow wildcards in --epub-embed-font
arguments.
...
Closes #1939 .
2015-02-13 23:34:20 -08:00
John MacFarlane
d5469b30fe
Improved building of data URIs in SelfContained.
...
Now base64 is used except for 'text/*' mime types. Closes #1940 .
2015-02-13 21:37:43 -08:00
Jesse Rosenthal
616e211f36
Docx reader: test lists in table cells.
2015-02-13 09:08:07 -05:00
Jesse Rosenthal
24fd0ad04d
Docx reader: Handle lists correctly inside table cells.
...
Previously we didn't transform lists inside table cells.
2015-02-13 09:02:16 -05:00
Jesse Rosenthal
ba59e5447f
Docx writer: Add footnotes id -1 and 0.
...
Word uses, by default, footnotes with id -1 and 0 for separators. If a
user modifies reference.docx, they will end up with a settings.xml file
that references these footnotes, but no such footnotes in the
document. This will produce a corruption error. Here we add these to the
document and settings.xml file, so future modifications won't break the file.
2015-02-12 09:21:41 -05:00
Jesse Rosenthal
c2f32f4e8f
Docx Writer: Alter Blockquote style slightly.
...
Since blockquote derives from BodyText, we just want to specify by
default that it won't indent, regardless of what BodyText does. Note
that this will not produce any visible difference in the default
configuration.
2015-02-11 15:06:48 -05:00
Jesse Rosenthal
f703198bc9
Docx Writer: Update reference.docx
...
This updates reference.docx to make BodyText a quick style, and inherit
from it appropriately.
2015-02-11 15:06:48 -05:00