Commit graph

768 commits

Author SHA1 Message Date
John MacFarlane
e883ef4eb9 Merge pull request #1527 from mpickering/juicypixels
Attempts to convert gif, tiff and bmp to png in pdf writer
2014-08-12 16:57:22 -07:00
Matthew Pickering
57bebe26df PDF Writer: Attempts to convert images to pdf renderable formats
Now depends on the JuicyPixels library.

Will attempt to convert an image (gif, tiff, bmp) to png when converting
to pdf.
2014-08-13 00:37:18 +01:00
Matthew Pickering
063ba81622 EPUB Tests: Added wasteland test
This epub contains many epub:type elements including footnotes and
titlepage.
2014-08-13 00:25:18 +01:00
Jesse Rosenthal
0808449547 Docx: Add dropcap tests. 2014-08-11 23:10:50 -04:00
John MacFarlane
7ec953e31b Require zip-archive 0.2.3.4, with normalized path comparison. 2014-08-11 12:13:32 -07:00
Matthew Pickering
f33ae631f3 Improved EPUB Tests
Rewrote features test to remove all unimplemented features.

There are now all three examples of where an image can be included in
the test.
  1. Cover image
  2. As a spine elemnt
  3. In the document

Tests have also been added to make sure that the mediabag contains all
these images after processing.
2014-08-10 14:58:53 +01:00
John MacFarlane
7ec8dd956f Removed OMath module, depend on texmath >= 0.8. 2014-08-10 06:19:41 -07:00
Matthew Pickering
edc57f77fc Added Text.Pandoc.Readers.Docx.Fonts 2014-08-09 22:37:12 -04:00
John MacFarlane
10b662c120 EPUB test renaming.
Renamed epub test files so they're identified more clearly as
epub:  features.{epub,native} -> epub.features.{epub,native},
and similarly with formatting.{epub,native}.

Added epub test files to cabal file, so they'll be included in
the tarball.
2014-08-07 22:25:06 -07:00
John MacFarlane
17e48ba81e Merge pull request #1494 from jkr/math-module
Math module
2014-08-07 13:44:19 -07:00
Jesse Rosenthal
98d14b2b2a Docx reader: Test inline image code. 2014-08-07 15:34:49 -04:00
Jesse Rosenthal
a7967d1aef Docx reader: Split math out into math module.
Could use some cleanup, but this is the first step for getting
an OMML reader into TeXMath.
2014-08-07 12:20:22 -04:00
Jesse Rosenthal
cdd769624f Remove now-unnecessary TexChar
TeXMath does the work now.
2014-08-06 11:20:41 -04:00
John MacFarlane
4630cff2a6 Merge branch 'epubend' of https://github.com/mpickering/pandoc into mpickering-epubend
Conflicts:
	pandoc.cabal
2014-08-04 07:36:18 -07:00
Artyom Kazak
f6cf8e8b4b Add plain writer testing module to .cabal file. 2014-08-03 18:32:31 +04:00
John MacFarlane
cbaaa17d49 Bump aeson upper bound. 2014-08-02 15:14:15 -07:00
Matthew Pickering
8460ea417f EPUB Reader: Integrated into program 2014-07-31 21:39:50 +01:00
Jesse Rosenthal
ed71e9b31d Docx tests: rewrite mediabag tests.
This will allow us to test the whole mediabag (making sure, for example,
that images are added with the correct keys) instead of just individual
extracted images. We compare each entry in the media bag to an image
extracted on the fly from the docx. As a result, we only need one file
to test with.

The image in the current tests was also replaced with a smaller one.
2014-07-31 15:47:45 -04:00
John MacFarlane
6dd2418476 New module, Text.Pandoc.MediaBag.
Moved `MediaBag` definition and functions from Shared:
`lookupMedia`, `mediaDirectory`, `insertMedia`, `extractMediaBag`.
Removed `emptyMediaBag`; use `mempty` instead, since `MediaBag`
is a Monoid.
2014-07-31 12:00:21 -07:00
Jesse Rosenthal
16f88edb3b Docx tests: Added media test comparison function.
Also tell pandoc.cabal that we'll be needing base64, since we want to
compare strings here.
2014-07-30 22:31:38 -04:00
Jesse Rosenthal
54708da371 Add and update docx tests in pandoc.cabal. 2014-07-29 13:05:19 -04:00
Matthew Pickering
9e4604fa0b Added compatability layer to support directory-1.1 2014-07-27 00:36:23 +01:00
Matthew Pickering
00cb9836b8 Txt2Tags Reader: Updated README and package description 2014-07-27 00:12:57 +01:00
Matthew Pickering
e340a7da02 Txt2Tags Reader: Added tests 2014-07-27 00:12:57 +01:00
Matthew Pickering
7d04d383a6 Added txt2tags reader
http://txt2tags.org/

