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

652 commits

Author SHA1 Message Date
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
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
John MacFarlane
24d8961d05 Added Text.Pandoc.Offline module. 2011-11-19 00:20:00 -08:00
John MacFarlane
1561d51cc5 Renamed to AsciiDoc. Fixed display math and escapes. 
AsciiDoc does not seem to have consistent escaping rules.
 2011-11-18 21:09:49 -08:00
John MacFarlane
1a3b7abd18 Spelling correction. 2011-11-18 19:57:29 -08:00
John MacFarlane
fc1c17b174 Added an asciidoc writer (partial). 
Still TODO:

- documentation in README
- add default.asciidoc to templates/
- lists
- tables
- proper escaping
- footnotes with blank lines - print separately at end?
  currently they are just ignored.
- fix header (date gives weird result on pandoc README)
 2011-11-16 19:14:55 -08:00
John MacFarlane
5c1c818501 Require citeproc-hs >= 0.3.4. 2011-11-09 13:23:59 -08:00
John MacFarlane
8c588a98c6 Revert "Added built man pages to repository." 
This reverts commit eac1fc3750.
 2011-10-23 18:26:50 -07:00
John MacFarlane
eac1fc3750 Added built man pages to repository. 
In general I don't like adding generated content to the repository,
but I also want to make it possible to clone the repository and
'cabal install'.  THe current system with Setup.hs calling
MakeManPage.hs is too fragile.
 2011-10-23 18:24:19 -07:00
John MacFarlane
9b37c9cc35 Added dzslides output option. 
* Added DZSlides to HTMLSlideVariant.
* Added support for dzslides in HTML writer.
* Added dzslides template.
 2011-10-01 23:02:24 -07:00
Antoine Latter
9804e0aa20 relax some version constraints in the package description 2011-09-02 17:49:21 -05:00
John MacFarlane
f1c33c2958 Revert "Workaround for linker errors in macosx + ghc 7.0.3." 
This reverts commit 54520c4e6f.
 2011-08-18 12:12:45 -07:00
John MacFarlane
54520c4e6f Workaround for linker errors in macosx + ghc 7.0.3. 2011-08-18 10:48:14 -07:00
John MacFarlane
f9f3c195f7 Relax version bounds for pandoc-types to 1.8.*. 2011-08-01 10:53:00 -07:00
John MacFarlane
70b8d2b130 Bump version to 1.8.2.1 2011-08-01 10:52:57 -07:00
Sergei Trofimovich
bbebbe6349 .cabal: extend test-framework dep range up to <0.5 
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
 2011-07-31 10:39:09 +03:00
John MacFarlane
7fc4bd3d6e Added Tests.Writers.Markdown in cabal file. 2011-07-30 20:46:09 -07:00
John MacFarlane
9071026938 Updated tested-with field. 2011-07-30 19:43:50 -07:00
John MacFarlane
4919b49f1c Depend on same version of pandoc-types as citeproc-hs, for now. 2011-07-28 15:42:39 -07:00
John MacFarlane
7b4c1b171c Use data: protocol to embed s5 css in <link> tags. 
Using inline css didn't work properly with Chrome and Safari.
 2011-07-24 11:36:54 -07:00
John MacFarlane
d5e0c449bd Use yuicompressor-packed js for s5. 
Removed s5/default/slides.js.comment,
s5/default/slides.js.packed. Added s5/default/slides.min.js.
 2011-07-24 09:27:08 -07:00
John MacFarlane
fa16e31f89 Fixed slidy css. 
* Use non-minimized version of `slidy.css` with `--offline` option,
  so users can more easily edit it.
* Fixed bug in slidy css that prevented proper centering of title.
 2011-07-24 09:08:11 -07:00
John MacFarlane
d7793d6649 Version bump to 1.8.2. 
Reason:  new naming scheme for templates may require users
to rename default templates they have put in ~./pandoc/templates.
A template named FORMAT.template should be renamed default.FORMAT.
 2011-07-22 22:52:26 -07:00
John MacFarlane
fd34dcba85 Changed default template naming scheme. 
Instead of latex.template, we now have default.latex.

An appropriate extension is added automatically if the value of
`--template` has no extension.  So, `pandoc --template=special -t latex`
looks for `special.latex`, while `pandoc --template=special -t man`
looks for `special.man`.
 2011-07-22 22:49:38 -07:00
John MacFarlane
581ec74a18 Version bump to 1.8.1.3. 2011-07-22 13:20:49 -07:00
John MacFarlane
1c28c5308f Added unexported Text.Pandoc.MIME. 
Moved getMimeType from Text.Pandoc.Shared to Text.Pandoc.MIME,
so we won't have an API change.
 2011-07-19 12:01:20 -07:00
