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

6065 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
eb50bf896c Merge pull request #2099 from RyanGlScott/master 
Bump zlib upper version bounds
 2015-04-20 14:03:58 -07:00
RyanGlScott
b65238b412 Bump zlib upper version bounds 2015-04-20 13:52:48 -05:00
John MacFarlane
ac75964f4e Merge pull request #2095 from pombreda/patch-1 
Fixed typo in URL for dzslides
 2015-04-20 09:13:59 -07:00
John MacFarlane
0cd845672b Added license & copyright for lua to COPYRIGHT. 
Closes #2096.
 2015-04-20 09:02:37 -07:00
Philippe Ombredanne
7d4828252b Fixed typo in URL for dzslides 2015-04-20 12:28:03 +02: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
John MacFarlane
5b5813c30b Merge pull request #2090 from lierdakil/issue2083 
Fix for #2083 (citation suffix clashes with links and footnotes)
 2015-04-19 16:49:34 -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
Nikolay Yakimov
c1ff165154 MD Reader: Tests for links/footnotes after citations 
In-text citation suffix clashes with links and footnotes
 2015-04-20 01:31:45 +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
343b6051da Added test case for #2062. 2015-04-18 19:00:18 -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
0b80073e7c Merge pull request #2093 from gbataille/genericTypo 
Typo on Text.Pandoc.Generic
 2015-04-18 10:54:40 -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
Grégory Bataille
4d4a0a3a01 Typo on Text.Pandoc.Generic 2015-04-18 16:05:30 +02: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
aaf5e67624 Merge branch 'jlduran-latex-tightlist' 2015-04-17 19:37:16 -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
96abd907bd Merge pull request #2088 from AndreasLoow/master 
Various minor formatting and consistency fixes for the README
 2015-04-17 19:05:30 -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
9ad336f586 LaTeX template: redefine \paragraph, \subparagraph... 
to behave more like section headers.  Closes #1658.
 2015-04-17 18:51:36 -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
94e4a5ec44 MD Reader: Test for smart ' after inline math 2015-04-18 00:53:20 +03:00
Andreas Lööw
6a076ae36e Various minor formatting and consistency fixes for the program options. 2015-04-16 18:41:17 +00:00
Andreas Lööw
2fd5f4c37d Minor, fixed a Markdown error that caused formatting problems. 2015-04-16 17:26:34 +00:00
Nikolay Yakimov
4b7ddeb63f RST Writer: Tests for rubrics and heading normalization 2015-04-16 19:27:33 +03:00
Nikolay Yakimov
3f5d5a0a76 RST Writer: treat headings in block quotes, etc as rubrics 2015-04-16 12:12:00 +03:00
John MacFarlane
0c5f57aab9 Updated changelog for 1.13.2.1 release. 2015-04-15 13:58:40 -07:00
John MacFarlane
2cd08b47e0 Document toc-title variable in README. 
See #2081.
 2015-04-14 09:41:26 -07:00
John MacFarlane
81fa3ef2ee Merge pull request #2081 from lierdakil/docx-content-title 
Docx Writer: Take TOC title from toc-title metadata field
 2015-04-14 09:39:55 -07:00
Nikolay Yakimov
2337ef68fc Docx Writer: Take TOC title from toc-title metadata field 2015-04-14 13:16:19 +03:00
John MacFarlane
693bc5f50f Bump texmath lower bound to 0.8.1 2015-04-13 21:25:06 -07: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
09083637ab Merge pull request #2078 from nickbart1980/patch-2 
Adds YAML biblio format
 2015-04-13 09:23:03 -07:00
John MacFarlane
c5acaec3b5 LaTeX template: include grffile together with graphicx. 
This properly handles filenames containing spaces and dots.
Closes #2074.
 2015-04-13 09:00:55 -07:00
nickbart1980
a43ceb5549 Adds YAML biblio format 
Also, adds note on pandoc-citeproc --bib2json and pandoc-citeproc --bib2yaml, and sorts table
 2015-04-13 10:21:41 +00: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
6a83773f03 OpenDocument template: use text:p instead of text:h for title. 
Using `text:h` causes problems with numbering.  Closes #2059.
Thansk to @nkalvi for diagnosing this.
 2015-04-12 21:29:53 -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
251ce0738d LaTeX Reader: Test for ^^ character escapes 2015-04-13 03:22:39 +03:00
Nikolay Yakimov
b92d49092f LaTeX Reader: Code cleanup 2015-04-12 14:50:38 +03:00
John MacFarlane
a21c5ba7c8 Merge pull request #2070 from lierdakil/odt-image-captions 
ODT Writer: Figure captions
 2015-04-11 21:20:43 -07:00
Nikolay Yakimov
66a8016bb3 ODT Writer: Figure captions - Tests update 2015-04-12 00:56:02 +03:00