Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
6240 commits 2 branches 0 tags 65 MiB
Commit graph

3201 commits

Author SHA1 Message Date
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 #2121.
 2015-05-01 22:36:38 -07:00
John MacFarlane
9b2f645e2a SelfContained: cssURLs no longer tries to fetch fragment URLs. 
The current test is: does the URL start with a `#`?
Closes #2121.
 2015-05-01 22:15:43 -07:00
Alfred Wechselberger
7031748a43 Added woff2 to MIME types 2015-04-29 14:10:30 -07:00
John MacFarlane
55b7afc674 HTML reader: Allow multiple colgroups in table. 
Closes #2122.
 2015-04-29 12:05:38 -07:00
John MacFarlane
7b27cc6758 EPUB writer: Remove linear=no from cover itemref. 
Closes #1609.
 2015-04-26 15:43:58 -07:00
John MacFarlane
d9d88e58e1 Fixed regression with lists inside defintiion lists. 
This fixes a regression (not in any released version) on
things like

    hi
    :   - there

Closes #2098.
 2015-04-26 11:27:47 -07:00
John MacFarlane
2793d986dc Merge pull request #2112 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 #2111. 2015-04-26 10:18:29 -07:00
Nikolay Yakimov
a0ec3e85ad Custom Writer: Set foreign encoding to UTF-8 
Closes #2101, #1634

Also factored out ByteString, since it's only used as an intermediate
representation.
 2015-04-26 08:44:57 +03:00
John MacFarlane
e1d6be4e30 LaTeX reader: recognize \newpage as a block command. 2015-04-22 08:48:25 -07:00
John MacFarlane
2bca018201 Custom writer: use UTF-8 aware bytestring conversion. 
This might help with #2101.
 2015-04-21 22:50:58 -07:00
John MacFarlane
e9d7504bea Rewrote charsInBalancedBrackets. 
This version should be a bit more efficient.

This doesn't help with #1735, however.
 2015-04-19 17:04:33 -07:00
Nikolay Yakimov
e83968412e MD Reader: Fix links/footnotets after citations 
Footnotes: check if '^' follows '['
Links: check if '[' or '(' follows ']'
Shorthand links: attempt to lazily parse suffix as referenceLink
 2015-04-20 01:47:02 +03:00
John MacFarlane
1a69896d8f Revert "Merge pull request #1947 from mpickering/Fmonad" 
Closes #2062.

This reverts commit c302bdcdbe, reversing
changes made to b983adf0d0.

Conflicts:
	src/Text/Pandoc/Parsing.hs
	src/Text/Pandoc/Readers/Markdown.hs
	src/Text/Pandoc/Readers/Org.hs
	src/Text/Pandoc/Readers/RST.hs
 2015-04-18 19:00:32 -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 #2086.
 2015-04-18 10:58:50 -07:00
John MacFarlane
d3544dc6f7 Markdown definition lists: don't require indent for first line. 
Previously the body of the definition (after the `:` or `~` marker)
needed to be in column 4.  This commit relaxes that requirement,
to better match the behavior of PHP Markdown Extra.  So, now
this is a valid definition list:

    foo
    : bar

This patch also helps resolve a potentially ambiguity with table
captions:

    foo

      : bar

      -----
      table
      -----

Is "bar" a definition, or the caption for the table?  We'll count
it as a caption for the table.

Closes #2087.
 2015-04-18 10:13:32 -07:00
John MacFarlane
10e28ef750 More principled fix for #1820. 
If the tag parses as a comment, we check to see if the
input starts with `<!--`. If not, it's bogus comment mode
and we fail htmlTag.

Includes test case.  Closes #1820.
 2015-04-17 22:56:33 -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
28ca8566ab Merge pull request #1954 from mcmtroffaes/feature/citekey-firstchar-alphanum 
Allow digit as first character of a citation key.
 2015-04-17 19:10:37 -07:00
John MacFarlane
44fcc5f96e Merge pull request #2079 from lierdakil/rst-normalize-headings 
RST Writer: Normalize headings to sequential levels
 2015-04-17 19:06:25 -07:00
John MacFarlane
fb143be038 Merge pull request #2092 from lierdakil/issue1909 
MD Reader: Smart apostrophe after inline math
 2015-04-17 18:55:35 -07:00
John MacFarlane
13b230a1b5 Fixed htmlTag in HTML reader. 
Require that `<!` or `<?` be followed by nonspace.
This prevents `</ div>` from being parsed as a comment.

Closes #1820.
 2015-04-17 18:35:49 -07:00
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