Commit graph

576 commits

Author SHA1 Message Date
John MacFarlane
7c1d38ac7d Bump version to 1.13 2014-06-16 22:18:01 -07:00
Jesse Rosenthal
cfd5290fc5 Reference new DocX tests in cabal file. 2014-06-16 07:18:52 -04:00
Jesse Rosenthal
7f4668d871 Add files to cabal.
Note there is a build warning for unused `makeImagesSelfContained`
function, since there isn't yet a command-line-option to make use of it.
2014-06-16 07:18:40 -04:00
John MacFarlane
f011d24165 Require aeson >= 0.7.0.5 to avoid build problems. 2014-06-06 22:20:21 -07:00
John MacFarlane
aff6ba921b Require texmath >= 0.6.6.3. Closes #1324.
This fixes \tilde{E}, especially in docx.
2014-06-03 17:17:33 -07:00
John MacFarlane
356a32e938 Version bump to 1.12.5. 2014-06-03 11:02:11 -07:00
John MacFarlane
4552555625 Require latest texmath. Closes #1319.
This allows `\left` to be used with `]`, `)`, etc.
2014-06-02 13:50:58 -07:00
John MacFarlane
e1cf47efa0 Templates: Fail informatively on template syntax errors.
With the move from parsec to attoparsec, we lost good error
reporting.  In fact, since we weren't testing for end of input,
malformed templates would fail silently.  Here we revert back to
Parsec for better error messages.
2014-06-01 23:45:05 -07:00
John MacFarlane
9cf5f74e8f PDF writer: Fixed treatment of data uris for images.
Closes #1062.
2014-05-28 10:41:40 -07:00
John MacFarlane
2d90803b7c Require latest highlighting-kate. Fixes #1317. 2014-05-27 12:12:02 -07:00
John MacFarlane
fd11a5a5eb Require latest zip-archive.
This has fixes for unicode path names.  Note that compiling
pandoc against zip-archive 0.2.3 or 0.2.3.1 will lead to invalid
zip containers, causing LibreOffice (e.g.) to regard ODTs as corrupt.
2014-05-27 11:22:53 -07:00
John MacFarlane
ee8c8da8cc Removed dependency on conduit.
* http-conduit flag is now https.
* Instead of http-conduit, we depend on http-client and http-client-tls.
2014-05-18 22:07:00 -07:00
John MacFarlane
650f831949 travis: Test with ghc 7.8.2 rather than 7.8.1. 2014-05-16 09:50:30 -07:00
Michael Snoyman
46e7bcae69 Allow scientific 0.3 2014-05-16 09:32:24 +03:00
John MacFarlane
8de5daed57 Require highlighting-kate 0.5.8.1.
0.5.8 has a serious bug that causes error failure with ocaml and fsharp.
2014-05-15 12:58:30 -07:00
John MacFarlane
cf533a1c2c Bump version to 1.12.4.2. 2014-05-14 13:46:09 -07:00
John MacFarlane
06edff7402 Added default.icml to data-files so it installs with the package. 2014-05-12 12:30:30 -07:00
John MacFarlane
02b8608aab Version bump to 1.12.4.1. 2014-05-12 12:08:36 -07:00
John MacFarlane
e52196691b Require highlighting-kate >= 0.5.8.
This fixes a performance regression.
2014-05-12 09:21:16 -07:00
Albert Krewinkel
8fdbef841d Update copyright notices for 2014, add missing notices 2014-05-09 00:46:08 +02:00
John MacFarlane
249c3e8c5a Bumped version bound for mtl. 2014-05-07 11:21:04 -07:00
John MacFarlane
b71810d7e6 Require latest texmath. 2014-05-07 11:10:25 -07:00
John MacFarlane
985ba0b32b Require latest highlighting-kate. 2014-05-07 11:09:45 -07:00
John MacFarlane
41c89d51c7 AsciiDoc writer: Added test for empty table cells. 2014-05-03 21:24:20 -07:00
John MacFarlane
7f86f95f36 Require pandoc-types 1.12.3.3.
Fixes #1269.
2014-04-29 22:25:46 -07:00
John MacFarlane
a744e3868e Bump version to 1.12.4. 2014-04-25 20:14:39 -07:00
John MacFarlane
aeec883e0e Merge pull request #1260 from joehillen/tabs-in-cabalfile
change tabs to spaces in pandoc.cabal
2014-04-24 16:48:02 -07:00
John MacFarlane
58c9946cda Bumped upper bounds for http-conduit and network. 2014-04-24 13:16:10 -07:00
John MacFarlane
b08de8fe35 Require aeson >= 0.7. 2014-04-24 11:55:20 -07:00
John MacFarlane
d16775e1c7 Render numbers in YAML metadata without decimals when possible.
The change to aeson > 0.7 caused numbers to be rendered with
decimals.  This change causes them to be rendered without decimals
wehn possible.
2014-04-24 11:09:07 -07:00
Joe Hillenbrand
8b0279b4ac change tabs to spaces in pandoc.cabal 2014-04-22 10:50:22 -07:00
John MacFarlane
d8d4ede4d6 Require yaml >= 0.8.8.2.
Otherwise we have problems with integers being rendered with
decimal points.
2014-04-14 17:06:38 -07:00
John MacFarlane
714d4707b5 Require tagsoup 0.13.1.
This fixes a bug in parsing of script tags.
See #1248.
2014-04-14 17:05:20 -07:00
John MacFarlane
f48b564ac7 Updated GHC versions in tested-with field. 2014-04-10 11:04:05 -07:00
John MacFarlane
9f3f4298dd Moved some doc files from data-files to extra-source-files.
They aren't needed at runtime.

