Commit graph

139 commits

Author SHA1 Message Date
John MacFarlane
0e6bb176f9 Updated changelog and bumped version to 1.5.0.1. 2010-03-21 22:51:04 -07:00
John MacFarlane
6e498fc727 cabal: included several missing test files. 2010-03-20 14:47:57 -07:00
fiddlosopher
5ae0e0d442 Depend on extensible-exceptions, remove CPP in Templates module.
It's safe to depend on extensible-exceptions, since this is
shipped with GHC 6.10 and 6.12.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1911 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-19 02:33:15 +00:00
fiddlosopher
56217f1004 Added --mathml option; removed Text.Pandoc.LaTeXMathML.
* Added data/MathMLinHTML.js, which is included when no URL is provided
  for --mathml.  This allows MathML to be displayed in better browsers,
  as text/html.
* The module was no longer necessary; its functionality (two lines)
  was incorporated into pandoc.hs.
* Consolidated the two LaTeXMathML.js files into one.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1909 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 06:45:56 +00:00
fiddlosopher
695961155a Added plain writer.
Text.Pandoc.Writers.Markdown now exports a writePlain,
which writes plain text without links, pictures, or
special formatting (not even markdown conventions).

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1907 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 06:45:43 +00:00
fiddlosopher
d7e5bb96a7 cabal: Depend on extensible-exception for GHC < 6.10.
This, I hope, will allow pandoc to be compiled on ghc 6.8
again.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1903 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 02:39:23 +00:00
fiddlosopher
c2ce51e9f5 Cabal file: depend on HTTP >= 4000.0.5.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1870 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-07 19:35:53 +00:00
fiddlosopher
997ea5ea1d Removed html2markdown and hsmarkdown.
html2markdown is no longer needed, since you can pass URI arguments
to pandoc and directly convert web pages. (Note, however, that pandoc
assumes the pages are UTF8. html2markdown made an attempt to guess the
encoding and convert them.)

hsmarkdown is pointless -- a large executable that could be replaced
by 'pandoc --strict'.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1834 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-06 18:55:28 +00:00
fiddlosopher
d6642c322c Bump version to 1.5 since API has changed.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1831 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-03 05:53:49 +00:00
fiddlosopher
9fee73d2a3 Allow absolute URI as parameter (in this case, content is downloaded).
+ Adds dependency on HTTP.
+ If a parameter is an absolute URI, pandoc will try to
  get the content via HTTP.
+ So, you can do:  pandoc -r html -w markdown http://www.fsf.org

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1826 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-02 07:37:01 +00:00
fiddlosopher
00da8f49bf Removed ref to Makefile in cabal file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1819 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 09:10:51 +00:00
fiddlosopher
58f32c1928 Version bump to 1.4.1.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1802 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-10 08:30:21 +00:00
fiddlosopher
dba0b40e2e Removed unneeded dependency on template-haskell.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1791 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-03 08:24:54 +00:00
fiddlosopher
2ae3b9239e Moved data/ui -> s5. Added note on this in README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1763 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-01 01:25:24 +00:00
fiddlosopher
c9b5fa20e6 Updated copyright date in cabal file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1762 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 22:44:08 +00:00
fiddlosopher
ed1535de10 Added --reference-odt option.
This allows the user to customized the styles used in pandoc-generated
ODTs.  The user may also put a default reference.odt in the ~/.pandoc
directory.

We have removed the old data/odt directory and replaced it with a
reference.odt.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1760 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 22:40:59 +00:00
fiddlosopher
9c54354cd7 Make the -fno-warn-unused-do-bind conditional on ghc >= 6.12.
This option isn't recognized by older ghcs.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1753 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 16:48:50 +00:00
fiddlosopher
c8a9cbf911 Revised tested-with field to be more precise.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1751 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 16:48:41 +00:00
fiddlosopher
a37527c501 Added GHC versions to tested-with field in cabal file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1749 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 16:48:26 +00:00
fiddlosopher
c97c099c61 Removed unneeded Extensions from cabal file.
Also disable compiler warnings for discarded values in do blocks.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1746 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 16:48:05 +00:00
fiddlosopher
fdf00ce17e Version bump to 1.4.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1745 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 02:09:43 +00:00
fiddlosopher
225f7dd411 Got s5 writer working with html template.
s5 css and js is included using header-includes variable.
We don't need a separate s5 template, so it has been
removed.