There are two points which currently do not match the official
implementation.

1. In the official implementation lists can not be nested like the
following but the reader would interpret this as a bullet list with the
first item being a numbered list.

```
  - + This is not a list
```

2. The specification describes how URIs automatically becomes links.
Unfortunately as is often the case, their definitiong of URI is not
clear. I tried three solutions but was unsure about which to adopt.

* Using isURI from Network.URI, this matches far too many strings and is
therefore unsuitable
* Using uri from Text.Pandoc.Shared, this doesn't match all strings that
the reference implementation matches
* Try to simulate the regex which is used in the native code

I went with the third approach but it is not perfect, for example
trailing punctuation is captured in Urls.
2014-07-27 00:12:56 +01:00
John MacFarlane
999b952a21 Require highlighting-kate >= 0.5.8.5. 2014-07-19 17:16:41 -07:00
John MacFarlane
047f9b3714 Merge pull request #1430 from jkr/anchor-fix-2
Fix auto identified headers when already auto-id'ed
2014-07-15 20:27:28 -07:00
John MacFarlane
454d0e4d85 Require highlighting-kate 0.5.8.4.
For correct highlighting of identifiers in prolog and other languages.
2014-07-15 13:31:31 -07:00
Jesse Rosenthal
643435f1de Docx reader: Add test
Test auto ident header anchors with pandoc-generated pandoc.
2014-07-15 18:32:19 +01:00
Jesse Rosenthal
fe2eda9d54 Docx Reader: Add a compatibility layer for Except.
mtl switched from ErrorT to ExceptT, but we're not sure which mtl we'll
be dealing with. This should make errors work with both.

The main difference (beside the name of the module and the monad
transformer) is that Except doesn't require an instance of an Error
Typeclass. So we define that for compatability. When we switch to a
later mtl, using Control.Monad.Exception, we can just erase the instance
declaration, and all should work fine.
2014-07-12 18:04:06 +01:00
John MacFarlane
7d9136edbb Minor line wrapping. 2014-07-07 16:20:18 -06:00
John MacFarlane
616cf6c539 Merge branch 'dokuwiki' of https://github.com/claremacrae/pandoc into claremacrae-dokuwiki 2014-07-07 16:15:35 -06:00
Jesse Rosenthal
9f4bacf86f Docx Reader: Add new file, TexChar.
This will allow us to deal with unicode characters from word equations. This
part of the process will need to continue to be improved.
2014-07-02 16:53:28 -04:00
Clare Macrae
717e16660d Merge remote-tracking branch 'jgm/master' into dokuwiki 2014-06-29 19:22:31 +01:00
John MacFarlane
b2127311cb Require haddock-library >= 1.1 and simplify haddock reader code.
See #1346.
2014-06-26 12:35:13 -07:00
Jesse Rosenthal
8517a4f2e5 Add Reducible to cabal file. 2014-06-23 17:08:17 -04:00
John MacFarlane
84391a887d Require highlighting-kate >= 0.5.8.3.
This change to highlighting-kate means that PHP fragments no longer
need to start with `<?php`.  Closes #1271.
2014-06-19 11:52:58 -07:00
John MacFarlane
cf15b929f8 Added haddock writer tests. 2014-06-18 17:55:21 -07:00
John MacFarlane
0d364a284d Added haddock template. 2014-06-18 17:49:32 -07:00
John MacFarlane
35e57db5c2 Finished first draft of Haddock writer. 2014-06-18 17:09:36 -07:00
John MacFarlane
ab390a10ec Removed old haddock reader code. Add dependency on haddock-library.
This also removes the dependency on alex and happy.
2014-06-18 11:33:09 -07:00
John MacFarlane
bbe99003f8 Naming: Use Docx instead of DocX.
For consistency with the existing writer.
2014-06-16 22:44:40 -07:00
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
John MacFarlane
f869f7e08d Use new flexible metadata type.
* Depend on pandoc 1.12.
* Added yaml dependency.
* `Text.Pandoc.XML`: Removed `stripTags`.  (API change.)
* `Text.Pandoc.Shared`:  Added `metaToJSON`.
  This will be used in writers to create a JSON object for use
  in the templates from the pandoc metadata.
