diff -Nru pandoc-1.8.1.1/changelog pandoc-1.8.2.1/changelog --- pandoc-1.8.1.1/changelog 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/changelog 2011-08-01 18:02:52.000000000 +0000 @@ -1,3 +1,238 @@ +pandoc (1.8.2.1) + + * Relaxed cabal consntraints for test-framework (S. Trofimovich). + + * Relaxed cabal constraints for pandoc-types. + + * Adjusted Arbitrary instance to help avoid timeouts in tests. + + * Added `Tests.Writers.Markdown` to cabal file. + +pandoc (1.8.2) + + * Added script to produce OS X package. + + * Made `templates` directory a git submodule. This should make it + easier for people to revise their custom templates when the default + templates change. + + * Changed template naming scheme: `FORMAT.template` -> `default.FORMAT`. + **Note:** If you have existing templates in `~/.pandoc/templates`, you + must rename them to conform to the new scheme! + + * Fixed smart quotes bug, now handling `'...hi'` properly. + + * RST reader: + + + Partial support for labeled footnotes. + + Improved accuracy of `simpleReferenceName` parser. + + * HTML reader: + + + Substitute correct unicode characters for + characters in the 128..159 range, which are often found even in + HTML that purports to be UTF-8. + + * LaTeX reader: Handle `\subtitle` command (a subtitle is added + to the title, after a colon and linebreak). Closes #280. + + * Leaner `reference.odt`. + + * Added unexported module `Text.Pandoc.MIME` for use in + the ODT writer. + + * ODT writer: Construct `manifest.xml` based on archive contents. + This fixes a bug in ODTs containing images. Recent versions of + LibreOffice would reject these as corrupt, because `manifest.xml` + did not contain a reference to the image files. + + * LaTeX writer: + + + Make verbatim environments flush to avoid spurious + blank lines. Closes #277. + + Use `\texttt` and escapes insntead of `\verb!...!`, which + is too fragile (doesn't work in command arguments). + + Use `\enquote{}` for quotes if the template includes + the `csquotes` package. This provides better support for + local quoting styles. (Thanks to Andreas Wagner for the idea.) + + * ConTeXt writer: Make `\starttyping`/`\stoptyping` flush with + margin, preventing spurious blank lines. + + * Slidy writer: + + + Use non-minimized version of `slidy.css` with `--offline` + option, so users can more easily edit it. + + Also fixed a bug in the CSS that prevented proper centering + of title (now reported and fixed upstream). + + * S5 writer: + + + Replaced `s5/default/slides.js.{comment,packed}` with + new compressed `s5/default/slides.min.js`. + + Use `data:` protocol to embed S5 CSS in `` tags, + when `--offline` is specified. Using inline CSS didn't + work with Chrome or Safari. This fixes offline + S5 on those browsers. + + * HTML writer: Removed English title on footnote backlinks. + This is incongrous in non-English documents. + + * Docbook writer: + + + Use CALS tables. (Some older docbook software does not work + well with XHTML tables.) Closes #77. + + Use `programlisting` tags (instead of `screen`) for code blocks. + + * `markdown2pdf`: + + + Calls latex with `-halt-on-error -interaction nonstopmode` instead + of `-interaction=batchmode`, which essentially just ignored errors, + leading to bad results. Better to know when something is wrong. + + Fixed issues with non-UTF-8 output of `pdflatex`. + + Better error reporting. + + * `--mathjax` now takes an optional URL argument. If it is not + provided, pandoc links directly to the (secure) mathjax CDN, + as now recommended (thanks to dsanson). + + * Deprecated `--xetex` option in `pandoc`. It is no longer needed, + since the LaTeX writer now produces a file that can be processed by + `latex`, `pdflatex`, `lualatex`, or `xelatex`. + + * Introduced `--luatex` option to `markdown2pdf`. This causes `lualatex` + to be used to create the PDF. + + * If a template specified with `--template` is not found, look for it + in `datadir`. Also, if no extension is provided, supply one based + on the writer. So now you can put your `special.latex` template in + `~/.pandoc/templates`, and use it from any directory via + `pandoc -t latex --template special`. + + * Default template improvements: + + + HTML: Display author and date after title. + + HTML: Made table of contents more customizable. The container + for the TOC is now in the template, so users can insert a header + or other styling. (Thanks to Bruce D'Arcus for the suggestion.) + + HTML, Slidy, S5: Enclose scripts in CDATA tags. + + Slidy, S5: 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`. + + LaTeX: Use `\and` to separate authors in LaTeX documents (reader + & writer). Closes #279. + + LaTeX: Use different `hyperref` options for `xetex`, fixing + problems with unicode bookmarks (thanks to CircleCode). + + LaTeX: Removed `ucs` package, use `utf8` rather than `utf8x` + with `inputenc`. This covers fewer characters but is more + robust with other packages, and `ucs` is unmaintained. Users + who need better unicode support should use xelatex or lualatex. + +pandoc (1.8.1.2) + + * Added `--epub-cover-image` option. + + * Documented `--biblatex` and `--natbib` options. + + * Allow `--section-divs` with slidy output. Resolves Issue #296. + + * Disallow notes within notes in reST and markdown. + These previously caused infinite looping and stack overflows. + For example: + + [^1] + + [^1]: See [^1] + + Note references are allowed in reST notes, so this isn't a full + implementation of reST. That can come later. For now we need to + prevent the stack overflows. Partially resolves Issue #297. + + * EPUB writer: Allow non-plain math methods. + + * Forbid ()s in citation item keys. Resolves Issue #304: problems with + `(@item1; @item2)` because the final paren was being parsed as part of + the item key. + + * Changed URI parser so it doesn't include trailing punctuation. + So, in RST, `http://google.com.` should be parsed as a link followed by a + period. The parser is smart enough to recognize balanced parentheses, as + often occur in wikipedia links: `http://foo.bar/baz_(bam)`. + + * Markdown+lhs reader: Require space after inverse bird tracks, so that + HTML tags can be used freely at the left margin of a markdown+lhs document. + Thanks to Conal Elliot for the suggestion. + + * Markdown reader: + + + Improved emph/strong parsing; fixes bug found by Perry Wagle. + + Fixed bug in footnote order (reported by CircleCode). + + * RST reader: + + Fixed bug in in field lists with multi-line items at the + end of the list. + + Added parentheses to RST `specialChars`, so + `(http://google.com)` will be parsed as a link in parens. + Resolves Issue #291. + + Allow `|` followed by newline in RST line block. + + * LaTeX reader: + + Support `\dots`. + + Gobble option & space after linebreak `\\[10pt]`. + + * Textile reader: + + Make it possible to have colons after links. (qerub) + + Make it possible to have colons after links. (Christoffer Sawicki) + + * HTML reader: + + Skip spaces after ``, ``, etc. + + Handle tbody, thead in simple tables. Closes #274. + + Implicit `Para`s instead of `Plains` in some contexts. + + * OpenDocument writer: Use special `First paragraph` style for + first paragraph after most non-paragraph blocks. This allows users to + specify e.g. that only paragraphs after the first paragraph of a block are + to be indented. Thanks to Andrea Rossato for the patch. Closes #20. + + * LaTeX writer: use `deVerb` on table and picture captions. + Otherwise LaTeX complains about `\verb` inside command argument. + Thanks to bbanier for reporting the bug. + + * Markdown writer: Insert HTML comment btw list and indented code block. + This prevents the code block from being interpreted as part of the list. + + * EPUB writer: Add a meta element specify the cover. + Some EPUB e-readers, such as the Nook, require a meta element inside the + OPF metadata block to ensure the cover image is properly displayed. + (Kelsey Hightower) + + * HTML writer: Use embed tag for images with non-image extensions. + (e.g. PDFs). Closes #264. + + * LaTeX writer: Improved tables. + + + More space between lines, top-align cells. + + Use ctable package, which allows footnotes and + provides additional options. + + Made cell alignments work in multiline tables. + + Closes #271, #272. + + * Un-URI-escape image filenames in LaTeX, ConTeXt, RTF, Texinfo. + Also do this when copying image files into EPUBs and ODTs. + Closes #263. + + * Changed to github issue tracker. + + * Added failing emph/strong markdown test case due to Perry Wagle. + + * Slidy improvements: + + Updated to use Slidy2. + + Fixed bug, unclosed div tag. + + Added `duration` variable in template. + Setting this activates the timer. + + Use 'titlepage' instead of 'cover' for title div. + pandoc (1.8.1.1) * `markdown2pdf`: Removed some debugging lines accidentally included @@ -291,6 +526,8 @@ to `Text.Pandoc.Readers.Parsing`, and parameterized it with an inline parser. + * Added `nonspaceChar` to `Text.Pandoc.Parsing`. + * Ellipses are no longer allowed to contain spaces. Previously we allowed '. . .', ' . . . ', etc. This caused too many complications, and removed author's flexibility in diff -Nru pandoc-1.8.1.1/debian/changelog pandoc-1.8.2.1/debian/changelog --- pandoc-1.8.1.1/debian/changelog 2011-11-12 10:59:11.000000000 +0000 +++ pandoc-1.8.2.1/debian/changelog 2011-09-29 14:40:10.000000000 +0000 @@ -1,21 +1,48 @@ -pandoc (1.8.1.1-1ubuntu3) precise; urgency=low +pandoc (1.8.2.1-2) unstable; urgency=low - * Rebuild for new GHC ABIs. + * Bump debhelper compatibility level to 7. + * Update package relations: + + Fix stop bogusly depending on libghc-rts-doc or libghc-rts-prof. + + Build-depend-indep on ghc-haddock (not on virtual haddock). + + Add ${haskell:Depends} ${haskell:Recommends} ${haskell:Suggests} + and ${haskell:Provides}, and stop explicitly suggesting *-doc + packages. + This fixes: bug#640963. Thanks to Clint Adams. + + Fix depend on ${shlibs:Depends}. + + Relax to build-depend unversioned on devscripts and debhelper: + Needed version satisfied even in oldstable. - -- Colin Watson Sat, 12 Nov 2011 10:59:10 +0000 + -- Jonas Smedegaard Thu, 29 Sep 2011 16:36:16 +0200 -pandoc (1.8.1.1-1ubuntu2) oneiric; urgency=low +pandoc (1.8.2.1-1) unstable; urgency=low - * No change rebuild against new GHC ABIs - - -- Iain Lane Thu, 09 Jun 2011 09:23:08 +0100 - -pandoc (1.8.1.1-1ubuntu1) oneiric; urgency=low - - * Change BDI to ghc-haddock explicitly. Can go away once ghc6 is removed and - there is only one package providing haddock again. + * New upstream release. + Closes: bug#640645. Thanks to Clint Adams. + * Fix adjust package dependencies for recent upstream releases: + + Suggest texlive-luatex. + + Stop suggesting texlive-latex-extra. + + Relax build-dependency on libghc-pandoc-types-dev. + * Adjust long description: Update references to suggested LaTeX + packages. + * Fix build-depend on a bunch of libghc-*-doc. + * Build-depend on a bunch of libghc-*-prof. Provide binary package + libghc-pandoc-prof. + Closes: bug#630713. Thanks to Clint Adams. + * Fix use true upstream hackage URL (not googlecode). + + -- Jonas Smedegaard Wed, 07 Sep 2011 18:10:58 +0200 + +pandoc (1.8.2-1) unstable; urgency=low + + * Build-depend on and suggest some additional -doc packages. + * Imported Upstream version 1.8.2 + * Update md5sum hint for new upstream 1.8.2 release. + * Build-depend on libghc-base64-bytestring-dev and -doc. Tighten + build-dependency on libghc-pandoc-types-dev. + * Update copyright file: Add Slidy, licensed W3C-Document and + W3C-Software. - -- Iain Lane Sun, 29 May 2011 10:36:00 +0100 + -- Jonas Smedegaard Tue, 23 Aug 2011 10:46:52 +0200 pandoc (1.8.1.1-1) unstable; urgency=low diff -Nru pandoc-1.8.1.1/debian/compat pandoc-1.8.2.1/debian/compat --- pandoc-1.8.1.1/debian/compat 2011-05-21 07:07:44.000000000 +0000 +++ pandoc-1.8.2.1/debian/compat 2011-09-29 12:35:06.000000000 +0000 @@ -1 +1 @@ -6 +7 diff -Nru pandoc-1.8.1.1/debian/control pandoc-1.8.2.1/debian/control --- pandoc-1.8.1.1/debian/control 2011-05-29 09:44:17.000000000 +0000 +++ pandoc-1.8.2.1/debian/control 2011-09-29 14:35:51.000000000 +0000 @@ -2,9 +2,9 @@ Section: text Priority: optional Maintainer: Jonas Smedegaard -Build-Depends: cdbs (>= 0.4.70~), - devscripts (>= 2.10.7~), - debhelper (>= 6), +Build-Depends: cdbs (>= 0.4.72~), + devscripts, + debhelper, dh-buildinfo, ghc, libghc-syb-dev, @@ -18,15 +18,67 @@ libghc-texmath-dev (<< 0.6), libghc-xml-dev (<< 1.4), libghc-citeproc-hs-dev (<< 0.4), + libghc-pandoc-types-dev (>= 1.8), libghc-pandoc-types-dev (<< 1.9), libghc-json-dev (<< 0.5), libghc-dlist-dev (<< 0.6), libghc-tagsoup-dev (<< 0.13), + libghc-base64-bytestring-dev (>= 0.1), + libghc-base64-bytestring-dev (<< 0.2), libghc-highlighting-kate-dev (<< 0.3), libghc-diff-dev, libghc-testpack-dev, hscolour (>= 1.8), ghc-doc, + libghc-syb-doc, + libghc-parsec3-doc, + libghc-xhtml-doc, + libghc-mtl-doc, + libghc-network-doc, + libghc-zip-archive-doc, + libghc-utf8-string-doc, + libghc-http-doc, + libghc-texmath-doc, + libghc-xml-doc, + libghc-citeproc-hs-doc, + libghc-pandoc-types-doc, + libghc-json-doc, + libghc-dlist-doc, + libghc-tagsoup-doc, + libghc-base64-bytestring-doc, + libghc-highlighting-kate-doc, + libghc-diff-doc, + libghc-testpack-doc, + libghc-binary-doc, + libghc-digest-doc, + libghc-pcre-light-doc, + libghc-transformers-doc, + libghc-zlib-doc, + ghc-prof, + libghc-syb-prof, + libghc-parsec3-prof, + libghc-xhtml-prof, + libghc-mtl-prof, + libghc-network-prof, + libghc-zip-archive-prof, + libghc-utf8-string-prof, + libghc-http-prof, + libghc-texmath-prof, + libghc-xml-prof, + libghc-citeproc-hs-prof, + libghc-pandoc-types-prof, + libghc-json-prof, + libghc-dlist-prof, + libghc-tagsoup-prof, + libghc-base64-bytestring-prof, + libghc-highlighting-kate-prof, + libghc-diff-prof, + libghc-testpack-prof, + libghc-binary-prof, + libghc-digest-prof, + libghc-pcre-light-prof, + libghc-transformers-prof, + libghc-zlib-prof, haskell-devscripts (>=0.5.12) Build-Depends-Indep: ghc-haddock Standards-Version: 3.9.2 @@ -37,7 +89,8 @@ Package: pandoc Section: text Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends} + , ${misc:Depends} Suggests: ${cdbs:Suggests} Description: general markup converter Pandoc is a Haskell library for converting from one markup format to @@ -63,14 +116,22 @@ . This package contains the pandoc tool itself, and the wrapper script markdown2pdf for converting markdown documents to PDFs via LaTeX - (requires texlive-latex-extra) or XeLaTeX (requires texlive-xetex). + (requires texlive-latex-recommended) using either PDFLaTeX, XeLaTeX + (additionally requires texlive-xetex) or LuaTeX (additionally requires + texlive-luatex). Package: libghc-pandoc-dev Section: haskell Priority: extra Architecture: any -Depends: ${haskell:Depends}, ${cdbs:Depends}, ${misc:Depends} +Depends: ${haskell:Depends} + , ${shlibs:Depends} + , ${cdbs:Depends} + , ${misc:Depends} +Recommends: ${haskell:Recommends} Suggests: ${haskell:Suggests} + , ${cdbs:Suggests} +Provides: ${haskell:Provides} Description: general markup converter Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses this library. It can read @@ -99,8 +160,11 @@ Section: doc Priority: extra Architecture: all -Depends: ${misc:Depends} -Suggests: ${cdbs:Suggests} +Depends: ${haskell:Depends} + , ${misc:Depends} +Recommends: ${haskell:Recommends} +Suggests: ${haskell:Suggests} + , ${cdbs:Suggests} Description: general markup converter Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses this library. It can read @@ -124,3 +188,37 @@ an input or output format requires only adding a reader or writer. . This package contains the library documentation for Pandoc. + +Package: libghc-pandoc-prof +Section: haskell +Priority: extra +Architecture: any +Depends: ${haskell:Depends} + , ${misc:Depends} +Recommends: ${haskell:Recommends} +Suggests: ${haskell:Suggests} + , ${cdbs:Suggests} +Provides: ${haskell:Provides} +Description: general markup converter + Pandoc is a Haskell library for converting from one markup format to + another, and a command-line tool that uses this library. It can read + markdown and (subsets of) reStructuredText, HTML, and LaTeX; and it can + write plain text, markdown, reStructuredText, HTML, LaTeX, ConTeXt, + RTF, DocBook XML, OpenDocument XML, ODT, GNU Texinfo, MediaWiki markup, + EPUB, Textile, groff man pages, Emacs Org-mode, and Slidy or S5 HTML + slide shows. + . + Pandoc's enhanced version of markdown includes syntax for footnotes, + tables, flexible ordered lists, definition lists, delimited code + blocks, superscript, subscript, strikeout, title blocks, automatic + tables of contents, embedded LaTeX math, citations, and markdown inside + HTML block elements. (These enhancements can optionally be disabled.) + . + In contrast to most existing tools for converting markdown to HTML, + which use regex substitutions, Pandoc has a modular design: it consists + of a set of readers, which parse text in a given format and produce a + native representation of the document, and a set of writers, which + convert this native representation into a target format. Thus, adding + an input or output format requires only adding a reader or writer. + . + This package contains the profiling libraries for Pandoc. diff -Nru pandoc-1.8.1.1/debian/control.in pandoc-1.8.2.1/debian/control.in --- pandoc-1.8.1.1/debian/control.in 2011-05-29 09:35:52.000000000 +0000 +++ pandoc-1.8.2.1/debian/control.in 2011-09-29 14:29:05.000000000 +0000 @@ -12,7 +12,8 @@ Package: pandoc Section: text Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends} + , ${misc:Depends} Suggests: ${cdbs:Suggests} Description: general markup converter Pandoc is a Haskell library for converting from one markup format to @@ -38,14 +39,22 @@ . This package contains the pandoc tool itself, and the wrapper script markdown2pdf for converting markdown documents to PDFs via LaTeX - (requires texlive-latex-extra) or XeLaTeX (requires texlive-xetex). + (requires texlive-latex-recommended) using either PDFLaTeX, XeLaTeX + (additionally requires texlive-xetex) or LuaTeX (additionally requires + texlive-luatex). Package: libghc-pandoc-dev Section: haskell Priority: extra Architecture: any -Depends: ${haskell:Depends}, ${cdbs:Depends}, ${misc:Depends} +Depends: ${haskell:Depends} + , ${shlibs:Depends} + , ${cdbs:Depends} + , ${misc:Depends} +Recommends: ${haskell:Recommends} Suggests: ${haskell:Suggests} + , ${cdbs:Suggests} +Provides: ${haskell:Provides} Description: general markup converter Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses this library. It can read @@ -74,8 +83,11 @@ Section: doc Priority: extra Architecture: all -Depends: ${misc:Depends} -Suggests: ${cdbs:Suggests} +Depends: ${haskell:Depends} + , ${misc:Depends} +Recommends: ${haskell:Recommends} +Suggests: ${haskell:Suggests} + , ${cdbs:Suggests} Description: general markup converter Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses this library. It can read @@ -99,3 +111,37 @@ an input or output format requires only adding a reader or writer. . This package contains the library documentation for Pandoc. + +Package: libghc-pandoc-prof +Section: haskell +Priority: extra +Architecture: any +Depends: ${haskell:Depends} + , ${misc:Depends} +Recommends: ${haskell:Recommends} +Suggests: ${haskell:Suggests} + , ${cdbs:Suggests} +Provides: ${haskell:Provides} +Description: general markup converter + Pandoc is a Haskell library for converting from one markup format to + another, and a command-line tool that uses this library. It can read + markdown and (subsets of) reStructuredText, HTML, and LaTeX; and it can + write plain text, markdown, reStructuredText, HTML, LaTeX, ConTeXt, + RTF, DocBook XML, OpenDocument XML, ODT, GNU Texinfo, MediaWiki markup, + EPUB, Textile, groff man pages, Emacs Org-mode, and Slidy or S5 HTML + slide shows. + . + Pandoc's enhanced version of markdown includes syntax for footnotes, + tables, flexible ordered lists, definition lists, delimited code + blocks, superscript, subscript, strikeout, title blocks, automatic + tables of contents, embedded LaTeX math, citations, and markdown inside + HTML block elements. (These enhancements can optionally be disabled.) + . + In contrast to most existing tools for converting markdown to HTML, + which use regex substitutions, Pandoc has a modular design: it consists + of a set of readers, which parse text in a given format and produce a + native representation of the document, and a set of writers, which + convert this native representation into a target format. Thus, adding + an input or output format requires only adding a reader or writer. + . + This package contains the profiling libraries for Pandoc. diff -Nru pandoc-1.8.1.1/debian/copyright pandoc-1.8.2.1/debian/copyright --- pandoc-1.8.1.1/debian/copyright 2011-05-21 07:10:50.000000000 +0000 +++ pandoc-1.8.2.1/debian/copyright 2011-09-07 14:42:54.000000000 +0000 @@ -1,7 +1,7 @@ Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174 Upstream-Name: pandoc Upstream-Contact: John MacFarlane -Source: http://code.google.com/p/pandoc/downloads/list +Source: http://hackage.haskell.org/packages/archive/pandoc/ Files: * Copyright: 2006-2011, John MacFarlane @@ -53,6 +53,10 @@ License: PD released into the Public Domain +Files: slidy/slidy.css +Copyright: 2005-2010, W3C (MIT, ERCIM, Keio) +License: W3C-Document and W3C-Software + Files: debian/* Copyright: 2006-2010, John MacFarlane 2007-2008, Recai Oktaş @@ -75,3 +79,95 @@ . You should have received a copy of the GNU General Public License along with this program. If not, see . + +License: W3C-Document + By using and/or copying this document, or the W3C document from which + this statement is linked, you (the licensee) agree that you have read, + understood, and will comply with the following terms and conditions: + . + Permission to copy, and distribute the contents of this document, or + the W3C document from which this statement is linked, in any medium for + any purpose and without fee or royalty is hereby granted, provided that + you include the following on ALL copies of the document, or portions + thereof, that you use: + . + A link or URL to the original W3C document. + The pre-existing copyright notice of the original author, or if it + doesn't exist, a notice (hypertext is preferred, but a textual + representation is permitted) of the form: "Copyright © + [$date-of-document] World Wide Web Consortium, (Massachusetts + Institute of Technology, European Research Consortium for + Informatics and Mathematics, Keio University). All Rights Reserved. + http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231" + If it exists, the STATUS of the W3C document. + . + When space permits, inclusion of the full text of this NOTICE should be + provided. We request that authorship attribution be provided in any + software, documents, or other items or products that you create + pursuant to the implementation of the contents of this document, or any + portion thereof. + . + No right to create modifications or derivatives of W3C documents is + granted pursuant to this license. However, if additional requirements + (documented in the Copyright FAQ) are satisfied, the right to create + modifications or derivatives is sometimes granted by the W3C to + individuals complying with those requirements. + . + Disclaimers + . + THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO + REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT + LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT + ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH + CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, + TRADEMARKS OR OTHER RIGHTS. + . + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL + OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE + PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF. + . + The name and trademarks of copyright holders may NOT be used in + advertising or publicity pertaining to this document or its contents + without specific, written prior permission. Title to copyright in this + document will at all times remain with copyright holders. + +License: W3C-Software + By obtaining, using and/or copying this work, you (the licensee) agree + that you have read, understood, and will comply with the following + terms and conditions. + . + Permission to copy, modify, and distribute this software and its + documentation, with or without modification, for any purpose and + without fee or royalty is hereby granted, provided that you include the + following on ALL copies of the software and documentation or portions + thereof, including modifications: + . + The full text of this NOTICE in a location viewable to users of the + redistributed or derivative work. + Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, the W3C Software Short Notice + should be included (hypertext is preferred, text is permitted) + within the body of any redistributed or derivative code. + Notice of any changes or modifications to the files, including the + date changes were made. (We recommend you provide URIs to the + location from which the code is derived.) + . + Disclaimers + . + THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT + HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR + DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, + TRADEMARKS OR OTHER RIGHTS. + . + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL + OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR + DOCUMENTATION. + . + The name and trademarks of copyright holders may NOT be used in + advertising or publicity pertaining to the software without specific, + written prior permission. Title to copyright in this software and any + associated documentation will at all times remain with copyright + holders. diff -Nru pandoc-1.8.1.1/debian/copyright_hints pandoc-1.8.2.1/debian/copyright_hints --- pandoc-1.8.1.1/debian/copyright_hints 2011-05-21 07:09:15.000000000 +0000 +++ pandoc-1.8.2.1/debian/copyright_hints 2011-08-22 22:31:41.000000000 +0000 @@ -38,10 +38,7 @@ s5/default/pretty.css s5/default/print.css s5/default/s5-core.css - s5/default/slides.js.comment - s5/default/slides.js.packed - slidy/slidy.min.css - slidy/slidy.min.js + s5/default/slides.min.js src/Tests/Arbitrary.hs src/Tests/Helpers.hs src/Tests/Old.hs @@ -51,25 +48,26 @@ src/Tests/Shared.hs src/Tests/Writers/ConTeXt.hs src/Tests/Writers/HTML.hs + src/Tests/Writers/Markdown.hs src/Tests/Writers/Native.hs src/markdown2pdf.hs src/test-pandoc.hs - templates/context.template - templates/docbook.template - templates/html.template - templates/latex.template - templates/man.template - templates/markdown.template - templates/mediawiki.template - templates/opendocument.template - templates/org.template - templates/plain.template - templates/rst.template - templates/rtf.template - templates/s5.template - templates/slidy.template - templates/texinfo.template - templates/textile.template + templates/default.context + templates/default.docbook + templates/default.html + templates/default.latex + templates/default.man + templates/default.markdown + templates/default.mediawiki + templates/default.opendocument + templates/default.org + templates/default.plain + templates/default.rst + templates/default.rtf + templates/default.s5 + templates/default.slidy + templates/default.texinfo + templates/default.textile tests/biblio.bib tests/chicago-author-date.csl tests/ieee.csl @@ -190,6 +188,13 @@ License: GPL-2+ FIXME +Files: src/Text/Pandoc/MIME.hs + src/Text/Pandoc/Readers/Native.hs +Copyright: 2011, John MacFarlane + : 2011, John MacFarlane +License: GPL-2+ + FIXME + Files: tests/html-reader.native tests/latex-reader.native Copyright: ",Space,Str "\169" @@ -257,12 +262,6 @@ License: GPL-2+ FIXME -Files: src/Text/Pandoc/Readers/Native.hs -Copyright: 2011, John MacFarlane - : 2011, John MacFarlane -License: GPL-2+ - FIXME - Files: COPYING Copyright: 1989, 1991 Free Software Foundation, Inc @@ -319,6 +318,12 @@ License: UNKNOWN FIXME +Files: slidy/slidy.css +Copyright: 2005-2010, W3C (MIT, ERCIM, Keio) + { font-size: smaller } +License: UNKNOWN + FIXME + Files: tests/writer.rtf Copyright: \u169?\sa180\par} License: UNKNOWN @@ -332,3 +337,8 @@ License: UNKNOWN FIXME +Files: slidy/slidy.min.js +Copyright: function(){var a,c;var d=document.getElementsByTagName("meta");for(var b=0;b= 1.8), libghc-pandoc-types-dev (<< 1.9) CDBS_BUILD_DEPENDS += , libghc-json-dev (<< 0.5) CDBS_BUILD_DEPENDS += , libghc-dlist-dev (<< 0.6) CDBS_BUILD_DEPENDS += , libghc-tagsoup-dev (<< 0.13) +CDBS_BUILD_DEPENDS += , libghc-base64-bytestring-dev (>= 0.1), libghc-base64-bytestring-dev (<< 0.2) CDBS_BUILD_DEPENDS += , libghc-highlighting-kate-dev (<< 0.3) CDBS_BUILD_DEPENDS += , libghc-diff-dev, libghc-testpack-dev CDBS_BUILD_DEPENDS += , hscolour (>= 1.8) -CDBS_BUILD_DEPENDS += , $(deps-doc) +CDBS_BUILD_DEPENDS += , $(deps-doc), $(deps-prof) # Needed for our packaging CDBS_BUILD_DEPENDS += , haskell-devscripts (>=0.5.12) # Needed (always/often/seldom) at runtime # texlive-* needed for markdown2pdf script -# (texlive-latex-recommended mostly ok except ucs.sty - see bug#571678) -CDBS_SUGGESTS_pandoc = texlive-latex-recommended, texlive-latex-extra, texlive-xetex -CDBS_SUGGESTS_libghc-pandoc-doc = $(deps-doc) +CDBS_SUGGESTS_pandoc = texlive-latex-recommended, texlive-xetex, texlive-luatex diff -Nru pandoc-1.8.1.1/debian/watch pandoc-1.8.2.1/debian/watch --- pandoc-1.8.1.1/debian/watch 2011-05-21 07:07:45.000000000 +0000 +++ pandoc-1.8.2.1/debian/watch 2011-09-07 14:45:53.000000000 +0000 @@ -1,3 +1,3 @@ # run the "uscan" command to check for upstream updates and more. version=3 -http://googlecode.debian.net/p/pandoc/pandoc-(.*)\.tar\.gz +http://hackage.haskell.org/packages/archive/pandoc/1.8.2.1/pandoc-(.*)\.tar\.gz diff -Nru pandoc-1.8.1.1/MakeManPage.hs pandoc-1.8.2.1/MakeManPage.hs --- pandoc-1.8.1.1/MakeManPage.hs 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/MakeManPage.hs 2011-08-01 18:02:52.000000000 +0000 @@ -28,7 +28,7 @@ modDeps <- modifiedDependencies markdown2pdfpage [markdown2pdfpage <.> "md"] unless (null modDeps) $ do mpdfContents <- liftM toString $ B.readFile $ markdown2pdfpage <.> "md" - templ <- liftM toString $ B.readFile $ "templates" "man.template" + templ <- liftM toString $ B.readFile $ "templates" "default.man" let doc = readMarkdown defaultParserState{ stateStandalone = True } mpdfContents writeManPage markdown2pdfpage templ doc diff -Nru pandoc-1.8.1.1/man/man1/markdown2pdf.1 pandoc-1.8.2.1/man/man1/markdown2pdf.1 --- pandoc-1.8.1.1/man/man1/markdown2pdf.1 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/man/man1/markdown2pdf.1 2011-08-01 18:02:52.000000000 +0000 @@ -47,11 +47,6 @@ .RS .RE .TP -.B --xetex -Use xelatex instead of pdflatex to create the PDF. -.RS -.RE -.TP .B -N, --number-sections Number section headings in LaTeX output. (Default is not to number them.) @@ -158,6 +153,16 @@ directory, or \f[C]s5\f[] directory placed in this directory will override pandoc\[aq]s normal defaults. .RE +.TP +.B --xetex +Use xelatex instead of pdflatex to create the PDF. +.RS +.RE +.TP +.B --luatex +Use lualatex instead of pdflatex to create the PDF. +.RS +.RE .SH SEE ALSO .PP \f[C]pandoc\f[](1), \f[C]pdflatex\f[](1) diff -Nru pandoc-1.8.1.1/man/man1/markdown2pdf.1.md pandoc-1.8.2.1/man/man1/markdown2pdf.1.md --- pandoc-1.8.1.1/man/man1/markdown2pdf.1.md 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/man/man1/markdown2pdf.1.md 2011-08-01 18:02:52.000000000 +0000 @@ -42,9 +42,6 @@ \--strict : Use strict markdown syntax, with no extensions or variants. -\--xetex -: Use xelatex instead of pdflatex to create the PDF. - -N, \--number-sections : Number section headings in LaTeX output. (Default is not to number them.) @@ -109,6 +106,12 @@ or `s5` directory placed in this directory will override pandoc's normal defaults. +\--xetex +: Use xelatex instead of pdflatex to create the PDF. + +\--luatex +: Use lualatex instead of pdflatex to create the PDF. + # SEE ALSO `pandoc`(1), `pdflatex`(1) diff -Nru pandoc-1.8.1.1/man/man1/pandoc.1 pandoc-1.8.2.1/man/man1/pandoc.1 --- pandoc-1.8.1.1/man/man1/pandoc.1 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/man/man1/pandoc.1 2011-08-01 18:02:52.000000000 +0000 @@ -1,4 +1,4 @@ -.TH PANDOC 1 "January 29, 2011" "Pandoc" +.TH PANDOC 1 "July 30, 2011" "Pandoc" .SH NAME pandoc - general markup converter .SH SYNOPSIS @@ -263,9 +263,11 @@ .RS .RE .TP -.B \f[C]--mathjax=\f[]\f[I]URL\f[] +.B \f[C]--mathjax\f[][=\f[I]URL\f[]] Use MathJax to display embedded TeX math in HTML output. The \f[I]URL\f[] should point to the \f[C]MathJax.js\f[] load script. +If a \f[I]URL\f[] is not provided, a link to the MathJax CDN will be +inserted. .RS .RE .TP @@ -304,11 +306,6 @@ .RS .RE .TP -.B \f[C]--xetex\f[] -Create LaTeX outut suitable for processing by XeTeX. -.RS -.RE -.TP .B \f[C]--chapters\f[] Treat top-level headers as chapters in LaTeX, ConTeXt, and DocBook output. @@ -397,18 +394,22 @@ Use \f[I]FILE\f[] as a custom template for the generated document. Implies \f[C]--standalone\f[]. See Templates below for a description of template syntax. +If no extension is specified, an extension corresponding to the writer +will be added, so that \f[C]--template=special\f[] looks for +\f[C]special.html\f[] for HTML output. +If the template is not found, pandoc will search for it in the user data +directory (see \f[C]--data-dir\f[]). If this option is not used, a default template appropriate for the -output format will be used. -See also \f[C]-D/--print-default-template\f[]. +output format will be used (see \f[C]-D/--print-default-template\f[]). .RS .RE .TP .B \f[C]-V\f[] \f[I]KEY=VAL\f[], \f[C]--variable=\f[]\f[I]KEY:VAL\f[] Set the template variable \f[I]KEY\f[] to the value \f[I]VAL\f[] when rendering the document in standalone mode. -This is only useful when the \f[C]--template\f[] option is used to -specify a custom template, since pandoc automatically sets the variables -used in the default templates. +This is generally only useful when the \f[C]--template\f[] option is +used to specify a custom template, since pandoc automatically sets the +variables used in the default templates. .RS .RE .TP @@ -475,6 +476,13 @@ .RS .RE .TP +.B \f[C]--epub-cover-image=\f[]\f[I]FILE\f[] +Use the specified image as the EPUB cover. +It is recommended that the image be less than 1000px in width and +height. +.RS +.RE +.TP .B \f[C]--epub-metadata=\f[]\f[I]FILE\f[] Look in the specified XML file for metadata for the EPUB. The file should contain a series of Dublin Core elements, as documented @@ -551,6 +559,16 @@ author-date style. .RE .TP +.B \f[C]--natbib\f[] +Use natbib for citations in LaTeX output. +.RS +.RE +.TP +.B \f[C]--biblatex\f[] +Use biblatex for citations in LaTeX output. +.RS +.RE +.TP .B \f[C]--data-dir=\f[]\f[I]DIRECTORY\f[] Specify the user data directory to search for pandoc data files. If this option is not specified, the default user data directory will be @@ -639,7 +657,7 @@ A custom template can be specified using the \f[C]--template\f[] option. You can also override the system default templates for a given output format \f[C]FORMAT\f[] by putting a file -\f[C]templates/FORMAT.template\f[] in the user data directory (see +\f[C]templates/default.FORMAT\f[] in the user data directory (see \f[C]--data-dir\f[], above). .PP Templates may contain \f[I]variables\f[]. @@ -710,6 +728,17 @@ language code for HTML documents .RS .RE +.TP +.B \f[C]slidy-url\f[] +base URL for Slidy documents (defaults to +\f[C]http://www.w3.org/Talks/Tools/Slidy2\f[]) +.RS +.RE +.TP +.B \f[C]s5-url\f[] +base URL for S5 documents (defaults to \f[C]ui/default\f[]) +.RS +.RE .PP Variables may be set at the command line using the \f[C]-V/--variable\f[] option. @@ -753,6 +782,14 @@ $for(author)$$author$$sep$,\ $endfor$ \f[] .fi +.PP +If you use custom templates, you may need to revise them as pandoc +changes. +We recommend tracking the changes in the default templates, and +modifying your custom templates accordingly. +An easy way to do this is to fork the pandoc-templates repository +(\f[C]http://github.com/jgm/pandoc-templates\f[]) and merge in changes +after each pandoc release. .SH PRODUCING HTML SLIDE SHOWS WITH PANDOC .PP You can use Pandoc to produce an HTML + javascript slide presentation @@ -810,7 +847,9 @@ embeds a link to javascripts and CSS files, which are assumed to be available at the relative path \f[C]ui/default\f[] (for S5) or at the Slidy website at \f[C]w3.org\f[] (for Slidy). -If the \f[C]--offline\f[] option is specified, the scripts and CSS will +(These paths can be changed by setting the \f[C]slidy-url\f[] or +\f[C]s5-url\f[] variables; see \f[C]--variable\f[], above.) + If the \f[C]--offline\f[] option is specified, the scripts and CSS will be included directly in the generated file, so that it may be used offline. .PP @@ -904,7 +943,8 @@ Other contributors include Recai Oktaş, Paulo Tanimoto, Peter Wang, Andrea Rossato, Eric Kow, infinity0x, Luke Plant, shreevatsa.public, Puneeth Chaganti, Paul Rivier, rodja.trappe, Bradley Kuhn, thsutton, -Nathan Gass, Jonathan Daugherty, Jérémy Bobbio, Justin Bogner. +Nathan Gass, Jonathan Daugherty, Jérémy Bobbio, Justin Bogner, qerub, +Christopher Sawicki, Kelsey Hightower. .SH PANDOC'S MARKDOWN For a complete description of pandoc's extensions to standard markdown, see \f[C]pandoc_markdown\f[] (5). diff -Nru pandoc-1.8.1.1/man/man5/pandoc_markdown.5 pandoc-1.8.2.1/man/man5/pandoc_markdown.5 --- pandoc-1.8.1.1/man/man5/pandoc_markdown.5 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/man/man5/pandoc_markdown.5 2011-08-01 18:02:52.000000000 +0000 @@ -1,5 +1,5 @@ .\"t -.TH PANDOC_MARKDOWN 5 "January 29, 2011" "Pandoc" +.TH PANDOC_MARKDOWN 5 "July 30, 2011" "Pandoc" .SH NAME pandoc_markdown - markdown syntax for pandoc(1) .SH DESCRIPTION @@ -1040,6 +1040,10 @@ ellipses. Nonbreaking spaces are inserted after certain abbreviations, such as "Mr." +.PP +Note: if your LaTeX template uses the \f[C]csquotes\f[] package, pandoc +will detect automatically this and use \f[C]\\enquote{...}\f[] for +quoted text. .SH INLINE FORMATTING .SS Emphasis .PP @@ -1629,6 +1633,7 @@ \f[C]http://citationstyles.org/downloads/primer.html\f[]. A repository of CSL styles can be found at \f[C]https://github.com/citation-style-language/styles\f[]. +See also \f[C]http://zotero.org/styles\f[] for easy browsing. .PP Citations go inside square brackets and are separated by semicolons. Each citation must have a key, composed of \[aq]\@\[aq] + the citation diff -Nru pandoc-1.8.1.1/pandoc.cabal pandoc-1.8.2.1/pandoc.cabal --- pandoc-1.8.1.1/pandoc.cabal 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/pandoc.cabal 2011-08-01 18:02:52.000000000 +0000 @@ -1,5 +1,5 @@ Name: pandoc -Version: 1.8.1.1 +Version: 1.8.2.1 Cabal-Version: >= 1.6 Build-Type: Custom License: GPL @@ -7,11 +7,11 @@ Copyright: (c) 2006-2011 John MacFarlane Author: John MacFarlane Maintainer: John MacFarlane -Bug-Reports: http://code.google.com/p/pandoc/issues/list +Bug-Reports: https://github.com/jgm/pandoc/issues Stability: alpha Homepage: http://johnmacfarlane.net/pandoc Category: Text -Tested-With: GHC == 6.10.4, GHC == 6.12.1, GHC == 6.12.3, GHC == 7.0.1 +Tested-With: GHC == 6.12.3, GHC == 7.0.3 Synopsis: Conversion between markup formats Description: Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses @@ -37,14 +37,14 @@ only adding a reader or writer. Data-Files: -- templates - templates/html.template, templates/docbook.template, - templates/opendocument.template, templates/latex.template, - templates/context.template, templates/texinfo.template, - templates/man.template, templates/markdown.template, - templates/rst.template, templates/plain.template, - templates/mediawiki.template, templates/rtf.template, - templates/s5.template, templates/slidy.template, - templates/textile.template, templates/org.template + templates/default.html, templates/default.docbook, + templates/default.opendocument, templates/default.latex, + templates/default.context, templates/default.texinfo, + templates/default.man, templates/default.markdown, + templates/default.rst, templates/default.plain, + templates/default.mediawiki, templates/default.rtf, + templates/default.s5, templates/default.slidy, + templates/default.textile, templates/default.org -- data for ODT writer reference.odt, -- stylesheet for EPUB writer @@ -53,8 +53,7 @@ data/LaTeXMathML.js, data/MathMLinHTML.js, -- data for S5 writer - s5/default/slides.js.comment, - s5/default/slides.js.packed, + s5/default/slides.min.js, s5/default/s5-core.css, s5/default/framing.css, s5/default/pretty.css, @@ -62,7 +61,7 @@ s5/default/outline.css, s5/default/print.css, -- data for slidy writer - slidy/slidy.min.css, + slidy/slidy.css, slidy/slidy.min.js, -- data for citeproc default.csl, @@ -211,7 +210,8 @@ pandoc-types == 1.8.*, json >= 0.4 && < 0.5, dlist >= 0.4 && < 0.6, - tagsoup >= 0.12 && < 0.13 + tagsoup >= 0.12 && < 0.13, + base64-bytestring >= 0.1 && < 0.2 if impl(ghc >= 6.10) Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4 else @@ -262,6 +262,7 @@ Text.Pandoc.Biblio Other-Modules: Text.Pandoc.XML, Text.Pandoc.UTF8, + Text.Pandoc.MIME, Text.Pandoc.UUID, Paths_pandoc @@ -295,7 +296,8 @@ pandoc-types == 1.8.*, json >= 0.4 && < 0.5, dlist >= 0.4 && < 0.6, - tagsoup >= 0.12 && < 0.13 + tagsoup >= 0.12 && < 0.13, + base64-bytestring >= 0.1 && < 0.2 if impl(ghc >= 6.10) Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4 else @@ -349,7 +351,7 @@ else Ghc-Options: -Wall Extensions: CPP - Build-Depends: base >= 4 && < 5, Diff, test-framework >= 0.3 && < 0.4, + Build-Depends: base >= 4 && < 5, Diff, test-framework >= 0.3 && < 0.5, test-framework-hunit >= 0.2 && < 0.3, test-framework-quickcheck2 >= 0.2.9 && < 0.3, QuickCheck >= 2.4 && < 2.6, @@ -366,3 +368,4 @@ Tests.Writers.Native Tests.Writers.ConTeXt Tests.Writers.HTML + Tests.Writers.Markdown diff -Nru pandoc-1.8.1.1/README pandoc-1.8.2.1/README --- pandoc-1.8.1.1/README 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/README 2011-08-01 18:02:52.000000000 +0000 @@ -1,6 +1,6 @@ % Pandoc User's Guide % John MacFarlane -% January 29, 2011 +% July 30, 2011 Synopsis ======== @@ -238,9 +238,11 @@ no link to the jsMath load script will be inserted; it is then up to the author to provide such a link in the HTML template. -`--mathjax=`*URL* +`--mathjax`[=*URL*] : Use [MathJax] to display embedded TeX math in HTML output. The *URL* should point to the `MathJax.js` load script. + If a *URL* is not provided, a link to the MathJax CDN will + be inserted. `--gladtex` : Enclose TeX math in `` tags in HTML output. These can then @@ -265,9 +267,6 @@ show in the output, so that the slide show will work even when no internet connection is available. -`--xetex` -: Create LaTeX outut suitable for processing by XeTeX. - `--chapters` : Treat top-level headers as chapters in LaTeX, ConTeXt, and DocBook output. @@ -327,13 +326,17 @@ `--template=`*FILE* : Use *FILE* as a custom template for the generated document. Implies `--standalone`. See [Templates](#templates) below for a description - of template syntax. If this option is not used, a default - template appropriate for the output format will be used. See also - `-D/--print-default-template`. + of template syntax. If no extension is specified, an extension + corresponding to the writer will be added, so that `--template=special` + looks for `special.html` for HTML output. If the template is not + found, pandoc will search for it in the user data directory + (see `--data-dir`). If this option is not used, a default + template appropriate for the output format will be used (see + `-D/--print-default-template`). `-V` *KEY=VAL*, `--variable=`*KEY:VAL* : Set the template variable *KEY* to the value *VAL* when rendering the - document in standalone mode. This is only useful when the + document in standalone mode. This is generally only useful when the `--template` option is used to specify a custom template, since pandoc automatically sets the variables used in the default templates. @@ -379,6 +382,10 @@ user data directory (see `--data-dir`, below). If it is not found there, sensible defaults will be used. +`--epub-cover-image=`*FILE* +: Use the specified image as the EPUB cover. It is recommended + that the image be less than 1000px in width and height. + `--epub-metadata=`*FILE* : Look in the specified XML file for metadata for the EPUB. The file should contain a series of Dublin Core elements, @@ -431,6 +438,12 @@ user data directory (see `--data-dir`), or, if that is not present, the Chicago author-date style. +`--natbib` +: Use natbib for citations in LaTeX output. + +`--biblatex` +: Use biblatex for citations in LaTeX output. + `--data-dir=`*DIRECTORY* : Specify the user data directory to search for pandoc data files. If this option is not specified, the default user data directory @@ -491,7 +504,7 @@ where `FORMAT` is the name of the output format. A custom template can be specified using the `--template` option. You can also override the system default templates for a given output format `FORMAT` -by putting a file `templates/FORMAT.template` in the user data +by putting a file `templates/default.FORMAT` in the user data directory (see `--data-dir`, above). Templates may contain *variables*. Variable names are sequences of @@ -530,6 +543,11 @@ : date of document, as specified in title block `lang` : language code for HTML documents +`slidy-url` +: base URL for Slidy documents (defaults to + `http://www.w3.org/Talks/Tools/Slidy2`) +`s5-url` +: base URL for S5 documents (defaults to `ui/default`) Variables may be set at the command line using the `-V/--variable` option. This allows users to include custom variables in their @@ -560,6 +578,13 @@ $for(author)$$author$$sep$, $endfor$ +If you use custom templates, you may need to revise them as pandoc +changes. We recommend tracking the changes in the default templates, +and modifying your custom templates accordingly. An easy way to do this +is to fork the pandoc-templates repository +() and merge in changes after each +pandoc release. + Pandoc's markdown ================= @@ -1372,6 +1397,9 @@ to Em-dashes, and `...` to ellipses. Nonbreaking spaces are inserted after certain abbreviations, such as "Mr." +Note: if your LaTeX template uses the `csquotes` package, pandoc will +detect automatically this and use `\enquote{...}` for quoted text. + Inline formatting ----------------- @@ -1805,6 +1833,7 @@ . A repository of CSL styles can be found at . +See also for easy browsing. Citations go inside square brackets and are separated by semicolons. Each citation must have a key, composed of '@' + the citation @@ -1883,7 +1912,9 @@ The file produced by pandoc with the `-s/--standalone` option embeds a link to javascripts and CSS files, which are assumed to be available at the relative path `ui/default` (for S5) or at the Slidy website at -`w3.org` (for Slidy). If the `--offline` option is specified, the +`w3.org` (for Slidy). (These paths can be changed by setting the +`slidy-url` or `s5-url` variables; see `--variable`, above.) +If the `--offline` option is specified, the scripts and CSS will be included directly in the generated file, so that it may be used offline. @@ -1963,7 +1994,8 @@ Other contributors include Recai Oktaş, Paulo Tanimoto, Peter Wang, Andrea Rossato, Eric Kow, infinity0x, Luke Plant, shreevatsa.public, Puneeth Chaganti, Paul Rivier, rodja.trappe, Bradley Kuhn, thsutton, -Nathan Gass, Jonathan Daugherty, Jérémy Bobbio, Justin Bogner. +Nathan Gass, Jonathan Daugherty, Jérémy Bobbio, Justin Bogner, qerub, +Christopher Sawicki, Kelsey Hightower. [markdown]: http://daringfireball.net/projects/markdown/ [reStructuredText]: http://docutils.sourceforge.net/docs/ref/rst/introduction.html @@ -1981,7 +2013,7 @@ [groff man]: http://developer.apple.com/DOCUMENTATION/Darwin/Reference/ManPages/man7/groff_man.7.html [Haskell]: http://www.haskell.org/ [GNU Texinfo]: http://www.gnu.org/software/texinfo/ -[Emacs Org-Mode]: http://org-mode.org +[Emacs Org-Mode]: http://orgmode.org [EPUB]: http://www.idpf.org/ [GPL]: http://www.gnu.org/copyleft/gpl.html "GNU General Public License" Binary files /tmp/I_XxbdJ758/pandoc-1.8.1.1/reference.odt and /tmp/LPAfXw7qnM/pandoc-1.8.2.1/reference.odt differ diff -Nru pandoc-1.8.1.1/s5/default/slides.js.comment pandoc-1.8.2.1/s5/default/slides.js.comment --- pandoc-1.8.1.1/s5/default/slides.js.comment 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/s5/default/slides.js.comment 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -// S5 v1.1 slides.js -- released into the Public Domain -// -// Please see http://www.meyerweb.com/eric/tools/s5/credits.html for information -// about all the wonderful and talented contributors to this code! diff -Nru pandoc-1.8.1.1/s5/default/slides.js.packed pandoc-1.8.2.1/s5/default/slides.js.packed --- pandoc-1.8.1.1/s5/default/slides.js.packed 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/s5/default/slides.js.packed 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -var undef;var slideCSS='';var snum=0;var smax=1;var incpos=0;var number=undef;var s5mode=true;var defaultView='slideshow';var controlVis='visible';var isIE=navigator.appName=='Microsoft Internet Explorer'&&navigator.userAgent.indexOf('Opera')<1?1:0;var isOp=navigator.userAgent.indexOf('Opera')>-1?1:0;var isGe=navigator.userAgent.indexOf('Gecko')>-1&&navigator.userAgent.indexOf('Safari')<1?1:0;function hasClass(object,className){if(!object.className)return false;return(object.className.search('(^|\\s)'+className+'(\\s|$)')!=-1);} -function hasValue(object,value){if(!object)return false;return(object.search('(^|\\s)'+value+'(\\s|$)')!=-1);} -function removeClass(object,className){if(!object)return;object.className=object.className.replace(new RegExp('(^|\\s)'+className+'(\\s|$)'),RegExp.$1+RegExp.$2);} -function addClass(object,className){if(!object||hasClass(object,className))return;if(object.className){object.className+=' '+className;}else{object.className=className;}} -function GetElementsWithClassName(elementName,className){var allElements=document.getElementsByTagName(elementName);var elemColl=new Array();for(var i=0;i '+'\/<\/span> '+''+(smax-1)+'<\/span>';if(snum==0){cs.style.visibility='hidden';}else{cs.style.visibility='visible';}} -function go(step){if(document.getElementById('slideProj').disabled||step==0)return;var jl=document.getElementById('jumplist');var cid='slide'+snum;var ce=document.getElementById(cid);if(incrementals[snum].length>0){for(var i=0;ilmax)snum=lmax;if(snum<0)snum=0;}else -snum=parseInt(jl.value);var nid='slide'+snum;var ne=document.getElementById(nid);if(!ne){ne=document.getElementById('slide0');snum=0;} -if(step<0){incpos=incrementals[snum].length}else{incpos=0;} -if(incrementals[snum].length>0&&incpos==0){for(var i=0;i0&&incpos>0) -addClass(incrementals[snum][incpos-1],'current');ce.style.visibility='hidden';ne.style.visibility='visible';jl.selectedIndex=snum;currentSlide();number=0;} -function goTo(target){if(target>=smax||target==snum)return;go(target-snum);} -function subgo(step){if(step>0){removeClass(incrementals[snum][incpos-1],'current');removeClass(incrementals[snum][incpos],'incremental');addClass(incrementals[snum][incpos],'current');incpos++;}else{incpos--;removeClass(incrementals[snum][incpos],'current');addClass(incrementals[snum][incpos],'incremental');addClass(incrementals[snum][incpos-1],'current');}} -function toggle(){var slideColl=GetElementsWithClassName('*','slide');var slides=document.getElementById('slideProj');var outline=document.getElementById('outlineStyle');if(!slides.disabled){slides.disabled=true;outline.disabled=false;s5mode=false;fontSize('1em');for(var n=0;n=incrementals[snum].length){go(1);}else{subgo(1);} -break;case 33:case 37:case 38:if(number!=undef){go(-1*number);}else if(!incrementals[snum]||incpos<=0){go(-1);}else{subgo(-1);} -break;case 36:goTo(0);break;case 35:goTo(smax-1);break;case 67:showHide('k');break;} -if(key.which<48||key.which>57){number=undef;}else{if(window.event&&isParentOrSelf(window.event.srcElement,'controls'))return;if(key.target&&isParentOrSelf(key.target,'controls'))return;number=(((number!=undef)?number:0)*10)+(key.which-48);}} -return false;} -function clicker(e){number=undef;var target;if(window.event){target=window.event.srcElement;e=window.event;}else target=e.target;if(target.getAttribute('href')!=null||hasValue(target.rel,'external')||isParentOrSelf(target,'controls')||isParentOrSelf(target,'embed')||isParentOrSelf(target,'object'))return true;if(!e.which||e.which==1){if(!incrementals[snum]||incpos>=incrementals[snum].length){go(1);}else{subgo(1);}}} -function findSlide(hash){var target=null;var slides=GetElementsWithClassName('*','slide');for(var i=0;i'+'
" JavascriptObfuscation -> (script ! [thetype "text/javascript"] $ - primHtml ("\n\n")) +++ + "document.write(''+" ++ + linkText ++ "+'<\\/'+'a'+'>');\n// -->\n")) +++ noscript (primHtml $ obfuscateString altText) _ -> error $ "Unknown obfuscation method: " ++ show meth _ -> anchor ! [href s] $ stringToHtml opts txt -- malformed email -- | Obfuscate character as entity. obfuscateChar :: Char -> String -obfuscateChar char = +obfuscateChar char = let num = ord char numstr = if even num then show num else "x" ++ showHex num "" in "&#" ++ numstr ++ ";" @@ -323,6 +318,17 @@ [prefixedId opts id' | not (null id')] ++ map (\(x,y) -> strAttr x y) keyvals +imageExts :: [String] +imageExts = [ "art", "bmp", "cdr", "cdt", "cpt", "cr2", "crw", "djvu", "erf", + "gif", "ico", "ief", "jng", "jpg", "jpeg", "nef", "orf", "pat", "pbm", + "pcx", "pgm", "png", "pnm", "ppm", "psd", "ras", "rgb", "svg", "tiff", + "wbmp", "xbm", "xpm", "xwd" ] + +treatAsImage :: FilePath -> Bool +treatAsImage fp = + let ext = map toLower $ drop 1 $ takeExtension fp + in null ext || ext `elem` imageExts + -- | Convert Pandoc block element to HTML. blockToHtml :: WriterOptions -> Block -> State WriterState Html blockToHtml _ Null = return noHtml @@ -361,14 +367,14 @@ return h blockToHtml opts (BlockQuote blocks) = -- in S5, treat list in blockquote specially - -- if default is incremental, make it nonincremental; + -- if default is incremental, make it nonincremental; -- otherwise incremental if writerSlideVariant opts /= NoSlides then let inc = not (writerIncremental opts) in - case blocks of + case blocks of [BulletList lst] -> blockToHtml (opts {writerIncremental = inc}) (BulletList lst) - [OrderedList attribs lst] -> + [OrderedList attribs lst] -> blockToHtml (opts {writerIncremental = inc}) (OrderedList attribs lst) _ -> do contents <- blockListToHtml opts blocks @@ -377,7 +383,7 @@ else do contents <- blockListToHtml opts blocks return $ blockquote (nl opts +++ contents +++ nl opts) -blockToHtml opts (Header level lst) = do +blockToHtml opts (Header level lst) = do contents <- inlineListToHtml opts lst secnum <- liftM stSecNum get let contents' = if writerNumberSections opts @@ -470,8 +476,8 @@ 0 -> "header" x | x `rem` 2 == 1 -> "odd" _ -> "even" - cols'' <- sequence $ zipWith - (\alignment item -> tableItemToHtml opts mkcell alignment item) + cols'' <- sequence $ zipWith + (\alignment item -> tableItemToHtml opts mkcell alignment item) aligns cols' return $ (tr ! [theclass rowclass] $ nl opts +++ toHtmlFromList cols'') +++ nl opts @@ -508,13 +514,13 @@ -- | Convert list of Pandoc inline elements to HTML. inlineListToHtml :: WriterOptions -> [Inline] -> State WriterState Html -inlineListToHtml opts lst = +inlineListToHtml opts lst = mapM (inlineToHtml opts) lst >>= return . toHtmlFromList -- | Convert Pandoc inline element to HTML. inlineToHtml :: WriterOptions -> Inline -> State WriterState Html inlineToHtml opts inline = - case inline of + case inline of (Str str) -> return $ stringToHtml opts str (Space) -> return $ stringToHtml opts " " (LineBreak) -> return br @@ -543,9 +549,9 @@ stringToHtml opts "”") in do contents <- inlineListToHtml opts lst return $ leftQuote +++ contents +++ rightQuote - (Math t str) -> modify (\st -> st {stMath = True}) >> + (Math t str) -> modify (\st -> st {stMath = True}) >> (case writerHTMLMathMethod opts of - LaTeXMathML _ -> + LaTeXMathML _ -> -- putting LaTeXMathML in container with class "LaTeX" prevents -- non-math elements on the page from being treated as math by -- the javascript @@ -594,37 +600,44 @@ LaTeXMathML _ -> do modify (\st -> st {stMath = True}) return $ primHtml str _ -> return noHtml - (RawInline "html" str) -> return $ primHtml str + (RawInline "html" str) -> return $ primHtml str (RawInline _ _) -> return noHtml (Link [Code _ str] (s,_)) | "mailto:" `isPrefixOf` s -> return $ obfuscateLink opts str s (Link txt (s,_)) | "mailto:" `isPrefixOf` s -> do - linkText <- inlineListToHtml opts txt + linkText <- inlineListToHtml opts txt return $ obfuscateLink opts (show linkText) s (Link txt (s,tit)) -> do linkText <- inlineListToHtml opts txt - return $ anchor ! ([href s] ++ - if null tit then [] else [title tit]) $ + return $ anchor ! ([href s] ++ + if null tit then [] else [title tit]) $ linkText - (Image txt (s,tit)) -> do + (Image txt (s,tit)) | treatAsImage s -> do let alternate' = stringify txt let attributes = [src s] ++ - (if null tit - then [] - else [title tit]) ++ - if null txt - then [] + (if null tit + then [] + else [title tit]) ++ + if null txt + then [] else [alt alternate'] - return $ image ! attributes - -- note: null title included, as in Markdown.pl - (Note contents) -> do + return $ image ! attributes + -- note: null title included, as in Markdown.pl + (Image _ (s,tit)) -> do + let attributes = [src s] ++ + (if null tit + then [] + else [title tit]) + return $ itag "embed" ! attributes + -- note: null title included, as in Markdown.pl + (Note contents) -> do st <- get let notes = stNotes st let number = (length notes) + 1 let ref = show number - htmlContents <- blockListToNote opts ref contents + htmlContents <- blockListToNote opts ref contents -- push contents onto front of notes - put $ st {stNotes = (htmlContents:notes)} + put $ st {stNotes = (htmlContents:notes)} return $ sup << anchor ! [href ("#" ++ writerIdentifierPrefix opts ++ "fn" ++ ref), theclass "footnoteRef", @@ -635,9 +648,8 @@ blockListToNote opts ref blocks = -- If last block is Para or Plain, include the backlink at the end of -- that block. Otherwise, insert a new Plain block with the backlink. - let backlink = [RawInline "html" $ " " ++ + let backlink = [RawInline "html" $ " " ++ (if writerAscii opts then "↩" else "↩") ++ ""] blocks' = if null blocks then [] @@ -652,4 +664,3 @@ Plain backlink] in do contents <- blockListToHtml opts blocks' return $ nl opts +++ (li ! [prefixedId opts ("fn" ++ ref)]) contents - diff -Nru pandoc-1.8.1.1/src/Text/Pandoc/Writers/LaTeX.hs pandoc-1.8.2.1/src/Text/Pandoc/Writers/LaTeX.hs --- pandoc-1.8.1.1/src/Text/Pandoc/Writers/LaTeX.hs 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/src/Text/Pandoc/Writers/LaTeX.hs 2011-08-01 18:02:52.000000000 +0000 @@ -34,7 +34,9 @@ import Text.Pandoc.Shared import Text.Pandoc.Templates import Text.Printf ( printf ) -import Data.List ( (\\), isSuffixOf, isPrefixOf, intercalate, intersperse ) +import Network.URI ( isAbsoluteURI, unEscapeString ) +import Data.List ( (\\), isSuffixOf, isInfixOf, + isPrefixOf, intercalate, intersperse ) import Data.Char ( toLower, isPunctuation ) import Control.Monad.State import Text.Pandoc.Pretty @@ -42,6 +44,9 @@ data WriterState = WriterState { stInNote :: Bool -- @True@ if we're in a note + , stInTable :: Bool -- @True@ if we're in a table + , stTableNotes :: [(Char, Doc)] -- List of markers, notes + -- in current table , stOLLevel :: Int -- level of ordered list nesting , stOptions :: WriterOptions -- writer options, so they don't have to be parameter , stVerbInNote :: Bool -- true if document has verbatim text in note @@ -53,17 +58,20 @@ , stGraphics :: Bool -- true if document contains images , stLHS :: Bool -- true if document has literate haskell code , stBook :: Bool -- true if document uses book or memoir class + , stCsquotes :: Bool -- true if document uses csquotes } -- | Convert Pandoc to LaTeX. writeLaTeX :: WriterOptions -> Pandoc -> String writeLaTeX options document = evalState (pandocToLaTeX options document) $ - WriterState { stInNote = False, stOLLevel = 1, stOptions = options, + WriterState { stInNote = False, stInTable = False, + stTableNotes = [], stOLLevel = 1, stOptions = options, stVerbInNote = False, stEnumerate = False, stTable = False, stStrikeout = False, stSubscript = False, stUrl = False, stGraphics = False, - stLHS = False, stBook = writerChapters options } + stLHS = False, stBook = writerChapters options, + stCsquotes = False } pandocToLaTeX :: WriterOptions -> Pandoc -> State WriterState String pandocToLaTeX options (Pandoc (Meta title authors date) blocks) = do @@ -73,6 +81,10 @@ "{report}" `isSuffixOf` x) when (any usesBookClass (lines template)) $ modify $ \s -> s{stBook = True} + -- check for \usepackage...{csquotes}; if present, we'll use + -- \enquote{...} for smart quotes: + when ("{csquotes}" `isInfixOf` template) $ + modify $ \s -> s{stCsquotes = True} opts <- liftM stOptions get let colwidth = if writerWrapText opts then Just $ writerColumns opts @@ -106,7 +118,6 @@ , ("title", titletext) , ("date", dateText) ] ++ [ ("author", a) | a <- authorsText ] ++ - [ ("xetex", "yes") | writerXeTeX options ] ++ [ ("verbatim-in-note", "yes") | stVerbInNote st ] ++ [ ("fancy-enums", "yes") | stEnumerate st ] ++ [ ("tables", "yes") | stTable st ] ++ @@ -147,14 +158,6 @@ inCmd :: String -> Doc -> Doc inCmd cmd contents = char '\\' <> text cmd <> braces contents --- | Remove all code elements from list of inline elements --- (because it's illegal to have verbatim inside some command arguments) -deVerb :: [Inline] -> [Inline] -deVerb [] = [] -deVerb ((Code _ str):rest) = - (RawInline "latex" $ "\\texttt{" ++ stringToLaTeX str ++ "}"):(deVerb rest) -deVerb (other:rest) = other:(deVerb rest) - -- | Convert Pandoc block element to LaTeX. blockToLaTeX :: Block -- ^ Block to convert -> State WriterState Doc @@ -211,8 +214,9 @@ | null params = empty | otherwise = "[" <> hsep (intersperse "," (map text params)) <> "]" - return $ "\\begin{" <> text env <> "}" <> printParams $$ flush (text str) $$ - "\\end{" <> text env <> "}" $$ cr -- final cr needed because of footnotes + return $ flush ("\\begin{" <> text env <> "}" <> printParams $$ text str $$ + "\\end{" <> text env <> "}") $$ cr + -- final cr needed because of footnotes blockToLaTeX (RawBlock "latex" x) = return $ text x <> blankline blockToLaTeX (RawBlock _ _) = return empty blockToLaTeX (BulletList lst) = do @@ -244,14 +248,13 @@ blockToLaTeX HorizontalRule = return $ "\\begin{center}\\rule{3in}{0.4pt}\\end{center}" $$ blankline blockToLaTeX (Header level lst) = do - let lst' = deVerb lst - txt <- inlineListToLaTeX lst' + txt <- inlineListToLaTeX lst let noNote (Note _) = Str "" noNote x = x - let lstNoNotes = bottomUp noNote lst' + let lstNoNotes = bottomUp noNote lst -- footnotes in sections don't work unless you specify an optional -- argument: \section[mysec]{mysec\footnote{blah}} - optional <- if lstNoNotes == lst' + optional <- if lstNoNotes == lst then return empty else do res <- inlineListToLaTeX lstNoNotes @@ -269,47 +272,61 @@ 5 -> headerWith "\\subparagraph" stuffing _ -> txt $$ blankline blockToLaTeX (Table caption aligns widths heads rows) = do + modify $ \s -> s{ stInTable = True, stTableNotes = [] } headers <- if all null heads then return empty - else liftM ($$ "\\hline") $ (tableRowToLaTeX widths) heads + else liftM ($$ "\\ML") + $ (tableRowToLaTeX True aligns widths) heads captionText <- inlineListToLaTeX caption - rows' <- mapM (tableRowToLaTeX widths) rows - let colDescriptors = concat $ zipWith toColDescriptor widths aligns - let tableBody = text ("\\begin{tabular}{" ++ colDescriptors ++ "}") $$ - headers $$ vcat rows' $$ "\\end{tabular}" - let centered txt = "\\begin{center}" $$ txt $$ "\\end{center}" - modify $ \s -> s{ stTable = True } - return $ if isEmpty captionText - then centered tableBody $$ blankline - else "\\begin{table}[h]" $$ centered tableBody $$ - inCmd "caption" captionText $$ "\\end{table}" $$ blankline + let capt = if isEmpty captionText + then empty + else text "caption = " <> captionText <> "," <> space + rows' <- mapM (tableRowToLaTeX False aligns widths) rows + let rows'' = intersperse ("\\\\\\noalign{\\medskip}") rows' + tableNotes <- liftM (reverse . stTableNotes) get + let toNote (marker, x) = "\\tnote" <> brackets (char marker) <> + braces (nest 2 x) + let notes = vcat $ map toNote tableNotes + let colDescriptors = text $ concat $ map toColDescriptor aligns + let tableBody = + ("\\ctable" <> brackets (capt <> text "pos = H, center, botcap")) + <> braces colDescriptors + $$ braces ("% notes" <> cr <> notes <> cr) + $$ braces (text "% rows" $$ "\\FL" $$ + vcat (headers : rows'') $$ "\\LL" <> cr) + modify $ \s -> s{ stTable = True, stInTable = False, stTableNotes = [] } + return $ tableBody $$ blankline -toColDescriptor :: Double -> Alignment -> String -toColDescriptor 0 align = +toColDescriptor :: Alignment -> String +toColDescriptor align = case align of AlignLeft -> "l" AlignRight -> "r" AlignCenter -> "c" AlignDefault -> "l" -toColDescriptor width align = ">{\\PBS" ++ - (case align of - AlignLeft -> "\\raggedright" - AlignRight -> "\\raggedleft" - AlignCenter -> "\\centering" - AlignDefault -> "\\raggedright") ++ - "\\hspace{0pt}}p{" ++ printf "%.2f" width ++ "\\columnwidth}" blockListToLaTeX :: [Block] -> State WriterState Doc blockListToLaTeX lst = mapM blockToLaTeX lst >>= return . vcat -tableRowToLaTeX :: [Double] -> [[Block]] -> State WriterState Doc -tableRowToLaTeX widths cols = do +tableRowToLaTeX :: Bool + -> [Alignment] + -> [Double] + -> [[Block]] + -> State WriterState Doc +tableRowToLaTeX header aligns widths cols = do renderedCells <- mapM blockListToLaTeX cols - let toCell 0 c = c - toCell w c = "\\parbox{" <> text (printf "%.2f" w) <> - "\\columnwidth}{" <> c <> cr <> "}" - let cells = zipWith toCell widths renderedCells - return $ (hcat $ intersperse (" & ") cells) <> "\\\\" + let valign = text $ if header then "[b]" else "[t]" + let halign x = case x of + AlignLeft -> "\\raggedright" + AlignRight -> "\\raggedleft" + AlignCenter -> "\\centering" + AlignDefault -> "\\raggedright" + let toCell 0 _ c = c + toCell w a c = "\\parbox" <> valign <> + braces (text (printf "%.2f\\columnwidth" w)) <> + braces (halign a <> cr <> c <> cr) + let cells = zipWith3 toCell widths aligns renderedCells + return $ hcat $ intersperse (" & ") cells listItemToLaTeX :: [Block] -> State WriterState Doc listItemToLaTeX lst = blockListToLaTeX lst >>= return . (text "\\item" $$) . @@ -317,7 +334,7 @@ defListItemToLaTeX :: ([Inline], [[Block]]) -> State WriterState Doc defListItemToLaTeX (term, defs) = do - term' <- inlineListToLaTeX $ deVerb term + term' <- inlineListToLaTeX term def' <- liftM vsep $ mapM blockListToLaTeX defs return $ "\\item" <> brackets term' $$ def' @@ -335,23 +352,23 @@ inlineToLaTeX :: Inline -- ^ Inline to convert -> State WriterState Doc inlineToLaTeX (Emph lst) = - inlineListToLaTeX (deVerb lst) >>= return . inCmd "emph" + inlineListToLaTeX lst >>= return . inCmd "emph" inlineToLaTeX (Strong lst) = - inlineListToLaTeX (deVerb lst) >>= return . inCmd "textbf" + inlineListToLaTeX lst >>= return . inCmd "textbf" inlineToLaTeX (Strikeout lst) = do - contents <- inlineListToLaTeX $ deVerb lst + contents <- inlineListToLaTeX lst modify $ \s -> s{ stStrikeout = True } return $ inCmd "sout" contents inlineToLaTeX (Superscript lst) = - inlineListToLaTeX (deVerb lst) >>= return . inCmd "textsuperscript" + inlineListToLaTeX lst >>= return . inCmd "textsuperscript" inlineToLaTeX (Subscript lst) = do modify $ \s -> s{ stSubscript = True } - contents <- inlineListToLaTeX $ deVerb lst + contents <- inlineListToLaTeX lst -- oddly, latex includes \textsuperscript but not \textsubscript -- so we have to define it (using a different name so as not to conflict with memoir class): return $ inCmd "textsubscr" contents inlineToLaTeX (SmallCaps lst) = - inlineListToLaTeX (deVerb lst) >>= return . inCmd "textsc" + inlineListToLaTeX lst >>= return . inCmd "textsc" inlineToLaTeX (Cite cits lst) = do st <- get let opts = stOptions st @@ -362,29 +379,38 @@ inlineToLaTeX (Code _ str) = do st <- get - when (stInNote st) $ modify $ \s -> s{ stVerbInNote = True } - let chr = ((enumFromTo '!' '~') \\ str) !! 0 if writerListings (stOptions st) - then return $ text $ "\\lstinline" ++ [chr] ++ str ++ [chr] - else return $ text $ "\\verb" ++ [chr] ++ str ++ [chr] + then do + when (stInNote st) $ modify $ \s -> s{ stVerbInNote = True } + let chr = ((enumFromTo '!' '~') \\ str) !! 0 + return $ text $ "\\lstinline" ++ [chr] ++ str ++ [chr] + else return $ text $ "\\texttt{" ++ stringToLaTeX str ++ "}" inlineToLaTeX (Quoted SingleQuote lst) = do contents <- inlineListToLaTeX lst - let s1 = if (not (null lst)) && (isQuoted (head lst)) - then "\\," - else empty - let s2 = if (not (null lst)) && (isQuoted (last lst)) - then "\\," - else empty - return $ char '`' <> s1 <> contents <> s2 <> char '\'' + csquotes <- liftM stCsquotes get + if csquotes + then return $ "\\enquote" <> braces contents + else do + let s1 = if (not (null lst)) && (isQuoted (head lst)) + then "\\," + else empty + let s2 = if (not (null lst)) && (isQuoted (last lst)) + then "\\," + else empty + return $ char '`' <> s1 <> contents <> s2 <> char '\'' inlineToLaTeX (Quoted DoubleQuote lst) = do contents <- inlineListToLaTeX lst - let s1 = if (not (null lst)) && (isQuoted (head lst)) - then "\\," - else empty - let s2 = if (not (null lst)) && (isQuoted (last lst)) - then "\\," - else empty - return $ "``" <> s1 <> contents <> s2 <> "''" + csquotes <- liftM stCsquotes get + if csquotes + then return $ "\\enquote" <> braces contents + else do + let s1 = if (not (null lst)) && (isQuoted (head lst)) + then "\\," + else empty + let s2 = if (not (null lst)) && (isQuoted (last lst)) + then "\\," + else empty + return $ "``" <> s1 <> contents <> s2 <> "''" inlineToLaTeX Apostrophe = return $ char '\'' inlineToLaTeX EmDash = return "---" inlineToLaTeX EnDash = return "--" @@ -402,19 +428,28 @@ [Code _ x] | x == src -> -- autolink do modify $ \s -> s{ stUrl = True } return $ text $ "\\url{" ++ x ++ "}" - _ -> do contents <- inlineListToLaTeX $ deVerb txt + _ -> do contents <- inlineListToLaTeX txt return $ text ("\\href{" ++ stringToLaTeX src ++ "}{") <> contents <> char '}' inlineToLaTeX (Image _ (source, _)) = do modify $ \s -> s{ stGraphics = True } - return $ "\\includegraphics" <> braces (text source) + let source' = if isAbsoluteURI source + then source + else unEscapeString source + return $ "\\includegraphics" <> braces (text source') inlineToLaTeX (Note contents) = do modify (\s -> s{stInNote = True}) contents' <- blockListToLaTeX contents modify (\s -> s {stInNote = False}) - -- note: a \n before } is needed when note ends with a Verbatim environment - return $ "\\footnote" <> braces (nest 2 contents') - + inTable <- liftM stInTable get + if inTable + then do + curnotes <- liftM stTableNotes get + let marker = cycle ['a'..'z'] !! length curnotes + modify $ \s -> s{ stTableNotes = (marker, contents') : curnotes } + return $ "\\tmark" <> brackets (char marker) <> space + else return $ "\\footnote" <> braces (nest 2 contents') + -- note: a \n before } needed when note ends with a Verbatim environment citationsToNatbib :: [Citation] -> State WriterState Doc citationsToNatbib (one:[]) diff -Nru pandoc-1.8.1.1/src/Text/Pandoc/Writers/Markdown.hs pandoc-1.8.2.1/src/Text/Pandoc/Writers/Markdown.hs --- pandoc-1.8.1.1/src/Text/Pandoc/Writers/Markdown.hs 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/src/Text/Pandoc/Writers/Markdown.hs 2011-08-01 18:02:52.000000000 +0000 @@ -366,7 +366,19 @@ -> [Block] -- ^ List of block elements -> State WriterState Doc blockListToMarkdown opts blocks = - mapM (blockToMarkdown opts) blocks >>= return . cat + mapM (blockToMarkdown opts) (fixBlocks blocks) >>= return . cat + -- insert comment between list and indented code block, or the + -- code block will be treated as a list continuation paragraph + where fixBlocks (b : CodeBlock attr x : rest) + | (writerStrictMarkdown opts || attr == nullAttr) && isListBlock b = + b : RawBlock "html" "\n" : CodeBlock attr x : + fixBlocks rest + fixBlocks (x : xs) = x : fixBlocks xs + fixBlocks [] = [] + isListBlock (BulletList _) = True + isListBlock (OrderedList _ _) = True + isListBlock (DefinitionList _) = True + isListBlock _ = False -- | Get reference for target; if none exists, create unique one and return. -- Prefer label if possible; otherwise, generate a unique key. diff -Nru pandoc-1.8.1.1/src/Text/Pandoc/Writers/ODT.hs pandoc-1.8.2.1/src/Text/Pandoc/Writers/ODT.hs --- pandoc-1.8.1.1/src/Text/Pandoc/Writers/ODT.hs 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/src/Text/Pandoc/Writers/ODT.hs 2011-08-01 18:02:52.000000000 +0000 @@ -29,6 +29,7 @@ -} module Text.Pandoc.Writers.ODT ( writeODT ) where import Data.IORef +import Data.List ( isPrefixOf ) import System.FilePath ( (), takeExtension ) import qualified Data.ByteString.Lazy as B import Data.ByteString.Lazy.UTF8 ( fromString ) @@ -36,11 +37,15 @@ import System.Time import Paths_pandoc ( getDataFileName ) import Text.Pandoc.Shared ( WriterOptions(..) ) +import Text.Pandoc.MIME ( getMimeType ) import Text.Pandoc.Definition import Text.Pandoc.Generic import Text.Pandoc.Writers.OpenDocument ( writeOpenDocument ) import System.Directory import Control.Monad (liftM) +import Network.URI ( unEscapeString ) +import Text.Pandoc.XML +import Text.Pandoc.Pretty -- | Produce an ODT file from a Pandoc document. writeODT :: Maybe FilePath -- ^ Path specified by --reference-odt @@ -69,14 +74,37 @@ (TOD epochtime _) <- getClockTime let contentEntry = toEntry "content.xml" epochtime $ fromString newContents picEntries <- readIORef picEntriesRef - let archive = foldr addEntryToArchive refArchive (contentEntry : picEntries) - return $ fromArchive archive + let archive = foldr addEntryToArchive refArchive $ contentEntry : picEntries + -- construct META-INF/manifest.xml based on archive + let toFileEntry fp = case getMimeType fp of + Nothing -> empty + Just m -> selfClosingTag "manifest:file-entry" + [("manifest:media-type", m) + ,("manifest:full-path", fp) + ] + let files = [ ent | ent <- filesInArchive archive, not ("META-INF" `isPrefixOf` ent) ] + let manifestEntry = toEntry "META-INF/manifest.xml" epochtime + $ fromString $ show + $ text "" + $$ + ( inTags True "manifest:manifest" + [("xmlns:manifest","urn:oasis:names:tc:opendocument:xmlns:manifest:1.0")] + $ ( selfClosingTag "manifest:file-entry" + [("manifest:media-type","application/vnd.oasis.opendocument.text") + ,("manifest:version","1.2") + ,("manifest:full-path","/")] + $$ vcat ( map toFileEntry $ files ) + ) + ) + let archive' = addEntryToArchive manifestEntry archive + return $ fromArchive archive' transformPic :: FilePath -> IORef [Entry] -> Inline -> IO Inline transformPic sourceDir entriesRef (Image lab (src,tit)) = do + let src' = unEscapeString src entries <- readIORef entriesRef - let newsrc = "Pictures/" ++ show (length entries) ++ takeExtension src - catch (readEntry [] (sourceDir src) >>= \entry -> + let newsrc = "Pictures/" ++ show (length entries) ++ takeExtension src' + catch (readEntry [] (sourceDir src') >>= \entry -> modifyIORef entriesRef (entry{ eRelativePath = newsrc } :) >> return (Image lab (newsrc, tit))) (\_ -> return (Emph lab)) diff -Nru pandoc-1.8.1.1/src/Text/Pandoc/Writers/OpenDocument.hs pandoc-1.8.2.1/src/Text/Pandoc/Writers/OpenDocument.hs --- pandoc-1.8.1.1/src/Text/Pandoc/Writers/OpenDocument.hs 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/src/Text/Pandoc/Writers/OpenDocument.hs 2011-08-01 18:02:52.000000000 +0000 @@ -62,6 +62,7 @@ , stIndentPara :: Int , stInDefinition :: Bool , stTight :: Bool + , stFirstPara :: Bool } defaultWriterState :: WriterState @@ -75,6 +76,7 @@ , stIndentPara = 0 , stInDefinition = False , stTight = False + , stFirstPara = False } when :: Bool -> Doc -> Doc @@ -111,10 +113,18 @@ setInDefinitionList :: Bool -> State WriterState () setInDefinitionList b = modify $ \s -> s { stInDefinition = b } -inParagraphTags :: Doc -> Doc -inParagraphTags d | isEmpty d = empty -inParagraphTags d = - inTags False "text:p" [("text:style-name", "Text_20_body")] d +setFirstPara :: State WriterState () +setFirstPara = modify $ \s -> s { stFirstPara = True } + +inParagraphTags :: Doc -> State WriterState Doc +inParagraphTags d | isEmpty d = return empty +inParagraphTags d = do + b <- gets stFirstPara + a <- if b + then do modify $ \st -> st { stFirstPara = False } + return $ [("text:style-name", "First_20_paragraph")] + else return [("text:style-name", "Text_20_body")] + return $ inTags False "text:p" a d inParagraphTagsWithStyle :: String -> Doc -> Doc inParagraphTagsWithStyle sty = inTags False "text:p" [("text:style-name", sty)] @@ -138,9 +148,10 @@ $ selfClosingTag "style:text-properties" (concatMap snd $ Map.toList at) return $ inTags False "text:span" [("text:style-name","T" ++ show tn)] d -inHeaderTags :: Int -> Doc -> Doc -inHeaderTags i = inTags False "text:h" [ ("text:style-name", "Heading_20_" ++ show i) - , ("text:outline-level", show i)] +inHeaderTags :: Int -> Doc -> State WriterState Doc +inHeaderTags i d = + return $ inTags False "text:h" [ ("text:style-name", "Heading_20_" ++ show i) + , ("text:outline-level", show i)] d inQuotes :: QuoteType -> Doc -> Doc inQuotes SingleQuote s = text "‘" <> s <> text "’" @@ -164,7 +175,7 @@ writeOpenDocument opts (Pandoc (Meta title authors date) blocks) = let ((doc, title', authors', date'),s) = flip runState defaultWriterState $ do - title'' <- inlinesToOpenDocument opts title + title'' <- inlinesToOpenDocument opts title authors'' <- mapM (inlinesToOpenDocument opts) authors date'' <- inlinesToOpenDocument opts date doc'' <- blocksToOpenDocument opts blocks @@ -274,18 +285,20 @@ -- | Convert a Pandoc block element to OpenDocument. blockToOpenDocument :: WriterOptions -> Block -> State WriterState Doc blockToOpenDocument o bs - | Plain b <- bs = inParagraphTags <$> inlinesToOpenDocument o b - | Para b <- bs = inParagraphTags <$> inlinesToOpenDocument o b - | Header i b <- bs = inHeaderTags i <$> inlinesToOpenDocument o b - | BlockQuote b <- bs = mkBlockQuote b - | CodeBlock _ s <- bs = preformatted s + | Plain b <- bs = inParagraphTags =<< inlinesToOpenDocument o b + | Para b <- bs = inParagraphTags =<< inlinesToOpenDocument o b + | Header i b <- bs = setFirstPara >> + (inHeaderTags i =<< inlinesToOpenDocument o b) + | BlockQuote b <- bs = setFirstPara >> mkBlockQuote b + | DefinitionList b <- bs = setFirstPara >> defList b + | BulletList b <- bs = setFirstPara >> bulletListToOpenDocument o b + | OrderedList a b <- bs = setFirstPara >> orderedList a b + | CodeBlock _ s <- bs = setFirstPara >> preformatted s + | Table c a w h r <- bs = setFirstPara >> table c a w h r + | HorizontalRule <- bs = setFirstPara >> return (selfClosingTag "text:p" + [ ("text:style-name", "Horizontal_20_Line") ]) | RawBlock _ _ <- bs = return empty - | DefinitionList b <- bs = defList b - | BulletList b <- bs = bulletListToOpenDocument o b - | OrderedList a b <- bs = orderedList a b - | Table c a w h r <- bs = table c a w h r | Null <- bs = return empty - | HorizontalRule <- bs = return $ selfClosingTag "text:p" [ ("text:style-name", "Horizontal_20_Line") ] | otherwise = return empty where defList b = do setInDefinitionList True @@ -381,14 +394,14 @@ mkImg s = inTags False "draw:frame" [] $ selfClosingTag "draw:image" [ ("xlink:href" , s ) , ("xlink:type" , "simple") - , (" xlink:show" , "embed" ) + , ("xlink:show" , "embed" ) , ("xlink:actuate", "onLoad")] mkNote l = do n <- length <$> gets stNotes let footNote t = inTags False "text:note" [ ("text:id" , "ftn" ++ show n) , ("text:note-class", "footnote" )] $ - inTagsSimple "text:note-citation" (text . show $ n + 1) <> + inTagsSimple "text:note-citation" (text . show $ n + 1) <> inTagsSimple "text:note-body" t nn <- footNote <$> withParagraphStyle o "Footnote" l addNote nn diff -Nru pandoc-1.8.1.1/src/Text/Pandoc/Writers/RTF.hs pandoc-1.8.2.1/src/Text/Pandoc/Writers/RTF.hs --- pandoc-1.8.1.1/src/Text/Pandoc/Writers/RTF.hs 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/src/Text/Pandoc/Writers/RTF.hs 2011-08-01 18:02:52.000000000 +0000 @@ -37,23 +37,28 @@ import System.FilePath ( takeExtension ) import qualified Data.ByteString as B import Text.Printf ( printf ) +import Network.URI ( isAbsoluteURI, unEscapeString ) -- | Convert Image inlines into a raw RTF embedded image, read from a file. -- If file not found or filetype not jpeg or png, leave the inline unchanged. rtfEmbedImage :: Inline -> IO Inline -rtfEmbedImage x@(Image _ (src,_)) - | map toLower (takeExtension src) `elem` [".jpg",".jpeg",".png"] = do - imgdata <- catch (B.readFile src) (\_ -> return B.empty) - let bytes = map (printf "%02x") $ B.unpack imgdata - let filetype = case map toLower (takeExtension src) of - ".jpg" -> "\\jpegblip" - ".jpeg" -> "\\jpegblip" - ".png" -> "\\pngblip" - _ -> error "Unknown file type" - let raw = "{\\pict" ++ filetype ++ " " ++ concat bytes ++ "}" - return $ if B.null imgdata - then x - else RawInline "rtf" raw +rtfEmbedImage x@(Image _ (src,_)) = do + let ext = map toLower (takeExtension src) + if ext `elem` [".jpg",".jpeg",".png"] && not (isAbsoluteURI src) + then do + let src' = unEscapeString src + imgdata <- catch (B.readFile src') (\_ -> return B.empty) + let bytes = map (printf "%02x") $ B.unpack imgdata + let filetype = case ext of + ".jpg" -> "\\jpegblip" + ".jpeg" -> "\\jpegblip" + ".png" -> "\\pngblip" + _ -> error "Unknown file type" + let raw = "{\\pict" ++ filetype ++ " " ++ concat bytes ++ "}" + return $ if B.null imgdata + then x + else RawInline "rtf" raw + else return x rtfEmbedImage x = return x -- | Convert Pandoc to a string in rich text format. diff -Nru pandoc-1.8.1.1/src/Text/Pandoc/Writers/Texinfo.hs pandoc-1.8.2.1/src/Text/Pandoc/Writers/Texinfo.hs --- pandoc-1.8.1.1/src/Text/Pandoc/Writers/Texinfo.hs 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/src/Text/Pandoc/Writers/Texinfo.hs 2011-08-01 18:02:52.000000000 +0000 @@ -37,6 +37,8 @@ import Data.Char ( chr, ord ) import Control.Monad.State import Text.Pandoc.Pretty +import Network.URI ( isAbsoluteURI, unEscapeString ) +import System.FilePath data WriterState = WriterState { stStrikeout :: Bool -- document contains strikeout @@ -412,11 +414,11 @@ return $ text ("@image{" ++ base ++ ",,,") <> content <> text "," <> text (ext ++ "}") where - (revext, revbase) = break (=='.') (reverse source) - ext = reverse revext - base = case revbase of - ('.' : rest) -> reverse rest - _ -> reverse revbase + ext = drop 1 $ takeExtension source' + base = takeBaseName source' + source' = if isAbsoluteURI source + then source + else unEscapeString source inlineToTexinfo (Note contents) = do contents' <- blockListToTexinfo contents diff -Nru pandoc-1.8.1.1/templates/context.template pandoc-1.8.2.1/templates/context.template --- pandoc-1.8.1.1/templates/context.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/context.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -\enableregime[utf] % use UTF-8 - -\setupcolors[state=start] -\setupinteraction[state=start, color=middleblue] % needed for hyperlinks - -\setuppapersize[letter][letter] % use letter paper -\setuplayout[width=middle, backspace=1.5in, cutspace=1.5in, - height=middle, header=0.75in, footer=0.75in] % page layout -\setuppagenumbering[location={footer,center}] % number pages -\setupbodyfont[11pt] % 11pt font -\setupwhitespace[medium] % inter-paragraph spacing - -\setuphead[section][style=\tfc] -\setuphead[subsection][style=\tfb] -\setuphead[subsubsection][style=\bf] - -% define descr (for definition lists) -\definedescription[descr][ - headstyle=bold,style=normal,align=left,location=hanging, - width=broad,margin=1cm] - -% prevent orphaned list intros -\setupitemize[autointro] - -% define defaults for bulleted lists -\setupitemize[1][symbol=1][indentnext=no] -\setupitemize[2][symbol=2][indentnext=no] -\setupitemize[3][symbol=3][indentnext=no] -\setupitemize[4][symbol=4][indentnext=no] - -\setupthinrules[width=15em] % width of horizontal rules - -% for block quotations -\unprotect - -\startvariables all -blockquote: blockquote -\stopvariables - -\definedelimitedtext -[\v!blockquote][\v!quotation] - -\setupdelimitedtext -[\v!blockquote] -[\c!left=, -\c!right=, -before={\blank[medium]}, -after={\blank[medium]}, -] - -\protect -$for(header-includes)$ -$header-includes$ -$endfor$ - -\starttext -$if(title)$ -\startalignment[center] - \blank[2*big] - {\tfd $title$} -$if(author)$ - \blank[3*medium] - {\tfa $for(author)$$author$$sep$\crlf $endfor$} -$endif$ -$if(date)$ - \blank[2*medium] - {\tfa $date$} -$endif$ - \blank[3*medium] -\stopalignment -$endif$ -$for(include-before)$ -$include-before$ -$endfor$ -$if(toc)$ -\placecontent -$endif$ - -$body$ - -$for(include-after)$ -$include-after$ -$endfor$ -\stoptext diff -Nru pandoc-1.8.1.1/templates/default.context pandoc-1.8.2.1/templates/default.context --- pandoc-1.8.1.1/templates/default.context 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.context 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,84 @@ +\enableregime[utf] % use UTF-8 + +\setupcolors[state=start] +\setupinteraction[state=start, color=middleblue] % needed for hyperlinks + +\setuppapersize[letter][letter] % use letter paper +\setuplayout[width=middle, backspace=1.5in, cutspace=1.5in, + height=middle, header=0.75in, footer=0.75in] % page layout +\setuppagenumbering[location={footer,center}] % number pages +\setupbodyfont[11pt] % 11pt font +\setupwhitespace[medium] % inter-paragraph spacing + +\setuphead[section][style=\tfc] +\setuphead[subsection][style=\tfb] +\setuphead[subsubsection][style=\bf] + +% define descr (for definition lists) +\definedescription[descr][ + headstyle=bold,style=normal,align=left,location=hanging, + width=broad,margin=1cm] + +% prevent orphaned list intros +\setupitemize[autointro] + +% define defaults for bulleted lists +\setupitemize[1][symbol=1][indentnext=no] +\setupitemize[2][symbol=2][indentnext=no] +\setupitemize[3][symbol=3][indentnext=no] +\setupitemize[4][symbol=4][indentnext=no] + +\setupthinrules[width=15em] % width of horizontal rules + +% for block quotations +\unprotect + +\startvariables all +blockquote: blockquote +\stopvariables + +\definedelimitedtext +[\v!blockquote][\v!quotation] + +\setupdelimitedtext +[\v!blockquote] +[\c!left=, +\c!right=, +before={\blank[medium]}, +after={\blank[medium]}, +] + +\protect +$for(header-includes)$ +$header-includes$ +$endfor$ + +\starttext +$if(title)$ +\startalignment[center] + \blank[2*big] + {\tfd $title$} +$if(author)$ + \blank[3*medium] + {\tfa $for(author)$$author$$sep$\crlf $endfor$} +$endif$ +$if(date)$ + \blank[2*medium] + {\tfa $date$} +$endif$ + \blank[3*medium] +\stopalignment +$endif$ +$for(include-before)$ +$include-before$ +$endfor$ +$if(toc)$ +\placecontent +$endif$ + +$body$ + +$for(include-after)$ +$include-after$ +$endfor$ +\stoptext diff -Nru pandoc-1.8.1.1/templates/default.docbook pandoc-1.8.2.1/templates/default.docbook --- pandoc-1.8.1.1/templates/default.docbook 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.docbook 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,23 @@ + + +
+ + $title$ +$for(author)$ + + $author$ + +$endfor$ +$if(date)$ + $date$ +$endif$ + +$for(include-before)$ +$include-before$ +$endfor$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ +
diff -Nru pandoc-1.8.1.1/templates/default.html pandoc-1.8.2.1/templates/default.html --- pandoc-1.8.1.1/templates/default.html 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.html 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,86 @@ +$if(html5)$ + + +$else$ + + +$endif$ + +$if(html5)$ + +$else$ + +$endif$ + +$for(author)$ + +$endfor$ +$if(date)$ + +$endif$ + $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$ +$if(html5)$ + +$endif$ +$if(highlighting-css)$ + +$endif$ +$for(css)$ + +$endfor$ +$if(math)$ +$if(html5)$ +$else$ + $math$ +$endif$ +$endif$ +$for(header-includes)$ + $header-includes$ +$endfor$ + + +$for(include-before)$ +$include-before$ +$endfor$ +$if(title)$ +$if(html5)$ +
+$else$ +
+$endif$ +

