Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
4145 commits 2 branches 0 tags 65 MiB
Commit graph

442 commits

Author SHA1 Message Date
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
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
John MacFarlane
e2c157f86f Removed module Text.Pandoc.CharacterReferences. 
Moved characterReference parser to Text.Pandoc.Parsing.
decodeCharacterReferences is now replaced by fromEntities
in Text.Pandoc.XML.
 2012-02-05 22:52:00 -08:00
John MacFarlane
0a89f124e6 Removed 'nohl' variants of tests from pandoc.cabal. 2012-02-05 22:23:48 -08:00
John MacFarlane
8a2db77de2 Tightened version bounds for pandoc-types, json. 2012-02-05 22:22:10 -08:00