Commit graph

1613 commits

Author SHA1 Message Date
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
becf01b7af Updated changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1761 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 22:43:12 +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
bdd448ea2c LaTeX writer: Only require listings package if needed.
That is, if literate Haskell code is used.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1759 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 21:18:36 +00:00
fiddlosopher
07fe1aedd0 Removed old data/templates directory.
Templates are now in templates/.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1758 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 21:18:26 +00:00
fiddlosopher
e72b85ce38 Updated changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1757 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 21:18:19 +00:00
fiddlosopher
c882232e94 Fuller discussion of Templates in README and man page.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1756 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 21:18:13 +00:00
fiddlosopher
445f89b9f2 Added windows package build intsructions in windows makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1755 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 17:19:32 +00:00
fiddlosopher
957f4b9524 Added needed imports from System.IO when we're using ghc >= 6.12.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1754 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 16:48:55 +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
9c48ee2ad2 Removed unneeded import from RunTests.hs
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1752 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 16:48:45 +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
ca2bbafbb9 Removed redundant imports (found by ghc 6.12).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1750 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 16:48:36 +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
aab574f9ef Use System.IO.UTF8 only if ghc < 6.12.
GHC >= 6.12 (base >= 4.2) uses iconv to convert to unicode
Strings.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1748 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 16:48:21 +00:00
fiddlosopher
1b3d5896c7 Removed unneeded LANGUAGE pragmas.
(CPP is enabled globally in the cabal file.)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1747 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 16:48:14 +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
709de16223 Use UTF8 instead of entities in HTML.
Resolves Issue #163.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1744 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 02:06:52 +00:00
fiddlosopher
e620eab478 HTML footnotes: put anchor inside sup, instead of other way.
Resolves Issue #191.  Thanks to infinity0x for suggesting.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1743 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:47:08 +00:00
fiddlosopher
c5735511eb Changed Setup.hs so it can build man pages again.
Problem was that it couldn't find the man template until
the data files were installed.  Fixed by using --template
to point it at the right file in the source directory.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1742 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:47:00 +00:00
fiddlosopher
6bab230357 Updated lhs tests.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1741 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:18:35 +00:00
fiddlosopher
f9408319d9 Updated latex writer tests to conform to recent changes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1740 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:18:27 +00:00
fiddlosopher
a2860f6fac markdown2pdf.hs: interpret ! in a log as an error line.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1739 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:18:20 +00:00
fiddlosopher
ade6d8a3fe Modified latex template to include bare minimum of packages.
Packages will be included only if they are needed, given what
is in the document.  So if you never use strikeout, you don't
need to install the ulem package.

Also moved amsmath to the top of the package list, made
\maketitle conditional on a title being present, and
adjusted spacing.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1738 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:18:14 +00:00
fiddlosopher
ffed5c1cc3 Added --xetex option to pandoc and markdown2pdf.
If --xetex is specified, pandoc produces latex suitable for
processing by xelatex, and markdown2pdf uses xelatex to create
the PDF. Resolves Issue #185.

This seems better than using latex packages to detect xetex,
since not all latex installations will have these.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1737 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:18:06 +00:00
fiddlosopher
b867109830 Modified mediawiki writer to use new templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1736 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:17:55 +00:00
fiddlosopher
3f53d6f270 Updated texinfo writer to use new templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1735 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:17:45 +00:00
fiddlosopher
cc6294c4f2 Modified RTF writer to use new templates.
Also changed treatment of multiple authors: they now occupy
multiple paragraphs rather than using a line break.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1734 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:17:36 +00:00
fiddlosopher
87537c3ff8 Revised man writer to use new templates.
Note that now the "--after-body" will come after the "AUTHORS"
section, whereas before it would come before it.  This is a
slight break from backwards compatibility.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1733 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:17:27 +00:00
fiddlosopher
bf42fa1f54 Indented and line-broke styles.xml so it can be modified more easily.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1732 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:17:18 +00:00
fiddlosopher
e0ab935353 Opendocument writer: support new templates.
Also, don't generate unneeded style declarations.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1731 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:17:12 +00:00
fiddlosopher
9eb4107af9 Don't wrap text in OpenDocument writer.
The tags are so long that it's pointless.
Use <> instead of $$ to prevent huge indents.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1730 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:17:02 +00:00
fiddlosopher
2a9ac1e65a Context and latex writers - parse title, author, date before body.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1729 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:16:55 +00:00
fiddlosopher
7dc43d3684 Updated docbook writer to use new templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1728 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:16:44 +00:00
fiddlosopher
998fb9820e LaTeX reader: use \\ to separate multiple authors.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1727 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:16:34 +00:00
fiddlosopher
54dda0ff9e Markdown reader: use ; as separator between authors.
This allows you to use ',' within author names:
e.g. "John Jones, Jr."

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1726 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:16:27 +00:00
fiddlosopher
312d9337b9 Improved RST writer.
Updated test suite.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1725 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:16:19 +00:00
fiddlosopher
f4e738a6a9 Fixed bug with $else$ in templates module.
We need to be sure we parse the else block even if the
if condition is satisfied.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1724 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:16:08 +00:00
fiddlosopher
dd210437f6 Use $for$ for multiple authors in context, latex, markdown.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1723 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:16:00 +00:00
fiddlosopher
fbef848a3a Use $for$ for header-includes.
Put variables in right order.  We've specified that if they
use -A, -B, -H multiple times, the text appears in the same
order as on the command line.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1722 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:15:50 +00:00
fiddlosopher
7baa79597e Use $for$ for --css option in HTML writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1721 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:15:42 +00:00
fiddlosopher
5ba6c0911c Added $for$ to template system.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1720 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:15:33 +00:00
fiddlosopher
16f0604bec Use separate title, author, date variables in markdown template.
This allows us to simplify the writer code and gives the
user more control.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1719 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:15:24 +00:00
fiddlosopher
60cb80b459 Revised documentation for templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1718 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:15:15 +00:00
fiddlosopher
0535396290 Don't set "standalone" variable.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1717 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:15:08 +00:00
fiddlosopher
44db4b3295 Added docbook template.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1716 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:15:03 +00:00
fiddlosopher
d35f34fb44 Fixed RST writer to use new templates.
Use stHasMath instead of stIncludes.

This gives the user more control over how the math
directive is defined.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1715 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:14:57 +00:00
fiddlosopher
89952782c3 Markdown template - added space after header includes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1714 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:14:48 +00:00
fiddlosopher
780df052f6 Made an import more specific.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1713 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:14:42 +00:00