$title$

+$for(author)$ +

$author$

+$endfor$ +$if(date)$ +

$date$

+$endif$ +$if(html5)$ +
+$else$ +
+$endif$ +$endif$ +$if(toc)$ +$if(html5)$ + +$else$ +
+$toc$ +
+$endif$ +$endif$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ + + diff -Nru pandoc-1.8.1.1/templates/default.latex pandoc-1.8.2.1/templates/default.latex --- pandoc-1.8.1.1/templates/default.latex 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.latex 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,139 @@ +\documentclass$if(fontsize)$[$fontsize$]$endif${article} +\usepackage{amssymb,amsmath} +\usepackage{ifxetex,ifluatex} +\ifxetex + \usepackage{fontspec,xltxtra,xunicode} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} +\else + \ifluatex + \usepackage{fontspec} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \else + \usepackage[utf8]{inputenc} + \fi +\fi +$if(natbib)$ +\usepackage{natbib} +\bibliographystyle{plainnat} +$endif$ +$if(biblatex)$ +\usepackage{biblatex} +$if(biblio-files)$ +\bibliography{$biblio-files$} +$endif$ +$endif$ +$if(lhs)$ +\usepackage{listings} +\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} +$endif$ +$if(verbatim-in-note)$ +\usepackage{fancyvrb} +$endif$ +$if(fancy-enums)$ +% Redefine labelwidth for lists; otherwise, the enumerate package will cause +% markers to extend beyond the left margin. +\makeatletter\AtBeginDocument{% + \renewcommand{\@listi} + {\setlength{\labelwidth}{4em}} +}\makeatother +\usepackage{enumerate} +$endif$ +$if(tables)$ +\usepackage{ctable} +\usepackage{float} % provides the H option for float placement +$endif$ +$if(url)$ +\usepackage{url} +$endif$ +$if(graphics)$ +\usepackage{graphicx} +% We will generate all images so they have a width \maxwidth. This means +% that they will get their normal width if they fit onto the page, but +% are scaled down if they would overflow the margins. +\makeatletter +\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth +\else\Gin@nat@width\fi} +\makeatother +\let\Oldincludegraphics\includegraphics +\renewcommand{\includegraphics}[1]{\Oldincludegraphics[width=\maxwidth]{#1}} +$endif$ +\ifxetex + \usepackage[setpagesize=false, % page size defined by xetex + unicode=false, % unicode breaks when used with xetex + xetex]{hyperref} +\else + \usepackage[unicode=true]{hyperref} +\fi +\hypersetup{breaklinks=true, pdfborder={0 0 0}} +$if(strikeout)$ +\usepackage[normalem]{ulem} +% avoid problems with \sout in headers with hyperref: +\pdfstringdefDisableCommands{\renewcommand{\sout}{}} +$endif$ +$if(subscript)$ +\newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}} +$endif$ +\setlength{\parindent}{0pt} +\setlength{\parskip}{6pt plus 2pt minus 1pt} +\setlength{\emergencystretch}{3em} % prevent overfull lines +$if(listings)$ +\usepackage{listings} +$endif$ +$if(numbersections)$ +$else$ +\setcounter{secnumdepth}{0} +$endif$ +$if(verbatim-in-note)$ +\VerbatimFootnotes % allows verbatim text in footnotes +$endif$ +$for(header-includes)$ +$header-includes$ +$endfor$ + +$if(title)$ +\title{$title$} +$endif$ +$if(author)$ +\author{$for(author)$$author$$sep$ \and $endfor$} +$endif$ +$if(date)$ +\date{$date$} +$endif$ + +\begin{document} +$if(title)$ +\maketitle +$endif$ + +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +\tableofcontents + +$endif$ +$body$ + +$if(natbib)$ +$if(biblio-files)$ +$if(biblio-title)$ +$if(book-class)$ +\renewcommand\bibname{$biblio-title$} +$else$ +\renewcommand\refname{$biblio-title$} +$endif$ +$endif$ +\bibliography{$biblio-files$} + +$endif$ +$endif$ +$if(biblatex)$ +\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$ + +$endif$ +$for(include-after)$ +$include-after$ + +$endfor$ +\end{document} diff -Nru pandoc-1.8.1.1/templates/default.man pandoc-1.8.2.1/templates/default.man --- pandoc-1.8.1.1/templates/default.man 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.man 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,18 @@ +$if(has-tables)$ +.\"t +$endif$ +.TH $title$ $section$ "$date$" $description$ +$for(header-includes)$ +$header-includes$ +$endfor$ +$for(include-before)$ +$include-before$ +$endfor$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ +$if(author)$ +.SH AUTHORS +$for(author)$$author$$sep$; $endfor$. +$endif$ diff -Nru pandoc-1.8.1.1/templates/default.markdown pandoc-1.8.2.1/templates/default.markdown --- pandoc-1.8.1.1/templates/default.markdown 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.markdown 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,23 @@ +$if(titleblock)$ +% $title$ +% $for(author)$$author$$sep$; $endfor$ +% $date$ + +$endif$ +$for(header-includes)$ +$header-includes$ + +$endfor$ +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +$toc$ + +$endif$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff -Nru pandoc-1.8.1.1/templates/default.mediawiki pandoc-1.8.2.1/templates/default.mediawiki --- pandoc-1.8.1.1/templates/default.mediawiki 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.mediawiki 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,13 @@ +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +__TOC__ + +$endif$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff -Nru pandoc-1.8.1.1/templates/default.opendocument pandoc-1.8.2.1/templates/default.opendocument --- pandoc-1.8.1.1/templates/default.opendocument 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.opendocument 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,27 @@ + + + $automatic-styles$ +$for(header-includes)$ + $header-includes$ +$endfor$ + + +$if(title)$ +$title$ +$endif$ +$for(author)$ +$author$ +$endfor$ +$if(date)$ +$date$ +$endif$ +$for(include-before)$ +$include-before$ +$endfor$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ + + + diff -Nru pandoc-1.8.1.1/templates/default.org pandoc-1.8.2.1/templates/default.org --- pandoc-1.8.1.1/templates/default.org 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.org 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,24 @@ +$if(title)$ +$title$ + +$endif$ +$if(author)$ +#+AUTHOR: $for(author)$$author$$sep$; $endfor$ +$endif$ +$if(date)$ +#+DATE: $date$ + +$endif$ +$for(header-includes)$ +$header-includes$ + +$endfor$ +$for(include-before)$ +$include-before$ + +$endfor$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff -Nru pandoc-1.8.1.1/templates/default.plain pandoc-1.8.2.1/templates/default.plain --- pandoc-1.8.1.1/templates/default.plain 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.plain 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,23 @@ +$if(titleblock)$ +$title$ +$for(author)$$author$$sep$; $endfor$ +$date$ + +$endif$ +$for(header-includes)$ +$header-includes$ + +$endfor$ +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +$toc$ + +$endif$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff -Nru pandoc-1.8.1.1/templates/default.rst pandoc-1.8.2.1/templates/default.rst --- pandoc-1.8.1.1/templates/default.rst 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.rst 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,39 @@ +$if(title)$ +$title$ + +$endif$ +$for(author)$ +:Author: $author$ +$endfor$ +$if(date)$ +:Date: $date$ +$endif$ +$if(author)$ + +$else$ +$if(date)$ + +$endif$ +$endif$ +$if(math)$ +.. role:: math(raw) + :format: html latex + +$endif$ +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +.. contents:: + +$endif$ +$for(header-includes)$ +$header-includes$ + +$endfor$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff -Nru pandoc-1.8.1.1/templates/default.rtf pandoc-1.8.2.1/templates/default.rtf --- pandoc-1.8.1.1/templates/default.rtf 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.rtf 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,27 @@ +{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}} +{\colortbl;\red255\green0\blue0;\red0\green0\blue255;} +\widowctrl\hyphauto +$for(header-includes)$ +$header-includes$ +$endfor$ + +$if(title)$ +{\pard \qc \f0 \sa180 \li0 \fi0 \b \fs36 $title$\par} +$endif$ +$for(author)$ +{\pard \qc \f0 \sa180 \li0 \fi0 $author$\par} +$endfor$ +$if(date)$ +{\pard \qc \f0 \sa180 \li0 \fi0 $date$\par} +$endif$ +$if(spacer)$ +{\pard \ql \f0 \sa180 \li0 \fi0 \par} +$endif$ +$for(include-before)$ +$include-before$ +$endfor$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ +} diff -Nru pandoc-1.8.1.1/templates/default.s5 pandoc-1.8.2.1/templates/default.s5 --- pandoc-1.8.1.1/templates/default.s5 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.s5 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,69 @@ + + + + + +$for(author)$ + +$endfor$ +$if(date)$ + +$endif$ + $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$ + + + +$if(highlighting-css)$ + +$endif$ +$for(css)$ + +$endfor$ +$if(s5includes)$ +$s5includes$ +$else$ + + + + + + + +$endif$ +$if(math)$ + $math$ +$endif$ +$for(header-includes)$ + $header-includes$ +$endfor$ + + +$for(include-before)$ +$include-before$ +$endfor$ +
+
+
+ + +
+
+$if(title)$ +
+

$title$

+

$for(author)$$author$$sep$
$endfor$

+

$date$

+
+$endif$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ +
+ + diff -Nru pandoc-1.8.1.1/templates/default.slidy pandoc-1.8.2.1/templates/default.slidy --- pandoc-1.8.1.1/templates/default.slidy 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.slidy 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,76 @@ + + + + + + +$for(author)$ + +$endfor$ +$if(date)$ + +$endif$ +$if(highlighting-css)$ + $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$ + +$endif$ +$if(slidy-css)$ + +$else$ + +$endif$ +$for(css)$ + +$endfor$ +$if(math)$ + $math$ +$endif$ +$for(header-includes)$ + $header-includes$ +$endfor$ +$if(slidy-js)$ + +$else$ + +$endif$ +$if(duration)$ + +$endif$ + + +$for(include-before)$ +$include-before$ +$endfor$ +$if(title)$ +
+

$title$

+

+$for(author)$$author$$sep$
$endfor$ +

+$if(date)$ +

$date$

+$endif$ +
+$endif$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ + + diff -Nru pandoc-1.8.1.1/templates/default.texinfo pandoc-1.8.2.1/templates/default.texinfo --- pandoc-1.8.1.1/templates/default.texinfo 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.texinfo 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,64 @@ +\input texinfo +@documentencoding utf-8 +$for(header-includes)$ +$header-includes$ +$endfor$ + +$if(strikeout)$ +@macro textstrikeout{text} +~~\text\~~ +@end macro + +$endif$ +$if(subscript)$ +@macro textsubscript{text} +@iftex +@textsubscript{\text\} +@end iftex +@ifnottex +_@{\text\@} +@end ifnottex +@end macro + +$endif$ +$if(superscript)$ +@macro textsuperscript{text} +@iftex +@textsuperscript{\text\} +@end iftex +@ifnottex +^@{\text\@} +@end ifnottex +@end macro + +$endif$ +@ifnottex +@paragraphindent 0 +@end ifnottex +$if(titlepage)$ +@titlepage +@title $title$ +$for(author)$ +@author $author$ +$endfor$ +$if(date)$ +$date$ +$endif$ +@end titlepage + +$endif$ +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +@contents + +$endif$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ + +@bye diff -Nru pandoc-1.8.1.1/templates/default.textile pandoc-1.8.2.1/templates/default.textile --- pandoc-1.8.1.1/templates/default.textile 1970-01-01 00:00:00.000000000 +0000 +++ pandoc-1.8.2.1/templates/default.textile 2011-08-01 18:02:52.000000000 +0000 @@ -0,0 +1,9 @@ +$for(include-before)$ +$include-before$ + +$endfor$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff -Nru pandoc-1.8.1.1/templates/docbook.template pandoc-1.8.2.1/templates/docbook.template --- pandoc-1.8.1.1/templates/docbook.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/docbook.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ - - -
- - $title$ -$for(author)$ - - $author$ - -$endfor$ -$if(date)$ - $date$ -$endif$ - -$for(include-before)$ -$include-before$ -$endfor$ -$body$ -$for(include-after)$ -$include-after$ -$endfor$ -
diff -Nru pandoc-1.8.1.1/templates/html.template pandoc-1.8.2.1/templates/html.template --- pandoc-1.8.1.1/templates/html.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/html.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -$if(html5)$ - - -$else$ - - -$endif$ - -$if(html5)$ - -$else$ - -$endif$ - -$for(author)$ - -$endfor$ -$if(date)$ - -$endif$ - $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$ -$if(html5)$ - -$endif$ -$if(highlighting-css)$ - -$endif$ -$for(css)$ - -$endfor$ -$if(math)$ -$if(html5)$ -$else$ - $math$ -$endif$ -$endif$ -$for(header-includes)$ - $header-includes$ -$endfor$ - - -$for(include-before)$ -$include-before$ -$endfor$ -$if(title)$ -$if(html5)$ -
-$endif$ -

$title$

-$if(html5)$ -
-$endif$ -$endif$ -$if(toc)$ -$toc$ -$endif$ -$body$ -$for(include-after)$ -$include-after$ -$endfor$ - - diff -Nru pandoc-1.8.1.1/templates/latex.template pandoc-1.8.2.1/templates/latex.template --- pandoc-1.8.1.1/templates/latex.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/latex.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,132 +0,0 @@ -\documentclass$if(fontsize)$[$fontsize$]$endif${article} -\usepackage{amssymb,amsmath} -$if(xetex)$ -\usepackage{ifxetex} -\ifxetex - \usepackage{fontspec,xltxtra,xunicode} - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} -\else - \usepackage[mathletters]{ucs} - \usepackage[utf8x]{inputenc} -\fi -$else$ -\usepackage[mathletters]{ucs} -\usepackage[utf8x]{inputenc} -$endif$ -$if(natbib)$ -\usepackage{natbib} -\bibliographystyle{plainnat} -$endif$ -$if(biblatex)$ -\usepackage{biblatex} -$if(biblio-files)$ -\bibliography{$biblio-files$} -$endif$ -$endif$ -$if(lhs)$ -\usepackage{listings} -\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} -$endif$ -$if(verbatim-in-note)$ -\usepackage{fancyvrb} -$endif$ -$if(fancy-enums)$ -% Redefine labelwidth for lists; otherwise, the enumerate package will cause -% markers to extend beyond the left margin. -\makeatletter\AtBeginDocument{% - \renewcommand{\@listi} - {\setlength{\labelwidth}{4em}} -}\makeatother -\usepackage{enumerate} -$endif$ -$if(tables)$ -\usepackage{array} -% This is needed because raggedright in table elements redefines \\: -\newcommand{\PreserveBackslash}[1]{\let\temp=\\#1\let\\=\temp} -\let\PBS=\PreserveBackslash -$endif$ -$if(strikeout)$ -\usepackage[normalem]{ulem} -% avoid problems with \sout in headers with hyperref: -\pdfstringdefDisableCommands{\renewcommand{\sout}{}} -$endif$ -$if(subscript)$ -\newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}} -$endif$ -$if(url)$ -\usepackage{url} -$endif$ -$if(graphics)$ -\usepackage{graphicx} -% We will generate all images so they have a width \maxwidth. This means -% that they will get their normal width if they fit onto the page, but -% are scaled down if they would overflow the margins. -\makeatletter -\def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth -\else\Gin@nat@width\fi} -\makeatother -\let\Oldincludegraphics\includegraphics -\renewcommand{\includegraphics}[1]{\Oldincludegraphics[width=\maxwidth]{#1}} -$endif$ -\usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref} -\setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 2pt minus 1pt} -$if(listings)$ -\usepackage{listings} -$endif$ -$if(numbersections)$ -$else$ -\setcounter{secnumdepth}{0} -$endif$ -$if(verbatim-in-note)$ -\VerbatimFootnotes % allows verbatim text in footnotes -$endif$ -$for(header-includes)$ -$header-includes$ -$endfor$ - -$if(title)$ -\title{$title$} -$endif$ -$if(author)$ -\author{$for(author)$$author$$sep$\\$endfor$} -$endif$ -$if(date)$ -\date{$date$} -$endif$ - -\begin{document} -$if(title)$ -\maketitle -$endif$ - -$for(include-before)$ -$include-before$ - -$endfor$ -$if(toc)$ -\tableofcontents - -$endif$ -$body$ -$if(biblio-files)$ -$if(natbib)$ -$if(biblio-title)$ -$if(book-class)$ -\renewcommand\bibname{$biblio-title$} -$else$ -\renewcommand\refname{$biblio-title$} -$endif$ -$endif$ -\bibliography{$biblio-files$} -$endif$ -$endif$ -$if(biblatex)$ -\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$ -$endif$ -$for(include-after)$ - -$include-after$ -$endfor$ - -\end{document} diff -Nru pandoc-1.8.1.1/templates/man.template pandoc-1.8.2.1/templates/man.template --- pandoc-1.8.1.1/templates/man.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/man.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -$if(has-tables)$ -.\"t -$endif$ -.TH $title$ $section$ "$date$" $description$ -$for(header-includes)$ -$header-includes$ -$endfor$ -$for(include-before)$ -$include-before$ -$endfor$ -$body$ -$for(include-after)$ -$include-after$ -$endfor$ -$if(author)$ -.SH AUTHORS -$for(author)$$author$$sep$; $endfor$. -$endif$ diff -Nru pandoc-1.8.1.1/templates/markdown.template pandoc-1.8.2.1/templates/markdown.template --- pandoc-1.8.1.1/templates/markdown.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/markdown.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -$if(titleblock)$ -% $title$ -% $for(author)$$author$$sep$; $endfor$ -% $date$ - -$endif$ -$for(header-includes)$ -$header-includes$ - -$endfor$ -$for(include-before)$ -$include-before$ - -$endfor$ -$if(toc)$ -$toc$ - -$endif$ -$body$ -$for(include-after)$ - -$include-after$ -$endfor$ diff -Nru pandoc-1.8.1.1/templates/mediawiki.template pandoc-1.8.2.1/templates/mediawiki.template --- pandoc-1.8.1.1/templates/mediawiki.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/mediawiki.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -$for(include-before)$ -$include-before$ - -$endfor$ -$if(toc)$ -__TOC__ - -$endif$ -$body$ -$for(include-after)$ - -$include-after$ -$endfor$ diff -Nru pandoc-1.8.1.1/templates/opendocument.template pandoc-1.8.2.1/templates/opendocument.template --- pandoc-1.8.1.1/templates/opendocument.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/opendocument.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ - - - $automatic-styles$ -$for(header-includes)$ - $header-includes$ -$endfor$ - - -$if(title)$ -$title$ -$endif$ -$for(author)$ -$author$ -$endfor$ -$if(date)$ -$date$ -$endif$ -$for(include-before)$ -$include-before$ -$endfor$ -$body$ -$for(include-after)$ -$include-after$ -$endfor$ - - - diff -Nru pandoc-1.8.1.1/templates/org.template pandoc-1.8.2.1/templates/org.template --- pandoc-1.8.1.1/templates/org.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/org.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -$if(title)$ -$title$ - -$endif$ -$if(author)$ -#+AUTHOR: $for(author)$$author$$sep$; $endfor$ -$endif$ -$if(date)$ -#+DATE: $date$ - -$endif$ -$for(header-includes)$ -$header-includes$ - -$endfor$ -$for(include-before)$ -$include-before$ - -$endfor$ -$body$ -$for(include-after)$ - -$include-after$ -$endfor$ diff -Nru pandoc-1.8.1.1/templates/plain.template pandoc-1.8.2.1/templates/plain.template --- pandoc-1.8.1.1/templates/plain.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/plain.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -$if(titleblock)$ -$title$ -$for(author)$$author$$sep$; $endfor$ -$date$ - -$endif$ -$for(header-includes)$ -$header-includes$ - -$endfor$ -$for(include-before)$ -$include-before$ - -$endfor$ -$if(toc)$ -$toc$ - -$endif$ -$body$ -$for(include-after)$ - -$include-after$ -$endfor$ diff -Nru pandoc-1.8.1.1/templates/rst.template pandoc-1.8.2.1/templates/rst.template --- pandoc-1.8.1.1/templates/rst.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/rst.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -$if(title)$ -$title$ - -$endif$ -$for(author)$ -:Author: $author$ -$endfor$ -$if(date)$ -:Date: $date$ -$endif$ -$if(author)$ - -$else$ -$if(date)$ - -$endif$ -$endif$ -$if(math)$ -.. role:: math(raw) - :format: html latex - -$endif$ -$for(include-before)$ -$include-before$ - -$endfor$ -$if(toc)$ -.. contents:: - -$endif$ -$for(header-includes)$ -$header-includes$ - -$endfor$ -$body$ -$for(include-after)$ - -$include-after$ -$endfor$ diff -Nru pandoc-1.8.1.1/templates/rtf.template pandoc-1.8.2.1/templates/rtf.template --- pandoc-1.8.1.1/templates/rtf.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/rtf.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}} -{\colortbl;\red255\green0\blue0;\red0\green0\blue255;} -\widowctrl\hyphauto -$for(header-includes)$ -$header-includes$ -$endfor$ - -$if(title)$ -{\pard \qc \f0 \sa180 \li0 \fi0 \b \fs36 $title$\par} -$endif$ -$for(author)$ -{\pard \qc \f0 \sa180 \li0 \fi0 $author$\par} -$endfor$ -$if(date)$ -{\pard \qc \f0 \sa180 \li0 \fi0 $date$\par} -$endif$ -$if(spacer)$ -{\pard \ql \f0 \sa180 \li0 \fi0 \par} -$endif$ -$for(include-before)$ -$include-before$ -$endfor$ -$body$ -$for(include-after)$ -$include-after$ -$endfor$ -} diff -Nru pandoc-1.8.1.1/templates/s5.template pandoc-1.8.2.1/templates/s5.template --- pandoc-1.8.1.1/templates/s5.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/s5.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ - - - - - -$for(author)$ - -$endfor$ -$if(date)$ - -$endif$ - $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$ - - - -$if(highlighting-css)$ - -$endif$ -$for(css)$ - -$endfor$ -$if(s5includes)$ -$s5includes$ -$else$ - - - - - - - -$endif$ -$if(math)$ - $math$ -$endif$ -$for(header-includes)$ - $header-includes$ -$endfor$ - - -$for(include-before)$ -$include-before$ -$endfor$ -
-
-
- - -
-
-$if(title)$ -
-

$title$

-

$for(author)$$author$$sep$
$endfor$

-

$date$

-
-$endif$ -$body$ -$for(include-after)$ -$include-after$ -$endfor$ -
- - diff -Nru pandoc-1.8.1.1/templates/slidy.template pandoc-1.8.2.1/templates/slidy.template --- pandoc-1.8.1.1/templates/slidy.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/slidy.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ - - - - - - -$for(author)$ - -$endfor$ -$if(date)$ - -$endif$ -$if(highlighting-css)$ - $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$ - -$endif$ -$for(css)$ - -$endfor$ -$if(slidy-css)$ - -$else$ - -$endif$ -$if(math)$ - $math$ -$endif$ -$for(header-includes)$ - $header-includes$ -$endfor$ -$if(slidy-js)$ - -$else$ - -$endif$ - - -$for(include-before)$ -$include-before$ -$endfor$ -$if(title)$ -
-

$title$

-

-$for(author)$$author$$sep$
$endfor$ -

-$if(date)$ -

$date$

-$endif$ -
-$endif$ -$body$ -$for(include-after)$ -$include-after$ -$endfor$ - - diff -Nru pandoc-1.8.1.1/templates/texinfo.template pandoc-1.8.2.1/templates/texinfo.template --- pandoc-1.8.1.1/templates/texinfo.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/texinfo.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -\input texinfo -@documentencoding utf-8 -$for(header-includes)$ -$header-includes$ -$endfor$ - -$if(strikeout)$ -@macro textstrikeout{text} -~~\text\~~ -@end macro - -$endif$ -$if(subscript)$ -@macro textsubscript{text} -@iftex -@textsubscript{\text\} -@end iftex -@ifnottex -_@{\text\@} -@end ifnottex -@end macro - -$endif$ -$if(superscript)$ -@macro textsuperscript{text} -@iftex -@textsuperscript{\text\} -@end iftex -@ifnottex -^@{\text\@} -@end ifnottex -@end macro - -$endif$ -@ifnottex -@paragraphindent 0 -@end ifnottex -$if(titlepage)$ -@titlepage -@title $title$ -$for(author)$ -@author $author$ -$endfor$ -$if(date)$ -$date$ -$endif$ -@end titlepage - -$endif$ -$for(include-before)$ -$include-before$ - -$endfor$ -$if(toc)$ -@contents - -$endif$ -$body$ -$for(include-after)$ - -$include-after$ -$endfor$ - -@bye diff -Nru pandoc-1.8.1.1/templates/textile.template pandoc-1.8.2.1/templates/textile.template --- pandoc-1.8.1.1/templates/textile.template 2011-02-13 17:02:59.000000000 +0000 +++ pandoc-1.8.2.1/templates/textile.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -$for(include-before)$ -$include-before$ - -$endfor$ -$body$ -$for(include-after)$ - -$include-after$ -$endfor$ diff -Nru pandoc-1.8.1.1/tests/html-reader.html pandoc-1.8.2.1/tests/html-reader.html --- pandoc-1.8.1.1/tests/html-reader.html 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/html-reader.html 2011-08-01 18:02:52.000000000 +0000 @@ -298,40 +298,6 @@
Low-voiced stringed instrument.

-

HTML Blocks

-

Simple block on one line:

-foo

And nested without indentation:

-foobar

Interpreted markdown in a table:

-This is emphasized. And this is strong

Here's a simple block:

-foo

This should be a code block, though:

-
<div>
-    foo
-</div>
-
-

As should this:

-
<div>foo</div>
-
-

Now, nested:

-foo

This should just be an HTML comment:

-

Multiline:

-

Code block:

-
<!-- Comment -->
-
-

Just plain comment, with trailing spaces on the line:

-

Code:

-
<hr />
-
-

Hr's:

-
-
-
-
-
-
-
-
-
-

Inline Markup

This is emphasized, and so is this.

This is strong, and so is this.

diff -Nru pandoc-1.8.1.1/tests/html-reader.native pandoc-1.8.2.1/tests/html-reader.native --- pandoc-1.8.1.1/tests/html-reader.native 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/html-reader.native 2011-08-01 18:02:52.000000000 +0000 @@ -183,39 +183,6 @@ ,([Str "Cello",LineBreak,Str "Violoncello"], [[Plain [Str "Low",Str "-",Str "voiced",Space,Str "stringed",Space,Str "instrument",Str "."]]])] ,HorizontalRule -,Header 1 [Str "HTML",Space,Str "Blocks"] -,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"] -,Plain [Str "foo"] -,Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation:"] -,Plain [Str "foobar"] -,Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table:"] -,Plain [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ".",Space,Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"]] -,Para [Str "Here",Str "'",Str "s",Space,Str "a",Space,Str "simple",Space,Str "block:"] -,Plain [Str "foo"] -,Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "code",Space,Str "block,",Space,Str "though:"] -,CodeBlock ("",[],[]) "
\n foo\n
" -,Para [Str "As",Space,Str "should",Space,Str "this:"] -,CodeBlock ("",[],[]) "
foo
" -,Para [Str "Now,",Space,Str "nested:"] -,Plain [Str "foo"] -,Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment:"] -,Para [Str "Multiline:"] -,Para [Str "Code",Space,Str "block:"] -,CodeBlock ("",[],[]) "" -,Para [Str "Just",Space,Str "plain",Space,Str "comment,",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line:"] -,Para [Str "Code:"] -,CodeBlock ("",[],[]) "
" -,Para [Str "Hr",Str "'",Str "s:"] -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule ,Header 1 [Str "Inline",Space,Str "Markup"] ,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str "."] ,Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str "."] @@ -293,7 +260,7 @@ ,Para [Link [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title preceded by a tab"),Str "."] ,Para [Link [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with \"quotes\" in it")] ,Para [Link [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with single quotes")] -,Plain [Str "Email",Space,Str "link",Space,Str "(nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net)"] +,Para [Str "Email",Space,Str "link",Space,Str "(nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net)"] ,Para [Link [Str "Empty"] ("",""),Str "."] ,Header 2 [Str "Reference"] ,Para [Str "Foo",Space,Link [Str "bar"] ("/url/",""),Str "."] @@ -319,7 +286,7 @@ [[Plain [Str "In",Space,Str "a",Space,Str "list?"]] ,[Plain [Link [Str "http://example",Str ".",Str "com/"] ("http://example.com/","")]] ,[Plain [Str "It",Space,Str "should",Str "."]]] -,Plain [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Str "nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net"] +,Para [Str "An",Space,Str "e",Str "-",Str "mail",Space,Str "address:",Space,Str "nobody",Space,Str "[at]",Space,Str "nowhere",Str ".",Str "net"] ,BlockQuote [Para [Str "Blockquoted:",Space,Link [Str "http://example",Str ".",Str "com/"] ("http://example.com/","")]] ,Para [Str "Auto",Str "-",Str "links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ("",[],[]) ""] diff -Nru pandoc-1.8.1.1/tests/latex-reader.latex pandoc-1.8.2.1/tests/latex-reader.latex --- pandoc-1.8.1.1/tests/latex-reader.latex 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/latex-reader.latex 2011-08-01 18:02:52.000000000 +0000 @@ -17,7 +17,7 @@ \setcounter{secnumdepth}{0} \VerbatimFootnotes % allows verbatim text in footnotes \title{Pandoc Test Suite} -\author{John MacFarlane\\Anonymous} +\author{John MacFarlane \and Anonymous} \date{July 17, 2006} \begin{document} \maketitle diff -Nru pandoc-1.8.1.1/tests/lhs-test.html pandoc-1.8.2.1/tests/lhs-test.html --- pandoc-1.8.1.1/tests/lhs-test.html 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/lhs-test.html 2011-08-01 18:02:52.000000000 +0000 @@ -5,6 +5,7 @@ diff -Nru pandoc-1.8.1.1/tests/lhs-test.html+lhs pandoc-1.8.2.1/tests/lhs-test.html+lhs --- pandoc-1.8.1.1/tests/lhs-test.html+lhs 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/lhs-test.html+lhs 2011-08-01 18:02:52.000000000 +0000 @@ -5,6 +5,7 @@ diff -Nru pandoc-1.8.1.1/tests/lhs-test.latex pandoc-1.8.2.1/tests/lhs-test.latex --- pandoc-1.8.1.1/tests/lhs-test.latex 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/lhs-test.latex 2011-08-01 18:02:52.000000000 +0000 @@ -1,10 +1,28 @@ \documentclass{article} \usepackage{amssymb,amsmath} -\usepackage[mathletters]{ucs} -\usepackage[utf8x]{inputenc} -\usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref} +\usepackage{ifxetex,ifluatex} +\ifxetex + \usepackage{fontspec,xltxtra,xunicode} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} +\else + \ifluatex + \usepackage{fontspec} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \else + \usepackage[utf8]{inputenc} + \fi +\fi +\ifxetex + \usepackage[setpagesize=false, % page size defined by xetex + unicode=false, % unicode breaks when used with xetex + xetex]{hyperref} +\else + \usepackage[unicode=true]{hyperref} +\fi +\hypersetup{breaklinks=true, pdfborder={0 0 0}} \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} +\setlength{\emergencystretch}{3em} % prevent overfull lines \setcounter{secnumdepth}{0} @@ -12,7 +30,7 @@ \section{lhs test} -\verb!unsplit! is an arrow that takes a pair of values and combines them to +\texttt{unsplit} is an arrow that takes a pair of values and combines them to return a single value: \begin{verbatim} @@ -20,9 +38,9 @@ unsplit = arr . uncurry -- arr (\op (x,y) -> x `op` y) \end{verbatim} -\verb!(***)! combines two arrows into a new arrow by running the two arrows on -a pair of values (one arrow on the first item of the pair and one arrow on the -second item of the pair). +\texttt{(***)} combines two arrows into a new arrow by running the two arrows +on a pair of values (one arrow on the first item of the pair and one arrow on +the second item of the pair). \begin{verbatim} f *** g = first f >>> second g diff -Nru pandoc-1.8.1.1/tests/lhs-test.latex+lhs pandoc-1.8.2.1/tests/lhs-test.latex+lhs --- pandoc-1.8.1.1/tests/lhs-test.latex+lhs 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/lhs-test.latex+lhs 2011-08-01 18:02:52.000000000 +0000 @@ -1,12 +1,30 @@ \documentclass{article} \usepackage{amssymb,amsmath} -\usepackage[mathletters]{ucs} -\usepackage[utf8x]{inputenc} +\usepackage{ifxetex,ifluatex} +\ifxetex + \usepackage{fontspec,xltxtra,xunicode} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} +\else + \ifluatex + \usepackage{fontspec} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \else + \usepackage[utf8]{inputenc} + \fi +\fi \usepackage{listings} \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} -\usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref} +\ifxetex + \usepackage[setpagesize=false, % page size defined by xetex + unicode=false, % unicode breaks when used with xetex + xetex]{hyperref} +\else + \usepackage[unicode=true]{hyperref} +\fi +\hypersetup{breaklinks=true, pdfborder={0 0 0}} \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} +\setlength{\emergencystretch}{3em} % prevent overfull lines \setcounter{secnumdepth}{0} @@ -14,7 +32,7 @@ \section{lhs test} -\verb!unsplit! is an arrow that takes a pair of values and combines them to +\texttt{unsplit} is an arrow that takes a pair of values and combines them to return a single value: \begin{code} @@ -22,9 +40,9 @@ unsplit = arr . uncurry -- arr (\op (x,y) -> x `op` y) \end{code} -\verb!(***)! combines two arrows into a new arrow by running the two arrows on -a pair of values (one arrow on the first item of the pair and one arrow on the -second item of the pair). +\texttt{(***)} combines two arrows into a new arrow by running the two arrows +on a pair of values (one arrow on the first item of the pair and one arrow on +the second item of the pair). \begin{verbatim} f *** g = first f >>> second g diff -Nru pandoc-1.8.1.1/tests/lhs-test.nohl.html pandoc-1.8.2.1/tests/lhs-test.nohl.html --- pandoc-1.8.1.1/tests/lhs-test.nohl.html 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/lhs-test.nohl.html 2011-08-01 18:02:52.000000000 +0000 @@ -4,30 +4,14 @@ -

lhs test

unsplit is an arrow that takes a pair of values and combines them to return a single value:

-
unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
unsplit = arr . uncurry
-- arr (\op (x,y) -> x `op` y)
+
unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
+unsplit = arr . uncurry       
+          -- arr (\op (x,y) -> x `op` y) 
+

(***) combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).

