Commit graph

668 commits

Author SHA1 Message Date
John MacFarlane
db936f7233 Allow http-types 0.9. 2015-10-06 09:14:32 -07:00
John MacFarlane
747a7a4cf8 Allow HUnit 1.3 2015-10-03 16:19:53 -07:00
John MacFarlane
0c7d6fbaba Allow syb 0.6. 2015-09-23 12:30:14 -07:00
John MacFarlane
d25a37c122 Allow aeson 0.10. 2015-09-20 13:19:16 -07:00
John MacFarlane
73824908aa Added --bash-completion option.
This generates a bash completion script.

To use:

     eval "$(pandoc --bash-completion)"
2015-08-13 15:27:47 -07:00
John MacFarlane
50dddecb53 Update version to 1.15.1. 2015-08-10 16:38:16 -07:00
John MacFarlane
609c8231da Allow latest criterion version. 2015-08-10 16:02:00 -07:00
John MacFarlane
74c31abb1a Merge pull request #2327 from hftf/list-style
HTML Reader: Correctly parse inline list-style(-type) for <ol>
2015-08-07 11:08:53 -07:00
Ophir Lifshitz
7ef8700734 HTML Reader: Parse <ol> type, class, and inline list-style(-type) CSS 2015-07-24 02:53:17 -04:00
John MacFarlane
2b68f7af15 Updated README and cabal description for ODT reader. 2015-07-23 15:54:18 -07:00
MarLinn
f068093555 Added odt reader
Fully implemented features:

* Paragraphs
* Headers
* Basic styling
* Unordered lists
* Ordered lists
* External Links
* Internal Links
* Footnotes, Endnotes
* Blockquotes

Partly implemented features:

* Citations
  Very basic, but pandoc can't do much more
* Tables
  No headers, no sizing, limited styling
2015-07-23 15:37:01 -07:00
John MacFarlane
0c83c391db Version bump to 1.15.0.6. 2015-07-15 08:58:06 -07:00
John MacFarlane
6c32afc3c4 Updated to use cmark >= 0.4. 2015-07-14 22:51:23 -07:00
John MacFarlane
dce6a7388a Allow vector 0.11. 2015-07-14 09:23:47 -07:00
John MacFarlane
5f730ee804 Version bump to 1.15.0.5 and updated changelog. 2015-07-09 22:50:13 -07:00
John MacFarlane
f1103f8f69 Make cabal require hsb2hs >= 0.3.1.
This is done by adding `hookedPrograms` in `Setup.hs`,
which allows us to include `hsb2hs` in Build-Tools in cabal.
2015-07-05 13:50:10 -07:00
John MacFarlane
79764df2d5 Added pandoc.1 to repository. Don't build as part of cabal build.
The process was too fragile.  It made too many assumptions about
available libraries (which failed sometimes when sandboxes were
used).  This is a low-tech solution.  The only drawback is that
`man/pandoc.1` is a generated file in the repository.  It will need
to be regenerated periodically when README changes.
2015-07-02 22:12:38 -07:00
John MacFarlane
a945d702c0 Bump version to 1.15.0.4. 2015-07-02 20:48:31 -07:00
John MacFarlane
9044229531 Bump version to 1.15.0.3, updated changelog. 2015-07-02 09:32:45 -07:00
John MacFarlane
f30b2d4629 Version bump to 1.15.0.2, updated changelog. 2015-07-02 08:13:28 -07:00
John MacFarlane
dce8dd6e6b Added man page source files to extra-source-files. 2015-07-02 08:01:22 -07:00
John MacFarlane
49da3e70cd Bump version to 1.15.0.1, update changelog. 2015-07-01 18:05:00 -07:00
John MacFarlane
9ffd1babc7 Install man pages as part of cabal 'copy' phase. 2015-07-01 18:01:21 -07:00
John MacFarlane
28cb50503b Generate man page in cabal build process and include in data/.
The pandoc.1 man page is generated automatically after the cabal
build process.  It goes in `data/pandoc.1`.  It can be obtained
by the user who installs pandoc via cabal thus:

    pandoc --print-default-data-file pandoc.1 > pandoc.1
2015-07-01 16:29:44 -07:00
John MacFarlane
a04c15a422 New method for building man pages.
+ Removed `--man1`, `--man5` options (breaking change).
+ Removed `Text.Pandoc.ManPages` module (breaking API change).
+ Version bump to 1.15 because of the breaking changes, even
  though they involve features that have only been in pandoc
  for a day.
+ Makefile target for `man/man1/pandoc.1`.  This uses pandoc to
  create the man page from README using a custom template and filters.
+ Added `man/` directory with template and filters needed to build
  man page.
+ We no longer have two man pages: pandoc.1 and pandoc_markdown.5.
  Now there is just pandoc.1, which has all the content from README.
  This change was needed because of the extensive cross-references
  between parts of the README.
+ Removed old `data/pandoc.1.template` and
  `data/pandoc_markdown.5.template`.
2015-07-01 11:27:15 -07:00
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