Commit graph

308 commits

Author SHA1 Message Date
John MacFarlane
cdb01e6d54 Made html5 and html5+lhs output formats.
Deprecated the `--html5`/`-5` flag. Use the output format
instead.
2011-12-29 13:39:03 -08:00
John MacFarlane
ea39a607ed Added 'beamer' as an output format.
Beamer output uses the default LaTeX template, with some
customizations via variables.

Added `writerBeamer` to `WriterOptions`.

Added `--beamer` option to `markdown2pdf`.
2011-12-29 13:26:04 -08:00
John MacFarlane
16629bf1ce Added --highlight-style and --no-highlight options. 2011-12-27 23:46:47 -08:00
John MacFarlane
fca95bf43c Removed highlighting flag. Highlighting support is now standard. 2011-12-22 13:24:43 -08:00
John MacFarlane
89c962a18c Use blaze-html instead of xhtml for HTML generation.
* This is a breaking API change for `writeHtml`.
* It introduces a new dependency on blaze-html.
* Pandoc now depends on highlighting-kate >= 0.4, which
  also uses blaze-html.
* The --ascii option has been removed, because of differences
  in blaze-html's and xhtml's escaping.
* Pandoc will no longer transform leading newlines in code
  blocks to `<br/>` tags.
2011-12-17 22:46:03 -08:00
John MacFarlane
318d136881 Added 'lang' variable to LaTeX template.
Thanks to Magnus Therning for the suggestion.
2011-11-27 20:38:05 -08:00
John MacFarlane
f027fd0eff --self-contained now works with <video> as well as <img>. 2011-11-24 10:04:25 -08:00
John MacFarlane
2f3d76844a Slight modification of --self-contained documentation. 2011-11-21 15:55:05 -08:00
John MacFarlane
00d811d986 Documented --self-contained and modified documentation for --offline. 2011-11-21 15:36:36 -08:00
John MacFarlane
d01c632055 Added asciidoc output to README. 2011-11-18 19:56:58 -08:00
John MacFarlane
9a46d75506 Implemented --citation-abbreviations option.
Mostly due to Andrea Rossato.
2011-11-11 17:54:34 -08:00
John MacFarlane
14620579c0 Changed misleading documentation on markdown2pdf.
markdown2pdf used to create a backup file if the output file
exists; it doesn't any longer, but the documentation still said
it does.
2011-11-10 15:37:52 -08:00
John MacFarlane
195f9045a4 Clarified rule for first line of definition lists.
Closes #310.
2011-10-28 13:24:39 -07:00
John MacFarlane
f68e29aeb8 Fixed typo. 2011-10-26 15:49:52 -07:00
John MacFarlane
1b81981c5f HTML reader now recognizes DocBook block and inline tags.
It was always possible to include raw DocBook tags in a markdown
document, but now pandoc will be able to distinguish block from
inline tags and behave accordingly. Thus, for example,

    <sidebar>
    hello
    </sidebar>

will not be wrapped in `<para>` tags.
2011-10-25 12:44:20 -07:00
John MacFarlane
8da83ff3c5 Updated README to remove mention of .bbx for bibliographies. 2011-10-04 11:52:25 -07:00
John MacFarlane
9b37c9cc35 Added dzslides output option.
* Added DZSlides to HTMLSlideVariant.
* Added support for dzslides in HTML writer.
* Added dzslides template.
2011-10-01 23:02:24 -07:00
John MacFarlane
9924e8f03a Fixed typo in README 2011-09-09 20:32:58 -07:00
John MacFarlane
f25df13b8e Note in README that --chapters is implicit when certain classes used.
report, book, or memoir.
2011-08-03 10:20:27 -07:00
John MacFarlane
b1d2b307be Changed date on README. 2011-07-30 19:51:36 -07:00
John MacFarlane
57821e1cdf Added s5-url and slidy-url variables, instead of hard-coding.
If you want to put your slidy files in the slidy subdirectory,
for example, you can do

    pandoc -t slidy -V slidy-url=slidy -s
2011-07-28 17:35:26 -07:00
John MacFarlane
310697ce7e Changed --mathjax to link to mathjax CDN by default.
`--mathjax` now takes an optional URL argument. If it is not provided,
pandoc links directly to the (secure) mathjax CDN.
This is what they now recommend.  Thanks to dsanson.
2011-07-23 13:30:59 -07:00
John MacFarlane
81c403d2d1 Use \enquote{..} for latex quotes if template uses csquotes package.
This provides better support for foreign language quoting.
Thanks to Andreas Wagner for the idea.
2011-07-23 13:12:11 -07:00
John MacFarlane
4dc40c923f Added link to zotero styles page. 2011-07-22 23:01:36 -07:00
John MacFarlane
ac724226d4 Small documentation fix. 2011-07-22 23:01:33 -07:00
John MacFarlane
fd34dcba85 Changed default template naming scheme.
Instead of latex.template, we now have default.latex.