* Revised readers and writers to use the new Meta type.
* `Text.Pandoc.Options`: Added `Ext_yaml_title_block`.
* Markdown reader:  Added support for YAML metadata block.
  Note that it must come at the beginning of the document.
* `Text.Pandoc.Parsing.ParserState`:  Replace `stateTitle`,
  `stateAuthors`, `stateDate` with `stateMeta`.
* RST reader:  Improved metadata.
  Treat initial field list as metadata when standalone specified.
  Previously ALL fields "title", "author", "date" in field lists
  were treated as metadata, even if not at the beginning.
  Use `subtitle` metadata field for subtitle.
* `Text.Pandoc.Templates`:  Export `renderTemplate'` that takes a string
  instead of a compiled template..
* OPML template:  Use 'for' loop for authors.
* Org template: '#+TITLE:' is inserted before the title.
  Previously the writer did this.
2013-06-24 20:29:41 -07:00
John MacFarlane
e32a8f5981 Revised Text.Pandoc.Templates to accept JSON contexts.
Currently the library is set up with a shim for association
lists, for compatibility, but this can change when the writers
are changed.

New export: `varListToJSON`.

Removed `Empty`.

Simplified template type to a newtype.
2013-06-24 20:27:37 -07:00
John MacFarlane
5f4a32e465 Use aeson for json.
Benchmarked:  about twice as slow as json!
2013-06-24 20:27:37 -07:00
John MacFarlane
b664068221 Set default stack size to 16M.
This is needed for some large conversions, esp. if pandoc
is compiled with 64-bit ghc.
2013-05-29 12:29:38 -07:00
John MacFarlane
f42ffcb710 Bump upper bound for criterion. 2013-05-07 20:42:38 -07:00
John MacFarlane
fa978e1365 Use latest highlighting-kate and texmath.
Closes #849.
2013-05-07 20:22:09 -07:00
John MacFarlane
9d01c45b01 Version bump to 1.11.2. 2013-05-01 12:54:19 -07:00
John MacFarlane
26fefa040a PDF: On Windows, create temdir in working directory.
Reason:  the path to the system temp directory may contain tildes,
which causes problems in LaTeX when the username is more than
eight characters.

Closes #777.
2013-04-26 20:36:06 -07:00
John MacFarlane
cecceee0d3 Added Text.Pandoc.Asciify utility module.
This has functions to create ascii-only versions of identifiers.
2013-04-23 20:10:24 -07:00
John MacFarlane
7d7bc2cb79 Added CONTRIBUTING.md. 2013-04-14 20:42:01 -07:00
John MacFarlane
4fa2a94759 Added Text.Pandoc.Writers.Custom, --print-custom-lua-writer.
pandoc -t data/sample.lua

will load the script sample.lua and use it as a custom writer.
data/sample.lua is provided as an example.

Added `--print-custom-lua-writer` option to print the sample
script.
2013-04-14 00:31:39 -05:00
John MacFarlane
0b85ad7546 Added stubs for haddock reader tests.
Modify tests/haddock-reader.haddock and
tests/haddock-reader.native.
2013-03-28 15:58:09 -07:00
John MacFarlane
5a20f3a9c3 Mention haddock reader in cabal description. 2013-03-28 15:31:15 -07:00
David Lazar
18459b95ba Add reader for Haddock markup based on Haddock's own lexer/parser. 2013-03-28 14:53:10 -07:00
John MacFarlane
ba1e74dcd7 Removed blaze_html_0_5 flag, require blaze-html >= 0.5.
Reason:  < 0.5 does not provide a monoid instance for Attribute,
which is now needed by the HTML writer.

Closes #803.
2013-03-26 11:38:50 -07:00
John MacFarlane
942b7b8f9c Slidy: Use slidy.js rather than slidy.js.gz.
Reason:  some browsers have trouble with the gzipped js file,
at least on the local file system.

