Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
1420 commits 2 branches 0 tags 65 MiB
Commit graph

1420 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fiddlosopher
d5907b3034 Made renderTemplate polymorphic; added TemplateTarget class. 
Now renderTemplate can return an Html, a Doc, a ByteString, or
a String.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1712 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:14:35 +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
275a740624 Added newline at end of LaTeXMathML script. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1710 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:14:17 +00:00
fiddlosopher
c70f585e56 Templates: don't try to handle indented $if$, $else$, $endif$. 
Instead, require that these be flush left in multiline
conditionals.

Also, swallow empty space after keywords in multiline conditionals.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1709 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:14:11 +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
cc8e3345d9 -Wall cleanup in markdown writer. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1706 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:13:48 +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
3ec8772daf Changed Meta author and date types to Inline lists instead of Strings. 
Meta [Inline] [[Inline]] [Inline] rather than
Meta [Inline] [String] String.

This is a breaking change for libraries that use pandoc and
manipulate the metadata.

Changed .native files in test suite for new Meta format.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1699 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:12:44 +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
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
fad620c004 Changed readDataFile to look first in user data directory. 
This way all of the pandoc data files can be overridden by
user files.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1693 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:11:30 +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
9551e36389 Removed need for TH in ODT module. 
Instead get reference zip file directly from the file at run time.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1690 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:11:04 +00:00
fiddlosopher
ecbf3388d4 Use Text.Pandoc.Templates instead of Text.Pandoc.DefaultTemplates. 
(in pandoc.hs and Text.Pandoc)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1689 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:10:57 +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
5ef0be2375 Simplified handling of --css; removed optCSS in pandoc.hs. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1686 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:10:32 +00:00
fiddlosopher
b771051432 Added -V/--variable option to set custom template variables. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1685 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:10:26 +00:00
fiddlosopher
9f126c15cf Removed unneeded writer options; use template variables instead. 
Removed writerIncludeAfter, writerIncludeBefore, writerTitlePrefix,
writerHeader.  Removed corresponding fields of Options structure
in pandoc.hs.  The options now set template variables (writerVariables)
instead.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1684 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:10:17 +00:00
fiddlosopher
c602ed3459 Added and documented --template option. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1683 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:10:04 +00:00
fiddlosopher
974bceaac5 Use legacy-header variable for custom header. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1682 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:09:56 +00:00
fiddlosopher
e037d6ace3 Made writerVariables active in LaTeX writer. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1681 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:09:50 +00:00
fiddlosopher
4b0e39fd02 Add legacy-header to LaTeX template. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1680 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:09:43 +00:00
fiddlosopher
0d8fc82a8c Changed --print-default-header to --print-default-template. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1679 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:09:36 +00:00
fiddlosopher
732e6a1097 Added writerTemplate and writerVariables to writerOptions. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1678 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:09:28 +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
ca712fe7f8 LaTeX header: fixes for xetex and header-includes. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1676 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:09:02 +00:00
fiddlosopher
2033da8e47 Revised LaTeX writer to use templates. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1675 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:08:56 +00:00
fiddlosopher
26ce0d04ec Fixed S5. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1674 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-31 01:08:46 +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
96e515bd88 Minor tweak to README on definition lists. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1671 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-29 21:01:37 +00:00
fiddlosopher
cf432b3974 Fixed link in README. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1670 788f1e2b-df1e-0410-8736-df70ead52e1b
 2009-12-29 20:59:36 +00:00