An appropriate extension is added automatically if the value of
`--template` has no extension.  So, `pandoc --template=special -t latex`
looks for `special.latex`, while `pandoc --template=special -t man`
looks for `special.man`.
2011-07-22 22:49:38 -07:00
John MacFarlane
18306c74fb Deprecated --xetex option - it is no longer needed.
Deprecated `writerXeTeX` and the `--xetex` option.
The latex writer now produces a file that can be processed
by latex, pdflatex, lualatex, or xelatex, so this option isn't
needed.

The option is still neded in markdown2pdf, however, which
has been modified to take some options that aren't in pandoc.
2011-07-22 13:11:46 -07:00
John MacFarlane
49fdf273ab Updated contributor list. 2011-07-22 12:01:57 -07:00
John MacFarlane
bd18a80ebe Document pandoc-templates repository in README. 2011-07-20 08:41:15 -07:00
John MacFarlane
6b282fda5b Document --biblatex and --natbib options. 2011-04-04 19:42:12 -07:00
John MacFarlane
f5cbb68534 Added --epub-cover-image option.
API change: Added a parameter for the cover image path to
writeEPUB.

Followed best practices outlined in
http://blog.threepress.org/2009/11/20/best-practices-in-epub-cover-images/
2011-03-13 12:42:16 -07:00
John MacFarlane
08797d1b3e Fixed orgmode link. 2011-03-09 08:21:33 -08:00
John MacFarlane
8f408e4b7b Added --ascii option.
Currently supported only in HTML writer.
2011-02-06 09:27:03 -08:00
John MacFarlane
798c5d55bb README: Added section on four-space rule for lists.
Resolves Issue #283.
2011-02-05 07:10:35 -08:00
John MacFarlane
df95f72659 README: Clarified optional arguments on math options. 2011-02-05 06:37:38 -08:00
John MacFarlane
6d6eb9ab5d Fixed misspelling in README. 2011-01-30 17:02:22 -08:00
John MacFarlane
154b48c627 Updated some dates in documentation. 2011-01-29 13:14:25 -08:00
John MacFarlane
3a3b484957 Finished revising markdown description in README. 2011-01-28 23:18:39 -08:00
John MacFarlane
0d19adeeef Improved README on lists. 2011-01-28 21:54:28 -08:00
Josef Svenningsson
d8d0f46c4c Add possibility to use listings package for code blocks and
inline code in the LaTeX writer.
2011-01-28 21:09:38 -08:00
John MacFarlane
d4137e1021 More README improvements. 2011-01-28 20:01:40 -08:00
John MacFarlane
2837ad46fe Partial restructuring of README.
Aim is to provide a complete markdown syntax description,
including pandoc differences.
2011-01-28 18:33:42 -08:00
John MacFarlane
8c435578d6 Refactored man pages.
* Markdown syntax description from README now goes in pandoc_markdown.5.
* Refactored man page construction functions, putting more of
  the work in MakeManPages.hs.
2011-01-28 12:02:26 -08:00
John MacFarlane
9bb5b54102 Added --normalize option. 2011-01-20 22:48:20 -08:00
John MacFarlane
25da1680c3 Documented --chapters in README. 2011-01-16 09:34:47 -08:00
John MacFarlane
91510a109f Improvements to --html5 support:
+ <nav> for TOC, <figure> for figures, type attribute in <ol>.
+ Don't add math javascript in html5.
+ Use style attributes instead of deprecated width, align.
+ html template: move <title> after <meta>.
  Note: charset needs to be declared before title.
+ slidy and s5 templates: move <title> after <meta>.
+ html template: Added link to html5 shim for IE.
+ Make --html5 have an effect only for 'html' writer (not s5, slidy, epub).
2011-01-11 23:15:30 -08:00
John MacFarlane
e8ad4ba43c Preliminary support for HTML5.
+ Added writerHtml5 writer option.
+ Added --html5 option.
+ Added support for lang in html tag (so you can do
  'pandoc -s --V lang=en', for example).
+ Updated html template with conditionals for HTML5.
+ When HTML5 selected, use <header> tag around title in document,
  and use <section> tags instead of <div>s if --section-divs
  specified.
2011-01-11 21:18:46 -08:00
John MacFarlane
6aa0a187b3 Added link to repo of CSL styles to README. 2010-12-20 19:41:31 -08:00
John MacFarlane
543aa28c38 Added new prettyprinting module.
* Added Text.Pandoc.Pretty.
  This is better suited for pandoc than the 'pretty' package.
  One advantage is that we now get proper wrapping; Emph [Inline]
  is no longer treated as a big unwrappable unit. Previously
  we only got breaks for spaces at the "outer level." We can also
  more easily avoid doubled blank lines.  Performance is
  significantly better as well.