Closes #795.
2013-03-25 19:48:42 -07:00
John MacFarlane
572457f8a9 Documented revealjs in README and pandoc.cabal description. 2013-03-23 21:48:39 -04:00
John MacFarlane
6b4a72f633 Added default.revealjs template to cabal file. 2013-03-23 21:31:15 -04:00
John MacFarlane
5b4d239b85 Added OPML template, tests.
Minor fixes to OPML writer.
Improved OPML reader tests.
2013-03-20 10:17:59 -07:00
John MacFarlane
69acb47a34 Added Text.Pandoc.Writers.OPML.
TODO:

* Document in README
* Add tests
* Add template (and add template to cabal file)
2013-03-19 22:49:44 -07:00
John MacFarlane
74d53f4347 Added Text.Pandoc.Readers.OPML, exporting readOPML.
The _note attribute is supported.  This is unofficial, but
used e.g. in OmniOutliner and supported by multimarkdown.
We treat the contents as markdown blocks under a section
header.

Added to documentation and tests.
2013-03-19 20:22:14 -07:00
John MacFarlane
cae52ecc31 Revert "LaTeX reader: citation handling changes."
This reverts commit f7229b1473.
2013-03-17 08:48:29 -07:00
John MacFarlane
0e40355059 Version bump to 1.11.1. 2013-03-16 15:55:43 -07:00
John MacFarlane
762258b233 Version bump to 1.11.0.1. 2013-03-16 15:48:34 -07:00
John MacFarlane
6e8209f6b2 Bumped QuickCheck version bound. 2013-03-16 15:32:54 -07:00
John MacFarlane
f7229b1473 LaTeX reader: citation handling changes.
Previously, a LaTeX citation would always be parsed as a Citation
element, with the raw LaTeX in the [Inline] part.

Now, the LaTeX citation is parsed as a Citation element only if
`--biblio` was specified (i.e. only if there is a nonempty set
of references in readerReferences).  Otherwise it is parsed as
raw LaTeX.

This will make it possible to simplify some things in the markdown
writer.  It also makes the LaTeX reader behave more like the Markdown
reader.
2013-03-09 10:33:25 -08:00
John MacFarlane
4e2e088feb Bump syb version to < 0.5. 2013-03-06 13:06:35 -08:00
John MacFarlane
3b63cb0903 Hide Text.Pandoc.Highlighting.
* Moved code for translating listings language names to
  highlighting-kate names and back from LaTeX reader to Highlighting.
* Text.Pandoc.Highlighting no longer exposed (API change)
* Text.Pandoc.Highlighting exports toListingsLang, fromListingsLang
2013-03-05 22:09:42 -08:00
John MacFarlane
fd657986cc pandoc.cabal: Require latest h-k, texmath, citeproc-hs, zip-archive.
Pandoc will compile with older versions, but there will be bugs
relating to these functions.  Making the current versions dependencies
is the only way to get packages updated in the distros.
2013-03-04 17:15:51 -08:00
John MacFarlane
9453995cbf Allow compilation with blaze-html 0.6. 2013-02-19 18:45:41 -08:00
John MacFarlane
1a22709ff9 Increased upper bound for Diff. 2013-02-13 08:20:02 -08:00
John MacFarlane
6d95984626 Version bump to 1.11, Text.Pandoc.Parsing no longer exposed. 2013-02-12 20:14:43 -08:00
John MacFarlane
55fed3ca9c Version to 1.10.1.1 since we no longer have API change. 2013-02-09 19:07:27 -08:00
John MacFarlane
78759cfd42 Revert "Hide module Text.Pandoc.Parsing."
This reverts commit 18a5c9a8bf.

We want to do this eventually, but as it requires a major version
bump, let's wait til later.
2013-02-09 19:04:55 -08:00
John MacFarlane
1aa74199cf Revert "Hide module Text.Pandoc.Highlighting."
This reverts commit 01753ead71.

We need it after all in pandoc.hs.
2013-02-05 19:34:08 -08:00
John MacFarlane
4cff7ba817 Version bump to 1.11 due to API changes. 2013-02-05 19:27:55 -08:00
John MacFarlane
01753ead71 Hide module Text.Pandoc.Highlighting.
This is really an auxiliary module.
2013-02-05 19:07:59 -08:00
John MacFarlane
18a5c9a8bf Hide module Text.Pandoc.Parsing. 2013-02-05 19:06:33 -08:00
John MacFarlane
f3b1b8e720 Version bump to 1.10.1. 2013-01-28 10:54:34 -08:00
John MacFarlane
0bc9b0679b Increased ansi-terminal upper bound. 2013-01-25 12:37:45 -08:00
John MacFarlane
bd645d9ae5 Relaxed old-time version bound, allowing 1.0.*.
I see no reason for the restriction, which requires a recent
Haskell Platform.

