Commit Graph

5892 Commits

Author SHA1 Message Date
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 c2cb64379e benchmark - removed kludge we needed before CommonMark writer. 2015-03-30 00:06:40 -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 cbe32c2aeb Require cmark 0.3.1. 2015-03-29 23:42:42 -07: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
John MacFarlane ef07974dc4 Merge pull request #2039 from mpickering/7.10
Docx Writer: Filter out illegal XML characters
2015-03-29 09:24:58 -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
Nikolay Yakimov 0d4d262944 Updated README with new Docx Writer style names 2015-03-29 11:48:58 +03:00
Nikolay Yakimov 79be04df69 Add toc heading style to reference.docx 2015-03-29 09:03:33 +03:00
Nikolay Yakimov 5ab839a187 Docx Writer: Initial support for --toc option (issue #458)
Creates a "dirty" TOC at the beginning of document, before abstract
2015-03-29 09:03:33 +03:00
John MacFarlane aa49deceaa README: Add links to filter libs in perl, php, javascript.
Closes #1829.
2015-03-28 22:05:27 -07:00
Nikolay Yakimov 78cf36a392 Reference Docx: Add keepNext to table captions 2015-03-29 08:02:23 +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 a241cf6a30 Merge branch 'rootzlevel-master' 2015-03-28 21:14:09 -07:00
John MacFarlane 2d2e4c9ab2 Merge branch 'master' of https://github.com/rootzlevel/pandoc into rootzlevel-master
Conflicts:
	src/Text/Pandoc/Readers/Org.hs
2015-03-28 21:09:38 -07:00
John MacFarlane 27078985d5 Merge pull request #2034 from lierdakil/issue2032
Reference Docx: update word/footnotes.xml
2015-03-28 20:37:24 -07:00
Nikolay Yakimov d20add5b01 Reference Docx: update word/footnotes.xml 2015-03-29 05:59:09 +03:00
John MacFarlane 3f20fb3f9f Always build man pages. Removed make-pandoc-man-pages flag.
Updated INSTALL instructions.

Makefile:  removed man target, now that we generate man pages by default.
2015-03-28 15:40:50 -07:00
John MacFarlane 524d284b88 Added images needed for docx tests to cabal extra-source-files. 2015-03-28 15:40:50 -07:00
John MacFarlane 978ae55b22 make-pandoc-man-pages: fixed to build with new readMarkdown type. 2015-03-28 15:36:30 -07:00
John MacFarlane 07cc0079f7 Added source files for reference.docx/odt to extra-source-files. 2015-03-28 14:22:04 -07:00
John MacFarlane db28a39ba6 Added Tests.Writers.Docx to cabal file. 2015-03-28 14:12:18 -07:00
John MacFarlane f986d78c7c Version bump to 1.14.
This is because of the significant API changes in the reader
types.  (They now return an Either value.)
2015-03-28 13:48:53 -07:00
John MacFarlane 8c6ad05ad3 Updated code example in Text.Pandoc. 2015-03-28 13:37:18 -07:00
John MacFarlane 743b680649 Merge branch 'master' of github.com:jgm/pandoc 2015-03-28 13:10:32 -07:00
John MacFarlane c6aaeb3c4f Fixed typo in lhs-test.html. 2015-03-28 13:02:59 -07:00
John MacFarlane b74af6762d Merge branch 'mpickering-errortype' 2015-03-28 12:15:09 -07:00
John MacFarlane 6f4018f8d3 Fixed lhs writer tests (overflow-x, not x-overflow). 2015-03-28 12:13:27 -07:00
John MacFarlane 6a3a04c428 Merge branch 'errortype' of https://github.com/mpickering/pandoc into mpickering-errortype
Conflicts:
	benchmark/benchmark-pandoc.hs
	src/Text/Pandoc/Readers/Markdown.hs
	src/Text/Pandoc/Readers/Org.hs
	src/Text/Pandoc/Readers/RST.hs
	tests/Tests/Readers/LaTeX.hs
2015-03-28 12:12:48 -07:00
Nikolay Yakimov d744b83b61 Create reference files from unpacked archives with helper program 2015-03-28 10:36:53 -07:00
Nikolay Yakimov 1710c4bd8b Add unpacked reference data 2015-03-28 10:26:08 -07:00
Nikolay Yakimov f10a8a3239 Remove pre-built reference files 2015-03-28 10:26:08 -07:00
John MacFarlane 5f74db8605 Updated tests for new highlighting-kate behavior. 2015-03-28 10:10:33 -07:00
John MacFarlane b5b11f31a6 Fixed ghc-prof-options. 2015-03-28 10:10:14 -07:00
John MacFarlane 3f89e3f332 Require highlighting-kate >= 0.5.14
This ensures that all code blocks will be wrapped in a div
with class sourceCode.  Also, the default highlighting CSS
now adds `div.sourceCode { x-overflow: auto; }`, which means
that code blocks (even with line numbers) will acquire a scroll
bar on screens too small to display them (e.g. mobile phones).

See #1903 and jgm/highlighting-kate#65.
2015-03-28 08:18:01 -07:00
John MacFarlane 12c9aa00de pandoc.cabal: changed default profiling options.
Removed `-auto-all` and `-caf-all` at cabal's suggestion.
Use `-auto-exported` instead.
2015-03-27 22:12:42 -07:00
John MacFarlane 86a44422c1 Merge pull request #2030 from lierdakil/issue2026
Fixes for #2026
2015-03-27 21:30:25 -07:00
John MacFarlane 3a4ef013d8 travis script: build with ghc 7.10.1.
For now -Werror is turned of for 7.10.1.
2015-03-27 21:14:32 -07:00
Nikolay Yakimov 5f7639a0d6 Markdown Reader: Require nonempty value in mmd title block
`many1Till` will gobble up newline, and then whole following line will
match, so I had to use guard here.
2015-03-28 07:07:03 +03:00
Nikolay Yakimov 7091002966 Markdown Reader: Req. " " after key in mmd title block
Require space after key-value delimiter colon in mmd title block.
Issue #2026
Amend: parsec's `spaces` include newlines, but we don't want that. Had
to make custom `spaceNoNewline` parser here
2015-03-28 07:05:02 +03:00
Nikolay Yakimov 6960b2a4cc Markdown Reader: Disable meta exts for meta values
Disable all metadata block extensions when parsing metadata field
values. Issue #2026
2015-03-28 02:53:33 +03:00
John MacFarlane dd5d3379e8 Require highlighting-kate 0.5.13.
Closes #1903.
2015-03-27 13:45:22 -07:00
John MacFarlane 49e1b83ac6 README: make defn lists for options all "loose" for consistency. 2015-03-27 10:58:43 -07:00
Matthew Pickering 3341c7851a Merge pull request #2023 from lierdakil/fix-stylemap
Docx Writer: Fix StyleMap
2015-03-24 17:31:17 +00:00
Nikolay Yakimov d09b7593f6 Docx Writer: Fix StyleMap
I've messed up badly with it, so it didn't work properly most of the
time. At the plus side, fallback mechanic is working wonderfully.
2015-03-24 19:24:29 +03:00
John MacFarlane 75a2a7ba69 Allow pipe tables with header but no body.
Closes #2017.
2015-03-23 20:26:56 -07:00
John MacFarlane c302bdcdbe Merge pull request #1947 from mpickering/Fmonad
Remove F Monad from Markdown and Org readers.
2015-03-22 22:40:20 -07:00