aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-09Fixed shadowing error.John MacFarlane1-3/+3
2015-11-09make_travis_yml.hs: don't suppress -Werror on ghc 7.10.John MacFarlane1-1/+1
2015-11-09Restored Text.Pandoc.Compat.Monoid.John MacFarlane22-30/+64
Don't use custom prelude for latest ghc. This is a better approach to making 'stack ghci' and 'cabal repl' work. Instead of using NoImplicitPrelude, we only use the custom prelude for older ghc versions. The custom prelude presents a uniform API that matches the current base version's prelude. So, when developing (presumably with latest ghc), we don't use a custom prelude at all and hence have no trouble with ghci. The custom prelude no longer exports (<>): we now want to match the base 4.8 prelude behavior.
2015-11-09Revert "Use -XNoImplicitPrelude and 'import Prelude' explicitly."John MacFarlane109-118/+12
This reverts commit c423dbb5a34c2d1195020e0f0ca3aae883d0749b.
2015-11-09Revert "Use Default-extensions rather than ghc-options for NoImplicitPrelude."John MacFarlane1-8/+4
This reverts commit 67cabb2a0d09df17fa4f86b77f66e39a6f036c1d.
2015-11-09Revert "Give up support for ghc 7.4."John MacFarlane3-2/+5
This reverts commit e0c83f74f39ca94437d0b6f823c6f932aa663fe0.
2015-11-09Remove redundant `center` variable for reveal.js.Andrew Dunning1-3/+0
This is no longer needed with the updates to the template in https://github.com/jgm/pandoc-templates/commit/da139313d2e2ba99f4d31be6ea376dabf8c877ff
2015-11-08Give up support for ghc 7.4.John MacFarlane3-5/+2
2015-11-08Use Default-extensions rather than ghc-options for NoImplicitPrelude.John MacFarlane1-4/+8
To satisfy 'cabal check'.
2015-11-08Merge pull request #2502 from minoki/latex-comment-environmentJohn MacFarlane1-1/+2
LaTeX reader: Handle `comment` environment.
2015-11-08Merge pull request #2505 from tarleb/org-header-markup-fixJohn MacFarlane2-1/+12
Org reader: fix markup parsing in headers
2015-11-08Use -XNoImplicitPrelude and 'import Prelude' explicitly.John MacFarlane109-12/+118
This is needed for ghci to work with pandoc, given that we now use a custom prelude. Closes #2503.
2015-11-08Org reader: fix markup parsing in headersAlbert Krewinkel2-1/+12
Markup as the very first item in a header wasn't recognized. This was caused by an incorrect parser state: positions at which inline markup can start need to be marked explicitly by changing the parser state. This wasn't done for headers. The proper function to update the state is now called at the beginning of the header parser, fixing this issue. This fixes #2504.
2015-11-08LaTeX reader: Handle `comment` environment.ARATA Mizuki1-1/+2
The `comment` environment is handled in a similar way to the `verbatim` environment, except that its content is discarded.
2015-11-04Merge pull request #2472 from adunning/patch-1John MacFarlane1-15/+21
Update LaTeX/ConTeXt variable usage in README.
2015-11-01LaTeX writer: properly handle footnotes in captions.John MacFarlane1-15/+18
Closes #1506.
2015-11-01LaTeX writer: avoid footnotes in list of figures.John MacFarlane1-1/+14
Footnotes aren't allowed in the list of figures. This patch causes footnotes to be stripped from captions when entered into the list of figures. Footnotes still don't actually WORK in captions in latex/pdf, but at least an error is no longer raised. See #1506.
2015-10-30Pipe tables with long lines now get relative cell widths.John MacFarlane3-14/+39
If a pipe table contains a line longer than the column width (as set by `--columns` or 80 by default), relative widths are computed based on the widths of the separator lines relative to the column width. This should solve persistent problems with long pipe tables in LaTeX/PDF output, and give more flexibility for determining relative column widths in other formats, too. For narrower pipe tables, column widths of 0 are used, telling pandoc not to specify widths explicitly in output formats that permit this. Closes #2471.
2015-10-30HTML writer: use width on whole table if col widths sum to < 100%.John MacFarlane2-5/+12
Otherwise some browsers display the table with the columns separated far apart.
2015-10-30Beamer template: added code to prevent slide breaks inside paragraphs.John MacFarlane1-13/+8
This will matter, in practice, only when `allowframebreaks` is used. It is especially helpful for bibliography slides. Closes #2442. Thanks to Nick Bart for the solution.
2015-10-30Textile reader: don't do smart punctuation unless explicitly asked.John MacFarlane3-15/+14
Closes #2480. Note that although smart punctuation is part of the textile spec, it's not always wanted when converting from textile to, say, Markdown. So it seems better to make this an option.
2015-10-29Beamer template: fix incompatibility of section slides with natbib.John MacFarlane1-7/+15
Natbib (and presumably biblatex) bibliography commands create their own section. Since these are in frame environments, we have an incompatibility with the `\AtBeginSection` macro which creates a special frame when a new section occurs. (We can't have a frame inside another frame.) This change disables `\AtBeginSection` inside bibliography slides. Thinks to Yihui Xie for bringing the problem to my attention. This supersedes #145. See discussion there.
2015-10-28Revert "New approach to stack build on appveyor."John MacFarlane3-171/+33
This reverts commit cdd6389e91357c48dc3bb859695ab4538da4d004.
2015-10-28New approach to stack build on appveyor.John MacFarlane3-33/+171
This uses system lua library. See https://github.com/osa1/hslua/issues/22#issuecomment-151281274
2015-10-28Fixed omitted `url(...)` in CSS data-uri with `--self-contained`.John MacFarlane1-1/+1
Fixes #2489.
2015-10-28LaTeX writer: add `\protect` to `\hyperlink`.John MacFarlane2-2/+2
Thanks to Hadrien Mary for the problem and solution. Closes #2490.
2015-10-27Change default for old-locale flag to False.John MacFarlane1-1/+1
2015-10-27LaTeX writer: Use `\hypertarget` and `\hyperlink` for links.John MacFarlane2-18/+10
This works correctly to link to Div or Span elements. We now don't bother defining `\label` for Div or Span elements. Closes jgm/pandoc-citeproc#174.
2015-10-26Markdown reader: improved parser for `mmd_title_block`.John MacFarlane1-9/+8
We now allow blank metadata fields. These were explicitly disallowed before. For background see #2026. The issue in #2026 has since been fixed in another way, so there is no need to forbid blank metadata fields.
2015-10-26Merge pull request #2484 from nickbart1980/patch-4John MacFarlane1-2/+3
Added de-CH-1901, fixed el-polyton
2015-10-26Added de-CH-1901, fixed el-polytonnickbart19801-2/+3
el-polyton, not el-poly, see http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
2015-10-25Merge pull request #2481 from mb21/textarabicJohn MacFarlane1-1/+1
LaTeX writer: \textarabic fix
2015-10-25Template improvements (Andrew Dunning).John MacFarlane4-16/+19
- Added `keywords` to HTML templates and fixed alignment. - Updated dzslides template from source. - Added `lang`, `dir`, `quotes` to HTML templates; always make author and date display conditional. - Fixed `author` and `date` in asciidoc; added `keywords`, `abstract`. - Updated tests.
2015-10-25Merge pull request #2477 from tarleb/org-toggling-header-argsJohn MacFarlane2-4/+35
Org reader: allow toggling header args
2015-10-25LaTeX writer: \textarabic fixmb211-1/+1
2015-10-25Org reader: allow toggling header argsAlbert Krewinkel2-4/+35
Org-mode allows to skip the argument of a code block header argument if it's toggling a value. Argument-less headers are now recognized, avoiding weird parsing errors. The fixes are not exactly pretty, but neither is the code that was fixed. So I guess it's about par for the course. However, a rewrite of the header parsing code wouldn't hurt in the long run. Thanks to @jo-tham for filing the bug report. This fixes #2269.
2015-10-24deb/Makefile: added 'clean'.John MacFarlane1-1/+4
2015-10-24deb/Vagrantfile: share .., so we can put the deb there.John MacFarlane1-1/+1
2015-10-24Added Vagrantfile for building deb in vm.John MacFarlane2-0/+81
This should help in automating binary package creation. 'make package' will make the package. 'make package COMMIT=blah' will make the package from commit blah.
2015-10-24Fixed typo.John MacFarlane2-2/+2
2015-10-24Fixed typo.John MacFarlane1-1/+1
2015-10-24Added Paths_pandoc to other-modules for executable stanza.John MacFarlane1-0/+1
2015-10-24make_deb: changed path for man page.John MacFarlane1-1/+2
stack doesn't install it as cabal did.
2015-10-24Improved fetching of pandoc-citeproc man page.John MacFarlane2-4/+16
2015-10-24Moved PATH setting in make_deb, make_osx_package.John MacFarlane2-4/+6
Otherwise 'which hsb2hs' won't find the local one.
2015-10-24Set paths in make_deb and make_osx_package.John MacFarlane2-0/+5
This is needed to include a locally installed hsb2hs.
2015-10-24Changed path . to .. in deb/osx stack.yaml.John MacFarlane2-2/+2
2015-10-24Changes for deb and osx package generators.John MacFarlane4-21/+33
- Use stack for make_deb.sh. - Use osx/stack.yaml or deb/stack.yaml. - deb/stack.yaml doesn't want the same ghc-options.
2015-10-24Added stack.hsb2hs.yaml, for easy installation of hsb2hs.John MacFarlane1-0/+4
2015-10-24make_osx_package: don't create man5.John MacFarlane1-1/+0