The module is only used in make-pandoc-man-pages anyway.
2013-01-25 11:24:52 -08:00
John MacFarlane
e97b8ae946 Version bump to 1.10.0.5. 2013-01-23 19:39:07 -08:00
John MacFarlane
fe337b07f7 Use hsb2hs preprocessor instead of TH for embed_data_files.
This should work on Windows, unlike the TH solution with
file-embed.
2013-01-23 19:26:39 -08:00
John MacFarlane
daeb52d4e0 Eliminated use of TH in test suite. 2013-01-23 19:26:39 -08:00
John MacFarlane
9c299d282f Added Text.Pandoc.Data (non-exported) if embed_data_files selected.
This module just exports the association list of embedded data files,
which is used by Shared.
2013-01-23 19:26:39 -08:00
John MacFarlane
b4232fdbda Updated tested-with in cabal file. 2013-01-21 14:05:36 -08:00
John MacFarlane
93c9a1c167 Version bump to 1.10.0.4. 2013-01-20 19:25:42 -08:00
John MacFarlane
00fe1dba31 Bump version to 1.10.0.3; added further missing fb2 tests.
Updated changelog.
2013-01-20 10:19:08 -08:00
John MacFarlane
155a312a83 Version bump to 1.10.0.2. 2013-01-20 09:43:37 -08:00
John MacFarlane
8c8aadecf4 Added fb2 tests to extra-source-files.
Otherwise we get an error in `cabal install --enable-tests`
from Hackage.
2013-01-20 09:43:11 -08:00
John MacFarlane
31b282d422 Bump version to 1.10.0.1. 2013-01-20 08:47:20 -08:00
John MacFarlane
346edea8c2 Bump version bounds on test-framework packages. 2013-01-20 08:46:51 -08:00
John MacFarlane
492268a984 Updated copyright date in pandoc.cabal. 2013-01-19 16:44:03 -08:00
John MacFarlane
e1225643bb Removed -O2.
The benchmark differences between -O2 and the default
were so slight that it's not worth it.  (Measured with ghc 7.4.)
2013-01-19 16:29:18 -08:00
John MacFarlane
08ce073de5 Removed unneeded -dno-debug-output from ghc-options 2013-01-19 16:15:24 -08:00
John MacFarlane
e3ccff1f2d Removed MakeManPages from cabal extra-files. 2013-01-19 16:01:16 -08:00
John MacFarlane
d599c4cdab Added Attr field to Header.
Previously header ids were autogenerated by the writers.
Now they are generated (unless supplied explicitly) in the
markdown parser, if the `header_identifiers` extension is
selected.

In addition, the textile reader now supports id attributes on
headers.
2013-01-09 09:30:05 -08:00
John MacFarlane
0675346e76 Fixed test suite to use Diff 0.2 API. 2013-01-02 11:41:22 -08:00
John MacFarlane
2e43980a67 Fixed bytestring upperbounds (0.11, not 1.0). 2012-12-31 14:34:02 -08:00
John MacFarlane
547ad7fd1b Require file-embed >= 0.0.4.7.
This fixes a bug with embedDir on Windows:  previously
forward slashes were used as path separators.
2012-12-30 15:51:04 -08:00
John MacFarlane
2f984b6074 Moved all data files and templates to data/. 2012-12-29 18:14:29 -08:00
John MacFarlane
1864bb0994 Data files changes.
* Added `embed_data_files` flag.  (not yet used)
* Shared no longer exports `findDataFile`.
* `readDataFile` now returns a strict bytestring.
* Shared now exports `readDataFileUTF8` which returns a string like
  the old `readDataFile`.
* Rewrote modules to use new data file functions and to avoid
  using functions from Paths_pandoc directly.
2012-12-29 17:54:07 -08:00
John MacFarlane
32c5a8e2dc Cabal file changes.
* Remove executable and library flags.
* Expose `Text.Pandoc.XML` and `Text.Pandoc.Biblio`.
* Depend on pandoc library in executable, so we don't recompile
  everything.
