Commit graph

5859 commits

Author SHA1 Message Date
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
Jesse Rosenthal
96d5c8a5dc Docx Writer: Add "BodyText" Style
We apply a "BodyText" style to all unstyled paragraphs. This is,
essentially, the same as "Normal" up until now -- except that since not
everything inherits from "BodyText" (the metadata won't, for example, or
the headers or footnote numbers) we can change the text in the body
without having to make exceptions for everything.

This will still inherit from Normal, so if we want to
change *everything*, we can do it through "Normal".
2015-02-11 15:06:36 -05:00
Jesse Rosenthal
25ef68d266 Docx Writer: Use FirstParagraph style at beginning.
Before we had used `FirstParagraph` style after Headings, BlockQuotes,
and other blocks a user might not want an indentation after. We hadn't
actually used it for the first paragraph -- i.e. the opening of the
body. This makes sure the first body paragraph gets that style.
2015-02-10 21:05:13 -05:00
Jesse Rosenthal
d623a5c7e9 Added FirstParagraph to docx templates. 2015-02-09 23:22:59 -05:00
Jesse Rosenthal
daab4c3f22 Docx Writer: Implement FirstParagraph Style
Following the odt writer, we make the first text paragraph following an
image, blockquote, table, or heading into a "FirstParagraph" style. This
allows it to be styled differently, if the user wishes. The default is
for it to be the same as "Normal"
2015-02-09 23:22:52 -05:00
John MacFarlane
6a6392d393 Travis: comment out ghc 7.10 until we have the dependencies. 2015-02-07 21:17:53 -08:00
John MacFarlane
12962e2332 Merge pull request #1927 from freephile/master
update syntax for Images/Media files in MediaWiki
2015-02-07 20:33:33 -08:00
John MacFarlane
24f379ebd7 Merge pull request #1915 from mpickering/travisupdate
Update travis file (for GHC 7.10)
2015-02-07 20:32:42 -08:00
John MacFarlane
20b3dea3fe Merge branch 'timtylin-patch/fixTexinfoWrap' 2015-02-07 20:31:33 -08:00
John MacFarlane
bd7cf8dbd5 Merge branch 'patch/fixTexinfoWrap' of https://github.com/timtylin/scholdoc into timtylin-patch/fixTexinfoWrap
Conflicts:
	src/Text/Pandoc/Writers/Texinfo.hs
2015-02-07 20:28:56 -08:00
John MacFarlane
0a1cd25312 Merge pull request #1925 from timtylin/patch/prettyLineBreaks
Append newline to the LineBreak of various writers
2015-02-07 20:21:58 -08:00
Tim Lin
858ebf99eb Texinfo writer: fix wrapping by using breakable spaces 2015-02-06 01:16:40 -08:00
Greg Rundlett
218f28af6d update syntax for Images/Media files in MediaWiki
The preferred syntax for Images and other media is [[File:Foo.jpg]] in MediaWiki since v1.14 (2008).  [[Image:Foo.jpg]] is deprecated but still works as an alias to the File namespace.  I don't think this would break any existing wikis since talk of switching the syntax/namespace for images started back in 2002 (https://phabricator.wikimedia.org/T2044).  NS_FILE became the new namespace for Files in v 1.14 in late 2008. (https://www.mediawiki.org/wiki/Release_notes/1.14)  There is still a namespace alias so '[[Image:]]' still works today.  It's just that MediaWiki supports other media as well, and so the name and syntax used in documentation (see https://www.mediawiki.org/wiki/Help:Images) has long been '[[File:foo.jpg]]'
2015-02-05 17:07:50 -05:00
Greg Rundlett
13c4757057 update syntax for Images/Media files in MediaWiki
The preferred syntax for Images and other media is [[File:Foo.jpg]] in MediaWiki since v1.14 (2008).  [[Image:Foo.jpg]] is deprecated but still works as an alias to the File namespace.
2015-02-05 17:03:20 -05:00
Tim Lin
0c18f3a854 Append newline to the LineBreak of various writers
This change improves output formatting of content with a large amount of force line breaks, such as line-blocks. The following writers are affected:

* Dokuwiki
* HTML
* EPUB (via HTML)
* LaTeX
* MediaWiki
* OpenDocument
* Texinfo

This commit resolves #1924
2015-02-04 22:42:22 -08:00