* Removed Text.Pandoc.Blocks.
  Text.Pandoc.Pretty allows you to define blocks and concatenate
  them.

* Modified markdown, RST, org readers to use Text.Pandoc.Pretty
  instead of Text.PrettyPrint.HughesPJ.

* Text.Pandoc.Shared:  Added writerColumns to WriterOptions.

* Markdown, RST, Org writers now break text at writerColumns.

* Added --columns command-line option, which sets stColumns
  and writerColumns.

* Table parsing:  If the size of the header > stColumns,
  use the header size as 100% for purposes of calculating
  relative widths of columns.
2010-12-17 13:39:17 -08:00
John MacFarlane
999a4733f3 Fixed table in README. 2010-12-13 20:03:44 -08:00
John MacFarlane
a102fed2b8 Fixed internal link in README. 2010-12-13 20:03:35 -08:00
John MacFarlane
c6b79d794e Removed deprecated -C/--custom-header option.
Use --template instead.
2010-12-11 00:22:34 -08:00
John MacFarlane
f5c2082304 Added JSON reader and writer.
The JSON reader is about 20x faster than the native reader.
So this can be a good way to serialize a pandoc document.
2010-12-11 00:06:03 -08:00
John MacFarlane
5770ceca36 Removed HTML sanitization.
This is better done on the resulting HTML; use the xss-sanitize library
for this.  xss-sanitize is based on pandoc's sanitization, but improves
it.

- Removed stateSanitize from ParserState.
- Removed --sanitize-html option.
2010-12-10 12:26:03 -08:00
John MacFarlane
167eeef6cb Added json format for reading and writing.
This is faster to parse than native.
2010-12-09 10:40:31 -08:00
John MacFarlane
9ead748cc9 RST reader: Added footnote suppport.
Resolves issue #258.

Note that there are some differences in how docutils and
pandoc treat footnotes.  Currently pandoc ignores the numeral
or symbol used in the note; footnotes are put in an auto-numbered
ordered list.
2010-12-08 08:39:50 -08:00
John MacFarlane
6ef8a363dc Narrowed a long line in README. 2010-12-07 12:31:51 -08:00
John MacFarlane
3b3387b4a3 Improved process to create man page from README.
Previously it relied on pandoc already being installed.
Now it uses dist/package.conf.inplace.
2010-12-07 12:29:43 -08:00
John MacFarlane
315e236d6a Use same options documentation in README and man page.
Later we will generate the man page from the README.
2010-12-07 09:36:03 -08:00
John MacFarlane
37dc5d8c5d Documented citations in README. 2010-12-05 12:57:44 -08:00
John MacFarlane
fabd9e6c22 Documented fact that you can specify --bibliography repeatedly. 2010-12-05 12:57:27 -08:00
John MacFarlane
529f75adec README: Updated list of code contributors. 2010-12-05 09:52:28 -08:00
John MacFarlane
05b8017679 Documented org-mode writer in README, cabal, man pages. 2010-12-05 09:45:55 -08:00
John MacFarlane
c277d29902 Documented all the formats citeproc/bibutils can handle. 2010-12-05 09:29:14 -08:00
John MacFarlane
5171de66c5 Updated README and pandoc man page with textile reader. 2010-12-03 23:50:03 -08:00
John MacFarlane
38bc3f2316 More documentation for citeproc features (still incomplete). 2010-12-03 23:05:20 -08:00
John MacFarlane
c989bf028f Merge branch 'textile'
Conflicts:
	README
	man/man1/pandoc.1.md
	pandoc.cabal
2010-11-27 10:52:44 -08:00
John MacFarlane
bd24e83c81 --mathjax: Use mathjax with raw latex rather than mathml.
It seems to work better, and the default config can be used.
2010-10-31 18:55:35 -07:00
John MacFarlane
9cf27c92c1 Added support for MathJax for displaying math in HTML.
Added --mathjax option.
Added MathJax to HTMLMathMethod.
Supported MathJax in HTML writer.