Use linebreak to separate authors in S5 title page.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1705 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:13:41 +00:00
fiddlosopher
b80de325b7 Moved odt-styles -> odt. Changed ODT module to look at user data first.
So if the user has an odt-styles directory in ~/.pandoc, it
will be used instead of the default.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1694 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:11:49 +00:00
fiddlosopher
9eb435d3c1 Removed TH module; refactored LaTeXMathML not to use TH.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1692 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:11:23 +00:00
fiddlosopher
ae44c7297f Removed TH dependency from S5 module, removed DefaultTemplates.
S5 module now exports s5HeaderIncludes, which pandoc.hs
includes if writer is s5 and standalone.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1691 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:11:13 +00:00
fiddlosopher
2b1c010599 Added getDefaultTemplate to Templates.
Exposed Templates module in API.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1688 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:10:49 +00:00
fiddlosopher
8c74cebbfc Added templates/ directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1687 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:10:42 +00:00
fiddlosopher
ca97f1482d Renamed headers -> templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1677 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:09:20 +00:00
fiddlosopher
a42bae619a Added templates module.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1673 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:08:38 +00:00
fiddlosopher
d86c01795f Changed RunTests.hs to use the Diff library.
Previously a copy of Diff.hs was included.  But it is better
to use the compiled, installed version, since speed can be
a problem in some cases.

This change means that 'cabal test' presupposes that the Diff
library is installed.

Removed tests/Diff.hs from cabal file.

Changed RunTests to use local environment.
We need at least HOME, so pandoc can find its data directory.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1672 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:08:30 +00:00
fiddlosopher
2a6803c7b6 Removed reference to html2markdown wrapper in wrapper flag description.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1653 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-07 08:26:22 +00:00
fiddlosopher
8c23996fae Version bump to 1.3 (because of change to ParserState).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1641 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-01 20:35:52 +00:00
fiddlosopher
7c6467a115 Bumped version to 1.2.2 and updated changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1630 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-28 03:22:22 +00:00
fiddlosopher
11867521f7 Version bump to 1.2.1.1.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1625 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-22 18:31:38 +00:00
fiddlosopher
4c387a4bc7 Added markdown2pdf.1 to tmp-files in cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1623 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-22 08:20:51 +00:00
fiddlosopher
f361a743b6 Added upper version limit to base in cabal file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1590 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-07-04 07:27:17 +00:00
fiddlosopher
ccc70f62e4 Version bump to 1.2.1.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1589 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-07-04 07:27:12 +00:00
fiddlosopher
15258f66f0 Fixed duplicate text bug in markdown2pdf.hs. (Paulo Tanimoto)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1582 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-06-25 01:12:07 +00:00
fiddlosopher
541a032e49 Don't install markdown2pdf by default - still has bugs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1581 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-06-17 03:40:45 +00:00
fiddlosopher
cceede4ca2 Added new Haskell version of markdown2pdf.
Thanks to Paulo Tanimoto for the patch.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1573 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-05-01 04:18:14 +00:00
fiddlosopher
490c4304f5 Fixed profiling options.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1569 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-29 19:29:09 +00:00
fiddlosopher
59563e5fb1 Added -caf-all to profiling options.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1566 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-29 19:28:45 +00:00
fiddlosopher
a972a6ccbc Use Paths_pandoc to get version number.
(Instead of hard-coding it into Text/Pandoc.hs.)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1560 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-18 16:15:56 +00:00
fiddlosopher
24cb44ad6c Revert "Require Cabal >= 1.6."
This reverts commit 1823bf615b.
Reason:  This requirement doesn't help, since the problem is in
compiling Setup.hs.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1550 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-26 15:58:32 +00:00
fiddlosopher
1823bf615b Require Cabal >= 1.6.
This is needed for the new test hook, because the
PackageName type is new in 1.6.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1549 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-26 15:56:15 +00:00
fiddlosopher
5f3a147dfd Removed plugin support.
Plugins will probably be added in a later version,
but for now we want to avoid the heavy GHC API dependency.
Also, plugins are very slow with the current system.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1548 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-24 22:59:44 +00:00
fiddlosopher
bb639d5506 Added new lhs tests to cabal file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1547 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-14 18:54:30 +00:00
fiddlosopher
f1c22f3d1a Version bump to 1.2.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1546 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-14 18:30:11 +00:00
fiddlosopher
bdcd54a485 Make wrappers flag False by default.
This can change when we've got haskell versions of all
the wrappers.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1544 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-14 17:24:28 +00:00
fiddlosopher
cdd3b67a05 Rewrote hsmarkdown in Haskell for portability.
For now, keeping the old shell script too.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1533 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-31 18:30:26 +00:00