* Move pandoc.hs from src/ to .
2012-12-29 16:43:22 -08:00
John MacFarlane
5914be88a8 EPUB writer: Rationalized templates.
* Previously there were three different templates involved in
  epub production. There is now just one template, default.epub
  or default.epub3.
* It can now be overridden using `--template`, just like other
  templates.
2012-11-04 21:21:57 -08:00
John MacFarlane
83b326b005 EPUB: removed need for separate epub-titlepage template.
The titlepage stuff is now folded into the epub-page template.
A titlepage variable selects it.
2012-11-04 21:08:40 -08:00
John MacFarlane
a7b8351d43 EPUB writer: Removed need for separate epub-coverpage template.
The standard epub-page template is now used.
2012-11-04 20:53:41 -08:00
John MacFarlane
0c5801297d Added epub3 to cabal description 2012-11-04 10:40:11 -08:00
John MacFarlane
06300e59d5 Removed citationSuppressParens.
Makefile: Use citeproc-0.3.6 release.
2012-10-28 09:36:15 -07:00
John MacFarlane
d89b74a003 Bumped version bound for template-haskell. 2012-10-21 14:11:03 -07:00
John MacFarlane
b3ad94bde9 Moved man page creation out of Setup.hs.
* MakeManPage.hs has been transformed into
  man/make-pandoc-man-pages.hs.
* There is now a cabal stanza for this, so the dependencies are
  handled by cabal.
* Special treatment in Setup.hs ensures that this never gets installed;
  it is built and used to create the man pages.
* Setup.hs cleaned up.
2012-10-15 21:26:24 -07:00
John MacFarlane
91c547a0c6 Don't expose Text.Pandoc.Biblio.
It's no longer necessary for library users, as bibliography
processing occurs in readMarkdown and readLaTeX.
2012-10-13 11:36:29 -07:00
John MacFarlane
946764ccf7 Bumped versions of json and base64-bytestring dependencies.
Thanks to Dirk Ullirch.
2012-09-30 11:53:18 -07:00
John MacFarlane
83ad8982e1 Make blaze_html_0_5 default to True. 2012-09-30 11:53:00 -07:00
John MacFarlane
6ad7ac1239 Removed need for utf8-string package.
* Depend on text.
* Expose Text.Pandoc.UTF8.
* Text.Pandoc.UTF8 now exports toString, fromString,
  toStringLazy, fromStringLazy.
* These are used instead of the old utf8-string functions.
2012-09-25 19:54:21 -07:00
John MacFarlane
3e302bf651 Added base dependencies for test suite. 2012-09-23 13:45:23 -07:00
John MacFarlane
07793b6b7f Require base >= 4.2 (i.e. GHC 6.12). 2012-09-23 12:57:05 -07:00
Ben Gamari
bb4ea9d422 Bump network upper bound to <2.5
network 2.4 is now on hackage
2012-09-21 09:31:52 -04:00
Ben Gamari
77ccdf59f5 Bump directory upper bound to <1.3
directory-1.2 is in ghc 7.6
2012-09-21 09:30:42 -04:00
Ben Gamari
92c7029492 Bump containers upper bound to <0.6
Since containers 0.5 is in the wild as of ghc 7.6
2012-09-21 09:29:23 -04:00
John MacFarlane
3d361b2101 Added basic mediawiki reader.
Text.Pandoc.Readers.MediaWiki module,
tests/mediawiki-reader.{txt,native}.
2012-09-12 09:05:10 -07:00
John MacFarlane
dfa4b76630 Changes to literate haskell options.
- Removed writerLiterateHaskell from WriterOptions.
- Removed readerLiterateHaskell from ReaderOptions.
- Added Ext_literate_haskell to Extensions.  Test for this
  instead of the above.
- Removed failUnlessLHS from Shared.

Note:  At this point, +lhs and .lhs extension no longer has any effect.
Need to fix.
2012-08-08 23:18:19 -07:00
John MacFarlane
7cfec2bcd9 Require pandoc-types 1.10.*. 2012-08-07 22:48:48 -07:00
John MacFarlane
f4c7ad6caf Revert "Require Cabal 0.14."
This reverts commit f6cc63de41.

