Commit graph

345 commits

Author SHA1 Message Date
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
Mark Wright
471d4dc502 changes for blaze-html 0.5 2012-04-23 19:53:04 +10:00
John MacFarlane
b6d530d876 Merge pull request #491 from mb21/patch-1
Added link, code and info elements to DocBook Reader
2012-04-20 10:30:34 -07:00
Simon Hengel
16694e3134 Allow mtl-2.1.* 2012-04-15 16:31:36 +02:00
John MacFarlane
d339b29967 Added skeleton of basic docbook reader. 2012-04-14 16:44:21 -07:00
John MacFarlane
c05a390c67 Version bump to 1.9.2. 2012-04-01 21:14:25 -07:00
John MacFarlane
68503311cc Bumped version bound for test-framework. 2012-03-15 11:18:41 -07:00
Sergei Trofimovich
b7c13f1645 pandoc.cabal: fix typo in zlib's upper bound '<= 0.6' should be '< 0.6'
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
2012-03-10 13:24:25 +03:00
John MacFarlane
6787cf2fbf Bump version to 1.9.1.2. 2012-03-09 09:30:32 -08:00
John MacFarlane
5c30bce6e8 Version bump to 1.9.1.1. 2012-02-11 13:35:53 -08:00
John MacFarlane
ddd3e067d2 Added two needed gifs to the data files for s5.
ALso removed sildes.min.js, which was no longer being used.
2012-02-10 11:08:59 -08:00
John MacFarlane
ef5dcae211 Require texmath >= 0.6.0.2. 2012-02-08 14:33:17 -08:00
John MacFarlane
421b362b99 Require h-k 0.5.0.2. 2012-02-08 11:14:53 -08:00
John MacFarlane
11e1e2b922 Version bump to 1.9.1.
(Due to new field in ParserState introduced in last commit.)
2012-02-07 22:47:07 -08:00
John MacFarlane
535f52b196 Version bump to 1.9.0.5. 2012-02-06 13:51:34 -08:00
John MacFarlane
c0cb852265 cabal: Put build-depends for tests under conditional.
Otherwise even those who don't build with the tests flag need
to have dependencies like test-framework.

This restores the old behavior; I wrongly assumed that by now cabal
was smart enough not to bring in build-depends for components with
Buildable = False.
2012-02-06 13:49:56 -08:00
John MacFarlane
408f975e47 Version bump to 1.9.0.4, updated changelog. 2012-02-06 12:49:13 -08:00
Conal Elliott
857552f85e Relaxed version upper bound for test-framework from < 0.5 to < 0.6, since 0.5 is the first version on Hackage that builds under GHC 7.4.1. 2012-02-06 10:26:36 -08:00
John MacFarlane
abf5df9fa8 More cabal tweaks, default to Haskell98 for ghc 6.12 compatibility. 2012-02-06 08:10:56 -08:00
John MacFarlane
47f9a7daf8 Version bump to 1.9.0.3. 2012-02-06 08:07:53 -08:00
John MacFarlane
e13ad49f0d cabal changes required by version >= 1.10. 2012-02-06 08:07:17 -08:00
John MacFarlane
4f76f9f6e5 Require cabal version >= 1.10.
This is needed for ghcPackageDbOptions in Setup.hs.
2012-02-06 07:05:40 -08:00
John MacFarlane
0e85ac299a Bump version to 1.9.0.2. 2012-02-05 23:38:15 -08:00
John MacFarlane
8173625059 Allow json 0.4.
Otherwise we can't compile on ghc 6.12.
2012-02-05 23:37:45 -08:00