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

405 commits

Author SHA1 Message Date
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
John MacFarlane
6c449b5cf0 Bump highlighting-kate version. 2012-02-05 17:35:56 -08:00
John MacFarlane
4dec972cfe Remove dependency on dlist. 
Use sequence in Pretty instead.
 2012-02-05 14:25:12 -08:00
John MacFarlane
ff18deae44 Added 6.12.1 to list of tested-with ghc versions. 2012-02-05 13:27:06 -08:00
John MacFarlane
9bf32a7554 Don't use -rtsopts unless ghc >= 7.0.1. 2012-02-05 12:14:34 -08:00
John MacFarlane
1fc57ed250 Depend on parsec 3 - for applicative instances used in LaTeX reader. 
This is okay now that parsec 3 is the standard version in the Haskell
platform, and the speed issues have been addressed.
 2012-02-04 19:38:51 -08:00
John MacFarlane
ccd61a5372 Bumped xml version to >= 1.3.12. 2012-01-31 09:48:42 -08:00
John MacFarlane
928b1380f3 Change copyright date. 2012-01-31 08:59:19 -08:00
John MacFarlane
34801acc69 Added default.beamer template (separate from default.latex). 2012-01-30 11:26:04 -08:00
John MacFarlane
f437827b0c Remove dependency on old-time. 2012-01-28 16:04:35 -08:00
John MacFarlane
3a0b3df007 Put date in YYYY-MM-DD format if possible for HTML, docx metadata. 
Added normalizeDate to Text.Pandoc.Shared.
 2012-01-28 15:54:34 -08:00
John MacFarlane
3a8afc119a Depend on highlighting-kate 0.5. 
This uses styleToCss instead of styleToHtml.
 2012-01-25 11:29:42 -08:00
John MacFarlane
64de5194b7 Added Text.Pandoc.Slides. 2012-01-22 19:58:45 -08:00
John MacFarlane
1d615908c2 Removed markdown2pdf and documentation. 2012-01-20 21:22:51 -08:00
John MacFarlane
9d1118ac1f Added Text.Pandoc.PDF - converts latex to PDF. 2012-01-20 18:57:16 -08:00
John MacFarlane
ba81cda7f1 Added Docx writer. 
* New module `Text.Pandoc.Docx`.
* New output format `docx`.
* Added reference.docx.
* New option `--reference-docx`.

The writer includes support for highlighted code blocks
and math (which is converted from TeX to OMML using
texmath's new OMML module).
 2012-01-19 12:10:49 -08:00
John MacFarlane
51365b3b36 Added Text.Pandoc.ImageSize. 
This is intened for use in docx and odt writers, so the size
of image boxes can be calculated.
 2012-01-14 11:42:35 -08:00
John MacFarlane
4daf471920 Split html template into html, html5 templates. 2012-01-11 12:53:43 -08:00
John MacFarlane
31fb776c32 DZSlides: Added dzslides/template.html. 
This is the unaltered file from the dzslides repository.
Pandoc now reads it, looking for the core part, and includes
this in the new dzslides template via the 'dzslides-core'
variable.

When dzslides is updated, you can just put the new
template.html in your `~/.pandoc/dzslides` directory,
and things should work -- provided the core part can
be identified as everything from

    <!-- {{{{ dzslides core

to the end of the file.

This should make it a bit easier to keep up to date.
 2011-12-29 17:41:06 -08:00
John MacFarlane
c20d4e86be Updated 'Tested-With' field. 2011-12-22 22:25:57 -08:00
Antoine Latter
1c854ea5c3 tests: update package description to build with GHC 7.4 2011-12-22 17:24:24 -05:00
Antoine Latter
08e8adaf01 Update build depends for GHC 7.4 2011-12-22 16:49:14 -05:00
John MacFarlane
fca95bf43c Removed highlighting flag. Highlighting support is now standard. 2011-12-22 13:24:43 -08:00
John MacFarlane
5ff7f81b85 Restore xhtml style self-closed tags in HTML writer. 
This requires blaze-html >= 0.4.3.0.
 2011-12-20 11:26:10 -08:00
John MacFarlane
fba4f1f37e EPUB: Added customizable templates for epub pages. 
epub-page.html, epub-coverimage.html, epub-titlepage.html.
 2011-12-18 12:33:44 -08:00
John MacFarlane
89c962a18c Use blaze-html instead of xhtml for HTML generation. 
* This is a breaking API change for `writeHtml`.
* It introduces a new dependency on blaze-html.
* Pandoc now depends on highlighting-kate >= 0.4, which
  also uses blaze-html.
* The --ascii option has been removed, because of differences
  in blaze-html's and xhtml's escaping.
* Pandoc will no longer transform leading newlines in code
  blocks to `<br/>` tags.
 2011-12-17 22:46:03 -08:00
John MacFarlane
78816497f3 Use pandoc-types 1.9.*. 2011-12-13 14:29:07 -08:00
John MacFarlane
bab0c333a0 Added -rtsopts to profiling options. 2011-12-13 14:28:57 -08:00
John MacFarlane
fc4d46517c Depend on tagsoup >= 12.5. 
This has a fix needed for the --self-contained option to work properly.
 2011-12-04 15:58:05 -08:00
John MacFarlane
fb5f9a90f1 New slidy directory for "self-contained." 2011-12-03 22:10:18 -08:00
John MacFarlane
38fbfed35e Bump version constraint on HTTP. 2011-12-03 21:35:39 -08:00
John MacFarlane
eb0424a892 Allow to build against highlighting-kate 0.3. 2011-12-01 20:00:57 -08:00
John MacFarlane
479a0a56d7 Update version bound for highlighting-kate. 2011-11-28 10:27:39 -08:00
John MacFarlane
fa3fe2d93d Version bump to 1.9. 
We need to increment the second digit, since we removed an entire
module (S5) from the API.
 2011-11-21 15:26:50 -08:00
John MacFarlane
21d74289ce Removed Text.Pandoc.S5 -- no longer needed. 2011-11-21 15:26:11 -08:00
John MacFarlane
10b23e85b7 Changed Offline module to SelfContained, offline to makeSelfContained. 2011-11-21 15:09:42 -08:00
John MacFarlane
99f2ae2805 Added missing s5 files to data-files in pandoc.cabal. 2011-11-20 12:47:05 -08:00
John MacFarlane
6aa9f521ea Depend on zlib (for Offline). 2011-11-20 12:05:01 -08:00