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

628 commits

Author SHA1 Message Date
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
2a4e5f9daa HTML writer: don't include empty UL if --toc but no sections. 
Resolves Issue #199.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1799 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-09 03:13:08 +00:00
fiddlosopher
66c4f90e09 markdown2pdf: always do at least two runs. 
Reason:  hyperref bookmarks require this.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1797 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-05 08:36:08 +00:00
fiddlosopher
e1e9bfc004 LaTeX writer: Removed stLink, link template variable. 
Reason: we now always include hyperref in the template.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1796 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-05 08:36:02 +00:00
fiddlosopher
d5d67f9657 Updated haddocks for changes in Meta type. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1794 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-04 02:27:24 +00:00
fiddlosopher
e91cb556d2 LaTeX writer: if book, report, or memoir documentclass, use \chapter{} 
for first-level headers. Otherwise use \section{}.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1793 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-03 08:47:54 +00:00
fiddlosopher
6c2cf70fb0 Changed default of writerXeTeX to False. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1790 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-02 21:09:29 +00:00
fiddlosopher
9070777091 markdown2pdf.hs: throw error if pandoc --dump-args does. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1781 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-02 18:19:28 +00:00
fiddlosopher
77396199e7 markdown2pdf.hs: When --toc, run latex an extra time. 
Previously --toc was broken.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1780 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-02 18:19:24 +00:00
fiddlosopher
1e0c8e21cf pandoc.hs: warn of deprecated options after --dump-args has exited. 
Otherwise we mess up the wrappers that look at the output of
--dump-args.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1779 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-02 18:19:19 +00:00
fiddlosopher
8fce9c54ec XML: don't escape \160 (nonbreaking space) as an entity. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1770 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-01 04:12:06 +00:00
fiddlosopher
c7149d317f Docbook writer: use unicode instead of entities. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1769 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-01 04:12:00 +00:00
fiddlosopher
41aff1cf55 HTML writer: Use functions from XML module to escape strings. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1768 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-01 04:11:54 +00:00
fiddlosopher
87c66d4623 Finished converting HTML writer to use unicode instead of entities. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1767 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-01 04:11:48 +00:00
fiddlosopher
8a308ac1b2 Modified S5 writer to look for s5 files in s5 directory. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1764 788f1e2b-df1e-0410-8736-df70ead52e1b
 2010-01-01 01:32:48 +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
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
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
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
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
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
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
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
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
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
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