Commit graph

117 commits

Author SHA1 Message Date
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
fiddlosopher
5a9e3b7445 Renamed Main.hs -> pandoc.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1531 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-31 17:13:30 +00:00
fiddlosopher
155809d220 Added TemplateHaskell to Extensions for executable, removed -threaded for library.
Thanks to duncan.coutts for the bug report.  Resolves Issue #121.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1529 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-25 17:55:47 +00:00
fiddlosopher
42aca57dee Moved all haskell source to src subdirectory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1528 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 20:00:26 +00:00
fiddlosopher
066e1cfe90 Moved some Extra-Source-Files to Data-Files.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1520 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 19:58:14 +00:00
fiddlosopher
874c3e0dea Added a plugin system, based on hint.
+ In Text.Pandoc.Definition, added processIn, processInM,
  and queryIn, and deprecated processPandoc and queryPandoc
  for these more general functions, which are useful in writing
  plugins.

+ Added module Text.Pandoc.Plugins.

+ Added a --plugins option to Main, and code to run the parsed pandoc
  document through all the plugins.

+ Provided five sample plugin files in the plugins/ directory.

+ Documented --plugin in the pandoc man page and README.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1519 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 19:58:06 +00:00
fiddlosopher
243008242d Brought citeproc support up to date for citeproc-hs-0.2.
(Patch by Andrea Rossato.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1518 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-29 22:45:18 +00:00
fiddlosopher
3a6bfd75cb Added Bug-Reports field to cabal file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1516 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-23 02:57:00 +00:00
fiddlosopher
035f0ff917 Conditionally depend on syb and base >= 4 if ghc >= 6.10.
Resolves Issue #109.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1496 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-01 04:54:29 +00:00
fiddlosopher
e5c28b37c2 Removed package-URL field from cabal file.
This pointed to an old version, and isn't really needed since the
cabal file comes with the source bundle.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1495 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-01 04:54:23 +00:00
fiddlosopher
95efec1e62 Updated location of odt-styles in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1488 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-06 17:12:02 +00:00
fiddlosopher
2ed83d7921 Version bump to 1.1.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1473 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-30 01:03:06 +00:00
fiddlosopher
51a58987b3 Bump version to 1.0.0.2.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1463 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-16 01:00:59 +00:00
fiddlosopher
d0fe8dcae0 Add BUGS to files in tarball.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1461 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-16 01:00:42 +00:00
fiddlosopher
2483d5ff5b Bumped version to 1.0.0.1.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1449 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-14 03:15:59 +00:00
fiddlosopher
087e4457d2 pandoc.cabal: Removed most upper-bounds on dependency versions.
Reason:  Upper bounds may cause problems for package managers, since
many package management systems do not (like Cabal) allow multiple
versions of libraries to be installed simultaneously.  At this point
very few packages in HackageDB use upper bounds.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1436 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-10 21:57:45 +00:00
fiddlosopher
8c182d4d99 Use versioned dependencies in pandoc.cabal, following guidelines in
<http://www.haskell.org/haskellwiki/Package_versioning_policy>.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1435 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-10 21:39:58 +00:00
fiddlosopher
e7cc9b26db Version bump to 1.0.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1434 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-10 21:39:50 +00:00
fiddlosopher
08ba270027 pandoc.cabal: removed COPYING from Extra-Source-Files;
it is already included under License-File.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1431 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-09 23:12:45 +00:00
fiddlosopher
000b89c718 Use Data.List's 'intercalate' instead of custom 'joinWithSep'.
+ Removed joinWithSep definition from Text.Pandoc.Shared.
+ Replaced joinWithSep with intercalate
+ Depend on base >= 3, since in base < 3 intercalate is not included.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1428 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-08 06:36:28 +00:00
fiddlosopher
4dca8f6e75 Reworked Text.Pandoc.ODT to use zip-archive instead of calling external 'zip'.
+ Removed utf8-string and xml-light modules, and unneeded content.xml.
+ Removed code for building reference.odt from Setup.hs.
  The ODT is now built using template haskell in Text.Pandoc.ODT.
+ Removed copyright statements for utf8-string and xml modules,
  since they are no longer included in the source.
+ README: Removed claim that 'zip' is needed for ODT production.
+ Removed dependency on 'zip' from debian/control.
+ Text.Pandoc.Shared: Removed withTempDir, added inDirectory.
+ Added makeZip to Text.Pandoc.TH.
+ pandoc.cabal: Added dependencies on old-time, zip-archive, and utf8-string.
  Added markdown2pdf files to extra-sources list.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1417 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-04 02:51:28 +00:00
fiddlosopher
3d2ff3d0a8 Removed PDF writer from core pandoc, restored markdown2pdf.
+ Added markdown2pdf.
+ Removed Text/Pandoc/PDF.hs.
+ Removed references to PDF writer from Main.hs.
+ Removed references to PDF writer from pandoc.cabal.
+ Added markdown2pdf.1 to list of man pages in Setup.hs.
+ Added markdown2pdf.1.md man page source.
+ Added reference to markdown2pdf(1) in pandoc man page.
+ Added markdown2pdf to WRAPPERS in Makefile.
+ Removed mention of pdf writer from README; added markdown2pdf.
+ Added remarks on markdown2pdf dependencies to README.Debian.
+ Added markdown2pdf to web/index.txt.in.
+ Use markdown2pdf for pdf web demos.
+ Put markdown2pdf back into debian control and rules.
+ Added markdown2pdf to macports Portfile.
+ Added markdown2pdf to freebsd package.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1415 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-27 05:50:26 +00:00
fiddlosopher
d00da31622 Simplified and improved UTF8 handling:
+ Removed utf8-string cabal configuration flag.
+ Instead, we just include System.IO.UTF8 and Codec.Binary.UTF8.String
  from utf8-string package in the source tree, avoiding a dependency
  on utf8-string and avoiding crufty custom UTF8 code. (The old
  Text.Pandoc.UTF8 had problems with the getContents function.)
+ Removed lots of CPP directives that are no longer needed.
+ In Setup.hs, use '-i..' in running RunTests.hs, so the local UTF8
  code will be found.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1411 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-14 01:32:54 +00:00