Older versions of cabal supposedly just ignore the benchmark
stanza.
2012-07-26 11:51:37 -07:00
John MacFarlane
f6cc63de41 Require Cabal 0.14. 2012-07-26 11:09:25 -07:00
John MacFarlane
786d01fd1d Bump version to 1.10. 2012-07-26 10:02:27 -07:00
John MacFarlane
acbb4a5e46 Integrated test suite with cabal.
To run tests, configure with --enable-tests, then 'cabal test'.
You can specify particular tests using --test-options='-t markdown'.

No output is shown unless tests fail.  In the future, we can move
to the detailed-1.0 interface.
2012-07-26 09:43:27 -07:00
John MacFarlane
c414a08bcf Integrated benchmark into cabal.
Can now do:

cabal configure --enable-benchmarks && cabal build
cabal bench --benchmark-option='markdown' --benchmark-option='-s 20'
2012-07-26 09:19:40 -07:00
John MacFarlane
45e4c123a4 Moved tests to tests/, modified cabal file so lib isn't recompiled. 2012-07-26 08:37:36 -07:00
John MacFarlane
0d21b8d6ae Added Text.Pandoc.Options. 2012-07-25 10:18:57 -07:00
John MacFarlane
d2cc56a46a Revised code for pipe tables.
* All tables now require at least one body row.
* Renamed from 'extra' to 'pipe' tables.
* Moved functions from Parsing to Readers.Markdown.
* Cleaned up code; revised to parse in one pass rather than
  parsing a raw string, splitting it, and parsing the components.
* Allow pipe tables without pipes on the ends (as PHP Markdown Extra
  does).
2012-07-22 22:09:15 -07:00
John MacFarlane
5a704ecc6e Renamed tests/markdown-tables -> tests/extra-tables.
Added to cabal file.
2012-07-22 19:28:56 -07:00
John MacFarlane
40e123173b Added Text.Pandoc.Writers.FB2 to list of exported modules.
Also added FB2 to description.
2012-07-22 11:14:07 -07:00
John MacFarlane
2351f7a112 Provide Data.Default instances for ParserState and WriterOptions.
Now you can use def (which is re-exported by Text.Pandoc) instead of
defaultParserState or defaultWriterOptions.  For now, these
are still defined too, so existing code need not change.

Closes #546.
2012-07-19 12:38:54 -07:00
John MacFarlane
a5db424665 Removed -threaded from cabal ghc-options.
Use of the threaded runtime imposes a slight performance penalty,
and there is really no need for it, since pandoc doesn't run faster
on multiple cores.
2012-07-02 16:29:11 -07:00
John MacFarlane
11aea4bd3f Remove -threaded in library stanza. 2012-06-28 19:36:35 -07:00
John MacFarlane
f75f3392ef Bump version to 1.9.4.2. 2012-06-27 15:54:02 -07:00
John MacFarlane
38f933356f Use -rtsopts and -threaded. 2012-06-27 15:25:35 -07:00
Alexander V Vershilov
cf4db74400 fixing exported test modules and files 2012-06-25 03:00:16 +04:00
John MacFarlane
b606e93050 Bumped version to 1.9.4.1. 2012-06-08 10:48:13 -07:00
John MacFarlane
fbefdd040b Version bump to 1.9.4. 2012-05-31 19:29:13 -07:00
John MacFarlane
81be8fbf77 Merge pull request #521 from jonassmedegaard/master
Slidy lang support, and new Slideous writer
2012-05-30 18:21:26 -07:00
John MacFarlane
d0d2edd854 Require highlighting-kate >= 0.5.1.
This is required for proper highlighted inline code in LaTeX.
Closes #527.
2012-05-29 20:58:58 -07:00
Jonas Smedegaard
61f8dd4da8 Add support for Slideous output. 2012-05-24 10:31:18 +02:00
John MacFarlane
1f222b78c8 Require highlighting-kate 0.5.0.6. 2012-05-17 18:38:33 -07:00
John MacFarlane
bde18a4fc7 Updated cabal description to include docbook reader. 2012-05-12 20:24:09 -07:00
John MacFarlane
858bf197fe Revert "Removed blaze_html_05 flag -- require blaze >= 0.5 by default."
This reverts commit f67a80cea2.
2012-05-10 09:13:14 -07:00
John MacFarlane
95a6b93f5a Version bump to 1.9.3. 2012-05-01 22:59:20 -07:00
John MacFarlane
f67a80cea2 Removed blaze_html_05 flag -- require blaze >= 0.5 by default. 2012-04-24 19:34:53 -04:00