Commit graph

339 commits

Author SHA1 Message Date
John MacFarlane
04627b17ac Changed a README example.
The old one was bad, because the HTML comment is no longer
needed for that case in pandoc.
2012-02-09 07:20:03 -08:00
Douglas Calvert
0d1cf3c526 "be is in" -> "be in" 2012-02-08 22:50:18 -05:00
John MacFarlane
630c9f81ff Fixed lhs+markdown instructions.
Classes 'literate' and 'haskell' are needed for bird tracks.
Closes #395.
2012-02-06 12:38:45 -08:00
John MacFarlane
bec9485d93 Re-added the --ascii option.
Now it is implemented in pandoc.hs, not in the HTML writer.
2012-02-05 14:58:55 -08:00
John MacFarlane
e9a270d03b Don't include mathml javascript for html5 output.
mathml is supposed to be supported in HTML5.
2012-01-31 10:47:48 -08:00
John MacFarlane
3880828415 Support --mathml flag in docbook. 2012-01-31 10:32:40 -08:00
John MacFarlane
8f1bfec7b9 Added --epub-embed-font option.
* This can be repeated for multiple fonts.
* Added parameter for fonts to embed to writeEPUB.
* Added ttf, otf to Mime types in Text.Pandoc.MIME.
2012-01-30 13:09:52 -08:00
John MacFarlane
e7a94829b7 Updated README author list. 2012-01-29 19:33:34 -08:00
John MacFarlane
2a84abd210 Changed date in README. 2012-01-28 16:12:41 -08:00
John MacFarlane
d1ded4b026 Support github syntax for fenced code blocks.
You can now write

    ```ruby
    x = 2
    ```

instead of

    ~~~ {.ruby}
    x = 2
    ~~~~
2012-01-28 12:25:24 -08:00
John MacFarlane
8abe08d6d4 Made beamer an output format, removed pdf as output format.
Removed `--beamer` option; instead, use `beamer` as output format.
There is no longer a `pdf` output format; instead, pandoc tries
to produce a pdf if the output file has a `.pdf` extension.
(The output format can be latex -- the default for pdf output,
latex+lhs, or beamer.)

This seems more consistent with the way pandoc currently works
(e.g. we have an `html5` output format, not an `--html5` option).
2012-01-28 11:41:26 -08:00
John MacFarlane
259dda2c56 Fixed link in README. 2012-01-27 11:30:14 -08:00
John MacFarlane
5fc6669be6 Added --atx-headers option. 2012-01-26 23:55:37 -08:00
John MacFarlane
47bb165a65 Reorganized documentation of options, grouping into categories. 2012-01-25 22:34:16 -08:00
John MacFarlane
60bf741d68 Added --slide-level option to override default.
This allows users to select a slide level below the first
header level with content.

Note that content under sections above the slide level will not appear
in slides (either in beamer or in HTML slide shows).

This is primarily useful for creating documents that can be made
into both slides and handouts (which contain additional content
outside the slides).
2012-01-25 17:51:52 -08:00
John MacFarlane
2c4a55d160 FIxed typo in README. Closes #390. 2012-01-25 15:13:06 -08:00
John MacFarlane
b1a2f02082 Improved README on slides. 2012-01-25 11:51:36 -08:00
John MacFarlane
31629cb992 Updated README on --chapters with --beamer. 2012-01-25 10:48:25 -08:00
John MacFarlane
74100cf371 README: More on slide shows. 2012-01-24 20:52:09 -08:00
John MacFarlane
0f60e0cf76 README: New instructions for slide shows. 2012-01-24 20:48:45 -08:00
John MacFarlane
e57fb8d59d README: More information on what is needed to produce PDFs. 2012-01-21 14:59:25 -08:00
John MacFarlane
e721c7428e Removed beamer output format; added --beamer option. 2012-01-21 14:49:26 -08:00
John MacFarlane
2703162424 README tweak on equivalent to markdown2pdf. 2012-01-21 14:24:02 -08:00
John MacFarlane
1d615908c2 Removed markdown2pdf and documentation. 2012-01-20 21:22:51 -08:00
John MacFarlane
75a2b2fda1 Documented docx reader in README. 2012-01-19 23:26:45 -08:00
John MacFarlane
9001506f33 README: Added note on proper date format. 2012-01-01 14:54:41 -08:00
John MacFarlane
4e30f24974 EPUB writer: Allow lang variable to set language in metadata.
Defaults to locale language if `lang` is not set.
2012-01-01 14:32:27 -08:00
John MacFarlane
da8425598a New treatment of dashes in --smart mode.
* `---` is always em-dash, `--` is always en-dash.
* pandoc no longer tries to guess when `-` should be en-dash.
* A new option, `--old-dashes`, is provided for legacy documents.

Rationale: The rules for en-dash are too complex and
language-dependent for a guesser to work reliably.  This
change gives users greater control.  The alternative of
using unicode isn't very good, since unicode em- and en-
dashes are barely distinguishable in a monospace font.
2012-01-01 13:48:28 -08:00
John MacFarlane
a561135386 README: header identifiers now work in LaTeX, ConTeXt as well as HTML.
Patch from B. Scott Michel.
2011-12-30 14:34:54 -08:00
B. Scott Michel
a5ee02c659 ConTeXt writer: Add section labels and internal links as in HTML.
Add the ability to refer to internal links to the ConTeXt writer, just
like the HTML writer can. The 'hierarchicalize' function generates
unique names for sections, which can be used for references in ConTeXt,
just as they can be in HTML.

The ConTeXt writer adds these unique identifiers to each \section and
does special processing of the Link target to see if it starts with a
'#' (hash symbol), which is the tip-off that the link is an internal
link.
2011-12-30 13:10:15 -08:00
John MacFarlane
c5c7aa653a README: Added link for HTML 5. 2011-12-30 11:27:28 -08:00
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