Commit graph

1228 commits

Author SHA1 Message Date
John MacFarlane
44fcc5f96e Merge pull request from lierdakil/rst-normalize-headings
RST Writer: Normalize headings to sequential levels
2015-04-17 19:06:25 -07: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
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
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
28497d484e RST writer: better handling of raw latex inline.
We use `` :raw-latex:`...` `` and add a definition for this
role to the template.

Closes .
2015-04-07 22:07:38 -07: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
2b2f7fe15e Merge pull request 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
John MacFarlane
34c6ff1f60 Merge pull request 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 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 
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 )
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
b983adf0d0 Markdown writer: fixes for GHC 7.10. 2015-03-19 11:48:05 -07:00
John MacFarlane
619b2e8ca2 Merge pull request from lierdakil/issue1607
Fixes for multiple docx writer style bugs.
2015-03-16 12:02:40 -07:00
John MacFarlane
fcf1cd2f31 AsciiDoc writer: avoid wrapping after list marker.
Closes .
2015-03-15 15:43:05 -07:00
John MacFarlane
451019290b AsciiDoc writer: insert some needed blank lines.
Closes .
2015-03-15 14:48:01 -07:00
John MacFarlane
0deb7c507d Merge pull request 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 .
This closes , 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
Konstantin Zudov
b9f77ed03d Support shortcut reference links in markdown writer
Issue 

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
Nikolay Yakimov
c0c9b313e6 Docx Writer: set firstRow information in tables 2015-03-08 04:42:23 +03: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 .
2015-03-07 10:40:13 -08:00
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 .
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 .
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 .
2015-02-25 08:57:30 -08: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 2015-02-22 00:19:58 +03:00
Nikolay Yakimov
5cdd11725c Initial stab at more involved fix for
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
Matthew Pickering
274efc4a71 LaTeX Writer: Don't use listings in headers
Fixes 
2015-02-20 09:35:36 +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 .
2015-02-17 08:50:48 -08:00
John MacFarlane
e32227f744 Allow wildcards in --epub-embed-font arguments.
Closes .
2015-02-13 23:34:20 -08: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