Commit graph

3178 commits

Author SHA1 Message Date
Nikolay Yakimov
4229cf2d92 MD Reader: Smart ' after inline math
Closes #1909.

Adds new parser combinator to Parsing.hs

`a <+?> b`

:   if a succeeds, applies b and mappends
    output (if any) to result of a. If b fails,
    it's just a, if a fails, whole expression fails.
2015-04-18 01:23:41 +03:00
Nikolay Yakimov
3f5d5a0a76 RST Writer: treat headings in block quotes, etc as rubrics 2015-04-16 12:12:00 +03:00
Nikolay Yakimov
2337ef68fc Docx Writer: Take TOC title from toc-title metadata field 2015-04-14 13:16:19 +03:00
Nikolay Yakimov
deb95d380e RST Writer: Normalize headings to sequential levels
This is pretty much required by docutils.
2015-04-13 20:45:40 +03:00
John MacFarlane
5ae48b7eaf Fixed warning. 2015-04-12 22:06:44 -07:00
John MacFarlane
0439f6f964 Fixed toc depth in RST writer.
Previously the depth was being rendered as a floating point
number with a decimal point.  Thanks to Nick Yakimov for
noticing this.
2015-04-12 22:06:44 -07:00
John MacFarlane
fee04fbee0 Merge pull request #2072 from lierdakil/latex-reader-cleanup
LaTeX Reader: Code cleanup
2015-04-12 21:39:08 -07:00
John MacFarlane
a9628d0745 Text.Pandoc.PDF: more comprehensible errors on image conversion.
Closes #2067.
EPS can't be supported without shelling out to something like
ImageMagick, but at least we can avoid mysterious error messages.

We now get:

    pandoc: Unable to convert `circle.eps' for use with pdflatex.
    ! Package pdftex.def Error: File `circle-eps-converted-to.pdf' not found.

which seems more straightforward.
2015-04-12 21:18:21 -07:00
Nikolay Yakimov
b92d49092f LaTeX Reader: Code cleanup 2015-04-12 14:50:38 +03:00
Nikolay Yakimov
b2ba922638 ODT Writer: Figure captions
Works pretty much the same as Word writer.

Following styles are used for figures:

Figure -- for figure with empty caption
FigureWithCaption (based on Figure) -- for figure with caption
FigureCaption (based on Caption) -- for figure captions

Also, TableCaption (based on Caption) is used for table captions.

We need FigureWithCaption to set keepWithNext, in order to keep caption
with figure.
2015-04-12 00:34:03 +03:00
John MacFarlane
5a33032560 Removed redundat import. 2015-04-07 23:26:20 -07:00
John MacFarlane
250fbef94d DocBook reader: look inside "info" elements for section titles.
Closes #1931.
2015-04-07 22:15:20 -07:00
John MacFarlane
28497d484e RST writer: better handling of raw latex inline.
We use `` :raw-latex:`...` `` and add a definition for this
role to the template.