f *** g = first f >>> second g
 
diff -Nru pandoc-1.8.1.1/tests/lhs-test.nohl.html+lhs pandoc-1.8.2.1/tests/lhs-test.nohl.html+lhs --- pandoc-1.8.1.1/tests/lhs-test.nohl.html+lhs 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/lhs-test.nohl.html+lhs 2011-08-01 18:02:52.000000000 +0000 @@ -4,30 +4,14 @@ -

lhs test

unsplit is an arrow that takes a pair of values and combines them to return a single value:

-
> unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
> unsplit = arr . uncurry
> -- arr (\op (x,y) -> x `op` y)
+
> unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
+> unsplit = arr . uncurry       
+>           -- arr (\op (x,y) -> x `op` y) 
+

(***) combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).

f *** g = first f >>> second g
 
diff -Nru pandoc-1.8.1.1/tests/rst-reader.native pandoc-1.8.2.1/tests/rst-reader.native --- pandoc-1.8.1.1/tests/rst-reader.native 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/rst-reader.native 2011-08-01 18:02:52.000000000 +0000 @@ -222,7 +222,7 @@ ,Para [Str "But",Space,Str "not",Space,Str "here",Str ":"] ,CodeBlock ("",[],[]) "http://example.com/" ,Header 1 [Str "Images"] -,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902)",Str ":"] +,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(",Str "1902",Str ")",Str ":"] ,Plain [Image [Str "image"] ("lalune.jpg","")] ,Plain [Image [Str "Voyage dans la Lune"] ("lalune.jpg","")] ,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] ("movie.jpg",""),Space,Str "icon",Str "."] diff -Nru pandoc-1.8.1.1/tests/s5.basic.html pandoc-1.8.2.1/tests/s5.basic.html --- pandoc-1.8.1.1/tests/s5.basic.html 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/s5.basic.html 2011-08-01 18:02:52.000000000 +0000 @@ -35,16 +35,13 @@

