diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2010-11-27 10:52:44 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2010-11-27 10:52:44 -0800 |
| commit | c989bf028fa226acb7b03039d0d77ef1e6a4700e (patch) | |
| tree | 70c5d3af464d52e7d905f1039fdf3c37655ff8ef /pandoc.cabal | |
| parent | f0b7945b2007fa2356f638864ca644bb851b0c18 (diff) | |
| parent | 71c9316a597298415a7d4cb7f758b523ac9339cd (diff) | |
Merge branch 'textile'
Conflicts:
README
man/man1/pandoc.1.md
pandoc.cabal
Diffstat (limited to 'pandoc.cabal')
| -rw-r--r-- | pandoc.cabal | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index c760df2be..ddcb94ee0 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -18,8 +18,8 @@ Description: Pandoc is a Haskell library for converting from one markup this library. It can read markdown and (subsets of) reStructuredText, HTML, and LaTeX, and it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook, - OpenDocument, ODT, RTF, MediaWiki, groff man pages, EPUB, - and S5 and Slidy HTML slide shows. + OpenDocument, ODT, RTF, MediaWiki, Textile, groff man pages, + EPUB, and S5 and Slidy HTML slide shows. . Pandoc extends standard markdown syntax with footnotes, embedded LaTeX, definition lists, tables, and other @@ -43,6 +43,7 @@ Data-Files: templates/rst.template, templates/plain.template, templates/mediawiki.template, templates/rtf.template, templates/s5.template, templates/slidy.template, + templates/textile.template -- data for ODT writer reference.odt, -- stylesheet for EPUB writer @@ -93,6 +94,7 @@ Extra-Source-Files: tests/tables.plain, tests/tables.markdown, tests/tables.mediawiki, + tests/tables.textile, tests/tables.native, tests/tables.opendocument, tests/tables.texinfo, @@ -110,6 +112,7 @@ Extra-Source-Files: tests/writer.markdown, tests/writer.plain, tests/writer.mediawiki, + tests/writer.textile, tests/writer.native, tests/writer.opendocument, tests/writer.rst, @@ -200,6 +203,7 @@ Library Text.Pandoc.Writers.Man, Text.Pandoc.Writers.Markdown, Text.Pandoc.Writers.RST, + Text.Pandoc.Writers.Textile, Text.Pandoc.Writers.MediaWiki, Text.Pandoc.Writers.RTF, Text.Pandoc.Writers.ODT, |