lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-09-18 05:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,211 Commits 87 Branches 298 Tags
b70079fbfa73dff4a3d94de1aa3d8b804fc9520b
Commit Graph
10211 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 d248c9d638 LaTeX template: Added \tightlist definition. 
See jgm/pandoc#1571.
 2015-04-17 19:22:28 -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 e8aec53fad Merge pull request #92 from lierdakil/patch-1 
Redefine (sub)paragraphs in default LaTeX template
 2015-04-17 18:38:40 -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
Nikolay Yakimov 9ca76d3fbe Redefine (sub)paragraphs in default LaTeX template 
This should make those behave more like sections, as per https://github.com/jgm/pandoc/issues/1658
 2015-04-17 23:26:21 +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
John MacFarlane 12ba81ec96 LaTeX: include grffile when including graphics. 
This allows filenames with spaces etc. See jgm/pandoc#2074.
 2015-04-13 08:53:08 -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 09767991b2 OpenDocument: use text:p instead of text:h for title. 
Using text:h causes problems with numbering.
See jgm/pandoc#2059.
 2015-04-12 21:22:38 -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
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 9e16fb3b96 Merge pull request #2064 from nickbart1980/patch-1 
Fix obsolete reference to mods2yaml
 2015-04-10 10:11:04 -07:00
nickbart1980 d54a97113e Fix obsolete reference to mods2yaml 2015-04-10 08:34:26 +00: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
John MacFarlane 7846f08b61 rst template: Added conditional role definition for raw-latex. 2015-04-07 22:07:11 -07:00
John MacFarlane ca6a8d62f2 epub, epub3: added header-includes, include-before, include-after. 
Closes #1987.
 2015-04-07 21:11:43 -07:00
John MacFarlane bed3f14dbc epub, epub3: added header-includes, include-before, include-after. 
Closes jgm/pandoc#1987.
 2015-04-07 21:10:00 -07:00
John MacFarlane 394cf3365f reveal.js template: move custom css after theme. 
This allows custom css to modify themes, instead of being replaced
by themes.
 2015-04-07 20:31:43 -07:00
John MacFarlane c3aa395c71 reveal.js template: move custom css after theme. 
This allows custom css to modify themes, instead of being replaced
by themes.

Closes #91.
 2015-04-07 20:31:00 -07:00
Matthew Pickering 5b8f261b22 Merge pull request #2057 from Jubobs/master 
Markdown Reader: eliminate common subexpressions
 2015-04-07 15:56:14 +01:00
Julien Cretel b28c846018 Markdown Reader: eliminate common subexpressions 2015-04-07 13:46:32 +01:00