We keep README and COPYRIGHT in data to ensure that they'll be
available on all systems on which pandoc is installed.

Closes #1123.
2014-04-06 15:04:50 -07:00
Sergei Trofimovich
8890c2ba3d pandoc.cabal: allow QuickCheck-2.7
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
2014-04-04 23:49:21 +03:00
John MacFarlane
64a571775d Updated README and pandoc.cabal with icml writer. 2014-03-04 10:29:13 -08:00
John MacFarlane
ae86e24ff6 Merge branch 'master' of https://github.com/mb21/pandoc into mb21-master 2014-03-04 10:15:43 -08:00
John MacFarlane
1046339755 Added org-mode to list of readers in cabal description. 2014-03-04 10:15:04 -08:00
Albert Krewinkel
24b2ac43b0 Add a simple Emacs Org-mode reader
The basic structure of org-mode documents is recognized; however,
org-mode features like todo markers, tags etc. are not supported yet.
2014-03-04 10:40:40 +01:00
mb21
80511f1b34 InDesign ICML Writer 2014-02-28 13:35:35 +01:00
John MacFarlane
19b127b898 PDF: Use ; for TEXINPUTS separator on Windows.
Closes #1151, I hope.  Testing needed.
2014-02-23 20:36:21 -08:00
John MacFarlane
4a84e9691e Version bump to 1.12.3.3.
No changes to source:  just to regenerate tarball with latest alex,
happy, to satisfy GHC 7.8.
2014-02-03 14:08:13 -08:00
John MacFarlane
406c311115 Version bump to 1.12.3.2. 2014-02-03 13:32:50 -08:00
John MacFarlane
dc2c23a25f Bumped version bounds for blaze-html, blaze-markup. 2014-01-27 21:08:56 -08:00
John MacFarlane
a1abb3eeea Allow binary 0.5. Version bump to 1.12.3.1. 2014-01-14 10:13:08 -08:00
John MacFarlane
32c82903f3 Require latest texmath, highlighting-kate. 2014-01-09 23:12:19 -08:00
John MacFarlane
c26fd3556b Relaxed version bounds on attoparsec, text, aeson. 2014-01-09 16:05:20 -08:00
John MacFarlane
5c8c380a79 Better exif parsing, including image resolution.
This introduces a dependency on binary >= 0.6, but we depend
on binary >= 0.5 via zip-archive anyway.

Closes #976.
2014-01-09 11:16:55 -08:00
John MacFarlane
9bd7ed7225 Increase upper bound for text. 2014-01-06 22:35:54 -08:00
John MacFarlane
6ddd9f3239 Increase upper bound on process. 2014-01-06 22:35:06 -08:00
John MacFarlane
452a140d0c Pretty: Added nestle. API change, minor version bump to 1.12.3. 2014-01-02 21:09:39 -08:00
John MacFarlane
3f26a02737 Allow temporary 1.2. 2013-12-26 11:12:37 -08:00
John MacFarlane
26052d3cba Allow zip-archive 0.2. 2013-12-10 10:24:02 -08:00
John MacFarlane
afa88b4a25 Relaxed version bounds for array, http-conduit, process. 2013-12-09 21:07:33 -08:00
John MacFarlane
9673587b38 Version mubp to 1.12.2.1 2013-12-08 14:35:42 -08:00
John MacFarlane
f8b4a9e669 Require texmath >= 0.6.5.2. 2013-11-06 09:26:37 -08:00
John MacFarlane
cf0472a4c6 Version bump to 1.12.2. 2013-11-03 21:24:34 -08:00
John MacFarlane
0d95c15e83 TexMath: Export readTeXMath', which attends to display/inline.
Deprecate readTeXMath, and use readTeXMath' in all the writers.
Require texmath >= 0.6.5.
2013-11-01 14:28:24 -07:00
John MacFarlane
1a2832e96a Bump version to 1.12.1. 2013-10-20 13:43:00 -07:00
John MacFarlane
e2acc46f50 Removed data files for s5, slideous, slidy.
Users of s5 and slideous will have to download the needed
files, as has been documented for some time in the README.

