Commit graph

45 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
22dcf7afdd Tweaked templates and tests.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1711 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:14:27 +00:00
fiddlosopher
213895f033 Modified templates to respect indentation.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1708 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:14:04 +00:00
fiddlosopher
3d8cccc7e3 Fixed spacing in latex, context templates.
Minor fixes in latex, context tests.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1707 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:13:56 +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
2de39923c4 Removed spurious linebreak in latex template.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1704 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:13:32 +00:00
fiddlosopher
43d5e3d279 HTML writer changes for templates.
Note:  now a single meta tag is used for multiple authors.
Previously one tag per author was used.

Fixed title in HTML template to avoid excess blank space.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1703 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:13:26 +00:00
fiddlosopher
f36ce015c4 Fixed up LaTeXMathML module not to use TH.
Instead, we read the script in pandoc.hs, and pass it via variables.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1702 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:13:16 +00:00
fiddlosopher
b7750b705a Implemented templates for context writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1701 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:13:08 +00:00
fiddlosopher
1f580fb701 Restored writerIncludeBefore, writerIncludeAfter.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1700 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:12:59 +00:00
fiddlosopher
1a166987df Added rough templates for all writers. These need much fine tuning.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1698 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:12:25 +00:00
fiddlosopher
4806628c8d Added 'standalone' variable, use in templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1697 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:12:14 +00:00
fiddlosopher
359f110974 Fixed markdown writer to use templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1696 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:12:03 +00:00
fiddlosopher
858f728d43 Started on an HTML template.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1695 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:11:55 +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
ba32c2ec42 Simplified build process using template haskell.
+ Text/Pandoc/ASCIIMathML.hs, Text/Pandoc/DefaultHeaders.hs,
  and Text/Pandoc/Writers/S5.hs are no longer built in Setup.hs
  from templates in the templates/ directory.
+ Instead, they use template haskell to read data at compile
  time from the relevant files in data/.
+ Setup.hs is back to the default simple configuration.
+ Removed old templates and Extra-Tmp-Files field from
  pandoc.cabal.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1357 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 06:35:42 +00:00
fiddlosopher
2751608d9b Use CPP to simplify build procedure for Highlighting.hs module.
This is no longer built by Setup.hs in the pre-configure phase.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1339 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 06:35:46 +00:00
fiddlosopher
ff43ff6229 Code cleanup in S5 writer template.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1312 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:21:16 +00:00
fiddlosopher
2baf6d09ee Andrea Rossato's patch for OpenDocument support.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1252 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-19 18:45:51 +00:00
fiddlosopher
213d30fdf6 Added amsmath package to default LaTeX header. Resolves Issue #48.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1249 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-09 03:05:54 +00:00
fiddlosopher
9a7ca4d9aa Minor changes due to changes in highlighting-kate API.
defaultHighlightingCss now imported rather than duplicated.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1235 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-10 18:59:54 +00:00
fiddlosopher
742a465980 Support for startFrom="nn" to select starting line number in syntax highlighting.
Changed argument of highlightHtml to Attr, not [String], for generality.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1232 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-10 18:59:34 +00:00
fiddlosopher
868aeace2d Renamed default headers with .header extension; have Setup.hs look for these.
(This fixes a bug where Setup.hs would find .svn directories.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1230 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:30:59 +00:00
fiddlosopher
04b32451be Added build option for syntax highlighting, with *optional* dependency on highlighting-kate.
+ pandoc.cabal includes a flag, 'highlighting', that causes a dependency
  on highlighting-kate.
+ if Setup.hs detects this dependency, it copies templates/Highlighting.yes.hs
  to Text/Pandoc/Highlighting.hs.  Otherwise, it copies templates/Highlighting.no.hs.
+ The HTML writer imports this new module instead of Text.Highlighting.Kate.
  The new module exports highlightHtml, which either uses highlighting-kate to
  perform syntax highlighting or automatically returns a failure code, depending
  on whether highlighting support was selected.
+ --version now prints information about whether syntax highlighting support is compiled in.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1221 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:21:19 +00:00
fiddlosopher
087739ad7a Moved Text.Pandoc.Writers.DefaultHeaders -> Text.Pandoc.DefaultHeaders.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1218 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:20:55 +00:00
fiddlosopher
446a964a19 Incorporated templates phase into Setup.hs and improved templates.
+ Removed templates/Makefile and fillTemplates.pl.
+ Removed 'templates' Makefile target.
+ Added postConf hook to Setup.hs that fills the templates.
+ Use compressed javascripts for S5 and ASCIIMathML templates.
+ Revised test suite.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1216 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:20:42 +00:00
fiddlosopher
d3a179cdfc Added \setupitemize[autointro] to ConTeXt header, to prevent orphaned
list introduction lines.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1195 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-23 02:17:59 +00:00
fiddlosopher
0814ee0e77 New version of ASCIIMathML.js.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1120 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:32 +00:00
fiddlosopher
b2fa8c7dd2 Moved ASCIIMathML.js, headers, and ui into templates.
Adjusted templates/Makefile and fillTemplates.pl as needed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1106 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:03:04 +00:00
fiddlosopher
9a67a486c2 Moved everything from src into the top-level directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1104 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:02:34 +00:00