Resolves Issue #259.
2010-10-26 21:07:51 -07:00
John MacFarlane
3a799f4482 Documented LaTeX macros. 2010-10-26 19:57:05 -07:00
John MacFarlane
90bae29216 Clarified that multiline tables don't support colspans or rowspans. 2010-09-23 06:21:09 -07:00
John MacFarlane
a627dc828b Slight change in README on table cell spans. 2010-09-23 06:18:17 -07:00
John MacFarlane
78d9af999f README - moved links to end. 2010-07-24 10:36:50 -07:00
John MacFarlane
7f936852d7 Revised description of slide formats. 2010-07-23 22:47:36 -07:00
John MacFarlane
c5ed016616 Added new --offline option for slidy.
Added slidy/slidy.min.{css,js}.
2010-07-22 21:50:53 -07:00
John MacFarlane
7712a0a91f Updated --data-dir documentation to include epub.css. 2010-07-21 00:00:31 -07:00
John MacFarlane
465a4a6699 Slidy writer: create new slide at every level 1 header. 2010-07-18 23:06:22 -07:00
John MacFarlane
9be9bccfcf Added --section-divs option.
+ Header identifiers now get attached to the headers, unless
  --section-divs is specified, in which case they are added to
  enclosing divs. By default, the divs are not added.
+ Resolves Issue #230, #239.
2010-07-15 22:26:45 -07:00
John MacFarlane
57a91f3b6a Added --webtex option for HTML math.
+ Added --webtex command-line option, with optional parameter.
  (Defaults to using google charts API.)
+ Added WebTeX HTMLMathMethod.
+ Removed MimeTeX HTMLMathMethod.  (WebTeX is generic and subsumes it.)
+ Modified --mimetex option to use WebTeX.
+ Thanks to lpeterse for the idea and some of the code.
2010-07-15 19:01:00 -07:00
John MacFarlane
255aa7eb6e Improved Slidy writer.
We now carve up slides at HorizontalRules, rather than by level-1
headers. This gives the user lots of flexibility.
2010-07-13 23:41:18 -07:00
John MacFarlane
9b833e8744 Added a slidy writer.
Resolves Issue #122.
2010-07-13 20:44:56 -07:00
John MacFarlane
afe18e53f1 Modified example refs so they can occur before or after target.
The refs are now replaced by numbers at the final stage, using
processWith.
2010-07-12 23:05:46 -07:00
John MacFarlane
0181e66250 Merge branch 'atlists'. Added auto-numbered example lists. 2010-07-11 22:47:52 -07:00
John MacFarlane
cbac17cfd2 Documented grid tables in README.
Resolves Issue #43.
2010-07-06 23:05:58 -07:00
John MacFarlane
7d687684aa Allow language-neutral table captions.
+ Captions may now begin simply with ':', instead of 'Table:'
+ Captions may now appear either above or below the table.
+ Resolves Issue #227.
2010-07-06 21:02:26 -07:00
John MacFarlane
162b869aac Documented EPUB writer and --epub-{stylesheet,metadata} options. 2010-07-05 00:06:27 -07:00
John MacFarlane
d073b16892 Added Textile writer module. 2010-05-17 21:52:45 -07:00
John MacFarlane
fb201a5b46 Updated man page and README.
Pandoc no longer respects locale, even when compiled by GHC 6.12.
2010-05-06 22:32:06 -07:00
John MacFarlane
6972c0b5b0 Implemented @ for sequentially numbered examples.
Also implemented (@label) for example labels and references.
2010-03-27 10:24:18 -07:00
John MacFarlane
db31e06693 Removed unneeded single quotes in README. 2010-03-27 10:22:55 -07:00
John MacFarlane
9cc54751ec Added to acknowledgements. 2010-03-20 15:59:49 -07:00
fiddlosopher
fcc25a388c Improved contributor list.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1925 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-20 18:07:44 +00:00
fiddlosopher
83797bc1c9 Fixed indent in README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1924 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-20 18:02:32 +00:00
fiddlosopher
bdd5ec37ae Updated date on README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1921 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-19 16:22:08 +00:00
fiddlosopher
56217f1004 Added --mathml option; removed Text.Pandoc.LaTeXMathML.
* Added data/MathMLinHTML.js, which is included when no URL is provided
  for --mathml.  This allows MathML to be displayed in better browsers,
  as text/html.
* The module was no longer necessary; its functionality (two lines)
  was incorporated into pandoc.hs.
* Consolidated the two LaTeXMathML.js files into one.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1909 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 06:45:56 +00:00
fiddlosopher
695961155a Added plain writer.
Text.Pandoc.Writers.Markdown now exports a writePlain,
which writes plain text without links, pictures, or
special formatting (not even markdown conventions).

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1907 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 06:45:43 +00:00
fiddlosopher
081ae411b3 Fixed definition lists for options in README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1906 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 06:45:32 +00:00
fiddlosopher
13d0a0ccb9 Documented that ODT and RTF don't implement the image-as-figure feature.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1902 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 02:39:18 +00:00
fiddlosopher
a9b0d876d9 HTML writer: Use a p rather than a div for image caption.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1900 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 02:39:06 +00:00
fiddlosopher
26b41ce7ba Shared: Export uniqueIdent, don't allow tilde in identifier.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1894 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-16 06:45:52 +00:00