slidy files will be sought on the web, as before.
2013-10-20 13:35:04 -07:00
John MacFarlane
dc853a1cd9 Version bump to 1.12.0.3. 2013-10-19 16:39:57 -07:00
John MacFarlane
f37fa15518 Require pandoc-types 1.12.3.
This will enforce a certain JSON encoding.
2013-10-15 22:53:03 -07:00
John MacFarlane
627c54011b Revert "Setup.hs: Better way of handling man page building."
This reverts commit ed061b91c8.
2013-10-08 20:52:56 -07:00
John MacFarlane
ed061b91c8 Setup.hs: Better way of handling man page building.
Previously we tried to remove make-pandoc-man-pages from the list
of packages to be haddocked, installed, copied, etc.

It works better to set 'Buildable: False' on make-pandoc-man-pages,
then have the buildHook temporarily set Buildable to True.  This
allows make-pandoc-man-pages to be built (and used in generating
the man pages), but not installed.
2013-10-06 18:04:18 -07:00
John MacFarlane
d6ccebdb2c Require pandoc-types >= 1.12.2.2. 2013-10-01 22:50:02 -07:00
John MacFarlane
3081fce90e Require pandoc-types >= 1.12.2. 2013-09-29 11:19:04 -07:00
John MacFarlane
f9430e995e Bump version to 1.12.0.2 and update changelog. 2013-09-20 20:31:43 -07:00
John MacFarlane
1b42093890 Removed stringable as a dependency. IT is not used. 2013-09-20 20:30:36 -07:00
John MacFarlane
6a2ca0b295 Version bump to 1.12.0.1. 2013-09-20 10:30:46 -07:00
John MacFarlane
652f9a88f4 Handle Boolean values in --metadata.
Note that anything not parseable as a YAML boolean or string
is treated as a literal string.

Note that you can still get a string value with "yes" or any
of the strings interpretable as booleans:

    -M boolvalue=yes -M stringvalue='"yes"'
2013-09-19 20:21:35 -07:00
John MacFarlane
32afe85754 Allow --metadata to be repeated for the same key to form a list.
This also has the effect that `--bibliography` can be repeated,
as before.
2013-09-17 21:04:27 -07:00
John MacFarlane
c04d243795 Depend on pandoc-types 1.12.1. 2013-09-17 08:34:43 -07:00
John MacFarlane
2b2d0064be Declare alex and happy as build-tools.
Closes #986.
2013-09-16 08:10:53 -07:00
John MacFarlane
c2960d9ded Fixed a couple test files in cabal file. 2013-09-09 22:15:19 -07:00
John MacFarlane
53f61019e2 Added --metadata/-M option.
This is like `--variable/-V`, but actually adds to metadata, not
just variables.
2013-09-01 15:40:28 -07:00
John MacFarlane
4e4c948b41 Added markdown citation parsing test. 2013-08-26 22:30:27 -07:00
John MacFarlane
152d2919ab Removed tests relating to citation processing. 2013-08-25 07:41:37 -07:00
John MacFarlane
deb59b6235 Removed dependency on citeproc-hs.
Going forward we'll use pandoc-citeproc, as an external filter.

The `--bibliography`, `--csl`, and `--citation-abbreviation` fields
have been removed.  Instead one must include `bibliography`, `csl`,
or `csl-abbrevs` fields in the document's YAML metadata.  The filter
can then be used as follows:

    pandoc --filter pandoc-citeproc

The `Text.Pandoc.Biblio` module has been removed.  Henceforth,
`Text.CSL.Pandoc` from pandoc-citations can be used by library users.

The Markdown and LaTeX readers now longer format bibliographies and
citations.  That must be done using `processCites` or `processCites'`
from Text.CSL.Pandoc.

All bibliography-related fields have been removed from `ReaderOptions`
and `WriterOptions`: `writerBiblioFiles`, `readerReferences`,
`readerCitationStyle`.

