Commit graph

643 commits

Author SHA1 Message Date
John MacFarlane
fe625e053d New method for producing man pages.
This change adds `--man1` and `--man5` options to pandoc, so
pandoc can generate its own man pages.

It removes the old overly complex method of building a separate
executable (but not installing it) just to create the man pages.

The man pages are no longer automatically created in the build
process.

The man/ directory has been removed.  The man page templates
have been moved to data/.

New unexported module:  Text.Pandoc.ManPages.

Text.Pandoc.Data now exports readmeFile, and `readDataFile`
knows how to find README.

Closes #2190.
2015-06-28 14:39:17 -07:00
John MacFarlane
3e5b4faaf2 Version bump to 1.14.1.
Because of the addition of `Options.plainExtensions`.
2015-06-28 11:58:50 -07:00
John MacFarlane
ed9a118b54 Fixed regression in CSS parsing with --self-contained.
In 1b44acf0c5 we replaced some
hackish CSS parsing with css-text, which I thought was a complete
CSS parser.  It turns out that it is very buggy, which results
in lots of things being silently dropped from CSS when
`--self-contained` is used (#2224).

This commit replaces the use of css-text with a small but
more principled css preprocessor, which only removes whitespace
and replaces URLs with base 64 data when possible.

Closes #2224.
2015-06-28 11:54:18 -07:00
Pablo Rodríguez
c18e93ca6e replace old url with pandoc.org 2015-06-09 22:22:58 +02:00
John MacFarlane
70b76bb633 Bump cmark version to >= 0.3.4. 2015-06-08 13:37:11 -07:00
John MacFarlane
bbd429ae70 Version bump to 1.14.0.4, added commonmark template to data files. 2015-06-02 13:23:32 +02:00
John MacFarlane
a367107483 Bump version to 1.14.0.3; updated changelog. 2015-06-01 10:39:00 +02:00
John MacFarlane
a75998ba24 Allow compilation with syb 0.5.*. 2015-05-31 21:18:39 +02:00
John MacFarlane
cb339c7425 Bump to 1.14.0.2, updated changelog. 2015-05-31 14:10:25 +02:00
John MacFarlane
c327b283c1 Allow building with hslua 0.4. 2015-05-31 13:57:14 +02:00
John MacFarlane
b241472a90 Better fix for #2187.
* Reverted kludgy change to make-windows-installer.bat.
* Removed make-reference-fiels.hs.
* Moved the individual ingredients of reference.docx and
  reference.odt to the data directory.
* Removed reference.docx and reference.odt from data directory.
* We now build the reference archives from their ingredient pieces
  in the docx and odt writers, instead of having a reference.docx
  or reference.odt intermediary.

This should fix #2187.

It also simplifies the bulid procedure.

The one thing users may notice is different is that you can
no longer get the reference.docx or reference.odt using
`--print-default-data-file`.  Instead, simply generate a
docx or odt using pandoc with a blank or minimal input,
and use that (or a customized version) with `--reference-docx`
or `--reference-odt`.
2015-05-28 18:15:01 -07:00
John MacFarlane
3b2ca81b8d Added filepath dependency to make-reference-files. 2015-05-28 10:12:37 -07:00
John MacFarlane
43371a96e5 Bump version to 1.14.0.1. 2015-05-28 10:00:20 -07:00
John MacFarlane
a10cf0d080 Don't include generated man pages in extra-source-files.
See 3f20fb3f9f.

Closes #2189.
2015-05-28 09:02:58 -07:00
John MacFarlane
ed43a90259 Bump upper bound for aeson. 2015-05-28 08:46:22 -07:00
John MacFarlane
1daa26468c Require cmark-hs >= 0.3.3 (fixes #2175). 2015-05-26 17:23:32 -07:00
John MacFarlane
21b83a14fa Require highlighting-kate 0.6. 2015-05-26 16:52:33 -07:00
John MacFarlane
e06810499e HTML reader: Support base tag.
We only support the href attribute, as there's no place for
"target" in the Pandoc document model for links.

Added HTML reader test module, with tests for this feature.

Closes #1751.
2015-05-13 20:53:19 -07:00
John MacFarlane
1b44acf0c5 SelfContained: properly handle data URIs in css urls.
Also use a proper css parser (adds dependency on text-css).

Closes #2129.
2015-05-04 16:00:28 -07:00
John MacFarlane
1868cb5e42 Updated copyright notices to -2015. Closes #2111. 2015-04-26 10:18:29 -07:00
RyanGlScott
b65238b412 Bump zlib upper version bounds 2015-04-20 13:52:48 -05: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
Nikolay Yakimov
4b7ddeb63f RST Writer: Tests for rubrics and heading normalization 2015-04-16 19:27:33 +03:00
John MacFarlane
693bc5f50f Bump texmath lower bound to 0.8.1 2015-04-13 21:25:06 -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
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
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
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
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
dd5d3379e8 Require highlighting-kate 0.5.13.
Closes #1903.
2015-03-27 13:45:22 -07:00
John MacFarlane
8b8a613cd4 Bumped upper bounds for filepath, QuickCheck.
Bumped lower bounds for highlighting-kate, texmath.
2015-03-19 11:47:20 -07:00
John MacFarlane
e0d234e54d Added CommonMark reader using cmark (libcmark bindings).
- Added commonmark as an input format.
- Added `Text.Pandoc.Readers.CommonMark.readCommonMark`.
- For now, we use the markdown writer to generate benchmark
  text for the CommonMark reader.  We can change this when we
  get a writer.
2015-03-17 16:15:57 -07:00
John MacFarlane
5721a5d34b Bump criterion version bound. 2015-03-17 16:15:56 -07:00
John MacFarlane
619b2e8ca2 Merge pull request #1968 from lierdakil/issue1607
Fixes for multiple docx writer style bugs.
2015-03-16 12:02:40 -07:00
Nikolay Yakimov
409111f647 Started moving StyleMap out of writer code 2015-03-01 22:57:35 +03:00
RyanGlScott
d649acc146 Bump blaze-html and blaze-markup upper version bounds 2015-02-28 16:55:23 -06:00
Matthew Pickering
8381ac3b02 Add Text.Pandoc.Error module with PandocError type 2015-02-18 21:09:05 +00:00
John MacFarlane
e32227f744 Allow wildcards in --epub-embed-font arguments.
Closes #1939.
2015-02-13 23:34:20 -08:00
Mark Wright
4c9ebf3c2b Allow haddock-library 1.2 2015-01-05 14:15:10 +11:00
John MacFarlane
c30c96b422 Version bump to 1.13.3. 2014-12-26 10:05:31 -07:00
John MacFarlane
ccf081d32c Require latest highlighting-kate and texmath. 2014-12-19 21:41:53 -08:00
John MacFarlane
c6ad01dc69 Added old-locale flag.
This will ease transition to time 1.5.  However, currently we can't
build with time 1.5 because of dependencies.
2014-12-19 17:26:14 -08:00
John MacFarlane
2c3310a592 Added Text.Pandoc.Compat.Locale to assist with transition to time 1.5. 2014-12-19 16:13:38 -08:00