Commit graph

1176 commits

Author SHA1 Message Date
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
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
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
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
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
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
5df3ec11c0 RST reader: Allow :: before lhs code block.
The RST spec requires the :: before verbatim blocks.
This :: should not be treated as literal colons.
Resolves Issue #189.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1668 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-22 07:27:14 +00:00
fiddlosopher
383b0b86ca Use HTML combinators for spans in section numbers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1660 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-09 04:58:29 +00:00
fiddlosopher
717767ddd1 Provide CSS hooks for section numbers in headers and TOC entries.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1659 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-08 06:53:37 +00:00
fiddlosopher
2ced785e95 Added optional section numbering in HTML output.
This involves a change to the Element data structure,
including a section number as well as an id and title
for each section.  Section numbers are lists of integers;
this should allow different numbering schemes to be used
in the future.  Currently [1,2,3] -> 1.2.3.

Resolves Issue #150.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1658 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-08 02:36:16 +00:00
fiddlosopher
0543698895 Don't print raw HTML in man output.
Resolves Issue #183.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1657 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-07 23:34:54 +00:00
fiddlosopher
5082b5411b Improved syntax for markdown definition lists.
Definition lists are now more compatible with PHP Markdown Extra.
Resolves Issue #24.

+ You can have multiple definitions for a term (but still not
  multiple terms).
+ Multi-block definitions no longer need a
  column before each block (indeed, this will now cause
  multiple definitions).
+ The marker no longer needs to be flush with the left margin,
  but can be indented at or two spaces.  Also, ~ as well as :
  can be used as the marker (this suggestion due to David
  Wheeler.)
+ There can now be a blank line between the term and
  the definitions.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1656 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-07 08:26:53 +00:00
fiddlosopher
6ddf8da444 Blank lines after lists in MediaWiki writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1655 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-07 08:26:32 +00:00
fiddlosopher
56ca3e8dcf Changed markdown2pdf.hs so it prints error messages on last attempt.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1654 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-07 08:26:27 +00:00
fiddlosopher
ad5450266c Allow markdown tables without headers.
Resolves Issue #50. The new syntax is described in README.
Also allow optional line of dashes at bottom of simple tables.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1652 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 21:34:46 +00:00
fiddlosopher
de38adc7f3 Docbook writer: add ids to sections. Use link for internal links.
See Issue #60.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1651 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 18:26:29 +00:00
fiddlosopher
78475498b4 Added --id-prefix option.
This adds a prefix to all automatically generated HTML identifiers,
which helps prevent duplicate identifiers when you're generating
a fragment (say a blog post).

Added writerIdentifierPrefix to WriterOptions.

Resolves Issue #41.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1650 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 17:56:02 +00:00
fiddlosopher
61f7a4f869 Markdown reader: Compensate for width of final table column.
Resolves Issue #144.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1649 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 07:47:09 +00:00
fiddlosopher
da6291d930 Fixed handling of footnotes in titles (HTML) and headers (LaTeX).
Resolves Issues #137.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1648 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 07:28:50 +00:00
fiddlosopher
90c335c463 Added stripTags to Text.Pandoc.XML.
This is used in the HTML writer.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1647 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 07:28:45 +00:00
fiddlosopher
8671bc5a1b Markdown reader: Treat a backslash followed by a newline as hard linebreak.
Resolves Issue #154.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1646 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 05:33:24 +00:00
fiddlosopher
94841b7602 Added "head" to list of HTML block-level tags.
Resolves Issue #108.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1645 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 04:47:08 +00:00
fiddlosopher
eb5550a6e4 Changed --default-code-classes -> --indented-code-classes.
Also changed stateDefaultCodeClasses -> stateIndentedCodeClasses.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1643 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 04:46:57 +00:00
fiddlosopher
a42703d3c0 Allow . and ~ in header identifiers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1638 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-01 07:44:06 +00:00
fiddlosopher
df0ce7658c Added --default-code-classes option.
This specifies classes to use for indented code blocks.
Thanks to buttock for the (slightly modified) patch.
Resolves Issue #87.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1637 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-01 06:56:47 +00:00
fiddlosopher
a84472e054 Allow _ character in automatically generated identifiers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1635 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-29 20:37:55 +00:00
fiddlosopher
80a4a03df7 Markdown reader: treat 4 or more * or _ in a row as literal text.
(Instead of trying to parse as strong or emph, which leads to
exponential performance problems.)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1634 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-29 19:31:58 +00:00
fiddlosopher
93d202cbd1 Markdown reader: Use + rather than %20 for spaces in URLs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1633 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-29 19:31:50 +00:00
fiddlosopher
98ff6b2fd0 Better looking simple tables. Resolves Issue #180.
* Markdown reader: simple tables are now given column widths of 0.

* Column width of 0 is interpreted as meaning: use default column width.

* Writers now include explicit column width information only
  for multiline tables.  (Exception:  RTF writer, which requires
  column widths.  In this case, columns are given equal widths,
  adding up to the text width.)

* Simple tables should now look better in most output formats.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1631 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-28 03:22:33 +00:00
fiddlosopher
d1b80f8f35 Markdown reader: parse refs and notes in the same pass.
Previously the markdown reader made one pass for references,
a second pass for notes (which it parsed and stored in the
parser state), and a third pass for the rest.  This patch
achieves a 10% speed improvement by storing the raw notes
on the first (reference) pass, then parsing them when the
notes are inserted into the AST. This eliminates the need
for a second pass to parse notes.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1629 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-28 03:22:18 +00:00