Closes #1961.
2015-04-07 22:07:38 -07:00
Julien Cretel
b28c846018 Markdown Reader: eliminate common subexpressions 2015-04-07 13:46:32 +01:00
John MacFarlane
b29a8a5516 EPUB writer: Take TOC title from toc-title metadata field. 2015-04-02 21:28:55 -07:00
John MacFarlane
8d39d03d05 Added "noProof" to docx syntax highlighting SourceCode style. 2015-04-01 15:21:55 -07:00
John MacFarlane
9a79538ac9 Merge pull request #2042 from lierdakil/issue1866
LaTeX Reader: check for block-level newcommand aliases in blockCommand
2015-03-31 09:44:15 -07:00
Nikolay Yakimov
f1eb1ab9cf Latex Reader: Block commands code cleanup 2015-03-31 14:32:42 +03:00
John MacFarlane
2b2f7fe15e Merge pull request #2035 from lierdakil/issue2031
Docx Writer/Reference: Add keepNext to objects w/ captions
2015-03-30 20:30:15 -07:00
John MacFarlane
ccb828894b Added CommonMark writer.
Added `Text.Pandoc.Writers.CommonMark`, exporting
`writeCommonMark`.
2015-03-29 23:42:42 -07:00
Nikolay Yakimov
6a0d500f99 Latex Reader: Guard against para starting with inline macro 2015-03-30 06:42:15 +03:00
Nikolay Yakimov
f3e8274d04 LaTeX Reader: check for block-level newcommand aliases in blockCommand 2015-03-30 05:37:00 +03:00
John MacFarlane
34c6ff1f60 Merge pull request #2038 from lierdakil/docx-hyphen-settings
Docx Writer: Copy hyphenation settings from reference.docx
2015-03-29 09:58:45 -07:00
John MacFarlane
91128aac99 Merge pull request #2037 from lierdakil/issue458
Docx Writer: support for --toc option
2015-03-29 09:47:49 -07:00
Matthew Pickering
f3aa03ee86 Docx Writer: Filter out illegal XML characters
Fixes #1992
2015-03-29 13:38:52 +01:00
Nikolay Yakimov
4d1e85a09e Docx Writer: Place toc after abstract, rather than before 2015-03-29 13:46:34 +03:00
Nikolay Yakimov
6ba37909fe Docx Writer: Copy hyphenation settings from reference.docx 2015-03-29 12:24:17 +03:00
Nikolay Yakimov
5ab839a187 Docx Writer: Initial support for --toc option (issue #458)
Creates a "dirty" TOC at the beginning of document, before abstract
2015-03-29 09:03:33 +03:00
Nikolay Yakimov
69d5085c11 Docx Writer: Add a style to figure images
Figures with empty captions use style "Figure"

Figures with nonempty captions use style "Figure with Caption", which is
based on "Figure", and additionally has keepNext set.
2015-03-29 08:02:18 +03:00
John MacFarlane
2d2e4c9ab2 Merge branch 'master' of https://github.com/rootzlevel/pandoc into rootzlevel-master
Conflicts:
	src/Text/Pandoc/Readers/Org.hs
2015-03-28 21:09:38 -07:00
John MacFarlane
8c6ad05ad3 Updated code example in Text.Pandoc. 2015-03-28 13:37:18 -07:00
John MacFarlane
6a3a04c428 Merge branch 'errortype' of https://github.com/mpickering/pandoc into mpickering-errortype
Conflicts:
	benchmark/benchmark-pandoc.hs
	src/Text/Pandoc/Readers/Markdown.hs
	src/Text/Pandoc/Readers/Org.hs
	src/Text/Pandoc/Readers/RST.hs
	tests/Tests/Readers/LaTeX.hs
2015-03-28 12:12:48 -07:00
Nikolay Yakimov
5f7639a0d6 Markdown Reader: Require nonempty value in mmd title block
`many1Till` will gobble up newline, and then whole following line will
match, so I had to use guard here.
2015-03-28 07:07:03 +03:00
Nikolay Yakimov
7091002966 Markdown Reader: Req. " " after key in mmd title block
Require space after key-value delimiter colon in mmd title block.
Issue #2026
Amend: parsec's `spaces` include newlines, but we don't want that. Had
to make custom `spaceNoNewline` parser here
2015-03-28 07:05:02 +03:00
Nikolay Yakimov
6960b2a4cc Markdown Reader: Disable meta exts for meta values
Disable all metadata block extensions when parsing metadata field
values. Issue #2026
2015-03-28 02:53:33 +03:00
Nikolay Yakimov
d09b7593f6 Docx Writer: Fix StyleMap
I've messed up badly with it, so it didn't work properly most of the
time. At the plus side, fallback mechanic is working wonderfully.
2015-03-24 19:24:29 +03:00
John MacFarlane
75a2a7ba69 Allow pipe tables with header but no body.
Closes #2017.
2015-03-23 20:26:56 -07:00
Matthew Pickering
65d67dcb51 Fix accidently usage of list monad instance 2015-03-23 00:14:02 +00:00
Matthew Pickering
84d6703ea7 Add missing import 2015-03-22 23:31:08 +00:00
Matthew Pickering
4ce6471c12 Factor out "returnState" into Parsing module 2015-03-22 21:47:28 +00:00
Matthew Pickering
9e150dd7cf HLint changes 2015-03-22 21:47:28 +00:00
Matthew Pickering
17b317268b Remove F Monad from Markdown reader 2015-03-22 21:47:28 +00:00
Matthew Pickering
7690e1d17f Generalise signature of addWarning 2015-03-22 20:11:30 +00:00
Matthew Pickering
9ca34cc9a9 Add check to see whether in a footnote to ParserState (to avoid circular footnotes) 2015-03-22 20:11:30 +00:00
Matthew Pickering
de093b4e6e Remove F monad from Parsing 2015-03-22 20:11:30 +00:00
Matthew Pickering
5dc902cbcc Changed parseWithWarnings to the more general returnWarnings parser transformer 2015-03-22 20:11:30 +00:00
Matthew Pickering
f6419a2691 Remove F monad from Org Reader. 2015-03-22 20:11:29 +00:00
Matthew Pickering
8271fb574e Added generalize function which can be used to lift specialised parsers.
Monad m => Parsec s st a -> Parsec T s st m a
2015-03-22 18:57:36 +00:00
John MacFarlane
b983adf0d0 Markdown writer: fixes for GHC 7.10. 2015-03-19 11:48:05 -07:00
Shahbaz Youssefi
e952d6633f Derive from Data and Typeable for libpandoc
This commit derives a few types from Data and Typeable used by
libpandoc.

Requires corresponding pull-request for Highlighting-Kate:

    https://github.com/jgm/highlighting-kate/pull/64

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
2015-03-19 17:07:18 +01:00
John MacFarlane
0a82e7e4b1 Fixed a compiler warning. 2015-03-17 17:06:19 -07:00
John MacFarlane
e0d234e54d Added CommonMark reader using cmark (libcmark bindings).
- Added commonmark as an input format.
- Added `Text.Pandoc.Readers.CommonMark.readCommonMark`.
- For now, we use the markdown writer to generate benchmark
  text for the CommonMark reader.  We can change this when we
  get a writer.
2015-03-17 16:15:57 -07:00
John MacFarlane
619b2e8ca2 Merge pull request #1968 from lierdakil/issue1607
Fixes for multiple docx writer style bugs.
2015-03-16 12:02:40 -07:00
Tom Leese
3dba66bf5d Replace occurrences of 'Github' with 'GitHub'
The website is called 'GitHub' afterall.
2015-03-16 09:28:45 +00:00
John MacFarlane
fcf1cd2f31 AsciiDoc writer: avoid wrapping after list marker.
Closes #1858.
2015-03-15 15:43:05 -07:00
John MacFarlane
451019290b AsciiDoc writer: insert some needed blank lines.
Closes #1860.
2015-03-15 14:48:01 -07:00
John MacFarlane
0deb7c507d Merge pull request #1989 from zudov/shortcut_ref_link_pr
Support shortcut reference links in markdown writer
2015-03-15 11:58:30 -07:00
John MacFarlane
967c13560e Really fix #1394.
This closes #1394, which actually wasn't fixed by the earlier commit.
This ensures that lists in speaker notes don't add "fragment" classes,
which can cause additional keypresses to be needed to advance a slide.
2015-03-14 23:32:35 -07:00
John MacFarlane
3b962a5277 Properly gobble spaces after \\.
Closes #2007.
2015-03-14 23:12:04 -07:00
John MacFarlane
348b383731 LaTeX reader: allow block content in \title{}.
Closes #2001.
2015-03-14 23:11:04 -07:00
Konstantin Zudov
b9f77ed03d Support shortcut reference links in markdown writer
Issue #1977

Most markdown processors support the [shortcut format] for reference links.
Pandoc's markdown reader parsed this shortcuts unoptionally.
Pandoc's markdown writer (with --reference-links option) never shortcutted links.

This commit adds an extension `shortcut_reference_links`. The extension is
enabled by default for those markdown flavors that support reading shortcut
reference links, namely:

    - pandoc
    - strict pandoc
    - github flavoured
    - PHPmarkdown

If extension is enabled, reader parses the shortcuts in the same way as
it preveously did. Otherwise it would parse them as normal text.

If extension is enabled, writer outputs shortcut reference links unless
doing so would cause problems (see test cases in `tests/Tests/Writers/Markdown.hs`).
2015-03-10 20:32:24 +02:00
Craig S. Bosma
513221f822 Org reader: add support for smart punctuation 2015-03-09 07:11:53 -05:00
Mathias Schenner
12bf0ff3e5 LaTeX reader: allow non-empty colsep in tables
The `tabular` environment allows non-empty column separators
with the "@{...}" syntax. Previously, pandoc would fail to
parse tables if a non-empty colsep was present. With this
commit, these separators are still ignored, but the table gets
parsed. A test case is included.
2015-03-08 15:47:39 +01:00
Mathias Schenner
1e3ef0e36f LaTeX reader: allow valign argument in tables
The `tabular` environment takes an optional parameter for
vertical alignment. Previously, pandoc would fail to parse
tables if this parameter was present. With this commit,
the parameter is still ignored, but the table gets
parsed. A test case is included.
2015-03-08 15:39:18 +01:00
John MacFarlane
efdc1691fa LaTeX reader: ignore options in \lstinline.
Rather than raising a parse error.  Closes #1997.
2015-03-07 19:58:49 -08:00
Nikolay Yakimov
c0c9b313e6 Docx Writer: set firstRow information in tables 2015-03-08 04:42:23 +03:00
John MacFarlane
0b42eb5f58 MediaWiki writer: spaces to underscores in wikilink URL.
This mimics MediaWiki itself.  Closes #1982.
2015-03-07 10:58:56 -08:00
John MacFarlane
48eaadc57f Fixed pipe tables -- headerless tables are not allowed.
GFM and PHP Markdown Extra pipe tables require headers.
Previously pandoc allowed pipe tables not to include headers,
and produced headerless pipe tables in Markdown output, but this
was based on a misconception about pipe table syntax. This
commit fixes this.

Note:  If you have been using headerless pipe tables, this may
cause existing tables to break.

Closes #1996.
2015-03-07 10:40:13 -08:00
Sumit Sahrawat
ad9e4cde9d Fix issue #969, #1779 by providing --latex-engine-opt 2015-03-04 15:25:56 +05:30
Nikolay Yakimov
65c80822e7 Code cleanup 2015-03-03 13:08:52 +03:00
Nikolay Yakimov
409111f647 Started moving StyleMap out of writer code 2015-03-01 22:57:35 +03:00
Nikolay Yakimov
13daf3ed6a Update Docx writer for 1cb601d reference.docx 2015-03-01 18:49:44 +03:00
John MacFarlane
4f0c5c3080 HTML writer: include raw latex blocks if --mathjax specified.
Closes #1938.
2015-02-25 21:40:40 -08:00
John MacFarlane
4b43531a70 Markdown writer: don't emit span tags if plain or raw HTML disabled. 2015-02-25 21:15:28 -08:00
John MacFarlane
7af3e23bdf Define isRight since it's only in recent versions of Data.Either. 2015-02-25 14:45:00 -08:00
John MacFarlane
9a5e081073 Markdown writer: Avoid introducing spurious list items through wrapping.
Closes #1946.
2015-02-25 10:16:05 -08:00
John MacFarlane
8e404aaca0 LaTeX writer: recognize book documentclass if set in metadata.
This sets `--chapters` implicitly if the documentclass in metadata
is a book documentclass.  Previously this was done only if a book
documentclass was set in a variable.

Closes #1971.
2015-02-25 08:57:30 -08:00
John MacFarlane
47bfdca049 Markdown reader: check for tex macros after indented code.
Closes #1973.
2015-02-25 08:33:42 -08:00
Hans-Peter Deifel
2ca5101113 Org reader: Allow image links with non-image targets
Org-Mode's own html exporter converts the following org link:

  [[http://example.com][https://www.haskell.org/static/img/logo.png]]

to

  <a href="http://example.com">
  <img src="https://www.haskell.org/static/img/logo.png" alt="logo.png" />
  </a>

but pandoc generates:

  <a href="http://example.com">
  <a href="https://www.haskell.org/static/img/logo.png" class="uri">
   https://www.haskell.org/static/img/logo.png
  </a>
  </a>

which is useless. With this patch, it generates:

  <a href="http://example.com">
  <img src="https://www.haskell.org/static/img/logo.png" alt="" />
  </a>
2015-02-25 16:58:48 +01:00
John MacFarlane
ae3142f919 Docbook writer: don't print empty id attributes.
Thanks to Steve Horne for reporting.
2015-02-25 06:59:43 -08:00
Nikolay Yakimov
ba153585db Comment out unused functions to make CI happy 2015-02-24 02:34:46 +03:00
Nikolay Yakimov
908a47e4b9 Treat some ambiguous styles as custom for now
* Author
* Abstract
* Compact
* ImageCaption
* TableCaption
* DefinitionTerm
* Definition
* FirstParagraph
2015-02-24 02:31:14 +03:00
Nikolay Yakimov
47c70b9131 Do not lookup custom styles 2015-02-23 02:05:32 +03:00
Nikolay Yakimov
7ae7f0c051 Also skip SourceCode style if exists 2015-02-23 01:53:47 +03:00
Nikolay Yakimov
8b3acde9de If --no-highlight is set, remove *Tok styles. 2015-02-22 23:25:12 +03:00
Nikolay Yakimov
80715ecd7a Prototype fix for #1872 2015-02-22 00:19:58 +03:00
Nikolay Yakimov
5cdd11725c Initial stab at more involved fix for #1607
This patch attempts to build a style name -> style id mapping based on styles.xml from reference doc, and changes pStyle and rStyle to accept style name as a parameter instead of styleId. There is a fallback mechanic that removes spaces from style name and returns it as style id, but it likely won't help much.

Style names are matched lower-case, since headings and `footnote text` have lowercase names.
2015-02-21 22:20:18 +03:00
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
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
274efc4a71 LaTeX Writer: Don't use listings in headers
Fixes #1963
2015-02-20 09:35:36 +00: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
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
Matthias C. M. Troffaes
dccd408a9c Allow digit as first character of a citation key.
* Update parser to recognize citation keys starting with a digit.
* Update documentation accordingly.
* Test case added.

See https://github.com/jgm/pandoc-citeproc/issues/97
2015-02-18 15:30:17 +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
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
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
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
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
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
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
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
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
John MacFarlane
fb7a03dcda Textile reader: table improvements.
* Handle newlines in cells.
* Handle empty cells.
* Closes #1919.
2015-02-02 10:45:50 -08:00
John MacFarlane
7050c26abc LaTeX writer: Don't escape $ in URL. Closes #1913. 2015-02-01 11:19:55 -08:00
John MacFarlane
6a0d4da382 HTML writer: Add "inline" or "display" class to math spans.
This allows inline and display math to be styled differently.

Closes #1914.
2015-02-01 11:08:27 -08:00
Konstantin Zudov
92e762c2d6 Refactored if x then [] else y to [y | not x] 2015-01-29 22:36:23 +02:00
Konstantin Zudov
b5cc01e976 Do not ommit missing alt attribute on img tag
Fixes #1131
2015-01-29 22:16:38 +02:00
John MacFarlane
82c04a28ce Fixed list-style-type for numbered example lists.
Should be "decimal," not "example."  Closes #1902.
2015-01-27 16:56:56 -08:00
John MacFarlane
33d1c8cc01 Merge pull request #1885 from mb21/html-reader-tables
fixes HTML Reader: tables
2015-01-25 10:46:47 -08:00
mb21
b40d33b174 fixes #1859 HTML Reader table parsing 2015-01-25 09:41:12 +01:00
John MacFarlane
d90dc6b8b5 LaTeX reader: don't limit includes to .tex extension.
Previously `\input` and `\include` would only work if the
included files had the extension `.tex`.  This change relaxes
that restriction, though if the extension is not `.tex`, it
must be given explicitly in the `\input` or `\include`.

Closes #1882.
2015-01-22 23:17:25 -08:00
Jesse Rosenthal
eb11c61182 Docx: Parse images in deprecated vml format.
Some older versions of word use vml (vector markup language) and put
their images in a "v:imagedata" tag inside a "w:pict". We read those as
we read the more modern "blip" inside a "w:drawing".

Note that this does not mean the reader knows anything about vml. It
just looks for a `v:imagdata`. It's possible that, with more complicated
uses of images in vml, it won't do the right thing.
2015-01-21 13:41:16 -05:00
John MacFarlane
8a7db5cc9d Use CPP to avoid unneeded import warning for blaze-markup >= 0.6.3.
See https://github.com/jgm/pandoc/pull/1888#issuecomment-70470409
2015-01-19 10:29:57 -08:00
John MacFarlane
030d3b597d Custom writer: Raise PandocLuaException instead of using 'error'.
Eventually we'll change the return type so that no exception
is involved, but at least this can be trapped.
2015-01-18 22:04:42 -08:00
John MacFarlane
ab8b00ea0c Custom writer: raise error if loadstring returns an error status.
This will make debugging custom scripts much easier.
2015-01-18 21:48:04 -08:00
John MacFarlane
25e12ca7b2 EPUB writer: properly handle internal links to IDs in spans, divs.
Closes #1884.
2015-01-17 11:27:49 -08:00