John MacFarlane
fd46f610e3 Version bump to 1.8.1.2. 2011-07-16 10:13:04 -07:00
John MacFarlane
39811e6d9f Changed to github issue tracker. 2011-06-09 18:12:12 -07:00
John MacFarlane
1ee0640c52 Bump version to 1.8.1.1 & update changelog. 2011-02-13 08:56:45 -08:00
John MacFarlane
d9c824c2cc Version bump to 1.8.1. 2011-02-13 08:35:02 -08:00
John MacFarlane
df58e478fc Updated copyright. 2011-02-05 10:39:21 -08:00
John MacFarlane
9277d89bdd Bumped version to 1.8.0.3; updated changelog; fixed source-repository. 2011-02-05 10:38:25 -08:00
John MacFarlane
1d8c2d36a7 Added Source-repository to cabal file. 2011-02-05 10:34:55 -08:00
John MacFarlane
00bba468ea Version bump to 1.8.0.2. 2011-02-05 10:25:43 -08:00
John MacFarlane
5dce199ff7 Added 6.10.4 to list of GHC versions test (MacPorts). 2011-02-01 07:43:21 -08:00
John MacFarlane
3068f8ad15 Version bump to 1.8.0.1. 2011-01-31 09:34:51 -08:00
John MacFarlane
c2998f5e90 Require non-buggy zip-archive 0.1.1.7. 2011-01-30 13:53:14 -08:00
John MacFarlane
f911bae39e Depend on citeproc >= 0.3.1. 2011-01-30 08:26:52 -08:00
John MacFarlane
3b5dbe6fdb Added HTML writer tests for inline code. 2011-01-29 16:26:00 -08:00
John MacFarlane
9e89047518 Depend on highlighting-kate >= 0.2.9. 
This is needed for highlighting of inline code.
 2011-01-29 15:24:48 -08:00
John MacFarlane
570d8ff08c Moved tests to src. 2011-01-29 11:24:16 -08:00
John MacFarlane
fbf166b6c3 Updated tested-with field of cabal file. 2011-01-29 10:57:55 -08:00
John MacFarlane
0833daff4a Added Tests.Shared with normalize round-trip tests. 2011-01-29 10:03:24 -08:00
John MacFarlane
d8c9b0c6f7 Added biblatex citation tests to Tests.Readers.LaTeX. 
Removed old biblatex-citations.latex.
 2011-01-29 09:01:30 -08:00
John MacFarlane
7961208aaf Added natbib citation tests to Tests.Readers.LaTeX. 
Removed old tests/natbib-citations.latex.
 2011-01-29 08:47:00 -08:00
John MacFarlane
8c435578d6 Refactored man pages. 
* Markdown syntax description from README now goes in pandoc_markdown.5.
* Refactored man page construction functions, putting more of
  the work in MakeManPages.hs.
 2011-01-28 12:02:26 -08:00
John MacFarlane
219573eed2 Moved manpage.template -> man/man1/pandoc.1.template. 2011-01-28 09:15:29 -08:00
John MacFarlane
0acf774011 Added Tests.Readers.Markdown. 2011-01-26 22:09:09 -08:00
John MacFarlane
f8dca6ccbc Add support for attributes in inline Code. 
Additional related changes:

* URLs in Code in autolinks now use class "url".
* Require highlighting-kate 0.2.8.2, which omits the final <br/> tag,
  essential for inline code.
 2011-01-26 20:44:25 -08:00
John MacFarlane
066cbbad76 Added RST reader tests. 2011-01-26 17:23:56 -08:00
John MacFarlane
c5384a33c0 Updates for compiling with ghc 7. 
We now use a CPP trick to have compatible quasiquotes that
work in both GHC 6.12 and 7.
 2011-01-26 17:23:56 -08:00
John MacFarlane
bd43c0f4c9 Bumped version to 1.8; depend on pandoc-types 1.8. 
The old TeX, HtmlInline and RawHtml elements have been removed
and replaced by generic RawInline and RawBlock elements.

All modules updated to use the new raw elements.
 2011-01-26 17:22:53 -08:00
John MacFarlane
87aaa7e719 Use ANSI color to point to diffs in test output. 
ConTeXt writer bullet list test set to break as an example.
 2011-01-22 14:58:32 -08:00
John MacFarlane
61c0647d49 Depend on latest QuickCheck2. 2011-01-22 13:39:36 -08:00
John MacFarlane
373d05601a Added native writer tests. 2011-01-22 12:37:19 -08:00