diff --git a/MakeManPage.hs b/MakeManPage.hs --- a/MakeManPage.hs +++ b/MakeManPage.hs @@ -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 --git a/README b/README --- a/README +++ b/README @@ -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. @@ -501,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 @@ -540,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 @@ -570,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 ================= @@ -1382,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 ----------------- @@ -1815,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 @@ -1893,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. @@ -1973,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 diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,124 @@ +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. @@ -33,8 +154,11 @@ HTML tags can be used freely at the left margin of a markdown+lhs document. Thanks to Conal Elliot for the suggestion. - * Markdown reader: Fixed bug in footnote order (reported by CircleCode). + * 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. @@ -391,6 +515,8 @@ * Moved `smartPunctuation` from `Text.Pandoc.Readers.Markdown` 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 diff --git a/man/man1/markdown2pdf.1 b/man/man1/markdown2pdf.1 --- a/man/man1/markdown2pdf.1 +++ b/man/man1/markdown2pdf.1 @@ -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.) @@ -157,6 +152,16 @@ A \f[C]reference.odt\f[], \f[C]epub.css\f[], \f[C]templates\f[] 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 diff --git a/man/man1/markdown2pdf.1.md b/man/man1/markdown2pdf.1.md --- a/man/man1/markdown2pdf.1.md +++ b/man/man1/markdown2pdf.1.md @@ -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.) @@ -108,6 +105,12 @@ in Windows. A `reference.odt`, `epub.css`, `templates` directory, 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 diff --git a/man/man1/pandoc.1 b/man/man1/pandoc.1 --- a/man/man1/pandoc.1 +++ b/man/man1/pandoc.1 @@ -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 @@ -656,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[]. @@ -727,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. @@ -770,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 @@ -827,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 @@ -921,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 --git a/man/man5/pandoc_markdown.5 b/man/man5/pandoc_markdown.5 --- a/man/man5/pandoc_markdown.5 +++ b/man/man5/pandoc_markdown.5 @@ -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 --git a/pandoc.cabal b/pandoc.cabal --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,5 +1,5 @@ Name: pandoc -Version: 1.8.1.2 +Version: 1.8.2 Cabal-Version: >= 1.6 Build-Type: Custom License: GPL @@ -11,7 +11,7 @@ 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, @@ -208,10 +207,11 @@ random >= 1 && < 1.1, extensible-exceptions >= 0.1 && < 0.2, citeproc-hs >= 0.3.1 && < 0.4, - pandoc-types == 1.8.*, + pandoc-types == 1.8.0.2, 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 @@ -292,10 +293,11 @@ random >= 1 && < 1.1, extensible-exceptions >= 0.1 && < 0.2, citeproc-hs >= 0.3.1 && < 0.4, - pandoc-types == 1.8.*, + pandoc-types == 1.8.0.2, 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 @@ -366,3 +368,4 @@ Tests.Writers.Native Tests.Writers.ConTeXt Tests.Writers.HTML + Tests.Writers.Markdown diff --git a/reference.odt b/reference.odt Binary files a/reference.odt and b/reference.odt differ diff --git a/s5/default/slides.js.comment b/s5/default/slides.js.comment deleted file mode 100644 --- a/s5/default/slides.js.comment +++ /dev/null @@ -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 --git a/s5/default/slides.js.packed b/s5/default/slides.js.packed deleted file mode 100644 --- a/s5/default/slides.js.packed +++ /dev/null @@ -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'+'" ++ + "\" class=\"footnoteBackLink\">" ++ (if writerAscii opts then "↩" else "↩") ++ ""] blocks' = if null blocks then [] diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -35,7 +35,8 @@ import Text.Pandoc.Templates import Text.Printf ( printf ) import Network.URI ( isAbsoluteURI, unEscapeString ) -import Data.List ( (\\), isSuffixOf, isPrefixOf, intercalate, intersperse ) +import Data.List ( (\\), isSuffixOf, isInfixOf, + isPrefixOf, intercalate, intersperse ) import Data.Char ( toLower, isPunctuation ) import Control.Monad.State import Text.Pandoc.Pretty @@ -57,6 +58,7 @@ , 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. @@ -68,7 +70,8 @@ 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 @@ -78,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 @@ -111,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 ] ++ @@ -152,21 +158,13 @@ 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 blockToLaTeX Null = return empty blockToLaTeX (Plain lst) = inlineListToLaTeX lst blockToLaTeX (Para [Image txt (src,tit)]) = do - capt <- inlineListToLaTeX $ deVerb txt + capt <- inlineListToLaTeX txt img <- inlineToLaTeX (Image txt (src,tit)) return $ "\\begin{figure}[htbp]" $$ "\\centering" $$ img $$ ("\\caption{" <> capt <> char '}') $$ "\\end{figure}" $$ blankline @@ -216,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 @@ -249,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 @@ -279,7 +277,7 @@ then return empty else liftM ($$ "\\ML") $ (tableRowToLaTeX True aligns widths) heads - captionText <- inlineListToLaTeX $ deVerb caption + captionText <- inlineListToLaTeX caption let capt = if isEmpty captionText then empty else text "caption = " <> captionText <> "," <> space @@ -336,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' @@ -354,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 @@ -381,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 "--" @@ -421,7 +428,7 @@ [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 diff --git a/src/Text/Pandoc/Writers/ODT.hs b/src/Text/Pandoc/Writers/ODT.hs --- a/src/Text/Pandoc/Writers/ODT.hs +++ b/src/Text/Pandoc/Writers/ODT.hs @@ -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,12 +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 @@ -70,8 +74,30 @@ (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 diff --git a/src/markdown2pdf.hs b/src/markdown2pdf.hs --- a/src/markdown2pdf.hs +++ b/src/markdown2pdf.hs @@ -2,24 +2,63 @@ import Data.List (isInfixOf, intercalate, isPrefixOf) import Data.Maybe (isNothing) - -import Control.Monad (unless, guard) -import Control.Exception (tryJust, bracket) +import qualified Data.ByteString as BS +import Codec.Binary.UTF8.String (decodeString, encodeString) +import Data.ByteString.UTF8 (toString) +import Control.Monad (unless, guard, liftM, when) +import Control.Concurrent (putMVar, takeMVar, newEmptyMVar, forkIO) +import Control.Exception (tryJust, bracket, evaluate) -import System.IO (stderr) +import System.IO import System.IO.Error (isDoesNotExistError) import System.Environment ( getArgs, getProgName ) import qualified Text.Pandoc.UTF8 as UTF8 import System.Exit (ExitCode (..), exitWith) import System.FilePath import System.Directory -import System.Process (readProcessWithExitCode) -import Codec.Binary.UTF8.String (decodeString, encodeString) -import Control.Monad (liftM) +import System.Process +-- A variant of 'readProcessWithExitCode' that does not +-- cause an error if the output is not UTF-8. (Copied +-- with slight variants from 'System.Process'.) +readProcessWithExitCode' + :: FilePath -- ^ command to run + -> [String] -- ^ any arguments + -> String -- ^ standard input + -> IO (ExitCode,String,String) -- ^ exitcode, stdout, stderr +readProcessWithExitCode' cmd args input = do + (Just inh, Just outh, Just errh, pid) <- + createProcess (proc cmd args){ std_in = CreatePipe, + std_out = CreatePipe, + std_err = CreatePipe } + + outMVar <- newEmptyMVar + + -- fork off a thread to start consuming stdout + out <- liftM toString $ BS.hGetContents outh + _ <- forkIO $ evaluate (length out) >> putMVar outMVar () + + -- fork off a thread to start consuming stderr + err <- liftM toString $ BS.hGetContents errh + _ <- forkIO $ evaluate (length err) >> putMVar outMVar () + + -- now write and flush any input + when (not (null input)) $ do hPutStr inh input; hFlush inh + hClose inh -- done with stdin + + -- wait on the output + takeMVar outMVar + takeMVar outMVar + hClose outh + + -- wait on the process + ex <- waitForProcess pid + + return (ex, out, err) + run :: FilePath -> [String] -> IO (Either String String) run file opts = do - (code, out, err) <- readProcessWithExitCode (encodeString file) + (code, out, err) <- readProcessWithExitCode' (encodeString file) (map encodeString opts) "" let msg = out ++ err case code of @@ -48,11 +87,12 @@ runLatexRaw :: String -> FilePath -> IO (Either (Either String String) FilePath) runLatexRaw latexProgram file = do -- we ignore the ExitCode because pdflatex always fails the first time - run latexProgram ["-interaction=batchmode", "-output-directory", - takeDirectory file, dropExtension file] >> return () + run latexProgram ["-halt-on-error", "-interaction", "nonstopmode", + "-output-directory", takeDirectory file, dropExtension file] >> return () let pdfFile = replaceExtension file "pdf" let logFile = replaceExtension file "log" - txt <- tryJust (guard . isDoesNotExistError) (UTF8.readFile logFile) + txt <- tryJust (guard . isDoesNotExistError) + (liftM toString $ BS.readFile logFile) let checks = checkLatex $ either (const "") id txt case checks of -- err , bib , ref , msg @@ -79,7 +119,9 @@ checkLatex txt = (err , bib, ref, unlines $! msgs ++ tips) where xs `oneOf` x = any (flip isInfixOf x) xs - msgs = filter (oneOf ["Error:", "Warning:"]) (lines txt) + msgs = dropWhile (not . errorline) $ lines txt + errorline ('!':_) = True + errorline _ = False tips = checkPackages msgs err = any (oneOf ["!", "LaTeX Error:", "Latex Error:"]) msgs bib = any (oneOf ["Warning: Citation" @@ -122,7 +164,7 @@ saveStdin :: FilePath -> IO (Either String FilePath) saveStdin file = do - text <- UTF8.getContents + text <- liftM toString $ BS.getContents UTF8.writeFile file text fileExist <- doesFileExist (encodeString file) case fileExist of @@ -152,7 +194,7 @@ let goodopts = ["-f","-r","-N", "-p","-R","-H","-B","-A", "-C","-o","-V"] let goodoptslong = ["--from","--read","--strict", "--preserve-tabs","--tab-stop","--parse-raw", - "--toc","--table-of-contents", "--xetex", + "--toc","--table-of-contents", "--xetex", "--luatex", "--number-sections","--include-in-header", "--include-before-body","--include-after-body", "--custom-header","--output", @@ -164,17 +206,23 @@ -- note that a long option can come in this form: --opt=val let isGoodopt x = x `elem` (goodopts ++ goodoptslong) || any (\o -> (o ++ "=") `isPrefixOf` x) goodoptslong + let markdown2pdfOpts = ["--xetex","--luatex"] unless (all isGoodopt opts) $ do (code, out, _err) <- readProcessWithExitCode "pandoc" ["--help"] "" UTF8.putStrLn "markdown2pdf [OPTIONS] [FILES]\nOptions:" UTF8.putStr $ unlines $ - filter (\l -> any (`isInfixOf` l) goodoptslong) $ lines out + filter (\l -> any (`isInfixOf` l) goodoptslong) (lines out) + ++ map (replicate 24 ' ' ++) markdown2pdfOpts exitWith code + let args' = filter (`notElem` markdown2pdfOpts) args + -- check for executable files let latexProgram = if "--xetex" `elem` opts then "xelatex" - else "pdflatex" + else if "--luatex" `elem` opts + then "lualatex" + else "pdflatex" let execs = ["pandoc", latexProgram, "bibtex"] paths <- mapM findExecutable execs let miss = map snd $ filter (isNothing . fst) $ zip paths execs @@ -182,7 +230,7 @@ -- parse arguments -- if no input given, use 'stdin' - pandocArgs <- parsePandocArgs args + pandocArgs <- parsePandocArgs args' (input, output) <- case pandocArgs of Nothing -> exit "Could not parse arguments" Just ([],out) -> do @@ -193,7 +241,7 @@ -- no need because we'll pass all arguments to pandoc Just (_ ,out) -> return ([], out) -- run pandoc - pandocRes <- runPandoc (input ++ args) $ replaceDirectory output tmp + pandocRes <- runPandoc (input ++ args') $ replaceDirectory output tmp case pandocRes of Left err -> exit err Right texFile -> do diff --git a/src/pandoc.hs b/src/pandoc.hs --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -44,6 +44,8 @@ import Data.List ( intercalate, isSuffixOf, isPrefixOf ) import System.Directory ( getAppUserDataDirectory, doesFileExist ) import System.IO ( stdout, stderr ) +import System.IO.Error ( isDoesNotExistError ) +import Control.Exception.Extensible ( throwIO ) import qualified Text.Pandoc.UTF8 as UTF8 import Text.CSL import Text.Pandoc.Biblio @@ -93,7 +95,7 @@ , optParseRaw :: Bool -- ^ Parse unconvertable HTML and TeX , optTableOfContents :: Bool -- ^ Include table of contents , optTransforms :: [Pandoc -> Pandoc] -- ^ Doc transforms to apply - , optTemplate :: String -- ^ Custom template + , optTemplate :: Maybe FilePath -- ^ Custom template , optVariables :: [(String,String)] -- ^ Template variables to set , optOutputFile :: String -- ^ Name of output file , optNumberSections :: Bool -- ^ Number sections in LaTeX @@ -137,7 +139,7 @@ , optParseRaw = False , optTableOfContents = False , optTransforms = [] - , optTemplate = "" + , optTemplate = Nothing , optVariables = [] , optOutputFile = "-" -- "-" means stdout , optNumberSections = False @@ -286,8 +288,12 @@ "" -- "Use jsMath for HTML math" , Option "" ["mathjax"] - (ReqArg - (\arg opt -> return opt { optHTMLMathMethod = MathJax arg}) + (OptArg + (\arg opt -> do + let url' = case arg of + Just u -> u + Nothing -> "https://d3eoax9i5htok0.cloudfront.net/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" + return opt { optHTMLMathMethod = MathJax url'}) "URL") "" -- "Use MathJax for HTML math" @@ -309,7 +315,10 @@ , Option "" ["xetex"] (NoArg - (\opt -> return opt { optXeTeX = True })) + (\opt -> do + UTF8.hPutStrLn stderr $ "pandoc: --xetex is deprecated. " + ++ "It is no longer needed for use with XeTeX." + return opt { optXeTeX = True })) "" -- "Format latex for processing by XeTeX" , Option "" ["chapters"] @@ -404,8 +413,7 @@ , Option "" ["template"] (ReqArg (\arg opt -> do - text <- UTF8.readFile arg - return opt{ optTemplate = text, + return opt{ optTemplate = Just arg, optStandalone = True }) "FILENAME") "" -- "Use custom template" @@ -669,13 +677,12 @@ , optVariables = variables , optTableOfContents = toc , optTransforms = transforms - , optTemplate = template + , optTemplate = templatePath , optOutputFile = outputFile , optNumberSections = numberSections , optSectionDivs = sectionDivs , optIncremental = incremental , optOffline = offline - , optXeTeX = xetex , optSmart = smart , optHtml5 = html5 , optChapters = chapters @@ -729,10 +736,25 @@ Just r -> return r Nothing -> error ("Unknown reader: " ++ readerName') - templ <- getDefaultTemplate datadir writerName' - let defaultTemplate = case templ of - Right t -> t - Left e -> error (show e) + templ <- case templatePath of + Nothing -> do + deftemp <- getDefaultTemplate datadir writerName' + case deftemp of + Left e -> throwIO e + Right t -> return t + Just tp -> do + -- strip off "+lhs" if present + let format = takeWhile (/='+') writerName' + let tp' = case takeExtension tp of + "" -> tp <.> format + _ -> tp + catch (UTF8.readFile tp') + (\e -> if isDoesNotExistError e + then catch + (readDataFile datadir $ + "templates" tp') + (\_ -> throwIO e) + else throwIO e) let standalone' = standalone || isNonTextOutput writerName' @@ -744,7 +766,7 @@ slidyJs <- readDataFile datadir $ "slidy" "slidy.min.js" slidyCss <- readDataFile datadir $ - "slidy" "slidy.min.css" + "slidy" "slidy.css" return $ ("slidy-js", slidyJs) : ("slidy-css", slidyCss) : variables _ -> return variables @@ -786,10 +808,9 @@ stateIndentedCodeClasses = codeBlockClasses, stateApplyMacros = writerName' `notElem` ["latex", "latex+lhs"] } - let writerOptions = WriterOptions { writerStandalone = standalone', - writerTemplate = if null template - then defaultTemplate - else template, + let writerOptions = defaultWriterOptions + { writerStandalone = standalone', + writerTemplate = templ, writerVariables = variables'', writerEPUBMetadata = epubMetadata, writerTabStop = tabStop, @@ -798,7 +819,6 @@ writerHTMLMathMethod = mathMethod, writerSlideVariant = slideVariant, writerIncremental = incremental, - writerXeTeX = xetex, writerCiteMethod = citeMethod, writerBiblioFiles = reffiles, writerIgnoreNotes = False, diff --git a/templates/context.template b/templates/context.template deleted file mode 100644 --- a/templates/context.template +++ /dev/null @@ -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 --git a/templates/default.context b/templates/default.context new file mode 100644 --- /dev/null +++ b/templates/default.context @@ -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 --git a/templates/default.docbook b/templates/default.docbook new file mode 100644 --- /dev/null +++ b/templates/default.docbook @@ -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 --git a/templates/default.html b/templates/default.html new file mode 100644 --- /dev/null +++ b/templates/default.html @@ -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 --git a/templates/default.latex b/templates/default.latex new file mode 100644 --- /dev/null +++ b/templates/default.latex @@ -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 --git a/templates/default.man b/templates/default.man new file mode 100644 --- /dev/null +++ b/templates/default.man @@ -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 --git a/templates/default.markdown b/templates/default.markdown new file mode 100644 --- /dev/null +++ b/templates/default.markdown @@ -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 --git a/templates/default.mediawiki b/templates/default.mediawiki new file mode 100644 --- /dev/null +++ b/templates/default.mediawiki @@ -0,0 +1,13 @@ +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +__TOC__ + +$endif$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff --git a/templates/default.opendocument b/templates/default.opendocument new file mode 100644 --- /dev/null +++ b/templates/default.opendocument @@ -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 --git a/templates/default.org b/templates/default.org new file mode 100644 --- /dev/null +++ b/templates/default.org @@ -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 --git a/templates/default.plain b/templates/default.plain new file mode 100644 --- /dev/null +++ b/templates/default.plain @@ -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 --git a/templates/default.rst b/templates/default.rst new file mode 100644 --- /dev/null +++ b/templates/default.rst @@ -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 --git a/templates/default.rtf b/templates/default.rtf new file mode 100644 --- /dev/null +++ b/templates/default.rtf @@ -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 --git a/templates/default.s5 b/templates/default.s5 new file mode 100644 --- /dev/null +++ b/templates/default.s5 @@ -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 --git a/templates/default.slidy b/templates/default.slidy new file mode 100644 --- /dev/null +++ b/templates/default.slidy @@ -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 --git a/templates/default.texinfo b/templates/default.texinfo new file mode 100644 --- /dev/null +++ b/templates/default.texinfo @@ -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 --git a/templates/default.textile b/templates/default.textile new file mode 100644 --- /dev/null +++ b/templates/default.textile @@ -0,0 +1,9 @@ +$for(include-before)$ +$include-before$ + +$endfor$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff --git a/templates/docbook.template b/templates/docbook.template deleted file mode 100644 --- a/templates/docbook.template +++ /dev/null @@ -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 --git a/templates/html.template b/templates/html.template deleted file mode 100644 --- a/templates/html.template +++ /dev/null @@ -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 --git a/templates/latex.template b/templates/latex.template deleted file mode 100644 --- a/templates/latex.template +++ /dev/null @@ -1,130 +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{ctable} -\usepackage{float} % provides the H option for float placement -$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 --git a/templates/man.template b/templates/man.template deleted file mode 100644 --- a/templates/man.template +++ /dev/null @@ -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 --git a/templates/markdown.template b/templates/markdown.template deleted file mode 100644 --- a/templates/markdown.template +++ /dev/null @@ -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 --git a/templates/mediawiki.template b/templates/mediawiki.template deleted file mode 100644 --- a/templates/mediawiki.template +++ /dev/null @@ -1,13 +0,0 @@ -$for(include-before)$ -$include-before$ - -$endfor$ -$if(toc)$ -__TOC__ - -$endif$ -$body$ -$for(include-after)$ - -$include-after$ -$endfor$ diff --git a/templates/opendocument.template b/templates/opendocument.template deleted file mode 100644 --- a/templates/opendocument.template +++ /dev/null @@ -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 --git a/templates/org.template b/templates/org.template deleted file mode 100644 --- a/templates/org.template +++ /dev/null @@ -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 --git a/templates/plain.template b/templates/plain.template deleted file mode 100644 --- a/templates/plain.template +++ /dev/null @@ -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 --git a/templates/rst.template b/templates/rst.template deleted file mode 100644 --- a/templates/rst.template +++ /dev/null @@ -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 --git a/templates/rtf.template b/templates/rtf.template deleted file mode 100644 --- a/templates/rtf.template +++ /dev/null @@ -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 --git a/templates/s5.template b/templates/s5.template deleted file mode 100644 --- a/templates/s5.template +++ /dev/null @@ -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 --git a/templates/slidy.template b/templates/slidy.template deleted file mode 100644 --- a/templates/slidy.template +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - -$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 --git a/templates/texinfo.template b/templates/texinfo.template deleted file mode 100644 --- a/templates/texinfo.template +++ /dev/null @@ -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 --git a/templates/textile.template b/templates/textile.template deleted file mode 100644 --- a/templates/textile.template +++ /dev/null @@ -1,9 +0,0 @@ -$for(include-before)$ -$include-before$ - -$endfor$ -$body$ -$for(include-after)$ - -$include-after$ -$endfor$ diff --git a/tests/latex-reader.latex b/tests/latex-reader.latex --- a/tests/latex-reader.latex +++ b/tests/latex-reader.latex @@ -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 --git a/tests/lhs-test.html b/tests/lhs-test.html --- a/tests/lhs-test.html +++ b/tests/lhs-test.html @@ -5,6 +5,7 @@ diff --git a/tests/lhs-test.html+lhs b/tests/lhs-test.html+lhs --- a/tests/lhs-test.html+lhs +++ b/tests/lhs-test.html+lhs @@ -5,6 +5,7 @@ diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex --- a/tests/lhs-test.latex +++ b/tests/lhs-test.latex @@ -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 --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs --- a/tests/lhs-test.latex+lhs +++ b/tests/lhs-test.latex+lhs @@ -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 --git a/tests/s5.fancy.html b/tests/s5.fancy.html --- a/tests/s5.fancy.html +++ b/tests/s5.fancy.html @@ -17,7 +17,8 @@ - diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html --- a/tests/s5.inserts.html +++ b/tests/s5.inserts.html @@ -12,7 +12,12 @@ STUFF INSERTED +

First slide

  • first bullet
    • diff --git a/tests/tables.docbook b/tests/tables.docbook --- a/tests/tables.docbook +++ b/tests/tables.docbook @@ -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 --git a/tests/writer.context b/tests/writer.context --- a/tests/writer.context +++ b/tests/writer.context @@ -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 --git a/tests/writer.docbook b/tests/writer.docbook --- a/tests/writer.docbook +++ b/tests/writer.docbook @@ -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 --git a/tests/writer.html b/tests/writer.html --- a/tests/writer.html +++ b/tests/writer.html @@ -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. +

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

    3. 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. ↩

      4. -

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

      5. -

    5. In quote. ↩

      6. -

    6. In list. ↩

      7. +

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

      +

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

      8. +

    8. In quote. ↩

      9. +

    9. In list. ↩

    diff --git a/tests/writer.latex b/tests/writer.latex --- a/tests/writer.latex +++ b/tests/writer.latex @@ -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.}