Commit graph

24 commits

Author SHA1 Message Date
John MacFarlane
69b0c15030 Added FlexibleInstances pragma.
Thanks to Sivaram Gowkana for the patch.
2011-03-19 12:05:55 -07:00
John MacFarlane
dc597a8a68 Removed all dependencies on 'pretty' package. 2010-12-22 11:48:08 -08:00
John MacFarlane
a11b530935 Moved s5 writing from S5 module to HTML.
Now s5 is handled in more or less the same way as slidy,
as a variant of HTML.
2010-07-22 22:58:48 -07:00
John MacFarlane
bd0320962e Comment change in Templates (thanks to Alexander Hirzel).
Resolves Issue #245.
2010-07-05 00:11:02 -07:00
John MacFarlane
1aeb7d23ad Updated copyright notices. 2010-03-23 13:31:09 -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
bd433b5738 Templates: Conditionally import Control.Exception.Extensible if base < 4.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1910 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 21:35:41 +00:00
fiddlosopher
4cdb4c0b36 Removed unneeded import.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1822 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-18 07:09:03 +00:00
fiddlosopher
b412a9cf4a Made user directory a Maybe in readFile, s5HeaderIncludes, laTeXMathML.
This is more uniform, and calling libraries can always disable
searching of user directories for overrides.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1821 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-18 07:01:29 +00:00
fiddlosopher
9fed26181f Rename getTemplate -> getDefaultTemplate.
(One reason is that getTemplate conflicts with a
function in yst.)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1820 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-18 05:06:08 +00:00
fiddlosopher
eb851a41ca Added --data-dir option.
+ This specifies a user data directory. If not specified, will default
  to ~/.pandoc on unix or Application Data\pandoc on Windows.
  Files placed in the user data directory will override system default
  data files.
+ Added datadir parameter to readDataFile, saveOpenDocumentAsODT,
  latexMathMLScript, s5HeaderIncludes, and getTemplate.  Removed
  getDefaultTemplate.
+ Updated documentation.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1809 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-14 05:54:38 +00:00
fiddlosopher
fd7fe7d000 Added getTemplate to Text.Pandoc.Templates.
This allows the caller to select whether to allow user overrides
from the user data directory (~/.pandoc).

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1803 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-11 03:43:49 +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
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
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
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
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
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
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
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
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