Commit graph

1248 commits

Author SHA1 Message Date
John MacFarlane
d5f367d04b EPUB writer: Split references into separate chapter.
Previously the div-enclosed reference section produced
by pandoc-citeproc would not be split into its own chapter,
which caused various problems.

See , .

I'm not sure this is a complete fix.  I note that the bibliography
doesn't appear in nav or toc, which seems bad.
2015-05-21 00:45:57 -07:00
John MacFarlane
f532dd69c9 DocBook writer: add id to para if in Div with id element.
This makes the writer work properly with linked bibliographic
items with pandoc-citeproc.

Closes .
2015-05-20 10:55:06 -07:00
John MacFarlane
75cfa7b462 Beamer: mark slide as [fragile] if header has fragile class.
Closes .
2015-05-13 20:10:54 -07:00
John MacFarlane
0fa753b999 EPUB writer: Properly handle image URLs without an extension.
We now look at the mime type from the server and attach an
appropriate extension.

Closes .
2015-05-13 14:52:51 -07:00
John MacFarlane
4560447041 Don't use sup element for epub footnotes.
Instead, just use an a element with class `footnoteRef`.
This allows more styling options, and provides better results
in some readers (e.g. iBooks, where anything inside the a
tag breaks popup footnotes).

Closes .
2015-05-11 21:58:01 -07:00
John MacFarlane
60bf4a8bfb Improved warnings when image size can't be determined.
Closes .
2015-05-09 23:56:53 -07:00
John MacFarlane
6fe243abbd ImageSize: make imageSize return an Either, not a Maybe.
This will give us better error reporting options.
This is part of a fix for .
2015-05-09 21:32:31 -07:00
John MacFarlane
7920a1a469 Revert "EPUB writer: stylesheet changes. Closes #2040."
This reverts commit 1c2951dfd9.

See .

The semantics was too squishy.  `--css` takes a URL, but
for EPUB we need files that we can read.  I prefer keeping
the old system for now, with `--epub-stylesheet`.
2015-05-09 00:07:27 -07:00
John MacFarlane
1c2951dfd9 EPUB writer: stylesheet changes. Closes .
* Allow `--css` to be used to specify stylesheets.
* Deprecated `--epub-stylesheet` and made it a synoynym of
  `--css`.
* If a code block with class "css" is given as contents of the
  `stylesheet` metadata field, use its literal code as contents of
  the epub stylesheet.  Otherwise, treat it as a filename and
  read the file.
* Note: `--css` and `stylesheet` in metadata are not compatible.
  `stylesheet` takes precedence.
2015-05-08 23:47:50 -07:00
John MacFarlane
472c1424ba Deal with deprecation warning in Custom. 2015-05-05 12:46:20 -07:00
John MacFarlane
8a77eb4c9c LaTeX writer: Add a \label in \hyperdef for Div, Span.
Otherwise links don't work.
2015-05-02 17:58:16 -07:00
John MacFarlane
f1aaad9e86 EPUB writer: Use plain writer for metadata dc: fields.
This gives better results when we have, e.g. multiple paragraphs.
Note that tags aren't allowed in these fields.

Closes .
2015-05-01 22:36:38 -07:00
John MacFarlane
7b27cc6758 EPUB writer: Remove linear=no from cover itemref.
Closes .
2015-04-26 15:43:58 -07:00
John MacFarlane
2793d986dc Merge pull request from lierdakil/issue2101
Custom Writer: Set foreign encoding to UTF-8
2015-04-26 11:16:50 -07:00
John MacFarlane
1868cb5e42 Updated copyright notices to -2015. Closes . 2015-04-26 10:18:29 -07:00
Nikolay Yakimov
a0ec3e85ad Custom Writer: Set foreign encoding to UTF-8
Closes , 

Also factored out ByteString, since it's only used as an intermediate
representation.
2015-04-26 08:44:57 +03:00
John MacFarlane
2bca018201 Custom writer: use UTF-8 aware bytestring conversion.
This might help with .
2015-04-21 22:50:58 -07:00
John MacFarlane
d20152e011 Markdown writer: improved escaping.
`<` should not be escaped as `\<`, for compatibility with
original Markdown.  We now escape `<` and `>` with entities.
Also, we now backslash-escape square brackets.

Closes .
2015-04-18 10:58:50 -07:00
John MacFarlane
764f677530 Merge branch 'latex-tightlist' of https://github.com/jlduran/pandoc into jlduran-latex-tightlist
Conflicts:
	data/templates
2015-04-17 19:23:13 -07:00
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