July 15, 2006

-

First slide

  • first bullet
  • second bullet
-
-

Math

  • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
  • diff -Nru pandoc-1.8.1.1/tests/s5.fancy.html pandoc-1.8.2.1/tests/s5.fancy.html --- pandoc-1.8.1.1/tests/s5.fancy.html 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/s5.fancy.html 2011-08-01 18:02:52.000000000 +0000 @@ -17,7 +17,8 @@ - @@ -234,16 +236,13 @@

    July 15, 2006

-

First slide

  • first bullet
  • second bullet
-
-

Math

  • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
  • diff -Nru pandoc-1.8.1.1/tests/s5.inserts.html pandoc-1.8.2.1/tests/s5.inserts.html --- pandoc-1.8.1.1/tests/s5.inserts.html 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/s5.inserts.html 2011-08-01 18:02:52.000000000 +0000 @@ -12,7 +12,12 @@ STUFF INSERTED +

    First slide

    • first bullet
    • diff -Nru pandoc-1.8.1.1/tests/tables.docbook pandoc-1.8.2.1/tests/tables.docbook --- pandoc-1.8.1.1/tests/tables.docbook 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/tables.docbook 2011-08-01 18:02:52.000000000 +0000 @@ -2,401 +2,431 @@ Simple table with caption: - + + + Right + + + Left + + + Center + + + Default + + + + + + + 12 + + + 12 + + + 12 + + + 12 + + + + + 123 + + + 123 + + + 123 + + + 123 + + + + + 1 + + + 1 + + + 1 + + + 1 + + + +
      + Demonstration of simple table syntax. - </caption> - <thead> - <tr> - <th align="right"> - Right - </th> - <th align="left"> - Left - </th> - <th align="center"> - Center - </th> - <th align="left"> - Default - </th> - </tr> - </thead> - <tbody> - <tr> - <td align="right"> - 12 - </td> - <td align="left"> - 12 - </td> - <td align="center"> - 12 - </td> - <td align="left"> - 12 - </td> - </tr> - <tr> - <td align="right"> - 123 - </td> - <td align="left"> - 123 - </td> - <td align="center"> - 123 - </td> - <td align="left"> - 123 - </td> - </tr> - <tr> - <td align="right"> - 1 - </td> - <td align="left"> - 1 - </td> - <td align="center"> - 1 - </td> - <td align="left"> - 1 - </td> - </tr> - </tbody> + + + + + + +
      Simple table without caption: - - - - Right - - - Left - - - Center - - - Default - - - - - - - 12 - - - 12 - - - 12 - - - 12 - - - - - 123 - - - 123 - - - 123 - - - 123 - - - - - 1 - - - 1 - - - 1 - - - 1 - - - + + + + + + + + + Right + + + Left + + + Center + + + Default + + + + + + + 12 + + + 12 + + + 12 + + + 12 + + + + + 123 + + + 123 + + + 123 + + + 123 + + + + + 1 + + + 1 + + + 1 + + + 1 + + + + Simple table indented two spaces: - + + + Right + + + Left + + + Center + + + Default + + + + + + + 12 + + + 12 + + + 12 + + + 12 + + + + + 123 + + + 123 + + + 123 + + + 123 + + + + + 1 + + + 1 + + + 1 + + + 1 + + + +
      + Demonstration of simple table syntax. - </caption> - <thead> - <tr> - <th align="right"> - Right - </th> - <th align="left"> - Left - </th> - <th align="center"> - Center - </th> - <th align="left"> - Default - </th> - </tr> - </thead> - <tbody> - <tr> - <td align="right"> - 12 - </td> - <td align="left"> - 12 - </td> - <td align="center"> - 12 - </td> - <td align="left"> - 12 - </td> - </tr> - <tr> - <td align="right"> - 123 - </td> - <td align="left"> - 123 - </td> - <td align="center"> - 123 - </td> - <td align="left"> - 123 - </td> - </tr> - <tr> - <td align="right"> - 1 - </td> - <td align="left"> - 1 - </td> - <td align="center"> - 1 - </td> - <td align="left"> - 1 - </td> - </tr> - </tbody> + + + + + + +
      Multiline table with caption: - + + + Centered Header + + + Left Aligned + + + Right Aligned + + + Default aligned + + + + + + + First + + + row + + + 12.0 + + + Example of a row that spans multiple lines. + + + + + Second + + + row + + + 5.0 + + + Here's another one. Note the blank line between rows. + + + +
      + Here's the caption. It may span multiple lines. - </caption> - <col width="15%" /> - <col width="13%" /> - <col width="16%" /> - <col width="33%" /> - <thead> - <tr> - <th align="center"> - Centered Header - </th> - <th align="left"> - Left Aligned - </th> - <th align="right"> - Right Aligned - </th> - <th align="left"> - Default aligned - </th> - </tr> - </thead> - <tbody> - <tr> - <td align="center"> - First - </td> - <td align="left"> - row - </td> - <td align="right"> - 12.0 - </td> - <td align="left"> - Example of a row that spans multiple lines. - </td> - </tr> - <tr> - <td align="center"> - Second - </td> - <td align="left"> - row - </td> - <td align="right"> - 5.0 - </td> - <td align="left"> - Here's another one. Note the blank line between rows. - </td> - </tr> - </tbody> + + + + + + +
      Multiline table without caption: - - - - - - - - Centered Header - - - Left Aligned - - - Right Aligned - - - Default aligned - - - - - - - First - - - row - - - 12.0 - - - Example of a row that spans multiple lines. - - - - - Second - - - row - - - 5.0 - - - Here's another one. Note the blank line between rows. - - - + + + + + + + + + Centered Header + + + Left Aligned + + + Right Aligned + + + Default aligned + + + + + + + First + + + row + + + 12.0 + + + Example of a row that spans multiple lines. + + + + + Second + + + row + + + 5.0 + + + Here's another one. Note the blank line between rows. + + + + Table without column headers: - - - - 12 - - - 12 - - - 12 - - - 12 - - - - - 123 - - - 123 - - - 123 - - - 123 - - - - - 1 - - - 1 - - - 1 - - - 1 - - - + + + + + + + + + 12 + + + 12 + + + 12 + + + 12 + + + + + 123 + + + 123 + + + 123 + + + 123 + + + + + 1 + + + 1 + + + 1 + + + 1 + + + + Multiline table without column headers: - - - - - - - - First - - - row - - - 12.0 - - - Example of a row that spans multiple lines. - - - - - Second - - - row - - - 5.0 - - - Here's another one. Note the blank line between rows. - - - + + + + + + + + + First + + + row + + + 12.0 + + + Example of a row that spans multiple lines. + + + + + Second + + + row + + + 5.0 + + + Here's another one. Note the blank line between rows. + + + + diff -Nru pandoc-1.8.1.1/tests/tables.latex pandoc-1.8.2.1/tests/tables.latex --- pandoc-1.8.1.1/tests/tables.latex 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/tables.latex 2011-08-01 18:02:52.000000000 +0000 @@ -1,121 +1,176 @@ Simple table with caption: -\begin{table}[h] -\begin{center} -\begin{tabular}{rlcl} -Right & Left & Center & Default\\ -\hline -12 & 12 & 12 & 12\\ -123 & 123 & 123 & 123\\ -1 & 1 & 1 & 1\\ -\end{tabular} -\end{center} -\caption{Demonstration of simple table syntax.} -\end{table} +\ctable[caption = Demonstration of simple table syntax., +pos = H, center, botcap]{rlcl} +{% notes +} +{% rows +\FL +Right & Left & Center & Default +\ML +12 & 12 & 12 & 12 +\\\noalign{\medskip} +123 & 123 & 123 & 123 +\\\noalign{\medskip} +1 & 1 & 1 & 1 +\LL +} Simple table without caption: -\begin{center} -\begin{tabular}{rlcl} -Right & Left & Center & Default\\ -\hline -12 & 12 & 12 & 12\\ -123 & 123 & 123 & 123\\ -1 & 1 & 1 & 1\\ -\end{tabular} -\end{center} +\ctable[pos = H, center, botcap]{rlcl} +{% notes +} +{% rows +\FL +Right & Left & Center & Default +\ML +12 & 12 & 12 & 12 +\\\noalign{\medskip} +123 & 123 & 123 & 123 +\\\noalign{\medskip} +1 & 1 & 1 & 1 +\LL +} Simple table indented two spaces: -\begin{table}[h] -\begin{center} -\begin{tabular}{rlcl} -Right & Left & Center & Default\\ -\hline -12 & 12 & 12 & 12\\ -123 & 123 & 123 & 123\\ -1 & 1 & 1 & 1\\ -\end{tabular} -\end{center} -\caption{Demonstration of simple table syntax.} -\end{table} +\ctable[caption = Demonstration of simple table syntax., +pos = H, center, botcap]{rlcl} +{% notes +} +{% rows +\FL +Right & Left & Center & Default +\ML +12 & 12 & 12 & 12 +\\\noalign{\medskip} +123 & 123 & 123 & 123 +\\\noalign{\medskip} +1 & 1 & 1 & 1 +\LL +} Multiline table with caption: -\begin{table}[h] -\begin{center} -\begin{tabular}{>{\PBS\centering\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.14\columnwidth}>{\PBS\raggedleft\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.34\columnwidth}} -\parbox{0.15\columnwidth}{Centered Header -} & \parbox{0.14\columnwidth}{Left Aligned -} & \parbox{0.16\columnwidth}{Right Aligned -} & \parbox{0.34\columnwidth}{Default aligned -}\\ -\hline -\parbox{0.15\columnwidth}{First -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{12.0 -} & \parbox{0.34\columnwidth}{Example of a row that spans multiple lines. -}\\ -\parbox{0.15\columnwidth}{Second -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{5.0 -} & \parbox{0.34\columnwidth}{Here's another one. Note the blank line between -rows. -}\\ -\end{tabular} -\end{center} -\caption{Here's the caption. It may span multiple lines.} -\end{table} +\ctable[caption = Here's the caption. It may span multiple lines., +pos = H, center, botcap]{clrl} +{% notes +} +{% rows +\FL +\parbox[b]{0.15\columnwidth}{\centering +Centered Header +} & \parbox[b]{0.14\columnwidth}{\raggedright +Left Aligned +} & \parbox[b]{0.16\columnwidth}{\raggedleft +Right Aligned +} & \parbox[b]{0.34\columnwidth}{\raggedright +Default aligned +} +\ML +\parbox[t]{0.15\columnwidth}{\centering +First +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +12.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Example of a row that spans multiple lines. +} +\\\noalign{\medskip} +\parbox[t]{0.15\columnwidth}{\centering +Second +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +5.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Here's another one. Note the blank line between rows. +} +\LL +} Multiline table without caption: -\begin{center} -\begin{tabular}{>{\PBS\centering\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.14\columnwidth}>{\PBS\raggedleft\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.34\columnwidth}} -\parbox{0.15\columnwidth}{Centered Header -} & \parbox{0.14\columnwidth}{Left Aligned -} & \parbox{0.16\columnwidth}{Right Aligned -} & \parbox{0.34\columnwidth}{Default aligned -}\\ -\hline -\parbox{0.15\columnwidth}{First -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{12.0 -} & \parbox{0.34\columnwidth}{Example of a row that spans multiple lines. -}\\ -\parbox{0.15\columnwidth}{Second -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{5.0 -} & \parbox{0.34\columnwidth}{Here's another one. Note the blank line between -rows. -}\\ -\end{tabular} -\end{center} +\ctable[pos = H, center, botcap]{clrl} +{% notes +} +{% rows +\FL +\parbox[b]{0.15\columnwidth}{\centering +Centered Header +} & \parbox[b]{0.14\columnwidth}{\raggedright +Left Aligned +} & \parbox[b]{0.16\columnwidth}{\raggedleft +Right Aligned +} & \parbox[b]{0.34\columnwidth}{\raggedright +Default aligned +} +\ML +\parbox[t]{0.15\columnwidth}{\centering +First +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +12.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Example of a row that spans multiple lines. +} +\\\noalign{\medskip} +\parbox[t]{0.15\columnwidth}{\centering +Second +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +5.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Here's another one. Note the blank line between rows. +} +\LL +} Table without column headers: -\begin{center} -\begin{tabular}{rlcr} -12 & 12 & 12 & 12\\ -123 & 123 & 123 & 123\\ -1 & 1 & 1 & 1\\ -\end{tabular} -\end{center} +\ctable[pos = H, center, botcap]{rlcr} +{% notes +} +{% rows +\FL +12 & 12 & 12 & 12 +\\\noalign{\medskip} +123 & 123 & 123 & 123 +\\\noalign{\medskip} +1 & 1 & 1 & 1 +\LL +} Multiline table without column headers: -\begin{center} -\begin{tabular}{>{\PBS\centering\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.14\columnwidth}>{\PBS\raggedleft\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.34\columnwidth}} -\parbox{0.15\columnwidth}{First -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{12.0 -} & \parbox{0.34\columnwidth}{Example of a row that spans multiple lines. -}\\ -\parbox{0.15\columnwidth}{Second -} & \parbox{0.14\columnwidth}{row -} & \parbox{0.16\columnwidth}{5.0 -} & \parbox{0.34\columnwidth}{Here's another one. Note the blank line between -rows. -}\\ -\end{tabular} -\end{center} +\ctable[pos = H, center, botcap]{clrl} +{% notes +} +{% rows +\FL +\parbox[t]{0.15\columnwidth}{\centering +First +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +12.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Example of a row that spans multiple lines. +} +\\\noalign{\medskip} +\parbox[t]{0.15\columnwidth}{\centering +Second +} & \parbox[t]{0.14\columnwidth}{\raggedright +row +} & \parbox[t]{0.16\columnwidth}{\raggedleft +5.0 +} & \parbox[t]{0.34\columnwidth}{\raggedright +Here's another one. Note the blank line between rows. +} +\LL +} diff -Nru pandoc-1.8.1.1/tests/tables.opendocument pandoc-1.8.2.1/tests/tables.opendocument --- pandoc-1.8.1.1/tests/tables.opendocument 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/tables.opendocument 2011-08-01 18:02:52.000000000 +0000 @@ -65,7 +65,8 @@ Demonstration of simple table syntax. -Simple table without caption: +Simple table without +caption: @@ -130,7 +131,7 @@ -Simple table indented two +Simple table indented two spaces: @@ -198,7 +199,8 @@ Demonstration of simple table syntax. -Multiline table with caption: +Multiline table with +caption: @@ -253,7 +255,7 @@ Here's the caption. It may span multiple lines. -Multiline table without +Multiline table without caption: @@ -307,7 +309,8 @@ -Table without column headers: +Table without column +headers: @@ -356,7 +359,7 @@ -Multiline table without column +Multiline table without column headers: diff -Nru pandoc-1.8.1.1/tests/textile-reader.native pandoc-1.8.2.1/tests/textile-reader.native --- pandoc-1.8.1.1/tests/textile-reader.native 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/textile-reader.native 2011-08-01 18:02:52.000000000 +0000 @@ -78,6 +78,7 @@ ,Para [Str "Just",Space,Str "a",Space,Link [Str "url"] ("http://www.url.com","")] ,Para [Link [Str "Email",Space,Str "link"] ("mailto:nobody@nowhere.net","")] ,Para [Str "Automatic",Space,Str "linking",Space,Str "to",Space,Link [Str "http://www.example.com"] ("http://www.example.com",""),Space,Str "and",Space,Link [Str "foobar@example.com"] ("mailto:foobar@example.com",""),Str "."] +,Para [Link [Str "Example"] ("http://www.example.com/",""),Str ":",Space,Str "Example",Space,Str "of",Space,Str "a",Space,Str "link",Space,Str "followed",Space,Str "by",Space,Str "a",Space,Str "colon",Str "."] ,Header 1 [Str "Tables"] ,Para [Str "Textile",Space,Str "allows",Space,Str "tables",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "headers",Space,Str ":"] ,Header 2 [Str "Without",Space,Str "headers"] diff -Nru pandoc-1.8.1.1/tests/textile-reader.textile pandoc-1.8.2.1/tests/textile-reader.textile --- pandoc-1.8.1.1/tests/textile-reader.textile 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/textile-reader.textile 2011-08-01 18:02:52.000000000 +0000 @@ -141,6 +141,8 @@ Automatic linking to http://www.example.com and foobar@example.com. +"Example":http://www.example.com/: Example of a link followed by a colon. + h1. Tables Textile allows tables with and without headers : diff -Nru pandoc-1.8.1.1/tests/writer.context pandoc-1.8.2.1/tests/writer.context --- pandoc-1.8.1.1/tests/writer.context 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/writer.context 2011-08-01 18:02:52.000000000 +0000 @@ -490,9 +490,9 @@ \startdescr{{\em orange}} orange fruit - \starttyping +\starttyping { orange code block } - \stoptyping +\stoptyping \startblockquote orange block quote @@ -866,9 +866,9 @@ Subsequent blocks are indented to show that they belong to the footnote (as with list items). - \starttyping +\starttyping { } - \stoptyping +\stoptyping If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.} This should {\em not} be a footnote diff -Nru pandoc-1.8.1.1/tests/writer.docbook pandoc-1.8.2.1/tests/writer.docbook --- pandoc-1.8.1.1/tests/writer.docbook 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/writer.docbook 2011-08-01 18:02:52.000000000 +0000 @@ -84,11 +84,11 @@ Code in a block quote: - + sub status { print "working"; } - + A list: @@ -130,7 +130,7 @@ Code: - + ---- (should be four hyphens) sub status { @@ -138,15 +138,15 @@ } this code block is indented by one tab - + And: - + this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ - +
      Lists @@ -742,9 +742,9 @@ orange fruit - + { orange code block } - +
      orange block quote @@ -902,17 +902,17 @@ This should be a code block, though: - + <div> foo </div> - + As should this: - + <div>foo</div> - + Now, nested: @@ -942,9 +942,9 @@ Code block: - + <!-- Comment --> - + Just plain comment, with trailing spaces on the line: @@ -952,9 +952,9 @@ Code: - + <hr /> - + Hr's: @@ -1291,9 +1291,9 @@ This should [not][] be a link. - + [not]: /url - + Foo bar. @@ -1355,9 +1355,9 @@ Auto-links should not occur here: <http://example.com/> - + or here: <http://example.com/> - +
      @@ -1398,9 +1398,9 @@ Subsequent blocks are indented to show that they belong to the footnote (as with list items). - + { <code> } - + If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. diff -Nru pandoc-1.8.1.1/tests/writer.html pandoc-1.8.2.1/tests/writer.html --- pandoc-1.8.1.1/tests/writer.html 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/writer.html 2011-08-01 18:02:52.000000000 +0000 @@ -9,7 +9,12 @@ Pandoc Test Suite +

      This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite.


      Headers

      @@ -559,15 +564,15 @@

        -
      1. Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.

      2. +
      3. Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.

      4. Here’s the long note. This one contains multiple blocks.

        Subsequent blocks are indented to show that they belong to the footnote (as with list items).

          { <code> }
         
        -

        If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.

      5. -
      6. This is easier to type. Inline notes may contain links and ] verbatim characters, as well as [bracketed text].

      7. -
      8. In quote.

      9. -
      10. In list.

      11. +

        If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.

        +
      12. This is easier to type. Inline notes may contain links and ] verbatim characters, as well as [bracketed text].

      13. +
      14. In quote.

      15. +
      16. In list.

      diff -Nru pandoc-1.8.1.1/tests/writer.latex pandoc-1.8.2.1/tests/writer.latex --- pandoc-1.8.1.1/tests/writer.latex 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/writer.latex 2011-08-01 18:02:52.000000000 +0000 @@ -1,7 +1,17 @@ \documentclass{article} \usepackage{amssymb,amsmath} -\usepackage[mathletters]{ucs} -\usepackage[utf8x]{inputenc} +\usepackage{ifxetex,ifluatex} +\ifxetex + \usepackage{fontspec,xltxtra,xunicode} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} +\else + \ifluatex + \usepackage{fontspec} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \else + \usepackage[utf8]{inputenc} + \fi +\fi \usepackage{fancyvrb} % Redefine labelwidth for lists; otherwise, the enumerate package will cause % markers to extend beyond the left margin. @@ -10,10 +20,6 @@ {\setlength{\labelwidth}{4em}} }\makeatother \usepackage{enumerate} -\usepackage[normalem]{ulem} -% avoid problems with \sout in headers with hyperref: -\pdfstringdefDisableCommands{\renewcommand{\sout}{}} -\newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}} \usepackage{url} \usepackage{graphicx} % We will generate all images so they have a width \maxwidth. This means @@ -25,14 +31,26 @@ \makeatother \let\Oldincludegraphics\includegraphics \renewcommand{\includegraphics}[1]{\Oldincludegraphics[width=\maxwidth]{#1}} -\usepackage[breaklinks=true,unicode=true,pdfborder={0 0 0}]{hyperref} +\ifxetex + \usepackage[setpagesize=false, % page size defined by xetex + unicode=false, % unicode breaks when used with xetex + xetex]{hyperref} +\else + \usepackage[unicode=true]{hyperref} +\fi +\hypersetup{breaklinks=true, pdfborder={0 0 0}} +\usepackage[normalem]{ulem} +% avoid problems with \sout in headers with hyperref: +\pdfstringdefDisableCommands{\renewcommand{\sout}{}} +\newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}} \setlength{\parindent}{0pt} \setlength{\parskip}{6pt plus 2pt minus 1pt} +\setlength{\emergencystretch}{3em} % prevent overfull lines \setcounter{secnumdepth}{0} \VerbatimFootnotes % allows verbatim text in footnotes \title{Pandoc Test Suite} -\author{John MacFarlane\\Anonymous} +\author{John MacFarlane \and Anonymous} \date{July 17, 2006} \begin{document} @@ -558,7 +576,8 @@ So is \textbf{\emph{this}} word. -This is code: \verb!>!, \verb!$!, \verb!\!, \verb!\$!, \verb!!. +This is code: \texttt{\textgreater{}}, \texttt{\$}, \texttt{\textbackslash{}}, +\texttt{\textbackslash{}\$}, \texttt{\textless{}html\textgreater{}}. \sout{This is \emph{strikeout}.} @@ -582,7 +601,7 @@ `He said, ``I want to go.''\,' Were you alive in the 70's? -Here is some quoted `\verb!code!' and a +Here is some quoted `\texttt{code}' and a ``\href{http://example.com/?foo=1\&bar=2}{quoted link}''. Some dashes: one---two --- three---four --- five. @@ -618,14 +637,14 @@ \begin{itemize} \item - To get the famous equation, write \verb!$e = mc^2$!. + To get the famous equation, write \texttt{\$e = mc\^{}2\$}. \item \$22,000 is a \emph{lot} of money. So is \$34,000. (It worked if ``lot'' is emphasized.) \item Shoes (\$20) and socks (\$5). \item - Escaped \verb!$!: \$73 \emph{this should be emphasized} 23\$. + Escaped \texttt{\$}: \$73 \emph{this should be emphasized} 23\$. \end{itemize} Here's a LaTeX table: @@ -777,7 +796,8 @@ Blockquoted: \url{http://example.com/} \end{quote} -Auto-links should not occur here: \verb!! +Auto-links should not occur here: +\texttt{\textless{}http://example.com/\textgreater{}} \begin{verbatim} or here: @@ -808,15 +828,15 @@ Subsequent blocks are indented to show that they belong to the footnote (as with list items). - \begin{Verbatim} +\begin{Verbatim} { } - \end{Verbatim} +\end{Verbatim} If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.} This should \emph{not} be a footnote reference, because it contains a space.{[}\^{}my note{]} Here is an inline note.\footnote{This is \emph{easier} to type. Inline notes may contain - \href{http://google.com}{links} and \verb!]! verbatim characters, as well as - {[}bracketed text{]}.} + \href{http://google.com}{links} and \texttt{{]}} verbatim characters, as + well as {[}bracketed text{]}.} \begin{quote} Notes can go in quotes.\footnote{In quote.} diff -Nru pandoc-1.8.1.1/tests/writer.opendocument pandoc-1.8.2.1/tests/writer.opendocument --- pandoc-1.8.1.1/tests/writer.opendocument 2011-02-13 17:03:00.000000000 +0000 +++ pandoc-1.8.2.1/tests/writer.opendocument 2011-08-01 18:02:52.000000000 +0000 @@ -874,12 +874,12 @@ Level 2 with emphasis Level 3 -with no blank line +with no blank line Level 2 -with no blank line +with no blank line Paragraphs -Here’s a regular +Here’s a regular paragraph. In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle @@ -891,7 +891,7 @@ Block Quotes -E-mail style: +E-mail style: This is a block quote. It is pretty short. Code in a block quote: @@ -910,13 +910,13 @@ Nested block quotes: nested nested -This should not be a block quote: 2 -> 1. +This should not be a block quote: +2 > 1. And a following paragraph. Code Blocks -Code: +Code: ---- (should be four hyphens) sub status { @@ -924,14 +924,14 @@ } this code block is indented by one tab -And: +And: this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ Lists Unordered -Asterisks tight: +Asterisks tight: asterisk 1 @@ -943,7 +943,7 @@ asterisk 3 -Asterisks loose: +Asterisks loose: asterisk 1 @@ -955,7 +955,7 @@ asterisk 3 -Pluses tight: +Pluses tight: Plus 1 @@ -967,7 +967,7 @@ Plus 3 -Pluses loose: +Pluses loose: Plus 1 @@ -979,7 +979,7 @@ Plus 3 -Minuses tight: +Minuses tight: Minus 1 @@ -991,7 +991,7 @@ Minus 3 -Minuses loose: +Minuses loose: Minus 1 @@ -1004,7 +1004,7 @@ Ordered -Tight: +Tight: First @@ -1016,7 +1016,7 @@ Third -and: +and: One @@ -1028,7 +1028,7 @@ Three -Loose using tabs: +Loose using tabs: First @@ -1040,7 +1040,7 @@ Third -and using spaces: +and using spaces: One @@ -1052,7 +1052,7 @@ Three -Multiple paragraphs: +Multiple paragraphs: Item 1, graf one. @@ -1080,7 +1080,7 @@ -Here’s another: +Here’s another: First @@ -1103,7 +1103,7 @@ Third -Same thing but with +Same thing but with paragraphs: @@ -1176,7 +1176,7 @@ -Nesting: +Nesting: Upper Alpha @@ -1197,7 +1197,7 @@ -Autonumbering: +Autonumbering: Autonumber. @@ -1211,13 +1211,14 @@ -Should not be a list item: +Should not be a list +item: M.A. 2007 B. Williams Definition Lists -Tight using spaces: +Tight using spaces: apple red fruit orange @@ -1226,7 +1227,7 @@ banana yellow fruit -Tight using tabs: +Tight using tabs: apple red fruit orange @@ -1235,14 +1236,15 @@ banana yellow fruit -Loose: +Loose: apple red fruit orange orange fruit banana yellow fruit -Multiple blocks with italics: +Multiple blocks with +italics: apple red fruitcontains @@ -1250,7 +1252,8 @@ orange orange fruit{ orange code block }orange block quote -Multiple definitions, tight: +Multiple definitions, +tight: apple red fruit computer @@ -1258,15 +1261,16 @@ orange fruit bank -Multiple definitions, loose: +Multiple definitions, +loose: apple red fruit computer orange orange fruit bank -Blank line after term, indented marker, -alternate markers: +Blank line after term, indented +marker, alternate markers: apple red fruit computer @@ -1282,7 +1286,8 @@ HTML Blocks -Simple block on one line: +Simple block on one +line: foo And nested without indentation: @@ -1301,24 +1306,24 @@ <div> foo </div> -As should this: +As should this: <div>foo</div> -Now, nested: +Now, nested: foo This should just be an HTML comment: Multiline: Code block: <!-- Comment --> -Just plain comment, with trailing +Just plain comment, with trailing spaces on the line: Code: <hr /> -Hr’s: +Hr’s: Inline Markup -This is +This is emphasized, and so is this. @@ -1365,8 +1370,8 @@ Smart quotes, ellipses, dashes -“Hello,” said the spider. -“‘Shelob’ is my name.” +“Hello,” said the +spider. “‘Shelob’ is my name.” ‘A’, ‘B’, and ‘C’ are letters. ‘Oak,’ ‘elm,’ @@ -1413,7 +1418,8 @@ α + ω × x2. -These shouldn’t be math: +These shouldn’t be +math: To get the famous equation, write @@ -1437,11 +1443,12 @@ 23$. -Here’s a LaTeX table: +Here’s a LaTeX +table: Special Characters -Here is some unicode: +Here is some unicode: I hat: Î @@ -1459,8 +1466,8 @@ copyright: © -AT&T has an ampersand in their -name. +AT&T has an ampersand in +their name. AT&T is another way to write it. This & that. @@ -1485,7 +1492,7 @@ Links Explicit -Just a +Just a URL. URL and title. @@ -1502,7 +1509,7 @@ link Empty. Reference -Foo +Foo bar. Foo bar. @@ -1521,13 +1528,13 @@ thrice. This should [not][] be a link. [not]: /url -Foo +Foo bar. Foo biz. With ampersands -Here’s a +Here’s a link with an ampersand in the URL. Here’s a link with an amersand in @@ -1540,7 +1547,7 @@ inline link in pointy braces. Autolinks -With an ampersand: +With an ampersand: http://example.com/?foo=1&bar=2 @@ -1553,24 +1560,24 @@ It should. -An e-mail address: +An e-mail address: nobody@nowhere.net Blockquoted: http://example.com/ -Auto-links should not occur here: +Auto-links should not occur here: <http://example.com/> or here: <http://example.com/> Images -From “Voyage dans la Lune” -by Georges Melies (1902): - +From “Voyage dans la +Lune” by Georges Melies (1902): + Here is a movie - + icon. Footnotes -Here is a footnote +Here is a footnote reference,1Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document. @@ -1600,8 +1607,8 @@ list. -This paragraph should not be part of -the note, as it is not indented. +This paragraph should not be part +of the note, as it is not indented.