API change.
2013-08-24 22:33:01 -07:00
John MacFarlane
74250b6c35 Moved most of Text.Pandoc.Readers.TeXMath to texmath 0.6.4. 2013-08-24 16:10:13 -07:00
John MacFarlane
70386a6a54 Removed scripts directory.
This has been put in its own github repo:
https://github.com/jgm/pandoc-filters-python
2013-08-18 15:37:27 -07:00
John MacFarlane
caa89efc32 Added scripts/deflists.py to filter examples. 2013-08-16 20:57:34 -07:00
John MacFarlane
3e8bd8aa15 Updated for removed unMeta, unFormat in pandoc-types. 2013-08-14 23:24:45 -07:00
John MacFarlane
6f736dfa75 Added Tests.Walk.
This verifies that walk and query match the generic traversals.
2013-08-10 19:04:15 -07:00
John MacFarlane
99bb066bb9 Pass writename as argument to filters.
This way filters can figure out what the target format is
and react appropriately.

Example:

    #!/usr/bin/env runghc
    import Text.Pandoc.JSON
    import Data.Char

    main = toJSONFilter cap
      where cap (Just "html") (Str xs) = Str $ map toUpper xs
            cap _ x = x

This capitalizes text only for html output.
2013-08-08 15:15:58 -07:00
John MacFarlane
7d694e1569 Added Text.Pandoc.Process (pipeProcess).
A souped up version of readProcessWithErrorCode that uses lazy bytestrings
and allows setting environment.
2013-08-08 15:15:12 -07:00
John MacFarlane
2677e84663 Revert "Revert "Added --filter option.""
This reverts commit 2e5edbb278.
2013-08-08 11:09:00 -07:00
John MacFarlane
12e7ec4070 Added Text.Pandoc.Compat.TagSoupEntity.
This allows pandoc to compile with tagsoup 0.13.x.
Thanks to Dirk Ullrich for the patch.
2013-08-08 10:42:52 -07:00
John MacFarlane
802dc9a8b9 Added Text.Pandoc.Compat.Monoid.
This allows pandoc to compile with base < 4.5, where Data.Monoid
doesn't export `<>`.  Thanks to Dirk Ullirch for the patch.
2013-08-08 10:41:39 -07:00
John MacFarlane
b1be9cfaef Require latest version of texmath.
Closes #935.
2013-08-05 18:41:33 -07:00
John MacFarlane
2d6e0b1530 Remove CPP from default-extensions; add pragmas to modules as needed. 2013-08-04 14:12:13 -07:00
John MacFarlane
a24409d43e pandoc.cabal: Removed support for ghc version < 7.2.
There is no point to supporting them, since pandoc-types
requires at least ghc 7.2 for GHC generics.
2013-08-03 16:44:54 -07:00
John MacFarlane
2e5edbb278 Revert "Added --filter option."
This reverts commit 85dacbb282.
2013-07-23 23:17:07 -07:00
John MacFarlane
85dacbb282 Added --filter option.
This makes it easier to use JSON filters.  Instead of
doing

    pandoc -t json | ./filter | pandoc -f json

you can just do

    pandoc --filter ./filter
2013-07-23 23:02:47 -07:00
John MacFarlane
7f15d888f6 Require highlighting-kate 0.5.5.
0.5.4 has a serious memory leak that affects the mandoc parser.
See highlighting-kate#34.
2013-07-22 16:14:47 -07:00
Clare Macrae
7eded47bcd Initial work to create dokuwiki writer (#386)
In this first version, all dokuwiki files are straight copies of the
media wiki counterparts.
2013-07-14 13:40:27 +01:00
John MacFarlane
ed714b1b52 cabal: Added http-conduit flag, which allows fetching https resources.
It also brings in a large number of dependencies (http-conduit and its
dependencies), which is why for now it is an optional flag.

Closes #820.
2013-07-04 23:13:37 -07:00
John MacFarlane
e973bbbbc8 Markdown reader: Better error messages for yaml headers. 2013-07-02 09:23:43 -07:00
John MacFarlane
956425709d Created Text.Pandoc.Writers.Shared, improved metaToJSON.
* Text.Pandoc.Writers.Shared contains shared functions used
  only in writers.
* metaToJSON now takes a WriterOptions parameter, and will
  return an empty object if standalone is not specified.
2013-07-01 20:47:26 -07:00
John MacFarlane
f939dbdcc5 Require highlighting-kate 0.5.4. 2013-06-26 20:53:38 -07:00