diff --git a/AUTHORS.md b/AUTHORS.md --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,195 +1,540 @@ # Contributors -- Arata Mizuki - Aaron Wolen +- Adelar da Silva Queiróz +- Agriya Khetarpal +- Agustín Martín Barbero +- Akash Patel +- Akos Marton - Albert Krewinkel +- Albert Lei - Alex Ivkin +- Alex Toldaiev - Alex Vong +- Alexander Batischev - Alexander Kondratskiy - Alexander Krotov - Alexander Sulfrian - Alexander V Vershilov +- Alexandre Franke - Alfred Wechselberger +- Amar Al-Zubaidi +- Amir Dekel +- Amneesh Singh +- Amogh Rathore +- Amy de Buitléir +- Anabra +- Anders Waldenborg +- Andreas Deininger - Andreas Lööw +- Andreas Scherer +- Andres Freund - Andrew Dunning +- Andy Morris +- Aner Lucero +- Anti-Distinctlyminty - Antoine Latter +- Anton Antich +- Anton Melnikov +- Antonio Terceiro - Arata Mizuki +- Arata Mizuki +- Arfon Smith - Arlo O'Keeffe +- Artem Pelenitsyn - Artyom Kazak -- Agustín Martín Barbero +- Asliddinbek Azizovich - B. Scott Michel +- Bastien Dumont - Ben Firshman - Ben Gamari +- Ben Steinberg - Beni Cherniavsky-Paskin +- Benjamin Bray +- Benjamin Esham +- Benjamin Wuethrich - Benoit Schweblin +- Benson Muite - Bjorn Buckwalter +- Blake Eryx +- Bodigrim - Bradley Kuhn - Brent Yorgey +- Brian Leung - Bryan O'Sullivan - Caleb McDaniel +- Caleb Mclennan - Calvin Beck +- Carlos Scheidegger - Carlos Sosa +- Carsten Allefeld +- Castedo Ellerman +- Cécile Chemin +- Cédric Couralet +- Cezary Drożak +- Chandrahas77 +- Charanjit Singh +- Charles Tapley Hoyt +- Charlotte Koch - Chris Black +- Chris Callison-Burch - Christian Conkle +- Christian Christiansen +- Christian Despres - Christoffer Ackelman - Christoffer Sawicki +- Christophe Dervieux +- Christopher Kenny - Clare Macrae - Clint Adams - Conal Elliott +- Cormac Relf - Craig S. Bosma +- Damien Clochard +- Dan Jacobson - Daniel Bergey +- Daniel Kessler +- Daniel Maslowski - Daniel T. Staal - Daniele D'Orazio - David A Roberts - David Lazar +- David Martschenko - David Röthlisberger - Denis Laxalde +- Denis Maier +- Derek Chen-Becker +- Diego Balseiro +- Diogo Almiro +- Dimitri Sabadie +- Dimitris Apostolou +- Dmitry Pogodin +- Dmitry Volodin - Douglas Calvert +- Edwin Török +- Eigil Rischel +- Elliot Bobrow - Emanuel Evans +- Emmanuel Ferdman +- Emerson Harkin +- Emily Bourke - Emily Eisenberg - Eric Kow +- Eric Schrijver - Eric Seidel +- Erik Post +- Erik Rask +- Ethan Riley +- Étienne Bersac +- Evan Silberman +- Even Brenden +- Ezwal +- Fabián Heredia Montiel +- Félix Baylac-Jacqué - Felix Yan +- Florian Beeres - Florian Eitel +- Florian Klink +- Florian Kohrt +- FoxChillz +- Francesco Mazzoli +- Francesco Occhipinti - François Gannaz +- Frank Seifferth +- Frederik Elwert - Freiric Barral - Freirich Raabe - Frerich Raabe - Fyodor Sheremetyev - Gabor Pali +- Gabriel Lewertowski - Gavin Beatty +- George Stagg +- Georgi Lyubenov +- GHyman83 +- Gokul Rajiv +- Gordon Woodhull - Gottfried Haider - Greg Maslov - Greg Rundlett - Grégory Bataille +- Guriy Samarin - Gwern Branwen - Hamish Mackenzie - Hans-Peter Deifel +- Hendrik Erz +- Heiko Schlittermann - Henrik Tramberend - Henry de Valence +- Herwig Stuetz +- Hikaru Ibayashi +- Hos Es - Hubert Plociniczak +- Iacobus1983 +- Ian Max Andolina +- Igor Khorlo +- Igor Pashev +- Ilona Silverwood - Ilya V. Portnov +- Ivan Panchenko +- Ivan Trubach +- Ivar de Bruin - Ivo Clarysse +- Jaap de Jong +- Jacob Larkin +- James J Balamuta +- J. B. Rainsberger - J. Lewis Muir +- Jackson Schuster +- Jaehwang Jung - Jaime Marquínez Ferrándiz +- Jake Zimmerman - Jakob Voß - James Aspnes +- James P. Ascher +- James Barlow +- James Scott-Brown - Jamie F. Olson - Jan Larres - Jan Schulz +- Jan Tojnar +- Jannik Buhr +- Jan-Otto Kröpke +- Jared Lander - Jason Ronallo - Jeff Arnold - Jeff Runningen - Jens Getreu - Jens Petersen +- Jens Oehlschlägel +- Jesse Hathaway +- Jeremie Knuesel +- Jérémy Bobbio +- Jeroen de Haas +- Jerry Sky - Jesse Rosenthal +- Jez Cope +- Joe Hermaszewski - Joe Hillenbrand +- Johan Larsson +- John KetzerX +- John Luke Bentley - John MacFarlane - John Muccigrosso -- John Luke Bentley +- John Purnell +- Jonas Scholl - Jonas Smedegaard +- Jonathan - Jonathan Daugherty +- Jonathan Dönszelmann - Jose Luis Duran +- José de Mattos Neto - Josef Svenningsson +- Joseph C. Sible +- Julia Diaz - Julien Cretel +- Julien Dutant +- Juliette Fourcot - Juliusz Gonera - Justin Bogner -- Jérémy Bobbio +- Justin Wood +- Karl Pettersson +- Keenan Brock - Keiichiro Shikano - Kelsey Hightower +- Kevin Broch - Kolen Cheung - Konstantin Zudov - Kristof Bastiaensen -- Herwig Stuetz +- Krystof Beuermann - Lars-Dominik Braun +- Laurent P. René de Cotret +- Lawrence Chonavel +- Leif Metcalf +- Leo Heitmann Ruiz +- Leonard Rosenthol +- Lila +- Link Swanson +- Loïc Grobol +- Lorenzo +- Lucas Escot +- Lucas Viana +- Lucas V. R +- Luis Rivera - Luke Plant +- Manolis Stamatogiannakis - Marc Schreiber +- Marcin Serwin +- Mario Lang +- Mark Gardner - Mark Szepieniec - Mark Wright +- Martin Joerg - Martin Linn +- Martin Michlmayr +- Martín Pozo +- Masataka Ogawa - Masayoshi Takahashi - Matej Kollar - Mathias Schenner +- Mathias Walter +- Mathieu Boespflug - Mathieu Duponchelle +- Matt Dodson +- Matthew Doty - Matthew Eddey - Matthew Pickering - Matthias C. M. Troffaes - Mauro Bieg - Max Bolingbroke +- Max Heller - Max Rydahl Andersen +- Meher Chaitanya - Merijn Verstraaten - Michael Beaumont - Michael Chladek +- Michael Hoffmann +- Michael McClurg +- Michael Peyton Jones +- Michael Reed - Michael Snoyman +- Michael Stahl - Michael Thompson +- Mickaël Canouil +- Mike Tzou +- Mikołaj Machowski +- Milan Bracke - MinRK +- Mohamed Akram +- Morgan Willcock - Morton Fox - Nathan Gass +- Naveen - Neil Mayhew - Nick Bart +- Nick Berendsen +- Nick Fleisher - Nicolas Kaiser +- Niklas Eicker +- Nikolai Korobeinikov - Nikolay Yakimov +- Nils Carlson +- Nixon Enraght-Moony +- Noah Malmed +- Nokome Bentley +- Norwid Behrnd +- OCzarnecki +- Ola Wolska +- Ole Martin Ruud +- Oliver Fabel - Oliver Matthews +- Olivier Benz +- Olivier Dossmann - Ophir Lifshitz - Or Neeman +- OvidiusCicero +- Owen McGrath - Pablo Rodríguez +- Pascal Wagler +- Pau RE - Paul Rivier +- Paul Tilley - Paulo Tanimoto +- Pavol Otto +- Per Christian Gaustad +- Pete Ryland +- Peter Briggs +- Peter Fabinksi - Peter Wang +- Philip Pesca - Philippe Ombredanne - Phillip Alday +- Pranesh Prakash +- Prat - Prayag Verma - Puneeth Chaganti +- Quinn +- R. N. West - Ralf Stephan - Raniere Silva +- Raymond Berger +- Raymond Ehlers - Recai Oktaş +- Repetitive +- Reuben Thomas +- Rowan Rodrik van der Molen - Roland Hieber +- Roman Beránek +- Ruqi - RyanGlScott +- Ryan Gibb +- S.P.H +- Sai Asish Y +- Salim B +- Sam S. Almahri +- Sam May +- Samuel Tardieu +- Saumel Lemmenmeier +- Santiago Zarate - Sascha Wilde - Scott Morrison +- Sean Soon +- Sebastian Talmon +- Sebbones +- Sen-wen Deng - Sergei Trofimovich - Sergey Astanin +- Seth Speaks - Shahbaz Youssefi - Shaun Attfield +- Shim Myeongseob +- Shin Sang-jae - Sidarth Kapur +- Sidney Mau - Sidharth Kapur - Simon Hengel +- Simon Schuster +- Siphalor - Stefan Dresselhaus +- Stephan Daus +- Stephan Meijer +- Stephen Altamirano +- Stephen Huan +- Stephen Reindl +- Stéphane Guillou +- Sukil Etxenike +- Sukka - Sumit Sahrawat +- Suraj Patil +- Sven Wick +- TEC +- Tarik Graba +- Tatiana Porras +- Terence Eden - Thenaesh Elango - Thomas Hodgson +- Thomas Soeiro - Thomas Weißschuh +- Tiago-Manzato - Tim Lin +- Tim Stewart +- Tim Wisotzki - Timm Albers - Timothy Humphries - Tiziano Müller - Todd Sifleet +- Tomas Dahlqvist +- TomBen - Tom Leese +- Toni Dietze +- Tristan Stenner +- Tristan de Cacqueray +- Tristano Ajmone +- Tuong Nguyen Manh - Uli Köhler +- Urs Liska +- Václav Haisman - Václav Zeman +- Vaibhav Sagar +- Vanessa McHale +- Vasily Alferov +- Veratyr - Viktor Kronvall - Vincent -- Václav Haisman -- Václav Zeman -- Wandmalfarbe +- Vlad Hanciuta +- Vladimir Alexiev - Waldir Pimenta +- Wandmalfarbe +- Wentao Han - Wikiwide +- William Lupton +- William Rusnack +- Winnie Hellmann +- Wout Gevaert - Xavier Olive +- Yan Pashkovsky +- Yann Trividic +- Yehuda Katz +- YI +- Yoan Blanc +- You Jiangbin - Yuchen Pei +- Zihang Chen +- 3w36zj6 +- arcnmx +- a-vrma +- andrebauer +- benniekiss +- black-desk +- blmage - bucklereed - bumper314 +- chinapedia +- cholonam +- closeobserve - csforste - d-dorazio -- iandol +- damon-sava-stanley +- dbecher-ito +- ebiim +- ech0 +- etclub +- favonia +- guqicun +- har7an +- harabat +- hseg - infinity0x +- jeongminkim-islab +- josch +- kaizshang91 +- lawcho +- lifeunleaded +- lux-lth +- luz paz - lwolfsonkin +- massifrg +- mbracke +- mbrackeantidot +- mh4ckt3mh4ckt1c4s +- mjfs +- mt_caret +- nbehrnd +- nibras shami +- niszet - nkalvi +- nuew +- obcat +- oltolm +- oquechy +- pacien +- perro tuerto +- piq9117 +- priiduonu - qerub +- quasicomputational +- reptee +- ricnorr - robabla - roblabla - rodja.trappe - rski +- samuel-weinhardt +- sdhoward - shreevatsa.public - takahashim +- taotieren +- tecosaur - tgkokk +- the-solipsist +- thomjur - thsutton +- thron7 +- timo-a +- vijayphoenix +- vkraven +- wgevaert +- wiefling +- willj-dev +- wuffi +- λx.x diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,24 +1,87 @@ Contributing to pandoc ====================== +Welcome to pandoc! Very soon after its beginnings in 2006, pandoc +has been influenced, improved, and modified, by users, devs, and +newcomers alike. The project thrives on its active community. It is +great to have you here. + +How can I help? +--------------- + +There are many ways in which you can support pandoc. Here are a few +ideas: + + * Participate in online discussions. The [discussion + forum] is a good place for this. + + * Help with questions. Every request that is answered by the wider + community frees time for programming contributors. This will + speed up development of new features and issue fixes. Don't + underestimate your knowledge, please share it! + + Good places to help are the [discussion forum], Q/A + sites like StackOverflow, community forums (e.g. + [RStudio][RStudio Community], [Zettlr][Zettlr Forum]), and, for + technical questions, the GitHub [issue tracker]. + + * Write or improve documentation. If you ran into a problem which + took more time to figure out than expected, please consider to + save other users from the same experience. People writing the + documentation tend to lack an outside view, so please help + provide one. Good documentation is both difficult and extremely + important. + + The official docs are not the only place for documentation. + Pandoc also has a [Wiki][pandoc wiki]. Private blogs can serve + as documentation just as the official manual can. + + * Contribute code. No matter whether it's a small fix in a format + template or a huge lump of Haskell code: help is welcome. It's + usually a good idea to talk about the plans early, as this can + prevent unnecessary work. See below for more information. + + * Last but not least: consider funding the development and + maintenance of pandoc financially. You can find sponsor buttons + on the [pandoc website] and the [GitHub repository][GitHub + repo]. + +A rich ecosystem of libraries, editors, filters, and templates has +developed around pandoc; conversely, pandoc builds and depends on a +large number of libraries. Contributing to any of these projects is +another way that can help to ensure stability, and to keep pushing +the boundaries of what is possible with pandoc. + +[RStudio Community]: https://community.rstudio.com/ +[Zettlr Forum]: https://forum.zettlr.com/ +[pandoc wiki]: https://github.com/jgm/pandoc/wiki +[pandoc website]: https://pandoc.org +[GitHub repo]: https://github.com/jgm/pandoc + Have a question? ---------------- -Ask on [pandoc-discuss]. +Ask on the [discussion forum]. Found a bug? ------------ -Bug reports are welcome! Please report all bugs on pandoc's github +Bug reports are welcome! Please report all bugs on pandoc's GitHub [issue tracker]. Before you submit a bug report, search the [open issues] *and* [closed issues] to make sure the issue hasn't come up before. Also, check the [User's Guide] and [FAQs] for anything relevant. -Make sure you can reproduce the bug with the [latest released version] of pandoc -(or, even better, the [development version]). +Make sure you can reproduce the bug with the [latest released +version] of pandoc---or, even better, the development version, +since the bug may have been fixed since the last release. +[Nightly builds] are available, so you don't need to compile +from source to test against the development version. +(To fetch a nightly, visit the link, click the topmost "Nightly" +in the table, then choose your platform under "Artifacts." Note +that you must be logged in with a GitHub account.) Your report should give detailed, *reproducible* instructions, including @@ -55,7 +118,7 @@ So before submitting a bug report, consider whether it might be "out of scope." If it concerns a feature of documents that isn't representable in pandoc's Markdown, then it very likely is. -(If in doubt, you can always ask on [pandoc-discuss].) +(If in doubt, you can always ask on the [discussion forum].) Fixing bugs from the issue tracker ---------------------------------- @@ -65,12 +128,12 @@ bug. There is not yet a way to indicate priority. An up to date summary of issues can be found on [GitHub labels]. -* [beginner-friendly] — The perfect starting point for new contributors. The +* [good first issue] — The perfect starting point for new contributors. The issue is generic and can be resolved without deep knowledge of the code base. * [enhancement] — A feature which would be desirable. We recommend - you discuss any proposed enhancement on pandoc-discuss before - writing code. + you discuss any proposed enhancement on the [discussion forum] + before writing code. * [bug] — A problem which needs to be fixed. * [complexity:low] — The fix should only be a couple of lines. * [complexity:high] — The fix might require structural changes or in depth @@ -92,22 +155,29 @@ Have an idea for a new feature? ------------------------------- -First, search [pandoc-discuss] and the issue tracker (both [open issues] *and* +First, search the [discussion forum] +and the issue tracker (both [open issues] *and* [closed issues]) to make sure that the idea has not been discussed before. Explain the rationale for the feature you're requesting. Why would this feature be useful? Consider also any possible drawbacks, including backwards compatibility, new library dependencies, and performance issues. -It is best to discuss a potential new feature on [pandoc-discuss] -before opening an issue. +Features are very rarely "implement and forget", as all code must be +maintained. This is especially relevant for large or complex +contributions. It is helpful to be sympathetic to that fact, and to +communicate future plans and availability clearly. +Any potential new feature is best discussed on the [discussion +forum] before opening an issue. + Patches and pull requests ------------------------- Patches and pull requests are welcome. Before you put time into a nontrivial -patch, it is a good idea to discuss it on [pandoc-discuss], especially if it is -for a new feature (rather than fixing a bug). +patch, it is a good idea to discuss it on the +[discussion forum], especially if it is for a new feature (rather +than fixing a bug). Please follow these guidelines: @@ -144,13 +214,10 @@ 9. It is better not to introduce new dependencies. Dependencies on external C libraries should especially be avoided. -10. We aim for compatibility with ghc versions from 7.8.3 to the - latest release. All pull requests and commits are tested - automatically on , using GHC versions in the - `Tested-With` stanza of `pandoc.cabal`. We currently relax - the "`-Wall` clean" requirement for GHC 7.10.x, because - there are so many warnings relating to the addition of type - classes to the Prelude. +10. We aim for compatibility with at least the last three + released ghc versions, and sometimes more. Currently we + support ghc versions 9.6 and higher. All pull requests + and commits are tested automatically on GitHub Actions. Tests ----- @@ -169,6 +236,77 @@ The test program is `test/test-pandoc.hs`. +To run particular tests (pattern-matching on their names), use +the `-p` option: + + cabal install pandoc --enable-tests + cabal test --test-options='-p markdown' + +Or with stack: + + stack test --test-arguments='-p markdown' + +It is often helpful to add `-j4` (run tests in parallel) and +`--hide-successes` (don't clutter output with successes) to the test +arguments as well. Collecting all options in a `cabal.project.local` +file in the project's root directory can help to keep `cabal` +commands short. E.g.: + + flags: +embed_data_files + tests: True + test-show-details: direct + test-options: -j4 --hide-successes + +If you add a new feature to pandoc, please add tests as well, following +the pattern of the existing tests. The test suite code is in +`test/test-pandoc.hs`. If you are adding a new reader or writer, it is +probably easiest to add some data files to the `test` directory, and +modify `test/Tests/Old.hs`. Otherwise, it is better to modify the module +under the `test/Tests` hierarchy corresponding to the pandoc module you +are changing. Alternatively, you may add a "command test" to +the `/test/command/` hierarchy, following the pattern of the tests there. +These test files should have a meaningful name, which can include the issue +number and/or the feature that's being tested. For example, `5474-tables.md` +refers to both issue and feature. + +You can rebuild the golden tests in `tests/` by passing +`--accept` to the test script. (If you're using stack, `stack +test --test-arguments "--accept"`; or `make TESTARGS=--accept`). +Then check the changed golden files for accuracy, and +commit the changes. For docx or pptx tests, open the files in Word +or Powerpoint to ensure that they weren't corrupted and that +they had the expected result, and mention the Word/Powerpoint +version and OS in your commit comment. + +Code style +---------- + +Pandoc uses [hlint] to identify opportunities for code improvements +like redundant brackets or unnecessary `Language` extensions. +However, sometimes there are cases where there are good reasons to +use code different from what hlint proposes. In these cases, the +respective warning should be disabled in the file `.hlint.yaml`. + +There should be no errors when running `hlint .`; this is checked by +the continuous integration (CI) setup. It is recommended that +contributors check their code with a local hlint installation, but +relying on the CI is fine, too. + +A good way to ensure no new warnings are introduced is to use a Git +[pre-commit hook] which runs hlint on all updated Haskell files +before creating a commit: + + #!/bin/sh + git diff --diff-filter=MA --cached --name-only | grep '\.hs$' | \ + xargs hlint --hint .hlint.yaml + +(If you are using GNU `xargs`, add the `-r` option immediately +after `xargs`.) + +Saving this to `.git/hooks/pre-commit`, and making the script +executable, will prevent accidental introduction of potentially +problematic code. + Benchmarks ---------- @@ -182,29 +320,29 @@ stack bench -You can also build pandoc with the `weigh-pandoc` flag and -run `weigh-pandoc` to get some statistics on memory usage. -(Eventually this should be incorporated into the benchmark -suite.) Using the REPL -------------- With a recent version of cabal, you can do `cabal repl` and get a ghci REPL for working with pandoc. With [stack], use -`cabal ghci`. +`stack ghci`. We recommend using the following `.ghci` file (which can be placed in the source directory): - :set -fobject-code - :set -XTypeSynonymInstances - :set -XScopedTypeVariables - :set -XOverloadedStrings + :set -fobject-code + :set -XTypeSynonymInstances + :set -XScopedTypeVariables + :set -XOverloadedStrings Profiling --------- +To diagnose a performance issue with parsing, first try using +the `--trace` option. This will give you a record of when block +parsers succeed, so you can spot backtracking issues. + To use the GHC profiler with cabal: cabal clean @@ -219,28 +357,11 @@ pandoc +RTS -p -RTS [file]... less pandoc.prof -Templates ---------- - -The default templates live in `data/templates`, which is a git -subtree linked to . -The purpose of maintaining a separate repository is to allow -people to maintain variant templates as a fork. - -You can modify the templates and submit patches without worrying -much about this: when these patches are merged, we will -push them to the main templates repository by doing - - git subtree push --prefix=data/templates templates master - -where `templates` is a remote pointing to the templates -repository. - The code -------- Pandoc has a publicly accessible git repository on -github: . To get a local copy of the source: +GitHub: . To get a local copy of the source: git clone https://github.com/jgm/pandoc.git @@ -250,7 +371,7 @@ The modules `Text.Pandoc.Definition`, `Text.Pandoc.Builder`, and `Text.Pandoc.Generic` are in a separate library `pandoc-types`. The code can -be found in . +be found in . To build pandoc, you will need a working installation of the [Haskell platform]. @@ -263,18 +384,18 @@ - `Text.Pandoc.Definition` (in `pandoc-types`) defines the types used for representing a pandoc document. - `Text.Pandoc.Builder` (in `pandoc-types`) provides functions for - building pandoc documents programatically. + building pandoc documents programmatically. - `Text.Pandoc.Generics` (in `pandoc-types`) provides functions allowing you to promote functions that operate on parts of pandoc documents to functions that operate on whole pandoc documents, walking the tree automatically. - `Text.Pandoc.Readers.*` are the readers, and `Text.Pandoc.Writers.*` are the writers. - - `Text.Pandoc.Biblio` is a utility module for formatting citations - using citeproc-hs. + - `Text.Pandoc.Citeproc.*` contain the code for citation handling, + including an interface to the [citeproc] library. - `Text.Pandoc.Data` is used to embed data files when the `embed_data_files` - cabal flag is used. It is generated from `src/Text/Pandoc/Data.hsb` using - the preprocessor [hsb2hs]. + cabal flag is used. + - `Text.Pandoc.Emoji` is a thin wrapper around [emojis]. - `Text.Pandoc.Highlighting` contains the interface to the skylighting library, which is used for code syntax highlighting. - `Text.Pandoc.ImageSize` is a utility module containing functions for @@ -285,7 +406,6 @@ - `Text.Pandoc.PDF` contains functions for producing a PDF from a LaTeX source. - `Text.Pandoc.Parsing` contains parsing functions used in multiple readers. - - `Text.Pandoc.Pretty` is a pretty-printing library specialized to the needs of pandoc. - `Text.Pandoc.SelfContained` contains functions for making an HTML file "self-contained," by importing remotely linked images, CSS, @@ -302,19 +422,53 @@ - `Text.Pandoc.UUID` contains functions for generating UUIDs. - `Text.Pandoc.XML` contains functions for formatting XML. +Adding a new command-line option +-------------------------------- + +To add a new command-line option, you'll need to make changes in several +places: + +- `MANUAL.txt` -- documentation for new option, both in the list + of options and in the section on defaults files. +- `Text.Pandoc.App.Opt` -- new constructor for Opt and default + value +- `Text.Pandoc.App.CommandLineOptions` -- the option parser +- `Text.Pandoc.App` or `Text.Pandoc.App.OutputSettings` -- + handle the new option +- possibly in pandoc-server: `Text.Pandoc.Server` -- handle the + new option + +If your change requires a new field for ReaderOptions or +WriterOptions, you'll also need to + +- `Text.Pandoc.Options` -- type change and default value +- in pandoc-lua-engine: Text.Pandoc.Lua.Marshal.WriterOptions + and/or Text.Pandoc.Lua.Marshal.ReaderOptions + +Lua filters +----------- + +If you've written a useful pandoc [lua filter](./doc/lua-filters.md), +you may want to consider submitting a pull request to the +[lua-filters repository](https://github.com/pandoc/lua-filters). + [open issues]: https://github.com/jgm/pandoc/issues [closed issues]: https://github.com/jgm/pandoc/issues?q=is%3Aissue+is%3Aclosed [latest released version]: https://github.com/jgm/pandoc/releases/latest -[development version]: https://github.com/pandoc-extras/pandoc-nightly/releases/latest -[pandoc-discuss]: http://groups.google.com/group/pandoc-discuss +[Nightly builds]: https://github.com/jgm/pandoc/actions?query=workflow%3ANightly +[pandoc-discuss]: https://groups.google.com/group/pandoc-discuss [issue tracker]: https://github.com/jgm/pandoc/issues -[User's Guide]: http://pandoc.org/MANUAL.html -[FAQs]: http://pandoc.org/faqs.html -[EditorConfig]: http://editorconfig.org/ -[Haskell platform]: http://www.haskell.org/platform/ -[hsb2hs]: http://hackage.haskell.org/package/hsb2hs +[User's Guide]: https://pandoc.org/MANUAL.html +[FAQs]: https://pandoc.org/faqs.html +[EditorConfig]: https://editorconfig.org/ +[Haskell platform]: https://www.haskell.org/platform/ +[hlint]: https://hackage.haskell.org/package/hlint +[citeproc]: https://hackage.haskell.org/package/citeproc +[emojis]: https://hackage.haskell.org/package/emojis +[hsb2hs]: https://hackage.haskell.org/package/hsb2hs +[pre-commit hook]: https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks [GitHub labels]: https://github.com/jgm/pandoc/labels -[beginner-friendly]: https://github.com/jgm/pandoc/labels/beginner-friendly +[good first issue]:https://github.com/jgm/pandoc/labels/good%20first%20issue [enhancement]: https://github.com/jgm/pandoc/labels/enhancement [bug]: https://github.com/jgm/pandoc/labels/bug [complexity:low]: https://github.com/jgm/pandoc/labels/complexity:low @@ -327,4 +481,5 @@ [status:more-discussion-needed]: https://github.com/jgm/pandoc/labels/status:more-discussion-needed [status:more-info-needed]: https://github.com/jgm/pandoc/labels/status:more-info-needed [stack]: https://github.com/commercialhaskell/stack +[discussion forum]: https://github.com/jgm/pandoc/discussions diff --git a/COPYING.md b/COPYING.md --- a/COPYING.md +++ b/COPYING.md @@ -3,8 +3,8 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -317,10 +317,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + You should have received a copy of the GNU General Public License along + with this program; if not, see . Also add information on how to contact you by electronic and paper mail. @@ -357,5 +356,5 @@ you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the [GNU Lesser General Public -License](http://www.gnu.org/licenses/lgpl.html) instead of this +License](https://www.gnu.org/licenses/lgpl.html) instead of this License. diff --git a/COPYRIGHT b/COPYRIGHT --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ Pandoc -Copyright (C) 2006-2017 John MacFarlane +Copyright (C) 2006-2024 John MacFarlane With the exceptions noted below, this code is released under the [GPL], version 2 or later: @@ -14,19 +14,18 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU General Public License along + with this program; if not, see . The GNU General Public License is available in the file COPYING.md in the source distribution. On Debian systems, the complete text of the GPL can be found in `/usr/share/common-licenses/GPL`. -[GPL]: http://www.gnu.org/copyleft/gpl.html - -Pandoc's complete source code is available from the [Pandoc home page]. +[GPL]: https://www.gnu.org/copyleft/gpl.html -[Pandoc home page]: http://pandoc.org +The complete source code for pandoc version X.Y.Z is available at + +and at . Pandoc includes some code with different copyrights, or subject to different licenses. The copyright and license statements for these sources are included @@ -37,7 +36,7 @@ Text.Pandoc.Builder, Text.Pandoc.Generics, Text.Pandoc.JSON, Text.Pandoc.Walk) are licensed under the BSD 3-clause license: -Copyright (c) 2006-2017, John MacFarlane +Copyright (c) 2006-2024, John MacFarlane All rights reserved. @@ -69,32 +68,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- -Pandoc's templates (in `data/templates`) are dual-licensed GPL (v2 or -higher, same as pandoc) and the BSD 3-clause license. +Pandoc's templates (in `data/templates`) are dual-licensed as either +GPL (v2 or higher, same as pandoc) or (at your option) the BSD +3-clause license. -Copyright (c) 2014--2017, John MacFarlane +Copyright (c) 2014--2024, John MacFarlane ---------------------------------------------------------------------- src/Text/Pandoc/Writers/Muse.hs -Copyright (C) 2017 Alexander Krotov +Copyright (C) 2017-2020 Alexander Krotov Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Writers/Texinfo.hs -Copyright (C) 2008-2017 John MacFarlane and Peter Wang +Copyright (C) 2008-2024 John MacFarlane and Peter Wang Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Writers/OpenDocument.hs -Copyright (C) 2008-2017 Andrea Rossato and John MacFarlane +Copyright (C) 2008-2024 Andrea Rossato and John MacFarlane Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Writers/Org.hs -Copyright (C) 2010-2017 Puneeth Chaganti, John MacFarlane, and +Copyright (C) 2010-2024 Puneeth Chaganti, John MacFarlane, and Albert Krewinkel Released under the GNU General Public License version 2 or later. @@ -108,54 +108,75 @@ ---------------------------------------------------------------------- src/Text/Pandoc/Readers/Docx.hs src/Text/Pandoc/Readers/Docx/* -Copyright (C) 2014-2017 Jesse Rosenthal +Copyright (C) 2014-2020 Jesse Rosenthal Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Readers/Textile.hs -Copyright (C) 2010-2017 Paul Rivier and John MacFarlane +Copyright (C) 2010-2024 Paul Rivier and John MacFarlane Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- +src/Text/Pandoc/Readers/TikiWiki.hs +Copyright (C) 2017 Robin Lee Powell + +Released under the GNU General Public License version 2 or later. + +---------------------------------------------------------------------- +src/Text/Pandoc/Readers/JATS.hs +Copyright (C) 2017-2018 Hamish Mackenzie + +Released under the GNU General Public License version 2 or later. + +---------------------------------------------------------------------- +src/Text/Pandoc/Readers/EPUB.hs +Copyright (C) 2014-2024 Matthew Pickering and John MacFarlane + +Released under the GNU General Public License version 2 or later. + +---------------------------------------------------------------------- src/Text/Pandoc/Readers/Org.hs -test/Tests/Readers/Org.hs -Copyright (C) 2014-2017 Albert Krewinkel +src/Text/Pandoc/Readers/Org/* +test/Tests/Readers/Org/* +Copyright (C) 2014-2024 Albert Krewinkel Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- -data/LaTeXMathML.js -Adapted by Jeff Knisely and Douglas Woodall from -ASCIIMathML.js v. 1.4.7 -Copyright (C) 2005 Peter Jipsen +pandoc-lua-engine/src/Text/Pandoc/Lua.hs +pandoc-lua-engine/src/Text/Pandoc/Lua/* +pandoc-lua-engine/test/lua/* +Copyright (C) 2017--2024 Albert Krewinkel and John MacFarlane Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- -data/MathMLinHTML.js -Copyright (C) 2004 Peter Jipsen http://www.chapman.edu/~jipsen +src/Text/Pandoc/Readers/Jira.hs +src/Text/Pandoc/Writers/Jira.hs +test/Tests/Readers/Jira.hs +Copyright (C) 2019--2024 Albert Krewinkel Released under the GNU General Public License version 2 or later. ------------------------------------------------------------------------- -data/pandoc.lua -Copyright (C) 2017 Albert Krewinkel +---------------------------------------------------------------------- +src/Text/Pandoc/Readers/FB2.hs +Copyright (C) 2018--2019 Alexander Krotov Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- The dzslides template contains JavaScript and CSS from Paul Rouget's dzslides template. -http://github.com/paulrouget/dzslides +https://github.com/paulrouget/dzslides Released under the Do What the Fuck You Want To Public License. ------------------------------------------------------------------------ -Pandoc embeds a lua interpreter (via hslua). +Pandoc embeds a Lua interpreter (via hslua). -Copyright © 1994–2015 Lua.org, PUC-Rio. +Copyright © 1994--2023 Lua.org, PUC-Rio. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -177,10 +198,28 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------ -The template pandoc.jats is Copyright 2013--15 Martin Fenner, -released under GPL version 2 or later. +Some of the code in wasm/pandoc.js and the patches in wasm/patches is +from https://github.com/haskell-wasm/pandoc-wasm. It is released under +this license: -The file data/jats.csl is derived from a csl file by Martin Fenner, -revised by Martin Paul Eve and then John MacFarlane. -"This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 -License. Originally by Martin Fenner." +MIT License + +Copyright (c) Tweag I/O Limited. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/INSTALL.md b/INSTALL.md --- a/INSTALL.md +++ b/INSTALL.md @@ -1,95 +1,209 @@ # Installing pandoc +The simplest way to get the latest pandoc release is to use the installer. + + + Download the latest installer + + +For alternative ways to install pandoc, see below under the heading for +your operating system. + +**Note**: the statically linked Pandoc binaries provided by us (or those +available on Conda Forge) have a limitation. They are unable to utilise Lua +filters that rely on Lua modules written in C. If you require the +functionality offered by these filters, please consider an alternative +method of installation. + ## Windows - - There is a package installer at pandoc's [download page]. - This will install pandoc, replacing older versions, and - update your path to include the directory where pandoc's - binaries are installed. +There is a package installer at pandoc's [download page]. +This will install pandoc, replacing older versions, and +update your path to include the directory where pandoc's +binaries are installed. - - If you prefer not to use the msi installer, we also provide - a zip file that contains pandoc's binaries and - documentation. Simply unzip this file and move the binaries - to a directory of your choice. +If you prefer not to use the msi installer, we also provide +a zip file that contains pandoc's binaries and +documentation. Simply unzip this file and move the binaries +to a directory of your choice. - - For PDF output, you'll also need to install LaTeX. - We recommend [MiKTeX](http://miktex.org/). +Alternatively, you can install pandoc using +[Chocolatey](https://chocolatey.org): + choco install pandoc + +Chocolatey can also install other software that integrates with Pandoc. +For example, to install `rsvg-convert` (from [librsvg], covering formats +without SVG support), [Python] (to use Pandoc filters), and +[MiKTeX] (to typeset PDFs with [LaTeX]): + + choco install rsvg-convert python miktex + +Or, you can install pandoc using +[winget](https://github.com/microsoft/winget-pkgs): + + winget install --source winget --exact --id JohnMacFarlane.Pandoc + +Or, you can install Pandoc using [Conda forge]. + +Using multiple installation methods can result in two separate +installations of pandoc; it is recommended to properly uninstall +pandoc before switching to an alternative installation method. + +By default, Pandoc creates PDFs using LaTeX. We recommend +installing it via [MiKTeX]. With the option `--pdf-engine`, +you however can specify other programs for this task. + ## macOS - - You can install pandoc using - [homebrew](http://brew.sh): `brew install pandoc`. +There is a package installer at pandoc's [download page]. +If you later want to uninstall the package, you can do so +by downloading [this script][uninstaller] +and running it with `perl uninstall-pandoc.pl`. - - There is a package installer at pandoc's [download page]. - If you later want to uninstall the package, you can do so - by downloading [this script][uninstaller] - and running it with `perl uninstall-pandoc.pl`. +Alternatively, you can install pandoc using +[Homebrew](https://brew.sh): - - We also provide a zip file containing the binaries and man - pages, for those who prefer not to use the installer. Simply - unzip the file and move the binaries and man pages to - whatever directory you like. + brew install pandoc - - For PDF output, you'll also need LaTeX. Because a full [MacTeX] - installation takes more than a gigabyte of disk space, we recommend - installing [BasicTeX](http://www.tug.org/mactex/morepackages.html) - (64M) and using the `tlmgr` tool to install additional packages - as needed. If you get errors warning of fonts not found, try +Homebrew can also install other software that integrates with Pandoc. +For example, to install [librsvg] (its `rsvg-convert` covers formats +without SVG support), [Python] (to use Pandoc filters), and +[BasicTeX] (to typeset PDFs with [LaTeX]): - tlmgr install collection-fontsrecommended + brew install librsvg python homebrew/cask/basictex +Note: On unsupported versions of macOS (more than three releases old), +Homebrew installs from source, which takes additional time and disk space +for the `ghc` compiler and dependent Haskell libraries. + +You can also install pandoc using [MacPorts]: + + port install pandoc + +Or, you can install Pandoc using [Conda forge]. + +We also provide a zip file containing the binaries and man +pages, for those who prefer not to use the installer. Simply +unzip the file and move the binaries and man pages to +whatever directory you like. + +By default, Pandoc creates PDFs using LaTeX. Because a full [MacTeX] +installation uses four gigabytes of disk space, we recommend +[BasicTeX] or [TinyTeX](https://yihui.org/tinytex/) +and using the `tlmgr` tool to install additional packages +as needed. If you receive errors warning of fonts not found: + + tlmgr install collection-fontsrecommended + +With the option `--pdf-engine`, you however can specify other programs +for this task. + ## Linux - - First, try your package manager. - Pandoc is in the [Debian], [Ubuntu], [Slackware], - [Arch], [Fedora], [NiXOS], [openSUSE], and [gentoo] repositories. - Note, however, that versions in the repositories are often - old. +Check whether the pandoc version in your package manager is +not outdated. Pandoc is in the [Debian], [Ubuntu], [Slackware], +[Arch], [Fedora], [NixOS], [openSUSE], [gentoo] and [Void] repositories. - - We provide a binary package for amd64 architecture on - the [download page]. This provides both `pandoc` and - `pandoc-citeproc`. The executables are statically linked and - have no dynamic dependencies or dependencies on external - data files. Note: because of the static - linking, the pandoc binary from this package cannot use lua - filters that require external lua modules written in C. +To get the latest release, we provide a binary package for amd64 +architecture on the **[download page]**. - Both a tarball and a deb installer are provided. To install the deb: +The executable is statically linked and +has no dynamic dependencies or dependencies on external +data files. - sudo dpkg -i $DEB +Both a tarball and a deb installer are provided. To install the deb: - where `$DEB` is the path to the downloaded deb. This will - install the `pandoc` and `pandoc-citeproc` executables and - man pages. + sudo dpkg -i $DEB - If you use an RPM-based distro, you may be able to install - the deb from our download page using `alien`. +where `$DEB` is the path to the downloaded deb. This will +install the `pandoc` executable and man page. - On any distro, you may install from the tarball into `$DEST` - (say, `/usr/local/` or `$HOME/.local`) by doing +If you use an RPM-based distro, you may be able to install +the deb from our download page using `alien`. - tar xvzf $TGZ --strip-components 1 -C $DEST +On any distro, you may install from the tarball into `$DEST` +(say, `/usr/local/` or `$HOME/.local`) by doing - where `$TGZ` is the path to the downloaded zipped tarball. - For Pandoc versions before 2.0, which don't provide - a tarball, try instead + tar xvzf $TGZ --strip-components 1 -C $DEST - ar p $DEB data.tar.gz | tar xvz --strip-components 2 -C $DEST +where `$TGZ` is the path to the downloaded zipped tarball. +For Pandoc versions before 2.0, which don't provide +a tarball, try instead - - You can also install from source, using the - instructions below under [Compiling from source]. - Note that most distros have the Haskell platform in their - package repositories. For example, on Debian/Ubuntu, - you can install it with `apt-get install haskell-platform`. + ar p $DEB data.tar.gz | tar xvz --strip-components 2 -C $DEST - - For PDF output, you'll need LaTeX. We recommend installing - [TeX Live](http://www.tug.org/texlive/) via your package - manager. (On Debian/Ubuntu, `apt-get install texlive`.) +Or, you can install Pandoc using [Conda forge]. +You can also install from source, using the +instructions below under [Compiling from source]. + +By default, Pandoc creates PDFs using LaTeX. We recommend installing +[TeX Live](https://www.tug.org/texlive/) via your package +manager. (On Debian/Ubuntu, `apt-get install texlive`.) With the option +`--pdf-engine`, you however can specify other programs for this task. + +## Chrome OS + +On Chrome OS, pandoc can be installed using the +[chromebrew](https://github.com/skycocker/chromebrew) package manager +with the command: + +```sh +crew install pandoc +``` + +This will automatically build and configure pandoc for the specific +device you are using. + ## BSD - - Pandoc is in the [NetBSD] and [FreeBSD ports] repositories. +Pandoc is in the [NetBSD], [FreeBSD], and [OpenBSD ports] repositories. +## Conda Forge + +You can install Pandoc using a [Conda +Forge](https://anaconda.org/conda-forge/pandoc) tool, like +[Conda](https://conda.pydata.org/docs/intro.html), +[[Micro]Mamba](https://mamba.readthedocs.io/en/latest/index.html) or +[Pixi](https://prefix.dev). Conda forge also includes multiple LaTeX and +other relevant packages for Pandoc (including `pandoc-citeproc`, +`pandoc-plot`, `rsvg-convert` via `librsvg` etc.). **Note:** conda forge +installs a statically-linked executable. + + conda install -c conda-forge pandoc + pixi global install pandoc + micromamba install pandoc + +## Docker + +The official Docker images for pandoc can be found at + and at +[dockerhub](https://hub.docker.com/). + +The [pandoc/core](https://hub.docker.com/r/pandoc/core) +image contains `pandoc`. + +The [pandoc/latex](https://hub.docker.com/r/pandoc/latex) +image also contains the minimal LaTeX installation needed +to produce PDFs using pandoc. + +To run pandoc using Docker, converting `README.md` to `README.pdf`: + + docker run --rm --volume "`pwd`:/data" --user `id -u`:`id -g` pandoc/latex README.md -o README.pdf + +## GitHub Actions + +Pandoc can be run through +[GitHub Actions](https://github.com/features/actions). For some +examples, see . + +## GitLab CI/CD + +Pandoc can be run through [GitLab CI/CD]. For some +examples, see . + ## Compiling from source If for some reason a binary package is not available for your @@ -118,14 +232,13 @@ ### Quick stack method -The easiest way to build pandoc from source is to use [stack]: - -1. Install [stack]. +The easiest way to build pandoc from source is to use [stack][stack]: -2. Change to the pandoc source directory and issue the following commands: +1. Install [stack][stack]. Note that Pandoc requires stack >= 1.7.0. +2. stack setup - stack install --test + stack install pandoc-cli `stack setup` will automatically download the ghc compiler if you don't have it. `stack install` will install the @@ -133,11 +246,11 @@ add to your `PATH`. This process will take a while, and will consume a considerable amount of disk space. + ### Quick cabal method -1. Install the [Haskell platform]. This will give you [GHC] and - the [cabal-install] build tool. Note that pandoc requires - GHC >= 7.8. +1. Install [ghcup](https://www.haskell.org/ghcup/install/). + This will give you `ghc` and `cabal`. 2. Update your package database: @@ -145,52 +258,30 @@ 3. Use `cabal` to install pandoc and its dependencies: - cabal install pandoc --enable-tests + cabal install pandoc-cli This procedure will install the released version of pandoc, which will be downloaded automatically from HackageDB. - - If you want to install a modified or development version - of pandoc instead, switch to the source directory and do - as above, but without the 'pandoc': + The `pandoc` executable will be symlinked in`$HOME/.cabal/bin` + on linux/unix/macOS and in `%APPDATA%\cabal\bin` on Windows. + Make sure this directory is in your path. To specify a + custom install directory, use `--installdir`. To have + the executable copied instead of symlinked, use + `--install-method=copy`. - cabal install + If you want to install a modified or development version of + pandoc instead, switch to the source directory before running + the above command -- cabal will use the local code for all + projects mentioned in the `cabal.project`. -4. Make sure the `$CABALDIR/bin` directory is in your path. You should - now be able to run `pandoc`: +4. You should now be able to run `pandoc`: pandoc --help - [Not sure where `$CABALDIR` is?](http://www.haskell.org/haskellwiki/Cabal-Install#The_cabal-install_configuration_file) - -5. If you want to process citations with pandoc, you will also need to - install a separate package, `pandoc-citeproc`. This can be installed - using cabal: - - cabal install pandoc-citeproc - - By default `pandoc-citeproc` uses the "i;unicode-casemap" method - to sort bibliography entries (RFC 5051). If you would like to - use the locale-sensitive unicode collation algorithm instead, - specify the `unicode_collation` flag: - - cabal install pandoc-citeproc -funicode_collation - - Note that this requires the `text-icu` library, which in turn - depends on the C library `icu4c`. Installation directions - vary by platform. Here is how it might work on macOS with homebrew: - - brew install icu4c - cabal install --extra-lib-dirs=/usr/local/Cellar/icu4c/51.1/lib \ - --extra-include-dirs=/usr/local/Cellar/icu4c/51.1/include \ - -funicode_collation text-icu pandoc-citeproc - -6. The `pandoc.1` man page will be installed automatically. cabal shows - you where it is installed: you may need to set your `MANPATH` - accordingly. If `MANUAL.txt` has been modified, the man page can be - rebuilt: `make man/pandoc.1`. - - The `pandoc-citeproc.1` man page will also be installed automatically. +5. Cabal does not install the `pandoc.1` man page, but you can + copy it from the `man/` directory of the source code to + `/usr/local/share/man/man1/` or wherever man pages go on + your system. ### Custom cabal method @@ -200,13 +291,12 @@ quick install, but this information may be of use to packagers. For more details, see the [Cabal User's Guide]. These instructions assume that the pandoc source directory is your working directory. +You will need cabal version 2.0 or higher. -1. Install dependencies: in addition to the [Haskell platform], - you will need a number of additional libraries. You can install - them all with +1. Install dependencies: cabal update - cabal install --only-dependencies + cabal build --only-dependencies 2. Configure: @@ -220,14 +310,20 @@ `FLAGSPEC` is a list of Cabal configuration flags, optionally preceded by a `-` (to force the flag to `false`), and separated - by spaces. Pandoc's flags include: + by spaces. `pandoc`'s flags include: - `embed_data_files`: embed all data files into the binary (default no). This is helpful if you want to create a relocatable binary. - - `https`: enable support for downloading resources over https - (using the `http-client` and `http-client-tls` libraries). + `pandoc-cli`'s flags include: + - `lua`: compile in support for Lua filters and custom + writers. + + - `server`: compile in support for running in HTTP server + mode when the executable is renamed (or symlinked as) + `pandoc-server`. + 3. Build: cabal build @@ -237,19 +333,9 @@ cabal haddock --html-location=URL --hyperlink-source -5. Copy the files: - - cabal copy --destdir=PATH - - The default destdir is `/`. - -6. Register pandoc as a GHC package: - - cabal register +5. Install - Package managers may want to use the `--gen-script` option to - generate a script that can be run to register the package at - install time. + cabal install pandoc-cli ### Creating a relocatable binary @@ -257,12 +343,10 @@ pandoc uses are embedded in the binary. The resulting binary can be run from any directory and is completely self-contained. With cabal, add `-fembed_data_files` to the `cabal configure` -or `cabal install` commands. +or `cabal build` commands. With stack, use `--flag pandoc:embed_data_files`. - - ### Running tests Pandoc comes with an automated test suite. @@ -310,25 +394,31 @@ cabal bench --benchmark-options='markdown' -[Arch]: https://www.archlinux.org/packages/community/x86_64/pandoc/ -[Cabal User's Guide]: http://www.haskell.org/cabal/release/latest/doc/users-guide/builders.html#setup-configure-paths -[Debian]: https://packages.debian.org/pandoc -[Fedora]: https://apps.fedoraproject.org/packages/pandoc -[FreeBSD ports]: http://www.freshports.org/textproc/pandoc/ -[GHC]: http://www.haskell.org/ghc/ -[GPL]: http://www.gnu.org/copyleft/gpl.html -[Haskell platform]: http://hackage.haskell.org/platform/ -[MacPorts]: http://trac.macports.org/browser/trunk/dports/textproc/pandoc/Portfile +[Arch]: https://archlinux.org/packages/?q=pandoc +[Cabal User's Guide]: https://cabal.readthedocs.io/ +[Debian]: https://packages.debian.org/search?keywords=pandoc +[Fedora]: https://packages.fedoraproject.org/pkgs/pandoc/pandoc/ +[FreeBSD]: https://www.freshports.org/textproc/hs-pandoc/ +[GHC]: https://www.haskell.org/ghc/ +[GitLab CI/CD]: https://about.gitlab.com/stages-devops-lifecycle/continuous-integration/ +[MacPorts]: https://ports.macports.org/port/pandoc/ [MacTeX]: https://tug.org/mactex/ -[NetBSD]: http://pkgsrc.se/wip/pandoc -[NixOS]: https://nixos.org/nixos/packages.html +[OpenBSD ports]: https://cvsweb.openbsd.org/ports/textproc/pandoc/ +[BasicTeX]: https://www.tug.org/mactex/morepackages.html +[LaTeX]: https://www.latex-project.org +[MiKTeX]: https://miktex.org/ +[librsvg]: https://wiki.gnome.org/Projects/LibRsvg +[Python]: https://www.python.org +[NetBSD]: https://pkgsrc.se/converters/pandoc +[NixOS]: https://search.nixos.org/packages?query=pandoc [Slackware]: https://www.slackbuilds.org/result/?search=pandoc&sv= -[Ubuntu]: https://packages.ubuntu.com/pandoc +[Ubuntu]: https://packages.ubuntu.com/search?keywords=pandoc [download page]: https://github.com/jgm/pandoc/releases/latest -[gentoo]: http://packages.gentoo.org/package/app-text/pandoc +[gentoo]: https://packages.gentoo.org/package/app-text/pandoc [haskell repository]: https://wiki.archlinux.org/index.php/Haskell_Package_Guidelines#.5Bhaskell.5D [openSUSE]: https://software.opensuse.org/package/pandoc -[source tarball]: http://hackage.haskell.org/package/pandoc -[stack]: http://docs.haskellstack.org/en/stable/install_and_upgrade.html -[cabal-install]: http://hackage.haskell.org/trac/hackage/wiki/CabalInstall -[uninstaller]: https://raw.githubusercontent.com/jgm/pandoc/master/macos/uninstall-pandoc.pl +[source tarball]: https://hackage.haskell.org/package/pandoc +[stack]: https://docs.haskellstack.org/en/stable/install_and_upgrade.html +[cabal-install]: https://hackage.haskell.org/package/cabal-install +[Void]: https://voidlinux.org/packages/?arch=x86_64&q=pandoc +[uninstaller]: https://raw.githubusercontent.com/jgm/pandoc/main/macos/uninstall-pandoc.pl diff --git a/MANUAL.txt b/MANUAL.txt --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1,4499 +1,8054 @@ -% Pandoc User's Guide -% John MacFarlane -% December 27, 2017 - -Synopsis -======== - -`pandoc` [*options*] [*input-file*]... - -Description -=========== - -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], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored -Markdown], [MultiMarkdown], and (subsets of) [Textile], -[reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki -markup], [TikiWiki markup], [Creole 1.0], [Haddock markup], [OPML], -[Emacs Org mode], [DocBook], [JATS], [Muse], [txt2tags], [Vimwiki], -[EPUB], [ODT], and [Word docx]; and it can write plain text, [Markdown], -[CommonMark], [PHP Markdown Extra], [GitHub-Flavored Markdown], -[MultiMarkdown], [reStructuredText], [XHTML], [HTML5], [LaTeX] -\(including [`beamer`] slide shows\), [ConTeXt], [RTF], [OPML], -[DocBook], [JATS], [OpenDocument], [ODT], [Word docx], [GNU Texinfo], -[MediaWiki markup], [DokuWiki markup], [ZimWiki markup], [Haddock -markup], [EPUB] \(v2 or v3\), [FictionBook2], [Textile], [groff man], -[groff ms], [Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI -Simple], [Muse], [PowerPoint] slide shows and [Slidy], [Slideous], -[DZSlides], [reveal.js] or [S5] HTML slide shows. It can also produce -[PDF] output on systems where LaTeX, ConTeXt, `pdfroff`, -`wkhtmltopdf`, `prince`, or `weasyprint` is installed. - -Pandoc's enhanced version of Markdown includes syntax for [footnotes], -[tables], flexible [ordered lists], [definition lists], [fenced code -blocks], [superscripts and subscripts], [strikeout], [metadata blocks], -automatic tables of contents, embedded LaTeX [math], [citations], and -[Markdown inside HTML block elements][Extension: -`markdown_in_html_blocks`]. (These enhancements, described further under -[Pandoc's Markdown], can be disabled using the `markdown_strict` input -or output format.) - -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. - -Because pandoc's intermediate representation of a document is less -expressive than many of the formats it converts between, one should -not expect perfect conversions between every format and every other. -Pandoc attempts to preserve the structural elements of a document, but -not formatting details such as margin size. And some document elements, -such as complex tables, may not fit into pandoc's simple document -model. While conversions from pandoc's Markdown to all formats aspire -to be perfect, conversions from formats more expressive than pandoc's -Markdown can be expected to be lossy. - -[Markdown]: http://daringfireball.net/projects/markdown/ -[CommonMark]: http://commonmark.org -[PHP Markdown Extra]: https://michelf.ca/projects/php-markdown/extra/ -[GitHub-Flavored Markdown]: https://help.github.com/articles/github-flavored-markdown/ -[MultiMarkdown]: http://fletcherpenney.net/multimarkdown/ -[reStructuredText]: http://docutils.sourceforge.net/docs/ref/rst/introduction.html -[S5]: http://meyerweb.com/eric/tools/s5/ -[Slidy]: http://www.w3.org/Talks/Tools/Slidy/ -[Slideous]: http://goessner.net/articles/slideous/ -[HTML]: http://www.w3.org/html/ -[HTML5]: http://www.w3.org/TR/html5/ -[polyglot markup]: https://www.w3.org/TR/html-polyglot/ -[XHTML]: http://www.w3.org/TR/xhtml1/ -[LaTeX]: http://latex-project.org -[`beamer`]: https://ctan.org/pkg/beamer -[Beamer User's Guide]: http://ctan.math.utah.edu/ctan/tex-archive/macros/latex/contrib/beamer/doc/beameruserguide.pdf -[ConTeXt]: http://www.contextgarden.net/ -[RTF]: http://en.wikipedia.org/wiki/Rich_Text_Format -[DocBook]: http://docbook.org -[JATS]: https://jats.nlm.nih.gov -[txt2tags]: http://txt2tags.org -[EPUB]: http://idpf.org/epub -[OPML]: http://dev.opml.org/spec2.html -[OpenDocument]: http://opendocument.xml.org -[ODT]: http://en.wikipedia.org/wiki/OpenDocument -[Textile]: http://redcloth.org/textile -[MediaWiki markup]: https://www.mediawiki.org/wiki/Help:Formatting -[DokuWiki markup]: https://www.dokuwiki.org/dokuwiki -[ZimWiki markup]: http://zim-wiki.org/manual/Help/Wiki_Syntax.html -[TWiki markup]: http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules -[TikiWiki markup]: https://doc.tiki.org/Wiki-Syntax-Text#The_Markup_Language_Wiki-Syntax -[Haddock markup]: https://www.haskell.org/haddock/doc/html/ch03s08.html -[Creole 1.0]: http://www.wikicreole.org/wiki/Creole1.0 -[groff man]: http://man7.org/linux/man-pages/man7/groff_man.7.html -[groff ms]: http://man7.org/linux/man-pages/man7/groff_ms.7.html -[Haskell]: https://www.haskell.org -[GNU Texinfo]: http://www.gnu.org/software/texinfo/ -[Emacs Org mode]: http://orgmode.org -[AsciiDoc]: http://www.methods.co.nz/asciidoc/ -[DZSlides]: http://paulrouget.com/dzslides/ -[Word docx]: https://en.wikipedia.org/wiki/Office_Open_XML -[PDF]: https://www.adobe.com/pdf/ -[reveal.js]: http://lab.hakim.se/reveal-js/ -[FictionBook2]: http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1 -[InDesign ICML]: https://www.adobe.com/content/dam/Adobe/en/devnet/indesign/cs55-docs/IDML/idml-specification.pdf -[TEI Simple]: https://github.com/TEIC/TEI-Simple -[Muse]: https://amusewiki.org/library/manual -[PowerPoint]: https://en.wikipedia.org/wiki/Microsoft_PowerPoint -[Vimwiki]: https://vimwiki.github.io - -Using `pandoc` --------------- - -If no *input-file* is specified, input is read from *stdin*. -Otherwise, the *input-files* are concatenated (with a blank -line between each) and used as input. Output goes to *stdout* by -default (though output to the terminal is disabled for the -`odt`, `docx`, `epub2`, and `epub3` output formats, unless it is -forced using `-o -`). For output to a file, use the `-o` -option: - - pandoc -o output.html input.txt - -By default, pandoc produces a document fragment, not a standalone -document with a proper header and footer. To produce a standalone -document, use the `-s` or `--standalone` flag: - - pandoc -s -o output.html input.txt - -For more information on how standalone documents are produced, see -[Templates], below. - -Instead of a file, an absolute URI may be given. In this case -pandoc will fetch the content using HTTP: - - pandoc -f html -t markdown http://www.fsf.org - -It is possible to supply a custom User-Agent string or other -header when requesting a document from a URL: - - pandoc -f html -t markdown --request-header User-Agent:"Mozilla/5.0" \ - http://www.fsf.org - -If multiple input files are given, `pandoc` will concatenate them all (with -blank lines between them) before parsing. This feature is disabled for - binary input formats such as `EPUB`, `odt`, and `docx`. - -The format of the input and output can be specified explicitly using -command-line options. The input format can be specified using the -`-r/--read` or `-f/--from` options, the output format using the -`-w/--write` or `-t/--to` options. Thus, to convert `hello.txt` from -Markdown to LaTeX, you could type: - - pandoc -f markdown -t latex hello.txt - -To convert `hello.html` from HTML to Markdown: - - pandoc -f html -t markdown hello.html - -Supported output formats are listed below under the `-t/--to` option. -Supported input formats are listed below under the `-f/--from` option. Note -that the `rst`, `textile`, `latex`, and `html` readers are not complete; -there are some constructs that they do not parse. - -If the input or output format is not specified explicitly, `pandoc` -will attempt to guess it from the extensions of -the input and output filenames. Thus, for example, - - pandoc -o hello.tex hello.txt - -will convert `hello.txt` from Markdown to LaTeX. If no output file -is specified (so that output goes to *stdout*), or if the output file's -extension is unknown, the output format will default to HTML. -If no input file is specified (so that input comes from *stdin*), or -if the input files' extensions are unknown, the input format will -be assumed to be Markdown unless explicitly specified. - -Pandoc uses the UTF-8 character encoding for both input and output. -If your local character encoding is not UTF-8, you -should pipe input and output through [`iconv`]: - - iconv -t utf-8 input.txt | pandoc | iconv -f utf-8 - -Note that in some output formats (such as HTML, LaTeX, ConTeXt, -RTF, OPML, DocBook, and Texinfo), information about -the character encoding is included in the document header, which -will only be included if you use the `-s/--standalone` option. - -[`iconv`]: http://www.gnu.org/software/libiconv/ - -Creating a PDF --------------- - -To produce a PDF, specify an output file with a `.pdf` extension. -By default, pandoc will use LaTeX to create the PDF: - - pandoc test.txt -o test.pdf - -Production of a PDF requires that a LaTeX engine be installed (see -`--pdf-engine`, below), and assumes that the following LaTeX packages -are available: [`amsfonts`], [`amsmath`], [`lm`], [`unicode-math`], -[`ifxetex`], [`ifluatex`], [`listings`] (if the -`--listings` option is used), [`fancyvrb`], [`longtable`], -[`booktabs`], [`graphicx`] and [`grffile`] (if the document -contains images), [`hyperref`], [`xcolor`] (with `colorlinks`), [`ulem`], [`geometry`] (with the -`geometry` variable set), [`setspace`] (with `linestretch`), and -[`babel`] (with `lang`). The use of `xelatex` or `lualatex` as -the LaTeX engine requires [`fontspec`]. `xelatex` uses -[`polyglossia`] (with `lang`), [`xecjk`], and [`bidi`] (with the -`dir` variable set). If the `mathspec` variable is set, -`xelatex` will use [`mathspec`] instead of [`unicode-math`]. -The [`upquote`] and [`microtype`] packages are used if -available, and [`csquotes`] will be used for [typography] -if added to the template or included in any header file. The -[`natbib`], [`biblatex`], [`bibtex`], and [`biber`] packages can -optionally be used for [citation rendering]. These are included -with all recent versions of [TeX Live]. - -Alternatively, pandoc can use [ConTeXt], `pdfroff`, or any of the -following HTML/CSS-to-PDF-engines, to create a PDF: [`wkhtmltopdf`], -[`weasyprint`] or [`prince`]. -To do this, specify an output file with a `.pdf` extension, as before, -but add the `--pdf-engine` option or `-t context`, `-t html`, or `-t ms` -to the command line (`-t html` defaults to `--pdf-engine=wkhtmltopdf`). - -PDF output can be controlled using [variables for LaTeX] (if -LaTeX is used) and [variables for ConTeXt] (if ConTeXt is used). -When using an HTML/CSS-to-PDF-engine, `--css` affects the output. -If `wkhtmltopdf` is used, then the variables `margin-left`, -`margin-right`, `margin-top`, `margin-bottom`, and `papersize` -will affect the output. - -[`amsfonts`]: https://ctan.org/pkg/amsfonts -[`amsmath`]: https://ctan.org/pkg/amsmath -[`lm`]: https://ctan.org/pkg/lm -[`ifxetex`]: https://ctan.org/pkg/ifxetex -[`ifluatex`]: https://ctan.org/pkg/ifluatex -[`listings`]: https://ctan.org/pkg/listings -[`fancyvrb`]: https://ctan.org/pkg/fancyvrb -[`longtable`]: https://ctan.org/pkg/longtable -[`booktabs`]: https://ctan.org/pkg/booktabs -[`graphicx`]: https://ctan.org/pkg/graphicx -[`grffile`]: https://ctan.org/pkg/grffile -[`geometry`]: https://ctan.org/pkg/geometry -[`setspace`]: https://ctan.org/pkg/setspace -[`xecjk`]: https://ctan.org/pkg/xecjk -[`hyperref`]: https://ctan.org/pkg/hyperref -[`ulem`]: https://ctan.org/pkg/ulem -[`babel`]: https://ctan.org/pkg/babel -[`bidi`]: https://ctan.org/pkg/bidi -[`mathspec`]: https://ctan.org/pkg/mathspec -[`unicode-math`]: https://ctan.org/pkg/unicode-math -[`polyglossia`]: https://ctan.org/pkg/polyglossia -[`fontspec`]: https://ctan.org/pkg/fontspec -[`upquote`]: https://ctan.org/pkg/upquote -[`microtype`]: https://ctan.org/pkg/microtype -[`csquotes`]: https://ctan.org/pkg/csquotes -[`natbib`]: https://ctan.org/pkg/natbib -[`biblatex`]: https://ctan.org/pkg/biblatex -[`bibtex`]: https://ctan.org/pkg/bibtex -[`biber`]: https://ctan.org/pkg/biber -[TeX Live]: http://www.tug.org/texlive/ -[`wkhtmltopdf`]: https://wkhtmltopdf.org -[`weasyprint`]: http://weasyprint.org -[`prince`]: https://www.princexml.com/ - -Options -======= - -General options ---------------- - -`-f` *FORMAT*, `-r` *FORMAT*, `--from=`*FORMAT*, `--read=`*FORMAT* - -: Specify input format. *FORMAT* can be `native` (native Haskell), - `json` (JSON version of native AST), `markdown` (pandoc's - extended Markdown), `markdown_strict` (original unextended - Markdown), `markdown_phpextra` (PHP Markdown Extra), - `markdown_mmd` (MultiMarkdown), `gfm` (GitHub-Flavored Markdown), - `commonmark` (CommonMark Markdown), `textile` (Textile), `rst` - (reStructuredText), `html` (HTML), `docbook` (DocBook), `t2t` - (txt2tags), `docx` (docx), `odt` (ODT), `epub` (EPUB), `opml` (OPML), - `org` (Emacs Org mode), `mediawiki` (MediaWiki markup), `twiki` (TWiki - markup), `tikiwiki` (TikiWiki markup), `creole` (Creole 1.0), - `haddock` (Haddock markup), or `latex` (LaTeX). - (`markdown_github` provides deprecated and less accurate support - for Github-Flavored Markdown; please use `gfm` instead, unless you - need to use extensions other than `smart`.) - Extensions can be individually enabled or disabled by - appending `+EXTENSION` or `-EXTENSION` to the format name. - See [Extensions] below, for a list of extensions and - their names. See `--list-input-formats` and `--list-extensions`, - below. - -`-t` *FORMAT*, `-w` *FORMAT*, `--to=`*FORMAT*, `--write=`*FORMAT* - -: Specify output format. *FORMAT* can be `native` (native Haskell), - `json` (JSON version of native AST), `plain` (plain text), - `markdown` (pandoc's extended Markdown), `markdown_strict` - (original unextended Markdown), `markdown_phpextra` (PHP Markdown - Extra), `markdown_mmd` (MultiMarkdown), `gfm` (GitHub-Flavored - Markdown), `commonmark` (CommonMark Markdown), `rst` - (reStructuredText), `html4` (XHTML 1.0 Transitional), `html` or - `html5` (HTML5/XHTML [polyglot markup]), `latex` (LaTeX), `beamer` - (LaTeX beamer slide show), `context` (ConTeXt), `man` (groff man), - `mediawiki` (MediaWiki markup), `dokuwiki` (DokuWiki markup), - `zimwiki` (ZimWiki markup), `textile` (Textile), `org` (Emacs Org - mode), `texinfo` (GNU Texinfo), `opml` (OPML), `docbook` or - `docbook4` (DocBook 4), `docbook5` (DocBook 5), `jats` (JATS XML), - `opendocument` (OpenDocument), `odt` (OpenOffice text document), - `docx` (Word docx), `haddock` (Haddock markup), `rtf` (rich text - format), `epub2` (EPUB v2 book), `epub` or `epub3` (EPUB v3), - `fb2` (FictionBook2 e-book), `asciidoc` (AsciiDoc), `icml` - (InDesign ICML), `tei` (TEI Simple), `slidy` (Slidy HTML and - JavaScript slide show), `slideous` (Slideous HTML and JavaScript - slide show), `dzslides` (DZSlides HTML5 + JavaScript slide show), - `revealjs` (reveal.js HTML5 + JavaScript slide show), `s5` (S5 - HTML and JavaScript slide show), `pptx` (PowerPoint slide show) or - the path of a custom lua writer (see [Custom writers], - below). (`markdown_github` provides deprecated and less accurate - support for Github-Flavored Markdown; please use `gfm` instead, - unless you use extensions that do not work with `gfm`.) Note that - `odt`, `epub`, and `epub3` output will not be directed to - *stdout*; an output filename must be specified using the - `-o/--output` option. Extensions can be individually enabled or - disabled by appending `+EXTENSION` or `-EXTENSION` to the format - name. See [Extensions] below, for a list of extensions and their - names. See `--list-output-formats` and `--list-extensions`, below. - -`-o` *FILE*, `--output=`*FILE* - -: Write output to *FILE* instead of *stdout*. If *FILE* is - `-`, output will go to *stdout*, even if a non-textual format - (`docx`, `odt`, `epub2`, `epub3`) is specified. - -`--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 - will be used. This is, in UNIX: - - $HOME/.pandoc - - in Windows XP: - - C:\Documents And Settings\USERNAME\Application Data\pandoc - - and in Windows Vista or later: - - C:\Users\USERNAME\AppData\Roaming\pandoc - - You can find the default user data directory on your system by - looking at the output of `pandoc --version`. - A `reference.odt`, `reference.docx`, `epub.css`, `templates`, - `slidy`, `slideous`, or `s5` directory - placed in this directory will override pandoc's normal defaults. - -`--bash-completion` - -: Generate a bash completion script. To enable bash completion - with pandoc, add this to your `.bashrc`: - - eval "$(pandoc --bash-completion)" - -`--verbose` - -: Give verbose debugging output. Currently this only has an effect - with PDF output. - -`--quiet` - -: Suppress warning messages. - -`--fail-if-warnings` - -: Exit with error status if there are any warnings. - -`--log=`*FILE* - -: Write log messages in machine-readable JSON format to - *FILE*. All messages above DEBUG level will be written, - regardless of verbosity settings (`--verbose`, `--quiet`). - -`--list-input-formats` - -: List supported input formats, one per line. - -`--list-output-formats` - -: List supported output formats, one per line. - -`--list-extensions`[`=`*FORMAT*] - -: List supported Markdown extensions, one per line, preceded - by a `+` or `-` indicating whether it is enabled by default - in *FORMAT*. If *FORMAT* is not specified, defaults for - pandoc's Markdown are given. - -`--list-highlight-languages` - -: List supported languages for syntax highlighting, one per - line. - -`--list-highlight-styles` - -: List supported styles for syntax highlighting, one per line. - See `--highlight-style`. - -`-v`, `--version` - -: Print version. - -`-h`, `--help` - -: Show usage message. - -Reader options --------------- - -`--base-header-level=`*NUMBER* - -: Specify the base level for headers (defaults to 1). - -`--strip-empty-paragraphs` - -: *Deprecated. Use the `+empty_paragraphs` extension instead.* - Ignore paragraphs with no content. This option is useful - for converting word processing documents where users have - used empty paragraphs to create inter-paragraph space. - -`--indented-code-classes=`*CLASSES* - -: Specify classes to use for indented code blocks--for example, - `perl,numberLines` or `haskell`. Multiple classes may be separated - by spaces or commas. - -`--default-image-extension=`*EXTENSION* - -: Specify a default extension to use when image paths/URLs have no - extension. This allows you to use the same source for formats that - require different kinds of images. Currently this option only affects - the Markdown and LaTeX readers. - -`--file-scope` - -: Parse each file individually before combining for multifile - documents. This will allow footnotes in different files with the - same identifiers to work as expected. If this option is set, - footnotes and links will not work across files. Reading binary - files (docx, odt, epub) implies `--file-scope`. - -`--filter=`*PROGRAM* - -: Specify an executable to be used as a filter transforming the - pandoc AST after the input is parsed and before the output is - written. The executable should read JSON from stdin and write - JSON to stdout. The JSON must be formatted like pandoc's own - JSON input and output. The name of the output format will be - passed to the filter as the first argument. Hence, - - pandoc --filter ./caps.py -t latex - - is equivalent to - - pandoc -t json | ./caps.py latex | pandoc -f json -t latex - - The latter form may be useful for debugging filters. - - Filters may be written in any language. `Text.Pandoc.JSON` - exports `toJSONFilter` to facilitate writing filters in Haskell. - Those who would prefer to write filters in python can use the - module [`pandocfilters`], installable from PyPI. There are also - pandoc filter libraries in [PHP], [perl], and - [JavaScript/node.js]. - - In order of preference, pandoc will look for filters in - - 1. a specified full or relative path (executable or - non-executable) - - 2. `$DATADIR/filters` (executable or non-executable) - where `$DATADIR` is the user data directory (see - `--data-dir`, above). - - 3. `$PATH` (executable only) - -`--lua-filter=`*SCRIPT* - -: Transform the document in a similar fashion as JSON filters (see - `--filter`), but use pandoc's build-in lua filtering system. The given - lua script is expected to return a list of lua filters which will be - applied in order. Each lua filter must contain element-transforming - functions indexed by the name of the AST element on which the filter - function should be applied. - - The `pandoc` lua module provides helper functions for element - creation. It is always loaded into the script's lua environment. - - The following is an example lua script for macro-expansion: - - function expand_hello_world(inline) - if inline.c == '{{helloworld}}' then - return pandoc.Emph{ pandoc.Str "Hello, World" } - else - return inline - end - end - - return {{Str = expand_hello_world}} - - -`-M` *KEY*[`=`*VAL*], `--metadata=`*KEY*[`:`*VAL*] - -: Set the metadata field *KEY* to the value *VAL*. A value specified - on the command line overrides a value specified in the document. - Values will be parsed as YAML boolean or string values. If no value is - specified, the value will be treated as Boolean true. Like - `--variable`, `--metadata` causes template variables to be set. - But unlike `--variable`, `--metadata` affects the metadata of the - underlying document (which is accessible from filters and may be - printed in some output formats). - -`-p`, `--preserve-tabs` - -: Preserve tabs instead of converting them to spaces (the default). - Note that this will only affect tabs in literal code spans and code - blocks; tabs in regular text will be treated as spaces. - -`--tab-stop=`*NUMBER* - -: Specify the number of spaces per tab (default is 4). - -`--track-changes=accept`|`reject`|`all` - -: Specifies what to do with insertions, deletions, and comments - produced by the MS Word "Track Changes" feature. `accept` (the - default), inserts all insertions, and ignores all - deletions. `reject` inserts all deletions and ignores - insertions. Both `accept` and `reject` ignore comments. `all` puts - in insertions, deletions, and comments, wrapped in spans with - `insertion`, `deletion`, `comment-start`, and `comment-end` - classes, respectively. The author and time of change is - included. `all` is useful for scripting: only accepting changes - from a certain reviewer, say, or before a certain date. This - option only affects the docx reader. - -`--extract-media=`*DIR* - -: Extract images and other media contained in or linked from - the source document to the path *DIR*, creating it if - necessary, and adjust the images references in the document - so they point to the extracted files. If the source format is - a binary container (docx, epub, or odt), the media is - extracted from the container and the original - filenames are used. Otherwise the media is read from the - file system or downloaded, and new filenames are constructed - based on SHA1 hashes of the contents. - -`--abbreviations=`*FILE* - -: Specifies a custom abbreviations file, with abbreviations - one to a line. If this option is not specified, pandoc will - read the data file `abbreviations` from the user data - directory or fall back on a system default. To see the - system default, use - `pandoc --print-default-data-file=abbreviations`. The only - use pandoc makes of this list is in the Markdown reader. - Strings ending in a period that are found in this list will - be followed by a nonbreaking space, so that the period will - not produce sentence-ending space in formats like LaTeX. - -[`pandocfilters`]: https://github.com/jgm/pandocfilters -[PHP]: https://github.com/vinai/pandocfilters-php -[perl]: https://metacpan.org/pod/Pandoc::Filter -[JavaScript/node.js]: https://github.com/mvhenderson/pandoc-filter-node - -General writer options ----------------------- - -`-s`, `--standalone` - -: Produce output with an appropriate header and footer (e.g. a - standalone HTML, LaTeX, TEI, or RTF file, not a fragment). This option - is set automatically for `pdf`, `epub`, `epub3`, `fb2`, `docx`, and `odt` - output. - -`--template=`*FILE* - -: Use *FILE* as a custom template for the generated document. Implies - `--standalone`. 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 `--template=special` - looks for `special.html` for HTML output. If the template is not - found, pandoc will search for it in the `templates` subdirectory of - 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 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. If no *VAL* is specified, the key will be given the - value `true`. - -`-D` *FORMAT*, `--print-default-template=`*FORMAT* - -: Print the system default template for an output *FORMAT*. (See `-t` - for a list of possible *FORMAT*s.) Templates in the user data - directory are ignored. - -`--print-default-data-file=`*FILE* - -: Print a system default data file. Files in the user data directory - are ignored. - -`--eol=crlf`|`lf`|`native` - -: Manually specify line endings: `crlf` (Windows), `lf` - (macOS/Linux/UNIX), or `native` (line endings appropriate - to the OS on which pandoc is being run). The default is - `native`. - -`--dpi`=*NUMBER* - -: Specify the dpi (dots per inch) value for conversion from pixels - to inch/centimeters and vice versa. The default is 96dpi. - Technically, the correct term would be ppi (pixels per inch). - -`--wrap=auto`|`none`|`preserve` - -: Determine how text is wrapped in the output (the source - code, not the rendered version). With `auto` (the default), - pandoc will attempt to wrap lines to the column width specified by - `--columns` (default 72). With `none`, pandoc will not wrap - lines at all. With `preserve`, pandoc will attempt to - preserve the wrapping from the source document (that is, - where there are nonsemantic newlines in the source, there - will be nonsemantic newlines in the output as well). - Automatic wrapping does not currently work in HTML output. - -`--columns=`*NUMBER* - -: Specify length of lines in characters. This affects text wrapping - in the generated source code (see `--wrap`). It also affects - calculation of column widths for plain text tables (see [Tables] below). - -`--toc`, `--table-of-contents` - -: Include an automatically generated table of contents (or, in - the case of `latex`, `context`, `docx`, `odt`, - `opendocument`, `rst`, or `ms`, an instruction to create - one) in the output document. This option has no effect on - `man`, `docbook4`, `docbook5`, or `jats` output. - -`--toc-depth=`*NUMBER* - -: Specify the number of section levels to include in the table - of contents. The default is 3 (which means that level 1, 2, and 3 - headers will be listed in the contents). - -`--strip-comments` - -: Strip out HTML comments in the Markdown or Textile source, - rather than passing them on to Markdown, Textile or HTML - output as raw HTML. This does not apply to HTML comments - inside raw HTML blocks when the `markdown_in_html_blocks` - extension is not set. - -`--no-highlight` - -: Disables syntax highlighting for code blocks and inlines, even when - a language attribute is given. - -`--highlight-style=`*STYLE*|*FILE* - -: Specifies the coloring style to be used in highlighted source code. - Options are `pygments` (the default), `kate`, `monochrome`, - `breezeDark`, `espresso`, `zenburn`, `haddock`, and `tango`. - For more information on syntax highlighting in pandoc, see - [Syntax highlighting], below. See also - `--list-highlight-styles`. - - Instead of a *STYLE* name, a JSON file with extension - `.theme` may be supplied. This will be parsed as a KDE - syntax highlighting theme and (if valid) used as the - highlighting style. - - To generate the JSON version of an existing style, - use `--print-highlight-style`. - -`--print-highlight-style=`*STYLE*|*FILE* - -: Prints a JSON version of a highlighting style, which can - be modified, saved with a `.theme` extension, and used - with `--highlight-style`. - -`--syntax-definition=`*FILE* - -: Instructs pandoc to load a KDE XML syntax definition file, - which will be used for syntax highlighting of appropriately - marked code blocks. This can be used to add support for - new languages or to use altered syntax definitions for - existing languages. - -`-H` *FILE*, `--include-in-header=`*FILE* - -: Include contents of *FILE*, verbatim, at the end of the header. - This can be used, for example, to include special - CSS or JavaScript in HTML documents. This option can be used - repeatedly to include multiple files in the header. They will be - included in the order specified. Implies `--standalone`. - -`-B` *FILE*, `--include-before-body=`*FILE* - -: Include contents of *FILE*, verbatim, at the beginning of the - document body (e.g. after the `` tag in HTML, or the - `\begin{document}` command in LaTeX). This can be used to include - navigation bars or banners in HTML documents. This option can be - used repeatedly to include multiple files. They will be included in - the order specified. Implies `--standalone`. - -`-A` *FILE*, `--include-after-body=`*FILE* - -: Include contents of *FILE*, verbatim, at the end of the document - body (before the `` tag in HTML, or the - `\end{document}` command in LaTeX). This option can be used - repeatedly to include multiple files. They will be included in the - order specified. Implies `--standalone`. - -`--resource-path=`*SEARCHPATH* - -: List of paths to search for images and other resources. - The paths should be separated by `:` on Linux, UNIX, and - macOS systems, and by `;` on Windows. If `--resource-path` - is not specified, the default resource path is the working - directory. Note that, if `--resource-path` is specified, - the working directory must be explicitly listed or it - will not be searched. For example: - `--resource-path=.:test` will search the working directory - and the `test` subdirectory, in that order. - -`--request-header=`*NAME*`:`*VAL* - -: Set the request header *NAME* to the value *VAL* when making - HTTP requests (for example, when a URL is given on the - command line, or when resources used in a document must be - downloaded). - -Options affecting specific writers ----------------------------------- - -`--self-contained` - -: Produce a standalone HTML file with no external dependencies, using - `data:` URIs to incorporate the contents of linked scripts, stylesheets, - images, and videos. The resulting file should be "self-contained," - in the sense that it needs no external files and no net access to be - displayed properly by a browser. This option works only with HTML output - formats, including `html4`, `html5`, `html+lhs`, `html5+lhs`, `s5`, - `slidy`, `slideous`, `dzslides`, and `revealjs`. Scripts, images, and - stylesheets at absolute URLs will be downloaded; those at relative URLs - will be sought relative to the working directory (if the first source - file is local) or relative to the base URL (if the first source - file is remote). Elements with the attribute - `data-external="1"` will be left alone; the documents they - link to will not be incorporated in the document. - Limitation: resources that are loaded dynamically through - JavaScript cannot be incorporated; as a result, - `--self-contained` does not work with `--mathjax`, and some - advanced features (e.g. zoom or speaker notes) may not work - in an offline "self-contained" `reveal.js` slide show. - -`--html-q-tags` - -: Use `` tags for quotes in HTML. - -`--ascii` - -: Use only ASCII characters in output. Currently supported only for - HTML and DocBook output (which uses numerical entities instead of - UTF-8 when this option is selected). - -`--reference-links` - -: Use reference-style links, rather than inline links, in writing Markdown - or reStructuredText. By default inline links are used. The - placement of link references is affected by the - `--reference-location` option. - -`--reference-location = block`|`section`|`document` - -: Specify whether footnotes (and references, if `reference-links` is - set) are placed at the end of the current (top-level) block, the - current section, or the document. The default is - `document`. Currently only affects the markdown writer. - -`--atx-headers` - -: Use ATX-style headers in Markdown and AsciiDoc output. The default is - to use setext-style headers for levels 1-2, and then ATX headers. - (Note: for `gfm` output, ATX headers are always used.) - -`--top-level-division=[default|section|chapter|part]` - -: Treat top-level headers as the given division type in LaTeX, ConTeXt, - DocBook, and TEI output. The hierarchy order is part, chapter, then section; - all headers are shifted such that the top-level header becomes the specified - type. The default behavior is to determine the best division type via - heuristics: unless other conditions apply, `section` is chosen. When the - LaTeX document class is set to `report`, `book`, or `memoir` (unless the - `article` option is specified), `chapter` is implied as the setting for this - option. If `beamer` is the output format, specifying either `chapter` or - `part` will cause top-level headers to become `\part{..}`, while - second-level headers remain as their default type. - -`-N`, `--number-sections` - -: Number section headings in LaTeX, ConTeXt, HTML, or EPUB output. - By default, sections are not numbered. Sections with class - `unnumbered` will never be numbered, even if `--number-sections` - is specified. - -`--number-offset=`*NUMBER*[`,`*NUMBER*`,`*...*] - -: Offset for section headings in HTML output (ignored in other - output formats). The first number is added to the section number for - top-level headers, the second for second-level headers, and so on. - So, for example, if you want the first top-level header in your - document to be numbered "6", specify `--number-offset=5`. - If your document starts with a level-2 header which you want to - be numbered "1.5", specify `--number-offset=1,4`. - Offsets are 0 by default. Implies `--number-sections`. - -`--listings` - -: Use the [`listings`] package for LaTeX code blocks - -`-i`, `--incremental` - -: Make list items in slide shows display incrementally (one by one). - The default is for lists to be displayed all at once. - -`--slide-level=`*NUMBER* - -: Specifies that headers with the specified level create - slides (for `beamer`, `s5`, `slidy`, `slideous`, `dzslides`). Headers - above this level in the hierarchy are used to divide the - slide show into sections; headers below this level create - subheads within a slide. Note that content that is - not contained under slide-level headers will not appear in - the slide show. The default is to set the slide level based - on the contents of the document; see [Structuring the slide - show]. - -`--section-divs` - -: Wrap sections in `
` tags (or `
` tags for `html4`), - and attach identifiers to the enclosing `
` (or `
`) - rather than the header itself. See - [Header identifiers], below. - -`--email-obfuscation=none`|`javascript`|`references` - -: Specify a method for obfuscating `mailto:` links in HTML documents. - `none` leaves `mailto:` links as they are. `javascript` obfuscates - them using JavaScript. `references` obfuscates them by printing their - letters as decimal or hexadecimal character references. The default - is `none`. - -`--id-prefix=`*STRING* - -: Specify a prefix to be added to all identifiers and internal links - in HTML and DocBook output, and to footnote numbers in Markdown - and Haddock output. This is useful for preventing duplicate - identifiers when generating fragments to be included in other pages. - -`-T` *STRING*, `--title-prefix=`*STRING* - -: Specify *STRING* as a prefix at the beginning of the title - that appears in the HTML header (but not in the title as it - appears at the beginning of the HTML body). Implies - `--standalone`. - -`-c` *URL*, `--css=`*URL* - -: Link to a CSS style sheet. This option can be used repeatedly to - include multiple files. They will be included in the order specified. - - A stylesheet is required for generating EPUB. If none is - provided using this option (or the `stylesheet` metadata - field), pandoc will look for a file `epub.css` in the - user data directory (see `--data-dir`). If it is not - found there, sensible defaults will be used. - -`--reference-doc=`*FILE* - -: Use the specified file as a style reference in producing a - docx or ODT file. - - Docx - - : For best results, the reference docx should be a modified - version of a docx file produced using pandoc. The contents - of the reference docx are ignored, but its stylesheets and - document properties (including margins, page size, header, - and footer) are used in the new docx. If no reference docx - is specified on the command line, pandoc will look for a - file `reference.docx` in the user data directory (see - `--data-dir`). If this is not found either, sensible - defaults will be used. - - To produce a custom `reference.docx`, first get a copy of - the default `reference.docx`: `pandoc - --print-default-data-file reference.docx > - custom-reference.docx`. Then open `custom-reference.docx` - in Word, modify the styles as you wish, and save the file. - For best results, do not make changes to this file other - than modifying the styles used by pandoc: [paragraph] - Normal, Body Text, First Paragraph, Compact, Title, - Subtitle, Author, Date, Abstract, Bibliography, Heading 1, - Heading 2, Heading 3, Heading 4, Heading 5, Heading 6, - Heading 7, Heading 8, Heading 9, Block Text, Footnote Text, - Definition Term, Definition, Caption, Table Caption, - Image Caption, Figure, Captioned Figure, TOC Heading; - [character] Default Paragraph Font, Body Text Char, - Verbatim Char, Footnote Reference, Hyperlink; [table] - Table. - - ODT - - : For best results, the reference ODT should be a modified - version of an ODT produced using pandoc. The contents of - the reference ODT are ignored, but its stylesheets are used - in the new ODT. If no reference ODT is specified on the - command line, pandoc will look for a file `reference.odt` in - the user data directory (see `--data-dir`). If this is not - found either, sensible defaults will be used. - - To produce a custom `reference.odt`, first get a copy of - the default `reference.odt`: `pandoc - --print-default-data-file reference.odt > - custom-reference.odt`. Then open `custom-reference.odt` in - LibreOffice, modify the styles as you wish, and save the - file. - -`--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. Note that - in a Markdown source document you can also specify `cover-image` - in a YAML metadata block (see [EPUB Metadata], below). - -`--epub-metadata=`*FILE* - -: Look in the specified XML file for metadata for the EPUB. - The file should contain a series of [Dublin Core elements]. - For example: - - Creative Commons - es-AR - - By default, pandoc will include the following metadata elements: - `` (from the document title), `` (from the - document authors), `` (from the document date, which should - be in [ISO 8601 format]), `` (from the `lang` - variable, or, if is not set, the locale), and `` (a randomly generated UUID). Any of these may be - overridden by elements in the metadata file. - - Note: if the source document is Markdown, a YAML metadata block - in the document can be used instead. See below under - [EPUB Metadata]. - -`--epub-embed-font=`*FILE* - -: Embed the specified font in the EPUB. This option can be repeated - to embed multiple fonts. Wildcards can also be used: for example, - `DejaVuSans-*.ttf`. However, if you use wildcards on the command - line, be sure to escape them or put the whole filename in single quotes, - to prevent them from being interpreted by the shell. To use the - embedded fonts, you will need to add declarations like the following - to your CSS (see `--css`): - - @font-face { - font-family: DejaVuSans; - font-style: normal; - font-weight: normal; - src:url("DejaVuSans-Regular.ttf"); - } - @font-face { - font-family: DejaVuSans; - font-style: normal; - font-weight: bold; - src:url("DejaVuSans-Bold.ttf"); - } - @font-face { - font-family: DejaVuSans; - font-style: italic; - font-weight: normal; - src:url("DejaVuSans-Oblique.ttf"); - } - @font-face { - font-family: DejaVuSans; - font-style: italic; - font-weight: bold; - src:url("DejaVuSans-BoldOblique.ttf"); - } - body { font-family: "DejaVuSans"; } - -`--epub-chapter-level=`*NUMBER* - -: Specify the header level at which to split the EPUB into separate - "chapter" files. The default is to split into chapters at level 1 - headers. This option only affects the internal composition of the - EPUB, not the way chapters and sections are displayed to users. Some - readers may be slow if the chapter files are too large, so for large - documents with few level 1 headers, one might want to use a chapter - level of 2 or 3. - -`--epub-subdirectory=`*DIRNAME* - -: Specify the subdirectory in the OCF container that is to hold - the EPUB-specific contents. The default is `EPUB`. To put - the EPUB contents in the top level, use an empty string. - -`--pdf-engine=pdflatex`|`lualatex`|`xelatex`|`wkhtmltopdf`|`weasyprint`|`prince`|`context`|`pdfroff` - -: Use the specified engine when producing PDF output. - The default is `pdflatex`. If the engine is not in your PATH, - the full path of the engine may be specified here. - -`--pdf-engine-opt=`*STRING* - -: Use the given string as a command-line argument to the `pdf-engine`. - If used multiple times, the arguments are provided with spaces between - them. Note that no check for duplicate options is done. - -[Dublin Core elements]: http://dublincore.org/documents/dces/ -[ISO 8601 format]: http://www.w3.org/TR/NOTE-datetime - -Citation rendering ------------------- - -`--bibliography=`*FILE* - -: Set the `bibliography` field in the document's metadata to *FILE*, - overriding any value set in the metadata, and process citations - using `pandoc-citeproc`. (This is equivalent to - `--metadata bibliography=FILE --filter pandoc-citeproc`.) - If `--natbib` or `--biblatex` is also supplied, `pandoc-citeproc` is not - used, making this equivalent to `--metadata bibliography=FILE`. - If you supply this argument multiple times, each *FILE* will be added - to bibliography. - -`--csl=`*FILE* - -: Set the `csl` field in the document's metadata to *FILE*, - overriding any value set in the metadata. (This is equivalent to - `--metadata csl=FILE`.) - This option is only relevant with `pandoc-citeproc`. - -`--citation-abbreviations=`*FILE* - -: Set the `citation-abbreviations` field in the document's metadata to - *FILE*, overriding any value set in the metadata. (This is equivalent to - `--metadata citation-abbreviations=FILE`.) - This option is only relevant with `pandoc-citeproc`. - -`--natbib` - -: Use [`natbib`] for citations in LaTeX output. This option is not for use - with the `pandoc-citeproc` filter or with PDF output. It is intended for - use in producing a LaTeX file that can be processed with [`bibtex`]. - -`--biblatex` - -: Use [`biblatex`] for citations in LaTeX output. This option is not for use - with the `pandoc-citeproc` filter or with PDF output. It is intended for - use in producing a LaTeX file that can be processed with [`bibtex`] or [`biber`]. - -Math rendering in HTML ----------------------- - -The default is to render TeX math as far as possible using Unicode characters. -Formulas are put inside a `span` with `class="math"`, so that they may be styled -differently from the surrounding text if needed. However, this gives acceptable -results only for basic math, usually you will want to use `--mathjax` or another -of the following options. - -`--mathjax`[`=`*URL*] - -: Use [MathJax] to display embedded TeX math in HTML output. - TeX math will be put between `\(...\)` (for inline math) - or `\[...\]` (for display math) and wrapped in `` tags - with class `math`. Then the MathJax JavaScript will render it. - The *URL* should point to the `MathJax.js` load script. - If a *URL* is not provided, a link to the Cloudflare CDN will - be inserted. - -`--mathml` - -: Convert TeX math to [MathML] (in `epub3`, `docbook4`, `docbook5`, `jats`, - `html4` and `html5`). This is the default in `odt` output. Note that - currently only Firefox and Safari (and select e-book readers) natively - support MathML. - -`--webtex`[`=`*URL*] - -: Convert TeX formulas to `` tags that link to an external script - that converts formulas to images. The formula will be URL-encoded - and concatenated with the URL provided. For SVG images you can for - example use `--webtex https://latex.codecogs.com/svg.latex?`. - If no URL is specified, the CodeCogs URL generating PNGs - will be used (`https://latex.codecogs.com/png.latex?`). - Note: the `--webtex` option will affect Markdown output - as well as HTML, which is useful if you're targeting a - version of Markdown without native math support. - -`--katex`[`=`*URL*] - -: Use [KaTeX] to display embedded TeX math in HTML output. - The *URL* is the base URL for the KaTeX library. If a *URL* is - not provided, a link to the KaTeX CDN will be inserted. - -`--katex-stylesheet=`*URL* - -: The *URL* should point to the `katex.css` stylesheet. If this option is - not specified, a link to the KaTeX CDN will be inserted. Note that this - option does not imply `--katex`. - -`-m` [*URL*], `--latexmathml`[`=`*URL*] - -: *Deprecated.* - Use the [LaTeXMathML] script to display embedded TeX math in HTML output. - TeX math will be displayed between `$` or `$$` characters and put in - `` tags with class `LaTeX`. The LaTeXMathML JavaScript will then - change it to MathML. Note that currently only Firefox and Safari - (and select e-book readers) natively support MathML. - To insert a link the `LaTeXMathML.js` script, provide a *URL*. - -`--jsmath`[`=`*URL*] - -: *Deprecated.* - Use [jsMath] (the predecessor of MathJax) to display embedded TeX - math in HTML output. TeX math will be put inside `` tags - (for inline math) or `
` tags (for display math) with class - `math` and rendered by the jsMath script. The *URL* should point to - the script (e.g. `jsMath/easy/load.js`); if provided, it will be linked - to in the header of standalone HTML documents. If a *URL* is not provided, - 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. - -`--gladtex` - -: *Deprecated.* - Enclose TeX math in `` tags in HTML output. The resulting HTML - can then be processed by [gladTeX] to produce images of the typeset - formulas and an HTML file with links to these images. - So, the procedure is: - - pandoc -s --gladtex input.md -o myfile.htex - gladtex -d myfile-images myfile.htex - # produces myfile.html and images in myfile-images - -`--mimetex`[`=`*URL*] - -: *Deprecated.* - Render TeX math using the [mimeTeX] CGI script, which generates an - image for each TeX formula. This should work in all browsers. If - *URL* is not specified, it is assumed that the script is at - `/cgi-bin/mimetex.cgi`. - -[MathML]: http://www.w3.org/Math/ -[LaTeXMathML]: http://math.etsu.edu/LaTeXMathML/ -[jsMath]: http://www.math.union.edu/~dpvc/jsmath/ -[MathJax]: https://www.mathjax.org -[gladTeX]: http://ans.hsh.no/home/mgg/gladtex/ -[mimeTeX]: http://www.forkosh.com/mimetex.html -[KaTeX]: https://github.com/Khan/KaTeX - -Options for wrapper scripts ---------------------------- - -`--dump-args` - -: Print information about command-line arguments to *stdout*, then exit. - This option is intended primarily for use in wrapper scripts. - The first line of output contains the name of the output file specified - with the `-o` option, or `-` (for *stdout*) if no output file was - specified. The remaining lines contain the command-line arguments, - one per line, in the order they appear. These do not include regular - pandoc options and their arguments, but do include any options appearing - after a `--` separator at the end of the line. - -`--ignore-args` - -: Ignore command-line arguments (for use in wrapper scripts). - Regular pandoc options are not ignored. Thus, for example, - - pandoc --ignore-args -o foo.html -s foo.txt -- -e latin1 - - is equivalent to - - pandoc -o foo.html -s - -Templates -========= - -When the `-s/--standalone` option is used, pandoc uses a template to -add header and footer material that is needed for a self-standing -document. To see the default template that is used, just type - - pandoc -D *FORMAT* - -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/default.*FORMAT*` in the user data -directory (see `--data-dir`, above). *Exceptions:* - -- For `odt` output, customize the `default.opendocument` - template. -- For `pdf` output, customize the `default.latex` template - (or the `default.context` template, if you use `-t context`, - or the `default.ms` template, if you use `-t ms`, or the - `default.html5` template, if you use `-t html5`). -- `docx` has no template (however, you can use - `--reference-doc` to customize the output). - -Templates contain *variables*, which allow for the inclusion of -arbitrary information at any point in the file. Variables may be set -within the document using [YAML metadata blocks][Extension: -`yaml_metadata_block`]. They may also be set at the -command line using the `-V/--variable` option: variables set in this -way override metadata fields with the same name. - -Variables set by pandoc ------------------------ - -Some variables are set automatically by pandoc. These vary somewhat -depending on the output format, but include metadata fields as well -as the following: - -`sourcefile`, `outputfile` -: source and destination filenames, as given on the command line. - `sourcefile` can also be a list if input comes from multiple files, or empty - if input is from stdin. You can use the following snippet in your template - to distinguish them: - - $if(sourcefile)$ - $for(sourcefile)$ - $sourcefile$ - $endfor$ - $else$ - (stdin) - $endif$ - - Similarly, `outputfile` can be `-` if output goes to the terminal. - -`title`, `author`, `date` -: allow identification of basic aspects of the document. Included - in PDF metadata through LaTeX and ConTeXt. These can be set - through a [pandoc title block][Extension: `pandoc_title_block`], - which allows for multiple authors, or through a YAML metadata block: - - --- - author: - - Aristotle - - Peter Abelard - ... - -`subtitle` -: document subtitle, included in HTML, EPUB, LaTeX, ConTeXt, and Word docx; - renders in LaTeX only when using a document class that supports - `\subtitle`, such as `beamer` or the [KOMA-Script] series (`scrartcl`, - `scrreprt`, `scrbook`).[^subtitle] - -`institute` -: author affiliations (in LaTeX and Beamer only). Can be a - list, when there are multiple authors. - -`abstract` -: document summary, included in LaTeX, ConTeXt, AsciiDoc, and Word docx - -`keywords` -: list of keywords to be included in HTML, PDF, and AsciiDoc metadata; - may be repeated as for `author`, above - -`header-includes` -: contents specified by `-H/--include-in-header` (may have multiple - values) - -`toc` -: non-null value if `--toc/--table-of-contents` was specified - -`toc-title` -: title of table of contents (works only with EPUB, - opendocument, odt, docx) - -`include-before` -: contents specified by `-B/--include-before-body` (may have - multiple values) - -`include-after` -: contents specified by `-A/--include-after-body` (may have - multiple values) - -`body` -: body of document - -`meta-json` -: JSON representation of all of the document's metadata. Field - values are transformed to the selected output format. - -[^subtitle]: To make `subtitle` work with other LaTeX - document classes, you can add the following to `header-includes`: - - \providecommand{\subtitle}[1]{% - \usepackage{titling} - \posttitle{% - \par\large#1\end{center}} - } - -Language variables ------------------- - -`lang` -: identifies the main language of the document, - using a code according to [BCP 47] (e.g. `en` or `en-GB`). - For some output formats, pandoc will convert it to an appropriate - format stored in the additional variables `babel-lang`, - `polyglossia-lang` (LaTeX) and `context-lang` (ConTeXt). - - Native pandoc `span`s and `div`s with the lang attribute - (value in BCP 47) can be used to switch the language in - that range. - -`otherlangs` -: a list of other languages used in the document - in the YAML metadata, according to [BCP 47]. For example: - `otherlangs: [en-GB, fr]`. - This is automatically generated from the `lang` attributes - in all `span`s and `div`s but can be overridden. - Currently only used by LaTeX through the generated - `babel-otherlangs` and `polyglossia-otherlangs` variables. - The LaTeX writer outputs polyglossia commands in the text but - the `babel-newcommands` variable contains mappings for them - to the corresponding babel. - -`dir` -: the base direction of the document, either `rtl` (right-to-left) - or `ltr` (left-to-right). - - For bidirectional documents, native pandoc `span`s and `div`s - with the `dir` attribute (value `rtl` or `ltr`) can be used to - override the base direction in some output formats. - This may not always be necessary if the final renderer - (e.g. the browser, when generating HTML) supports the - [Unicode Bidirectional Algorithm]. - - When using LaTeX for bidirectional documents, only the `xelatex` engine - is fully supported (use `--pdf-engine=xelatex`). - -[BCP 47]: https://tools.ietf.org/html/bcp47 -[Unicode Bidirectional Algorithm]: http://www.w3.org/International/articles/inline-bidi-markup/uba-basics - -Variables for slides --------------------- - -Variables are available for [producing slide shows with pandoc], -including all [reveal.js configuration options]. - -`titlegraphic` -: title graphic for Beamer documents - -`logo` -: logo for Beamer documents - -`slidy-url` -: base URL for Slidy documents (defaults to - `https://www.w3.org/Talks/Tools/Slidy2`) - -`slideous-url` -: base URL for Slideous documents (defaults to `slideous`) - -`s5-url` -: base URL for S5 documents (defaults to `s5/default`) - -`revealjs-url` -: base URL for reveal.js documents (defaults to `reveal.js`) - -`theme`, `colortheme`, `fonttheme`, `innertheme`, `outertheme` -: themes for LaTeX [`beamer`] documents - -`themeoptions` -: options for LaTeX beamer themes (a list). - -`navigation` -: controls navigation symbols in `beamer` documents - (default is `empty` for no navigation symbols; other valid values - are `frame`, `vertical`, and `horizontal`). - -`section-titles` -: enables on "title pages" for new sections in `beamer` - documents (default = true). - -`beamerarticle` -: when true, the `beamerarticle` package is loaded (for - producing an article from beamer slides). - -`aspectratio` -: aspect ratio of slides (for beamer only, `1610` for 16:10, `169` for 16:9, - `149` for 14:9, `141` for 1.41:1, `54` for 5:4, `43` for 4:3 which is the - default, and `32` for 3:2). - -[reveal.js configuration options]: https://github.com/hakimel/reveal.js#configuration - -Variables for LaTeX -------------------- - -LaTeX variables are used when [creating a PDF]. - -`papersize` -: paper size, e.g. `letter`, `a4` - -`fontsize` -: font size for body text (e.g. `10pt`, `12pt`) - -`documentclass` -: document class, e.g. [`article`], [`report`], [`book`], [`memoir`] - -`classoption` -: option for document class, e.g. `oneside`; may be repeated - for multiple options - -`geometry` -: option for [`geometry`] package, e.g. `margin=1in`; - may be repeated for multiple options - -`margin-left`, `margin-right`, `margin-top`, `margin-bottom` -: sets margins, if `geometry` is not used (otherwise `geometry` - overrides these) - -`linestretch` -: adjusts line spacing using the [`setspace`] - package, e.g. `1.25`, `1.5` - -`fontfamily` -: font package for use with `pdflatex`: - [TeX Live] includes many options, documented in the [LaTeX Font Catalogue]. - The default is [Latin Modern][`lm`]. - -`fontfamilyoptions` -: options for package used as `fontfamily`: e.g. `osf,sc` with - `fontfamily` set to [`mathpazo`] provides Palatino with old-style - figures and true small caps; may be repeated for multiple options - -`mainfont`, `sansfont`, `monofont`, `mathfont`, `CJKmainfont` -: font families for use with `xelatex` or - `lualatex`: take the name of any system font, using the - [`fontspec`] package. Note that if `CJKmainfont` is used, - the [`xecjk`] package must be available. - -`mainfontoptions`, `sansfontoptions`, `monofontoptions`, `mathfontoptions`, `CJKoptions` -: options to use with `mainfont`, `sansfont`, `monofont`, `mathfont`, - `CJKmainfont` in `xelatex` and `lualatex`. Allow for any choices - available through [`fontspec`], such as the OpenType features - `Numbers=OldStyle,Numbers=Proportional`. May be repeated for multiple options. - -`fontenc` -: allows font encoding to be specified through `fontenc` package (with `pdflatex`); - default is `T1` (see guide to [LaTeX font encodings]) - -`microtypeoptions` -: options to pass to the microtype package - -`colorlinks` -: add color to link text; automatically enabled if any of `linkcolor`, `citecolor`, - `urlcolor`, or `toccolor` are set - -`linkcolor`, `citecolor`, `urlcolor`, `toccolor` -: color for internal links, citation links, external links, and links in table of contents: - uses options allowed by [`xcolor`], including the `dvipsnames`, `svgnames`, and `x11names` lists - -`links-as-notes` -: causes links to be printed as footnotes - -`indent` -: uses document class settings for indentation (the default LaTeX template - otherwise removes indentation and adds space between paragraphs) - -`subparagraph` -: disables default behavior of LaTeX template that redefines (sub)paragraphs - as sections, changing the appearance of nested headings in some classes - -`thanks` -: specifies contents of acknowledgments footnote after document title. - -`toc` -: include table of contents (can also be set using `--toc/--table-of-contents`) - -`toc-depth` -: level of section to include in table of contents - -`secnumdepth` -: numbering depth for sections, if sections are numbered - -`lof`, `lot` -: include list of figures, list of tables - -`bibliography` -: bibliography to use for resolving references - -`biblio-style` -: bibliography style, when used with `--natbib` and `--biblatex`. - -`biblio-title` -: bibliography title, when used with `--natbib` and `--biblatex`. - -`biblatexoptions` -: list of options for biblatex. - -`natbiboptions` -: list of options for natbib. - -`pagestyle` -: An option for LaTeX's `\pagestyle{}`. The default article class - supports 'plain' (default), 'empty', and 'headings'; headings puts - section titles in the header. - -[`article`]: https://ctan.org/pkg/article -[`report`]: https://ctan.org/pkg/report -[`book`]: https://ctan.org/pkg/book -[KOMA-Script]: https://ctan.org/pkg/koma-script -[`memoir`]: https://ctan.org/pkg/memoir -[`xcolor`]: https://ctan.org/pkg/xcolor -[LaTeX Font Catalogue]: http://www.tug.dk/FontCatalogue/ -[`mathpazo`]: https://ctan.org/pkg/mathpazo -[LaTeX font encodings]: https://ctan.org/pkg/encguide - -Variables for ConTeXt ---------------------- - -`papersize` -: paper size, e.g. `letter`, `A4`, `landscape` (see [ConTeXt Paper Setup]); - may be repeated for multiple options - -`layout` -: options for page margins and text arrangement (see [ConTeXt Layout]); - may be repeated for multiple options - -`margin-left`, `margin-right`, `margin-top`, `margin-bottom` -: sets margins, if `layout` is not used (otherwise `layout` - overrides these) - -`fontsize` -: font size for body text (e.g. `10pt`, `12pt`) - -`mainfont`, `sansfont`, `monofont`, `mathfont` -: font families: take the name of any system font (see [ConTeXt Font Switching]) - -`linkcolor`, `contrastcolor` -: color for links outside and inside a page, e.g. `red`, `blue` (see [ConTeXt Color]) - -`linkstyle` -: typeface style for links, e.g. `normal`, `bold`, `slanted`, `boldslanted`, `type`, `cap`, `small` - -`indenting` -: controls indentation of paragraphs, e.g. `yes,small,next` (see [ConTeXt Indentation]); - may be repeated for multiple options - -`whitespace` -: spacing between paragraphs, e.g. `none`, `small` (using [`setupwhitespace`]) - -`interlinespace` -: adjusts line spacing, e.g. `4ex` (using [`setupinterlinespace`]); - may be repeated for multiple options - -`headertext`, `footertext` -: text to be placed in running header or footer (see [ConTeXt Headers and Footers]); - may be repeated up to four times for different placement - -`pagenumbering` -: page number style and location (using [`setuppagenumbering`]); - may be repeated for multiple options - -`toc` -: include table of contents (can also be set using `--toc/--table-of-contents`) - -`lof`, `lot` -: include list of figures, list of tables - -[ConTeXt Paper Setup]: http://wiki.contextgarden.net/PaperSetup -[ConTeXt Layout]: http://wiki.contextgarden.net/Layout -[ConTeXt Font Switching]: http://wiki.contextgarden.net/Font_Switching -[ConTeXt Color]: http://wiki.contextgarden.net/Color -[ConTeXt Headers and Footers]: http://wiki.contextgarden.net/Headers_and_Footers -[ConTeXt Indentation]: http://wiki.contextgarden.net/Indentation -[`setupwhitespace`]: http://wiki.contextgarden.net/Command/setupwhitespace -[`setupinterlinespace`]: http://wiki.contextgarden.net/Command/setupinterlinespace -[`setuppagenumbering`]: http://wiki.contextgarden.net/Command/setuppagenumbering - -Variables for man pages ------------------------ - -`section` -: section number in man pages - -`header` -: header in man pages - -`footer` -: footer in man pages - -`adjusting` -: adjusts text to left (`l`), right (`r`), center (`c`), - or both (`b`) margins - -`hyphenate` -: if `true` (the default), hyphenation will be used - -Variables for ms ----------------- - -`pointsize` -: point size (e.g. `10p`) - -`lineheight` -: line height (e.g. `12p`) - -`fontfamily` -: font family (e.g. `T` or `P`) - -`indent` -: paragraph indent (e.g. `2m`) - -Using variables in templates ----------------------------- - -Variable names are sequences of alphanumerics, `-`, and `_`, -starting with a letter. A variable name surrounded by `$` signs -will be replaced by its value. For example, the string `$title$` in - - $title$ - -will be replaced by the document title. - -To write a literal `$` in a template, use `$$`. - -Templates may contain conditionals. The syntax is as follows: - - $if(variable)$ - X - $else$ - Y - $endif$ - -This will include `X` in the template if `variable` has a non-null -value; otherwise it will include `Y`. `X` and `Y` are placeholders for -any valid template text, and may include interpolated variables or other -conditionals. The `$else$` section may be omitted. - -When variables can have multiple values (for example, `author` in -a multi-author document), you can use the `$for$` keyword: - - $for(author)$ - - $endfor$ - -You can optionally specify a separator to be used between -consecutive items: - - $for(author)$$author$$sep$, $endfor$ - -A dot can be used to select a field of a variable that takes -an object as its value. So, for example: - - $author.name$ ($author.affiliation$) - -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. - -Templates may contain comments: anything on a line after `$--` -will be treated as a comment and ignored. - -[pandoc-templates]: https://github.com/jgm/pandoc-templates - -Extensions -========== - -The behavior of some of the readers and writers can be adjusted by -enabling or disabling various extensions. - -An extension can be enabled by adding `+EXTENSION` -to the format name and disabled by adding `-EXTENSION`. For example, -`--from markdown_strict+footnotes` is strict Markdown with footnotes -enabled, while `--from markdown-footnotes-pipe_tables` is pandoc's -Markdown without footnotes or pipe tables. - -The markdown reader and writer make by far the most use of extensions. -Extensions only used by them are therefore covered in the -section [Pandoc's Markdown] below (See [Markdown variants] for -`commonmark` and `gfm`.) In the following, extensions that also work -for other formats are covered. - -Typography ----------- - -#### Extension: `smart` #### - -Interpret straight quotes as curly quotes, `---` as em-dashes, -`--` as en-dashes, and `...` as ellipses. Nonbreaking spaces are -inserted after certain abbreviations, such as "Mr." - -This extension can be enabled/disabled for the following formats: - -input formats -: `markdown`, `commonmark`, `latex`, `mediawiki`, `org`, `rst`, `twiki` - -output formats -: `markdown`, `latex`, `context`, `rst` - -enabled by default in -: `markdown`, `latex`, `context` (both input and output) - -Note: If you are *writing* Markdown, then the `smart` extension -has the reverse effect: what would have been curly quotes comes -out straight. - -In LaTeX, `smart` means to use the standard TeX ligatures -for quotation marks (` `` ` and ` '' ` for double quotes, -`` ` `` and `` ' `` for single quotes) and dashes (`--` for -en-dash and `---` for em-dash). If `smart` is disabled, -then in reading LaTeX pandoc will parse these characters -literally. In writing LaTeX, enabling `smart` tells pandoc -to use the ligatures when possible; if `smart` is disabled -pandoc will use unicode quotation mark and dash characters. - -Headers and sections --------------------- - -#### Extension: `auto_identifiers` #### - -A header without an explicitly specified identifier will be -automatically assigned a unique identifier based on the header text. - -This extension can be enabled/disabled for the following formats: - -input formats -: `markdown`, `latex`, `rst`, `mediawiki`, `textile` - -output formats -: `markdown`, `muse` - -enabled by default in -: `markdown`, `muse` - -The algorithm used to derive the identifier from the header text is: - - - Remove all formatting, links, etc. - - Remove all footnotes. - - Remove all punctuation, except underscores, hyphens, and periods. - - Replace all spaces and newlines with hyphens. - - Convert all alphabetic characters to lowercase. - - Remove everything up to the first letter (identifiers may - not begin with a number or punctuation mark). - - If nothing is left after this, use the identifier `section`. - -Thus, for example, - - Header Identifier - ------------------------------- ---------------------------- - `Header identifiers in HTML` `header-identifiers-in-html` - `*Dogs*?--in *my* house?` `dogs--in-my-house` - `[HTML], [S5], or [RTF]?` `html-s5-or-rtf` - `3. Applications` `applications` - `33` `section` - -These rules should, in most cases, allow one to determine the identifier -from the header text. The exception is when several headers have the -same text; in this case, the first will get an identifier as described -above; the second will get the same identifier with `-1` appended; the -third with `-2`; and so on. - -These identifiers are used to provide link targets in the table of -contents generated by the `--toc|--table-of-contents` option. They -also make it easy to provide links from one section of a document to -another. A link to this section, for example, might look like this: - - See the section on - [header identifiers](#header-identifiers-in-html-latex-and-context). - -Note, however, that this method of providing links to sections works -only in HTML, LaTeX, and ConTeXt formats. - -If the `--section-divs` option is specified, then each section will -be wrapped in a `section` (or a `div`, if `html4` was specified), -and the identifier will be attached to the enclosing `
` -(or `
`) tag rather than the header itself. This allows entire -sections to be manipulated using JavaScript or treated differently in -CSS. - -#### Extension: `ascii_identifiers` #### - -Causes the identifiers produced by `auto_identifiers` to be pure ASCII. -Accents are stripped off of accented Latin letters, and non-Latin -letters are omitted. - -Math Input ----------- - -The extensions [`tex_math_dollars`](#extension-tex_math_dollars), -[`tex_math_single_backslash`](#extension-tex_math_single_backslash), and -[`tex_math_double_backslash`](#extension-tex_math_double_backslash) -are described in the section about Pandoc's Markdown. - -However, they can also be used with HTML input. This is handy for -reading web pages formatted using MathJax, for example. - -Raw HTML/TeX ------------- - -The following extensions (especially how they affect Markdown -input/output) are also described in more detail in their respective -sections of [Pandoc's Markdown]. - -#### [Extension: `raw_html`] {#raw_html} - -When converting from HTML, parse elements to raw HTML which are not -representable in pandoc's AST. -By default, this is disabled for HTML input. - -#### [Extension: `raw_tex`] {#raw_tex} - -Allows raw LaTeX, TeX, and ConTeXt to be included in a document. - -This extension can be enabled/disabled for the following formats -(in addition to `markdown`): - -input formats -: `latex`, `org`, `textile` - -output formats -: `textile` - -#### [Extension: `native_divs`] {#native_divs} - -This extension is enabled by default for HTML input. This means that -`div`s are parsed to pandoc native elements. (Alternatively, you -can parse them to raw HTML using `-f html-native_divs+raw_html`.) - -When converting HTML to Markdown, for example, you may want to drop all -`div`s and `span`s: - - pandoc -f html-native_divs-native_spans -t markdown - -#### [Extension: `native_spans`] {#native_spans} - -Analogous to `native_divs` above. - - -Literate Haskell support ------------------------- - -#### Extension: `literate_haskell` #### - -Treat the document as literate Haskell source. - -This extension can be enabled/disabled for the following formats: - -input formats -: `markdown`, `rst`, `latex` - -output formats -: `markdown`, `rst`, `latex`, `html` - -If you append `+lhs` (or `+literate_haskell`) to one of the formats -above, pandoc will treat the document as literate Haskell source. -This means that - - - In Markdown input, "bird track" sections will be parsed as Haskell - code rather than block quotations. Text between `\begin{code}` - and `\end{code}` will also be treated as Haskell code. For - ATX-style headers the character '=' will be used instead of '#'. - - - In Markdown output, code blocks with classes `haskell` and `literate` - will be rendered using bird tracks, and block quotations will be - indented one space, so they will not be treated as Haskell code. - In addition, headers will be rendered setext-style (with underlines) - rather than ATX-style (with '#' characters). (This is because ghc - treats '#' characters in column 1 as introducing line numbers.) - - - In restructured text input, "bird track" sections will be parsed - as Haskell code. - - - In restructured text output, code blocks with class `haskell` will - be rendered using bird tracks. - - - In LaTeX input, text in `code` environments will be parsed as - Haskell code. - - - In LaTeX output, code blocks with class `haskell` will be rendered - inside `code` environments. - - - In HTML output, code blocks with class `haskell` will be rendered - with class `literatehaskell` and bird tracks. - -Examples: - - pandoc -f markdown+lhs -t html - -reads literate Haskell source formatted with Markdown conventions and writes -ordinary HTML (without bird tracks). - - pandoc -f markdown+lhs -t html+lhs - -writes HTML with the Haskell code in bird tracks, so it can be copied -and pasted as literate Haskell source. - -Note that GHC expects the bird tracks in the first column, so indentend literate -code blocks (e.g. inside an itemized environment) will not be picked up by the -Haskell compiler. - -Other extensions ----------------- - -#### Extension: `empty_paragraphs` #### - -Allows empty paragraphs. By default empty paragraphs are -omitted. - -This extension can be enabled/disabled for the following formats: - -input formats -: `docx`, `html` - -output formats -: `markdown`, `docx`, `odt`, `opendocument`, `html` - -#### Extension: `amuse` #### - -In the `muse` input format, this enables Text::Amuse -extensions to Emacs Muse markup. - -#### Extension: `citations` {#org-citations} - -Some aspects of [Pandoc's Markdown citation syntax](#citations) are also accepted -in `org` input. - - -Pandoc's Markdown -================= - -Pandoc understands an extended and slightly revised version of -John Gruber's [Markdown] syntax. This document explains the syntax, -noting differences from standard Markdown. Except where noted, these -differences can be suppressed by using the `markdown_strict` format instead -of `markdown`. Extensions can be enabled or disabled to specify the -behavior more granularly. They are described in the following. See also -[Extensions] above, for extensions that work also on other formats. - -Philosophy ----------- - -Markdown is designed to be easy to write, and, even more importantly, -easy to read: - -> A Markdown-formatted document should be publishable as-is, as plain -> text, without looking like it's been marked up with tags or formatting -> instructions. -> -- [John Gruber](http://daringfireball.net/projects/markdown/syntax#philosophy) - -This principle has guided pandoc's decisions in finding syntax for -tables, footnotes, and other extensions. - -There is, however, one respect in which pandoc's aims are different -from the original aims of Markdown. Whereas Markdown was originally -designed with HTML generation in mind, pandoc is designed for multiple -output formats. Thus, while pandoc allows the embedding of raw HTML, -it discourages it, and provides other, non-HTMLish ways of representing -important document elements like definition lists, tables, mathematics, and -footnotes. - -Paragraphs ----------- - -A paragraph is one or more lines of text followed by one or more blank lines. -Newlines are treated as spaces, so you can reflow your paragraphs as you like. -If you need a hard line break, put two or more spaces at the end of a line. - -#### Extension: `escaped_line_breaks` #### - -A backslash followed by a newline is also a hard line break. -Note: in multiline and grid table cells, this is the only way -to create a hard line break, since trailing spaces in the cells -are ignored. - -Headers -------- - -There are two kinds of headers: Setext and ATX. - -### Setext-style headers ### - -A setext-style header is a line of text "underlined" with a row of `=` signs -(for a level one header) or `-` signs (for a level two header): - - A level-one header - ================== - - A level-two header - ------------------ - -The header text can contain inline formatting, such as emphasis (see -[Inline formatting], below). - - -### ATX-style headers ### - -An ATX-style header consists of one to six `#` signs and a line of -text, optionally followed by any number of `#` signs. The number of -`#` signs at the beginning of the line is the header level: - - ## A level-two header - - ### A level-three header ### - -As with setext-style headers, the header text can contain formatting: - - # A level-one header with a [link](/url) and *emphasis* - -#### Extension: `blank_before_header` #### - -Standard Markdown syntax does not require a blank line before a header. -Pandoc does require this (except, of course, at the beginning of the -document). The reason for the requirement is that it is all too easy for a -`#` to end up at the beginning of a line by accident (perhaps through line -wrapping). Consider, for example: - - I like several of their flavors of ice cream: - #22, for example, and #5. - -#### Extension: `space_in_atx_header` #### - -Many Markdown implementations do not require a space between the -opening `#`s of an ATX header and the header text, so that -`#5 bolt` and `#hashtag` count as headers. With this extension, -pandoc does require the space. - -### Header identifiers ### - -See also the [`auto_identifiers` extension](#extension-auto_identifiers) above. - -#### Extension: `header_attributes` #### - -Headers can be assigned attributes using this syntax at the end -of the line containing the header text: - - {#identifier .class .class key=value key=value} - -Thus, for example, the following headers will all be assigned the identifier -`foo`: - - # My header {#foo} - - ## My header ## {#foo} - - My other header {#foo} - --------------- - -(This syntax is compatible with [PHP Markdown Extra].) - -Note that although this syntax allows assignment of classes and key/value -attributes, writers generally don't use all of this information. Identifiers, -classes, and key/value attributes are used in HTML and HTML-based formats such -as EPUB and slidy. Identifiers are used for labels and link anchors in the -LaTeX, ConTeXt, Textile, and AsciiDoc writers. - -Headers with the class `unnumbered` will not be numbered, even if -`--number-sections` is specified. A single hyphen (`-`) in an attribute -context is equivalent to `.unnumbered`, and preferable in non-English -documents. So, - - # My header {-} - -is just the same as - - # My header {.unnumbered} - -#### Extension: `implicit_header_references` #### - -Pandoc behaves as if reference links have been defined for each header. -So, to link to a header - - # Header identifiers in HTML - -you can simply write - - [Header identifiers in HTML] - -or - - [Header identifiers in HTML][] - -or - - [the section on header identifiers][header identifiers in - HTML] - -instead of giving the identifier explicitly: - - [Header identifiers in HTML](#header-identifiers-in-html) - -If there are multiple headers with identical text, the corresponding -reference will link to the first one only, and you will need to use explicit -links to link to the others, as described above. - -Like regular reference links, these references are case-insensitive. - -Explicit link reference definitions always take priority over -implicit header references. So, in the following example, the -link will point to `bar`, not to `#foo`: - - # Foo - - [foo]: bar - - See [foo] - -Block quotations ----------------- - -Markdown uses email conventions for quoting blocks of text. -A block quotation is one or more paragraphs or other block elements -(such as lists or headers), with each line preceded by a `>` character -and an optional space. (The `>` need not start at the left margin, but -it should not be indented more than three spaces.) - - > This is a block quote. This - > paragraph has two lines. - > - > 1. This is a list inside a block quote. - > 2. Second item. - -A "lazy" form, which requires the `>` character only on the first -line of each block, is also allowed: - - > This is a block quote. This - paragraph has two lines. - - > 1. This is a list inside a block quote. - 2. Second item. - -Among the block elements that can be contained in a block quote are -other block quotes. That is, block quotes can be nested: - - > This is a block quote. - > - > > A block quote within a block quote. - -If the `>` character is followed by an optional space, that space -will be considered part of the block quote marker and not part of -the indentation of the contents. Thus, to put an indented code -block in a block quote, you need five spaces after the `>`: - - > code - -#### Extension: `blank_before_blockquote` #### - -Standard Markdown syntax does not require a blank line before a block -quote. Pandoc does require this (except, of course, at the beginning of the -document). The reason for the requirement is that it is all too easy for a -`>` to end up at the beginning of a line by accident (perhaps through line -wrapping). So, unless the `markdown_strict` format is used, the following does -not produce a nested block quote in pandoc: - - > This is a block quote. - >> Nested. - - -Verbatim (code) blocks ----------------------- - -### Indented code blocks ### - -A block of text indented four spaces (or one tab) is treated as verbatim -text: that is, special characters do not trigger special formatting, -and all spaces and line breaks are preserved. For example, - - if (a > 3) { - moveShip(5 * gravity, DOWN); - } - -The initial (four space or one tab) indentation is not considered part -of the verbatim text, and is removed in the output. - -Note: blank lines in the verbatim text need not begin with four spaces. - - -### Fenced code blocks ### - -#### Extension: `fenced_code_blocks` #### - -In addition to standard indented code blocks, pandoc supports -*fenced* code blocks. These begin with a row of three or more -tildes (`~`) and end with a row of tildes that must be at least as long as -the starting row. Everything between these lines is treated as code. No -indentation is necessary: - - ~~~~~~~ - if (a > 3) { - moveShip(5 * gravity, DOWN); - } - ~~~~~~~ - -Like regular code blocks, fenced code blocks must be separated -from surrounding text by blank lines. - -If the code itself contains a row of tildes or backticks, just use a longer -row of tildes or backticks at the start and end: - - ~~~~~~~~~~~~~~~~ - ~~~~~~~~~~ - code including tildes - ~~~~~~~~~~ - ~~~~~~~~~~~~~~~~ - -#### Extension: `backtick_code_blocks` #### - -Same as `fenced_code_blocks`, but uses backticks (`` ` ``) instead of tildes -(`~`). - -#### Extension: `fenced_code_attributes` #### - -Optionally, you may attach attributes to fenced or backtick code block using -this syntax: - - ~~~~ {#mycode .haskell .numberLines startFrom="100"} - qsort [] = [] - qsort (x:xs) = qsort (filter (< x) xs) ++ [x] ++ - qsort (filter (>= x) xs) - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Here `mycode` is an identifier, `haskell` and `numberLines` are classes, and -`startFrom` is an attribute with value `100`. Some output formats can use this -information to do syntax highlighting. Currently, the only output formats -that uses this information are HTML, LaTeX, Docx, and Ms. If highlighting -is supported for your output format and language, then the code block above -will appear highlighted, with numbered lines. (To see which languages are -supported, type `pandoc --list-highlight-languages`.) Otherwise, the code -block above will appear as follows: - - 
-      
-      ...
-      
-
- -The `numberLines` (or `number-lines`) class will cause the lines -of the code block to be numbered, starting with `1` or the value -of the `startFrom` attribute. The `lineAnchors` (or -`line-anchors`) class will cause the lines to be clickable -anchors in HTML output. - -A shortcut form can also be used for specifying the language of -the code block: - - ```haskell - qsort [] = [] - ``` - -This is equivalent to: - - ``` {.haskell} - qsort [] = [] - ``` - -If the `fenced_code_attributes` extension is disabled, but -input contains class attribute(s) for the code block, the first -class attribute will be printed after the opening fence as a bare -word. - -To prevent all highlighting, use the `--no-highlight` flag. -To set the highlighting style, use `--highlight-style`. -For more information on highlighting, see [Syntax highlighting], -below. - -Line blocks ------------ - -#### Extension: `line_blocks` #### - -A line block is a sequence of lines beginning with a vertical bar (`|`) -followed by a space. The division into lines will be preserved in -the output, as will any leading spaces; otherwise, the lines will -be formatted as Markdown. This is useful for verse and addresses: - - | The limerick packs laughs anatomical - | In space that is quite economical. - | But the good ones I've seen - | So seldom are clean - | And the clean ones so seldom are comical - - | 200 Main St. - | Berkeley, CA 94718 - -The lines can be hard-wrapped if needed, but the continuation -line must begin with a space. - - | The Right Honorable Most Venerable and Righteous Samuel L. - Constable, Jr. - | 200 Main St. - | Berkeley, CA 94718 - -This syntax is borrowed from [reStructuredText]. - -Lists ------ - -### Bullet lists ### - -A bullet list is a list of bulleted list items. A bulleted list -item begins with a bullet (`*`, `+`, or `-`). Here is a simple -example: - - * one - * two - * three - -This will produce a "compact" list. If you want a "loose" list, in which -each item is formatted as a paragraph, put spaces between the items: - - * one - - * two - - * three - -The bullets need not be flush with the left margin; they may be -indented one, two, or three spaces. The bullet must be followed -by whitespace. - -List items look best if subsequent lines are flush with the first -line (after the bullet): - - * here is my first - list item. - * and my second. - -But Markdown also allows a "lazy" format: - - * here is my first - list item. - * and my second. - -### Block content in list items ### - -A list item may contain multiple paragraphs and other block-level -content. However, subsequent paragraphs must be preceded by a blank line -and indented to line up with the first non-space content after -the list marker. - - * First paragraph. - - Continued. - - * Second paragraph. With a code block, which must be indented - eight spaces: - - { code } - -Exception: if the list marker is followed by an indented code -block, which must begin 5 spaces after the list marker, then -subsequent paragraphs must begin two columns after the last -character of the list marker: - - * code - - continuation paragraph - -List items may include other lists. In this case the preceding blank -line is optional. The nested list must be indented to line up with -the first non-space character after the list marker of the -containing list item. - - * fruits - + apples - - macintosh - - red delicious - + pears - + peaches - * vegetables - + broccoli - + chard - -As noted above, Markdown allows you to write list items "lazily," instead of -indenting continuation lines. However, if there are multiple paragraphs or -other blocks in a list item, the first line of each must be indented. - - + A lazy, lazy, list - item. - - + Another one; this looks - bad but is legal. - - Second paragraph of second - list item. - -### Ordered lists ### - -Ordered lists work just like bulleted lists, except that the items -begin with enumerators rather than bullets. - -In standard Markdown, enumerators are decimal numbers followed -by a period and a space. The numbers themselves are ignored, so -there is no difference between this list: - - 1. one - 2. two - 3. three - -and this one: - - 5. one - 7. two - 1. three - -#### Extension: `fancy_lists` #### - -Unlike standard Markdown, pandoc allows ordered list items to be marked -with uppercase and lowercase letters and roman numerals, in addition to -Arabic numerals. List markers may be enclosed in parentheses or followed by a -single right-parentheses or period. They must be separated from the -text that follows by at least one space, and, if the list marker is a -capital letter with a period, by at least two spaces.[^2] - -[^2]: The point of this rule is to ensure that normal paragraphs - starting with people's initials, like - - B. Russell was an English philosopher. - - do not get treated as list items. - - This rule will not prevent - - (C) 2007 Joe Smith - - from being interpreted as a list item. In this case, a backslash - escape can be used: - - (C\) 2007 Joe Smith - -The `fancy_lists` extension also allows '`#`' to be used as an -ordered list marker in place of a numeral: - - #. one - #. two - -#### Extension: `startnum` #### - -Pandoc also pays attention to the type of list marker used, and to the -starting number, and both of these are preserved where possible in the -output format. Thus, the following yields a list with numbers followed -by a single parenthesis, starting with 9, and a sublist with lowercase -roman numerals: - - 9) Ninth - 10) Tenth - 11) Eleventh - i. subone - ii. subtwo - iii. subthree - -Pandoc will start a new list each time a different type of list -marker is used. So, the following will create three lists: - - (2) Two - (5) Three - 1. Four - * Five - -If default list markers are desired, use `#.`: - - #. one - #. two - #. three - - -### Definition lists ### - -#### Extension: `definition_lists` #### - -Pandoc supports definition lists, using the syntax of -[PHP Markdown Extra] with some extensions.[^3] - - Term 1 - - : Definition 1 - - Term 2 with *inline markup* - - : Definition 2 - - { some code, part of Definition 2 } - - Third paragraph of definition 2. - -Each term must fit on one line, which may optionally be followed by -a blank line, and must be followed by one or more definitions. -A definition begins with a colon or tilde, which may be indented one -or two spaces. - -A term may have multiple definitions, and each definition may consist of one or -more block elements (paragraph, code block, list, etc.), each indented four -spaces or one tab stop. The body of the definition (including the first line, -aside from the colon or tilde) should be indented four spaces. However, -as with other Markdown lists, you can "lazily" omit indentation except -at the beginning of a paragraph or other block element: - - Term 1 - - : Definition - with lazy continuation. - - Second paragraph of the definition. - -If you leave space before the definition (as in the example above), -the text of the definition will be treated as a paragraph. In some -output formats, this will mean greater spacing between term/definition -pairs. For a more compact definition list, omit the space before the -definition: - - Term 1 - ~ Definition 1 - - Term 2 - ~ Definition 2a - ~ Definition 2b - -Note that space between items in a definition list is required. -(A variant that loosens this requirement, but disallows "lazy" -hard wrapping, can be activated with `compact_definition_lists`: see -[Non-pandoc extensions], below.) - -[^3]: I have been influenced by the suggestions of [David Wheeler](http://www.justatheory.com/computers/markup/modest-markdown-proposal.html). - -### Numbered example lists ### - -#### Extension: `example_lists` #### - -The special list marker `@` can be used for sequentially numbered -examples. The first list item with a `@` marker will be numbered '1', -the next '2', and so on, throughout the document. The numbered examples -need not occur in a single list; each new list using `@` will take up -where the last stopped. So, for example: - - (@) My first example will be numbered (1). - (@) My second example will be numbered (2). - - Explanation of examples. - - (@) My third example will be numbered (3). - -Numbered examples can be labeled and referred to elsewhere in the -document: - - (@good) This is a good example. - - As (@good) illustrates, ... - -The label can be any string of alphanumeric characters, underscores, -or hyphens. - -Note: continuation paragraphs in example lists must always -be indented four spaces, regardless of the length of the -list marker. That is, example lists always behave as if the -`four_space_rule` extension is set. This is because example -labels tend to be long, and indenting content to the -first non-space character after the label would be awkward. - -### Compact and loose lists ### - -Pandoc behaves differently from `Markdown.pl` on some "edge -cases" involving lists. Consider this source: - - + First - + Second: - - Fee - - Fie - - Foe - - + Third - -Pandoc transforms this into a "compact list" (with no `

` tags around -"First", "Second", or "Third"), while Markdown puts `

` tags around -"Second" and "Third" (but not "First"), because of the blank space -around "Third". Pandoc follows a simple rule: if the text is followed by -a blank line, it is treated as a paragraph. Since "Second" is followed -by a list, and not a blank line, it isn't treated as a paragraph. The -fact that the list is followed by a blank line is irrelevant. (Note: -Pandoc works this way even when the `markdown_strict` format is specified. This -behavior is consistent with the official Markdown syntax description, -even though it is different from that of `Markdown.pl`.) - - -### Ending a list ### - -What if you want to put an indented code block after a list? - - - item one - - item two - - { my code block } - -Trouble! Here pandoc (like other Markdown implementations) will treat -`{ my code block }` as the second paragraph of item two, and not as -a code block. - -To "cut off" the list after item two, you can insert some non-indented -content, like an HTML comment, which won't produce visible output in -any format: - - - item one - - item two - - - - { my code block } - -You can use the same trick if you want two consecutive lists instead -of one big list: - - 1. one - 2. two - 3. three - - - - 1. uno - 2. dos - 3. tres - -Horizontal rules ----------------- - -A line containing a row of three or more `*`, `-`, or `_` characters -(optionally separated by spaces) produces a horizontal rule: - - * * * * - - --------------- - - -Tables ------- - -Four kinds of tables may be used. The first three kinds presuppose the use of -a fixed-width font, such as Courier. The fourth kind can be used with -proportionally spaced fonts, as it does not require lining up columns. - -#### Extension: `table_captions` #### - -A caption may optionally be provided with all 4 kinds of tables (as -illustrated in the examples below). A caption is a paragraph beginning -with the string `Table:` (or just `:`), which will be stripped off. -It may appear either before or after the table. - -#### Extension: `simple_tables` #### - -Simple tables look like this: - - Right Left Center Default - ------- ------ ---------- ------- - 12 12 12 12 - 123 123 123 123 - 1 1 1 1 - - Table: Demonstration of simple table syntax. - -The headers and table rows must each fit on one line. Column -alignments are determined by the position of the header text relative -to the dashed line below it:[^4] - - - If the dashed line is flush with the header text on the right side - but extends beyond it on the left, the column is right-aligned. - - If the dashed line is flush with the header text on the left side - but extends beyond it on the right, the column is left-aligned. - - If the dashed line extends beyond the header text on both sides, - the column is centered. - - If the dashed line is flush with the header text on both sides, - the default alignment is used (in most cases, this will be left). - -[^4]: This scheme is due to Michel Fortin, who proposed it on the - [Markdown discussion list](http://six.pairlist.net/pipermail/markdown-discuss/2005-March/001097.html). - -The table must end with a blank line, or a line of dashes followed by -a blank line. - -The column headers may be omitted, provided a dashed line is used -to end the table. For example: - - ------- ------ ---------- ------- - 12 12 12 12 - 123 123 123 123 - 1 1 1 1 - ------- ------ ---------- ------- - -When headers are omitted, column alignments are determined on the basis -of the first line of the table body. So, in the tables above, the columns -would be right, left, center, and right aligned, respectively. - -#### Extension: `multiline_tables` #### - -Multiline tables allow headers and table rows to span multiple lines -of text (but cells that span multiple columns or rows of the table are -not supported). Here is an example: - - ------------------------------------------------------------- - Centered Default Right Left - Header Aligned Aligned 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: Here's the caption. It, too, may span - multiple lines. - -These work like simple tables, but with the following differences: - - - They must begin with a row of dashes, before the header text - (unless the headers are omitted). - - They must end with a row of dashes, then a blank line. - - The rows must be separated by blank lines. - -In multiline tables, the table parser pays attention to the widths of -the columns, and the writers try to reproduce these relative widths in -the output. So, if you find that one of the columns is too narrow in the -output, try widening it in the Markdown source. - -Headers may be omitted in multiline tables as well as simple tables: - - ----------- ------- --------------- ------------------------- - 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 a multiline table without headers. - -It is possible for a multiline table to have just one row, but the row -should be followed by a blank line (and then the row of dashes that ends -the table), or the table may be interpreted as a simple table. - -#### Extension: `grid_tables` #### - -Grid tables look like this: - - : Sample grid table. - - +---------------+---------------+--------------------+ - | Fruit | Price | Advantages | - +===============+===============+====================+ - | Bananas | $1.34 | - built-in wrapper | - | | | - bright color | - +---------------+---------------+--------------------+ - | Oranges | $2.10 | - cures scurvy | - | | | - tasty | - +---------------+---------------+--------------------+ - -The row of `=`s separates the header from the table body, and can be -omitted for a headerless table. The cells of grid tables may contain -arbitrary block elements (multiple paragraphs, code blocks, lists, -etc.). Cells that span multiple columns or rows are not -supported. Grid tables can be created easily using [Emacs table mode]. - -[Emacs table mode]: http://table.sourceforge.net/ - -Alignments can be specified as with pipe tables, by putting -colons at the boundaries of the separator line after the -header: - - +---------------+---------------+--------------------+ - | Right | Left | Centered | - +==============:+:==============+:==================:+ - | Bananas | $1.34 | built-in wrapper | - +---------------+---------------+--------------------+ - -For headerless tables, the colons go on the top line instead: - - +--------------:+:--------------+:------------------:+ - | Right | Left | Centered | - +---------------+---------------+--------------------+ - -##### Grid Table Limitations ##### - -Pandoc does not support grid tables with row spans or column spans. -This means that neither variable numbers of columns across rows nor -variable numbers of rows across columns are supported by Pandoc. -All grid tables must have the same number of columns in each row, -and the same number of rows in each column. For example, the -Docutils [sample grid tables] will not render as expected with -Pandoc. - -[sample grid tables]: http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#grid-tables - - -#### Extension: `pipe_tables` #### - -Pipe tables look like this: - - | Right | Left | Default | Center | - |------:|:-----|---------|:------:| - | 12 | 12 | 12 | 12 | - | 123 | 123 | 123 | 123 | - | 1 | 1 | 1 | 1 | - - : Demonstration of pipe table syntax. - -The syntax is identical to [PHP Markdown Extra tables]. The beginning and -ending pipe characters are optional, but pipes are required between all -columns. The colons indicate column alignment as shown. The header -cannot be omitted. To simulate a headerless table, include a header -with blank cells. - -Since the pipes indicate column boundaries, columns need not be vertically -aligned, as they are in the above example. So, this is a perfectly -legal (though ugly) pipe table: - - fruit| price - -----|-----: - apple|2.05 - pear|1.37 - orange|3.09 - -The cells of pipe tables cannot contain block elements like paragraphs -and lists, and cannot span multiple lines. If a pipe table contains a -row whose printable content is wider than the column width (see -`--columns`), then the cell contents will wrap, with the -relative cell widths determined by the widths of the separator -lines. (In this case, the table will take up the full text -width.) If no lines are wider than column width, then -cell contents will not be wrapped, and the cells will be sized -to their contents. - -Note: pandoc also recognizes pipe tables of the following -form, as can be produced by Emacs' orgtbl-mode: - - | One | Two | - |-----+-------| - | my | table | - | is | nice | - -The difference is that `+` is used instead of `|`. Other orgtbl features -are not supported. In particular, to get non-default column alignment, -you'll need to add colons as above. - -[PHP Markdown Extra tables]: https://michelf.ca/projects/php-markdown/extra/#table - -Metadata blocks ---------------- - -#### Extension: `pandoc_title_block` #### - -If the file begins with a title block - - % title - % author(s) (separated by semicolons) - % date - -it will be parsed as bibliographic information, not regular text. (It -will be used, for example, in the title of standalone LaTeX or HTML -output.) The block may contain just a title, a title and an author, -or all three elements. If you want to include an author but no -title, or a title and a date but no author, you need a blank line: - - % - % Author - - % My title - % - % June 15, 2006 - -The title may occupy multiple lines, but continuation lines must -begin with leading space, thus: - - % My title - on multiple lines - -If a document has multiple authors, the authors may be put on -separate lines with leading space, or separated by semicolons, or -both. So, all of the following are equivalent: - - % Author One - Author Two - - % Author One; Author Two - - % Author One; - Author Two - -The date must fit on one line. - -All three metadata fields may contain standard inline formatting -(italics, links, footnotes, etc.). - -Title blocks will always be parsed, but they will affect the output only -when the `--standalone` (`-s`) option is chosen. In HTML output, titles -will appear twice: once in the document head -- this is the title that -will appear at the top of the window in a browser -- and once at the -beginning of the document body. The title in the document head can have -an optional prefix attached (`--title-prefix` or `-T` option). The title -in the body appears as an H1 element with class "title", so it can be -suppressed or reformatted with CSS. If a title prefix is specified with -`-T` and no title block appears in the document, the title prefix will -be used by itself as the HTML title. - -The man page writer extracts a title, man page section number, and -other header and footer information from the title line. The title -is assumed to be the first word on the title line, which may optionally -end with a (single-digit) section number in parentheses. (There should -be no space between the title and the parentheses.) Anything after -this is assumed to be additional footer and header text. A single pipe -character (`|`) should be used to separate the footer text from the header -text. Thus, - - % PANDOC(1) - -will yield a man page with the title `PANDOC` and section 1. - - % PANDOC(1) Pandoc User Manuals - -will also have "Pandoc User Manuals" in the footer. - - % PANDOC(1) Pandoc User Manuals | Version 4.0 - -will also have "Version 4.0" in the header. - -#### Extension: `yaml_metadata_block` #### - -A YAML metadata block is a valid YAML object, delimited by a line of three -hyphens (`---`) at the top and a line of three hyphens (`---`) or three dots -(`...`) at the bottom. A YAML metadata block may occur anywhere in the -document, but if it is not at the beginning, it must be preceded by a blank -line. (Note that, because of the way pandoc concatenates input files when -several are provided, you may also keep the metadata in a separate YAML file -and pass it to pandoc as an argument, along with your Markdown files: - - pandoc chap1.md chap2.md chap3.md metadata.yaml -s -o book.html - -Just be sure that the YAML file begins with `---` and ends with `---` or -`...`.) - -Metadata will be taken from the fields of the YAML object and added to any -existing document metadata. Metadata can contain lists and objects (nested -arbitrarily), but all string scalars will be interpreted as Markdown. Fields -with names ending in an underscore will be ignored by pandoc. (They may be -given a role by external processors.) - -A document may contain multiple metadata blocks. The metadata fields will -be combined through a *left-biased union*: if two metadata blocks attempt -to set the same field, the value from the first block will be taken. - -When pandoc is used with `-t markdown` to create a Markdown document, -a YAML metadata block will be produced only if the `-s/--standalone` -option is used. All of the metadata will appear in a single block -at the beginning of the document. - -Note that YAML escaping rules must be followed. Thus, for example, -if a title contains a colon, it must be quoted. The pipe character -(`|`) can be used to begin an indented block that will be interpreted -literally, without need for escaping. This form is necessary -when the field contains blank lines or block-level formatting: - - --- - title: 'This is the title: it contains a colon' - author: - - Author One - - Author Two - tags: [nothing, nothingness] - abstract: | - This is the abstract. - - It consists of two paragraphs. - ... - -Template variables will be set automatically from the metadata. Thus, for -example, in writing HTML, the variable `abstract` will be set to the HTML -equivalent of the Markdown in the `abstract` field: - -

This is the abstract.

-

It consists of two paragraphs.

- -Variables can contain arbitrary YAML structures, but the template must match -this structure. The `author` variable in the default templates expects a -simple list or string, but can be changed to support more complicated -structures. The following combination, for example, would add an affiliation -to the author if one is given: - - --- - title: The document title - author: - - name: Author One - affiliation: University of Somewhere - - name: Author Two - affiliation: University of Nowhere - ... - -To use the structured authors in the example above, you would need a custom -template: - - $for(author)$ - $if(author.name)$ - $author.name$$if(author.affiliation)$ ($author.affiliation$)$endif$ - $else$ - $author$ - $endif$ - $endfor$ - - -Backslash escapes ------------------ - -#### Extension: `all_symbols_escapable` #### - -Except inside a code block or inline code, any punctuation or space -character preceded by a backslash will be treated literally, even if it -would normally indicate formatting. Thus, for example, if one writes - - *\*hello\** - -one will get - - *hello* - -instead of - - hello - -This rule is easier to remember than standard Markdown's rule, -which allows only the following characters to be backslash-escaped: - - \`*_{}[]()>#+-.! - -(However, if the `markdown_strict` format is used, the standard Markdown rule -will be used.) - -A backslash-escaped space is parsed as a nonbreaking space. It will -appear in TeX output as `~` and in HTML and XML as `\ ` or -`\ `. - -A backslash-escaped newline (i.e. a backslash occurring at the end of -a line) is parsed as a hard line break. It will appear in TeX output as -`\\` and in HTML as `
`. This is a nice alternative to -Markdown's "invisible" way of indicating hard line breaks using -two trailing spaces on a line. - -Backslash escapes do not work in verbatim contexts. - -Inline formatting ------------------ - -### Emphasis ### - -To *emphasize* some text, surround it with `*`s or `_`, like this: - - This text is _emphasized with underscores_, and this - is *emphasized with asterisks*. - -Double `*` or `_` produces **strong emphasis**: - - This is **strong emphasis** and __with underscores__. - -A `*` or `_` character surrounded by spaces, or backslash-escaped, -will not trigger emphasis: - - This is * not emphasized *, and \*neither is this\*. - -#### Extension: `intraword_underscores` #### - -Because `_` is sometimes used inside words and identifiers, -pandoc does not interpret a `_` surrounded by alphanumeric -characters as an emphasis marker. If you want to emphasize -just part of a word, use `*`: - - feas*ible*, not feas*able*. - - -### Strikeout ### - -#### Extension: `strikeout` #### - -To strikeout a section of text with a horizontal line, begin and end it -with `~~`. Thus, for example, - - This ~~is deleted text.~~ - - -### Superscripts and subscripts ### - -#### Extension: `superscript`, `subscript` #### - -Superscripts may be written by surrounding the superscripted text by `^` -characters; subscripts may be written by surrounding the subscripted -text by `~` characters. Thus, for example, - - H~2~O is a liquid. 2^10^ is 1024. - -If the superscripted or subscripted text contains spaces, these spaces -must be escaped with backslashes. (This is to prevent accidental -superscripting and subscripting through the ordinary use of `~` and `^`.) -Thus, if you want the letter P with 'a cat' in subscripts, use -`P~a\ cat~`, not `P~a cat~`. - - -### Verbatim ### - -To make a short span of text verbatim, put it inside backticks: - - What is the difference between `>>=` and `>>`? - -If the verbatim text includes a backtick, use double backticks: - - Here is a literal backtick `` ` ``. - -(The spaces after the opening backticks and before the closing -backticks will be ignored.) - -The general rule is that a verbatim span starts with a string -of consecutive backticks (optionally followed by a space) -and ends with a string of the same number of backticks (optionally -preceded by a space). - -Note that backslash-escapes (and other Markdown constructs) do not -work in verbatim contexts: - - This is a backslash followed by an asterisk: `\*`. - -#### Extension: `inline_code_attributes` #### - -Attributes can be attached to verbatim text, just as with -[fenced code blocks]: - - `<$>`{.haskell} - -### Small caps ### - -To write small caps, use the `smallcaps` class: - - [Small caps]{.smallcaps} - -Or, without the `bracketed_spans` extension: - - Small caps - -For compatibility with other Markdown flavors, CSS is also supported: - - Small caps - -This will work in all output formats that support small caps. - - -Math ----- - -#### Extension: `tex_math_dollars` #### - -Anything between two `$` characters will be treated as TeX math. The -opening `$` must have a non-space character immediately to its right, -while the closing `$` must have a non-space character immediately to its -left, and must not be followed immediately by a digit. Thus, -`$20,000 and $30,000` won't parse as math. If for some reason -you need to enclose text in literal `$` characters, backslash-escape -them and they won't be treated as math delimiters. - -TeX math will be printed in all output formats. How it is rendered -depends on the output format: - -Markdown, LaTeX, Emacs Org mode, ConTeXt, ZimWiki - ~ It will appear verbatim between `$` characters. - -reStructuredText - ~ It will be rendered using an [interpreted text role `:math:`]. - -AsciiDoc - ~ It will be rendered as `latexmath:[...]`. - -Texinfo - ~ It will be rendered inside a `@math` command. - -groff man - ~ It will be rendered verbatim without `$`'s. - -MediaWiki, DokuWiki - ~ It will be rendered inside `` tags. - -Textile - ~ It will be rendered inside `` tags. - -RTF, OpenDocument - ~ It will be rendered, if possible, using Unicode characters, - and will otherwise appear verbatim. - -ODT - ~ It will be rendered, if possible, using MathML. - -DocBook - ~ If the `--mathml` flag is used, it will be rendered using MathML - in an `inlineequation` or `informalequation` tag. Otherwise it - will be rendered, if possible, using Unicode characters. - -Docx - ~ It will be rendered using OMML math markup. - -FictionBook2 - ~ If the `--webtex` option is used, formulas are rendered as images - using CodeCogs or other compatible web service, downloaded - and embedded in the e-book. Otherwise, they will appear verbatim. - -HTML, Slidy, DZSlides, S5, EPUB - ~ The way math is rendered in HTML will depend on the - command-line options selected. Therefore see [Math rendering in HTML] - above. - -[interpreted text role `:math:`]: http://docutils.sourceforge.net/docs/ref/rst/roles.html#math - -Raw HTML --------- - -#### Extension: `raw_html` #### - -Markdown allows you to insert raw HTML (or DocBook) anywhere in a document -(except verbatim contexts, where `<`, `>`, and `&` are interpreted -literally). (Technically this is not an extension, since standard -Markdown allows it, but it has been made an extension so that it can -be disabled if desired.) - -The raw HTML is passed through unchanged in HTML, S5, Slidy, Slideous, -DZSlides, EPUB, Markdown, Emacs Org mode, and Textile output, and suppressed -in other formats. - -#### Extension: `markdown_in_html_blocks` #### - -Standard Markdown allows you to include HTML "blocks": blocks -of HTML between balanced tags that are separated from the surrounding text -with blank lines, and start and end at the left margin. Within -these blocks, everything is interpreted as HTML, not Markdown; -so (for example), `*` does not signify emphasis. - -Pandoc behaves this way when the `markdown_strict` format is used; but -by default, pandoc interprets material between HTML block tags as Markdown. -Thus, for example, pandoc will turn - - - - - - -
*one*[a link](http://google.com)
- -into - - - - - - -
onea link
- -whereas `Markdown.pl` will preserve it as is. - -There is one exception to this rule: text between ` +HTML +""") +``` + +## Image + +This image ![image](myimage.png) will be +included as a cell attachment. +```` + +If you want to add cell attributes, group cells differently, or +add output to code cells, then you need to include divs to +indicate the structure. You can use either [fenced +divs][Extension: `fenced_divs`] or [native divs][Extension: +`native_divs`] for this. Here is an example: + +```` +:::::: {.cell .markdown} +# Lorem + +**Lorem ipsum** dolor sit amet, consectetur adipiscing elit. Nunc luctus +bibendum felis dictum sodales. +:::::: + +:::::: {.cell .code execution_count=1} +``` {.python} +print("hello") +``` + +::: {.output .stream .stdout} +``` +hello +``` +::: +:::::: + +:::::: {.cell .code execution_count=2} +``` {.python} +from IPython.display import HTML +HTML(""" + +HTML +""") +``` + +::: {.output .execute_result execution_count=2} +```{=html} + +HTML +hello +``` +::: +:::::: +```` + +If you include raw HTML or TeX in an output cell, use the +[raw attribute](#extension-raw_attribute), as shown +in the last cell of the example above. Although pandoc can +process "bare" raw HTML and TeX, the result is often +interspersed raw elements and normal textual elements, and +in an output cell pandoc expects a single, connected raw +block. To avoid using raw HTML or TeX except when +marked explicitly using raw attributes, we recommend +specifying the extensions `-raw_html-raw_tex+raw_attribute` when +translating between Markdown and ipynb notebooks. + +Note that options and extensions that affect reading and +writing of Markdown will also affect Markdown cells in ipynb +notebooks. For example, `--wrap=preserve` will preserve +soft line breaks in Markdown cells; `--markdown-headings=setext` will +cause Setext-style headings to be used; and `--preserve-tabs` will +prevent tabs from being turned to spaces. + +# Vimdoc + +Vimdoc writer generates Vim help files and makes use of the following metadata +variables: + +``` yaml +abstract: "A short description" +author: Author +title: Title + +# Vimdoc-specific +filename: "definition-lists.txt" +vimdoc-prefix: pandoc +``` + +Complete header requires `abstract`, `author`, `title` and `filename` to +be set. Compiling file with such metadata produces the following file +(assumes `--standalone`, see [Templates]): + +``` vimdoc +*definition-lists.txt* A short description + + Title by Author + + + Type |gO| to see the table of contents. + +[...] + + vim:tw=72:sw=4:ts=4:ft=help:norl:et: +``` + +If `vimdoc-prefix` is set, all non-command tags are prefixed with its +value, it is used to prevent tag collision: all headers have a tag +(either inferred or explicit) and multiple help pages can have the same +header names, therefore collision is to be expected. Let our input be +the following markdown file: + +``` markdown +## Header + +`:[range]Fnl {expr}`{#:Fnl} +: Evaluates {expr} or range + +`vim.b`{#vim.b} +: Buffer-scoped (`:h b:`) variables for the current buffer. Invalid or unset + key returns `nil`. Can be indexed with an integer to access variables for a + specific buffer. + +[Span]{#span} +: generic inline container for phrasing content, which does not inherently + represent anything. +``` + +Convert it to vimdoc: + +``` vimdoc +------------------------------------------------------------------------ +Header *header* + +:[range]Fnl {expr} *:Fnl* + Evaluates {expr} or range +`vim.b` *vim.b* + Buffer-scoped (|b:|) variables for the current buffer. Invalid or + unset key returns `nil`. Can be indexed with an integer to access + variables for a specific buffer. +Span *span* + generic inline container for phrasing content, which does not + inherently represent anything. +``` + +Convert it to vimdoc with metadata variable set (e.g. with +`-M vimdoc-prefix=pandoc`) + +``` vimdoc +------------------------------------------------------------------------ +Header *pandoc-header* + +:[range]Fnl {expr} *:Fnl* + Evaluates {expr} or range +`vim.b` *pandoc-vim.b* + Buffer-scoped (|b:|) variables for the current buffer. Invalid or + unset key returns `nil`. Can be indexed with an integer to access + variables for a specific buffer. +Span *pandoc-span* + generic inline container for phrasing content, which does not + inherently represent anything. +``` + +`vim.b` and `Span` got their prefixes but not `:Fnl` because ex-commands +(those starting with `:`) don't get a prefix, since they are considered +unique across help pages. + +In both cases `:help b:` became reference `|b:|` (also works with +`:h b:`). Links pointing to either or + become references too. + +Vim traditionally wraps at 78, but Pandoc defaults to 72. Use +`--columns 78` to match Vim. + +# Syntax highlighting + +Pandoc will automatically highlight syntax in [fenced code blocks] that +are marked with a language name. The Haskell library [skylighting] is +used for highlighting. Currently highlighting is supported only for +HTML, EPUB, Docx, Ms, Man, Typst, and LaTeX/PDF output. To see a list +of language names that pandoc will recognize, type `pandoc +--list-highlight-languages`. + +The color scheme can be selected using the `--syntax-highlighting` +option. The default color scheme is `pygments`, which imitates the +default color scheme used by the Python library pygments (though +pygments is not actually used to do the highlighting). To see a +list of highlight styles, type `pandoc --list-highlight-styles`. + +If you are not satisfied with the predefined styles, you can use +`--print-highlight-style` to generate a JSON `.theme` file which +can be modified and used as the argument to +`--syntax-highlighting`. To get a JSON version of the `pygments` +style, for example: + + pandoc -o my.theme --print-highlight-style pygments + +Then edit `my.theme` and use it like this: + + pandoc --syntax-highlighting my.theme + +If you are not satisfied with the built-in highlighting, or you +want to highlight a language that isn't supported, you can use the +`--syntax-definition` option to load a [KDE-style XML syntax definition +file](https://docs.kde.org/stable5/en/kate/katepart/highlight.html). +Before writing your own, have a look at KDE's [repository of syntax +definitions](https://github.com/KDE/syntax-highlighting/tree/master/data/syntax). + +If you receive an error that pandoc "Could not read highlighting theme", +check that the JSON file is encoded with UTF-8 and has no Byte-Order Mark (BOM). + +To disable highlighting, use `--syntax-highlighting=none`. + +To use a format's idiomatic syntax highlighting instead of +pandoc's built-in highlighting, use `--syntax-highlighting=idiomatic`. +Currently, `idiomatic` only affects the following formats: + +- In reveal.js, it causes reveal.js's highlighting plugin to be + used for source code highlighting. The style may be customized + by setting the `highlightjs-theme` variable. + +- In Typst, it causes Typst's built-in highlighting to be used. + (This is also the default for Typst.) + +- In LaTeX, it causes the [`listings`][] package to be used. Note that + `listings` does not support multi-byte encoding for source code. To handle + UTF-8 you would need to use a custom template. This issue is fully + documented here: [Encoding issue with the listings package][]. + +- In other formats, `idiomatic` will have the same result as `default`. + +[skylighting]: https://github.com/jgm/skylighting + +# Custom Styles + +Custom styles can be used in the docx, odt and ICML formats. + +## Output + +By default, pandoc's odt, docx and ICML output applies a predefined set of +styles for blocks such as paragraphs and block quotes, and uses largely +default formatting (italics, bold) for inlines. This will work for most +purposes, especially alongside a [reference doc](#option--reference-doc) file. +However, if you need to apply your own styles to blocks, or match a preexisting +set of styles, pandoc allows you to define custom styles for blocks and text +using `div`s and `span`s, respectively. + +If you define a Div, Span, or Table with the attribute +`custom-style`, pandoc will apply your specified style to the +contained elements (with the exception of elements whose function +depends on a style, like headings, code blocks, block quotes, or +links). So, for example, using the `bracketed_spans` syntax, + + [Get out]{custom-style="Emphatically"}, he said. + +would produce a file with "Get out" styled with character +style `Emphatically`. Similarly, using the `fenced_divs` syntax, + + Dickinson starts the poem simply: + + ::: {custom-style="Poetry"} + | A Bird came down the Walk--- + | He did not know I saw--- + ::: + +would style the two contained lines with the `Poetry` paragraph style. + +Styles will be defined in the output file as inheriting +from normal text (docx) or Default Paragraph Style (odt), if the +styles are not yet in your [reference doc](#option--reference-doc). +If they are already defined, pandoc will not alter the definition. + +This feature allows for greatest customization in conjunction with +[pandoc filters]. If you want all paragraphs after block quotes to be +indented, you can write a filter to apply the styles necessary. If you +want all italics to be transformed to the `Emphasis` character style +(perhaps to change their color), you can write a filter which will +transform all italicized inlines to inlines within an `Emphasis` +custom-style `span`. + +For docx or odt output, you don't need to enable any extensions for +custom styles to work. + +For icml output, you can also set an `object-style` in images: + + ![Image with object style](myImage.jpg){object-style="fixedSizeImage"} + +In InDesign you'll see that object style given to the image, +and you'll be able to customize it, or load its definition from +a template of yours. + +[pandoc filters]: https://pandoc.org/filters.html + +## Input + +The docx reader, by default, only reads those styles that it can +convert into pandoc elements, either by direct conversion or +interpreting the derivation of the input document's styles. + +By enabling the [`styles` extension](#ext-styles) in the docx reader +(`-f docx+styles`), you can produce output that maintains the styles +of the input document, using the `custom-style` class. A `custom-style` +attribute will be added for each style. Divs will be created to +hold the paragraph styles, and Spans to hold the character styles. +Table styles will be applied directly to the Table. + +For example, using the `custom-style-reference.docx` file in the test +directory, we have the following different outputs: + +Without the `+styles` extension: + + $ pandoc test/docx/custom-style-reference.docx -f docx -t markdown + This is some text. + + This is text with an *emphasized* text style. And this is text with a + **strengthened** text style. + + > Here is a styled paragraph that inherits from Block Text. + +And with the extension: + + $ pandoc test/docx/custom-style-reference.docx -f docx+styles -t markdown + + ::: {custom-style="First Paragraph"} + This is some text. + ::: + + ::: {custom-style="Body Text"} + This is text with an [emphasized]{custom-style="Emphatic"} text style. + And this is text with a [strengthened]{custom-style="Strengthened"} + text style. + ::: + + ::: {custom-style="My Block Style"} + > Here is a styled paragraph that inherits from Block Text. + ::: + +With these custom styles, you can use your input document as a +reference-doc while creating docx output (see below), and maintain the +same styles in your input and output files. + +# Custom readers and writers + +Pandoc can be extended with custom readers and writers written +in [Lua]. (Pandoc includes a Lua interpreter, so Lua need not +be installed separately.) + +To use a custom reader or writer, simply specify the path to the +Lua script in place of the input or output format. For example: + + pandoc -t data/sample.lua + pandoc -f my_custom_markup_language.lua -t latex -s + +If the script is not found relative to the working directory, +it will be sought in the `custom` subdirectory of the user data +directory (see `--data-dir`). + +A custom reader is a Lua script that defines one function, +Reader, which takes a string as input and returns a Pandoc +AST. See the [Lua filters documentation] for documentation +of the functions that are available for creating pandoc +AST elements. For parsing, the [lpeg] parsing library +is available by default. To see a sample custom reader: + + pandoc --print-default-data-file creole.lua + +If you want your custom reader to have access to reader options +(e.g. the tab stop setting), you give your Reader function a +second `options` parameter. + +A custom writer is a Lua script that defines a function +that specifies how to render each element in a Pandoc AST. +See the [djot-writer.lua] for a full-featured example. + +Note that custom writers have no default template. If you want +to use `--standalone` with a custom writer, you will need to +specify a template manually using `--template` or add a new +default template with the name +`default.NAME_OF_CUSTOM_WRITER.lua` to the `templates` +subdirectory of your user data directory (see [Templates]). + +[Lua]: https://www.lua.org +[lpeg]: http://www.inf.puc-rio.br/~roberto/lpeg/ +[djot-writer.lua]: https://github.com/jgm/djot.lua/blob/main/djot-writer.lua + +# Reproducible builds + +Some of the document formats pandoc targets (such as EPUB, +docx, and ODT) include build timestamps in the generated document. +That means that the files generated on successive builds will +differ, even if the source does not. To avoid this, set the +`SOURCE_DATE_EPOCH` environment variable, and the timestamp will +be taken from it instead of the current time. +`SOURCE_DATE_EPOCH` should contain an integer unix timestamp +(specifying the number of seconds since midnight UTC January 1, 1970). + +For reproducible builds with LaTeX, you can either specify the +`pdf-trailer-id` in the metadata or leave it undefined, in which +case pandoc will create a trailer-id based on a hash of the +`SOURCE_DATE_EPOCH` and the document's contents. + +Some document formats also include a unique identifier. For +EPUB, this can be set explicitly by setting the `identifier` +metadata field (see [EPUB Metadata], above). + +# Accessible PDFs and PDF archiving standards + +PDF is a flexible format, and using PDF in certain contexts +requires additional conventions. For example, PDFs are not +accessible by default; they define how characters are placed on a +page but do not contain semantic information on the content. +However, it is possible to generate accessible PDFs, which use +tagging to add semantic information to the document. + +Pandoc defaults to LaTeX to generate PDF. LaTeX's `\DocumentMetadata` +interface supports PDF standards and tagging when using LuaLaTeX; +set the `pdfstandard` variable to enable this (see below). For older +LaTeX installations, alternative engines must be used. + +The PDF standards PDF/A and PDF/UA define further restrictions +intended to optimize PDFs for archiving and accessibility. Tagging +is commonly used in combination with these standards to ensure +best results. + +Note, however, that standard compliance depends on many things, +including the colorspace of embedded images. Pandoc cannot check +this, and external programs must be used to ensure that generated +PDFs are in compliance. + +## LaTeX + +Set the `pdfstandard` variable to produce tagged PDFs conforming +to PDF/A, PDF/X, or PDF/UA standards. For example: + + pandoc -V pdfstandard=ua-2 --pdf-engine=lualatex doc.md -o doc.pdf + +Multiple standards can be combined: + + --- + pdfstandard: + - ua-2 + - a-4f + --- + +The required PDF version is inferred automatically. This feature +requires LuaLaTeX in TeX Live 2025 with LaTeX kernel 2025-06-01 +or newer. + +## ConTeXt + +ConTeXt always produces tagged PDFs, but the quality depends on +the input. The default ConTeXt markup generated by pandoc is +optimized for readability and reuse, not tagging. Enable the +[`tagging`](#extension--tagging) format extension to force markup +that is optimized for tagging. For example: + + pandoc -t context+tagging doc.md -o doc.pdf + +A recent `context` version should be used, as older versions +contained a bug that lead to invalid PDF metadata. + +## WeasyPrint + +The HTML-based engine WeasyPrint includes experimental support for +PDF/A and PDF/UA since version 57. Tagged PDFs can created with + + pandoc --pdf-engine=weasyprint \ + --pdf-engine-opt=--pdf-variant=pdf/ua-1 ... + +The feature is experimental and standard compliance should not be +assumed. + +## Prince XML + +The non-free HTML-to-PDF converter `prince` has extensive support +for various PDF standards as well as tagging. E.g.: + + pandoc --pdf-engine=prince \ + --pdf-engine-opt=--tagged-pdf ... + +See the prince documentation for more info. + +## Typst + +Typst 0.12 can produce PDF/A-2b: + + pandoc --pdf-engine=typst --pdf-engine-opt=--pdf-standard=a-2b ... + +## Word Processors + +Word processors like LibreOffice and MS Word can also be used to +generate standardized and tagged PDF output. Pandoc does not +support direct conversions via these tools. However, pandoc can +convert a document to a `docx` or `odt` file, which can then be +opened and converted to PDF with the respective word processor. +See the documentation for [Word][word-accessible-pdfs] and +[LibreOffice][lo-pdf-export]. + +[word-accessible-pdfs]: https://support.microsoft.com/en-us/office/create-accessible-pdfs-064625e0-56ea-4e16-ad71-3aa33bb4b7ed +[lo-pdf-export]: https://help.libreoffice.org/latest/en-US/text/shared/01/ref_pdf_export_general.html + + +# Running pandoc as a web server + +If you rename (or symlink) the pandoc executable to +`pandoc-server`, or if you call pandoc with `server` as the first +argument, it will start up a web server with a JSON API. This +server exposes most of the conversion functionality of pandoc. For +full documentation, see the [pandoc-server] man page. + +If you rename (or symlink) the pandoc executable to +`pandoc-server.cgi`, it will function as a CGI program +exposing the same API as `pandoc-server`. + +`pandoc-server` is designed to be maximally secure; it uses +Haskell's type system to provide strong guarantees that no I/O +will be performed on the server during pandoc conversions. + +[pandoc-server]: https://github.com/jgm/pandoc/blob/master/doc/pandoc-server.md + +# Running pandoc as a Lua interpreter + +Calling the pandoc executable under the name `pandoc-lua` or with +`lua` as the first argument will make it function as a standalone +Lua interpreter. The behavior is mostly identical to that of the +[standalone `lua` executable][lua standalone], version 5.4. +All `pandoc.*` packages, as well as the packages `re` and `lpeg`, +are available via global variables. Furthermore, the globals +`PANDOC_VERSION`, `PANDOC_STATE`, and `PANDOC_API_VERSION` are +set at startup. For full documentation, see the [pandoc-lua] man page. + +[lua standalone]: https://www.lua.org/manual/5.4/manual.html#7 +[pandoc-lua]: https://github.com/jgm/pandoc/blob/master/doc/pandoc-lua.md + +# A note on security + +1. Although pandoc itself will not create or modify any files other + than those you explicitly ask it create (with the exception + of temporary files used in producing PDFs), a filter or custom + writer could in principle do anything on your file system. Please + audit filters and custom writers very carefully before using them. + +2. Several input formats (including LaTeX, Org, RST, and Typst) + support `include` directives that allow the contents of a file to be + included in the output. An untrusted attacker could use these + to view the contents of files on the file system. (Using the + `--sandbox` option can protect against this threat.) + +3. Several output formats (including RTF, FB2, HTML with + `--self-contained`, EPUB, Docx, and ODT) will embed encoded + or raw images into the output file. An untrusted attacker + could exploit this to view the contents of non-image files on the + file system. (Using the `--sandbox` option can protect + against this threat, but will also prevent including images in + these formats.) + +4. In reading HTML files, pandoc will attempt to include the + contents of `iframe` elements by fetching content from the + local file or URL specified by `src`. If untrusted HTML is + processed on a server, this has the potential to reveal anything + readable by the process running the server. Using the `-f html+raw_html` + will mitigate this threat by causing the whole `iframe` + to be parsed as a raw HTML block. Using `--sandbox` will also + protect against the threat. + +5. If your application uses pandoc as a Haskell library (rather than + shelling out to the executable), it is possible to use it in a mode + that fully isolates pandoc from your file system, by running the + pandoc operations in the `PandocPure` monad. See the document + [Using the pandoc API](https://pandoc.org/using-the-pandoc-api.html) + for more details. (This corresponds to the use of the `--sandbox` + option on the command line.) + +6. Pandoc's parsers can exhibit pathological performance on some + corner cases. It is wise to put any pandoc operations under + a timeout, to avoid DOS attacks that exploit these issues. + If you are using the pandoc executable, you can add the + command line options `+RTS -M512M -RTS` (for example) to limit + the heap size to 512MB. Note that the `commonmark` parser + (including `commonmark_x` and `gfm`) is much less vulnerable + to pathological performance than the `markdown` parser, so + it is a better choice when processing untrusted input. + +7. The HTML generated by pandoc is not guaranteed to be safe. + If `raw_html` is enabled for the Markdown input, users can + inject arbitrary HTML. Even if `raw_html` is disabled, + users can include dangerous content in URLs and attributes. + To be safe, you should run all HTML generated from untrusted + user input through an HTML sanitizer. + +# Authors + +Copyright 2006--2024 John MacFarlane (jgm@berkeley.edu). Released +under the [GPL], version 2 or greater. This software carries no +warranty of any kind. (See COPYRIGHT for full copyright and +warranty notices.) For a full list of contributors, see the file +AUTHORS.md in the pandoc source code. + +[GPL]: https://www.gnu.org/copyleft/gpl.html "GNU General Public License" +[YAML]: https://yaml.org/spec/1.2/spec.html "YAML v1.2 Spec" diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,155 +1,300 @@ -Pandoc -====== + -[![github release](https://img.shields.io/github/release/jgm/pandoc.svg?label=current+release)](https://github.com/jgm/pandoc/releases) -[![hackage release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](http://hackage.haskell.org/package/pandoc) -[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](http://brewformulas.org/Pandoc) -[![stackage LTS package](http://stackage.org/package/pandoc/badge/lts)](http://stackage.org/lts/package/pandoc) -[![travis build status](https://img.shields.io/travis/jgm/pandoc/master.svg?label=travis+build)](https://travis-ci.org/jgm/pandoc) -[![appveyor build status](https://ci.appveyor.com/api/projects/status/nvqs4ct090igjiqc?svg=true)](https://ci.appveyor.com/project/jgm/pandoc) +# Pandoc + +[![github +release](https://img.shields.io/github/release/jgm/pandoc.svg?label=current+release)](https://github.com/jgm/pandoc/releases) +[![hackage +release](https://img.shields.io/hackage/v/pandoc.svg?label=hackage)](https://hackage.haskell.org/package/pandoc) +[![homebrew](https://img.shields.io/homebrew/v/pandoc.svg)](https://formulae.brew.sh/formula/pandoc) +[![stackage LTS +package](https://stackage.org/package/pandoc/badge/lts)](https://www.stackage.org/lts/package/pandoc) +[![CI +tests](https://github.com/jgm/pandoc/workflows/CI%20tests/badge.svg)](https://github.com/jgm/pandoc/actions) [![license](https://img.shields.io/badge/license-GPLv2+-lightgray.svg)](https://www.gnu.org/licenses/gpl.html) -[![pandoc-discuss on google groups](https://img.shields.io/badge/pandoc-discuss-red.svg?style=social)](https://groups.google.com/forum/#!forum/pandoc-discuss) +[![pandoc-discuss on google +groups](https://img.shields.io/badge/pandoc-discuss-red.svg?style=social)](https://groups.google.com/forum/#!forum/pandoc-discuss) +## The universal markup converter -The universal markup converter ------------------------------- +Pandoc is a [Haskell](https://haskell.org) library for converting from +one markup format to another, and a command-line tool that uses this +library. -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], [CommonMark], [PHP Markdown Extra], [GitHub-Flavored -Markdown], [MultiMarkdown], and (subsets of) [Textile], -[reStructuredText], [HTML], [LaTeX], [MediaWiki markup], [TWiki markup], -[TikiWiki markup], [Creole 1.0], [Haddock markup], [OPML], [Emacs Org mode], -[DocBook], [JATS], [Muse], [txt2tags], [Vimwiki], [EPUB], [ODT], and -[Word docx]; and it can write plain text, [Markdown], [CommonMark], [PHP -Markdown Extra], [GitHub-Flavored Markdown], [MultiMarkdown], -[reStructuredText], [XHTML], [HTML5], [LaTeX] \(including -[`beamer`] slide shows\), [ConTeXt], [RTF], [OPML], [DocBook], [JATS], -[OpenDocument], [ODT], [Word docx], [GNU Texinfo], [MediaWiki -markup], [DokuWiki markup], [ZimWiki markup], [Haddock markup], -[EPUB] \(v2 or v3\), [FictionBook2], [Textile], [groff man], -[groff ms], [Emacs Org mode], [AsciiDoc], [InDesign ICML], [TEI -Simple], [Muse], [PowerPoint] slide shows and [Slidy], [Slideous], -[DZSlides], [reveal.js] or [S5] HTML slide shows. It can also produce -[PDF] output on systems where LaTeX, ConTeXt, `pdfroff`, `wkhtmltopdf`, -`prince`, or `weasyprint` is installed. +It can convert *from* -Pandoc's enhanced version of Markdown includes syntax for [footnotes], -[tables], flexible [ordered lists], [definition lists], [fenced code -blocks], [superscripts and subscripts], [strikeout], [metadata blocks], -automatic tables of contents, embedded LaTeX [math], [citations], and -[Markdown inside HTML block elements](#extension-markdown_in_html_blocks). -(These enhancements, described further under -[Pandoc's Markdown], can be disabled using the `markdown_strict` input -or output format.) +
-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. +- `asciidoc` ([AsciiDoc](https://asciidoc.org/) markup) +- `bibtex` ([BibTeX](https://ctan.org/pkg/bibtex) bibliography) +- `biblatex` ([BibLaTeX](https://ctan.org/pkg/biblatex) bibliography) +- `bits` ([BITS](https://jats.nlm.nih.gov/extensions/bits/) XML, alias + for `jats`) +- `commonmark` ([CommonMark](https://commonmark.org) Markdown) +- `commonmark_x` ([CommonMark](https://commonmark.org) Markdown with + extensions) +- `creole` ([Creole 1.0](http://www.wikicreole.org/wiki/Creole1.0)) +- `csljson` ([CSL + JSON](https://citeproc-js.readthedocs.io/en/latest/csl-json/markup.html) + bibliography) +- `csv` ([CSV](https://tools.ietf.org/html/rfc4180) table) +- `tsv` + ([TSV](https://www.iana.org/assignments/media-types/text/tab-separated-values) + table) +- `djot` ([Djot markup](https://djot.net)) +- `docbook` ([DocBook](https://docbook.org)) +- `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML)) +- `dokuwiki` ([DokuWiki markup](https://www.dokuwiki.org/dokuwiki)) +- `endnotexml` ([EndNote XML + bibliography](https://support.clarivate.com/Endnote/s/article/EndNote-XML-Document-Type-Definition)) +- `epub` ([EPUB](http://idpf.org/epub)) +- `fb2` + ([FictionBook2](http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1) + e-book) +- `gfm` ([GitHub-Flavored + Markdown](https://help.github.com/articles/github-flavored-markdown/)), + or the deprecated and less accurate `markdown_github`; use + [`markdown_github`](https://pandoc.org/MANUAL.html#markdown-variants) + only if you need extensions not supported in + [`gfm`](https://pandoc.org/MANUAL.html#markdown-variants). +- `haddock` ([Haddock + markup](https://www.haskell.org/haddock/doc/html/ch03s08.html)) +- `html` ([HTML](https://www.w3.org/html/)) +- `ipynb` ([Jupyter + notebook](https://nbformat.readthedocs.io/en/latest/)) +- `jats` ([JATS](https://jats.nlm.nih.gov) XML) +- `jira` + ([Jira](https://jira.atlassian.com/secure/WikiRendererHelpAction.jspa?section=all)/Confluence + wiki markup) +- `json` (JSON version of native AST) +- `latex` ([LaTeX](https://www.latex-project.org/)) +- `markdown` ([Pandoc’s + Markdown](https://pandoc.org/MANUAL.html#pandocs-markdown)) +- `markdown_mmd` + ([MultiMarkdown](https://fletcherpenney.net/multimarkdown/)) +- `markdown_phpextra` ([PHP Markdown + Extra](https://michelf.ca/projects/php-markdown/extra/)) +- `markdown_strict` (original unextended + [Markdown](https://daringfireball.net/projects/markdown/)) +- `mediawiki` ([MediaWiki + markup](https://www.mediawiki.org/wiki/Help:Formatting)) +- `man` ([roff man](https://man.cx/groff_man(7))) +- `mdoc` ([mdoc](https://mandoc.bsd.lv/man/mdoc.7.html) manual page + markup) +- `muse` ([Muse](https://amusewiki.org/library/manual)) +- `native` (native Haskell) +- `odt` ([OpenDocument text + document](https://en.wikipedia.org/wiki/OpenDocument)) +- `opml` ([OPML](https://opml.org/spec2.opml)) +- `org` ([Emacs Org mode](https://orgmode.org)) +- `pod` (Perl’s [Plain Old + Documentation](https://perldoc.perl.org/perlpod)) +- `pptx` + ([PowerPoint](https://en.wikipedia.org/wiki/Microsoft_PowerPoint)) +- `ris` ([RIS](https://en.wikipedia.org/wiki/RIS_(file_format)) + bibliography) +- `rtf` ([Rich Text + Format](https://en.wikipedia.org/wiki/Rich_Text_Format)) +- `rst` + ([reStructuredText](https://docutils.sourceforge.io/docs/ref/rst/introduction.html)) +- `t2t` ([txt2tags](https://txt2tags.org)) +- `textile` ([Textile](https://textile-lang.com)) +- `tikiwiki` ([TikiWiki + markup](https://doc.tiki.org/Wiki-Syntax-Text#The_Markup_Language_Wiki-Syntax)) +- `twiki` ([TWiki + markup](https://twiki.org/cgi-bin/view/TWiki/TextFormattingRules)) +- `typst` ([typst](https://typst.app)) +- `vimwiki` ([Vimwiki](https://vimwiki.github.io)) +- `xlsx` ([Excel + spreadsheet](https://en.wikipedia.org/wiki/Microsoft_Excel#File_formats)) +- `xml` (XML version of native AST) +- the path of a custom Lua reader, see [Custom readers and + writers](https://pandoc.org/MANUAL.html#custom-readers-and-writers) + below -Because pandoc's intermediate representation of a document is less -expressive than many of the formats it converts between, one should -not expect perfect conversions between every format and every other. -Pandoc attempts to preserve the structural elements of a document, but -not formatting details such as margin size. And some document elements, -such as complex tables, may not fit into pandoc's simple document -model. While conversions from pandoc's Markdown to all formats aspire -to be perfect, conversions from formats more expressive than pandoc's -Markdown can be expected to be lossy. +
-[Markdown]: http://daringfireball.net/projects/markdown/ -[CommonMark]: http://commonmark.org -[PHP Markdown Extra]: https://michelf.ca/projects/php-markdown/extra/ -[GitHub-Flavored Markdown]: https://help.github.com/articles/github-flavored-markdown/ -[MultiMarkdown]: http://fletcherpenney.net/multimarkdown/ -[reStructuredText]: http://docutils.sourceforge.net/docs/ref/rst/introduction.html -[S5]: http://meyerweb.com/eric/tools/s5/ -[Slidy]: http://www.w3.org/Talks/Tools/Slidy/ -[Slideous]: http://goessner.net/articles/slideous/ -[HTML]: http://www.w3.org/html/ -[HTML5]: http://www.w3.org/TR/html5/ -[XHTML]: http://www.w3.org/TR/xhtml1/ -[LaTeX]: http://latex-project.org -[`beamer`]: https://ctan.org/pkg/beamer -[Beamer User's Guide]: http://ctan.math.utah.edu/ctan/tex-archive/macros/latex/contrib/beamer/doc/beameruserguide.pdf -[ConTeXt]: http://www.contextgarden.net/ -[RTF]: http://en.wikipedia.org/wiki/Rich_Text_Format -[Creole 1.0]: http://www.wikicreole.org/wiki/Creole1.0 -[DocBook]: http://docbook.org -[JATS]: https://jats.nlm.nih.gov -[txt2tags]: http://txt2tags.org -[EPUB]: http://idpf.org/epub -[OPML]: http://dev.opml.org/spec2.html -[OpenDocument]: http://opendocument.xml.org -[ODT]: http://en.wikipedia.org/wiki/OpenDocument -[Textile]: http://redcloth.org/textile -[MediaWiki markup]: https://www.mediawiki.org/wiki/Help:Formatting -[DokuWiki markup]: https://www.dokuwiki.org/dokuwiki -[ZimWiki markup]: http://zim-wiki.org/manual/Help/Wiki_Syntax.html -[TWiki markup]: http://twiki.org/cgi-bin/view/TWiki/TextFormattingRules -[Haddock markup]: https://www.haskell.org/haddock/doc/html/ch03s08.html -[groff man]: http://man7.org/linux/man-pages/man7/groff_man.7.html -[groff ms]: http://man7.org/linux/man-pages/man7/groff_ms.7.html -[Haskell]: https://www.haskell.org -[GNU Texinfo]: http://www.gnu.org/software/texinfo/ -[Emacs Org mode]: http://orgmode.org -[AsciiDoc]: http://www.methods.co.nz/asciidoc/ -[DZSlides]: http://paulrouget.com/dzslides/ -[Word docx]: https://en.wikipedia.org/wiki/Office_Open_XML -[PDF]: https://www.adobe.com/pdf/ -[reveal.js]: http://lab.hakim.se/reveal-js/ -[FictionBook2]: http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1 -[InDesign ICML]: https://www.adobe.com/content/dam/Adobe/en/devnet/indesign/cs55-docs/IDML/idml-specification.pdf -[TEI Simple]: https://github.com/TEIC/TEI-Simple -[Muse]: https://amusewiki.org/library/manual -[PowerPoint]: https://en.wikipedia.org/wiki/Microsoft_PowerPoint -[Vimwiki]: https://vimwiki.github.io +It can convert *to* +
+- `ansi` (text with [ANSI escape + codes](https://en.wikipedia.org/wiki/ANSI_escape_code), for terminal + viewing) +- `asciidoc` (modern [AsciiDoc](https://asciidoc.org/) as interpreted by + [AsciiDoctor](https://asciidoctor.org/)) +- `asciidoc_legacy` ([AsciiDoc](https://asciidoc.org/) as interpreted by + [`asciidoc-py`](https://github.com/asciidoc-py/asciidoc-py)). +- `asciidoctor` (deprecated synonym for `asciidoc`) +- `bbcode` [BBCode](https://www.bbcode.org/reference.php) +- `bbcode_fluxbb` [BBCode + (FluxBB)](https://web.archive.org/web/20210623155046/https://fluxbb.org/forums/help.php#bbcode) +- `bbcode_phpbb` [BBCode + (phpBB)](https://www.phpbb.com/community/help/bbcode) +- `bbcode_steam` [BBCode + (Steam)](https://steamcommunity.com/comment/ForumTopic/formattinghelp) +- `bbcode_hubzilla` [BBCode + (Hubzilla)](https://hubzilla.org/help/member/bbcode) +- `bbcode_xenforo` [BBCode + (xenForo)](https://www.xenfocus.com/community/help/bb-codes/) +- `beamer` ([LaTeX beamer](https://ctan.org/pkg/beamer) slide show) +- `bibtex` ([BibTeX](https://ctan.org/pkg/bibtex) bibliography) +- `biblatex` ([BibLaTeX](https://ctan.org/pkg/biblatex) bibliography) +- `chunkedhtml` (zip archive of multiple linked HTML files) +- `commonmark` ([CommonMark](https://commonmark.org) Markdown) +- `commonmark_x` ([CommonMark](https://commonmark.org) Markdown with + extensions) +- `context` ([ConTeXt](https://www.contextgarden.net/)) +- `csljson` ([CSL + JSON](https://citeproc-js.readthedocs.io/en/latest/csl-json/markup.html) + bibliography) +- `djot` ([Djot markup](https://djot.net)) +- `docbook` or `docbook4` ([DocBook](https://docbook.org) 4) +- `docbook5` (DocBook 5) +- `docx` ([Word docx](https://en.wikipedia.org/wiki/Office_Open_XML)) +- `dokuwiki` ([DokuWiki markup](https://www.dokuwiki.org/dokuwiki)) +- `epub` or `epub3` ([EPUB](http://idpf.org/epub) v3 book) +- `epub2` (EPUB v2) +- `fb2` + ([FictionBook2](http://www.fictionbook.org/index.php/Eng:XML_Schema_Fictionbook_2.1) + e-book) +- `gfm` ([GitHub-Flavored + Markdown](https://help.github.com/articles/github-flavored-markdown/)), + or the deprecated and less accurate `markdown_github`; use + [`markdown_github`](https://pandoc.org/MANUAL.html#markdown-variants) + only if you need extensions not supported in + [`gfm`](https://pandoc.org/MANUAL.html#markdown-variants). +- `haddock` ([Haddock + markup](https://www.haskell.org/haddock/doc/html/ch03s08.html)) +- `html` or `html5` ([HTML](https://www.w3.org/html/), + i.e. [HTML5](https://html.spec.whatwg.org/)/XHTML [polyglot + markup](https://www.w3.org/TR/html-polyglot/)) +- `html4` ([XHTML](https://www.w3.org/TR/xhtml1/) 1.0 Transitional) +- `icml` ([InDesign + ICML](https://web.archive.org/web/20211006210211/https://wwwimages.adobe.com/www.adobe.com/content/dam/acom/en/devnet/indesign/sdk/cs6/idml/idml-cookbook.pdf)) +- `ipynb` ([Jupyter + notebook](https://nbformat.readthedocs.io/en/latest/)) +- `jats_archiving` ([JATS](https://jats.nlm.nih.gov) XML, Archiving and + Interchange Tag Set) +- `jats_articleauthoring` ([JATS](https://jats.nlm.nih.gov) XML, Article + Authoring Tag Set) +- `jats_publishing` ([JATS](https://jats.nlm.nih.gov) XML, Journal + Publishing Tag Set) +- `jats` (alias for `jats_archiving`) +- `jira` + ([Jira](https://jira.atlassian.com/secure/WikiRendererHelpAction.jspa?section=all)/Confluence + wiki markup) +- `json` (JSON version of native AST) +- `latex` ([LaTeX](https://www.latex-project.org/)) +- `man` ([roff man](https://man.cx/groff_man(7))) +- `markdown` ([Pandoc’s + Markdown](https://pandoc.org/MANUAL.html#pandocs-markdown)) +- `markdown_mmd` + ([MultiMarkdown](https://fletcherpenney.net/multimarkdown/)) +- `markdown_phpextra` ([PHP Markdown + Extra](https://michelf.ca/projects/php-markdown/extra/)) +- `markdown_strict` (original unextended + [Markdown](https://daringfireball.net/projects/markdown/)) +- `markua` ([Markua](https://leanpub.com/markua/read)) +- `mediawiki` ([MediaWiki + markup](https://www.mediawiki.org/wiki/Help:Formatting)) +- `ms` ([roff ms](https://man.cx/groff_ms(7))) +- `muse` ([Muse](https://amusewiki.org/library/manual)) +- `native` (native Haskell) +- `odt` ([OpenDocument text + document](https://en.wikipedia.org/wiki/OpenDocument)) +- `opml` ([OPML](https://opml.org/spec2.opml)) +- `opendocument` ([OpenDocument + XML](https://www.oasis-open.org/2021/06/16/opendocument-v1-3-oasis-standard-published/)) +- `org` ([Emacs Org mode](https://orgmode.org)) +- `pdf` ([PDF](https://www.adobe.com/pdf/)) +- `plain` (plain text) +- `pptx` + ([PowerPoint](https://en.wikipedia.org/wiki/Microsoft_PowerPoint) + slide show) +- `rst` + ([reStructuredText](https://docutils.sourceforge.io/docs/ref/rst/introduction.html)) +- `rtf` ([Rich Text + Format](https://en.wikipedia.org/wiki/Rich_Text_Format)) +- `texinfo` ([GNU Texinfo](https://www.gnu.org/software/texinfo/)) +- `textile` ([Textile](https://textile-lang.com)) +- `slideous` ([Slideous](https://goessner.net/articles/slideous/) HTML + and JavaScript slide show) +- `slidy` ([Slidy](https://www.w3.org/Talks/Tools/Slidy2/) HTML and + JavaScript slide show) +- `dzslides` ([DZSlides](https://paulrouget.com/dzslides/) HTML5 + + JavaScript slide show) +- `revealjs` ([reveal.js](https://revealjs.com/) HTML5 + JavaScript + slide show) +- `s5` ([S5](https://meyerweb.com/eric/tools/s5/) HTML and JavaScript + slide show) +- `tei` ([TEI Simple](https://github.com/TEIC/TEI-Simple)) +- `typst` ([typst](https://typst.app)) +- `vimdoc` + ([Vimdoc](https://vimhelp.org/helphelp.txt.html#help-writing)) +- `xml` (XML version of native AST) +- `xwiki` ([XWiki + markup](https://www.xwiki.org/xwiki/bin/view/Documentation/UserGuide/Features/XWikiSyntax/)) +- `zimwiki` ([ZimWiki + markup](https://zim-wiki.org/manual/Help/Wiki_Syntax.html)) +- the path of a custom Lua writer, see [Custom readers and + writers](https://pandoc.org/MANUAL.html#custom-readers-and-writers) + below -[footnotes]: http://pandoc.org/MANUAL.html#footnotes -[tables]: http://pandoc.org/MANUAL.html#tables -[ordered lists]: http://pandoc.org/MANUAL.html#ordered-lists -[definition lists]: http://pandoc.org/MANUAL.html#definition-lists -[fenced code blocks]: http://pandoc.org/MANUAL.html#fenced-code-blocks -[superscripts and subscripts]: http://pandoc.org/MANUAL.html#superscripts-and-subscripts -[strikeout]: http://pandoc.org/MANUAL.html#strikeout -[metadata blocks]: http://pandoc.org/MANUAL.html#metadata-blocks -[math]: http://pandoc.org/MANUAL.html#math -[citations]: http://pandoc.org/MANUAL.html#citations -[Markdown inside HTML block elements]: http://pandoc.org/MANUAL.html#extension-markdown_in_html_blocks -[Pandoc's Markdown]: http://pandoc.org/MANUAL.html#pandocs-markdown +
-Installing ----------- +Pandoc can also produce PDF output via LaTeX, Groff ms, or HTML. -Here's [how to install pandoc](INSTALL.md). +Pandoc’s enhanced version of Markdown includes syntax for tables, +definition lists, metadata blocks, footnotes, citations, math, and much +more. See the User’s Manual below under [Pandoc’s +Markdown](https://pandoc.org/MANUAL.html#pandocs-markdown). -Documentation -------------- +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 (an *abstract syntax tree* or AST), 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. Users +can also run custom pandoc filters to modify the intermediate AST (see +the documentation for [filters](https://pandoc.org/filters.html) and +[Lua filters](https://pandoc.org/lua-filters.html)). -Pandoc's website contains a full [User's Guide](https://pandoc.org/MANUAL.html). -It is also available [here](MANUAL.txt) as pandoc-flavored Markdown. -The website also contains some [examples of the use of -pandoc](https://pandoc.org/demos.html) and a limited [online -demo](https://pandoc.org/try). +Because pandoc’s intermediate representation of a document is less +expressive than many of the formats it converts between, one should not +expect perfect conversions between every format and every other. Pandoc +attempts to preserve the structural elements of a document, but not +formatting details such as margin size. And some document elements, such +as complex tables, may not fit into pandoc’s simple document model. +While conversions from pandoc’s Markdown to all formats aspire to be +perfect, conversions from formats more expressive than pandoc’s Markdown +can be expected to be lossy. -Contributing ------------- +## Installing -Pull requests, bug reports, and feature requests are welcome. Please make -sure to read [the contributor guidelines](CONTRIBUTING.md) before opening a -new issue. +Here’s [how to install pandoc](INSTALL.md). +## Documentation -License -------- +Pandoc’s website contains a full [User’s +Guide](https://pandoc.org/MANUAL.html). It is also available +[here](MANUAL.txt) as pandoc-flavored Markdown. The website also +contains some [examples of the use of +pandoc](https://pandoc.org/demos.html), a limited [online +demo](https://pandoc.org/try), and a [WebAssembly-based online +demo](https://pandoc.org/app). -© 2006-2017 John MacFarlane (jgm@berkeley.edu). Released under the -[GPL], version 2 or greater. This software carries no warranty of -any kind. (See COPYRIGHT for full copyright and warranty notices.) +## Contributing -[GPL]: http://www.gnu.org/copyleft/gpl.html "GNU General Public License" +Pull requests, bug reports, and feature requests are welcome. Please +make sure to read [the contributor guidelines](CONTRIBUTING.md) before +opening a new issue. + +## License + +© 2006-2024 John MacFarlane (jgm@berkeley.edu). Released under the +[GPL](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html "GNU General Public License"), +version 2 or greater. This software carries no warranty of any kind. +(See COPYRIGHT for full copyright and warranty notices.) diff --git a/Setup.hs b/Setup.hs deleted file mode 100644 --- a/Setup.hs +++ /dev/null @@ -1,38 +0,0 @@ -{- -Copyright (C) 2006-2017 John MacFarlane - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --} - -import Distribution.Simple -import Distribution.Simple.Setup (CopyFlags(..), fromFlag) -import Distribution.PackageDescription (PackageDescription(..)) -import Distribution.Simple.Utils (notice, installOrdinaryFiles) -import Distribution.Simple.LocalBuildInfo - -main :: IO () -main = defaultMainWithHooks $ simpleUserHooks { - postCopy = installManPage - } - -installManPage :: Args -> CopyFlags - -> PackageDescription -> LocalBuildInfo -> IO () -installManPage _ flags pkg lbi = do - let verbosity = fromFlag (copyVerbosity flags) - let copydest = fromFlag (copyDest flags) - let mandest = mandir (absoluteInstallDirs pkg lbi copydest) - ++ "/man1" - notice verbosity $ "Copying man page to " ++ mandest - installOrdinaryFiles verbosity mandest [("man", "pandoc.1")] diff --git a/benchmark/benchmark-pandoc.hs b/benchmark/benchmark-pandoc.hs --- a/benchmark/benchmark-pandoc.hs +++ b/benchmark/benchmark-pandoc.hs @@ -1,5 +1,6 @@ +{-# LANGUAGE OverloadedStrings #-} {- -Copyright (C) 2012-2017 John MacFarlane +Copyright (C) 2012-2024 John MacFarlane This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,73 +17,89 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -} import Text.Pandoc +import Text.Pandoc.MIME +import Control.DeepSeq (force) +import Control.Monad.Except (throwError) import qualified Text.Pandoc.UTF8 as UTF8 -import Data.Text (Text) -import Data.Time (getCurrentTime) import qualified Data.ByteString as B -import qualified Data.Map as Map -import Criterion.Main -import Criterion.Types (Config(..)) +import qualified Data.Text as T +import Test.Tasty.Bench +-- import Gauge +import qualified Data.ByteString.Lazy as BL import Data.Maybe (mapMaybe) -import Debug.Trace (trace) -import System.Environment (getArgs) +import Data.List (sortOn) +import Text.Pandoc.Format (FlavoredFormat(..)) readerBench :: Pandoc - -> (String, ReaderOptions -> Text -> Pandoc) + -> T.Text -> Maybe Benchmark -readerBench doc (name, reader) = - case lookup name writers of - Just (TextWriter writer) -> - let inp = either (error . show) id $ runPure - $ writer def{ writerWrapText = WrapAuto} doc - in return $ bench (name ++ " reader") $ nf - (reader def) inp - _ -> Debug.Trace.trace - ("\nCould not find writer for " ++ name ++ "\n") Nothing +readerBench _ name + | name `elem` ["bibtex", "biblatex", "csljson"] = Nothing +readerBench doc name = either (const Nothing) Just $ + runPure $ do + (rdr, rexts) <- getReader $ FlavoredFormat name mempty + (wtr, wexts) <- getWriter $ FlavoredFormat name mempty + tmpl <- Just <$> compileDefaultTemplate name + case (rdr, wtr) of + (TextReader r, TextWriter w) -> do + inp <- w def{ writerWrapText = WrapAuto + , writerExtensions = wexts + , writerTemplate = tmpl } doc + return $ bench (T.unpack name) $ + nf (either (error . show) id . runPure . r def) inp + (ByteStringReader r, ByteStringWriter w) -> do + inp <- w def{ writerWrapText = WrapAuto + , writerExtensions = wexts + , writerTemplate = tmpl } doc + return $ bench (T.unpack name) $ + nf (either (error . show) id . + runPure . r def{readerExtensions = rexts}) inp + _ -> throwError $ PandocSomeError $ "text/bytestring format mismatch: " + <> name -writerBench :: Pandoc - -> (String, WriterOptions -> Pandoc -> Text) - -> Benchmark -writerBench doc (name, writer) = bench (name ++ " writer") $ nf - (writer def{ writerWrapText = WrapAuto }) doc +getImages :: IO [(FilePath, MimeType, BL.ByteString)] +getImages = do + ll <- B.readFile "test/lalune.jpg" + mv <- B.readFile "test/movie.jpg" + return [("lalune.jpg", "image/jpg", BL.fromStrict ll) + ,("movie.jpg", "image/jpg", BL.fromStrict mv)] +writerBench :: [(FilePath, MimeType, BL.ByteString)] + -> Pandoc + -> T.Text + -> Maybe Benchmark +writerBench _ _ name + | name `elem` ["bibtex", "biblatex", "csljson"] = Nothing +writerBench imgs doc name = either (const Nothing) Just $ + runPure $ do + (wtr, wexts) <- getWriter $ FlavoredFormat name mempty + case wtr of + TextWriter writerFun -> + return $ bench (T.unpack name) + $ nf (\d -> either (error . show) id $ + runPure $ do + mapM_ (\(fp,mt,bs) -> insertMedia fp (Just mt) bs) imgs + writerFun def{ writerExtensions = wexts} d) + doc + ByteStringWriter writerFun -> + return $ bench (T.unpack name) + $ nf (\d -> either (error . show) id $ + runPure $ do + mapM_ (\(fp,mt,bs) -> insertMedia fp (Just mt) bs) imgs + writerFun def{ writerExtensions = wexts} d) + doc + main :: IO () main = do - args <- getArgs - let matchReader (n, TextReader _) = - case args of - [] -> True - [x] -> x == n - (x:y:_) -> x == n && y == "reader" - matchReader (_, _) = False - let matchWriter (n, TextWriter _) = - case args of - [] -> True - [x] -> x == n - (x:y:_) -> x == n && y == "writer" - matchWriter (_, _) = False - let matchedReaders = filter matchReader readers - let matchedWriters = filter matchWriter writers inp <- UTF8.toText <$> B.readFile "test/testsuite.txt" - lalune <- B.readFile "test/lalune.jpg" - movie <- B.readFile "test/movie.jpg" - time <- Data.Time.getCurrentTime - let setupFakeFiles = modifyPureState $ \st -> st{ stFiles = - FileTree $ Map.fromList [ - ("lalune.jpg", FileInfo time lalune), - ("movie.jpg", FileInfo time movie) - ]} let opts = def - let doc = either (error . show) id $ runPure $ readMarkdown opts inp - let readers' = [(n, \o d -> - either (error . show) id $ runPure $ r o d) - | (n, TextReader r) <- matchedReaders] - let readerBs = mapMaybe (readerBench doc) - $ filter (\(n,_) -> n /="haddock") readers' - let writers' = [(n, \o d -> - either (error . show) id $ runPure $ setupFakeFiles >> w o d) - | (n, TextWriter w) <- matchedWriters] - let writerBs = map (writerBench doc) - $ writers' - defaultMainWith defaultConfig{ timeLimit = 6.0 } - (writerBs ++ readerBs) + let doc = either (error . show) force $ runPure $ readMarkdown opts inp + defaultMain + [ env getImages $ \imgs -> + bgroup "writers" $ mapMaybe (writerBench imgs doc . fst) + (sortOn fst + writers :: [(T.Text, Writer PandocPure)]) + , bgroup "readers" $ mapMaybe (readerBench doc . fst) + (sortOn fst + readers :: [(T.Text, Reader PandocPure)]) + ] diff --git a/benchmark/weigh-pandoc.hs b/benchmark/weigh-pandoc.hs deleted file mode 100644 --- a/benchmark/weigh-pandoc.hs +++ /dev/null @@ -1,38 +0,0 @@ -import Weigh -import Text.Pandoc -import Data.Text (Text) - -main :: IO () -main = do - doc <- read <$> readFile "test/testsuite.native" - mainWith $ do - func "Pandoc document" id doc - mapM_ - (\(n,r) -> weighReader doc n (either (error . show) id . runPure . r def{readerExtensions = pandocExtensions})) - [("markdown", readMarkdown) - ,("html", readHtml) - ,("docbook", readDocBook) - ,("latex", readLaTeX) - ,("commonmark", readCommonMark) - ] - mapM_ - (\(n,w) -> weighWriter doc n (either (error . show) id . runPure . w def)) - [("markdown", writeMarkdown) - ,("html", writeHtml5String) - ,("docbook", writeDocbook5) - ,("latex", writeLaTeX) - ,("commonmark", writeCommonMark) - ] - -weighWriter :: Pandoc -> String -> (Pandoc -> Text) -> Weigh () -weighWriter doc name writer = func (name ++ " writer") writer doc - -weighReader :: Pandoc -> String -> (Text -> Pandoc) -> Weigh () -weighReader doc name reader = do - case lookup name writers of - Just (TextWriter writer) -> - let inp = either (error . show) id $ runPure $ writer def{ writerWrapText = WrapAuto} doc - in func (name ++ " reader") reader inp - _ -> return () -- no writer for reader - - diff --git a/changelog b/changelog deleted file mode 100644 --- a/changelog +++ /dev/null @@ -1,13586 +0,0 @@ -pandoc (2.0.6) - - * Added `jats` as an input format. - - + Add Text.Pandoc.Readers.JATS, exporting `readJATS` (API - change) (Hamish Mackenzie). - + Improved citation handling in JATS reader. JATS citations - are now converted to pandoc citations, and JATS ref-lists - are converted into a `references` field in metadata, suitable - for use with pandoc-citeproc. Thus a JATS article with embedded - bibliographic information can be processed with pandoc and - pandoc-citeproc to produce a formatted bibliography. - - * Allow `--list-extensions` to take an optional FORMAT argument. - This lists the extensions set by default for the selected FORMAT. - The extensions are now alphabetized, and the `+` or `-` - indicating the default setting comes before, rather than after, - the extension. - - * Markdown reader: - - + Preserve original whitespace between blocks. - + Recognize `\placeformula` as context. - + Be pickier about table captions. A caption starts with a `:` which - can't be followed by punctuation. Otherwise we can falsely interpret - the start of a fenced div, or even a table header line like - `:--:|:--:`, as a caption. - + Always use four space rule for example lists. It would be awkward - to indent example list contents to the first non-space character after - the label, since example list labels are often long. Thanks to - Bernhard Fisseni for the suggestion. - + Improve raw tex parsing. Note that the Markdown reader is also - affected by the `latex_macros` extension changes described below - under the LaTeX reader. - - * LaTeX reader: - - + `latex_macros` extension changes (#4179). Don't pass through macro - definitions themselves when `latex_macros` is set. The macros - have already been applied. If `latex_macros` is enabled, then - `rawLaTeXBlock` in Text.Pandoc.Readers.LaTeX will succeed in parsing - a macro definition, and will update pandoc's internal macro map - accordingly, but the empty string will be returned. - + Export `tokenize`, `untokenize` (API change). - + Use `applyMacros` in `rawLaTeXBlock`, `rawLaTeXInline`. - + Refactored `inlineCommand`. - + Fix bug in tokenizer. Material following `^^` was - dropped if it wasn't a character escape. This only affected - invalid LaTeX, so we didn't see it in the wild, but it appeared - in a QuickCheck test failure. - + Fix regression in LateX tokenization (#4159). This mainly affects the - Markdown reader when parsing raw LaTeX with escaped spaces. - + Add tests of LaTeX tokenizer. - + Support `\foreignlanguage` from babel. - + Be more tolerant of `&` character (#4208). This allows us to parse - unknown tabular environments as raw LaTeX. - - * Muse reader (Alexander Krotov): - - + Parse anchors immediately after headings as IDs. - + Require that note references does not start with 0. - + Parse empty comments correctly. - - * Org reader (Albert Krewinkel): - - + Fix asterisks-related parsing error (#4180). - + Support minlevel option for includes (#4154). The level of headers - in included files can be shifted to a higher level by specifying a - minimum header level via the `:minlevel` parameter. E.g. - `#+include: "tour.org" :minlevel 1` will shift the headers in - tour.org such that the topmost headers become level 1 headers. - + Break-up org reader test file into multiple modules. - - * OPML reader: - - + Enable raw HTML and other extensions by default for notes - (#4164). This fixes a regression in 2.0. Note that extensions can - now be individually disabled, e.g. `-f opml-smart-raw_html`. - - * RST reader: - - + Allow empty list items (#4193). - + More accurate parsing of references (#4156). Previously we erroneously - included the enclosing backticks in a reference ID (#4156). This - change also disables interpretation of syntax inside references, as - in docutils. So, there is no emphasis in `` `my *link*`_ ``. - - * Docx reader: - - + Continue lists after interruption (#4025, Jesse Rosenthal). - Docx expects that lists will continue where they left off after an - interruption and introduces a new id if a list is starting again. So - we keep track of the state of lists and use them to define a "start" - attribute, if necessary. - + Add tests for structured document tags unwrapping (Jesse Rosenthal). - + Preprocess Document body to unwrap `w:sdt` elements (Jesse Rosenthal, - #4190). - - * Plain writer: - - + Don't linkify table of contents. - - * RST writer: - - + Fix anchors for headers (#4188). We were missing an `_`. - - * PowerPoint writer (Jesse Rosenthal): - - + Treat lists inside BlockQuotes as lists. We don't yet produce - incremental lists in PowerPoint, but we should at least treat lists - inside BlockQuotes as lists, for compatibility with other slide formats. - + Add ability to force size. This replaces the more specific - `blockQuote runProp`, which only affected the size of blockquotes. We - can use this for notes, etc. - + Implement notes. This currently prints all notes on a final slide. - Note that at the moment, there is a danger of text overflowing the - note slide, since there is no logic for adding further slides. - + Implement basic definition list functionality to PowerPoint writer. - + Don't look for default template file for Powerpoint (#4181). - + Add pptx to isTextFormat list. This is used to check standalone - and not writing to the terminal. - + Obey slide level option (Jesse Rosenthal). - + Introduce tests. - - * Docx writer: - - + Ensure that `distArchive` is the one that comes with pandoc - (#4182). Previously a `reference.docx` in `~/.pandoc` (or the user data - dir) would be used instead, and this could cause problems because a - user-modified docx sometimes lacks vital sections that we count - on the `distArchive` to supply. - - * Org writer: - - + Do not wrap "-" to avoid accidental bullet lists (Alexander Krotov). - + Don't allow fn refs to wrap to beginning of line (#4171, with help from - Alexander Krotov). Otherwise they can be interpreted as footnote - definitions. - - * Muse writer (Alexander Krotov): - - + Don't wrap note references to the next line (#4172). - - * HTML writer: - - + Use br elements in line blocks instead of relying on CSS - (#4162). HTML-based templates have had the custom CSS for - `div.line-block` removed. Those maintaining custom templates will want - to remove this too. We still enclose line blocks in a div with class - `line-block`. - - * LaTeX writer: - - + Use `\renewcommand` for `\textlatin` with babel (#4161). - This avoids a clash with a deprecated `\textlatin` command defined - in Babel. - + Allow fragile=singleslide attribute in beamer slides (#4169). - + Use `\endhead` after `\toprule` in headerless tables (#4207). - - * FB2 writer: - - + Add cover image specified by `cover-image` meta (Alexander Krotov, - #4195). - - * JATS writer (Hamish Mackenzie): - - + Support writing `` and `` elements - with `` and `<caption>` inside them by using Divs with class set - to one of `fig`, `table-wrap` or `caption` (Hamish Mackenzie). The - title is included as a Heading so the constraint on where Heading can - occur is also relaxed. - + Leave out empty alt attributes on links. - + Deduplicate image mime type code. - + Make `<p>` optional in `<td>` and `<th>` (#4178). - + Self closing tags for empty xref (#4187). - + Improve support for code language. - - * Custom writer: - - + Use init file to setup Lua interpreter (Albert Krewinkel). - The same init file (`data/init`) that is used to setup the Lua - interpreter for Lua filters is also used to setup the interpreter of - custom writers.lua. - + Define instances for newtype wrapper (Albert Krewinkel). The custom - writer used its own `ToLuaStack` instance definitions, which made - it difficult to share code with Lua filters, as this could result - in conflicting instances. A `Stringify` wrapper is introduced to - avoid this problem. - + Added tests for custom writer. - + Fixed definition lists and tables in `data/sample.lua`. - - * Fixed regression: when target is PDF, writer extensions were being - ignored. So, for example, `pandoc -t latex-smart -o file.pdf` - did not work properly. - - * Lua modules (Albert Krewinkel): - - + Add `pandoc.utils` module, to hold utility functions. - + Create a Haskell module Text.Pandoc.Lua.Module.Pandoc to - define the `pandoc` lua module. - + Make a Haskell module for each Lua module. Move definitions for the - `pandoc.mediabag` modules to a separate Haskell module. - + Move `sha1` from the main `pandoc` module to `pandoc.utils`. - + Add function `pandoc.utils.hierarchicalize` (convert list of - Pandoc blocks into (hierarchical) list of Elements). - + Add function `pandoc.utils.normalize_date` (parses a date and - converts it (if possible) to "YYYY-MM-DD" format). - + Add function `pandoc.utils.to_roman_numeral` (allows conversion - of numbers below 4000 into roman numerals). - + Add function `pandoc.utils.stringify` (converts any AST element - to a string with formatting removed). - + `data/init.lua`: load `pandoc.utils` by default - + Turn pipe, read into full Haskell functions. The `pipe` and `read` - utility functions are converted from hybrid lua/haskell functions - into full Haskell functions. This avoids the need for intermediate - `_pipe`/`_read` helper functions, which have dropped. - + pandoc.lua: re-add missing MetaMap function. This was a bug - introduced in version 2.0.4. - - * Text.Pandoc.Class: Add `insertInFileTree` [API change]. This gives - a pure way to insert an ersatz file into a `FileTree`. In addition, we - normalize paths both on insertion and on lookup. - - * Text.Pandoc.Shared: export `blocksToInlines'` (API change, Maura Bieg). - - * Text.Pandoc.MIME: Add opus to MIME type table as audio/ogg (#4198). - - * Text.Pandoc.Extensions: Alphabetical order constructors for - `Extension`. This makes them appear in order in `--list-extensions`. - - * Allow lenient decoding of latex error logs, which are not always - properly UTF8-encoded (#4200). - - * Update latex template to work with recent versions of beamer. - The old template produced numbered sections with some recent - versions of beamer. Thanks to Thomas Hodgson. - - * Updated reference.docx (#4175). Instead of just "Hello, world", the - document now contains exemplars of most of the styles that have an - effect on pandoc documents. This makes it easier to see the effect - of style changes. - - * Removed `default.theme` data file (#4096). It is no longer needed now - that we have `--print-highlight-style`. - - * Added `stack.lts9.yaml` for building with lts 9 and ghc 8.0.2. - We still need this for the alpine static linux build, since - we don't have ghc 8.2.2 for that yet. - - * Removed `stack.pkg.yaml`. We only really need `stack.yaml`; we - can put flag settings for pandoc-citeproc there. - - * Makefile: Add 'trypandoc' and 'pandoc-templates' targets to - make releases easier. - - * MANUAL.txt: - - + Add note on what formats have `+smart` by default. - + Use native syntax for custom-style (#4174, Mauro Bieg). - + Introduce dedicated Extensions section, since some extensions - affect formats other than markdown (Mauro Bieg, #4204). - + Clarify default html output for `--section-divs` (Richard Edwards). - - * filters.md: say that Text.Pandoc.JSON comes form pandoc-types. - Closes jgm/pandoc-website#16. - - * epub.md: Delete removed `-S` option from command (#4151, Georger Araújo). - -pandoc (2.0.5) - - * Fix a bug in 2.0.4, whereby pandoc could not read the theme files - generated with `--print-highlight-style` (#4133). Improve JSON - serialization of styles. - - * Fix CSS issues involving line numbers (#4128). - Highlighted code blocks are now enclosed in a div with class `sourceCode`. - Highlighting CSS no longer sets a generic color for pre and code; we only - set these for class `sourceCode`. - - * `--pdf-engine-opt`: fix bug where option order was reversed (#4137). - - * Add PowerPoint (pptx) writer (Jesse Rosenthal). - It works following the standard Pandoc conventions for making other - sorts of slides. Caveats: - - + Syntax highlighting is not yet implemented. (This is difficult - because there are no character classes in Powerpoint.) - + Footnotes and Definition lists are not yet implemented. (Notes will - usually take the form of a final slide. - + Image placement and auto-resizing has a few glitches. - + Reference powerpoint files don't work dependably from the command - line. This will be implemented, but at the moment users are advised - to change themes from within Powerpoint. - - * Create shared Text.Pandoc.Writers.OOXML module (Jesse Rosenthal). - This is for functions used by both Powerpoint and Docx writers. - - * Add default pptx data for Powerpoint writer (Jesse Rosenthal). - - * Add `empty_paragraphs` extension. - - + Deprecate `--strip-empty-paragraphs` option. Instead we now - use an `empty_paragraphs` extension that can be enabled on - the reader or writer. By default, disabled. - + Add `Ext_empty_paragraphs` constructor to `Extension`. - + Revert "Docx reader: don't strip out empty paragraphs." - This reverts commit d6c58eb836f033a48955796de4d9ffb3b30e297b. - + Implement `empty_paragraphs` extension in docx reader and writer, - opendocument writer, HTML reader and writer. - + Add tests for `empty_paragraphs` extension. - - * Markdown reader: - - + Don't parse native div as table caption (#4119). - + Improved computation of column widths in pipe tables. - Pipe tables with lines longer than the text width (as set - by `--columns`) are now scaled to text width, with the relative - widths of columns determined by the ratios between the - header lines. Previously we computed column widths using - the ratio of header line lengths to column width, so that - tables with narrow header lines were extremely thin, which - was very rarely the desired result. - - * LaTeX reader: fix `\` before newline (#4134). This should be a space, - as long as it's not followed by a blank line. This has been fixed at the - tokenizer level. - - * Muse reader (Alexander Krotov): - - + Add test for `#disable-tables` directive in Emacs mode. - + Don't allow emphasis to be preceded by letter. - + Add underline support in Emacs Muse mode.. - + Support multiline directives in Amusewiki mode - - * Man writer: omit internal links (#4136). That is, just print the link - text without the URL. - - * Markdown reader: accept processing instructions as raw HTML (#4125). - - * Lua filters (Albert Krewinkel): - - + Use script to initialize the interpreter. The file `init.lua` is - used to initialize the Lua interpreter which is used in Lua filters. - This gives users the option to require libraries which they want to - use in all of their filters, and to extend default modules. - + Fix package loading for Lua 5.1. The list of package searchers is - named `package.loaders` in Lua 5.1 and LuaJIT, and `package.searchers` - in Lua 5.2 and later. - + Refactor lua module handling. The integration with Lua's package/module - system is improved: A pandoc-specific package searcher is prepended to - the searchers in `package.searchers`. The modules `pandoc` and - `pandoc.mediabag` can now be loaded via `require`. - + Bump lower bound of hslua. The release hslua 0.9.3 contains a new - function which makes using Haskell functions as package loaders much - easier. - - * reveal.js template: add title-slide identifier to title slide (#4120). - This allows it to be styled more easily. - - * LaTeX template: Added support for `pagestyle` variable (#4135, - Thomas Hodgson) - - * Add `-threaded` to ghc-options for executable (#4130, fixes a build - error on linux). - - -pandoc (2.0.4) - - * Add `--print-highlight-style` option. This generates a JSON version - of a highlighting style, which can be saved as a `.theme` file, modified, - and used with `--highlight-style` (#4106, #4096). - - * Add `--strip-empty-paragraphs` option. This works for any input format. - It is primarily intended for use with docx and odt documents where - empty paragraphs have been used for inter-paragraph spaces. - - * Support `--webtex` for `gfm` output. - - * Recognize `.muse` file extension. - - * Support beamer `\alert` in LaTeX reader. Closes #4091. - - * Docx reader: don't strip out empty paragraphs (#2252). - Users who have a conversion pipeline from docx may want to consider adding - `--strip-empty-paragraphs` to the command line. - - * Org reader (Albert Krewinkel): Allow empty list items (#4090). - - * Muse reader (Alexander Krotov): - - + Parse markup in definition list terms. - + Allow definition to end with EOF. - + Make code blocks round trip. - + Drop common space prefix from list items. - + Add partial round trip test. - + Don't interpret XML entities. - + Remove `nested`. - + Parse `~~` as non-breaking space in Emacs mode. - + Correctly remove indentation from notes. Exactly one space is - required and considered to be part of the marker. - + Allow list items to be empty. - + Add ordered list test. - + Add more multiline definition tests. - + Don't allow blockquotes within lists. - + Fix reading of multiline definitions. - + Add inline `<literal>` support. - + Concatenate inlines of the same type - - * Docx writer: allow empty paragraphs (#2252). - - * CommonMark/gfm writer: - - + Use raw html for native divs/spans (#4113). This allows a pandoc - markdown native div or span to be rendered in gfm using raw html tags. - + Implement `raw_html` and `raw_tex` extensions. Note that `raw_html` - is enabled by default for `gfm`, while `raw_tex` is disabled by default. - - * Muse writer (Alexander Krotov): - - + Test that inline math conversion result is normalized. - Without normalization this test produced - `<em>a</em><em>b</em><em>c</em>`. - + Improve inline list normalization and move to writer. - + Escape hash symbol. - + Escape `----` to avoid accidental horizontal rules. - + Escape only `</code>` inside code tag. - + Additional `<verbatim>` is not needed as `<code>` is verbatim already. - - * LaTeX writer: - - + Allow specifying just width or height for image size. - Previously both needed to be specified (unless the image was - being resized to be smaller than its original size). - If height but not width is specified, we now set width to - textwidth. If width but not height is specified, we now set - height to textheight. Since we have `keepaspectratio`, this - yields the desired result. - + Escape `~` and `_` in code with `--listings` (#4111). - - * HTML writer: export `tagWithAttributes`. This is a helper allowing - other writers to create single HTML tags. - - * Let papersizes `a0`, `a1`, `a2`, ... be case-insensitive by - converting the case as needed in LaTeX and ConTeXt writers. - - * Change `fixDisplayMath` from `Text.Pandoc.Writers.Shared` - so that it no longer produces empty `Para`'s as an artifact. - - * `Text.Pandoc.Shared.blocksToInlines`: rewrote using builder. - This gives us automatic normalization, so we don't get - for example two consecutive Spaces. - - * Include default CSS for 'underline' class in HTML-based templates. - - * revealjs template: add `tex2jax` configuration for the - math plugin. With the next release of reveal.js, this will - fix the problem of `$`s outside of math contexts being - interpreted as math delimiters (#4027). - - * `pandoc.lua` module for use in lua filters (Albert Krewinkel): - - + Add basic lua List module (#4099, #4081). The List module is - automatically loaded, but not assigned to a global variable. It can be - included in filters by calling `List = require 'List'`. Lists of blocks, - lists of inlines, and lists of classes are now given `List` as a metatable, - making working with them more convenient. E.g., it is now possible to - concatenate lists of inlines using Lua's concatenation operator `..` - (requires at least one of the operants to have `List` as a metatable): - - function Emph (emph) - local s = {pandoc.Space(), pandoc.Str 'emphasized'} - return pandoc.Span(emph.content .. s) - end - - The `List` metatable is assigned to the tables which get passed to - the constructors `MetaBlocks`, `MetaInline`, and `MetaList`. This - enables the use of the resulting objects as lists. - + `Lua/StackInstances`: push Pandoc and Meta via constructor. - Pandoc and Meta elements are now pushed by calling the respective - constructor functions of the pandoc Lua module. This makes serialization - consistent with the way blocks and inlines are pushed to lua and allows - to use List methods with the `blocks` value. - + Add documentation for pandoc.List in `lua-filters.md`. - - * Use latest tagsoup. This fixes a bug in parsing HTML tags with - `&` (but not a valid entity) following them (#4094, #4088). - - * Use skylighting 0.4.4.1, fixing the color of unmarked code text - when `numberLines` is used (#4103). - - * Make `normalizeDate` more forgiving (Mauro Bieg, #4101), not - requiring a leading 0 on single-digit days. - - * Fix `--help` output for `--highlight-style` to include `FILE` (Mauro - Bieg, #4095). - - * Clearer deprecation warning for `--latexmathml, --asciimathml, -m`. - Previously we only mentioned `--latexmathml`, even if `-m` was - used. - - * Changelog: fix description of lua filters in 2.0 release - (Albert Krewinkel). Lua filters were initially run *after* conventional - (JSON) filters. However, this was changed later to make it easier to deal - with files in the mediabag. The changelog is updated to describe that - feature of the 2.0 release correctly. - - * Change Generic JSON instances to TemplateHaskell (Jasper Van der Jeugt, - #4085). This reduces compile time and memory usage significantly. - - * `lua-filters.md`: Added tikz filter example. - - * Create alternative zip file for macOS binaries. - - * Create alternative zip file for Windows binaries. - - * Update INSTALL.md since we now provide zips for binaries. - - * Relax `http-types` dependency (Justus Sagemüller, #4084). - - * Add `epub.md`, `getting-started.md` to docs. These used to live in - the website repo. - - * Add `packages` target to Makefile. - - * Bump bounds for binary, http-types, tasty-hunit - -pandoc (2.0.3) - - * Lua filters: preload text module (Albert Krewinkel, #4077). - The `text` module is preloaded in lua. The module contains some UTF-8 - aware string functions, implemented in Haskell. The module is loaded on - request only, e.g.: - - text = require 'text' - function Str (s) - s.text = text.upper(s.text) - return s - end - - * Allow table-like access to attributes in lua filters (Albert Krewinkel, - #4071). Attribute lists are represented as associative lists in Lua. Pure - associative lists are awkward to work with. A metatable is attached to - attribute lists, allowing to access and use the associative list as if - the attributes were stored in as normal key-value pair in table. - Note that this changes the way `pairs` works on attribute lists. Instead - of producing integer keys and two-element tables, the resulting iterator - function now returns the key and value of those pairs. Use `ipairs` to - get the old behavior. Warning: the new iteration mechanism only works if - pandoc has been compiled with Lua 5.2 or later (current default: 5.3). - - * Text.Pandoc.Parsing.uri: allow `&` and `=` as word characters (#4068). - This fixes a bug where pandoc would stop parsing a URI with an - empty attribute: for example, `&a=&b=` wolud stop at `a`. - (The uri parser tries to guess which punctuation characters - are part of the URI and which might be punctuation after it.) - - * Introduce `HasSyntaxExtensions` typeclass (Alexander Krotov, #4074). - - + Added new `HasSyntaxExtensions` typeclass for `ReaderOptions` and - `WriterOptions`. - + Reimplemented `isEnabled` function from `Options.hs` to accept both - `ReaderOptions` and `WriterOptions`. - + Replaced `enabled` from `CommonMark.hs` with new `isEnabled`. - - * Add `amuse` extension (Alexander Krotov) to enable Amuse wiki - behavior for `muse`. New `Ext_amuse` constructor for - `Extension`. Note: this is switched on by default; for - Emacs behavior, use `muse-amuse`. - - * Muse reader (Alexander Krotov): - - + Count only one space as part of list item marker. - + Produce SoftBreaks on newlines. Now wrapping can be preserved - with `--wrap=preserve`. - + Add Text::Amuse footnote extensions. Footnote end is indicated by - indentation, so footnotes can be placed anywhere in the text, - not just at the end of it. - + Accept Emacs Muse definition lists when `-amuse`. - Emacs Muse does not require indentation. - - * HTML reader: - - + Ensure we don't produce level 0 headers (#4076), even for chapter - sections in epubs. This causes problems because writers aren't set - up to expect these. - + Allow spaces after `\(` and before `\)` with `tex_math_single_backslash`. - Previously `\( \frac{1}{a} < \frac{1}{b} \)` was not parsed as math in - `markdown` or `html` `+tex_math_single_backslash`. - + Parse div with class `line-block` as LineBlock. - + Don't fail with block-level content in figcaption (Mauro Bieg, #4183). - - * MANUAL: clarify that math extensions work with HTML. - Clarify that `tex_math_dollars` and `tex_math_single_backslash` - will work with HTML as well as Markdown. - - * Creole reader: Fix performance issue for longer lists (Sascha Wilde, - #4067). - - * RST reader: better support for 'container' directive (#4066). - Create a div, incorporate name attribute and classes. - - * LaTeX reader: - - + Support column specs like `*{2}{r}` (#4056). This is equivalent to - `rr`. We now expand it like a macro. - + Allow optional args for parbox (#4056). - + Allow optional arguments on `\footnote` (#4062). - - * EPUB writer: Fixed path for cover image (#4069). It was previously - `media/media/imagename`, and should have been `media/imagename`. - - * Markdown writer: fix bug with doubled footnotes in grid tables - (#4061). - - * LaTeX template: include natbib/biblatex after polyglossia (#4073). - Otherwise we seem to get an error; biblatex wants polyglossia - language to be defined. - - * Added examples to lua filters documentation. - - -pandoc (2.0.2) - - * Deprecated ancient HTML math methods: `--latexmathml`, `--gladtex`, - `--mimetex`, `--jsmath`. - - * Fixed URIs in `data/jats.csl`. They were being rendered twice, - leading to invalid XML in default JATS output with pandoc-citeproc. - - * `lua-filters.md`: use real-world man page filter as example. - - * Add lua filter functions `walk_inline` and `walk_block` - in the pandoc module, to apply filters inside particular - inline and block elements. - - * Refactored some code from `Text.Pandoc.Lua.PandocModule` - into new internal module `Text.Pandoc.Lua.Filter`. - - * Markdown reader: - - + Allow fenced code blocks to be indented 1-3 spaces (#4011). - This brings our handling of them into alignment with CommonMark's. - + Fix YAML metadata with "chomp" (`|-`). Previously if a - YAML block under `|-` contained a blank line, pandoc would - not parse it as metadata. - - * Removed `etc.` from abbreviations file. Often `etc.` ends a - sentence, and we want the period to be treated as a - sentence-ending period. - - * Fix regression with `--metadata` (#4054). Values specified with - `--metadata` should replace a metadata value set in the document - itself, rather than creating a list including a new value. - - * EPUB writer: - - + Fix EPUB OCF structure. #3720 had been improperly implemented. - + Fix modified paths for raw HTML tags (src, poster, etc.) - (#4050, #4055). This had not been updated for the new EPUB - container layout, with a separate text/ subdirectory. - + Fix image paths with empty `--epub-subdirectory`. - - * Miscellaneous code cleanup (Alexander Krotov). - - * Use pandoc-types 1.17.3, which adds `Walkable` instances - for `[Block] Block` and `[Inline] Inline`. - - * Remove obsolete `stack.full.yaml` (#4052). - - * Change to using pandoc-citeproc 0.12.1 in binary packages. - - * Consolidate math output method documentation (#4049, Mauro Bieg). - - * `MANUAL.txt`: fix header level of "Extension: emoji" (Albert Krewinkel). - - * Use lua filter to generate man page from `MANUAL.txt`, replacing old - Haskell filters. This is easier and faster. - - * Improved `INSTALL.md`. - - * Update commands to extract deb archive on Linux (#4043, Salim B). - - -pandoc (2.0.1.1) - - * Improved fix to #3989 (parsing of HTML tags containing - `>` in an attribute or comment). The previous fix (in 2.0.1) only - worked in certain cases. - - * FB2 writer (Alexander Krotov): - - + Add `unrecognised` genre to `<title-info>` - (Alexander Krotov). XML schema requires at least one genre. - + Remove `<annotation>` from `<body>`. - - * CommonMark writer: fix strikethrough for `gfm` (#4038). - - * Use texmath 0.10, which adds support for a wider range of - symbols and fixes default column alignments in MathML - and OMML. - - * Highlighting fixes, using skylighting 0.4.3.2: - - + Fix invalid CSS. - + Support `lineAnchors` (or `line-anchors`) in HTML code blocks. - + Ensure that code lines don't get duplicate identifiers (#4031). - The line identifiers are built using the code block's identifier - as a prefix. If the code block has null identifier, we use - `cb1`, `cb2`, etc. - - * Added a few abbreviations to `data/abbreviations`, - and sorted the list (#3984, Wandmalfarbe). - - * Improved support for columns in HTML writer (#4028). - - + Remove `width` attribute from the `div`. - + Remove space between `<div class="column">` elements, - since this prevents columns whose widths sum to 100% - (the space takes up space). - + Move as much as possible of the CSS to the template. - + Ensure that all the HTML-based templates (including epub) - contain the CSS for columns. - + Columns default to 50% width unless they are given a width - attribute. So if you want two equal-width columns, you - can use a div with class `column` and no `width` attribute. - - * SelfContained: use `base64` for css links with media attribute (#4026). - This fixes `--self-contained` with S5. - - * Improve `pandoc-template-mode.el` (Vaclav Haisman). - - * Issue INFO, not WARNING, when a .sty file cannot be - read in LaTeX reader. It is normally not an issue requiring - a fix from the user if .sty files are not found. - - * INSTALL.md: MacOS instructions needed xar -f (adam234). - - * MANUAL.txt: - - + Clarify that --setext-headers doesn't affect gfm output (#4035). - + Clarify what is needed to open and close a div in `fenced_divs` - (#4039, Tristano Ajmone). - + Removed reference to `default.beamer` in docs (#4024). - Also added mention of other templates affecting PDF output - with different settings. - -pandoc (2.0.1) - - * Fixed regression in parsing of HTML comments in markdown and other - non-HTML formats (`Text.Pandoc.Readers.HTML.htmlTag`) (#4019). - The parser stopped at the first `>` character, even if it wasn't - the end of the comment. - - * Creole reader (Sascha Wilde): - - + Fix some minor typos and formatting. - + Add additional test on nowiki-block after para. - + Fix lists with trailing white space. - - * LaTeX reader: handle `%` comment right after command. - For example, `\emph%`. - - * Markdown reader: make sure fenced div closers work in lists. - Previously the following failed: - - ::: {.class} - 1. one - 2. two - ::: - - and you needed a blank line before the closing `:::`. - - * Make `fenced_divs` affect the Markdown writer. If `fenced_divs` is - enabled, Divs will be rendered as fenced divs. - - * LaTeX/Beamer writer: support "blocks" inside columns and other Divs - (#4016). - - * HTML Writer: consistently use dashed class-names (Mauro Bieg, #3556). - Note: this change may require some changes in CSS rules. - `footnoteRef` has become `footnote-ref`, `titleslide` has - become `title-slide`, and `footnoteBack` has become `footnote-back`. - - * JATS writer: Properly pass through author metadata (#4020). - - * FB2 writer (Alexander Krotov): - - + Write blocks outside of `<p>` in definitions. - + Make bullet lists consistent with ordered lists, repeating - the marker for the outer list rather than indenting sublists, - since indentation does not work in readers. - + Add new style FB2 tests. - - * `Text.Pandoc.ImageSize`: Add `Millimeter` constructor to `Dimension` - (#4012) [API change]. Now sizes given in 'mm' are no longer converted - to 'cm'. - - * Revise documentation of small caps syntax (Andrew Dunning, #4013). - - * Fix broken reference links in manual (Andrew Dunning, #4014) - - * Fixed example of slide columns structure in changelog (#4015). - Also documented this feature in MANUAL.txt. - - -pandoc (2.0.0.1) - - * EPUB writer: - - + Fixed filepaths for nonstandard epub-subdirectory values. - + Ensure that epub2 is recognized as a non-text format, - so that a template is used. - + Don't include "prefix" attribute for ibooks for epub2. - It doesn't validate. - + Fix stylesheet paths; previously we had an incorrect - stylesheet path for the cover page and nav page. - - * LaTeX reader: - - + Insert space when needed in macro expansion (#4007). - Sometimes we need to insert a space after a control sequence - to prevent it merging with a following letter. - + Allow unbraced arguments for macros (#4007). - + Allow body of macro definition to be unbraced (#4007). - - * Linux package build: ensure that pandoc-citeproc is statically linked. - - * trypandoc: add native, ms. - -pandoc (2.0) - - [new features] - - * New output format `ms` (groff ms). Complete support, including - tables, math, syntax highlighting, and PDF bookmarks. The writer uses - texmath's new eqn writer to convert math to eqn format, so a ms file - produced with this writer should be processed with `groff -ms -e` if - it contains math. - - * New output format `jats` (Journal Article Tag Suite). This is an XML - format used in archiving and publishing articles. Note that a - URI-encoded CSL stylesheet (`data/jats.csl`) is added automatically - unless a stylesheet is specified using `--css`. - - * New output format `gfm` (GitHub-flavored CommonMark) (#3841). - This uses bindings to GitHub's fork of cmark, so it should parse - gfm exactly as GitHub does (excepting certain postprocessing - steps, involving notifications, emojis, etc.). `markdown_github` - has been deprecated in favor of `gfm`. - - * New output format `muse` (Emacs Muse) (Alexander Krotov, #3489). - - * New input format `gfm` (GitHub-flavored CommonMark) (#3841). - This uses bindings to GitHub's fork of cmark. `markdown_github` - has been deprecated in favor of `gfm`. - - * New input format `muse` (Emacs Muse) reader (Alexander Krotov, #3620). - - * New input format `tikiwiki` (TikiWiki markup) (rlpowell, #3800). - - * New input format `vimwiki` (Vimwiki markup) (Yuchen Pei, #3705). - Note that there is a new data file, `data/vimwiki.css`, which can - be used to display the HTML produced by this reader and - pandoc's HTML writer in the style of vimwiki's own HTML - export. - - * New input format `creole` (Creole 1.0) (#3994, Sascha Wilde). - - * New syntax for Divs, with `fenced_divs` extension enabled by - default (#168). This gives an attractive, plain-text way to create - containers for block-level content. - - * Added new syntax for including raw content in any output format, - enabled by the `raw_attribute` extension (which is on by default - for `markdown` and `multimarkdown`). The syntax is the same as - for fenced code blocks or code inlines, only with `{=FORMAT}` for - attributes, where `FORMAT` is the name of the output format - (e.g., `ms`, `html`). - - * Implement multicolumn support for slide formats (#1710). - The structure expected is: - - :::::::::::::: {.columns} - ::: {.column width="40%"} - contents... - ::: - ::: {.column width="60%"} - contents... - ::: - :::::::::::::: - - Support has been added for beamer and all HTML slide formats. - - * Allows line comments in templates, beginning with `$--` (#3806). - (Requires doctemplates 0.2.1.) - - * Add `--eol=crlf|lf|native` flag and writer option to control line endings - (Stefan Dresselhaus, #3663, #2097). - - * Add `--log` option to save log messages in JSON format to a file (#3392). - - * Add `--request-header` option, to set request headers when pandoc - makes HTTP requests to fetch external resources. For example: - `--request-header User-Agent:blah`. - - * Added lua filters (Albert Krewinkel, #3514). The new `--lua-filter` - option works like `--filter` but takes pathnames of special lua filters - and uses the lua interpreter baked into pandoc, so that no external - interpreter is needed. Note that lua filters are all applied before - regular filters, regardless of their position on the command line. - For documentation of lua filters, see `doc/lua-filters.md`. - - * Set `PANDOC_READER_OPTIONS` in environment where filters are run. - This contains a JSON representation of `ReaderOptions`, so filters - can access it. - - * Support creation of pdf via groff `ms` and pdfroff. - `pandoc -t ms -o output.pdf input.txt`. - - * Support for PDF generation via HTML and `weasyprint` or `prince` - (Mauro Bieg, #3909). `pandoc -t html5 -o output.pdf --pdf-engine=prince`. - - * Added `--epub-subdirectory` option (#3720). This specifies the - subdirectory in the OCF container that holds the EPUB specific content. - We now put all EPUB related content in an `EPUB/` subdirectory by default - (later this will be configurable). - - ``` - mimetype - META-INF/ - com.apple.ibooks.display-options.xml - container.xml - EPUB/ <<--configurable-->> - fonts/ <<--static-->> - font.otf - media/ <<--static-->> - cover.jpg - fig1.jpg - styles/ <<--static-->> - stylesheet.css - content.opf - toc.ncx - text/ <<--static-->> - ch001.xhtml - ``` - - * Added `--resource-path=SEARCHPATH` command line option (#852). - SEARCHPATH is separated by the usual character, depending on OS - (: on unix, ; on windows). Default resource path is just working - directory. However, the working directory must be explicitly - specified if the `--resource-path` option is used. - - * Added --abbreviations=FILE option for custom abbreviations file - (#256). Default abbreviations file (`data/abbreviations`) contains - a list of strings that will be recognized by pandoc's - Markdown parser as abbreviations. (A nonbreaking space will - be inserted after the period, preventing a sentence space in - formats like LaTeX.) Users can override the default by putting a file - abbreviations in their user data directory (`~/.pandoc` on *nix). - - * Allow a theme file as argument to `--highlight-style`. - Also include a sample, `default.theme`, in `data/`. - - * Allow `--syntax-definition` option for dynamic loading of syntax - highlighting definitions (#3334). - - * Lists in `markdown` by default now use the CommonMark variable - nesting rules (#3511). The indentation required for a block-level - item to be included in a list item is no longer fixed, but is - determined by the first line of the list item. To be included in - the list item, a block must be indented to the level of the first - non-space content after the list marker. Exception: if are 5 or more - spaces after the list marker, then the content is interpreted as an - indented code block, and continuation paragraphs must be indented - two spaces beyond the end of the list marker. See the CommonMark - spec for more details and examples. - - Documents that adhere to the four-space rule should, in most cases, - be parsed the same way by the new rules. Here are some examples - of texts that will be parsed differently: - - - a - - b - - will be parsed as a list item with a sublist; under the four-space - rule, it would be a list with two items. - - - a - - code - - Here we have an indented code block under the list item, even though it - is only indented six spaces from the margin, because it is four spaces - past the point where a continuation paragraph could begin. With the - four-space rule, this would be a regular paragraph rather than a code - block. - - - a - - code - - Here the code block will start with two spaces, whereas under - the four-space rule, it would start with `code`. With the four-space - rule, indented code under a list item always must be indented eight - spaces from the margin, while the new rules require only that it - be indented four spaces from the beginning of the first non-space - text after the list marker (here, `a`). - - This change was motivated by a slew of bug reports from people - who expected lists to work differently (#3125, #2367, #2575, #2210, - #1990, #1137, #744, #172, #137, #128) and by the growing prevalance - of CommonMark (now used by GitHub, for example). Those who - prefer the old behavior can use `-f markdown+four_space_rule`. - - * Added `four_space_rule` extension. This triggers the old pandoc - parsing rule for content nested under list items (the "four space - rule"). - - * Added `spaced_reference_links` extension (#2602). It allows whitespace - between the two parts of a reference link: e.g. - - [a] [b] - - [b]: url - - This was previously enabled by default; now it is now forbidden by default. - - * Add `space_in_atx_header` extension (#3512). This is enabled by default - in pandoc and GitHub markdown but not the other flavors. - This requires a space between the opening #'s and the header - text in ATX headers (as CommonMark does but many other implementations - do not). This is desirable to avoid falsely capturing things like - - #hashtag - - or - - #5 - - * Add `sourcefile` and `outputfile` template variables (Roland Hieber, - #3431). - - * Allow ibooks-specific metadata in epubs (#2693). You can now have - the following fields in your YAML metadata, and it will be treated - appropriately in the generated EPUB: - - ``` - ibooks: - version: 1.3.4 - specified-fonts: false - ipad-orientation-lock: portrait-only - iphone-orientation-lock: landscape-only - binding: true - scroll-axis: vertical - ``` - - - [behavior changes] - - * Reader functions no longer presuppose that CRs have been - stripped from the input. (They strip CRs themselves, before - parsing, to simplify the parsers.) - - * Added support for translations (localization) (#3559). - Currently this only affects the LaTeX reader, for things - like `\figurename`. Translation data files for 46 languages - can be found in `data/translations`. - - * Make `--ascii` work with DocBook output too. - - * Rename `--latex-engine` to `--pdf-engine`, - and `--latex-engine-opt` to `--pdf-engine-opt`. - - * Removed `--parse-raw` and `readerParseRaw`. These were confusing. - Now we rely on the `+raw_tex` or `+raw_html` extension with latex or html - input. Thus, instead of `--parse-raw -f latex` we use `-f latex+raw_tex`, - and instead of `--parse-raw -f html` we use `-f html+raw_html`. - - * With `--filter` R filters are now recognized, even if they are - not executable (#3940, #3941, Andrie de Vries). - - * Support SVG in PDF output, converting with `rsvg2pdf` (#1793). - - * Make epub an alias for epub3, not epub2. - - * Removed `--epub-stylesheet`; use `--css` instead (#3472, #847). - Multiple stylesheets may be used. Stylesheets will be taken both from - `--css` and from the `stylesheet` metadata field (which can contain - either a file path or a list of them). - - * `--mathml` and MathML in HTMLMathMethod no longer take an argument. - The argument was for a bridge JavaScript that used to be necessary - in 2004. We have removed the script already. - - * `--katex` improvements. The latest version is used, and the - autoload script is loaded by default. - - * Change MathJax CDN default since old one is shutting down (#3544). - Note: The new URL requires a version number, which we'll have - to update manually in subsequent pandoc releases in order to - take advantage of mathjax improvements. - - * `--self-contained`: don't incorporate elements with `data-external="1"` - (#2656). You can leave an external link as it is by adding the attribute - data-external="1" to the element. Pandoc will then not try to - incorporate its content when `--self-contained` is used. This is - similar to a feature already supported by the EPUB writer. - - * Allow `--extract-media` to work with non-binary input formats - (#1583, #2289). If `--extract-media` is supplied with a non-binary - input format, pandoc will attempt to extract the contents of all - linked images, whether in local files, data: uris, or external uris. - They will be named based on the sha1 hash of the contents. - - * Make `papersize: a4` work regardless of the case of `a4`. - It is converted to `a4` in LaTeX and `A4` in ConTeXt. - - * Make `east_asian_line_breaks` affect all readers/writers (#3703). - - * Underlined elements are now treated consistently by readers - (#2270, hftf); they are always put in a Span with class `underline`. - This allows the user to treat them differently from other emphasis, - using a filter. Docx, Org, Textile, Txt2Tags, and HTML readers - have been changed. - - * Improved behavior of `auto_identifiers` when there are explicit ids - (#1745). Previously only autogenerated ids were added to the list - of header identifiers in state, so explicit ids weren't taken - into account when generating unique identifiers. Duplicated - identifiers could result. This simple fix ensures that explicitly given - identifiers are also taken into account. - - * Use `table-of-contents` for contents of toc, make `toc` a boolean - (#2872). Changed markdown, rtf, and HTML-based templates accordingly. - This allows you to set `toc: true` in the metadata; this - previously produced strange results in some output formats. - For backwards compatibility, `toc` is still set to the - toc contents. But it is recommended that you update templates - to use `table-of-contents` for the toc contents and `toc` - for a boolean flag. - - * Change behavior with binary format output to stdout. - Previously, for binary formats, output to stdout was disabled - unless we could detect that the output was being piped (and not - sent to the terminal). Unfortunately, such detection is not - possible on Windows, leaving windows users no way to pipe binary - output. So we have changed the behavior in the following way: - - + Output to stdout is allowed when it can be determined that - the output is being piped (on non-Windows platforms). - + If the `-o` option is not used, binary output is never sent - to stdout by default; instead, an error is raised. - + If `-o -` is used, binary output is sent to stdout, regardless - of whether it is being piped. This works on Windows too. - - * Better error behavior: uses of `error` have been replaced by - raising of `PandocError`, which can be trapped and handled by the - calling program. - - * Removed `hard_line_breaks` extension from `markdown_github` (#3594). - GitHub has two Markdown modes, one for long-form documents like READMEs - and one for short things like issue coments. In issue comments, a line - break is treated as a hard line break. In README, wikis, etc., it is - treated as a space as in regular Markdown. Since pandoc is more likely to - be used to convert long-form documents from GitHub Markdown, - `-hard_line_breaks` is a better default. - - * Include `backtick_code_blocks` extension in `mardkown_mmd` (#3637). - - * Escape `MetaString` values (as added with `-M/--metadata` flag) (#3792). - Previously they would be transmitted to the template without any - escaping. Note that `--M title='*foo*'` yields a different result from - - --- - title: *foo* - --- - - In the latter case, we have emphasis; in the former case, just - a string with literal asterisks (which will be escaped - in formats, like Markdown, that require it). - - * Allow `em`, `cm`, `in` for image height/width in HTML, LaTeX (#3450). - - * HTML writer: Insert `data-` in front of unsupported attributes. Thus, - a span with attribute `foo` gets written to HTML5 with `data-foo`, so - it is valid HTML5. HTML4 is not affected. This will allow us to use - custom attributes in pandoc without producing invalid HTML. (With help - from Wandmalfarbe, #3817.) - - * Plain writer: improved super/subscript rendering. We now - handle more non-digit characters for which there are - sub/superscripted unicode characters. When unicode - sub/superscripted characters are not available, we use - `_(..)` or `^(..)` (#3518). - - * Docbook, JATS, TEI writers: print INFO message when omitting interior - header (#3750). This only applies to section headers inside list items, - e.g., which were otherwise silently omitted. - - * Change to `--reference-links` in Markdown writer (#3701). With - `--reference-location` of `section` or `block`, pandoc will now repeat - references that have been used in earlier sections. The Markdown - reader has also been modified, so that *exactly* repeated references - do not generate a warning, only references with the same label but - different targets. The idea is that, with references after every block, - one might want to repeat references sometimes. - - * ODT/OpenDocument writer: - - + Support `lang` attribute (#1667). - + Added support for `--toc` (#2836). Thanks to @anayrat. - - * Docx writer: - - + `lang` meta, see #1667 (Mauro Bieg, #3515). - + Change `FigureWithCaption` to `CaptionedFigure` (iandol, #3658). - + Use `Table` rather than `Table Normal` for table style (#3275). - `Table Normal` is the default table style and can't be modified. - + Pass through comments (#2994). We assume that comments are defined as - parsed by the docx reader: - - I want <span class="comment-start" id="0" author="Jesse Rosenthal" - date="2016-05-09T16:13:00Z">I left a comment.</span>some text to - have a comment <span class="comment-end" id="0"></span>on it. - - We assume also that the id attributes are unique and properly - matched between comment-start and comment-end. - + Bookmark improvements. Bookmark start/end now surrounds content rather - than preceding it. Bookmarks generated for Div with id - (jgm/pandoc-citeproc#205). - + Add `keywords` metadata to docx document properties (Ian). - - * RST writer: support unknown interpreted text roles by - parsing them as `Span` with `role` attributes (#3407). This - way they can be manipulated in the AST. - - * HTML writer: - - + Line block: Use class instead of style attribute (#1623). We now - issue `<div class="line-block">` and include a default definition - for `line-block` in the default templates, instead of hard-coding a - `style` on the div. - + Add class `footnoteBack` to footnote back references (Timm Albers). - This allows for easier CSS styling. - + Render SmallCaps as span with smallcaps class (#1592), rather than - using a style attribute directly. This gives the user more flexibility - in styling small caps in CSS. - + With reveal.js we use `data-src` instead of `src` for images for - lazy loading. - + Special-case `.stretch` class for images in reveal.js (#1291). - Now in reveal.js, an image with class `stretch` in a paragraph - by itself will stretch to fill the whole screen, with no - caption or figure environment. - - * Added warnings for non-rendered blocks to writers. - - * Writers now raise an error on template failure. - - * When creating a PDF via LaTeX, warn if the font is missing some - characters (#3742). - - * Remove initial check for PDF-creating program (#3819). - Instead, just try running it and raise the exception if it - isn't found at that point. This improves things for users of Cygwin - on Windows, where the executable won't be found by `findExecutable` - unless `.exe` is added. The same exception is raised as before, but - at a later point. - - * Readers issue warning for duplicate header identifiers (#1745). - Autogenerated header identifiers are given suffixes so as not to clash - with previously used header identifiers. But they may still coincide with - an explicit identifier that is given for a header later in the document, - or with an identifier on a div, span, link, or image. We now issue - a warning in this case, so users can supply an explicit identifier. - - * CommonMark reader now supports `emoji`, `hard_line_breaks`, `smart`, - and `raw_html` extensions. - - * Markdown reader: - - + Don't allow backslash + newline to affect block structure (#3730). - Note that as a result of this change, the following, which formerly - produced a header with two lines separated by a line break, will - now produce a header followed by a paragraph: - - # Hi\ - there - - This may affect some existing documents that relied on - this undocumented and unintended behavior. This change makes pandoc - more consistent with other Markdown implementations, and with itself - (since the two-space version of a line break doesn't work inside ATX - headers, and neither version works inside Setext headers). - - - * Org reader (Albert Krewinkel, unless noted): - - + Support `table.el` tables (#3314). - + Support macros (#3401). - + Support the `#+INCLUDE:` file inclusion mechanism (#3510). - Recognized include types are `example`, `export`, `src`, and - normal org file inclusion. Advanced features like line numbers - and level selection are not implemented yet. - + Interpret more meta value as inlines. The values of the following - meta variables are now interpreted using org-markup instead of - treating them as pure strings: `keywords` (comma-separated list of - inlines), `subtitle` (inline values), `nocite` (inline values, can - be repeated). - + Support `\n` export option (#3940). This turns all newlines in the - text into hard linebreaks. - - * RST reader: - - + Improved admonition support (#223). We no longer add an - `admonition` class, we just use the class for the type of admonition, - `note` for example. We put the word corresponding to the label in - a paragraph inside a `Div` at the beginning of the admonition with - class `admonition-title`. This is about as close as we can get to - RST's own output. - + Initial support of `.. table` directive. This allows adding captions - to tables. - + Support `.. line-block` directive. This is deprecated but may still - be in older documents. - + Support scale and align attributes of images (#2662). - + Implemented implicit internal header links (#3475). - + Support RST-style citations (#853). The citations appear at the end - of the document as a definition list in a special div with id - `citations`. Citations link to the definitions. - + Recurse into bodies of unknown directives (#3432). - In most cases it's better to preserve the content than - to emit it. This isn't guaranteed to have good results; - it will fail spectacularly for unknown raw or verbatim directives. - + Handle chained link definitions (#262). For example, - - .. _hello: - .. _goodbye: example.com - - Here both `hello` and `goodbye` should link to `example.com`. - + Support anchors (#262). E.g. - - `hello` - - .. _hello: - - paragraph - - This is supported by putting "paragraph" in a `Div` with id `hello`. - + Support `:widths:` attribute for table directive. - + Implement csv-table directive (#3533). Most attributes are supported, - including `:file:` and `:url:`. - + Support unknown interpreted text roles by parsing them as Span - with "role" attributes (#3407). This way they can be manipulated in - the AST. - - * HTML reader: parse a span with class `smallcaps` as `SmallCaps`. - - * LaTeX reader: - - + Implemented `\graphicspath` (#736). - + Properly handle column prefixes/suffixes. For example, in - `\begin{tabular}{>{$}l<{$}>{$}l<{$} >{$}l<{$}}` - each cell will be interpreted as if it has a `$` - before its content and a `$` after (math mode). - + Handle komascript `\dedication` (#1845). It now adds a - `dedication` field to metadata. It is up to the user to supply - a template that uses this variable. - + Support all `\textXX` commands, where XX = `rm`, `tt`, `up`, `md`, - `sf`, `bf` (#3488). Spans with a class are used when there is - nothing better. - + Expand `\newenvironment` macros (#987). - + Add support for LaTeX subfiles package (Marc Schreiber, #3530). - + Better support for subfigure package (#3577). - A figure with two subfigures turns into two pandoc - figures; the subcaptions are used and the main caption - ignored, unless there are no subcaptions. - + Add support for \vdots (Marc Schreiber, #3607). - + Add basic support for hyphenat package (Marc Schreiber, #3603). - + Add basic `\textcolor` support (Marc Schreiber). - + Add support for `tabularx` environment (Marc Schreiber, #3632). - + Better handling of comments inside math environments (#3113). - This solves a problem with commented out `\end{eqnarray}` inside - an eqnarray (among other things). - + Parse tikzpicture as raw verbatim environment if `raw_tex` extension - is selected (#3692). Otherwise skip with a warning. This is better - than trying to parse it as text! - + Add `\colorbox` support (Marc Schreiber). - + Set identifiers on Spans used for `\label`. - + Have `\setmainlanguage` set `lang` in metadata. - + Support etoolbox's `\ifstrequal`. - + Support `plainbreak`, `fancybreak` et al from the memoir class - (bucklereed, #3833). - + Support `\let`. Also, fix regular macros so they're expanded at the - point of use, and NOT also the point of definition. `\let` macros, - by contrast, are expanded at the point of definition. Added an - `ExpansionPoint` field to `Macro` to track this difference. - + Support simple `\def` macros. Note that we still don't support - macros with fancy parameter delimiters, like `\def\foo#1..#2{...}`. - + Support \chaptername, \partname, \abstractname, etc. (#3559, - obsoletes #3560). - + Put content of `\ref`, `\label`, `\eqref` commands into `Span` with - attributes, so they can be handled in filters (Marc Schreiber, #3639) - + Add Support for `glossaries` and `acronym` package (Marc Schreiber, - #3589). Acronyms are not resolved by the reader, but acronym and - glossary information is put into attributes on Spans so that they - can be processed in filters. - + Use `Link` instead of `Span` for `\ref`. This makes more sense - semantically and avoids unnecessary `Span [Link]` nestings when - references are resolved. - + Rudimentary support for `\hyperlink`. - + Support `\textquoteleft|right`, `\textquotedblleft|right` (#3849). - + Support `\lq`, `\rq`. - + Implement `\newtoggle`, `\iftoggle`, `\toggletrue|false` from etoolbox - (#3853). - + Support `\RN` and `\Rn`, from biblatex (bucklereed, #3854). - + Improved support for `\hyperlink`, `\hypertarget` (#2549). - + Support `\k` ogonek accent. - + Improve handling of accents. Handle ogonek, and fall back correctly - with forms like `\"{}`. - + Better support for ogonek accents. - + Support for `\faCheck` and `\faClose` (Marc Schreiber, #3727). - + Support for `xspace` (Marc Schreiber, #3797). - + Support `\setmainlanguage` or `\setdefaultlanguage` (polyglossia) - and `\figurename`. - + Better handling of `\part` in LaTeX (#1905). Now we parse chapters as - level 0 headers, and parts as level -1 headers. After parsing, we - check for the lowest header level, and if it's less than 1 we bump - everything up so that 1 is the lowest header level. So `\part` will - always produce a header; no command-line options are needed. - + Add block version of `\textcolor` (Marc Schreiber). - + `\textcolor` works as inline and block command (Marc Schreiber). - + `\textcolor` will be parse as span at the beginning of a paragraph - (Marc Schreiber). - + Read polyglossia/babel `\text(LANG){...}` (bucklereed) - + Improved handling of include files in LaTeX reader (#3971). - Previously `\include` wouldn't work if the included file - contained, e.g., a begin without a matching end. - + Support `\expandafter` (#3983). - + Handle `\DeclareRobustCommand` (#3983). Currently it's just treated - as a synonym for `\newcommand`. - + Handle `\lettrine` (Mauro Bieg). - - * Math improvements due to updates in texmath: - - + Improved handling of accents and upper/lower delimiters. - + Support for output in GNU eqn format (used with *roff). - + Allow `\boldsymbol` + a token without braces, and similarly - with other styling commands. - + Improve parsing of `\mathop` to allow multi-character operator names. - + Add thin space after math operators when "faking it with - unicode." - - * `walk` is now used instead of `bottomUp` in the `ToJSONFilter` - instance for `a -> [a]` (pandoc-types). Note that behavior - will be slightly different, since `bottomUp`'s treatment of - a function `[a] -> [a]` is to apply it to each sublist of a - list, while walk applies it only to maximal sublists. - Usually the latter behavior is what is wanted, and the - former can be simulated when needed. But there may be - existing filters that need to be rewritten in light of the - new behavior. Performance should be improved. - - * There are some changes to syntax highlighting due to revisions - in the `skylighting` library: - - + Support for `powershell` has been added, and many syntax - definitions have been updated. - + Background colors have been added to the `kate` style. - + The way highlighted code blocks are formatted in HTML has - been changed (David Baynard), in ways that may require - changes in hard-coded CSS affecting highlighting. - (If you haven't included hard-coded highlighting CSS in - your template, you needn't change anything.) - - - [API changes] - - * New module `Text.Pandoc.Class` (Jesse Rosenthal, John MacFarlane). - This contains definitions of the `PandocMonad` typeclass, the - `PandocIO` and `PandocPure` monads, and associated functions. - - * Changed types of all writers and readers. - - + We now use `Text` instead of `String` in the interface (#3731). - (We have not yet changed the internals of most readers to work - with `Text`, but making this change in the API now opens up a - path to doing that.) - + The result is now of form `m a` with constraint `PandocMonad m`. - Readers and writers can be combined to form monadic values which - can be run using either `runIO` or `runPure`. If `runIO` is used, - then both readers and writers will be able to do IO when needed - (for include files, for example); if `runPure` is used, - then the functions are pure and will not touch IO. - + Where previously you used - `writeRST def (readMarkdown def "[foo](url)")`, now you - would use - `runPure $ readMarkdown def (pack "[foo](url)") >>= writeRST def`. - - * New module `Text.Pandoc.Readers` (Albert Krewinkel). This - contains reader helper functions formerly defined in the - top-level `Text.Pandoc` module. - - + Changed `StringReader` -> `TextReader`. - + `getReader` now returns a pair of a reader and - `Extensions`, instead of building the extensions into the - reader (#3659). The calling code must explicitly set - `readerExtensions` using the `Extensions` returned. The - point of the change is to make it possible for the calling - code to determine what extensions are being used. - - * New module `Text.Pandoc.Writers` (Albert Krewinkel). - This contains writer helper functions formerly defined in the - top-level `Text.Pandoc` module. - - + Changed `StringWriter` -> `TextWriter`. - + `getWriter` now retuns a pair of a reader and - `Extensions`, instead of building the extensions into the - reader (#3659). The calling code must explicitly set - `readerExtensions` using the `Extensions` returned. The - point of the change is to make it possible for the calling - code to determine what extensions are being used. - - * New module `Text.Pandoc.Lua`, exporting `runLuaFilter` (Albert Krewinkel, - #3514). - - * New module `Text.Pandoc.App`. This abstracts out the functionality - of the command line program (`convertWithOpts`), so it can be reproduced - e.g. in a desktop or web application. Instead of exiting, we throw errors - (#3548), which are caught (leading to exit) in pandoc.hs, but allow other - users of `Text.Pandoc.App` to recover. `pandoc.hs` is now a 2-liner. - The module also exports some utility functions for parsing options - and running filters. - - * New module `Text.Pandoc.Logging` (exported module) (#3392). - This now contains the `Verbosity` definition previously in - `Text.Pandoc.Options`, as well as a new `LogMessage` datatype that will - eventually be used instead of raw strings for warnings. This will enable - us, among other things, to provide machine-readable warnings if desired. - Include ToJSON instance and showLogMessage. This gives us the possibility - of both machine-readable and human-readable output for log messages. - - * New module `Text.Pandoc.BCP47`, with `getLang`, `Lang(..)`, `parseBCP47`. - - * New module `Text.Pandoc.Translations`, exporting `Term`, - `Translations`, `readTranslations`. - - * New module `Text.Pandoc.Readers.LaTeX.Types', exporting `Macro`, `Tok`, - `TokType`, `Line`, `Column`. - - * `Text.Pandoc.Error`: added many new constructors for `PandocError`. - - * Expose some previously private modules (#3260). These are often - helpful to people writing their own reader or writer modules: - - + `Text.Pandoc.Writers.Shared` - + `Text.Pandoc.Parsing` - + `Text.Pandoc.Asciify` - + `Text.Pandoc.Emoji` - + `Text.Pandoc.ImageSize` - + `Text.Pandoc.Highlighting` -` - * New module `Text.Pandoc.Extensions` (Albert Krewinkel): - Extension parsing and processing functions were defined in the top-level - `Text.Pandoc` module. These functions are moved to the Extensions - submodule as to enable reuse in other submodules. - - * Add `Ext_raw_attribute` constructor for `Extension`. - - * Add `Ext_fenced_divs` constructor for `Extension'. - - * Add `Ext_four_space_rule` constructor in `Extension`. - - * Add `Ext_gfm_auto_identifiers` constructor for `Extension`. - - * Add `Monoid` instance for `Extensions`. - - * Add `Text.Pandoc.Writers.Ms`, exporting `writeMs`. - - * Add `Text.Pandoc.Writers.JATS`, exporting `writeJATS`. - - * Add `Text.Pandoc.Writers.Muse`, exporting `writeMuse`. - - * Add `Text.Pandoc.Readers.Muse`, exporting `readMuse`. - - * Add `Text.Pandoc.Readers.TikiWiki`, exporting `readTikiWiki`. - - * Add `Text.Pandoc.Readers.Vimwiki`, exporting `readVimwiki`. - - * Add `Text.Pandoc.Readers.Creole`, exporting `readCreole`. - - * Export `setVerbosity` from `Text.Pandoc`. - - * `Text.Pandoc.Pretty`: Add `Eq` instance for `Doc`. - - * `Text.Pandoc.XML`: `toEntities`: changed type to `Text -> Text`. - - * `Text.Pandoc.UTF8`: - - + Export `fromText`, `fromTextLazy`, `toText`, `toTextLazy`. - Define `toString`, `toStringLazy` in terms of them. - + Add new functions parameterized on `Newline`: `writeFileWith`, - `putStrWith`, `putStrLnWith`, `hPutStrWith`, `hPutStrLnWith`. - - * `Text.Pandoc.MediaBag`: removed `extractMediaBag`. - - * `Text.Pandoc.Highlighting`: - - + `highlighting` now returns an Either rather than Maybe. - This allows us to display error information returned by the skylighting - library. Display a warning if the highlighting library throws an error. - + Add parameter for `SyntaxMap` to `highlight`. - - * `Text.Pandoc.Writers.Math`: - - + Export `defaultMathJaxURL`, `defaultKaTeXURL`. This will ensure that - we only need to update these in one place. - - * `Text.Pandoc.SelfContained`: - - + Removed `WriterOptions` parameter from `makeSelfContained`. - + Put `makeSelfContained` in PandocMonad instead of IO. This removes - the need to pass MediaBag around and improves exceptions. It also - opens up the possibility of using makeSelfContained purely. - + Export `makeDataURI`. - - * `Text.Pandoc.ImageSize`: - - + Export `lengthToDim`, new function `scaleDimension`. - + Export `inEm` from ImageSize (#3450). - + Change `showFl` and `show` instance for `Dimension` so - extra decimal places are omitted. - + Added `Em` as a constructor of `Dimension`. - + Add `WriterOptions` parameter to `imageSize` signature (Mauro Bieg). - - * `Text.Pandoc.Templates`: - - + Change type of `renderTemplate'`. Now it runs in `PandocMonad` - and raises a proper `PandocTemplateError` if there are problems, rather - than failing with uncatchable `error`. - + Change signature of `getDefaultTemplate`. Now it runs in any instance - of `PandocMonad`, and returns a `String` rather than an `Either` value. - And it no longer takes a `datadir` parameter, since this can be - retrieved from `CommonState`. - - * `Text.Pandoc.Options`: - - + Added `writerEpubSubdirectory` to `WriterOptions` (#3720). - The EPUB writer now takes its EPUB subdirectory from this option. - + In `WriterOptions`, rename `writerLaTeXEngine` to `writerPdfEngine` - and `writerLaTeXArgs` to `writerPdfArgs` (Mauro Bieg, #3909). - + Add `writerSyntaxMap` to `WriterOptions`. - + Removed `writerEpubStylesheet` from `WriterOptions`. - + Remove `writerUserDataDir` from `WriterOptions`. It is now carried - in `CommonState` in `PandocMonad` instances. (And thus it can be used - by readers too.) - + Changed `writerEpubMetadata` to a `Maybe String`. - + Removed `readerApplyMacros` from `ReaderOptions`. Now we just check - the `latex_macros` reader extension. - + FromJSON/ToJSON instances for `ReaderOptions`. - + In `HTMLMathMethod`, the `KaTeX` contsructor now takes only - one string (for the KaTeX base URL), rather than two. - + Removed `writerSourceURL` from `WriterOptions`. We now use - `stSourceURL` in `CommonState`, which is set by `setInputFiles`. - - * `Text.Pandoc.Shared`: - - + `tabFilter` now takes a `Text`, not `String`. - + `openURL`: Changed type from an Either. Now it will just raise - an exception to be trapped later. - + Remove `normalizeSpaces` (#1530). - + Remove `warn`. (Use `report` from `Text.Pandoc.Class` instead.) - + Export a new function `crFilter`. - + Add `eastAsianLineBreakFilter` (previously in Markdown reader). - + Provide custom `isURI` that rejects unknown schemes. - (Albert Krewinkel, #2713). We also export the set of known - `schemes`. The new function replaces the function of the same name - from `Network.URI`, as the latter did not check whether a scheme is - well-known. All official IANA schemes (as of 2017-05-22) are - included in the set of known schemes. The four non-official schemes - `doi`, `isbn`, `javascript`, and `pmid` are kept. - + Remove `err`. - + Remove `readDataFile`, `readDefaultDataFile`, `getReferenceDocx`, - `getReferenceODT`. These now live in `Text.Pandoc.Class`, - where they are defined in terms of `PandocMonad` - primitives and have different signatures. - + Remove `openURL`. Use `openURL` from `Text.Pandoc.Class` instead. - + Add `underlineSpan`. - - * `Text.Pandoc.Readers.HTML`: export new `NamedTag` class. - - * `Text.Pandoc.Readers.Markdown`: remove `readDocxWithWarnings`. - With the new API one can simply use `getLog` after running - the reader. - - * `Text.Pandoc.Readers.LaTeX`: Changed types for `rawLaTeXInline` - and `rawLaTeXBlock`. (Both now return a `String`, and they are - polymorphic in state.) - - - [bug fixes and under-the-hood improvements] - - * TEI writer: Added identifiers on `<div>` elements. - - * DokuWiki reader: Better handling for code block in list item (#3824). - - * Custom writer: Remove old preprocesesor conditionals (Albert Krewinkel). - - * ZimWiki writer: Removed internal formatting from note and table cells, - because ZimWiki does not support it (Alex Ivkin, #3446). - - * MediaWiki writer: - - + Updated list of syntax highlighting languages (#3461). - Now `r` gets you `<source>` rather than `<code>` (among others). - + Add display attribute on `<math>` tags (#3452). This allows display - math to be rendered properly. - + Remove newline before `</ref>` (#2652). - + Don't softbreak lines inside list items (#3531). - - * Org writer: - - + Reduce to two spaces after bullets (#3417, Albert Krewinkel). - + Add unit tests (Alexander Krotov). - + Stop using raw HTML to wrap divs (Albert Krewinkel, #3771). - + Do not strip `#` from Org anchor links (Alexander Krotov). - - * CommonMark writer: - - + Avoid excess blank lines at end of output. - + Prefer pipe tables to HTML tables even if it means losing relative - column width information (#3734). - + Support table, strikethrough extensions, when enabled (as with gfm). - Note that we bypass the commonmark writer from cmark and construct our - own pipe tables, with better results. - + Properly support `--wrap=none`. - + Use smallcaps class for `SmallCaps` (#1592). - + Omit "fig:" prefix in image titles. This is used internally to - indicate internal figures. - - * RST writer: - - + Properly handle table captions. - + Don't wrap lines in in definition list terms. Wrapping is not allowed. - + Implemented `+/-smart` and improved escaping with `+smart`. - + Add empty comments when needed to avoid including a blockquote - in the indented content of a preceding block (#3675). - + Improve grid table output, fix bug with empty rows (#3516). - Uses the new `gridTable` in Writers.Shared, which is here - improved to better handle 0-width cells. - + Remove space at beginning/end of RST code span (#3496). Otherwise - we get invalid RST. There seems to be no way to escape the space. - + Add header anchors when header has non-standard id (#3937). - + Correctly handle inline code containing backticks, using a `:literal:` - role (#3974). - + Don't backslash-escape word-internal punctuation (#3978). - - * Markdown writer: - - + Don't include variables in metadata blocks. Previously variables set - on the command line were included in e.g. YAML metadata, contrary to - documentation and intentions. - + Improved escaping with `+smart`. - + Fixed grid tables embedded in grid tables (#2834). - + Use span with class 'smallcaps' for SmallCaps, instead of a style - attribute as before (#1592). - + Escape initial `%` in a paragraph if the `pandoc_title_blocks` - extension is enabled (#3454). Otherwise in a document starting with - a literal `%` the first line is wrongly interpreted as a title. - + Fixed false ordered lists in YAML metadata (#3492, #1685). Now we - properly escape things that would otherwise start ordered lists, - such as - - --- - title: 1. inline - ... - + Better handling of tables with empty columns (#3337). We now - calculate the number of columns based on the longest row (or the - length of aligns or widths). - + Escape unordered list markers at beginning of paragraph (#3497), to - avoid false interpretation as a list. - + Escape `|` appropriately. - + Ensure space before list at top level (#3487). - + Avoid spurious blanklines at end of document after tables and list, - for example. - + Fixed bugs in simple/multiline list output (#3384). - Previously we got overlong lists with `--wrap=none`. This is fixed. - Previously a multiline list could become a simple list (and would - always become one with `--wrap=none`). - + Don't emit a simple table if `simple_tables` disabled (#3529). - + Case-insensitive reference links (David A Roberts, #3616). - Ensure that we do not generate reference links whose labels differ only - by case. Also allow implicit reference links when the link - text and label are identical up to case. - + Put space before reference link definitions (Mauro Bieg, #3630). - + Better escaping for links (David A. Roberts, #3619). Previously the - Markdown writer would sometimes create links where there were none - in the source. This is now avoided by selectively escaping bracket - characters when they occur in a place where a link might be created. - + Added missing `\n` (David A. Roberts, #3647). - + Fixed duplicated reference links with `--reference-links` - and `--reference-location=section` (#3674). Also ensure that there - are no empty link references `[]`. - + Avoid inline surround-marking with empty content (#3715). - E.g. we don't want `<strong></strong>` to become `****`. - Similarly for emphasis, super/subscript, strikeout. - + Don't allow soft break in header (#3736). - + Make sure `plain`, `markdown_github`, etc. work for raw. - Previously only `markdown` worked. Note: currently a raw block labeled - `markdown_github` will be printed for any `markdown` format. - + Ensure that `+` and `-` are escaped properly so they don't cause - spurious lists (#3773). Previously they were only - if succeeded by a space, not if they were at end of line. - + Use pipe tables if `raw_html` disabled and `pipe_tables` enabled, - even if the table has relative width information (#3734). - + Markdown writer: don't crash on `Str ""`. - + Make `Span` with null attribute transparent. That is, we don't use - brackets or `<span>` tags to mark spans when there are no attributes; - we simply output the contents. - + Escape pipe characters when `pipe_tables` enabled (#3887). - + Better escaping of `<` and `>`. If `all_symbols_escapable` is set, - we backslash escape these. Otherwise we use entities as before. - + When writing plain, don't use ` ` to separate list and indented - code. There's no need for it in this context, since this isn't to be - interpreted using Markdown rules. - + Preserve classes in JS obfuscated links (Timm Albers, #2989). - HTML links containing classes originally now preserve them when using - JavaScript email obfuscation. - + Render `SmallCaps` as a native span when `native_spans` are enabled. - + Always write attributes with `bracketed_spans` (d-dorazio). - - * Man writer: - - + Fix handling of nested font commands (#3568). Previously pandoc emitted - incorrect markup for bold + italic, for example, or bold + code. - + Avoid error for definition lists with no definitions (#3832). - - * DocBook writer: - - + Fix internal links with `writerIdentifierPrefix opt` - (#3397, Mauro Bieg). - - * Docx writer: - - + Don't include bookmarks on headers unless non-null id (#3476). - + Support 9 levels of headers (#1642). - + Allow 9 list levels (#3519). - + Don't take `distArchive` from datadir (#3322). The docx writer takes - components from the distribution's version of `reference.docx` when it - can't find them in a user's custom `reference.docx`. Previously, we - allowed a `reference.docx` in the data directory (e.g. `~/.pandoc`) - to be used as the distribution's reference.docx. This led to a - bizarre situation where pandoc would produce a good docx using - `--template ~/.pandoc/ref.docx`, but if `ref.docx` were moved to - `~/.pandoc/reference.docx`, it would then produce a corrupted docx. - + Fixed handling of soft hyphen (0173) (#3691). - + Better handling of keywords (#3719). - + Cleaner code for handling dir and style attributes for `Div`. - + Use `Set` for dynamic styles to avoid duplicates. - + Removed redundant element from data/docx/word/numbering.xml. - The elements we need are generated when the document is - compiled; this didn't do anything. - + Activate `evenAndOddHeaders` from reference docx (#3901, - Augustín Martín Barbero). - - * ODT/OpenDocument writer: - - + Calculate aspect ratio for percentage-sized images (Mauro Bieg, #3239). - + Use more widely available bullet characters (#1400). The old - characters weren't available in some font sets. These seem to work - well on Windows and Linux versions of LibreOffice. - + Wider labels for lists (#2421). This avoids overly narrow labels for - ordered lists with `()` delimiters. However, arguably it creates - overly wide labels for bullets. Also, lists now start flush with - the margin, rather than indented. - + Fixed dropped elements in some ordered lists (#2434). - - * FB2 writer: - - + Don't render `RawBlock` as code. - + Don't fail with an error on interior headers (e.g. in list) (#3750). - Instead, omit them with an INFO message. - + Add support for "lang" metadata (Alexander Krotov, #3625). - + Format `LineBlock` as poem (Alexander Krotov). Previously writer - produced one paragraph with `<empty-line/>` elements, which are not - allowed inside `<p>` according to FB2 schema. - + Replace `concatMap` with `cMap` (Alexander Krotov). - + Write FB2 lists without nesting blocks inside `<p>` (Alexander - Krotov, #4004) - - * HTML writer: - - + Make sure `html4`, `html5` formats work for raw blocks/inlines. - + Render raw inline environments when `--mathjax` used (#3816). - We previously did this only with raw blocks, on the assumption - that math environments would always be raw blocks. This has changed - since we now parse them as inline environments. - + Ensure we don't get two style attributes for width and height. - + Report when not rendering raw inline/block. - + Issue warning if no title specified and template used (#3473). - + Info message if `lang` is unspecified (#3486). - + Removed unused parameter in `dimensionsToAttributeList`. - + Avoid two class attributes when adding `uri` class (#3716). - + Fix internal links with `writerIdentifierPrefix opt` (#3397, Mauro - Bieg). - + Use revealjs's math plugin for mathjax (#3743). This is a thin - wrapper around mathjax that makes math look better on revealjs. - + Slidy: use h1 for all slides, even if they were originally - level 2 headers (#3566). Otherwise the built-in table of contents - in Slidy breaks. - - * LaTeX writer: - - + Don't render LaTeX images with data: URIs (#3636). Note that - `--extract-media` can be used when the input contains data: URIs. - + Make highlighted code blocks work in footnotes (Timm Albers). - + Don't use figure inside table cell (#3836). - + Use proper code for list enumerators (#3891). This should fix problems - with lists that don't use arabic numerals. - + Always add hypertarget when there's a non-empty identifier (#2719). - Previously the hypertargets were only added when there was actually - a link to that identifier. - + Use `%` after hypertarget before code block. - + Add `\leavevmode` before hypertarget at start of paragraph (#2704, - fixes formatting problems in beamer citations). - + Don't use `lstinline` in \item[..] (#645). If you do, the contents - of item disappear or are misplaced. Use `\texttt` instead. - + Fix problem with escaping in `lstinline` (#1629). Previously the - LaTeX writer created invalid LaTeX when `--listings` was specified and - a code span occured inside emphasis or another construction. - + Fix error with line breaks after empty content (#2874). LaTeX - requires something before a line break, so we insert a `~` if no - printable content has yet been emitted. - + Use BCP47 parser. - + Fixed detection of otherlangs (#3770). We weren't recursing into - inline contexts. - + Handle language in inline code with `--listings` (#3422). - + Write euro symbol directly in LaTeX (Andrew Dunning, #3801). - The textcomp package allows pdfLaTeX to parse `€` directly, making the - `\euro` command unneeded. - + Fixed footnotes in table captions (#2378). Note that if the table has - a first page header and a continuation page header, the notes will - appear only on the first occurrence of the header. - + In `writeBeamer` output, allow hyperlinks to frames (#3220). - Previously you could link to a header above or below slide level but - not *to* slide level. This commit changes that. Hypertargets are - inserted inside frame titles; technically the reference is to just - after the title, but in normal use (where slides are viewed full - screen in a slide show), this does not matter. - + Remove `\strut` at beginning of table cells (#3436). This fixes a - problem with alignment of lists in table cells. The `\strut` at the - end seems to be enough to avoid the too-close spacing that motivated - addition of the strut in #1573. - + Add partial siunitx Support (Marc Schreiber, #3588). - - * ConTeXt writer: - - + Refactored to use BCP47 module. - + Remove unnecessary `$` (Alexander Krotov, #3482). - + Use header identifiers for chapters (#3968). - - * EPUB writer: - - + `title_page.xhtml` is now put in `text/`. - + Don't strip formatting in TOC (#1611). - - * Textile reader: - - + Fix bug for certain links in table cells (#3667). - + Allow 'pre' code in list item (#3916). - - * HTML reader: - - + Added warnings for ignored material (#3392). - + Better sanity checks to avoid parsing unintended things as - raw HTML in the Markdown reader (#3257). - + Revise treatment of `li` with `id` attribute (#3596). Previously we - always added an empty div before the list item, but this created - problems with spacing in tight lists. Now we do this: If the list - item contents begin with a `Plain` block, we modify the `Plain` - block by adding a `Span` around its contents. Otherwise, we add a - `Div` around the contents of the list item (instead of adding an - empty `Div` to the beginning, as before). - + Add `details` tag to list of block tags (#3694). - + Removed `button` from block tag list (#3717). It is already in the - `eitherBlockOrInlineTag` list, and should be both places. - + Use `Set`s instead of lists for block tag lookup. - + Rewrote to use `Text` throughout. Effect on memory usage is modest - (< 10%). - + Use the lang value of `<html>` to set the lang meta value (bucklereed, - #3765). - + Ensure that paragraphs are closed properly when the parent block - element closes, even without `</p>` (#3794). - + Parse `<figure>` and `<figcaption>` (Mauro Bieg, #3813). - + Parse `<main>` like `<div role=main>` (bucklereed, #3791). - `<main>` closes `<p>` and behaves like a block element generally - + Support column alignments (#1881). These can be set either - with a `width` attribute or with `text-width` in a `style` attribute. - + Modified state type to be an instance of `HasLogMessages`, so - `registerHeader` can issue warnings. - + `</td>` or `</th>` should close any open block tag (#3991). - + `<td>` should close an open `<th>` or `<td>`. - + `htmlTag` improvements (#3989). We previously failed on cases - where an attribute contained a `>` character. This patch fixes the - bug, which especially affects raw HTML in Markdown. - - * Txt2Tags reader: - - + Newline is not indentation (Alexander Krotov). - - * MediaWiki reader: - - + Allow extra hyphens after `|-` in tables (#2649). - + Allow blank line after table start (#2649). - + Fixed more table issues (#2649). - + Ensure that list starts begin at left margin (#2606). Including when - they're in tables or other list items. - + Make smart double quotes depend on `smart` extension (#3585). - + Don't do curly quotes inside `<tt>` contexts (#3585). Even if `+smart`. - + Modified state type to be an instance of `HasLogMessages`, so - `registerHeader` can issue warnings. - - * TWiki reader (Alexander Krotov): - - + Remove unnecessary `$` (#3597). - + Simplify `linkText` (#3605). - - * EPUB reader: - - + Minor refactoring, avoiding explicit MediaBag handling. - This all works behind the scenes in CommonState plumbing. - - * Docx reader: - - + Don't drop smartTag contents (#2242). - + Handle local namespace declarations (#3365). Previously we didn't - recognize math, for example, when the xmlns declaration occured on - the element and not the root. - + More efficient trimSps (#1530). Replacing `trimLineBreaks`. This - does the work of `normalizeSpaces` as well, so we avoid the need for - that function here. - + Avoid 0-level headers (Jesse Rosenthal, #3830). We used to parse - paragraphs styled with "HeadingN" as "nth-level header." But if a - document has a custom style named "Heading0", this will produce a - 0-level header, which shouldn't exist. We only parse this style - if N>0. Otherwise we treat it as a normal style name, and - follow its dependencies, if any. - + Add tests for avoiding zero-level header (Jesse Rosenthal). - - * ODT reader: - - + Replaced `collectRights` with Rights from `Data.Either`. - + Remove dead code (Albert Krewinkel). - - * Org reader (Albert Krewinkel, unless noted). - - + Don't allow tables inside list items (John MacFarlane, #3499). - + Disallow tables on list marker lines (#3499). - + Convert markup at beginning of footnotes (John MacFarlane, #3576). - + Allow emphasized text to be followed by `[` (#3577). - + Handle line numbering switch for src blocks. - The line-numbering switch that can be given to source blocks (`-n` with - an start number as an optional parameter) is parsed and translated to a - class/key-value combination used by highlighting and other readers and - writers. - + Stop adding rundoc prefix to src params. Source block parameter names - are no longer prefixed with `rundoc`. This was intended to simplify - working with the rundoc project, a babel runner. However, the rundoc - project is unmaintained, and adding those markers is not the reader's - job anyway. The original language that is specified for a source - element is now retained as the `data-org-language` attribute and only - added if it differs from the translated language. - + Allow multi-word arguments to src block params (#3477). The reader now - correctly parses src block parameter list even if parameter arguments - contain multiple words. - + Avoid creating `nullMeta` by applying `setMeta` directly - (Alexander Krotov). - + Replace `sequence . map` with `mapM`. - + Fix smart parsing behavior. Parsing of smart quotes and special - characters can either be enabled via the `smart` language extension or - the `'` and `-` export options. Smart parsing is active if either the - extension or export option is enabled. Only smart parsing of special - characters (like ellipses and en and em dashes) is enabled by default, - while smart quotes are disabled. Previously, all smart parsing was - disabled unless the language extension was enabled. - + Subject full doc tree to headline transformations (Albert Krewinkel, - #3695). Emacs parses org documents into a tree structure, which is - then post-processed during exporting. The reader is changed to do the - same, turning the document into a single tree of headlines starting - at level 0. - + Fix cite parsing behaviour (Herwig Stuetz). Until now, `org-ref` - cite keys included special characters also at the end. This caused - problems when citations occur right before colons or at the end of - a sentence. With this change, all non alphanumeric characters at - the end of a cite key are ignored. This also adds `,` to the list - of special characters that are legal in cite keys to better mirror - the behaviour of org-export. - + Fix module names in haddock comments. Copy-pasting had lead to - haddock module descriptions containing the wrong module names. - + Recognize babel result blocks with attributes (#3706). Babel - result blocks can have block attributes like captions and names. - Result blocks with attributes were not recognized and were parsed - as normal blocks without attributes. - + Include tags in headlines. The Emacs default is to include tags in the - headline when exporting. Instead of just empty spans, which contain the - tag name as attribute, tags are rendered as small caps and wrapped in - those spans. Non-breaking spaces serve as separators for multiple tags. - + Respect export option for tags (#3713). Tags are appended to - headlines by default, but will be omitted when the `tags` export option - is set to nil. - + Use `tag-name` attribute instead of `data-tag-name`. - + Use `org-language` attribute rather than `data-org-language`. - + Modified state type to be an instance of `HasLogMessages`, so - `registerHeader` can issue warnings. - + End footnotes after two blank lines. Footnotes can not only be - terminated by the start of a new footnote or a header, but also by two - consecutive blank lines. - + Update emphasis border chars (#3933). The org reader was updated to - match current org-mode behavior: the set of characters which are - acceptable to occur as the first or last character in an org emphasis - have been changed and now allows all non-whitespace chars at the - inner border of emphasized text (see `org-emphasis-regexp-components`). - - * RST reader: - - + Fixed small bug in list parsing (#3432). Previously the parser didn't - handle properly this case: - - * - a - - b - * - c - - d - + Handle multiline cells in simple tables (#1166). - + Parse list table directive (Keiichiro Shikano, #3432). - + Make use of `anyLineNewline` (Alexander Krotov, #3686). - + Use `anyLineNewline` in `rawListItem` (Alexander Krotov, #3702). - + Reorganize block parsers for ~20% faster parsing. - + Fixed `..include::` directive (#3880). - + Handle blank lines correctly in line blocks (Alexander Krotov, #3881). - Previously pandoc would sometimes combine two line blocks separated - by blanks, and ignore trailing blank lines within the line block. - + Fix indirect hyperlink targets (#512). - - * Markdown reader: - - + Allow attributes in reference links to start on next line (#3674). - + Parse YAML metadata in a context that sees footnotes defined in - the body of the document (#1279). - + When splitting pipe table cells, skip tex math (#3481). - You might have a `|` character inside math. (Or for that matter - something that the parser might mistake for raw HTML.) - + Treat span with class `smallcaps` as SmallCaps. - This allows users to specify small caps in Markdown this way: - `[my text]{.smallcaps}` (#1592). - + Fixed internal header links (#2397). - This patch also adds `shortcut_reference_links` to the list - of mmd extensions. - + Treat certain environments as inline - when they occur without space surrounding them (#3309, #2171). - E.g. equation, math. This avoids incorrect vertical space - around equations. - + Optimized `nonindentSpaces`. Makes the benchmark go from 40 to 36 ms. - + Allow latex macro definitions indented 1-3 spaces. - Previously they only worked if nonindented. - + Improved parsing of indented raw HTML blocks (#1841). - Previously we inadvertently interpreted indented HTML as - code blocks. This was a regression. We now seek to determine the - indentation level of the contents of an HTML block, and (optionally) - skip that much indentation. As a side effect, indentation may be - stripped off of raw HTML blocks, if `markdown_in_html_blocks` is - used. This is better than having things interpreted as indented - code blocks. - + Fixed smart quotes after emphasis (#2228). E.g. in `*foo*'s 'foo'`. - + Warn for notes defined but not used (#1718). - + Use `anyLineNewline` (Alexander Krotov). - + Interpret YAML metadata as Inlines when possible (#3755). If - the metadata field is all on one line, we try to interpret it as - Inlines, and only try parsing as Blocks if that fails. If it - extends over one line (including possibly the `|` or `>` character - signaling an indented block), then we parse as Blocks. This was - motivated by some German users finding that `date: '22. Juin 2017'` - got parsed as an ordered list. - + Fixed spurious parsing as citation as reference def (#3840). - We now disallow reference keys starting with `@` if the - `citations` extension is enabled. - + Parse `-@roe` as suppress-author citation (pandoc-citeproc#237). - Previously only `[-@roe]` (with brackets) was recognized as - suppress-author, and `-@roe` was treated the same as `@roe`. - + Fixed parsing of fenced code after list when there is no intervening - blank line (#3733). - + Allow raw latex commands starting with `\start` (#3558). Previously - these weren't allowed because they were interpreted as starting - ConTeXt environments, even without a corresponding `\stop`... - + Added `inlines`, `inlines1`. - + Require nonempty alt text for `implicit_figures` (#2844). - A figure with an empty caption doesn't make sense. - + Removed texmath macro material; now all this is handled - in the LaTeX reader functions. - + Fixed bug with indented code following raw LaTeX (#3947). - - * LaTeX reader: - - + Rewrote LaTeX reader with proper tokenization (#1390, - #2118, #3236, #3779, #934, #982). This rewrite is primarily - motivated by the need to get macros working properly. A side benefit - is that the reader is significantly faster. We now tokenize the - input text, then parse the token stream. Macros modify the token - stream, so they should now be effective in any context, including - math. Thus, we no longer need the clunky macro processing - capacities of texmath. - + Parse `\,` to `\8198` (six-per-em space) (Henri Werth). - + Allow `\newcommand\foo{blah}` without braces. - + Support `\lstinputlisting` (#2116). - + Issue warnings when skipping unknown latex commands (#3392). - + Include contents of `\parbox`. - + Allow `\hspace` and `\vspace` to count as raw block or inline. - Previously we would refuse to parse anything as raw inline if - it was in the `blockCommands` list. Now we allow exceptions - if they're listed under ignoreInlines in inlineCommands. - This should make it easier e.g. to include an `\hspace` - between two side-by-side raw LaTeX tables. - + Don't drop contents of `\hypertarget`. - + Handle spaces before `\cite` arguments. - + Allow newpage, clearpage, pagebreak in inline contexts as well as - block contexts (#3494). - + Treat `{{xxx}}` the same as `{xxx}` (#2115). - + Use `pMacroDefinition` in macro (for more direct parsing). - Note that this means that `macro` will now parse one - macro at a time, rather than parsing a whole group together. - + Fixed failures on \ref{}, \label{} with `+raw_tex`. Now these - commands are parsed as raw if `+raw_tex`; otherwise, their argument - is parsed as a bracketed string. - + Don't crash on empty `enumerate` environment (#3707). - + Handle escaped `&` inside table cell (#3708). - + Handle block structure inside table cells (#3709). `minipage` is no - longer required. - + Handle some width specifiers on table columns (#3709). Currently - we only handle the form `0.9\linewidth`. Anything else would have - to be converted to a percentage, using some kind arbitrary assumptions - about line widths. - + Make sure `\write18` is parsed as raw LaTeX. The change is in the - LaTeX reader's treatment of raw commands, but it also affects the - Markdown reader. - + Fixed regression with starred environment names (#3803). - + Handle optional args in raw `\titleformat` (#3804). - + Improved heuristic for raw block/inline. An unknown command at the - beginning of the line that could be either block or inline is - treated as block if we have a sequence of block commands followed by - a newline or a `\startXXX` command (which might start a raw ConTeXt - environment). - + Don't remove macro definitions from the output, even if - `Ext_latex_macros` is set, so that macros will be applied. - Since they're only applied to math in Markdown, removing the macros - can have bad effects. Even for math macros, keeping them should be - harmless. - + Removed `macro`. It is no longer necessary, since the - `rawLaTeXBlock` parser will parse macro definitions. This also avoids - the need for a separate `latexMacro` parser in the Markdown reader. - + Use `label` instead of `data-label` for label in caption (#3639). - + Fixed space after \figurename etc. - + Resolve references to section numbers. - + Fix `\let\a=0` case, with single character token. - + Allow `@` as a letter in control sequences. `@` is commonly used - in macros using `\makeatletter`. Ideally we'd make the tokenizer - sensitive to `\makeatletter` and `\makeatother`, but until then this - seems a good change. - + Track header numbers and correlate with labels. - + Allow `]` inside group in option brackets (#3857). - + lstinline with braces can be used (verb cannot be used with braces) - (Marc Schreiber, #3535). - + Fix keyval funtion: pandoc did not parse options in braces correctly - (Marc Schreiber, #3642). - + When parsing raw LaTeX commands, include trailing space (#1773). - Otherwise things like `\noindent foo` break and turn into - `\noindentfoo`. Affects `-f latex+raw_tex` and `-f markdown` (and other - formats that allow `raw_tex`). - + Don't treat "..." as Quoted (#3958). This caused quotes to be omitted in - `\texttt` contexts. - + Add tests for existing `\includegraphics` behaviour (Ben Firshman). - + Allow space before `=` in bracketd options (Ben Firshman). - + Be more forgiving in parsing command options. This was needed, for - example, to make some minted options work. - + Strip off quotes in `\include` filenames. - - * Added `Text.Pandoc.CSV`, simple (unexported) CSV parser. - - * `Text.Pandoc.PDF`: - - + Got `--resource-path` working with PDF output (#852). - + Fetch images when generating PDF via context (#3380). - To do this, we create the temp directory as a subdirectory - of the working directory. Since context mk IV by default looks - for images in the parent directory, this works. - + Use `report` instead of `warn`, make it sensitive to verbosity settings. - + Use `fillMediaBag` and `extractMedia` to extract media to temp dir. - This reduces code duplication. - + `html2pdf`: use stdin instead of intermediate HTML file - + Removed useless `TEXINPUTS` stuff for `context2pdf`. mkiv context - doesn't use `TEXINPUTS`. - - * `Text.Pandoc.Pretty`: - - + Simplified definition of `realLength`. - + Don't error for blocks of size < 1. Instead, resize to 1 (see #1785). - - * `Text.Pandoc.MIME`: - - + Use `application/javascript` (not `application/x-javascript`). - + Added `emf` to mimeTypes with type `application/x-msmetafile` (#1713). - - * `Text.Pandoc.ImageSize`: - - + Improve SVG image size code (Marc Schreiber, #3580). - + Make `imageSize` recognize basic SVG dimensions (Mauro Bieg, #3462). - - * Use `Control.Monad.State.Strict` throughout. This gives 20-30% speedup - and reduction of memory usage in most of the writers. - - * Use `foldrWithKey` instead of deprecated `foldWithKey`. - - * `Text.Pandoc.SelfContained`: - - + Fixed problem with embedded fonts (#3629). - + Refactored getData from `getDataURI` in `SelfContained`. - + Don't use data URIs for script or style (#3423). Instead, just use - script or style tags with the content inside. The old method with - data URIs prevents certain optimizations outside pandoc. Exception: - data URIs are still used when a script contains `</script>` or a - style contains `</`. - + SelfContained: Handle URL inside material retrieved from a URL - (#3629). This can happen e.g. with an @import of a google web font. - (What is imported is some CSS which contains an url reference - to the font itself.) Also, allow unescaped pipe (|) in URL. - + Load resources from `data-src` (needed for lazy loading in - reveal.js slide shows). - + Handle `data-background-image` attribute on section (#3979). - - * `Text.Pandoc.Parsing`: - - + Added `indentWith` (Alexander Krotov, #3687). - + Added `stateCitations` to `ParserState`. - + Removed `stateChapters` from `ParserState`. - + In `ParserState`, make `stateNotes'` a Map, add `stateNoteRefs`. - + Added `gobbleSpaces` and `gobbleAtMostSpaces`. - + Adjusted type of `insertIncludedFile` so it can be used with token - parser. - + Replace old texmath macro stuff from Parsing. Use Macro from - Text.Pandoc.Readers.LaTeX.Types instead. - + Export `insertIncludedFile`. - + Added `HasLogMessages`, `logMessage`, `reportLogMessages` (#3447). - + Replace partial with total function (Albert Krewinkel). - + Introduce `HasIncludeFiles` type class (Albert Krewinkel). The - `insertIncludeFile` function is generalized to work with all parser - states which are instances of that class. - + Add `insertIncludedFilesF` which returns F blocks (Albert Krewinkel). - The `insertIncludeFiles` function was generalized and renamed - to `insertIncludedFiles'`; the specialized versions are based on that. - + `many1Till`: Check for the end condition before parsing (Herwig - Stuetz). By not checking for the end condition before the first - parse, the parser was applied too often, consuming too much of the - input. This only affects `many1Till p end` where `p` matches on a - prefix of `end`. - + Provide `parseFromString` (#3690). This is a verison of - `parseFromString` specialied to ParserState, which resets - `stateLastStrPos` at the end. This is almost always what we want. - This fixes a bug where `_hi_` wasn't treated as emphasis in the - following, because pandoc got confused about the position of the - last word: `- [o] _hi_`. - + Added `takeP`, `takeWhileP` for efficient parsing of `[Char]`. - + Fix `blanklines` documentation (Alexander Krotov, #3843). - + Give less misleading line information with `parseWithString`. - Previously positions would be reported past the end of the chunk. - We now reset the source position within the chunk and report - positions "in chunk." - + Add `anyLineNewline` (Alexander Krotov). - + Provide shared F monad functions for Markdown and Org readers - (Albert Krewinkel). The `F` monads used for delayed evaluation - of certain values in the Markdown and Org readers are based on a - shared data type capturing the common pattern of both `F` types. - + Add `returnF` (Alexander Krotov). - + Avoid parsing `Notes:**` as a bare URI (#3570). This avoids parsing - bare URIs that start with a scheme + colon + `*`, `_`, or `]`. - + Added `readerAbbreviations` to `ParserState`. Markdown reader - now consults this to determine what is an abbreviation. - + Combine grid table parsers (Albert Krewinkel, #3638). The grid table - parsers for markdown and rst was combined into one single - parser `gridTable`, slightly changing parsing behavior of both - parsers: (1) The markdown parser now compactifies block content - cell-wise: pure text blocks in cells are now treated as paragraphs - only if the cell contains multiple paragraphs, and as plain blocks - otherwise. Before, this was true only for single-column tables. (2) - The rst parser now accepts newlines and multiple blocks in header - cells. - + Generalize tableWith, gridTableWith (Albert Krewinkel). - The parsing functions `tableWith` and `gridTableWith` are generalized - to work with more parsers. The parser state only has to be an - instance of the `HasOptions` class instead of requiring a concrete - type. Block parsers are required to return blocks wrapped into a - monad, as this makes it possible to use parsers returning results - wrapped in `Future`s. - - * `Text.Pandoc.Shared`: - - + Simplify `toRomanNumeral` using guards (Alexander Krotov, #3445) - + `stringify`: handle Quoted better (#3958). Previously we were losing - the quotation marks in Quoted elements. - - * `Text.Pandoc.Writers.Shared`: - - + Export `metaToJSON'`, `addVariablesToJSON` (#3439). - This allows us to add the variables AFTER using the metadata - to generate a YAML header (in the Markdown writer). - + Added `unsmartify` (previously in RST writer). - Undo literal double curly quotes. Previously we left these. - + Generalize type of `metaToJSON` so it can take a Text. Previously a - String was needed as argument; now any ToJSON instance will do. - + Added `gridTable` (previously in Markdown writer). - + `gridTable`: Refactored to use widths in chars. - + `gridTable`: remove unnecessary extra space in cells. - + Fixed `addVariablesToJSON`. It was previously not allowing multiple - values to become lists. - + Pipe tables: impose minimum cell size (see #3526). - - - [default template changes] - - * HTML templates (including EPUB and HTML slide show templates): - - + Make default.html5 polyglot markup conformant (John Luke Bentley, - #3473). Polyglot markup is HTML5 that is also valid XHTML. See - <https://www.w3.org/TR/html-polyglot>. With this change, pandoc's - html5 writer creates HTML that is both valid HTML5 and valid XHTML. - + Regularized CSS in html/epub/html slide templates (#3485). - All templates now include `code{white-space: pre-wrap}` - and CSS for `q` if `--html-q-tags` is used. Previously some templates - had `pre` and others `pre-wrap`; the `q` styles were only sometimes - included. - + CSS for `.smallcaps`, (Mauro Bieg, #1592) - + `default.revealjs`: make `history` default to true. - + `default.revealjs`: use lazy loading (#2283). - + `default.revealjs`: add `mathjax` variable and some conditional code - to use the MathJaX plugin. - + `default.slidy` uses `https` instead of `http` (ickc, #3848). - + `default.dzslides`: Load Google Font using HTTPS by default - (Yoan Blanc). - - * DocBook5 template: Use `lang` and `subtitle` variables (Jens Getreu, - #3855). - - * LaTeX/Beamer template: - - + Combine LaTeX/Beamer templates (Andrew Dunning, #3878). - `default.beamer` has been removed; beamer now uses the - `default.latex` template. Beamer-specific parts are conditional - on the `beamer` variable set by the writer. Note that - `pandoc -D beamer` will return this (combined) template. - + Use `xcolor` for `colorlinks` option (Andrew Dunning, #3877). - Beamer loads `xcolor` rather than `color`, and thus the - `dvipsnames` option doesn't take effect. This also provides a wider - range of colour selections with the `svgnames` option. - + Use starred versions of `xcolor` names (Andrew Dunning). - Prevents changes to documents defined using the `dvipsnames` list (e.g. - `Blue` gives a different result with svgnames enabled). - + Load `polyglossia` after header-includes (#3898). It needs to be - loaded as late as possible. - + Use `unicode-math` (Vaclav Haisman). Use `mathspec` with only - XeLaTeX on request. - + Don't load `fontspec` before `unicode-math` (over there). - The `unicode-math` package loads `fontspec` so explict loading of - `fontspec` before `unicode-math` is not necessary. - + Use `unicode-math` by default in default.latex template. mathspec will - be used in xelatex if the `mathspec` variable is set; otherwise - unicode-math will be used (Václav Haisman). - + Use `dvipsnames` options when `colorlinks` specified (otherwise - we get an error for `maroon`) (Thomas Hodgson). - + Added beamer `titlegraphic` and `logo` variables (Thomas Hodgson). - + Fix typo in fix for notes in tables (#2378, zeeMonkeez). - + Fix `hyperref` options clash (Andrew Dunning, #3847) Avoids an options - clash when loading a package (e.g. `tufte-latex`) that uses - `hyperref` settings different from those in the template. - + Add `natbiboptions` variable (#3768). - + Fix links inside captions in LaTeX output with links-as-notes - (Václav Haisman, #3651). Declare our redefined `\href` robust. - + Load `parskip` before `hyperref` (Václav Haisman, #3654). - + Allow setting Japanese fonts when using LuaLaTeX (Václav Haisman, - #3873). by using the `luatexja-fontspec` and `luatexja-preset` - packages. Use existing `CJKmainfont` and `CJKoptions` template - variables. Add `luatexjafontspecoptions` for `luatexja-fontspec` - and `luatexjapresetoptions` for `luatexja-preset`. - + Added `aspectratio` variable to beamer template (Václav Haisman, - #3723). - + Modified template.latex to fix XeLaTex being used with tables - (lwolfsonkin, #3661). Reordered `lang` variable handling to - immediately before `bidi`. - - * ConTeXt template: Improved font handling: `simplefonts` is now - obsolete in ConTeXt (Pablo Rodríguez). - - - [documentation improvements] - - * MANUAL.txt: - - + Add URL for Prince HTML > PDF engine (Ian, #3919). - + Document that content above slide-level will be omitted in - slide shows. See #3460, #2265. - + Explain `--webtex` SVG url (Mauro Bieg, #3471) - + Small clarification in YAML metadata section. - + Document that html4 is technically XHTML 1.0 transitional. - + Remove refs to highlighting-kate (#3672). - + Document ibooks specific epub metadata. - + Clarify that mathml is used for ODT math. - + Mention limitations of Literate Haskell Support (#3410, - Joachim Breitner). - + Add documentation of limitations of grid tables (Stephen - McDowell, #3864). - + Clarify that meta-json contains transformed values (Jakob Voß, - #3491) Make clear that template variable `meta-json` does not - contain plain text values or JSON output format but field values - transformed to the selected output format. - - * COPYRIGHT: - - + Clarify that templates are dual-licensed. - + Clarify that pandoc-types is BSD3 licensed. - + List new files not written by jgm (Albert Krewinkel). - + Update dates in copyright notices (Albert Krewinkel). This follows - the suggestions given by the FSF for GPL licensed software. - <https://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html> - - * INSTALL.md: - - + Improved instructions for tests with patterns. - + Put RPM-based distros on separate point (Mauro Bieg, #3449) - - * CONTRIBUTING.md: - - + Fixed typos (Wandmalfarbe, #3479). - + Add "ask on pandoc-discuss" (Mauro Bieg). - - * Add lua filter documentation in `doc/lua-filters.md`. Note that the - end of this document is autogenerated from `data/pandoc.lua` - using `make doc/lua-filters.md`, which uses `tools/ldoc.ltp` - (Albert Krewinkel). - - * Add `doc/filters.md`. This is the old scripting tutorial from - the website. - - * Add `doc/using-the-pandoc-api.md` (#3289). This gives an introduction - to using pandoc as a Haskell library. - - - [build infrastructure improvements] - - * Removed `data/templates` submodule. Templates are now a subtree - in `data/templates`. This removes the need to do `git submodule - update`. - - * Renamed `tests` -> `test`. - - * Remove `https` flag. Always build with HTTPS support. - - * Use `file-embed` instead of `hsb2hs` to embed data files when - `embed_data_files` flag is set. `file-embed` gives us better dependency - tracking: if a data file changes, ghc/stack/cabal know to recompile - the Data module. This also removes `hsb2hs` as a build dependency. - - * Add `custom-setup` stanza to pandoc, lowercase field names. - - * Add `static` Cabal flag. - - * Name change OSX -> MacOS. Add a -MacOS suffix to mac package rather - than -OSX. Changed local names from osx to macos. - - * make_macos_package.sh - Use strip to reduce executable size. - - * Revised binary linux package. Now a completely static executable - is created, using Docker and alpine. We create both a deb and a - tarball. The old `deb` directory has been replaced with a `linux` - directory. Running `make` in the `linux` directory should - perform the build, putting the binary packages in `artifacts/`. - - * `linux/control.in`: add `Replaces:`, so existing pandoc-citeproc and - pandoc-data packages will be uninstalled; this package provides - both (#3822). Add latex packages as 'suggested', update - description. - - * Remove cpphs build requirement -- it is no longer needed. - - * Replaced `{deb,macos,windows}/stack.yaml` with `stack.pkg.yaml`. - - * Name change OSX -> macOS (ickc, #3869). - - * Fix casing of Linux, UNIX, and Windows (ickc). - - * `.travis.yml`: create a source dist and do cabal build and test there. - That way we catch errors due to files missing from the data - section of pandoc.cabal. - - * Makefile: - - + Split `make haddock` from `make full`. - + Add BRANCH variable for winpkg. - + Add `lint` target. - + Improve `make full`. Disable optimizations. - Build everything, inc. trypandoc and benchmarks. Use parallel build. - + Allow `make test` to take `TESTARGS`. - - * Added new command tests (`Tests.Command`), using small text files - in `test/command/`. Any files added in this directory will be treated - as shell tests (see smart.md for an example). This makes it very easy - to add regression tests etc. - - * Test fixes so we can find data files. In old tests & command tests, - we now set the environment variable `pandoc_datadir`. In lua tests, - we set the datadir explicitly. - - * Refactored `compareOutput` in docx writer test. - - * Consolidated some common functions in `Tests.Helper`. - - * Small change to unbalanced bracket test to speed up test suite. - - * Speed up Native writer quickcheck tests. - - * Use tasty for tests rather than test-framework. - - * Add simple Emacs mode to help with Pandoc templates editing. - (Václav Haisman, #3889). `tools/pandoc-template-mode.el` - - -pandoc (1.19.2) - - * Use skylighting library instead of highlighting-kate for syntax - highlighting. Skylighting is faster and more accurate (#3363). - Later we'll be able to add features like warning messages, dynamic - loading of xml syntax definitions, and dynamic loading of themes. - - * Added a new highlight style, `breezeDark`. - - * Text.Pandoc.Highlighting: Update list of `listings` languages (#3374). - This allows more languages to be used when using the `--listings` - option. - - * OpenDocument writer: - - + Small refactoring. Removed separate 'parent' parameter in paraStyle. - + Don't profilerate text styles unnecessarily (#3371). - This change makes the writer create only as many temporary - text styles as are absolutely necessary. It also consolidates - adjacent nodes with the same style. - - * Org reader (Albert Krewinkel): - - + Allow short hand for single-line raw blocks (Albert Krewinkel, - #3366). Single-line raw blocks can be given via `#+FORMAT: raw line`, - where `FORMAT` must be one of `latex`, `beamer`, `html`, or `texinfo`. - + Accept org-ref citations followed by commas (Albert Krewinkel). - Bugfix for an issue which, whenever the citation was immediately - followed by a comma, prevented correct parsing of org-ref citations. - + Ensure emphasis markup can be nested. Nested emphasis markup (e.g. - `/*strong and emphasized*/`) was interpreted incorrectly in that the - inner markup was not recognized. - + Remove pipe char irking the haddock coverage tool (Albert Krewinkel). - - * Docx reader: Empty header should be list of lists (Jesse Rosenthal). - In the past, the docx reader wrote an empty header as an empty list. It - should have the same width as a row (and be filled with empty cells). - - * MediaWiki reader: - - + Improved handling of display math (#3362). Sometimes display math is - indented with more than one colon. Previously we handled these cases - badly, generating definition lists and missing the math. - + Fix quotation mark parsing (#3336, tgkokk). Change MediaWiki reader's - behavior when the smart option is parsed to match other readers' - behavior. - - * Markdown reader: - - + Fixed `-f markdown_github-hard_line_breaks+escaped_line_breaks` - (#3341). Previously this did not properly enable escaped line breaks. - + Disallow space between inline code and attributes (#3326, #3323, - Mauro Bieg). - - * DocBook5 writer: make id attribute xml:id, fixes #3329 (#3330, Mauro Bieg). - - * Added some test cases for ODT reader (#3306, #3308, Hubert Plociniczak). - - * LaTeX writer: allow tables with empty cells to count as "plain." - This addresses a problem of too-wide tables when empty cells - are used. Thanks to Joost Kremers for reporting the issue. - - * Org writer: prefix footnote numbers with `fn:` (Albert Krewinkel). - Unprefixed numbers where used by older org-mode versions, but are no - longer supported. - - * HTML writer: don't process pars with empty RawInline, (#1040, #3327, - Mauro Bieg). - - * Markdown writer: Fix display math with `--webtex` (#3298). - - * Fix sample.lua so it properly handles raw blocks/inlines (#3358, - bumper314). - - * Templates: - - + default.latex: Moved geometry after hyperref (Václav Haisman). - Otherwise PDF sizes can be wrong in some circumstances. - + Copied a few changes from default.latex to default.beamer - (Wandmalfarbe). - + default.latex, default.beamer: Changed position of `\VerbatimNotes` - and `fancyvrb`. This fixes hyperlinks on footnotes in documents - that contain verbatim in notes (#3361). (Note: the beamer template - was updated to match the LaTeX template, but at this point verbatim - in notes seems not to work in beamer.) - + default.latex: Allow passing `microtypeoptions` to microtype - (Václav Haisman). - + default.latex: Add hyphen option to url package. - + default.docbook5: Fix namespace declarations (Mauro Bieg). - - * Moved `make_osx_package.sh` to `osx/` directory. - - * Travis continuous integration: - - + Fix false positives with dist build. - + Speed improvements (Kolen Cheung, #3304, #3357). - - * MANUAL.txt: - - + Clarify that blank space is needed around footnotes (#3352). - + Fixed typo (#3351, Alexey Rogechev). - + Note that `--wrap=auto` does not work in HTML output. - + Default `--columns` width is 72, not 80. - + Fixed broken links (#3316, Kolen Cheung). - + Document usage of `@*` in nocite section (#3333, John Muccigrosso). - - * INSTALL.md: - - + Indent code so it's properly formatted (#3335, Bheesham Persaud). - + Added instructions for extracting binary from OSX, Windows packages. - - * CONTRIBUTING.md: Describe labels currently used in issue tracker - (Albert Krewinkel). The labels have changed over time, the list of - labels is updated to reflect the current set of labels used in the - issue tracker. - - * Rearrange and extend badges in README (Albert Krewinkel, #3354) - - * Bumped version bounds for dependencies. - - -pandoc (1.19.1) - - * Set `PANDOC_VERSION` environment variable for filters (#2640). - This allows filters to check the pandoc version that produced - the JSON they are receiving. - - * Docx reader: Ensure one-row tables don't have header (#3285, - Jesse Rosenthal). Tables in MS Word are set by default to have - special first-row formatting, which pandoc uses to determine whether - or not they have a header. This means that one-row tables will, by - default, have only a header -- which we imagine is not what people - want. This change ensures that a one-row table is not understood to - be a header only. Note that this means that it is impossible to - produce a header-only table from docx, even though it is legal - pandoc. But we believe that in nearly all cases, it will be an - accidental (and unwelcome) result - - * HTML reader: - - + Fixed some bad regressions in HTML table parser (#3280). - This regression leads to the introduction of empty rows - in some circumstances. - + Understand `style=width:` as well as `width` in `col` (#3286). - - * RST reader: - - + Print warnings when keys, substitition, notes not found. - Previously the parsers failed and we got raw text. Now we get a - link with an empty URL, or empty inlines in the case of a note or - substitution. - - + Fix hyperlink aliases (#3283). - - * Man writer: Ensure that periods are escaped at beginning of line - (#3270). - - * LaTeX writer: Fix unnumbered headers when used with `--top-level` - (#3272, Albert Krewinkel). Fix interaction of top-level divisions - `part` or `chapter` with unnumbered headers when emitting LaTeX. Headers - are ensured to be written using stared commands (like `\subsection*{}`). - - * LaTeX template: use comma not semicolon to separate keywords for - `pdfkeywords`. Thanks to Wandmalfarbe. - - * Markdown writer: Fixed incorrect word wrapping (#3277). Previously pandoc - would sometimes wrap lines too early due to this bug. - - * Text.Pandoc.Pretty: Added `afterBreak` [API change]. This makes it - possible to insert escape codes for content that needs escaping at the - beginning of a line. - - * Removed old MathMLInHTML.js from 2004, which should no longer - be needed for MathML with modern browsers. - - * Fixed tests with dynamic linking (#2709). - - * Makefile: Use stack instead of cabal for targets. This is just - a convenience for developers. - - * Fixed bash completion of filenames with space (#2749). - - * MANUAL: improved documentation on how to create a custom `reference.docx`. - - * Fix minor spelling typos in the manual (#3273, Anthony Geoghegan) - -pandoc (1.19) - - * Changed resolution of filter paths. - - + We now first treat the argument of `--filter` as a full (absolute - or relative) path, looking for a program there. If it's found, we - run it. - + If not, and if it is a simple program name or a relative path, we - try resolving it relative to `$DATADIR/filters`. - + If this fails, then we treat it as a program name and look in the - user's PATH. - + Removed a hardcoded '/' that may have caused problems with - Windows paths. - - Previously if you did `--filter foo` and you had `foo` in your path and - also an executable `foo` in your working directory, the one in the path - would be used. Now the one in the working directory is used. - - In addition, when you do `--filter foo/bar.hs`, pandoc will now find a - filter `$DATADIR/filters/foo/bar.hs` -- assuming there isn't a - `foo/bar.hs` relative to the working directory. - - * Allow `file://` URIs as arguments (#3196). Also improved default reader - format detection. Previously with a URI ending in .md or .markdown, - pandoc would assume HTML input. Now it treats these as markdown. - - * Allow to overwrite top-level division type heuristics (#3258, - Albert Krewinkel). Pandoc uses heuristics to determine the most - reasonable top-level division type when emitting LaTeX or - Docbook markup. It is now possible to overwrite this implicitly set - top-level division via the `top-level-division` command line parameter. - - * Text.Pandoc.Options \[API changes\]: - - + Removed `writerStandalone` field in `WriterOptions`, made - `writerTemplate` a `Maybe` value. Previously setting - `writerStandalone = True` did nothing unless a template was provided - in writerTemplate. Now a fragment will be generated if - `writerTemplate` is `Nothing`; otherwise, the specified template - will be used and standalone output generated. - + `Division` has been renamed `TopLevelDivision` (#3197). The - `Section`, `Chapter`, and `Part` constructors were renamed to - `TopLevelSection`, `TopLevelChapter`, and - `TopLevelPart`, respectively. An additional `TopLevelDefault` - constructor was added, which is now also the new default value of - the `writerTopLevelDivision` field in `WriterOptions`. - - * Improved error if they give wrong arg to `--top-level-division`. - - * Use new module from texmath to lookup MS font codepoints in Docx reader. - Removed unexported module Text.Pandoc.Readers.Docx.Fonts. Its code now - lives in texmath (0.9). - - * DocBook reader: Fixed xref lookup (#3243). It previously only worked - when the qnames lacked the docbook namespace URI. - - * HTML reader: - - + Improved table parsing (#3027). We now check explicitly for non-1 - rowspan or colspan attributes, and fail when we encounter them. - Previously we checked that each row had the same number of cells, - but that could be true even with rowspans/colspans. And there are - cases where it isn't true in tables that we can handle fine -- e.g. - when a tr element is empty. So now we just pad rows with empty cells - when needed. - + Treat `<math>` as MathML by default unless something else is - explicitly specified in xmlns. Provided it parses as MathML, - of course. Also fixed default which should be to inline math if no - display attribute is used. - + Only treat "a" element as link if it has href (#3226). Otherwise - treat as span. - - * Docx reader (Jesse Rosenthal): - - + Add a placeholder value for CHART. We wrap `[CHART]` in a - `<span class="chart">`. Note that it maps to inlines because, in - docx, anything in a drawing tag can be part of a larger paragraph. - + Be more specific in parsing images We not only want `w:drawing`, - because that could also include charts. Now we specify - `w:drawing/pic:pic`. This shouldn't change behavior at all, but it's - a first step toward allowing other sorts of drawing data as well. - + Abstract out function to avoid code repetition. - + Update tests for img title and alt (#3204). - + Handle Alt text and titles in images. We use the "description" field - as alt text and the "title" field as title. These can be accessed - through the "Format Picture" dialog in Word. - + Docx reader utils: handle empty namespace in `elemName`. Previously, - if given an empty namespace `(elemName ns "" "foo")` `elemName` - would output a QName with a `Just ""` namespace. This is never what - we want. Now we output a `Nothing`. If someone *does* want a - `Just ""` in the namespace, they can enter the QName - value explicitly. - - * ODT reader/writer: - - + Inline code when text has a special style (Hubert Plociniczak). When - a piece of text has a text `Source_Text` then we assume that this is - a piece of the document that represents a code that needs to - be inlined. Adapted the writer to also reflect that change. - Previously it was just writing a 'preformatted' text using a - non-distinguishable font style. Code blocks are still not recognized - by the ODT reader. That's a separate issue. - + Infer table's caption from the paragraph (#3224, - Hubert Plociniczak). ODT's reader always put empty captions for the - parsed tables. This commit - - 1. checks paragraphs that follow the table definition - 2. treats specially a paragraph with a style named 'Table' - 3. does some postprocessing of the paragraphs that combines tables - followed immediately by captions - - The ODT writer used the `TableCaption` style for the caption - paragraph. This commit follows the OpenOffice approach which allows - for appending captions to table but uses a built-in style named - `Table` instead of `TableCaption`. Users of a custom `reference.odt` - should change the style's name from `TableCaption` to `Table`. - - * ODT reader: Infer tables' header props from rows (#3199, - Hubert Plociniczak). ODT reader simply provided an empty header list - which meant that the contents of the whole table, even if not empty, was - simply ignored. While we still do not infer headers we at least have to - provide default properties of columns. - - * Markdown reader: - - + Allow reference link labels starting with `@...` if `citations` - extension disabled (#3209). Example: in - - \[link text\]\[@a\] - - `link text` isn't hyperlinked because `[@a]` is parsed as - a citation. Previously this happened whether or not the `citations` - extension was enabled. Now it happens only if the `citations` - extension is enabled. - + Allow alignments to be specified in Markdown grid tables. For - example, - - +-------+---------------+--------------------+ - | Right | Left | Centered | - +=========:+:=================+:=============:+ - | Bananas | $1.34 | built-in wrapper | - +-------+---------------+--------------------+ - - + Allow Small Caps elements to be created using bracketed spans (as - they already can be using HTML-syntax spans) (#3191, Kolen Cheung). - - * LaTeX reader: - - + Don't treat `\vspace` and `\hspace` as block commands (#3256). - Fixed an error which came up, for example, with `\vspace` inside - a caption. (Captions expect inlines.) - + Improved table handling. We can now parse all of the tables emitted - by pandoc in our tests. The only thing we don't get yet are - alignments and column widths in more complex tables. See #2669. - + Limited support for minipage. - + Allow for `[]`s inside LaTeX optional args. Fixes cases like: - + Handle BVerbatim from fancyvrb (#3203). - + Handle hungarumlaut (#3201). - + Allow beamer-style `<...>` options in raw LaTeX (also in Markdown) - (#3184). This allows use of things like `\only<2,3>{my content}` in - Markdown that is going to be converted to beamer. - - * Use pre-wrap for code in dzslides template (Nicolas Porcel). Otherwise - overly long code will appear on every slide. - - * Org reader (Albert Krewinkel): - - + Respect column width settings (#3246). Table column properties can - optionally specify a column's width with which it is displayed in - the buffer. Some exporters, notably the ODT exporter in org-mode - v9.0, use these values to calculate relative column widths. The org - reader now implements the same behavior. Note that the org-mode - LaTeX and HTML exporters in Emacs don't support this feature yet, - which should be kept in mind by users who use the column - widths parameters. - + Allow HTML attribs on non-figure images (#3222). Images which are - the only element in a paragraph can still be given HTML attributes, - even if the image does not have a caption and is hence not a figure. - The following will add set the `width` attribute of the image to - `50%`: - - +ATTR\_HTML: :width 50% - ======================= - - \[\[file:image.jpg\]\] - - + Support `ATTR_HTML` for special blocks (#3182). Special - blocks (i.e. blocks with unrecognized names) can be prefixed with an - `ATTR_HTML` block attribute. The attributes defined in that - meta-directive are added to the `Div` which is used to represent the - special block. - + Support the `todo` export option. The `todo` export option allows to - toggle the inclusion of TODO keywords in the output. Setting this to - `nil` causes TODO keywords to be dropped from headlines. The default - is to include the keywords. - + Add support for todo-markers. Headlines can have optional - todo-markers which can be controlled via the `#+TODO`, `#+SEQ_TODO`, - or `#+TYP_TODO` meta directive. Multiple such directives can be - given, each adding a new set of recognized todo-markers. If no - custom todo-markers are defined, the default `TODO` and `DONE` - markers are used. Todo-markers are conceptually separate from - headline text and are hence excluded when autogenerating - headline IDs. The markers are rendered as spans and labelled with - two classes: One class is the markers name, the other signals the - todo-state of the marker (either `todo` or `done`). - - * LaTeX writer: - - + Use `\autocites*` when "suppress-author" citation used. - + Ensure that simple tables have simple cells (#2666). If cells - contain more than a single Plain or Para, then we need to set - nonzero widths and put contents into minipages. - + Remove invalid inlines in sections (#3218, Hubert Plociniczak). - - * Markdown writer: - - + Fix calculation of column widths for aligned multiline tables - (#1911, Björn Peemöller). This also fixes excessive CPU and memory - usage for tables when `--columns` is set in such a way that cells - must be very tiny. Now cells are guaranteed to be big enough so that - single words don't need to line break, even if this pushes the line - length above the column width. - + Use bracketed form for native spans when `bracketed_spans` - enabled (#3229). - + Fixed inconsistent spacing issue (#3232). Previously a tight bullet - sublist got rendered with a blank line after, while a tight ordered - sublist did not. Now we don't get the blank line in either case. - + Fix escaping of spaces in super/subscript (#3225). Previously two - backslashes were inserted, which gave a literal backslash. - + Adjust widths in Markdown grid tables so that they match - on round-trip. - - * Docx writer: - - + Give full detail when there are errors converting tex math. - + Handle title text in images (Jesse Rosenthal). We already handled - alt text. This just puts the image "title" into the docx - "title" attr. - + Fixed XML markup for empty cells (#3238). Previously the Compact - style wasn't being applied properly to empty cells. - - * HTML writer: - - + Updated `renderHtml` import from blaze-html. - - * Text.Pandoc.Pretty: - - + Fixed some bugs that caused blank lines in tables (#3251). The bugs - caused spurious blank lines in grid tables when we had things like - `blankline $$ blankline`. - + Add exported function `minOffet` \[API change\] (Björn Peemöller). - + Added error message for illegal call to `block` (Björn Peemöller). - - * Text.Pandoc.Shared: - - + Put `warn` in MonadIO. - + `fetchItem`: Better handling of protocol-relative URL (#2635). If - URL starts with `//` and there is no "base URL" (as there would be - if a URL were used on the command line), then default to http:. - - * Export Text.Pandoc.getDefaultExtensions \[API change\] (#3178). - - * In --version, trap error in `getAppUserDataDirectory` (#3241). This - fixes a crash with `pandoc --version` on unusual systems with no real - user (e.g. SQL Server 2016). - - * Added weigh-pandoc for memory usage diagnostics (#3169). - - * Use correct mime types for woff and woff2 (#3228). - - * Remove make\_travis\_yml.hs (#3235, Kolen Cheung). - - * changelog: Moved an item that was misplaced in the 1.17.2 section to the - 1.18 section where it belongs. - - * CONTRIBUTING.md: minor change in wording and punctuation (#3252, - Kolen Cheung). - - * Further revisions to manual for `--version` changes (#3244). - - -pandoc (1.18) - - * Added `--list-input-formats`, `--list-output-formats`, - `--list-extensions`, `--list-highlight-languages`, and - `--list-highlight-styles` (#3173). Removed list of highlighting - languages from `--version` output. Removed list of input and output - formats from default `--help` output. - - * Added `--reference-location=block|section|document` option - (Jesse Rosenthal). This determines whether Markdown link references - and footnotes are placed at the end of the document, the end of the - section, or the end of the top-level block. - - * Added `--top-level-division=section|chapter|part` (Albert Krewinkel). - This determines what a level-1 header corresponds to in LaTeX, - ConTeXt, DocBook, and TEI output. The default is `section`. - The `--chapters` option has been deprecated in favor of - `--top-level-division=chapter`. - - * Added `LineBlock` constructor for `Block` (Albert Krewinkel). This - is now used in parsing RST and Markdown line blocks, DocBook - `linegroup`/`line` combinations, and Org-mode `VERSE` blocks. - Previously `Para` blocks with hard linebreaks were used. `LineBlock`s - are handled specially in the following ouput formats: AsciiDoc - (as `[verse]` blocks), ConTeXt (`\startlines`/`\endlines`), - HTML (`div` with a style), Markdown (line blocks if `line_blocks` - is enabled), Org-mode (`VERSE` blocks), RST (line blocks). In - other output formats, a paragraph with hard linebreaks is emitted. - - * Allow binary formats to be written to stdout (but not to tty) (#2677). - Only works on posix, since we use the unix library to check whether - output is to tty. On Windows, pandoc works as before and always requires - an output file parameter for binary formats. - - * Changed JSON output format (Jesse Rosenthal). Previously we used - generically generated JSON, but this was subject to change depending - on the version of aeson pandoc was compiled with. To ensure stability, - we switched to using manually written ToJSON and FromJSON - instances, and encoding the API version. **Note:** pandoc filter - libraries will need to be revised to handle the format change. - Here is a summary of the essential changes: - - + The toplevel JSON format is now `{"pandoc-api-version" : - [MAJ, MIN, REV], "meta" : META, "blocks": BLOCKS}` - instead of `[{"unMeta": META}, [BLOCKS]]`. - Decoding fails if the major and minor version numbers don't - match. - + Leaf nodes no longer have an empty array for their "c" value. - Thus, for example, a `Space` is encoded as `{"t":"Space"}` - rather than `{"t":"Space","c":[]}` as before. - - * Removed `tests/Tests/Arbitrary.hs` and added a `Text.Pandoc.Arbitrary` - module to pandoc-types (Jesse Rosenthal). This makes it easier - to use QuickCheck with pandoc types outside of pandoc itself. - - * Add `bracketed_spans` Markdown extension, enabled by default - in pandoc `markdown`. This allows you to create a native span - using this syntax: `[Here is my span]{#id .class key="val"}`. - - * Added `angle_brackets_escapable` Markdown extension (#2846). - This is needed because github flavored Markdown has a slightly - different set of escapable symbols than original Markdown; - it includes angle brackets. - - * Export `Text.Pandoc.Error` in `Text.Pandoc` [API change]. - - * Print highlighting-kate version in `--version`. - - * `Text.Pandoc.Options`: - - + `Extension` has new constructors `Ext_brackted_spans` and - `Ext_angle_brackets_escapable` [API change]. - + Added `ReferenceLocation` type [API change] (Jesse Rosenthal). - + Added `writerReferenceLocation` field to `WriterOptions` (Jesse - Rosenthal). - - * `--filter`: we now check `$DATADIR/filters` for filters before - looking in the path (#3127, Jesse Rosenthal, thanks to Jakob - Voß for the idea). Filters placed in this directory need not - be executable; if the extension is `.hs`, `.php`, `.pl`, `.js`, - or `.rb`, pandoc will run the right interpreter. - - * For `--webtex`, replace deprecated Google Chart API by CodeCogs as - default (Kolen Cheung). - - * Removed `raw_tex` extension from `markdown_mmd` defaults (Kolen Cheung). - - * Execute .js filters with node (Jakob Voß). - - * Textile reader: - - + Support `bc..` extended code blocks (#3037). Also, remove trailing - newline in code blocks (consistently with Markdown reader). - + Improve table parsing. We now handle cell and row attributes, mostly - by skipping them. However, alignments are now handled properly. - Since in pandoc alignment is per-column, not per-cell, we - try to devine column alignments from cell alignments. - Table captions are also now parsed, and textile indicators - for thead and tfoot no longer cause parse failure. (However, - a row designated as tfoot will just be a regular row in pandoc.) - + Improve definition list parsing. We now allow multiple terms - (which we concatenate with linebreaks). An exponential parsing - bug (#3020) is also fixed. - + Disallow empty URL in explicit link (#3036). - - * RST reader: - - + Use Div instead of BlockQuote for admonitions (#3031). - The Div has class `admonition` and (if relevant) one of the - following: `attention`, `caution`, `danger`, `error`, `hint`, - `important`, `note`, `tip`, `warning`. **Note:** This will change - the rendering of some RST documents! The word ("Warning", "Attention", - etc.) is no longer added; that must be done with CSS or a filter. - + A Div is now used for `sidebar` as well. - + Skip whitespace before note (Jesse Rosenthal, #3163). RST requires a - space before a footnote marker. We discard those spaces so that footnotes - will be adjacent to the text that comes before it. This is in line with - what rst2latex does. - + Allow empty lines when parsing line blocks (Albert Krewinkel). - - * Markdown reader: - - + Allow empty lines when parsing line blocks (Albert Krewinkel). - + Allow attributes on autolinks (#3183, Daniele D'Orazio). - - * LaTeX reader: - - + More robust parsing of unknown environments (#3026). - We no longer fail on things like `^` inside options for tikz. - + Be more forgiving of non-standard characters, e.g. `^` outside of math. - Some custom environments give these a meaning, so we should try not to - fall over when we encounter them. - + Drop duplicate `*` in bibtexKeyChars (Albert Krewinkel) - - * MediaWiki reader: - - + Fix for unquoted attribute values in mediawiki tables (#3053). - Previously an unquoted attribute value in a table row - could cause parsing problems. - + Improved treatment of verbatim constructions (#3055). - Previously these yielded strings of alternating Code and Space - elements; we now incorporate the spaces into the Code. Emphasis - etc. is still possible inside these. - + Properly interpret XML tags in pre environments (#3042). They are meant - to be interpreted as literal text. - - * EPUB reader: don't add root path to data: URIs (#3150). - Thanks to @lep for the bug report and patch. - - * Org reader (Albert Krewinkel): - - + Preserve indentation of verse lines (#3064). Leading spaces in verse - lines are converted to non-breaking spaces, so indentation is preserved. - + Ensure image sources are proper links. Image sources as those in plain - images, image links, or figures, must be proper URIs or relative file - paths to be recognized as images. This restriction is now enforced - for all image sources. This also fixes the reader's usage of uncleaned - image sources, leading to `file:` prefixes not being deleted from - figure images. Thanks to @bsag for noticing this bug. - + Trim verse lines properly (Albert Krewinkel). - + Extract meta parsing code to module. Parsing of meta-data is well - separable from other block parsing tasks. Moving into new module to - get small files and clearly arranged code. - + Read markup only for special meta keys. Most meta-keys should be read - as normal string values, only a few are interpreted as marked-up text. - + Allow multiple, comma-separated authors. Multiple authors can be - specified in the `#+AUTHOR` meta line if they are given as a - comma-separated list. - + Give precedence to later meta lines. The last meta-line of any given - type is the significant line. Previously the value of the first line - was kept, even if more lines of the same type were encounterd. - + Read LaTeX_header as header-includes. LaTeX-specific header commands - can be defined in `#+LaTeX_header` lines. They are parsed as - format-specific inlines to ensure that they will only show up in LaTeX - output. - + Set documentclass meta from LaTeX_class. - + Set classoption meta from LaTeX_class_options. - + Read HTML_head as header-includes. HTML-specific head content can be - defined in `#+HTML_head` lines. They are parsed as format-specific - inlines to ensure that they will only show up in HTML output. - + Respect `author` export option. The `author` option controls whether - the author should be included in the final markup. Setting - `#+OPTIONS: author:nil` will drop the author from the final meta-data - output. - + Respect `email` export option. The `email` option controls whether the - email meta-field should be included in the final markup. Setting - `#+OPTIONS: email:nil` will drop the email field from the final - meta-data output. - + Respect `creator` export option. The `creator` option controls whether - the creator meta-field should be included in the final markup. Setting - `#+OPTIONS: creator:nil` will drop the creator field from the final - meta-data output. Org-mode recognizes the special value `comment` for - this field, causing the creator to be included in a comment. This is - difficult to translate to Pandoc internals and is hence interpreted the - same as other truish values (i.e. the meta field is kept if it's - present). - + Respect unnumbered header property (#3095). Sections the `unnumbered` - property should, as the name implies, be excluded from the automatic - numbering of section provided by some output formats. The Pandoc - convention for this is to add an "unnumbered" class to the header. The - reader treats properties as key-value pairs per default, so a special - case is added to translate the above property to a class instead. - + Allow figure with empty caption (Albert Krewinkel, #3161). - A `#+CAPTION` attribute before an image is enough to turn an image into - a figure. This wasn't the case because the `parseFromString` function, - which processes the caption value, would fail on empty values. Adding - a newline character to the caption value fixes this. - - * Docx reader: - - + Use XML convenience functions (Jesse Rosenthal). - The functions `isElem` and `elemName` (defined in Docx/Util.hs) make - the code a lot cleaner than the original XML.Light functions, but they - had been used inconsistently. This puts them in wherever applicable. - + Handle anchor spans with content in headers. Previously, we would only - be able to figure out internal links to a header in a docx if the - anchor span was empty. We change that to read the inlines out of the - first anchor span in a header. - + Let headers use exisiting id. Previously we always generated an id for - headers (since they wouldn't bring one from Docx). Now we let it use an - existing one if possible. This should allow us to recurs through anchor - spans. - + Use all anchor spans for header ids. Previously we only used the first - anchor span to affect header ids. This allows us to use all the anchor - spans in a header, whether they're nested or not (#3088). - + Test for nested anchor spans in header. This ensures that anchor spans - in header with content (or with other anchor spans inside) will resolve - to links to a header id properly. - - * ODT reader (Hubert Plociniczak) - - + Include list's starting value. Previously the starting value of - the lists' items has been hardcoded to 1. In reality ODT's list - style definition can provide a new starting value in one of its - attributes. - + Infer caption from the text following the image. - Frame can contain other frames with the text boxes. - + Add `fig:` to title for Image with a caption (as expected - by pandoc's writers). - + Basic support for images in ODT documents. - + Don't duplicate text for anchors (#3143). When creating an anchor - element we were adding its representation as well as the original - content, leading to text duplication. - - * DocBook writer: - - + Include an anchor element when a div or span has an id (#3102). - Note that DocBook does not have a class attribute, but at least this - provides an anchor for internal links. - - * LaTeX writer: - - + Don't use * for unnumbered paragraph, subparagraph. The starred - variants don't exist. This helps with part of #3058...it gets rid of - the spurious `*`s. But we still have numbers on the 4th and 5th level - headers. - + Properly escape backticks in verbatim (#3121, Jesse Rosenthal). - Otherwise they can cause unintended ligatures like `` ?` ``. - + Handle NARRAOW NO-BREAK SPACE into LaTeX (Vaclav Zeman) as `\,`. - + Don't include `[htbp]` placement for figures (#3103, Václav Haisman). - This allows figure placement defaults to be changed by the user - in the template. - - * HTML writer (slide show formats): In slide shows, don't change slide title - to level 1 header (#2221). - - * TEI writer: remove heuristic to detect book template (Albert Krewinkel). - TEI doesn't have `<book>` elements but only generic `<divN>` division - elements. Checking the template for a trailing `</book>` is nonsensical. - - * MediaWiki writer: transform filename with underscores in images (#3052). - `foo bar.jpg` becomes `foo_bar.jpg`. This was already done - for internal links, but it also needs to happen for images. - - * ICML writer: replace partial function (!!) in table handling (#3175, - Mauro Bieg). - - * Man writer: allow section numbers that are not a single digit (#3089). - - * AsciiDoc writer: avoid unnecessary use of "unconstrained" emphasis - (#3068). In AsciiDoc, you must use a special form of emphasis - (double `__`) for intraword emphasis. Pandoc was previously using - this more than necessary. - - * EPUB writer: use stringify instead of plain writer for metadata - (#3066). This means that underscores won't be used for emphasis, - or CAPS for bold. The metadata fields will just have unadorned - text. - - * Docx Writer: - - + Implement user-defined styles (Jesse Rosenthal). Divs and Spans - with a `custom-style` key in the attributes will apply the corresponding - key to the contained blocks or inlines. - + Add ReaderT env to the docx writer (Jesse Rosenthal). - + Clean up and streamline RTL behavior (Jesse Rosenthal, #3140). - You can set `dir: rtl` in YAML metadata, or use `-M dir=rtl` - on the command line. For finer-grained control, you can set - the `dir` attribute in Div or Span elements. - - * Org writer (Albert Krewinkel): - - + Remove blank line after figure caption. Org-mode only treats an image - as a figure if it is directly preceded by a caption. - + Ensure blank line after figure. An Org-mode figure should be surrounded - by blank lines. The figure would be recognized regardless, but images - in the following line would unintentionally be treated as figures as - well. - + Ensure link targets are paths or URLs. Org-mode treats links as - document internal searches unless the link target looks like a URL or - file path, either relative or absolute. This change ensures that this - is always the case. - + Translate language identifiers. Pandoc and Org-mode use different - programming language identifiers. An additional translation between - those identifiers is added to avoid unexpected behavior. This fixes a - problem where language specific source code would sometimes be output - as example code. - + Drop space before footnote markers (Albert Krewinkel, #3162). - The writer no longer adds an extra space before footnote markers. - - * Markdown writer: - - + Don't emit HTML for tables unless `raw_html` extension is set (#3154). - Emit `[TABLE]` if no suitable table formats are enabled and raw HTML - is disabled. - + Check for the `raw_html` extension before emiting a raw HTML block. - + Abstract out note/ref function (Jesse Rosenthal). - + Add ReaderT monad for environment variables (Jesse Rosenthal). - - * HTML, EPUB, slidy, revealjs templates: Use `<p>` instead of `<h1>` for - subtitle, author, date (#3119). Note that, as a result of this change, - authors may need to update CSS. - - * revealjs template: Added `notes-server` option - (jgm/pandoc-templates#212, Yoan Blanc). - - * Beamer template: - - + Restore whitespace between paragraphs. This was - a regression in the last release (jgm/pandoc-templates#207). - + Added `themeoptions` variable (Carsten Gips). - + Added `beamerarticle` variable. This causes the `beamerarticle` - package to be loaded in beamer, to produce an article from beamer - slides. (Carsten Gips) - + Added support for `fontfamilies` structured variable - (Artem Klevtsov). - + Added hypersetup options (Jake Zimmerman). - - * LaTeX template: - - + Added dummy definition for `\institute`. - This isn't a standard command, and we want to avoid a crash when - `institute` is used with the default template. - + Define default figure placement (Václav Haisman), since pandoc - no longer includes `[htbp]` for figures. Users with custom templates - will want to add this. See #3103. - + Use footnote package to fix notes in tables (jgm/pandoc-templates#208, - Václav Haisman). - - * Moved template compiling/rendering code to a separate library. - `doctemplates`. This allows the pandoc templating system to be - used independently. - - * Text.Pandoc.Error: Fix out of index error in `handleError` - (Matthew Pickering). The fix is to not try to show the exact line when - it would cause an out-of-bounds error as a result of included files. - - * Text.Pandoc.Shared: Add `linesToBlock` function (Albert Krewinkel). - - * Text.Pandoc.Parsing.emailAddress: tighten up parsing of email - addresses. Technically `**@user` is a valid email address, but if we - allow things like this, we get bad results in markdown flavors - that autolink raw email addresses (see #2940). So we exclude a few - valid email addresses in order to avoid these more common bad cases. - - * Text.Pandoc.PDF: Don't crash with nonexistent image (#3100). Instead, - emit the alt text, emphasized. This accords with what the ODT writer - currently does. The user will still get a warning about a nonexistent - image. - - * Fix example in API documentation (#3176, Thomas Weißschuh). - - * Tell where to get tarball in INSTALL (#3062). - - * Rename README to MANUAL.txt and add GitHub-friendly README.md - (Albert Krewinkel, Kolen Cheung). - - * Replace COPYING with Markdown version COPYING.md from GNU (Kolen Cheung). - - * MANUAL.txt: - - + Put note on structured vars in separate paragraph (#2148, Albert - Krewinkel). Make it clearer that structured author variables require a - custom template - + Note that `--katex` works best with `html5` (#3077). - + Fix the LaTeX and EPUB links in manual (Morton Fox). - + Document `biblio-title` variable. - - * Improve spacing of footnotes in `--help` output (Waldir Pimenta). - - * Update KaTeX to v0.6.0 (Kolen Cheung). - - * Allow latest dependencies. - - * Use texmath 0.8.6.6 (#3040). - - * Allow http-client 0.4.30, which is the version in stackage lts. - Previously we required 0.5. - Remove CPP conditionals for earlier versions. - - * Remove support for GHC < 7.8 (Jesse Rosenthal). - - + Remove Compat.Monoid. - + Remove an inline monad compatibility macro. - + Remove Text.Pandoc.Compat.Except. - + Remove directory compat. - + Change constraint on mtl. - + Remove unnecessary CPP condition in UTF8. - + Bump base lower bound to 4.7. - + Remove 7.6 build from .travis.yaml. - + Bump supported ghc version in CONTRIBUTING.md. - + Add note about GHC version support to INSTALL. - + Remove GHC 7.6 from list of tested versions (Albert Krewinkel). - + Remove TagSoup compat. - + Add EOL note to time compat module. Because time 1.4 is a boot library - for GHC 7.8, we will support the compatibility module as long as we - support 7.8. But we should be clear about when we will no longer need - it. - + Remove blaze-html CPP conditional. - + Remove unnecessary CPP in custom Prelude. - -pandoc (1.17.2) - - * Added Zim Wiki writer, template and tests. `zimwiki` is now - a valid output format. (Alex Ivkin) - - * Changed email-obfuscation default to no obfuscation (#2988). - + `writerEmailObfuscation` in `defaultWriterOptions` is now - `NoObfuscation`. - + the default for the command-line `--email-obfuscation` option is - now `none`. - - * Docbook writer: Declare xlink namespace in Docbook5 output (Ivo Clarysse). - - * Org writer: - - + Support arbitrary raw inlines (Albert Krewinkel). - Org mode allows arbitrary raw inlines ("export snippets" in Emacs - parlance) to be included as `@@format:raw foreign format text@@`. - + Improve Div handling (Albert Krewinkel). Div blocks handling is - changed to make the output look more like idiomatic org mode: - - Div-wrapped content is output as-is if the div's attribute is the - null attribute. - - Div containers with an id but neither classes nor key-value pairs - are unwrapped and the id is added as an anchor. - - Divs with classes associated with greater block elements are - wrapped in a `#+BEGIN`...`#+END` block. - - The old behavior for Divs with more complex attributes is kept. - - * HTML writer: - - + Better support for raw LaTeX environments (#2758). - Previously we just passed all raw TeX through when MathJax was used for - HTML math. This passed through too much. With this patch, only raw - LaTeX environments that MathJax can handle get passed through. - This patch also causes raw LaTeX environments to be treated - as math, when possible, with MathML and WebTeX output. - - * Markdown writer: use raw HTML for simple, pipe tables with linebreaks - (#2993). Markdown line breaks involve a newline, and simple and pipe - tables can't contain one. - - * Make --webtex work with the Markdown writer (#1177). - This is a convenient option for people using - websites whose Markdown flavors don't provide for math. - - * Docx writer: - - + Set paragraph to FirstPara after display math (Jesse Rosenthal). - We treat display math like block quotes, and apply FirstParagraph style - to paragraphs that follow them. These can be styled as the user - wishes. (But, when the user is using indentation, this allows for - paragraphs to continue after display math without indentation.) - + Use actual creation time as doc prop (Jesse Rosenthal). - Previously, we had used the user-supplied date, if available, for Word's - document creation metadata. This could lead to weird results, as in - cases where the user post-dates a document (so the modification might be - prior to the creation). Here we use the actual computer time to set the - document creation. - - * LaTeX writer: - - + Don't URI-escape image source (#2825). Usually this is a local file, - and replacing spaces with `%20` ruins things. - + Allow 'standout' as a beamer frame option (#3007). - `## Slide title {.standout}`. - - * RST reader: Fixed links with no explicit link text. The link - `` `<foo>`_ `` should have `foo` as both its link text and its URL. - See RST spec at <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#embedded-uris-and-aliases> - Closes Debian #828167 -- reported by Christian Heller. - - * Textile reader: - - + Fixed attributes (#2984). Attributes can't be followed by - a space. So, `_(class)emph_` but `_(noclass) emph_`. - + Fixed exponential parsing bug (#3020). - + Fix overly aggressive interpretation as images (#2998). - Spaces are not allowed in the image URL in textile. - - * LaTeX reader: - - + Fix `\cite` so it is a NormalCitation not AuthorInText. - + Strip off double quotes around image source if present (#2825). - Avoids interpreting these as part of the literal filename. - - * Org reader: - - + Add semicolon to list of special chars (Albert Krewinkel) - Semicolons are used as special characters in citations syntax. This - ensures the correct parsing of Pandoc-style citations: `[prefix; @key; - suffix]`. Previously, parsing would have failed unless there was a space - or other special character as the last <prefix> character. - + Add support for "Berkeley-style" cites (Albert Krewinkel, #1978). - A specification for an official Org-mode citation syntax was drafted by - Richard Lawrence and enhanced with the help of others on the orgmode - mailing list. Basic support for this citation style is added to the - reader. - + Support arbitrary raw inlines (Albert Krewinkel). - Org mode allows arbitrary raw inlines ("export snippets" in Emacs - parlance) to be included as `@@format:raw foreign format text@@`. - + Remove partial functions (Albert Krewinkel, #2991). - Partial functions like `head` lead to avoidable errors and should be - avoided. They are replaced with total functions. - + Support figure labels (Albert Krewinkel, #2496, #2999). - Figure labels given as `#+LABEL: thelabel` are used as the ID of the - respective image. This allows e.g. the LaTeX to add proper `\label` - markup. - + Improve tag and properties type safety (Albert Krewinkel). - Specific newtype definitions are used to replace stringly typing of tags - and properties. Type safety is increased while readability is improved. - + Parse as headlines, convert to blocks (Albert Krewinkel). - Emacs org-mode is based on outline-mode, which treats documents as trees - with headlines are nodes. The reader is refactored to parse into a - similar tree structure. This simplifies transformations acting on - document (sub-)trees. - * Refactor comment tree handling (Albert Krewinkel). - Comment trees were handled after parsing, as pattern matching on lists - is easier than matching on sequences. The new method of reading - documents as trees allows for more elegant subtree removal. - * Support archived trees export options (Albert Krewinkel). - Handling of archived trees can be modified using the `arch` option. - Archived trees are either dropped, exported completely, or collapsed to - include just the header when the `arch` option is nil, non-nil, or - `headline`, respectively. - * Put export setting parser into module (Albert Krewinkel). - Export option parsing is distinct enough from general block parsing to - justify putting it into a separate module. - * Support headline levels export setting (Albert Krewinkel). - The depths of headlines can be modified using the `H` option. Deeper - headlines will be converted to lists. - * Replace ugly code with view pattern (Albert Krewinkel). - Some less-than-smart code required a pragma switching of overlapping - pattern warnings in order to compile seamlessly. Using view patterns - makes the code easier to read and also doesn't require overlapping - pattern checks to be disabled. - * Fix parsing of verbatim inlines (Albert Krewinkel, #3016). - Org rules for allowed characters before or after markup chars were not - checked for verbatim text. This resultet in wrong parsing outcomes of - if the verbatim text contained e.g. space enclosed markup characters as - part of the text (`=is_substr = True=`). Forcing the parser to update - the positions of allowed/forbidden markup border characters fixes this. - - * LaTeX template: fix for obscure hyperref/xelatex issue. - Here's a minimal case: - - \documentclass[]{article} - \usepackage{hyperref} - \begin{document} - \section{\%á} - \end{document} - - Without this change, this fails on the second invocation of xelatex. - This affects inputs this like `# %á` with pdf output via xelatex. - - * trypandoc: call results 'html' instead of 'result'. - This is for better compatibility with babelmark2. - - * Document MultiMarkdown as input/output format (Albert Krewinkel, #2973). - MultiMarkdown was only mentioned as a supported Markdown dialect but not - as a possible input or output format. A brief mention is added - everywhere the other supported markdown dialects are mentioned. - - * Document Org mode as a format containing raw HTML (Albert Krewinkel) - Raw HTML is kept when the output format is Emacs Org mode. - - * Implement `RawInline` and `RawBlock` in sample lua custom writer (#2985). - - * Text.Pandoc.Shared: - - + Introduce blocksToInlines function (Jesse Rosenthal). - This is a lossy function for converting `[Block] -> [Inline]`. Its main - use, at the moment, is for docx comments, which can contain arbitrary - blocks (except for footnotes), but which will be converted to spans. - This is, at the moment, pretty useless for everything but the basic - `Para` and `Plain` comments. It can be improved, but the docx reader - should probably emit a warning if the comment contains more than this. - + Add BlockQuote to blocksToInlines (Jesse Rosenthal). - + Add further formats for `normalizeDate` (Jesse Rosenthal). - We want to avoid illegal dates -- in particular years with greater than - four digits. We attempt to parse series of digits first as `%Y%m%d`, then - `%Y%m`, and finally `%Y`. - + `normalizeDate` should reject illegal years (Jesse Rosenthal). - We only allow years between 1601 and 9999, inclusive. The ISO 8601 - actually says that years are supposed to start with 1583, but MS Word - only allows 1601-9999. This should stop corrupted word files if the date - is out of that range, or is parsed incorrectly. - + Improve year sanity check in normalizeDate (Jesse Rosenthal). - Previously we parsed a list of dates, took the first one, and then - tested its year range. That meant that if the first one failed, we - returned nothing, regardless of what the others did. Now we test for - sanity before running `msum` over the list of Maybe values. Anything - failing the test will be Nothing, so will not be a candidate. - - * Docx reader: - - + Add simple comment functionality. (Jesse Rosenthal). - This adds simple track-changes comment parsing to the docx reader. It is - turned on with `--track-changes=all`. All comments are converted to - inlines, which can list some information. In the future a warning will be - added for comments with formatting that seems like it will be excessively - denatured. Note that comments can extend across blocks. For that reason - there are two spans: `comment-start` and `comment-end`. `comment-start` - will contain the comment. `comment-end` will always be empty. The two - will be associated by a numeric id. - + Enable warnings in top-level reader (Jesse Rosenthal). - Previously we had only allowed for warnings in the parser. Now we allow - for them in the `Docx.hs` as well. The warnings are simply concatenated. - + Add warning for advanced comment formatting. (Jesse Rosenthal). - We can't guarantee we'll convert every comment correctly, though we'll - do the best we can. This warns if the comment includes something other - than Para or Plain. - + Add tests for warnings. (Jesse Rosenthal). - + Add tests for comments (Jesse Rosenthal). - We test for comments, using all track-changes options. Note that we - should only output comments if `--track-changes=all`. We also test for - emitting warnings if there is complicated formatting. - - * README: update to include track-changes comments. (Jesse Rosenthal) - - * Improved Windows installer - don't ignore properties set on command-line. - See #2708. Needs testing to see if this resolves the issue. - Thanks to @nkalvi. - - * Process markdown extensions on command line in L->R order (#2995). - Previously they were processed, very unintuitively, in R->L - order, so that `markdown-tex_math_dollars+tex_math_dollars` - had `tex_math_dollars` disabled. - - * Added `secnumdepth` variable to LaTeX template (#2920). - - * Include table of contents in README.html in Windows package. - - * Writers: treat SoftBreak as space for stripping (Jesse Rosenthal) - In Writers.Shared, we strip leading and trailing spaces for display - math. Since SoftBreak's are treated as spaces, we should strip those - too. - - * beamer, latex templates: pass biblatexoptions directly in package load. - This allows runtime optinos to be used. Fixes jgm/pandoc-citeproc#201 - - * CPP workaround for deprecation of `parseUrl` in http-client. - - * Removed some redundant class constraints. - - * make_oxs_package.sh - use OSX env variable. - - * Replaced INSTALL with INSTALL.md, incorporating INSTALL and the - old installing page from website. - - * Added `winpkg` target to Makefile. This downloads the windows package - from appveyor and signs it using the key. - - * Document Org mode as a format containing raw TeX (Albert Krewinkel). - Raw TeX is kept verbatim when the output format is Emacs Org mode. - - * Support math with haddock-library >= 1.4. - - * Removed `-rtsopts` from library stanza. It has no effect, and Hackage - wouldn't accept the package. - - * Update library dependency versions. - -pandoc (1.17.1) - - * New output format: `docbook5` (Ivo Clarysse). - - * `Text.Pandoc.Options`: Add `writerDocBook5` to `WriterOptions` - (API change). - - * Org writer: - - + Add :PROPERTIES: drawer support (Albert Krewinkel, #1962). - This allows header attributes to be added to org documents in the form - of `:PROPERTIES:` drawers. All available attributes are stored as - key/value pairs. This reflects the way the org reader handles - `:PROPERTIES:` blocks. - + Add drawer capability (Carlos Sosa). For the implementation of the - Drawer element in the Org Writer, we make use of a generic Block - container with attributes. The presence of a `drawer` class defines - that the `Div` constructor is a drawer. The first class defines the - drawer name to use. The key-value list in the attributes defines - the keys to add inside the Drawer. Lastly, the list of Block elements - contains miscellaneous blocks elements to add inside of the Drawer. - + Use `CUSTOM_ID` in properties (Albert Krewinkel). The `ID` property is - reserved for internal use by Org-mode and should not be used. - The `CUSTOM_ID` property is to be used instead, it is converted to the - `ID` property for certain export format. - - * LaTeX writer: - - + Ignore `--incremental` unless output format is beamer (#2843). - + Fix polyglossia to babel env mapping (Mauro Bieg, #2728). - Allow for optional argument in square brackets. - + Recognize `la-x-classic` as Classical Latin (Andrew Dunning). - This allows one to access the hyphenation patterns in CTAN's - hyph-utf8. - + Add missing languages from hyph-utf8 (Andrew Dunning). - + Improve use of `\strut` with `\minipage` inside tables - (Jose Luis Duran). This improves spacing in multiline - tables. - + Use `{}` around options containing special chars (#2892). - + Avoid lazy `foldl`. - + Don't escape underscore in labels (#2921). Previously they were - escaped as `ux5f`. - + brazilian -> brazil for polyglossia (#2953). - - * HTML writer: Ensure mathjax link is added when math appears in footnote - (#2881). Previously if a document only had math in a footnote, the - MathJax link would not be added. - - * EPUB writer: set `navpage` variable on nav page. - This allows templates to treat it differently. - - * DocBook writer: - - + Use docbook5 if `writerDocbook5` is set (Ivo Clarysse). - + Properly handle `ulink`/`link` (Ivo Clarysse). - - * EPUB reader: - - + Unescape URIs in spine (#2924). - + EPUB reader: normalise link id (Mauro Bieg). - - * Docx Reader: - - + Parse `moveTo` and `moveFrom` (Jesse Rosenthal). - `moveTo` and `moveFrom` are track-changes tags that are used when a - block of text is moved in the document. We now recognize these tags and - treat them the same as `insert` and `delete`, respectively. So, - `--track-changes=accept` will show the moved version, while - `--track-changes=reject` will show the original version. - + Tests for track-changes moving (Jesse Rosenthal). - - * ODT, EPUB, Docx readers: throw `PandocError` on unzip failure - (Jesse Rosenthal) Previously, `readDocx`, `readEPUB`, and `readOdt` - would error out if zip-archive failed. We change the archive extraction - step from `toArchive` to `toArchiveOrFail`, which returns an Either value. - - * Markdown, HTML readers: be more forgiving about unescaped `&` in - HTML (#2410). We are now more forgiving about parsing invalid HTML with - unescaped `&` as raw HTML. (Previously any unescaped `&` - would cause pandoc not to recognize the string as raw HTML.) - - * Markdown reader: - - + Added bracket syntax for native spans (#168). - + Fix pandoc title blocks with lines ending in 2 spaces (#2799). - + Added `-s` to markdown-reader-more test. - - * HTML reader: fixed bug in `pClose`. This caused exponential parsing - behavior in documnets with unclosed tags in `dl`, `dd`, `dt`. - - * MediaWiki reader: Allow spaces before `!` in MediaWiki table header - (roblabla). - - * RST reader: Support `:class:` option for code block in RST reader - (Sidharth Kapur). - - * Org reader (all Albert Krewinkel, except where noted otherwise): - - + Stop padding short table rows. - Emacs Org-mode doesn't add any padding to table rows. The first - row (header or first body row) is used to determine the column count, - no other magic is performed. - + Refactor rows-to-table conversion. This refactors - the codes conversing a list table lines to an org table ADT. - The old code was simplified and is now slightly less ugly. - + Fix handling of empty table cells, rows (Albert Krewinkel, #2616). - This fixes Org mode parsing of some corner cases regarding empty cells - and rows. Empty cells weren't parsed correctly, e.g. `|||` should be - two empty cells, but would be parsed as a single cell containing a pipe - character. Empty rows where parsed as alignment rows and dropped from - the output. - + Fix spacing after LaTeX-style symbols. - The org-reader was droping space after unescaped LaTeX-style symbol - commands: `\ForAll \Auml` resulted in `∀Ä` but should give `∀ Ä` - instead. This seems to be because the LaTeX-reader treats the - command-terminating space as part of the command. Dropping the trailing - space from the symbol-command fixes this issue. - + Print empty table rows. Empty table rows should not - be dropped from the output, so row-height is always set to be at least 1. - + Move parser state into separate module. - The org reader code has become large and confusing. Extracting smaller - parts into submodules should help to clean things up. - + Add support for sub/superscript export options. - Org-mode allows to specify export settings via `#+OPTIONS` lines. - Disabling simple sub- and superscripts is one of these export options, - this options is now supported. - + Support special strings export option Parsing of special strings - (like `...` as ellipsis or `--` as en dash) can be toggled using the `-` - option. - + Support emphasized text export option. Parsing of emphasized text can - be toggled using the `*` option. This influences parsing of text marked - as emphasized, strong, strikeout, and underline. Parsing of inline math, - code, and verbatim text is not affected by this option. - + Support smart quotes export option. Reading of smart quotes can be - toggled using the `'` option. - + Parse but ignore export options. All known export options are parsed - but ignored. - + Refactor block attribute handling. A parser state attribute was used - to keep track of block attributes defined in meta-lines. Global state - is undesirable, so block attributes are no longer saved as part of the - parser state. Old functions and the respective part of the parser state - are removed. - + Use custom `anyLine`. Additional state changes need to be made after - a newline is parsed, otherwise markup may not be recognized correctly. - This fixes a bug where markup after certain block-types would not be - recognized. - + Add support for `ATTR_HTML` attributes (#1906). - Arbitrary key-value pairs can be added to some block types using a - `#+ATTR_HTML` line before the block. Emacs Org-mode only includes these - when exporting to HTML, but since we cannot make this distinction here, - the attributes are always added. The functionality is now supported - for figures. - + Add `:PROPERTIES:` drawer support (#1877). - Headers can have optional `:PROPERTIES:` drawers associated with them. - These drawers contain key/value pairs like the header's `id`. The - reader adds all listed pairs to the header's attributes; `id` and - `class` attributes are handled specially to match the way `Attr` are - defined. This also changes behavior of how drawers of unknown type - are handled. Instead of including all unknown drawers, those are not - read/exported, thereby matching current Emacs behavior. - + Use `CUSTOM_ID` in properties. See above on Org writer changes. - + Respect drawer export setting. The `d` export option can be used - to control which drawers are exported and which are discarded. - Basic support for this option is added here. - + Ignore leading space in org code blocks (Emanuel Evans, #2862). - Also fix up tab handling for leading whitespace in code blocks. - + Support new syntax for export blocks. Org-mode version 9 - uses a new syntax for export blocks. Instead of `#+BEGIN_<FORMAT>`, - where `<FORMAT>` is the format of the block's content, the new - format uses `#+BEGIN_export <FORMAT>` instead. Both types are - supported. - + Refactor `BEGIN...END` block parsing. - + Fix handling of whitespace in blocks, allowing content to be indented - less then the block header. - + Support org-ref style citations. The *org-ref* package is an - org-mode extension commonly used to manage citations in org - documents. Basic support for the `cite:citeKey` and - `[[cite:citeKey][prefix text::suffix text]]` syntax is added. - + Split code into separate modules, making for cleaner code and - better decoupling. - - * Added `docbook5` template. - - * `--mathjax` improvements: - - + Use new CommonHTML output for MathJax (updated default MathJax URL, - #2858). - + Change default mathjax setup to use `TeX-AMS_CHTML` configuration. - This is designed for cases where the input is always TeX and maximal - conformity with TeX is desired. It seems to be smaller and load faster - than what we used before. See #2858. - + Load the full MathJax config to maximize loading speed (KolenCheung). - - * Bumped upper version bounds to allow use of latest packages - and compilation with ghc 8. - - * Require texmath 0.8.6.2. Closes several texmath-related bugs (#2775, - #2310, #2310, #2824). This fixes behavior of roots, e.g. - `\sqrt[3]{x}`, and issues with sub/superscript positioning - and matrix column alignment in docx. - - * README: - - + Clarified documentation of `implicit_header_references` (#2904). - + Improved documentation of `--columns` option. - - * Added appveyor setup, with artefacts (Jan Schulz). - - * stack.yaml versions: Use proper flags used for texmath, pandoc-citeproc. - - * LaTeX template: support for custom font families (vladipus). - Needed for correct polyglossia operation with Cyrillic fonts and perhaps - can find some other usages. Example usage in YAML metadata: - - fontfamilies: - - name: \cyrillicfont - font: Liberation Serif - - name: \cyrillicfonttt - options: Scale=MatchLowercase - font: Liberation - - * Create unsigned msi as build artifact in appveyor build. - - * On travis, test with ghc 8.0.1; drop testing for ghc 7.4.1. - -pandoc (1.17.0.3) - - * LaTeX writer: Fixed position of label in figures (#2813). - Previously the label wasn't in the right place, and `\ref` - wouldn't work properly. - * Added .tei test files to pandoc.cabal so they'll be included - in tarball (#2811). - * Updated copyright dates. - -pandoc (1.17.0.2) - - * Fixed serious regression in `htmlInBalanced`, which caused - newlines to be omitted in some raw HTML blocks in Markdown - (#2804). - -pandoc (1.17.0.1) - - * File scope is no longer used when there are no input files (i.e., - when input comes from stdin). Previously file scope was triggered - when the `json` reader was specified and input came from `stdin`, - and this caused no output to be produced. (Fix due to Jesse Rosenthal; - thanks to Fedor Sheremetyev for calling the bug to our attention.) - * Improved documentation of templates (#2797). - -pandoc (1.17) - - * Added `--file-scope` option (Jesse Rosenthal). - By default pandoc operates on multiple files by first concatenating - them (around extra line breaks) and then processing the joined file. So - it only parses a multi-file document at the document scope. This has the - benefit that footnotes and links can be in different files, but for - some purposes it is useful to parse the individual files first - and then combine their outputs (e.g. when the files use footnotes - or links with the same labels). The `--file-scope` option causes - pandoc to parse the files first, and then combine the parsed output, - instead of combining before parsing. `--file-scope` is selected - automatically for binary input files (which cannot be concatenated) - and for pandoc json. - - * Add TEI Writer (Chris Forster) and `tei` output format. - - * Added a general `ByteStringReader` with warnings, used by the docx - reader (API change, Jesse Rosenthal). - - * Add `readDocxWithWarnings` (API change, Jesse Rosenthal). - - * Changed type of `Shared.uniqueIdent`'s argument from `[String]` - to `Set String.` This avoids performance problems in documents with - many identically named headers (API change, #2671). - - * Removed `tex_math_single_backslash` from `markdown_github` options - (#2707). - - * Make language extensions as well as full language names - trigger syntax highlighting. For example, `py` will now work as - well as `python` (jgm/highlighting-kate#83). - - * Added `institute` variable to latex, beamer templates (Fraser - Tweedale, Josef Svenningsson). - - * Docx reader (Jesse Rosenthal): - - + Handle alternate content. Some word functions (especially graphics) - give various choices for content so there can be backwards compatibility. - + Don't turn numbered headers into lists. - + Docx Reader: Add state to the parser, for warnings - + Update feature checklist in source code. - + Get rid of `Modifiable` typeclass. - + Add tests for adjacent hyperlinks. - + Add a "Link" modifier to `Reducible`. We want to make sure that - links have their spaces removed, and are appropriately smushed - together (#2689). - - * HTML reader: - - + Fixed behavior of base tag (#2777). - If the base path does not end with slash, the last component - will be replaced. E.g. base = `http://example.com/foo` - combines with `bar.html` to give `http://example.com/bar.html`. - If the href begins with a slash, the whole path of the base - is replaced. E.g. base = `http://example.com/foo/` combines - with `/bar.html` to give `http://example.com/bar.html`. - + Rewrote `htmlInBalanced`. This version avoids an exponential - performance problem with `<script>` tags, and it should be faster - in general (#2730). - + Properly handle an empty cell in a simple table (#2718). - + Handle multiple `<meta>` tags with same name. Put them in a list - in the metadata so they are all preserved, rather than (as before) - throwing out all but one.. - - * Markdown reader: - - + Improved pipe table parsing (#2765). - + Allow `+` separators in pipe table cells. We already allowed - them in the header, but not in the body rows, for some reason. - This gives compatibility with org-mode tables. - + Don't cross line boundary parsing pipe table row. - Previously an Emph element could be parsed across the newline - at the end of the pipe table row. - + Use `htmlInBalanced` for `rawVerbatimBlock`, for better - performance (#2730). - + Fixed bug with smart quotes around tex math. - - * LaTeX reader: - - + Handle interior `$` characters in math (#2743). For example, - `$$\hbox{$i$}$$`. - + `inlineCommand` now gobbles an empty `{}` after any command (#2687). - This gives better results when people write e.g. `\TeX{}` in Markdown. - + Properly handle LaTeX "math" environment as inline math (#2171). - - * Textile reader: Support `>`, `<`, `=`, `<>` text alignment attributes. - Closes #2674. - - * Org reader (Albert Krewinkel): - - + Prefix even empty figure names with "fig:" (#2643). The - convention used by pandoc for figures is to mark them by prefixing - the name with `fig:`. The org reader failed to do this if a figure - had no name. - + Refactor link-target processing (#2684). - - * ConTeXt writer: Fix whitespace at line beginning in line blocks (#2744). - Thanks to @c-foster. - - * HTML writer: Don't include alignment attribute for default table columns. - Previously these were given "left" alignment. Better to leave off - alignment attributes altogether (#2694). - - * Markdown writer: Use hyphens for YAML metadata block bottom line, for - better compatibility with other Markdown flavors (Henrik Tramberend). - - * LaTeX writer: - - + Use image identifier to create a label and hypertarget for - figures (Mauro Bieg). - + Avoid double toprule in headerless table with caption (#2742). - + Clean up options parser (Jesse Rosenthal). - + Treat `memoir` template with `article` option as article, instead - of treating all `memoir` templates as books. - + Allow more flexible table alignment (Henrik Tramberend, #2665). - New default is not to include `[c]` option (which is the default - anyway if no positioning is specified). Now LaTeX emplates can - control the overall table alignment in a document by setting the - longtable length variables `LTleft` and `LTright`. For example, - `\setlength\LTleft\parindent\setlength\LTright\fill` - will create left-aligned tables that respect paragraph indentation. - - * Docx writer: Handle image alt text (#2754, Mauro Bieg). - - * Org writer - pass through RawInline with format "org". - - * DokuWiki writer: use `$$` for display math. - - * Custom writer: Pass attributes parameter to CaptionedImage (#2697). - - * Make protocol-relative URIs work again (#2737). - - * make_osx_package.sh: Use env variable for developer id certs. - - * Raise `tagsoup` lower bound to 0.13.7 to fix entity-related - problems (#2734). - - * Allow `zip-archive` 0.3. - - * Allow `aeson` 0.11. - -pandoc (1.16.0.2) - - * Depend on deepseq rather than deepseq-generics (fpco/stackage#1096). - - * Fixed regression in latex smart quote parsing (#2645). - In cases where a match was not found for a quote, everything - from the open quote to the end of the paragraph was being dropped. - -pandoc (1.16.0.1) - - * Fixed regression with `--latex-engine` (#2618). In 1.16 `--latex-engine` - raises an error if a full path is given. - - * Org reader: Fix function dropping subtrees tagged `:noexport` - (Albert Krewinkel, #2628): - - * Markdown reader: renormalize table column widths if they exceed 100% - (#2626). - - * Textile reader: don't allow block HTML tags in inline contexts. - The reader previously did allow this, following redcloth, - which happily parses - - Html blocks can be <div>inlined</div> as well. - - as - - <p>Html blocks can be <div>inlined</div> as well.</p> - - This is invalid HTML. The above sample now produces; - - <p>Html blocks can be</p> - <div> - <p>inlined</p> - </div> - <p>as well.</p> - - * Improved default template lookup for custom lua scripts (#2625). - Previously, if you tried to do `pandoc -s -t /path/to/lua/script.lua`, - pandoc would look for the template in - `~/.pandoc/templates/default./path/to/lua/script.lua`. - With this change it will look in the more reasonable - `~/.pandoc/templates/default.script.lua`. This makes it possible to - store default templates for custom writers. - - * RST, Markdown writers: Fixed rendering of grid tables with blank rows - (#2615). - - * LaTeX writer: restore old treatment of Span (#2624). A Span is - now rendered with surrounding `{}`, as it was before 1.16. - - * Entity handling fixes: improved handling of entities like - `⟨` that require a trailing semicolon. Allow uppercase - `x` in numerical hexidecimal character references, working - around a tagsoup bug. - - * `stack.yaml` - use lts-4.0, but with older aeson to avoid excessive - memory use on compile. With aeson 0.10 we were getting an out of - memory error on a 2GB Ubuntu 64-bit VM. - - * Improved deb package creation script. Made `DPKGVER` work. - Renamed `COMMIT` to `TREE`. You should now be able to do - `TREE=1.16.0.1 DPKGVER=2 make deb`. - - -pandoc (1.16) - - * Added `Attr` field to `Link` and `Image` (Mauro Bieg, #261, API change). - - + Added syntax for link and image attributes to pandoc's Markdown. - + Updated readers and writers to use link and image attributes - when appropriate. - + Support image attributes in Docx, Textile, RST readers. - - * Renamed link attribute extensions. The old `link_attributes` is - now `mmd_link_attributes`, and `link_attributes` now enables the - new pandoc-style link and image attributes (API change). - Note: this change could break some existing workflows. - - * Implemented `SoftBreak` and new `--wrap` option (#1701, API change). - Added threefold wrapping option. - - + Command line option: deprecated `--no-wrap`, added - `--wrap=[auto|none|preserve]` - + Added `WrapOption`, exported from `Text.Pandoc.Options` - + Changed type of `writerWrapText` in `WriterOptions` from - `Bool` to `WrapOption`. - + Modified `Text.Pandoc.Shared` functions to allow `SoftBreak`. - + Supported `SoftBreak` in readers and writers. - - * Text.Pandoc.Options: Added `writerDpi` to `WriterOptions` (API - change, Mauro Bieg). - - * Added `--dpi` command-line option (Mauro Bieg). - - * Rationalized behavior of `--no-tex-ligatures` and `--smart` (#2541). - This change makes `--no-tex-ligatures` affect the LaTeX reader - as well as the LaTeX and ConTeXt writers. If it is used, - the LaTeX reader will parse characters `` ` ``, `'`, and `-` - literally, rather than parsing ligatures for quotation marks - and dashes. And the LaTeX writer will print unicode quotation - mark and dash characters literally, rather than converting - them to the standard ASCII ligatures. Note that `--smart` has - no effect on the LaTeX reader. `--smart` is still the default - for all input formats when LaTeX or ConTeXt is the output format, - *unless* `--no-tex-ligatures` is used. - - Some examples to illustrate the logic: - - ``` - % echo "'hi'" | pandoc -t latex - `hi' - % echo "'hi'" | pandoc -t latex --no-tex-ligatures - 'hi' - % echo "'hi'" | pandoc -t latex --no-tex-ligatures --smart - ‘hi’ - % echo "'hi'" | pandoc -f latex --no-tex-ligatures - <p>'hi'</p> - % echo "'hi'" | pandoc -f latex - <p>’hi’</p> - ``` - - * Removed deprecated options `--offline` and `--html5`. - - * Fixed language code for Czech (`cs` not `cz`) (#2597). - - * Implemented `east_asian_line_breaks` extension (#2586). - In `Text.Pandoc.Options`, added `Ext_east_asian_line_breaks` constructor - to `Extension` (API change). This extension is like - `ignore_line_breaks`, but smarter -- it only ignores line breaks - between two East Asian wide characters. This makes it better suited - for writing with a mix of East Asian and non-East Asian scripts. - - * Added support for PDF creation via `wkhtmltopdf`. - To use this: `pandoc -t html5 -o result.pdf` (and add `--mathjax` - if you have math.) Margins can be set using the variables - `margin-top`, `margin-bottom`, `margin-left`, `margin-right`. - Other styling can be done through CSS. - - * Fixed cite key parsing regression (jgm/pandoc-citeproc#201). - We were capturing final colons as in `[@foo: bar]`; the citation id - was being parsed as `@foo:`. - - * ICML writer: - - + Fixed image syntax for local files (#2589). - + Changed type of `writeICML` (Mauro Bieg). - API change: It is now `WriterOptions -> Pandoc -> IO String`. - Also handle new image attributes. - + Intersperse line breaks instead of appending them to - every `ParagraphStyleRange` (Mauro Bieg, #2501). - + Add `Cite` style to citations (Mauro Bieg). - + Added figure handling (#2590, Mauro Bieg). - + Better handling of math. Instead of just printing the raw tex, - we now try to fake it with unicode characters. - - * HTML writer: Include `example` class for example lists (#2524). - - * ODT/OpenDocument writer: improved image attributes (Mauro Bieg). - - + Support for percentage widths/heights - + Use `Attr` instead of title to get dimensions from ODT walker - to `writeOpenDocument`. - - * AsciiDoc writer: - - + Support anchors in spans and divs with id elements - (jgm/pandoc-citeproc#143). - + Fixed code blocks (#1861). - - * Haddock writer: omit formatting inside links, which isn't supported - by Haddock (#2515). - - * MediaWiki writer: Fixed spacing issues in table cells. - - + Start cell on new line unless it's a single Para or Plain - (#2606). - + For single Para or Plain, insert a space after the `|` to - avoid problems when the text begins with a character like - `-` (#2604). - - * Beamer writer: mark frame as fragile when it contains verbatim (#1613). - - * LaTeX writer: - - + Add support for GAP highlighting using listings (Raniere Silva). - + Consider `header-includes` content as well as templates - when determining whether to use csquotes (Andreas Lööw). - + Create defaults for geometry using `margin-left` etc. - If `geometry` has no value, but `margin-left`, `margin-right`, - `margin-top`, and/or `-margin-bottom` are given, a default value - for `geometry` is created from these. Note that these variables - already affect PDF production via HTML5 with `wkhtmltopdf`. - - * ConTeXt writer: set default layout based on `margin-left`, etc. - This sets up `\setuplayout` based on the variables `margin-left`, - `margin-right`, `margin-bottom`, and `margin-top`, if no layout - is given. - - * Docx writer: better handling of PDF images. Previously we tried - to get the image size from the image even if an explicit size was - specified. Since we still can't get image size for PDFs, this made - it impossible to use PDF images in docx. Now we don't try to get - the image size when a size is already explicitly specified. - - * Markdown writer: use raw HTML for link/image attributes when - the `link_attributes` extension is unset and `raw_html` is set (#2554). - - * MediaWiki reader: interpret markup inside `<tt>`, `<code>` (#2607). - - * LaTeX reader: - - + Improved smart quote parsing (#2555). This fixes redering of - unmatched quotes. - + Use curly quotes for unmatched ` (#2555). - + Allow blank space between braced arguments of commands (#2592). - - * Markdown reader: - - + Improved pipe table relative widths. Previously pipe table - columns got relative widths (based on the header underscore lines) - when the source of one of the rows was greater in width than the - column width. This gave bad results in some cases where much of - the width of the row was due to nonprinting material (e.g. link - URLs). Now pandoc only looks at printable width (the width of a - plain string version of the source), which should give better results. - Thanks to John Muccigrosso for bringing up the issue. - + Fixed parsing bug with macros. Previously macro definitions in - indented code blocks were being parsed as macro definitions, not code. - - * Textile reader: skip over attribute in image source (#2515). - We don't have a place yet for styles or sizes on images, but - we can skip the attributes rather than incorrectly taking them - to be part of the filename. - - * Docx reader: Handle dummy list items (Jesse Rosenthal). - These come up when people create a list item and then delete the - bullet. It doesn't refer to any real list item, and we used to ignore - it. - - * CommonMark reader/writer rewritten to use latest `cmark`. - - * Fixed Emoji character definitions (#2523). There were many bugs in the - definitions. - - * `Text.Pandoc.CSS`: - - + Added `pickStylesToKVs` function to extract multiple properties at - once (API change, Mauro Bieg). - + Parse CSS that doesn't contain the optional semicolon (Mauro Bieg). - - * `trypandoc`: sort drop-down lists. - - * Beamer template: - - + Made `\euro` conditional on presence of character. - for xelatex and lualatex, as it is for pdflatex (Andrew Dunning). - + Moved `header-includes` before setting of title (Thomas Hodgson), - to match the LaTeX template (jgm/pandoc-templates#168). - + Added `section-titles` variable (defaults to true) - to enable/suppress section title pages in beamer - slide shows (Thomas Hodgson). - + Moved beamer themes after fonts, so that themes can - change fonts. (Previously the fonts set were being - clobbered by lmodern.sty.) (Thomas Hodgson). - - * Beamer/LaTeX template changes (Thomas Hodgson): - + Added `thanks` variable - + Use `parskip.sty` when `indent` isn't set (fall back to using - `setlength` as before if `parskip.sty` isn't available). - + Use `biblio-style` with biblatex. - + Added `biblatexoptions` variable. - - * LaTeX template changes: - - + Added `paper` after `$papersize$` variable in latex template. - Thus you can say `papersize: a4` and the latex will contain - `a4paper`. This change may break some existing workflows; if - you currently specify `a4paper`, you'll get `a4paperpaper` which - is meaningless. However, the change seems worth it, as it will - make the `papersize` variable work uniformly across ConTeXt, LaTeX, - and html->pdf via wkhtmltopdf. - + Only pass options to color package if `colorlinks` is set - (Andrew Dunning). - + Make definition of `\euro` conditional in xelatex/lualatex, - as it is already for pdflatex (Andrew Dunning). - + Removed setting of `subject` in PDF metadata. - This used to be set to the subtitle, but really the subtitle - need not give the subject. Also, `subtitle` can contain formatting, - so we'd need, at least, a plain text version for this. - + Moved `header-includes` before setting of `\title`, `\author`, - etc. This allows these macros to be redefined. - + Use `\subtitle` command for `subtitle`, instead of tacking it - on to the title as before. We give a no-op fallback definition if it - is not defined. This change should produce much better results - in classes that support `\subtitle`. With the default article - class, which does not define `\subtitle`, subtitles will no - longer be printed unless the user defines `\subtitle` and - redefines `\maketitle`. - + Moved redefinitions of `\paragraph` and `\subparagraph` to - before header-includes. - - * Context template: - - + Use `simplefonts` for font loading (Paolo Rodríguez). This is - needed for things to work on ConTeXt stable from TeXLive 2015. - + Revert use of `\setuphead` in title block (Andrew Dunning, - Rik Kabel). - - * Update LaTeX/ConTeXt link colour usage (Andrew Dunning). - - * Fixed man template so disabling hyphenation actually works. - The command needs to come after .TH. - - * Added 'navigation' variable to beamer template (#2543). - Valid values are `empty` (the default), `horizontal`, `vertical`, - and `frame`. Note that this changes the default behavior from - `horizontal` to `empty`. Closes #2543. - - * Added `toc` to HTML slide format templates (Andrew Dunning), - so that `--toc` creates a contents slide. - - * Added `stack.full.yaml` to build `pandoc-citeproc` as well. - - * Allow pipe tables with no body rows (#2556). - Previously this raised a runtime error. - - * Shared: Improved `fetchItem` so that `C:/Blah/Blah.jpg` isn't treated - as URL. The Haskell URI parsing routines will accept "C:" as a - scheme, so we rule that out manually. This helps with - `--self-contained` and absolute Windows paths. - - * Define a `meta-json` variable for all writers (#2019). This contains - a JSON version of all the metadata, in the format selected for the - writer. So, for example, to get just the YAML metadata, you can run - pandoc with the following custom template: `$meta-json$`. The intent - is to make it easier for static site generators and other tools to get - at the metadata. - - * Document limitations of --self-contained (#2553). - - * Improved Citations section of README (#2551). Added information - about `link-citations` and a link to the pandoc-citeproc man page. - - * `ImageSize`: use `safeRead` instead of `readMaybe`, which isn't - in base < 4.6. - - * Allow .adoc file extension for AsciiDoc (Andrew Dunning). - - * Improved implicit pandoc-citeproc inclusion. - The filter pandoc-citeproc is automatically used when - `--bibliography` is specified on the command line, unless - `--natbib` or `--biblatex` is used. However, previously this - only worked if `--bibliography` was spelled out in full, and not - if `--biblio` was used. - - * reveal.js: Interpret pauses correctly for all headers (#2530). - Previously, when using headers below the slide level, pauses are left - uninterpreted into pauses. In my opinion, unexpected behavior but - intentional looking at the code. - - * Remove redundant `center` variable for reveal.js (Andrew Dunning). - - * Parsing: Add `extractIdClass`, modified type of `KeyTable` (Mauro - Bieg, API change). - - * ImageSize: Added functions for converting between image dimensions - (Mauro Bieg). - - * Use lts-3.18 in stack.yaml. This avoids Windows build - issues with the HTTP library. - - * Bump version bounds for dependencies. - -pandoc (1.15.2.1) - - * Added two missing test files, and `stack.yaml`, to - `extra-source-files` so they're included in the source tarball. - - * reveal.js template: Fixed parallaxBackground options. - `parallaxBackgroundHorizontal` and `parallaxBackgroundVertical` - need integer values, not strings. (Vaughn Iverson) - -pandoc (1.15.2) - - * `pandoc my.md -t context -o my.pdf` will now create a PDF using - ConTeXt rather than LaTeX (#2463). - - * Fixed omitted `url(...)` in CSS data-uri with `--self-contained` (#2489). - - * Added `emoji` Markdown extension, enabled by default in `markdown_github` - (#2523). Added `Ext_emoji` to `Extension` in `Text.Pandoc.Options` - (API change). - - * `Text.Pandoc.Readers.HTML.parseTags`: Fixed over-eager raw HTML inline - parsing (#2469). Tightened up the inline HTML parser so it disallows - TagWarnings. - - * Derive `Generic` instances for the types in `Text.Pandoc.Options`. - - * Org reader: - - + Fix paragraph/list interaction (Albert Krewinkel, #2464). - Paragraphs can be followed by lists, even if there is no blank line - between the two blocks. However, this should only be true if the - paragraph is not within a list, were the preceding block should be - parsed as a plain instead of paragraph (to allow for compact lists). - Thanks to @rgaiacs for bringing this up. - + Allow toggling header args (Albert Krewinkel, #2269). - Org-mode allows to skip the argument of a code block header argument if - it's toggling a value. Argument-less headers are now recognized, - avoiding weird parsing errors. - + Fix markup parsing in headers (Albert Krewinkel, #2504). - Markup as the very first item in a header wasn't recognized. This was - caused by an incorrect parser state: positions at which inline markup - can start need to be marked explicitly by changing the parser state. - This wasn't done for headers. The proper function to update the state - is now called at the beginning of the header parser, fixing this issue. - + Fix emphasis rules for smart parsing (Albert Krewinkel, #2513). - Smart quotes, ellipses, and dashes should behave like normal quotes, - single dashes, and dots with respect to text markup parsing. - + Require whitespace around definition list markers (#2518). - This rule was not checked before, resulting in bugs with footnotes - and some link types. - - * Markdown reader: - - + Pipe tables with long lines now get relative cell widths (#2471). - If a pipe table contains a line longer than the column width (as set by - `--columns` or 80 by default), relative widths are computed based on the - widths of the separator lines relative to the column width. This should - solve persistent problems with long pipe tables in LaTeX/PDF output, and - give more flexibility for determining relative column widths in other - formats, too. For narrower pipe tables, column widths of 0 are used, - telling pandoc not to specify widths explicitly in output formats that - permit this. - + Improved parser for `mmd_title_block`. We now allow blank metadata - fields. These were explicitly disallowed before. - + Citation keys can now contain `://`, so URLs and DOIs can be used - as citation keys (jgm/pandoc-citeproc#166). - - * Beamer template: fix incompatibility of section slides with natbib. - Natbib (and presumably biblatex) bibliography commands create - their own section. Since these are in frame environments, - we have an incompatibility with the `\AtBeginSection` macro - which creates a special frame when a new section occurs. - (We can't have a frame inside another frame.) This change disables - `\AtBeginSection` inside bibliography slides. Thinks to Yihui Xie for - bringing the problem to my attention. This supersedes #145. See - discussion there. - - * Textile reader: don't do smart punctuation unless explicitly asked - (#2480). Note that although smart punctuation is part of the textile - spec, it's not always wanted when converting from textile - to, say, Markdown. So it seems better to make this an option. - - * LaTeX reader: Handle `comment` environment (Arata Mizuki). - The `comment` environment is handled in a similar way to the - `verbatim` environment, except that its content is discarded. - - * Docx reader: Follow relationships correctly in foot/endnotes (#2258, - Jesse Rosenthal). This fixes a problem with links in notes. - - * LaTeX and ConTeXt writers: support `lang` attribute on divs and spans - (Mauro Bieg). For LaTeX, also collect `lang` and `dir` attributes on - spans and divs to set the `lang`, `otherlangs` and `dir` variables if - they aren’t set already. See #895. - - * LaTeX writer: - - + Use proper command for `\textarabic` (Mauro Bieg). - + Added `de-CH-1901`, fixed `el-polyton` in `toPloyglossia` (Nick Bart). - + Use `\hypertarget` and `\hyperlink` for links. This works correctly - to link to Div or Span elements. We now don't bother defining `\label` - for Div or Span elements. Closes jgm/pandoc-citeproc#174. - + Avoid footnotes in list of figures (#1506). - + Properly handle footnotes in captions (#1506). - + Add `\protect` to `\hyperlink` (#2490). Thanks to Hadrien Mary. - + Set `colorlinks` if `linkcolor`, `urlcolor`, `citecolor`, or - `toccolor` is set (#2508). - - * Textile writer: support start number in ordered lists (#2465). - - * OpenDocument writer: Allow customization of opendocument - automatic styles. Automatic styles can now be inserted in the - template, which now provides the enclosing `<office:automatic-styles>` - tags (#2520). - - * Docx writer: insert space between footnote reference and note (#2527). - This matches Word's default behavior. - - * EPUB writer: don't download linked media when `data-external` attribute - set (#2473). By default pandoc downloads all linked media and includes it - in the EPUB container. This can be disabled by setting `data-external` on - the tags linking to media that should not be downloaded. Example: - - <audio controls="1"> - <source src="http://example.com/music/toccata.mp3" - data-external="1" type="audio/mpeg"> - </source> - </audio> - - * HTML writer: use width on whole table if col widths sum to < 100%. - Otherwise some browsers display the table with the columns - separated far apart. - - * AsciiDoc template: Fix `author` and `date`; add `keywords`, - `abstract` (Andrew Dunning). - - * HTML-based templates (Andrew Dunning): - - + Use en dash instead of hyphen between title prefix and title. - + Add `keywords` to metadata. - + Add `lang`, `dir`, `quotes` where missing. - + Always make author and date display conditional. - + Updated dzslides template from source. - - * Man template: make "generated by" comment conditional. - - * LaTeX, Beamer templates: - - + Add `babel-otherlangs` for language divs/spans; `babel-newcommands`, - filled by commands that make babel understand the polyglossia-style - language directives (Mauro Bieg, #137). - + Improved formatting of conditionals; `$for$` is always provided to allow - multiple options (Andrew Dunning, #141). - + Use `Ligatures=TeX` rather than `Mapping=tex-text` with `fontspec` - to improve support for LuaTeX (Andrew Dunning, #135). - + Revise `hyperref` usage (Andrew Dunning, #139, #141): - - use same options for all LaTeX engines; - - add `subtitle` and `keywords` to PDF metadata; - - do not override `hyperref` link coloring without user input, effectively making - the `hidelinks` option the default (removed as a separate variable); - - link colors can be enabled (using a slightly darker version of the old - defaults) using a new `colorlinks` variable, automatically used by - the LaTeX writer when custom colors are specified; - - `pdfborder={0 0 0}` is automatically set by `hyperref` with - `colorlinks`, and is only applied if `colorlinks` is disabled. - - * ConTeXt template (Andrew Dunning): - - + New variables for controlling styles: `linkstyle`, `linkcolor`, - `linkcontrastcolor`, `layout`, `pagenumbering`, `whitespace`, `indenting`, - `interlinespace`, `headertext`, `footertext`, `mainfont`, `sansfont`, - `monofont`, `mathfont`, `fontsize`. - + Default template no longer supports MkII. - + Improve writing of title block (suppressing numbering of first page). - + Add `title` `subtitle`, `author`, `date`, `keywords` to PDF metadata. - + Support `subtitle`, `abstract`. - + Support list of figures (`lof`), list of tables (`lot`). - + Disable link styling by default. - + Define styles for all section types. - + Enable microtype. - + Improved formatting of conditionals. - - * Beamer template: added code to prevent slide breaks inside paragraphs - (#2422, thanks to Nick Bart). This will matter, in practice, only when - `allowframebreaks` is used. It is especially helpful for bibliography - slides. - - * OpenDocument template: Add `<office:automatic-styles>` tag around - automatic styles. The writer now longer provides this (see #2520). - - * Restored Text.Pandoc.Compat.Monoid. - - * Do not export (<>) from custom Prelude. The Prelude now matches - base 4.8 Prelude's API. - - * Don't use custom prelude with ghc 7.10. Use the custom prelude - only for earlier versions. This change makes `stack ghci` and - `cabal repl` work (#2503), at least with ghc 7.10. - - * Changed § to % in operators from Odt.Arrows.Utils (#2457). - This prevents problems building haddocks with "C" locale. - - * Change default for old-locale flag to False. - - * Use stack in deb, osx, and Windows package generators. - - * Added Vagrantfile for building deb in vm. - This should help in automating binary package creation. 'make package' - will make the package. 'make package COMMIT=blah' will make the package - from commit blah. - - * README: - - + Consistent capitalization for pandoc and Markdown. - + Fixed `auto_identifiers` examples (Benoit Schweblin). - + Improved documentation of template variables (Andrew Dunning). - -pandoc (1.15.1.1) - - * `Text.Pandoc.Data`: store paths in dataFiles using posix separators. - This way we have uniform separators, whether on Windows or Linux. - This should solve a problem where on some Windows versions - the data files weren't being found (#2459). - -pandoc (1.15.1) - - * `pandocVersion` is now defined in `Text.Pandoc.Shared` - and reexported from `Text.Pandoc` (Alex Vong). This allows - writers to access it. (Alex Vong) (API change) - - * For `markdown_mmd`, add: `implicit_figures`, `superscripts`, - `subscripts` (#2401). - - * Added `odt` as input format (Martin Linnemann). Added new module - `Text.Pandoc.Reader.ODT` (API change). Fully implemented features: - Paragraphs, Headers, Basic styling, Unordered lists, Ordered lists, - External Links, Internal Links, Footnotes, Endnotes, Blockquotes. - Partly implemented features: Citations, Tables. - - * Markdown Reader: - - + Add basic tests for each header style (Ophir Lifshitz). - + Add implicit header ref tests for headers with spaces (Ophir Lifshitz). - + Skip spaces in headers (Ophir Lifshitz). - + Handle 'id' and 'class' in parsing key/value attributes (#2396). - `# Header {id="myid" class="foo bar"}` - is now equivalent to `# Header {#myid .foo .bar}`. - + Use '=' instead of '#' for atx-style headers in markdown+lhs. - (Kristof Bastiaensen) - + Pipe tables: allow indented columns. Previously the left-hand column - could not start with 4 or more spaces indent. This was inconvenient - for right-aligned left columns. Note that the first (header column) - must still have 3 or fewer spaces indentation, or the table will be - treated as an indented code block. - + Fix regression: allow HTML comments containing `--`. - Technically this isn't allowed in an HTML comment, but - we've always allowed it, and so do most other implementations. - It is handy if e.g. you want to put command line arguments - in HTML comments. - - * LaTeX reader: - - + Don't eat excess whitespace after macros with only optional - arguments (#2446). - + Support longtable (#2411). - + Implement `\Cite` (#2335). - + Support abstract environment. The abstract populates an - `abstract` metadata field. - + Properly handle booktabs lines. Lines aren't part of the - pandoc table model, so we just ignore them (#2307). - - * HTML reader: - - + Handle type attribute on ol, e.g. `<ol type="i">` (#2313). - + Updated for new automatic header attributes. - + Add auto identifiers if not present on headers. This makes - TOC linking work properly. - + Detect `font-variant` with `pickStyleAttrProps` (Ophir Lifshitz). - + Test `<ol>` type, class, and inline list-style(-type) CSS - (Ophir Lifshitz). - + Better handling of "section" elements (#2438). Previously - `<section>` tags were just parsed as raw HTML blocks. With - this change, section elements are parsed as Div elements with - the class "section". - - * MediaWiki reader: handle unquoted table attributes (#2355). - - * DocBook reader: - - + Added proper support for DocBook `xref` elements (Frerich Raabe). - Added `dbContent` field to reader state, so we can lookup - cross refs. - + Handle `informalexample` (#2319). - - * Docx Reader: - - + Create special punctuation test (Ophir Lifshitz). - + Parse soft, no-break hyphen elements (Ophir Lifshitz). - + Updated headers test (Ophir Lifshitz). Replaced `styles.xml` - in `headers.docx` with pandoc's current `styles.xml`, which - contains styles for Heading 1 through 6. Added Heading 4 - through 7 to the test document. Note that Heading 7 is not - parsed as a Heading because there is no Heading 7 style. - - * RST reader: better handling of indirect roles. - Previously the parser failed on this kind of case - - .. role:: indirect(code) - - .. role:: py(indirect) - :language: python - - :py:`hi` - - Now it correctly recognizes `:py:` as a code role. - - * Org reader: - - + Add auto identifiers if not present on headers - (#2354, Juliusz Gonera). - + Allow verse blocks to contain empty lines (#2402, - Albert Krewinkel). - - * EPUB reader: stop mangling external URLs (#2284). - - * RST writer: - - + Don't insert `\ ` when complex expression in matched pairs. - E.g. `` [:sup:`3`] `` is okay; you don't need `` [:sup:`3`\ ] ``. - + Ensure that `\ ` is inserted when needed before Cite and Span - elements that begin with a "complex" element (jgm/pandoc-citeproc#157). - + Normalize headers only in "standalone" mode (#2394). - - * Haddock writer: escape `*` and `^` (G. Bataille). - - * Markdown writer: - - + In TOC, add links to headers (#829). - + Use unicode super/subscripts for digits in plain output - (when the `superscripts` and `subscripts` extensions are - not enabled). - - * Docx writer: - - + Moved invalid character stripping to `formattedString`. - This avoids an inefficient generic traversal (#2356). - + Use user data directory for `reference.docx` archive. - This allows the test suite to work without installing pandoc first. - It also brings the docx writer in line with the odt writer. - + Tests: docx writer tests now use `../data` for data directory. - This allows tests to be run without installing first. - + Tests: Use real jpg (not empty) for docx tests to avoid warning. - - * LaTeX writer: - - + Fixed detection of 'chapters' from template. - If a documentclass isn't specified in metadata, but the - template has a hardwired bookish documentclass, act as if - `--chapters` was used. This was the default in earlier - versions, but it has been broken for a little while. - + Correctly recognize book documentclass in metadata (#2395). - + Set language-related variables automatically, depending - on the value of the `lang` field, which is now always - assumed to be in BCP47 format (Mauro Bieg, #1614, #2437). - + Add `\protect` to `\hyperdef` in inline context. This way we - don't get an error when this is used as a moveable argument (#2136). - + Support all frame attributes in Beamer. - + Percent-encode more special characters in URLs (#1640, #2377). - The special characters are '<','>','|','"','{','}','[',']','^', '`'. - - * HTML writer: - - + Update KaTeX JS and CSS versions (Emily Eisenberg). - + For dzslides, add `role="note"` for speaker notes (#1693). - + Percent-encode more special characters in URLs (#1640, #2377). - The special characters are '<','>','|','"','{','}','[',']','^', '`'. - + Render Div with class `section` as `<section>` in HTML5. - - * EPUB writer: - - + In TOC, replace literal `<br/>` with space (#2105). - + With `--webtex`, include image file rather than `data:` URI (#2363). - - * Native writer: format Div properly, with blocks separated. - - * Support bidirectional text output with XeLaTeX, ConTeXt and HTML - (#2191, Mauro Bieg). - - * Reference Docx: - - + Add missing Header 6 style (steel blue) (Ophir Lifshitz). - + Correct `outlineLvl` for Header styles (Ophir Lifshitz). - - * Templates - - + Beamer: Add `innertheme`, `outertheme` variables - (Guilhem Bonnefille, #121). Add space after colon in figure caption. - Integrate recent font and language updates from LaTeX template; - allow use of `mainfont` variable for changing the slide text - in XeTeX and LuaTeX (Andrew Dunning, #131). - + LaTeX: Add `mainfontoptions`, `sansfontoptions`, - `monofontoptions`, `mathfontoptions`, `fontfamilyoptions` - (Andrew Dunning, #122). Support handling of bidirectional - text (Mauro Bieg, #120). Improve reliability of superscripts/subscripts - under XeTeX and prevent letters and numbers from appearing on a - different baseline by removing use of the `realscripts` package - (via `xltxtra`). To restore use of OpenType characters for these - features under XeTeX or LuaTeX, add `\usepackage{realscripts}` to - `header-includes` (Andrew Dunning, #130). Remove redundant - reference to `xunicode` (Andrew Dunning, #130). Add `fontenc`, - `indent`, `subparagraph` variables (Andrew Dunning). - Allow use of `hidelinks` variable for `hyperref` package (Hugo Roy, - #113). Prevent package clash with `tufte-latex` and other classes that - include `hyperref` or `color` (Xavier Olive, #115). - + ConTeXt: Support handling of bidirectional text (Mauro Bieg, #120). - + LaTeX and ConTeXt: Use more specific language variables. - Instead of directly using `lang`, we now use `babel-lang` and - `polyglossia-lang` and `context-lang`. These variables are set by - the writers to the necessary values, based on the `lang` variable - (which now always takes a value in BCP47 format). (Mauro Bieg, #114, - #129). - + HTML: Support handling of bidirectional text (Mauro Bieg, #120). - Move HTML5 shiv after CSS and fix URL (Andrew Dunning). - Add dir attribute in html5 (Andrew Dunning). - + reveal.js: Add `controls`, `progress` variables (Grégoire Pineau, #127). - Add `width`, `height` variables (Andrew Dunning). Update template - from 3.1 source (Andrew Dunning). All configuration options are now - available as variables, but are only be included if set (reveal.js - uses defaults otherwise). - + man: Added comment stating that the page is autogenerated by pandoc, - giving version. Added `adjusting` and `hyphenate` variables - (Alex Vong, #123). - - * epub.css: added selectors for nested emphasis (Pablo Rodriguez). - - * MediaBag: ensure that `/` is always used as path separator. - - * `sample.lua`: define `CaptionedImage`, add newline at end (#2393). - - * Added `--bash-completion` option. This generates a bash completion - script. To use: `eval "$(pandoc --bash-completion)"`. - - * Text.Pandoc.Error: Define Typeable and Exception instances - for PandocError (#2386). - - * Text.Pandoc.Parsing: `toKey`: strip off outer brackets. - This makes keys with extra space at the beginning and end - work: e.g. - - [foo]: bar - - [ foo ] - - will now be a link to bar (it wasn't before). - - * Text.Pandoc: disable `auto_identifiers` for epub. - The epub writer inserts its own auto identifiers; - this is more complex due to splitting into "chapter" files. - - * Renamed Text.Pandoc.Compat.Locale -> Text.Pandoc.Compat.Time. - It now reexports Data.Time. - - * Use custom Prelude to avoid compiler warnings. - - + The (non-exported) prelude is in prelude/Prelude.hs. - + It exports Monoid and Applicative, like base 4.8 prelude, - but works with older base versions. - + It exports (<>) for mappend. - + It hides 'catch' on older base versions. - - * Added a `stack.ymal` and stack install instructions to INSTALL. - - * Clarified what is "out of scope" in README and CONTRIBUTING.md. - - * Added note to CONTRIBUTING.md about ghc versions and travis. - - * Clarify docs on block quotes. The space after `>` is optional (#2346). - - * Removed obsolete reference to default.csl (#2372). - - * List all styles in manual for `--reference-docx` (Chris Black) - - * Don't capitalize header links in man page. - - * Added section on repl to CONTRIBUTING.md. - - * README: Added space after backslash in image example (#2329). - - * Document details of citation locator terms (Nick Bart). - - * Fixed some internal links in README (#2309). - - * Improve CSL documentation, variables documentations, - links, and cross-references in README. (Andrew Dunning) - - * Fix build failure with `--flags=-https` (Sergei Trofimovich). - - * Use `newManager` instead of `withManager` in recent `http-client`. - This avoids a deprecation warning. - - * Allow building with latest versions of http-types, - HUnit, criterion, syb, aeson. - - * Updated benchmark program for new criterion API. - - * Setup.hs: rewrite so as not to use process, directory, filepath. - Using anything outside base is dangerous, since older - versions of ghc may link against two different versions. - - * Added appveyor (Windows continuous integration) builds. - - * New `.travis.yml`. Autgenerated using `make_travis_yml.hs`. - This script has been modified in a few ways, e.g. to add `GHCOPTS`. - `make .travis.yml` regenerates it based on the tested-with - field of the cabal file. - -pandoc (1.15.0.6) - - * `--self-contained`: Fixed overaggressive CSS minimization (#2301, 2286). - Previously `--self-contained` wiped out all spaces in CSS, - including semantically significant spaces. This was a regression - from 1.14.x. - - * Markdown reader: don't allow bare URI links or autolinks in link - label (#2300). Added test cases. - - * `Text.Pandoc.Parsing`, `uri`: Improved bare autolink detection (#2299). - Previously we disallowed `-` at the end of an autolink, - and disallowed the combination `=-`. This commit liberalizes the - rules for allowing punctuation in a bare URI, and adds test cases. - One potential drawback is that you can no longer put a bare - URI in em dashes like this: - `this uri---http://example.com---is an example.` - But in this respect we now match github's treatment of bare URIs. - - * HTML writer: support speaker notes in dzslides. - With this change `<div class="notes">` and also `<div class="notes" - role="note">` will be output if `-t dzslides` is used. So we can - have speaker notes in dzslides too. Thanks to maybegeek. - - * Updated dzslides template. - - * Improved documentation of options to print system default files (#2298). - `--print-default-data-file` and `--print-default-template`. - - * DokuWiki writer: use `$..$` for Math instead of `<math>..</math>` - (Tiziano Müller). MathJax seems currently to be the only maintained - math rendering extension for DokuWiki. - - * `Text.Pandoc.Shared`: Changed `hierarchicalize` so it treats references - div as top-level header (#2294). This fixes a bug with `--section-divs`, - where the final references section added by pandoc-citeproc, enclosed in - its own div, got nested in the div for the section previous to it. - - * Allow vector 0.11. - - * Require cmark > 0.4. - -pandoc (1.15.0.5) - - * HTML writer: Fixed email javascript obfuscation with `mailto:` - URLs (#2280). This fixes a potential security issue. Because - single quotes weren't being escaped in the link portion, a - specially crafted email address could allow javascript code injection. - - * Markdown/HTML readers: Avoid parsing partial URLs like - `<www.pandoc.org/blah#foo>` as HTML tags (#2277). - - * RST reader: allow inline formatting in definition list field - names (Lars-Dominik Braun). - - * PDF: Make sure `--latex-engine-opt` goes before the filename - on the command line. LaTeX needs the argument to come after - the options (#1779). - - * CommonMark writer: fixed tags used for super/subscript. - - * ConTeXt template: activate hanging indent for definition lists - (Mauro Bieg). - - * Make cabal require `hsb2hs` >= 0.3.1 if `embed_data_files` specified. - This is done by adding `hookedPrograms` in `Setup.hs`, which allows us - to include `hsb2hs` in Build-Tools in cabal. - - * Improved Windows installer (thanks to nkalvi). - - + When per-machine installation is chosen, the system path - is updated instead of the user's. - + An appropriate default is used for per-machine installation - directory. - + Admin privileges are no longer required for a per-user install - - * Travis: unpack sdist for build to catch packaging bugs. - - * Improved documentation on where user templates go (#2272). - -pandoc (1.15.0.4) - - * Added pandoc.1 man page to the repository. It is no longer - built as part of the cabal build process. (This proved too - fragile.) pandoc.1 can be regenerated (`make man/pandoc.1`) - when `README` is changed. - - * Copying of the man page now respects `--destdir` (#2262). - - * Improved error messages for filters. User is now informed if - the filter requires an interpreter that isn't found in the path, - or if the filter returns an error status. - -pandoc (1.15.0.3) - - * Ensure target directory is created when installing man page. - -pandoc (1.15.0.2) - - * Added files needed for building man page to Extra-Source-Files. - -pandoc (1.15.0.1) - - * Man page is now built and installed as part of the cabal build - process. Removed Makefile target for man page. - -pandoc (1.15) - - * Man page changes: - - + Removed `--man1`, `--man5` options (breaking change). - + Removed `Text.Pandoc.ManPages` module (breaking API change). - + Makefile target for `man/man1/pandoc.1`. This uses pandoc to - create the man page from README using a custom template and filters. - + Added `man/` directory with template and filters needed to build - man page. - + We no longer have two man pages: `pandoc.1` and `pandoc_markdown.5`. - Now there is just pandoc.1, which has all the content from README. - This change was needed because of the extensive cross-references - between parts of the README. - + Removed old `data/pandoc.1.template` and - `data/pandoc_markdown.5.template`. - - * OpenDocument writer: Do not add a carriage return after a hard - line break (Michael Chladek). - - * ConTeXt writer: - - + use `\goto` for internal links. - + Added a `%` at end for `\reference` to avoid spurious space. - - * Ignore sandbox on 'make quick' - -pandoc (1.14.1) - - * Added `--man1` and `--man5` options to pandoc, allowing pandoc - to generate its own man pages. Man pages are no longer automatically - generated in the build process (the process for this was too complex - and prone to failure, #2190). The `make-pandoc-man-pages` executable - has been removed. The `man/` directory has been removed, and man page - templates have been moved to `data/`. NOTE TO PACKAGERS: You will no - longer find pandoc's man pages in `man/`, but you can generate them using - `pandoc --man1 > pandoc.1` and `pandoc --man5 > pandoc_markdown.5`. - - * Added new unexported module: `Text.Pandoc.ManPages`. - - * `README` now acts like a data file (even though it isn't in - `data/`). So, for example, `pandoc --print-default-data-file README` - will produce the README.) This change was required for the `--man1` - and `--man5` options, since the man pages are produced from the - README, but it may be useful for other purposes as well. - - * Allow `reference.docx` and `reference.odt` to be used with - `--print-default-data-file` and to shadow defaults if placed in - the user data directory. Note that as of 1.14, we no longer - include these files as data files; instead, we include their - components. This change causes pandoc to behave as if it has - these data files; they are constructed on demand when needed - using `getDefaultReferenceDocx` and `getDefaultReferenceODT`. - - * Fixed regression in CSS parsing with `--self-contained` (#2224). - Pandoc 1.14.0.x used css-text to parse the CSS, but its parser - silently drops big sections of CSS. This commit replaces the - use of css-text with a small but principled CSS preprocessor, - which removes whitespace and comments and replaces `url()` with - base 64 data when possible. - - * Use `https://` instead of `//` for MathJax and KaTeX CDN URLs (#1920). - This will allow math to work when pages are being viewed locally. - - * `Text.Pandoc.Options`: Export `plainExtensions`. - These are the extensions used in `plain` output. - - * LaTeX reader: Don't parse `_` and `^` as sub/superscript outside of - math mode; treat them as regular inline text. Normally these will - cause an error in LaTeX, but there are contexts (e.g. `alltt` - environments) where they are allowed. - - * HTML reader: allow `<body>` to close `<head>`. - - * DocBook reader: support `mediaobject`s and `figures` (#2184, Mauro Bieg). - - * RST reader: Fix reference names with special characters - (Lars-Dominik Braun). - - * Textile writer: escape `+` and `-` as entities (#2225). - - * DokuWiki writer: Use proper `<code>` tags for code blocks (#2213). - - * Plain writer: don't use symbols for super/subscript (#2237). - Simplified code by using `plainExtensions`. - - * InDesign writer: Properly escape URLs containing more than one - colon character (gohai). - - * Docx writer: Make sure we use dist version of `reference.docx` - (and not the user's version) for certain settings. Taking some - settings values from a user-supplied reference.docx can lead to - corruption. This fixes a regression from the last release (#2249). - - * `Text.Pandoc.Shared`: exports `getDefaultReferenceDocx` and - `getDefaultReferenceODT` (API change). These functions have been - removed from the Docx and ODT writers. - - * LaTeX template (Xavier Olive): - + Added `CJKmainfont` and `CJKoptions` variables. - + Allow dvipsnames (e.g. `MidnightBlue`) for colors (Xavier Olive). - - * Epub templates: use `author.role`, not `author.type`. - - * Bump cmark version to >= 0.3.4. - - * Improved Windows installer (#2205, thanks to nkalvi). - Users can now select a per-user or systemwide install, and can set - the installation path. At the end of installation, the install location - is given. The install location is also now given in the list of - installed programs in Control Panel. Cleaner WiX syntax is used for - setting the path. - - * Added `download_stats` target to Makefile. - -pandoc (1.14.0.4) - - * Added missing commonmark template. - - * Improved try pandoc (moved button, show raw command). - -pandoc (1.14.0.3) - - * Allow compilation with syb 0.5.*. - - * Custom writer: fixed some compiler warnings for ghc < 7.10. - -pandoc (1.14.0.2) - - * Allow building with hslua 0.4. - -pandoc (1.14.0.1) - - * Fixed problem with building of `reference.docx` and `reference.odt` - when the `embed_data_files` flag is used. Instead of having a phase - of the build where `reference.docx` and `reference.odt` are created - from their constituent data files, we now construct these archives - from their constituents when a `docx` or `odt` is built. The - constituent files have been moved from `extra-source-files` to - `data-files`, and `reference.docx` and `reference.odt` have been - removed. Users can create their own `reference.docx` or - `reference.odt` by using pandoc to create a simple `docx` or `odt`. - `make-reference-files.hs` has been removed, simplifying the build - process (#2187) - - * Don't include generated man pages in extra-source-files (#2189). - - * Bumped upper bound for aeson. - - * ConTeXt writer: create internal link anchors for Div elements with - identifiers. (This is needed for linked citations to work.) - -pandoc (1.14) - - [new features] - - * Added `commonmark` as input and output format. - - * Added `--verbose` flag for debugging output in PDF production (#1840, - #1653). - - * Allow wildcards in `--epub-embed-font` arguments (#1939). - - * Added `--latex-engine-opt` option (#969, #1779, Sumit Sahrawat). - - * Added `shortcut_reference_links` extension (Konstantin Zudov, #1977). - This is enabled by default for those markdown flavors that - support reading shortcut reference links, namely: `markdown`, - `markdown_strict`, `markdown_github`, `markdown_php`. - If the extension is enabled, the reader parses shortcut reference - links like `[foo]`, and the writer creates such links unless doing - so would cause problems. Users of markdown flavors that support - shortcut reference links should not notice a difference in reading - markdown, but the markdown pandoc produces may differ. - If shortcut links are not desired, the extension can be disabled - in the normal way. - - [behavior changes] - - * `--toc` is now supported for `docx` output (#458, Nikolay Yakimov). - A "dirty" TOC is created at the beginning of document. - It can be regenerated after the document has been opened. - - * An implicit `--filter pandoc-citeproc` is now triggered only when the - `--bibliography` option is used, and not when the `bibliography` - field in metadata is specified (#1849). - - * Markdown reader: - - + Reference links with `implicit_header_references` are no longer - case-sensitive (#1606). - + Definition lists no longer require indentation for first line (#2087). - Previously the body of the definition (after the `:` or `~` marker) - needed to be in column 4. This commit relaxes that requirement, - to better match the behavior of PHP Markdown Extra. So, now - this is a valid definition list: - - foo - : bar - + Resolve a potentially ambiguity with table captions: - - foo - - : bar - - ----- - table - ----- - - Is "bar" a definition, or the caption for the table? We'll count - it as a caption for the table. - + Disallow headerless pipe tables (#1996), to conform to GFM and PHP - Markdown Extra. Note: If you have been using headerless pipe tables, - this change may cause existing tables to break. - + Allow pipe tables with header but no body (#2017). - + Allow a digit as first character of a citation key (Matthias Troffaes). - See https://github.com/jgm/pandoc-citeproc/issues/97 - - * LaTeX reader: - - + Don't limit includes to `.tex` extension (#1882). - If the extension is not `.tex`, it must be given explicitly in - the `\input` or `\include`. - - * Docx reader: - - + Allow numbering in the style file. This allows inherited styles - with numbering (lists) (Jesse Rosenthal). - - * Org reader: - - + Support smart punctuation (Craig Bosma). - + Drop trees with a :noexport: tag (Albert Krewinkel). Trees having a - `:noexport:` tag set are not exported. This mirrors org-mode. - + Put header tags into empty spans (Albert Krewinkel, #2160). - Org mode allows headers to be tagged: `* Headline :TAG1:TAG2`. - Instead of being interpreted as part of the headline, the tags are now - put into the attributes of empty spans. Spans without textual content - won't be visible by default, but they are detectable by filters. They - can also be styled using CSS when written as HTML. - + Generalize code block result parsing (Albert Krewinkel). - Previously, only code blocks were recognized as result blocks; - now, any kind of block can be the result. - - * Append newline to the LineBreak in Dokuwiki, HTML, EPUB, - LaTeX, MediaWiki, OpenDocument, Texinfo writers (#1924, Tim Lin). - - * HTML writer: - - + Add "inline" or "display" class to math spans (#1914). - This allows inline and display math to be styled differently. - + Include raw latex blocks if `--mathjax` specified (#1938). - + Require highlighting-kate >= 0.5.14 (#1903). - This ensures that all code blocks will be wrapped in a `div` - with class `sourceCode`. Also, the default highlighting CSS - now adds `div.sourceCode { x-overflow: auto; }`, which means - that code blocks (even with line numbers) will acquire a scroll - bar on screens too small to display them (e.g. mobile phones). - See also jgm/highlighting-kate#65. - - * LaTeX writer: - - + Use a declaration for tight lists (Jose Luis Duran, Joseph - Harriott). Previously, pandoc hard-coded some commands to make - tight lists in LaTeX. Now we use a custom command instead, - allowing the styling to be changed in a macro in the header. - (Note: existing templates may need to be modified to include - the definition of this macro. See the current template.) - + Beamer output: if the header introducing a slide has the - class `fragile`, add the `[fragile]` option to the slide (#2119). - - * MediaWiki writer: - - + Use `File:` instead of the deprecated `Image:` for images and - other media files (Greg Rundlett). - - * DocBook writer: - - + Render a `Div (id,_,_) [Para _]` element as a `para` element - with an `id` attribute. This makes links to citations work in - DocBook with pandoc-citeproc. - - * RST writer: - - + Normalize headings to sequential levels (Nikolay Yakimov). - This is pretty much required by docutils. - + Treat headings in block quotes, etc as rubrics (Nikolay Yakimov). - + Better handling of raw latex inline (#1961). We use - `` :raw-latex:`...` `` and add a definition for this role to - the template. - - * EPUB writer: - - + Remove `linear=no` from cover `itemref` (#1609). - + Don't use `sup` element for epub footnotes (#1995). - Instead, just use an a element with class `footnoteRef`. - This allows more styling options, and provides better results - in some readers (e.g. iBooks, where anything inside the a - tag breaks popup footnotes). - + Take TOC title from `toc-title` metadata field. - - * Docx writer: - - + Implemented `FirstParagraph` style (Jesse Rosenthal). - Following the ODT writer, we add the `FirstParagraph` style to the - first text paragraph following an image, blockquote, table, heading, - or beginning of document. This allows it to be styled differently. - The default is for it to be the same as `Normal`. - + Added `BodyText` style (Jesse Rosenthal). - We apply a `BodyText` style to all unstyled paragraphs. This is, - essentially, the same as `Normal`, except that since not everything - inherits from `BodyText` (the metadata won't, for example, or - the headers or footnote numbers), we can change the text in the body - without having to make exceptions for everything. If we do want to - change *everything*, we can still do it through `Normal`. - + Altered `Blockquote` style slightly (Jesse Rosenthal). - Since `BlockQuote` derives from `BodyText`, we just want to specify - by default that it won't indent, regardless of what `BodyText` does. - Note that this will not produce any visible difference in the default - configuration. - + Take TOC title from `toc-title` metadata field (Nikolay Yakimov). - + Added a style to figure images (Nikolay Yakimov). - Figures with empty captions use style `Figure`. - Figures with nonempty captions use style `Figure with Caption`, which - is based on `Figure`, and additionally has `keepNext` set. - - * ODT writer: - - + Added figure captions (Nikolay Yakimov). The following styles are - used for figures: - `Figure` -- for figure with empty caption), - `FigureWithCaption` (based on `Figure`) -- for figure with caption, - `FigureCaption` (based on `Caption`) -- for figure captions. - Also, `TableCaption` (based on `Caption`) is used for table captions. - - [API changes] - - * New `Text.Pandoc.Error` module with `PandocError` type - (Matthew Pickering). - - * All readers now return `Either PandocError Pandoc` instead of `Pandoc` - (Matthew Pickering). This allows better handling of errors. - - * Added `Text.Pandoc.Writers.CommonMark`, exporting `writeCommonMark`. - - * Added `Text.Pandoc.Readers.CommonMark`, exporting `readCommonMark`. - - * Derive `Data` and `Typeable` instances for `MediaBag`, `Extension`, - `ReaderOptions`, `EPUBVersion`, `CiteMethod`, `ObfuscationMethod`, - `HTMLSlideVariant`, `TrackChanges`, `WriterOptions` (Shabbaz - Youssefi). - - * New `Ext_shortcut_reference_links` constructor for `Extension` - (Konstantin Zudov). - - [bug fixes] - - * Markdown reader: - - + Allow smart `'` after inline math (#1909, Nikolay Yakimov). - + Check for tex macros after indented code (#1973). - + Rewrote `charsInBalancedBrackets` for efficiency. - + Make sure a closing `</div>` doesn't get included in a - definition list item (#2127). - + Don't parse bracketed text as citation if it might be a link, - image, or footnote (Nikolay Yakimov). - + Require space after key in mmd title block (#2026, Nikolay - Yakimov). Require space after key-value delimiter colon in mmd title - block. - + Require nonempty value in mmd title block (Nikolay Yakimov). - + Disable all metadata block extensions when parsing - metadata field values (#2026, Nikolay Yakimov). Otherwise we - could get a mmd title block inside YAML metadata, for example. - - * HTML reader: - - + Improve self-closing tag detection in `htmlInBalanced` (#2146). - + Handle tables with `<th>` in body rows (#1859, Mauro Bieg). - + Fixed `htmlTag` (#1820). If the tag parses as a comment, we check - to see if the input starts with `<!--`. If not, it's bogus comment - mode and we fail `htmlTag`. - + Handle `base` tag; if it has an `href` value, this is added to - all relative URLs in links and images. - - * DocBook reader: - - + Look inside "info" elements for section titles (#1931). - - * Docx reader: - - + Parse images in deprecated vml format (Jesse Rosenthal). - + Allow sub/superscript verbatims (Jesse Rosenthal). - Verbatim usually shuts off all other run styles, but we don't want it - to shut off sub/superscript. - - * LaTeX reader: - - + Handle `tabular*` environment (#1850). - Note that the table width is not actually parsed or taken into - account, but pandoc no longer chokes on it. - + Ignore options in `\lstinline` rather than raising error (#1997). - + Add some test cases for simple tables (Mathias Schenner). - + Handle valign argument in tables (Mathias Schenner) (currently - we just ignore this). - + Allow non-empty colsep in tables (Mathias Schenner). - The `tabular` environment allows non-empty column separators - with the "@{...}" syntax. Previously, pandoc would fail to - parse tables if a non-empty colsep was present. With this - commit, these separators are still ignored, but the table gets - parsed. A test case is included. - + Recognize `\newpage` as a block command. - + Allow block content in \title{} (#2001). - + Check for block-level newcommand aliases in blockCommand (Nikolay - Yakimov). - + Guard against paragraph starting with inline macro (Nikolay Yakimov). - + Properly gobble spaces after `\\` (#2007). - - * Textile reader: - - + Handle newlines in table cells, and empty cells (#1919). - - * Org reader: - - + Allow image links with non-image targets (Hans-Peter Deifel). - This matches behavior of Org-Mode for links like - `[[http://example.com][https://www.haskell.org/static/img/logo.png]]`. - - * Docbook writer: - - + Don't print empty id attributes (thanks to Steve Horne). - - * HTML writer: - - + Fixed list-style-type for numbered example lists. - Should be "decimal," not "example" (#1902). - + Do not omit missing `alt` attribute on `img` tag (#1131, - Konstantin Zudov). - + Allow multiple colgroups in table (#2122). - + In revealjs, ensure that lists in speaker notes don't add "fragment" - classes, which can cause additional keypresses to be needed to - advance a slide (#1394). - - * LaTeX writer: - - + Don't escape `$` in URL (#1913). - + Don't use listings in headers (Matthew Pickering, #1963). - + Recognize book documentclass if set in metadata (#1971). - This sets `--chapters` implicitly if the documentclass in metadata - is a book documentclass. Previously this was done only if a book - documentclass was set in a variable. - + Add a `\label` in `\hyperdef` for Div, Span (or links don't work). - + Make `mainlang` work when `lang` is in metadata (#2174). - - * Texinfo writer: - - + Fix wrapping by using breakable spaces (Tim Lin). - - * RST writer: - - + Fixed toc depth in RST writer. Previously the depth was being - rendered as a floating point number with a decimal point. - - * Markdown writer: - - + Improved escaping (#2086). `<` should not be escaped as `\<`, for - compatibility with original Markdown. We now escape `<` and `>` - with entities. Also, we now backslash-escape square brackets. - + Avoid introducing spurious list items through wrapping (#1946). - + Don't emit span tags if plain or raw HTML disabled. - - * MediaWiki writer: - - + Convert spaces to underscores in wikilink URL (#1982), like MediaWiki. - - * AsciiDoc writer: - - + Insert some needed blank lines (#1860). - + Avoid wrapping after list marker (#1858). - - * EPUB writer: - - + Properly handle internal links to IDs in spans, divs (#1884). - + Use plain writer for metadata dc: fields (#2121). - This gives better results when we have, e.g. multiple paragraphs. - Note that tags aren't allowed in these fields. - + Properly handle image links without an extension (#1855). - + Improved chapter splitting and internal link rewriting (#1887, - #2162, #2163). This will ensure that internal links work and - that the references section produced by pandoc-citeproc is - in its own chapter. - + Fixed handling of svg images (#2183). - - * ICML writer: - - + Better handling of raw blocks and inlines (#1951). - Previously these were always escaped and printed verbatim. - Now they are ignored unless the format is `icml`, in which - case they are passed through unescaped. - + Fixed image URIs in ICML output (gohai). - - * Custom writer: - - + Raise error if loadstring returns an error status. - + Raise `PandocLuaException` instead of using 'error'. - Eventually we'll change the return type so that no exception - is involved, but at least this can be trapped. - + Use UTF-8 aware bytestring conversion. - + Set foreign encoding to UTF-8 (Nikolay Yakimov, #2101, #1634). - Also factored out ByteString, since it's only used as an intermediate - representation. - - * Docx writer: - - + Copy hyphenation settings from reference.docx (Nikolay Yakimov). - + Filter out illegal XML characters (#1992, Matthew Pickering). - + Added `noProof` to docx syntax highlighting `SourceCode` style. - + Added footnotes id -1 and 0 (Jesse Rosenthal). - Word uses, by default, footnotes with id -1 and 0 for separators. If a - user modifies `reference.docx`, they will end up with a `settings.xml` - file that references these footnotes, but no such footnotes in the - document. This will produce a corruption error. Here we add these to the - document and `settings.xml` file, so future modifications won't break - the file. - + Handle lists correctly inside table cells (Jesse Rosenthal). - Previously we didn't transform lists inside table cells. - + Set firstRow information in tables (Nikolay Yakimov). - + Don't replace `SourceCode` style in `reference.docx` if it is defined - there (Nikolay Yakimov, #1872). If `--no-highlight` specified, remove - any `SourceCode` and `*Tok` styles in `reference.docx`. - + Attempt to match international style names (#1607, Nikolay Yakimov). - + Set these styles as custom (Nikolay Yakimov): `Author`, `Abstract`, - `Compact`, `Image Caption`, `Table Caption`, `Definition Term`, - `Definition`, `First Paragraph`. - + Rename these styles to correspond with Word `Normal.dotm` (Nikolay - Yakimov): `Block Quote -> Block Text`, `Link -> Hyperlink`, - `Footnote Ref -> Footnote Reference`. - + Added `Caption` style (Nikolay Yakimov). - + Changed these styles' inheritance (Nikolay Yakimov): - `Image Caption <- Caption`, `Table Caption <- Caption`. - + Remove `SourceCode` style from `reference.docx` (#1872). - This is added automatically by the docx writer. - + Added toc heading style to `reference.docx` (Nikolay Yakimov). - - * `Text.Pandoc.PDF` - - + Don't suggest "Try xelatex" if xelatex already in use (Mauro Bieg, - #1832). - + More comprehensible errors on image conversion (#2067). - EPS can't be supported without shelling out to something like - ImageMagick, but at least we can avoid mysterious error messages. - - * `Text.Pandoc.Shared`: - - + Make safeRead safe (#1801, Matthew Pickering). - + Addded `mapLeft`, `hush` (Matthew Pickering). - - * `Text.Pandoc.Pretty`: - - + Remove partial function (Matthew Pickering). - - * `Text.Pandoc.SelfContained`: - - + Add `;charset=utf-8` to script mime type if missing (#1842). - + Improved building of data URIs (#1940). Now base64 is used except - for `text/*` mime types. - + `cssURLs` no longer tries to fetch fragment URLs (#2121). - + Properly handle data URIs in css urls (#2129). - Use a proper CSS parser (adds dependency on `text-css`). - - * `Text.Pandoc.UTF8`: - - + Better handling of bare CRs in input files (#2132). - Previously we just stripped them out; now we convert - other line ending styles to LF line endings. - - * `Text.Pandoc.ImageSize`: - - + Fixed some exif header parsing bugs (#1834). - + Make imageSize return an Either, not a Maybe (#1834). - Use `runGetOrFail` (with `binary >= 0.7`) to return `Left` on - parse failure (rather than `error`). - + Improved warnings when image size can't be determined. - + Removed error landmines (Matthew Pickering). - - * Added woff2 to MIME types (Alfred Wechselberger). - - * pandoc: When a binary input format is used, warn that file - arguments past the first one are being ignored (Matthew Pickering). - - [template changes] - - * LaTeX template: - - + Degrade gracefully if `\paragraph` not defined. - + Include `grffile` together with `graphicx` (#2074). - This properly handles filenames containing spaces and dots. - + Redefine `\paragraph`, `\subparagraph`... to behave more - like section headers (#1658). - + Import hyperref before polyglossia to avoid an error with xelatex, - "please load package hyperref before bidi package" (Nick Bart). - + Added `toccolor` variable to control link color in toc (Kaixhin). - - * LaTeX, Beamer templates: - - + Provide `\tightlist`, which is now used by the LaTeX writer. - + Use polyglossia in beamer (#85). - + Use `bibliography` instead of `biblio-files` - (#1661). Also use `\addbibresource` instead of `\bibliography` for - biblatex. - + Added `setotherlanguages` in polyglossia. This uses an `otherlang` - variable that is derived from a comma-separated list in `lang`; - the last language is `mainlang` and the others are `otherlang`. - - * EPUB templates: - - + Use `div`, not `p`, for "rights" on title page. - + Added header-includes, include-before, include-after (#1987). - - * OpenDocument template: - - + Use `text:p` instead of `text:h` for title. - Using `text:h` causes problems with numbering. Closes #2059. - Thansk to @nkalvi for diagnosing this. - - * reveal.js template: - - + Link to non-minified css, js. The minified versions no longer - ship with the library. - + Correctly include style CSS (#1949). - + New configurable options options: `center`, `maxScale`, `slideNuber` - (Dmitry Smirnov, pandoc-templates#89). - + Moved custom CSS after theme. This allows custom CSS to modify - themes, instead of being replaced by them. - + Allow `center` to be set to false. - - [under the hood improvements] - - * Removed pre-built `reference.docx` and `reference.odt` (Nikolay - Yakimov). Instead the repository now includes the component text files, - and the zipped binaries are built from these using a helper - program, `make-reference-files`. This should make maintenance of - these components easier going forward. - - * `Text.Pandoc.Parsing`: - - + Added new `<+?>` combinator (Nikolay Yakimov). - + Added `stateHeaderKeys` to `ParserState`. - - * `make_deb.sh` fixes: - - + Detect architecture. - + Add Installed-Size to debian package control file (#1900). - + Use `fakeroot` to get permissions right. - + Use `mkdir` and `cp` instead of `install`. - + Set permissions of directories to 755. - + Install in `/usr` rather than `/usr/local`. - + Compress man pages. - + Combine copyright files for `pandoc`, `pandoc-citeproc`. - - * Added `Text.Pandoc.Compat.Locale` and `old-locale` flag - to assist with transition to `time` 1.5. - - * Updated CONTRIBUTING.md with information about issue tags (Matthew - Pickering). - - * Updated travis installs to the new sudo-less syntax (Tim Lin). - - * Updated dependency version bounds. - - * EPUB tests: don't use `joinPath`, which varies across platforms. - Instead, use a forward-slash to join paths, regardless of the - platform. This matches the way `MediaBag` now works. - - * Clarify JSON input and output in usage message (Caleb McDaniel). - - * Improved INSTALL instructions. - - * Always build man pages. Removed make-pandoc-man-pages flag. - - * Makefile: removed man target, now that we generate man pages by default. - - * README: - - + Fixed typos (J. Lewis Muir). - + Added documentation on backtick_code_blocks (#2135, Nikolay Yakimov). - + Added note on in-field markup in biblio databases (Nick Bart). - + Fixed misleading example of raw HTML block. - + Various minor formatting and consistency fixes for the program - options (Andreas Lööw). - + Made definition lists for options all "loose" for consistency. - + Added YAML biblio format to table, and note on `pandoc-citeproc`'s - `--bib2json` and `--bib2yaml` options (Nick Bart). - + Removed obsolete reference to `mods2yaml` (Nick Bart). - + Added section on syntax highlighting. - + Documented `toccolor` variable. - -pandoc (1.13.2.1) - - * Updated to build with ghc 7.10.1. - - * Bumped package upper bounds for filepath, blaze-html, - blaze-markup. - -pandoc (1.13.2) - - * TWiki Reader: add new new twiki reader (API change, Alexander Sulfrian). - - * Markdown reader: - - + Better handling of paragraph in div (#1591). - Previously text that ended a div would be parsed as Plain - unless there was a blank line before the closing div tag. - + Don't treat a citation as a reference link label (#1763). - + Fix autolinks with following punctuation (#1811). - The price of this is that autolinked bare URIs can no longer - contain `>` characters, but this is not a big issue. - + Fix `Ext_lists_without_preceding_blankline` bug (#1636, Artyom). - + Allow `startnum` to work without `fancy_lists`. Formerly - `pandoc -f markdown-fancy_lists+startnum` did not work properly. - - * RST reader (all Daniel Bergey): - - + Parse quoted literal blocks (#65). RST quoted literal blocks are - the same as indented literal blocks (which pandoc already supports) - except that the quote character is preserved in each line. - + Parse RST class directives. The class directive accepts one or more - class names, and creates a Div value with those classes. If the - directive has an indented body, the body is parsed as the children of - the Div. If not, the first block folowing the directive is made a - child of the Div. This differs from the behavior of rst2xml, which - does not create a Div element. Instead, the specified classes are - applied to each child of the directive. However, most Pandoc Block - constructors to not take an Attr argument, so we can't duplicate this - behavior. - + Warn about skipped directives. - + Literal role now produces Code. Code role should have "code" class. - + Improved support for custom roles - - - Added `sourceCode` to classes for `:code:` role, and anything - inheriting from it. - - Add the name of the custom role to classes if the Inline - constructor supports Attr. - - If the custom role directive does not specify a parent role, - inherit from the `:span:` role. - - This differs somewhat from the `rst2xml.py` behavior. If a custom - role inherits from another custom role, Pandoc will attach both - roles' names as classes. `rst2xml.py` will only use the class of - the directly invoked role (though in the case of inheriting from a - `:code:` role with a `:language:` defined, it will also provide the - inherited language as a class). - + Warn about ignored fields in role directives. - - * LaTeX reader: - - + Parse label after caption into a span instead of - inserting an additional paragraph of bracketed text (#1747). - + Parse math environments as inline when possible (#1821). - + Better handling of `\noindent` and `\greektext` (#1783). - + Handle `\texorpdfstring` more gracefully. - + Handle `\cref` and `\sep` (Wikiwide). - + Support `\smartcite` and `\Smartcite` from biblatex. - - * HTML reader: - - + Retain display type of MathML output (#1719, Matthew Pickering). - + Recognise `<br>` tags inside `<pre>` blocks (#1620, Matthew Pickering). - + Make `embed` tag either block or inline (#1756). - - * DocBook reader: - - + Handle `keycombo`, `keycap` (#1815). - + Get string content in inner tags for literal elements (#1816). - + Handle `menuchoice` elements better, with a `>` between (#1817). - + Include `id` on section headers (#1818). - + Document/test "type" as implemented (Brian O'Sullivan). - + Add support for calloutlist and callout (Brian O'Sullivan). - We treat a calloutlist as a bulleted list. This works well in practice. - + Add support for `classname` (Bryan O'Sullivan). - - * Docx reader: - - + Fix window path for image lookup (Jesse Rosenthal). - Don't use os-sensitive "combine", since we always want the paths in our - zip-archive to use forward-slashes. - + Single-item headers in ordered lists are headers (Jesse Rosenthal). - When users number their headers, Word understands that as a single item - enumerated list. We make the assumption that such a list is, in fact, - a header. - + Rewrite rewriteLink to work with new headers (Jesse Rosenthal). - There could be new top-level headers after making lists, so we have to - rewrite links after that. - + Use polyglot header list (Jesse Rosenthal). - We're just keeping a list of header formats that different languages - use as their default styles. At the moment, we have English, German, - Danish, and French. We can continue to add to this. - This is simpler than parsing the styles file, and perhaps less - error-prone, since there seems to be some variations, even within a - language, of how a style file will define headers. - + Remove header class properly in other langs (Jesse Rosenthal). - When we encounter one of the polyglot header styles, we want to remove - that from the par styles after we convert to a header. To do that, we - have to keep track of the style name, and remove it appropriately. - + Account for external link URLs with anchors. Previously, if a URL - had an anchor, the reader would incorrectly identify it as an - internal link and return only the anchor as URL. (Caleb McDaniel) - + Fix for Issue #1692 (i18n styles) (Nikolay Yakimov). - - * Org reader: - - + Added state changing blanklines (Jesse Rosenthal). - This allows us to emphasize at the beginning of a new paragraph (or, in - general, after blank lines). - + Fixed bug with bulleted lists: - - - a - - b - * c - - was being parsed as a list, even though an unindented `*` - should make a heading. See - <http://orgmode.org/manual/Plain-lists.html#fn-1>. - + Org reader: absolute, relative paths in link (#1741, Albert - Krewinkel). The org reader was too restrictive when parsing links; - some relative links and links to files given as absolute paths - were not recognized correctly. - + Org reader: allow empty links (jgm/gitit#471, Albert Krewinkel). - This is important for use in gitit, which uses empty links - for wikilinks. - + Respect indent when parsing Org bullet lists (#1650, Timothy - Humphries). Fixes issue with top-level bullet list parsing. - + Fix indent issue for definition lists (Timothy Humphries, - see #1650, #1698, #1680). - + Parse multi-inline terms correctly in definition list (#1649, - Matthew Pickering). - + Fix rules for emphasis recognition (Albert Krewinkel). - Things like `/hello,/` or `/hi'/` were falsy recognized as emphasised - strings. This is wrong, as `,` and `'` are forbidden border chars and - may not occur on the inner border of emphasized text. - + Drop COMMENT document trees (Albert Krewinkel). - Document trees under a header starting with the word `COMMENT` are - comment trees and should not be exported. Those trees are dropped - silently (#1678). - + Properly handle links to `file:target` (Albert Krewinkel). - Org links like `[[file:target][title]]` were not handled correctly, - parsing the link target verbatim. The org reader is changed such that - the leading `file:` is dropped from the link target (see #756, #1812). - + Parse LaTeX-style MathML entities (#1657, Albert Krewinkel). - Org supports special symbols which can be included using LaTeX syntax, - but are actually MathML entities. Examples for this are - `\nbsp` (non-breaking space), `\Aacute` (the letter A with accent acute) - or `\copy` (the copyright sign ©) - - * EPUB reader: - - + URI handling improvements. Now we outsource most of the work to - `fetchItem'`. Also, do not include queries in file extensions (#1671). - - * LaTeX writer: - - + Use `\texorpdfstring` for section captions when needed (Vaclav Zeman). - + Handle consecutive linebreaks (#1733). - + Protect graphics in headers (Jesse Rosenthal). - Graphics in `\section`/`\subsection` etc titles need to be `\protect`ed. - + Put `~` before header in list item text (Jesse Rosenthal). - Because of the built-in line skip, LaTeX can't handle a section header - as the first element in a list item. - + Avoid using reserved characters as `\lstinline` delimiters (#1595). - + Better handling of display math in simple tables (#1754). - We convert display math to inline math in simple tables, - since LaTeX can't deal with display math in simple tables. - + Escape spaces in code (#1694, Bjorn Buckwalter). - - * MediaWiki writer: - - + Fixed links with URL = text. Previously these were rendered as bare - words, even if the URL was not an absolute URL (#1825). - - * ICML writer: - - + Don't force all citations into footnotes. - - * RTF writer: - - + Add blankline at end of output (#1732, Matthew Pickering). - - * RST writer: - - + Ensure blank line after figure. - + Avoid exces whitespace after last list item (#1777). - + Wrap line blocks with spaces before continuations (#1656). - + Fixed double-rendering of footnotes in RST tables (#1769). - - * DokuWiki writer: - - + Better handling of block quotes. This change ensures that - multiple paragraph blockquotes are rendered using native `>` - rather than as HTML (#1738). - + Fix external images (#1739). Preface relative links with ":", - absolute URIs without. (Timothy Humphries) - - * HTML writer: - - + Use protocol-relative URL for mathjax. - + Put newline btw img and caption paragraph. - + MathML now outputted with tex annotation (#1635, Matthew Pickering). - + Add support for KaTeX HTML math (#1626, Matthew Pickering). - This adds `KaTeX` to `HTMLMathMethod` (API change). - + Don't double render when `email-obfuscation=none` (#1625, Matthew - Pickering). - + Make header attributes work outside top level (#1711). - Previously they only appeared on top level header elements. - Now they work e.g. in blockquotes. - - * ODT writer: - - + Correctly handle images without extensions (#1729). - + Strip querystring in ODT write (#1682, Todd Sifleet). - - * FB2 writer: - - + Add newline to output. - - * EPUB writer: - - + Don't add `sourceURL` to absolute URIs (#1669). - + Don't use unsupported `opf:title-type` for epub2. - + Include "landmarks" section in nav document for epub3 (#1757). - + Removed playOrder from navpoint elements in ncx file (#1760). - These aren't required, and they make manual modification of epubs - difficult. - + Extract title even from structured title. - + Don't include nav node in spine unless `--toc` was requested. - Previously we included it in the spine with `linear="no"`, leading - to odd results in some readers (#1593). - + Fixed absolute URI detection (#1672). - + Correctly resolve relative URIs (#1671). - + Use regular page template for `nav.xhtml`, including doctype (#1759). - - * Docx writer: - - + Put docx table captions above tables (#1641, Nikolay Yakimov). - + Get the page width from the reference docx file, and use - it to scale images that are too large to fit (Grégory Bataille). - + Partial fix for #1607 (Nikolay Yakimov). International heading styles - are inferred based on `<w:name val="heading #">` fallback, if there - are no en-US "Heading#" styles - + Look in user data dir for archive `reference.docx`. - + Renumber header and footer relationships to avoid collisions (Jesse - Rosenthal). We previously took the old relationship names of the - headers and footer in secptr. That led to collisions. We now make - a map of availabl names in the relationships file, and then rename - in secptr. - - * ConTeXt writer: - - + Add function toLabel (Mark Szepieniec). - This function can be used to sanitize reference labels so that - they do not contain any of the illegal characters \#[]",{}%()|= . - Currently only Links have their labels sanitized, because they - are the only Elements that use passed labels. - - * `Text.Pandoc.Shared`: - - + Moved import of `toChunks` outside of CPP conditional (#1590). - + Fix `inDirectory` to reset to the original directory in case - an exception occurs (Freiric Barral). - - * Templates: - - + LaTeX template: load polyglossia before bibtex (jgm/pandoc-templates#70). - Thanks to bluebirch. - + LaTeX template: Added `\VerbatimFootnotes` if there is verbatim in notes - (#1616). - + LaTeX template: Add shorthands=off to babel options (#1648). - + EPUB, EPUB3 templates: Added `id="cover"` to body of cover page. - This aids styling, making it possible for example to set 0 margins - on the title page (#1758). - + EPUB, EPUB3 templates: Handle structured metadata on titlepage. - Previously we just expected 'title', 'subtitle', 'author', 'date'. - Now we still support those, but also support the format recommended - for epub metadata in the pandoc README: - - --- - title: - - type: main - text: My Book - - type: subtitle - text: An investigation of metadata - creator: - - role: author - text: John Smith - - role: editor - text: Sarah Jones - identifier: - - scheme: DOI - text: doi:10.234234.234/33 - publisher: My Press - rights: (c) 2007 John Smith, CC BY-NC - ... - - * `Text.Pandoc.Templates.getDefaultTemplate`: - don't fail when called with "fb2" (#1660). - - * `Text.Pandoc.Parsing`: - - + Fixed `inlineMath` so it handles `\text{..}` containing `$`. - For example: `$x = \text{the $n$th root of $y$}` (#1677). - + Change `parseFromString` to fail if not all input is consumed. - (Matthew Pickering) - + Moved `addWarning` from Markdown reader to `Parsing`, so it can be - used by more readers (API change, Daniel Bergey). - - * `Text.Pandoc.Pretty`: - - + Improve performance of `realLength` (Matthew Pickering). - + Make CR + BLANKLINE = BLANKLINE. This fixes an extra blank line we - were getting at the end of markdown fragments (as well as rst, org, - etc.) (#1705). - - * `Text.Pandoc.MIME`: - - + Add mime type for WebVTT (Jason Ronallo). - + Changed mime type for `otf` to `application/vnd.ms-opentype` (#1761). - This is needed for epub3 validation. - - * `Text.Pandoc.MediaBag`: - - + Fix Windows specific path problems (#1597). - - * `Text.Pandoc.Shared`: - - + Make `collapseFilePath` OS-agnostic (Matthew Pickering). - - * Link the test suite using `-threaded`. - This allows the test suite to be run using `+RTS -N`. - - * Added `network` dependency under `network-uri` flag in test section. - - * Give better error messages when someone tries to convert from - pdf, doc, odt (#1683). - - * Added `track` to list of tags treated by `--self-contained` (#1664). - -pandoc (1.13.1) - - * Fixed `--self-contained` with Windows paths (#1558). - Previously `C:\foo.js` was being wrongly interpreted as a URI. - - * HTML reader: improved handling of tags that can be block or inline. - Previously a section like this would be enclosed in a paragraph, - with RawInline for the video tags (since video is a tag that can - be either block or inline): - - <video controls="controls"> - <source src="../videos/test.mp4" type="video/mp4" /> - <source src="../videos/test.webm" type="video/webm" /> - <p> - The videos can not be played back on your system.<br/> - Try viewing on Youtube (requires Internet connection): - <a href="http://youtu.be/etE5urBps_w">Relative Velocity on - Youtube</a>. - </p> - </video> - - This change will cause the video and source tags to be parsed - as RawBlock instead, giving better output. - The general change is this: when we're parsing a "plain" sequence - of inlines, we don't parse anything that COULD be a block-level tag. - - * Docx reader: - - + Be sensitive to user styles. Note that "Hyperlink" is - "blacklisted," as we don't want the default underline styling to be - inherited by all links by default (Jesse Rosenthal). - + Read single paragraph in table cell as `Plain` (Jesse Rosenthal). - This makes to docx reader's native output fit with the way the markdown - reader understands its markdown output. - - * Textile writer: Extended the range of cases where native textile - tables will be used (as opposed to raw HTML): we now handle any - alignment type, but only for simple tables with no captions. - - * Txt2Tags reader: - - + Header is now parsed only if standalone flag is set (Matthew Pickering). - + The header is now parsed as meta information. The first line is the - `title`, the second is the `author` and third line is the `date` - (Matthew Pickering). - + Corrected formatting of `%%mtime` macro (Matthew Pickering). - + Fixed crash when reading from stdin. - - * EPUB writer: Don't use page-progression-direction in EPUB2, which - doesn't support it. Also, if page-progression-direction not specified - in metadata, don't include the attribute even in EPUB3; not including it - is the same as including it with the value "default", as we did before. - (#1550) - - * Org writer: Accept example lines with indentation at the beginning - (Calvin Beck). - - * DokuWiki writer: - - + Refactor to use Reader monad (Matthew Pickering). - + Avoid using raw HTML in table cells; instead, use `\\` - instead of newlines (Jesse Rosenthal). - + Properly handle HTML table cell alignments, and use spacing - to make the tables look prettier (#1566). - - * Docx writer: - - + Bibliography entries get `Bibliography` style (#1559). - + Implement change tracking (Jesse Rosenthal). - - * LaTeX writer: - - + Fixed a bug that caused a table caption to repeat across all pages - (Jose Luis Duran). - + Improved vertical spacing in tables and made it customizable using - standard lengths set by booktab. See - <https://groups.google.com/forum/#!msg/pandoc-discuss/qMu6_5lYy0o/ZAU7lzAIKw0J> - (Jose Luis Duran). - + Added `\strut` to fix spacing in multiline tables (Jose Luis Duran). - + Use `\tabularnewline` instead of `\\` in table cells (Jose Luis Duran). - + Made horizontal rules more flexible (Jose Luis Duran). - - * Text.Pandoc.MIME: - - + Added `MimeType` (type synonym for `String`) and `getMimeTypeDef`. - Code cleanups (Artyom Kazak). - - * Templates: - - + LaTeX template: disable microtype protrusion for typewriter font (#1549, - thanks lemzwerg). - - * Improved OSX build procedure. - - * Added `network-uri` flag, to deal with split of `network-uri` from - `network`. - - * Fix build dependencies for the `trypandoc` flag, so that they are - ignored if `trypandoc` flag is set to False (Gabor Pali). - - * Updated README to remove outdated claim that `--self-contained` - looks in the user data directory for missing files. - -pandoc (1.13.0.1) - - * Docx writer: - - + Fixed regression which bungled list numbering (#1544), causing - all lists to appear as basic ordered lists. - + Include row width in table rows (Christoffer Ackelman, Viktor Kronvall). - Added a property to all table rows where the sum of column widths - is specified in pct (fraction of 5000). This helps persuade Word - to lay out the table with the widths we specify. - - * Fixed a bug in Windows 8 which caused pandoc not to find the - `pandoc-citeproc` filter (#1542). - - * Docx reader: miscellaneous under-the-hood improvements (Jesse Rosenthal). - Most significantly, the reader now uses Builder, leading to some - performance improvements. - - * HTML reader: Parse appropriately styled span as SmallCaps. - - * Markdown writer: don't escape `$`, `^`, `~` when `tex_math_dollars`, - `superscript`, and `subscript` extensions, respectively, are - deactivated (#1127). - - * Added `trypandoc` flag to build CGI executable used in the online - demo. - - * Makefile: Added 'quick', 'osxpkg' targets. - - * Updated README in templates to indicate templates license. - The templates are dual-licensed, BSD3 and GPL2+. - -pandoc (1.13) - - [new features] - - * Added `docx` as an input format (Jesse Rosenthal). The docx - reader includes conversion of native Word equations to pandoc - LaTeX `Math` elements. Metadata is taken from paragraphs at the - beginning of the document with styles `Author`, `Title`, `Subtitle`, - `Date`, and `Abstract`. - - * Added `epub` as an input format (Matthew Pickering). The epub - reader includes conversion of MathML to pandoc LaTeX `Math` - elements. - - * Added `t2t` (Txt2Tags) as an input format (Matthew Pickering). - Txt2tags is a lightweight markup format described at - <http://txt2tags.org/>. - - * Added `dokuwiki` as an output format (Clare Macrae). - - * Added `haddock` as an output format. - - * Added `--extract-media` option to extract media contained in a zip - container (docx or epub) while adjusting image paths to point to the - extracted images. - - * Added a new markdown extension, `compact_definition_lists`, that - restores the syntax for definition lists of pandoc 1.12.x, allowing - tight definition lists with no blank space between items, and - disallowing lazy wrapping. (See below under behavior changes.) - - * Added an extension `epub_html_exts` for parsing HTML in EPUBs. - - * Added extensions `native_spans` and `native_divs` to activate - parsing of material in HTML span or div tags as Pandoc Span - inlines or Div blocks. - - * `--trace` now works with the Markdown, HTML, Haddock, EPUB, - Textile, and MediaWiki readers. This is an option intended - for debugging parsing problems; ordinary users should not need - to use it. - - [behavior changes] - - * Changed behavior of the `markdown_attribute` extension, to bring - it in line with PHP markdown extra and multimarkdown. Setting - `markdown="1"` on an outer tag affects all contained tags, - recursively, until it is reversed with `markdown="0"` (#1378). - - * Revised markdown definition list syntax (#1429). Both the reader - and writer are affected. This change brings pandoc's definition list - syntax into alignment with that used in PHP markdown extra and - multimarkdown (with the exception that pandoc is more flexible about - the definition markers, allowing tildes as well as colons). Lazily - wrapped definitions are now allowed. Blank space is required - between list items. The space before a definition is used to determine - whether it is a paragraph or a "plain" element. **WARNING: This change - may break existing documents!** Either check your documents for - definition lists without blank space between items, or use - `markdown+compact_definition_lists` for the old behavior. - - * `.numberLines` now works in fenced code blocks even if no language - is given (#1287, jgm/highlighting-kate#40). - - * Improvements to `--filter`: - - + Don't search PATH for a filter with an explicit path. - This fixed a bug wherein `--filter ./caps.py` would run `caps.py` from - the system path, even if there was a `caps.py` in the working directory. - + Respect shebang if filter is executable (#1389). - + Don't print misleading error message. - Previously pandoc would say that a filter was not found, - even in a case where the filter had a syntax error. - - * HTML reader: - - + Parse `div` and `span` elements even without `--parse-raw`, - provided `native_divs` and `native_spans` extensions are set. - Motivation: these now generate native pandoc Div and Span - elements, not raw HTML. - + Parse EPUB-specific elements if the `epub_html_exts` - extension is enabled. These include `switch`, `footnote`, - `rearnote`, `noteref`. - - * Org reader: - - + Support for inline LaTeX. Inline LaTeX is now accepted and parsed by the - org-mode reader. Both math symbols (like `\tau`) and LaTeX commands (like - `\cite{Coffee}`), can be used without any further escaping (Albert - Krewinkel). - - * Textile reader and writer: - - + The `raw_tex` extension is no longer set by default. You can - enable it with `textile+raw_tex`. - - * DocBook reader: - - + Support `equation`, `informalequation`, `inlineequation` elements with - `mml:math` content. This is converted into LaTeX and put into a Pandoc - Math inline. - - * Revised `plain` output, largely following the style of Project - Gutenberg: - - + Emphasis is rendered with `_underscores_`, strong emphasis - with ALL CAPS. - + Headings are rendered differently, with space to set them off, - not with setext style underlines. Level 1 headers are ALL CAPS. - + Math is rendered using unicode when possible, but without the - distracting emphasis markers around variables. - + Footnotes use a regular `[n]` style. - - * Markdown writer: - - + Horizontal rules are now a line across the whole page. - + Prettier pipe tables. Columns are now aligned (#1323). - + Respect the `raw_html` extension. `pandoc -t markdown-raw_html` - no longer emits any raw HTML, including span and div tags - generated by Span and Div elements. - + Use span with style for `SmallCaps` (#1360). - - * HTML writer: - - + Autolinks now have class `uri`, and email autolinks have class - `email`, so they can be styled. - - * Docx writer: - - + Document formatting is carried over from `reference.docx`. - This includes margins, page size, page orientation, header, - and footer, including images in headers and footers. - + Include abstract (if present) with `Abstract` style (#1451). - + Include subtitle (if present) with `Subtitle` style, rather - than tacking it on to the title (#1451). - - * Org writer: - - + Write empty span elements with an id attribute as org anchors. - For example `Span ("uid",[],[]) []` becomes `<<uid>>`. - - * LaTeX writer: - - + Put table captions above tables, to match the conventional - standard. (Previously they appeared below tables.) - + Use `\(..\)` instead of `$..$` for inline math (#1464). - + Use `\nolinkurl` in email autolinks. This allows them to be styled - using `\urlstyle{tt}`. Thanks to Ulrike Fischer for the solution. - + Use `\textquotesingle` for `'` in inline code. Otherwise we get - curly quotes in the PDF output (#1364). - + Use `\footnote<.>{..}` for notes in beamer, so that footnotes - do not appear before the overlays in which their markers appear - (#1525). - + Don't produce a `\label{..}` for a Div or Span element. Do produce - a `\hyperdef{..}` (#1519). - - * EPUB writer: - - + If the metadata includes `page-progression-direction` (which can be - `ltr` or `rtl`, the `page-progression-direction` attribute will - be set in the EPUB spine (#1455). - - * Custom lua writers: - - + Custom writers now work with `--template`. - + Removed HTML header scaffolding from `sample.lua`. - + Made citation information available in lua writers. - - * `--normalize` and `Text.Pandoc.Shared.normalize` now consolidate - adjacent `RawBlock`s when possible. - - [API changes] - - * Added `Text.Pandoc.Readers.Docx`, exporting `readDocx` (Jesse Rosenthal). - - * Added `Text.Pandoc.Readers.EPUB`, exporting `readEPUB` (Matthew - Pickering). - - * Added `Text.Pandoc.Readers.Txt2Tags`, exporting `readTxt2Tags` (Matthew - Pickering). - - * Added `Text.Pandoc.Writers.DokuWiki`, exporting `writeDokuWiki` - (Clare Macrae). - - * Added `Text.Pandoc.Writers.Haddock`, exporting `writeHaddock`. - - * Added `Text.Pandoc.MediaBag`, exporting `MediaBag`, `lookupMedia`, - `insertMedia`, `mediaDirectory`, `extractMediaBag`. The docx and epub - readers return a pair of a `Pandoc` document and a `MediaBag` with - the media resources they contain. This can be extracted using - `--extract-media`. Writers that incorporate media (PDF, Docx, - ODT, EPUB, RTF, or HTML formats with `--self-contained`) will look - for resources in the `MediaBag` generated by the reader, in addition to - the file system or web. - - * `Text.Pandoc.Readers.TexMath`: Removed deprecated `readTeXMath`. - Renamed `readTeXMath'` to `texMathToInlines`. - - * `Text.Pandoc`: Added `Reader` data type (Matthew Pickering). - `readers` now associates names of readers with `Reader` - structures. This allows inclusion of readers, like the docx - reader, that take binary rather than textual input. - - * `Text.Pandoc.Shared`: - - + Added `capitalize` (Artyom Kazak), and replaced uses of - `map toUpper` (which give bad results for many languages). - + Added `collapseFilePath`, which removes intermediate `.` and - `..` from a path (Matthew Pickering). - + Added `fetchItem'`, which works like `fetchItem` but searches - a `MediaBag` before looking on the net or file system. - + Added `withTempDir`. - + Added `removeFormatting`. - + Added `extractSpaces` (from HTML reader) and generalized its type - so that it can be used by the docx reader (Matthew Pickering). - + Added `ordNub`. - + Added `normalizeInlines`, `normalizeBlocks`. - + `normalize` is now `Pandoc -> Pandoc` instead of - `Data a :: a -> a`. Some users may need to change their uses of - `normalize` to the newly exported `normalizeInlines` or - `normalizeBlocks`. - - * `Text.Pandoc.Options`: - - + Added `writerMediaBag` to `WriterOptions`. - + Removed deprecated and no longer used `readerStrict` in - `ReaderOptions`. This is handled by `readerExtensions` now. - + Added `Ext_compact_definition_lists`. - + Added `Ext_epub_html_exts`. - + Added `Ext_native_divs` and `Ext_native_spans`. - This allows users to turn off the default pandoc behavior of - parsing contents of div and span tags in markdown and HTML - as native pandoc Div blocks and Span inlines. - - * `Text.Pandoc.Parsing`: - - + Generalized `readWith` to `readWithM` (Matthew Pickering). - + Export `runParserT` and `Stream` (Matthew Pickering). - + Added `HasQuoteContext` type class (Matthew Pickering). - + Generalized types of `mathInline`, `smartPunctuation`, `quoted`, - `singleQuoted`, `doubleQuoted`, `failIfInQuoteContext`, - `applyMacros` (Matthew Pickering). - + Added custom `token` (Matthew Pickering). - + Added `stateInHtmlBlock` to `ParserState`. This is used to keep - track of the ending tag we're waiting for when we're parsing inside - HTML block tags. - + Added `stateMarkdownAttribute` to `ParserState`. This is used - to keep track of whether the markdown attribute has been set in - an enclosing tag. - + Generalized type of `registerHeader`, using new type classes - `HasReaderOptions`, `HasIdentifierList`, `HasHeaderMap` (Matthew - Pickering). These allow certain common functions to be reused - even in parsers that use custom state (instead of `ParserState`), - such as the MediaWiki reader. - + Moved `inlineMath`, `displayMath` from Markdown reader to Parsing, - and generalized their types (Matthew Pickering). - - * `Text.Pandoc.Pretty`: - - + Added `nestle`. - + Added `blanklines`, which guarantees a certain number of blank lines - (and no more). - - [bug fixes] - - * Markdown reader: - - + Fixed parsing of indented code in list items. Indented code - at the beginning of a list item must be indented eight spaces - from the margin (or edge of the container), or four spaces - from the list marker, whichever is greater. - + Fixed small bug in HTML parsing with `markdown_attribute`, which - caused incorrect tag nesting for input like - `<aside markdown="1">*hi*</aside>`. - + Fixed regression with intraword underscores (#1121). - + Improved parsing of inline links containing quote characters (#1534). - + Slight rewrite of `enclosure`/`emphOrStrong` code. - + Revamped raw HTML block parsing in markdown (#1330). - We no longer include trailing spaces and newlines in the - raw blocks. We look for closing tags for elements (but without - backtracking). Each block-level tag is its own `RawBlock`; - we no longer try to consolidate them (though `--normalize` will do so). - + Combine consecutive latex environments. This helps when you have - two minipages which can't have blank lines between them (#690, #1196). - + Support smallcaps through span. - `<span style="font-variant:small-caps;">foo</span>` will be - parsed as a `SmallCaps` inline, and will work in all output - formats that support small caps (#1360). - + Prevent spurious line breaks after list items (#1137). When the - `hard_line_breaks` option was specified, pandoc would formerly - produce a spurious line break after a tight list item. - + Fixed table parsing bug (#1333). - + Handle `c++` and `objective-c` as language identifiers in - github-style fenced blocks (#1318). - + Inline math must have nonspace before final `$` (#1313). - - * LaTeX reader: - - + Handle comments at the end of tables. This resolves the issue - illustrated in <http://stackoverflow.com/questions/24009489>. - + Correctly handle table rows with too few cells. LaTeX seems to - treat them as if they have empty cells at the end (#241). - + Handle leading/trailing spaces in `\emph` better. - `\emph{ hi }` gets parsed as `[Space, Emph [Str "hi"], Space]` - so that we don't get things like `* hi *` in markdown output. - Also applies to `\textbf` and some other constructions (#1146). - + Don't assume preamble doesn't contain environments (#1338). - + Allow (and discard) optional argument for `\caption` (James Aspnes). - - * HTML reader: - - + Fixed major parsing problem with HTML tables. Table cells were - being combined into one cell (#1341). - + Fixed performance issue with malformed HTML tables. - We let a `</table>` tag close an open `<tr>` or `<td>` (#1167). - + Allow space between `<col>` and `</col>`. - + Added `audio` and `source` in `eitherBlockOrInline`. - + Moved `video`, `svg`, `progress`, `script`, `noscript`, `svg` from - `blockTags` to `eitherBlockOrInline`. - + `map` and `object` were mistakenly in both lists; they have been removed - from `blockTags`. - + Ignore `DOCTYPE` and `xml` declarations. - - * MediaWiki reader: - - + Don't parse backslash escapes inside `<source>` (#1445). - + Tightened up template parsing. - The opening `{{` must be followed by an alphanumeric or `:`. - This prevents the exponential slowdown in #1033. - + Support "Bild" for images. - - * DocBook reader: - - + Better handle elements inside code environments. Pandoc's document - model does not allow structure inside code blocks, but at least this way - we preserve the text (#1449). - + Support `<?asciidoc-br?>` (#1236). - - * Textile reader: - - + Fixed list parsing. Lists can now start without an intervening - blank line (#1513). - + HTML block-level tags that do not start a line are parsed as - inline HTML and do not interrupt paragraphs (as in RedCloth). - - * Org reader: - - + Make tildes create inline code (#1345). Also relabeled `code` and - `verbatim` parsers to accord with the org-mode manual. - + Respect `:exports` header argument in code blocks (Craig Bosma). - + Fixed tight lists with sublists (#1437). - - * EPUB writer: - - + Avoid excess whitespace in `nav.xhtml`. This should improve - TOC view in iBooks (#1392). - + Fixed regression on cover image. - In 1.12.4 and 1.12.4.2, the cover image would not appear properly, - because the metadata id was not correct. Now we derive the id from the - actual cover image filename, which we preserve rather than using - "cover-image." - + Keep newlines between block elements. This allows - easier diff-ability (#1424). - + Use `stringify` instead of custom `plainify`. - + Use `renderTags'` for all tag rendering. This properly handles tags - that should be self-closing. Previously `<hr/>` would appear in EPUB - output as `<hr></hr>` (#1420). - + Better handle HTML media tags. - + Handle multiple dates with OPF `event` attributes. Note: in EPUB3 we - can have only one dc:date, so only the first one is used. - - * LaTeX writer: - - + Correctly handle figures in notes. Notes can't contain figures in - LaTeX, so we fake it to avoid an error (#1053). - + Fixed strikeout + highlighted code (#1294). - Previously strikeout highlighted code caused an error. - - * ConTeXt writer: - - + Improved detection of autolinks with URLs containing escapes. - - * RTF writer: - - + Improved image embedding: `fetchItem'` is now used to get the - images, and calculated image sizes are indicated in the RTF. - + Avoid extra paragraph tags in metadata (#1421). - - * HTML writer: - - + Deactivate "incremental" inside slide speaker notes (#1394). - + Don't include empty items in the table of contents for - slide shows. (These would result from creating a slide - using a horizontal rule.) - - * MediaWiki writer: - - + Minor renaming of `st` prefixed names. - - * AsciiDoc writer: - - + Double up emphasis and strong emphasis markers in intraword - contexts, as required by asciidoc (#1441). - - * Markdown writer: - - + Avoid wrapping that might start a list, blockquote, or header (#1013). - + Use Span instead of (hackish) `SmallCaps` in `plainify`. - + Don't use braced attributes for fenced code (#1416). - If `Ext_fenced_code_attributes` is not set, the first class - attribute will be printed after the opening fence as a bare word. - + Separate adjacent lists of the same kind with an HTML comment (#1458). - - * PDF writer: - - + Fixed treatment of data uris for images (#1062). - - * Docx writer: - - + Use Compact style for empty table cells (#1353). - Otherwise we get overly tall lines when there are empty - table cells and the other cells are compact. - + Create overrides per-image for `media/` in reference docx. - This should be somewhat more robust and cover more types of images. - + Improved `entryFromArchive` to avoid an unneeded parse. - + Section numbering carries over from reference.docx (#1305). - + Simplified `abstractNumId` numbering. Instead of sequential numbering, - we assign numbers based on the list marker styles. - - * `Text.Pandoc.Options`: - - + Removed `Ext_fenced_code_attributes` from `markdown_github` - extensions. - - * `Text.Pandoc.ImageSize`: - - + Use default instead of failing if image size not found - in exif header (#1358). - + ignore unknown exif header tag rather than crashing. - Some images seem to have tag type of 256, which was causing - a runtime error. - - * `Text.Pandoc.Shared`: - - + `fetchItem`: unescape URI encoding before reading local file (#1427). - + `fetchItem`: strip a fragment like `?#iefix` from the extension before - doing mime lookup, to improve mime type guessing. - + Improved logic of `fetchItem`: absolute URIs are fetched from the net; - other things are treated as relative URIs if `sourceURL` is `Just _`, - otherwise as file paths on the local file system. - + `fetchItem` now properly handles links without a protocol (#1477). - + `fetchItem` now escapes characters not allowed in URIs before trying - to parse the URIs. - + Fixed runtime error with `compactify'DL` on certain lists (#1452). - - * `pandoc.hs`: Don't strip path off of `writerSourceURL`: the path is - needed to resolve relative URLs when we fetch resources (#750). - - * `Text.Pandoc.Parsing` - - + Simplified `dash` and `ellipsis` (#1419). - + Removed `(>>~)` in favor of the equivalent `(<*)` (Matthew Pickering). - + Generalized functions to use `ParsecT` (Matthew Pickering). - + Added `isbn` and `pmid` to list of recognized schemes (Matthew - Pickering). - - [template changes] - - * Added haddock template. - * EPUB3: Added `type` attribute to `link` tags. They are supposed to - be "advisory" in HTML5, but kindlegen seems to require them. - * EPUB3: Put title page in section with `epub:type="titlepage"`. - * LaTeX: Made `\subtitle` work properly (#1327). - * LaTeX/Beamer: remove conditional around date (#1321). - * LaTeX: Added `lot` and `lof` variables, which can be set to - get `\listoftables` and `\listoffigures` (#1407). Note that - these variables can be set at the command line with `-Vlot -Vlof` - or in YAML metadata. - - [under the hood improvements] - - * Rewrote normalize for efficiency (#1385). - - * Rewrote Haddock reader to use `haddock-library` (#1346). - - + This brings pandoc's rendering of haddock markup in line - with the new haddock. - + Fixed line breaks in `@` code blocks. - + alex and happy are no longer build-depends. - - * Added `Text.Pandoc.Compat.Directory` to allow building against - different versions of the `directory` library. - - + Added `Text.Pandoc.Compat.Except` to allow building against - different verions of `mtl`. - - * Code cleanup in some writers, using Reader monad to avoid - passing options parameter around (Matej Kollar). - - * Improved readability in `pandoc.hs`. - - * Miscellaneous code cleanups (Artyom Kazak). - - * Avoid `import Prelude hiding (catch)` (#1309, thanks to Michael - Thompson). - - * Changed `http-conduit` flag to `https`. Depend on `http-client` - and `http-client-tls` instead of `http-conduit`. (Note: pandoc still - depends on `conduit` via `yaml`.) - - * Require `highlighting-kate >= 0.5.8.5` (#1271, #1317, Debian #753299). - This change to highlighting-kate means that PHP fragments no longer need - to start with `<?php`. It also fixes a serious bug causing failures with - ocaml and fsharp. - - * Require latest `texmath`. This fixes `\tilde{E}` and allows - `\left` to be used with `]`, `)` etc. (#1319), among many other - improvements. - - * Require latest `zip-archive`. This has fixes for unicode path names. - - * Added tests for plain writer. - - * `Text.Pandoc.Templates`: - - + Fail informatively on template syntax errors. - With the move from parsec to attoparsec, we lost good error - reporting. In fact, since we weren't testing for end of input, - malformed templates would fail silently. Here we revert back to - Parsec for better error messages. - + Use `ordNub` (#1022). - - * Benchmarks: - - + Made benchmarks compile again (Artyom Kazak). - + Fixed so that the failure of one benchmark does not prevent others - from running (Artyom Kazak). - + Use `nfIO` instead of the `getLength` trick to force full evaluation. - + Changed benchmark to use only the test suite, so that benchmarks - run more quickly. - - * Windows build script: - - + Add `-windows` to file name. - + Use one install command for pandoc, pandoc-citeproc. - + Force install of pandoc-citeproc. - - * `make_osx_package`: Call zip file `pandoc-VERSION-osx.zip`. - The zip should not be named `SOMETHING.pkg.zip`, or OSX finder - will extract it into a folder named `SOMETHING.pkg`, which it - will interpret as a defective package (#1308). - - * `README`: - - + Made headers for all extensions so they have IDs and can be - linked to (Beni Cherniavsky-Paskin). - + Fixed typos (Phillip Alday). - + Fixed documentation of attributes (#1315). - + Clarified documentation on small caps (#1360). - + Better documentation for `fenced_code_attributes` extension - (Caleb McDaniel). - + Documented fact that you can put YAML metadata in a separate file - (#1412). - - -pandoc (1.12.4.2) - - * Require highlighting-kate >= 0.5.8. Fixes a performance regression. - - * Shared: `addMetaValue` now behaves slightly differently: - if both the new and old values are lists, it concatenates their - contents to form a new list. - - * LaTeX reader: - - + Set `bibliography` in metadata from `\bibliography` or - `\addbibresource` command. - + Don't error on `%foo` with no trailing newline. - - * Org reader: - - + Support code block headers (`#+BEGIN_SRC ...`) (Albert Krewinkel). - + Fix parsing of blank lines within blocks (Albert Krewinkel). - + Support pandoc citation extension (Albert Krewinkel). This can - be turned off by specifying `org-citations` as the input format. - - * Markdown reader: - - + `citeKey` moved to `Text.Pandoc.Parsing` so it can be used by - other readers (Albert Krewinkel). - - * `Text.Pandoc.Parsing`: - - + Added `citeKey` (see above). - + Added `HasLastStrPosition` type class and `updateLastStrPos` - and `notAfterString` functions. - - * Updated copyright notices (Albert Krewinkel). - - * Added default.icml to data files so it installs with the package. - - * OSX package: - - + The binary is now built with options to ensure that it can be - used with OSX 10.6+. - + Moved OSX package materials to osx directory. - + Added OSX package uninstall script, included in the zip container - (thanks to Daniel T. Staal). - -pandoc (1.12.4) - - * Made it possible to run filters that aren't executable (#1096). - Pandoc first tries to find the executable (searching the path - if path isn't given). If it fails, but the file exists and has - a `.py`, `.pl`, `.rb`, `.hs`, or `.php` extension, pandoc runs the filter - using the appropriate interpreter. This should make it easier to - use filters on Windows, and make it more convenient for everyone. - - * Added Emacs org-mode reader (Albert Krewinkel). - - * Added InDesign ICML Writer (Mauro Bieg). - - * MediaWiki reader: - - + Accept image links in more languages (Jaime Marquínez Ferrándiz). - + Fixed bug in certain nested lists (#1213). If a level 2 list was - followed by a level 1 list, the first item of the level 1 list - would be lost. - + Handle table rows containing just an HTML comment (#1230). - - * LaTeX reader: - - + Give better location information on errors, pointing to line - numbers within included files (#1274). - + LaTeX reader: Better handling of `table` environment (#1204). - Positioning options no longer rendered verbatim. - + Better handling of figure and table with caption (#1204). - + Handle `@{}` and `p{length}` in tabular. The length is not actually - recorded, but at least we get a table (#1180). - + Properly handle `\nocite`. It now adds a `nocite` metadata - field. Citations there will appear in the bibliography but not - in the text (unless you explicitly put a `$nocite$` variable - in your template). - - * Markdown reader: - - + Ensure that whole numbers in YAML metadata are rendered without - decimal points. (This became necessary with changes to aeson - and yaml libraries. aeson >= 0.7 and yaml >= 0.8.8.2 are now required.) - + Fixed regression on line breaks in strict mode (#1203). - + Small efficiency improvements. - + Improved parsing of nested `div`s. Formerly a closing `div` tag - would be missed if it came right after other block-level tags. - + Avoid backtracking when closing `</div>` not found. - + Fixed bug in reference link parsing in `markdown_mmd`. - + Fixed a bug in list parsing (#1154). When reading a raw list - item, we now strip off up to 4 spaces. - + Fixed parsing of empty reference link definitions (#1186). - + Made one-column pipe tables work (#1218). - - * Textile reader: - - + Better support for attributes. Instead of being ignored, attributes - are now parsed and included in Span inlines. The output will be a bit - different from stock textile: e.g. for `*(foo)hi*`, we'll get - `<em><span class="foo">hi</span></em>` instead of - `<em class="foo">hi</em>`. But at least the data is not lost. - + Improved treatment of HTML spans (%) (#1115). - + Improved link parsing. In particular we now pick up on attributes. - Since pandoc links can't have attributes, we enclose the whole link in - a span if there are attributes (#1008). - + Implemented correct parsing rules for inline markup (#1175, Matthew - Pickering). - + Use Builder (Matthew Pickering). - + Fixed list parsing bug (#1500). - + Don't allow inline formatting to extend over newlines. - This matches the behavior of RedCarpet, avoids some ugly bugs, - and improves performance. - - * DocBook reader: - - + Better treatment of `formalpara`. We now emit the title (if present) - as a separate paragraph with boldface text (#1215). - + Set metadata `author` not `authors`. - + Added recognition of `authorgroup` and `releaseinfo` elements (#1214, - Matthew Pickering). - + Converted current meta information parsing in DocBook to a more - extensible version which is aware of the more recent meta - representation (Matthew Pickering). - - * HTML reader: - - + Require tagsoup 0.13.1, to fix a bug with parsing of script tags - (#1248). - + Treat processing instructions & declarations as block. Previously - these were treated as inline, and included in paragraph tags in HTML - or DocBook output, which is generally not what is wanted (#1233). - + Updated `closes` with rules from HTML5 spec. - + Use Builder (Matthew Pickering, #1162). - - * RST reader: - - + Remove duplicate `http` in PEP links (Albert Krewinkel). - + Make rst figures true figures (#1168, CasperVector) - + Enhanced Pandoc's support for rST roles (Merijn Verstaaten). - rST parser now supports: all built-in rST roles, new role definition, - role inheritance, though with some limitations. - + Use `author` rather than `authors` in metadata. - + Better handling of directives. We now correctly handle field - lists that are indented more than three spaces. We treat an - `aafig` directive as a code block with attributes, so it can be - processed in a filter (#1212). - - * LaTeX writer: - - + Mark span contents with label if span has an ID (Albert Krewinkel). - + Made `--toc-depth` work well with books in latex/pdf output (#1210). - + Handle line breaks in simple table cells (#1217). - + Workaround for level 4-5 headers in quotes. These previously produced - invalid LaTeX: `\paragraph` or `\subparagraph` in a `quote` environment. - This adds an `mbox{}` in these contexts to work around the problem. - See <http://tex.stackexchange.com/a/169833/22451> (#1221). - + Use `\/` to avoid en-dash ligature instead of `-{}-` (Vaclav Zeman). - This is to fix LuaLaTeX output. The `-{}-` sequence does not avoid the - ligature with LuaLaTeX but `\/` does. - + Fixed string escaping in `hyperref` and `hyperdef` (#1130). - - * ConTeXt writer: Improved autolinks (#1270). - - * DocBook writer: - - + Improve handling of hard line breaks in Docbook writer - (Neil Mayhew). Use a `<literallayout>` for the entire paragraph, not - just for the newline character. - + Don't let line breaks inside footnotes influence the enclosing - paragraph (Neil Mayhew). - + Distinguish tight and loose lists in DocBook output, using - `spacing="compact"` (Neil Mayhew, #1250). - - * Docx writer: When needed files are not present in the user's - `reference.docx`, fall back on the versions in the `reference.docx` - in pandoc's data files. This fixes a bug that occurs when a - `reference.docx` saved by LibreOffice is used. (#1185) - - * EPUB writer: - - + Include extension in epub ids. This fixes a problem with duplicate - extensions for fonts and images with the same base name but different - extensions (#1254). - + Handle files linked in raw `img` tags (#1170). - + Handle media in `audio` source tags (#1170). - Note that we now use a `media` directory rather than `images`. - + Incorporate files linked in `video` tags (#1170). `src` and `poster` - will both be incorporated into `content.opf` and the epub container. - - * HTML writer: - - + Add colgroup around col tags (#877). Also affects EPUB writer. - + Fixed bug with unnumbered section headings. Unnumbered section - headings (with class `unnumbered`) were getting numbers. - + Improved detection of image links. Previously image links with - queries were not recognized, causing `<embed>` to be used instead - of `<img>`. - - * Man writer: Ensure that terms in definition lists aren't line wrapped - (#1195). - - * Markdown writer: - - + Use proper escapes to avoid unwanted lists (#980). Previously we used - 0-width spaces, an ugly hack. - + Use longer backtick fences if needed (#1206). If the content contains a - backtick fence and there are attributes, make sure longer fences are - used to delimit the code. Note: This works well in pandoc, but github - markdown is more limited, and will interpret the first string of three - or more backticks as ending the code block. - - * RST writer: Avoid stack overflow with certain tables (#1197). - - * RTF writer: Fixed table cells containing paragraphs. - - * Custom writer: - - + Correctly handle UTF-8 in custom lua scripts (#1189). - + Fix bugs with lua scripts with mixed-case filenames and - paths containing `+` or `-` (#1267). Note that `getWriter` - in `Text.Pandoc` no longer returns a custom writer on input - `foo.lua`. - - * AsciiDoc writer: Handle multiblock and empty table cells - (#1245, #1246). Added tests. - - * `Text.Pandoc.Options`: Added `readerTrace` to `ReaderOptions` - - * `Text.Pandoc.Shared`: - - + Added `compactify'DL` (formerly in markdown reader) (Albert Krewinkel). - + Fixed bug in `toRomanNumeral`: numbers ending with '9' would - be rendered as Roman numerals ending with 'IXIV' (#1249). Thanks to - Jesse Rosenthal. - + `openURL`: set proxy with value of http_proxy env variable (#1211). - Note: proxies with non-root paths are not supported, due to - limitations in `http-conduit`. - - * `Text.Pandoc.PDF`: - - + Ensure that temp directories deleted on Windows (#1192). The PDF is - now read as a strict bytestring, ensuring that process ownership will - be terminated, so the temp directory can be deleted. - + Use `/` as path separators in a few places, even on Windows. - This seems to be necessary for texlive (#1151, thanks to Tim Lin). - + Use `;` for `TEXINPUTS` separator on Windows (#1151). - + Changes to error reporting, to handle non-UTF8 error output. - - * `Text.Pandoc.Templates`: - - + Removed unneeded datatype context (Merijn Verstraaten). - - + YAML objects resolve to "true" in conditionals (#1133). - Note: If `address` is a YAML object and you just have `$address$` - in your template, the word `true` will appear, which may be - unexpected. (Previously nothing would appear.) - - * `Text.Pandoc.SelfContained`: - - + `mkSelfContained` now takes just two arguments, `WriterOptions` and - the string. - * It no longer looks in data files. This only made sense when we - had copies of slidy and S5 code there. - * `fetchItem'` is used instead of the nearly duplicate `getItem`. - + Handle `poster` attribute in `video` tags (#1188). - - * `Text.Pandoc.Parsing`: - - + Made `F` an instance of Applicative (#1138). - + Added `stateCaption`. - + Added `HasMacros`, simplified other typeclasses. - Removed `updateHeaderMap`, `setHeaderMap`, `getHeaderMap`, - `updateIdentifierList`, `setIdentifierList`, `getIdentifierList`. - + Changed the smart punctuation parser to return `Inlines` - rather than `Inline` (Matthew Pickering). - + Changed `HasReaderOptions`, `HasHeaderMap`, `HasIdentifierList` - from typeclasses of monads to typeclasses of states. This simplifies - the instance definitions and provides more flexibility. Generalized - type of `getOption` and added a default definition. Removed - `askReaderOption`. Added `extractReaderOption`. Added - `extractHeaderMap` and `updateHeaderMap` in `HasHeaderMap`. - Gave default definitions for `getHeaderMap`, `putHeaderMap`, - `modifyHeaderMap`. Added `extractIdentifierList` and - `updateIdentifierList` in `HasIdentifierList`. Gave defaults - for `getIdentifierList`, `putIdentifierList`, and - `modifyIdentifierList`. The ultimate goal here is to allow different - parsers to use their own, tailored parser states (instead of - `ParserState`) while still using shared functions. - - * Template changes: - - + LaTeX template: Use `fontenc` package only with `pdflatex` (#1164). - + LaTeX template: Add `linestretch` and `fontfamily` variables. - + LaTeX template: Conditionalize author and date commands. - + Beamer template: Consistent styles for figure and table captions - (aaronwolen). - + LaTeX and beamer template: Adjust widths correctly for oversized - images. Use `\setkeys{Gin}{}` to set appropriate defaults for - `\includegraphics` (Yihui Xie, Garrick Aden-Buie). Load - `upquote` only after `fontenc` (Yihui Xie). - + Beamer template: Added caption package (#1200). - + Beamer template: changes for better unicode handling (KarolS). - + DocBook template: use `authorgroup` if there are authors. - + revealjs template: Move `include-after` to end (certainlyakey). - + revealjs template: Fixed PDF print function (#1220, kevinkenan). - - * Bumped version bounds of dependencies. - - * Added a `--trace` command line option, for debugging backtracking - bugs. So far this only works with the markdown reader. - - * MathMLinHTML: Fixed deprecation warning (#362, gwern, Albert Krewinkel). - - * Updated travis script to test with multiple GHC versions. - - * Force failure of a Travis build if GHC produces warnings (Albert - Krewinkel). - - * Add `.editorconfig` (Albert Krewinkel). - See <http://editorconfig.org/> for details. - - * Give more useful error message if '-t pdf' is specified (#1155). - - * Added `Cite`, `SmallCaps` to `Arbitrary` instance (#1269). - - * Allow `html4` as a synonym of `html` as a reader (it already works - as a writer). - - * README: - - + Added an explanation of how to use YAML metadata to - force items to appear in the bibliography without citations in - the text (like LaTeX `\nocite`). - + Added note to `--bibtex/--natbib`: not for use in making PDF - (#1194, thanks to nahoj). - + Added explanatory notes about `--natbib` and `--biblatex`. - + Added specification of legal syntax for citation keys. - + Fixed variable defaults documentation (Albert Krewinkel). - - * Removed copyright statements for files that have been removed - (Albert Krewinkel). - - * Moved some doc files from `data-files` to `extra-source-files` (#1123). - They aren't needed at runtime. We keep README and COPYRIGHT in data - to ensure that they'll be available on all systems on which pandoc - is installed. - - * Use cabal sandboxes in Windows build script. - -pandoc (1.12.3.3) - - * To changes to source; recompiled tarball with latest alex and - happy, so they will work with GHC 7.8. - -pandoc (1.12.3.2) - - * Bumped version bounds for blaze-html, blaze-markup. - - * ImageSize: Avoid use of lookAhead, which is not in binary >= 0.6 - (#1124). - - * Fixed mediawiki ordered list parsing (#1122). - - * HTML reader: Fixed bug reading inline math with `$$` (#225). - - * Added support for LaTeX style literate Haskell code blocks in rST - (Merijn Verstraaten). - -pandoc (1.12.3.1) - - * Relaxed version constraint on binary, allowing the use of binary 0.5. - -pandoc (1.12.3) - - * The `--bibliography` option now sets the `biblio-files` variable. - So, if you're using `--natbib` or `--biblatex`, you can just use - `--bibliography=foo.bib` instead of `-V bibliofiles=foo`. - - * Don't run pandoc-citeproc filter if `--bibliography` is - used together with `--natbib` or `--biblatex` (Florian Eitel). - - * Template changes: - - + Updated beamer template to include booktabs. - + Added `abstract` variable to LaTeX template. - + Put `header-includes` after `title` in LaTeX template (#908). - + Allow use of `\includegraphics[size]` in beamer. - This just required porting a macro definition from the default - LaTeX template to the default beamer template. - - * `reference.docx`: Include `FootnoteText` style. - Otherwise Word ignores the style, even when specified in the `pPr`. - (#901) - - * `reference.odt`: Tidied `styles.xml`. - - * Relaxed version bounds for dependencies. - - * Added `withSocketsDo` around http conduit code in `openURL`, - so it works on Windows (#1080). - - * Added `Cite` function to `sample.lua`. - - * Markdown reader: - - + Fixed regression in title blocks (#1089). - If author field was empty, date was being ignored. - + Allow backslash-newline hard line breaks in grid and - multiline table cells. - + Citation keys may now start with underscores, and may contain - underscores adjacent to internal punctuation. - - * LaTeX reader: - - + Add support for `Verb` macro (jrnold) (#1090). - + Support babel-style quoting: `` "`..."' ``. - - * Properly handle script blocks in strict mode. (That is, - `markdown-markdown_in_html_blocks`.) Previously a spurious - `<p>` tag was being added (#1093). - - * Docbook reader: Avoid failure if `tbody` contains no `tr` or `row` - elements. - - * LaTeX writer: - - + Factored out function for table cell creation. - + Better treatment of footnotes in tables. - Notes now appear in the regular sequence, rather than in the - table cell. (This was a regression in 1.10.) - - * HTML reader: Parse name/content pairs from meta tags as metadata. - Closes #1106. - - * Moved `fixDisplayMath` from Docx writer to `Writer.Shared`. - - * OpenDocument writer: Fixed `RawInline`, `RawBlock` so they don't escape. - - * ODT writer: Use mathml for proper rendering of formulas. - Note: LibreOffice's support for this seems a bit buggy. But - it should be better than what we had before. - - * RST writer: Ensure no blank line after def in definition list (#992). - - * Markdown writer: Don't use tilde code blocks with braced attributes in - `markdown_github` output. A consequence of this change is that the - backtick form will be preferred in general if both are enabled. That - is good, as it is much more widespread than the tilde form. (#1084) - - * Docx writer: Fixed problem with some modified reference docx files. - Include `word/_rels/settings.xml.rels` if it exists, as well as other - `rels` files besides the ones pandoc generates explicitly. - - * HTML writer: - - + With `--toc`, headers no longer link to themselves (#1081). - + Omit footnotes from TOC entries. Otherwise we get doubled - footnotes when headers have notes! - - * EPUB writer: - - + Avoid duplicate notes when headings contain notes. - This arose because the headings are copied into the metadata - "title" field, and the note gets rendered twice. We strip the - note now before putting the heading in "title". - + Strip out footnotes from toc entries. - + Fixed bug with `--epub-stylesheet`. Now the contents of - `writerEpubStylesheet` (set by `--epub-stylesheet`) - should again work, and take precedence over a stylesheet specified - in the metadata. - - * `Text.Pandoc.MIME`: Added `wmf`, `emf`. - - * `Text.Pandoc.Shared`: `fetchItem` now handles image URLs beginning - with `//`. - - * `Text.Pandoc.ImageSize`: Parse EXIF format JPEGs. Previously - we could only get size information for JFIF format, which led - to squished images in Word documents. Closes #976. - - * Removed old `MarkdownTest_1.0.3` directory (#1104). - -pandoc (1.12.2.1) - - * Markdown reader: Fixed regression in list parser, involving - continuation lines containing raw HTML (or even verbatim raw HTML). - -pandoc (1.12.2) - - * Metadata may now be included in YAML blocks in a markdown document. - For example, - - --- - title: - - type: main - text: My Book - - type: subtitle - text: An investigation of metadata - creator: - - role: author - text: John Smith - - role: editor - text: Sarah Jones - identifier: - - scheme: DOI - text: doi:10.234234.234/33 - publisher: My Press - rights: (c) 2007 John Smith, CC BY-NC - cover-image: img/mypic.jpg - ... - - Metadata may still be provided using `--epub-metadata`; it will - be merged with the metadata in YAML blocks. - - * EPUB writer: - - + `meta` tags are now used instead of `opf` attributes for EPUB3. - + Insert "svg" property as needed in opf (EPUB 3). - + Simplify `imageTypeOf` using `getMimeType`. - + Add properties attribute to `cover-image` item for EPUB 3. - + Don't include node for `cover.xhtml` if no cover! - + Ensure that same identifier is used throughout (#1044). - If an identifier is given in metadata, we use that; otherwise - we generate a random uuid. - + Add cover reference to guide element (EPUB 2) (Shaun Attfield). - Fixes an issue with Calibre putting the cover at the end of the book - if the spine has `linear="no"`. Apparently this is best practice - for other converters as well: - <http://www.idpf.org/epub/20/spec/OPF_2.0.1_draft.htm#Section2.6>. - + Allow `stylesheet` in metadata. The value is a path to the stylesheet. - + Allow partial dates: `YYYY`, `YYYY-MM`. - - * Markdown writer: Fix rendering of tight sublists (#1050). - Previously a spurious blank line was included after a tight sublist. - - * ODT writer: Add `draw:name` attribute to `draw:frame` elements (#1069). - This is reported to be necessary to avoid an error from recent - versions of Libre Office when files contain more than one image - Thanks to wmanley for reporting and diagnosing the problem. - - * ConTeXt writer: Don't hardcode figure/table placement and numbering. - Instead, let this be set in the template, using `\setupfloat`. - Thanks to on4aa and Aditya Mahajan for the suggestion (#1067). - - * Implemented CSL flipflopping spans in DOCX, LaTeX, and HTML writers. - - * Fixed bug with markdown intraword emphasis. Closes #1066. - - * Docbook writer: Hierarchicalize block content in metadata. - Previously headers just disappeared from block-level metadata - when it was used in templates. Now we apply the 'hierarchicalize' - transformation. Note that a block headed by a level-2 header will - turn into a `<sect1>` element. - - * OpenDocument writer: Skip raw HTML (#1035). - Previously it was erroneously included as verbatim text. - - * HTML/EPUB writer, footnotes: Put `<sup>` tag inside `<a>` tags. - This allows better control of formatting, since the `<a>` - tags have a distinguishing class (#1049). - - * Docx writer: - - + Use mime type info returned by fetchItem. - + Fixed core metadata (#1046). - Don't create empty date nodes if no date given. - Don't create multiple `dc:creator` nodes; instead separate by - semicolons. - + Fix URL for core-properties in `_rels/.rels` (#1046). - - * Plain writer: don't print `<span>` tags. - - * LaTeX writer: - - + Fix definition lists with internal links in terms (#1032). - This fix puts braces around a term that contains an internal - link, to avoid problems with square brackets. - + Properly escape pdftitle, pdfauthor (#1059). - + Use booktabs package for tables (thanks to Jose Luis Duran). - - * Updated beamer template. Now references should work properly - (in a slide) when `--biblatex` or `--natbib` is used. - - * LaTeX reader: - - + Parse contents of curly quotes or matched `"` as quotes. - + Support `\textnormal` as span with class `nodecor`. - This is needed for pandoc-citeproc. - + Improved citation parsing. This fixes a run-time error that occured - with `\citet{}` (empty list of keys). It also ensures that empty keys - don't get produced. - - * MediaWiki reader: Add automatic header identifiers. - - * HTML reader: - - + Use pandoc `Div` and `Span` for raw `<div>`, `<span>` when - `--parse-raw`. - + Recognize `svg` tags as block level content (thanks to MinRK). - + Parse LaTeX math if appropriate options are set. - - * Markdown reader: - - + Yaml block must start immediately after `---`. If there's a blank - line after `---`, we interpreted it as a horizontal rule. - + Correctly handle empty bullet list items. - + Stop parsing "list lines" when we hit a block tag. - This fixes exponential slowdown in certain input, e.g. - a series of lists followed by `</div>`. - - * Slides: Preserve `<div class="references">` in references slide. - - * `Text.Pandoc.Writer.Shared`: - - + Fixed bug in `tagWithAttrs`. A space was omitted before key-value - attributes, leading to invalid HTML. - + `normalizeDate`: Allow dates with year only (thanks to Shaun Attfield). - + Fixed bug in `openURL` with `data:` URIs. Previously the base-64 - encoded bytestring was returned. We now decode it so it's a proper - image! - - * DocBook reader: Handle numerical attributes starting with decimal. - Also use `safeRead` instead of `read`. - - * `Text.Pandoc.Readers.TexMath`: Export `readTeXMath'`, which attends - to display/inline. Deprecate `readTeXMath`, and use `readTeXMath'` - in all the writers. Require `texmath >= 0.6.5.2`. - - * `Text.Pandoc.MIME`: - - + Add entry for `jfif`. - + In looking up extensions, drop the encoding info. - E.g. for 'image/jpg;base64' we should lookup 'image/jpg'. - - * Templates: Changed how array variables are resolved. Previously if - `foo` is an array (which might be because multiple values were set on - the command line), `$foo$` would resolve to the concatenation of the - elements of foo. This is rarely useful behavior. It has been changed - so that the first value is rendered. Of course, you can still iterate - over the values using `$for(foo)$`. This has the result that you can - override earlier settings using `-V` by putting new values later on the - command line, which is useful for many purposes. - - * `Text.Pandoc`: Don't default to `pandocExtensions` for all writers. - - * Allow "epub2" as synonym for "epub", "html4" for "html". - - * Don't look for slidy files in data files with `--self-contained`. - - * Allow `https:` command line arguments to be downloaded. - - * Fixed `make_osx_package.sh` so data files embedded in `pandoc-citeproc`. - -pandoc (1.12.1) - - * `Text.Pandoc.Definition`: Changed default JSON serialization format. - Instead of `{"Str": "foo"}`, for example, we now have `{"t": "Str", - "c": "foo"}`. This new format is easier to work with outside of Haskell. - Incidentally, "t" stands for "tag", "c" for "contents". - - * MediaWiki reader: Trim contents of `<math>` tags, to avoid problems - when converting to markdown (#1027). - - * LaTeX reader: - - + Ensure that preamble doesn't contribute to the text of - the document. - + Fixed character escaping in \url{}. Previously `\~` wasn't handled - properly, among others. - + Parse `{groups}` as `Span`. This is needed for accurate conversion of - bibtex titles, since we need to know what was protected from - titlecase conversions. - - * LaTeX writer: - - + Specially escape non-ascii characters in labels. - Otherwise we can get compile errors and other bugs when - compiled with pdflatex (#1007). Thanks to begemotv2718 for the fix. - + Add link anchors for code blocks with identifiers (#1025). - - * Throughout the code, use `isURI` instead of `isAbsoluteURI`. - It allows fragments identifiers. - - * Slide formats: - - + A Div element with class "notes" is treated as speaker - notes. Currently beamer goes to `\note{}`, revealjs to - `<aside class="notes">`, and the notes are simply suppressed in - other formats (#925). - + Fixed `. . .` (pause) on HTML slide formats. Closes #1029. - The old version caused a pause to be inserted before the first - material on a slide. This has been fixed. - + Removed data files for s5, slideous, slidy. - Users of s5 and slideous will have to download the needed - files, as has been documented for some time in the README. - By default, slidy code will be sought on the web, as before. - - * HTML writer: Insert command to typeset mathjax only in slideous output - (#966, #1012). - - * RST writer: Skip spaces after display math. Otherwise we get indentation - problems, and part of the next paragraph may be rendered as part of the - math. - - * OpenDocument writer: Fix formatting of strikeout code (#995), - thanks to wilx. don't use `font-face-decls` variable. - - * Fixed test suite so it works with cabal sandboxes. - -pandoc (1.12.0.2) - - * Removed `stringable` dependency. - -pandoc (1.12.0.1) - - * Allow `--metadata` to be repeated for the same key to form a list. - This also has the effect that `--bibliography` can be repeated, - as before. - - * Handle boolean values in `--metadata`. Note that anything not parseable - as a YAML boolean or string is treated as a literal string. - You can get a string value with "yes", or any of the strings interpretable - as booleans, by quoting it: - - -M boolvalue=yes -M stringvalue='"yes"' - - * LaTeX writer: Don't print references if `--natbib` or `--biblatex` - option used. - - * DOCX writer: Add `settings.xml` to the zip container. Fixes a bug - in which docx files could not be read by some versions of Word - and LibreOffice (#990). - - * Fixed a regression involving slide shows with bibliographies. - The Div container around references messed up the procedure for carving - a document into slides. So we now remove the surrounding Div in - `prepSlides`. - - * More informative error message when a filter is not found in path. - - * Depend on pandoc-types 1.12.1. This provide `ToJSONFilter` - instances for `Data a => a -> [a]` and `Data a => a -> IO [a]`. - - * Don't use unicode_collation in building OSX package: - it adds something like 50MB of dependencies to the package. - - * Declare alex and happy as build-tools (#986). - -pandoc (1.12) - - [new features] - - * Much more flexible metadata, including arbitrary fields and structured - values. Metadata can be specified flexibly in pandoc markdown using - YAML metadata blocks, which may occur anywhere in the document: - - --- - title: Here is my title. - abstract: | - This is the abstract. - - 1. It can contain - 2. block content - and *inline markup* - - tags: [cat, dog, animal] - ... - - Metadata fields automatically populate template variables. - - * Added `opml` (OPML) as input and output format. The `_note` attribute, - used in OmniOutliner and supported by multimarkdown, is supported. - We treat the contents as markdown blocks under a section header. - - * Added `haddock` (Haddock markup) as input format (David Lazar). - - * Added `revealjs` output format, for reveal.js HTML 5 slide shows. - (Thanks to Jamie F. Olson for the initial patch.) - Nested vertical stacks are used for hierarchical structure. - Results for more than one level of nesting may be odd. - - * Custom writers can now be written in lua. - - pandoc -t data/sample.lua - - will load the script sample.lua and use it as a custom writer. - (For a sample, do `pandoc --print-default-data-file sample.lua`.) - Note that pandoc embeds a lua interpreter, so lua need not be - installed separately. - - * New `--filter/-F` option to make it easier to run "filters" - (Pandoc AST transformations that operate on JSON serializations). - Filters are always passed the name of the output format, so their - behavior can be tailored to it. The repository - <https://github.com/jgm/pandocfilters> contains - a python module for writing pandoc filters in python, with - a number of examples. - - * Added `--metadata/-M` option. - This is like `--variable/-V`, but actually adds to metadata, not - just variables. - - * Added `--print-default-data-file` option, which allows printing - of any of pandoc's data files. (For example, - `pandoc --print-default-data-file reference.odt` will print - `reference.odt`.) - - * Added syntax for "pauses" in slide shows: - - This gives - - . . . - - me pause. - - * New markdown extensions: - - + `ignore_line_breaks`: causes intra-paragraph line breaks to be ignored, - rather than being treated as hard line breaks or spaces. This is useful - for some East Asian languages, where spaces aren't used between words, - but text is separated into lines for readability. - + `yaml_metadata_block`: Parse YAML metadata blocks. (Default.) - + `ascii_identifiers`: This will force `auto_identifiers` to use ASCII - only. (Default for `markdown_github`.) (#807) - + `lists_without_preceding_blankline`: Allow lists to start without - preceding blank space. (Default for `markdown_github`.) (#972) - - [behavior changes] - - * `--toc-level` no longer implies `--toc`. - Reason: EPUB users who don't want a visible TOC may still want - to set the TOC level for in the book navigation. - - * `--help` now prints in and out formats in alphabetical order, and - says something about PDF output (#720). - - * `--self-contained` now returns less verbose output (telling you - which URLs it is fetching, but not giving the full header). In - addition, there are better error messages when fetching a URL fails. - - * Citation support is no longer baked in to core pandoc. Users who - need citations will need to install and use a separate filter - (`--filter pandoc-citeproc`). This filter will take `bibliography`, - `csl`, and `citation-abbreviations` from the metadata, though it - may still be specified on the command line as before. - - * A `Cite` element is now created in parsing markdown whether or not - there is a matching reference. - - * The `pandoc-citeproc` script will put the bibliography at the - end of the document, as before. However, it will be put inside a `Div` - element with class "references", allowing users some control - over the styling of references. A final header, if any, will - be included in the `Div`. - - * The markdown writer will not print a bibliography if the - `citations` extension is enabled. (If the citations are formatted - as markdown citations, it is redundant to have a bibliography, - since one will be generated automatically.) - - * Previously we used to store the directory of the first input file, - even if it was local, and used this as a base directory for finding - images in ODT, EPUB, Docx, and PDF. This has been confusing to many - users. So we now look for images relative to the current - working directory, even if the first file argument is in another - directory. Note that this change may break some existing workflows. - If you have been assuming that relative links will be interpreted - relative to the directory of the first file argument, you'll need - to make that the current directory before running pandoc. (#942) - - * Better error reporting in some readers, due to changes in `readWith`: - the line in which the error occured is printed, with a caret pointing - to the column. - - * All slide formats now support incremental slide view for definition lists. - - * Parse `\(..\)` and `\[..\]` as math in MediaWiki reader. - Parse `:<math>...</math>` as display math. These notations are used with - the MathJax MediaWiki extension. - - * All writers: template variables are set automatically from metadata - fields. However, variables specified on the command line with - `--variable` will completely shadow metadata fields. - - * If `--variable` is used to set many variables with the same name, - a list is created. - - * Man writer: The `title`, `section`, `header`, and `footer` can now - all be set individually in metadata. The `description` variable has been - removed. Quotes have been added so that spaces are allowed in the - title. If you have a title that begins - - COMMAND(1) footer here | header here - - pandoc will still parse it into a title, section, header, and - footer. But you can also specify these elements explicitly (#885). - - * Markdown reader - - + Added support for YAML metadata blocks, which can come anywhere - in the document (not just at the beginning). A document can contain - multiple YAML metadata blocks. - + HTML span and div tags are parsed as pandoc Span and Div elements. - - * Markdown writer - - + Allow simple tables to be printed as grid tables, - if other table options are disabled. This means you can do - `pandoc -t markdown-pipe_tables-simple_tables-multiline_tables` - and all tables will render as grid tables. - + Support YAML title block (render fields in alphabetical order - to make output predictable). - - [API changes] - - * `Meta` in `Text.Pandoc.Definition` has been changed to allow - structured metadata. (Note: existing code that pattern-matches - on `Meta` will have to be revised.) Metadata can now contain - indefinitely many fields, with content that can be a string, - a Boolean, a list of `Inline` elements, a list of `Block` - elements, or a map or list of these. - - * A new generic block container (`Div`) has been added to `Block`, - and a generic inline container (`Span`) has been added to `Inline`. - These can take attributes. They will render in HTML, Textile, - MediaWiki, Org, RST and and Markdown (with `markdown_in_html` - extension) as HTML `<div>` and `<span>` elements; in other formats - they will simply pass through their contents. But they can be - targeted by scripts. - - * `Format` is now a newtype, not an alias for String. - Equality comparisons are case-insensitive. - - * Added `Text.Pandoc.Walk`, which exports hand-written tree-walking - functions that are much faster than the SYB functions from - `Text.Pandoc.Generic`. These functions are now used where possible - in pandoc's code. (`Tests.Walk` verifies that `walk` and `query` - match the generic traversals `bottomUp` and `queryWith`.) - - * Added `Text.Pandoc.JSON`, which provides `ToJSON` and `FromJSON` - instances for the basic pandoc types. They use GHC generics and - should be faster than the old JSON serialization using - `Data.Aeson.Generic`. - - * Added `Text.Pandoc.Process`, exporting `pipeProcess`. - This is a souped-up version of `readProcessWithErrorcode` that - uses lazy bytestrings instead of strings and allows setting - environment variables. (Used in `Text.Pandoc.PDF`.) - - * New module `Text.Pandoc.Readers.OPML`. - - * New module `Text.Pandoc.Writers.OPML`. - - * New module `Text.Pandoc.Readers.Haddock` (David Lazar). - This is based on Haddock's own lexer/parser. - - * New module `Text.Pandoc.Writers.Custom`. - - * In `Text.Pandoc.Shared`, `openURL` and `fetchItem` now return an - Either, for better error handling. - - * Made `stringify` polymorphic in `Text.Pandoc.Shared`. - - * Removed `stripTags` from `Text.Pandoc.XML`. - - * `Text.Pandoc.Templates`: - - + Simplified `Template` type to a newtype. - + Removed `Empty`. - + Changed type of `renderTemplate`: it now takes a JSON context - and a compiled template. - + Export `compileTemplate`. - + Export `renderTemplate'` that takes a string instead of a compiled - template. - + Export `varListToJSON`. - - * `Text.Pandoc.PDF` exports `makePDF` instead of `tex2pdf`. - The signature of `makePDF` has changed and now contains - an additional argument for pdf engine options. - - * `Text.Pandoc`: - - + Made `toJsonFilter` an alias for `toJSONFilter` from `Text.Pandoc.JSON`. - + Removed `ToJsonFilter` typeclass. `ToJSONFilter` from - `Text.Pandoc.JSON` should be used instead. (Compiling against - pandoc-types instead of pandoc will also produce smaller executables.) - * Removed the deprecated `jsonFilter` function. - + Added `readJSON`, `writeJSON` to the API (#817). - - * `Text.Pandoc.Options`: - - + Added `Ext_lists_without_preceding_blankline`, - `Ext_ascii_identifiers`, `Ext_ignore_line_breaks`, - `Ext_yaml_metadataBlock` to `Extension`. - + Changed `writerSourceDirectory` to `writerSourceURL` and changed the - type to a `Maybe`. `writerSourceURL` is set to 'Just url' when the - first command-line argument is an absolute URL. (So, relative links - will be resolved in relation to the first page.) Otherwise, 'Nothing'. - + All bibliography-related fields have been removed from - `ReaderOptions` and `WriterOptions`: `writerBiblioFiles`, - `readerReferences`, `readerCitationStyle`. - + Removed `writerPdfArgs` from `WriterOptions`. These are now - passed in as a parameter to `makePDF`. - - * The `Text.Pandoc.Biblio` module has been removed. Users of the - pandoc library who want citation support will need to use - `Text.CSL.Pandoc` from `pandoc-citeproc`. - - - [bug fixes] - - * In markdown, don't autolink a bare URI that is followed by `</a>` - (#937). - - * `Text.Pandoc.Shared` - - + `openURL` now follows redirects (#701), properly handles `data:` - URIs, and prints diagnostic output to stderr rather than stdout. - + `readDefaultDataFile`: normalize the paths. This fixes bugs in - `--self-contained` on pandoc compiled with `embed_data_files` (#833). - + Fixed `readDefaultDataFile` so it works on Windows. - + Better error messages for `readDefaultDataFile`. Instead of - listing the last path tried, which can confuse people who are - using `--self-contained`, so now we just list the data file name. - + URL-escape pipe characters. Even though these are legal, `Network.URI` - doesn't regard them as legal in URLs. So we escape them first (#535). - - * Mathjax in HTML slide shows: include explicit "Typeset" call. - This seems to be needed for some formats (e.g. slideous) and won't - hurt in others (#966). - - * `Text.Pandoc.PDF` - - + On Windows, create temdir in working directory, since the system - temp directory path may contain tildes, which can cause - problems in LaTeX (#777). - + Put temporary output directory in `TEXINPUTS` (see #917). - + `makePDF` tries to download images that are not found locally, - if the first argument is a URL (#917). - + If compiling with `pdflatex` yields an encoding error, offer - the suggestion to use `--latex-engine=xelatex`. - - * Produce automatic header identifiers in parsing textile, RST, - and LaTeX, unless `auto_identifiers` extension is disabled (#967). - - * `Text.Pandoc.SelfContained`: Strip off fragment, query of relative URL - before treating as a filename. This fixes `--self-contained` when used - with CSS files that include web fonts using the method described here: - <http://paulirish.com/2009/bulletproof-font-face-implementation-syntax/> - (#739). Handle `src` in `embed`, `audio`, `source`, `input` tags. - - * `Text.Pandoc.Parsing`: `uri` parser no longer treats punctuation before - percent-encoding, or a `+` character, as final punctuation. - - * `Text.Pandoc.ImageSize`: Handle EPS (#903). This change will make - EPS images properly sized on conversion to Word. - - * Slidy: Use slidy.js rather than slidy.js.gz. - Reason: some browsers have trouble with the gzipped js file, - at least on the local file system (#795). - - * Markdown reader - - + Properly handle blank line at beginning of input (#882). - + Fixed bug in unmatched reference links. The input - `[*infile*] [*outfile*]` was getting improperly parsed: - "infile" was emphasized, but "*outfile*" was literal (#883). - + Allow internal `+` in citation identifiers (#856). - + Allow `.` or `)` after `#` in ATX headers if no `fancy_lists`. - + Do not generate blank title, author, or date metadata elements. - Leave these out entirely if they aren't present. - + Allow backtick code blocks not to be preceded by blank line (#975). - - * Textile reader: - - + Correctly handle entities. - + Improved handling of `<pre>` blocks (#927). Remove internal HTML tags - in code blocks, rather than printing them verbatim. Parse attributes - on `<pre>` tag for code blocks. - - * HTML reader: Handle non-simple tables (#893). Column widths are read from - `col` tags if present, otherwise divided equally. - - * LaTeX reader - - + Support alltt environment (#892). - + Support `\textasciitilde`, `\textasciicircum` (#810). - + Treat `\textsl` as emphasized text reader (#850). - + Skip positional options after `\begin{figure}`. - + Support `\v{}` for hacek (#926). - + Don't add spurious ", " to citation suffixes. - This is added when needed in pandoc-citeproc. - + Allow spaces in alignment spec in tables, e.g. `{ l r c }`. - + Improved support for accented characters (thanks to Scott Morrison). - + Parse label after section command and set id (#951). - - * RST reader: - - + Don't insert paragraphs where docutils doesn't. - `rst2html` doesn't add `<p>` tags to list items (even when they are - separated by blank lines) unless there are multiple paragraphs in the - list. This commit changes the RST reader to conform more closely to - what docutils does (#880). - + Improved metadata. Treat initial field list as metadata when - standalone specified. Previously ALL fields "title", "author", - "date" in field lists were treated as metadata, even if not at - the beginning. Use `subtitle` metadata field for subtitle. - + Fixed 'authors' metadata parsing in reST. Semicolons separate - different authors. - - * MediaWiki reader - - + Allow space before table rows. - + Fixed regression for `<ref>URL</ref>`. - `<` is no longer allowed in URLs, according to the uri parser - in `Text.Pandoc.Parsing`. Added a test case. - + Correctly handle indented preformatted text without preceding - or following blank line. - + Fixed `|` links inside table cells. Improved attribute parsing. - + Skip attributes on table rows. Previously we just crashed if - rows had attributes, now we ignore them. - + Ignore attributes on headers. - + Allow `Image:` for images (#971). - + Parse an image with caption in a paragraph by itself as a figure. - - * LaTeX writer - - + Don't use ligatures in escaping inline code. - + Fixed footnote numbers in LaTeX/PDF tables. This fixes a bug - wherein notes were numbered incorrectly in tables (#827). - + Always create labels for sections. Previously the labels were only - created when there were links to the section in the document (#871). - + Stop escaping `|` in LaTeX math. - This caused problems with array environments (#891). - + Change `\` to `/` in paths. `/` works even on Windows in LaTeX. - `\` will cause major problems if unescaped. - + Write id for code block to label attribute in LaTeX when listings - is used (thanks to Florian Eitel). - + Scale LaTeX tables so they don't exceed columnwidth. - + Avoid problem with footnotes in unnumbered headers (#940). - - * Beamer writer: when creating beamer slides, add `allowframebreaks` option - to the slide if it is one of the header classes. It is recommended - that your bibliography slide have this attribute: - - # References {.allowframebreaks} - - This causes multiple slides to be created if necessary, depending - on the length of the bibliography. - - * ConTeXt writer: Properly handle tables without captions. The old output - only worked in MkII. This should work in MkIV as well (#837). - - * MediaWiki writer: Use native mediawiki tables instead of HTML (#720). - - * HTML writer: - - + Fixed `--no-highlight` (Alexander Kondratskiy). - + Don't convert to lowercase in email obfuscation (#839). - + Ensure proper escaping in `<title>` and `<meta>` fields. - - * AsciiDoc writer: - - + Support `--atx-headers` (Max Rydahl Andersen). - + Don't print empty identifier blocks `([[]])` on headers (Max - Rydahl Andersen). - - * ODT writer: - - + Fixing wrong numbered-list indentation in open document format - (Alexander Kondratskiy) (#369). - + `reference.odt`: Added pandoc as "generator" in `meta.xml`. - + Minor changes for ODF 1.2 conformance (#939). We leave the - nonconforming `contextual-spacing` attribute, which is provided by - LibreOffice itself and seems well supported. - - * Docx writer: - - + Fixed rendering of display math in lists. - In 1.11 and 1.11.1, display math in lists rendered as a new list - item. Now it always appears centered, just as outside of lists, - and in proper display math style, no matter how far indented the - containing list item is (#784). - + Use `w:br` with `w:type` `textWrapping` for linebreaks. - Previously we used `w:cr` (#873). - + Use Compact style for Plain block elements, to - differentiate between tight and loose lists (#775). - + Ignore most components of `reference.docx`. - We take the `word/styles.xml`, `docProps/app.xml`, - `word/theme/theme1.xml`, and `word/fontTable.xml` from - `reference.docx`, ignoring everything else. This should help - with the corruption problems caused when different versions of - Word resave the reference.docx and reorganize things. - + Made `--no-highlight` work properly. - - * EPUB writer - - + Don't add `dc:creator` tags if present in EPUB metadata. - + Add `id="toc-title"` to `h1` in `nav.xhtml` (#799). - + Don't put blank title page in reading sequence. - Set `linear="no"` if no title block. Addresses #797. - + Download webtex images and include as data URLs. - This allows you to use `--webtex` in creating EPUBs. - Math with `--webtex` is automatically made self-contained. - + In `data/epub.css`, removed highlighting styles (which - are no longer needed, since styles are added by the HTML - writer according to `--highlighting-style`). Simplified - margin fields. - + If resource not found, skip it, as in Docx writer (#916). - - * RTF writer: - - + Properly handle characters above the 0000-FFFF range. - Uses surrogate pairs. Thanks to Hiromi Ishii for the patch. - + Fixed regression with RTF table of contents. - + Only autolink absolute URIs. This fixes a regression, #830. - - * Markdown writer: - - + Only autolink absolute URIs. This fixes a regression, #830. - + Don't wrap attributes in fenced code blocks. - + Write full metadata in MMD style title blocks. - + Put multiple authors on separate lines in pandoc titleblock. - Also, don't wrap long author entries, as new lines get treated - as new authors. - - * `Text.Pandoc.Templates`: - - + Fixed bug retrieving default template for markdown variants. - + Templates can now contain "record lookups" in variables; - for example, `author.institution` will retrieve the `institution` - field of the `author` variable. - + More consistent behavior of `$for$`. When `foo` is not a list, - `$for(foo)$...$endfor$` should behave like $if(foo)$...$endif$. - So if `foo` resolves to "", no output should be produced. - See pandoc-templates#39. - - * Citation processing improvements (now part of pandoc-citeproc): - - + Fixed `endWithPunct` The new version correctly sees a sentence - ending in '.)' as ending with punctuation. This fixes a bug which - led such sentences to receive an extra period at the end: '.).'. - Thanks to Steve Petersen for reporting. - + Don't interfere with Notes that aren't citation notes. - This fixes a bug in which notes not generated from citations were - being altered (e.g. first letter capitalized) (#898). - + Only capitalize footnote citations when they have a prefix. - + Changes in suffix parsing. A suffix beginning with a digit gets 'p' - inserted before it before passing to citeproc-hs, so that bare numbers - are treated as page numbers by default. A suffix not beginning with - punctuation has a space added at the beginning (rather than a comma and - space, as was done before for not-author-in-text citations). - The result is that `\citep[23]{item1}` in LaTeX will be interpreted - properly, with '23' treated as a locator of type 'page'. - + Many improvements to citation rendering, due to fixes in citeproc-hs - (thanks to Andrea Rossato). - + Warnings are issued for undefined citations, which are rendered - as `???`. - + Fixed hanging behavior when locale files cannot be found. - - [template changes] - - * DocBook: Use DocBook 4.5 doctype. - - * Org: '#+TITLE:' is inserted before the title. - Previously the writer did this. - - * LaTeX: Changes to make mathfont work with xelatex. - We need the mathspec library, not just fontspec, for this. - We also need to set options for setmathfont (#734). - - * LaTeX: Use `tex-ansi` mapping for `monofont`. - This ensures that straight quotes appear as straight, rather than - being treated as curly. See #889. - - * Made `\includegraphics` more flexible in LaTeX template. - Now it can be used with options, if needed. Thanks to Bernhard Weichel. - - * LaTeX/Beamer: Added `classoption` variable. - This is intended for class options like `oneside`; it may - be repeated with different options. (Thanks to Oliver Matthews.) - - * Beamer: Added `fonttheme` variable. (Thanks to Luis Osa.) - - * LaTeX: Added `biblio-style` variable (#920). - - * DZSlides: title attribute on title section. - - * HTML5: add meta tag to allow scaling by user (Erik Evenson) - - [under-the-hood improvements] - - * Markdown reader:Improved strong/emph parsing, using the strategy of - <https://github.com/jgm/Markdown>. The new parsing algorithm requires - no backtracking, and no keeping track of nesting levels. It will give - different results in some edge cases, but these should not affect normal - uses. - - * Added `Text.Pandoc.Compat.Monoid`. - This allows pandoc to compile with `base` < 4.5, where `Data.Monoid` - doesn't export `<>`. Thanks to Dirk Ullirch for the patch. - - * Added `Text.Pandoc.Compat.TagSoupEntity`. - This allows pandoc to compile with `tagsoup` 0.13.x. - Thanks to Dirk Ullrich for the patch. - - * Most of `Text.Pandoc.Readers.TeXMath` has been moved to the - `texmath` module (0.6.4). (This allows `pandoc-citeproc` to - handle simple math in bibliography fields.) - - * Added `Text.Pandoc.Writers.Shared` for shared functions used - only in writers. `metaToJSON` is used in writers to create a - JSON object for use in the templates from the pandoc metadata - and variables. `getField`, `setField`, and `defField` are - for working with JSON template contexts. - - * Added `Text.Pandoc.Asciify` utility module. - This exports functions to create ASCII-only versions of identifiers. - - * `Text.Pandoc.Parsing` - - + Generalized state type on `readWith` (API change). - + Specialize readWith to `String` input. (API change). - + In `ParserState`, replace `stateTitle`, `stateAuthors`, `stateDate` - with `stateMeta` and `stateMeta'`. - - * `Text.Pandoc.UTF8`: use strict bytestrings in reading. The use of lazy - bytestrings seemed to cause problems using pandoc on 64-bit Windows - 7/8 (#874). - - * Factored out `registerHeader` from markdown reader, added to - `Text.Pandoc.Parsing`. - - * Removed `blaze_html_0_5` flag, require `blaze-html` >= 0.5. - Reason: < 0.5 does not provide a monoid instance for Attribute, - which is now needed by the HTML writer (#803). - - * Added `http-conduit` flag, which allows fetching https resources. - It also brings in a large number of dependencies (`http-conduit` - and its dependencies), which is why for now it is an optional flag - (#820). - - * Added CONTRIBUTING.md. - - * Improved INSTALL instructions. - - * `make-windows-installer.bat`: Removed explicit paths for executables. - - * `aeson` is now used instead of `json` for JSON. - - * Set default stack size to 16M. This is needed for some large - conversions, esp. if pandoc is compiled with 64-bit ghc. - - * Various small documentation improvements. - Thanks to achalddave and drothlis for patches. - - * Removed comment that chokes recent versions of CPP (#933). - - * Removed support for GHC version < 7.2, since pandoc-types now - requires at least GHC 7.2 for GHC generics. - - -pandoc (1.11.1) - - * Markdown reader: - - + Fixed regression in which parentheses were lost in link URLs. - Added tests. Closes #786. - + Better handling of unmatched double quotes in `--smart` mode. - These occur frequently in fiction, since it is customary not to - close quotes in dialogue if the speaker does not change between - paragraphs. The unmatched quotes now get turned into literal - left double quotes. (No `Quoted` inline is generated, however.) - Closes #99 (again). - - * HTML writer: Fixed numbering mismatch between TOC and sections. - `--number-offset` now affects TOC numbering as well - as section numbering, as it should have all along. Closes #789. - - * Markdown writer: Reverted 1.11 change that caused citations to be rendered - as markdown citations, even if `--bibliography` was specified, unless - `citation` extension is disabled. Now, formatted citations are always - printed if `--bibliography` was specified. If you want to reformat - markdown keeping pandoc markdown citations intact, don't use - `--bibliography`. Note that citations parsed from LaTeX documents will - be rendered as pandoc markdown citations when `--bibliography` is not - specified. - - * ODT writer: Fixed regression leading to corrupt ODTs. - This was due to a change in the `Show` instance for - `Text.Pandoc.Pretty.Doc`. Closes #780. - - * Fixed spacing bugs involving code block attributes in - RST reader and Markdown writer. Closes #763. - - * Windows package: Various improvements due to Fyodor Sheremetyev. - - + Automatically set installation path (Program Files or Local App Data). - + Set system PATH environment variable when installing for all users. - + Pandoc can installed for all users using the following command. - `msiexec /i pandoc-1.11.msi ALLUSERS=1`. - - * Bumped QuickCheck version bound. - -pandoc (1.11) - - * Added `--number-offset` option. (See README for description.) - - * Added `--default-image-extension` option. (See README for description.) - - * `--number-sections` behavior change: headers with class `unnumbered` - will not be numbered. - - * `--version` now reports the default data directory. - - * `Text.Pandoc.Parsing` is no longer exposed. (API change.) - - * `Text.Pandoc.Highlighting` is no longer exposed. (API change.) - - * `Text.Pandoc.Shared`: Changed type of `Element`. `Sec` now includes - a field for `Attr` rather than just `String`. (API change.) - - * Added `markdown_github` as input format. This was an accidental - omission in 1.10. - - * Added `readerDefaultImageExtension` field to `ReaderOptions`. (API - change.) - - * Added `writerNumberOffset` field in `WriterOptions`. (API change.) - - * Beamer template: - - + Fixed captions with longtable. Thanks to Joost Kremers. - + Provide `\Oldincludegraphics` as in LaTeX template (Benjamin Bannier). - - * LaTeX template: - - + Load microtype after fonts. Microtype needs to know - what fonts are being used. Thanks to dfc for the patch. - + Set `secnumdepth` to 5 if `--number-sections` specified. - This yields behavior equivalent to the other writers, numbering - level 4 and 5 headers too. Closes #753. - - * HTML reader: - - + Handle `<colgroup>` tag. - + Preserve all header attributes. - - * LaTeX reader: - - + Parse `\hrule` as `HorizontalRule`. Closes #746. - + Parse starred variants of `\section` etc. as headers with - attribute `unnumbered`. - + Read optional attributes in `lstlisting` and `Verbatim` environments. - We convert these to pandoc standard names, e.g. `numberLines` - for `numbers=left`, `startFrom=100` from `firstnumber=100`. - + Handle language attribute for lstlistings. - + Better support for Verbatim and minted environments. Closes #763. - - * Markdown reader: - - + `-` in an attribute context = `.unnumbered`. The point of this - is to provide a way to specify unnumbered headers in non-English - documents. - + Fixed bug parsing key/value attributes. Parsing failed if you - had an unquoted attribute immediately before the final '}'. - + Make backslash escape work in attributes. - + Fix title block parsing. Now if `mmd_title_blocks` is specified, - pandoc will parse a MMD title block if it sees one, even if - `pandoc_title_blocks` is enabled. - + Refactoring: `litChar` now includes entities, so we don't need - to use `fromEntities` e.g. on titles. - + Allow spaces around borders in pipe tables. Closes #772. - + Allow all punctuation in angle-bracket autolinks. Previously - things like `----` were disallowed, because the uri parser - treated them as trailing punctuation. Closes #768. - + Make `implicit_header_references` work properly when - headers are given explicit identifiers. - + Check for tables before line blocks. Otherwise some pipe - tables get treated as line blocks. - + Allow `&` in emails (for entities). - + Properly handle entities in titles and links. A markdown link - `<http://göogle.com>` should be a link to `http://göogle.com`. - Closes #723. - - * Textile reader: - - + Handle attributes on headers. - - * LaTeX reader: - - + Add `fig:` as title for images with captions. - This is needed for them to be rendered as figures. Closes #766. - + Never emit an empty paragraph. See #761. - + Handle `\caption` for images in figures. Closes #766. - + Parse `\section*`, etc. as unnumbered sections. - - * HTML writer: - - + Support header attributes. The attributes go on - the enclosing `section` or `div` tag if `--section-divs` is specified. - + Fixed a regression (only now noticed) in html+lhs output. - Previously the bird tracks were being omitted. - - * LaTeX writer: - - + Omit lists with no items to avoid LaTeX errors. - + Support line numbering with `--listings`. - If `numberLines` class is present, we add `numbers=left`; - if `startFrom` is present, we add `firstnumber=`. (#763) - - * ConTeXt writer: - - + Removed `\placecontent`. This produced a duplicate toc, - in conjunction with `\placelist`. - + Use `\title`, `\subject` etc. for headers with - `unnumbered` class. - - * Textile writer: - - + Support header attributes. - - * Markdown writer: - - + Use grid tables when needed, and if enabled. Closes #740. - + Render citations as pandoc-markdown citations. - Previously citations were rendered as citeproc-formatted citations - by default. Now we render them as pandoc citations, e.g. `[@item1]`, - unless the `citations` extension is disabled. - If you still want formatted citations in your markdown output, - use `pandoc -t markdown-citations`. - - * RST writer: - - + Support `:number-lines:` in code blocks. - - * Docx writer: - - + Better treatment of display math. Display math inside a - paragraph is now put in a separate paragraph, so it will render - properly (centered and without extra blank lines around it). - Partially addresses #742. - + Content types and document rels xml files are now created from - scratch, rather than being taken over from `reference.docx`. - This fixes problems that arise when you edit the `reference.docx` - with Word. - + We also now encode mime types for each individual image rather - than using defaults. This should allow us to handle a wider - range of image types (including PDF). Closes #414. - + Changed style names in `reference docx`. - `FootnoteReference` -> `FootnoteRef`, `Hyperlink` -> `Link`. - The old names got changed by Word when the `reference.docx` was - edited. Closes #414. - - * EPUB writer: - - + Fix section numbering. Previously the numbering restarted from 1 - in each chapter (with `--number-sections`), though the numbers in - the table of contents were correct. - + Headers with "unnumbered" attribute are not numbered. (Nor do they - cause an increment in running numbering.) Section numbers now work - properly, even when there is material before the first numbered section. - + Include HTML TOC, even in epub2. The TOC is included in `<spine>`, - but `linear` is set to `no` unless the `--toc` option is specified. - Include `<guide>` element in OPF. This should allow the TOC to - be useable in Kindles when converted with kindlegen. Closes #773. - - * `Text.Pandoc.Parsing`: Optimized `oneOfStringsCI`. - This dramatically reduces the speed penalty that comes from enabling the - `autolink_bare_uris` extension. The penalty is still substantial (in one - test, from 0.33s to 0.44s), but nowhere near what it used to be. - The RST reader is also much faster now, as it autodetects URIs. - - * `Text.Pandoc.Shared`: `hierarchicalize` will not number section - with class "unnumbered". Unnumbered sections get `[]` for their - section number. - - * `Text.Pandoc.Pretty`: - - + Fixed `chomp` so it works inside `Prefixed` elements. - + Changed `Show` instance so it is better for debugging. - - * `Text.Pandoc.ImageSize`: Added `Pdf` to `ImageType`. - - * `Text.Pandoc.UTF8`: Strip off BOM if present. Closes #743. - - * Windows installer improvements: - - + The installer is now signed with a certificate (thanks to - Fyodor Sheremetyev). - + WiX is used instead of InnoSetup. The installer is now a - standard msi file. - + The version number is now auto-detected, and need not be - updated separately. - - * OSX installer improvements: - - + The package and pandoc executable are now signed with a - certificate (thanks to Fyodor Sheremetyev). - + RTF version of license is used. - + Use full path for sysctl in `InstallationCheck` script (jonahbull). - Closes #580. - - * Converted COPYING to markdown. - - * pandoc.cabal: Require latest versions of highlighting-kate, - texmath, citeproc-hs, zip-archive. - -pandoc (1.10.1) - - * Markdown reader: various optimizations, leading to a - significant performance boost. - - * RST reader: Allow anonymous form of inline links: - `` `hello <url>`__ `` Closes #724. - - * Mediawiki reader: Don't require newlines after tables. - Thanks to jrunningen for the patch. Closes #733. - - * Fixed LaTeX macro parsing. Now LaTeX macro definitions are preserved - when output is LaTeX, and applied when it is another format. - Partially addresses #730. - - * Markdown and RST readers: Added parser to `block` that skips blank - lines. This fixes a subtle regression involving grid tables with - empty cells. Also added test for grid table with empty cells. - Closes #732. - - * RST writer: Use `.. code:: language` for code blocks with language. - Closes #721. - - * DocBook writer: Fixed output for hard line breaks, adding a newline - between `<literallayout>` tags. - - * Markdown writer: Use an autolink when link text matches url. - Previously we also checked for a null title, but this - test fails for links produced by citeproc-hs in bibliographies. - So, if the link has a title, it will be lost on conversion - to an autolink, but that seems okay. - - * Markdown writer: Set title, author, date variables as before. - These are no longer used in the default template, since we use - titleblock, but we set them anyway for those who use custom templates. - - * LaTeX writer: Avoid extra space at start/end of table cell. - Thanks to Nick Bart for the suggestion of using @{}. - - * `Text.Pandoc.Parsing`: - - + More efficient version of `anyLine`. - + Type of `macro` has changed; the parser now returns `Blocks` - instead of `Block`. - - * Relaxed old-time version bound, allowing 1.0.*. - - * Removed obsolete `hsmarkdown` script. Those who need `hsmarkdown` - should create a symlink as described in the README. - -pandoc (1.10.0.5) - - * Markdown reader: Try `lhsCodeBlock` before `rawTeXBlock`. Otherwise - `\begin{code}...\end{code}` isn't handled properly in markdown+lhs. - Thanks to Daniel Miot for noticing the bug and suggesting the fix. - - * Markdown reader: Fixed bug with headerless grid tables. - The 1.10 code assumed that each table header cell contains exactly one - block. That failed for headerless tables (0) and also for tables with - multiple blocks in a header cell. The code is fixed and tests provided. - Thanks to Andrew Lee for pointing out the bug. - - * Markdown reader: Fixed regressions in fenced code blocks. Closes #722. - - + Tilde code fences can again take a bare language string - (`~~~ haskell`), not just curly-bracketed attributes - (`~~~ {.haskell}`). - + Backtick code blocks can take the curly-bracketed attributes. - + Backtick code blocks don't *require* a language. - + Consolidated code for the two kinds of fenced code blocks. - - * LaTeX template: Use `\urlstyle{same}` to avoid monospace URLs. - - * Markdown writer: Use proportional font for email autolinks with - obfuscation. Closes #714. - - * Corrected name of `blank_before_blockquote` in README. Closes #718. - - * `Text.Pandoc.Shared`: Fixed bug in `uri` parser. - The bug prevented an autolink at the end of a string (e.g. - at the end of a line block line) from counting as a link. Closes #711. - - * Use the `hsb2hs` preprocessor instead of TH for embed_data_files. - This should work on Windows, unlike the TH solution with - file-embed. - - * Eliminated use of TH in test suite. - - * Added `Text.Pandoc.Data` (non-exported) to hold the association - list of embedded data files, if the `embed_data_files` flag is selected. - This isolates the code that needs special treatment with file-embed or - `hsb2hs`. - - * Changes to `make-windows-installer.bat`. - - + Exit batch file if any of the cabal-dev installs fail. - + There's no longer any need to reinstall `highlighting-kate`. - + Don't start with a `cabal update`; leave that to the user. - + Force reinstall of pandoc. - - * Fixed EPUB writer so it builds with blaze-html 0.4.x. Thanks to - Jens Petersen. - -pandoc (1.10.0.4) - - * Fixed bug with escaped % in LaTeX reader. Closes #710. - -pandoc (1.10.0.3) - - * Added further missing fb2 tests to cabal file. - -pandoc (1.10.0.2) - - * Added fb2 tests to cabal file's extra-source-files. - -pandoc (1.10.0.1) - - * Bump version bounds on test-framework packages. - -pandoc (1.10) - - [new features] - - * New input formats: `mediawiki` (MediaWiki markup). - - * New output formats: `epub3` (EPUB v3 with MathML), - `fb2` (FictionBook2 ebooks). - - * New `--toc-depth` option, specifying how many levels of - headers to include in a table of contents. - - * New `--epub-chapter-level` option, specifying the header - level at which to divide EPUBs into separate files. - Note that this normally affects only performance, not the - visual presentation of the EPUB in a reader. - - * Removed the `--strict` option. Instead of using `--strict`, - one can now use the format name `markdown_strict` for either input - or output. This gives more fine-grained control that `--strict` - did, allowing one to convert from pandoc's markdown to strict - markdown or vice versa. - - * It is now possible to enable or disable specific syntax - extensions by appending them (with `+` or `-`) to the writer - or reader name. For example, - - pandoc -f markdown-footnotes+hard_line_breaks - - disables footnotes and enables treating newlines as hard - line breaks. The literate Haskell extensions are now implemented - this way as well, using either `+lhs` or `+literate_haskell`. - For a list of extension names, see the README under - "Pandoc's Markdown." - - * The following aliases have been introduced for specific - combinations of markdown extensions: `markdown_phpextra`, - `markdown_github`, `markdown_mmd`, `markdown_strict`. These aliases - work just like regular reader and writer names, and can be modified - with extension modifiers as described above. (Note that conversion - from one markdown dialect to another does not work perfectly, - because there are differences in markdown parsers besides - just the extensions, and because pandoc's internal document model is - not rich enough to capture all of the extensions.) - - * New `--html-q-tags` option. The previous default was to use `<q>` - tags for smart quotes in HTML5. But `<q>` tags are also valid HTML4. - Moreover, they are not a robust way of typesetting quotes, since - some user agents don't support them, and some CSS resets (e.g. - bootstrap) prevent pandoc's quotes CSS from working properly. - We now just insert literal quote characters by default in both - `html` and `html5` output, but this option is provided for - those who still want `<q>` tags. - - * The markdown reader now prints warnings (to stderr) about - duplicate link and note references. Closes #375. - - * Markdown syntax extensions: - - + Added pipe tables. Thanks to François Gannaz for the initial patch. - These conform to PHP Markdown Extra's pipe table syntax. A subset - of org-mode table syntax is also supported, which means that you can - use org-mode's nice table editor to create tables. - - + Added support for RST-style line blocks. These are - useful for verse and addresses. - - + Attributes can now be specified for headers, using the same - syntax as in code blocks. (However, currently only the - identifier has any effect in most writers.) For example, - - # My header {#foo} - - See [the header above](#foo). - - + Pandoc will now act as if link references have been defined - for all headers without explicit identifiers. - So, you can do this: - - # My header - - Link to [My header]. - Another link to [it][My header]. - - Closes #691. - - * LaTeX reader: - - + Command macros now work everywhere, including non-math. - Environment macros still not supported. - + `\input` now works, as well as `\include`. TEXINPUTS is used. - Pandoc looks recursively into included files for more included files. - - [behavior changes] - - * The Markdown reader no longer puts the text of autolinks in a - `Code` inline. This means that autolinks will no longer appear - in a monospace font. - - * The character `/` can now appear in markdown citation keys. - - * HTML blocks in strict_markdown are no longer required to begin - at the left margin. Technically this is required, according to - the markdown syntax document, but `Markdown.pl` and other markdown - processors are more liberal. - - * The `-V` option has been changed so that if there are duplicate - variables, those specified later on the command line take precedence. - - * Tight lists now work in LaTeX and ConTeXt output. - - * The LaTeX writer no longer relien on the `enumerate` package. - Instead, it uses standard LaTeX commands to change the list numbering - style. - - * The LaTeX writer now uses `longtable` instead of `ctable`. This allows - tables to be split over page boundaries. - - * The RST writer now uses a line block to render paragraphs containing - linebreaks (which previously weren't supported at all). - - * The markdown writer now applies the `--id-prefix` to footnote IDs. - Closes #614. - - * The plain writer no longer uses backslash-escaped line breaks - (which are not very "plain"). - - * `Text.Pandoc.UTF8`: Better error message for invalid UTF8. - Read bytestring and use `Text`'s decodeUtf8 instead of using - `System.IO.hGetContents`. This way you get a message saying - "invalid UTF-8 stream" instead of "invalid byte sequence." - You are also told which byte caused the problem. - - * Docx, ODT, and EPUB writers now download images specified by a URL - instead of skipping them or raising an error. - - * EPUB writer: - - + The default CSS now left-aligns headers by default, instead of - centering. This is more consistent with the rest of the writers. - + A proper multi-level table of contents is now used in `toc.ncx`. - There is no longer a subsidiary table of contents at the beginning - of each chapter. - + Code highlighting now works by default. - + Section divs are used by default for better semantic markup. - + The title is used instead of "Title Page" in the table of contents. - Otherwise we have a hard-coded English string, which looks - strange in ebooks written in other languages. Closes #572. - - * HTML writer: - - + Put mathjax in span with class "math". Closes #562. - + Put citations in a span with class "citation." In HTML5, also include - a `data-cite` attribute with a space-separated list of citation - keys. - - * `Text.Pandoc.UTF8`: use universalNewlineMode in reading. - This treats both `\r\n` and `\n` as `\n` on input, no matter - what platform we're running on. - - * Citation processing is now done in the Markdown and LaTeX - readers, not in `pandoc.hs`. This makes it easier for library users - to use citations. - - [template changes] - - * HTML: Added css to template to preserve spaces in `<code>` tags. - Thanks to Dirk Laurie. - - * Beamer: Remove English-centric strings in section pages. - Section pages used to have "Section" and a number as well as the - section title. Now they just have the title. Similarly for part - and subsection. Closes #566. - - * LaTeX, ConTeXt: Added papersize variable. - - * LaTeX, Beamer templates: Use longtable instead of ctable. - - * LaTeX, Beamer templates: Don't require 'float' package for tables. - We don't actually seem to use the '[H]' option. - - * LaTeX: Use `upquote` package if it is available. This fixes - straight quotes in verbatim environments. - - * Markdown, plain: Fixed titleblock so it is just a single string. - Previously separate title, author, and date variables were used, - but this didn't allow different kinds of title blocks. - - * EPUB: - - + Rationalized templates. Previously there were three different - templates involved in epub production. There is now just one - template, `default.epub` or `default.epub3`. It can now be - overridden using `--template`, just like other templates. - The titlepage is now folded into the default template. - A `titlepage` variable selects it. - + UTF-8, lang tag, meta tags, title element. - - * Added scale-to-width feature to beamer template - - [API changes] - - * `Text.Pandoc.Definition`: Added `Attr` field to `Header`. - Previously header identifers were autogenerated by the writers. - Now they are added in the readers (either automatically or explicitly). - - * `Text.Pandoc.Builder`: - - + `Inlines` and `Blocks` are now synonyms for `Many Inline` and - `Many Block`. `Many` is a newtype wrapper around `Seq`, with - custom Monoid instances for `Many Inline` and `Many Block. This - allows `Many` to be made an instance of `Foldable` and `Traversable`. - + The old `Listable` class has been removed. - + The module now exports `isNull`, `toList`, `fromList`. - + The old `Read` and `Show` instances have been removed; derived - instances are now used. - + Added `headerWith`. - - * The readers now take a `ReaderOptions` rather than a `ParserState` - as a parameter. Indeed, not all parsers use the `ParserState` type; - some have a custom state. The motivation for this change was to separate - user-specifiable options from the accounting functions of parser state. - - * New module `Text.Pandoc.Options`. This includes the `WriterOptions` - formerly in `Text.Pandoc.Shared`, and its associated - data types. It also includes a new type `ReaderOptions`, which - contains many options formerly in `ParserState`, and its associated - data types: - - + `ParserState.stateParseRaw` -> `ReaderOptions.readerParseRaw`. - + `ParserState.stateColumns` -> `ReaderOptions.readerColumns`. - + `ParserState.stateTabStop` -> `ReaderOptions.readerTabStop`. - + `ParserState.stateOldDashes` -> `ReaderOptions.readerOldDashes`. - + `ParserState.stateLiterateHaskell` -> `ReaderOptions.readerLiterateHaskell`. - + `ParserState.stateCitations` -> `ReaderOptions.readerReferences`. - + `ParserState.stateApplyMacros` -> `ReaderOptions.readerApplyMacros`. - + `ParserState.stateIndentedCodeClasses` -> - `ReaderOptions.readerIndentedCodeClasses`. - + Added `ReaderOptions.readerCitationStyle`. - - * `WriterOptions` now includes `writerEpubVersion`, `writerEpubChapterLevel`, - `writerEpubStylesheet`, `writerEpubFonts`, `writerReferenceODT`, - `writerReferenceDocx`, and `writerTOCDepth`. `writerEPUBMetadata` has - been renamed `writerEpubMetadata` for consistency. - - * Changed signatures of `writeODT`, `writeDocx`, `writeEPUB`, since they no - longer stylesheet, fonts, reference files as separate parameters. - - * Removed `writerLiterateHaskell` from `WriterOptions`, and - `readerLiterateHaskell` from `ReaderOptions`. LHS is now handled - by an extension (`Ext_literate_haskell`). - - * Removed deprecated `writerXeTeX`. - - * Removed `writerStrict` from `WriterOptions`. Added `writerExtensions`. - Strict is now handled through extensions. - - * `Text.Pandoc.Options` exports `pandocExtensions`, `strictExtensions`, - `phpMarkdownExtraExtensions`, `githubMarkdownExtensions`, - and `multimarkdownExtensions`, as well as the `Extensions` type. - - * New `Text.Pandoc.Readers.MediaWiki` module, exporting - `readMediaWiki`. - - * New `Text.Pandoc.Writers.FB2` module, exporting `writeFB2` - (thanks to Sergey Astanin). - - * `Text.Pandoc`: - - + Added `getReader`, `getWriter` to `Text.Pandoc`. - + `writers` is now an association list `(String, Writer)`. - A `Writer` can be a `PureStringWriter`, an `IOStringWriter`, or - an `IOByteStringWriter`. ALL writers are now in the 'writers' - list, including the binary writers and FB2 writer. This allows - code in `pandoc.hs` to be simplified. - + Changed type of `readers`, so all readers are in IO. - Users who want pure readers can still get them form the reader - modules; this just affects the function `getReader` that looks up - a reader based on the format name. The point of this change is to - make it possible to print warnings from the parser. - - * `Text.Pandoc.Parsing`: - - + `Text.Parsec` now exports all Parsec functions used in pandoc code. - No other module directly imports Parsec. This will make it easier - to change the parsing backend in the future, if we want to. - + `Text.Parsec` is used instead of `Text.ParserCombinators.Parsec`. - + Export the type synonym `Parser`. - + Export `widthsFromIndices`, `NoteTable'`, `KeyTable'`, `Key'`, `toKey'`, - `withQuoteContext`, `singleQuoteStart`, `singleQuoteEnd`, - `doubleQuoteStart`, `doubleQuoteEnd`, `ellipses`, `apostrophe`, - `dash`, `nested`, `F(..)`, `askF`, `asksF`, `runF`, `lineBlockLines`. - + `ParserState` is no longer an instance of `Show`. - + Added `stateSubstitutions` and `stateWarnings` to `ParserState`. - + Generalized type of `withQuoteContext`. - + Added `guardEnabled`, `guardDisabled`, `getOption`. - + Removed `failIfStrict`. - + `lookupKeySrc` and `fromKey` are no longer exported. - - * `Data.Default` instances are now provided for `ReaderOptions`, - `WriterOptions`, and `ParserState`. `Text.Pandoc` re-exports `def`. - Now you can use `def` (which is re-exported by `Text.Pandoc`) instead - of `defaultWriterOptions` (which is still defined). Closes #546. - - * `Text.Pandoc.Shared`: - - + Added `safeRead`. - + Renamed `removedLeadingTrailingSpace` to `trim`, - `removeLeadingSpace` to `triml`, and `removeTrailingSpace` to `trimr`. - + Count `\r` as space in `trim` functions. - + Moved `renderTags'` from HTML reader and `Text.Pandoc.SelfContained` - to `Shared`. - + Removed `failUnlessLHS`. - + Export `compactify'`, formerly in Markdown reader. - + Export `isTightList`. - + Do not export `findDataFile`. - + `readDataFile` now returns a strict ByteString. - + Export `readDataFileUTF8` which returns a String, like the - old `readDataFile`. - + Export `fetchItem` and `openURL`. - - * `Text.Pandoc.ImageSize`: Use strict, not lazy bytestrings. - Removed `readImageSize`. - - * `Text.Pandoc.UTF8`: Export `encodePath`, `decodePath`, - `decodeArg`, `toString`, `fromString`, `toStringLazy`, - `fromStringLazy`. - - * `Text.Pandoc.UTF8` is now an exposed module. - - * `Text.Pandoc.Biblio`: - - + csl parameter now a `String` rather than a `FilePath`. - + Changed type of `processBiblio`. It is no longer in the IO monad. - It now takes a `Maybe Style` argument rather than parameters for CSL - and abbrev filenames. (`pandoc.hs` now calls the functions to parse - the style file and add abbreviations.) - - * Markdown reader now exports `readMarkdownWithWarnings`. - - * `Text.Pandoc.RTF` now exports `writeRTFWithEmbeddedImages` instead of - `rtfEmbedImage`. - - [bug fixes] - - * Make `--ascii` work properly with `--self-contained`. Closes #568. - - * Markdown reader: - - + Fixed link parser to avoid exponential slowdowns. Closes #620. - Previously the parser would hang on input like this: - - [[[[[[[[[[[[[[[[[[hi - - We fixed this by making the link parser parser characters - between balanced brackets (skipping brackets in inline code spans), - then parsing the result as an inline list. One change is that - - [hi *there]* bud](/url) - - is now no longer parsed as a link. But in this respect pandoc behaved - differently from most other implementations anyway, so that seems okay. - - + Look for raw html/latex blocks before tables. - Otherwise the following gets parsed as a table: - - \begin{code} - -------------- - -- My comment. - \end{code} - - Closes #578. - - * RST reader: - - + Added support for `:target:` on `.. image::` blocks - and substitutions. - + Field list fixes: - - - Fixed field lists items with body beginning after a new line - (Denis Laxalde). - - Allow any char but ':' in names of field lists in RST reader - (Denis Laxalde). - - Don't allow line breaks in field names. - - Require whitespace after field list field names. - - Don't create empty definition list for metadata field lists. - Previously a field list consisting only of metadata fields (author, - title, date) would be parsed as an empty DefinitionList, which is - not legal in LaTeX and not needed in any format. - - + Don't recognize inline-markup starts inside words. - For example, `2*2 = 4*1` should not contain an emphasized - section. Added test case for "Literal symbols". Closes #569. - + Allow dashes as separator in simple tables. Closes #555. - + Added support for `container`, `compound`, `epigraph`, - `rubric`, `highlights`, `pull-quote`. - + Added support for `.. code::`. - + Made directive labels case-insensitive. - + Removed requirement that directives begin at left margin. - This was (correctly) not in earlier releases; docutils doesn't - make the requirement. - + Added support for `replace::` and `unicode::` substitutions. - + Ignore unknown interpreted roles. - + Renamed image parser to `subst`, since it now handles all - substitution references. - - * Textile reader: - - + Allow newlines before pipes in table. Closes #654. - + Fixed bug with list items containing line breaks. - Now pandoc correctly handles hard line breaks inside list items. - Previously they broke list parsing. - + Implemented comment blocks. - + Fixed bug affected words ending in hyphen. - + Properly handle links with surrounding brackets. - Square brackets need to be used when the link isn't surrounded by - spaces or punctuation, or when the URL ending may be ambiguous. - Closes #564. - + Removed nullBlock. Better to know about parsing problems than - to skip stuff when we get stuck. - + Allow ID attributes on headers. - + Textile reader: Avoid parsing dashes as strikeout. - Previously the input - - text-- - text-- - text-- - text-- - - would be parsed with strikeouts rather than dashes. This fixes - the problem by requiring that a strikeout delimiting - not be - followed by a -. Closes #631. - + Expanded list of `stringBreakers`. - This fixes a bug on input like "(_hello_)" which should - be a parenthesized emphasized "hello". - The new list is taken from the PHP source of textile 2.4. - + Fixed autolinks. Previously the textile reader and writer - incorrectly implented RST-style autolinks for URLs and email - addresses. This has been fixed. Now an autolink is done this way: - `"$":http://myurl.com`. - + Fixed footnotes bug in textile. This affected notes occuring - before punctuation, e.g. `foo[1].`. Closes #518. - - * LaTeX reader: - - + Better handling of citation commands. - + Better handling of `\noindent`. - + Added a 'try' in rawLaTeXBlock, so we can handle `\begin` without `{`. - Closes #622. - + Made `rawLaTeXInline` try to parse block commands as well. This - is usually what we want, given how `rawLaTeXInline` is used in - the markdown and textile readers. If a block-level LaTeX command - is used in the middle of a paragraph (e.g. `\subtitle` inside a title), - we can treat it as raw inline LaTeX. - + Handle \slash command. Closes #605. - + Basic `\enquote` support. - + Fixed parsing of paragraphs beginning with a group. Closes #606. - + Use curly quotes for bare straight quotes. - + Support obeylines environment. Closes #604. - + Guard against "begin", "end" in inlineCommand and - blockCommand. - + Better error messages for environments. Now it should tell you that - it was looking for \end{env}, instead of giving "unknown parse error." - - * HTML reader: - - + Added HTML 5 tags to list of block-level tags. - + HTML reader: Fixed bug in `htmlBalanced`, which - caused hangs in parsing certain markdown input using - strict mode. - + Parse `<q>` as `Quoted DoubleQuote`. - + Handle nested `<q>` tags properly. - + Modified `htmlTag` for fewer false positives. - A tag must start with `<` followed by `!`,`?`, `/`, or a letter. - This makes it more useful in the wikimedia and markdown parsers. - - * DocBook reader: Support title in "figure" element. Closes #650. - - * MediaWiki writer: - - + Remove newline after `<br/>` in translation of `LineBreak` - There's no particular need for a newline (other than making the - generated MediaWiki source look nice to a human), and in fact - sometimes it is incorrect: in particular, inside an enumeration, list - items cannot have embedded newline characters. (Brent Yorgey) - + Use `<code>` not `<tt>` for Code. - - * Man writer: Escape `-` as `\-`. - Unescaped `-`'s become hyphens, while `\-`'s are left as ascii minus - signs. That is preferable for use with command-line options. See - <http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html>. Thanks - to Andrea Bolognani for bringing the issue to our attention. - - * RST writer: - - + Improved line block output. Use nonbreaking spaces for - initial indent (otherwise lost in HTML and LaTeX). - Allow multiple paragraphs in a single line block. - Allow soft breaks w continuations in line blocks. - + Properly handle images with no alt text. Closes #678. - + Fixed bug with links with duplicate text. We now (a) use anonymous - links for links with inline URLs, and (b) use an inline link instead - of a reference link if the reference link would require a label that - has already been used for a different link. Closes #511. - + Fixed hyperlinked images. Closes #611. Use `:target:` - field when you have a simple linked image. - + Don't add `:align: center` to figures. - - * Texinfo writer: Fixed internal cross-references. - Now we insert anchors after each header, and use `@ref` instead of `@uref` - for links. Commas are now escaped as `@comma{}` only when needed; - previously all commas were escaped. (This change is needed, in part, - because `@ref` commands must be followed by a real comma or period.) Also - insert a blank line in from of `@verbatim` environments. - - * DocBook writer: - - + Made --id-prefix work in DocBook as well as HTML. - Closes #607. - + Don't include empty captions in figures. Closes #581. - - * LaTeX writer: - - + Use `\hspace*` for nonbreaking space after line break, - since `~` spaces after a line break are just ignored. - Closes #687. - + Don't escape `_` in URLs or hyperref identifiers. - + Properly escape strings inside \url{}. Closes #576. - + Use `[fragile]` only for slides containing code rendered - using listings. Closes #649. - + Escape `|` as `\vert` in LaTeX math. This avoids a clash with - highlighting-kate's macros, which redefine `|` as a short verbatim - delimiter. Thanks to Björn Peemöller for raising this issue. - + Use minipage rather than parbox for block containers in tables. - This allows verbatim code to be included in grid tables. - Closes #663. - + Prevent paragraphs containing only linebreaks or spaces. - - * HTML writer: - - + Included `highlighting-css` for code spans, too. - Previously it was only included if used in a code block. Closes #653. - + Improved line breaks with `<dd>` tags. We now put a newline between - `</dd>` and `<dd>` when there are multiple definitions. - + Changed mathjax cdn url so it doesn't use https. (This caused - problems when used with `--self-contained`.) See #609. - - * EPUB writer: - - + `--number-sections` now works properly. - + Don't strip meta and link elements in epub metadata. - Patch from aberrancy. Closes #589. - + Fixed a couple validation bugs. - + Use ch001, ch002, etc. for chapter filenames. This improves sorting - of chapters in some readers, which apparently sort ch2 after ch10. - Closes #610. - - * ODT writer: properly set title property (Arlo O'Keeffe). - - * Docx writer: - - + Fixed bug with nested lists. Previously a list like - - 1. one - - a - - b - 2. two - - would come out with a bullet instead of "2." - Thanks to Russell Allen for reporting the bug. - + Use `w:cr` in `w:r` instead of `w:br` for linebreaks. - This seems to fix a problem viewing pandoc-generated - docx files in LibreOffice. - + Use integer ids for bookmarks. Closes #626. - + Added nsid to abstractNum elements. This helps when merging - word documents with numbered or bulleted lists. Closes #627. - + Use separate footnotes.xml for notes. - This seems to help LibreOffice convert the file, even though - it was valid docx before. Closes #637. - + Use rIdNN identifiers for r:embed in images. - + Avoid reading image files again when we've already processed them. - + Fixed typo in `referenc.docx` that prevented image captions from - working. Thanks to Huashan Chen. - - * `Text.Pandoc.Parsing`: - - + Fixed bug in `withRaw`, which didn't correctly handle the case - where nothing is parsed. - + Made `emailAddress` parser more correct. Now it is based on RFC 822, - though it still doesn't implement quoted strings in email addresses. - + Revised URI parser. It now allows many more schemes, allows - uppercase URIs, and better handles trailing punctuation and - trailing slashes in bare URIs. Added many tests. - + Simplified and improved singleQuoteStart. This makes `'s'`, `'l'`, - etc. parse properly. Formerly we had some English-centric heuristics, - but they are no longer needed. Closes #698. - - * `Text.Pandoc.Pretty`: Added wide punctuation range to `charWidth`. - This fixes bug with Chinese commas in markdown and reST tables, and - a bug that caused combining characters to be dropped. - - * `Text.Pandoc.MIME`: Added MIME types for .wof and .eot. Closes #640. - - * `Text.Pandoc.Biblio`: - - + Run `mvPunc` and `deNote` on metadata too. - This fixed a bug with notes on titles using footnote styles. - + Fixed bug in fetching CSL files from CSL data directory. - - * `pandoc.hs`: Give correct value to `writerSourceDirectory` when a URL - is provided. It should be the URL up to the path. - - * Fixed/simplified diff output for tests. - Biblio: Make sure mvPunc and deNote run on metadata too. - This fixed a bug with notes on titles using footnote styles. - - [under the hood improvements] - - * We no longer depend on `utf8-string`. Instead we use functions - defined in `Text.Pandoc.UTF8` that use `Data.Text`'s conversions. - - * Use `safeRead` instead of using `reads` directly (various modules). - - * "Implicit figures" (images alone in a paragraph) are now handled - differently. The markdown reader gives their titles the prefix `fig:`; the - writers look for this before treating the image as a figure. Though this - is a bit of a hack, it has two advantages: (i) implicit figures can be - limited to the markdown reader, and (ii) they can be deactivated by turning - off the `implicit_figures` extension. - - * `catch` from `Control.Exception` is now used instead of the - old Preface `catch`. - - * `Text.Pandoc.Shared`: Improved algorithm for `normalizeSpaces` - and `oneOfStrings` (which is now non-backtracking). - - * `Text.Pandoc.Biblio`: Remove workaround for `toCapital`. - Now citeproc-hs is fixed upstream, so this is no longer needed. - Closes #531. - - * Textile reader: Improved speed of `hyphenedWords`. - This speeds up the textile reader by about a factor of 4. - - * Use `Text.Pandoc.Builder` in RST reader, for more flexibility, - better performance, and automatic normalization. - - * Major rewrite of markdown reader: - - + Use `Text.Pandoc.Builder` instead of lists. This also - means that everything is normalized automatically. - + Move to a one-pass parsing strategy, returning values in the reader - monad, which are then run (at the end of parsing) against the final - parser state. - - * In HTML writer, we now use `toHtml` instead of pre-escaping. - We work around the problem that blaze-html unnecessarily escapes `'` - by pre-escaping just the `'` characters, instead of the whole string. - If blaze-html later stops escaping `'` characters, we can simplify - `strToHtml` to `toHtml`. Closes #629. - - * Moved code for embedding images in RTFs from `pandoc.hs` to the - RTF writer (which now exports `writeRTFWithEmbeddedImages`). - - * Moved citation processing from `pandoc.hs` into the readers. - This makes things more convenient for library users. - - * The man pages are now built by an executable `make-pandoc-man-pages`, - which has its own stanza in the cabal file so that dependencies can be - handled by Cabal. Special treatment in `Setup.hs` ensures that this - executable never gets installed; it is only used to create the man pages. - - * The cabal file has been modified so that the pandoc library is used - in building the pandoc executable. (This required moving `pandoc.hs` - from `src` to `.`.) This cuts compile time in half. - - * `-O2` is no longer used in building pandoc. The performance improvement - it yields is so slight that it is not worth it. (Measured with - benchmarks on ghc 7.4.) - - * The `executable` and `library` flags have been removed. - - * `-threaded` has been removed from ghc-options. - - * Version bounds of dependencies have been raised, and the - `blaze_html_0_5` flag now defaults to True. Pandoc now compiles on - GHC 7.6. - - * We now require base >= 4.2. - - * Integrated the benchmark program into cabal. One can now do: - - cabal configure --enable-benchmarks && cabal build - cabal bench --benchmark-option='markdown' --benchmark-option='-s 20' - - The benchmark now uses README + testsuite, so benchmark results - from older versions aren't comparable. - - * Integrated test suite with cabal. - To run tests, configure with `--enable-tests`, then `cabal test`. - You can specify particular tests using `--test-options='-t markdown'`. - No output is shown unless tests fail. The Haskell test modules - have been moved from `src/` to `tests/`. - - * Moved all data files and templates to the `data/` subdirectory. - - * Added an `embed_data_files` cabal flag. This causes all - data files to be embedded in the binary, so that the binary - is self-sufficient and can be relocated anywhere, copied on - a USB key, etc. The Windows installer now uses this. - (Since we no longer have the option to build the executable - without the library, this is the only way to get a relocatable - binary on Windows.) - - * Removed pcre3.dll from windows package. - It isn't needed unless highlighting-kate is compilled with the - `pcre-light` flag. By default, regex-prce-builtin is used. - - -pandoc (1.9.4.2) - - * Don't encode/decode file paths if base >= 4.4. - Prior to base 4.4, filepaths and command line arguments were treated - as unencoded lists of bytes, not unicode strings, so we had to work - around that by encoding and decoding them. This commit adds CPP - checks for the base version that intelligibly enable encoding/decoding - when needed. Fixes a bug with multilingual filenames when pandoc was - compiled with ghc 7.4 (#540). - - * Don't generate an empty H1 after hrule slide breaks. - We now use a slide-level header with contents `[Str "\0"]` to mark - an hrule break. This avoids creation of an empty H1 in these - contexts. Closes #484. - - * Docbook reader: Added support for "bold" emphasis. Thanks to Mauro Bieg. - - * In make_osx_package.sh, ensure citeproc-hs is built with the - embed_data_files flag. - - * MediaWiki writer: Avoid extra blank lines after sublists (Gavin Beatty). - - * ConTeXt writer: Don't escape `&`, `^`, `<`, `>`, `_`, - simplified escapes for `}` and `{` to `\{` and `\}` (Aditya Mahajan). - - * Fixed handling of absolute URLs in CSS imports with `--self-contained`. - Closes #535. - - * Added webm to mime types. Closes #543. - - * Added some missing exports and tests to the cabal file - (Alexander V Vershilov). - - * Compile with `-rtsopts` and `-threaded` by default. - -pandoc (1.9.4.1) - - * Markdown reader: Added `cf.` and `cp.` to list of likely abbreviations. - - * LaTeX template: Added `linkcolor`, `urlcolor` and `links-as-notes` - variables. Make TOC links black. - - * LaTeX template improvements. - - + Don't print date unless one is given explicitly in the document. - + Simplified templates. - + Use fontenc [T1] by default, and lmodern. - + Use microtype if available. - - * Biblio: - - + Add comma to beginning of bare suffix, e.g. `@item1 [50]`. - Motivation: `@item1 [50]` should be as close as possible to - `[@item1, 50]`. - + Added workaround for a bug in citeproc-hs 0.3.4 that causes footnotes - beginning with a citation to be empty. Closes #531. - - * Fixed documentation on mixed lists. Closes #533. - -pandoc (1.9.4) - - * Simplified `Text.Pandoc.Biblio` and fixed bugs with citations inside - footnotes and captions. We now handle note citations by inserting - footnotes during initial citation processing, and doing a separate - pass later to remove notes inside notes. - - * Added 'zenburn' highlight style from highlighting-kate. - - * Added Slideous writer. Slideous is an HTML + javascript slide show - format, similar to Slidy, but works with IE 7. (Jonas Smedegaard) - - * LaTeX writer: - - + Ensure we don't have extra blank lines at ends of cells. - This can cause LaTeX errors, as they are interpreted as new paragraphs. - + More consistent interblock spacing. - + Require highlighting-kate >= 0.5.1, for proper highlighted inline - code in LaTeX. Closes #527. - + Ensure that a Verbatim at the end of a footnote is followed by - a newline. (Fixes a regression in the previous version.) - + In default template, use black for internal links and TOC. - Added commented-out code to use footnotes for links, as would - be suitable in print output. - - * Beamer writer: When `--incremental` is used, lists inside - a block quote should appear all at once. (This makes Beamer - output consistent with the HTML slide show formats.) - - * ConTeXt writer: - - + Escape `%` as `\letterpercent{}` not `\letterpercent `, - to avoid gobbling spaces after the `%` sign. - + Ensure space after `\stopformula`. - - * Markdown writer: - - + Use `:` form instead of `~` in definition lists, for better - compatibility with other markdown implementations. - + Don't wrap the term, because it breaks definition lists. - + Use a nonzero space to prevent false recognition - of list marker in ordered lists. Closes #516. - - * Org writer: Add space before language name. Closes #523. - - * Docx writer: Simplified bullet characters so they work properly - with Word 2007. Closes #520. - - * LaTeX reader: Support `\centerline`. - - * RST reader: handle figures. Closes #522. - - * Textile reader: fix for `<notextile>` and `==`. Closes #517. - (Paul Rivier) - -pandoc (1.9.3) - - * Fixed bug in `fromEntities`. The previous version would turn - `hi & low you know;` into `hi &`. - - * HTML reader: - - + Don't skip nonbreaking spaces. - Previously a paragraph containing just ` ` would be rendered - as an empty paragraph. Thanks to Paul Vorbach for pointing out the bug. - + Support `<col>` and `<caption>` in tables. Closes #486. - - * Markdown reader: - - + Don't recognize references inside delimited code blocks. - + Allow list items to begin with lists. - - * Added basic docbook reader (John MacFarlane and Mauro Bieg). - - * LaTeX reader: - - + Handle `\bgroup`, `\egroup`, `\begingroup`, `\endgroup`. - + Control sequences can't be followed by a letter. - This fixes a bug where `\begingroup` was parsed as `\begin` - followed by `group`. - + Parse 'dimension' arguments to unknown commands. e.g. `\parindent0pt` - + Make `\label` and `\ref` sensitive to `--parse-raw`. - If `--parse-raw` is selected, these will be parsed as raw latex - inlines, rather than bracketed text. - + Don't crash on unknown block commands (like `\vspace{10pt}`) - inside `\author`; just skip them. Closes #505. - - * Textile reader: - - + Implemented literal escapes with `==` and `<notextile>`. Closes #473. - + Added support for LaTeX blocks and inlines (Paul Rivier). - + Better conformance to RedCloth inline parsing (Paul Rivier). - + Parse '+text+' as emphasized (should be underlined, but this - is better than leaving literal plus characters in the output. - - * Docx writer: Fixed multi-paragraph list items. Previously they each - got a list marker. Closes #457. - - * LaTeX writer: - - + Added `--no-tex-ligatures` option to avoid replacing - quotation marks and dashes with TeX ligatures. - + Use `fixltx2e` package to provide '\textsubscript'. - + Improve spacing around LaTeX block environments: - quote, verbatim, itemize, description, enumerate. - Closes #502. - + Use blue instead of pink for URL links in latex/pdf output. - - * ConTeXt writer: Fixed escaping of `%`. - In text, `%` needs to be escaped as `\letterpercent`, not `\%` - Inside URLs, `%` needs to be escaped as `\%` - Thanks to jmarca and adityam for the fix. Closes #492. - - * Texinfo writer: Escape special characters in node titles. - This fixes a problem pointed out by Joost Kremers. Pandoc used - to escape an '@' in a chapter title, but not in the corresponding - node title, leading to invalid texinfo. - - * Fixed document encoding in texinfo template. - Resolves Debian Bug #667816. - - * Markdown writer: - - + Don't force delimited code blocks to be flush left. - Fixes bug with delimited code blocks inside lists etc. - + Escape `<` and `$`. - - * LaTeX writer: Use `\hyperref[ident]{text}` for internal links. - Previously we used `\href{\#ident}{text}`, which didn't work on - all systems. Thanks to Dirk Laurie. - - * RST writer: Don't wrap link references. Closes #487. - - * Updated to use latest versions of blaze-html, mtl. - - -pandoc (1.9.2) - - * LaTeX reader: - - + Made `lstlisting` work as a proper verbatim environment. - + Fixed bug parsing LaTeX tables with one column. - - * LaTeX writer: - - + Use `{}` around `ctable` caption, so that formatting can be used. - + Don't require eurosym package unless document has a €. - - * LaTeX template: Added variables for `geometry`, `romanfont`, - `sansfont`, `mathfont`, `mainfont` so users can more easily - customize fonts. - - * PDF writer: - - + Run latex engine at least two times, to ensure - that PDFs will have hyperlinked bookmarks. - + Added PDF metadata (title,author) in LaTeX standalone + PDF output. - - * Texinfo writer: retain directories in image paths. (Peter Wang) - - * RST writer: Better handling of inline formatting, in accord - with docutils' "inline markup recognition rules" (though we don't - implement the unicode rules fully). Now `hi*there*hi` gets - rendered properly as `hi\ *there*\ hi`, and unnecessary - `\ ` are avoided around `:math:`, `:sub:`, `:sup:`. - - * RST reader: - - + Parse `\ ` as null, not escaped space. - + Allow `` :math:`...` `` even when not followed by blank - or `\`. This does not implement the complex rule docutils follows, - but it should be good enough for most purposes. - + Add support for the rST default-role directive. (Greg Maslov) - - * Text.Pandoc.Parsing: Added `stateRstDefaultRole` field to `ParserState`. - (Greg Maslov) - - * Markdown reader: Properly handle citations nested in other inline - elements. - - * Markdown writer: don't replace empty alt in image with "image". - - * DZSlides: Updated template.html and styles in default template. - Removed bizarre CSS for `q` in dzslides template. - - * Avoid repeated `id` attribute in section and header in HTML slides. - - * README improvements: new instructions on internal links, - removed misleading note on reST math. - - * Build system: - - + Fixed Windows installer so that dzslides works. - + Removed stripansi.sh. - + Added .travis.yml for Travis continuous integration support.. - + Fixed upper bound for zlib (Sergei Trofimovich). - + Fixed upper bound for test-framework. - + Updated haddocks for haddock-2.10 (Sergei Trofimovich). - -pandoc (1.9.1.2) - - * Added `beamer+lhs` as output format. - - * Don't escape `<` in `<style>` tags with `--self-contained`. - This fixes a bug which prevented highlighting from working - when using `--self-contained`. - - * PDF: run latex engine three times if `--toc` specified. - This fixes page numbers in the table of contents. - - * Docx writer: Added TableNormal style to tables. - - * LaTeX math environment fixes. `aligned` is now used instead of - the nonexistent `aligned*`. `multline` instead of the nonexistent - `multiline`. - - * LaTeX writer: Use `\textasciitilde` for literal `~`. - - * HTML writer: Don't escape contents of EQ tags with --gladtex. - This fixes a regression from 1.8. - - * Use `<q>` tags for Quoted items for HTML5 output. - The quote style can be changed by modifying the template - or including a css file. A default quote style is included. - - * LaTeX reader: Fixed accents (\~{a}, `\c{c}`). - Correctly handle \^{}. Support "minted" as a LaTeX verbatim block. - - * Updated LaTeX template for better language support. - Use `polyglossia` instead of `babel` with xetex. - Set `lang` as documentclass option. - `\setmainlanguage` will use the last of a comma-separated - list of languages. Thanks to François Gannaz. - - * Fixed default LaTeX template so `\euro` and `€` work. The - `eurosym` package is needed if you are using pdflatex. - - * Fixed escaping of period in man writer (thanks to Michael Thompson). - - * Fixed list label positions in beamer. - - * Set `mainlang` variable in context writer. - This parallels behavior of latex writer. `mainlang` is the last - of a comma-separated list of languages in lang. - - * EPUB language metadat: convert e.g. `en_US` from locale to `en-US`. - - * Changed `-V` so that you can specify a key without a value. - Such keys get the value `true`. - - * Fixed permissions on installed man pages - thanks Magnus Therning. - - * Windows installer: require XP or higher. The installer is - now compiled on a Windows 7 machine, which fixes a problem - using citation functions on Windows 7. - - * OSX package: Check for 64-bit Intel CPU before installing. - -pandoc (1.9.1.1) - - * Better handling of raw latex environments in markdown. Now - - \begin{equation} - a_1 - \end{equation} - - turns into a raw latex block as expected. - - * Improvements to LaTeX reader: - - + Skip options after block commands. - + Correctly handle `{\\}` in braced. - + Added a needed 'try'. - + Citations: add `, ` to suffix if it doesn't start with space or - punctuation. Otherwise we get no space between the year and the - suffix in author-date styles. - - * Added two needed data files for S5. This fixes a problem with - `pandoc -t s5 --self-contained`. Also removed `slides.min.js`, - which was no longer being used. - - * Fixed some minor problems in `reference.docx`: - name on "Date" style, `xCs` instead of `xIs`. - - * Fixed a problem creating docx files using a reference docx - modified using Word. The problem seems to be that Word - modifies `_rels/.rels`, changing the Type of the Relationship to - `docProps/core.xml`. Pandoc now changes this back to the correct - value if it has been altered, fixing the problem. - - * Fixed html5 template so it works properly with highlighting. - -pandoc (1.9.1) - - * LaTeX reader: - - + Fixed regression in 1.9; properly handle escaped $ in latex math. - + Put LaTeX verse environments in blockquotes. - - * Markdown reader: - - + Limit nesting of strong/emph. This avoids exponential lookahead - in parasitic cases, like `a**a*a**a*a**a*a**a*a**a*a**a*a**a*a**`. - + Improved attributes syntax (inn code blocks/spans): - (1) Attributes can contain line breaks. (2) Values in key-value - attributes can be surrounded by either double or single quotes, or - left unquoted if they contain no spaces. - - * Don't wrap headers in markdown or RST writers. - - * Added `stateMaxNestingLevel` to `ParserState`. - We set this to 6, so you can still have `Emph` inside `Emph`, - just not indefinitely. - - * More efficient implementation of `nowrap` in `Text.Pandoc.Pretty`. - - * `Text.Pandoc.PDF`: Only run latex twice if `\tableofcontents` - is present. - - * Require highlighting-kate >= 0.5.0.2, texmath >= 0.6.0.2. - -pandoc (1.9.0.5) - - * Changed cabal file so that build-depends for the test program - are not required unless the tests flag is used. - - * LaTeX writer: insert `{}` between adjacent hyphens so they don't - form ligatures (dashes) in code spans. - -pandoc (1.9.0.4) - - * Raised version bound on test-framework to avoid problems - compiling tests on GHC 7.4.1. - - * LaTeX reader: Use raw LaTeX as fallback inline text for Cites, - so citations don't just disappear unless you process with - citeproc. Ignore `\bibliographystyle`, `\nocite`. - - * Simplified tex2pdf; it will always run latex twice to - resolve table of contents and hyperrefs. - -pandoc (1.9.0.3) - - * Require Cabal >= 1.10. - * Tweaked cabal file to meet Cabal 1.10 requirements. - -pandoc (1.9.0.2) - - * Allow build with json 0.4 or 0.5. Otherwise we can't build with - ghc 6.12. - -pandoc (1.9) - - [new features] - - * Added a Microsoft Word `docx` writer. The writer includes support - for highlighted code and for math (which is converted from TeX to OMML, - Office's native math markup language, using texmath's new OMML module). - A new option `--reference-docx` allows the user to customize the - styles. - - * Added an `asciidoc` writer (<http://www.methods.co.nz/asciidoc/>). - - * Better support for slide shows: - - + Added a `dzslides` writer. DZSlides is a lightweight HTML5/javascript - slide show format due to Paul Rouget (<http://paulrouget.com/dzslides/>). - - + Added a LaTeX `beamer` writer. Beamer is a LaTeX package for creating - slide presentations. - - + New, flexible rules for dividing documents into sections and slides - (see the "Structuring the slide show" in the User's Guide). These - are backward-compatible with the old rules, but they allow slide - shows to be organized into sections and subsections containing - multiple slides. - - + A new `--slide-level` option allows users to override defaults - and select a slide level below the first header level with content. - - * A new `--self-contained` option produces HTML output that does not - depend on an internet connection or the presence of any external - files. Linked images, CSS, and javascript is downloaded (or fetched - locally) and encoded in `data:` URIs. This is useful for making portable - `HTML slide shows. The --offline` option has been deprecated and is now - `treated as a synonym or --self-contained`. - - * Support for PDF output: - - + Removed the old `markdown2pdf`. - + `pandoc` can now create PDFs (assuming you have latex and a set of - appropriate packages installed): just specify an output file with the - `.pdf` extension. - + A new option `--latex-engine` allows you to specify `pdflatex`, - `xelatex`, or `lualatex` as the processor. - - * Highlighting changes: - - + Syntax highlighting is now a standard feature; the `highlighting` - flag is no longer needed when compiling. - + A new `--no-highlight` option allows highlighting to be disabled. - + Highlighting now works in `docx`, `latex`, and `epub`, as well as - `html`, `html5`, `dzslides`, `s5`, and `slidy`. - + A new `--highlight-style` option selects between various highlighting - color themes. - - * Internal links to sections now work in ConTeXt and LaTeX as well as HTML. - - * LaTeX `\include` and `\usepackage` commands are now processed, - provided the files are in the working directory. - - * EPUB improvements: - - + Internal and external links now work in EPUB. - + Raw HTML is allowed. - + New `--epub-embed-font` option. - + Customizable templates for EPUB pages offer more control over - formatting: `epub-page.html`, `epub-coverimage.html`, - `epub-titlepage.html`. - - * `--mathml` now works with DocBook. - - * Added support for math in RST reader and writer. Inline math uses the - `` :math:`...` `` construct. Display math uses - - .. math:: ... - - or if the math is multiline, - - .. math:: - - ... - - These constructions are now supported now by `rst2latex.py`. - - * GitHub syntax for fenced code blocks is supported in pandoc's - markdown. You can now write - - ```ruby - x = 2 - ``` - - instead of - - ~~~ {.ruby} - x = 2 - ~~~~ - - * Easier scripting: a new `toJsonFilter` function makes it easier to - write Haskell scripts to manipulate the Pandoc AST. - - [behavior changes] - - * Fixed parsing of consecutive lists in markdown. - Pandoc previously behaved like Markdown.pl for consecutive - lists of different styles. Thus, the following would be parsed - as a single ordered list, rather than an ordered list followed - by an unordered list: - - 1. one - 2. two - - - one - - two - - This change makes pandoc behave more sensibly, parsing this as - two lists. Any change in list type (ordered/unordered) or in - list number style will trigger a new list. Thus, the following - will also be parsed as two lists: - - 1. one - 2. two - - a. one - b. two - - Since we regard this as a bug in Markdown.pl, and not something - anyone would ever rely on, we do not preserve the old behavior - even when `--strict` is selected. - - * Dashes work differently with `--smart`: `---` is always em-dash, - and `--` is always en-dash. Pandoc no longer tries to guess when - `-` should be en-dash. *Note:* This may change how existing documents - look when processed with pandoc. A new option, `--old-dashes`, - is provided for legacy documents. - - * The markdown writer now uses setext headers for levels 1-2. - The old behavior (ATX headers for all levels) can be restored - using the new `--atx-headers` option. - - * Links are now allowed in markdown image captions. They are also - allowed in links, but will appear there as regular text. So, - - [link with [link](/url)](/url) - - will turn into - - <p><a href="/url">link with link</a></p> - - * Improved handling of citations using `citeproc-hs-0.3.4`. - Added `--citation-abbreviations` option. - - * Citation keys can no longer end with a punctuation character. - This means that `@item1.` will be parsed as a citation with key - 'item1', followed by a period, instead of a citation with key - 'item1.', as was the case previously. - - * In HTML output, citations are now put in a span with class `citation`. - - * The markdown reader now recognizes DocBook block and inline tags. - It was always possible to include raw DocBook tags in a markdown - document, but now pandoc will be able to distinguish block from - inline tags and behave accordingly. Thus, for example, - - <sidebar> - hello - </sidebar> - - will not be wrapped in `<para>` tags. - - * The LaTeX parser has been completely rewritten; it is now much more - accurate, robust, and extensible. However, there are two important - changes in how it treats unknown LaTeX. (1) Previously, unknown - environments became BlockQuote elements; now, they are treated - as "transparent", so `\begin{unknown}xyz\end{unknown}` is the - same as `xyz`. (2) Previously, arguments of unknown commands - were passed through with their braces; now the braces are stripped - off. - - * `--smart` is no longer selected automatically with `man` output. - - * The deprecated `--xetex` option has been removed. - - * The `--html5`/`-5` option has been deprecated. Use `-t html5` - instead. `html5` and `html5+lhs` are now separate output formats. - - * Single quotes are no longer escaped in HTML output. They do not - need to be escaped outside of attributes. - - * Pandoc will no longer transform leading newlines in code - blocks to `<br/>` tags. - - * The ODT writer now sizes images appropriately, using the image - size and DPI information embedded in the image. - - * `--standalone` is once again implicitly for a non-text output format - (ODT, EPUB). You can again do `pandoc test.txt -o test.odt` - and get a standalone ODT file. - - * The Docbook writer now uses `<sect1>`, `<sect2>`, etc. instead of - `<section>`. - - * The HTML writer now uses `<del>` for strikeout. - - * In HTML output with `--section-divs`, the classes `section` and - `level[1,2,..6]` are put on the `div` tags so they can be styled. - In HTML 5 output with `--section-divs`, the classes - `level[1,2,...6]` are put on `section` tags. - - * EPUB writer changes: - - + The `lang` variable now sets the language - in the metadata (if it is not set, we default to the locale). - + EPUB: UTF-8 is used rather than decimal entities. - - * Added `titleslide` class to title slide in S5 template. - - * In HTML, EPUB, and docx metadata, the date is normalized into - YYYY-MM-DD format if possible. (This is required for validation.) - - * Attributes in highlighted code blocks are now preserved in HTML. - The container element will have the classes, id, and key-value attributes - you specified in the delimited code block. Previously these were stripped - off. - - * The reference backlink in the HTML writer no longer has a special - `footnoteBacklink` class. - - * The HTML template has been split into `html` and `html5` templates. - - * Author and date are treated more consistently in HTML templates. - Authors are now `<h2>`, date `<h3>`. - - * URLs are hyphenated in the ConTeXt writer (B. Scott Michel). - - * In `Text.Pandoc.Builder`, `+++` has been replaced by `<>`. - - [bug fixes] - - * Better support for combining characters and East Asian wide characters - in markdown and reST. - - * Better handling of single quotes with `--smart`. - Previously `D'oh l'*aide*` would be parsed with left and right single - quotes instead of apostrophes. This kind of error is now fixed. - - * Highlighting: Use `reads` instead of `read` for better error handling. - Fixes crash on `startNum="abc"`. - - * Added blank comment after directives in rst template. - - * Unescape entities in citation `refId`. The `refId`s coming - from citeproc contain XML numeric entities, and these don't match with the - citation keys parsed by pandoc. Solution is to unescape them. - - * HTML reader: Fixed bug parsing tables with both thead and tbody. - - * Markdown reader: - - + Better handling of escapes in link URLs and titles. - + Fixed backslash escapes in reference links. - + Fixed bug in table/hrule parsing, by checking that the top - line of a table is not followed by a blank line. This bug caused - slowdowns on some files with hrules and tables, as pandoc tried to - interpret the hrules as the tops of multiline tables. - + Fixed bug in code block attribute parser. Previously the ID attribute - got lost if it didn't come first. Now attributes can come in any order. - - * RST reader: allow footnotes followed by newline without space characters. - - * LaTeX reader: - - + Ignore empty groups {}, { }. - + LaTeX reader: Handle \@. - + LaTeX reader: Don't crash on commands like `\itemsep`. - + LaTeX reader: Better handling of letter environments. - - * RST writer: Fixed bug involving empty table cells. isSimple was being - calculated in a way that assumed there were no non-empty cells. - - * ConTeXt writer: - - + Made `--toc` work even without `--number-sections`. - + Escape # in link URLs. - + Use buffering for footnotes containing code blocks. - + Changed 'descr' to 'description', fixed alignment. - - * LaTeX writer: - - + Escape euro character. - + Don't escape ~ inside href{...}. - + Escape # in href URLs. - + Improved detection of book classes. We now check the - `documentclass` variable, and if that is not set, we look through - the template itself. Also, we have added the KOMA classes scrreprt - and scrbook. You can now make a book using - `pandoc -V documentclass:book mybook.txt -o mybook.pdf` - + LHS files now set the "listings" variable, so that the definition - of the `code` environment will be included in the template. - + Links are colored blue by default (this can be changed by - modifying `hyperref` settings in the template). - + Added `lang` variable to LaTeX template. - - * HTML writer: - - + Fixed bug in HTML template with html5 and mathml. - + Don't use self-closing img, br, hr tags for HTML5. - + Use `<section>` for footnotes if HTML5. - + Update HTML templates to use Content-Style-Type meta tag. - + Use separate variables for meta-date, meta-author. - This makes footnotes work in author and date fields. - + Use 'vertical-align:middle' in WebTeX math for better alignment. - - * S5/slidy writer: Make footnotes appear on separate slide at end. - - * MIME: Added 'layout-cache' to getMimeType. This ensures that the - META-INF/manifest.xml for ODT files will have everything it needs, so - that ODT files modified by LibreOffice can be used as `--reference-odt`. - - * `Text.Pandoc.Templates`: Return empty string for json template. - - * `Text.Pandoc.Biblio`: - - + Expand citations recursively inside nested inlines. - + Treat `\160` as space when parsing locator and suffix. - This fixes a bug with "p. 33" when `--smart` is used. Previously - the whole "p. 33" would be included in the suffix, with no locator. - + Put whole author-in-text citation in a Cite. Previously just the - date and other info went in the Cite. - + Don't add comma+space to prefix if it ends in punctuation. - - * Updated chicago-author-date.csl. The old version did not work - properly for edited volumes with no author. - - * EPUB writer: - - + Add date to EPUB titlepage and metadata. - + Added TOC identifier in EPUB page template. - + Don't generate superfluous file `cover-image.jpg`. - - [under the hood improvements] - - * Modified `make_osx_package.sh` to use cabal-dev. - Items are no longer installed as root. - Man pages are zipped and given proper permissions. - - * Modified windows installer generater to use cabal-dev. - - * Setup: Making man pages now works with cabal-dev (at least on OSX). In - Setup.hs we now invoke 'runghc' in a way that points it to the correct - package databases, instead of always falling back to the default user - package db. - - * Updated to work with GHC 7.4.1. - - * Removed dependency on old-time. - - * Removed dependency on dlist. - - * New slidy directory for "self-contained." - - * TeXMath writer: Use unicode thin spaces for thin spaces. - - * Markdown citations: don't strip off initial space in locator. - - [API changes] - - * Removed `Apostrophe`, `EmDash`, `EnDash`, and `Ellipses` - from the native `Inline` type in pandoc-types. Now we use `Str` - elements with unicode. - - * Improvements to `Text.Pandoc.Builder`: - - + `Inlines` and `Blocks` are now newtypes (not synonyms for - sequences). - + Instances are defined for `IsString`, `Show`, `Read`, `Monoid`, - and a new `Listable` class, which allows these to be manipulated - to some extent like lists. Monoid append includes automatic - normalization. - + `+++` has been replaced by `<>` (mappend). - - * Use blaze-html instead of xhtml for HTML generation. - This changes the type of `writeHtml`. - - * `Text.Pandoc.Shared`: - - + Added `warn` and `err`. - + Removed `unescapeURI`, modified `escapeURI`. - (See under [behavior changes], above.) - - * Changes in URI escaping: Previously the readers escaped URIs by - converting unicode characters to octets and then percent encoding. - Now unicode characters are left as they are, and `escapeURI` only - percent-encodes space characters. This gives more readable - URIs, and works well with modern user agents. URIs are no longer unescaped - at all on conversion to `markdown`, `asciidoc`, `rst`, `org`. - - * New module `Text.Pandoc.SelfContained`. - - * New module `Text.Pandoc.Docx`. - - * New module `Text.Pandoc.PDF`. - - * Added `writerBeamer` to `WriterOptions`. - - * Added `normalizeDate` to `Text.Pandoc.Shared`. - - * Added `splitStringWithIndices` in `Text.Pandoc.Shared`. - This is like `splitWithIndices`, but it is sensitive to distinctions - between wide, combining, and regular characters. - - * `Text.Pandoc.Pretty`: - - + Added `chomp` combinator. - + Added `beforeNonBreak` combinator. This allows you to include - something conditionally on it being before a nonblank. - Used for RST inline math. - + Added `charWidth` function. All characters marked W or F in the unicode - spec EastAsianWidth.txt get width 2. - + Added `realLength`, based on `charWidth`. `realLength` is now - used in calculating offsets. - - * New module `Text.Pandoc.Slides`, for common functions for breaking - a document into slides. - - * Removed `Text.Pandoc.S5`, which is no longer needed. - - * Removed `Text.Pandoc.CharacterReferences`. Moved - `characterReference` to `Text.Pandoc.Parsing`. - `decodeCharacterReferences` is replaced by `fromEntities` - in `Text.Pandoc.XML`. - - * Added `Text.Pandoc.ImageSize`. This is intened for use - in `docx` and `odt` writers, so the size and dpi of images - can be calculated. - - * Removed `writerAscii` in `WriterOptions`. - - * Added `writerHighlight` to `WriterOptions`. - - * Added `DZSlides` to `HTMLSlideVariant`. - - * `writeEPUB` has a new argument for font files to embed. - - * Added `stateLastStrPos` to `ParserState`. This lets us keep track - of whether we're parsing the position immediately after a regular - (non-space, non-symbol) string, which is useful for distinguishing - apostrophes from single quote starts. - - * `Text.Pandoc.Parsing`: - - + `escaped` now returns a `Char`. - + Removed `charsInBalanced'`, added a character parser as - a parameter of `charsInBalanced`. This is needed for - proper handling of escapes, etc. - + Added `withRaw`. - - * Added `toEntities` to `Text.Pandoc.XML`. - - * `Text.Pandoc.Readers.LaTeX`: - - + Export `handleIncludes`. - + Export `rawLaTeXBlock` instead of `rawLaTeXEnvironment'`. - - * Added `ToJsonFilter` class and `toJsonFilter` function to - `Text.Pandoc`, deprecating the old `jsonFilter` function. - - * `Text.Pandoc.Highlighting`: - - + Removed `highlightHtml`, `defaultHighlightingCss`. - + Export `formatLaTeXInline`, `formatLaTeXBlock`, and `highlight`, plus - key functions from highlighting-kate. - + Changed types of highlighting function. `highlight` returns a - `Maybe`, not an `Either`. - -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 `<link>` 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 `<b>`, `<emph>`, 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 - in the 1.8.1 release. With those lines, the temp directory is created - in the working directory, and it is not deleted. This fix restores - the original behavior. - -pandoc (1.8.1) - - * Added `--ascii` option. Currently supported only in HTML writer, - which it causes to use numerical entities instead of UTF-8. - - * EPUB writer: `--toc` now works to provide a table of contents - at the beginning of each chapter. - - * LaTeX writer: Change figure defaults to `htbp`. - This prevents "too many unprocessed floats." Resolves - Issue #285. - - * `Text.Pandoc.UTF8`: Encode filenames even when using recent - base. - - * `markdown2pdf`: Fixed filename encoding issues. With help from Paulo - Tanimoto. Resolves Issue #286. - - * HTML writer: Put line breaks in section divs. - - * `Text.Pandoc.Shared`: Make `writerSectionDivs` default to False. - -pandoc (1.8.0.3) - - * Fixed Source-repository stanza in cabal file. - -pandoc (1.8.0.2) - - * HTML writer: - - + Stringify alt text instead of converting to HTML. - + Break lines after block elements, not inside tags. - HTML output now closely resembles that of tidy. Resolves Issue #134. - - * Markdown reader: Fixed bug in footnote block parser (pointed out - by Jesse Rosenthal). The problem arose when the blank line - at the end of a footnote block contained indenting spaces. - - * Shared: Improved 'normalize' function so it normalizes Spaces too. - In normal form, Space elements only occur to separate two non-Space - elements. So, we never have [Space], or [, ..., Space]. - - * Tests: - - + Improved Arbitrary instance. - + Added timeout for test instances. - - * README: - - + Added section on four-space rule for lists. Resolves Issue #283. - + Clarified optional arguments on math options. - - * markdown2pdf: Fixed bug with output file extensions. - Previously `markdown2pdf test.txt -o test.en.pdf` would produce - `test.pdf`, not `test.en.pdf`. Thanks to Paolo Tanimoto for the fix. - -pandoc (1.8.0.1) - - * Revised Interact.hs so that it works with the CPP macros - in the UTF8 module. - - * Revised Setup.hs so that we don't call MakeManPage.hs unless - the man pages are out of date. - -pandoc (1.8) - - [new features] - - * Support for citations using Andrea Rossato's `citeproc-hs` 0.3. - You can now write, for example, - - Water is wet [see @doe99, pp. 33-35; also @smith04, ch. 1]. - - and, when you process your document using `pandoc`, specifying - a citation style using `--csl` and a bibliography using `--bibliography`, - the citation will be replaced by an appropriately formatted - citation, and a list of works cited will be added to the end - of the document. - - This means that you can switch effortlessly between different citation - and bibliography styles, including footnote, numerical, and author-date - formats. The bibliography can be in any of the following formats: MODS, - BibTeX, BibLaTeX, RIS, EndNote, EndNote XML, ISI, MEDLINE, Copac, or JSON. - See the README for further details. - - Citations are supported in the markdown reader, using a special - syntax, and in the LaTeX reader, using natbib or biblatex syntax. - (Thanks to Nathan Gass for the natbib and biblatex support.) - - * New `textile` reader and writer. Thanks to Paul Rivier for contributing - the `textile` reader, an almost complete implementation of the textile - syntax used by the ruby [RedCloth library](http://redcloth.org/textile). - Resolves Issue #51. - - * New `org` writer, for Emacs Org-mode, contributed by Puneeth Chaganti. - - * New `json` reader and writer, for reading and writing a JSON - representation of the native Pandoc AST. These are much faster - than the `native` reader and writer, and should be used for - serializing Pandoc to text. To convert between the JSON representation - and native Pandoc, use `encodeJSON` and `decodeJSON` from - `Text.JSON.Generic`. - - * A new `jsonFilter` function in `Text.Pandoc` makes it easy - to write scripts that transform a JSON-encoded pandoc document. - For example: - - -- removelinks.hs - removes links from document - import Text.Pandoc - main = interact $ jsonFilter $ bottomUp removeLink - where removeLink (Link xs _) = Emph xs - removeLink x = x - - To use this to remove links while translating markdown to LaTeX: - - pandoc -t json | runghc removelinks.hs | pandoc -f json -t latex - - * Attributes are now allowed in inline `Code` elements, for example: - - In this code, `ulist ! [theclass "special"] << elts`{.haskell} is... - - The attribute syntax is the same as for delimited code blocks. - `Code` inline has an extra argument place for attributes, just like - `CodeBlock`. Inline code will be highlighted in HTML output, if pandoc - is compiled with highlighting support. Resolves Issue #119. - - * New `RawBlock` and `RawInline` elements (replacing `RawHtml`, - `HtmlInline`, and `TeX`) provide lots of flexibility in writing - scripts to transform Pandoc documents. Scripts can now change - how each element is rendered in each output format. - - * You can now define LaTeX macros in markdown documents, and pandoc - will apply them to TeX math. For example, - - \newcommand{\plus}[2]{#1 + #2} - $\plus{3}{4}$ - - yields `3+4`. Since the macros are applied in the reader, they - will work in every output format, not just LaTeX. - - * LaTeX macros can also be used in LaTeX documents (both in math - and in non-math contexts). - - * A new `--mathjax` option has been added for displaying - math in HTML using MathJax. Resolves issue #259. - - * Footnotes are now supported in the RST reader. (Note, however, - that unlike docutils, pandoc ignores the numeral or symbol used in - the note; footnotes are put in an auto-numbered ordered list.) - Resolves Issue #258. - - * A new `--normalize` option causes pandoc to normalize the AST - before writing the document. This means that, for example, - `*hi**there*` will be rendered as `<em>hithere</em>` - instead of `<em>hi</em><em>there</em>`. This is not the default, - because there is a significant performance penalty. - - * A new `--chapters` command-line option causes headers - in DocBook, LaTeX, and ConTeXt to start with "chapter" (level one). - Resolves Issue #265. - - * In DocBook output, `<chapter>` is now used for top-level - headers if the template contains `<book>`. Resolves Issue #265. - - * A new `--listings` option in `pandoc` and `markdown2pdf` causes - the LaTeX writer to use the listings package for code blocks. - (Thanks to Josef Svennigsson for the pandoc patch, and Etienne - Millon for the markdown2pdf patch.) - - * `markdown2pdf` now supports `--data-dir`. - - * URLs in autolinks now have class "url" so they can be styled. - - * Improved prettyprinting in most formats. Lines will be wrapped - more evenly and duplicate blank lines avoided. - - * New `--columns` command-line option sets the column width for - line wrapping and relative width calculations for tables. - - * Made `--smart` work in HTML, RST, and Textile readers, as well - as markdown. - - * Added `--html5` option for HTML5 output. - - * Added support for listings package in LaTeX reader - (Puneeth Chaganti). - - * Added support for simple tables in the LaTeX reader. - - * Added support for simple tables in the HTML reader. - - * Significant performance improvements in many readers and writers. - - [API and program changes] - - * Moved `Text.Pandoc.Definition` from the `pandoc` package to a new - auxiliary package, `pandoc-types`. This will make it possible for other - programs to supply output in Pandoc format, without depending on the whole - pandoc package. - - * Added `Attr` field to `Code`. - - * Removed `RawHtml`, `HtmlInline`, and `TeX` elements; added generic - `RawBlock` and `RawInline`. - - * Moved generic functions to `Text.Pandoc.Generic`. Deprecated - `processWith`, replacing it with two functions, `bottomUp` and `topDown`. - Removed previously deprecated functions `processPandoc` and `queryPandoc`. - - * Added `Text.Pandoc.Builder`, for building `Pandoc` structures. - - * `Text.Pandoc` now exports association lists `readers` and `writers`. - - * Added `Text.Pandoc.Readers.Native`, which exports `readNative`. - `readNative` can now read full pandoc documents, block lists, blocks, - inline lists, or inlines. It will interpret `Str "hi"` - as if it were `Pandoc (Meta [] [] []) [Plain [Str "hi"]]`. - This should make testing easier. - - * Removed deprecated `-C/--custom-header` option. - Use `--template` instead. - - * `--biblio-file` has been replaced by `--bibliography`. - `--biblio-format` has been removed; pandoc now guesses the format - from the file extension (see README). - - * pandoc will treat an argument as a URI only if it has an - `http(s)` scheme. Previously pandoc would treat some - Windows pathnames beginning with `C:/` as URIs. - - * The `--sanitize-html` option and the `stateSanitize` field in - `ParserState` have been removed. Sanitization is better done in the - resulting HTML using `xss-sanitize`, which is based on pandoc's - sanitization, but improved. - - * pandoc now adds a newline to the end of its output in fragment - mode (= not `--standalone`). - - * Added support for `lang` in `html` tag in the HTML template, - so you can do `pandoc -s -V lang=es`, for example. - - * `highlightHtml` in `Text.Pandoc.Highlighting` now takes - a boolean argument that selects between "inline" and - "block" HTML. - - * `Text.Pandoc.Writers.RTF` now exports `rtfEmbedImage`. - Images are embedded in RTF output when possible (png, jpeg). - Resolves Issue #275. - - * Added `Text.Pandoc.Pretty`. This is better suited for pandoc than the - `pretty` package. Changed all writers that used - `Text.PrettyPrint.HughesPJ` to use `Text.Pandoc.Pretty` instead. - - * Rewrote `writeNative` using the new prettyprinting module. It is - now much faster. The output has been made more consistent and compressed. - `writeNative` is also now sensitive to writerStandalone`, and will simply - `print a block list if writerStandalone` is False. - - * Removed `Text.Pandoc.Blocks`. `Text.Pandoc.Pretty` allows you to define - blocks and concatenate them, so a separate module is no longer needed. - - * `Text.Pandoc.Shared`: - - + Added `writerColumns`, `writerChapters`, and `writerHtml5` to - `WriterOptions`. - + Added `normalize`. - + Removed unneeded prettyprinting functions: - `wrapped`, `wrapIfNeeded`, `wrappedTeX`, `wrapTeXIfNeeded`, `hang'`, - `BlockWrapper`, `wrappedBlocksToDoc`. - + Made `splitBy` take a test instead of an element. - + Added `findDataFile`, refactored `readDataFile`. - + Added `stringify`. Rewrote `inlineListToIdentifier` using `stringify`. - + Fixed `inlineListToIdentifier` to treat '\160' as ' '. - - * `Text.Pandoc.Readers.HTML`: - - + Removed `rawHtmlBlock`, `anyHtmlBlockTag`, `anyHtmlInlineTag`, - `anyHtmlTag`, `anyHtmlEndTag`, `htmlEndTag`, `extractTagType`, - `htmlBlockElement`, `htmlComment` - + Added `htmlTag`, `htmlInBalanced`, `isInlineTag`, `isBlockTag`, - `isTextTag` - - * 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 - too many complications, and removed author's flexibility in - combining ellipses with spaces and periods. - - * Allow linebreaks in URLs (treat as spaces). Also, a string of - consecutive spaces or tabs is now parsed as a single space. If you have - multiple spaces in your URL, use `%20%20`. - - * `Text.Pandoc.Parsing`: - - + Removed `refsMatch`. - + Hid `Key` constructor. - + Removed custom `Ord` and `Eq` instances for `Key`. - + Added `toKey` and `fromKey` to convert between `Key` and `[Inline]`. - + Generalized type on `readWith`. - - * Small change in calculation of relative widths of table columns. - If the size of the header > the specified column width, use - the header size as 100% for purposes of calculating - relative widths of columns. - - * Markdown writer now uses some pandoc-specific features when `--strict` - is not specified: `\` newline is used for a hard linebreak instead of - two spaces then a newline. And delimited code blocks are used when - there are attributes. - - * HTML writer: improved gladTeX output by setting ENV appropriately - for display or inline math (Jonathan Daugherty). - - * LaTeX writer: Use `\paragraph`, `\subparagraph` for level 4,5 headers. - - * LaTeX reader: - - + `\label{foo}` and `\ref{foo}` now become `{foo}` instead of `(foo)`. - + `\index{}` commands are skipped. - - * Added `fontsize` variable to default LaTeX template. - This makes it easy to set the font size using `markdown2pdf`: - `markdown2pdf -V fontsize=12pt input.txt`. - - * Fixed problem with strikeout in LaTeX headers when using - hyperref, by adding a command to the default LaTeX template - that disables `\sout` inside pdf strings. Thanks to Joost Kremers - for the fix. - - * The `COLUMNS` environment variable no longer has any effect. - - [under-the-hood improvements] - - * Pandoc now compiles with GHC 7. (This alone leads to a - significant performance improvement, 15-20%.) - - * Completely rewrote HTML reader using tagsoup as a lexer. The - new reader is faster and more accurate. Unlike the - old reader, it does not get bogged down on some input - (Issues #277, 255). And it handles namespaces in tags - (Issue #274). - - * Replaced `escapeStringAsXML` with a faster version. - - * Rewrote `spaceChar` and some other parsers in Text.Pandoc.Parsing - for a significant performance boost. - - * Improved performance of all readers by rewriting parsers. - - * Simplified Text.Pandoc.CharacterReferences by using - entity lookup functions from TagSoup. - - * `Text.Pandoc.UTF8` now uses the unicode-aware IO functions - from `System.IO` if base >= 4.2. This gives support for - windows line endings on windows. - - * Remove duplications in documentation by generating the - pandoc man page from README, using `MakeManPage.hs`. - - * README now includes a full description of markdown syntax, - including non-pandoc-specific parts. A new `pandoc_markdown` - man page is extracted from this, so you can look up markdown - syntax by doing `man pandoc_markdown`. - - * Completely revised test framework (with help from Nathan Gass). - The new test framework is built when the `tests` Cabal flag is set. It - includes the old integration tests, but also some new unit and quickcheck - tests. Test output has been much improved, and you can now specify a glob - pattern after `cabal test` to indicate which tests should be run; - for example `cabal test citations` will run all the citation tests. - - * Added a shell script, `stripansi.sh`, for filtering ANSI control - sequences from test output: `cabal test | ./stripansi.sh > test.log`. - - * Added `Interact.hs` to make it easier to use ghci while developing. - `Interact.hs` loads `ghci` from the `src` directory, specifying - all the options needed to load pandoc modules (including - specific package dependencies, which it gets by parsing - dist/setup-config). - - * Added `Benchmark.hs`, testing all readers + writers using criterion. - - * Added `stats.sh`, to make it easier to collect and archive - benchmark and lines-of-code stats. - - * Added upper bounds to all cabal dependencies. - - * Include man pages in extra-source-files. This allows users to - install pandoc from the tarball without needing to build the man - pages. - - [bug fixes] - - * Filenames are encoded as UTF8. Resolves Issue #252. - - * Handle curly quotes better in `--smart` mode. Previously, curly quotes - were just parsed literally, leading to problems in some output formats. - Now they are parsed as `Quoted` inlines, if `--smart` is specified. - Resolves Issue #270. - - * Text.Pandoc.Parsing: Fixed bug in grid table parser. - Spaces at end of line were not being stripped properly, - resulting in unintended LineBreaks. - - * Markdown reader: - - + Allow HTML comments as inline elements in markdown. - So, `aaa <!-- comment --> bbb` can be a single paragraph. - + Fixed superscripts with links: `^[link](/foo)^` gets - recognized as a superscripted link, not an inline note followed by - garbage. - + Fixed regression, making markdown reference keys case-insensitive again. - Resolves Issue #272. - + Properly handle abbreviations (like `Mr.`) at the end of a line. - + Better handling of intraword underscores, avoiding exponential - slowdowns in some cases. Resolves Issue #182. - + Fixed bug in alignments in tables with blank rows in the header. - - * RST reader: - - + Field lists now allow spaces in field names, and - block content in field values. (Thanks to Lachlan Musicman - for pointing out the bug.) - + Definition list items are now always `Para` instead of - `Plain`, matching behavior of `rst2xml.py`. - + In image blocks, the description is parsed properly and - used for the alt attribute, not also the title. - + Skip blank lines at beginning of file. Resolves - Debian #611328. - - * LaTeX reader: - - + Improved parsing of preamble. - Previously you'd get unexpected behavior on a document that - contained `\begin{document}` in, say, a verbatim block. - + Allow spaces between `\begin` or `\end` and `{`. - + Support `\L` and `\l`. - + Skip comments inside paragraphs. - - * LaTeX writer: - - + Escape strings in `\href{..}`. - + In nonsimple tables, put cells in `\parbox`. - - * OpenDocument writer: don't print raw TeX. - - * Markdown writer: - - + Fixed bug in `Image`. URI was getting unescaped twice! - + Avoid printing extra blank lines at the end if there are - no notes or references. - - * LaTeX and ConTeXt: Escape `[` and `]` as `{[}` and `{]}`. - This avoids unwanted interpretation as an optional argument. - - * ConTeXt writer: Fixed problem with inline code. Previously - `}` would be rendered `\type{}}`. Now we check the string for '}' and '{'. - If it contains neither, use `\type{}`; otherwise use `\mono{}` - with an escaped version of the string. - - * `:` now allowed in HTML tags. Resolves Issue #274. - -pandoc (1.6) - - [ John MacFarlane ] - - * New EPUB and HTML Slidy writers. (Issue #122) - - - EPUB is a standard ebook format, used in Apple's iBooks for - the iPad and iPhone, Barnes and Noble's nook reader, the Sony - reader, and many other devices. - - Slidy, like S5, is a system for producing HTML+javascript slide - shows. - - * All input is assumed to be UTF-8, no matter what the locale and ghc - version, and all output is UTF-8. This reverts to pre-1.5 behavior. - Also, a BOM, if present, is stripped from the input. - - * Markdown now supports grid tables, whose cells can contain - arbitrary block elements. (Issue #43) - - * Sequentially numbered example lists in markdown with `@` marker. - - * Markdown table captions can begin with a bare colon and no longer need - to include the English word "table." Also, a caption can now occur - either before or after the table. (Issue #227) - - * New command-line options: - - - `--epub-stylesheet` allows you to specify a CSS file that will - be used to style your ebook. - - `--epub-metadata` allows you to specify metadata for the ebook. - - `--offline` causes the generated HTML slideshow to include all - needed scripts and stylesheets. - - `--webtex` causes TeX math to be converted to images using the - Google Charts API (unless a different URL is specified). - - `--section-divs` causes div tags to be added around each section - in an HTML document. (Issue #230, 239) - - * Default behavior of S5 writer in standalone mode has changed: - previously, it would include all needed scripts and stylesheets - in the generated HTML; now, only links are included unless - the `--offline` option is used. - - * Default behavior of HTML writer has changed. Between 1.2 and 1.5, - pandoc would enclose sections in div tags with identifiers on the - div tags, so that the sections can be manipulated in javascript. - This caused undesirable interactions with raw HTML div tags. So, - starting with 1.6, the default is to put the identifiers directly - on the header tags, and not to include the divs. The `--section-divs` - option selects the 1.2-1.5 behavior. - - * API changes: - - - `HTMLMathMethod`: Added `WebTeX`, removed `MimeTeX`. - - `WriterOptions`: Added `writerUserDataDir`, `writerSourceDirectory`, - `writerEPUBMetadata` fields. Removed `writerIncludeBefore`, - `writerIncludeAfter`. - - Added `headerShift` to `Text.Pandoc.Shared`. - - Moved parsing code and `ParserState` from `Text.Pandoc.Shared` - to a new module, `Text.Pandoc.Parsing`. - - Added `stateHasChapters` to `ParserState`. - - Added `HTMLSlideVariant`. - - Made `KeyTable` a map instead of an association list. - - Added accessors for `Meta` fields (`docTitle`, `docAuthors`, - `docDate`). - - `Pandoc`, `Meta`, `Inline`, and `Block` have been given `Ord` - instances. - - Reference keys now have a type of their own (`Key`), with its - own `Ord` instance for case-insensitive comparison. - - Added `Text.Pandoc.Writers.EPUB`. - - Added `Text.Pandoc.UUID`. - - Removed `Text.Pandoc.ODT`, added `Text.Pandoc.Writers.ODT`. - Removed `saveOpenDocumentAsODT`, added `writeODT`. - - Added `Text.Pandoc.Writers.Native` and `writeNative`. - Removed `prettyPandoc`. - - Added `Text.Pandoc.UTF8` for portable UTF8 string IO. - - Removed `Text.Pandoc.Writers.S5` and the `writeS5` function. - Moved `s5Includes` to a new module, `Text.Pandoc.S5`. - To write S5, you now use `writeHtml` with `writerSlideVariant` - set to `S5Slides` or `SlidySlides`. - - * Template changes. If you use custom templates, please update them, - particularly if you use syntax highlighting with pandoc. The old HTML - templates hardcoded highlighting CSS that will no longer work with - the most recent version of highlighting-kate. - - - HTML template: avoid empty meta tag if no date. - - HTML template: Use default highlighting CSS from highlighting-kate - instead of hard-coding the CSS into the template. - - HTML template: insert-before text goes before the title, and - immediately after the <body> tag, as documented. (Issue #241) - - Added slidy and s5 templates. - - Added amssymb to preamble of latex template. (github Issue 1) - - * Removed excess newlines at the end of output. Note: because output - will not contain an extra newline, you may need to make adjustments - if you are inserting pandoc's output into a template. - - * In S5 and slidy, horizontal rules now cause a new slide, so you - are no longer limited to one slide per section. - - * Improved handling of code in man writer. Inline code is now monospace, - not bold, and code blocks now use .nf (no fill) and .IP (indented para). - - * HTML reader parses `<tt>` as Code. (Issue #247) - - * html+lhs output now contains bird tracks, even when compiled without - highlighting support. (Issue #242) - - * Colons are now no longer allowed in autogenerated XML/HTML identifiers, - since they have a special meaning in XML. - - * Code improvements in ODT writer. Remote images are now replaced with - their alt text rather than a broken link. - - * LaTeX reader improvements: - - - Made latex `\section`, `\chapter` parsers more forgiving of - whitespace. - - Parse `\chapter{}` in latex. - - Changed `rawLaTeXInline` to accept `\section`, `\begin`, etc. - - Use new `rawLaTeXInline'` in LaTeX reader, and export `rawLaTeXInline` - for use in markdown reader. - - Fixes bug wherein `\section{foo}` was not recognized as raw TeX - in markdown document. - - * LaTeX writer: images are automatically shrunk if they would extend - beyond the page margin. - - * Plain, markdown, RST writers now use unicode for smart punctuation. - - * Man writer converts math to unicode when possible, as in other writers. - - * `markdown2pdf` can now recognize citeproc options. - - * Command-line arguments are converted to UTF-8. (Issue #234) - - * `Text.Pandoc.TeXMath` has been rewritten to use texmath's parser. - This allows it to handle a wider range of formulas. Also, if a formula - cannot be converted, it is left in raw TeX; formulas are no longer - partially converted. - - * Unicode curly quotes are left alone when parsing smart quotes. (Issue - #143) - - * Cabal file changes: - - - Removed parsec < 3 restriction. - - Added 'threaded' flag for architectures where GHC lacks a threaded - runtime. - - Use 'threaded' only for markdown2pdf; it is not needed for pandoc. - - Require highlighting-kate 0.2.7. - - * Use explicit imports from `Data.Generics`. Otherwise we have a - conflict with the 'empty' symbol, introduced in syb >= 0.2. (Issue #237) - - * New data files: slidy/slidy.min.js, slidy/slidy.min.css, epub.css. - -pandoc (1.5.1.1) - - [ John MacFarlane ] - - * Fixed uniqueIdent in Shared so that header identifiers work as - advertized in the README and are are valid XHTML names. - -pandoc (1.5.1) - - [ John MacFarlane ] - - * Fixed treatment of unicode characters in URIs. - + Shared now exports escapeURI and unescapeURI. These handle - UTF8 encoding and decoding as well as URI escaping/unescaping. - + Shared: uri and emailAddress now return a pair of the original - parsed text and the escaped URI (in the latter case, with - the mailto: prefix). - + HTML reader: unsanitaryURI has been modified to allow unicode - high characters in a URI. - + Readers: All link and image URIs are now escaped using - escapeURI. - + Markdown and RST writers: unescapeURI is used so that URIs - in these formats are human-readable. - - * Setup.hs: Don't assume that the build directory is "dist". - Instead, get it from localBuildInfo. - - * OpenDocument writer: Use a Map for stTextStyleAttr. - This avoids duplicates (and invalid xml). Resolves Issue #222. - -pandoc (1.5.0.1) - - [ John MacFarlane ] - - * HTML writer: Fixed error in math writer (with MathML option) - that caused an infinite loop for unparsable MathML. - -pandoc (1.5) - - [ John MacFarlane ] - - * Added --mathml option. When this is selected, pandoc will convert - TeX math into MathML. - + Added data/MathMLinHTML.js, which is included when no URL is - provided for --mathml. This allows MathML to be displayed (in - better browsers) as text/html. - + Removed Text.Pandoc.LaTeXMathML. The module was no longer - necessary; it was replaced by two lines in pandoc.hs. - + Replaced LaTeXMathML.js.commend and LaTeXMathML.js.packed with a - single combined file, LaTeXMathML.js. - - * Added --data-dir option. - This specifies a user data directory. If not specified, will default - to ~/.pandoc on unix or Application Data\pandoc on Windows. - Files placed in the user data directory will override system default - data files. - - * Added Maybe datadir parameter to readDataFile, saveOpenDocumentAsODT, - latexMathMLScript, s5HeaderIncludes, and getDefaultTemplate. If - Nothing, no user directory is searched for an override. - - * Added 'plain' output format. This is similar to markdown, but - removes links, pictures, inline formatting, and most anything that - looks even vaguely markupish. The function writePlain is exported by - Text.Pandoc.Writers.Markdown, with which it shares most of its code. - - * Allow multi-line titles and authors in meta block. - Titles may span multiple lines, provided continuation lines - begin with a space character. Separate authors may be put on - multiple lines, provided each line after the first begins with - a space character. Each author must fit on one line. Multiple - authors on a single line may still be separated by a semicolon. - Based on a patch by Justin Bogner. - - * When given an absolute URI as parameter, pandoc will try to fetch - the content via HTTP. So you can do: - 'pandoc -r html -w markdown http://www.fsf.org' - Adds dependency on HTTP. - - * Made HTML reader much more forgiving. - + Incorporated idea (from HXT) that an element can be closed - by an open tag for another element. - + Javascript is partially parsed to make sure that a <script> - section is not closed by a </script> in a comment or string. - + More lenient non-quoted attribute values. - Now we accept anything but a space character, quote, or <>. - This helps in parsing e.g. www.google.com! - + Bare & signs are now parsed as a string. This is a common - HTML mistake. - + Skip a bare < in malformed HTML. - - * Removed html2markdown and hsmarkdown. - + html2markdown is no longer needed, since you can now pass URI - arguments to pandoc and directly convert web pages. (Note, - however, that pandoc assumes the pages are UTF8. html2markdown - made an attempt to guess the encoding and convert them.) - + hsmarkdown is pointless -- a large executable that could be - replaced by 'pandoc --strict'. - - * In most writers, an image in a paragraph by itself is now rendered - as a figure, with the alt text as the caption. (Texinfo, HTML, RST, - MediaWiki, Docbook, LaTeX, ConTeXt, HTML.) Other images are - rendered inline. - - * Depend on extensible-exceptions. This allows pandoc to be compiled - on GHC 6.8. - - * Added --base-header-level option. For example, --base-header-level=2 - will change level 1 headers to level 2, level 2 to level 3, etc. - Closes Debian #563416. - - * Incomplete support for RST tables (simple and grid). - Thanks to Eric Kow. Colspans and rowspans not yet supported. - - * Added accessors (docTitle, docAuthors, docDate) to Meta type. - - * MediaWiki writer: format links with relative URLs as wikilinks. - The new rule: If the link target is an absolute URL, an external - link is created. Otherwise, a wikilink is created. - - * Text.Pandoc.Shared: Export uniqueIdent, and don't allow tilde in - identifier. Note: This may break links to sections that involve - tildes. - - * Markdown(+lhs) reader: handle "inverse bird tracks." - Inverse bird tracks (<) are used for haskell example code that is not - part of the literate Haskell program. Resolves Issue #211. - - * LaTeX reader: - + Recognize '\ ' (interword space). - + Recognize nonbreaking space '~'. - + Ignore \section, \pdfannot, \pdfstringdef. Ignore alt title in - section headers. Don't treat \section as inline LaTeX. - Resolves Issue #202. - + LaTeX reader: allow any special character to be escaped. - Resolves Issue #221. - + LaTeX reader: treat \paragraph and \subparagraph as level 4, 5 - headers. Resolves Issue #207. - - * Use template variables for include-before/after. - + These options now imply -s; previously they worked also in fragment - mode. - + Users can now adjust position of include-before and include-after - text in the templates. - + Default position of include-before moved back (as it was before 1.4) - before table of contents. - + Resolves Issue #217. - - * Don't print an empty table header: (all writers). - Resolves Issue #210. - - * HTML, Docbook writer: Use tbody, thead, and cols in tables. - - * HTML writer: Don't include TOC div if table of contents is empty. - - * Markdown writer: Fixed citations. - Previously the markdown writer printed raw citation codes, e.g. - [geach1970], rather than the expanded citations provided by - citeproc, e.g. (Geach 1970). Now it prints the expanded citations. - This means that the document produced can be processed as a markdown - document without citeproc. Thanks to dsanson for reporting, and - Andrea Rossato for the patch. - - * Improved and simplified title block in context template. - Previously it caused an error if there was no title. - This method should also be easier for users to customize. - - * Markdown reader: - + Treat p., pp., sec., ch., as abbreviations in smart mode. - + Disallow blank lines in inline code span. - + Allow footnotes to be indented < 4 spaces. - This fixes a regression. A test case has been added. - + Escape spaces in URLs as %20. Previously they were incorrectly - escaped as +, which is appropriate only for the query part of - a URL. Resolves Issue #220. - + Require two spaces after capital letter + period for list item. - Otherwise "E. coli" starts a list. This might change the semantics - of some existing documents, since previously the two-space - requirement was only enforced when the second word started - with a capital letter. But it is consistent with the existing - documentation and follows the principle of least surprise. - Resolves Issue #212. - - * LaTeX template: redefine labelwidth when using enumerate package. - Otherwise the list labels (numbers) often extend past the left - margin, which looks bad. - - * Mediawiki writer: Don't print a "== Notes ==" header before - references. This is too English-centric. Writers can provide their - own header at the end of the document. - - * Promoted mediawiki headers. '= head =' is now level 1, '== head ==' - level 2, etc. This seems to be correct; it's only by convention - that wikipedia articles have level 2 headers at most. - Patch due to Eric Kow. - - * RunTests.hs: Set LANG to a UTF-8 locale. Use 'pandoc --data-dir=' so - data files don't need to have been installed. This removes the need to - set HOME. - - * HTML reader: - + Handle spaces before <html>. Resolves Issue #216. - + Be forgiving in parsing a bare list within a list. - The following is not valid xhtml, but the intent is clear: - <ol> - <li>one</li> - <ol><li>sub</li></ol> - <li>two</li> - </ol> - We'll treat the <ol> as if it's in a <li>. Resolves Issue #215. - - * Updated INSTALL instructions. cabal method is now promoted. - - * Updated markdown2pdf man page. It no longer says all pandoc options - are accepted. - - * README/man pages: Removed advice to pipe through tidy before HTML - reader. This is obsolete, now that we have a forgiving HTML parser. - - * LaTeX writer: set numbersections template variable, so - the section numbering options work again. - - * Removed obsolete Makefile. - - * Website: renamed index.txt.in -> index.txt. - - * New batch file to make-windows-installer. - + Removed old Makefile.windows - + Added make-windows-installer.bat - + Modified default installer name in pandoc-setup.iss - - * Removed freebsd and macports directories. - They are no longer up to date. - - * Setup.hs: - + Made man page building sensitive to build verbosity. - + Improved detection of highlighting support in test hook. - + Install wrapper scripts into cabal bin directory. - + Also simplified installManpages. - + Setup.hs: install manpages to mandir. Code borrowed from darcs. - - * Changed default of writerXeTeX to False. - - * HTML writer: don't include empty UL if --toc but no sections. - Resolves Issue #199. - - * LaTeX writer: - - + If book, report, or memoir documentclass, use \chapter{} - for first-level headers. Otherwise use \section{}. - + Removed stLink, link template variable. Reason: we now always - include hyperref in the template. - - * LaTeX template: - - + Only show \author if there are some. - + Always include hyperref package. It is used not just for links but - for toc, section heading bookmarks, footnotes, etc. Also added - unicode=true on hyperref options. - - * markdown2pdf: always do at least two runs. hyperref bookmarks - require this. - - * cabal file: Removed unneeded dependency on template-haskell. - - * Windows installer - fixed bug in data file locations. - Resolves Issue #197. - - * Deprecated --custom-header in documentation. - Removed old "Custom Headers" section in README. - -pandoc (1.4) - - [ John MacFarlane ] - - * Pandoc will now compile with either GHC 6.10 or 6.12. - + Don't use System.IO.UTF8 when compiling with 6.12 - + Use -fno-warn-unused-do-bind option when compiling with 6.12 - - * Replaced old headers with templates. Now users have much more - control over the way documents appear in --standalone mode, - and writer code is simplified. Resolves Issues #59, 147. - Every effort has been made to retain backwards compatibilty. - So, the --custom-header option should still work as before. - - + Added Text.Pandoc.Templates. This provides functions for - retrieving default templates and for rendering templates. - + System templates (in the pandoc data directory) can be - overridden by user templates in $HOME/.pandoc/templates. - + Removed Text.Pandoc.DefaultHeaders. - + Removed data/headers directory. - + Added templates directory. - + Added writerTemplate and writerVariables fields to WriterOptions. - + Removed writerTitlePrefix, writerHeader fields from WriterOptions. - + Changed --print-default-header to --print-default-template. - + Added --template option. - + Added -V/--variable option to set custom template variables. - - * Pandoc no longer requires Template Haskell. Resolves Issue #186. - - + Removed need for TH in ODT module. Instead get reference.odt from - data file at run time. - + Removed TH dependency from S5 module. S5 module now exports - s5HeaderIncludes, which pandoc.hs includes if writer is s5 and - standalone. - + Refactored LaTeXMathML not to use TH. - - * Meta is now Meta [Inline] [[Inline]] [Inline] rather than - Meta [Inline] [String] String. Authors and date in Meta are now lists - of Inline elements rather than raw strings. This means that they can - be formatted and can include footnotes. NOTE: This may be a breaking - change for those using pandoc as a library. - - * Added readDataFile to Text.Pandoc.Shared. This retrieves - a data file from the user pandoc data directory (~/.pandoc - on unix), or, if not found there, from the system data - directory ($CABALDIR/shared/pandoc-VERSION/). All data - files, including templates, LaTeXMathML.js, s5 styles, - and reference.odt, can be overridden by the user. - - * s5 files moved from data/ui/default to s5/default. - - * Use unicode instead of entities in HTML and XML output. Resolves - Issue #163. - - * Prettier HTML footnote references: put anchor inside sup, - instead of other way. Resolves Issue #191. Thanks to - infinity0x. - - * Added --xetex option to pandoc and markdown2pdf. - If --xetex is specified, pandoc produces latex suitable for - processing by xelatex, and markdown2pdf uses xelatex to create - the PDF. Resolves Issue #185. - - * RTF writer: multiple authors now occupy multiple paragraphs rather - than using a line break. - - * Man writer: now the "--after-body" will come after the "AUTHORS" - section, whereas before it would come before it. This is a - slight break from backwards compatibility. - - * Added --reference-odt option, so users may customize the styles - used in pandoc-generated ODT files. Users may also place a - default reference.odt in the ~\.pandoc directory. - - * ODT writer: - + Indented and line-broke styles.xml so it can be modified more easily. - + Omitted some unnecessary style declarations. - + Don't wrap text in OpenDocument writer. The tags are too long, making - wrapping ugly and pointless. - - * LaTeX reader: use \\ to separate multiple authors. - - * Markdown reader: use ; as separator between authors. - This allows you to use ',' within author names: e.g. "John Jones, Jr." - - * S5 writer: use linebreak to separate authors in title page. - - * RST reader: Allow :: before lhs code block. The RST spec requires the - :: before verbatim blocks. This :: should not be treated as literal - colons. Resolves Issue #189. - - * Documented pandoc 1.3's new definition list syntax in README. - (An oversight in the last release.) - - * markdown2pdf.hs: - + interpret ! in a log as an error line. - + --toc now works properly. - - * Changes in RunTests.hs: - + Use the Diff library rather than a local copy of Diff.hs. - (This vastly increases performance.) This change means that 'cabal - test' presupposes that the Diff library is installed. - + Removed tests/Diff.hs from cabal file. - + Changed RunTests to use local environment. We need at least HOME, so - pandoc can find its data directory. - - * Updated windows installer to install data files in the app directory. - - * Windows installer now installs portable wrappers hsmarkdown and - markdown2pdf. - -pandoc (1.3) - - [ John MacFarlane ] - - * Added --id-prefix option (Issue #41). This adds a prefix to all - automatically generated HTML identifiers, which helps prevent - duplicate identifiers when you're generating a fragment (say a blog - post). - - * Added --indented-code-classes option. This specifies classes - to use for indented code blocks. (Patch due to buttock; Issue #87.) - - * --number-sections now affects HTML output as well as ConTeXt and LaTeX - (Issue #150). - - * Improved syntax for markdown definition lists (Issue #24). - Definition lists are now more compatible with PHP Markdown Extra. - + You can have multiple definitions for a term (but still not - multiple terms). - + Multi-block definitions no longer need a column before each block - (indeed, this will now cause multiple definitions). - + The marker no longer needs to be flush with the left margin, - but can be indented at or two spaces. Also, ~ as well as : - can be used as the marker (this suggestion due to David - Wheeler.) - + There can now be a blank line between the term and the - definitions. - - * Better looking simple tables. Resolves Issue #180. - + Markdown reader: simple tables are now given column widths of 0. - + Column width of 0 is interpreted as meaning: use default column width. - + Writers now include explicit column width information only - for multiline tables. (Exception: RTF writer, which requires - column widths. In this case, columns are given equal widths, - adding up to the text width.) - + Simple tables should now look better in most output formats. - - * Allow markdown tables without headers (Issue #50). - The new syntax is described in README. Also allow optional line of - dashes at bottom of simple tables. - - * Compensate for width of final table column (Issue #144). - - * Treat a backslash followed by a newline as a hard line break - in markdown. Resolves Issue #154. This is a nice alternative - to markdown's "invisible" way of indicating hardline breaks - using lines that end with two spaces. - - * Improved performance of markdown reader by ~10% by eliminating the - need for a separate parsing pass for notes. Raw notes are now stored - on the first pass (which parses references), then parsed when the - note is inserted into the AST. The stateNotes field in ParserState - is now a list of [(String, String)] pairs instead of [(String, - [Block])]. - - * In markdown reader, treat 4 or more * or _ in a row as literal - text. (Trying to parse long strings of * or _ as strong or emph - leads to exponential performance problems.) - - * Markdown reader: Use + rather than %20 for spaces in URLs. - - * Fixed htmlComment parser, adding a needed 'try'. - - * Don't print raw HTML in man output. - - * Allow . _ and ~ in header identifiers. - - * Specially mark code blocks that were "literate" in the input. - They can then be treated differently in the writers. This allows - authors to distinguish bits of the literate program they are writing - from source code examples, even if the examples are marked as - Haskell for highlighting. (Issue #174.) - - * Modified html+lhs output to use "haskell" highlighter instead - of "literateHaskell". The highlighting module now adds bird tracks - after highlighting (for HTML output), if the code block has the - "literate" class. This gives better results, because kate's - haskell highlighter is much better than the literateHaskell - highlighter. - - * Fixed handling of footnotes in titles (HTML) and headers (LaTeX). - (Issue #137.) - - * Support for "..code-block" directive in RST reader. Not core - RST, but used in Sphinx for code blocks annotated with syntax - information. Thanks to Luke Plant for the patch. - - * Added "head" to list of block-level HTML tags. Resolves - Issue #108. - - * Added stripTags to Text.Pandoc.XML. This is used in the HTML writer. - - * Set utf-8 encoding in texinfo headers. - - * Docbook writer: add ids to sections. Use link for internal links. - (Issue #60.) - - * Blank lines after lists in MediaWiki writer. - - * Properly handle commented-out list items in markdown. - Resolves Issue #142. Example: - - - a - <!-- - - b - --> - - c - - * Changed heuristic in compactify. compactify has to decide whether a - Para that ends a list is a Para intentionally, or just because of - the blank lines at the end of every list. In the latter case the - Para is turned to a Plain. The old heuristic was: change final Para - to Plain iff the other items all end in Plain. This produces bad - results when, for example, an item contains just a Plain and an HTML - comment, as it does in the list above. The new heuristic: change - final Para to Plain iff the other items don't contain a Para. - - * Added % as an rst underline character. Resolves Issue #173. - - * Fix inline math parser so that \$ is allowed in math. - Resolves Issue #169. - - * Translate \int (integral) into unicode when using unicode math - method. Resolves Issue #177. - - * markdown2pdf.hs improvements: - + Use System.IO.UTF8. - + Print error messages on last attempt. - + Do not create a backup when overwriting a PDF (Issue #166). - + Accept --longopt=val options. - + Added man/man1/markdown2pdf.1 to extra-tmp-files in cabal, so that - it is properly cleaned. - - * Added haddock comments warning that readers assume \n line endings. - - * Updated COPYRIGHT file. - - * Makefile: Changed EXECSBASE so it doesn't pull in hsmarkdown & - markdown2pdf. Otherwise strip tries to strip shell scripts when you - install using 'make'. - - * Changed Makefile so it doesn't build Haskell wrappers. - - * Fixed Makefile so it doesn't try to build man pages in build-doc. - - * Install pcre3.dll in Windows install script; this allows us to - package a version of pandoc with highlighting support. - -pandoc (1.2.1) - - [ John MacFarlane ] - - * Fixed regression with --preserveTabs. Brought back optPreserveTabs. - The trick of setting tabStop to 0 to mean "preserve tabs" had a bad - side effect: strings of 0 spaces were interpreted as indentation. - So, with --preserve-tabs, unindented paragraphs were treated as - code. Resolves Issue #138. - - * HTML writer: wrap sections in divs. Resolves Issue #70. - - + hierarchicalize has been rationalized; it builds a hierarchical - representation of the document from the headers, and simultaneously - gives each section a unique identifier based on the heading title. - + Identifiers are now attached to the divs rather than - to the headers themselves. - + Table of content backlinks go to the beginning of the table, rather - than to the section reference that was clicked. - + Code for constructing identifiers has been moved to Text.Pandoc.Shared - from the HTML writer, since it is now consumed only by - hierarchicalize. - + In --strict mode, pandoc just prints bare headings, as before - (unless --toc has been specified). - + In s5 output, it does not wrap sections in divs, as that seems to - confuse the s5 javascript. - - * Man writer: break lines at end of each sentence. groff expects this - and treats '.' and '?' differently when followed by line ending as - opposed to ordinary space. Also, don't escape periods. Instead, use - zero-width character \& to avoid unwanted interpretation of periods - at start of line. Resolves Issue #148. - - * Markdown writer: Added '#' and '>' to list of characters to be - escaped in markdown output. Removed '<', as it is not an officially - escapable character. This partially resolves Issue #96. - - * Make --smart the default for man output format. Otherwise we have - trouble dividing lists of endlines into sentences. - - * DocBook writer: Use language attribute to indicate source language - in code blocks. - - * RST reader: - - + Allow # to continue list, even if the list was started with an - explicit marker. For example: - - A. my list - #. continued - - Resolves Issue #140. - + Allow continuation lines in line blocks. Also added test cases for - line blocks for RST reader. Resolves Issue #149. - + Allow explicit links with spaces in URL: `link <to this>`_ - - * Improved LaTeX reader's coverage of math modes. Remove displaymath* - (which is not in LaTeX) and recognize all the amsmath environments - that are alternatives to eqnarray, namely equation, equation*, - gather, gather*, gathered, multline, multline*, align, align*, - alignat, alignat*, aligned, alignedat, split. Resolves Issue #103. - Thanks to shreevatsa.public for the patch. - - * Markdown reader: - - + Allow -, _, :, . in markdown attribute names. These are legal in - XML attribute names. - + Use non-breaking spaces in abbreviations. - + Markdown reader: improved efficiency of abbreviation parsing. - Instead of a separate abbrev parser, we just check for - abbreviations each time we parse a string. This gives a huge - performance boost with -S. Resolves Issue #141. - - * Improved efficiency of shared parsers: hexNum, htmlComment, - whitespace, indentSpaces. - - * Export HTMLMathMethod in Text.Pandoc. - - * Export languagesByExtension in Text.Pandoc.Highlighting. - - * Added new Haskell version of markdown2pdf, due to - Paulo Tanimoto. This should be more portable than the old - shell script. - - * Made 'pandoc -v' more explicit about compiler options. - Resolves Issue #139. - - * pandoc.hs: Made --strict compatible with --standalone, --toc. - - * Use Paths_pandoc to get version number, instead of hard-coding it - into Text/Pandoc.hs. - -pandoc (1.2) - - [ John MacFarlane ] - - * Added support for literate Haskell. lhs support is triggered by - '+lhs' suffixes in formats. For example, 'latex+lhs' is literate - Haskell LaTeX. '.lhs' files are treated by default as literate - markdown. - - + Added stateLiterateHaskell to parser state. - + Added parser for lhsCodeBlock to Markdown, RST, LaTeX readers. - + Added parser for |inline lhs| to LaTeX reader. - + Added writerLiterateHaskell to WriterOptions. - + Added lhs support to Markdown, RST, LaTeX, HTML writers. - + Added definition of code environment to LaTeX header. - + Added tests (run only if highlighting support compiled in). - + Documented lhs features in man page and README. - - * In Text.Pandoc.Definition, added processWith, processWithM, - and queryWith, and deprecated processPandoc and queryPandoc - for these more general functions. - - * Fixed bug in mediawiki writer: improper closing tags in tables. - Thanks to Benct Philip Jonsson for reporting the bug. - - * Added --email-obfuscation option. - - + Added writer option for email obfuscation. - + Implemented email obfuscation options in HTML writer. - + Added option to option parser. - + Documented in README and pandoc man page. - + Resolves Issue #97. - - * LaTeX writer: fixed bug with empty table cells. - Resolves Issue #107. Thanks to rodja.trappe for the patch. - - * Fixed bug with header spacing in Markdown and RST writers. - A null header (Meta [] [] []) should not cause a blank line - at the beginning of output. But a blank line is needed between - a non-null header and the main text. - - * Markdown reader: Relax spacing rules for $$ in display math. Now - space and newlines are allowed after the opening $$ and before the - closing $$. However, the display math cannot contain an entirely - blank line. Resolves Issue #105. - - * Markdown reader: Gobble space after Plain blocks containing only - raw html inline. Otherwise following header blocks are not parsed - correctly, since the parser sees blank space before them. Resolves - Issue #124. - - * Markdown reader: Allow " as well as '' to end a latex double-quote. - - * Conditionally depend on syb and base >= 4 if ghc >= 6.10. - Resolves Issue #109. - - * Fixed problems in RST and markdown output due to bug in pretty-1.0.1.0 - - + Added hang' function to Text.Pandoc.Shared; this will be used instead - of hang, which doesn't work properly in pretty-1.0.1.0. When pretty - is upgraded, we can go back to hang. - See http://article.gmane.org/gmane.comp.lang.haskell.general/16687 - + Use hang' (and some different techniques) in RST and markdown writers. - Some output is now a bit different. - - * Brought citeproc support up to date for citeproc-hs-0.2. - (Patch by Andrea Rossato.) - - * Moved all haskell source to src subdirectory. Renamed Main.hs to - pandoc.hs. - - * Rewrote hsmarkdown in Haskell for portability (src/hsmarkdown.hs). - For now, keeping the old shell script too. - - * Added TemplateHaskell to Extensions for executable, removed - -threaded for library. Thanks to duncan.coutts for the bug report. - Resolves Issue #121. - - * Moved some Extra-Source-Files to Data-Files. - - * Moved tabFilter to Shared. - - * In pandoc.hs, removed optPreserveTabs; instead, tabstop of 0 means - preserve tabs. - - * Minor code cleanup based on hlint suggestions. - -pandoc (1.1) - - [ John MacFarlane ] - - * Main.hs: - - + Changed date on copyright message in Main.hs. - + Have the '-v' option print syntax highlighting languages - separated by commas, and wrapped in lines, instead of in five - columns as before. - - * Added --jsmath option. Resolves Issue #68. - - + Added --jsmath option to Main.hs - + Added JsMath to HTMLMathMethod in Text.Pandoc.Shared. - + Handle math appropriately in HTML writer when JsMath selected. - + Documented the option in README and man page. - - * Text.Pandoc.Shared: Changed compactify to use a better heuristic - for tight and loose lists. Final Para is changed to Plain if all - other list items *end* with a Plain block. Addresses Issue #99. - - * HTML reader: - - + Added colons to protocols in unsanitaryURI. Closes Issue #88. - + HTML reader: Don't interpret contents of <pre> blocks as markdown. - Added rawVerbatimBlock parser. Resolves Issue #94. - - * Markdown reader: - - + Allow URLs with spaces in them in links and references, but escape - them as "%20". - + Allow blank space at the end of horizontal rules. - - * RST reader: Modified 'unknownDirective' parser to handle comment - blocks correctly, and added tests for comment blocks. Resolves Issue - #86. Closes Debian Bug #500662. - - * HTML writer: - - + Include classes on tr elements in HTML output: - "header", "odd", "even". This allows tables to be styled with - lines in alternating colors. Resolves Issue #91. - + Enclose all LaTeXMathML bits in <span class="LaTeX">. - This prevents parts of the document that are not math from being - interpreted as math by LaTeXMathML.js. - - * OpenDocument and ODT writers: Added support for HorizontalRule elements, - which were formerly ignored. Resolves Issue #95. - - * Text.Pandoc.Shared: Modified wrappedTeX to eliminate the line break - between a footnote and immediately following nonspace characters in - LaTeX and ConTeXt output. (This gets interpreted as a space, which - is not desired in cases like `text^[note]---`.) Resolves Issue #93. - - * Windows installer: Don't require admin privileges to run - installer. Modified pandoc-setup.iss, and changed modpath.iss to - modify HKCU path if user lacks admin privileges. Also fixed case - where oldpath is empty (previously this led to the new path - beginning with a semicolon). - - * Updated INSTALL instructions for Arch packages and OS X install using - cabal-install. - - * Removed the (now unneeded) debian directory. - Removed empty Codec and System directories. - - * Moved odt-styles/ to data/. Removed unneeded variable in Makefile. - - * Modified Setup.hs so that the "test" target returns an error status - when tests fail, and "build" returns a success status if - the build succeeds. Resolves Issue #100. - - * Added BUGS to files in tarball. - - -pandoc (1.0.0.1) - - [ John MacFarlane ] - - * Removed spurious reference to pdf output format from pandoc(1) man page. - -pandoc (1.0) - - [ Andrea Rossato ] - - * Added new OpenDocument writer. - - * Added support for SmallCaps inline element. - - * Added support for integrating pandoc with citeproc-hs. - - + Added Cite element to definition and writers. - + Added Text.Pandoc.Biblio module - + Note: This support is included only if the 'citeproc' - Cabal configuration flag is set. - - * Made Pandoc data structure an instance of Typeable. - Added new processPandoc and queryPandoc functions, to query - or transform matching elements in a Pandoc structure. - - [ Peter Wang ] - - * Added new Texinfo writer. - - [ John MacFarlane ] - - * Changes to Texinfo writer: - - + No space between paragraph and following @verbatim (provides more - pleasing appearance in text formats) - + Blank line consistently after list environments. - + Removed deVerb. - + Use @code instead of @verb for inline code (this solves the character - escaping problem for texi2dvi and texi2pdf). - + Added news of Texinfo writer to README. - + Added Texinfo to list of formats in man page, and removed extra 'groff'. - + Added texi & texinfo extensions to Main.hs, and fixed bug in determining - default output extension. - + Modified disallowedInNode in Texinfo writer to correct list of disallowed characters. - - * Added tests for OpenDocument writer. - - * Added ODT writer (using zip-archive library to package output of - OpenDocument writer). Added odt-styles directory with default ODT styles. - - * Added new mediawiki writer and tests. - - * Markdown reader: Added support for delimited code blocks, with optional - syntax highlighting using highlighting-kate (if the 'highlighting' - configuration option is selected). - - + Currently highlighting is supported only in the HTML writer. - + Delimited code blocks can have attributes; using the language name as - class triggers highlighting. - + New Attributes parameter in CodeBlock structure. - + --version now indicates whether syntax highlighting support is compiled - in, and prints a list of supported languages - - * Removed debian directory. Pandoc is no longer a native debian package. - - * Changes to build process: pandoc can now be built from the repository - using Cabal. No unix tools are needed (so, pandoc can be built on Windows - without Cygwin). - - + Include shell scripts themselves in repo, rather than generating from wrappers. - Removed wrappers directory and wrappers Makefile target. - + Text/Pandoc/ASCIIMathML.hs, Text/Pandoc/DefaultHeaders.hs, - and Text/Pandoc/Writers/S5.hs are no longer built in Makefile - from templates in the templates/ directory. Instead, they use template - haskell to read data at compile time from the relevant files in data/. - Template haskell functions go in a new module, Text.Pandoc.TH. - + man pages are now generated in Setup.hs hook, not by Makefile - + Makefile 'tarball' target now calls Cabal's 'sdist' - + Added "Extra-Source-Files" to pandoc.cabal, so sdist contains everything needed - + Added "Build-Type" field to pandoc.cabal to avoid warning. - + Added to "Extra-source-files" and "Extra-tmp-files" in pandoc.cabal, - so 'sdist' and 'clean' will work properly. - + Setup.hs now generates man pages in a postbuild hook. - + Added dependency-checking to Setup.hs, so it only rebuilds things - that need rebuilding. - + Added 'library' and 'executable' configuration flags. - Cabal can now be told to build just the library or just the executable. - + CABALOPTS may now be specified with 'make' to pass Cabal configuration flags. - For example: CABALOPTS=-fhighlighting make - - * Rewrote test suite so it doesn't depend on perl or unix tools. - - + Replaced old runtests.pl with a Haskell script RunTests.hs. - + Added Diff.hs module to be used by RunTests.hs instead of unix 'diff'. - + Added test hook to Setup.hs, so tests may be run from cabal. - + Changed Makefile's 'test' target to run tests via cabal. - + Removed old generate.sh. - + Since we no longer have 'sed' to filter out raw HTML sections - from the docbook writer test, or raw LaTeX sections from the - context writer test, we now just include these sections. - They can be taken out if it is necessary to process the files. - + Updated latex and context writer tests to remove extra spaces - after '\\item' - + Added a markdown table reader test. - + Added markdown-reader-more.txt to test suite, for additional test cases - for raw ConTeXt environments and more. - - * Compatibility fixes for CPP, Cabal, and haddock: - - + Use CPP in "Extensions" field in pandoc.cabal. - + Removed use of backslash string continuations in source files. - - * Removed pandoc.cabal.ghc66. We now require Cabal >= 1.2, GHC >= 6.8, - base >= 3. - - * Require parsec < 3. - The compatibility module in parsec 3.0.0 gives far worse performance than - parsec 2.1. Eventually pandoc will be upgraded to use the new bytestring - version of parsec, and then we'll go to parsec 3.0.0. - - * Removed Text.Regex dependencies by rewriting using plain Haskell - (Text.Pandoc.Writers.RTF, Text.Pandoc.Writers.HTML, Main.hs) - - * Moved Text.Pandoc.Writers.DefaultHeaders -> Text.Pandoc.DefaultHeaders. - - * Makefile: - - + Added 'configure' as dependency of 'uninstall-all'. - (It uses the Cabal build program.) - + Makefile: only use --with-hc-pkg if GHC_PKG is defined. - Note that Cabal will automatically choose the ghc-pkg appropriate - for the compiler selected, so normally specifying GHC by itself - is sufficient. - - * Removed Text.Pandoc.UTF8 module; instead, depend on utf8-string and use - its IO and conversion functions. - - * Added -Wall to ghc-options in pandoc.cabal. Cleaned up modules so that - everything is -Wall clean. - - + Added pragma to HTML writer to avoid deprecation warning for use of "start" attribute. - + Added pragma to Text/Pandoc/Shared.hs to get rid of "orphan instance" warnings. - (These are caused by the Lift instance for ByteString.) - - * Changed the comment used to replace unsafe HTML if sanitize-html option - selected. - - * Made -c/--css option repeatable on the command line (like -H, -A, -B). - - * Moved XML-formatting functions to new unexported module Text.Pandoc.XML. - - * Escape '\160' as " ", not " " in XML. - "nbsp" isn't a predefined XML entity. - - * Fixed bug in RST reader, which would choke on: "p. one\ntwo\n". - Added some try's in ordered list parsers. - - * Man writer: don't escape " as \". - - * Allow newline before URL in markdown link references. Resolves Issue #81. - Added tests for this issue in new "markdown-reader-more" tests. - Changed RunTests.hs to run these tests. - - * Support for display math. Resolves Issue #47. - - + Added a DisplayMath/InlineMath selector to Math inlines. - + Markdown parser yields DisplayMath for $$...$$. - + LaTeX parser yields DisplayMath when appropriate. Removed - mathBlock parsers, since the same effect is achieved by the math - inline parsers, now that they handle display math. - + Writers handle DisplayMath as appropriate for the format. - + Modified tests accordingly; added new tests for display math. - - * Use LaTeXMathML instead of ASCIIMathML. LaTeXMathML is closer - to LaTeX in its display of math, and supports many non-math LaTeX environments. - - + Changed -m option to use LaTeXMathML rather than ASCIIMathML. - + Modified HTML writer to print raw TeX when LaTeXMathML is - being used instead of suppressing it. - + Removed ASCIIMathML files from data/ and added LaTeXMathML. - + Replaced ASCIIMathML with LaTeXMathML in source files. - + Modified README and pandoc man page source. - + Added --latexmathml option (kept --asciimathml as a synonym - for backwards compatibility) - - * Markdown reader: Parse setext headers before atx headers. - Test case: - # hi - ==== - parsed by Markdown.pl as an H1 header with contents "# hi". - - * Markdown reader: Treat "mixed" lists the same way as Markdown.pl does. - The marker on the first list item determines the type of the whole - list. Thus, a list like - 1. one - - two - * three - gets parsed as a single ordered list. (Previous versions of pandoc - treated this as an ordered list with an unordered sublist.) - - * Markdown smart typography: - - + Em dashes no longer eat surrounding whitespace. Resolves Issue #69. - + Use nonbreaking spaces after known abbreviations in markdown parser. - Thus, for example, "Mr. Brown" comes out as "Mr.~Brown" in LaTeX, and does - not produce a sentence-separating space. Resolves Issue #75. - - * Markdown writer: Print unicode \160 literally, rather than as  . - - * Treat '\ ' in (extended) markdown as nonbreaking space. - Print nonbreaking space appropriately in each writer (e.g. ~ in LaTeX). - - * The '--sanitize-html' option now examines URIs in markdown links - and images, and in HTML href and src attributes. If the URI scheme - is not on a whitelist of safe schemes, it is rejected. The main point - is to prevent cross-site scripting attacks using 'javascript:' URIs. - See http://www.mail-archive.com/markdown-discuss@six.pairlist.net/msg01186.html - and http://ha.ckers.org/xss.html. Resolves Issue #62. - - * HTML writer: - - + Override Text.XHtml's stringToHtml function, - so that characters below 0xff are not converted to numerical entity - references. Also convert '\160' to " ". This should aid readability - and editability of the HTML source. It does presuppose that the HTML - will be served as UTF-8. - + In code blocks, change leading newlines to <br /> tags. - (Some browsers ignore them.) Resolves Issue #71. - See http://six.pairlist.net/pipermail/markdown-discuss/2008-May/001297.html - + Use style attributes rather than css classes for strikethrough - and ordered list styles. This works better when fragments, rather than - standalone documents, are generated. - - * HTML reader: Count anything that isn't a known block (HTML) tag as an - inline tag (rather than the other way around). Added "html", "head", and - "body" to list of block tags. Resolves Issue #66, allowing - <lj> to count as an inline tag. - - * RTF writer: Fixed bug. Extra spaces were being printed after emphasized, - boldface, and other inline elements. Resolves Issue #64. - - * LaTeX reader: improvements in raw LaTeX parsing. - - + "loose punctuation" (like {}) parsed as Space - + Para elements must contain more than Str "" and Space elements - + Added parser for "\ignore" command used in literate haskell. - + Reworked unknownCommand and rawLaTeXInline: when not in "parse raw" - mode, these parsers simply strip off the command part and allow - the arguments to be parsed normally. So, for example, - \blorg{\emph{hi}} will be parsed as Emph "hi" rather than - Str "{\\emph{hi}}". - + Parse lhs "code" environments as verbatim. - Refactored parsers for verbatim environments. - + Removed specialEnvironment parser. - + parse '{}', if present, after \textless, \textgreater, - \textbar, \textbackslash, \ldots. - + Parse unescaped special characters verbatim rather than - changing them to spaces. This way arguments of unknown - commands will appear in braces. - - * Parse raw ConTeXt environments as TeX in markdown reader. - Resolves Issue #73. - - * Moved BlockWrapper and wrappedBlocksToDoc from ConTeXt writer to Shared. - - * Made some structural changes to parsing of raw LaTeX environments. - Previously there was a special block parser for LaTeX environments. - It returned a Para element containing the raw TeX inline. This has - been removed, and the raw LaTeX environment parser is now used in the - rawLaTeXInline parser. The effect is exactly the same, except that we - can now handle consecutive LaTeX and ConTeXt environments not separated - by spaces. This new flexibility is required by the example in - Issue #73: - - \placeformula \startformula - L_{1} = L_{2} - \stopformula - - API change: The LaTeX reader now exports rawLaTeXEnvironment' (which - returns a string) rather than rawLaTeXEnvironment (which returns a block - element). This is more likely to be useful in other applications. - - * Use \textsubscr instead of \textsubscript for LaTeX subscript macro. - \textsubscript conflicts with a definition in the memoir class. - Resolves Issue #65. - - * Removed unneeded space after "\\item" in LaTeX and ConTeXt output. - - * Added amsmath package to default LaTeX header. Resolves Issue #48. - - * Added \setupitemize[autointro] to ConTeXt header, to prevent orphaned - list introduction lines. - - * Changed Float to Double in definition of Table element. - (Double is more efficient in GHC.) - - * Fixed bug in Markdown parser: regular $s triggering math mode. - For example: "shoes ($20) and socks ($5)." - The fix consists in two new restrictions: - - + the $ that ends a math span may not be directly followed by a digit. - + no blank lines may be included within a math span. - - Thanks to Joseph Reagle for noticing the bug. - - * Use Data.List's 'intercalate' instead of custom 'joinWithSep'. - Removed 'joinWithSep' from Text.Pandoc.Shared. - - * Updated README and man pages. Acknowledge contributors in README. - Added paragraph to README about producing S5 with separate CSS/javascript. - - * Updated INSTALL to reflect new build system (including configuration - options) and document new dependencies. Added note to INSTALL that - Cabal >= 1.2 is required for build. Resolves Issue #74. - - * Fixed some haddock documentation errors. - - * Small fix to markdown2pdf man page: only input needs to be piped through iconv. - -pandoc (0.46) unstable; urgency=low - - [ John MacFarlane ] - - * Made -H, -A, and -B options cumulative: if they are specified - multiple times, multiple files will be included. - - * Added optional HTML sanitization using a whitelist. - When this option is specified (--sanitize-html on the command line), - unsafe HTML tags will be replaced by HTML comments, and unsafe HTML - attributes will be removed. This option should be especially useful - for those who want to use pandoc libraries in web applications, where - users will provide the input. - - + Main.hs: Added --sanitize-html option. - - + Text.Pandoc.Shared: Added stateSanitizeHTML to ParserState. - - + Text.Pandoc.Readers.HTML: - - Added whitelists of sanitaryTags and sanitaryAttributes. - - Added parsers to check these lists (and state) to see if a given - tag or attribute should be counted unsafe. - - Modified anyHtmlTag and anyHtmlEndTag to replace unsafe tags - with comments. - - Modified htmlAttribute to remove unsafe attributes. - - Modified htmlScript and htmlStyle to remove these elements if - unsafe. - - + Modified README and man pages to document new option. - - * Improved handling of email addresses in markdown and reStructuredText. - Consolidated uri and email address parsers. (Resolves Issue #37.) - - + New emailAddress and uri parsers in Text.Pandoc.Shared. - - uri parser uses parseURI from Network.URI. - - emailAddress parser properly handles email addresses with periods - in them. - - + Removed uri and emailAddress parsers from Text.Pandoc.Readers.RST - and Text.Pandoc.Readers.Markdown. - - * Markdown reader: - - + Fixed emph parser so that "*hi **there***" is parsed as a Strong - nested in an Emph. (A '*' is only recognized as the end of the - emphasis if it's not the beginning of a strong emphasis.) - - + Moved blockQuote parser before list parsers for performance. - - + Modified 'source' parser to allow backslash-escapes in URLs. - So, for example, [my](/url\(1\)) yields a link to /url(1). - Resolves Issue #34. - - + Disallowed links within links. (Resolves Issue #35.) - - Replaced inlinesInBalanced with inlinesInBalancedBrackets, which - instead of hard-coding the inline parser takes an inline parser - as a parameter. - - Modified reference and inlineNote to use inlinesInBalancedBrackets. - - Removed unneeded inlineString function. - - Added inlineNonLink parser, which is now used in the definition of - reference. - - Added inlineParsers list and redefined inline and inlineNonLink parsers - in terms of it. - - Added failIfLink parser. - - + Better handling of parentheses in URLs and quotation marks in titles. - - 'source' parser first tries to parse URL with balanced parentheses; - if that doesn't work, it tries to parse everything beginning with - '(' and ending with ')'. - - source parser now uses an auxiliary function source'. - - linkTitle parser simplified and improved, under assumption that it - will be called in context of source'. - - + Make 'block' conditional on strictness state, instead of using - failIfStrict in block parsers. Use a different ordering of parsers - in strict mode (raw HTML block before paragraph) for performance. - In non-strict mode use rawHtmlBlocks instead of htmlBlock. - Simplified htmlBlock, since we know it's only called in strict - mode. - - + Improved handling of raw HTML. (Resolves Issue #36.) - - Tags that can be either block or inline (e.g. <ins>) should - be treated as block when appropriate and as inline when - appropriate. Thus, for example, - <ins>hi</ins> - should be treated as a paragraph with inline <ins> tags, while - <ins> - hi - </ins> - should be treated as a paragraph within <ins> tags. - - Moved htmlBlock after para in list of block parsers. This ensures - that tags that can be either block or inline get parsed as inline - when appropriate. - - Modified rawHtmlInline' so that block elements aren't treated as - inline. - - Modified para parser so that paragraphs containing only HTML tags and - blank space are not allowed. Treat these as raw HTML blocks instead. - - + Fixed bug wherein HTML preceding a code block could cause it to - be parsed as a paragraph. The problem is that the HTML parser - used to eat all blank space after an HTML block, including the - indentation of the code block. (Resolves Issue #39.) - - In Text.Pandoc.Readers.HTML, removed parsing of following space - from rawHtmlBlock. - - In Text.Pandoc.Readers.Markdown, modified rawHtmlBlocks so that - indentation is eaten *only* on the first line after the HTML - block. This means that in - <div> - foo - <div> - the foo won't be treated as a code block, but in - <div> - - foo - - </div> - it will. This seems the right approach for least surprise. - - * RST reader: - - + Fixed bug in parsing explicit links (resolves Issue #44). - The problem was that we were looking for inlines until a '<' character - signaled the start of the URL; so, if you hit a reference-style link, - it would keep looking til the end of the document. Fix: change - inline => (notFollowedBy (char '`') >> inline). Note that this won't - allow code inlines in links, but these aren't allowed in resT anyway. - - + Cleaned up parsing of reference names in key blocks and links. - Allow nonquoted reference links to contain isolated '.', '-', '_', so - so that strings like 'a_b_' count as links. - - + Removed unnecessary check for following link in str. - This is unnecessary now that link is above str in the definition of - 'inline'. - - * HTML reader: - - + Modified rawHtmlBlock so it parses </html> and </body> tags. - This allows these tags to be handled correctly in Markdown. - HTML reader now uses rawHtmlBlock', which excludes </html> and </body>, - since these are handled in parseHtml. (Resolves Issue #38.) - - + Fixed bug (emph parser was looking for `<IT>` tag, not `<I>`). - - + Don't interpret contents of style tags as markdown. - (Resolves Issue #40.) - - Added htmlStyle, analagous to htmlScript. - - Use htmlStyle in htmlBlockElement and rawHtmlInline. - - Moved "script" from the list of tags that can be either block or - inline to the list of block tags. - - + Modified rawHtmlBlock to use anyHtmlBlockTag instead of anyHtmlTag - and anyHtmlEndTag. This fixes a bug in markdown parsing, where - inline tags would be included in raw HTML blocks. - - + Modified anyHtmlBlockTag to test for (not inline) rather than - directly for block. This allows us to handle e.g. docbook in - the markdown reader. - - * LaTeX reader: Properly recognize --parse-raw in rawLaTeXInline. - Updated LaTeX reader test to use --parse-raw. - - * HTML writer: - - + Modified rules for automatic HTML header identifiers to - ensure that identifiers begin with an alphabetic character. - The new rules are described in README. (Resolves Issue #33.) - - + Changed handling of titles in HTML writer so you don't get - "titleprefix - " followed by nothing. - - * ConTeXt writer: Use wrappers around Doc elements to ensure proper - spacing. Each block element is wrapped with either Pad or Reg. - Pad'ed elements are guaranteed to have a blank line in between. - - * RST writer: - - + Refactored RST writer to use a record instead of a tuple for state, - and to include options in state so it doesn't need to be passed as - a parameter. - - + Use an interpreted text role to render math in restructuredText. - See http://www.american.edu/econ/itex2mml/mathhack.rst for the - strategy. - - [ Recai Oktaş ] - - * Debian packaging changes: - - + Remove the empty 'include' directory in -dev package, which lintian - complains about. - + Bump Standarts-Version to 3.7.3. - + Use new 'Homepage:' field to specify the upstream URL on suggestion of - lintian. - - -- Recai Oktaş <roktas@debian.org> Tue, 08 Jan 2008 05:13:31 +0200 - -pandoc (0.45) unstable; urgency=low - - [ John MacFarlane ] - - * Simplified parsing of reference keys and notes in markdown and RST - readers: The Reference data structure from Text.Pandoc.Shared is no - longer needed, since referenceKey and noteBlock parses return strings - (as many blank lines as were occupied by the key or note) and update - state themselves. getPosition and setPosition are now used to ensure - that error messages will give the correct line number. This yields - cleaner (and slightly faster) code, with more accurate parsing error - messages. - - * Added new Math inline element: - - + Markdown and LaTeX readers now convert TeX math into Math elements, - not TeX. - + This allows math to be treated differently from raw TeX in output. - TeX elements are no longer printed in output formats other than - Markdown, LaTeX, and ConTeXt. But Math elements are always printed. - - * New default handling of math in writers: - - + New module Text.Pandoc.Readers.TeXMath exports readTeXMath, which - parses raw TeX math and outputs a string of Pandoc inlines that - tries to render it as far as possible using unicode characters, - lapsing into literal TeX when needed. - + readTeXMath is now used for default HTML output in HTML, S5, RTF, - and Docbook, if no other method for displaying math in HTML is - specified. Enclosing $'s are no longer printed by default. - + By default, math is put inside `<span class="math">`. This way it can be - distinguished from the surrounding text, e.g. put in a different - font. - - * New --gladtex and --mimetex options for display of math in HTML: - - + If --gladtex is specified, math is output between `<eq>` tags, so - it can be processed by gladTeX. - + If --mimetex is specified, math is put in `<img>` tags with a link - to the mimetex CGI script (or any other script that takes TeX math - as input and outputs an image). The URL of the script may be - specified, but defaults to /cgi-bin/mimetex.cgi. - + HTMLMathMethod structure in WriterOptions keeps track of how to - display math in HTML output. - + Updated README with a description of the four options for displaying - math in HTML. - - * HTML reader: - - + Fixed bug: parser for minimized attributes should not swallow - trailing spaces. - + Simplified HTML attribute parsing. - + Changed parsing of code blocks in HTML reader: `<code>` tag is no - longer needed. `<pre>` suffices. All HTML tags in the code block - (e.g. for syntax highlighting) are skipped, because they are not - portable to other output formats. A `<code>...</code>` block not - surrounded by `<pre>` now counts as inline HTML, not a code block. - + Remove just one leading and one trailing newline from contents of - `<pre>...</pre>` in codeBlock parser. - - * Markdown reader: - - + Removed support for box-style block quotes. - + Require space before title in links and references. - This fixes a bug in parsing URLs like http://silly/url(withparen). - + Improved and simplified setextHeader parser. - + Fixed logic in smart quote parsing, adding some needed 'try' - statements. - + Fixed smart quote parsing so that unicode characters 8216 and 8217 - are recognized as single quotes, and 8220 and 8221 as double quotes. - - * RST reader: - - + Fixed bug in parsing of code blocks. Previously a full tab indent - was required, but RST allows code to be indented any amount. - Resolves Issue #27. - + Allow field lists to be indented. - + Parse the contents of field lists instead of treating as a raw string. - + Represent field lists as definition lists instead of blockquotes. - + Fixed bug in which metadata would be overridden if the document - contained multiple field lists. - + Parse fields associated with '.. image::' blocks, and use 'alt' - field, if given, for image alt and title attributes. - - * LaTeX reader: - - + Modified specialChar so that '"' characters are parsed. - + Fixed a bug in parsing of \[ \] math blocks (thanks to Mark Kalderon). - - * HTML writer: - - + Changes in handling of math (see above). - + Don't produce HTML for table of contents if there are - no headers. (This would be an empty list, which is invalid XHTML.) - - * Markdown writer: - - + Don't print title attribute if title is empty. (This differs from - the behavior of Markdown.pl, and agrees with PHP Markdown. But John - Gruber has indicated that he prefers this behavior.) Adjusted test - suite accordingly. - + Fixed incorrect line wrapping in paragraphs including hard line - breaks. Resolves Issue #25. - + Fixed bug in markdown writer: If an ordered list item began with - a marker greater than 3 characters in width, and the item took more - than one line, it would appear on the line after the list marker, - e.g.: - - (12) - My list item. - Multiline. - - Now it works as follows: - - (12) My list item. - Multiline. - - * RST writer - - + Fixed bug in RST writer's handling of ordered lists. Previously, - list items with multiple lines would not always line up with - single-line list items. Now, list items are nested the length of - the list marker + 1. This looks better and ensures that list items - all line up. (Note that list markers are padded to the length of - the longest list marker in the series.) - + Use 3-space indent for unordered lists. - + If label for a link reference contains a colon, surround it by ` - signs so it won't be interpreted as the end of the link label. - - * LaTeX writer: - - + Cleaner output for footnotes. Footnotes now always begin on a new - line, and the final } is on a line by itself only when it needs to - be (i.e. only when the note ends with a Verbatim environment). - + Added writer options to state, so state doesn't need to be passed as - a parameter. - + Text wrapping now provided, using wrapTeXIfNeeded. - - * ConTeXt writer: many improvements for more idiomatic ConTeXt output - (thanks to Idris Samawi Hamid for suggestions). - - + PrettyPrint module now used for output. - + Writer options are now in state, so they don't have to be passed as - a parameter. - + Text wrapping now provided, using wrapTeXIfNeeded. - + Better treatment of footnotes: footnotes are always on lines by - themselves, and the final } is on a line by itself only when - it needs to be (after \stoptyping). - + Use \subject, \subsubject, ... or \section, \subsection, ... for headings, - depending on whether --number-sections option is selected. - + Extra blank line inserted after \stopitemize - + Use new, "official" definition of blockquote environment. Also, use - blank line after \startblockquote to balance blank line at the end. - + Both itemized and enumerated lists are now generated using - \start-stopitemize, with appropriate options. Removed definitions - of ltxenum and ltxitem, which are no longer needed. Provided - defaults for itemized lists in the preamble. State keeps track of - ordered list level, so that when default numbering is specified, - the appropriate scheme can be used. - + Changed \useurl to \useURL. - + Changed link color from red to blue. - + Use \subsubsubsubsection etc., since these are supported - (up to at least sub x 5). - - * Text.Pandoc.Shared: - - + Save and restore position in parseFromString, so that accurate - error messages can be given. - + Improved efficiency of romanNumeral parser. - + Added wrappedTeX and wrapTeXIfNeeded functions. These ensure - that footnotes occur on lines by themselves (to make them - easier to see and move) and do not screw up line wrapping. - - * Text.Pandoc.UTF8: modified fromUTF8 to strip out the BOM - if present. Windows Notepad and other applications insert a - BOM at the beginning of a UTF8 file. - - * Main.hs (tabFilter): Treat '\r' at end of line as newline (in - addition to "\r\n" and '\n'). - - * Added a writer option for wrapped text and a command-line option - '--no-wrap', which disables text wrapping and minimizes whitespace - in HTML. (Resolves Issue #26.) - - + Added support for '--no-wrap' to Main.hs. - + Added wrapIfNeeded function to Text.Pandoc.Shared. - + Use wrapIfNeeded instead of wrapped in the RST, Man, Docbook, and - Markdown writers. - + Added render and renderFragment helpers to HTML writer. - - * Modified html2markdown to run tidy only if the HTML cannot be - parsed. Previously html2markdown piped all input through tidy - before passing it to pandoc. This caused problems on certain pages - (e.g. http://daringfireball.com/markdown) which have well-formed - XHTML that causes tidy to choke. The solution is to pipe through - tidy only if pandoc cannot parse the input by itself. This means - that a temp file is now always used, even when input comes from a - local file or standard input. - - * Removed 'version' constant from Main.hs; added 'pandocVersion' to - Text.Pandoc library. - - * pandoc.cabal: - - + Modified to work with GHC 6.8 and Cabal configurations. (For GHC - 6.8, pretty and containers must be added to Build-Depends, and it - is desirable to use the -O2 compiler option.) Cabal configurations - allows one to select options depending on the compiler version. - For GHC 6.6, the splitBase option can be disabled. - + pandoc.cabal.ghc66 is provided for users with older versions of - Cabal, which do not support configurations. - + Use Ghc-Prof-Options to ensure that '-auto-all' is used when - '--enable-(executable|library)-profiling' is specified. Updated - PROFILING instructions accordingly. - - * Makefile: - - + Makefile now checks GHC version. If GHC is 6.6, pandoc.cabal.ghc66 - is copied to pandoc.cabal, and the old pandoc.cabal is copied - to pandoc.cabal.orig. Otherwise, pandoc.cabal is copied to - pandoc.cabal.orig but otherwise unmodified. This way, the Makefile - will work properly with either GHC 6.6 or 6.8. - + Changed BUILDCONF to point to dist/setup-config, not .setup-config. - This is where current versions of Cabal put it. - + Added $(BUILDCMD) target, so setup doesn't get compiled every time. - + Removed dependency of templates on ./templates, which is circular - now that templates is a subdirectory of the top-level. - - * MacPorts Portfile: - - + Modified to install the pandoc library in addition to programs. - + Installation must be done manually rather than using Makefile's - install-all. - + Note that the library must be registered in the activate phase, - after the library files have been copied out of the destroot. - Cabal generates a 'register.sh' script that will do this. - - * debian/control: Added libghc6-network-dev, libghc6-xhtml-dev, and - libghc6-mtl-dev as dependencies for libghc6-pandoc-dev. - Closes: #445235 - - * debian/rules: Converted to UTF-8. - - * Changed pandoc home page to http://johnmacfarlane.net/pandoc/. - - * Updated ASCIIMathML.js to latest version. - - * Directory structure: - - + Moved everything from src into the top-level directory. - + Changed references to source directory in Makefile and - pandoc.cabal.*. - + Moved ASCIIMathML.js, headers, and ui into templates directory. - + Modified fillTemplates.pl to reflect new paths. - - [ Recai Oktaş ] - - * Makefile: Fixed the issue of having two copies of the library - documentation under some usage scenarios. - - * Replaced 'ghc' with '$(GHC)' in Makefile, and made GHC - and GHC_PKG configurable through the environment, to support - unusual ghc installations. For example: - GHC=/opt/ghc/bin/ghc GHC_PKG=/opt/ghc/bin/ghc-pkg make - - -- Recai Oktaş <roktas@debian.org> Sun, 07 Oct 2007 20:51:43 +0300 - -pandoc (0.44) unstable; urgency=low - - [ John MacFarlane ] - - * Fixed bug in HTML writer: when --toc was used, anchors were put around - headers, which is invalid XHTML (block content within inline element). - Now the anchors are put inside the header tags. Resolves Issue #23. - - * Added xmlns attribute to html element in html writer tests. - This attribute is added by more recent versions of the - xhtml library (>= 3000), and is required for valid XHTML. - - [ Recai Oktaş ] - - * On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build - command instead of 'runhaskell', which, on some platforms (such as s390, - alpha, m68k), throws the following error: - - runhaskell Setup.hs configure --prefix=/usr - ghc-6.6.1: not built for interactive use - - This causes a serious FTBFS bug. Closes: #440668. - - -- Recai Oktaş <roktas@debian.org> Mon, 03 Sep 2007 18:24:02 +0300 - -pandoc (0.43) unstable; urgency=low - - [ John MacFarlane ] - - * The focus of this release is performance. The markdown parser - is about five times faster than in 0.42, based on benchmarks - with the TextMate manual. - - * Main.hs: Replaced CRFilter and tabFilter with single function - tabFilter, which operates on the whole string rather than breaking - it into lines, and handles dos-style line-endings as well as tabs. - - * Added separate LaTeX reader and native reader tests; removed - round-trip tests. - - * Text.Pandoc.Shared: - - + Removed tabsToSpaces and tabsInLine (they were used only in Main.hs.) - + General code cleanup (to elimante warnings when compiling with -Wall.) - + Added 'wrapped' function, which helps wrap text into paragraphs, - using the prettyprinting library. - + Rewrote charsInBalanced and charsInBalanced'. - - Documented restriction: open and close must be distinct characters. - - Rearranged options for greater efficiency. - - Bug fix: Changed inner call to charsInBalanced inside - charsInBalanced' to charsInBalanced'. - + anyLine now requires that the line end with a newline (not eof). - This is a harmless assumption, since we always add newlines to the - end of a block before parsing with anyLine, and it yields a 10% speed - boost. - + Removed unnecessary 'try' in anyLine. - + Removed unneeded 'try' from romanNumeral parser. - + Use notFollowedBy instead of notFollowedBy' in charsInBalanced. - + Removed unneeded 'try' in parseFromString. - + Removed unneeded 'try' from stringAnyCase. (Now it behaves - like 'string'.) - + Changed definition of 'enclosed' in Text.Pandoc.Shared so that - 'try' is not automatically applied to the 'end' parser. Added - 'try' in calls to 'enclosed' where needed. Slight speed increase. - - * Writers: - - + Replaced individual wrapping routines in RST, Man, and Markdown - writers with 'wrapped' from Text.Pandoc.Shared. - + Rewrote LaTeX writer to use the prettyprinting library, - so we get word wrapping, etc. - + Modified latex writer tests for new latex writer using prettyprinter. - + Fixed bug in LaTeX writer: autolinks would not cause - '\usepackage{url}' to be put in the document header. Also, changes - to state in enumerated list items would be overwritten. - + In Markdown writer, escape paragraphs that begin with ordered list - markers, so they don't get interpreted as ordered lists. - - * Text.Pandoc.Reades.LaTeX: - - + Fixed bug in LaTeX reader, which wrongly assumed that the roman - numeral after "enum" in "setcounter" would consist entirely of - "i"s. 'enumiv' is legitimate. - + LaTeX command and environment names can't contain numbers. - + Rearranged order of parsers in inline for slight speed improvement. - + Added '`' to special characters and 'unescapedChar'. - - * Text.Pandoc.Readers.RST: - - + Removed unneeded try's in RST reader; also minor code cleanup. - + Removed tabchar. - + Rearranged parsers in inline (doubled speed). - - * Text.Pandoc.Readers.Markdown: - - + Skip notes parsing if running in strict mode. (This yields a nice - speed improvement in strict mode.) - + Simplify autolink parsing code, using Network.URI to test for - URIs. Added dependency on network library to debian/control and - pandoc.cabal. - + More perspicuous definition of nonindentSpaces. - + Removed unneeded 'try' in 'rawLine'. - + Combined linebreak and whitespace into a new whitespace parser, to - avoid unnecessary reparsing of space characters. - + Removed unnecessary 'try' in 'codeBlock', 'ellipses', 'noteMarker', - 'multilineRow', 'dashedLine', 'rawHtmlBlocks'. - + Use lookAhead in parsers for setext headers and definition lists - to see if the next line begins appropriately; if not, don't waste - any more time parsing. - + Don't require blank lines after code block. (It's sufficient to - end code block with a nonindented line.) - + Changed definition of 'emph': italics with '_' must not - be followed by an alphanumeric character. This is to help - prevent interpretation of e.g. `[LC_TYPE]: my_type` as - `[LC<em>TYPE]:my</em>type`. - + Improved Markdown.pl-compatibility in referenceLink: the two parts - of a reference-style link may be separated by one space, but not - more... [a] [link], [not] [a link]. - + Fixed markdown inline code parsing so it better accords with - Markdown.pl: the marker for the end of the code section is a clump - of the same number of `'s with which the section began, followed - by a non-` character. So, for example, - ` h ``` i ` -> `<code>h ``` i</code>`. - + Split 'title' into 'linkTitle' and 'referenceTitle', since the - rules are slightly different. - + Rewrote 'para' for greater efficiency. - + Rewrote link parsers for greater efficiency. - + Removed redundant 'referenceLink' in definition of inline (it's - already in 'link'). - + Refactored escapeChar so it doesn't need 'try'. - + Refactored hrule for performance in Markdown reader. - + More intelligent rearranging of 'inline' so that most frequently - used parsers are tried first. - + Removed tabchar parser, as whitespace handles tabs anyway. - - * Text.Pandoc.CharacterReferences: - - + Refactored. - + Removed unnecessary 'try's for a speed improvement. - + Removed unnecessary '&' and ';' from the entity table. - - * Build process: - - + Makefile: Get VERSION from cabal file, not Main.hs. - + Modified MacPorts Portfile: - - Depend on haddock - - Build and install libraries and library documentation in - addition to pandoc executable - - Added template item for md5 sum in Portfile.in. - - Incorporated changes from MacPorts repository (r28278). - + FreeBSD port: Don't try to generate distinfo in Makefile. - It can be made using 'make makesum' in FreeBSD. - + Make both freebsd and macports targets depend on tarball. - - * Website and documentation: - - + Updated INSTALL instructions. - + Added pandocwiki demo to website. - + Removed local references to Portfile, since pandoc is now in the - MacPorts repository. - - -- Recai Oktaş <roktas@debian.org> Sun, 02 Sep 2007 15:50:11 +0300 - -pandoc (0.42) unstable; urgency=low - - [ John MacFarlane ] - - * Main.hs: Use utf8 conversion on the extra files loaded with - the -H, -C, -B, and -A options. This fixes problems with unicode - characters in these files. - - * Exposed Text.Pandoc.ASCIIMathML, since it is imported in - Text.Pandoc.Readers.HTML and without it we get a linking error when - using the library. - - * Markdown reader: - - + Added new rule for enhanced markdown ordered lists: if the list - marker is a capital letter followed by a period (including a - single-letter capital roman numeral), then it must be followed by - at least two spaces. The point of this is to avoid accidentally - treating people's initials as list markers: a paragraph might begin, - "B. Russell was an English philosopher," and this shouldn't be - treated as a list. Documented change in README. - + Blocks that start with "p. " and a digit are no longer treated - as ordered lists (it's a page number). - + Added a needed 'try' to listItem. - + Removed check for a following setext header in endline. - A full test is too inefficient (doubles benchmark time), and the - substitute we had before is not 100% accurate. - + Don't use Code elements for autolinks if --strict specified. - - * LaTeX writer: When a footnote ends with a Verbatim environment, the - close } of the footnote cannot occur on the same line or an error occurs. - Fixed this by adding a newline before the closing } of every footnote. - - * HTML writer: - + Removed incorrect "{}" around style information in HTML tables. - Column widths now work properly in HTML. - + If --strict option is specified (and --toc is not), don't include - identifiers in headers, for better Markdown compatibility. - - * Build process: - - + Separated $(web_dest) and website targets. - + In website, index.txt is now constructed from template index.txt.in. - + Added freebsd target to Markefile. This creates the freebsd Makefile - from Makefile.in, and creates distinfo. Removed Makefile and distinfo - from the repository. - + Added macport target to Makefile. Portfile is built from template - Portfile.in. - + Removed OSX package targets. (Too many difficulties involving - dependencies on dynamic libraries.) - + More complete INSTALL instructions for all architectures. - - * Website: - + Added a programming demo, pandocwiki. - - [ Recai Oktaş ] - - * Do not forget to close pandoc's ITP. Closes: #391666 - - -- Recai Oktaş <roktas@debian.org> Sun, 26 Aug 2007 22:51:32 +0300 - -pandoc (0.41) unstable; urgency=low - - [ John MacFarlane ] - - * Fixed bugs in HTML reader: - + Skip material at end *only if* `</html>` is present (previously, - only part of the document would be parsed if an error was - found; now a proper error message is given). - + Added new constant eitherBlockOrInline with elements that may - count either as block-level or as inline. Modified isInline and - isBlock to take this into account. - + Modified rawHtmlBlock to accept any tag (even an inline tag): - this is innocuous, because rawHtmlBlock is tried only if a regular - inline element can't be parsed. - + Added a necessary 'try' in definition of 'para'. - - * Fixed bug in markdown ordered list parsing. The problem was that - anyOrderedListStart did not check for a space following the - ordered list marker. So in 'A.B. 2007' the parser would be - expecting a list item, but would not find one, causing an error. - Fixed a similar bug in the RST reader. Resolves Issue #22. - - * Refactored RST and Markdown readers using parseFromString. - - * LaTeX reader will now skip anything after \end{document}. - - * Fixed blockquote output in markdown writer: previously, block - quotes in indented contexts would be indented only in the first - line. - - * Added note to INSTALL about variations in versions of the xhtml - library that can lead to failed tests (thanks to Leif LeBaron). - - -- Recai Oktaş <roktas@debian.org> Sun, 19 Aug 2007 23:26:07 +0300 - -pandoc (0.4) unstable; urgency=low - - [ John MacFarlane ] - - * Added two new output formats: groff man pages and ConTeXt. By - default, output files with extensions ".ctx" and ".context" are - assumed to be ConTeXt, and output files with single-digit extensions - are assumed to be man pages. - - * Enhanced ordered lists (documented in README, under Lists): - + The OrderedList block element now stores information about - list number style, list number delimiter, and starting number. - + The readers parse this information when possible. - + The writers use this information to style ordered lists. - + The enhancement can be disabled using the --strict option. - - * Added support for tables (with a new Table block element). Two kinds - of tables are supported: a simple table with one-line rows, and a - more complex variety with multiline rows. All output formats are - supported, but only markdown tables are parsed at the moment. The - syntax is documented in README. - - * Added support for definition lists (with a new DefinitionList block - element). All output and input formats are supported. The syntax is - documented in README. - - * Added support for superscripts and subscripts (with new Superscript - and Subscript inline elements). All input and output - formats. The syntax is documented in README. - - * Added support for strikeout (with a new Strikeout inline element). - All input and output formats are supported. Thanks to Bradley Kuhn, - who contributed a patch. The syntax is documented in README. Resolves - Issue #18. - - * Added a --toc|--table-of-contents option. This causes an automatically - generated table of contents (or an instruction that creates one) to - be inserted at the beginning of the document. Not supported in S5, - DocBook, or man page writers. - - * Modified the -m|--asciimathml option: - - + If an optional URL argument is provided, a link is inserted - instead of the contents of the ASCIIMathML.js script. - + Nothing is inserted unless the document actually contains - LaTeX math. - - * Removed Blank block element as unnecessary. - - * Removed Key and Note blocks from the Pandoc data structure. All - links are now stored as explicit links, and note contents are - stored with the (inline) notes. - - + All link Targets are now explicit (URL, title) pairs; there - is no longer a 'Ref' target. - + Markdown and RST parsers now need to extract data from key and - note blocks and insert them into the relevant inline elements. - Other parsers have been simplified, since there is no longer any need - to construct separate key and note blocks. - + Markdown, RST, and HTML writers need to construct lists of - notes; Markdown and RST writers need to construct lists of link - references (when the --reference-links option is specified); and - the RST writer needs to construct a list of image substitution - references. All writers have been rewritten to use the State monad - when state is required. - + Several functions (generateReference, keyTable, - replaceReferenceLinks, replaceRefLinksBlockList, and some auxiliaries - used by them) have been removed from Text.Pandoc.Shared, since - they are no longer needed. New functions and data structures - (Reference, isNoteBlock, isKeyBlock, isLineClump) have been - added. The functions inTags, selfClosingTag, inTagsSimple, and - inTagsIndented have been moved to the DocBook writer, since that - is now the only module that uses them. NoteTable is now exported - in Text.Pandoc.Shared. - + Added stateKeys and stateNotes to ParserState; removed stateKeyBlocks, - stateKeysUsed, stateNoteBlocks, stateNoteIdentifiers, stateInlineLinks. - + Added writerNotes and writerReferenceLinks to WriterOptions. - - * Added Text.Pandoc module that exports basic readers, writers, - definitions, and utility functions. This should export everything - needed for most uses of Pandoc libraries. The haddock documentation - includes a short example program. - - * Text.Pandoc.ASCIIMathML is no longer an exported module. - - * Added Text.Pandoc.Blocks module to help in printing markdown - and RST tables. This module provides functions for working with - fixed-width blocks of text--e.g., placing them side by side, as - in a table row. - - * Refactored to avoid reliance on Haskell's Text.Regex library, which - (a) is slow, and (b) does not properly handle unicode. This fixed - some strange bugs, e.g. in parsing S-cedilla, and improved performance. - - + Replaced 'gsub' with a general list function 'substitute' - that does not rely on Text.Regex. - + Rewrote extractTagType in HTML reader so that it doesn't use - regexs. - + In Markdown reader, replaced email regex test with a custom email - autolink parser (autoLinkEmail). Also replaced selfClosingTag regex - with a custom function isSelfClosingTag. - + Modified Docbook writer so that it doesn't rely on Text.Regex for - detecting 'mailto' links. - + Removed escapePreservingRegex and reamped entity-handling - functions in Text.Pandoc.Shared and Text.Pandoc.CharacterReferences to - avoid reliance on Text.Regex (see below on character reference - handling changes). - - * Renamed Text.Pandoc.Entities as Text.Pandoc.CharacterReferences. - - * Changed handling of XML entities. Entities are now parsed (and unicode - characters returned) in the Markdown and HTML readers, rather than being - handled in the writers. In HTML and Docbook writers, UTF-8 is now used - instead of entities for characters above 128. This makes the HTML and - DocBook output much more readable and more easily editable. - - + Removed sgmlHexEntity, sgmlDecimalEntity, sgmlNamedEntity, and - sgmlCharacterEntity regexes from Text.Pandoc.Shared. - + Renamed escapeSGMLChar to escapeCharForXML. Added escapeStringForXML. - Moved both functions to Text.Pandoc.Writers.Docbook. - + Added characterReference parser to Text.Pandoc.CharacterReferences. - This parses a string and return a unicode character. - + Rewrote decodeCharacterReferences to use the new parser instead of - Text.Regex. - + Added new charRef parser for Markdown and HTML, which replaces the - old 'entity' parser. Added '&' as a special character in Markdown reader. - + Modified HTML and Markdown readers to call decodeEntities on all raw - strings (e.g. authors, dates, link titles), to ensure that no - unprocessed entities are included in the native representation of - the document. (In the HTML reader, most of this work is done by a - change in extractAttributeName.) - + In XML and Markdown output, escape unicode nonbreaking space as ' ', - since a unicode non-breaking space is impossible to distinguish visually - from a regular space. (Resolves Issue #3.) - + Removed encodeEntitiesNumerical. - + Use Data.Map for entityTable and (new) reverseEntityTable, for a - slight performance boost over the old association list. - + Removed unneeded decodeEntities from 'str' parser in HTML and - Markdown readers. - - * Text.Pandoc.UTF8: Renamed encodeUTF8 to toUTF8, decodeUTF8 to - fromUTF8, for clarity. - - * Replaced old haskell98 module names replaced by hierarchical module - names, e.g. List by Data.List. Removed haskell98 from dependencies - in pandoc.cabal, and added mtl (needed for state monad). Substituted - xhtml for html. - - * Refactored and cleaned up character escaping in writers, using - backslashEscapes and escapeStringUsing functions. - - * Instead of adding "\n\n" to the end of an input string in Main.hs, - this is now done in the readers. This makes the libraries behave - the way you'd expect from the pandoc program. Resolves Issue #10. - - * URLs and email addresses in autolinks are now typeset as Code. - - * In Main.hs, changed putStr to putStrLn -- mainly because MacOS X - doesn't display the whole output unless there's a line ending. - - * Major code cleanup in all modules, for greater consistency, concision, - and readability. - - * HTML reader: - - + Fixed several bugs (extractTagType, attribute parsing). - + Remove Null blocks in lists of blocks when possible. - + Allow HTML comments as raw HTML inline. - - * Markdown reader: - - + Ordered list items may no longer begin with uppercase letters, or - letters greater than 'n'. (This prevents first initials and page - reference, e.g. 'p. 400', from being parsed as beginning lists.) - Also, numbers beginning list items may no longer end with ')', - which is now allowed only after letters. Note: These changes - may cause documents to be parsed differently. Users should take - care in upgrading. - + Changed autoLink parsing to conform better to Markdown.pl's - behavior. `<google.com>` is not treated as a link, but - `<http://google.com>`, `<ftp://google.com>`, and - `<mailto:google@google.com>` are. - + Cleaned up handling of embedded quotes in link titles. Now these are - stored as a '"' character, not as '"'. - + Use lookAhead parser for the 'first pass' (looking for reference keys), - instead of parsing normally, then using setInput to reset input. This - yields a slight performance boost. - + Fixed several bugs in smart quote recognition. - + Fixed bug in indentSpaces (which didn't properly handle - cases with mixed spaces and tabs). - + Consolidated 'text', 'special', and 'inline' into 'inline'. - + Fixed bug which allowed URL and title to be separated by multiple blank - lines in links and reference keys. They can be on separate lines but - can't have blank lines between them. - + Correctly handle bracketed text inside inline footnotes and links,using - new function inlinesInBalanced. Resolves Issue #14. - + Fixed bug in footnotes: links in footnotes were not being - processed. Solution: three-stage parse. First, get all the - reference keys and add information to state. Next, get all the - notes and add information to state. (Reference keys may be needed - at this stage.) Finally, parse everything else. - + Replaced named constants like 'emphStart' with literals. - + Removed an extra occurance of escapedChar in definition of inline. - - * RST reader: - - + Allow the URI in a RST hyperlink target to start on the line - after the reference key. - + Added 'try' in front of 'string', where needed, or used a different - parser. This fixes a bug where ````` would not be correctly parsed as - a verbatim `. - + Fixed slow performance in parsing inline literals in RST reader. The - problem was that ``#`` was seen by 'inline' as a potential link or image. - Fix: inserted 'notFollowedBy (char '`')' in link parsers. - Resolves Issue #8. - + Use lookAhead instead of getInput/setInput in RST reader. Removed - unneeded getState call, since lookAhead automatically saves and - restores the parser state. - + Allow hyperlink target URIs to be split over multiple lines, and - to start on the line after the reference. Resolves Issue #7. - + Fixed handling of autolinks. - - * LaTeX reader: - - + Replaced 'choice [(try (string ...), ...]' idiom with 'oneOfStrings', - for clarity. - + Added clauses for tilde and caret. Tilde is \ensuremath{\sim}, and - caret is \^{}, not \^ as before. - + Added parsing for \url. - + Parse \texttt{} as code, provided there's nothing fancy inside. - - * HTML writer: - - + Modified HTML writer to use the Text.XHtml library. This results - in cleaner, faster code, and it makes it easier to use Pandoc in - other projects, like wikis, which use Text.XHtml. Two functions are - now provided, writeHtml and writeHtmlString: the former outputs an - Html structure, the latter a rendered string. The S5 writer is also - changed, in parallel ways (writeS5, writeS5String). - + The Html header is now written programmatically, so it has been - removed from the 'headers' directory. The S5 header is still - needed, but the doctype and some of the meta declarations have - been removed, since they are written programatically. This change - introduces a new dependency on the xhtml package. - + Fixed two bugs in email obfuscation involving improper escaping - of '&' in the `<noscript>` section and in `--strict` mode. Resolves - Issue #9. - + Fixed another bug in email obfuscation: If the text to be obfuscated - contains an entity, this needs to be decoded before obfuscation. - Thanks to thsutton for the patch. Resolves Issue #15. - + Changed the way the backlink is displayed in HTML footnotes. - Instead of appearing on a line by itself, it now generally - appears on the last line of the note. (Exception: when the - note does not end with a Plain or Para block.) This saves space - and looks better. - + Added automatic unique identifiers to headers: - - The identifier is derived from the header via a scheme - documented in README. - - WriterState now includes a list of header identifiers and a table - of contents in addition to notes. - - The function uniqueIdentifiers creates a list of unique identifiers - from a list of inline lists (e.g. headers). - - This list is part of WriterState and gets consumed by blockToHtml - each time a header is encountered. - + Include CSS for .strikethrough class in header only if strikethrough - text appears in the document. - + If the 'strict' option is specified, elements that do not appear in - standard markdown (like definition lists) are passed through as - raw HTML. - + Simplified treatment of autolinks, using pattern matching instead of - conditionals. - - * Markdown writer: - - + Links in markdown output are now printed as inline links by default, - rather than reference links. A --reference-links option has been added - that forces links to be printed as reference links. Resolves Issue #4. - + Use autolinks when possible. Instead of `[site.com](site.com)`, - use `<site.com>`. - - * LaTeX writer: - - + Rewrote to use the State monad. The preamble now includes only those - packages that are actually required, given the document's content. - Thus, for example, if strikeout is not used, ulem is not required. - Modified LaTeXHeader accordingly. - + Modified LaTeX writer to insert '\,' between consecutive quotes. - + Removed unused function tableRowColumnWidths. - + Simplified code for escaping special characters. - + Leave extra blank line after \maketitle. - + Include empty '\author{}' when no author specified to avoid LaTeX - errors. - + Include fancyvrb code in header only if needed -- that is, only - if there is actually code in a footnote. - + Use \url{} for autolinks. - + Include [mathletters] option in ucs package, so that basic unicode - Greek letters will work correctly. - - * RST writer: Force blank line before lists, so that sublists will - be handled correctly. - - * Docbook writer: Fixed a bug: email links with text, like - [foo](me@bar.baz), were being incorrectly treated as autolinks. - - * Removed Text.ParserCombinators.Pandoc and moved all its functions to - Text.Pandoc.Shared. - - * Text.Pandoc.Shared: - - + Added defaultWriterOptions. - + Added writerTableOfContents to WriterOptions. - + Added writerIgnoreNotes option to WriterOptions. This is needed - for processing header blocks for a table of contents, since notes on - headers should not appear in the TOC. - + Added prettyprinting for native Table format. - + Removed some unneeded imports. - + Moved escape and nullBlock parsers from - Text.ParserCombinators.Pandoc, since the latter is for - general-purpose parsers that don't depend on Text.Pandoc.Definition. - + Moved isHeaderBlock from Text.Pandoc.Writers.HTML. - + Moved Element, headerAtLeast, and hierarchicalize from Docbook - writer, because HTML writer now uses these in constructing a table - of contents. - + Added clauses for new inline elements (Strikeout, Superscript, - Subscript) to refsMatch. - + Removed backslashEscape; added new functions escapeStringUsing and - backslashEscapes. - + Moved failIfStrict from markdown reader, since it is now used also - by the HTML reader. - + Added a 'try' to the definition of indentSpaces. - + In definition of 'reference', added check to make sure it's not a note - reference. - + Added functions: camelCaseToHyphenated, toRomanNumeral, - anyOrderedListMarker, orderedListmarker, orderedListMarkers, - charsInBalanced', withHorizDisplacement, romanNumeral - + Fixed a bug in the anyLine parser. Previously it would parse an empty - string "", but it should fail on an empty string, or we get an error - when it is used inside "many" combinators. - + Removed followedBy' parser, replacing it with the lookAhead parser from - Parsec. - + Added some needed 'try's before multicharacter parsers, especially in - 'option' contexts. - + Removed the 'try' from the 'end' parser in 'enclosed', so that - 'enclosed' behaves like 'option', 'manyTill', etc. - + Added lineClump parser, which parses a raw line block up to and - including any following blank lines. - + Renamed parseFromStr to parseFromString. - + Added a 'try' to the 'end' parser in 'enclosed'. This makes errors in - the use of 'enclosed' less likely. Removed some now-unnecessary 'try's - in calling code. - + Removed unneeded 'try' in blanklines. - + Removed endsWith function and rewrote calling functions to use - isSuffixOf instead. - + Added >>~ combinator. - + Fixed bug in normalizeSpaces: Space:Str "":Space should compress to - Space. - - * Refactored runtests.pl; added separate tests for tables. - - * Shell scripts: - - + Added -asxhtml flag to tidy in html2markdown. This will - perhaps help the parser, which expects closing tags. - + Modified markdown2pdf to run pdflatex a second time if --toc or - --table-of-contents was specified; otherwise the table of - contents won't appear. - + Modified markdown2pdf to print a helpful message if the 'ulem' - LaTeX package is required and not found. - - * Changes to build process: - - + Dropped support for compilation with GHC 6.4. GHC 6.6 or higher - is now required. - + Removed cabalize and Pandoc.cabal.in. The repository now contains - pandoc.cabal itself. - + Pandoc.cabal has been changed to pandoc.cabal, because HackageDB - likes the cabal file to have the same name as the tarball. - + Expanded and revised the package description in pandoc.cabal. - Revised the package synopsis. - + The tarball built by 'make tarball' now contains files built from - templates (including man pages and shell scripts), so pandoc can - be built directly using Cabal tools, without preprocessing. - + Executable binaries are now stripped before installing. - + Man pages are now generated from markdown sources, using pandoc's - man page writer. - + Use HTML version of README (instead of RTF) in Mac OS X installer. - + Instead of testing for the existence of a pandoc symlink in build-exec, - use ln -f. - - * Documentation: - - + Updated README and man pages with information on new features. - + Updated INSTALL instructions with some useful clarifications and - links. - + Updated web content. - - * Added FreeBSD port. - - [ Recai Oktaş ] - - * debian/control: - - + Changed pandoc's Build-Depends to include libghc6-mtl-dev and - libghc6-xhtml-dev. Removed libghc6-html-dev. - + Suggest texlive-latex-recommended | tetex-extra instead of - tetex-bin. This brings in fancyvrb and unicode support. - - -- Recai Oktaş <roktas@debian.org> Tue, 16 Jan 2007 00:37:21 +0200 - -pandoc (0.3) unstable; urgency=low - - [ John MacFarlane ] - - * Changes in pandoc options: - - + Allow options to follow or precede arguments. - + Changed '--smartypants' to '--smart' and adjusted symbols accordingly. - + Added '--strict' option. - + Added '-o/--output' option. - + Added '--dump-args' and '--ignore-args' options (for use in wrappers). - + Modified '-v' and '-h' output to go to STDERR, not STDOUT, and return - error conditions. This is helpful for writing wrappers. - + Added copyright message to '-v' output, modeled after FSF messages. - + Reformatted usage message so that it doesn't wrap illegibly. - + Removed extra blanks after '-h' and '-D' output. - - * Added docbook writer. - - * Added implicit setting of default input and output format based - on input and output filename extensions. These defaults are - overridden if explicit input and output formats are specified using - '-t', '-f', '-r', or '-w' options. Documented in pandoc(1) man page - and README. - - * Allow ordered list items to begin with (single) letters, as well - as numbers. The list item marker may now be terminated either by - '.' or by ')'. This extension to standard markdown is documented - in README. - - * Revised footnote syntax. (See README for full details.) The - '[^1]' format now standard in markdown extensions is supported, - as are inline footnotes with this syntax: `^[My note.]`. - The earlier footnote syntax `^(1)` is no longer supported. - - * Improved HTML representation of footnotes. All footnotes - are now auto-numbered and appear in an ordered list at the - end of the HTML document. Since the default appearance is now - acceptable, the old footnote styles have been removed from the - HTML header. - - * Bug fixes: - - + Fixed a serious bug in the markdown, LaTeX, and RST readers. - These readers ran 'runParser' on processed chunks of text to handle - embedded block lists in lists and quotation blocks. But then - any changes made to the parser state in these chunks was lost, - as the state is local to the parser. So, for example, footnotes - didn't work in quotes or list items. The fix: instead of calling - runParser on some raw text, use setInput to make it the input, then - parse it, then use setInput to restore the input to what it was - before. This is shorter and more elegant, and it fixes the problem. - + Fixed bug in notFollowedBy' combinator (adding 'try' before - 'parser'). Adjusted code that uses this combinator accordingly. - + Fixed bug in RTF writer that caused improper indentation on - footnotes occurring in indented blocks like lists. - + Fixed parsing of metadata in LaTeX reader. Now the title, author, - and date are parsed correctly. Everything else in the preamble - is skipped. - + Modified escapedChar in LaTeX reader to allow a '\' at the end of a - line to count as escaped whitespace. - + Modified LaTeX reader to produce inline links rather than reference - links. Otherwise, links in footnotes aren't handled properly. - + Fixed handling of titles in links in Markdown reader, so that - embedded quotation marks are now handled properly. - + Fixed Markdown reader's handling of embedded brackets in links. - + Fixed Markdown reader so that it only parses bracketed material - as a reference link if there is actually a corresponding key. - + Revised inline code parsing in Markdown reader to conform to - markdown standard. Now any number of `s can begin inline code, - which will end with the same number of `s. For example, to - have two backticks as code, write ``` `` ```. Modified Markdown - writer accordingly. - + Fixed bug in text-wrapping routine in Markdown and RST writers. - Now LineBreaks no longer cause wrapping problems. - + Supported hexadecimal numerical entity references as well as - decimal ones. - + Fixed bug in Markdown reader's handling of underscores and other - inline formatting markers inside reference labels: for example, - in '[A_B]: /url/a_b', the material between underscores was being - parsed as emphasized inlines. - + Changed Markdown reader's handling of backslash escapes so that - only non-alphanumeric characters can be escaped. Strict mode - follows Markdown.pl in only allowing a select group of punctuation - characters to be escaped. - + Modified HTML reader to skip a newline following a `<br>` tag. - Otherwise the newline will be treated as a space at the beginning - of the next line. - - * Made handling of code blocks more consistent. Previously, some - readers allowed trailing newlines, while others stripped them. - Now, all readers strip trailing newlines in code blocks. Writers - insert a newline at the end of code blocks as needed. - - * Modified readers to make spacing at the end of output more consistent. - - * Minor improvements to LaTeX reader: - - + '\thanks' now treated like a footnote. - + Simplified parsing of LaTeX command arguments and options. - commandArgs now returns a list of arguments OR options (in - whatever order they appear). The brackets are included, and - a new stripFirstAndLast function is provided to strip them off - when needed. This fixes a problem in dealing with \newcommand - and \newenvironment. - - * Revised RTF writer: - - + Default font is now Helvetica. - + An '\f0' is added to each '\pard', so that font resizing works - correctly. - - * Moved handling of "smart typography" from the writers to the Markdown - and LaTeX readers. This allows great simplification of the writers - and more accurate smart quotes, dashes, and ellipses. DocBook can - now use `<quote>`. The '--smart' option now toggles an option in - the parser state rather than a writer option. Several new kinds - of inline elements have been added: Quoted, Ellipses, Apostrophe, - EmDash, EnDash. - - * Changes in HTML writer: - - + Include title block in header even when title is null. - + Made javascript obfuscation of emails even more obfuscatory, - by combining it with entity obfuscation. - - * Changed default ASCIIMathML text color to black. - - * Test suite: - - + Added --strip-trailing-cr option to diff in runtests.pl, for - compatibility with Windows. - + Added regression tests with footnotes in quote blocks and lists. - - * Makefile changes: - - + osx-pkg target creates a Mac OS X package (directory). New osx - directory contains files needed for construction of the package. - + osx-dmg target creates a compressed disk image containing the package. - + win-pkg target creates Windows binary package. - + tarball target creates distribution source tarball. - + website target generates pandoc's website automatically, including - demos. New 'web' directory containts files needed for construction - of the website (which will be created as the 'pandoc' subdirectory - of 'web'). - + Makefile checks to see if we're running Windows/Cygwin; if so, - a '.exe' extension is added to each executable in EXECS. - - * Removed all wrappers except markdown2pdf and html2markdown. - - * Added new wrapper hsmarkdown, to be used as a drop-in replacement - for Markdown.pl. hsmarkdown calls pandoc with the '--strict' - option and disables other options. - - * Added code to html2markdown that tries to determine the character - encoding of an HTML file, by parsing the "Content-type" meta tag. - - + If the encoding can't be determined, then if the content is local, - the local encoding is used; if it comes from a URL, UTF-8 is used - by default. - + If input is from STDIN, don't try to determine character encoding. - + Encoding can be specified explicitly using '-e' option. - - * Improved warning messages in wrappers: - - + Print warning if iconv not available - + More user-friendly error messages in markdown2pdf, when - pdflatex fails. - - * Code cleanup: - - + Renamed 'Text/Pandoc/HtmlEntities' module to - 'Text/Pandoc/Entities'. Also changed function names so as - not to be HTML-specific. - + Refactored SGML string escaping functions from HTML and Docbook - writers into Text/Pandoc/Shared. (escapeSGML, stringToSGML) - + Removed 'BlockQuoteContext' from ParserContext, as it isn't - used anywhere. - + Removed splitBySpace and replaced it with a general, polymorphic - splitBy function. - + Refactored LaTeX reader for clarity (added isArg function). - + Converted some CR's to LF's in src/ui/default/print.css. - + Added license text to top of source files. - + Added module data for haddock to source files. - + Reformatted code for consistency. - - * Rewrote documentation and man pages. Split README into INSTALL - and README. - - * Split LICENSE into COPYING and COPYRIGHT. - - * Removed TODO, since we now maintain ToDo on the wiki. - - * Made COPYRIGHT in top level a symlink to debian/copyright, to avoid - duplication. - - [ Recai Oktaş ] - - * Revamped build process to conform to debian standards and created - a proper debian package. Closes: #391666. - - * Modified build process to support GHC 6.6. - - + The package can still be compiled using GHC 6.4.2, though because - of dependencies the "make deb" target works only with GHC 6.6+. - + The script 'cabalize' is used to create an appropriate - 'Pandoc.cabal' from 'Pandoc.cabal.in', depending on the GHC and - Cabal versions. - - * Refactored template processing (fillTemplates.pl). - - * Modified wrapper scripts to make them more robust and portable. - To avoid code duplication and ensure consistency, wrappers are - generated via a templating system from templates in src/wrappers. - - + Wrappers now accept multiple filenames, when appropriate. - + Spaces and tabs allowed in filenames. - + getopts shell builtin is used for portable option parsing. - + Improved html2markdown's web grabber code, making it more robust, - configurable and verbose. Added '-e', '-g' options. - - -- Recai Oktaş <roktas@debian.org> Fri, 05 Jan 2007 09:41:19 +0200 - -pandoc (0.2) unstable; urgency=low - - * Fixed unicode/utf-8 translation - - -- John MacFarlane <jgm@berkeley.edu> Mon, 14 Aug 2006 00:00:00 -0400 - -pandoc (0.1) unstable; urgency=low - - * Initial creation of debian package - - -- John MacFarlane <jgm@berkeley.edu> Mon, 14 Aug 2006 00:00:00 -0400 diff --git a/changelog.md b/changelog.md new file mode 100644 --- /dev/null +++ b/changelog.md @@ -0,0 +1,29619 @@ +# Revision history for pandoc + +## pandoc 3.10 (2026-06-03) + + * Add `--typst-input` CLI option (#11588). This allows one to + pass parameters to typst, which are available at `sys.inputs`, + just as `typst` itself does with its `--input` option. + + * Avoid trailing spaces in `--help` output (#11623). + + * Make groff the default pdf-engine for `ms` output (#11558). + Formerly it was pdfroff. + + * Set default User-Agent request header to `pandoc/VERSION`. + This can be overridden using the `--request-header` option. + + * Markdown reader: + + + Allow grid tables to be indented (#11671, Johan Larsson). Like + the other table syntaxes (pipe, simple, and multiline tables) + and block-level constructs generally, a grid table may now be + indented by up to three spaces and still be recognized as a + table. Previously the grid-table parser required the table to + begin at the left margin, so an indented grid table was parsed + as a paragraph. + + Fix calculation of column widths for default columns in grid tables + (#11664). This fixes a bug which produced too-narrow columns in some + cases. + + Don't produce empty Raw element with `--strip-comments` (#11625). + + Fix quotes in inline notes (#11613, Andrew Dunning). + + Allow spaces inside attributes in super/sub (#11589). + + Simplify `checkNotes`, remove dead code + + Various small performance optimizations. + + * HTML reader: + + + Parse aside as a Div with class "aside" (instead of using + raw HTML) (#11626). + + Add "header" class to Divs created from headers. + + * Docx reader: + + + Fix bug in bitmask checking (#8299). This led to some table rows + being wrongly considered header rows. + + Improve treatment of `tblHeader` element (#8299). + If `tblHeader` exists but has `w:val="0"`, then don't consider + the element a header. + + With `citations` extension, prefer `citation-key` as the key for + item data, if it is defined (#11581; cf. #10366, #11567). The `id` key + used by Zotero is not exposed by their API and is generally not what + is wanted when converting to biblatex. + + Don't look to `ext` tags for image extent (#11580). + This reverts a change from 7ff1b798c4e6681ef9050899442d80883116573a. + The change was mistaken and could cause images to be parsed with + the wrong sizes. + + * Man reader: + + + Support `auto_identifiers`, `gfm_auto_identifiers`, and + `ascii_identifiers` extensions (#8852, Meher Chaitanya). + Section headings parsed from .SH and .SS macros now receive + auto-generated id attributes when the extension is enabled (as + it is by default). This enables `--toc` to produce working anchor links. + + Better handling of `.TP` macro (#11668). We parse these as + DefinitionList items, but we previously sometimes stopped prematurely + in including material in the definition. We should include everything + until we hit a new indentation-changing macro. + + * Roff reader: + + + Handle `\` line continuation in table cells (#11635). + + * LaTeX reader: + + + Evaluate theorem name when used rather than evaluating it when + the `\newtheorem` command is encountered (#11608). It may include + macros only defined later. + + Put identifier from label on table attributes rather than adding + an enclosing Div (#11604). + + * Typst reader: + + + Fix issue parsing figure inside rotate or box (#11598). + + Implement "rotate" as pass-through (#11531). Information about the + angle is encoded in an attribute of an enclosing span or div. + + * RTF reader: + + + Fix tables parsed as deeply nested tables (#11682). + + * Docx writer: + + + Fix display of paragraph with just inline math (#11674). + Word displays a paragraph containing just one inline math + element as if it were display math. We don't want that, + so we add a zero-width space to defeat this behavior. + + Fix FirstParagraph style lost after heading with footnote (#11573). + + Fix empty keywords in core document properties (#11666, Sai Asish Y). + + * OpenDocument/ODT writer: + + + Use predefined styles (#9316, #5086, #2747, #3426, #7336). + Previously the OpenDocument writer emitted a fresh automatic + style (L1..Ln, P1..Pn, T1..Tn) for nearly every list, list-item + paragraph, block quote, preformatted block, and inline text + style. This commit teaches the writer to reference the + predefined styles that LibreOffice ships and that pandoc's + reference.odt now exports: + + - Bullet lists use `List_20_1`; ordered lists with default start and + decimal format use `Numbering_20_1`. Non-default ordered lists + generate a single named override style (`Pandoc_Numbering_N`) + memoised by (ListNumberStyle, ListNumberDelim); a non-default start + value with the default format is expressed via `text:start-value` + on the `text:list` element instead of a new style. + - List-item paragraphs use `List_20_Bullet[_Tight]` and + `List_20_Number[_Tight]`. The Tight variants are pandoc-specific + (zero top/bottom margin) and are injected into the user's + reference.odt if missing, just like the Skylighting token styles. + - Block quotes use the predefined `Quotations` paragraph style + directly. Nested block quotes use a single automatic style that + inherits from Quotations and only adds extra margin-left, so a list + inside a block quote now inherits its container's indent (#2747). + - Preformatted blocks use `Preformatted_20_Text` directly. + - Emphasis, Strong, Strikeout, Subscript, Superscript and Code spans + use the predefined `Emphasis`, `Strong_20_Emphasis`, `Strikeout`, + `Subscript`, `Superscript` and `Source_20_Text` text styles. + - `paraStyle`/`paraStyleFromParent` no longer emit a wrapper automatic + style when its only attribute would be `parent-style-name`; the + parent name is returned directly. + + * EPUB writer: + + + Support multiple EPUB versions for raw content (#11628, + nibras shami). This change ensures that raw content marked `epub2` + will appear in (only) EPUBv2 output and content marked `epub3` will + appear in (only) EPUBv3 output. + + * Typst writer: + + + Add zero-width space before a Span label if otherwise the label + doesn't come after anything (#11568). (In this case typst will + raise an error.) + + Add newline after `#set text` directive (#11583). This ensures that + blocks such as lists are parsed correctly after a `set text`. + + * LaTeX writer: + + + Fix `fr-CA` babel language mapping (#11575, Christophe + Dervieux). Map fr-CA to `french` instead of deprecated `canadien`. + The babel-french package's `canadien.ldf` is deprecated and + broken: it never calls `\ldf@finish`, so `\bbl@main@language` is + left undefined, causing babel to crash at `\begin{document}`. + Since `canadien` was always just an unconditional alias for + `french`, use `french` directly. + + * MediaWiki writer: + + + Handle some technically malformed URLs (#11562). + + Fix escaping to avoid accidental lists (#11563). + + * Markdown writer: + + + Fix spacing issues with definition lists. + - Properly handle the case where the first item is an indented + code block (#11542). + - Use correct indentation when `four_space_rule` extension is + disabled. + + Escape `:::` to avoid triggering unintended divs (#11571). + + * Man writer: + + + Don't run together successive definitions in a tight definition list + with multiple definitions after a term (#11547). + + * Text.Pandoc.Writers.Shared: + + + `htmlAttrs`: use `data-` prefix when needed (#11680). This now + behaves like the HTML writer, adding the `data-` prefix for + custom attributes. This will affect, e.g., the mediawiki writer. + + * Text.Pandoc.Error: + + + Display IOError without stack trace (#11676). + + Use single quotes around paths and format names (#11645) in + displayed messages. + + * Text.Pandoc.App.Opt: + + + Opt has a new field `optTypstInputs` [API change]. + + * Text.Pandoc.Options: + + + Change `defaultMathJaxURL` to use MathJax v4 (#11669). + + ReaderOptions has a new field `readerTypstInputs` [API change]. + + * Text.Pandoc.Citeproc.BibTeX: + + + Prevent wrong combination of `subtitle` and `titleaddon` with + `maintitle` (#11677, Amir Dekel). When `maintitle` is present, `subtitle` + should not be added to `title`, but only to `volume-title`. + + BibLaTeX `inbook` should be CSL `book`, not `chapter` (#11552). + + Allow `doi` field in bibtex (input and output) (#11617, Thomas Hodson). + + * Text.Pandoc.Translations: + + + Find lang-script type translations (#11648). + E.g. for `zh-Hant-TW` look for (in order) `zh-Hant-TW.yaml`, + `zh-Hant.yaml`, `zh.yaml`. + + * Text.Pandoc.Parsing: + + + Various small optimizations. + + Fix bug in `extractIdClass` to ensure that both `id` and + `class` are stripped from key/value attributes.. + + * Text.Pandoc.Shared: + + + Various small optimizations. + + * ODT reference doc: demonstrate predefined styles (310327). + This mirrors the demonstration content already present in + the Word reference doc. + + * HTML templates: + + + Include pandoc-version in generator meta tag (#11624). + + Styles: make screen-only CSS conditional (#11524, Keenan Brock). + + * EPUB templates: + + + Add dir attribute to html element (#11554). + + * LaTeX template: Define `\xmpquote` if not defined (#11528). + `\xmpquote` is defined by the hyperref driver hyperxmp; we need a + fallback for those who aren't using that. + + * Lua subsystem: + + + Add constructor `pandoc.TableBody`. + + * doc/lua-filters.md: Re-indent definition list items + (Albert Krewinkel). + + * wasm/index.js: include filter to embed images for pdf-via-typst. + Auto-inject `embed_images` filter for PDF via Typst. Otherwise + conversion fails because we can't write the images in a temporary + directory in the WASM sandbox. See jgm/pandoc#11584. + + * Fix test suite parallel execution failures (#11566). + + * linux/make_artifacts.sh: add `loong64` support (#11597, + Olivier Benz). + + * `bash_completion.tpl`: add `groff` to `--pdf-engine` completions (#11555). + + * MANUAL.txt: + + + Improve description of reference links (#11643). + + Update instructions for modifying reference.docx + (#11600, Dan Jacobson). Mention LibreOffice as an alternative. + + Clarify indentation rules for definition lists (#11542). + + Move `--sandbox` to general options. + + Reword restrictions on YAML metadata in commonmark (#11561). + + * Bump upper bound for time, tls, aeson. + + * Use latest releases of doclayout, asciidoc, texmath, typst, + typst-symbols, pandoc-types, citeproc, commonmark, commonmark-pandoc, + commonmark-extensions. + + * Add missing NAME heading to pandoc-lua, pandoc-server man pages (#11634). + +## pandoc 3.9.0.2 (2026-03-19) + + * Typst template: fix regression introduced in 3.9.0.1 (#11538). + +## pandoc 3.9.0.1 (2026-03-17) + + * WASM GUI: + + + Don't block everything while pandoc.wasm loads. + + Fix bug with Unicode filenames (#11447). + + Catch errors loading pandoc. + + * Docx reader: + + + Recognize media inside textboxes (#11053, Raymond Berger). + + Properly handle media stored with packaged-rooted paths + such as `/media` (#11518). This can be produced by the online version of Word. + With this change, media stored at an absolute path will be stored + with its original name and not given a SHA1-based name. + + Preserve non-textbox content when unwrapping textboxes (#11510, #6893, + #11412, #5394, #9633). Treat text inside a textbox containing an image + as a figure caption. + + Support `w:gridBefore` table row property (#11464, Jan Tojnar). + + * Typst reader: + + + Handle bibliography command (#11460). If this is present, a + bibliography section is added to the document and the bibliography + paths are added to `bibliography` in the metadata. This sets things + up for using `--citeproc`. + + * Textile reader: + + + Handle block content in cells (#11455). + + * LaTeX reader: + + + Support `\footnotemark` and `\footnotetext` (#11450). + These commands allow separating the footnote mark from its content, useful + in tables, minipages, and other contexts where \footnote cannot be used + directly. + + Support supertabular environment (#11523, bodigrim). + + * ODT Reader: + + + Fix relative linked images (#11369, Tuong Nguyen Manh). + + Recognize `Preformatted_20_Text` style Jan Tojnar + This is used by LibreOffice, and we will switch to that as well. + + Add block smushing logic (Jan Tojnar). + + Support Preformatted Text style (#4841, Jan Tojnar). + + * Markdown reader: + + + Fix bug with `lists_without_preceding_blankline` (#11534). + + * Typst writer: + + + Don't add a carriage return after `\` for hard break (#11446). + They are not necessary. Note that they can still be included + if you use `--wrap=preserve` and add a newline in your source document. + + Improve handling of data: URIs in images. Instead of using an + SVG with a link containing the data URI (the solution of #10460), + we can now simply produce a `bytes` object with the requisite bytes. + Typst figures out the format automatically. + + Fix escaping of quotes (#11463). + + Include alt attributes on images (mcanouil). + + Properly escape `.` after bracketed argument (#11511). + + * Docx writer: + + + Don't depend on `extractTarget` from Docx reader. + + Fix section breaks with `--top-level-division` (#11482, #10578). + + * EPUB writer: + + + Add cover metadata for EPUB3 (#11479). This allows + file managers to show cover thumbnails for EPUB3 files as well. + + Update allowed values for EPUB3 metadata `identifier.scheme` (#11481, + Pascal Wagler). + + * ODT writer: + + + Rename inline source class to match LibreOffice (#3390, Jan Tojnar). + Rename the text style we use to represent `Code` inlines from + `Source_20_Text` to `Source_Text`. This is the same name LibreOffice + Writer uses so it will be recognized by the Character Styles section + of the Styles menu. + + Remove font size from inline source class (Jan Tojnar). This matches + what LibreOffice Writer is doing. Also fixes literals inside + headings being too small. + + Modernize `Preformatted Text` & `Source Text` styles (Jan Tojnar). + Presumably, `font-family-generic` and `font-pitch` will allow to find a + replacement on systems that do not have `Courier New`. + + * Markdown writer: + + + Fix rendering of alerts (#11479). We only properly handled the case + where the alert started with a paragraph, but it can start with a list + or other block type. + + Escape literal `&` that would trigger entity (#11490). + + * HTML writer: + + + For revealjs, default `scrollProgress` to `auto` (Christophe Dervieux). + + * PPTX writer: + + + Register content type for embedded fonts (#11492). + + * MediaWiki writer: + + + Use appropriate syntax for external images (#11494). + Note that they will only be rendered as images if an option + `$wgAllowExternalImages` is enabled in the MediaWiki instance. + + * ICML writer: + + + Support for image object styles (#11498, massifrg). + This change allows users to style images in InDesign bysetting the + `object-style` attribute in a pandoc Image, which is mapped to the + AppliedObjectStyle attribute in the Rectangle element around an Image + element in the resulting ICML. + + * JATS writer: + + + Improve representation of Divs (Albert Krewinkel). The writer now + checks if the element used to represent (non-special) Divs has any + `<boxed-text>` specific attributes. If it does, the writer keeps + wrapping the Div contents in a `<boxed-text>`, as it did before. + Otherwise, the writer falls back to the more appropriate `<p>` element + or simply unwraps the Div if the wrapping element wouldn't have any + attributes. The new behavior gives better semantic results in most cases, + as `<boxed-text>` should be used for text that "is outside the flow of the + narrative text", which doesn't apply to most divs. + "Special" divs, like those used to mark sections, are not + affected by this change. + + * Text.Pandoc.Writers.GridTable: + + + Normalize tables (#8102). Previously, if an invalid table was passed to + `toTable`, an array index error could be raised. Normalizing the table + forces it into a shape that won't allow this error. + + * Lua subsystem (Albert Krewinkel): + + + Add new function `pandoc.types.Sources` (#11441). + + * LaTeX template: properly handle keywords with commas. + These need to be put in an `\xmpquote{..}` command. Closes #11528. + + * HTML styles template: avoid duplicate code selector. + Consolidate two clauses. Closes #11484. + + * Revealjs template: fix type rendering of scroll-view options + (Christophe Dervieux, #11486). + + * Typst template: + + + Use both place and block for title (Gordon Woodhull). + Otherwise the title will be confined to the left column + + Put title block in a conditional (#11529). This avoids an + empty block for documents that lack metadata information. + The empty block causes problems if `#set page` is used, as + it will cause a page break. + + * Beamer template: add `logooption` variable (#11452, Sidney Mau). + + * Text.Pandoc.ImageSize: + + + Correctly handle percentage width, height on SVG (#11530). + Previously we were getting image size of 0 when a percentage + was specified for width or height on SVG. With this change, + we simply ignore these percentages (becaues ImageSize doesn't + know the size of the containing element). + + * Re-add `-threaded` to compile options in pandoc-cli. + + * Use released djot, asciidoc, texmath, typst. + + * Allow crypton 1.1, tls 2.2, http-client-tls 0.4. + + * Require auto-update >= 0.2.6 to fix server on macOS (#11488). + + * pandoc-cli.cabal: bump base min bound to 4.18 (same as pandoc). + + * MANUAL.txt: + + + Note that JSON may be used in YAML metadata blocks (#11525). + + Update link for ICML in manual. + + Fix outdated OPML spec URL in MANUAL.txt (#11504, Peter Briggs). + +## pandoc 3.9 (2026-02-03) + + * Add support for compiling pandoc to WASM. (To build, `make + pandoc.wasm`.) A stanza in `cabal.project` contains the + necessary build modifications. We owe this almost entirely to + TerrorJack, who created the original proof of context and + came up with the necessary build flags and patches to some + dependencies. + + `pandoc.wasm` has almost all the power of regular pandoc. The + main limitations is that it operates in a WASM sandbox and thus + cannot use HTTP to fetch resources and cannot run system commands. + As a result, JSON filters cannot be used, `--embed-resources` + works only with resources that have been explicitly provided in + the WASM sandbox, and PDFs cannot be produced (since that requires + running external commands). However, Lua filters can be used, + as long as they do not run system commands. + + A JavaScript bridge module, `wasm/pandoc.js`, is provided; this + handles the setup necessary to run `pandoc.wasm` in a browser. + + In addition, a full-featured GUI interface is provided in the + `wasm` subdirectory. `make serve` from that directory and it + will run locally, or visit <https://pandoc.org/app>. Note that + once the relevant code has been downloaded by the browser, it runs + entirely in the browser, and the conversions never touch a server. + The GUI was developed in interaction with Claude Code. This app + includes a WASM version of Typst and can produce PDF output via + Typst. + + * Defaults files may now be either JSON or YAML (though a `.yaml` + extension will still be assumed if the file has no extension). + The structure of a JSON defaults file is isomorphic to that of + a YAML defaults file. + + * Variable expansion now works even for the `defaults` field of + defaults files (#8024, Jacob Larkin). + + * `--extract-media` will now create a zip archive containing the media + (instead of a directory) if the path provided has a `.zip` extension. + + * Processing with `--citeproc` is now affected by a + `reset-citation-positions` class on headings. When the + `reset-citation-positions` class is added to a top-level + heading, `--citeproc` will reset position information at that + point in the document. This is needed in order to ensure that + the first citation in a chapter to a work that has been cited + in a previous chapter will not be in abbreviated form. + + * RST reader: + + + Fix definition lists where term ends with `-` (#11323). + This reverts some old code giving special treatment to + lines ending in hyphens; I don't understand why it was + there, because rst2html does not seem to do this. + + * HTML reader: + + + Revert an earlier change that caused style tags in the body + to be ignored (#10643, #11246). + + Parse inline style elements as RawInline (#10643, #11246). + + * Markdown reader: + + + Fix parsing of inline math (`$...$`) (#11311, benniekiss). + Do not allow blank lines before closing `$` delimiter. This brings the + parser in line with the documentation. + + Allow superscripted spans (#11409). These were being parsed as inline + notes. Now we disallow an inline note followed by + attributes, as this is almost certainly meant to be a span. + + Support `alerts` extension for pandoc markdown (#9716). It is not + enabled by default. + + * MediaWiki reader: + + + Add behavior switches support (#11354, Anton Melnikov). + They add a field to metadata without producing any text. + + Handle non-recognized tags as plain text (#11299). + + Better handling of inline tags (#11299). `<mark>`, `<var>`, + `<samp>`, and `<kbd>` now produce Code or Span elements with + classes, which can be handled by multiple output formats, + instead of simply being parsed as raw HTML tags. + + * RTF reader: + + + Ensure a new paragraph on `\pard` (#11361, Tuong Nguyen Manh). New + paragraphs may start with `\pard` alone without an explicit paragraph + break with `\par` preceding it. + + Improve hyperlink parsing more (#10942, Tuong Nguyen Manh). + Both the field instruction and its result may be ungrouped. + + Fix bug where list items were incorporated into a following table + (#11364). + + * ODT reader: + + + Add table row and column spans (#11366, Tuong Nguyen Manh). + Parse the number-rows-spanned and number-columns-spanned attributes to + create Cells for the Table. + + * DocBook reader: + + + Support "role" attribute (#11255, Yann Trividic). The `role` + attribute is parsed and added to Pandoc AST elements, using a + wrapper Div if needed. + + Omit empty title when not required (#11422). + This affects example and sidebar elements. + + Fix adding wrong metadata (#11300, Tuong Nguyen Manh). Now + keep track of the current element stack to only add metadata + if inside an appropriate parent element. + + * DocBook/JATS reader: + + + Don't export surrounding space from inline elements (#11398). Previously + we would export leading and trailing space inside elements like + emphasis or ulink so they appeared outside the resulting pandoc Inline + (Emph or Link). This is not really motivated; DocBook and XML in general + treats leading and trailing whitespace in this context as significant. + + * Docx reader: + + + Handle tables without `tblGrid` (#11380). + + Look inside v:rect as well as v:shape (#11412). + + * LaTeX reader: + + + Handle more quote macros from fontspec and ngerman babel (#6120). + + * Org reader: + + + Don't include 'example' class when parsing org example blocks (#11339). + These are just unmarked code blocks. + + * Texinfo writer: + + + Improve handling of certain code blocks (#11312). + MediaWiki, for example, will parse a code block containing + formatting as a sequence of Code elements separated by + LineBreaks. For this we now use a texinfo example block. + + * Typst writer: + + + Escape hyphens when needed (#11334). + + * HTML writer: + + + Include all classes on highlighted code elements (#11423). Previously, + only the language class was included, and the others were dropped. + + Slide formats: Make `. . .` pause work in nested blocks (#7201, #7582). + + For revealjs, add idiomatic highlight.js support (#11420, Claude Opus 4.5). + When using `--syntax-highlighting=idiomatic` with reveal.js output, pandoc + now generates HTML compatible with reveal.js's built-in highlight.js plugin: + Code blocks use `<pre><code class="language-X">` format. + The template loads highlight.js CSS, JS, and RevealHighlight plugin. + + * Markdown writer: + + + Ensure that `\ ` line breaks are used for commonmark. + + Use setext for headers containing line breaks for commonmark (#11341). + + Allow display math to start/end with space (#11384). + This reverts to earlier < 3.7 behavior. + + Properly handle tables with footers (#11416). + + * JATS writer: + + + Fix XML output for nested figures (#11362, Albert Krewinkel). + Subfigures are now wrapped inside a `<fig-group>` element. Furthermore, + figure content that isn't allowed as children of `<fig>` elements, such as + raw text, gets wrapped in `<p>` elements to ensure schema-conforming XML. + + * AsciiDoc writer: + + + Use doubled delims in more contexts (#11362). Also escape the `#` character. + + Use a span with role for SmallCaps (#11374). + + Export spaces inside delimited constructs like emph. + + * Docx writer: + + + Skip directory entries when building media overrides (#11379, You Jiangbin). + Pandoc's docx writer was previously adding an `<Override>` for + `/word/media/` in `[Content_Types].xml` when the reference doc contains + media, which violates OPC rules and causes Word to report corruption. + + Refactor the monolithic `writeDocx` into a number of smaller functions + (Claude Opus 4.5). + + Replace generic XML traversal with direct path navigation (Claude + Opus 4.5). Instead of using Data.Generics `everywhere` to traverse the + entire XML tree when setting language attributes, navigate directly to + the known path `w:docDefaults/w:rPr/w:lang`. This is more efficient and + removes the dependency on `Data.Generics`. + + * EPUB writer: + + + Don't use footnote backlinks for EPUBv3. Here we use aside elements, + which are popups, and the backlinks are not needed; in some readers + they cause a redundant number to appear, since the reader adds a note number. + + * MediaWiki writer: + + + Use Doc Text instead of Text for document construction (with Claude Open 4.5). + This refactors the writer to use Text.DocLayout combinators (vcat, hcat, + literal, blankline, cr, chomp) for building output, following the pattern + used by other text format writers (RST, Markdown, Man). This enables + better control over line spacing and paragraph separation. + + Improve blank space around div elements (#11417). This is merely cosmetic. + + * PPTX writer: + + + Support notes field in metadata for title slide (#5844, Chris Callison-Burch). + This adds support for a `notes` field in the YAML metadata block that will + be used as speaker notes for the title slide in PowerPoint output. + Previously, there was no way to add speaker notes to the title slide since + it is generated from metadata rather than from content blocks. + + * LaTeX writer: + + + Add PDF standard support via DocumentMetadata (#11407, Gordon Woodhull + with Claude Opus 4.5). The `pdfstandard` variable can be + used to specify PDF standards (PDF/A, PDF/X, PDF/UA) in + LaTeX output. This uses LaTeX's `\DocumentMetadata` + command, which requires LuaLaTeX. PDF version requirements + are automatically inferred, but can be explicitly overridden. + Automatic tagging is added for standards that require it. + + * Typst template: + + + Fix keywords usage. (#11317, har7an). + + Disable hyphenation for title, subtitle (#11375). + + Improve accessibility of definition lists (#11436). Before this + change, our show rule produced an error when typst was run with + `--pdf-standard=ua1`. + + * HTML5 template: + + + Conditionally include lang attribute, instead of providing + it with an empty value. + + * JATS template: + + + Fix author prefix placeholder (#11381, Christophe Dervieux). + + * Text.Pandoc.Citeproc: + + + Fix biblatex parsing of `@commentary` entries (#11322). + + Fix typo affecting `jurisdiction` biblatex type (#11321). + + Avoid adding an extra space at the beginning of a Cite. + + * Text.Pandoc.Shared: + + + Export `hasLineBreaks` [API change]. This was formerly + defined in the DocBook writer but more generally useful. + + * Text.Pandoc.PDF: + + + Add `SOURCE_DATE_EPOCH` to verbose environment variable info. + + * Text.Pandoc.Class: + + + Factor out `openURL` into Text.Pandoc.Class.IO.HTTP (unexported module). + + * Lua subsystem (Albert Krewinkel): + + + Mark readers and writers with their types (#11367). The + `pandoc.readers` and `pandoc.writers` maps now have string values + instead of boolean values. The string signals the type of the + reader/writer, `"text"` for TextReader/TextWriter and `"bytestring"` + for ByteStringReader/ByteStringWriter. + + Support equallity checks of LogMessage objects. + + Add function `pandoc.with_state` (#10859). The function allows + to run a callback with a modified pandoc state. This provides + the ability to temporarily modify the resource path, the user + data directory, and the HTTP request headers. + + Let `pandoc.with_state` error on unknown options (#11376). + + Add function `pandoc.utils.documentation` (#10999). + This is now used to generate much of the Lua API documentation. + + * Text.Pandoc.App: + + + Remove redundant check for asciidoc in UnknownReader. + + * Text.Pandoc.Logging: + + + Add `pretty` field to ToJSON instance for LogMessage. + This just reproduces the output of `logMessage`, for convenience for those + who are using the JSON output outside of Haskell. + + * Text.Pandoc.Error: + + + Change PandocHttpError constructor to take a Text instead of an + HttpException as the second argument (see #10980) [API change] + Motivation: exposing HttpException in the public API makes it + difficult to provide a version of pandoc that can be compiled + to wasm, which currently can't handle the network libraries. + + Define `displayException` for PandocError. This is a behavior change, + not an API change, since there was already a definition that defaulted + to using Show. The change here is that we use `renderError` for + a more human-readable version. + + * Drop support for compilation with GHC versions < 9.6. + + * Use released citeproc 0.13, djot 0.1.3, skylighting-format-blaze-html + 0.1.2 (see #11423), texmath 0.13.1, asciidoc 0.1.0.1, typst-0.9, + hslua 2.5. + + * Add `-Wno-deriving-typeble` to cabal ghc-options for ghc >= 9.12. + + * Add `http` cabal flag (#10980). This allows pandoc to be + compiled without support for making HTTP requests, which is + useful when WASM is the target. + + * pandoc-lua-engine has a new build flag `repl`, allowing support + for the Lua repl to be disabled for the wasm build. + + * We now sign Windows artifacts with a code signing + certificate provided by SignPath. + + * Mention Excel in cabal description. + + * Makefile: remove some obsolete targets. + + * MANUAL.txt: + + + Fix typo about `--chunk-template` (#11358, Albert Lei). + + Fix link for bbcode_steam (#11389). + + Small rewrite of syntax-highlighting info. + + Fix defaults.yaml example for `wrap`. + + * Fix a few mistakes in the contributing docs. (#11318, har7an). + + * Fix a couple small errors in `doc/lua-filters.md`, + `doc/custom-writers.md`, and `doc/custom-readers.md` + (#11408, #11388). + +## pandoc 3.8.3 (2025-12-01) + + * Add `asciidoc` as an input format (#1456). + + * Add `xlsx` (Microsoft Excel) as an input format (Anton Antich). + Each worksheet turns into a section containing a table. + + * Add `pptx` (PowerPoint) as new input format (Anton Antich). + + * Add `bbcode` as a new output format (#11242, reptee). Several variants + of BBCode are also supported: `bbcode_fluxbb` (FluxBB), `bbcode_phpbb` + (phpBB), `bbcode_steam` (Hubzilla), `bbcode_hubzilla` (Hubzilla), + and `bbcode_xenforo` (xenForo). + + * New exported module Text.Pandoc.Readers.AsciiDoc, + exporting `readAsciiDoc` [API change]. + + * New module `Text.Pandoc.Readers.Pptx`, + exporting `readPptx` (Anton Antich) [API change]. + + * New module `Text.Pandoc.Readers.Xlsx`, + exporting `readXlsx` (Anton Antich) [API change]. + + * LaTeX reader: + + + Revert `\linebreak` as LineBreak (#11272). `\linebreak` is more + of a hint, it shouldn't produce a hard break. + + Better handling of `\makeatletter` in parsing raw LaTeX (#11270). + + Fix spurious paragraph breaks in math environments (#11265, + Emmanuel Ferdman). Previously, a math environment with extra + space before the `\end` would get rendered with a blank line, + which LaTeX treats as a paragraph break. + + Change type on `rawLaTeXParser` in Text.Pandoc.LaTeX.Parsing. + The preparser doesn't need to return a value. + + Fix `rawTeXParser` (#11253). Make macro expansion in raw LaTeX + depend on the setting of the `latex_macros` extension. Previously + macros were always expanded, even in raw TeX in markdown. In + addition, there was previously a bug that caused content to be + garbled in certain cases. + + Handle `ifstrequal` at a lower level, like the other `if` + commands (#11253). + + Move `ifstrequal`, `iftoggle`, etc., which were misplaced in + `environments`, to `blockCommands`, so these commands work properly. + + * Docx reader: + + + Handle REF link instruction (#11296, Ezwal). + + Check recursively for caption styles (Albert Krewinkel). + The docx reader uses caption styles to identify figures and + captioned tables. It now checks for known caption styles in the + full styles hierarchy of a paragraph instead of just checking + the style directly. This allows to recognize caption styles that + are built on top of the basic *caption* style, as is sometimes + the case in sophisticated styles. + + * Markdown reader: + + + Fix performance issue in links with `'` (#10880). + + * Typst reader: + + + Handle document metadata and `#title` (jgm/typst-hs#80). + Note that previously, the typst reader never returned document + metadata. Now it does, even if the typst document does not contain + a `#title` function that would result in actually printing the + title block. + + * Djot reader: + + + Add Space elements (#11250). Previously we just got big + Str elements with spaces included. But many pandoc writers + assume that breakable spaces will be Space elements, and this + is also required for automatic wrapping. + + * RST reader: + + + Correctly handle intraword emphasis (#11309). + + * Text.Pandoc.Readers: + + + Export `readAsciiDoc`, `readXlsx`, `readPptx` [API change]. + + * New module Text.Pandoc.Writers.BBCode, exporting + `writeBBCode`, `writeBBCodeSteam`, `writeBBCodeFluxBB`, + `writeBBCodePhpBB`, `writeBBCodeHubzilla`, `writeBBCodeXenforo` + [API change]. + + * LaTeX writer: + + + Make level 1-3 headings work inside blockquotes (#11281, James Barlow). + + Remove `split` from list of math environments (#11274). + + Improve handling of math environments in tex math (#11266). + + * HTML writer: + + + Add reveal.js `scroll` and `scrollSnap` options to writer and + template (#10052, Asliddinbek Azizovich). + + Use 'defer' when including mathjax script, as recommended in + MathJax docs (#11292). + + * ANSI writer: + + + Apply row spans in tables (#10149, Tuong Nguyen Manh). + The ANSI writer is now able to keep track of row spans and apply + them in rows. + + * Pptx writer: + + + Handle reference doc without slides (#7536, Tuong Nguyen Manh). + + * AsciiDoc writer: + + + Add more table features (#11267, Tuong Nguyen Manh): + Row span and column span, footer row, individual horizontal + cell alignment. + + * Typst template: + + + Fix font for compatibility with typst 0.14, which doesn't + permit an empty array for `font` (#11238). + + Re-add `columns` to typst template (#11259), fixing a + pandoc 3.8 regression. + + Fix syntax for bibliography inclusion (#11233, Mickaël Canouil). + Previously the syntax was wrong when multiple bibliography files + were specified. Typst expects an array. + + * Text.Pandoc.Writers: + + + Export `writeBBCode`, `writeBBCodeSteam`, `writeBBCodeFluxBB`, + `writeBBCodePhpBB`, `writeBBCodeHubzilla`, `writeBBCodeXenforo` + [API change]. + + * Text.Pandoc.Writers.Shared: + + + Add functions `insertCurrentSpansAtColumn`, `takePreviousSpansAtColumn` + and `decrementTrailingRowSpans` for applying and keeping track of + RowSpans over multiple rows (#10149, Tuong Nguyen Manh). [API change] + + * Text.Pandoc.Logging: + + + Change message for missing HTML title warning (#11307). Suggest + setting the `pagetitle` variable instead of setting `title` in metadata. + + * Lua subsystem: + + + Preserve common state of custom Lua readers (Albert Krewinkel). + The common state is transferred to Lua when calling a custom Lua + reader, and is now also transferred back after the reader has + finished. This ensures that info messages, warnings, and + mediabag entries are available to the main program and all + subsequent processing steps. + + * Text.Pandoc.PDF: + + + Avoid converting SVG to PDF when non-TeX PDF engine is used (#11275). + This fixes a 3.8 regression, which caused documents with SVGs to + raise an error when converted to PDF using WeasyPrint. + + Fix a 3.8 regression with typst and smart quotes (#11256). + Before 3.8, the default behavior when producing a PDF `-t typst` + was to produce smart quotes according to typst's defaults. + (This could be defeated by specifying `-t typst-smart`.) + This behavior broke in 3.8 because of a change to Text.Pandoc.PDF. + This change caused `smart` to be disabled for all formats when + producing PDFs, when before it was only disable for TeX-based + formats (to avoid bad ligatures). This commit restores the old + behavior. Possibly the regression also other affects other + non-TeX formats, e.g. HTML. + + * Text.Pandoc.Shared: + + + Add functions `allRowsEmpty` and `tableBodiesToRows` from the + RST writer for reuse in other writers. (Tuong Nguyen Manh) [API + change]. + + * Text.Pandoc.Citeproc: + + + Allow formatting in locator to be transmitted to citeproc. + We do this indirectly, by rendering the formatting using the + HTML tags that citeproc recognizes. Fixes jgm/citeproc#68 + and jgm/citeproc#163. Note that formatting is only possible for + locators given in the explicit form, surrounded by curly braces. + It won't work for implicit locators, since these expect + number-like expressions. + + * New non-exported module Text.Pandoc.Readers.OOXML.Shared + containing functions factored out from + Text.Pandoc.Readers.Docx.Util (Anton Antich). + + * Tests: The common file `nativeDiff` has been extracted from + the Docx and Pptx text files and put in Tests.Helpers. + + * Use asciidoc 0.1, djot 0.1.2.4, texmath 0.13.0.2, typst 0.8.1, + citeproc 0.12. + + * MANUAL.txt: + + + Improve `implicit_figure` documentation (#11082). + + Give both forms of options when referring to them (#11306). + + * Update INSTALL.md (#11271). + +## pandoc 3.8.2.1 (2025-10-20) + + * HTML reader: allow blank space between open and close `iframe`. + + * RTF reader: improve hyperlink parsing (#11211). + + * Org reader: + + + Parse parameter lists on unknown blocks (#11188, Albert + Krewinkel). The reader tries to parse the rest of the opening + line of a block, e.g., `#+begin_myblock …`, as a parameters + list. It first assumes that the parameters are in lisp-style + (`:key value`), then alternatively tries to read python-style + key-value pairs (`key=value`) and falls back to reading the + entire remaining line as a single `parameter` attribute. + + Add support for dynamic blocks. + + * Docx writer: properly handle nested comment spans (#8189, #6959, + mourino). + + * RST writer: Don't use simple tables with RowSpans (#11214, + Tuong Nguyen Manh). + + * Typst writer: Escape open paren after non-space (#11210). + This fixes an issue that occurs if an open paren comes + right after e.g. `#strong[test]`. + + * Typst template: ensure that title block is properly centered (#11221). + + * LaTeX writer/template: small fix for unnumbered tables for + compatibility with older LaTeX installations (#11201). + Thanks to @priiduonu for the solution. + + * MANUAL.txt: Fixed missing backtick (#11209, FoxChillz). + + * Correct anchor references to `pandoc.text` module documentation (#11111, + Emmanuel Ferdman). + + * Fixed golden test regeneration in Docx reader test. + + * Allow unicode-data 0.8. + + * Use citeproc 0.11. This fixes a significant performance + regression in pandoc 3.8, which was due to a rewrite of the + default chicago-author-date.csl file. Performance with `--citeproc` + is now on par with what we had in pandoc 3.7, even with the + revised Chicago styles. + +## pandoc 3.8.2 (2025-10-05) + + * Markdown reader/writer: implement new `table_attributes` extension + (#10884). When `table_attributes` is enabled (as it is by default for + pandoc's Markdown), attributes can be attached to a table by + including them at the end of the caption. Previously the writer + would emit an identifier in this position, but the reader didn't + handle it. Now arbitrary attributes are allowed, and they work in + both the reader and writer. + + * Typst writer: don't add superfluous semicolons (#11196). + Previously we added semicolons after inline commands not + followed by spaces, but mainly this was to deal with one issue: + the presence of a semicolon after an inline command, which + would be swallowed as a command separator (#9252). + This commits adopts an approach that should avoid so many + superfluous semicolons: it escapes semicolons that might come + right after a command. + + * Typst template: fix 3.8 regression in which links disappear + (#11194). A template change in 3.8 added a show rule for links which + causes them to disappear except in special cases. + + * Text.Pandoc.Parsing: rewrite `oneOfStrings` more efficiently. + + * LaTeX writer: Fix strikeout in links (#11192, Tuong Nguyen Manh). + As in #1294 `\url` and `\href` need to be protected + inside an mbox for `soul` commands. + + * Text.Pandoc.Extensions: Add `Ext_table_attributes` constructor for + `Extension` [API change]. + + * Use released texmath 0.13.0.1. + + * Update FSF contact information in COPYING (#11183, Bensun Muite). + + * MANUAL.txt: remove some redundancy (#11178, Reuben Thomas). + +## pandoc 3.8.1 (2025-09-29) + + * New output format `vimdoc` (Vim documentation format) (#11132, reptee). + + + [API change] Added module Text.Pandoc.Writers.Vimdoc, exporting + `writeVimdoc`. + + * Markdown reader: + + + Improve superscript/subscript/inline note parsing (#8652). + We do not allow inline notes to be followed by `(` or `[`. + Otherwise, we parse inline notes before superscripts. + Also, the sub/superscript parsers have been adjusted so that they + really exclude unescaped spaces (as they did not before, when the + spaces occurred in nested inlines). + + Fix simple table alignment (#11136, Tuong Nguyen Manh). Take wide + characters into account when determining the alignment. + + * LaTeX reader: + + + Ignore `\pandocbounded` (#11140). + + * XML reader: + + + Parse `<MetaString>` (#11137, massifrg). + + * Typst reader: + + + Add support for reading typst pagebreak (#11101, Raymond Berger). + The pagebreak is parsed as a HorizontalRule inside a wrapper Div + with class `page-break`. + + * Docx reader: + + + Handle figures in indented paragraphs (#11028). + + Change default for textwidth. This should only be used if `sectPr` + is not found. + + Properly calculate table column widths (#9837, #11147). + Previously we assumed that every table took up the full text + width. Now we read the text width from the document's `sectPr`. + + Use Tasty.Golden for Docx reader tests. This way we can update + them with `--accept`. + + * RST reader: + + + Fix regression in simple table parsing (#11150). + + SkippedContent warning if table directive contains + non-tabular content. + + Simple tables: leading space in a cell should not cause the contents + to be parsed as a block quote (#11146). + + Parse `:alt:` on figure (#11140). Also give a better default if + `alt` is not specified, using the stringified caption rather + than the filename. + + Support col spans for simple tables (Tuong Nguyen Manh). + + * Markdown writer: + + + Improve handling of implicit figures (#11140). + Allow implicit figures when alt text differs from caption + (in this case, we use an image attribute to add the alt). + + Use approximate pipe tables when it's the only option (#11128). + If we have a table with row/colspans that can rendered as an + approximate pipe table (without row/colspans), and no other table + format is enabled that could render the table, we fall back to + an "approximate" pipe table, with no row/colspans. + + * RST writer: + + + Ensure blank line before directives (#11162). + + Add col spans for simple tables (#10127, Tuong Nguyen Manh). + + * OpenDocument writer: + + + Add missing table elements (#10002, Tuong Nguyen Manh). + Add missing header rows after the first one, + footer rows as well as TableBody header rows. + + * Docx writer: + + + Fix regression (from 3.8) in highlighted code (#11156). + + * Powerpoint writer: + + + Handle single column (Tuong Nguyen Manh). + + * Typst writer: + + + Fix syntax highlighting (#11171, completes #10525). + Previously the native typst highlighting was always used, regardless + of the setting of `--syntax-highlighting`. With this change, + `--syntax-highlighting=none` and `--syntax-highlighting=<stylename>` + (with skylighting style) will work. + + * LaTeX writer: + + + Make beamer footnotes compatible with pauses (#5954). + Previously they would appear before the content to which + the note was attached, when there were pauses in a slide. + + Avoid `\_` in bibliography variable (#11152). + + Ensure that unlabelled tables don't increment counter (#11141). + + Protect VERB in caption (#11139, Tuong Nguyen Manh). + + Don't add links to TOC (#11124, Albert Krewinkel). + + Fix strikeouts in beamer title (#11168, Tuong Nguyen Manh). + + * LaTeX template: Add `shorthands` variable for LaTeX output + (#11160). If true, pandoc will allow language-specific shorthands + when loading babel. (This is helpful, for example, in getting + proper spacing around French punctuation.) + + * epub.css: Remove coloring for `a, a:visiting` (#11174). + This was causing links in iOS books app not to be distinguished in + any way (since underlining is not used there). + + * Text.Pandoc.Parsing: + + + [API chage] (Tuong Nguyen Manh). New functions `tableWithSpans`, + `tableWithSpans'`, `toTableComponentsWithSpans` and + `toTableComponentsWithSpans'` take a list of lists of + (Blocks, RowSpan, ColSpan) to parse a Table with different RowSpan and + ColSpan values accordingly. New helper functions `singleRowSpans` and + `singleColumnSpans` help set all RowSpans or ColSpans to be 1 in case + the table format only allows setting one or the other. + + * Text.Pandoc.Class: + + + Let `fetchItem` fail if the HTTP request is not + successful (Albert Krewinkel). HTTP requests that don't return a 200 + error code are now treated as an error. This ensures that a warning is + triggered when using `--embed-resources` or `--extract-media`. + + * Text.Pandoc.Writers.Shared: + + + Add new function `removeLinks` [API change] (Albert Krewinkel). + The function converts links to spans. It is used, for example, to avoid + nested links. The HTML writer used to put the description of nested links + into small caps, but uses a simple *span* now. + + * Text.Pandoc.Highlighting: export typst functions + [API change]. New exported functions `formatTypstBlock`, + `formatTypstInline`, `styleToTypst`. + + * Text.Pandoc.XML: + + + Add `fetchpriority` to list of HTML attributes (#11176). + + * Allow unicode-data 0.7. + + * Use released djot 0.1.2.3. Fixes a bug in which indentation + was swallowed in a code block inside a blockquote. + + +## pandoc 3.8 (2025-09-06) + + * Add a new input and output format `xml`, exactly representing a Pandoc + AST and isomorphic to the existing `native` and `json` formats (massifrg). + XML schemas for validation can be found in `tools/pandoc-xml.*`. + The format is documented in `doc/xml.md`. Pandoc now defaults to this + reader and writer when the `.xml` extension is used. + + Two new exported modules are added [API change]: + Text.Pandoc.Readers.XML, exporting `readXML`, and + Text.Pandoc.Writers.XML, exporting `writeXML`. + A new unexported module Text.Pandoc.XMLFormat is also added. + + * Add a new command line option `--syntax-highlighting`; this takes + the values `none`, `default`, `idiomatic`, a style name, or a path to a + theme file. It replaces the `--no-highlighting`, `--highlighting-style`, + and `--listings` options, which will still work but with a deprecation + warning. (Albert Krewinkel) + + * Create directory of output file if it doesn't exist (#11040). + + * Update `--version` copyright dates (#10961), and use a hardcoded + string "pandoc" for the program name in `--version`, per GNU + guidelines. + + * Add `smart_quotes` and `special_strings` extensions (Albert Krewinkel). + Currently these only affect `org`. Org mode makes a distinction between + smart parsing of quotes, and smart parsing of special strings like `...`. + The finer grained control over these features is necessary to truthfully + reproduce Emacs Org mode behavior. Special strings are enabled by default, + while smart quotes are disabled. + + * Remove the old `compact_definition_lists` extension. This was + neded to preserve backwards compatibility after pandoc 1.12 + was released, but at this point we can get rid of it. + + * Make `-t chunkedhtml -o -` output to stdout (as documented), rather + than creating a directory called `-` (#11068). + + * RST reader: Support multiple header rows (#10338, TuongNM). + + * LaTeX reader: + + + Support soft hyphens (Albert Krewinkel). + + Parse `\minisec` as unlisted level 6 headings (#10635, Albert Krewinkel). + + Support `\ifmmode` (#10915). + + Change handling of math environments (#9711, #9296). + Certain environments in LaTeX will trigger math mode and can't + occur within math mode: e.g., `align` or `equation`. Previously + we "downshifted" these, parsing an `align` environment as a + Math element with `aligned`, and an `equation` environment as a + regular display math element. With this shift, we put these in + Math inlines but retain the original environments. + texmath and MathJax both handle these environments well. + + * Typst reader: + + + Fix addition of image path prefix to use posix separator. + + Properly resolve image paths in included files (#11090). + + Handle inline-level show rules on block content (#11017). + Typst allows things like `smallcaps` to be applied to block-level + content like headings. This produces a type mismatch in pandoc, + so before processing the output of typst-hs, we transform it, + pulling the block-level elements outside of the inline-level + elements. + + * Org reader: + + + Improve sub- and superscript parsing (Albert Krewinkel). + Sub- and superscript must be preceded by a string in Org mode. Some text + preceded by space or at the start of a paragraph was previously parsed + incorrectly as sub- or superscript. + + Allow "greater block" names to contain any non-space char (#4287, + Albert Krewinkel). + + Accept quoted values as argument values (#8869, Albert Krewinkel). + + Recognize "fast access" characters in TODO state definitions + (#10990, Ryan Gibb). + + Improve org-cite parsing: Handle global prefix and suffix properly. + Use all and only the styles mentioned in oc-basic.el. + Allow space after `;`. + + * HTML reader: + + + Don't drop the initial newline in a `pre` element (#11064). + + * DocBook reader: + + + Add rowspan support (#10981, Sean Soon). + + Be sensitive to startingnumber attribute on ordered lists (#10912). + + * POD reader: + + + Fix named entity lookup (#11015, Evan Silberman). + + * Man reader: + + + Support header and footer reader (Sean Soon). + + * Markdown reader: + + + Don't confuse a span after an author-in-text citation with a + locator. E.g. `@foo [test]{.bar}`. + See https://github.com/jgm/pandoc/issues/9080#issuecomment-3221689892. + + Make definition lists behave like other lists (#10889). + If the `four_space_rule` extension is not enabled, + figure out the indentation needed for child blocks dynamically, + by looking at the first nonspace content after the `:` marker. + Previously the four-space rule was always obeyed. + + Fix tight/loose detection for definition lists, to conform to + the documentation. + + * ODT reader: + + + Support `table-header-rows` (Tuong Nguyen Manh). + + * Docx reader: + + + Don't add highlighting if highlight color is "none" (#10900). + + Handle strict OpenXML as well as transitional (#7691). + + Fix `stringToInteger` (#9184). It previously converted things like + `11ccc` to an integer; now it requires that the whole string be parsable + as an integer. + + Improve handling of AlternateContent. This fixes handling of + one representation of emojis in Word (#11113). + + * LaTeX writer: + + + Control figure placement with attribute (#10369, Sean Soon). + If a `latex-placement` attribute is present on a figure, it will be used + as the optional positioning hint in LaTeX (e.g. `ht`). With implicit + figures, `latex-placement` will be added to the figure (and removed from + the image) if it is present on the image. + + Include cancel package only if there is math that contains `\cancel`, + `\bcancel`, or `\xcancel`. + + Add braces around comments in `title-meta` (#10501). This is needed to + prevent PDFs from interpreting this as a sequence of titles. + + Set `pdf-trailer-id` if `SOURCE_DATE_EPOCH` envvar is set (#6539, Albert + Krewinkel). The `SOURCE_DATE_EPOCH` environment variable is used to trigger + reproducible PDF compilation, i.e., PDFs that are identical down to the + byte level for repeated runs. + + Be more conservative about using `\url` (#8802). We only use it when the + URL is all ASCII, since the `\url` macro causes problems when used with + some non-ASCII characters. + + Support soft hyphens (Albert Krewinkel). + + Change handling of math environments (#9711, #9296). + When certain math environments (e.g. `align`) are found in Math + elements, we emit them "raw" instead of putting them in `$..$`. + + * Typst writer: + + + Check `XID_Continue` in identifiers (Tuong Nguyen Manh). + + Add escapes to prevent inadvertent lists due to automatic wrapping + (#10047). Also simplify existing code that was meant to do this. + + Add parentheses around typst-native year-only citations (#11044). + + Add native Typst support for `nocite` (#10680, Albert Krewinkel). + The `nocite` metadata field can now be used to supply + additional citations that don't appear in the text, just as with citeproc + and LaTeX's bibtex and natbib. + + Set `lang` attribute in Divs (#10965). + + Rename `numbering` variable to `section-numbering` (Albert Krewinkel). + This is the name expected by the default template. + + Add support for custom and/or translated "Abstract" titles (Albert + Krewinkel, #9724). + + * Org writer: + + + Don't wrap link descriptions (#9000). Org doesn't reliable display + these as links if they have hard breaks. + + Disable smart quotes by default (Albert Krewinkel). + + * Markdown writer: + + + Better handling of pandoc-generated code blocks (#10926). + Omit the wrapper sourceCode divs added by pandoc around code blocks. + More intelligently identify which class to use for the one class + allowed in GFM code blocks. If there is a class of form `language-X`, + use `X`; otherwise use the first class other than `sourceCode`. + + Use fenced divs even with empty attributes (#10955, Carlos Scheidegger). + Previously fenced divs were not used in this case, causing the writer to + fall back to raw HTML. + + Match indents in definition items (#10890, Albert Krewinkel). + Previously, the first line of a definition details item always used a + colon and three spaces instead of respecting the tab-stop setting, which + could lead to round-tripping issues. Likewise, the indentation of + continuation paragraphs in definition lists now matches the + two-characters leader of the first line for Markua output. + + * DocBook writer: + + + Use `startingnumber` instead of `override` for start numbers on ordered + lists (#10912). + + * ANSI writer: + + + Make `--wrap=none` work properly (#10898). + + * Djot writer: + + + Fix duplicate attributes before section headings (#10984). + + * Docx writer: + + + Ensure that documents don't start with a section separator + (#10578, Albert Krewinkel). Any leading section separator is removed from + the result. + + * HTML writer: + + + Unwrap "wrapper" divs (#11014). Some of the readers (e.g. djot) add + "wrapper" divs to hold attributes for elements that have no slot for + attributes in the pandoc AST. The HTML reader now "unwraps" + these wrappers so that the attributes go on the intended elements. + + * Asciidoc writer: + + + Handle lists with sublists following continuations (#11006). + These require an additional blank line in some cases. + + * HTML styles template: prefix default styles with informative CSS comment + (Albert Krewinkel, #8819). + + * Org template: add `#+options` lines if necessary (Albert Krewinkel). + The default template now adds `#+options` lines if non-default settings + are used for the `smart_quotes` and `special_strings` extensions. + + * LaTeX template: + + + Don't emit empty `linkcolor=` in hypersetup (#11098). + + Add RTL support for LuaTeX engine (Reuben Thomas). + + * Typst template: + + + Add several new variables (Christopher T. Kenny, #9956): + `thanks`, `abstract-title`, `linestretch`, `mathfont`, `codefont`, + `linkcolor`, `filecolor`, `citecolor`. + + * `reference.docx`: + + + Don't left-align table header row (R. N. West, #11019). + + Update East Asia font theme in `styles.xml` to `minorEastAsia` (TomBen). + + Update language settings in `styles.xml` for East Asia to Simplified + Chinese (TomBen). + + * Text.Pandoc.PDF: + + + `makePDF`: automatically embed resources from media bag in HTML + before trying to convert it with weasyprint, etc. (#11099). + This will give better results when converting from formats like docx. + + Use `utf8ToText` for LaTeX log messages. + + Make images from MediaBag available in tmp dir for every PDF engine, + not just LaTeX/ConTeXt (#10911). + + Improve error readability when pdf-engine is not supported (Albert + Krewinkel). Each supported engine is now printed on a line of its own. + + Allow `pdflatex-dev` and `lualatex-dev` as PDF engines (#10991, Albert + Krewinkel). These are the development versions of the LaTeX binaries; + installable, e.g., with `tlmgr install latex-base-dev`. + + Clean up `makePDF` (Albert Krewinkel). + + Avoid encoding errors when reading LaTeX logs (#10954). + + * Text.Pandoc.Readers: + + + Raise unknown reader error for `ods`, `odp`, `odf`, `xls`, + `xslx`, `zip` extensions. + + * Text.Pandoc.App: + + + Recognize binary signatures and fail early (Repetitive). Fail early when + receiving binary input with recognized signature: zip[-based], including + OpenDocument and Microsoft formats, PDF, CFBF-based (old Microsoft formats + including .doc and .xls), DjVu. + + Remove code duplication around version info. + Text.Pandoc.App.CommandLineOptions and `pandoc-cli/src/pandoc.hs` + had similar code for generating version information. + To avoid duplication, we now export `versionInfo` from + Text.Pandoc.App [API change]. This function has three parameters that can + be filled in when it is called by `pandoc-cli`. + + * Text.Pandoc.Parsing: + + + `tableWith` and `tableWith'` now return a list of lists of Blocks, rather + than a list of Blocks, for the header rows, allowing for multiple header + rows [API change] (#10338, TuongNM). + + * Text.Pandoc.Citeproc: + + + Don't move footnotes around em-dashes (#11046). + + Allow `--citeproc` to put the bibliography in a Div with id `refs` + even when `--file-scope` is used (#11072). When `--file-scope` + is used, a prefix will be added based on the filename, so the Div + will end up having an identifier like `myfile.md__refs`. + Previously, this prevented the bibliography from being added to + the marked Div. Now pandoc will add the bibliography to any Div + with the id `refs` or any id ending in `__refs`. + + * Text.Pandoc.Citeproc.BibTeX: Protect case in periodical titles (#11048). + Thus, for example, `{npj} Quantum Information` should translate as + `[npj]{.nocase} Quantum Information`. + + * Text.Pandoc.ImageSize: + + + Detect more JPEG file signatures (R. N. West and John MacFarlane, #11049). + + Unpack compressed object streams in PDFs and look inside for MediaBox + information (#10902). + + Add Point and Pica as constructors of ImageSize [API change] (#8957). + This will prevent unnecessary conversion of units. + + Add Avif constructor on ImageType [API change] and support avif images + (#10979). + + * Text.Pandoc.Writers.Shared: + + + Amend docs of `lookupMeta...` functions (#10634, Albert Krewinkel). + + * Text.Pandoc.Options: + + + Add and export `defaultWebTeXURL` WebTeX URL [API change] (#11029, + Sean Soon). This fixes the `webtex` option when used without + parameter in a defaults file. + + Add type `HighlightMethod` and patterns [API Change] (Albert Krewinkel). + + The `writerListings` and `writerHighlightStyle` fields of the + `WriterOptions` type are replaced with `writerHighlightMethod` + [API change] (Albert Krewinkel, #10525). + + * Text.Pandoc.Extensions: + + + Remove `Ext_compact_definition_lists` constructor for + `Extension` [API change]. + + Add `Ext_smart_quotes` and `Ext_special_strings` constructors. + [API change]. + + * Text.Pandoc.SelfContained: + + + Try fetching relative resources without query or fragment if the original + fetch fails. This provides a fix for #1477 in a way that doesn't raise + the problems mentioned in #11021. + + * Text.Pandoc.Highlighting: + + + Export `defaultStyle` [API Change] (Albert Krewinkel). + This allows to be more explicit about using a default style, and + providing a single point of truth for its value. The variable is + an alias for `pygments`. + + * Text.Pandoc.Class: + + + `downloadOrRead`: do not drop fragment/hash for local file paths (#11021). + With the previous behavior it was impossible to have an image + file containing `#` or `?`. + + Export function `runSilently` [API Change] (Albert Krewinkel). + The function runs an action in the PandocMonad, but returns all log + messages reported by that action instead of adding them to the main log. + + Make CommonState opaque. Text.Pandoc.Class now exports CommonState as + an opaque object, without its fields. [API change] + The internal module Text.Pandoc.Class.CommonState still exports + the fields. + + Text.Pandoc.Class now exports the following new functions: + `getRequestHeaders`, `setRequestHeaders`, `getSourceURL`, + `getTrace`. [API change] + + CommonState now has a `stManager` field. This allows us to cache the HTTP + client manager and reuse it for many requests, instead of creating it again + (an expensive operation) for each request. This fixes a memory leak and + performance issue in files with a large number of remote images (#10997). + + * Lua subsystem (Albert Krewinkel): + + + Add function `pandoc.structure.unique_identifier`. + + Add functions `pandoc.text.superscript` and `subscript`. + + Use proper interface functions to access the CommonState. + The `PANDOC_STATE` is no longer a userdata object, but a table that + behaves like the old object. Log messages in `PANDOC_STATE.log` are now + in temporal order. + + Add function `pandoc.path.exists`. + + Add `normalize` function to *Pandoc* objects (#10356). + This function performs a normalization of Pandoc documents. E.g., + multiple successive spaces are collapsed, and tables are normalized such + that all rows and columns contain the same number of cells. + + Add more UTF-8-aware file operations to `pandoc.system`. + Functions that expect UTF-8-encoded filenames should make it easier to + write platform-independent scripts, as the encoding of the actual + filename depends on the system. In addition, there is a new + generalized method to run commands, and functions to retrieve XDG + directory names. The new functions are `command`, `copy`, `read_file`, + `remove`, `rename`, `times`, `write_file`, `xdg`. + + Allow hslua-2.4. + + Require lua-module-system 1.2.3. This provides List methods to the value + returned by `pandoc.system.list_directory` (#11032). + + * MANUAL.txt: + + + Fix broken ConTeXt links (R. N. West, #11055). + + Add `xml` as input/output format. + + Fix minor capitalization typo (#11052, Albert Krewinkel). + + * `doc/lua-filters`: + + + Fix docs for `pandoc.Cite` (Albert Krewinkel). + + Don't encourage returning tables of filters from Lua filters + (R. N. West, #10995). Use the `Pandoc:walk` method instead. + + * doc/extras.md: Fix link to pandoc-mode (Erik Post). + + * doc/lua-filters.md: Add example on using pandoc.Table constructor (#10956, + Sean Soon). + + * Update `default.csl` from new chicago-author-date.csl, which is now + for the 18th edition. + + * Use latest releases of citeproc, typst-hs, texmath, doclayout, + skylighting-core, skylighting. + +## pandoc 3.7.0.2 (2025-05-28) + + * RST writer: + + + Don't emit alignment markers in grid tables (#10857). + + * Asciidoc writer: + + + Add support for sidebars (GHyman83). + + * LaTeX writer: + + + Include alt option in `\includegraphics` (#6095). + + * Markdown writer: + + + Preserve figure attributes (Nikolay Yakimov, #10867). + Fixes a regression introduced by 0d2114e, which caused the + Markdown writer to ignore attributes on the figure if it + has class or key-value attributes set. + + * HTML writer: + + + Use the ID prefix in the ID for the footnotes section (Benjamin Esham). + + * Text.Pandoc.Writers.Shared: + + + `gridTable`: fix (3.7) regression with missing cell alignments (#10853). + + `gridTable`: fix headings with colspans (#10855). If the heading + contains a colspan, we still need to include information in the header + line about the colspecs. + + `gridTable`: fix headerless tables. The top line should encode + colspan information. + + * Text.Pandoc.SelfContained: + + + Fix handling of empty script element (#10862). Previously in this + case the closing tag was dropped. + + Do not drop `data-` attributes in script tags (#10861). + + * Lua subsystem (Albert Krewinkel): + + + Add function `pandoc.mediabag.make_data_uri` (#10876). + The function takes a MIME type and raw data from which it creates an + RFC 2397 data URI. + + * `tools/update-lua-module-docs`: fix handling of wikilinks + (Albert Krewinkel). + + * `doc/lua-filters.md`: add missing docs for `pandoc.Caption` + (Albert Krewinkel). + + * Require texmath 0.12.10.3, typst 0.8.0.1 + +## pandoc 3.7.0.1 (2025-05-17) + + * Text.Pandoc.Shared.Writer: Fix numerous problems with `gridTable` and add + tests (#10848). These fixes affect the Markdown, RST, and Muse writers. + + * Fix context writer/template to produce tagged PDFs (#10846). + As before, the `tagging` extension must be enabled. + We now add the command that tells ConTeXt to start tagging. + +## pandoc 3.7 (2025-05-14) + + * Add new command-line option `--variable-json` (#10341). + This allows non-string values (booleans, lists, maps) to be given to + template variables on the command line. + + * The `--pdf-engine` option can now take `groff` as a value. + + * Markdown writer: + + + Avoid spaces after/before open/close delimiters (#10696). + E.g. instead of rendering `x<em> space </em>y` as `x* space *y` we render + it as `x *space* y`. + + Handle row/colspans in grid tables, and expand cells when it isn't + possible to lay them out without breaking string of non-whitespace. + + Render a figure with Para caption as implicit figure (#10755). + + When falling back to a Div with class `figure` for a figure that + can't be represented any other way, include a Div with class + `caption` containing the caption. + + Improve use of implicit figures when possible (#10758). + When the alt differs from the caption, but only as regards formatting, we + still use an implicit figure. + + Omit initial newlines in gfm `math` blocks to avoid an ugly blank line. + * Support the `four_space_rule` extension for `plain` output (#10813, + Manolis Stamatogiannakis). + + * RST writer: + + + Handle row/colspans in grid tables, and expand cells when it isn't + possible to lay them out without breaking string of non-whitespace. + + * Muse writer: + + + Handle row/colspans in grid tables, and expand cells when it isn't + possible to lay them out without breaking string of non-whitespace. + + * JATS writer: + + + Fix escaping for writing-review-editing role (#10744). + + * HTML writer: + + + Remove trailing slash from default revealjs URL (#8749). This + avoids a double slash in the URL's path component. + + * LaTeX writer: + + + Make alignment work within `multirow` in tables (#10772). + + * Typst writer: + + + Support `mark` class on spans (#10747). + + Add equation label if math contains `\label{..}` (#10805). + + * Roff format writers (man, ms): + + + Use the most compatible form for roff escapes (#10716). + For example, `\(xy` instead of `\[xy]`. This was the original + AT&T troff form and is the most widely supported. The + bracketed form causes problem for some tools, e.g. + `makewhatis` on macOS. And emit `e` followed by an escape + for a unicode combining accent rather than the form `\[e aa]`, + which works for groff but not e.g. on macOS's man. + This change affects Text.Pandoc.RoffChar, + Text.Pandoc.Writers.Roff, and the Man and Ms writers. + + * Docx writer: + + + Ensure that figures and tables with custom styles are not dropped + (#10705). + + Preserve Relationships for images from reference docx (#10759). + This should allow one to include an image in a reference.docx and + reference it in an openxml template. + + Don't renumber rels (#10769). We used to renumber the + Relationships so they didn't conflict with the set of fixed + Relationships we imposed. We are now preserving the ids + from the reference doc's document.xml.refs, so we shouldn't + renumber them or references introduced by the user (e.g. in + a template) will fail. + + * Ms writer: + + + Improve PDF TOC labels. We now use the plain writer to render these, + so that Greek characters etc. will show up properly. + + When no `pdf-engine` variable is specified, do not use the + `.pdfhref` macros at all (#10738). This gives better results for links + in formats other than PDF, since the link text would simply + disappear if it exists only in a `.pdfhref` macro. When a PDF + engine is specified, escape the argument of `.pdfhref O` in a way + that is appropriate. + + * OpenDocument writer: + + + Fix character styles in footnotes (#10791). Character + styles governing the position of the footnote reference + should not be imposed on the footnote text. + + * Powerpoint writer: + + + Use reference-doc font for captions (#9896, R. N. West). + + * DocBook writer: + + + Use literallayout element for LineBlock (#10825). + + * MediaWiki reader/writer: + + + Allow definition on same line as term (#10708). + + * LaTeX reader: + + + Skip at most one argument to LaTeX tabular newline (#7512, + Evan Silberman). + + Disable ligatures inside `\texttt` (#10781). + + Support more symbol commands (#10782). + + * Commonmark Reader: + + + Handle GFM math irregularity with braces (#10631). In GFM, you need + to use `\\{` rather than `\{` for a literal brace. + + * DocBook reader: + + + Improve handling of literallayout (#10825). This is now only made + a CodeBlock when there is a `monospaced` class. Otherwise it is made + a LineBlock. + + * Org reader: + + + Add AVIF to Org Reader image extensions (#10736, Christian Christiansen). + + Don't include newlines in inine code/verbatim (#10730). + Convert newlines to spaces as we do in other formats. + + Change handling of inline TeX (#10836). Previously inline + TeX was handled in a way that was different from org's own export, + and that could lead to information loss. This was particularly noticeable + for inline math environments such as `equation`. Previously, an + `equation` environment starting at the beginning of a line would create + a raw block, splitting up the paragraph containing it (see + #10836). On the other hand, an `equation` environment not + at the beginning of a line would be turned into regular + inline elements representing the math. (This would cause + the equation number to go missing and in some cases degrade + the math formatting.) Now, we parse all of these as raw + "latex" inlines, which will be omitted when converting to + formats other than LaTeX (and other formats like pandoc's + Markdown that allow raw LaTex). + + * Beamer template: fix regression in 3.6.4, reverting the omission of + `\date` when the document does not have a date. By default, beamer + will display a date when no `\date` is present in the title block, + so this was an unintended behavior change. The reverted + change was motivated by the desire to include a custom + `\date` in the frontmatter via header-includes. This can be + achieved more simply by simply setting the `date` variable. + In markdown you can even use `date` in metadata and put some + raw LaTeX there. + + * Ms template: + + + Use T rather than P as default font family (#10738). + + Put PDF-specific things under a conditional. + Don't include them if `pdf-engine` isn't set. + + * Upgrade reveal.js URL to v5 (#10740, Kolen Cheung). + v4 is no longer available on unpkg.com. + + * Text.Pandoc.PDF: Allow `groff` to be used as `--pdf-engine` with `ms` + (#10738). When `groff` is used as a PDF engine, the `groff` + extension to `ms` is automatically enabled. Limitations: + + - `groff` currently produces larger PDFs than `pdfroff`. + - With `groff`, a table of contents produced with + `--table-of-contents/--toc` will always be placed at the end of + the document. + - Certain characters (e.g. Greek characters) may be dropped in + the PDF outline. + + * Text.Pandoc.Writers.Shared: + + + Export `delimited` [API change]. + + New version of `gridTable` (#6344) [API change]. This + handles row and colspans. It also ensures that cells won't + wrap text in places where it wouldn't normally wrap, even + if this means making the cells wider than requested by the + colspec (#9001, #7641). Because the parameters are + different, this is a breaking API change. + + * Text.Pandoc.App: set `pdf-engine` variable. + If `--pdf-engine` is specified or if a PDF is being produced, we set the + `pdf-engine` variable. This allows writers and templates to behave + differently depending on the PDF engine. + + * Text.Pandoc.Class and Text.Pandoc.URI: + + + Fix parsing of base64 data URIs to allow URI escapes and + whitespace (which will be ignored) (#10704). + + Handle percent encoding in `pBase64URI` instead of + unescaping later, for efficiency (#10704). + + * Text.Pandoc.Citeproc.BibTeX: + + + Recognize `en` as a `langid` in biblatex bibliographies (#10764). + + * Text.Pandoc.MIME: + + + Add mime type and extension for `avif` (#10704). + + Handle `apng`, `avif`, `jxl` (#10704). + + * Text.Pandoc.Readers.LaTeX.Math: export `inlineEnvironmentNames`. + Internal module, not a change to the public API. + + * `reference.docx` (Andrew Dunning): + + + Remove extra spaces around text placeholders. + + Add footnote block text sample. + + * Text.Pandoc.Class.Sandbox: + + + Add `sandboxWithFileTree` function [API change] (Albert Krewinkel). + + * Lua subsystem (Albert Krewinkel): + + + pandoc-lua-engine: add all test files to the cabal file. + + Allow `pandoc.read` to be called in "sandbox" mode for added + security (#10831). Readers running in a sandbox will not be + able to access the network or file system. The sandbox is + enabled if the fourth parameter is a list of files or + filename/content pairs. The files are read and then made + available in the sandbox via en ersatz file system. + + * Makefile: + + + Add target `release-checkist`. + + Install @daisy/ace from npm if not present. + + Use pandoc lua instead of lua. + + Fix typo in `latex-package-dependencies` target. + + Use `jq` instead of `json_reformat` in `validate-docx-golden-tests2`. + + * NiX infrastructure: new working `flake.nix` and simpler `shell.nix`. + Removed old `default.nix`. + + * Require random >= 1.3 and use `splitGen`. `split` has been deprecated. + + * Use citeproc-0.9. Bump citeproc bounds for pandoc, pandoc-lua-engine. + + * Use texmath-0.12.10.1. + + * Use released typst 0.8 (partially supporting typst 0.13). + + * Use citeproc 0.9.0.1. + + * MANUAL.txt: + + + Fix default URL for revealjs. + + Add note that `alerts` extension only works with commonmark (#9716). + + Remove "Body Text Char" from list of Word styles that can be customized + using a reference.docx (#10646). This doesn't seem to be present in + pandoc-generated docx files, nor is it a Word default. + + For pandoc lua, add note about the environment. + + Improve documentation of `--variable` option. + + * `doc/typst-property-output.md`: Mention that `typst:no-figure` is a + class, not an attribute (#10826, Niklas Eicker). + + * Change RELEASE-CHECKLIST to RELEASE-CHECKLIST-TEMPLATE.org. Use org-babel + to automate many of the steps of the release. + + * INSTALL.md: update MacPorts information (#10719, Mohamed Akram). + + * COPYRIGHT: fix link to source code. + + * CONTRIBUTING.md: Fix link to discussion forum. (#10834, R. N. West). + +## pandoc 3.6.4 (2025-03-16) + + * Disable `citations` extension in writers if `--citeproc` is used (#10662). + Otherwise we get undesirable results, as the format's native + citation mechanism is used instead of (or in addition to) the + citeproc-generated citations. + + * Markdown reader: + + + Allow line break between URL and title of link (#10621). + + Give better position information when YAML metadata parsing fails + with a YAML exception (#10231). + + Fixed `escapedChar'` parser (#10672). It should not accept + escaped newlines. + + Remove some misguided list fanciness (#9865, #7778, cf. #5628). + Previously we tried to handle things like commented out list items: + ``` + - one + <!-- + - two + --> + - three + ``` + and also things like: + ``` + - one `and + - two` and + ``` + But the code we added to handle these cases caused problems with + other, more straightforward things, like: + ```` + - one + - ``` + code + ``` + - three + ```` + So we are rolling back all the fanciness, so that the markdown + parser now behaves more like the commonmark parser, in which + indicators of block-level structure always take priority over + indicators of inline structure. + + * HTML reader: + + + Skip MathJaX-introduced cruft (#10673). + + Ignore style tags in the body (#10643). + + * LaTeX reader: + + + Better handle comments/whitespace in option lists and includes (#10659). + + Support `\newline`, `\linebreak`. + + * Docx reader/writer: + + + Revert commit adding row heads + (cbe67b9602a736976ef6921aefbbc60d51c6755a) (#10627). + Word sets `w:firstColumn="1"` by default for tables. You have to find + the Table Design tab and explicitly uncheck "First Column" to make this + go away. In most cases, I don't think writers intend to designate + the first column as a row head, so this commit is going to produce + unexpected results. In addition, because of the table normalization + done by pandoc-type's `tableWith`, any table containing a colspanned + cell in the left-hand column will get broken if the first column is + designated a row head. For these reasons it seems best to revert this + change, which was made in response to #9495. + + * LaTeX writer and template: + + + Remove `selnolig-langs` (#9863). We now specify the language as + a global option again, so we no longer need to specify it when + invoking selnolig. + + Use babel options `shorthands=off` (#6817). + + Use `*` for multirow width when no colwidth specified (#10685). + Otherwise the multirow will be excessively wide. + + Protect `\phantomsection` (#10688, etclub). + + * Markdown writer: + + + Omit extra space after bullets (#7172). Those who want the old + behavior can obtain it by using `-t markdown+four_space_rule`. + + Treat `Emph [Emph ils]]` as `ils` (#10642). Otherwise we get + `**content**` which means strong emphasis. + + * EPUB writer: + + + Use a nonbreaking space after section number in nav.xhtml. + This seems to be required for iOS books app to display the space. + + * Typst writer: + + + Better heuristics for escaping potential list markers (#10650). + + Ensure that `citation-style` works as well as `csl` (#10661). + + * Powerpoint writer: + + + Avoid extra blank lines before author when there is no + subtitle (#10619). + + * JATS template: + + + Fix typo in author prefix in article.jats_publishing template + (#10622, Tiago-Manzato). + + * Text.Pandoc.Parsing: + + + Smart quote parsing: ignore curly quotes (#10610). Previously we + tried to match curly quotes as well as straight quotes, + producing Quoted inlines. But it seems better just to assume + that those who use curly quotes want them passed through + verbatim. This also fixes an (unintended) bug whereby curly + single left quotes would sometimes be changed to single right quotes. + + * Text.Pandoc.Shared: + + + `makeSections`: put some attributes on section element only. + Certain `role` and `epub:type` attributes should only be on the section + (and indeed, many `role`s give a validation error if left on the + heading element). + + * Text.Pandoc.Logging: + + + Change NoTitleElement from WARNING to INFO (#10671). Users + commonly complain about the warning when producing HTML + documents without an explicit title. It seems that an info + message is more appropriate, since pandoc's default here (using + the input's base name) ensures compliance with the standard and + many users are happy with that default. Those who want to make + sure the message is seen can use `--verbose`. + + * Beamer template: only emit `\date` if set (#10687, josch). + + * Fix invalid OOXML in definition_list.docx test (#10394). + + * MANUAL.txt: + + + Correct typo: 'date' for doubled 'title' (#10654, Olivier Dossmann). + + Add note about `template` variable for typst. + + Change maxwidth default in MANUAL.txt (#10683). + + Improve EPUB metadata documentation. + + In Security section, alert readers to a threat relating to iframe in + HTML, and add LaTeX, Typst to the list of formats that have an + `include` (#10682). + + * `doc/lua-filters.md`: Add missing html_math_method 'katex' (R. N. West). + + * Use texmath 0.12.9. + + * Use typst 0.7. Fixes an issue with package loading, a regression + in pandoc 3.6.3. + +## pandoc 3.6.3 (2025-02-09) + + * Track wikilinks with a class instead of a title (Evan Silberman). + Previously wikilinks were distinguished by giving them the `title` + `wikilink`. Now that we have link attributes, it makes more sense + to give them the `class` `wikilink`. This change affects all readers + and writers that support wikilinks. + + * DocBook reader: + + + Handle title inside `orderedlist` (#10594). Also some other + elements that allow title: `blockquote`, `calloutlist`, etc. + + Better handle `informalequation` (#10592, tombolano). Include `id` + attribute. + + Better handle `formalpara`, `example`, and `sidebar` (#8666, tombolano). + Include identifiers and titles in each case. + + * Markdown reader: + + + Simplify and fix normal citation parsing (#10584). + This fixes a bug that causes some normal citations to be + parsed as bracketed regular citations. + + * ODT reader: + + + Create Figure elements for images that are figures (#10567). + + Avoid producing spurious blockquotes in list items (#9505). + + Fix unwanted block quotes (#10575). Previously the reader created + block quotes whenever a paragraph was marked indented (even though + this just affects the first line). With this change we still + generate block quotes for content that has an altered left margin, + but not for indented paragraphs. + + * Docx reader: + + + Do not issue warning for comments with `+styles` (#10571, Stephen Reindl). + + * LaTeX reader: + + + Test \{,re}newcommand arguments (#4470, Evan Silberman). + + * Pod reader: + + + Consume blanks after =encoding in pod reader (#10537, Evan Silberman). + + * JATS writer: + + + Add CRediT roles to JATS (Charles Tapley Hoyt and Jez Cope, #10152). + Enable annotating author roles using the Contribution Role Taxonomy + (CRediT) and export this information in conformant JATS. + + * LaTeX writer/templates: + + + Improve babel support (#8283). Previously we used the `.ini` + files for every language, but for European languages these tend to + provide inferior results to the `.ldf` files used by classic + Babel. Currently Babel documentation recommends using the classic + system for European languages written in Latin and Cyrillic + scripts and Vietnamese. So the LaTeX writer and template now + follow this guidance. + + Main languages in the list of languages with good "classic" support + are added to global documentclass options and will be automatically + handled by Babel using the `.ldf` files. + + If the main language is not in this list, the `babeloptions` variable + will be set to `provide=*`, which will cause support to be loaded from + the `.ini` file rather than an `.ldf`. So, for example, setting + `-V babeloptions=''` with a polytonic Greek document will cause the + `.ldf` support to be used instead of the `.ini`. + + The default setting of this variable can be overwritten, but in most + cases the default should give good results. + + + Allow `csquotesoptions` to be specified. + + Fix indentation bugs in `font-settings.latex`. + + * Docx writer: + + + Repeat reference doc's `sectPr` for each new section (#10577). + Previously we were only carrying over the reference doc's `sectPr` + at the end of the document, so it wouldn't affect the intermediate + sections that are now added if `--top-level-division` is `chapter` + or `part`. This could lead to bad results (e.g. page numbering + starting only on the last chapter). + + Create section divisions with `--top-level-division=part` (#10576). + + Improve title style in reference.docx; base Author and Date + on Title; remove condensed spacing (Andrew Dunning, #10581). + + * Typst writer: + + + Brace tables with `typst:no-figure` and `typst:text` attributes (#10563, + Gordon Woodhull). + + * Ms writer: + + + Fix escaping of `-` (#10536). `-` should now be escaped in man + output but not in ms output (where `\-` is a unicode minus sign). + + * HTML styles: fix style of `hr` so it works when printed (#10535, Hendrik Erz). + Previously `background-color` was used to style the hr, but this gets ignored + when printing. This commit uses `border-top` instead. + + * Text.Pandoc.Shared: + + + Handle `<abbr>` as a span-like inline in `htmlSpanLikeElements` + (#5793, Evan Silberman). + + * Text.Pandoc.MediaBag: + + + Prefer MIME type when determining extensions for MediaBag items (#10557, + Max Heller). This should give different results for remote images + that are served at URLs that do not contain misleading extensions + (e.g. `shields.io`). + + * Text.Pandoc.Citeproc: + + + Fix moving punctuation before citation notes. This previously worked with + regular citations, but not author-in-text citations. Now it works with both. + + * `doc/lua-filters.md`: + + + Correct luacheck URL (#10589, R. N. West). + + Add static analysis paragraph to debugging section (#10568, R. N. West). + + Add note about extensions handling in `read` and `write` (Albert Krewinkel). + + * `doc/extras.md`: + + + Add entry for pandoc-subfigs (R. N. West). + + Update diagram Lua filter URL and description (R. N. West). + + * MANUAL.txt: + + + Add note on using typst to produce pdf/a-2b. + + Document top-level-division functionality with Docx (#10579, Andrew Dunning). + + * Raise xml-conduit upper bound. + + * Depend on latest commonmark-pandoc, commonmark-extensions, + citeproc, typst. + + * Makefile: make `make binpath` quiet. + +## pandoc 3.6.2 (2025-01-12) + + * New input format: `pod` (Evan Silberman). Pod ("Plain old documentation") + is a markup languaged used principally to document Perl modules and + programs. + + * New reader module Text.Pandoc.Readers.Pod, exporting `readPod` + [API change]. + + * Docx reader: + + + Support row heads in tables (#9495). Reader: When `w:tblLook` has + `w:firstColumn` set (or an equivalent bit mask), we set row heads = 1 + in the AST. + + Read table styles as custom styles when `styles` extension + is enabled (#9603). + + * HTML reader: + + + Add size information for font awesome SVG icons (#10134). + If the icon has class `fa-fw` or `fa-w16` or `fa-w14`, we add a width + attribute to prevent the icon from appearing full-width in PDF or + docx output. + + * Djot reader: + + + Use a Span with class "mark" rather than "highlighted" for + highlighted text, for consistency with the other pandoc readers and + writers. + + * mandoc reader: + + + Add mdoc St for C23 (Evan Silberman). + + * RST reader: + + + Fix handling of underscores (#10497). Fixes a a regression + introduced in 3.6. + + * Docx writer: + + + Support row heads in tables (#9495). Writer: set `w:firstColumn` in + `w:tblLook` when there are row heads. (Word only allows one, so this + is triggered by any number of row heads > 0.) + + * Djot writer: + + + Render a Span with sole class "mark" as highlighted text. + + * Asciidoc writer: + + + Don't emit the class in a span if it's just "mark" (#10511). + The "mark" class is used for highlighting, and Asciidoc treats + bare `#...#` with no attributes as highlighted text. + + Improve escaping (#10385, #2337, #6424). + + * EPUB v2 writer: + + + Fix cover image (#10505). This is a regression introduced in 3.6. + + * Typst writer: + + + Fix handling of pixel image dimensions (#9945). + These are now converted to inches as in the LaTeX writer. + + * Improve error message given when users specify `asciidoc` as input + format (#8416, Santiago Zarate). + + * Allow random 1.3. + + * Use texmath 0.12.8.13 (typst improvements). + + * `lua-filters.md`: document `system.os` return values (#10523). + + * `MANUAL.txt`: + + + Improve manual's coverage of custom styles. + + Replace LibreOffice PDF documentation link to latest so it links + to the latest major release rather than a specific major release + (which there are two of every year) (Stéphane Guillou). + + Improve links and descriptions for `odt`, `opendocument` (#10518). + +## pandoc 3.6.1 (2024-12-23) + + * Allow YAML bibliographies to be arrays of references (#10452). + Previously, they had to be YAML objects with a `references` key. + + * Change `--template` to allow use of extensionless templates (#5270). + The intent is to allow bash process substitution: e.g., + `--template <(echo "foo")`. Previously pandoc *always* added an + extension based on the output format, which caused problems + with the absolute filenames used by bash process substitution + (e.g. `/dev/fd/11`). Now, if the template has no extension, + pandoc will first try to find it without the extension, and + then add the extension if it can't be found. So, in general, + extensionless templates can now be used. But this has been + implemented in a way that should not cause problems for + existing uses, unless you are using a template `NAME.FORMAT` + but happen to have an extensionless file `NAME` in the template + search path. + + * Allow `--shift-heading-level-by=-1` to work in djot in the same way + it works for other formats (with the top-level heading being + promoted to metadata title) (#10459). This needed special + treatment because of the way djot surrounds sections with Divs. + + * RST reader: + + + Handle explicit reference links (#10484, Evan Silberman). + This case was missed when changing the reference link strategy for + RST to allow a single pass. (It is a regression in pandoc 3.6.) + + * Markdown reader: + + + Use T.P.URI's `pBase64DataURI` in parsing data URIs (#10075, + Evan Silberman and John MacFarlane). + + More efficient base64 data URI parsing (#10075, Evan + Silberman and John MacFarlane). This should yield dramatic + performance improvements for markdown documents containing + large data URIs in images. + + * HTML reader: + + + Don't canonicalize data: URIs (#10075). It can be very expensive + to call network-uri's URI parser on these. + + * LaTeX reader: + + + Handle `figure*` environment as a figure (#10472). + + * MediaWiki reader: + + + Allow empty quoted attributes (#10490). + + Allow cells starting with `+` (#10491). + + * Textile reader: + + + Improve parsing of spans (#9878). The span needs to be separated + from its surroundings by spaces. Also, a span can have attributes, + which we now attach. + + Inline constructors shouldn't trigger if closer is preceded by + whitespace (#10414). + + * Docx writer: + + + Put chapters in separate sections, and restart footnotes + by section by default (#2773). The main effect of this change is that + when `--top-level-division=chapter` is used, chapters will start on + a new page and footnote numbering will restart for each chapter. + Both of these defaults can be overridden in the reference.docx. + + Use styleIds not styleNames for Title, Subtitle, etc. + (#10282). This fixes a regression introduced in pandoc 3.5. + This change affects the default openxml template as well as the + OpenXML writer. + + * Markdown writer: + + + Avoid collapsing of initial/final newline in markdown raw blocks. + This makes it easy to write a filter that adds extra blank lines + before certain elements (#10477). + + * Mediawiki writer: + + + Escape line-initial characters that would otherwise be interpreted + as list starts (#9700). + + * LaTeX writer: + + + Properly handle boolean value for `csquotes` variable (#10403). + + Use displayquote for block quotes with `csquotes` (#10456). + + * HTML writer: + + + Avoid calling parseURIString for data URIs (#10075). + This was done to determine the "media category," but we can + get that directly from the mime component of data: URIs. + + * Typst writer: + + + Properly handle data URIs in images (#10460). + + * LaTeX/Beamer templates: + + + Fix default.beamer `nocite` location (Thomas Hodgson). + It must be inside a frame or it is ignored (#10465). + + Move nocites from LaTeX preamble to body (#10461, Thomas + Hodgson). Putting `\nocite` in the preamble works only with biblatex. + + * Text.Pandoc.Parsing: + + + Correct example in comment on `charsInBalanced` (Evan Silberman). + + * Text.Pandoc.Error: + + + Mention typst in rendering `PandocUnknownWriterError` for `pdf` + (Evan Silberman). + + * Text.Pandoc.MediaBag: + + + `insertMedia`: fast path for data URIs. Avoid the slow URI + parser from network-uri on large data URIs (#10075). + + * Text.Pandoc.Class: + + + Add shortcut for base64 data URIs in `downloadOrRead` (#10075). + This avoids calling the slow URI parser from network-uri on + data URIs, instead calling our own parser. + + * Text.Pandoc.MIME: + + + Fix `extensionFromMimeType`. We had a few special cases encoded, + but as previously written they wouldn't work properly with + modifiers like `;charset=utf-8`. + + * Text.Pandoc.URI: + + + Export `pBase64DataURI`. Modify `isURI` to use this and avoid + calling network-uri's inefficient `parseURI` for data URIs. + + * Text.Pandoc.PDF: + + + Fix temp file extension in `toPdfViaTempFile` (#10468). + This fixes a regression in pandoc 3.6, which changed + the extension from `html` to `source`. Apparently + `wkhtmltopdf` needs it to be `.html`. So now we have added + a parameter to `toPdfViaTempFile` that allows the extension + to be specified in a way that is appropriate to the PDF engine + used. + + * Lua (Albert Krewinkel): + + + Support more elements as input to `pandoc.utils.stringify` + (#10450). Elements of type Caption, Cell, TableHead, and TableFoot + can now be stringified. + + Add `Caption` constructor to `pandoc` module. + + * Miscellaneous code quality improvements (Joseph C. Sible). + + * Depend on citeproc 0.8.1.2, skylighting and skylighting-core + 0.14.5. + + * `doc/lua-filters.md: Fix links to constructors (Albert Krewinkel). + + +## pandoc 3.6 (2024-12-07) + + * Add `mdoc` as input format (Evan Silberman). This change + introduces a reader for mdoc, a roff-derived semantic markup + language for manual pages. This reader has been developed almost + exclusively against mandoc's documentation and implementation of + mdoc as a reference, and the real-world manual pages tested + against are those from the OpenBSD base system. Of ~3500 manuals + in mdoc format shipped with a fresh OpenBSD install, 17 cause the + mdoc reader to exit with a parse error. Any further chasing of + edge cases is deferred to future work. + + * New module: Text.Pandoc.Readers.Mdoc, exporting `readMdoc` [API change]. + + * Issue warnings for duplicate YAML metadata keys (#10312). + + * Ensure that `--sandbox` affects `--embed-resources`. Previously it + did not (contrary to what was implied by the manual), which means + that an image with URL `/etc/passwd` would leak an encoded version + of that file to HTML output with `--self-contained` or + `--embed-resources`, even if `--sandbox` was used. Thanks to + Samuel Mortenson for pointing out the issue. + + * Text.Pandoc.App.OutputSettings: add `sandbox'` function. + This computes the sandboxed files from Opt and avoids code repetition. + + * Docx reader: + + + Parse index references as empty spans with attributes (#10171). + Attributes included are `entry`, and optionally `bold`, `italic`, + `yomi`, `see`. + + Don't create multiple paragraphs for title or subtitle (#10359). + If there are multiple paragraphs with Title or Subtitle style, + use only the first for metadata. + + Handle case where Zotero `itemData` has different id from the + `citationItem` id. In this case we use the `citationItemId` + in the bibliography as well, overriding the `referenceId` + in the itemData (#10366). + + * LaTeX reader: + + + Put parsed minipage in specially marked Div (#10266). + + * HTML reader: + + + Parse footnotes defined by dpub-aria roles (#5294). + + * MediaWiki reader: + + + Fix indented tables with caption (#10390). + + Fix parsing of col/rowspan (#6992). + + * Typst reader: + + + Avoid generating empty paragraphs. + + Support `underparen`, `overparen`. + + Fix `#quote` attribution. If attribution is not present, don't print + the `--` (#10320). + + Fix typo in unicode code point for em dash (see #10320). + + * Commonmark reader: + + + `implicit_figures` should check for empty caption + and not produce an implicit figure in this case (#10429). + + * RST reader: + + + Use a new one-pass parsing strategy. Instead of having an initial pass + where we collect reference definitions, we create links with target + `##SUBST##something` or `##REF##something` or `##NOTE##something`, + and resolve these in a pass over the parsed AST. This allows us to handle + link references that are not at the top level (#10281). + + Ignore newlines in URL in explicit link (#10279). + + Handle block level substitutions. + + Support `:file:` on raw directive (#8584). + + Implement option lists (#10318). + + Avoid putting metadata in Para (#7766). Create MetaInlines when possible, + just as with markdown input. MetaBlocks is still used when there are + multiple paragraphs or non-paragraph content. + This change also affects field lists. + + Fix linked substitutions (#6588). E.g. `|Python|_`. + + Support inline anchors (#9196). + + Explicit links define references (#5081). For example, + ``Go to `g`_ `g <www.example.com>`_.`` should produce two links to + www.example.com. + + * EPUB writer: + + + Use standardized filename for cover image instead of the original name + (#10404). This avoids problems with e.g. filenames containing spaces. + + * Markdown writer: + + + Issue INFO warning when not rendering table, e.g., when `raw_html` is + disabled and the table can't be fit into a supported markdown table + format (#10407). + + Respect empty LineBlock lines in `plain` output (Evan Silberman). + The plain writer behaved as a markdown variant with `Ext_line_blocks` + turned off, and so empty lines in a line block would get eliminated. + + * LaTeX writer: + + Ensure that beamer footnotes go on frame, not column (#5769). + + * HTML writer: + + + Unwrap empty incremental divs (#10328, Albert Krewinkel). + Divs are unwrapped if the only purpose of the div seems to be to control + whether lists are presented incrementally on slides. + + * Typst writer: + + + Make template sensitive to a `page-numbering` variable (#10370). + This can be set to an empty string (or, in metadata, to false) for + no page numbers. + + Make `smart` extension work (#10271). If `smart` is not enabled, a command + in the default template will disable smartquote substitutions. + When `smart` is enabled, render curly apostrophes as straight + and escape straight apostrophes. When `smart` is disabled, + render curly apostrophes as curly and don't escape straight + apostrophes. Similarly for quotes, em and en dashes. This should + give more idiomatic typst output, with fewer unnecessary + escapes. + + * ANSI writer: + + + Respect empty LineBlock lines (Evan Silberman). + + * JATS writer: + + + Correct spelling of suppress attribute (#10350, Andreas Deininger). + + * Typst template: + + + Remove `definitions.typst` partial. + + Remove unnecessary definition of `endnote`. + + Incorporate the one remaining definition into `default.typst`. + + Use typst 0.12 code for two column layout (#10294, Luis Rivera). + + Note: the new templates presuppose typst 0.12; if you try to use an + earlier version of typst, an error will be raised. + + * LaTeX/Beamer template: + + + Split `fonts.latex` partial into two parts: `fonts.latex` and + `font-settings.latex`. + + In beamer template, load beamer theme between `fonts.latex` and + `font-settings.latex`. This allows a theme (such as metropolis) + to set its own default font, while still allowing the user to + override it. This fixes a regression in pandoc 3.5 (#10297). + + Note: Users who have custom templates based on pandoc 3.5 templates will + need to add `font-settings.latex()` after `fonts.latex()` in the + latex template. In a beamer template, the beamer theme-setting + code needs to be moved between these two partials. + + * ConTeXt template: Ensure that font names don't wrap (#10305). + + * `epub.css`: remove background-color (#10264, Suraj Patil). + With this greyish background color, epubs look bad on a Kindle (#10263). + + * Text.Pandoc.ImageSize: add WebP support (Evan Silberman, #10397). + Add `Webp` constructor on ImageType [API change]. + + * Text.Pandoc.Readers.Roff and a new unexported module + Text.Pandoc.Readers.Roff.Escape: parameterize Roff + escaping (Evan Silberman) [API change]. This allows code to + be reused between the mdoc and man readers, despite the + differing Token types. + + * Text.Pandoc.PDF: + + + PDF via LaTeX: always do max runs if `toc` is present (#10308). + The old method (checking to see if toc hash had changed) is not + completely reliable. + + Use `.source` extension, not `.html`, in `toPdfViaTempFile` (#10314). + + * Text.Pandoc.Logging: add `YamlWarning` constructor to `LogMessage` + [API change] (#10312). + + * Text.Pandoc.Format: remove duplicate typst entry (#10388, Caleb Mclennan). + + * Fix a typo in the `ua.yaml` localization for 'See' (Jens). + + * Lua subsystem (Albert Krewinkel): + + + Remove prefixes from Lua type names (#8574). Lua type names were + inconsistent with regard to the use of prefixes; all prefixes + are removed now, and Lua types now have the same name as the + Haskell types. The use of app-specific prefixes is suggested by + the Lua manual to avoid collisions. However, this shouldn't be a + problem with pandoc, as it cannot be used as a Lua package. + + * doc/libraries.md: Add newly developed Haskell packages. + Sort list alphabetically (Albert Krewinkel). + + * doc/lua-filters.md: document `pandoc.List:iter` method (Albert Krewinkel). + List objects have a new function `iter` that returns an iterator + function that returns the next list item on each call. + + * MANUAL.txt: + + + Clarify what the example of YAML EPUB metadata shows (#10405). + + Fix typo in template syntax (#10265, Pascal Wagler). + + Update manual with information on openxml template (#10273). + + Clarify that `--variable` can only assign string values (#10298). + + * Fix comments in TEI writer referring to DocBook (#10430, Evan Silberman). + + * Fix several typos in documentation (#10349, Andreas Deininger). + + * Allow Diff 1.0. + + * Add font-settings.latex partial to pandoc.cabal (#10379). + + * Bump upper bound for data-default. + + * Use latest typst, texmath, pandoc-lua-marshal, commonmark-pandoc, + commonmark-extensions, skylighting, skylighting-format-blaze-html. + + +## pandoc 3.5 (2024-10-04) + + * Add command-line options `--list-of-figures/--lof` and + `--list-of-tables/--lot` (#10029, Akash Patel). + Only docx, latex, and context are affected by these options currently. + Setting the `lof` and `lot` variables will also work for the formats + that are currently supported. + + * Defaults files: interpolation of environment variables now + works for `to` and `from` fields (#8024). This is needed because + these files can contain paths of custom readers/writers. + + * Docx reader: + + + Reset lists after headers in same list `numId` (#10258). + To accomplish this, we add a Heading constructor to BodyPart and + include on it all the information list items have. + + * DocBook reader: + + + Parse id, class, and tabstyle on tables (#10181, Erik Rask). + Add parsing of id (xml:id), class, and tabstyle XML attributes + for table and informaltable in the DocBook reader. + The tabstyle value is put in the 'custom-style' attribute. + + * Dokuwiki reader: + + + Be more forgiving about misaligned lists, like dokuwiki itself (#8863). + + Improve blockquote parsing in dokuwiki. Allow for quoted code blocks. + + Enable smart extension. + + Properly parse `--` and `---` as dashes. + + Fix block quote behavior (#6461). Blockquotes are not really block + containers in DokuWiki; the lines are interpreted literally (so, + e.g., you can't start a list), and line breaks are added at the ends. + + * EPUB reader: + + + Fix links to other files in the EPUB, making them internal links + to a fragment derived from the filename (#10207). There was + already code to handle links like `#foo`, but not to handle links + like `ch0001.html#foo`. + + * LaTeX reader: + + + Add em, ex, px, mu to list of units for dimension args (#10212). + + * ANSI writer: + + + Fix subscripts (Evan Silberman). + + * DokuWiki writer: + + + Don't emit `<HTML>` tags (#7413). The use of these tags is now + strongly discouraged for security reasons, and will be removed. + We previously used them as a fallback for lists that could not + be represented using DokuWiki syntax, e.g. ordered lists with + fancy numbers or lists with multiple blocks in their items. + We also used them for block quotes with multiple blocks as + their contents. We now use the `<WRAP>` syntax (from the optional + WRAP plugin) to handle lists with multiple blocks as their contents. + A new method of handling block quotes with complex contents + has the side benefit of also handling nested block quotes, + which weren't supported before. + `<HTML>` and `<html>` tags are only for raw HTML blocks and + inlines, and only if the `raw_html` extension is enabled. (It is + now a valid extension for `dokuwiki`, though off by default.) + + * Docx writer: + + + Support `--list-of-figures` and `--list-of-tables` (or `lof` and + `lot` variables) (Akash Patel). + + * HTML writer: + + + Don't emit missing title/lang warnings if templates does not + contain the `pagetitle` or `lang` variables respectively (#9370). + + * LaTeX writer: + + + Better fix for lists in definition lists (#10241). + In commit a26ec96d89ccf532f7bca7591c96ba30d8544e4a we added an + empty `\item[]` to the beginning of a list that occurs first + in a definition list, to avoid having one item on the line with + the label. This gave bad results in some cases (#10241) and there + is a more idiomatic solution anyway: using `\hfill`. + + Avoid error on `refs` div with empty citations (#10185). + If there are no citations, don't emit an empty CSLReferences environment. + + * RST writer: + + + Change bullet list hang from 3 to 2. This accords with the style in + the RST reference docs. + + Handle cases where indented context starts with block quote (#10236). + In these cases we emit an empty comment to fix the point from + which indentation is measured; otherwise the block quote is not + parsed as a block quote. This affects list items and admonitions. + + Don't enclose the list table in a `.. table::`; this leads to + doubled captions (#10226). + + Fix alignment of list table items corresponding to cells (#10227). + + * JATS template: + + + Support `floats-group` (Albert Krewinkel, see #10196). + The content of the `floats-group` variable is now rendered in a + `<floats-group>` element when using the *publishing* or *archiving* tag + sets. + + * LaTeX and Beamer templates: + + + Split old default.latex into two templates, `default.latex` and + `default.beamer`, factoring common parts into partials: + `fonts.latex`, `common.latex`, `passoptions.latex`, + `hypersetup.latex`, `after-header-includes.latex`. + + Make `default.beamer` the default template for beamer. + + Add `shorttitle`, `shortsubtitle`, `shortauthor`, `shortinstitute`, + `shortdate` variables to beamer template (#10248, Thomas Hodgson). + + Make `--number-sections` work with beamer (#12045, Thomas Hodgson). + + Support a list of images for `titlegraphic` in beamer template + (#10246, Thomas Hodgson). Title graphic options will be + applied to each title graphic. Images will be separated by `\enspace`. + + Beamer theme options (#10243) + + Add theme options to beamer template: `colorthemeoptions`, + `fontthemeoptions`, `innerthemeoptions`, `outerthemeoptions` (#10243, + Thomas Hodgson). + + Don't load amsmath, amssym in beamer template. These are loaded by + beamer automatically. + + * Text.Pandoc.SelfContained: + + + Improve handling of links to remote CSS (#10261). + + * Text.Pandoc.Class: + + + Allow extracting `data:` URIs even in PandocPure (`--sandbox`) + (#10249). + + Export `extractURIData` [API change]. + + * Text.Pandoc.PDF: + + + Read `.toc` and `.log` files from output directory (#10186). + When this is different from the input directory, this is + where `.toc` and `.log` files are written. + + * Text.Pandoc.Shared: + + + Modify `addPandocAttributes` for changes in commonmark-pandoc. + The new commonmark-pandoc version automatically adds the + attribute `wrapper="1"` on all Divs and Spans that + are introduced just as containers for attributes that belong + properly to their contents. So we don't need to add the + attribute here. This gives much better results in some cases. + Previously the wrapper attribute was being added even for + explicit Divs and Spans in djot, but it is not needed in these cases. + + * Text.Pandoc.Options: + + + Add `writerListOfFigures` and `writerListOfTables` fields + to `WriterOptions` (#8245, Akash Patel). [API change] + + * Text.Pandoc.App: + + + Add `optListOfFigures` and `optListOfTables` to `Opt` (#8245) + [API change]. + + * Lua subsystem (Albert Krewinkel): + + + Update List module (#9835). The module now comes with a method + `:at(index[, def])` that allows to access indices, accepts + negative indices to count from the end, and will return the + `def` value as a default if the list has no item at the given position. + Furthermore, the list constructor `pandoc.List` now accepts iterators. + E.g., `pandoc.List(text:gmatch '%S+')` returns the list of words + in `text`. + + Support character styling via `pandoc.layout`. The `Doc` values + produced and handled by the `pandoc.layout` module can now + be styled using `bold`, `italic`, `underlined`, or `strikeout`. The + style is ignored in normal rendering, but becomes visible when + rendering to ANSI output. The `pandoc.layout.render` function + now takes a third parameter that defines the output style, + either *plain* or *ansi*. + + It is now possible to return a single filter from a filter file, e.g. + ``` lua + -- Switch single- and double quotes + return { + Quoted = function (q) + elem.quotetype = elem.quotetype == 'SingleQuote' + and 'DoubleQuote' or 'SingleQuote' + return elem + end + } + ``` + The filter must not contain numerical indexes, or it might be treated + as a list of filters. + + Add `list_of_figures` and `list_of_tables` to writer options + (Akash Patel). + + * Use latest releases of commonmark, commonmark-pandoc, texmath, djot. + + * Stop depending on package SHA (Albert Krewinkel). Use `crypton` instead. + + * `linux/make_artifacts.sh`: add riscv64 support (Olivier Benz). + + * Fix invalid XML in `test/docx/normalize.docx` (#10242). + + * `doc/lua-filters.md`: list functions in `pandoc.utils` alphabetically + (Albert Krewinkel). + + * MANUAL.txt: + + + Clarify use of `beamerarticle` variable (#10250). + + Add clarification to address user issues like #6704 (Yehuda Katz). + +## pandoc 3.4 (2024-09-09) + + * New output format: `ansi` (for formatted console output) (Evan Silberman). + Most Pandoc elements are supported and printed in a reasonable way, if + not always ideally. This version does no detection of terminal + capabilities, nor does it fall back to different output styles for + less-capable terminals. + + * Add command line options `--table-caption-position` and + `--figure-caption-position`. These allow the user to specify whether + to put captions above or below tables and figures, respectively. + The following output formats are supported: HTML (and related such + as EPUB), LaTeX (and Beamer), Docx, ODT/OpenDocument, Typst. + + * Change default `--pdf-engine` via HTML to WeasyPrint (#10142). + `wkhtmltopdf` is deprecated. `weasyprint` is the easiest-to-install, + maintained alternative. For better results, one might prefer + `pagedjs-cli`. + + * Org reader: + + + Fix parsing of src blocks with an `-i` flag (#10071, Albert Krewinkel). + Tabs are now preserved in the contents of *src* blocks if the the block + has the `-i` flag. + + * RTF reader: + + + Handle images inside `shp` contexts (#10145). + + * RST reader: + + + Improve simple table support (#10093). Multiline rows occur + only when the *first* cell is empty; we were previously treating + lines with *any* empty cell as row continuations. In addition, we + no longer wrap multiline cells in Para if they can be represented + as Plain. This is consistent with docutils behavior. + + * LaTeX reader: + + + Math environments don't have bracketed options (#10160). + + Parse nested tabular environments (#4746). + + * Typst reader: + + + Change how "block" elements are handled. Previously they were + always parsed as divs. But actually they can occur in some "inline" + contexts. Now we first try to parse them as inlines, and only as + blocks if that fails. A surrounding Div or Span element is added + only if there is an identifier. + + * HTML reader: + + + Only parse main element's contents (if present) (#10140). + If main has an id or class, we include a div with that id or class; + otherwise just the contents. + + Read TeX annotation in MathML content if present (#9971). + + Better handle KaTeX-generated math (#9971). KaTeX emits the mathml + followed by a span with an HTML fallback. Previously pandoc was + converting both. We now ignore the HTML fallback span, marked + with class `katex-html`. + + * Docx reader: + + + Add "SuppressAuthor" and "AuthorOnly" to citationMode + when `+citations` is used (thomjur). + + * New module: Text.Pandoc.Writers.ANSI [API change] (Evan Silberman). + + * Docx writer: + + + Support `custom-style` attribute for docx table (Sebbones). + + Support `--number-offsets`. + + Make table/figure rendering sensitive to caption position settings. + + * OpenDocument writer: + + + Make table/figure rendering sensitive to caption position settings. + + * Typst writer/template: + + + Implement figure caption positions by triggering a show rule in + the default template, which determines caption positions for + figures and tables globally. + + Don't include trailing semicolon after `@` style citations with suffixes + (#10148). + + Template: move header-includes before show doc (#9996, Gordon Woodhull). + + * LaTeX writer: + + + Make table/figure rendering sensitive to caption position settings (#5116). + + Preserve locator labels with `--natbib` (#10057). + + * HTML writer/template: + + + Make `<figcaption>` placement sensitive to caption position + settings. For tables, `<caption>` must be the first element, and + positioning is determined by CSS, for here we set a variable + which the default template is sensitive to. + + Use `makeSectionsWithOffsets` for `writerNumberOffsets`, + instead of the old, inefficient code. + + Don't add doc-biblioref role to every link in a citation; + only to links to the bibliography (#10156). + + Add `data-` when rendering `label` attribute (#10048). + + * Markdown writer: + + + Avoid emitting markdown caption if table has fallen back to raw HTML, + which will then contain a `<caption>` tag (#10094). + + Make math sensitive to `tex_math_gfm` extension (#9121). + This means that in GFM output, the "new style" math will be used + by default, e.g. + + $`x=y`$ + + ```math + x = y + ``` + + To defeat this and get the older behavior, namely + + $x=y$ + + $$x=y$$ + + one could use `-t gfm-tex_math_gfm`. + + * AsciiDoc writer: + + + Add `link:` prefix when needed (#10105). AsciiDoc requires it + except for `http`, `https`, `irc`, `mailto`, `ftp` schemes (#10105). + + Preserve original base level (#10062). We used to normalize so + that the base level is always 1, but asciidoc no longer seems + to care about that, and the behavior creates difficulties when + we are converting fragments. + + Don't emit empty figure caption (#10047). + + * ODT writer: + + + Add TableCaption to styles.xml (#10058, Ian Max Andolina). + + * LaTeX template: + + + Fix wrong beamer color in (sub)section page (Jonathan). + + * Text.Pandoc.Options: + + + Add `CaptionPosition` and new `WriterOptions` fields + `writerFigureCaptionPosition` and `writerTableCaptionPosition` + [API change]. + + * Text.Pandoc.Opt: + + + Change default for optNumberOffset to `[]`. This behaves the same as + `[0,0,0,0,0]`. + + Add `Opt` fields `optFigureCaptionPosition` and + `optTableCaptionPosition` [API change]. + + * Text.Pandoc.Format: change `formatFromFilePaths` so that it is + smarter about URLs. URLs are parsed, and we take the format from + the path component, if present (#10141). This means that + `https://emacs.org/` will be treated as HTML, while + `https://emacs.org/sample.org` will be treated as Org. + + * Text.Pandoc.URI: + + + Add unofficial `gemini:` to list of URI schemes (Pau RE). + + * Text.Pandoc.Shared: + + + Add `makeSectionsWithOffsets` [API change]. + + Remove `stripEmptyParagraphs [API change] (Albert Krewinkel). + This function is no longer used. + + * Text.Pandoc.Highlighting: Expose `formatANSI` [API change] + (Evan Silberman). + + * Text.Pandoc.Writers.Shared: export `to{Sub,Super}scriptInline` + [API change] (Evan Silberman). + + * Remove use of partial functions (e.g. `head`) in code. + + * Use latest skylighting-core, skylighting, doclayout, texmath, typst. + + * pandoc-lua-engine: Add accessors for several writer options, including + some that were added in previous releases. + + * pandoc-server: Initialize some missing fields in WriterOptions: + `writerEpubTitlePage`, `writerChunkTemplate`, `writerListTables`, + `writerFigureCaptionPosition`, `writerTableCaptionPosition`. + + * CONTRIBUTING.md: Summarize steps for adding a new cli option. + + * MANUAL.txt: + + + Clarify that the `--number-offset` option should only + directly affect numbering of the first section heading in + a document; subsequent headings will increment normally. + + Fix asciidoc link (#10039). + + Fix CSL Docs broken link (#10100, Tristano Ajmone). + + Document the use of `luatexja` when CJKmainfont is used with lualatex + (#3873, Kolen Cheung). + + Add a `citations` (typst) section to the manual (#9127). + + Clarify that `citations` affects both input and output for `org`. + + Add note on `--citeproc` that you may need to disable `citations` + extension on the output format (e.g., `-t markdown-citations`) to + see the rendered citation (#9127, #10012). + + * INSTALL.md — reorganise info on static binaries and add conda-forge + install options (#10098, #10069, Ian Max Andolina). + +## pandoc 3.3 (2024-07-28) + + * New cli option: `--link-images`. This causes images to be linked + rather than embedded in ODT. + + * Allow `--number-sections` to take an optional `true|false` argument. + + * RTF reader: + + + Handle `\*\shppict` without dropping image (#10025). + + * TWiki Reader: + + + Recognize WikiWords as internal links (#9941). + + Avoid partial function. + + * Typst reader: + + + Ignore 'pad' and just parse its body (#9958). + + Use typst 0.5.0.5. Fixes parsing of equations like `$1.$`. + + * Docx writer: + + + Fix regression with nested lists (#9994). The bug affects e.g. + ordered lists with bullet sublists; after the sublist the top-level + list reverts to bullets instead of being properly numbered. + This is a regression introduced in version 3.2.1. + + * BibTeX writer: + + + Ensure that "literal" names are enclosed in braces (#9987). + + * Man writer: + + + Use default middle header when metadata does not include `header` + (#9943). This change causes pandoc to omit the middle + header parameter when `header` is not set, rather than + emitting `""`. The parameter is optional and man will use + a default based on the section if it is not specified. + + * HTML templates: don't load polyfill (#9918). + This was added in a period when MathJaX required polyfill. + MathJaX no longer recommends this and polyfill should no + longer be necessary on any reasonably modern browser. + + * Translations: + + + Add `ua.yaml` (Jens Oehlschlägel). + + Add a script (`tools/update-translations.py`) and Makefile + target (`update-translations`) to update translation data + automatically from babel and polyglossia upstream + (Stephen Huan). + + Use this script to update language data, increasing the number + of languages we cover (Stephen Huan). Fix a few small bugs in + existing translations. + + * Fix some mistakes with Japanese language code (#9938). + In several places we were mistakenly assuming that the BCP 47 code for + Japanese language was `jp`. It is `ja`. + + * Text.Pandoc.Options: + + + New field in WriterOptions: `writerLinkImages` [API change] (#9815). + + * Text.Pandoc.App.Opt: + + + New field in Opt: `optLinkImages` [API change] (#9815). + + * Lua subsystem: + + + Keep `lpeg` and `re` as "loaded" modules (Albert Krewinkel). + The modules `lpeg` and `re` are now treated as if they had been + loaded with `require`. Previously the modules were only assigned + to global values, but could be loaded again via `require`, + thereby allowing to use a system-wide installation. However, this + proved to be confusing. + + The old behavior can be restored by adding the following lines to + the top of Lua scripts, or to the `init.lua` in the data dir. + + debug.registry()['_LOADED'].lpeg = nil + debug.registry()['_LOADED'].re = nil + + * `pandoc-cli`: Include pandoc copyright in Lua version info (Albert + Krewinkel). + + * `pandoc-cli`: Refer printing of version info to the Lua interpreter + (Albert Krewinkel). The Lua interpreter no longer terminates when + called with `-v` or `--version` arguments, thus improving + compatibility with the default `lua` interpreter program. + + * Avoid partial functions in JATS reader, DocBook writer, Haddock reader. + + * Allow tls 2.1.x. + + * MANUAL.txt: + + + Make documentation of extensions clearer (#9060). + + Fix section level for two Extensions entries. + + * lua-filters.md: Partially autogenerate docs for module `pandoc` + (Albert Krewinkel). The documentation system isn't powerful enough to + generate the full documentation automatically. + +## pandoc 3.2.1 (2024-06-24) + + * Fix `gfm_auto_identifiers` to replace emojis with their aliases, + as documented (#9876). + + * CSV reader: + + + Turn line breaks into LineBreaks not SoftBreaks (#9797). + + * Docx reader: + + + Support task lists (#8211). + + Fix a small bug in parsing delimiters in numbered lists, + which led to the default delimiter being used wrongly in some cases. + + Improve handling of captions. + - Turn captioned images into Figure elements. Closes #9391. + - Improve the logic for associating elements with captions (#9358). + - Ensure that captions that can't be associated with an + element aren't just silently dropped (#9610). + + Support HorizontalRule. We support both pandoc-style and the style + described on a Microsoft support page, an empty paragraph with + a bottom border (#6285). + + React to `"left"` value on `jc` attribute. + + Handle column and cell alignments (#8551). We take the column alignments + from the first body row. + + Fix a bug that caused comments inside insertions or deletions + to be ignored (#9833). + + * HTML reader: + + + Better handle non-`li` elements in `ul` and `ol` (#9809). + For example, a `p` after a closed `li` will be incorporated into + the previous `li`. This mirrors what browsers do with this + invalid HTML. + + * LaTeX reader: + + + Fix parsing of dimensions beginning with `.`, e.g. `\kern.1pt` (#9902). + + * Markdown reader: + + + Allow author-only textual citations (#7219). E.g. `-@reese2002` + outside of brackets. + + * RST reader: + + + Tighten up rules for when emphasis can start (#9805). + + Support `:cite:` role with citeproc (#9904). A subset of the + functionality of the sphinxcontrib-bibtex extension to Sphinx + is supported. + + * Textile reader: + + + Don't let spans begin right after a symbol (#9878). + + * Typst reader: + + + Fix an incomplete pattern match (#9807). + + Handle inline bodies ending in a parbreak. E.g. + ``` + `#strong[ + test + ] + ``` + + * ConTeXt template: remove `\setupbackend[export=yes]` (#9820). + + * Docx writer: + + + Allow OpenXML templates to be used with `docx` (#8338, #9069, #7256, + #2928). The `--reference-doc` option allows customization of styles in + docx output, but it does not allow one to adjust the content of the output + (e.g., changing the order in which metadata, the table of contents, + and the body of the document are displayed), or adding boilerplate + text before or after the document body. For these changes, one can + now use `--template` with an OpenXML template. (See the default + `openxml` template for a sample.) `--include-before-body` and + `--include-after-body` can also now be used with `docx` output. + The included files must be OpenXML fragments suitable for + inclusion in the document body. + + New unexported module Text.Pandoc.Writers.Docx.OpenXML. + + Omit `jc` attribute on table cells with AlignDefault (#5662). + + Better formatting for task lists. Task lists are now properly + formatted, with no bullet (#5198). + + Replace an expensive generic traverse to remove Space elements, + for better performance. + + Wrap figures with `id` in a bookmark (#8662). + + Add eastAsia font hints to `w:r` (#9817). We do this when the text + in the run contains any CJK characters. This ensures that ambiguous + code points (e.g. quotation marks) will be represented as "wide" + characters when together with CJK characters. + + Clean up Abstract Title and Subtitle in default reference docx. + Center Subtitle, remove color. + + * HTML writer: + + + Ensure URI escaping needed for `html4` (#9905). + Unicode characters need not be escaped for html5, and still won't be. + + Don't emit unnecessary classes in HTML tables (#9325, Thomas Soeiro). + Pandoc used to emit a `header` class on the `tr` element that forms + the table header. This is no longer needed, because `head > tr` will + do the same thing. Similarly, pandoc used to emit `even` and `odd` + classes on `tr`s, allowing striped styling. This is no longer needed, + because one can use e.g. `tbody tr:nth-child(2n)`. + Compatibility warning: users who relied on these classes to style + tables may need to adjust their CSS. + + * JATS writer: + + + Support `supplementary-material` in metadata for `jats_articlepublishing` + (#9818). + + * LaTeX writer: + + + New method for ensuring images don't overflow (#9660). + Previously we relied on graphicx internals and made global + changes to Gin to force images to be resized if they exceed + textwidth. This approach is brittle and caused problems + with `\includesvg` (see #9660). The new approach uses a new macro + `\pandocbounded` that is now defined in the LaTeX template. + (Thanks here to Falk Hanisch in https://github.com/mrpiggi/svg/issues/60.) + The LaTeX writer has been changed to enclose `\includegraphics` + and `\includesvg` commands in this macro when they don't explicitly + specify a width or height. In addition, the writer now adds + `keepaspectratio` to the `\includegraphics` or `\includesvg` + options if `height` is specified without width, or vice versa. + Previously, this was set in the preamble as a global option. + Users should attend to the following compatibility issues: + - If custom templates are used with the new LaTeX writer, they will have + to be updated to include the new `\pandocbounded` macro, or an error + will be raised because of the undefined macro. + - Documents that specify explicit dimensions for an image may render + differently, if the dimensions are greater than the line width or + page height. Previously pandoc would shrink these images to fit, + but the new behavior takes the specified dimensions literally. + In addition, pandoc previously always enforced `keepaspectratio`, + even when width and height were both specified, so images with + width and height specified that do not conform to their intrinsic + aspect ratio will appear differently. + + Task lists must be unordered (#9185). + + Specify language option for `selnolig` and only include it if + `english` or `german` is used (#9863). (This includes changes to the + LaTeX template.) This should restore proper ligature suppression when + lualatex is used. + + Fix `--toc-depth` with beamer output (#9861). Previously only top-level + sections were ever included in the TOC, regardless of the setting of + `--toc-depth`. + + Use `\linewidth` instead of `\columnwidth` or `\textwidth` + for resizing figures, table cells, etc. in LaTeX (#9775). + `\linewidth`, unlike the others, is sensitive to indented environments + like lists. + + * LaTeX template: put `babel-lang` in options to beamer (#9868). + This is required to make beamer use proper localized terms for + things like "Section." + + * Markdown writer: + + + Don't print extra caption when using `implicit_figures`. + + Ensure blank line after HTML blocks in commonmark-based formats (#9792). + + Fix bug rendering block quotes in lists (#9908). + + * Texinfo writer: + + + Ensure proper escaping in all node/link contexts. + + Target node rather than anchor when possible in internal links. + + Remove illegal characters from internal link anchors (#6177). + + Use two commas not one in `@ref`. + + Don't add anchors to headings. We don't need them, now that we + make internal links use the node. + + Avoid duplicate node names. + + Improve menus. Properly handle the case where the node name is + different from the descriptive title. + + * Texinfo template: add variables for filename and version. + + * Typst writer: + + + Support '.typst:no-figure' and 'typst:figure:kind=kind' attributes + (#9778, Carlos Scheidegger). This extends support for fine-grained + properties in Typst. If the `typst:no-figure` class is present on a + Table, the table will not be placed in a figure. If the + `typst:figure:kind` attribute is present, its value will be used + for the figure's `kind` (#9777). These features are documented in + `doc/typst-property-output.md`. + + * Typst template: + + + Add subtitle (#9747, Mickaël Canouil). + + Use content rather than string for title, author, date, email (#9823). + This allows formatting in title, author, date, and email fields. + Since the PDF metadata requires a string, and typst only + converts the title to a string (not the authors), we use + + * Textile writer: + + + Get rid of header, odd, even classes on `tr` (#9376). + + * Text.Pandoc.Class: + + + `fillMediaBag`: Convert IOErrors to warnings when fetching absolute + paths (#9859, Albert Krewinkel). This will allow many conversions that + would have failed with an error to succeed (albeit without images or + other needed resources). + + * Text.Pandoc.ImageSize: + + + Don't prefer exif width/height when they conflict with image + width/height (#9871). That was a mistaken call in #6936. + Usually when these values disagree, it is because the image + has been resized by a tool that leaves the original exif values + the same, so the width/height metadata are more likely to be + correct that exif width/height. + + * Text.Pandoc.SelfContained: + + + Strip CRs from XML before base64 encoding for data URI + (so tests can work on Windows). + + Only create `<svg>` elements for SVG images when the image has + the class `inline-svg`. Otherwise just use a `data` URI as we do + with other images (#9787). + + * Lua subsystem (Albert Krewinkel): + + + Split Init module into more modules. The module has grown unwieldy and + is therefore split into three internal Haskell modules, `Init`, + `Module`, and `Run`. + + Add function `pandoc.utils.run_lua_filter` (#9803). + + Add function `pandoc.template.get` (#9854, co-authored by Carsten Gips). + The function allows to specify a template with the same argument value + that would be used with the `--template` command line parameter. + + Keep CommonState object in the registry. The state is an internal + value and should be treated as such. The `PANDOC_STATE` global is + merely a copy; unsetting the global no longer breaks the Lua engine. + + Allow passing an environment to `run_lua_filter`. + The default is now to use a *copy* of the global environment when running + a filter; this ensures better separation when `run_lua_filter` is used + multiple times. A custom environment can be specified via the + optional third parameter. + + Set `pandoc.List` as default metatable for JSON lists (#9834). + Lists created by `pandoc.json.decode` now behave like lists generated + via `pandoc.List`. This also ensures that `pandoc.List` tables are + encoded as JSON arrays when passed to `pandoc.json.encode`. + + * Text.Pandoc.Writers.Shared: export `toTaskListItem` [API change]. + + * Add unexported module Text.Pandoc.Char. This exports `isCJK`. + Use this instead of locally defined `isCJK` in T.P.Readers.MediaWiki. + + * MANUAL.txt: + + + Remove false claim that Lua mode does not support `-i` (#9757, + Ian Max Andolina). + + Use level-3 headings for extensions (to avoid gaps). + + Add anchor for tagging extension. + + Remove explicit referencess to generate anchors. + These will be linkified automatically. + + Fixed links to `option--reference-doc`. + + Add a note that column widths aren't supported in pptx for Divs + with class `columns` (#9890). + + Fix alerts example (#9826, Ian Max Andolina). + + Fix markup of `babelfonts` example code (Albert Krewinkel). + + * `doc/custom-writers.md`: + + + Fix usage of Template in example (Albert Krewinkel). + + Document the separator arg of `Writer.Blocks` (Albert Krewinkel). + + * `doc/lua-filters.md` (Albert Krewinkel): + + + Fix outdated documentation for math and quoting functions and fields. + + Autogenerate docs for module `pandoc.template` and `pandoc.layout`. + + Document operators of the "Doc" type. + + * pandoc-lua-engine: depend on pandoc >= 3.2 (see #9755). + + * Allow crypton-connection 0.4, time 1.14. + + * Allow tasty-quickcheck 0.11. + + * Use latest emojis, skylighting, skylighting-core, citeproc, djot, + commonmark-extensions, typst-hs + +## pandoc 3.2 (2024-05-11) + + * Change to `--file-scope` behavior (#8741): previously a Div with an + identifier derived from the filename would be added around the contents + of each file. This caused problems for "chunking" files into chapters, + e.g. in EPUB. We no longer add the surrounding Div. This cooperates + better with chunking. Note, however, that if you have relied on the old + behavior to link to the beginning of the contents of a file using + its filename as identifier, that will no longer work. + + * Markdown reader: + + + Allow repeated labels in numbered example lists. + Previously if you tried to use the same label as an earlier + example list item, you'd get a new number, not the old one, + and references to the label would go to the second occurrence. + Now an existing label will be reused, and no new number will + be generated. Caveat: this only works reliably when the + re-used example list item occurs by itself in a list, or + occurs in a list of previously used example list items that + occur in exactly the same order as previously. + + Fix `normalCite` so it doesn't consume past a closing `]` boundary + (#9710). This was causing an exponential performance bug on long + lists of links containing potential emphasis characters. + + Generalize `inlinesInBalancedBrackets` to `inBalancedBrackets`, + with a parameter for the inner parser. + + Auto-close unclosed divs (#9635). This applies to both fenced and + HTML-ish varieties. Otherwise we face an exponential performance + problem with backtracking. A warning is issued when a div is + implicitly closed. + + * RST reader: + + + Fix `figclass` and `align` annotations for figures (#7473, Gokul + Rajiv). + + * LaTeX writer: + + + Use `polytonicgreek` instead of `polutonikogreek` with babel (#9698). + `polutonikogreek` is outdated. Also recognize both in the LaTeX + reader. + + Improve treatment of math inside soul commands (#1294, #5529). + soul commands (`ul`, `hl`, `st`) are very fragile and the math + must be handled specially. + + * LaTeX reader: + + + Fix over-eager macro expansion in conditionals (#9676). + + Parse `flalign`, `flalign*` math environments (#9679). We parse + these as Math elements with an `aligned` environment. Semantically + it's not exactly the same, but better than falling back to raw LaTeX. + + * LaTeX template: add `titlegraphicoptions` variable (#9207, Guilhem + Saurel). + + * Docx reader: + + + Issue warning rather than error when we can't parse EndNote citations + (see #8433). + + Fix anchor in header after anchor (#9626, mbracke). + + * RTF reader: + + + Don't try to handle non-default code pages (#9683). Emit a warning + instead. + + * OpenDocument writer: + + + Implement custom-style for spans (#9657). + + * Typst writer: + + + Add blank line in definition lists with multiple definitions (see + #9704). + + Property output (#9648, Gordon Woodhull). The Typst writer will pass + on specially marked attributes as raw Typst parameters on selected + elements. This allows extensive customization using filters. + A separate document (`doc/typst-property-output.md`) has been added + that provides extensive documentation and examples of the use of + this feature. + + * Markdown writer: + + + Don't try to align columns in pipe tables with lines greater than + COLUMNS. The alignment just reduces readibility when the lines + soft wrap. + + Don't use `raw_attribute` syntax for raw blocks, unless there is no + other option (see #9677). Macros in a `raw_attribute` block don't + get interpreted when it is read again by pandoc's markdown reader. + + * ConTeXt writer: + + + Replace depreciated `\sc` with `\setsmallcaps` (#9518, James P. + Ascher). + + * Docx writer: + + + Use conventional styles/indents for Word bullet lists (#7280). + + * `reference.docx`: + + + Use current standard Word theme (#7280). This includes using the + sans-serif font Aptos instead of the serif font Cambria, and + default colors for headings. + + Remove duplicate `DefaultParagraphFont` in `styles.xml`. + + * New module Text.Pandoc.Transforms [API change] (Albert Krewinkel). + This module exports the following functions which were formerly + exported from Text.Pandoc.Shared: `headerShift`, + `filterIpynbOutput`, `eastAsianLineBreakFilter`, as well as some + functions that were previously not exported. + + * Text.Pandoc.Shared: + + + `headerShift`, `filterIpynbOutput`, and `eastAsianLineBreakFilter` + are no longer exported from this module; they are now exported + from Text.Pandoc.Transforms (Albert Krewinkel). + + * Text.Pandoc.Error: + + + Improve reporting of unsupported extensions errors (#9247, Albert + Krewinkel). + + * Text.Pandoc.App: + + + Move "transforms" after filters (#9664). This will mean that + `--shift-heading-level-by` affects a heading added by + `reference-section-title`. + + * Text.Pandoc.App.CommandLineOptions: + + + Simplify output for `OptVersion`. Omit the information about versions + of dependencies. We no longer emit version info at this level anyway; + `pandoc-cli` intercepts and handles `--version`. This code would + only be called if someone used the pandoc library function + `handleWithOptInfo` in their own program. + + * Text.Pandoc.ImageSize: + + + Export `ImageSize` datatype. + + * Text.Pandoc.SelfContained: + + + Merge class attribute when both img and svg specify it (#9652, + Carlos Scheidegger). + + * Text.Pandoc.Logging: + + + Add `ScriptingInfo` constructor for `LogMessage` [API change] + (Albert Krewinkel). + + Make `DocxParserWarning` a WARNING, not INFO. [API change]. + + Add `UnsupportedCodePage` constructor to `LogMessage` [API change]. + + Add `UnclosedDiv` constructor for `LogMessage` [API change]. + + * Lua subsystem (Albert Krewinkel: + + + Add a `pandoc.log` module. + + Uupdate to pandoc-lua-marshal version 0.2.7 (#8916). + This fixes counterintuitive behavior of the `content` property on + BulletList and OrderedList items. Unmarshalling of that field now + matches the behavior of the constructor. + + Use newest zip module. This adds a `symlink` function to Entry objects, + allowing to check if an entry represents a symbolic link. + + Improve `pandoc.json.decode` docs. + + Update and fix docs for `pandoc.types.Version` and `pandoc.utils.type`. + + Add new module `pandoc.image` The module provides basic querying + functions for image properties. + + Bump pandoc-lua-engine to 0.2.1.4. + + * Use latest KaTeX CDN asset (#9707, Salim B). + + * `pandoc-cli`: ensure UTF8 when emitting version info. + + * tools/update-lua-module-docs.lua: improve script-internal docs, cleanup + (Albert Krewinkel). + + * Allow network 3.2. + + * Use latest versions of texmath, djot, skylighting-core, skylighting. + + * Fix command test for #9652. + + * Fix some typos in code comments (#9638, guqicun). + + * Command tests: include regular PATH after directory with the test + executable (ensures that DLLs will be found on Windows). + + * MANUAL.txt: + + + Document `handout` variable for beamer (#9742). + + Document formats affected by `--slide-level` (#9745). + + Update the list of required LaTeX packages (#9728, Albert Krewinkel). + + Use more descriptive link text for ODT (#9673). + + Add clarification about `toc-title` in `docx`, `pptx` (#9645). + + Better document truthiness for conditionals (#9661). + + Mention that `custom-style` works with ODT (Ian Max Andolina). + + Harmonize typographic dashes (#9688, Salim B). Standardize on `---` + with no space. + + * INSTALL.md: Minor tweaks (#9705, Leo Heitmann Ruiz). + +## pandoc 3.1.13 (2024-04-07) + + * Org reader: + + + Fix treatment of `id` property under heading (#9639). + + * DocBook reader: + + + Add empty title to admonition div if not present (#9569). + This allows admonition elements (e.g. `<note>`) to work with + `gfm` admonitions even if the `<title>` is not present. + + * DokuWiki reader: + + + Link text cannot contain formatting (e.g., `//` is not italics) (#9630). + + An explicitly empty link text (`[[url|]]`) works the same as an omitted + link text (#9632). + + * Typst reader: + + + Support Typst 0.11 table features: col/rowspans, table head + and foot (#9588). + + Parse cell col/rowspans. + + * CSLJson writer: + + + Put `$` or `$$` around math in `csljson` output (#9616). + + * ConTeXt writer: + + + Fix options order with `\externalfigure`. The dimensions should + come after the class if both are present. + + * Typst writer: + + + Put label after Span, not before. Labels get applied to preceding markup + item. + + Support Typst 0.11 table features (#9588): colspans, rowspans, + cell alignment overrides, relative column widths, + header and footer, multiple table bodies with intermediate headers. + Row heads are not yet supported. + + The default typst template has been modified so that tables + don't have lines by default. As is standard with pandoc, we only + add a line under a header or over a footer. However, a different + default stroke pattern can easily be added in a template. + + More reliable escaping in inline `[..]` contexts (#9586). For example, + we need to escape `[\1. April]` or it will be treated as an ordered list. + + Handle `unnumbered` on headings (#9585). + + * LaTeX writer: + + + Fix math inside strikeout (#9597). + + * Text.Pandoc.Writers.Shared: + + + Export `isOrderedListMarker` [API change]. + + * Change lhs tests so they don't use `--standalone`. + This will avoid test failures due to minor changes in + skylighting versions, e.g. #9589. + + * Use latest texmath, typst. + + * Require pandoc-lua-marshal 0.2.6 (#9613, Albert Krewinkel). + Fixes an issue arising when the value of `content` properties + on *BlockQuote*, *Figure*, and *Div* elements was an empty list. + + * Update lua-filters.md (#9611, Carlos Scheidegger). + + +## pandoc 3.1.12.3 (2024-03-17) + + * Markdown reader: Fix bug with footnotes at end of fenced div (#9576). + + * LaTeX reader: + + + Improve tokenization of `@` (#9555). Make tokenization sensitive to + `\makeatletter`/`\makeatother`. Previously we just always treated + `@` as a letter. This led to bad results, e.g. with the sequence `\@`. + E.g., `a\@ b` would parse as "ab" and `a\@b` as "a". + + Make `withRaw` work inside `parseFromToks` (#9517). + This is needed for raw environments to work inside table cells. + + Better handling of table colwidths (#9579). Previously the parser just + failed if the column width specified in `p{}` wasn't a multiple of + `\linewidth`. This led to cases where content was skipped. + + * Typst writer: + + + Add 'kind' parameter to figures with tables (#9574). + + Avoid unnecessary box around image in figure (#9236). + + Omit width/height in images unless explicitly specified (#9236). + Previously we computed width/heigth for images that didn't have + size information, because otherwise typst would expand the image + to fit page width. This typst behavior has changed in 0.11. + This change fixes a bug in which images would sometimes overflow + page margins, depending on their intrinsic size. + + Don't add hard-coded `inset` to tables (#9580). Instead, set this + globally in the default template, allowing it to be customized. + + * LaTeX template: Fix block headings support for unnumbered paragraphs + (#9542, #6018, Oliver Fabel). + + * HTML templates: Replace polyfill provider (#9537, @SukkaW). + Replace polyfill.io with cdnjs.cloudflare.com/polyfill. + polyfill.io has been acquired by Funnull, and the service has + become unstable. + + * Korean translations: delete colon in translation for 'to'. + This was invalid YAML, and not desired anyway, since a colon + is added. + + * Use latest commonmark, commonmark-extensions. + This fixes a 3.12 regression in parsing of commonmark/gfm autolinks + (jgm/commonmark-hs#151). + + * Depend on djot 0.1.1.3, which fixes a serious parsing bug affecting + regular paragraphs after lists. + + * Depend on latest skylighting, skylighting-core, typst-hs, texmath. + + * MANUAL.txt: Change broken link to IDML cookbook (#9563). + +## pandoc 3.1.12.2 (2024-02-29) + + * Docx reader: + + + Ensure that table captions are counted (#9518). + + Detect caption by style name not id (#9518). + The styleId can change depending on the localization. + + Avoid emitting empty paragraph where caption was. + + * Markdown reader: fix regression in link parsing with wikilinks extensions + (#9481). This fixes a regression introduced in 3.1.12. + + * Org reader/writer: support admonitions (#9475). + + * Org writer: omit extra blank line at end of quote block. + + * Typst writer: ensure that `-`, `+`, etc. are escaped at beginning of block + (#9478). Our recent relaxing of escaping (#9386) caused problems for + things like emphasized `-` characters that were rendered using + `#strong[-]#`. This now gets rendered as `#strong[\-]`. + + * LaTeX writer: fix bug when a language is specified in two different ways + (#9472). If you used `lang: de-DE` but then had a span or div with + `lang=de`, the preamble would try to load `ngerman` twice, leading + to an error. This fix ensures that a language is only loaded once. + + * Docx writer: Don't copy over `footnotePr` in `settings.xml` + from reference.docx (#9522). + + * EPUB writer: omit EPUB2-specific meta tag on EPUB3 (#9493). + This caused a validation failure in epubs with cover images. + + * Lua: avoid crashing when an error message is not valid UTF-8 (Albert + Krewinkel). + + * Text.Pandoc.SelfContained: + + + Add `role="img"` to svgs. + + Add `aria-label` to svg elements with `alt` text if present. + Screen readers ignore `alt` attributes on svg elements but do + pay attention to `aria-label` (#9525). + + * Text.Pandoc.Shared: Fix regression in section numbering in + `makeSections` (#9516). Starting with pandoc 3.1.12, unnumbered + sections incremented the section number. + + * Text.Pandoc.Class: fix `openUrl` TLS negotiation (#9483). + With the release of TLS 2.0.0, the TLS library started requiring + Extended Main Secret for the TLS handshake. This caused problems + connecting to zotero's server and others that do not support TLS 1.3. + This commit relaxes this requirement. + + * Depend on djot 0.1.1.0 (fixes rendering on multiline block attributes). + + * Use new releases of skylighting-format-blaze-html (#9520). + Fixes auto-wrapping of long source lines in HTML print media. + + * Use new commonmark-extensions (fixes issue with the + `rebase_relative_paths` extension when used with commonmark/gfm. + + * Makefile: improve epub-validation target (#9493). + Use `--epub-cover-image` to catch issues that only arise with that. + +## pandoc 3.1.12.1 (2024-02-17) + + * EPUB writer: omit EPUBv3-specific accessibility features on epub2 + (#9469). Fixes a regression in 3.1.12. + + * More fixes for SVG ids with `--self-contained` (#9467). + This generalizes the fix to #9420 so it applies to things like + `style="fill(url(#..."` and should fix problems with SVGs including + gradients. + + * Powerpoint writer: properly handle math in headings and tables (#9465). + This ensures that paragraphs containing math are wrapped in + a `mc:AlternateContent` node as required. + + * Makefile: make validate-epub check v2 output too. + +## pandoc 3.1.12 (2024-02-14) + + * Add `djot` as input and output format. Djot is a light markup syntax + (https://djot.net). + + + New module Text.Pandoc.Readers.Djot [API change]. The function + `readDjot` is also exported by Text.Pandoc.Readers. + + New module Text.Pandoc.Writers.Djot [API change]. The function + `writeDjot` is also exported by Text.Pandoc.Writers. + + * `--number-sections` now uses the first digit for the number of + the top-level section, no matter what its level. So if the top-level + section is level-2, numbers will be `1`, `2`, etc. rather than + `0.1`, `0.2`, as in the past (#5071). For some backwards compatibility, + we revert to the old behavior when the `--number-offset` option is used. + + * DocBook reader: + + + Better handling of `<procedure>` and `<substeps>` (#9341): + `<procedure>` now gets parsed as an ordered list, and + `<substeps>` as a sublist. + + * Man reader: + + + Move spaces outside of emph/strong (#9445). + + * MediaWiki reader: + + + Don't make leading blanks underscores in image links (#9425). + + Allow lowercase `image:` (#9424). + + * BibTeX reader: + + + Support `pagetotal` in converting BibLaTeX. + + * Markdown reader: + + + Fix wikilinks extensions to allow newlines in titles (#9454). + + * EPUB reader: + + + Don't put `#` characters in identifiers. + + * LaTeX reader: + + + Improve treatment of `\cref`, `\Cref` (#7463). Use the + reference-type `ref+label` and `ref+Label`. Also, associate with + `\vref` `ref` instead of `ref+page`. + + Limited support for `\Cref` (#7463). + + Generate relative widths for `\linewidth`, `\textheight` (#9388). + + * Typst reader: + + + Fix handling of `\overline` (#9294). Due to a typo, it was being + incorrectly rendered as an `\underset`. + + Improve handling of inline `#quote` (#9413). + + Fix handling of `dot()`, `tilde()`, `ddot()` (jgm/typst-hs#38). + + Fix character used for `norm` (jgm/typst-hs#38). + + * Typst writer: + + + Use reference form (e.g. `@jones2000[p. 30]`) for citations when + possible. + + Use `#ref` or `@` for links with `reference-type="ref"` (#7463). + This attribute is added to LaTeX `\cref`, for example. + + Improve citation support (#9452). Emit `form: "prose"` or `form: "year"` + qualifiers if the citation is author-in-text or suppress-author. + Strip initial comma from suffix, since typst will add an extra one. + + Unescape URI escapes in image paths (#9389). + + Handle labels and citaiton ids with spaces and other special + characters (#9387). In these cases, we produce an explicit `label()` + rather than using `<>` or `@`. + + Avoid producing illegal labels (#9387). + + Avoid unnecessary escapes (#9386). + + * LaTeX writer: + + + Make writer sensitive to `empty_paragraphs` extension (#9443). + + Fix beamer highlighting (mh4ckt3mh4ckt1c4s). + + Create valid table even when table is empty (#9350). + + Set font fallback for babel main font (Max Heller). + + Add some kerns where needed between quotes (#9371). + + * HTML writer: + + + Add suffix to multiple footnote section ids, so they are + unique (Sam May). This is necessary when `--reference-location` + is `block` or `section`. + + * EPUB writer: + + + Add ARA roles for accessibility (#9378, Iacobus1983). + Footnote references are given role "doc-noteref", footnote text + gets "doc-footnote", and nav gets "doc-toc". + + Ensure that an alt attribute is always added (#9354). This seems to + be required by iBooks; even an empty alt attribute will satisfy it. + + Add `xml:lang` to package element (#9372). + + Add accessibility metadata to EPUB metadata (#9372, #9400, + Iacobus1983 and John MacFarlane). Reasonable default values are + used to ensure that pandoc's EPUBs conform to the EU Accessibilty Act + requirements, but values can be overridden using metadata. + + * Docx writer: + + + Restore ability to center-justify table (#9393). The fix to + #5947 caused all tables to be left indented. This was necessary + to avoid extra indentation in table cells when a table appeared + in a list item. This change makes the changes conditional, so + that they only affect tables in list items. + + * Man writer: + + + Fix bug with long URLs (#9458). URLs with more than 68 characters didn't + display properly because of wrapping. + + Support (limited) syntax highlighting in code blocks (#9446). + Currently only boldface and italics are supported. The `monochrome` + style might be of use for those generating man pages. + + * Org writer: + + + Escape special lines in code blocks (#9218, Albert Krewinkel). + + * Markdown writer: + + + Use different width fences for nested divs (#9450). Outer divs + have longer fences. This aids clarity for the reader, making it + easier to see where the div ends. It also makes the output + compatible with some other implementations, e.g. micromark, + which require different-width fences for nesting. + + Fix output for pipe tables with a huge number + of columns (#9346). Previously we got invalid pipe tables when the + number of table columns exceeded the setting of `--columns`. + + * Powerpoint writer: + + + Fix regression in layout for slides with figures (#9442). + + Use internal column widths in pptx writer tables (#5706, + Tomas Dahlqvist). The table writer used to only divide all + available width evenly for all columns. In this update the code + uses the incoming widths if they are available. If they are not + set the earlier even distribution is used. Some of the golden + templates are adjusted slightly because of different rounding when + using the new calculation model. + + * Custom writers: + + + Fix handling of common state (#9229, Albert Krewinkel). + The CommonState (`PANDOC_STATE` in Lua) may change between the time that + a custom writer script is first loaded and when the writer is run. + However, the writer was always using the initial state, which led to + problems, e.g. when the mediabag was updated in a filter, as those + updates where not visible to the writer. The state is now updated + right before the writer function runs. + + * Text.Pandoc.SelfContained: + + + Fix id replacements in SVGs with clipping paths (#9420). + This fixes `--embed-resources` when SVGs have `clip-path` attributes. + + Fix size of duplicated SVGs with `--embed-resources` (#9439). + + * ConTeXt template: support font fallback (#9361, Lawrence Chonavel). + + * Text.Pandoc.Shared: + + + `addPandocAttributes`: use `wrapper` attribute, not `wrap`, for + Divs and Spans added as wrappers to hold attributes on elements + that do not accept them. + + `makeSections` behavior changes: + - When the optional base level parameter is provided, we no + longer ensure that the sequence of heading levels is gapless + (#9398). Instead, we set the lowest heading level to + the specified base level, and adjust the others accordingly. If + an author wants to skip a level, e.g. from level 1 to level 3, + they can do that. In general, the heading levels specified + in the source document are preserved; `makeSections` only + puts them into a hierarchical structure. + - Section numbers are now assigned differently, as described above + under `--number-sections` changes (#5071). + + Improve `makeSections` code for section number calculation. + + * Text.Pandoc.Chunks: + + + Autogenerate unique ids for sections missing them (#9383). + This is needed for TOC generation to work properly. We can't + create TOC links if there are no ids. This fixes some EPUB validation + issues we've been getting since switching over to Chunks for chunking. + + Improve `fixTOCTreePaths`. We weren't adding ids for section headings + that don't head a chunk, but these headings are needed for a TOC. + + * Lua: catch encoding error in `pandoc.read` (#9385, Albert Krewinkel). + Fixed a bug that could lead to an un-catchable error and program + termination when `pandoc.read` was called with invalid UTF-8 input. + + * LaTeX template: support font fallback (lawcho). This support is + LuaLaTeX-specific. See MANUAL.txt for documentation. + + * Text.Pandoc.Readers: Add `readMan` to exports [API change] (George Stagg). + + * Text.Pandoc.PDF: + + + Reliably detect when TOC has changed (#9295). Sometimes the TOC + changes but there are no warnings: this happens when no labels + are present. In this case we must rerun LaTeX. So we now take the + SHA1 hash of the TOC file and rerun LaTeX if it changes between runs. + + Increase maximum number of LaTeX runs to 4 (#9299). On some documents, + 4 runs are needed (e.g. when a LastPage reference is used). + + Avoid `readFileLazy`, which caused improperly cleaned-up + temp directories on Windows (#9460). + + * MANUAL.txt: + + + Harmonize spelling of Markdown and MultiMarkdown (#9402, Salim B). + + Add `<pre>` to list of exceptions for `markdown_in_html_blocks` + extension (#9305). + + Add clarification to docs for `--resource-path` (#9417). + + * Makefile: Validate generated EPUB as part of prerelease checks. + + * Add validation for docx golden files to CI (Edwin Török). + +## pandoc 3.1.11.1 (2024-01-05) + + * Docx reader: + + + Fix HYPERLINK with only switch and no argument (#9246). + + * Org reader: + + + Parse caption and label for grid tables (#9279). + + * MediaWiki reader: + + + Handle multiline math in list items (#9293). + + * OPML writer: + + + Respect `--wrap` options & `--columns` in contents of notes (#9297). + + * ODT/OpenDocument writers: + + + Properly handle highlighting styles (#9287). These styles were + going into an `office:styles` element in `content.xml`, but this + is invalid. Instead they must go in `styles.xml`. The variable + `highlighting-styles` no longer has any effect on the default + opendocument template, and highlighting styles are not included + in `opendocument` output. + + * Markdown writer: + + + Add table identifier at end of caption if present (#9279). + + * Text.Pandoc.PDF: + + + Expand list of environment variables to display in verbose output + (#9303). + + Ensure that we find all the LaTeX warnings requiring a rerun (#9284). + This should fix a regression from 3.1.9 that led to incorrect + alignments in tables (and possibly other issues). + + * Docx writer: + + + Ensure that pandoc's output validates (Edwin Török, #9273, #9269, + John MacFarlane, #9265, #9266, #9264). + + Don't emit empty table rows, which seem to cause problems for + Word (#9224). + + * LaTeX writer: + + + Omit superfluous page locator label when used with `--natbib` or + `--biblatex` (#9275). These will treat a bare number as a + page locator, and they will be able to localize it. Note that the + recognition of the locator label is locale-sensitive; if `lang` is + `de`, then `S. 33` is a page reference, and `p. 33` is not! + + * Text.Pandoc.Chunks: Fine tune `makeChunks` (#9281). + + + Ensure that chunks not based on sections (those with the + "preamble" class) get unique identifiers, by appending chunk number. + + This will also ensure that they get unique path names when + the path is generated from the identifier. + + * Default HTML5 template: remove html5shiv (and support for IE < 9). + + * Makefile: + + + Fix `make quick-stack`: `j` was expecting a number (Edwin Török). + + Run built pandoc (instead of pandoc in path). + + Add `validate-epub` target, using `epubcheck` to test the golden files. + + Add `validate-docx-golden-tests` target. + +## pandoc 3.1.11 (2023-12-15) + + * Typst writer: + + + Emit `;` after typst code, unless followed by space (#9252). + Otherwise there's the potential that the typst code will swallow + up a following character. + + * Text.Pandoc.Logging: + + + Add `MakePDFWarning` constructor to LogMessage [API change]. + + Add `MakePDFInfo` constructor to LogMessage [API change]. + + * Text.Pandoc.PDF: + + + LaTeX warnings are passed on to the user as warnings. + + Use `report` with `MakePDFWarning` and `MakePDFInfo` to relay + verbose information and warnings, instead of writing directly + to stderr. + + Parse logs to determine whether additional runs needed, instead of + running a fixed number of times (#9255). (The number of times + that was appropriate given pandoc's default templates didn't + always work for custom templates, and thus pandoc 3.1.10's + change in the number of runs led to some regressions in PDF + production.) + + * Makefile: in `make prelease`, add checks that pandoc-cli and + pandoc have the same version, that pandoc-cli depends on this + exact version of pandoc, that there is an entry for this version + in the changelog, and that the version numbers in the + generated man pages are correct. + + * Regenerate man pages with pandoc 3.1.10. This properly escapes hyphens + and fixes version numbers in man pages for `pandoc-server` and + `pandoc-lua`. + + * Depend on texmath 0.12.8.6. This omits unneeded `lr`s in typst + math output. + + * Depend on typst 0.5. This allows the typst reader to support + multiline strings, the version type, and the `as` + keyword with `import`. + +## pandoc 3.1.10 (2023-12-12) + + * Link pandoc-cli version to pandoc version. Henceforth pandoc-cli's + version will be synchronized with pandoc's, and pandoc-cli will + depend on an exact pandoc version. This will avoid confusion by + ensuring that `cabal install pandoc-cli-X.Y.Z` installs pandoc + version X.Y.Z. It will make things more straightforward for + upstream packagers (see #9232). This scheme does not follow the + Haskell PVP, but that should cause no harm, because this package + does not expose a library. + + * Add `alerts` markdown extension. This enables GitHub style markdown + alerts as a commonmark extension. This extension is now default for + `gfm`. It can't be used with `markdown`, only with `commonmark` and + variants. + + * Markdown reader: + + + Preserve newlines in math instead of changing to spaces. + Otherwise we can get unwanted results if there's + a `%` comment (#9193). + + Make attributes work with reference links (#9171). + + * HTML reader: + + + Improve handling of invalidly nested sublists (#9187, cf. #8150). + + * MediaWiki reader: + + + Allow attribute keys with hyphens (#9178). + + * ODT reader: + + + Support attr `text:continue-numbering` (#8979, Stephan Meijer). + + * Typst reader: + + + Allow references (e.g. `@foo`) to become citations + if there is no corresponding label in the document. + + Collapse adjacent `cite` elements. + + Handle supplements in `cite`. + + Change `cite` (only one key allowed, a label) (typst 0.9 breaking change). + + Support `quote` element (typst 0.9). + + * LaTeX reader: + + + Handle otherlanguage environment and language-name environments like + `\begin{french}...\end{french}` (#9202). + + Fix theorem label parsing (#8872, Hikaru Ibayashi). + + * Docx reader: + + + Unwrap content of shaped textboxes (Stephan Meijer, #9214). + + Improve handling of `w:sym` (#9220). We now look up symbols in symbol + fonts using the table defined at Text.Pandoc.Readers.Docx.Symbols. + + Add unexported module Text.Pandoc.Readers.Docx.Symbols. This gives us a + table to use to resolve characters included in docx via `w:sym` element. + + * Man reader: + + + Properly handle `.sp` macro inside lists and block quotes (#9201). + + * LaTeX writer: + + + Fix bug with big footnotes inside emphasis (#8982, Hikaru Ibayashi). + + Handle identifiers inside heading contents. `\phantomsection` can't + be used in this case, so we need `\hypertarget` (#9209). + + * LaTeX template: + + + Include `bookmark` package unconditionally. This package + produces better PDF bookmarks than `hyperref` and does it on the + first pass. + + * Typst writer: + + + Use `quote` for block quotes. + + Support `--toc-depth` as in other writers (#9242). + + Put inline image dimensions on enclosing box, not image (#9104). + + Better handling of tables with captions (#9194). + We now put these in a figure with a caption argument. + + Update typst writer to typst 0.9 citation format (#9188). + + * Typst template: + + + Remove custom definition of `blockquote` in default template. + (We now use built-in `quote`.) + + Support table of contents. + + Support csl (#9186, Ian Max Andolina). Typst now supports CSL for its + native citation engine, so pandoc should use a specified `csl` + style in the template, falling back to `bibliographystyle` if + `csl` is not specified. + + * Docx writer: + + + Use different style for block quotes in notes (#9243). + Using "Footnote Block Text" for the style name, so it can be + given a different font size if footnotes are. + + Allow embedded fonts to be used in reference.docx (#6728). + + * HTML5 writer: + + + To conform to validator's expectations, `doc-footnote` role is used + with `aside` and `doc-endnotes` with `section`. + + `aside` is used only for notes at ends of sections or blocks; + if all the notes come at the end of the document, `section` is + used so we can have the `doc-endnotes` role. + + * JATS writer: + + + Handle case where there is material after refs div (#9166). Previously in + such cases the references were not being moved to back matter. + + * Ms writer: + + + Don't do normal escapes in filename arguments for PSPIC etc. + + * T.P.RoffChar: escape `-` as `\-`. The `groff_man (7)` man page indicates + that `-` characters will be treated as typographic hyphens and are not + appropriate for cases where the output should be copy-pasteable as an + ASCII hyphen-minus character. (E.g. in command line options.) + However, until a recent update groff man did not actually do this; + it treated `-` and `\-` the same. With the new update (1.23.0) + the two are distinguished (see https://lwn.net/Articles/947941/ + for background), so now it is important that pandoc escape `-`. + + * Text.Pandoc.Extension: add `Ext_alerts` constructor [API change]. + + * Text.Pandoc.PDF: We now default to running LaTeX only + once in producing a PDF (instead of twice). This is made possible by the + shift to the `bookmark` package, which does not require a second pass for + PDF bookmarks. If a table of contents is present, we still have to run + three times to get the page numbers, and if beamer is used we still do a + minimum of two runs. + + * Text.Pandoc.Shared: + + + `renderTags'`: use minimized tag for `rect`. + + Allow svg `path` element to be minimized. + + Export `combineAttr` [API change]. + + Improve `isTightList` so that it recognizes an item containing only a list + which is itself tight as potentially an item in a tight list (#9161). + + * Text.Pandoc.MIME: Ensure we use `.svg` not `.svgz` as extension + for `image/svg+xml` mime type. This fixes issues with embedded + SVG images in docx output, among other things (#9195). + + * Text.Pandoc.Class: `openURL` improvements for data uris. + Only treat data URI as `base64` if ';base64' is specified. + Otherwise treat as UTF-8 (not 100% reliable but should cover most + other cases). Strip off `;base64` (or `;charset=...` or whatever) + from mime type (#9195). + + * Text.Pandoc.SelfContained: Improve treatment of embedded SVGs + (#9206, #8948). + + + Ensure unique ids for elements by prefixing SVG id. + + Ensure SVG `id` attribute except when `use` element is used. + + Remove `width`, `height` attributes from svg element when `use` + element is used. Instead, add `width` and `height` 100% to the + `use` element. This seems to get the sizing right. + + * Text.Pandoc.Citeproc: Don't link citations if + `suppress-bibliography` specified, for there will be nothing to + link to (#9163). + + * epub.css: add styling for sup and sub (#9160). + + * Switch from `base64` to `base64-bytestring` (#9233). + + * Use newest versions of commonmark, commonmark-extensions, + commonmark-pandoc, texmath, typst, skylighting, skylighting-core. + + * Benchmark: use standalone documents for reader tests. + Otherwise typst reader benchmark fails. Note: this means that we are now + parsing longer documents, so bench results on readers won't be comparable + to before. + + * MANUAL.txt: update defaults file docs for bibliography fields (#9173). + Recommend using top-level `bibliography` `csl`, etc. instead + of a nested `metadata` field. Reason: `${USERDATA}` and `${HOME}` + are only expanded in these contexts, not in `metadata`. + + * Move man pages to pandoc-cli package (#9245). + +## pandoc 3.1.9 (2023-10-27) + + * Make `reference-section-title` work with `jats+element_citations` + (#9021). + + * Add `bits` as synonym of `jats` as input format. + + * JATS reader: + + + Modify JATS reader to handle BITS too (#9138, Julia Diaz). + Add provision for title-group, book, book-part-wrapper, book-meta, + book-part-meta, book-title, book-title-group, index, toc, legend, + title, collection-meta + + Fix handling of alt-text (#9130, Julia Diaz). Previously we were + looking for an attribute that doesn't exist in JATS; alt-text is + provided by a child element. + + * CommonMark reader: + + + Handle `Ext_tex_math_gfm` (#9121). Parse GFM-specific math + constructions when `tex_math_gfm` enabled. + + * DokuWiki reader: + + + Allow autolinks to be avoided using e.g. `https:%%//%%...` (#9153). + + Parse `<code>` and `<file>` as block-level code (#9154). + Previously we treated them as inline code in some contexts, + but that is not how DokuWiki works. + + * LaTeX reader: + + + Better handle spacing commands `\hfill`, `\vfill`, `\hskip`, + `\vskip`, etc. (#9150). + + Fix incorrect abbreviation for astronomical unit (#9125, + Michael McClurg). + + * Markdown reader: + + + Fix blindspot with superscript in links (#8981). + Previously `[^super^](#ref)` wasn't parsed as a link, due to + code that was meant to prevent footnote markers from being + recognized as reference links. This commit tightens up that + code to avoid this bad effect. We have also added a new + restriction on footnote labels: they cannot contain the characters + `^`, `[`, or `]`. Though this is technically a breaking change, we + suspect that the impact will be minimal, as it's very unlikely + people would be using these characters in their note labels. + + Don't apply `--default-image-extension` to data URIs (#9118). + + More accurate check that a normalCite is not a link, + bracketed span, or reference (#9080). + + * HTML reader: + + + Allow th to close td and vice versa (#9090). + + Parse task lists using input elements (#9047, Seth Speaks). + + * Creole reader: + + + Handle empty cells correctly (#9141, Sascha Wilde). + + * Org writer: + + + Escape literal `*`, `|`, `#` at beginning of line with ZWS (#9159). + + * ICML writer: + + + Prevent doubled attributes (#9158). + + * Powerpoint writer: + + + Fix a corruption error caused when the document used both a + regular png and a png in a data URI (#9113). (Similarly for any + other image format.) The problem was that duplicate entries in + `[Content Types].xml` were being created, one for the mime type + `image/png`, one for `image/png;base64`. + + * LaTeX writer: + + + Fix rowspans in tables so they use the width of + the column (`=` as the width parameter) (#9140). + + Don't treat table as "simple" if they have col widths. + This should help fix a problem wherein some grid tables with + colspans were overly wide (#9140). + + Fix uneven indents in line block output (#9088). + + * JATS writer: fix 3.1.4 regression in handling block-level metadata + (#9092). + + * Ms writer: improvements in image handling (#4475). + + + PDFPIC is now used for PDF images in figures. + + Inline images that are postscript or PDF are rendered using + PSPIC or PDFPIC. This isn't ideal, because they will still be + rendered as if in a separate paragraph, but it's probably + better than just printing the image name. + + Units are included in height. + + * HTML writer: + + + If raw format is an HTML side deck format, emit it (James J Balamuta). + + * Typst writer: + + + Add `#box` around image to make it inline. (#9104) + An `#image` by itself in typst is a block-level element. + To force images to be inline (as they are in pandoc), we need + to add a box with an explicit width. When a width is not given + in image attributes, we compute one from the image itself, when + possible. + + Don't allow long heading to wrap (#9132). + + Escape `(` (#9137). If unescaped `(` occurs in + certain contexts, it can be parsed as function application. + + * Man writer: + + + Fix some spacing issues around links (#9120). + We need to use `\c` before a `.UR` or `.MT`, to avoid + an extra space, and also after. To ensure that a space + at the beginning of the following line doesn't get swallowed + up, we escape it with `\`. + + Use UR, MT macros for URLs, emails (#9120). + + * Text.Pandoc.Extensions: + + + Add `Ext_tex_math_gfm` constructor to Extension (#9121). + [API change]. This handles two GitHub-specific syntaxes for math. + This is now default for `gfm`, in addition to `tex_math_dollars`. + + Remove duplicates for `Ext_raw_html` and `Ext_pipe_tables` + in some of the lists (Tim Stewart). + + * Text.Pandoc.Metadata: Add helpful message on some metadata + YAML errors (#9155). + + * Text.Pandoc.Shared: + + + `splitSentences`: don't split after initials. + This improves the man and ms writer output, preventing + sentence breaks after initials. + + Add `addPandocAttributes` function [API change]. + This is meant to simplify addition of attributes to Pandoc + elements: for elements that don't have a slot for attributes, an + enclosing Div or Span is added to hold the attributes. + + * MANUAL.txt: + + + Clarify that formatting can't cross line boundaries + in line blocks (#9119). + + Fix legacy option for citation (#8737, 3w36zj6) + + * Update `et` translations (priiduonu). + + * Updated `no` translations (Stephan Daus). + Renamed no.yaml (macrolanguage Norwegian) to nb.yaml (Norwegian Bokmål). + Created soft symbolic link from no.yaml pointing to nb.yaml. + + * Lua subsystem: Use the newest LPeg version (lpeg-1.1.*) (#9107, + Albert Krewinkel). + + * Default `epub.css`: Apply style to h6, format styles, and + combine identical styles under shared selectors (samuel-weinhardt). + + * Update nix flake with dependencies (piq9117). + + * LaTeX template: fix `\CSLBlock` vertical space (John Purnell). + + * Allow tasty 1.5 and Diff 0.5. + + * Require commonmark-extensions 0.2.4, commonmark 0.2.4. + + * Require texmath 0.12.8.4. This should improve math in + powerpoint, fixing empty boxes around roots in some cases. + + * Require typst 0.3.2.1 + +## pandoc 3.1.8 (2023-09-08) + + * JATS reader: + + + Ignore `<processing-meta>` element (#9057, Julia Diaz). + + Fix conversion of date to ISO 8601 format (#8865). + + * LaTeX template: + + + Add code allow `\cite` to break across lines (#9050). + + Fix regression with CSL `display="block"` (#7363). + This restores the line break before the block. + + Rewrite `CSLReferences` environment to avoid depending on + `enumitem`, which plays badly with beamer. Instead we use + a regular list environment. Thanks to @jpcirrus for the + concept (#9053). + + Restore the pre-3.1.7 format of the `CSLReferences` + environment, which again has two parameters. The first + determines whether a hanging indent is used (1 = yes, 0 = no), + and the second is the entry line spacing (0 = none). + + Add a strut to avoid inconsistencies in spacing (#9058). + - Remove a break at the end of `CSLRightInline` to avoid + inconsistencies in spacing. It shouldn't be necessary + because the paragraph should extend to the right margin (#9058). + + * LaTeX writer: + + + Fix regression with figure labels (#9045). In 3.1.7, pandoc + added two labels to LaTeX figure environments, one with a + phantomsection. + + Fix default citeproc entry-spacing. According to the CSL manual, + the default entry spacing is 1. We were treating it as 0 (#9058). + + * HTML writer: + + + Use the ID prefix in the ID for the footnotes section (#9044, + Benjamin Esham). + + Fix CSL entry-spacing default (#9058). + + * Text.Pandoc.Citeproc: always include an `entry-spacing` attribute + in the Div if the bibliography element contains an entry-spacing + attribute (previously we omitted it when it was 0) (#9058). + + * Clean up pandoc's own man pages by regenerating with pandoc 3.1.7. + + * pandoc-lua-engine: bump lower bound for pandoc (#9046). + + * Depend on texmath 0.12.8.2, fixing binom in typst writer (#9063). + +## pandoc 3.1.7 (2023-08-31) + + * Org reader: + + + Don't parse alphabetical lists unless the `fancy_lists` extension is + enabled (#9042). + + Allow escaping commas in macro arguments (Amneesh Singh). + + * JATS reader: + + + Support for `<permissions>` metadata (#9037, Julia Diaz). + metadata objects with multiple fields are created, matching the + structure in JATS. + + Correct name of JATS element `attrib`. + + * Markdown reader: + + + Support images with wikilink syntax, e.g. `![[foo|bar]]`, when + one of the `wikilinks` extension is enabled (#8853). + + Allow a citation or reference link to be parsed after a `!` (#8254). + + Fix dropped `!` before nonexistent reference (#9038). + + * LaTeX writer: + + + Fix regression in escaping URLs (#9043). + + Use `\cite` and `\bibitem` to link up citations, even with citeproc. + (#9031). This will give us better accessibility; when tagging is + enabled, the citation can be linked to the bibliography entry. + This changes some of the details of the layout and the default + template. We now make `CSLReferences` a special enumitem list + that will contain `\bibitem`s. Internal links inside citations to + ids beginning in `ref-` are creating using `\cite` instead of + `\hyperref`. + + Use `\phantomsection` and `\label` instead of `\hypertarget` (#9022). + + Use `\hyperref` for LaTeX internal links, `\hyperlink` for + beamer (since `\hyperref` doesn't seem to work) (#9022). + + Backslash-escape `%` and `#` in URLs (#9014). + + * JATS writer: + + + Fix placement of ref-list when no title is specified for the + reference section (#9017). (In this case we place it in `back` + with an empty title.) + + * Man writer: + + + Avoid a `.PP` right after a section heading (#9020). + This is at best a no-op (in groff man and mandoc) and at worst + (in some formatters) may create extra whitespace. + + We revert the fanciness introduced in #7506, which employs a + custom font name `V` and a macro that makes this act like boldface + in a terminal and monospace in other formats. Unfortunately, + this code uses a mechanism that is not portable (and does not + work in mandoc) (#9020). + + Instead of using `V` for inline code, we simply use `CR`. + Note that `\f[CR]` is emitted instead of plain `\f[C]`, + because there is no `C` font in man. (This produces warnings + in recent versions of groff, #9020.) + + For code blocks, we now use the `.EX` and `.EE` macros, + together with `.IP` for spacing and indentation. This gives + more standard code that can be better interpreted e.g. by mandoc + (#9020). + + * Man template: don't emit `.hy`, regardless of setting of + `hyphenate` variable (#9020). + + * LaTeX template: special redefinition of `\st` for CJK (#9019). + soul's version raises on error on CJK text. + + * Use latest skylighting-format-blaze-html (#7248). + This works around a longstanding iOS Safari bug that caused long + lines to be displayed in a different font size in highlighted code. + + * Allow skylighting 0.14 (and require it in pandoc core). + + * Allow text 2.1. + +## pandoc 3.1.6.2 (2023-08-22) + + * Org reader: allow example lines to end immediately after the colon + (Brian Leung). + + * Docx reader: + + + Omit "Table NN" from caption (#9002). + + Avoid spurious block quotes in list items (#8836). + + * JATS reader: Fix display of block elements (#8889, Julia Diaz). + A number of block elements, like disp-quote, list, and disp-formula, were + always treated as inlines if appearing inside paragraphs, even if their + usage granted a separate block. + + * HTML reader: avoid duplicate id on header and div (#8991). + + * Typst writer: + + + Use `~` for nonbreaking space, and escape literal `~` (#9010). + + Put the label in right place for Div, use `#block` (#8991). + Previously we were putting the label at the beginning of + the Div's contents, but according to the documentation such a + label gets attached to the *preceding* element. We now use an + explicit `#block` and add the label at the end. + + * LaTeX writer: + + + Improve escaping of URIs in href, url (#8992). + + Improve internal links and targets (#8744). We no longer + wrap section headings in a `\hypertarget`. This is unnecessary + (hyperref creates an anchor based on the label) and it interferes with + tagging. In addition, we now use `\hyperref` rather than `\hyperlink` + for internal links. Currently `\hypertarget` is still being used for + link anchors not on headings. Thanks to @u-fischer. + + * HTML format templates (style.html): Fix typo in clause for svg + (Jackson Schuster). + + * Use lastest texmath, typst-symbols, typst. Targets typst 0.7. + + +## pandoc 3.1.6.1 (2023-08-11) + + * HTML reader: properly calculate RowHeadColumns (#8984). This fixes a + bug in the calculation of the number of header columns in table row. + It also changes the algorithm for determining the table body's + RowHeadColumns based on the numbers of head columns in each row. + Previously we used the max, and #8634 switched to the min, which + led to bad results. Now we only set RowHeadColumns to a non-zero value + if *all* rows have the same number of head columns. + + * OpenDocument writer: + + + Implement syntax highlighting for inline and block code (#6710). + + Support highlighted text in ODT/OpenDocument writers for Span + with class `mark` (#8960). The color can be adjusted by + modifying the Highlighted style. + + * Typst writer: escape `//` so it doesn't get interpreted as a comment + (#8966). + + * ChunkedHTML writer: Fix regression including MathJax script (#8967). + The fix for #8620 caused the script to be included when the table of + contents but not the body text of a page contains math. But it broke the + case where the table of contents doesn't contain math but the page does. + This patch fixes the issue. + + * Text.Pandoc.SelfContained: + + + Retain attributes in SVG tag when referring to another + SVG's content using `<use>` (#8969). + + Allow units in width and height for SVG. Units are optional but allowed. + + Don't coerce calculated SVG dimensions to Int. + + fix calculation of SVG width and height. We were computing width and + height from viewBox incorrectly (#8969). + + Add clause for SVG to default CSS for HTML (#8969). + + Ensure that width and height attributes don't get specified + twice is both the img tag and the svg include them (#8965). + + Omit unnecessary attributes xmlns, xmlns:xlink, and version on + SVG element (#8965). + + Use 20 character rather than 40 character hashes for generated IDs + (#8965). + + * Use pandoc-types 1.23.1. This fixes a regression with toJSONFilter (#8976), + which in 1.23.0.1 no longer worked on pure values of type `a -> [a]`. + + * Use ghc 9.6 for release builds (#8947). + + * Fix some links in FAQs (Diogo Almiro). + + +## pandoc 3.1.6 (2023-07-20) + + * Fix CVE-2023-38745, a variant of the vulnerability in CVE-2023-35936. + Guilhem Moulin noticed that the fix to CVE-2023-35936 was incomplete. + An attacker could get around it by double-encoding the malicious + extension to create or override arbitrary files. + + * `--embed-resources`: Use inline SVG instead of data uris for SVG + images in HTML5 (#8948). Note that SelfContained does not have + access to the writer name, so we check for HTML5 by determining + whether the document starts with `<DOCTYPE! html>`. This means + that inline SVG won't be used when generating document fragments. + + * Fix regression on short boolean arguments (#8956). + In 3.1.5 boolean arguments were allowed an optional argument + (`true|false`). This created a regression for uses of fused + short arguments, e.g. `-somyfile.html`, which was equivalent + to `-s -omyfile.html`, but now raised an error because + pandoc attempted to parse `o` as a boolean `true` or `false`. + This change allows the fused short arguments to be used again. + Note that `-strue` will be interpreted as `-s` with an + argument `true`, not as `-s -t -rue`. It is best to + use long option names with the optional boolean values, + to avoid confusion. + + * Make `--epub-title-page`'s argument optional. It takes a boolean + argument, and now that all of our boolean flags take such an + argument, we can make this one optional for consistency. + + * Improve errors for illegal output formats. Previously if you did + `pandoc -s -t bbb`, it would give you an error about the missing + `bbb` template instead of saying that `bbb` is not a + supported output format. + + * Improve errors for incorrect command-line option values (#8879). + Always give the name of the relevant argument. + + * Fix typo on error message for incorrect `--preserve-tabs` argument. + Thanks @fsoedjede + + * Docx reader: use SVG version of image if present (#7244). + Previously the backup PNG was exported even if an SVG was + present, but the SVG should be preferred. + + * Typst reader: fix regression in recognition of display math (#8949). + The last release caused all math to be parsed as inline math. + + * JATS writer: don't use `<code>` for inline code (#8889). + It is intended for block-level code. + + * HTML writer: don't make line blocks sensitive to `--wrap` (#8952). + + * RST writer: fix figure handling (#8930, #8871). + This fixes a number of regressions from pandoc 2.x. + Properly handle caption, alt attribute in figures. + No longer treat a paragraph with a single image in it as a figure + (we have a dedicated Figure element now). + + * Docx writer: Copy "mirror margins" property from reference.docx (#8946). + + * Text.Pandoc.UTF8: Deprecate `decodeArg` which is now a no-op. + This was needed for old base versions which we no longer support. + + * Use released skylighting, typst. + + * Allow latest commonmark-extensions. This allows entities in wikilinks. + + * Switch back to using ghc 9.2 for linux and Windows binary releases + (#8947, #8955). With ghc 9.4+, we were getting AVX instructions + in the amd64 binary, which aren't supported on older hardware. + For maximum compatibility we switch back to ghc 9.2, which doesn't + cause the problem. (As documented, ghc should not be emitting these + instructions, so we aren't clear on the diagnosis, but the cure + has been tested.) + + * Change Windows release build to use cabal instead of stack. + +## pandoc 3.1.5 (2023-07-07) + + * Allow all boolean flags to take an optional `true` or `false` value + (#8788, Sam S. Almahri). The default is true if no value is specified, + so this is fully backwards-compatible. + + * Support `--id-prefix` for markdown output (#8878) + + * Markdown reader: + + + Add strictness annotations to fix a memory leak (#8762). + + * Typst reader: + + + Use typst-hs 0.3.0.0, which is more robust, fixes many bugs, and + targets typst 0.6. + + Package loading is now supported, as long as the package has been + cached or is local. + + Rewrite Typst reader in a way that makes it easier to extend. + + Filter out CR in raw. + + Handle block content for link element. + + Handle block-level content in text element. + + Handle style, align, place in inline contexts too. + + Improve info message for skipped elements. + + * Add typst reader tests (#8942). + + * MediaWiki reader: + + + Revise treatment of "link trail." Previously we only included ASCII + letters. That is correct for English but not for, e.g., Spanish (see + comment in #8525). A safer approach is to include all letters except + those in the CJK unified ideograph ranges. + + * AsciiDoc writer: + + + Make modern AsciiDoc the target for `asciidoc` (#8936). + The AsciiDoc community now regards the dialect parsed by `asciidoctor` + as the official AsciiDoc syntax, so it should be the target of our + `asciidoc` format. The `asciidoc` output format now behaves like + `asciidoctor` used to. `asciidoctor` is a deprecated synonym. For + the old `asciidoc` behavior (targeting the Python script), + use `asciidoc_legacy`. The templates have been consolidated. Instead of + separate `default.asciidoctor` and `default.asciidoc` templates, there + is just `default.asciidoc`. + + Text.Pandoc.Writers.AsciiDoc API changes: + - `writeAsciiDoc` now behaves like `writeAsciiDoctor` used to. + - `writeAsciiDoctor` is now a deprecated synonym for `writeAsciiDoc`. + - New exported function `writeAsciiDocLegacy` behaves like + `writeAsciDoc` used to. + + Update line-through for asciidoc writer to custom inline style (#8933, + Kevin Broch). + + * Typst writer: + + + Support `unlisted` class in headings (#8941). + + Consolidate bibliography files into one `#bibliography` command (#8937). + + Improve handling of autolinks (#8931). + + * Docx writer: + + + Make relative widths work in tables. This didn't work before because we + were missing an attribute that tells Word to used fixed widths rather + than computing optimal ones. + + * DokuWiki writer: fix lists with Div elements (#8920). + The DokuWiki writer doesn't render Divs specially, so their presence in + a list (e.g. because of custom-styles) need not prevent a regular + DokuWiki list from being used. (Falling back to raw HTML in this case is + pointless because no new information is given.) + + * LaTeX writer: + + + Fix babel name for `fa` (should be `persian`). + + Prevent babel language from being imported twice (#8925). + + * Text.Pandoc.Class: + + + Add `toTextM` [API change]. This is like `Text.Pandoc.UTF8.toText`, + except: + + - it takes a file path as first argument, in addition to + bytestring contents + - it raises an informative error with source position if + the contents are not UTF8-encoded + + This replaces `utf8ToText` whenever we have the filename and are + in a PandocMonad instance. This will lead to more informative error + messages for UTF8-encoding, indicating the file path and byte offset + where the error occurs (#8884). + + * Remove invalid term "Subject" from Turkish translations (#8921). + + * stack.yaml: add pkg-config to nix packages (#8927, pacien). + + * Allow aeson 2.2. + + * MANUAL: Add clarification on --section-divs. Closes #8882. + + +## pandoc 3.1.4 (2023-06-24) + + * Fix a security vulnerability in MediaBag and T.P.Class.IO.writeMedia. + This vulnerability, discovered by Entroy C, allows users to write + arbitrary files to any location by feeding pandoc a specially crafted + URL in an image element. The vulnerability is serious for anyone + using pandoc to process untrusted input. The vulnerability does + not affect pandoc when run with the `--sandbox` flag. [CVE-2023-35936] + + * Allow `epub-title-page` to be used in defaults files (#8908). + + * Issue `Extracting` info message (in `--verbose` mode) when using + `--extract-media` or extracting media temporarily in PDF production. + + * HTML reader: Update TableBody RowHeadColumns caculation (#8634, + Ruqi). This change sets RowHeadColumns to the minimum value of each row, + which gives better results in cases where rows have different numbers + of leading th tags. + + * Dokuwiki reader: retain image query parameters as attributes (#8887, echo0). + + * Textile reader: Add support for link references (#8706, Stephen Altamirano). + Textile supports what it calls "link alias", which are analogous to + Markdown's reference-style links. + + * LaTeX reader: support alt text on images (#8743, Albert Krewinkel). + + * Commonmark reader: Make `implicit_figures` work again. + Support for this (introduced in #6350) disappeared when we made an + architectural change. + + * JATS reader: + + + Add footer and multiple body parsing to table reader (#8765, Noah Malmed). + + Parse references title from ref-list (#8365). + + * JATS writer: + + + Make `--number-sections` work. + + Include title in ref-list (#8364). Previously the reference title ended + up in a separate section at the back of the body instead of in the ref-list + in the back matter. + + * Mediawiki writer: allow highlighting to work for F# language + (Adelar da Silva Queiróz). + + * LaTeX writer: Fix escaping of `&` in `\href` and `\url` (#8903). + + * Docx writer: + + + Fix localization of "Abstract" title (#8702). + + Allow `abstract-title` to be specified in docx metadata (#8794). + + * ChunkedHTML writer: Make math work in top-level page (#8915). + + * Text.Pandoc.Logging: add new log message type `ScriptingWarning` + [API change] (Albert Krewinkel). + + * Lua: report warnings from Lua scripts (Albert Krewinkel). + Lua's warning system is plugged into pandoc's reporting architecture. + Warnings that are raised with the Lua `warn` function are now reported + together with other messages. + + * Use crypton-connection instead of connection (#8896, Felix Yan). + Follows the change introduced in tls 1.7.0. + + * Bump versions for skylighting-core, skylighting. + + * Include lua/module/sample.svg in cabal extra-source-files (Felix Yan). + + * Add Nynorsk (New Norwegian) translations (Per Christian Gaustad). + + * Add tests for `fillMediaBag`/`extractMedia`. + + * INSTALL.md: + + + Mention alternatives to LaTeX to generate PDF (Norwid Behrnd). + + Update Linux install links (harabat). + + * pandoc-extras.md: add to "Academic publishing workflows" (#8696, + Vladimir Alexiev). + +## pandoc 3.1.3 (2023-06-07) + + * New output format: `typst`. + + * New module: Text.Pandoc.Readers.Typst [API change]. + + * DocBook reader: + + + Support more emphasis roles (Albert Krewinkel). + The role "bf" is taken to indicate "bold face", i.e., + "strongly emphasized" text, while "underline" leads to + underlined text. + + * JATS reader: + + + Improve title and label parsing in the JATS reader (#8718, + Noah Malmed.) + + Add rowspan, colspan and alignment to cells in jats table + reader (#8408, Noah Malmed) + + * Org reader (Albert Krewinkel): + + + Require abstract environment to use lowercase. + + Treat `#+NAME` as synonym for `#+LABEL` (#8578). + + * ODT reader: + + + Allow lists in table cells (#8892). + + Allow frames inside spans (#8886). + + * RST reader: + + + Fix sorting on anonymous keys (#8877). This fixes a link + resolution bug bug affecting RST documents with anonymous links. + + * HTML reader: + + + Fix iframe with data URI of an image (#8856). + In this case we don't want to try to parse the data at the URL. + Instead, create an image inside a div. + + * RTF reader: + + + Fix bug in table parsing (#8767). In certain cases, text before a + table was being incorporated into the table itself. + + * Docx reader: + + + Introduce support for Intense Quote (Stephan Meijer). + + * Markdown reader: + + + Disallow escaping of `~` and `"` in `markdown_strict` (#8777, + Albert Krewinkel). This matches the behavior of the legacy + `Markdown.pl` as well as what is described in the manual. + + * LaTeX reader: ignore args to column type in `\multicolumn` (#8789). + + * HTML writer: + + + Use first paragraph in task item as checkbox label (#8729, Albert + Krewinkel). + + * Ms writer: + + + Coerce titles to inlines (#8835). Block-level formatting is not + allowed inside `.TL`. + + * LaTeX writer: + + + Fix width for multicolumn simple table (#8831). + + * Jira writer: + + + Use first code block class as highlighting language (#8814, Albert + Krewinkel). The writer no longer searches the list of + classes for a known programming language but always uses + the first class in that list as the language identifier. + + * OpenDocument writer: + + + Handle row header column cells as header cells (#8764, Michael Stahl). + + Fix invalid `text:p` inside `text:p` from meta (#8256). + + * ODT writer: + + + Don't add settings.xml (Michael Stahl). This will cause defaults + to be used, which is what we want. + + Don't add unnecessary Configurations2 directory (Michael Stahl). + + Don't add thumbnail (Michael Stahl). + + Put `manifest.version` on directory file-entry (Michael Stahl). + See ODF 1.3 part 2, 4.16.14.1. + + Stop validator complaints by producing ODF 1.3 (Michael Stahl). + + * MediaWiki writer: + + + Remove links from inside links in mediawiki writer (#8739, + Wout Gevaert). + + * Typst writer: + + + Omit bibliography if `citations` not enabled (#8763). + With this change, the typst writer will omit the `#bibliography` + command when `citations` is not enabled. (If you want to use + pandoc's own `--citeproc`, you should combine it with + `-t typst-citations` to disable native typst citations. + + Use `<..>` for labels, create internal links. + + Use `#footnote` for notes (#8893). + + Fix alignment issue in lists. It's an aesthetic issue + only; the first line had an extra space indent after the + list marker. + + * Commonmark writer: + + + Use shortcut reference links: commonmark supports these. + + * EPUB template: add `lang` attribute to `<html>` (Gabriel Lewertoski). + + * Template styles.html: fix task-list styling in reveal.js + (#8731, Albert Krewinkel). + + * LaTeX template: Fix `\babelfont` (#8728). + + * Text.Pandoc.Parsing: + + + Remove unnecessary 'spaces' in `parseFromString`. + + * Text.Pandoc.ImageSize: Drop BOM at start of SVG if present. + Otherwise our code can fail to determine image size. + + * Lua subsystem: + + + Fix value of PANDOC_SCRIPT_FILE for custom readers & writers + (#8781, Albert Krewinkel). The value did not hold the actual + file path for scripts in the *custom* folder of the datadir. + + * Fix YAML in translation files for `cs` and `pl` (#8787). + + * Fix pdf output via typst (#8754). One must now use `typst + compile` rather than `typst`. + + * MANUAL.txt: + + + Added note that the user will need to create the user data + dir (#8727). + + Add `wikilinks` to non-default extensions (Ilona). + + Update link to custom djot writer (Albert Krewinkel). + + Better link to citation syntax. + + Fix typo (sdhoward). + + Note that `#` fancy list markers don't work with commonmark (#8772, + William Lupton). + + Add commonmark `fenced_div` note (#8773, William Lupton). + + Move highlighting documentation, with minor adjustments + (William Lupton). + + Fix inaccurate statement about spaces and tabs in template + syntax + (Frank Seifferth). + + * Update documentation for org-mode (Christian Christiansen, #8716). + + * doc/lua-filter.md: + + + Fix typos (#8734, perro tuerto). + + Fix anchor (Toni Dietze). + + Use full field name in example (#8857, Matt Dodson). + + Fix copy-paste error (#8798, thron7). + + * CONTRIBUTING.md: update info on ghc versions. + + * INSTALL.md: + + + Fix cabal install instructions (Albert Krewinkel). + + Use more relevant link to NetBSD/pkgsrc entry (Charlotte Koch). + + Fix Windows install instructions for winget (#8799). + + * Tests: Rename test/docx/block_quotes_parse_indent.native for + consistency (Stephan Meijer). + + * Add `tls` constraint on cabal.project. This is needed to + avoid problems caused by the transition to `crypton`. + + * Require texmath 0.12.8. + + +## pandoc 3.1.2 (2023-03-26) + + * Add a Lua REPL (Albert Krewinkel). This can be started + with `pandoc lua -i`. It is also possible to instruct a filter to + open the REPL at a certain point, for debugging (see `pandoc.cli.repl`). + + * Support `typst` as a `--pdf-engine`. + + * Add typst writer (#8713). New module Text.Pandoc.Writers.Typst, + exporting `writeTypst` [API change]. + + * Org reader: + + + Allow zero width space as an escape character (#8716, + Christian Christiansen). Allow the character U+200B to be used as + an escape character as described in the Org-mode documentation + (<https://orgmode.org/manual/Escape-Character.html>). + + * DocBook reader: + + + Handle "book" for xref references (#8712, Andres Freund) + This also adds a test xref to book and part. + + Handle `<part>` (#8712). + + * HTML reader: + + + Fix behavior with `-native_spans-raw_html` (#8711). Previously with + this configuration, `<span>`s were not treated as inline elements at all. + + * HTML writer: + + + Avoid duplicate classes (#8705). + + Use img element instead of embed for `.svg.gz` and `.png.gz` etc. (#8699). + + HTML writer footnotes changes (#8695): when `--reference-location=section` + or `=block`, use an `aside` element for the notes rather than a `section`. + When `--reference-location=section`, include the `aside` element inside + the section element, rather than outside. (In slide shows, this option + causes footnotes on a slide to be displayed at the bottom of the slide.) + + * EPUB writer: + + + Use different structure for epub footnotes (#8676, see #8672, #5583). + Many EPUB readers are thrown off by pandoc's current footnote + output. Both the ol and the fact that the footnote backlink is + at the end of the note seem to pose problems. + With this commit, we now create a list of aside (or div) elements, + instead of an ordered list. Each element begins with a note number + that is linked back to the note reference. (So, the backlink occurs + at the beginning rather than the end.) Thanks to @Porges and @lewer. + + * Docx writer: + + + Include abstract title (#8702). Uses localized term for abstract. + + * Markdown writer: + + + Use implicit figures if there's a caption but no alt (#8689, + Albert Krewinkel). + + * Jira reader (Albert Krewinkel): + + + Add panel title as nested div (#8681). + + Require jira-wiki-markup 1.5.1 (#8680). This fixes a bug in the parser + that caused text between two exclamation marks to be parsed as an + image. The first `!` of image markup must now be followed by a + non-space character; otherwise, the enclosed text is parsed as + normal content. + + * Ms writer: + + + Fix handling of Figure (#8660). + + * ICML writer: + + + Fix images with data (#8675). The Contents element + should be inside Properties. + + * LaTeX writer: + + + Add Chinese to Babel languages. + + Fix background image in Beamer when there are figure environments (#8671, + Martín Pozo). + + * LaTeX template: + + + Add `babelfonts` variable to default LaTeX template. + This allows specifying certain fonts to be used with + certain babel languages. Thanks to Frederik Elwert. + + Fix highlight/underline with lualatex (#8707). We need the lua-ul package + instead of soul, which doesn't work with lualatex. + + * Lua (Albert Krewinkel): + + + Add `pandoc.cli.repl` function + + Fix `json.encode` for nested AST elements. Ensures that objects with + nested AST elements can be encoded as JSON. + + Auto-generate docs for pandoc modules. + + Load text module as `pandoc.text`. This only affects the name in the + Lua-internal documentation. It is still possible to load the modules + via `require 'text'`, although this is deprecated. + + Move docs from module `text` to `pandoc.text` + The latter is easier to use and more consistent with the other modules. + + Keep the Lua stack clean A metatable used during initialization was + not properly removed from the stack. Likewise, accessing the + CommonState from Lua previously led to the pollution of the + Lua stack with a left-over value. + * Add function `pandoc.format.from_path`. + + Allow to get the JSON encoding of log messages. + + * Text.Pandoc.Format: Add new function `formatFromFilePaths` [API change] + (#8710, Albert Krewinkel). + + * The old Text.Pandoc.App.FormatHeuristics module has been removed. + + * In `--version`, use Windows `%APPDATA%` variable to describe + user data dir (#8686, Pablo Rodríguez). + + * Text.Pandoc.App.CommandLineOptions: don't lowercase arg to `--from`/`--read` + (Albert Krewinkel). This prevented users to use custom writers with + uppercase characters in their filenames. Format-normalization, + including lower-casing of format identifiers, happens during + format parsing. + + * Documentation: + + + Add `doc/nix.md`. + + Add `doc/extras.md`. This was formally in the website repo. + + `doc/lua-filters.md`: improve docs for `pandoc.zip`. + + * Factor out `make_macos_release.sh` from the release candidate workflow. + Use cabal instead of stack to build the macos binary. + + * Modify linux/make_artifacts.sh so it will work on cirrus. + + * Switch to hslua-2.3 + + * Depend on latest releases of texmath, doclayout. + +## pandoc 3.1.1 (2023-03-05) + + * EPUB reader: Give additional information in error if the epub + zip container can't be unpacked. + + * TSV reader: don't gobble tabs as whitespace (#8661). + + * Org reader: accept empty tables (#8659). + + * LaTeX reader: fix multiplication syntax for tabular (#8658). + We recognized `*{6}{...}` but not `*6{...}` or `*6c`. + + * Docx reader: parse image alt texts in LibreOffice generated files. + LibreOffice tags images slightly differently than Word; this change lets + the parses take that difference into account when looking for an image + description (alt text). + + * DocBook reader: + + + Fix `<xref>` references to tables in DocBook files + (#8626, Pavol Otto). + + Parse `figure` as a Figure element in the AST (#8668). + + * JATS reader: avoid generating duplicate figure captions (#8669). + + * RST reader: align with spec in syntax for role names (#8653). + In particular, we now allow colons in row names. + + * Add note on converting from .doc format to FAQs (#8654). + + * Trap error in getAppUserDataDirectory (#8648). + This can raise an error if pandoc is run in a non-user environment. + + * LaTeX writer: do not use longtable foot with Beamer (#8638, Albert + Krewinkel). The table foot is made part of the table body, as + otherwise it won't show up in the output. The root cause for + this is that longtable cannot detect page breaks in Beamer. + + * LaTeX template: Add CJKsansfont and CJKmonofont for XeLaTeX + (#8656, Yudong Jin). `CJKsansfont` and `CJKmonofont` will be + set for xelatex only if `CJKmainfont` is also provided. + + * URL style in ConTeXt (#8612, Thomas Hodgson). Previously, a + URL like this would be in monospace text: + `\useURL[url1][https://example.com]`. Now, it will match the + main text unless the `linkstyle` variable is set, which + controls the styling of all links. Closes #8602. + + * Asciidoc writer: Properly escape `|` in table cells (#8665). + + * asciidoc{,tor} template: fix revision date when author is unset + (#8637, arcnmx). Revision line syntax is only valid in + combination with an author line, so the date attribute must be + set explicitly when the author is missing + + * HTML writer: allow "track" element to be treated as block-level HTML + (#8629). + + * Include needed polyfill when MathJaX is used (#8625). + + * JATS writer: include alt-text in `<graphic>`, + `<inline-graphic>` elements (#8631, Albert Krewinkel). + + * Chunked HTML writer: Retain metadata in processing sections + for chunked HTML (#8620). Previously we suppressed metadata + in all but the top page, in order to prevent the title block + from being printed on every page. This prevented use of + custom variables set by metadata fields. This commit moves + to a better solution: a conditional in the default template + restricts the title block to the top page. + + * Lua API: + + + Add new function `pandoc.system.cputime` (Albert + Krewinkel). The function returns the CPU time consumed by + pandoc and can be used to benchmark Lua computations. + + Add module `pandoc.json` to handle JSON encoding (#8605, + Albert Krewinkel). + + * Use pandoc-lua-marshal 0.2.1 (Albert Krewinkel). + All major AST elements now have `__tojson` metamethods that return the + JSON representation of an element. This allows to JSON-encode these + elements with libraries that respect the `__tojson` metamethod, + including dkjson. + + * Use latest zip-archive. This allows pandoc to open certain + epubs that it could not open before. + + * Use commonmark-extensions 0.2.3.4. This fixes some bugs involving + definition lists and inline formatting. + + * Use latest skylighting-format-context + + * MANUAL.txt: + + + Document chunk-template in defaults file. + + Remove obsolete "raw content in a style" section. + + Revise documentation for `--mathml` to reflect support in all major + browsers (#8667). + + * docs/custom-readers.md: Update JSON parsing example. The example now + uses the built-in `pandoc.json` library to parse the API output. + + * doc/press.md: Add article on CiTO in J Cheminform by @egonw. + + * doc/lua-filters.md: fix typo in `run_json_filter` (Morgan Willcock). + + +## pandoc 3.1 (2023-02-09) + + * Fix regression with `--print-highlight-style` option (#8586). + + * Add new `--chunk-template` option (#8581), allowing more control + over the filenames in chunked HTML output. + + * Text.Pandoc.App: Add `optChunkTemplate` constructor to Opt [API change]. + + * Text.Pandoc.Options: add `writerChunkTemplate` constructor to + `WriterOptions` [API change]. + + * Text.Pandoc.Chunks: add Data, Typeable, Generic, ToJSON, FromJSON + instances for `PathTemplate` [API change]. + + * Text.Pandoc.Citeproc: Fix bug in `metaValueToReference` (#8611). + This bug caused us to get some repeated content when converting + MetaBlock to Inlines. + + * Textile reader: + + + Support footnote backlinks (#8585, Stephen Altamirano). + + Don't allow brackets in URLs (#8582). + + * ODT reader: fix blockquote indent detection (#3437, Daniel Kessler). + + * LaTeX writer: include short figure/table caption if one is given + (Albert Krewinkel). Short captions are used by LaTeX when generating + the list of figures or list of tables. Adding a short caption will + now overwrite the full caption in these lists. + + * Powerpoint writer: fix handling of simple figures (#8565, + Albert Krewinkel). This ensures that simple figures are displayed + in the same way as before the introduction of a dedicated `Figure` + constructor in the AST. + + * Improve handling of `%` in bib(la)tex parsing (#8597, #8595). + + * Use released skylighting 0.13.2.1 + + * INSTALL.md: direct people to cabal install pandoc-cli. + + * doc/lua-filters.md: document 'Figure' type and constructor (Albert + Krewinkel). Fix typos (Martin Joerg). + + * Fix link in manual (#8583, Salim B). + +## pandoc 3.0.1 (2023-01-25) + + * Fix use of extensions with custom readers (#8571). + + * Text.Pandoc.Writers.Shared: export `setupTranslations` [API change]. + Use this in HTML and OpenDocument writers, to ensure that + translations are set up properly even when we don't go through + `convertWithOpts`. + + * LaTeX reader: fix regression in macro resolution for environments (#8573). + + * Chunked HTML writer: Fix handling of images with absolute URLs (#8567). + + * HTML writer: + + + Don't omit newlines in task lists. + + Don't disable checkboxes in task lists (#8562). + + * Ensure that automatically set variables `pandoc-version`, `outputfile`, + `title-prefix`, `epub-cover-image`, `curdir`, `dzslides-core` can be + overridden by `--variable` on the command line. Previously they would + create lists in the template Context, which is not desirable. + + * Fix man page copying in `linux/make_artifacts.sh` (#8566). + Previously we were copying the pandoc-server.1 pandoc page to pandoc-lua.1. + + * pandoc.cabal: remove pandoc.cabal, stack.cabal from extra-source-files + (#8560). The problem is that if these are in extra-source-files, then they + get put in the tarball, and then anyone trying to build the source + from an unpacked tarball will run into the problem that cabal.project + and stack.yaml refer to pandoc-server, pandoc-lua-engine, and + pandoc-cli, which aren't in the tarball. + + * Require texmath 0.12.6 for better MathML output. + + * Fix typo in Lua filter documentation (Carlos Scheidegger). + + * Fix formatting of link in pandoc-server.md (James Scott-Brown). + + * Minor changelog fixups. + +## pandoc 3.0 (2023-01-18) + + * Split pandoc-server, pandoc-cli, and pandoc-lua-engine + into separate packages (#8309). Note that installing + the `pandoc` package from Hackage will no longer give you the + `pandoc` executable; for that you need to install `pandoc-cli`. + + * Pandoc now behaves like a Lua interpreter when called as + `pandoc-lua` or when `pandoc lua` is used (#8311, Albert Krewinkel). + The Lua API that is available in filters is automatically + available to the interpreter. (See the `pandoc-lua` man page.) + + * Pandoc behaves like a server when called as `pandoc-server` + or when `pandoc server` is used. (See the `pandoc-server` man page.) + + * A new command-line option `--list-tables`, causes tables to be + formatted as list tables in RST (#4564, with Francesco Occhipinti). + + * New command line option: `--epub-title-page=true|false` allows + the EPUB title page to be omitted (#6097). + + * `--reference-doc` can now accept a URL argument (#8535) and + load a remote reference doc. + + * `--version` output no longer contains version info for dependent + packages. Instead, it contains a "Features" line that indicates + whether the binary was compiled with support for acting as a server, + and for using Lua filters and Custom writers. + + * A new option `--split-level` replaces `--epub-chapter-level` + and affects both EPUB and chunked HTML output. `--epub-chapter-level` + will still work but is deprecated. + + * Multiple input files with `--file-scope`: fix case where the links + are URL-encoded, e.g. with `%20` (#8467). + + * Produce error if `--csl` is used more than once (#8195, Prat). + + * Remove deprecated `--atx-headers` option. + + * Remove deprecated option `--strip-empty-paragraphs`. + + * In `--verbose` mode add message when running citeproc (as with + other filters). + + * Add new `mark` extension for highlighted text in Markdown, + using `==` delimiters (#7743). + + * Add new extensions `wikilinks_title_after_pipe` and + `wikilinks_title_before_pipe` for `commonmark` and `markdown`. + (#2923, Albert Krewinkel). The former enables links of style + `[[Name of page|Title]]` and the latter `[[Title|Name of + page]]`. Titles are optional in both variants, so this works + for both: `[[https://example.org]]`, `[[Name of page]]`. The + writer is modified to render links with title `wikilink` as + a wikilink if a respective extension is enabled. Pandoc will + use `wikilinks_title_after_pipe` if both extensions are + enabled. + + * Add prefixes to identifiers with `--file-scope` (#6384). + This change only affects the case where `--file-scope` is used + and more than one file is specified on the command line. + In this case, identifiers will be prefixed with a string + derived from the file path, to disambiguate them. For example, + an identifier `foo` in `contents/file1.txt` will become + `contents__file1.txt__foo`. Links will be adjusted accordingly: + if `file2.txt` links to `file1.txt#foo`, then the link will + be changed to point to `#file1.txt__foo`. Similarly, a link + to `file1.txt` will point to `#file1.txt`. A Div with an + identifier derived from the file path will be added around + each file's content, so that links to files will still work. + + * New output format: `chunkedhtml`. This creates a zip file + containing multiple HTML files, one for each section, + linked with "next," "previous," "up," and "top" links. + (If `-o` is used with an argument without an extension, + it is treated as a directory and the zip file is automatically + extracted there, unless it already exists.) The top page will + contain a table of contents if `--toc` is used. A + `sitemap.json` file is also included. The option + `--split-level` determines the level at which sections are + to be split. + + * Support complex figures (Albert Krewinkel, Aner Lucero). + There is now a dedicate Figure block constructor for + figures. The old hack of representing a figure as + `Para [Image attr [..alt..] (source, "fig:title")]` + has been dropped. Here is a summary of figure support + in different formats: + + + Markdown reader: paragraphs containing just an image are treated as + figures if the `implicit_figures` extension is enabled. The identifier + is used as the figure's identifier and the image description is also + used as figure caption; all other attributes are treated as belonging + to the image. + + Markdown writer: figures are output as implicit figures if possible, + via HTML if the `raw_html` extension is enabled, and as Div elements + otherwise. + + HTML reader: `<figure>` elements are parsed as figures, with the + caption taken from the respective `<figcaption>` elements. + + HTML writer: the alt text is no longer constructed from the caption, + as was the case with implicit figures. This reduces duplication, but + comes at the risk of images that are missing alt texts. Authors should + take care to provide alt texts for all images. Some readers, most + notably the Markdown reader with the `implicit_figures` extension, + add a caption that's identical to the image description. The writer + checks for this and adds an `aria-hidden` attribute to the + `<figcaption>` element in that case. + + JATS reader: The `<fig>` and `<caption>` elements are parsed into + figure elements, even if the contents is more complex. + + JATS writer: The `<fig>` and `<caption>` elements are used write + figures. + + LaTeX reader: support for figures with non-image contents and for + subfigures. + + LaTeX writer: complex figures, e.g. with non-image contents and + subfigures, are supported. The `subfigure` template variable is set if + the document contains subfigures, triggering the conditional loading + of the *subcaption* package. Contants of figures that contain tables + are become unwrapped, as longtable environments are not allowed within + figures. + + DokuWiki, Haddock, Jira, Man, MediaWiki, Ms, Muse, PPTX, RTF, TEI, + ZimWiki writers: Figures are rendered like Div elements. + + Asciidoc writer: The figure contents is unwrapped; each image in the + the figure becomes a separate figure. + + Classic custom writers: Figures are passed to the global function + `Figure(caption, contents, attr)`, where `caption` and `contents` are + strings and `attr` is a table of key-value pairs. + + ConTeXt writer: Figures are wrapped in a "placefigure" environment + with `\startplacefigure`/`\endplacefigure`, adding the features + caption and listing title as properties. Subfigures are place in a + single row with the `\startfloatcombination` environment. + + DocBook writer: Uses `mediaobject` elements, unless the figure contains + subfigures or tables, in which case the figure content is unwrapped. + - Docx writer: figures with multiple content blocks are rendered as + tables with style `FigureTable`; like before, single-image figures are + still output as paragraphs with style `Figure` or `Captioned Figure`, + depending on whether a caption is attached. + + DokuWiki writer: Caption and "alt-text" are no longer combined. The + alt text of a figure will now be lost in the conversion. + + FB2 writer: The figure caption is added as alt text to the images in + the figure; pre-existing alt texts are kept. + + ICML writer: Only single-image figures are supported. The contents of + figures with additional elements gets unwrapped. + + OpenDocument writer: A separate paragraph is generated for each block + element in a figure, each with style `FigureWithCaption`. Behavior for + single-image figures therefore remains unchanged. + + Org writer: Only the first element in a figure is given a caption; + additional block elements in the figure are appended without any + caption being added. + + RST writer: Single-image figures are supported as before; the contents + of more complex images become nested in a container of type `float`. + + Texinfo writer: Figures are rendered as float with type `figure`. + + Textile writer: Figures are rendered with the help of HTML elements. + + XWiki: Figures are placed in a group. + + * Changes in custom readers/writers: + + + It is now possible to have a custom reader and a custom writer for + a format together in the same file. The file may also define + a custom template for the writer. + + Pandoc now checks the folder `custom` in the user's data directory + for a matching script if it can't find one in the local directory. + Previously, the `readers` and `writers` data directories were + searched for custom readers and writers, respectively. Scripts in + those directories must be moved to the `custom` folder. + + Custom readers used to implement a fallback behavior that allowed to + consume just a string value as input to the `Reader` function. This + has been removed, the first argument is now always a list of + sources. Use `tostring` on that argument to get a string. + + * New module Text.Pandoc.Writers.ChunkedHTML, + exporting `writeChunkedHtml` [API change]. + + * We now set the `pandoc-version` variable centrally rather + than in the writers. One effect is the man writer now emits + a comment with the pandoc version. + + * pandoc-server: + + + Add simple CORS support to pandoc-server (#8427). + + Print message to stderr when starting the server. + + * Docx reader: + + + Mark unnumbered headings with class `unnumbered` (#8148, + Albert Krewinkel). This change ensures good conversion + results when converting with `--number-sections`. + + Support parsing of highlighted text. + + Fix handling of `oMathPara` in `w:p` with other content (#8483). + + * ODT reader: + + + Fix relative links. ODT adds a `../` to relative links + (see #3524); this needs to be removed when converting from ODT. + + Handle "section" elements (#8409). + + Rename Text.Pandoc.Readers.Odt -> Text.Pandoc.Readers.ODT, + for consistency with Writers.ODT. Rename `readOdt` -> `readODT`. + [API change] + + * DocBook reader: + + + Support href on link even in a fragment (#8437). + (We now just look for an `href` attribute without + worrying about the namespace.) + + Parse title from imageobject/objectinfo (#8437). + + * JATS reader: + + + Handle uri element in references (#8270). + + * Ipynb reader: + + + Add cell id to attachment filename when storing in MediaBag (#8415). + Otherwise attachments with the same name can overwrite each other. + + * LaTeX reader: + + + Skip parenthenized args of toprule, midrule, etc (#8242). + + Handle `##` macro arguments properly (#8243). + + Remove unused function `toksToString` in Parsing module. + + Support more `soul` commands, including `\hl`. + + Add `unnumbered` class for `\part*` (#8447) + + Fix `TEXINPUTS` handling (#8392). If `TEXINPUTS` ends with `:`, + then the system default `TEXINPUTS` is added. We handle this by + just adding the working directory in this case. + + Parse short table caption (see jgm/pandoc-types#103). + This is not too useful yet, because writers don't do anything with + the short caption. + + * MediaWiki reader: + + + Parse table cell with attributess, to support rowspan, colspan (#8231, + Ruqi). + + Refine "blending" rules for MediaWiki links (#8525, Ruqi). + The rules for "blending" characters outside a link into the link are + described here: https://en.wikipedia.org/wiki/Help:Wikitext#Blend_link + These pose a problem for CJK languages, which generally don't have + spaces after links. However, it turns out that the blending behavior, as + implemented on Wikipedia, is (contrary to the documentation) only for + ASCII letters. This commit implements that restriction, which fixes + the problem for CJK. + + * HTML reader: + + + Fix regression for `<tt>` (#8330). It was no longer being parsed as + Code (Justin Wood). + + * RST reader: + + + Support `mark` role for round-trip. + + * Textile reader: + + + Support linked images (#8541). + + Fix strong emph ending with link (#8540). + + Adding a Parser to look for ordered list start attribute numbers + if any (#2465, vkraven). + + Handle empty paragraphs (#8487). Also, if attributes are added + explicitly to a paragraph, put it in a Div with the attributes. + + * Markdown reader: + + + Allow fenced code block "bare" language to be combined + with attributes (#8174, Siphalor), e.g. + ```` + ```haskell {.class #id} + ``` + ```` + + Allow table caption labels to start with lowercase `t` (#8259). + + Grid tables: allow specifying a table foot by enclosing it with + part separator lines, i.e., row separator lines consisting only + of `+` and `=` characters (#8257, Albert Krewinkel). E.g.: + ``` + +------+-------+ + | Item | Price | + +======+=======+ + | Eggs | 5£ | + +------+-------+ + | Spam | 3£ | + +======+=======+ + | Sum | 8£ | + +======+=======+ + ``` + + Fix `implicit_header_references` with duplicate headings (#8300). + Documentation says that when more than one heading has the same text, + an implicit reference `[Heading text][]` refers to the first one. + Previously pandoc linked to the last one instead. This patch + makes pandoc conform to the documented behavior. + + Parse highlighted text inside `==..==` if `mark` extension enabled. + + * Org reader: + + + Allow org-ref v2 citations with `&` prefix (#8302). + + Make `#+pandoc-emphasis-pre` work as expected (#8360, Amir Dekel). + + * BibTeX reader: + + + Fix handling of `%` in `url` field (#7678). + `%` does not function as a comment character inside `url` + (where URL-encoding is common). + + Allow `url` field in `bibtex` as well as `biblatex` (#8287). + This field is not officially supported for BibTeX, but many styles + can handle it (<https://www.bibtex.com/f/url-field/>), + and others will ignore it. + + Support `software` type in biblatex <-> CSL conversions (#8504). + + Make sure `version` field comes through in biblatex (#8504). + + * BibTeX writer: + + + Pass through `url` even for `bibtex` (#8287). + + * Org writer: + + + Pass through unknown languages in code blocks (#8278), instead + of producing `begin_example`. + + Use span attributes `tag-name` in headers as tags (#8513, Albert + Krewinkel). This enables round-tripping of tags in Org headings. + + * EndNote reader: + + + Better error when parsing EndNote references fails. + + * DocBook writer: + + + Rename Text.Pandoc.Writers.Docbook -> Text.Pandoc.Writers.DocBook. + Rename `writeDocbook` -> `writeDocBook`, for consistency with + the DocBook reader's naming. [API change] + + Fix position of textobject (#8437). It is a child of + `inlinemediaobject`, not `imageobject`. + + Add regression tests for #8437. + + Render image alt text using textobject element (#8437). + + Don't indent contents of title element. + + Store "unnumbered" class in DocBook role attribute (#1402, lifeunleaded). + + * ConTeXt writer (Albert Krewinkel): + + + Support syntax highlighting for code. + + Always use `\type` for inline code. + Inline codes that contained curly braces where previously rendered + with `\mono`; this led to unexpected results when the presentation + of `\type` was customized, as those changes would not have + been applied to code rendered with `\mono`. + + Add support for unlisted, unnumbered headings (#8486). + + Support `tagging` extension (Albert Krewinkel). Paragraphs + are enclosed by `\bpar` and `\epar` commands, and `highlight` commands + are used for emphasis. This results in much better tagging in PDF output. + + * LaTeX writer: + + + Do not repeat caption on headless tables (Albert Krewinkel). + The caption of headless tables was repeated on each page that + contained part of the table. It is now made part of the + "first head", i.e. the table head that is printed only once. + + Add separator line between table's body and its foot + (Albert Krewinkel). + + Ignore languages with no babel equivalent, instead of generating an + invalid command in the preamble (#8325). + + Use `\includesvg` for SVGs and include the `svg` package (#8334). + + Use `soul` instead of `ulem` for strikeout, underline (#8411). + This handles things like hyphenation, line breaks, and nonbreaking + spaces better. + + Use `\toprule\noalign{}` instead of `\toprule()` in tables, + and similarly for `\midrule` and `\bottomrule` (#8223). + This facilitates redefining `\toprule`, `\midrule`, and `\bottomrule` + without needing to gobble the ()s. (Those who redefine these macros + on the assumption that they will be followed by `()` may need to + change their definitions.) + + Support highlighted text for Span with class `mark`. + + * JATS writer: + + + Use `<break/>` for LineBreak in the limited contexts that accept it + (#8344). + + Officially deprecate `writeJATS` in favor of `writeJatsArchiving`. + + * RTF writer: + + + Add space after unicode escape commands (#8264). This fixes + a bug that caused characters to disappear after unicode escapes. + + * RST writer: + + + Render tables as list tables when the `--list-tables` option is + specified (`writerListTables`) (#4564, Francesco Occhipinti). + + Improve inline escaping rules (#8380). + + Use special `mark` role for Span with class `mark`. + + * Commonmark writer: + + + Ensure that we don't have blank lines in raw HTML (#8307). + + * HTML writer: + + + Only add role attribute in HTML5 (#8241). It is not valid in HTML4. + + Avoid aria-hidden in code blocks for HTML4 (#8241). + + Only treat `. . .` as a slide pause in slides, and not in regular + HTML output (#8281). + + Properly merge classes for headings of level > 6 (#8363). + + Prevent `<a>` inside `<a>` (#7585). If a link text contains a link, + we replace it with a span. + + Replace deprecated aria roles for bibliography entries (#8354). + `doc-biblioentry` -> `listitem`, `doc-bibliography` -> `list`. + + Remove obsolete stuff about mathml-script. + This was a shim we used to include for mathml support. + We don't do anything with this any more, so this is dead code. + + Include math links if there are raw commands or environments that + can be interpreted as math e.g. by MathJax (#8469). + + Add prooftree to list of math environments (#8462). This will cause + raw LaTeX prooftree environments to be rendered appropriately when + `--mathjax` is used. + + * HTML, Markdown writers: filter out empty class attributes (#8251). + These should not be generated by any pandoc readers, but they + might be produced programmatically. + + * Markdown writer: + + + Avoid HTML fallbacks in the generated TOC (Albert Krewinkel, #8131). + The generated table of contents usually has IDs for each TOC link, + allowing to link back to specific parts of the TOC. However, this + leads to unidiomatic markup in formats like gfm, which do not support + attributes on links and hence fall back to HTML. The IDs on TOC items + are now removed in that case, leading to more aesthetic TOCs. + + Escape `!` before `[` (#8254). + + Support `mark` extension. + + * AsciiDoc writer: + + + In link text, only replace commas with entities when they're in + Str elements. If a link contains an image, it may have attributes, + and the commas there should not be converted (see #8437, #8070). + + * ODT writer: + + + Fix relative links (#3524). + + * Docx writer: + + + Better handling of tables in lists (#5947). Previously the content + of each list cell was indented when the table belonged to a list + item. + + Indent tables in list items (#5947). + + Adjust correct attribute on `lang` element (#7022). For East Asian + languages, we need to adjust `w:eastAsia` rather than `w:val`. + This allows normal fonts to be used for any Latin-font text. + Similarly, for bidi languages, we need to adjust `w:bidi` + rather than `w:val`. We treat `he` and `ar` as bidi languages, + `zh`, `ja`, `ko` as East Asian languages. + + Support relative image widths (Albert Krewinkel). + Image widths given in percent are interpreted to be relative to + the text width. Previously, percent widths were taken relative to + the image's native size, inconsistently with other writers. + + Avoid using 'error' for unassigned table cells (#8468). Instead, + throw a regular pandoc error. + + Render a Span with class `mark` as highlighted. Currently + yellow is hardcoded. + + * MediaWiki writer: + + + Use the 'new' table structure, so that colspan and rowspan are + supported (Wout Gevaert). + + * Man writer: + + + Use UTF-8 by default for non-ascii characters (#8507). + Only use groff escapes if `--ascii` has been specified on the + command line (`writerPreferAscii`). + + * ICML writer: + + + Use Contents element for images with raw data instead of a link + with a data: uri (#8398). + + * EPUB writer: + + + Refactor to use Text.Pandoc.Chunks. + + Refactored and simplified code. + + Make title page optional (#6097). + + * Ms writer: + + + Properly format display equations (#8308). + + Remove -C option on PSPIC. Some old versions don't support this + option, and since it's the default it shouldn't be necessary. + + * XWiki writer: + + + Use template if it is specified (#8296). Previously + templates were ignored. + + * LaTeX template: + + + Set fonts after Beamer theme (Jeremie Knuesel). Beamer themes + such as metropolis and saintpetersburg change the default + fonts. This change gives precedence to the user font settings + by moving them after the loading of the Beamer theme. + + Set `\babelfont` when `mainlang` and `lang` are specified and + `pdflatex` is not being used (#8538). This is needed for good + results in Arabic. + + Add variable `urlstyle` (#8429, Amar Al-Zubaidi). This is set to + `same` by default, so users should not experience any change. + + * HTML template: + + + Remove default font size, line height and font family in + default inline css (#8423). `mainfont`, `fontsize`, + and `linestretch` can still be used as before; the only difference + is that we no longer provide opinionated defaults. + This commit also adds a `maxwidth` variable that sets `max-width`; + if not set, 36em is used as a default. + + Add `code { hyphens: manual; }`. + + Use `styles.citations.html` partial in `styles.html`. + + Fix class name `hanging` -> `hanging-indent` in + `styles.citations.html`. + + Put Consolas before Lucida Console for code font (#8543). + This is to prevent Lucida Console from being used on Windows, where + it causes spacing issues in some applications, with boldface + glyphs wider than regular ones. + + * EPUB CSS changes: Reduce the amount of inline CSS used for EPUBs + (#8379). Almost everything is now in the default EPUB CSS + (`data/epub.css`), which can be overridden either by + putting `epub.css` in the user data directory or by using + `--css` on the command line. Inline styles are only used + for syntax highlighting (which depends on the style + specified, and is only included on pages with highlighted + code) and for bibliography formatting (which can depend on + the CSL style, and is only used in the page containing the + bibliography). + + Note that, for compatibility with older readers, we don't + use flexbox to style `column/columns` divs by default, as + we do in HTML. Instead, we use an older method which only + works when there are two `column` divs inside a `columns` + div. If you need more than two columns and aren't worried + about support for older EPUB readers, you can modify the + default CSS (there is a comment in the CSS telling you what + to do). + + * Reveal.js template: prevent line-wrapping of parallax options + (#8503, Albert Krewinkel). + + * reference.pptx: Remove unsupported element (#8342, #6338, Link Swanson). + The default template contained text above the header, which can mislead + users into thinking there is a way to put text there using pandoc. + + * Text.Pandoc.Readers.Metadata: + + + Fix metadata parsing corner case (#8465). + + Don't fail on inline metadata beginning with newline (#8358). + + * Text.Pandoc.App: + + + Move initial input-to-Pandoc code to internal submodule (Albert + Krewinkel). + + Change `parseOptionsFromArgs` and `parseOptions` (#8406) + They now return `Either OptInfo Opt`. [API change] + + Add `OptInfo` type [API change]. + + Add `handleOptInfo` function. This performs the IO actions for + things like `--version` that were previously done in + `parseOptionsFromArgs` [API change]. + + `convertWithOpts`: add argument for a `ScriptingEngine` [API change]. + + Unify check for standalone output (Albert Krewinkel). + + New `optEpubTitlePage` field on `Opt` [API change] (#6097). + + Remove `optEpubChapterLevel`, add `optSplitLevel` [API change]. + + Export `IpynbOutput(..)` [API change]. + + * Text.Pandoc.App.OutputSettings: + + + Remove unused field `outputWriterName` in `OutputSettings`. + + * Text.Pandoc.Citeproc: + + + Check both extension and mime type to determine bibliography type + when the bibliography is fetched remotely (#7151). + + CslJson: allow an object with `items` property in addition to + an array of references. This is what is returned by e.g. + `https://api.zotero.org/groups/904125/items?v=...&format=csljson` + + Require a digit for an implicit "page" locator inside explicit + locator syntax `{...}` (#8288). Previously a locator specified as + `{}` would be rendered as `p.` with nothing after it. + + Update `sub verbo` to `sub-verbo` (#8315). This is a change in + the term's canonical name in citeproc. As a result of this change, + `sub verbo` locators have not worked in pandoc since citeproc 0.7. + + Text.Pandoc.Citeproc.MetaValue: remove unused function + `metaValueToPath`. + + Add internal module Text.Pandoc.Citeproc.Name (#8345). This exports + `toName`, which previously had been part of T.P.Citeproc.BibTeX, + and allows for cleaner module dependencies. + + * Export module `Text.Pandoc.Slides` [API Change] (Albert Krewinkel). + + * Add new module Text.Pandoc.Format [API change] (Albert Krewinkel). + The module provides functions and types for format spec parsing and + processing. The function `parseFormatSpec` was moved from + Text.Pandoc.Extensions to the new module and renamed to + `parseFlavoredFormat`. It now operates in + a PandocMonad and is based on the updated types. + + * Text.Pandoc.Sources: + + + Add UpdateSourcePos instances for String and + strict and lazy ByteString [API change]. + + * Text.Pandoc.Extensions: + + + Fix JSON decoding of Extensions (#8352, Albert Krewinkel). + + Add new exported function `readExtension` [API change]. + + Remove `parseFormatSpec` [API change]. This has been moved + to Text.Pandoc.Format and renamed as `parseFlavoredFormat` + (Albert Krewinkel). + + Simpler implementation of Extensions based on Set + (benchmarks show no performance penalty). + + Add `CustomExtension` constructor to `Extension` [API change]. + + Remove `Bounded`, `Enum` instances for `Extension`. + + Add `extensionsToList` function. + + Revise `readExtension` so it can handle `CustomExtension`, and so + that it returns a Text rather than `Maybe Text`. + + Add `showExtension` [API change]. + + Add `Ext_mark` extension [API change]. + + Add `Ext_tagging` constructor [API change] (Albert Krewinkel). + + Add `Ext_wikilinks_title_after_pipe`, `Ext_wikilinks_title_before_pipe` + [API change] (Albert Krewinkel). + + * Text.Pandoc.PDF: + + + Fix `papersize` on PDF generation via ms (#8403). + We need to set an option in pdfroff in addition to including + a macro in the ms file. With this fix, `-Vpapersize=a4` should be + sufficient to produce A4 PDF via ms. + + Change default background color of PDFs generated via HTML (#8422, + Marcin Serwin). + + * Text.Pandoc.MIME: + + + Base module on package `mime-types`, which + is already a transitive dependency (#8277, Albert Krewinkel). + + Remove deprecated overrides (#8292). + + * Text.Pandoc.XML: + + + Re-export `lookupEntity` from commonmark-hs [API change]. + + * Text.Pandoc.Parsing: + + + Remove gratuitious renaming of Parsec types. We were exporting + Parser, ParserT as synonyms of Parsec, ParsecT. + There is no good reason for this and it can cause confusion. + Also, when possible, we replace imports of Text.Parsec with + Text.Pandoc.Parsing. The idea is to make it easier, at some point, + to switch to megaparsec or another parsing engine if we want to. + New (re-)exports: `Stream(..)`, `updatePosString`, `SourceName`, + `Parsec`, `ParsecT`. Removed exports: `Parser`, `ParserT` + [API change]. + + Export `errorMessages`, `messageString` [API change]. + + Export `fromParsecError`, which can be used to turn a parsec + ParseError into a regular PandocParseError (#8382) [API change]. + + Remove `nested` [API change]. It was not being used, and in fact it + was a bad idea from the beginning, as it had no hope of solving + the problem it was introduced to solve. + + Change `characterReference`, `charsInBalanced`. `characterReference` + so they now return a Text (some named references don't correspond + to a single Char). Use the the `lookupEntity` function from + commonmark-hs instead of the slow one from tagsoup [API change]. + + `charsInBalanced` now takes a Text parser rather than a Char parser + as argument [API change]. + + * Text.Pandoc.Shared: + + + Export `textToIdentifier` [API change]. + + Remove deprecated `crFilter`. [API change] + + Remove deprecated `deLink`. [API change] + + Deprecate `notElemText`. + + Deprecate `makeMeta`. + + Remove `pandocVersion` (now available in Text.Pandoc.Version + as `pandocVersionText`). + + Remove `findM` [API change]. This was only used in one place, and + can be replaced with simpler code. + + Remove deprecated `makeMeta` [API change]. + + Remove `ordNub` [API change]. This is just `nubOrd` from + Data.Containers.ListUtils. + + Remove `mapLeft` [API change]. This is just a synonym for + Bifunctor.first. + + Remove `elemText`, `notElemText` [API change]. + + Drop export of `pandocVersion` and `pandocVersionText`, + which are now exported by Text.Pandoc.Version. + + Remove `escapeURI`, `isURI`. These are now exported by + Text.Pandoc.URI, and removing them from Shared helps make + the module structure more straightforward. + + Use LineBreak as default block sep in `blocksToInlines`. + (#8499, Albert Krewinkel). This change also affects the + `pandoc.utils.blocks_to_inlines` Lua function. + + `defaultUserDataDir` is no longer exported (it has been + moved to T.P.Data) [API change]. + + New function `figureDiv`, offering offers a standardized way + to convert a figure into a Div element (Albert Krewinkel) [API change]. + + * Text.Pandoc.Writers.Shared: + + + Export `htmlAddStyle`, `htmlAlignmentToString` and `htmlAttrs` + [API change] (Wout Gevaert). + + Use 'literal tag' instead of 'text (T.unpack tag)' in `tagWithAttrs` + (Wout Gevaert). + + `toTableOfContents`: handle nested Divs better (#8402). + + * Rename Text.Pandoc.Network.HTTP -> Text.Pandoc.URI. + This is still an unexported internal module. + Export `urlEncode`, `escapeURI`, `isURI`, `schemes`, `uriPathToPath`. + Drop exports of `schemes` and `uriPathToPath`. + + * Text.Pandoc.URI `isURI`: don't require non-ASCII characters to be + escaped (#8508). + + * Rename Text.Pandoc.Readers.LaTeX.Types -> Text.Pandoc.TeX (internal + module). + + * Text.Pandoc.Options: + + + WriterOptions now has a field `writerListTables`, + specifying that list tables be used in RST output [API change]. + + New `writerEpubTitlePage` field on `WriterOptions` (#6097) + [API change]. + + Remove `writerEpubChapterLevel`, add `writerSplitLevel` [API change]. + + * Text.Pandoc.Filter: + + + Export `applyFilters` [API change]. + + Export `applyJSONFilter` [API Change] (Albert Krewinkel). + + Parameterize `applyFilters` over scripting engine [API change] (Albert + Krewinkel). + + * New exported module Text.Pandoc.Chunks [API change]. This + module provides functions to split Pandoc documents into + chunks to be rendered in separate files, e.g. one per + section. Internal identifiers are rewritten appropriately to + point to the new locations (#6122). + + * Text.Pandoc.Readers: + + + Change argument type of `getReader`, so it takes a `FlavoredFormat` + instead of a `Text` [API change] (Albert Krewinkel). + + * Text.Pandoc.Writers: + + + Change argument type of `getWriter`, so it takes a `FlavoredFormat` + instead of a `Text` [API change] (Albert Krewinkel). + + * Text.Pandoc.Templates: + + + Do not try to normalize input to `getDefaultTemplate` (Albert + Krewinkel). The function `getDefaultTemplate` no longer splits off + extension modifers from the given format, as that conflicts with + using custom writers as formats. Haskell library users should use + `getDefaultTemplate <=< (fmap formatName . parseFlavoredFormat)` + if the input format can still contain extensions. The same is true + for `compileDefaultTemplate`, which calls `getDefaultTemplate` + internally + + Add Wrapper type documentation (#8490, William Rusnack). + + * New exported module Text.Pandoc.Scripting (Albert Krewinkel). + The module contains the central data structure for scripting engines + (e.g., Lua) [API change]. + + * Text.Pandoc.Error: + + + Add new PandocError constructor `PandocNoScriptingEngine` [API change] + (Albert Krewinkel). + + Add new PandocError constructor `PandocFormatError` [API change] + (Albert Krewinkel). The new error is used to report problems with + input or output format specifications. + + Add new PandocError constructor `PandocNoTemplateError` + (Albert Krewinkel). + + Remove `PandocParsecError` constructor from `PandocError` (#8385). + Henceforth we just use `PandocParseError`. + + * New module Text.Pandoc.Version, exporting `pandocVersionText` + and `pandocVersion` [API change]. `pandocVersion` returns a `Version` + instead of a `Text`, which is consistent with `pandocTypesVersion`. + + * Text.Pandoc.Class: + + + Make `getPOSIXTime`, `getZonedTime` sensitive to `SOURCE_DATE_EPOCH` + environment variable if set (#7093). (`getTimestamp` was + already sensitive.) This ensures that EPUB builds are reproducible. + + Text.Pandoc.Class no longer exports `readDataFile`, + `readDefaultDataFile`, `setTranslations`, and `translateTerm` + [API change]. + + Text.Pandoc.Class now exports `checkUserDataDir` [API change]. + + * T.P.Class.IO: export function `writeMedia` [API change] (Albert Krewinkel). + This is useful for the `pandoc.mediabag` module. + + * Separate out Text.Pandoc.Data and Text.Pandoc.Translations from + Text.Pandoc.Class (#8348). This makes Text.Pandoc.Class + more self-contained. + + + Text.Pandoc.Data is now an exported module, providing `readDataFile` + and `readDefaultDataFile` (both formerly provided by + Text.Pandoc.Class), and also `getDataFileNames` (formerly + unexported in Text.Pandoc.App.CommandLineOptions) + and `defaultUSerDataDir` (formerly provided by + Text.Pandoc.Shared). [API change] + + Text.Pandoc.Translations is now an exported module (along with + Text.Pandoc.Translations.Types), providing `readTranslations`, + `getTranslations`, `setTranslations`, `translateTerm`, + `lookupTerm`, `readTranslations`, `Term(..)`, and `Translations` [API + change]. + + * Text.Pandoc now exports Text.Pandoc.Data and `setTranslations` + and `translateTerm` {API change]. + + * Export module Text.Pandoc.Class.IO [API change]. + The module is useful when defining instances of class PandocMonad for + types that are also instances of MonadIO. + + * Remove modules Text.Pandoc.Writers.Custom and Text.Pandoc.Readers.Custom + [API Change] (Albert Krewinkel). The functions `writeCustom` and + `readCustom` are available from module Text.Pandoc.Lua. + + * Text.Pandoc.Server: + + + Split this module into a separate package, `pandoc-server`, + allowing the `pandoc` library to be compiled without server support. + + Return object if JSON is accepted. Previously we just returned + a JSON-encoded string. Now we return something like: + ``` + { + "output": "<p>hello</p>" + "base64": false, + "messages": [ + { + "message": "Not rendering RawInline (Format \"tex\") \"\\\\noe\"", + "verbosity": "INFO" + } + ], + } + ``` + This is a change in the pandoc-server JSON API. + + Set translations in the writer based on `lang` metadata. + + Return error in JSON object if response is JSON. + + Remove `parseServerOpts`. [API change] + + * Text.Pandoc.Lua: + + + This module has been moved to a separate package, + `pandoc-lua-engine`. + + Export `applyFilter`, `readCustom`, and `writeCustom`. + No longer export the lower-level function `runFilterFile` [API + change]. + + Change type of `applyFilter` [API Change] (Albert Krewinkel). + The module Text.Pandoc.Filter.Lua has been merged into + Text.Pandoc.Lua. The function `applyFilter` now has type + ``` haskell + applyFilter :: (PandocMonad m, MonadIO m) + => Environment-> [String]-> FilePath-> Pandoc-> m Pandoc + ``` + where `Environment` is defined in Text.Pandoc.Filter.Environment. + + Export new function `getEngine` [API Change]. + The function returns the Lua scripting engine. + + Add unexported modules T.P.Lua.Reader, T.P.Lua.Writer. + These contain the definitions of `readCustom` and `writeCustom` + that were previously in T.P.Readers.Custom and T.P.Writers.Custom. + + Cleanup module dependencies, for a cleaner module dependency graph. + + The `writeCustom` function has changed to return a Writer and + an ExtensionsConfig [API change]. This allows ByteString writers + to be defined. + + The `readCustom` function has changed to return a Reader and an + ExtensionsConfig [API change]. + + * Lua subsystem (Albert Krewinkel): + + + The whole Lua subsystem has been moved to a separate package, + `pandoc-lua-engine`. `pandoc` does not depend on it. + `convertWithOpts` has a new parameter that can be used to + pass in the scripting engine defined in `pandoc-lua-engine` + (or a different one, in theory). + + Fix the behavior of Lua "Version" objects under equality + comparisons (#8267). + + Support running Lua with a GC-collected Lua state. + + Ensure that extensions marshaling is consistent. + + Produce more informative error messages for pandoc errors. + Errors are reported in Lua in the same words in which they would be + reported in the terminal. + + Add new module `pandoc.format`. The module provides functions to + query the set of extensions supported by formats and the set + of extension enabled per default. + + Add function `pandoc.template.apply`. + + Add function `pandoc.template.meta_to_context`. + The functions converts Meta values to template contexts; the intended + use is in combination with `pandoc.template.apply`. + + Allow Doc values in `WriterOptions.variables`. + The specialized peeker and pusher function for `Context Text` values + does not go via JSON, and thus keeps Doc values unchanged during + round-tripping. + + Fix rendering of Lua errors in Lua, so that the + `Error running Lua` message is not prepended multiple times. + + Add new module `pandoc.zip`. + + Allow strings in place of compiled templates (#8321). + This allows to use a string as parameter to `pandoc.template.apply` + and in the WriterOptions `template` field. + + Rename `reader_extensions`/`writer_extensions` globals as `Extensions` + (#8390). + + Add `pandoc.scaffolding.Writer` (#8377). This can be used to reduce + boilerplate in custom writers. + + Fix peeker for PandocError (Albert Krewinkel). String error messages + were incorrectly popped of the stack when retrieving a PandocError. + + Add functions `pandoc.text.toencoding`, `pandoc.text.fromencoding` + (#8512, Albert Krewinkel). + + Add `pandoc.cli` module. Allow processing of CLI options in Lua. + + Support `-D` CLI option for custom writers. + A new error `PandocNoTemplateError` (code 87) is thrown if a template + is required but cannot be found. + + Allow table structure as format spec. This allows to pass structured + values as format specifiers to `pandoc.write` and `pandoc.read`. + + Add function `pandoc.mediabag.write` (Albert Krewinkel). + + Add module `pandoc.structure` (Albert Krewinkel). The function + `make_sections` has been given a friendlier interface and moved to the + new module; the old `pandoc.utils.make_sections` has been deprecated. + + * Custom writers: + + + The global variables `PANDOC_DOCUMENT` and `PANDOC_WRITER_OPTIONS` + are no longer set when the writer script is loaded. Both variables + are still set in classic writers before the conversion is started, + so they can be used when they are wrapped in functions. + + Deprecate classic custom writers. + + Add function `pandoc.write_classic`. The function can be used to + convert a classic writer into a new-style writer by setting it as + the value of `Writer`: + ``` lua + Writer = pandoc.write_classic + ``` + or to fully restore the old behavior: + ``` lua + function Writer (doc, opts) + PANDOC_DOCUMENT = doc + PANDOC_WRITER_OPTIONS = opts + load(PANDOC_SCRIPT_FILE)() + return pandoc.write_classic(doc, opts) + end + ``` + + Support extensions in custom writers. Custom writers can define the + extensions that they support via the global `writer_extensions`. + The variable's value must be a table with all supported extensions + as keys, and their default status as values. For example, + the below specifies that the writer supports the extensions `smart` + and `sourcepos`, but only the `smart` extension is enabled by default: + ``` lua + writer_extensions = { + smart = true, + sourcepos = false, + } + ``` + + Custom writers can define a default template via a global `Template` + function; the data directory is no longer searched for a default + template. Writer authors can restore the old lookup behavior with + ``` lua + Template = function () + local template + return template.compile(template.default(PANDOC_SCRIPT_FILE)) + end + ``` + + * Custom readers: + + + Support extensions in custom readers. + Custom readers, like writers, can define the set of supported + extensions by setting a global. E.g.: + ``` lua + reader_extensions = { + smart = true, + citations = false, + } + ``` + + * Use latest versions of `commonmark-extensions`, `texmath`, + `citeproc`, `gridtables`, and `skylighting`. + + * Use pandoc-types 1.23. This adds the `Figure` Block + constructor and removes the `Null` Block constructor. + + * Require aeson >= 2.0. + + * Use jira-wiki-markup 1.5.0 (#8511, Albert Krewinkel). Fixes issues with + icon-like sequences at the beginning of words. + + * Use doctemplates 0.11, avoiding a transitive dependency on HsYAML. + + * Use skylighting 0.13.1.2. + + * Allow mtl 2.3.1 (Alexander Batischev). + + * Use latest skylighting-format-context. + + * Allow building with mtl 2.3. + + * Remove `lua53` flag. We now only support Lua 5.4. + + * Add hie.yaml for haskell language server. + + * Add tools/latex-package-dependencies.lua. + + * Update default CSL with latest `chicago-author-date.csl`. + + * make_artifacts.sh: various small improvements. + + * Remove sample.lua from data files (#8356). + + * Documentation: + + + Deprecate `PANDOC_WRITER_OPTIONS` in custom writers (Albert Krewinkel). + + Document `pandoc.write_classic` (Albert Krewinkel). + + Document new table features (Albert Krewinkel). + + Clarify what background-image does in reveal.js (#6450). + + Documentation improvements for `blank_before_blockquote` + (#8324, Pranesh Prakash). + + Update grid table documentation (#8346). + + Add note about MathJax fonts to `--embed-resources`. + + Use cabal's --package-env more (#8317, Artem Pelenitsyn). + + Modify Zerobrane instructions to use Lua 5.4 (#8353, Ian Max Andolina). + + Fix documentation for highlight-style in `pandoc-server.md`. + + Fix link to fedora package site (#8246, Akos Marton). + + Rephrase paragraph on format extensions (#8375, Ilona Silverwood). + + Update README.template (#8496, Sven Wick). + + Fix a tiny typo in lua-filters.md (TomBen). + + Clarify that `--css` should be used with `-s`. + + Clarify font selection for pdf -t ms (#8421, nbehrnd). + + Clarify docs for `--metadata-file` (#8459). + + Fix typo in epub.md (Vladimir Alexiev). + + Add missing backtick in filters.md (R. N. West). + + `doc/lua-filters.md`: add documentation for `pandoc.format` + (Albert Krewinkel). + + Fix epub-embed-font documentation (#8455, Terence Eden). + + Removed obsolete Templates section in CONTRIBUTING.md. + + Add manual section on accessible PDFs, archiving standards (#8312, + Albert Krewinkel). + + * Tests.Command: remove unused `runTest`. + + * Add pandoc-lua.1 man page. + + * Improve `shell.nix`. + + * Add `tools/moduledeps.lua` for inspecting the internal module + dependency tree. + + * Fix macOS zip so pandoc-server is a symlink. This cuts its size by 2x. + + * CI: Improve CI speed by caching more, eliminating macos builds, + and splitting benchmarks into a separate action, run by + manual dispatch. (We still test that benchmarks build in + the regular CI.) The cache can be expired manually by + modifying the secret `CACHE_VERSION`. + + * Remove the unnecessary Setup.hs from pandoc. + Cabal does not need this with build-type 'simple'. + + * Add pandoc-lua and pandoc-server (symlinks) and their man pages + to releases. + + * Use hslua-cli package for pandoc-lua interface (Albert Krewinkel). + + * Add `server` flag to pandoc-cli, allowing it to be compiled without + server support. + + * pandoc-cli: Allow building a binary without Lua support (Albert + Krewinkel). Disabling the `lua` cabal flag will result in a + binary without Lua. + + * Move `--version` handling to pandoc-cli. We need it here in order + to print information about whether server and Lua support have been + compiled in. + + * Move `nightly` flag from pandoc to pandoc-cli (#8339). + + * Makefile changes: + + - `make help` will now print all the targets and what they do. + - Add targets: `coverage`, `weeder`, `moduledeps`, `prerelease`, + `ghcid`, `repl`, `linecounts`, `hie.yaml`, `binpath`. + - Note that you can `` alias pandoc=`make binpath` `` for + convenient local testing of a build. + - Rename `quick-cabal` -> `build`, `quick-test` -> `test`. + - Exclude tests from `SOURCEFILES`. + + * Factor out xml-light into an internal library. + + * Add CITATION.cff (#8434). + + * Move trypandoc to a separate repository, jgm/trypandoc. + +## pandoc 2.19.2 (2022-08-22) + + * Fix regression with data uris in 2.19.1 (#8239). + In 2.19.1 we used the base64URL encoding rather than base64. + + * pandoc-server: handle `citeproc` parameter as documented (#8235). + + * Org reader: treat *emacs-jupyter* src blocks as code cells (#8236, + Albert Krewinkel). This improves support for notebook-like org files + that are intended to be used with emacs-jupyter package. + + * HTML writer and templates: revert to using `width` property for column + widths (Albert Krewinkel). The default `flex` and `overflow-x` properties + of a column are set to `auto`. In combination, these changes allow to + get good results when using columns with or without explicit widths. + + * Org writer (Albert Krewinkel): + + + Add support for jupyter nodebook cells (#6367). + + Prefix code language of ipynb code blocks with `jupyter-`. + This is the convention used by the *emacs-jupyter* package. + + Keep code block attributes as header args. This allows to keep more + information in the resulting `src` blocks, making it easier to + roundtrip from or through Org. Org babel ignores unknown header + arguments. + + Add code block identifier as `#+name` to src blocks. + + * Fix some typos in the codebase (luz paz). + + * Require hslua-module-path 1.0.3 (#8228, Albert Krewinkel). + +## pandoc 2.19.1 (2022-08-18) + + * Add server capabilities. + + + New exported module Text.Pandoc.Server [API change]. + + The pandoc executable now starts up a web server when renamed or + symlinked as `pandoc-server`, and functions as a CGI program when + renamed or symlinked as `pandoc-server.cgi`. See the man page for + `pandoc-server` for full documentation. + + * Text.Pandoc.App.Opts: Redo `FromJSON` for `Opt` so that optional + values can be omitted (in which case the values from + `defaultOptions` are used). + + * Org reader: treat "abstract" block as metadata (Albert Krewinkel, #8204). + A block of type "abstract" is assumed to define the document's abstract. + It is transferred from the main text to the metadata. + + * Org template: add abstract from metadata as block of type "abstract" + (#8204). + + * HTML writer: use `flex` property for column widths + (Albert Krewinkel, #8232). + + * LaTeX writer: + + + Add label to tables that have an identifier (Albert Krewinkel, #8219). + Tables with an identifier are marked with a `\label`. A caption is + always included in this case, even if the caption is empty. + + Use `\textquotesingle` for straight quotes in text. + + Fix widths of multicolumn cells (#8218). + + * LaTeX template: fix behavior of `colorlinks` variable (Albert + Krewinkel, #8226). Fixes a regression in 2.19 that required the + `boxlinks` variable to be set in addition to the usual link coloring + variables. Otherwise links were never colored in LaTeX PDF output. + + * Text.Pandoc.Highlighting: Export `lookupHighlightingStyle` + [API change]. Previously this lived in an unexported module + Text.Pandoc.App.CommandLineOptions, under the name + `lookupHighlightStyle`. + + * Text.Pandoc.App: + + + Remove unneeded MonadIO constraints in readSources. + + Factor out `convertWithOpts'` from `convertWithOpts`. + This runs in any PandocMonad, MonadIO, MonadMask instance. + So far it is not exported, but it might find a use later. + + * Support `--strip-comments` in commonmark/gfm (#8222). + This change makes the commonmark reader sensitive to + `readerStripComments`. + + * Lua: add function `pandoc.utils.citeproc` (Albert Krewinkel). + The function runs the *citeproc* processor on a Pandoc document. + Exposing this functionality to Lua allows to make citation processing + part of a filter or writer, simplifies the creation of multiple + bibliographies, and enables the use of varying citation styles in + different parts of a document. + + * Refactor `linux/make_artifacts.sh`. + + * Update INSTALL.md installation from source instructions. + + * Use base64 package instead of base64-bytestring. It is supposed to be + faster and more standards-compliant. + + * trypandoc improvements: + + + Add dropdown with canned examples. + + Add citeproc support. + + Support csv, bibliographic and binary formats. + + Add load from file. + + Add permalink. Don't always reload page. + + Use vanilla JS and CSS + the new `pandoc-server.cgi`. + + * Allow haddock-library-1.11.0. + + * Convert `tool/extract-changes.hs` to a Lua filter. + + +## pandoc 2.19 (2022-08-03) + + * Add `--embed-resources` flag (Elliot Bobrow, #7331). This can be + used to embed resources without implying `--standalone`. + Deprecate `--self-contained` in favor of `--embed-resources --standalone`. + + * Allow environment variable interpolation in `highlight-style` + and `pdf-engine` fields in defaults files + (#8061; Jaehwang Jung, #8073). + + * Allow placing custom readers and writers in user data directory + (Albert Krewinkel, #8112) (`readers` and `writers` subdirectories). + + * Add `tsv` (tab separated values) as an input format (#7974). + [API change]: Text.Pandoc.Readers.CSV now exports `readTSV`. + Internal change: In Text.Pandoc.CSV, `CSVOptions` has changed + so that `csvQuote` takes a Maybe value. + + * Add `tex_math_dollars` to `gfm` default extensions (reflecting + gfm's new support for math). + + * RST, Org, Markdown readers: support rowspans and colspans in grid tables + (#8202, Albert Krewinkel). Note: the writers does not yet support these + more complex grid table features, so these complex grid tables will + not round-trip. + + * HTML, LaTeX, and MediaWiki readers: use `formatCode` + (#8162, #8129, Elliot Bobrow). This moves formatting from inside inline + code elements to the outside, since pandoc's Code element only takes string + content. + + * Markdown reader: + + + Don't parse inline notes with blank lines inside (#8028). + + Allow attributes in special spans (e.g. `smallcaps`, `underline`) + (Albert krewinkel, #4102). These spans are parsed as + SmallCaps or Underline elements, but any attributes are included + in a wrapping Span. + + * HTML reader: + + + Allow sublists that are not marked as items (Albert + Krewinkel, #8150). This is technically invalid HTML, but it can + be found in the wild and browsers handle it. + + * Org reader (Albert Krewinkel): + + + Recognize absolute paths on Windows (Albert Krewinkel, #8201). + + Recognize {webp,jxl} files as images (YI). + + Allow attrs for Org tables (Albert Krewinkel, #8049). Tables with + attributes are no longer wrapped in Div elements; attributes are added + directly to the table element. + + Support line selection in INCLUDE directives (Brian Leung, #8060). + + Fix Post / Pre mixup when setting emphasis chars (Amir Dekel, #8134). + + * LaTeX reader: + + + Support `\includesvg` (#8027). + + Unescape characters in `\lstinline` inside `\passthrough` (#8179). + + Improve `mathEnvWith` (#8122). When converting e.g. an align + environment to an aligned environment inside a Math element, we need + to include a newline before the `\end{aligned}`, since the previous + line might end in a comment. + + Fix treatment of extensions for `\input` in LaTeX reader (#8092). + Previously we required a `.tex` extension, but TeX + allows any extension for `\input` (as opposed to `\include`). + + * RTF reader: + + + support `\nosupersub` (#8170). + + * TikiWiki reader: + + + Support underlined text + + * DocBook reader: + + + Improved reading `<xref>` elements (Frerich Raabe, #8065). + + * JATS reader: + + + Strip `ref-` prefix from ref id in xref (#8007). + + Support edition in references (#8087). + + * RIS reader: + + + Make parser more forgiving (#8034). Allow blank lines after entries. + Allow entries with no space after the `-`, provided they + just have a newline, e.g. `DB -\n`. + + Get right order of names (#8055). + + * MediaWiki reader: + + + Allow HTML comment after row start (#8110). + + * DokuWiki reader: + + + The `tex_math_dollars` extension is now supported for `dokuwiki` + (but off by default) (#8178). + + Content inside `<latex>...</latex>` is parsed as raw LaTeX inline, + and inside `<LATEX>..</LATEX>` as raw LaTeX block (#8178). + + The behavior of `<php>...</php>` is changed, so that instead of + producing a code block, it produces raw HTML with `<?php ... ?>`. + + * LaTeX writer: + + + Improve grouping with autocites (#8088). + + Extend list of book documentclasses (Wentau Han, #8053). + + Fix width of multicolumn cells (Albert Krewinkel, #8090). + Cells spanning multiple columns must be given an explicit width, + calculated from the table properties. + + Beamer: allow containsverbatim as alternative to fragile (#8080). + + * HTML writer: + + + Add 'footnotes' identifier to footnotes section (#8043). + + Fix bug with `--number-offset`. This formerly caused section divs + to be produced, even when `--section-divs` was not specified (#8097). + + Use CSS flexboxes for columns (Albert Krewinkel). This allows + an arbitrary number of columns, while the previous approach assumed + exactly two columns. + + Allow "spanlike" classes to be combined (see #8194). Previously + classes like "underline" and "marked" had to be the first class + in a span in order for the span to be interpreted as a "ul" or + "mark" element. This commit allows these special classes to be + "stacked," e.g. `[test]{.mark .underline}`; in addition, the + special classes are no longer required to come first in the list + of classes. + + Avoid doubled style attribute when height and width are added to + style because of an image, but the image already has a style attribute + (#8047). + + Do not include the deprecated doc-endnote role (#8030). + doc-endnote was deprecated in DPUB-ARIA 1.1. + + Remove extra soft break for tasklist (black-desk, #8142). + Browser will display the extra newline character between checkbox and + text as a space, which make tasklist items cannot be aligned. + + * EPUB writer: + + + Allow choice of math method for v3 (#8164). Previously we always + used MathML for math in EPUB3, because the spec includes MathML. + But this is not widely supported by readers, so it seems better + to allow users to choose their math method as they can with + EPUB2 or HTML. **NOTE:** Existing workflows that produce EPUBv3 + documents including math will be affected by this change. You + must add `--mathml` to your command line if you want to continue + producing MathML. + + * RST writer: + + + Fix missing spaces with nested inlines (#8182). + + Always escape literal backslash (#8178). + + * Ms writer: + + + Add comment in preamble stating generator. + + Fix roff ms syntax highlighting definitions (#8175, thanks to + Branden Robinson). + + * ConTeXt writer: + + + Support complex table structures (Albert Krewinkel, #8116). + The following table feature are now supported in ConTeXt: + + - colspans, + - rowspans, + - multiple bodies, + - row headers, and + - multi-row table head and foot. + + The wrapping `placetable` environment is also given a `reference` option + with the table identifier, enabling referencing of the table from within + the document. + + Unify link handling (Albert Krewinkel, #8096). + Autolinks, i.e. links with content that's the same as the linked URL, + are now marked with the `\url` command. All other links, both internal + and external, are created with the `\goto` command, leading to shorter, + slightly more idiomatic code. As before, autolinks can still be styled + via `\setupurl`, other links via `\setupinteraction`. + + Use "sectionlevel" environment for headings (Albert Krewinkel, #5539). + The document hierarchy is now conveyed using the + `\startsectionlevel`/`\stopsectionlevel` by default. This makes it easy + to include pandoc-generated snippets in documents at arbitrary levels. + The more semantic environments "chapter", "section", "subsection", etc. + are used if the `--top-level-division` command line parameter is set to + a non-default value. + + * Docx writer: + + + Add `w:lang` to `rPr` for Span and Div with lang attribute, so + that Word can know that "Apfel" is not a spelling error (#8026). + + Prevent crashing when handling invalid tables (Albert Krewinkel, #8102). + Tables with different numbers of cells per row would sometimes crash + pandoc. This fix prevents this by cutting off overlong rows. + + * ICML writer: + + + Support custom-style attribute on Table (#8079). + + * AsciiDoc writer: + + + Fix commas in link text (#8070). Commas in link text trigger + interpretation of attributes. To block this, we replace them with + numeric entities. + + Fix underline. We were rendering it as `+++text+++`; this is now + changed to `[.underline]#text#`. See comment at + <https://github.com/jgm/pandoc/issues/8070#issuecomment-1126883824>. + + * FB2 writer: + + + Fix handling of non-section Divs (#8123). + + * Markdown writer: + + + Disable soft wrapping when `hard_line_breaks` enabled (#8035). + We were already doing this for `markdown`; this commit does + the same thing for `markua` and `commonmark` and `gfm`. + + Avoid excessive indentation on bullet lists for `commonmark`, + `markua`, `gfm`. They are now nested by 2 spaces instead of 4 (#8011). + + * Text.Pandoc.Class: + + + Add new function `findFileWithDataFallback` [API Change] + (Albert Krewinkel). + + `fillMediaBag`: Keep attributes of original image on Span (Albert + Krewinkel, #8099). Images that cannot be fetched are replaced with a + Span that contains the image's description. The span now also retains + all original image attributes and inherits all attributes of the image. + Furthermore, the classes `image` and `placeholder` are added, and path + and title are store in attributes `original-image-src` and + `original-image-title`, respectively. + + * Text.Pandoc.Shared: + + + `makeSections`: don't make a section for a div with class "fragments" + (#8098). + + Ensure that Nulls are ignored by `makeSection` and in segmenting + slides (#8155). + + Add `formatCode` function to Text.Pandoc.Shared [API change] + (Elliot Bobrow, #8129). + + `taskListItemToAscii`: handle asciidoctor's characters (#8011). + Asciidoctor uses different unicode characters for task + lists; we should recognize them too and be able to convert + them to ascii task lists in formats like gfm. + + Deprecate `deLink` and mark for later removal. + + * Text.Pandoc.Writers.Shared: + + + `toTableOfContents`: Don't replace links with empty spans in TOC (#8020). + + * Text.Pandoc.Readers.Metadata: + + + Ensure that metadata values w/o trailing newlines are + parsed as inlines, as the manual states. + Previously, they were parsed as inlines if they would + otherwise have been a single Plain or Para, but otherwise + left unchanged. This led to some quirky results (e.g. #8143). + We now use the general function `blocksToInlines` from T.P.Shared. + + * Text.Pandoc.Parsing: + + + Simplify `gridTableWith'`, `gridTableWith` [API Change] (Albert + Krewinkel). The functions `gridTableWith` and `gridTableWith'` no + longer takes a boolean argument that toggles whether a table head + should be parsed: both, tables with heads and without heads, are + always accepted now. + + * Lua subsystem (Albert Krewinkel): + + + Extend `pandoc.system` module (Albert Krewinkel, #8184). + The module now has the additional functions `list_directory`, + `make_directory`, and `remove_directory`. This makes it easier to write + cross-platform scripts that need to inspect or modify the file system. + + Require pandoc-lua-marshal 0.1.7. Adds a `clone` methods to + Pandoc objects and allows to pass Blocks in instead of full + Caption elements. + + Add fields `pandoc.readers` and `pandoc.writers` (#8177). + The set of supported input and output formats is made available to Lua + users. + + Ensure that tables marshaled via JSON arrays behave like Lists. + This allows to invoke methods like `map` and `includes` on lists like + `PANDOC_WRITER_OPTIONS.extensions`. + + Require hslua-2.2.1, unless lua53 flag is set, and do not reset + foreign encoding before running Lua. This fixes a problem where + the encoding used for Lua filenames would sometimes mismatch the + encoding used by the OS. + + Simplify module loading code. Modules are now loaded directly; + the special pandoc Lua package searcher is no longer necessary and + has been removed. + + Add function pandoc.mediabag.fill (#8104). The function allows to + fill the mediabag with all images in a given document. Images that + cannot be fetched are replaced with a Span containing the + image description. + + * Populate mediabag after filters have run (Albert Krewinkel, #8099). + The mediabag is filled with document resources after the filters have + run. This allows, for example, filter authors to modify image paths + before pandoc tries to fetch the images. + Lua filters that rely on a filled mediabag can use the new + `pandoc.mediabag.fill` function to perform that action in the filter. + + * Ms template: redefine rather than removing .CH macro (#8175). + + * JATS template (Albert Krewinkel, except as noted): + + + Include particles, prefix, suffix in names. + + Mark authors with cor-id as corresponding authors. + Corresponding authors are marked by setting the attribute + `corresp="yes"` in their respective `<contrib>` element. + + Unconditionally include permissions element (#8040). + Fixes a bug that caused license information to be omitted when no + copyright information was provided. + + Follow JATS4R recommendation and PudMed Central for license URI + (Castedo Ellerman, #8041). + + * LaTeX template: + + + Rename `\textormath` to `\TextOrMath` (Hos Es, #8036). + + Fix links-as-notes (Albert Krewinkel, #8077). + + * HTML template styles: + + + Remove `span.underline` rule. This is superfluous now that we + render Underline as `<u>`. + + Improve CSS for task lists (#8151). + + * LaTeX template: Add `boxlinks` variable for LaTeX/PDF output (#8198). + If `boxlinks` is set but `colorlinks` is not, then boxes will + be printed around links (`hidelinks` will not be set in `hypersetup`). + + * `--self-contained`: Handle `url()` in `<style>` elements (#8193). + + * Text.Pandoc.PDF: use SHA1 hash of filename when converting SVG. + The previous code threw away the directory component of + the filename in constructing a new one. This led to + surprising results if you had e.g. `foo/pic.svg` and `bar/pic.svg`; + in the final PDF they'd be the same image, because the latter + would overwrite the former in the temp directory. + + * Remove Muse reader round-trip tests. These are nondeterministic and have + repeatedly failed on strange edge cases. + + * Update fonts MIME following IANA recommendation (Gabriel Lewertowski, + #8127). + + * Future compat change for `liftA2` export from Prelude (Georgi Lyubenov, + #8132). + + * Update `default.csl` from the latest chicago-author-date.csl. + + * Update manfilter.hs for greater portability (#8045). + The tables in our man pages were not rendering correctly + with mandoc, now used by default with macOS. mandoc doesn't + allow man formatting inside table cells. For maximum portability, + we now render the tables in plain format and include them as code + blocks in the man page. + + * CI: update macos container version (#8197, Sukka). + + * Add `nightly` flag. This causes a `-nightly-COMPILEDATE` + suffix to be added the the output of `--version` (#8016). + This is used in the nightly CI builds. + + * Update dependencies (aeson, skylighting, pandoc-lua-marshall, + citeproc, texmath). + + * Documentation improvements (thanks to Jiří Wolker, + Castedo Ellerman, Albert Krewinkel, Bastien Dumont, Cezar Drożak, Benjamin + Wuethrich, Ivan Panchenko, Sukil Etxenike, Masataka Ogawa). + +## pandoc 2.18 (2022-04-04) + + * New input formats: `endnotexml` (EndNote XML bibliography), + `ris` (RIS bibliography). + + * A RIS bibliography file may now be used with `--citeproc`. + + * Citeproc: Allow a formatted bibliography to be placed in metadata fields + via a Div with class `refs` (#7969, #526). Thus, one can include a + metadata field, say `refs`, whose content is an + empty div with id `refs`, and the formatted bibliography will be put into + this metadata field. It may then be interpolated into a template using the + variable `refs`. + + * Ensure that you don't get PDF output to terminal. `-t pdf` now behaves + like `-t docx` and gives an error unless the output is redirected. + + * `--version` now prints hslua version (#7929) and + Lua version (#7997, Albert Krewinkel). + + * Change `--metadata-file` parsing so that, when the input format is not + markdown or a markdown variant, pandoc's markdown is used (#6832, #7926). + When the input format is a markdown variant, the same format is used. + Reason for the change: it doesn't make sense to run the markdown parser + with a set of extensions designed for a non-markdown format, and + this dramatically limits what people can do in metadata files. + + * Trim whitespace from math in `--webtex` (#7892). + This fixes problems with --webtex and markdown output, + when display math starts or ends with a newline. + + * `--self-contained`: issue warning rather than failing with an error + if a resource can't be found (#7904). + + * New exported module Text.Pandoc.Readers.EndNote, exporting + `readEndNoteXML` and `readEndNoteXMLCitation` [API change]. + + * New exported module, Text.Pandoc.Readers.RIS, exporting `readRIS` (#7894) + [API change]. + + * LaTeX reader: + + + Handle subequations as inline math environment (#7883). + + Rudimentary support for `vbox` (#7939). + + Support `\today` (#7905). + + Handle `\label` and `\ref` for footnotes (#7930). + + Allow inline groups starting with `\bgroup` (#7953). + + Use custom TokStream that keeps track of whether macros are expanded. + This allows us to improve performance a bit by avoiding unnecessary + runs of the macro expansion code (e.g. from 24 ms to 20 ms on + our standard benchmark). + + Further optimizations for inline parsing. + + Better handling of `\usepackage`. If the package is local but + causes parse errors, parse everything up to the error and skip the + rest. Issue a `CouldNotParseIncludeFile` warning indicating that + parsing failed at that point. + + Text.Pandoc.Readers.LaTeX.Parsing: Monoid and Semigroup instances for + TokStream. + + * HTML reader: + + + Give warnings and emit empty note when parsing + `<a epub:type="noteref">` and the identifier + doesn't correspond to anything in the note table (#7884). + Previously we just silently skipped these cases. + + Fix parsing of epub footnotes (#7884). + + * DocBook reader: + + + Handle complete set of entities as specified at + <https://www.w3.org/2003/entities/2007doc/byalpha.html> (#7938). + + Handle abstract in info section (#7747). + + Improve info parsing. + + Simplify metadata parsing code (#7747). + Handle abstract as block-level content. + Report skipped info elements with `--verbose`. + + Handle address and coyright in metadata (#7747). + + * DokuWiki reader: + + + Add DokuWiki table alignment (#5202, damon-sava-stanley). + + * RST reader: + + + Fix treatment of headerless simple tables (#7902). + + Wrap math in Span to preserve attributes (#7998, Albert Krewinkel). + Math elements with a name, classes, or other fields are wrapped in a + `Span` with these attributes. + + * JATS reader: + + + Improve handling of fn-group elements (#6348, Albert Krewinkel). + Footnotes in `<fn-group>` elements are collected and re-inserted into + the document as proper footnotes in the place where they are referenced. + + Handle `pub-date` (#8000). + + Support PMID, DOI, issue in citations (#7995). + + Improve refs parsing. Handle `issn` and `isbn`; use simpler form + for issued date. + + Strip 'ref-' from ref id in constructing CSL id. This allows better + round-tripping, because the JATS writer adds the `ref-` prefix to + the citation id to get the ref element's id. + + * Org reader: + + + Allow ":" in property drawer keys (Lucas V. R). + Any non-space character is allowed as property drawer key, including ":" + itself (so it is not really a delimiter). The real delimiter is a space + character, so in a drawer like + ``` + :PROPERTIES: + ::k:ey:: value + :END: + ``` + ":k:ey:" is a key with value "value". + + + Allow comments above property drawer. + + More flexible LaTeX environments (Lucas V. R). + + Handle `#+bibliography:` as metadata so that it can work with + `--citeproc`. + + Parse `#+print_bibliography:` as Div with id `refs`. + + Allow multiple `#+bibliography:`. + + * Markdown reader: + + + Allow one-column pipe tables with pipe on right (#7919). + + Remove restriction on identifiers, so they no longer need to + begin with a letter (#7920). + + * Docx reader: + + + Enable `citations` extension for docx reader (#7840). + When enabled, Zotero, Mendeley, and EndNote citations embedded in + a docx are parsed as native pandoc citations. + (When disabled, the generated citation + text and bibliography are passed through as regular text.) + The bibliography generated by the plugin is suppressed. + Instead, bibliographic data embedded in citation items is added + to the `references` metadata field so that it can be used + with `--citeproc`. + + * Docbook writer: + + + Interpret links without contents as cross-references (#7360, Jan Tojnar). + Links without text contents are converted to `<xref>` elements. DocBook + processors will generate appropriate cross-reference text when presented + with an xref element. + + * Docx writer: + + + Single numbering ID for examples (#7895, mjfs). + This change ensures that example list items all belong to a single + number sequence, so that if items are added or deleted in a word + processor, the other items will renumber automatically. + + Add bookmark with table id to table (#7989, Nikolai + Korobeinikov, #7285). This allows tables with ids to be linked to. + + * Ipynb writer: + + + Handle metadata better (#7928). Previously we used the markdown + writer to render metadata. This had some undesirable consequences + (e.g. en dash expanded to `--` when `smart` enabled), so now we use + the plain writer. + + * LaTeX writer: + + + Avoid extra space before `\CSLRightInline` (#7932). + + Add `scrreport` to `chaptersClasses` (#6168, ivardb). + + Support `page`,`trim`,`clip` attributes on images (#7181). + + Add `()` after booktabs rules (#8001). These commands take optional + arguments with () and [], which can lead to problems if the content + of the table cell begins with these characters. + + * RST writer: + + + Support all standard metadata ("bibliographic") fields. + + * HTML writer: performance improvements. + + * Org writer: + + + Stop indenting property drawers, quote blocks + (#3245, Albert Krewinkel). This follows the current default org-mode + behavior. + + * Markdown writer: + + + Move table-related code into submodule (Albert Krewinkel). + + Don't produce redundant header identifier when the + `gfm_auto_identifiers` extension is set (#7941). + + Update escaping rules for `\`. We now escape `\` only if `raw_tex` + is enabled or it is followed by a non-alphanumeric. + + * JATS writer: + + + Encode author "others" as `<etal/>` (Albert Krewinkel). + Citeproc adopted the BibTeX convention to use the author name "others" + when there are additional authors that are not named. JATS uses the + `<etal>` element for this. + + Avoid doubled ref-list element (#7990). Previously when generating JATS + with the `element_citations` extension enabled, the references were + put in a doubly-nested ref-list element (`<ref-list><ref-list>...`). + + Keep edition info in element citations (#7993, Albert Krewinkel). + + Fix handling of CSL variable 'page' (not 'pages' as we had before). + It should go to 'lpage' and 'rpage', not 'page-range'. + + * EPUB writer: refactor for clarity (#7991, Jonathan Dönszelmann, + Ola Wolska, Ivar de Bruin, Jaap de Jong). + + * Custom writer (Albert Krewinkel): + + + Support new-style Writer function (Albert Krewinkel). + See the documentation for custom writers for details. + + Produce stacktrace if Writer function fails + + * Text.Pandoc.Logging: add `CouldNotParseIncludeFile` constructor + for `LogMessage` [API change]. + + * Text.Pandoc.Shared: + + + Put id attributes on TOC entries (#7907, damon-sava-stanley). + Naming scheme of id is "toc-" + id of linked to header/section. + Effects HTML, Markdown, Powerpoint, and RTF. + + Define `ordNub` as alias for `nubOrd` from containers package (#7963, + Albert Krewinkel). + + Export `ensureValidXmlIdentifiers`. This function changes identifiers + that don't start with letters, and internal links to these identifiers, + making them compatible with XML standards. The change + is simple: we add `id_` to the front. There is potential + for duplication if there are already `id_...` identifiers + defined, but this seems rare enough not to worry too much + about. + + * Ensure that valid XML identifiers are used in Docbook, EPUB, FB2, + HTML4, S5, Slidy, Slideous, ICML, ODT, TEI writers. + Thus, if you convert `[anchor]{#1} and [link to](#1)`, + `id_1` will be used instead of `1` for the identifier. + + * Lua (Albert Krewinkel). + + + Add module `pandoc.layout` to format and layout text. + + Move custom writer code into Lua hierarchy. + + Use pandoc-lua-marshal 0.1.5. + + Allow any type of callable object as argument to List + functions `filter`, `map`, and `find_if`. These previously + required the argument to be of type `function`, which was too + restrictive. + + Inline: the type of Image captions is now `Inlines` instead of `List`. + + Allow passing `Sources` to `pandoc.read` (#8002). + + * Text.Pandoc.PDF: + + + Restore `wkhtmltopdf` as default pdf engine for HTML (Albert Krewinkel). + + Allow custom writer as format if engine is explicitly specified (#7898, + Albert Krewinkel). Note that it may be necessary to explicitly + specify a template on the command line. + + * Text.Pandoc.MediaBag: improve detection of absolute paths (#7881). + + * Text.Pandoc.Extensions: + + + Remove `raw_tex` extension from list of commonmark extensions, and + from the `commonmark_x` defaults. commonmark doesn't parse raw TeX, + and it doesn't make sense to write it if we don't parse it. + + Remove `native_divs` from allowed gfm extensions (#7965). This allows + `<div>` to be suppressed using `-raw_html`. Previously `native_divs` + was enabled but could not be suppressed, because it was not in the + list of available extensions for commonmark-based formats. + + * Text.Pandoc.Parsing: + + + Partition module into (internal) submodules (#7962, Albert Krewinkel). + + Unify grid table parsing (#7971, Albert Krewinkel). + Grid table parsing in Markdown and RST are updated use the same + functions. Functions are generalized to meet requirements for both + formats. This change also lays the ground for further generalizations + in table parsers, including support for advanced table features. + [API change] in Text.Pandoc.Parsing: + + - Parse results of functions `tableWith'` and `gridTableWith'` are now a + `mf TableComponents` instead of a quadruple of alignments, column + widths, header rows and body rows. + - Additional exports from Text.Pandoc.Parsing: + `tableWith'`, `TableComponents`, `TableNormalization`, + `toTableComponents`, `toTableComponents'`. + + * Text.Pandoc.XML.Light: add versions of the parsers that allow + specifying a custom entity map. Exports new functions: + `parseXMLElementWithEntities`, `parseXMLContentsWithEntities` [API change]. + + * Text.Pandoc.Writers.GridTable: improve module documentation (Albert + Krewinkel). + + * Text.Pandoc.Parsing.GridTable: simplify column handling code (Albert + Krewinkel). + + * Text.Pandoc.MIME: Add mime type for mkv extension (#7181). + + * Text.Pandoc.Asciify: Fix regression with `ascii_identifiers` and Turkish + undotted i (#8003). + + * Relax upper bound for hslua, allow hslua-2.2. (#7929) + Lua 5.4 is used by default after this is merged. Packagers may still + include Lua 5.3 instead by building pandoc with `--constraint='hslua <2.2'`. + Differences between 5.3 and 5.4 should not generally affect pandoc Lua + filters. See list of incompatible changes here: + <https://www.lua.org/manual/5.4/manual.html#8.1> + + * JATS template: allow multiple licenses (Albert Krewinkel). + + * LaTeX template: + + + Skip `\babelprovide` if `babel-lang` is empty (#7945) to avoid an error. + + Move hyperref near end of preamble (#5811). It now comes after + header-includes and right before title, author, date, abstract. + Note: Users who presuppose hyperref in their header-includes + will now have to add `\usepackage{hyperref}` to their header-includes + to make it available there. (The redundant `\usepackage` will + do no harm in this case.) + + Remove special redefinition of `\sout`. This used to be necessary to + avoid problems with hyperref, when headings contain strikeout text, + but it does not seem to be necessary any more (tested). + + * Tests: improve location reporting of failing tests (Albert Krewinkel). + + * Add tests for idempotency of `makeSections` (#7950). + + * Add armhf support in linux build script (#7944, Tony). + + * Use latest pandoc-types, so that toJSONFilter will work with + Meta and MetaValue. + + * Use latest doclayout, texmath, commonmark, citeproc. + + * INSTALL.md: add reference to install via winget (#7951, Guriy Samarin). + + * MANUAL.txt: + + - Document way to get list in block quote in slide shows (#7916). + - Minor changes to security section. + - Note that `smart` works for html input. + - Fix typos (#7934, Dimitris Apostolou). + - Fix documentation for citations and org mode. + - Remove claim that `--self-contained` does not work with `--mathjax` + (#682). + + * doc/org.md: remove obsolete citations section. + This mostly described citation formats we no longer support. + + * doc/lua-filters.md: Fix typo (#7981, Mario Lang). + + * Makefile: Use cabal for default build + + * Add `lua53` cabal flag. It is false by default. If set to true, compile + with hslua 2.1 and Lua 5.3, otherwise hslua 2.2 and Lua 5.4. + + +## pandoc 2.17.1.1 (2022-01-31) + + * Fix regression in 2.17.1 which caused problems finding + default files in the default user data directory. (Reverts + the item "logic bug in `fullDefaultsPath`", which was + misguided.) + + * Sample custom writer: use single quotes for strings (#7487, + Albert Krewinkel). + +## pandoc 2.17.1 (2022-01-30) + + * Support `pagedjs-cli` as pdf engine (#7838, Albert Krewinkel). + PagedJS is a polyfill and supports the Paged Media standards by the W3C. + <https://www.pagedjs.org/> + + * CommonMark reader: fix source position after YAML metadata (#7863). + + * LaTeX reader: + + + Remove retokenizing in `rawLaTeXParser`. + + Ensure that `\raggedright` doesn't gobble an argument (#7757). + + Improve `descItem`. For some reason we were skipping + arbitrary blocks before `\item`. This is now changed to "skip + whitespace and comments." + + Improve handling of `\newif`. Adding a pair of braces around the + second argument of `\def` prevents LaTeX from an emergency stop + on input like the following (#6096). + ``` + \newif\ifepub + \epubtrue + \ifepub + hi + \fi + ``` + + * Docx reader: Parse both Zotero citation and bibliography as + `FieldInfo` (#7840). + + * LaTeX writer: + + + Allow arbitrary frameoptions to be passed to a beamer + frame, using the frameoptions attribute (#7869). + + Add s and squeeze to recognized beamer frameoptions (#7869). + + * Markdown writer: handle explicit column widths with pipe tables (#7847). + If a table has explicit column width information *and* the content + extends beyond the `--columns` width, we need to adjust the + widths of the pipe separators to encode this width information. + + * Docx writer: Separate tables even with RawBlocks between (#7724, + Michael Hoffmann). Adjacent docx tables need to be separated by an + empty paragraph. If there's a RawBlock between tables which renders + to nothing, be sure to still insert the empty paragraph so that + they will not collapse together. + + * Man writer: use custom font V for inline code (#7506). + The V font is defined conditionally, so that it renders + like CB in output formats that support that, and like B + in those that don't (e.g. the terminal). + Aliases also defined for VI, VB, VBI. + + * Asciidoc writer: Support checklists in asciidoctor writer (#7832, + Nikolai Korobeinikov, ricnorr). The checklist syntax (similar to + `task_list` in markdown) seems to be an asciidoctor-only addition. + + * HTML writer: + + + Avoid duplicate "style" attributes on table cells (#7871). + + Don't break lines inside code elements. With the new (default) + line wrapping of HTML, in conjunction with the default CSS which + includes `code { whitespace: pre-wrap; }`, spurious line + breaks could be introduced into inline code (#7858). + + * Custom writer: preserve order of element attributes (#7489, Albert + Krewinkel). Attribute key-value pairs are marshaled as AttributeList, + i.e., as a userdata type that behaves both like a list and a map. This + allows to preserve the order of key-value pairs. + + * Switch to hslua-2.1 (Albert Krewinkel). This allows for some code + simplification and improves stability. + + * Don't read files outside of user data directory (Even Brenden). + If a file path does not exist relative to the working directory, and + it does exist relative to the user data directory, but outside of + of the user data directory, do not read it. This applies to + `readDataFile` and `readMetadataFile` in PandocMonad and, by + extension, any module that uses these by passing them relative paths. + + * Text.Pandoc.Class.`makeCanonical`: Correctly handle consecutive ".."s + at the beginning of a path (Even Brenden). Prior to this commit, + `../../file` would evaluate to `file`, when it should be unchanged. + + * Search for metadata files in `$DATADIR/metadata` (#7851, Even Brenden). + If files specified with `--metadata-file` are not found in the working + directory, look in `$DATADIR/metadata` (#5876). + + * Text.Pandoc.Class: export `readMetadataFile` [API change] (#5876). + + * Text.Pandoc.Error: export new `PandocCouldNotFindMetadataFileError` + constructor for `PandocError` [API change] (#5876). + + * Avoid putting a frame around speaker notes in beamer (#7857). + If speaker notes (a Div with class 'notes') occur right + after a section heading, but above slide level, the + resulting `\note{..}` caommand should not be wrapped in + a frame, as that will cause a spurious blank slide. + + * CSS in HTML template: adjust #TOC and h1 on mobile (#7835, Mauro Bieg). + + * Text.Pandoc.Readers.LaTeX.Parsing: don't export `totoks`. + Make the first param of `tokenize` a SourcePos instead of + SourceName, and use it instead of `totoks`. + + * Text.Pandoc.Shared: Modify `stringify` so it ignores `[Citation]` + inside `Cite` (#7855). Otherwise we'll sometimes get two copies of + things, one from the `citationPrefix` or `citationSuffix` and another + from the embedded fallback text. When there is no fallback text, + we'll get no content. However, it really isn't an alternative to just + rely on the result of running `query` on the embedded `Citation`s; + this will result in a jumble of text rather than anything structured. + + * Omit `--enable-doc` in the cabal haddock invocation in + `tools/build-and-upload-api-docs.sh`. + + * Text.Pandoc.App.Opt: fix logic bug in `fullDefaultsPath`. + Previously we would (also) search the default user data directory + for a defaults file, even if a different user data directory + was specified using `--data-dir`. This was a mistake; if + `--data-dir` is used, the default user data directory should + not be searched. + + * Text.Pandoc.Shared: `defaultUserDataDir` behavior change (#7842). + If the XDG data directory is not defined (e.g. because + it's not supported in the OS or HOME isn't defined), we + return the empty string instead of raising an exception. + + * Update command tests to distinguish stderr and test exit status. + + * MANUAL: add that speaker notes can be used with beamer (#7856). + + * Update `build-and-upload-api-docs.sh`. + + * Document `--trace` option. + Document `no-check-certificate` in defaults files. + Document 'sandbox' option for defaults files. (#7873). + + * Fix pattern syntax in sample readability custom reader. + + * doc/custom-readers.lua: add example for "readable HTML." + + * Fix message in man page about where code can be found. + + * `manfilter.lua`: remove extra indent in table cells with code blocks. + + * Fix lua-filters documentation for table column widths (#7864). + + * epub.doc: Update links to KindleGen (#7846, Benson Muite, Mauro Bieg). + KindleGen has been deprecated and we need to link to archived versions. + + * Use tables in defaults files documentation, so each + default option is paired with the corresponding command-line + option (Carsten Allefeld). + + * Use skylighting 0.12.2. + + * Add pandoc-lua-marshal to Nix shell (#7849, Even Brenden). + + +## pandoc 2.17.0.1 (2022-01-14) + + * Require pandoc-lua-marshal 0.1.3.1 (#7831, Albert Krewinkel). + Fixes a problem with `List.includes` and `List.find` that caused a + Lua stackoverflow and subsequent program crash. + + * HTML template: load header-includes before math (#7833, Kolen Cheung). + MathJax expect the config comes before loading the MathJax script. + This change of order allows one to config MathJax via + header-includes, which loads before the MathJax script. Cf. #2750. + + * When reading defaults file, stop at a line `...`. This line signals + the end of a YAML document. This restores the behavior we got with + HsYaml. yaml complains about content past this line. See + https://github.com/jgm/pandoc/issues/4627#issuecomment-1012438765 + + * Text.Pandoc.Citeproc: allow `notes-after-punctuation` to work with + numerical styles that use superscripts (e.g. + american-medical-association.csl), as well as with note styles. The + default setting of `notes-after-punctuation` is true for note styles + and false otherwise. This restores a behavior of pandoc-citeproc + that wasn't properly carried over to Citeproc (#7826, cf. + jgm/pandoc-citeproc#384). + + * Use commonmark-pandoc 0.2.1.2 (#7769). + + * Add FAQ on images in ipynb containers (#7749, Kolen Cheung). + +## pandoc 2.17 (2022-01-12) + + * Support `markua` as an output format (#1871, Tim Wisotzki and + Saumel Lemmenmeier). Markua is a markdown variant used by Leanpub. + + * Add text wrapping for HTML output (#7764). Previously the HTML writer + was exceptional in not being sensitive to the `--wrap` option. With + this change `--wrap` now works for HTML. The default (as with other + formats) is automatic wrapping. Note that the contents of `script`, + `textarea`, and `pre` tags are always laid out with the `flush` + combinator, so that unwanted spaces won't be introduced if these occur + in an indented context in a template. + + * Don't read sources until in/out format are verified (#7797). + + * Issue error with `--list-extensions` for invalid formats (#7797). + + * Make `--citeproc` recognize `.yml` as well as `.yaml` extensions + as YAML bibliography files (#7707, Jörn Krenzer). + + * Use latest version of KaTeX with `--katex`. + + * Fix parsing of footnotes in `--metadata-file` (#7813). Previously + non-inline footnotes were not being parsed. + + * ODT reader: + + + Parse list-header as a list item (Tuong Nguyen Manh). + + * Commonmark reader: + + + Put sourcepos attribute on header, not enclosing div + with `-f commonmark+sourcepos` (#7769). + + * Markdown reader: + + + Don't allow `^` at beginning of link or image label (#7723). + This is reserved for footnotes. Fixes regression from 0a93acf. + + Fix parsing of "bare locators" after author-in-text citations. + Previously `@item [p. 12; @item2]` was incorrectly parsed as + three citations rather than two. This is now fixed by ensuring + that `prefix` doesn't gobble any semicolons. + + Revert changes to `inlinesInBalancedBrackets` (commit fa83246), + which caused regressions. + + Improve detection of pipe table line widths (#7713). Fixed + calculation of maximum column widths in pipe tables. It is + now based on the length of the markdown line, rather than a + "stringified" version of the parsed line. This should be + more predictable for users. In addition, we take into account + double-wide characters such as emojis. + + * Custom (Lua) readers: + + + First argument is now a list of sources instead of the + concatenated text (Albert Krewinkel). The list + structure can easily be converted to a string by applying + `tostring`, but it is also possible to access the elements + (each with a `text` and `name`). A small example is added + to the custom reader documentation, showcasing its use in a + reader that creates a syntax-highlighted code block for + each source code file passed as input. Existing readers + will still work through a fallback mechanism, issuing a + deprecation notice. + + * Org reader: + + + Parse official org-cite citations (#7329). We also support the older + org-ref style as a fallback. We no longer support the + "markdown style" or "Berkeley style" citations. + + Support alphabetical (fancy) lists (Lucas Viana). When the + `fancy_lists` extension is enabled, alphabetical list markers are + allowed, mimicking the behaviour of Org Mode when + `org-list-allow-alphabetical` is enabled. + + Support counter cookies in lists (Lucas Viana). Such cookies are + used to override the item counter in ordered lists. In org it is + possible to set the counter at any list item, but since Pandoc AST + does not support this, we restrict the usage to setting an offset for + the entire ordered list, by using the cookie in the first list item. + + Allow trailing spaces after key/value pairs in directives (Albert + Krewinkel). Ensures that spaces at the end of attribute directives like + `#+ATTR_HTML: :width 100%` (note the trailing spaces) are accepted. + + * LaTeX reader: + + + Omit visible content for `\label{...}`. Previously we + included the text of the label in square brackets, but this is + undesirable in many cases. See discussion in + <https://github.com/jgm/pandoc/issues/813#issuecomment-978232426>. + + Improve references (#813). Resolve references to theorem environments. + Remove the Span caused by "label" in figure, table, and theorem + environments; this had an id that duplicated the environments' id. + + Fix semantics of `\ref`. We were including the ams + environment type in addition to the number. This is proper + behavior for `\cref` but not for `\ref`. To support `\cref` + we need to store the environment label separately. + + Add babel mappings for Guajati (gu) and Oriya (or) (#7815). + + Fix typo `panjabi` -> `punjabi` in babel mappings (#7814). + + * HTML reader: + + + Parse attributes on links and images (#6970). + + * Docx reader: + + + Handle multiple pic elements inside a drawing (#7786). + + Change `elemToParPart` to return `[ParPart]` instead of `ParPart`. + Also remove `NullParPart `constructor, as it is no longer + needed. This will allow us to handle elements that contain + multiple ParParts, e.g. `w:drawing` elements with multiple `pic:pic`. + + * DocBook reader: + + + Collapse internal spaces in literal and other similar tags (#7821), + as the standard docbook toolchain does. + + Be sensitive to spacing="compact" in lists (#7799). When + `spacing="compact"` is set, Para elements are turned into Plain, + so we get a "tight" list. + + * Markdown writer: + + + Add new exported function `writeMarkua` from Text.Pandoc.Writers.Markdown + [API change] (#1871, Tim Wisotzki and Saumel Lemmenmeier). + + Fix indentation issue in footnotes (#7801). + + Avoid extra space before citation suffix if it already starts + with a space. + + Ensure semicolon between the locator and the next citation when an + author-in-text citation has a locator and following citations. + + Improve escaping for `#` (#7726). + + * Custom (Lua) writers: + + + Allow variables to be set via second return value of `Doc` + (#6731, Albert Krewinkel). New templates variables can be added by + giving variable-value pairs as a second return value of the + global function `Doc`. Example: + ``` + function Doc (body, meta, vars) + vars.date = vars.date or os.date '%B %e, %Y' + return body, vars + end + ``` + + Provide global `PANDOC_WRITER_OPTIONS` (#6731, Albert Krewinkel). + + Assign default Pandoc object to global `PANDOC_DOCUMENT` (Albert + Krewinkel). The default Pandoc object is now non-strict, i.e., only + the parts of the document that are accessed will be marshaled to Lua. + A special type is no longer necessary. This change also makes it + possible to use the global variable with library functions such as + `pandoc.utils.references`, or to inspect the document contents with + `walk()`. + + * LaTeX writer: + + + Fix typo `panjabi` -> `punjabi` in babel mappings (#7814). + + * MediaWiki writer: + + + Remove redundant display text for wiki links (Jesse Hathaway). + + * Docx writer: + + + Handle bullets correctly in lists by not reusing numIds + (#7689, Michael Hoffmann). This fixes a bug in which a Div in + a list item would receive bullets on its contained paragraphs. + + * Org writer: + + + Fix list items starting with a code block or other non-paragraph + content (#7810). + + Avoid blank lines after tight sublists (#7810). + + Fix extra blank line inserted after empty list item (#7810). + + Don't add blank line before lists (#7810). + + Support starting number cookies (Lucas Viana). This is necessary + for lists that start at a number other than 1. + + Support the new org-cite syntax (#7329). + + * Haddock writer: + + + Avoid blank lines after tight sublists (#7810). + + * Ipynb writer: + + + Ensure deterministic order of keys. + + Handle cell output with raw block of markdown (#7563, Kolen Cheung). + Write RawBlock of markdown in code-cell output. This is designed + to fit the behavior of #7561, which makes the ipynb reader parse + code-cell output with mime "text/markdown" to a RawBlock of markdown. + This commit makes the ipynb writer writes this RawBlock of markdown + back inside a code-cell output with the same mime, preserving this + information in round-trip. + + In choosing between multiple output options, always favor + those marked with the output format over images (Kolen Cheung). + Previously, both `fmt == f` case and Image have a rank of 1. + + * Ipynb reader & writer: properly handle cell "id" (#7728). + This is passed through if it exists (in Nb4); otherwise + the writer will add a random one so that all cells have an "id". + + * Ms writer: + + + Properly encode strings for PDF contents (#7731). + + * JATS writer: + + + Keep quotes in element-citations (Albert Krewinkel). + Fixed a bug that lead to quote characters being lost in + element-citations. + + * RTF writer: + + + Properly handle images in data URIs (#7771). + + * Commonmark writer: + + + Allow ')' delimiters on ordered lists. + + * RST writer: + + + Avoid extra blank line after empty list item (#7810). + + * HTML writer: + + + Make line breaks more consistent. With `--wrap=none`, we now + output line breaks between block-level elements. Previously they + were omitted entirely, so the whole document was on one line, unless + there were literal line breaks in pre sections. This makes + the HTML writer's behavior more consistent with that of + other writers. Also, regardless of wrap settings, + put newline after `<dd>` and after block-level elements in + the footnotes section. And add a line break between an `img` tag + and the associated `figcaption`. + + reveal.js: Make sure images with `r-stretch` are not in p tags. + They must be direct children of the section. There was previously + code to make this work with the older class name `stretch`, but + the name has changed in reveal.js. + + reveal.js: don't add `r-fit-text` class to section. It must go on + the header only. + + * AsciiDoc writer: + + + Improve detection of intraword emphasis (#7803). + + * OpenDocument writer: + + + Fix vertical alignment bug with display math (#7777). Previously some + displayed formulas would be floated above a preceding text line. + This is fixed by setting `vertical-rel` to `text` rather than + `paragraph-content`. + + * JATS template (Albert Krewinkel): + + + Fix position of contrib affiliations in authoring set. Any + `<aff>` element must come before any `<email>` element. + + Fix affiliation tagging in `articleauthoring` output. + Affiliations were `xlink`ed even in the articleauthoring tag set, but + `<aff>` are not allowed as children of `contrib-group` elements in that + tag set. Each affiliation must be listed directly in the contrib + element. + + Add support for article subtitles. + + * EPUB template: + + + Include abstract in default template. + + Ensure that the essential styles needed by pandoc (`styles.html` + partial) are included in the templates. This is important for correct + formatting of CSL bibliographies. Note that much of the styling in + `styles.html` will be ignored for EPUB, because of the conditional on + `document-css`. Setting the `document-css` variable will cause it + not to be ignored. + + * HTML template: Add abstract (#7588, Jannik Buhr, John MacFarlane). + By default, a localized title (the word "Abstract") will be + used, unless the variable `abstract-title` is set. + + * ConTeXt template: Make title appear in PDF title bar. This is + recommended for accessibility reasons. Note: doesn't work with macOS + Preview.app. + + * `reference.pptx`: change to use 16:9 aspect ratio, Powerpoint's default. + + * Text.Pandoc.Writers: + + + Do not export `writeCustom` [API change]. This ensures that all + writers exported in T.P.Writers are parameterized and work with any + `PandocMonad` type. This is consistent with T.P.Readers, as + `readCustom` is not exported from that module either. + + * Text.Pandoc.Writers.Shared: + + + `endsWithPlain` now returns True if the list ends with a list + that ends with a Plain, and so on recursively (#7810). + + * Text.Pandoc.Class.IO: + + + `writeMedia`: unescape percent-encoding in creating file path. + This addresses a problem with spaces in image filenames + when creating PDFs (#7819); it also affects `--extract-media`. + + * New internal module Text.Pandoc.Writers.Blaze, exporting `layoutMarkup`. + This converts a blaze Html structure into a doclayout Doc Text. + + * Text.Pandoc.Extensions: + + + `parseFormatSpec`: cleaner error message for invalid extensions. + + * Text.Pandoc.MediaBag: + + + Fix bug in `extractMedia`, which caused the test for `..` + in paths to fail, with the result that images with `..` + in the path name could be extracted outside of the + directory specified by `extractMedia`. It also led a check for + `media` in resource paths to fail in the docx reader. + + * Text.Pandoc.Citeproc: + + + Avoid adding comma before an author-in-text citation in a note + if it begins with a title (no author) (#7761). + + Text.Pandoc.Citeproc.Locator now exports `toLocatorMap`, + `LocatorInfo`, and `LocatorMap`. The type of `parseLocator` + has changed, so it now takes a `LocatorMap` rather than a `Locale` + as parameter, and returns a `LocatorInfo` instead of a tuple. + + Fix citation locator detection for German. `toLocatorMap` now + stores keys case-folded. We want to do a case-insensitive + comparison when parsing locators, so that e.g. both + `Chap.` and `chap.` work. Previously we case-folded terms + when doing the lookup, but they weren't case-folded in the + map itself, which led to locator-detection breaking for + German (where the terms have uppercase letters). + + * Lua (Albert Krewinkel): + + + Allow single elements as singleton MetaBlocks/MetaInlines. Single + elements should always be treated as singleton lists in the Lua + subsystem. + + Add `pandoc.template` module. The module provides a `compile` + function to use strings as templates. + + Add `pandoc.WriterOptions` constructor. + + Add function `pandoc.write`. + + Provide global `PANDOC_WRITER_OPTIONS` (#5221). + + The function Text.Pandoc.Filter.applyFilters now takes a filter + environment of type `Environment`, instead of a ReaderOptions value + [API change]. + + The `Environment` type is exported from Text.Pandoc.Filter + and allows to combine ReaderOptions and WriterOptions in a single + value [API change]. + + Global, exported from Text.Pandoc.Lua, has a new type constructor + `PANDOC_WRITER_OPTIONS` [API change]. + + Add constructors `pandoc.Blocks` and `pandoc.Inlines`. + The functions convert their argument into a list of Block and Inline + values, respectively. When applied to a string, they split the + string into `Str` elements separated by `Space` or `SoftBreak` + (#7712). + + Support topdown traversals The traversal order of filters can now + be selected by setting the key `traverse` of the filter to either + `'topdown'` or `'typewise'`; the default remains `'typewise'`. + Topdown traversals can be cut short by returning `false` as a + second value from the filter function. No child-element of the + returned element is processed in that case. + + Marshal ReaderOptions field `extensions`, `track_changes` via JSON. + Extensions are now available as a list of strings; the track-changes + settings are given as the kebab-case representation used in JSON. + + Allow binary (byte string) readers to be used with `pandoc.read`. + + Use global state when parsing documents in `pandoc.read`. + The function `pandoc.read` is updated to use the same state that was + used while parsing the main input files. This ensures that log + messages are preserved and that images embedded in the input are + added to the mediabag. + + Cleanup stack in `peekReadOptionsTable`. A ReaderOptions element was + left on top of the stack when the `peekReadOptionsTable` function + was invoked. + + `walk` methods are added to `Pandoc`, `Block`, `Inline`, + `Blocks`, `Inlines` values; the methods are similar to + `pandoc.utils.walk_block` and `pandoc.utils.walk_inline`, but + apply to filter to the element's contents. + + Functions of name `Doc` are no longer accepted as alternatives for + `Pandoc` filter functions. This functionality was undocumented. + + Improve handling of empty caption, body by `from_simple_table` + #7776). Create truly empty table caption and body when these are + empty in the simple table. + + Change representation of `TableHead`, `TableFoot`, and `Row` values + (#7718). The objects now also follow the principle that element + attributes are accessible through the `.attr` field. Rows in `TableHead` + and `TableFoot` are available via the `.rows` field. Row objects have a + `.cells` field, containing the list of table cells. + + [Simplify](Simplify) code of `pandoc.utils.stringify`. Minor behavior change: + plain strings nested in tables are now included in the result string. + + Simplify and deprecate function `pandoc.utils.equals`. The function + is no longer required for element comparisons; it is now an alias + for the `==` operator. + + Add function `pandoc.utils.references` (#7752). + + Add new library function `pandoc.utils.type`. The function behaves + like the default `type` function from Lua's standard library, + but is aware of pandoc userdata types. A typical use-case would be + to determine the type of a metadata value. + + Fix return types of `blocks_to_inlines`, `make_sections`. + Ensures the returned lists have the correct type (`Inlines` and + `Blocks`, respectively). + + Use more natural representation for Reference values + Omit `false` boolean values, push integers as numbers. + + * Lua: use package pandoc-lua-marshal (#7719, Albert Krewinkel). + The marshaling functions for pandoc's AST are extracted into a separate + package. The package comes with a number of changes: + + + Pandoc's List module was rewritten in C, and error messages were + improved. + + Lists of `Block` and `Inline` elements are marshaled using the new + list types `Blocks` and `Inlines`, respectively. These types + currently behave identical to the generic List type, but give better + error messages. This also opens up the possibility of adding + element-specific methods to these lists in the future. + + Elements of type `MetaValue` are no longer pushed as values which + have `.t` and `.tag` properties. This was already true for + `MetaString` and `MetaBool` values, which are still marshaled as Lua + strings and booleans, respectively. Affected values: + - `MetaBlocks` values are marshaled as a `Blocks` list; + - `MetaInlines` values are marshaled as a `Inlines` list; + - `MetaList` values are marshaled as a generic pandoc `List`s. + - `MetaMap` values are marshaled as plain tables and no longer + given any metatable. + + `Cell` values are now marshaled as userdata objects; a constructor + function for table cells is provided as `pandoc.Cell`. + + The test suite for marshaled objects and their constructors has + been extended and improved. + + A bug in `Citation` objects, where setting a citation's suffix + modified it's prefix, has been fixed. + + Inlines, Blocks, and List objects now have an `__eq` metamethod, + testing equality by comparing two lists element-wise. + + * Powerpoint tests: shorten lines by grouping tests (Albert + Krewinkel). This makes the test output more pleasant to read + in narrow terminal windows. + + * make check: check for unreleased dependencies. + + * Add `tools/build-and-upload-api-docs.sh`. + + * Update cabal description. + + * `MANUAL.txt`: Add section on EPUB styling. + + * `MANUAL.txt`: clarify "standard Markdown" as "original Markdown" + (#7802, Martin Fischer). + + * `doc/custom-writers.md`: use filter to include source of example. + + * Add an example to `doc/custom-readers.md`. + + * Fix typo in `custom-readers.md` (#7722, Mauro Bieg). + + * `doc/jats.md`: add link to JATS documentation (Martin Fischer). + + * `doc/lua-filters.md`: many improvements (Albert Krewinkel, + John MacFarlane). + + * Use commonmark-extensions 0.2.3. This allows a bare-word class attribute + on fenced divs. + + * Use ipynb 0.2. + + * Use citeproc 0.6.0.1. + + * Use texmath 0.12.4. + + * Use doctemplates 0.10.0.1. + +## pandoc 2.16.2 (2021-11-21) + + * Add interface for custom readers written in Lua (#7669). + Users can now do `-f myreader.lua` and pandoc will treat the + script `myreader.lua` as a custom reader, which parses an input + string to a pandoc AST, using the pandoc module defined for + Lua filters. A sample custom reader can be found in `data/creole.lua`. + Also see documentation in `doc/custom-readers.md`. + + * New module Text.Pandoc.Readers.Custom, exporting `readCustom` [API change]. + + * Allow `plain` to be used in raw attribute syntax. + + * Accept empty `--metadata-file` (#7675). + This was a regression from 2.15 behavior. + + * Markdown reader: Improve `inlinesInBalancedBrackets`. + This is just a small improvement in terms of performance, but it's simpler + and more direct code. Also, we avoid parsing interparagraph spaces in + balanced brackets, as the original did. + + * BibTeX reader: Properly handle commented lines in BibTeX/BibLaTeX (#7668). + + * RST reader: handle class attribute for for custom roles (#7699, + willj-dev). Previously the class attribute was ignored, and the name + of the role used as the class. + + * DocBook reader: + + + Add `<titleabbr>` support (Rowan Rodrik van der Molen). + + Support for `<indexterm>` (#7607, Rowan Rodrik van der Molen). + + * LaTeX reader: + + + Add rudimentary support for `\autoref` (#7693). + + Add 'uri' class when parsing `\url`, for consistency + with treatment of autolinks in other formats (#7672). + + * JATS reader: Capture `alt-text` in figures (#7703, Aner Lucero). + + * MediaWiki writer: use HTML spans for anchors when header has id (#7697). + We need to generate a span when the header's ID doesn't match + the one MediaWiki would generate automatically. Note that MediaWiki's + generation scheme is different from pandoc's (it uses uppercase letters, + and `_` instead of `-`, for example). This means that in going from + markdown to mediawiki, we'll now get spans before almost every heading, + unless explicit identifiers are used that correspond to the ones MediaWiki + auto-generates. This is uglier output but it's necessary for internal + links to work properly. + + * Markdown writer: don't create autolinks when this loses information + (#7692). Previously we sometimes lost attributes when rendering links + as autolinks. + + * Text.Pandoc.Readers.Metadata: allow multiple YAML documents when parsing + YAML for `yamlBsToRefs`. Some people use `---` as the end delimiter in + YAML bibliography files, which causes the `yaml` library to emit an + error unless we explicitly allow multiple YAML documents (and just + consider the first). + + * JATS writer: + + + Ensure figures are wrapped with `<p>` in list items + (Albert Krewinkel). This prevents the generation of invalid output. + + Add URL to element citation entries (Albert Krewinkel). + The URL of a reference, if present, is added in tag `<uri>` to + element-citation entries. + + * HTML writer: Don't create invalid `data-` attribute for empty + attribute key (#7546). + + * LaTeX writer: + + + Babel mappings: use `ancientgreek` for `grc`. + + With `-t latex-smart`, don't generate `\ldots` from ellipsis (#7674). + Instead just use unicode ellipsis. + + * JATS template: fix `equal-contrib` attribute (Albert Krewinkel). + The standard requires the value to be either `yes` or `no`, but is was + set to `true` for authors who contributed equally. + + * reveal.js template: Add `disableLayout` variable (Christophe Dervieux). + + * Text.Pandoc.Error: sort errors in `handleError` by exit code + (Albert Krewinkel). + + * Text.Pandoc.Writers.Shared: Improve toLegacyTable (#7683, + Christian Despres). + + * Lua subsystem: + + + Include lpeg module (#7649, Albert Krewinkel). Compiles the `lpeg` + library (Parsing Expression Grammars For Lua) into + the program. Package maintainers may choose to rely on package + dependencies to make lpeg available, in which case they can compile + the with the constraint `lpeg +rely-on-shared-lpeg-library`. + `lpeg` and `re` are always made available in global variables, + without the need for a `require`. + + + Set `lpeg` and `re` as globals; allow shared lib access via `require`. + The `lpeg` and `re` modules are loaded into globals of the respective + name, but they are not necessarily registered as loaded packages. This + ensures that + + - the built-in library versions are preferred when setting the globals, + - a shared library is used if pandoc has been compiled without `lpeg`, + and + - the `require` mechanism can be used to load the shared library if + available, falling back to the internal version if possible and + necessary. + + + Fix argument order in constructor `pandoc.Cite` (Albert Krewinkel). + This restores the old behavior; argument order had been switched + accidentally in pandoc 2.15. + + + Add Pushable instance for `ReaderOptions` (Albert Krewinkel). + + + Allow to pass custom reader options to `pandoc.read` as an + optional third argument (#7656, Albert Krewinkel). + The object can either be a table or a ReaderOptions value + like `PANDOC_READER_OPTIONS`. Creating new ReaderOptions objects is + possible through the new constructor `pandoc.ReaderOptions`. + + + Display Pandoc values using their native Haskell representation + (Albert Krewinkel). + + + Require latest hslua (2.0.1) (#7661, #7657, Albert Krewinkel). + This fixes issues with + + - misleading error messages when a required function parameter is + omitted; + - absent properties still being listed in the output of `pairs`; and + - alias accessing leading to errors instead of returning `nil`, e.g. + with `(pandoc.Str '').identifier`. + + + Add missing space in "package not found" message (#7658, Albert + Krewinkel). + + * Update build files (#7696, Fabián Heredia Montiel). + Drop old windows 32-bit constraints. + Update cabal `tested-with` field to correspond to `ci.yml` matrix + + * Remove unneeded package dependencies from benchmark target. + + * Require ghc >= 8.6, base >= 4.12. + This allows us to get rid of the old custom prelude and + some crufty cpp. But the primary reason for this is that + conduit has bumped its base lower bound to 4.12, making it + impossible for us to support lower base versions. + + * Require Cabal 2.4. Use wildcards to ensure that all pptx tests are + included (#7677). + + * Update `bash_completion.tpl` (S.P.H.). + + * Add `data/creole.lua` as sample custom reader. + + * Add `doc/custom-readers.md` and `doc/custom-writers.md`. + + * `doc/lua-filters.md`: add section on global modules, including lpeg + (Albert Krewinkel). + + * `MANUAL.txt`: update table of exit codes and corresponding errors + (Albert Krewinkel). + + * Use latest texmath. + +## pandoc 2.16.1 (2021-11-02) + + + * Docx reader: don't let first line indents trigger block quotes (#7655). + This fixes a regression introduced in pandoc 2.15. + + * Docx writer: use `getTimestamp` for modification times in + reference.docx (#7654). This ensures that when `SOURCE_DATE_EPOCH` is + set, the modification times of files taken from the reference.docx will + be set deterministically, allowing for reproducible builds. + + * Lua subsystem (Albert Krewinkel): + + + Load module `pandoc.path` on startup (#7524). Previously the module + always had to be loaded via `require 'pandoc.path'`. + + Fix typo in SoftBreak constructor. + + Re-add `content` property to Strikeout elements. + Fixes a regression introduced in 2.15. + + Be more forgiving when retrieving the Image `caption` property. + Fixes a regression introduced in 2.15. + + Display Attr values using their native Haskell representation. + + Allow omitting the 2nd parameter in pandoc.Code constructor. + Fixes a regression introduced in 2.15 which required users to always + specify an Attr value when constructing a Code element. + + Allow to compare, show Citation values. Comparisons of Citation + values are performed in Haskell; values are equal if they represent + the same Haskell value. Converting a Citation value to a string + now yields its native Haskell string representation. + + Restore List behavior of MetaList (#7650). Fixes a regression + introduced in 2.16 which had MetaList elements lose + the `pandoc.List` properties. + + Restore `content` property on Header elements. + + Ensure Block elements have all expected properties. + + Ensure Inline elements have all expected properties. + + * Allow tasty-bench 0.3.x. + +## pandoc 2.16 (2021-10-31) + + * Switch back from HsYAML to yaml for parsing YAML metadata (#6084). + HsYAML is around 20 times slower in parsing large YAML bibliographies. + In addition, HsYAML is not being actively maintained. This sets us back + in our attempts to free ourselves from C dependencies (#4535). But I + don't see a good alternative until a faster pure Haskell parser is available. + Notes: + + + We've removed the FromYAML instances for all types that had them, since + this is a HsYAML-specific typeclass [API change]. (The yaml package just + uses From/ToJSON instead of having a dedicated From/ToYAML class.) + + Unlike HsYAML (in the configuration we were using), yaml parses 'Y', 'N', + 'Yes', 'No', 'On', 'Off' as boolean values. Users may need to quote these + when they are meant to be interpreted as strings. Similarly, 'null' is + parsed as a YAML null value (and will be treated as an empty string by + pandoc rather than the string 'null'). Quoting it will force it to be + interpreted as a string. + + Some tests had to be adjusted accordingly. + + Pandoc now behaves in a more useful way when the YAML metadata contains + escaping errors: instead of just failng silently and falling back to + some other interpretation of the section, it raises a YAML parsing error. + + * Markdown writer: Ensure that special values are quoted in YAML metadata. + These include "Y", "yes", "on", and "off", which are now (with yaml library) + considered boolean values, as well as "null". + + * Change JSON encodings of some types. + + + For LineEnding use lowercase constructors, e.g. `crlf`, `native`. + + For HTMLSlideVariant use lowercase constructors. + + For ReaderOptions use e.g. `default-image-extension` + instead of `readerDefaultImageExtension` for field names. + + For Extension, use e.g. `tex_math_dollars` instead of + `Ext_tex_math_dollars` as constructor. + + For Extensions, use an array of Extensions, instead of + an object wrapping the tag `Extensions` and an integer. + (The integer representation is not supposed to be part of the + public API.) + + For Opt, use field names like `tab-stop` instead of `optTabStop`. + + * Docx writer: + + + Add IDs to native_numbering test (Tristan Stenner). + + Move ": " out of the caption bookmark (Tristan Stenner). + This is needed so that native references to the figure are included as + "As seen in Figure X, it is..." instead of "As seen in [Figure: X, it is..." + + * Lua (Albert Krewinkel, except as noted): + + + Use hslua module abstraction where possible. + + Fix placement of tests for Block elements in pandoc module tests + + Increase strictness when getting attribute keys + + Re-add `t` and `tag` property to Attr values. + Removal of these properties from Attr values was a regression. + + Fix `pandoc.utils.stringify` regression. The `pandoc.utils.stringify` + function returned empty strings when called with a string argument. + + Fix a copy/paste bug in Lua marshalling code (John MacFarlane, #7639). + This caused links to be changed to figures when Lua filters changed + link properties. + + Re-add `content` property to Link elements (#7647). + This was a regression introduced in version 2.15. + + Generate constants in module pandoc programmatically. + + Marshal SimpleTable, ListAttributes, Citation, and Block values as + userdata objects. Properties of Block values are marshalled lazily, + which generally improves performance considerably. Script users may also + notice the following differences: + + - Block element properties can no longer be accessed by numerical + indexing of the `.c` field. The `.c` property now serves as an alias + for `.content`, so some filter that used this undocumented method + for property access may continue to work, while others will need to + be updated and use proper property names. + - The marshalled Block elements now have a `show` method, and a + `__tostring` metamethod. Both return the Haskell string + representation of the element. + - Block values now have the Lua type `userdata` instead of `table`. + + * Add a short guide to pandoc's sources (Albert Krewinkel). + + * Fix epub files in epub reader tests, so that they are valid + according to epubcheck (#7586). + + * Allow time 1.13. + + * Require latest skylighting (0.12.1). + + * Fix build on GHC 9.2 (Joseph C. Sible). + + * Fix trypandoc so it builds with aeson > 2. + + +## pandoc 2.15 (2021-10-23) + + * Add `--sandbox` option (#5045). + + + Add sandbox feature. When this option is used, readers and writers + only have access to input files (and other files specified directly on + command line). This restriction is enforced in the type system. + + Filters, PDF production, custom writers are unaffected. This + feature only insulates the actual readers and writers, not + the pipeline around them in Text.Pandoc.App. + + Note that when `--sandboxed` is specified, readers won't have + access to the resource path, nor will anything have access to + the user data directory. + + * `--self-contained`: Fix bug that caused everything to be made a data + URI (#7635, #7367). We only need to use data URIs in certain cases, but + due to a bug they were being used always. + + * Pandoc will now fall back to latin1 encoding for inputs that can't be + read as UTF-8. This is what it did previously for content fetched + from the web and not marked as to content type. It makes sense to do + the same for local files. In this case a `NotUTF8Encoded` warning + will be issued, indicating that pandoc is interpreting the input as latin1. + + * Markdown reader: + + + Don't parse links or bracketed spans as citations (#7632). + Previously pandoc would parse `[link to (@a)](url)` as a + citation; similarly `[(@a)]{#ident}`. This is undesirable. One should + be able to use example references in citations, and even if `@a` is + not defined as an example reference, `[@a](url)` should be a link + containing an author-in-text citation rather than a normal citation + followed by literal `(url)`. + + Fix interaction of `--strip-comments` and list parsing (#7521). + Use of `--strip-comments` was causing tight lists to be rendered as + loose (as if the comment were a blank line). + + Fix parsing bug for math in bracketed spans and links (#7623). + This affects math with unbalanced brackets (e.g. `$(0,1]$`) + inside links, images, bracketed spans. + + Fix code blocks using `--preserve-tabs` (#7573). Previously they + did not behave as the equivalent input with spaces would. + + * DocBook reader: + + + Honor linenumbering attribute (Samuel Tardieu). + The attribute DocBook `linenumbering="numbered"` on code blocks + maps to the `numberLines` class internally. + + * LaTeX reader: + + + Implement siunitx v3 commands (#7614). + We support `\unit`, `\qty`, `\qtyrange`, and `\qtylist` + as synonyms of `\si`, `\SI`, `\SIrange`, and `\SIlist`. + + Properly handle `\^` followed by group closing (#7615). + + Recognize that `\vadjust` sometimes takes "pre" (#7531). + + Ignore (and gobble parameters of) CSLReferences environment (#7531). + Otherwise we get the parameters as numbers in the output. + + Restrict `\endinput` to current file (Simun Schuster). + + * RST reader: handle escaped colons in reference definitions (#7568). + + * HTML reader: + + + Handle empty tbody element in table (#7589). + + * Ipynb reader (Kolen Cheung): + + + Get cell output mime from `raw_mimetype` in addition to `format`. + (`format` is what the spec calls for, but `raw_mimetype` is + often used in practice; see jupyter/nbformat#229). + + Add more formats that can be handled as "raw" cells. + + Fix mime type for `rst`. + + Support `text/markdown`, which is now a supported mime type for raw + output (#7561). + + * RTF reader: + + + Support `\binN` for binary image data. + + If doc begins with {\rtf1 ... } only parse its contents. + Some documents seem to have non-RTF (e.g. XML) material after the + `{\rtf1 ... }` group. + + Ignore `\pgdsc` group. Otherwise we get style names treated as test. + + Better handling of `\*` and bookmarks. We now ensure that groups + starting with `\*` never cause text to be added to the document. + In addition, bookmarks now create a span between the start + and end of the bookmark, rather than an empty span. + + * Docx reader: + + + Avoid blockquote when parent style has more indent (Milan Bracke). + When a paragraph has an indentation different from the parent (named) + style, it used to be considered a blockquote. But this only makes sense + when the paragraph has more indentation. So this commit adds a check + for the indentation of the parent style. + + Fix handling of empty fields (Milan Bracke). Some fields only + have an `instrText` and no content, Pandoc didn't understand these, + causing other fields to be misunderstood because it seemed like + a field was still open when it wasn't. + + Implement PAGEREF fields (Milan Bracke). These fields, often used + in tables of contents, can be a hyperlink. + + Fix handling of nested fields (Milan Bracke). Fields delimited by + `fldChar` elements can contain other fields. Before, the nested + fields would be ignored, except for the end, which would be + considered the end of the parent field. + + Add placeholder for word diagram instead of just omitting it (Ezwal). + + * Org reader: + + + Don't parse a list as first item in a list item (#7557). + + Allow an initial `:PROPERTIES:` drawer to add to metadata (#7520). + + * Docx writer: + + + Make id used in `native_numbering` predictable (#7551). + If the image has the id IMAGEID, then we use the id ref_IMAGEID + for the figure number. This allows one to create a filter that + adds a figure number with figure name, e.g. + `<w:fldSimple w:instr=" REF ref_superfig "><w:r><w:t>Figure X</w:t> + </w:r></w:fldSimple>`. + If an image lack an id, an id of the form `ref_fig1` is used. + + Ensure we have unique ids for `wp:docPr` and `pic:cNvPr` elements + (#7527, #7503). + + Handle SVG images (#4058). This change has several parts: + - In Text.Pandoc.App, if the writer is docx, we fill the media + bag and attempt to convert any SVG images to PNG, adding these + to the media bag. The PNG backups have the same filenames as + the SVG images, but with an added .png extension. If the conversion + cannot be done (e.g. because rsvg-convert is not present), + a warning is omitted. + - In Text.Pandoc.Writers.Docx, we now use Word 2016's syntax for + including SVG images. If a PNG fallback is present in the media bag, + we include a link to that too. + + * Powerpoint writer (Emily Bourke): + + + Add support for more layouts (#5097). Up til now, four layouts + were supported: "Title Slide" (used for the automatically generated + metadata slide), "Section Header" (used for headings above slide + level), "Two Column" (used when there's a columns div), "Title and + Content" (used for all other slides). We now support three + additional layouts: "Comparison", "Content with Caption", and + "Blank". The manual describes the logic that determines which + layout is used for a slide. Layouts may be customized in the + reference doc. + + Support specifying slide background images using a `background-image` + attribute on the slide's heading. Only the "stretch" mode is supported, + and the background image is centred around the slide in the image's + larger axis, matching the observed default behaviour of PowerPoint. + + Add support for incremental lists (through same methods as in + other slide writers) (#5689). + + Copy embedded fonts from reference doc. + + Include all themes in output archive. + + Fix list level numbering (#4828, #4663). In PowerPoint, + the content of a top-level list is at the same level as the content + of a top-level paragraph: the only difference is that a list style + has been applied. Previously, the writer incremented the paragrap + h level on each list, turning what should be top-level lists into + second-level lists. + + Line up list continuation paragraphs. This commit + changes the `marL` and `indent` values used for plain paragraphs + and numbered lists, and changes the spacing defined in the + reference doc master for bulleted lists. For paragraphs, there is + now a left-indent taken from the `otherStyle` in the master. + For numbered lists, the number is positioned where the text would be + if this were a plain paragraph, and the text is indented to the next + level. This means that continuation paragraphs line up nicely with + numbered lists. Existing reference docs may need to be modified so + that `otherStyle` and `bodyStyle` indent levels match, for this + feature to work with them. + + Consolidate text runs when possible (jgm). This slims down the output + files by avoiding unnecessary text run elements. + + Support footers in the reference doc. + There is one behaviour which may not be immediately obvious: if the + reference doc specifies a fixed date (i.e. not automatically updating), + and there’s a date specified in the metadata for the document, the + footer date is replaced by the metadata date. + + Fix presentation rel numbering. Before now, the numbering of `rId`s + was inconsistent when making the presentation XML and when making + the presentation relationships XML. + + Don’t add relationships unnecessarily. Before now, for any layouts + added to the output from the default reference doc, the relationships + were unconditionally added to the output. However, if there was already + a layout in slideMaster1 at the same index then that results in + duplicate relationships. + + If slide level is 0, don't insert a slide break between a heading + and a following table, "columns" div, or paragraph starting + with an image. + + Fix capitalisation of `notesMasterId`. + + Restructure tests. + + * Asciidoc writer: + + + Translate numberLines attribute to `linesnum` switch (Samuel Tardieu). + + Improve escaping for `--` in URLs (#7529). + + * LaTeX writer: + + + Make babel use more idiomatic (#7604, hseg). Use babel's + bidi implementation. Import babel languages individually instead + of as package options. Move `header-includes` to after + `babel` setup so it can be modified. + + Use babel, not polyglossia, with xelatex. Previously polyglossia + worked better with xelatex, but that is no longer the case, so + we simplify the code so that babel is used with all latex + engines. This involves a change to the default LaTeX template. + + * Markdown writer: + + + Avoid bad wraps at the Doc Text level. Previously we tried to + do this at the Inline list level, but it makes more sense to + intervene on breaking spaces at the Doc Text level. + + Use `underline` class rather than `ul` for underline. + This only affects output with `bracketed_spans` enabled. + The markdown reader parses spans with either `.ul` or `.underline` as + Underline elements, but we're moving towards preferring the latter. + + * RST writer: + + + Properly handle anchors to ids with spaces or leading underscore + (#7593). In this cases we need the quoted form, e.g. + ``` + .. _`foo bar`: + + .. _`_foo`: + ``` + Side note: rST will "normalize" these identifiers anyway, + ignoring the underscore. + + * HTML writer: + + + Render `\ref` and `\eqref` as inline math, not display (see #7589). + + Pass through `\ref` and `\eqref` if MathJax is used (#7587). + + Pass through inline math environments with KaTeX. + + Support `--reference-location` for HTML output (#7461, + Francesco Mazzoli). + + Set "hash" to True by default (for reveal.js) (#7574). See #6968 + where the motivation for setting "hash" to True is explained. + + * Native writer: Use pretty-show to format native output (#7580). + Previously we used our own homespun formatting. But this produces + over-long lines that aren't ideal for diffs in tests. + Performance is slower by about a factor of 10, but this isn't + really a problem because native isn't suitable as a serialization + format. (For serialization you should use json, because the reader + is so much faster than native.) + + * Org writer: + + + Don't indent contents of code blocks. We previously indented them + by two spaces, following a common convention. Since the convention + is fading, and the indentation is inconvenient for copy/paste, we are + discontinuing this practice. + + Update list of supported source languages in org writer (#5440). + + * Ipynb writer (Kolen Cheung): + + + Improve round trip identity for raw cell output. + See jupyter/nbformat#229. The Jupyter ecosystem, including nbconvert, + lab and notebook, deviated from their own spec in nbformat, where + they used the key `raw_mimetype` instead of `format`. Moreover, + the mime-type of rst used in Jupyter deviated from that suggested by + https://docutils.sourceforge.io/FAQ.html and is defined as + `text/restructuredtext` when chosen from "Raw NBConvert Format" in + Jupyter. The new behavior should matche the real world usage better, + hence improving the round-trip "identity" in raw-cell. + + Add more formats that can be handled as "raw" cells. + + * EPUB writer: + + + Add EPUB3 subject metadata (authority/term) (nuew). + This adds the ability to specify EPUB 3 `authority` and `term` specific + refinements to the `subject` tag. Specifying a plain `subject` tag in + metadata will function as before. + + Treat epub:type "frontispiece" as front matter (#7600). + + * reveal.js template: Fix line numbers in source code (#7634). + We need `overflow: visible` for these to work, and reveal's + default css disables this. So we re-enable it in the default template. + + * Text.Pandoc.Writers.Shared: + + + Export `splitSentences` as a Doc Text transform [API change]. + Use this in man/ms. We used to attempt automatic sentence + splitting in man and ms output, since sentence-ending + periods need to be followed by two spaces or a newline in + these formats. But it's difficult to do this reliably at + the level of `[Inline]`. + + * Text.Pandoc.Translations: small revisions for compatibility + with aeson 2. + + * Don't prepend `file://` to `--syntax-definition` on Windows (#6374). + This was a fix for a problem in skylighting, but this + problem doesn't exist now that we've moved from HXT to xml-conduit. + + * Text.Pandoc.Extensions: + + + Add `Ext_footnotes` to default `gfm` etxensions. Now `gfm` + supports footnotes. + + Alphabetize Extension constructors (also affects `--list-extensions`). + + * Text.Pandoc.Citeproc.Util: Better implementation of `splitStrWhen`. + Previously the citeproc code had two less efficient + implementations. + + * Update documentation for definition_list extension (#7594). + In 2015, we relaxed indentation requirements for the first + line of a definition (see commit d3544dc and issue #2087), but + the documnentation wasn't updated to reflect the change. + + * Text.Pandoc.Citeproc.BibTeX: Fix expansion of special strings in series + e.g. `newseries` or `library` (#7591). Expansion should not happen + when these strings are protected in braces, or when they're + capitalized. + + * Text.Pandoc.Logging: add `NotUTF8Encoded` constructor to `LogMessage` + [API change]. + + * Text.Pandoc.App.FormatHeuristics: remove `.tei.xml` extension for TEI + (#7630). This never worked, because `takeExtension` + only returns `.xml`. So it won't be missed if we remove it. + + * Text.Pandoc.Image: + + + Generalize `svgToPng` to MonadIO. + + `svgToPng`, change first parameter from WriterOptions to Int. + + * Text.Pandoc.Class: + + + Add `readStdinStrict` method to PandocMonad [API change]. + + Generalize type of `extractMedia` [API change]. + It was uselessly restricted to PandocIO, instead of any + instance of PandocMonad and MonadIO. + + * Text.Pandoc.Class.PandocIO: derive MonadCatch, MonadThrow, MonadMask. + This allows us to use `withTempDir` [API change]. + + * Add module Text.Pandoc.Class.Sandbox, defining + `sandbox`. Exported via Text.Pandoc.Class. [API change] + + * Text.Pandoc.Filter: Generalize type of `applyFilters` + from PandocIO to any instance of MonadIO and PandocMonad [API change]. + + * Text.Pandoc.PDF: generalize type of `makePDF`: + instead of PandocIO, it can be used in any instance of + PandocMonad, MonadIO, and MonadMask [API change]. + + * Lua subsystem and custom writers: generalize types from PandocIO + to any instance of PandocMonad and MonadIO [API change]. + The type of `runLua` is now + + (PandocMonad m, MonadIO m) => + LuaE PandocError a -> m (Either PandocError a) + + The change from `Lua` to `LuaE PandocError` is due to the switch to + hslua-2.0; see next item. + + * Lua modules (Albert Krewinkel): + + + Switch to hslua-2.0. The new HsLua version takes a somewhat different + approach to marshalling and unmarshalling, relying less on typeclasses + and more on specialized types. This allows for better performance and + improved error messages. Furthermore, new abstractions allow to + document the code and exposed functions. + + Marshal Version values, Inline elements, Attr elements, + and Pandoc elements as userdata. + + Remove deprecated inline constructors `DoubleQuoted`, + `SingleQuoted`, `DisplayMath`, and `InlineMath`. + + Attr values are no longer normalized when assigned to an Inline + element property. + + It's no longer possible to access parts of Inline elements via + numerical indexes. E.g., `pandoc.Span('test')[2]` used to give + `pandoc.Str 'test'`, but yields `nil` now. This was undocumented + behavior not intended to be used in user scripts. Use named properties + instead. + + Accessing `.c` to get a JSON-like tuple of all components no longer + works. This was undocumented behavior. + + Only known properties can be set on an element value. Trying to set a + different property will now raise an error. + + Adds a new `pandoc.AttributeList()` constructor, which creates the + associative attribute list that is used as the third component of + `Attr` values. Values of this type can often be passed to constructors + instead of `Attr` values. + + Convert IOErrors to PandocErrors in `pandoc.pipe` function (#7523). + + * Text.Pandoc.PDF: Previously we had to run `runIOorExplode` inside + `withTempDir`. Now that PandocIO is an instance of MonadMask, this is + no longer necessary. + + * Text.Pandoc.App: + + + Reorganize to make it easier to limit IO in main loop. + Previously we used liftIO fairly liberally. The code has + been restructured to avoid this. + + Move output-file writing out of PandocMonad action. + + * Text.Pandoc.App.OutputSettings: Generalize some types + so we can run this with any instance of PandocMonad and MonadIO, + not just PandocIO. + + * Use `simpleFigure` builder in readers and `SimpleFigure` + pattern synonym in writers (Aner Lucero). + + * Allow time 1.12. + + * Use skylighting-0.12, skylighting-core-0.12. + This fixes highlighting issues with typescript, scala, and other + syntaxes that include keyword lists from different syntaxes. + + * Use citeproc 0.6, commonmark 0.2.2.1, commonmark-extensions 0.2.2, + texmath 0.12.3.2, ipynb 0.1.0.2. (These changes also allow + building with aeson >= 2.) + + * Require doclayout >= 0.3.1.1. This fixes recognition of "real widths" + of emoji characters, which is important for tabular layout. + + * Cut out over 100K of fat in epub test golden files. + + * Make `test/epub/wasteland.epub` valid. + + * Add missing `%` on some command tests. + This prevented `--accept` from working properly. + + * Command tests: raise error if command doesn't begin with `%`. + + * OOXML tests: use pretty-printed form to display diffs. + Otherwise everything is on one line and the diff is uninformative. + + * Fix compareXML helper in Tests.Writers.OOXML. + Given how it is used, we were getting "mine" and "good" + flipped in the test results. + + * MANUAL.txt: + + + Clarify `attributes` extension support (William Lupton). + + Document formats affected by `--reference-location`. + + Document error code 25 + + Add some more info regarding `--slide-level=0` (Salim B). + + Add more to security section of manual. + + Mention support of `title-toc` (#7171, Christophe Dervieux). + + * doc/lua-filters.md: + + + Add missing type for Image title (Quinn). + + Improve order of Image fields (Quinn). + + Rephrase pandoc.path docs (#7548, Quinn). + + Do not leak working directory in TikZ filter (Jeroen de Haas). + +## pandoc 2.14.2 (2021-08-21) + + * Allow `--slide-level=0` (#7476). When the slide level is set + to 0, headings won't be used at all in splitting the document + into slides. Horizontal rules must be used to separate slides. + + * Add RTF reader (#3982). `rtf` is now supported as an input + format as well as an output format. New module + Text.Pandoc.Readers.RTF (exporting `readRTF`). [API change] + + * HTML reader: treat comments as blank when parsing (#7482). + + * Markdown reader: + + + Fix raw LaTeX injection issue (#7497). Using a code block + containing `\end{verbatim}`, one could inject raw TeX into a + LaTeX document even when `raw_tex` is disabled. Thanks to + Augustin Laville for noticing the bug. + + Multimarkdown sub- and superscripts (#5512, OCzarnecki). + Added an extension `short_subsuperscripts` which modifies + the behavior of `subscript` and `superscript`, allowing + subscripts or superscripts containing only alphanumerics + to end with a space character (eg. `x^2 = 4` or `H~2 is + combustible`). This improves support for multimarkdown. + + * RST reader: Fix `:literal:` includes (#7513). These should create + code blocks, not insert raw RST. + + * LaTeX reader: + + + Proper implicit grouping around environment macros. + + Support `\global` before `\def`, `\let`, etc. (#7494). + + Fix scope for LaTeX macros (#7494). They should by default + scope over the group in which they are defined (except `\gdef` + and `\xdef`, which are global). In addition, environments must + be treated as groups. + + Improve handling of plain TeX macro primitives (#7474). + Fixed semantics for `\let`. + + Implement `\edef`, `\gdef`, and `\xdef`. + + * Docx reader: Improve docx reader's robustness in extracting + images (#7511). The docx reader made some assumptions about + how docx containers were laid out that were not always true, with + the result that some images in documents did not get + extracted. + + * LaTeX writer: Increase table column width precision (#7466, + Peter Fabinski). In some cases, the rounding performed by the + LaTeX table writer would introduce visible overrun outside + the text area. This adds two more decimal places to the width + values. + + * Powerpoint writer: + + + Include image title in description (#7352, Emily Bourke). The + image title (i.e. `![alt text](link "title")`) was previously + ignored when writing to pptx. This commit includes it in + PowerPoint's description of the image, along with the link. + + Select layouts from reference doc by name (Emily Bourke). Until + now, users had to make sure that their reference doc contains + layouts in a specific order: the first four layouts in the file + had to have a specific structure. Now the layout selection uses + the layout names rather than order: users must make sure their + reference doc contains four layouts with specific names, and if + a layout with the right name isn’t found pandoc will emit + a warning and use the corresponding layout from the default + reference doc as a fallback. + + * Docx writer: be sensitive to the `native_numbering` extension + (#7499). Figure and table numbers are now only included if + `native_numbering` is enabled. (By default it is disabled.) + This is a behavior change with respect to 2.14.1, but the + default behavior is now that of previous versions. The + change was necessary to avoid incompatibilities between + pandoc's native numbering and third-party cross reference + filters like pandoc-crossref. + + * RTF writer: + + + Omit `\bin` in `\pict`. According to the spec, this is not + needed or wanted when the data is in hexadecimal format, as + here. + + Emit `\outlinelevel`` for section headings. + + * RTF template: specify font family for fixed-width font f1. + According to the spec, this is mandatory. + + * LaTeX writer: Use ulem for underline (#7351). ulem is + conditionally included already when the `strikeout` variable + is set, so we set this when there is underlined text, and use + `\uline` instead of `\underline`. This fixes wrapping for + underlined text. + + * Text.Pandoc.Citeproc: + + + Revise citeproc code to fit new citeproc 0.5 API (thanks to + Benjamin Bray). Linkification of URLs in the bibliography + is now done in the citeproc library, depending on the + setting of an option. We set that option depending on the + value of the metadata field `link-bibliography` (defaulting + to true, for consistency with earlier behavior). If a DOI, + PMID, PMCID, or URL field is present but not explicitly + rendered, the title (or if no title, the whole entry) is + hyperlinked. These changes implement the recommendations + from the draft CSL v1.0.2 spec (Appendix VI): + <https://github.com/citation-style-language/documentation/blob/master/specification.rst#appendix-vi-links> + + Avoid odd handling of quotes. Recent citeproc changes + allow us to ignore Quoted elements; citeproc now uses its own + method for represented quoted things, and only localizes and + flipflops quotes it adds itself. Convert Quoted in bib + entries to special Spans before passing them off to + citeproc. This ensures that we get proper localization and + flipflopping if, e.g., quotes are used in titles + (jgm/citeproc#87). + + Removed quote localization from citeproc processing. + This is now done in citeproc itself. + + * Text.Pandoc.Logging: Add PowerpointTemplateWarning log message + type [API change] (Emily Bourke). + + * Text.Pandoc.Extension: Add `Ext_short_subsuperscripts` + constructor to `Extension` [API change] (OCzarnecki). + + * Various sample.lua editorial fixes (#7493, #7487, William + Lupton). + + * Bump base-compat version so we get compatibility with base 4.12. + + * Use Prelude from base-compat for ghc 8.4 too. + + * Add haskell-language-server to shell.nix (#7496, Emily Bourke). + + * Tests.Helpers: export testGolden and use it in RTF reader. + This gives a diff output on failure. + + * Remove obsolete and incorrect sentence in `--slide-level` docs. + + * Add internal module Text.Pandoc.Network.HTTP, exporting + `urlEncode`. + + * Text.Pandoc.Parsing: `parseFromString`: preserve at least + the source directory (#7464). Previously we just set the + source name to "chunk" when parsing from strings, to avoid + misleading source positions. This had the side effect that + `rebase_relative_paths` would break inside sections that + were parsed as strings. So, now we use + "ORIGINAL_SOURCE_PATH_chunk" instead of just "chunk". + + * Text.Pandoc.MIME: use image/x-xcf instead of application/x-xcf + (#7454). + + * Don’t compare `cdLine` in OOXML golden tests (Emily Bourke). + The `cdLine` field gives the line of the file some CData was + found on, which reflects irrelevant formatting differences. + + * Provide more detailed XML diff in tests (Emily Bourke). + + * OOXML tests: silence warnings. These can make the test output + confusing, making people think tests are failing when they're + passing. + + * INSTALL.md: Add GitLab CI/CD example (#7448, Veratyr). + + * MANUAL.txt + + - Clarifications (William Lupton). + - Add a note on security risks of include directives. + + * Document use of the 'underline' class (#7492, #7484, William + Lupton). + + * Add a FAQ about the "Cannot allocate memory" error on M1 macs. + + * Use texmath 0.12.3.1. + + * Use released citeproc 0.5. + + * Remove dependency on HTTP package (#7456, mt_caret). + +## pandoc 2.14.1 (2021-07-18) + + * Text.Pandoc.ImageSize: Add Tiff constructor for ImageType (#7405) + [Minor API change]. This allows pandoc to get size information from + tiff images. + + * Markdown reader: don't try to read contents in self-closing HTML tag. + Previously we had problems parsing raw HTML with self-closing + tags like `<col/>`. The problem was that pandoc would look + for a closing tag to close the markdown contents, but the + closing tag had, in effect, already been parsed by `htmlTag`. + + * LaTeX reader: + + + Avoid trailing hyphen in translating languages (#7447). + Previously `\foreignlanguage{english}` turned into `<span lang="en-">`. + The same issue affected Arabic. + + Support `\cline` in LaTeX tables (#7442). + + Improved parsing of raw LaTeX from Text streams (`rawLaTeXParser`, + used to read LaTeX in Markdown files, #7434). We now use source + positions from the token stream to tell us how much of the text stream + to consume. Getting this to work required a few other changes to + make token source positions accurate. + + * DocBook reader: + + + Handle images with imageobjectco elements (#7440). + + Add support for citerefentry (#7437, Jan Tojnar). + + * RST reader: fix regression with code includes (#7436). + With the recent changes to include infrastructure, + included code blocks were getting an extra newline. + + * HTML reader: + + + Recognize data-external when reading HTML img tags (#7429, + Michael Hoffmann). Preserve all attributes in img tags. If attributes + have a `data-` prefix, it will be stripped. In particular, this + preserves a `data-external` attribute as an `external` attribute in + the pandoc AST. + + Add col, colgroup to 'closes' definitions + + * HTML writer: + + + Remove duplicated alt text in HTML output (Aner Lucero). + + Remove `aria-hidden` when explicit alt text is provided (Aner Lucero). + + Set boolean values for reveal.js variables. + + * Docx writer: + + + Add table numbering for captioned tables. + The numbers are added using fields, so that Word can + create a list of tables that will update automatically. + + Support figure numbers. These are set up in such a way that they + will work with Word's automatic table of figures (#7392). + + * Markdown writer: put space between Plain and following fenced Div + (#4465). + + * EPUB writer: Don't incorporate externally linked images in EPUB documents + (#7430, Michael Hoffmann). Just as it is possible to avoid incorporating + an image in EPUB by passing `data-external="1"` to a raw HTML snippet, + this makes the same possible for native Images, by looking for an + associated `external` attribute. + + * Text.Pandoc.PDF: + + + Fix `svgIn` path error (#7431). We were duplicating + the temp directory; this didn't cause problems on macOS or linux + because there we use absolute paths for the temp directory. + But on Windows it caused errors converting SVG files. + + `convertImage`: normalize paths (#7431). This will avoid paths + on Windows with mixed path separators. + + * Text.Pandoc.Class: Always use / when adding directory to image destination + with `extractMedia`, even on Windows. + + * Text.Pandoc.Citeproc: + + + Allow `$` characters in bibtex keys (#7409). + + Set proper initial source name in parsing BibTeX (for better error + messages.) + + Revamp note citation handling (#7394). Use latest + citeproc, which uses a Span with a class rather than a Note for notes. + This helps us distinguish between user notes and citation notes. Don't + put citations at the beginning of a note in parentheses. Fix small bug + in handling of citations in notes, which led to commas at the end of + sentences in some cases. + + Cleanup and efficiency improvement in `deNote`. + + Improve punctuation moving with `--citeproc`. Previously, using + `--citeproc` could cause punctuation to move in quotes even when + there aer no citations. This has been changed; punctuation moving + is now limited to citations. In addition, we only move footnotes + around punctuation if the style is a note style, even if + `notes-after-punctuation` is `true`. + + * Use citeproc 0.10. This helps improve note citations (see above) + and eliminates double hyperlinks in author-in-text citations. + Author-only citations are no longer hyperlinked. See jgm/citeproc#77. + It also fixes moving of punctuation inside quotes to conform to + the CSL spec: only comma and period are moved, not question + mark or exclamation point. + + * Text.Pandoc.Error: fix line calculations in reporting parsec errors. + Also remove a spurious initial newline in the error report. + + * Use doctemplates 0.4.1, which gives us better support for boolean + variable values. Previously `$if(foo)$` would evaluate to true + for variables with boolean `false` values, because it cared only + about the string rendering (#7402). + + * Require commonmark-pandoc >= 0.2.2.1. + This fixes task lists with multiple paragraphs. + + * Use skylighting 0.11. + + * CSS in HTML template: reset overflow-wrap on code blocks + (Mauro Bieg, #7423). + + * LaTeX template: Revert change in PR #7295: "move title, author, date up + to top of preamble." The change caused problem for people who used + LaTeX commands defined defined later in the preamble in the title + or author fields (#7422). + + * Add `doc/faqs.md`. This is imported from the website; in the future the + website version will be drawn from here. + Added a FAQ on the use of `\AtEndPreamble` for cases when the contents of + `header-includes` need to refer to definitions that come later in the + preamble. See #7422. + + * Upgrade Debian 10 AMI for build-arm.sh. + + * CircleCI: change to using xcode 11.1.0 (macOS 10.14.4). + We previously built on 10.13, but 10.13 no longer gets + security updates and CirclCI is deprecating. + +## pandoc 2.14.0.3 (2021-06-22) + + * Text.Pandoc.MediaBag `insertMediaBag`: ensure we get a sane mediaPath + for URLs (#7391). In earlier 2.14.x versions, we'd get + incorrect paths for resources downloaded from URLs when the + media are extracted (including in PDF production). + * Text.Pandoc.Parsing: improve `emailAddress` (#7398). + Previously the parser would accept characters in domains + that are illegal in domains, and this sometimes caused it + to gobble bits of the following text. + * txt2tags reader: modify the email address parser so + it still includes form parameters, even after the change to + `emailAddress` in Text.Pandoc.Parsing. + * Text.Pandoc.Readers.Metadata: Fix regression with comment-only YAML + metadata blocks (#7400). + * reveal.js writer and template: better handling of options. Previously + it was impossible to specify false values for options that default to + true (e.g. `center`); setting the option to false just caused the portion + of the template setting the option to be omitted. Now we prepopulate + all the variables with their default values, including them all + unconditionally and allowing them to be overridden. + * Markdown writer: Fix regression in code blocks with attributes (#7397). + Code blocks with a single class but nonempty attributes + were having attributes drop as a result of #7242. + * LaTeX writer: + + Add strut at end of minipage if it contains line breaks. + Without them, the last line is not as tall as it should be in + some cases. + + Always use a minipage for cells with line breaks, when + width information is available (#7393). Otherwise the way we treat them + can lead to content that overflows a cell. + + Use `\strut` instead of `~` before `\\` in empty line. + * Use lts-18.0 stack resolver. + * Require skylighting 0.10.5.2 (adding support for Swift). + * Require commonmark 0.2.1. + * Rephrase section on unsafe HTML in manual. + * Create SECURITY.md + +## pandoc 2.14.0.2 (2021-06-13) + + * Fix MediaBag regressions (#7345). iIn the 2.14 release `--extract-media` + stopped working as before; there could be mismatches between the + paths in the rendered document and the extracted media. + This patch makes several changes that restore the earlier behavior + (while keeping the same API). The `mediaPath` in 2.14 was always + constructed from the SHA1 hash of the media contents. Now, we + preserve the original path unless it's an absolute path or contains + `..` segments (in that case we use a path based on the SHA1 hash of + the contents). + + In Text.Pandoc.MediaBag, `mediaDirectory` and `mediaItems` now use the + `mediaPath`, rather than the mediabag key, for the first component of the + tuple. This makes more sense, I think, and fits with the documentation of + these functions; eventually, though, we should rework the API so that + `mediaItems` returns both the keys and the MediaItems. + + In Text.Pandoc.Class.IO, rewriting of source paths in `extractMedia` has + been fixed. + + In Text.Pandoc.Class.PandocMonad, `fillMediaBag` has been modified so that + it doesn't modify image paths (that was part of the problem in #7345). + + We now do path normalization (e.g. `\` separators on Windows) in + writing the media. + + * Text.Pandoc.PDF: + + + Text.Pandoc.PDF: Fix regression in 2.14 for generation of PDFs with + SVGs (#7344). + + Only print relevant part of environment on `--verbose`. Since + `--verbose` output might be put in an issue, we want to avoid + spilling out secrets in environment variables. + + * Markdown reader: fix pipe table regression in 2.11.4 (#7343). + Previously pipe tables with empty headers (that is, a header + line with all empty cells) would be rendered as headerless + tables. This broke in 2.11.4. The fix here is to produce an + AST with an empty table head when a pipe table has all empty + header cells. + + * LaTeX reader: don't allow optional `*` on symbol control sequences + (#7340). Generally we allow optional starred variants of LaTeX commands + (since many allow them, and if we don't accept these explicitly, + ignoring the star usually gives acceptable results). But we + don't want to do this for `\(*\)` and similar cases. + + * Docx reader: handle absolute URIs in Relationship Target (#7374). + + * Docx writer: fix handling of empty table headers (Albert Krewinkel, + #7369). A table header which does not contain any cells is now treated as + an empty header. + + * LaTeX writer: Fix regression in table header position (#7347). + In recent versions the table headers were no longer bottom-aligned + (if more than one line). This patch fixes that by using minipages + for table headers in non-simple tables. + + * CommonMark writer: + + + Do not use simple class for fenced-divs (Jan Tojnar, amends #7242.) + + Do not throw away attributes when `Ext_attributes` is enabled. + `Ext_attributes` covers at least the following: + `Ext_fenced_code_attributes`, `Ext_header_attributes`, + `Ext_inline_code_attributes`, `Ext_link_attributes`. + + * Markdown writer: + + + Allow `pipe_tables` to be disabled for commonmark formats + (`commonmark_x`, `gfm`) (#7375). + + Re-use functions from Text.Pandoc.Markdown.Inline (Jan Tojnar). + + * DocBook writer: Remove non-existent admonitions (Jan Tojnar). + `attention`, `error` and `hint` are reStructuredText specific. + + * HTML writer: Don't omit width attribute on div (#7342). + + * Text.Pandoc.MIME, `extensionFromMimeType`: add a few special cases. + When we do a reverse lookup in the MIME table, we just get the + last match, so when the same mime type is associated with several + different extensions, we sometimes got weird results, e.g. `.vs` + for `text/plain`. These special cases help us get the most standard + extensions for mime types like `text/plain`. + + * Lua utils: fix handling of table headers in `from_simple_table` (Albert + Krewinkel, #7369). Passing an empty list of header cells now results + in an empty table header. + + * Text.Pandoc.Citeproc: + + + Avoid duplicate classes and attributes on references div. + + Fix regression in citeproc processing (#7376). If inline + references are used (in the metadata `references` field), we + should still only include in the bibliography items that are + actually cited (unless `nocite` is used). + + * Require citeproc 0.4.0.1. This fixes a bug which led to doubled + "et al." in some (rare) circumstances. + + * MANUAL.txt: + + + Mention GladTeX for EPUB export (Sebastian Humenda). + This updates the manual and the web site about the GladTeX usage. + + More details and a useful link for YAML syntax. + + * CONTRIBUTING.md: update modules overview (Albert Krewinkel). + + * using-the-pandoc-api.md: switch from String to Text (Albert Krewinkel). + + +## pandoc 2.14.0.1 (2021-06-01) + + * Commonmark reader: Fix regression in 2.14 with YAML metdata block parsing, + which could cause the document body to be omitted after metadata (#7339). + + * HTML reader: fix column width regression in 2.14 (#7334). + Column widths specified with a style attribute were off by a factor of 100. + + * Markdown reader: in `rebasePaths`, check for both Windows and Posix + absolute paths. Previously Windows pandoc was treating + `/foo/bar.jpg` as non-absolute. + + * Text.Pandoc.Logging: In rendering `LoadedResource`, use relative paths. + + * Docx writer: fix regression on captions (#7328). The "Table Caption" + style was no longer getting applied. (It was overwritten by "Compact.") + + * Use commonmark-extensions 0.2.1.2 + +## pandoc 2.14 (2021-05-28) + + * Change reader types, allowing better tracking of source positions + [API change]. Previously, when multiple file arguments were provided, + pandoc simply concatenated them and passed the contents to the readers, + which took a Text argument. As a result, the readers had no way of knowing + which file was the source of any particular bit of text. This meant that + we couldn't report accurate source positions on errors or include accurate + source positions as attributes in the AST. More seriously, it meant that + we couldn't resolve resource paths relative to the files containing them + (see e.g. #5501, #6632, #6384, #3752). + + * Add `rebase_relative_paths` extension (#3752). When enabled, this + extension rewrites relative image and link paths by prepending + the (relative) directory of the containing file. This + behavior is useful when your input sources are split + into multiple files, across several directories, with files + referring to images stored in the same directory. The + extension can be enabled for all markdown and commonmark-based formats. + + * Add Text.Pandoc.Sources (exported module), with a `Sources` type and a + `ToSources` class. A `Sources` wraps a list of `(SourcePos, Text)` pairs + [API change]. A parsec `Stream` instance is provided for `Sources`. The + module also exports versions of parsec's `satisfy` and other Char parsers + that track source positions accurately from a `Sources` stream (or any + instance of the new `UpdateSourcePos` class). + + * Text.Pandoc.Parsing + + + Export the modified Char parsers defined in Text.Pandoc.Sources + instead of the ones parsec provides. Modified parsers to use a + `Sources` as stream [API change]. + + Improve include file functions [API change]. Remove old + `insertIncludedFileF`. Give `insertIncludedFile` a more general type, + allowing it to be used where `insertIncludedFileF` was. + + Add parameter to the `citeKey` parser from + Text.Pandoc.Parsing, which controls whether the `@{..}` + syntax is allowed [API change]. + + * Text.Pandoc.Error: Modified the constructor `PandocParsecError` to take a + `Sources` rather than a `Text` as first argument, so parse error locations + can be accurately reported. + + * Fix source position reporting for YAML bibliographies (#7273). + + * Issue error message when reader or writer format is malformed + (#7231). Previously we exited with an error status but (due to a bug) + no message. + + * Smarter smart quotes (#7216, #2103). Treat a leading `"` with no + closing `"` as a left curly quote. This supports the practice, in + fiction, of continuing paragraphs quoting the same speaker without an + end quote. It also helps with quotes that break over lines in line blocks. + + * Markdown reader: + + + Use MetaInlines not MetaBlocks for multimarkdown metadata fields. + This gives better results in converting to e.g. pandoc markdown. + + Implement curly-brace syntax for Markdown citation keys (#6026). + The change provides a way to use citation keys that contain + special characters not usable with the standard citation key syntax. + Example: `@{foo_bar{x}'}` for the key `foo_bar{x}`. It also allows + separating citation keys from immediately following text, e.g. `@{foo}A`. + + * RST reader: + + + Seek include files in the directory of the file + containing the include directive, as RST requires (#6632). + + Use `insertIncludedFile` from Text.Pandoc.Parsing + instead of reproducing much of its code. + + * Org reader: Resolve org includes relative to the directory containing the + file containing the INCLUDE directive (#5501). + + * ODT reader: Treat tabs as spaces (#7185, niszet). + + * Docx reader: + + + Add handling of vml image objects (#7257, mbrackeantidot). + + Support new table features (Emily Bourke, #6316): column + spans, row spans, multiple header rows, table description + (parsed as a simple caption), captions, column widths. + + * LaTeX reader: + + + Improved siunitx support (#6658, #6620). + + Better support for `\xspace` (#7299). + + Improve parsing of `\def` macros. We previously set "verbatim mode" + even for parsing the initial `\def`; this caused problems + for `\def` nested inside another `\def`. + + Implement `\newif`. + + * ConTeXt writer: improve ordered lists (#5016, Denis Maier). + Change ordered list from itemize to enumerate. Add new + itemgroup for ordered lists. Remove manual insertion of + width attributes. Use tabular figures in ordered list + enumerators. + + * HTML reader: + + + Don't fail on unmatched closing "script" tag (Albert Krenkel, #7282). + + Keep h1 tags as normal headers (#2293, Albert Krewinkel). + The tags `<title>` and `<h1 class="title">` often contain the same + information, so the latter was dropped from the document. However, as + this can lead to loss of information, the heading is now always + retained. Use `--shift-heading-level-by=-1` to turn the `<h1>` + into the document title, or a filter to restore the previous behavior. + + Handle relative lengths (e.g. `2*`) in HTML column widths (#4063). + See <https://www.w3.org/TR/html4/types.html#h-6.6>. + + * DocBook/JATS readers: + + + Fix mathml regression caused by the switch in XML libraries (#7173). + + Fix "phrase" in DocBook: take classes from "role" not "class" (#7195). + + * DocBook reader: ensure that first and last names are separated (#6541). + + * Jira reader (Albert Krewinkel, #7218): + + + Support "smart" links: `[alias|https://example.com|smart-card]` syntax. + + Allow spaces and most unicode characters in attachment links. + + No longer require a newline character after `{noformat}`. + + Only allow URI path segment characters in bare links. + + The `file:` schema is no longer allowed in bare links; these + rarely make sense. + + * Plain writer: handle superscript unicode minus (#7276). + + * LaTeX writer: + + + Better handling of line breaks in simple tables (#7272). + Now we also handle the case where they're embedded in other elements, + e.g. spans. + + For beamer output, support `exampleblock` and `alertblock` (#7278). + A block will be rendered as an `exampleblock` if the heading + has class `example` and an `alertblock` if it has class `alert`. + + Separate successive quote chars with thin space (#6958, + Albert Krewinkel). Successive quote characters are separated with + a thin space to improve readability and to prevent unwanted ligatures. + Detection of these quotes sometimes had failed if the second quote + was nested in a span element. + + Separate successive quote chars with thin space (#6958, Albert + Krewinkel). + + * EPUB Writer: Fix belongs-to-collection XML id choice (#7267, nuew). + The epub writer previously used the same XML id for both the book + identifier and the epub collection. This causes an error on epubcheck. + + * BibTeX/BibLaTeX writer: Handle `annote` field (#7266). + + * ZimWiki writer: allow links and emphasis in headers (#6605, + Albert Krewinkel). + + * ConTeXt writer: + + + Support blank lines in line blocks (#6564, Albert Krewinkel, + thanks to @denismaier). + + Use span identifiers as reference anchors (#7246, Albert Krewinkel). + + * HTML writer: + + + Keep attributes from code nested below `pre` tag (#7221, + Albert Krewinkel). If a code block is defined with `<pre><code + class="language-x">…</code></pre>`, where the `<pre>` element has no + attributes, then the attributes from the `<code>` element are used + instead. Any leading `language-` prefix is dropped in the code's + `class` attribute are dropped to improve syntax highlighting. + + Ensure headings only have valid attribs in HTML4 (#5944, Albert + Krewinkel). + + Parse `<header>` as a Div (Albert Krewinkel). + + * Org writer: + + + Inline latex envs need newlines (#7252, tecosaur). + As specified in https://orgmode.org/manual/LaTeX-fragments.html, an + inline \begin{}...\end{} LaTeX block must start on a new line. + + Use LaTeX style maths deliminators (#7196, tecosaur). + + * JATS writer (Albert Krewinkel): + + + Use either styled-content or named-content for spans (#7211). + If the element has a content-type attribute, or at least one class, + then that value is used as `content-type` and the span is put inside + a `<named-content>` element. Otherwise a `<styled-content>` element + is used instead. + + Reduce unnecessary use of `<p>` elements for wrapping (#7227). + The `<p>` element is used for wrapping in cases were the contents + would otherwise not be allowed in a certain context. Unnecessary + wrapping is avoided, especially around quotes (`<disp-quote>` elements). + + Convert spans to `<named-content>` elements (#7211). Spans with + attributes are converted to `<named-content>` elements instead of + being wrapped with `<milestone-start/>` and `<milestone-end>` + elements. Milestone elements are not allowed in documents using the + articleauthoring tag set, so this change ensures the creation of valid + documents. + + Add footnote number as label in backmatter (#7210). Footnotes in the + backmatter are given the footnote's number as a label. The + articleauthoring output is unaffected from this change, as footnotes + are placed inline there. + + Escape disallows chars in identifiers. XML identifiers must start + with an underscore or letter, and can contain only a limited set + of punctuation characters. Any IDs not adhering to these rules are + rewritten by writing the offending characters as `Uxxxx`, + where `xxxx` is the character's hex code. + + * Jira writer: use `{color}` when span has a color attribute + (Albert Krewinkel, tarleb/jira-wiki-markup#10). + + * Docx writer: + + + Autoset table width if no column has an explicit width (Albert + Krewinkel). + + Extract Table handling into separate module (Albert Krewinkel). + + Support colspans and rowspans in tables (Albert Krewinkel, #6315). + + Support multirow table headers (Albert Krewinkel). + + Improve integration of settings from reference.docx (#1209). + This change allows users to create a reference.docx that + sets `w:proofState` for spelling or grammar to `dirty`, + so that spell/grammar checking will be triggered on the + generated docx. + + Copy over more settings from reference.docx (#7240). From settings.xml + in the reference-doc, we now include: `zoom`, `embedSystemFonts`, + `doNotTrackMoves`, `defaultTabStop`, `drawingGridHorizontalSpacing`, + `drawingGridVerticalSpacing`, `displayHorizontalDrawingGridEvery`, + `displayVerticalDrawingGridEvery`, `characterSpacingControl`, + `savePreviewPicture`, `mathPr`, `themeFontLang`, `decimalSymbol`, + `listSeparator`, `autoHyphenation`, `compat`. + + Set zoom to 100% by default in settings.xml. + + Align math options more with current Word defaults (e.g. Cambria Math + font). + + Remove `rsid`s from default settings.xml. Word will add these + when revisions are made. + + * Ms writer: Handle tables with multiple paragraphs (#7288). + Previously they overflowed the table cell width. We now set line lengths + per-cell and restore them after the table has been written. + + * Markdown writer: + + + Use cleaner braceless syntax for code blocks with a + single class (#7242, Jan Tojnar). + + Add quotes properly in markdown YAML metadata fields (#7245). + This fixes a bug, which caused the writer to look at the *last* + rather than the *first* character in determining whether quotes + were needed. So we got spurious quotes in some cases and + didn't get necessary quotes in others. + + Use `@{..}` syntax for citations when needed. + + Use fewer unneeded escapes for `#` (see #6259). + + Improve escaping of `@`. We need to escape literal `@` before + `{` because of the new citation syntax. + + * Commonmark writer: Use backslash escapes for `<` and `|`... + instead of entities (#7208). + + * Powerpoint writer: allow `monofont` to be specified in metadata + (#7187). + + * LaTeX template: + + + Use non-starred names for xcolor color names (#6109). + This should make svgnames and x11names work properly. + + Fix bad vertical spacing after bibliography (#7234, badumont). + + List of figures before list of tables (#7235, Julien Dutant). + + Move CSL macro definitions before header-includes so they can be + overridden (#7286). + + Improve treatment of CSL `entry-spacing` (#7296). + Previously with the default template settings (`indent` variable + not set), we would get interparagraph spaces separating bib + entries even with `entry-spacing="0"`. On the other hand, + setting `entry-spacing="2"` gave ridiculously large spacing. + This change makes the spacing caused by `entry-spacing` a multiple + of `\parskip` by default, which gives aesthetically reasonable + output. Those who want a larger or smaller unit (e.g. because + they use `indent` which sets `\parskip` to 0) may + `\setlength{\cslentryspacingunit}{10pt}` in header-includes + to override the defaults. + + Move title, author, date up to top of preamble (#7295). + This allows header-includes to use them, and puts them + in a position where you can see them immediately. + + Define commands for zero width non-joiner character + (#6639, Albert Krewinkel). The zero-width non-joiner character + is used to avoid ligatures (e.g. in German). + + * ConTeXt template: + + + Define `enumerate` itemgroup (#5016, Denis Maier). + + List of figures before list of tables (#7235, Julien Dutant). + + * reveal.js template: + + + Support `toc-title` (#7171, Florian Kohrt). + + Use `hash: true` by default rather than `history: true` (#6968). + + * HTML-based slide shows: add support for `institute` (#7289, Thomas + Hodgson). + + * Text.Pandoc.Extensions: Add constructor `Ext_rebase_relative_paths` to + `Extensions` [API change]. + + * Text.Pandoc.XML.Light: add Eq, Ord instances for Content, + Element, Attr, CDataKind [API change]. + + * Text.Pandoc.MediaBag: + + + Change type to use a `Text` key instead of `[FilePath]`. + We normalize the path and use `/` separators for consistency. + + Export `MediaItem` type [API change]. + + Change `MediaBag` type to a map from Text to MediaItem [API change]. + + `lookupMedia` now returns a `MediaItem` [API change]. + + Change `insertMedia` so it sets the `mediaPath` to a filename based on + the SHA1 hash of the contents. This will be used when contents + are extracted. + + * Text.Pandoc.Class.PandocMonad: + + + Remove `fetchMediaResource` [API change]. Use `fetchItem` to get + resources in `fillMediaBag`. + + Add informational message in `downloadOrRead` indicating what path + local resources have been loaded from. + + * Text.Pandoc.Logging: + + + Remove single quotes around paths in messages. + + Add LoadedResource constructor to LogMessage [API change]. + This is for INFO-level messages telling where image data has been + loaded from. (This can vary because of the resource path.) + + * Text.Pandoc.Asciify: simplify code and export `toAsciiText` [API change]. + Instead of encoding a giant (and incomplete) map, we now + just use unicode-transforms to normalize the text to + a canonical decomposition, and manipulate the result. + + * App: allow tabs expansion even if file-scope is used (Albert Krewinkel, + #6709). Tabs in plain-text inputs are now handled correctly, even if + the `--file-scope` flag is used. + + * Add new internal module Text.Pandoc.Writers.GridTable (Albert Krewinkel). + + * Text.Pandoc.Highlighting: Change type of `languagesByExtension`, adding + a parameter for a `SyntaxMap` [API change] (Jan Tojnar, #7241). + Languages defined using `--syntax-definition` were not recognized by + `languagesByExtension`. This patch corrects that, allowing the writers + to see all custom definitions. The LaTeX writer still uses the default + syntax map, but that's okay in that context, since + `--syntax-definition` won't create new listings styles. + + * Text.Pandoc.Citeproc: + + + Ensure that CSL-related attributes are passed on to a Div with id + 'refs'. Otherwise things like `entry-spacing` won't work when + such Divs are used. + + Use metadata's `lang` for the lang parameter of citeproc, overriding + `localeLanguage`. + + Recognize locators spelled with a capital letter (#7323). + + Add a comma and a space in front of the suffix if it doesn't start + with space or punctuation (#7324). + + Don't detect math elements as locators (#7321). + + * Remove Text.Pandoc.BCP47 module [API change]. Use types and functions + from UnicodeCollation.Lang instead. This is a richer implementation + of BCP 47. + + * Text.Pandoc.Shared: + + + Fix regression in grid tables for wide characters (#7214). + In the translation from String to Text, a char-width-sensitive + `splitAt'` was dropped. This commit reinstates it and uses it to make + `splitTextByInstances` char-width sensitive. + + Add `getLang` (formerly in the now-removed BCP47) [API change]. + + * Text.Pandoc.SelfContained: use `application/octet-stream` + for unknown mime types instead of halting with an error (#7202). + + * Lua filters: respect Inlines/Blocks filter functions in `pandoc.walk_*` + (Albert Krewinkel). + + * Add text as build-depend for trypandoc (#7193, Roman Beránek). + + * Bump upper-bounds for network-uri, time, attoparsec. + + * Use citeproc 0.4. + + * Use texmath 0.12.3. + + * Use jira-wiki-markup 1.3.5 (Albert Krewinkel). + + * Require latest skylighting (fixes a bug in XML syntax highlighting). + + * Use latest xml-conduit. + + * Use latest commonmark, commonmark-extensions, commonmark-pandoc. + + * Use haddock-library-1.10.0 (Albert Krewinkel). + + * Allow compilation with base 4.15 (Albert Krewinkel). + + * MANUAL: + + + Add information about `lang` and bibliography sorting. + + Add info about YAML escape sequences, link to spec (#7152, + Albert Krewinkel). + + Note that `institute` variable works for HTML-based slides. + + Update documentation on citation syntax. + + Add citation example for locators and suffixes (Tristan Stenner) + + * Updated and fixed typos in documentation (Charanjit Singh, + Anti-Distinctlyminty, Tatiana Porras, obcat). + + * Add instructions for installing pandoc-types before compiling filter. + + * INSTALL: add note that parallel installations should be avoided + (#6865). + + * Remove `biblatex-nussbaum.md` test. It is basically the same + as `biblaetx-quotes.md`. + + * Command tests: fail if a file contains no tests---and fix a + test that failed in that way! + + * Use smaller images in tests, reducing the size of the source tarball by 8 MB. + + +## pandoc 2.13 (2021-03-21) + + * Support `yaml_metadata_block` extension for `commonmark`, `gfm` (#6537). + This supported is a bit more limited than with pandoc's + `markdown`. The YAML block must be the first thing in the input, + and the leaf notes are parsed in isolation from the rest of + the document. So, for example, you can't use reference + links if the references are defined later in the document. + + * Fix fallback to default partials when custom templates are used. + If the directory containing a template does not contain the partial, + it should be sought in the default templates, but this was not + working properly (#7164). + + * Handle `nocite` better with `--biblatex` and `--natbib` (#4585). + Previously the nocite metadata field was ignored with these formats. + Now it populates a `nocite-ids` template variable and causes a + `\nocite` command to be issued. + + * Text.Pandoc.Citeproc: apply `fixLinks` correctly (#7130). This is code + that incorporates a prefix like `https://doi.org/` into a following link + when appropriate. + + * Text.Pandoc.Shared: + + + Remove `backslashEscapes`, `escapeStringUsing` [API change]. Replace + these inefficient association list lookups with more efficient escaping + functions in the writers that used them (for a 10-25% performance boost + in org, haddock, rtf, texinfo writers). + + Remove `ToString`, `ToText` typeclasses [API change]. These were needed + for the transition from String to Text, but they are no longer used and + may clash with other things. + + Simplify `compactDL`. + + * Text.Pandoc.Parsing: + + + Change type of `readWithM` so that it is no longer polymorphic + [API change]. The `ToText` class has been removed, and now that we've + completed the transition to Text we no longer need this to operate + on Strings. + + Remove `F` type synonym [API change]. Muse and Org were defining their + own `F` anyway. + + * Text.Pandoc.Readers.Metadata: + + + Export `yamlMetaBlock` [API change]. + + Make `yamlBsToMeta`, `yamlBsToRefs` polymorphic on the parser state + [API change]. + + * Markdown reader: Fix regression with `tex_math_backslash` (#7155). + + * MediaWiki reader: Allow block-level content in notes (ref) (#7145). + + * Jira reader (Albert Krewinkel): + + + Fixed parsing of autolinks (i.e., of bare URLs in the text). + Previously an autolink would take up the rest of a line, as spaces + were allowed characters in these items. + + Emoji character sequences no longer cause parsing failures. This was + due to missing backtracking when emoji parsing fails. + + Mark divs created from panels with class "panel". + + * RST reader: fix logic for ending comments (#7134). Previously comments + sometimes got extended too far. + + * DocBook writer: include Header attributes as XML attributes on + section (Erik Rask). Attributes with key names that are not allowed + as XML attributes are dropped, as are attributes with invalid values + and `xml:id` (DocBook 5) and `id` (DocBook 4). + + * Docx writer: + + + Make `nsid` in `abstractNum` deterministic. Previously we assigned + a random number, but we don't need random values, so now we just + assign a value based on the list marker. + + Use integral values for `w:tblW` (#7141). + + * Jira writer (Albert Krewinkel): + + + Block quotes are only rendered as `bq.` if they do not contain a + linebreak. + + Jira writer: improve div/panel handling. Include div attributes in + panels, always render divs with class `panel` as panels, and + avoid nesting of panels. + + * HTML writer: Add warnings on duplicate attribute values. + This prevents emitting invalid HTML. Ultimately it would be good to + prevent this in the types themselves, but this is better for now. + + * Org writer: Prevent unintended creation of ordered list items (#7132, + Albert Krewinkel). Adjust line wrapping if default wrapping would cause + a line to be read as an ordered list item. + + * JATS templates: support 'equal-contrib' attrib for authors (Albert + Krewinkel). Authors who contributed equally to a paper may be marked + with `equal-contrib`. + + * reveal.js template: replace JS comment with HTML (#7154, Florian Kohrt). + + * Text.Pandoc.Logging: Add `DuplicateAttribute` constructor to `LogMessage`. + [API change] + + * Use `-j4` for linux release build. This speeds up the build dramatically + on arm. + + * cabal.project: remove ghcoptions. Move flags to top level, so they can + be set differently on the command line. + + * Require latest texmath, skylighting, citeproc, jira-wiki-markup. + (The latest skylighting fixes a bad bug with Haskell syntax highlighting.) + Narrow version bounds for texmath, skylighting, and citeproc, since + the test output depend on them. + + * Use doclayout 0.3.0.2. This significantly reduces the time and memory + needed to compile pandoc. + + * Use `foldl'` instead of `foldl` everywhere. + + * Update bounds for random (#7156, Alexey Kuleshevich). + + * Remove uses of some partial functions. + + * Don't bake in a larger stack size for the executable. + + * Test improvements: + + + Use `getExecutablePath` from base, avoiding the dependency on + `executable-path`. + + Factor out `setupEnvironment` in Helpers, to avoid code duplication. + + Fix finding of data files by setting teh `pandoc_datadir` environment + variable when we shell out to pandoc. This avoids the need to use + `--data-dir` for the tests, which caused problems finding `pandoc.lua` + when compiling without the `embed_data_files` flag (#7163). + + * Benchmark improvements: + + + Build `+RTS -A8m -RTS` into default ghc-options for benchmark. + This is necessary to get accurate benchmark results; otherwise we + are largely measuring garbage collecting, some not related to the + current benchmark. + + Allow specifying BASELINE file in 'make bench' for comparison + (otherwise the latest benchmark is chosen by default). + + Force `readFile` in benchmarks early (Bodigrim). + + * CONTRIBUTING: suggest using a `cabal.project.local` file (#7153, + Albert Krewinkel). + + * Add ghcid-test to Makefile. This loads the test suite in ghcid. + + +## pandoc 2.12 (2021-03-08) + + * `--resource-path` now accumulates if specified multiple + times (#6152). Resource paths specified later on the command line are + prepended to those specified earlier. Thus, + `--resource-path foo --resource-path bar:baz` is equivalent to + `--resource-path bar:bas:foo`. (The previous behavior was + for the last `--resource-path` to replace all the rest.) + `resource-path` in defaults files behaves the same way: it + will be prepended to the resource path set by earlier + command line options or defaults files. This change + facilitates the use of multiple defaults files: each can + specify a directory containing resources it refers to + without clobbering the resource paths set by the others. + + * Allow defaults files to refer to the home directory, the + user data directory, and the directory containing the defaults file + itself (#5871, #5982, #5977). In fields that expect file paths + (and only in these fields), + + + `${VARIABLE}` will expand to the value of the environment variable + `VARIABLE` (and in particular `${HOME}` will expand to the path + of the home directory). A warning will be raised for undefined + variables. + + `${USERDATA}` will expand to the path of the user data + directory in force when the defaults file is being processed. + + `${.}` will expand to the directory containing the defaults file. + (This allows default files to be placed in a directory containing + resources they make use of.) + + * When downloading content from URL arguments, be sensitive to + the character encoding (#5600). We can properly handle UTF-8 and latin1 + (ISO-8859-1); for others we raise an error. Fall back to latin1 if + no charset is given in the mime type and UTF-8 decoding fails. + + * Allow abbreviations that don't end in a period to be + specified using `--abbreviations` (#7124). + + * Add new unexported module Text.Pandoc.XML.Light, as well + as Text.Pandoc.XML.Light.Types, Text.Pantoc.XML.Light.Proc, + Text.Pandoc.XML.Light.Output. (Closes #6001, #6565, #7091). + + This module exports definitions of `Element` and `Content` + that are isomorphic to xml-light's, but with Text + instead of String. This allows us to keep most of the code in existing + readers that use xml-light, but avoid lots of unnecessary allocation. + + We also add versions of the functions from xml-light's + Text.XML.Light.Output and Text.XML.Light.Proc that operate on our + modified XML types, and functions that convert xml-light types to our + types (since some of our dependencies, like texmath, use xml-light). + + We export functions that use xml-conduit's parser to produce an + `Element` or `[Content]`. This allows existing pandoc code to use + a better parser without much modification. + + The new parser is used in all places where xml-light's parser was + previously used. Benchmarks show a significant performance improvement + in parsing XML-based formats (with docbook, opml, jats, and docx + almost twice as fast, odt and fb2 more than twice as fast). + + In addition, the new parser gives us better error reporting than + xml-light. We report XML errors, when possible, using the new + `PandocXMLError` constructor in `PandocError`. + + These changes revealed the need for some changes in the tests. The + docbook-reader.docbook test lacked definitions for the entities it used; + these have been added. And the docx golden tests have been updated, + because the new parser does not preserve the order of attributes. + + * DocBook reader: + + + Avoid expensive tree normalization step, as it is not necessary + with the new XML parser. + + Support `informalfigure` (#7079) (Nils Carlson). + + * Docx reader: + + + Use Map instead of list for Namespaces. This gives a speedup of + about 5-10%. With this and the XML parsing changes, the docx reader + is now about twice as fast as in the previous release. + + * HTML reader: + + + Small performance tweaks. + + Also, remove exported class `NamedTag(..)` [API change]. This was just + intended to smooth over the transition from String to Text and is no + longer needed. + + As a result, the functions `isInlineTag` and `isBlockTag` + are no longer polymorphic; they apply to a `Tag Text` [API change]. + + Do a lookahead to find the right parser to use. This takes + benchmarks from 34ms to 23ms, with less allocation. + + Fix bad handling of empty `src` attribute in `iframe` (#7099). + If `src` is empty, we simply skip the `iframe`. + If `src` is invalid or cannot be fetched, we issue a warning + nd skip instead of failing with an error. + + * JATS reader: + + + Avoid tree normalization, which is no longer necessary given the + new XML parser. + + * LaTeX reader: + + + Don't export `tokenize`, `untokenize` [API change]. These are internal + implementation details, which were only exported for testing. + They don't belong in the public API. + + Improved efficiency of the parser. With these changes the reader + is almost twice as fast as in the last release in our benchmarks. + + Code cleanup, removing some unnecessary things. + + Rewrite `withRaw` so it doesn't rely on fragile assumptions + about token positions (which break when macros are expanded) + (#7092). This requires the addition of `sEnableWithRaw` and + `sRawTokens` in `LaTeXState`, and a new combinator `disablingWithRaw` + to disable collecting of raw tokens in certain contexts. + Add `parseFromToks` to Text.Pandoc.Readers.LaTeX.Parsing. + Fix parsing of single character tokens so it doesn't mess + up the new raw token collecting. These changes slightly increase + allocations and have a small performance impact. + + Handle some bibtex/biblatex-specific commands that used to be + dealt with in pandoc-citeproc (#7049). + + Optimize `satisfyTok`, avoiding unnecessary macro expansion steps. + Benchmarks after this change show 2/3 of the run time and 2/3 of the + allocation of the Feb. 10 benchmarks. + + Removed `sExpanded` in state. This isn't actually needed and checking + it doesn't change anything. + + Improve `braced'`. Remove the parameter, have it parse the + opening brace, and make it more efficient. + + Factor out pieces of the LaTeX reader to make the module smaller. + This reduces memory demands when compiling. Created + Text.Pandoc.Readers.{LaTeX,Math,Citation,Table,Macro,Inline}. + Changed Text.Pandoc.Readers.LaTeX.SIunitx to export a command map + instead of individual commands. + + Handle table cells containing `&` in `\verb` (#7129). + + * Make Text.Pandoc.Readers.LaTeX.Types an unexported module [API change]. + + * Markdown reader: + + + Improved handling of mmd link attributes in references (#7080). + Previously they only worked for links that had titles. + + Improved efficiency of the parser (benchmarks show a 15% speedup). + + * OPML reader: + + + Avoid tree normalization, which is no longer necessary with the + new XML parser. + + * ODT reader: + + + Finer-grained errors on parse failure (#7091). + + Give more information if the zip container can't be unpacked. + + * Org reader: + + + Support `task_lists` extension (Albert Krewinkel, #6336). + + Fix bug in org-ref citation parsing (Albert Krewinkel, #7101). + The org-ref syntax allows to list multiple citations separated by + comma. Previously commas were accepted as part of the citation id, + so all citation lists were parsed as one single citation. + + * RST reader: + + + Use `getTimestamp` instead of `getCurrentTime` to fetch timestamp. + Setting `SOURCE_DATE_EPOCH` will allow reproducible builds. + + RST reader: fix handling of header in CSV tables (#7064). + The interpretation of this line is not affected by the delim option. + + * Jira reader: + + + Modified the Doc parser to skip leading blank lines. This fixes + parsing of documents which start with multiple blank lines (Albert + Krewinkel, #7095). + + Prevent URLs within link aliases to be treated as autolinks (Albert + Krewinkel, #6944). + + * Text.Pandoc.Shared + + + Remove formerly exported functions that are no longer used in the + code base: `splitByIndices`, `splitStringByIndicies`, `substitute`, + and `underlineSpan` (which had been deprecated in April 2020) + [API change]. + + Export `handleTaskListItem` (Albert Krewinkel) [API change]. + + Change `defaultUserDataDirs` to `defaultUserDataDir` [API + change]. We determine what is the default user data directory + by seeing whether the XDG directory and/or legacy + directory exist. + + * BibTeX writer: + + + BibTeX writer: use doclayout and doctemplate. This change allows + bibtex/biblatex output to wrap as other formats do, + depending on the settings of `--wrap` and `--columns` (#7068). + + * CSL JSON writer: + + + Output `[]` if no references in input, instead of raising a + PandocAppError as before. + + * Docx writer: + + + Use `getTimestamp` instead of `getCurrentTime` for timestamp. + Setting `SOURCE_DATE_EPOCH` will allow reproducible builds. + + * EPUB writer: + + + Use `getTimestamp` instead of `getCurrentTime` for timestamp. + Setting `SOURCE_DATE_EPOCH` will allow reproducible builds (#7093). + This does not suffice to fully enable reproducible in EPUB, since + a unique id is still being generated for each build. + + Support `belongs-to-collection` metadata (#7063) (Nick Berendsen). + + * JATS writer: + + + Escape special chars in reference elements (Albert Krewinkel). + Prevents the generation of invalid markup if a citation element + contains an ampersand or another character with a special meaning + in XML. + + * Jira writer: + + + Use Span identifiers as anchors (Albert Krewinkel). + + Use `{noformat}` instead of `{code}` for unknown languages (Albert + Krewinkel). Code blocks which are not marked as a language supported + by Jira are rendered as preformatted text via `{noformat}` blocks. + + * LaTeX writer: + + + Adjust hypertargets to beginnings of paragraphs (#7078). + Use `\vadjust pre` so that the hypertarget takes you to the beginning + of the paragraph rather than one line down. + This makes a particular difference for links to citations using + `--citeproc` and `link-citations: true`. + + Change BCP47 lang tag from `jp` to `ja` (Mauro Bieg, #7047). + + Use function instead of map for accent lookup (should be + more efficient). + + Split the module to make it easier to compile on low-memory + systems: added Text.Pandoc.Writers.LaTeX.{Util,Citation,Lang}. + + * Markdown writer: + + + Handle math right before digit. We insert an HTML comment to + avoid a `$` right before a digit, which pandoc will not recognize + as a math delimiter. + + Split the module to make it easier to compile on low-memory + systems: added Text.Pandoc.Writers.Markdown.{Types,Inline}. + + * ODT writer: + + + Use `getTimestamp` instead of `getCurrentTime` for timestamp. + Setting `SOURCE_DATE_EPOCH` will allow reproducible builds. + + Update default ODT style (Lorenzo). Previously, the "First paragraph" + style inherited from "Standard" but not from "Text body." Now + it is adjusted to inherit from "Text body", to avoid some ugly + spacing issues. It may be necessary to update a custom `reference.odt` + in light of this change. + + * Org writer: + + + Support `task_lists` extension (Albert Krewinkel, #6336). + + * Pptx writer: + + + Use `getTimestamp` instead of `getCurrentTime` for timestamp. + Setting `SOURCE_DATE_EPOCH` will allow reproducible builds. + + * JATS templates: tag `author.name` as `string-name` (Albert Krewinkel). + The partitioning the components of a name into surname, given names, + etc. is not always possible or not available. Using `author.name` + allows to give the full name as a fallback to be used when + `author.surname` is not available. + + * Add default templates for bibtex and biblatex, so that + the variables `header-include`, `include-before`, `include-after` + (or alternatively the command line options + `--include-in-header`, `--include-before-body`, `--include-after-body`) + may be used. + + * LaTeX template: + + + Update to iftex package (#7073) (Andrew Dunning) + + Wrap url colours in braces (#7121) (Loïc Grobol). + + * revealjs template: Add 'center' option for vertical slide centering. + (maurerle, #7104). + + * Text.Pandoc.XML: Improve efficiency of `fromEntities`. + + * Text.Pandoc.MIME + + + Add exported function `getCharset` [API change]. + + * Text.Pandoc.UTF8: change IO functions to return Text, not String + [API change]. This affects `readFile`, `getContents`, `writeFileWith`, + `writeFile`, `putStrWith`, `putStr`, `putStrLnWith`, `putStrLn`. + `hPutStrWith`, `hPutStr`, `hPutStrLnWith`, `hPutStrLn`, `hGetContents`. + This avoids the need to uselessly create a linked list of characters + when emiting output. + + * Text.Pandoc.App + + + Add `parseOptionsFromArgs` [API change, new exported function]. + + Add fields for CSL options to `Opt` [API change]: + `optCSL`, `optbibliography`, `optCitationAbbreviations`. + + * Text.Pandoc.Citeproc.BibTeX + + + `Text.Pandoc.Citeproc.writeBibTeXString` now returns + `Doc Text` instead of `Text` (#7068). + + Correctly handle `pages` (= `page` in CSL) (#7067). + + Correctly handle BibLaTeX `langid` (= `language` in CSL, #7067). + + In BibTeX output, protect foreign titles since there's no language + field (#7067). + + Clean up BibTeX parsing (#7049). Previously there was a messy code + path that gave strange results in some cases, not passing through raw + tex but trying to extract a string content. This was an artefact of + trying to handle some special bibtex-specific commands in the BibTeX + reader. Now we just handle these in the LaTeX reader and simplify + parsing in the BibTeX reader. This does mean that more raw tex will + be passed through (and currently this is not sensitive to the + `raw_tex` extension; this should be fixed). + + * Text.Pandoc.Citeproc.MetaValue + + + Correctly parse "raw" date value in markdown references metadata. + (See jgm/citeproc#53.) + + * Text.Pandoc.Citeproc + + + Use https URLs for links (Salim B, #7122). + + * Text.Pandoc.Class + + + Add `getTimestamp` [API change]. This attempts to read the + `SOURCE_DATE_EPOCH` environment variable and parse a UTC time + from it (treating it as a unix date stamp, see + https://reproducible-builds.org/specs/source-date-epoch/). If the + variable is not set or can't be parsed as a unix date stamp, then the + function returns the current date. + + * Text.Pandoc.Error + + + Add `PandocUnsupportedCharsetError` constructor for + `PandocError` [API change]. + + Export `renderError` [API change]. + + Refactor `handleError` to use `renderError`. This allows us render + error messages without exiting. + + * Text.Pandoc.Extensions + + + `Ext_task_lists` is now supported by org (and turned + on by default) (Albert Krewinkel, #6336). + + Remove `Ext_fenced_code_attributes` from allowed commonmark attributes + (#7097). This attribute was listed as allowed, but it didn't actually + do anything. Use `attributes` for code attributes and more. + + * Lua subsystem: + + + Always load built-in Lua scripts from default data-dir (Albert + Krewinkel). The Lua modules `pandoc` and `pandoc.List` are now always + loaded from the system's default data directory. Loading from a + different directory by overriding the default path, e.g. via + `--data-dir`, is no longer supported to avoid unexpected behavior + and to address security concerns. + + Add module "pandoc.path" (Albert Krewinkel, #6001, #6565). + The module allows to work with file paths in a convenient and + platform-independent manner. + + Use strict evaluation when retrieving AST value from the stack + (Albert Krewinkel, #6674). + + * Text.Pandoc.PDF + + + Disable `smart` extension when building PDF via LaTeX. + This is to prevent accidental creation of ligatures like + `` ?` `` and `` !` `` (especially in languages with quotations like + German), and similar ligature issues. (See jgm/citeproc#54.) + + * Text.Pandoc.CSV: + + + Fix parsing of unquoted values (#7112). Previously we didn't allow + unescaped quotes in unquoted values, but they are allowed + in CSV. + + * Test suite: + + + Use a more robust method for testing the executable. Many + of our tests require running the pandoc executable. This + is problematic for a few different reasons. First, + cabal-install will sometimes run the test suite after + building the library but before building the executable, + which means the executable isn't in place for the tests. + One can work around that by first building, then building + and running the tests, but that's fragile. Second, we + have to find the executable. So far, we've done that using + a function `findPandoc` that attempts to locate it + relative to the test executable (which can be located + using findExecutablePath). But the logic here is delicate + and work with every combination of options. To solve both + problems, we add an `--emulate` option to the + `test-pandoc` executable. When `--emulate` occurs as the + first argument passed to `test-pandoc`, the program simply + emulates the regular pandoc executable, using the rest of + the arguments (after `--emulate`). Thus, `test-pandoc + --emulate -f markdown -t latex` is just like `pandoc -f + markdown -t latex`. Since all the work is done by library + functions, implementing this emulation just takes a couple + lines of code and should be entirely reliable. With this + change, we can test the pandoc executable by running the + test program itself (locatable using `findExecutablePath`) + with the `--emulate` option. This removes the need for the + fragile `findPandoc` step, and it means we can run our + integration tests even when we're just building the + library, not the executable. [Note: part of this change + involved simplifying some complex handling to set + environment variables for dynamic library paths. I have + tested a build with `--enable-dynamic-executable`, and it + works, but further testing may be needed.] + + Print accurate location if a test fails (Albert + Krewinkel). Ensures that tasty-hunit reports the location + of the failing test instead of the location of the helper + `test` function. + + * Documentation: Update URLs and use `https` where possible (#7122, + Salim B). + + * Add `doc/libraries.md`, a description of libraries that support pandoc. + + * MANUAL.txt + + + MANUAL: block-level formatting is not allowed in line blocks (#7107). + + Clarify `tex_math_dollars` extension. Note that no blank lines + are allowed between the delimiters in display math. + + Add MANUAL section on reproducible builds. + + Document no template fallback for absolute path (#7077, Nixon + Enraght-Moony.) + + Improve docs for cite-method. + + Update README and man page. + + * Makefile: in `make bench`, create CSV files for comparison and compare + against previous benchmark run. Add timestamp to CSV filenames. + + * cabal.project: don't explicitly set -trypandoc. + If we do, this can't be overridden on the cabal command line. + + * doc/lua-filters.md: improve documentation for + `pandoc.mediabag.insert`, `pandoc.mediabag.fetch`, + `directory`, `normalize` (Albert Krewinkel). + + * Allow base64-bytestring-1.2.* (Dmitrii Kovanikov) + + * Require jira-wiki-markup 1.3.3 (Albert Krewinkel) + + * Require citeproc 0.3.0.8, which correctly titlecases when titles + contain non-ASCII characters. + + * Use skylighting 0.10.4. This version of skylighting uses xml-conduit + rather than hxt. This speeds up parsing of XML syntax definitions + fourfold, and removes four packages from pandoc's dependency graph: + hxt-charproperties, hxt-unicode, hxt-regex-xmlschema, hxt. + + * Add script `tools/parseTimings.pl` to help pin down which + modules take the most time and memory to compile. + + * Avoid unnecessary use of NoImplicitPrelude pragma (#7089) (Albert + Krewinkel) + + * Benchmarks + + + Use the lighter-weight tasty-bench instead of criterion. + + Run writer benchmarks for binary formats too. + + Alphabetize benchmarks. + + Don't run benchmarks for bibliography formats + (yet; we need a special input for them). + + Show allocation data + + Clean up benchmark code. + + Allow specifying patterns using `-p blah'. + + * trypandoc: add 2 second timeout. + + * Use `-split-sections` in creating linux release binary. + This reduces executable size significantly (by about 30%). + + * Remove `weigh-pandoc`. It's not really useful any more, now that our + regular benchmarks include data on allocation. + + * Improve linux package build process and add script to + automate building an arm64 binary package. + + +## pandoc 2.11.4 (2021-01-22) + + * Add `biblatex`, `bibtex` as output formats (closes #7040). + + * Recognize more extensions as markdown by default (#7034): + `mkdn`, `mkd`, `mdwn`, `mdown`, `Rmd`. + + * Implement defaults file inheritance (#6924, David Martschenko). + Allow defaults files to inherit options from other defaults files by + specifying them with the following syntax: + `defaults: [list of defaults files or single defaults file]`. + + * Fix infinite HTTP requests when writing epubs from URL source (#7013). + Due to a bug in code added to avoid overwriting the cover image + if it had the form `fileX.YYY`, pandoc made an endless sequence + of HTTP requests when writing epub with input from a URL. + + * Org reader: + + + Allow multiple pipe chars in todo sequences (Albert Krewinkel, #7014). + Additional pipe chars, used to separate "action" state from "no further + action" states, are ignored. E.g., for the following sequence, both + `DONE` and `FINISHED` are states with no further action required: + `#+TODO: UNFINISHED | DONE | FINISHED`. + + Restructure output of captioned code blocks (Albert Krewinkel, #6977). + The Div wrapper of code blocks with captions now has the class + "captioned-content". The caption itself is added as a Plain block + inside a Div of class "caption". This makes it easier to write filters + which match on captioned code blocks. Existing filters will need to be + updated. + + Mark verbatim code with class `verbatim` (Dimitri Sabadie, #6998). + + * LaTeX reader: + + + Handle `filecontents` environment (#7003). + + Put contents of unknown environments in a Div when `raw_tex` is not + enabled (#6997). (When `raw_tex` is enabled, the whole environment is + parsed as a raw block.) The class name is the name of the environment. + Previously, we just included the contents without the surrounding Div, + but having a record of the environment's boundaries and name can be + useful. + + * Mediawiki reader: + + + Allow space around storng/emph delimiters (#6993). + + * New module Text.Pandoc.Writers.BibTeX, exporting + writeBibTeX and writeBibLaTeX. [API change] + + * LaTeX writer: + + + Revert table line height increase in 2.11.3 (#6996). + In 2.11.3 we started adding `\addlinespace`, which produced less dense + tables. This wasn't an intentional change; I misunderstood a comment in + the discussion leading up to the change. This commit restores the earlier + default table appearance. Note that if you want a less dense table, you + can use something like `\def\arraystretch{1.5}` in your header. + + * EPUB writer: + + + Adjust internal links to identifiers defined in raw HTML sections + after splitting into chapters (#7000). + + Recognize `Format "html4"`, `Format "html5"` as raw HTML. + + Adjust internal links to images, links, and tables after splitting into + chapters. Previously we only did this for Div and Span and Header + elements (see #7000). + + * Ms writer: + + + Don't justify text inside table cells. + + * JATS writer: + + + Use `<element-citation>` if `element_citations` + extension is enabled (Albert Krewinkel). + + Fix citations (Albert Krewinkel, #7018). By default + we use formatted citations. + + Ensure that `<disp-quote>` is always wrapped in `<p>` (#7041). + + * Markdown writer: + + + Cleaned up raw formats. We now react appropriately + to `gfm`, `commonmark`, and `commonmark_x` as raw formats. + + * RST writer: + + + Fix bug with dropped content from inside spans with a class in + some cases (#7039). + + * Docx writer: + + + Handle table header using styles (#7008). Instead of hard-coding + the border and header cell vertical alignment, we now let this + be determined by the Table style, making use of Word's + "conditional formatting" for the table's first row. For + headerless tables, we use the tblLook element to tell Word + not to apply conditional first-row formatting. + + * Commonmark writer: + + + Implement start number on ordered lists (#7009). Previously they always + started at 1, but according to the spec the start number is respected. + + * HTML writer: + + + Fix implicit_figure at end of footnotes (#7006). + + * ConTeXt template: Remove `\setupthinrules` from default template. + The width parameter this used is not actually supported, + and the command didn't do anything. + + * Text.Pandoc.Extensions: + + + Add `Ext_element_citations` constructor (Albert Krewinkel). + + * Text.Pandoc.Citeproc.BibTeX: New unexported function + `writeBibtexString`. + + * Text.Pandoc.Citeproc: + + + Use finer grained imports (Albert Krewinkel). + + Factor out and export `getStyle` [API change]. + + Export `getReferences` [API change, #7106]. + + Factor out getLang. + + * Text.Pandoc.Parsing: modify `gridTableWith'` for headerless tables. + If the table lacks a header, the header row should be an empty + list. Previously we got a list of empty cells, which caused + an empty header to be emitted instead of no header. In LaTeX/PDF + output that meant we got a double top line with space between. + + * ImageSize: use `viewBox` for SVG if no length, width attributes (#7045). + This change allows pandoc to extract size information from more SVGs. + + * Add simple default.nix. + + * Use commonmark 0.1.1.3. + + * Use citeproc 0.3.0.5. + + * Update default CSL to use latest chicago-author-date.csl. + + * CONTRIBUTING.md: add note on GNU xargs. + + * MANUAL.txt: + + + Update description of `-L`/`--lua-filter`. + + Document use of citations in note styles (#6828). + +## pandoc 2.11.3.2 (2020-12-29) + + * HTML reader: use renderTags' from Text.Pandoc.Shared (Albert Krewinkel). + A side effect of this change is that empty `<col>` elements are written + as self-closing tags in raw HTML blocks. + + * Asciidoc writer: Add support for writing nested tables (#6972, timo-a). + Asciidoc supports one level of nesting. If deeper tables are to be + written, they are omitted and a warning is issued. + + * Docx writer: fix nested tables with captions (#6983). + Previously we got unreadable content, because docx seems + to want a `<w:p>` element (even an empty one) at the end of + every table cell. + + * Powerpoint writer: allow arbitrary OOXML in raw inline elements + (Albert Krewinkel). The raw text is now included verbatim in the + output. Previously is was parsed into XML elements, which prevented + the inclusion of partial XML snippets. + + * LaTeX writer: support colspans and rowspans in tables (#6950, + Albert Krewinkel). Note that the multirow package is needed for + rowspans. It is included in the latex template under a variable, + so that it won't be used unless needed for a table. + + * HTML writer: don't include p tags in CSL bibliography entries + (#6966). Fixes a regression in 2.11.3. + + * Add `meta-description` variable to HTML templates (#6982). This + is populated by the writer by stringifying the `description` + field of metadata (Jerry Sky). The `description` meta tag will + make the generated HTML documents more complete and SEO-friendly. + + * Citeproc: fix handling of empty URL variables (`DOI`, etc.). + The `linkifyVariables` function was changing these to links + which then got treated as non-empty by citeproc, leading + to wrong results (e.g. ignoring nonempty URL when empty DOI is present). + See jgm/citeproc#41. + + * Use citeproc 0.3.0.3. Fixes an issue in author-only citations when + both an author and translator are present, and an issue with + citation group delimiters. + + * Require texmath 0.12.1. This improves siunitx support in math, + fixes bugs with `\*mod` family operators and arrays, and avoids + italicizing symbols and operator names in docx output. + + * Ensure that the perl interpreter used for filters with `.pl` + extension (wuffi). + + * MANUAL: note that textarea content is never parsed as Markdown + (Albert Krewinkel). + + +## pandoc 2.11.3.1 (2020-12-18) + + * Added some missing files to extra-source-files and data + files, so they are included in the sdist tarball. Closes #6961. + Cleaned up some extraneous data and test files, and added + a CI check to ensure that the test and data files included + in the sdist match what is in the git repository. + + * Use citeproc 0.3.0.1, which avoids removing nonbreaking + space at the end of the `initialize-with` attribute. (Some + journals require nonbreaking space after initials, and this + makes that possible.) + +## pandoc 2.11.3 (2020-12-17) + + * With `--bibliography` (or `bibliography` in metadata), a + URL may now be provided, and pandoc will fetch the resource. + In addition, if a file path is provided and it is not + found relative to the working directory, the resource + path will be searched (#6940). + + * Add `sourcepos` extension for `commonmark`, `gfm`, `commonmark_x` + (#4565). With the `sourcepos` extension set set, `data-pos` + attributes are added to the AST by the commonmark reader. No other + readers are affected. The `data-pos` attributes are put on elements + that accept attributes; for other elements, an enlosing Div or Span + is added to hold the attributes. + + * Change extensions for `commonmark_x`: replace `auto_identifiers` + with `gfm_auto_identifiers` (#6863). `commonmark_x` never actually + supported `auto_identifiers` (it didn't do anything), because the + underlying library implements gfm-style identifiers only. Attempts + to add the `auto_identifiers` extension to `commonmark` will now + fail with an error. + + * HTML reader: + + + Split module into several submodules (Albert Krewinkel). Reducing + module size should reduce memory use during compilation. + + Support advanced table features (Albert Krewinkel): + block level content in captions, row and colspans, + body headers, row head columns, footers, attributes. + + Disable round-trip testing for tables. Information for cell + alignment in a column is not preserved during round-trips (Albert + Krewinkel). + + Allow finer grained options for tag omission (Albert Krewinkel). + + Simplify list attribute handling (Albert Krewinkel). + + Pay attention to `lang` attributes on body element (#6938). + These (as well as `lang` attributes on the html element) should update + lang in metadata. + + Retain attribute prefixes and avoid duplicates (#6938). + Previously we stripped attribute prefixes, reading `xml:lang` as + `lang` for example. This resulted in two duplicate `lang` + attributes when `xml:lang` and `lang` were both used. This commit + causes the prefixes to be retained, and also avoids invald + duplicate attributes. + + * Commonmark reader: + + + Refactor `specFor`. + + Set input name to `""` to avoid clutter in sourcepos output. + + * Org reader: + + + Parse `#+LANGUAGE` into `lang` metadata field (#6845, Albert + Krewinkel). + + Preserve targets of spurious links (#6916, Albert + Krewinkel). Links with (internal) targets that the reader doesn't + know about are converted into emphasized text. Information on the + link target is now preserved by wrapping the text in a Span of class + `spurious-link`, with an attribute `target` set to the link's + original target. This allows to recover and fix broken or unknown + links with filters. + + * DocBook reader: + + + Table text width support (#6791, Nils Carlson). + Table width in relation to text width is not natively supported + by docbook but is by the docbook `fo` stylesheets through an XML + processing instruction, `<?dbfo table-width="50%"?>`. + + * LaTeX reader: + + + Improve parsing of command options (#6869, #6873). + In cases where we run into trouble parsing inlines til the + closing `]`, e.g. quotes, we return a plain string with the + option contents. Previously we mistakenly included the brackets + in this string. + + Preserve center environment (#6852, Igor Pashev). + The contents of the `center` environment are put in a `Div` + with class `center`. + + Don't parse `\rule` with width 0 as horizontal rule. These are + sometimes used as spacers in LaTeX. + + Don't apply theorem default styling to a figure inside (#6925). + If we put an image in italics, then when rendering to Markdown + we no longer get an implicit figure. + + * Dokuwiki reader: + + + Handle unknown interwiki links better (#6932). + DokuWiki lets the user define his own Interwiki links. Previously + pandoc reacted to these by emitting a google search link, which is + not helpful. Instead, we now just emit the full URL including the + wikilink prefix, e.g. `faquk>FAQ-mathml`. This at least gives users + the ability to modify the links using filters. + + * Markdown writer: + + + Properly handle boolean values in writing YAML metadata (#6388). + + Ensure that a new csl-block begins on a new line (#6921). + This just looks better and doesn't affect the semantics. + + * RST writer: + + + Better image handling (#6948). An image alone in its paragraph + (but not a figure) is now rendered as an independent image, with an + `alt` attribute if a description is supplied. An inline image that + is not alone in its paragraph will be rendered, as before, using a + substitution. Such an image cannot have a "center", "left", or + "right" alignment, so the classes `align-center`, `align-left`, or + `align-right` are ignored. However, `align-top`, `align-middle`, + `align-bottom` will generate a corresponding `align` attribute. + + * Docx writer: + + + Keep raw openxml strings verbatim (#6933, Albert Krewinkel). + + Use Content instead of Element. This allows us to inject + raw OpenXML into the document without reparsing it into an + Element, which is necessary if you want to inject an open + tag or close tag. + + Fix bullets/lists indentation, so that the first level is slightly + indented to the right instead of right on the margin (cholonam). + + Support bold and italic in "complex script" (#6911). + Previously bold and italics didn't work properly in LTR + text. This commit causes the w:bCs and w:iCs attributes + to be used, in addition to w:b and w:i, for bold and + italics respectively. + + * ICML writer: + + + Fix image bounding box for custom widths/heighta (Mauro Bieg, #6936). + + * LaTeX writer: + + + Improve table spacing (#6842, #6860). + Remove the `\strut` that was added at the end of minipage + environments in cells. Replace `\tabularnewline` with + `\\ \addlinespace`. + + Improve calculation of column spacing (#6883). + + Extract table handling into separate module (Albert Krewinkel). + + Fix bug with nested `csl-` display Spans (#6921). + + Improve longtable output (#6883). Don't create minipages for + regular paragraphs. Put width and alignment information in the + longtable column descriptors. + + * OpenDocument writer: + + + Support for table width as a percentage of text width + (#6792, Nils Carson). + + Implement Div and Span ident support (#6755, Nils Carson). + Spans and Divs containing an ident in the Attr will become bookmarks + or sections with idents in OpenDocument format. + + Add two extensions, `xrefs_name` and `xrefs_number` (#6774, Nils + Carlson). Links to headings, figures and tables inside the + document are substituted with cross-references that will use the + name or caption of the referenced item for `xrefs_name` or the + number for `xrefs_number`. For the `xrefs_number` to be useful + heading numbers must be enabled in the generated document and + table and figure captions must be enabled using for example the + `native_numbering` extension. In order for numbers and reference + text to be updated the generated document must be refreshed. + + * JATS writer: + + + Support advanced table features (Albert Krewinkel). + + Support author affiliations (#6687, Albert Krewinkel). + + * Docbook writer: + + + Use correct id attribute consistently (Jan Tojnar). + DocBook5 should always use `xml:id` instead of `id`. + + Handle admonition titles better (Jan Tojnar). + Docbook reader produces a `Div` with `title` class for `<title>` + element within an “admonition” element. Markdown writer then turns + this into a fenced div with `title` class attribute. Since fenced + divs are block elements, their content is recognized as a + paragraph by the Markdown reader. This is an issue for Docbook + writer because it would produce an invalid DocBook document from + such AST – the `<title>` element can only contain “inline” + elements. Handle this special case separately by unwrapping + the paragraph before creating the `<title>` element. + + Add XML namespaces to top-level elements (#6923, Jan Tojnar). + Previously, we only added `xmlns` attributes to chapter + elements, even when running with `--top-level-division=section`. + These namespaces are now added to part and section elements too, + when they are the selected top-level divisions. + We do not need to add namespaces to documents produced with + `--standalone` flag, since those will already have xmlns attribute on + the root element in the template. + + * HTML writer: + + + Fix handling of nested `csl-` display spans (#6921). + Previously inner Spans used to represent CSL display attributes were + not rendered as div tags as intended. + + * EPUB writer: + + + Include title page in landmarks (#6919). + Note that the toc is also included if `--toc` is specified. + + Add frontmatter type on body element for nav.xhtml (#6918). + + * EPUB templates: use preserveAspectRatio="xMidYMid" for cover image (#6895, + Shin Sang-jae). This change affects both the epub2 and the epub3 + templates. It avoids distortion of the cover image by requiring that the + aspect ratio be preserved. + + * LaTeX template: + + + Include `csquotes` package if `csquotes` variable set. + + Put back `amssymb`. We need it for checkboxes in todo lists, + and maybe for other things. In this location it seems compatible + with the cases that prompted #6469 and PR #6762. + + Disable language-specific shorthands in babel (#6817, #6887). + Babel defines "shorthands" for some languages, and these can + produce unexpected results. For example, in Spanish, `1.22` + gets rendered as `122`, and `et~al.` as `etal`. + One would think that babel's `shorthands=off` option (which + we were using) would disable these, but it doesn't. So we + remove `shorthands=off` and add some code that redefines + the shorthands macro. Eventually this will be fixed in babel, + I hope, and we can revert to something simpler. + + * JATS template: allow array of persistent institute ids in `pid` + (Albert Krewinkel). + + * Text.Pandoc.Parsing: minor code and efficiency improvements. + + * Text.Pandoc.Extension: + + + Add `Ext_sourcepos` constructor for `Extension` [API change]. + + Add `Ext_xrefs_name` and `Ext_xrefs_number` constructors for + `Extension` (Nils Carson) [API change]. + + * Text.Pandoc.Citeproc: + + + Fix truncation of `[Citation]` list in `Cite` inside footnotes (#6890). + This affected author-in-text citations in footnotes. It didn't cause + problems for the printed output, but for filters that expected the + citation id and other information. + + Allow the use of both inline and external references (#6951), + as with pandoc-citeproc. References defined in the document's + metadata take priority over references with the same id defined in + an external bibliography. + + Use `fetchItem` to get external bibliography (#6940). + + Ensure that BCP47 lang codes can be used. We ignore the variants + and just use the base lang code and country code when passing off + to citeproc. + + Citeproc BibTeX parser: revert change in `getRawField` + which was made (for reasons forgotten) when transferring + this code from pandoc-citeproc. The change led to `--` in + URLs being interpreted as en-dashes, which is unwanted (#6874). + + * Text.Pandoc.ImageSize: + + + Default to DPI 72 if the format specifies DPI of 0 (#6880). + This shouldn't happen, in general, but it can happen with + JPEGs that don't conform to the spec. Having a DPI of 0 + will blow up size calculations (division by 0). + + ImageSize: use JuicyPixels to determine size for png, jpeg, and + gif, instead of doing our own binary parsing (#6936). This + gives more reliable results. + + * Text.Pandoc.CSS: + + + Remove `foldOrElse` (internal module) (Albert Krewinkel). + + * Use skylighting 0.10.2 (#6625). + + * Use citeproc 0.3. This fixes issues with references with + duplicate ids (jgm/citeproc#36). + + * Use doctemplates 0.9. This fixes issues with boolean + metadata values in the Markdown writer (#6388) + and in `meta-json` (#6650). It also fixes + issues with nested for loops in templates. + + * Add translations zh-Hans.yaml and zh-Hant.yaml (#6904, #6909, + Kolen Cheung, taotieren). + + * Add tests: True to cabal.project. + This fixes some CI failures for cabal. + + * Normalize test/tables/*.native (#6888, Kolen Cheung). + + * Move executable to `app` directory to avoid problems with cabal repl. + + * CONTRIBUTING: add section "How can I help?" (#6892, Albert Krewinkel). + Also adds a paragraph aimed at highlighting the importance of feature + maintenance. + + * MANUAL: Document that --number-sections works in `ms` (#6935). + + +## pandoc 2.11.2 (2020-11-19) + + * Default to using ATX (`##`-style) headings for Markdown output + (#6662, Aner Lucero). Previously we used Setext (underlined) headings + by default for levels 1--2. + + * Add option `--markdown-headings=atx|setext`, and deprecate + `--atx-headers` (#6662, Aner Lucero). + + * Support `markdown-headings` in defaults files. + + * Fix corner case in YAML metadata parsing (#6823). Previously YAML + metadata would sometimes not get recognized if a field ended with a + newline followed by spaces. + + * `--self-contained`: increase coverage (#6854). + Previously we only self-contained attributes for certain tag names + (`img`, `embed`, `video`, `input`, `audio`, `source`, `track`, + `section`). Now we self-contain any occurrence of `src`, + `data-src`, `poster`, or `data-background-image`, on any tag; and + also `href` on `link` tags. + + * Markdown reader: + + + Fix detection of locators following in-text citations. + Prevously, if we had `@foo [p. 33; @bar]`, the `p. 33` would be + incorrectly parsed as a prefix of `@bar` rather than a suffix of + `@foo`. + + Improve period suppression algorithm for citations in notes + in note citation styles (#6835). + + Don't increment `stateNoteNumber` for example list references. + This helps with #6836 (a bug in which example list references + disturb calculation of citation note number and affect when + `ibid` is triggered). + + * LaTeX reader: + + + Move `getNextNumber` from Readers.LaTeX to Readers.LaTeX.Parsing. + + Fix negative numbers in siunitx commands. A change in pandoc 2.11 + broke negative numbers, e.g. `\SI{-33}{\celcius}` or `\num{-3}`. + This fixes the regression. + + * DocBook reader: drop period in formalpara title + and put it in a div with class `formalpara-title`, so that + people can reformat with filters (#6562). + + * Man reader: improve handling of `.IP` (#6858). We now better handle + `.IP` when it is used with non-bullet, non-numbered lists, creating a + definition list. We also skip blank lines like groff itself. + + * Bibtex reader: fall back on `en-US` if locale for LANG not found. + This reproduces earlier pandoc-citeproc behavior (jgm/citeproc#26). + + * JATS writer: + + + Wrap all tables (Albert Krewinkel). + All `<table>` elements are put inside `<table-wrap>` elements, as the + former are not valid as immediate child elements of `<body>`. + + Move Table handling to separate module (Albert Krewinkel). + Adds two new unexported modules: + Text.Pandoc.Writers.JATS.Types, Text.Pandoc.Writers.JATS.Table. + + * Org writer: + + + Replace org #+KEYWORDS with #+keywords (TEC). + As of ~2 years ago, lower case keywords became the standard (though + they are handled case insensitive, as always). + + Update org supported languages and identifiers according to the + current list contained in + <https://orgmode.org/worg/org-contrib/babel/languages/index.html> + (TEC). + + * Only use `filterIpynbOutput` if input format is ipynb (#6841). + Before this change content could go missing from divs with class + `output`, even when non-ipynb was being converted. + + * When checking reader/writer name, check base name now that we permit + extensions on formats other than markdown. + + * Text.Pandoc.PDF: Fix `changePathSeparators` for Windows (#6173). + Previously a path beginning with a drive, like `C:\foo\bar`, was + translated to `C:\/foo/bar`, which caused problems. + With this fix, the backslashes are removed. + + * Text.Pandoc.Logging: + + + Add constructor `ATXHeadingInLHS` to `LogMessage` [API change]. + + Add constructor `EnvironmentVariableUndefined` to + `LogMessage` [API change]. + + * Fix error that is given when people specify `doc` output (#6834, + gison93). + + * LaTeX template: add a `\break` after parbox in `CSLRightInline`. + This should fix spacing problems between entries with numeric styles. + Also fix number of params on `CSLReferences`. + + * reveal.js template: Put quotes around `controlsLayout`, + `controlsBackArrows`, and `display`, since these require strings. + Add `showSlideNumber`, `hashOneBasedIndex`, `pause`. + + * Use citeproc 0.2. This fixes a bug with title case around parentheses. + + * pandoc.cabal: remove 'static' flag. + This isn't really necessary and can be misleading (e.g. on macOS, + where a fully static build isn't possible). cabal's new option + `--enable-executable-static` does the same. On stack you can add + something like this to the options for your executable in package.yaml: + + ld-options: -static -pthread + + * Remove obsolete bibutils flag setting in `linux/make_artifacts.sh`. + + * Manual: + + + Correct `link-citation` -> `link-citations`. + + Add a sentence about `pagetitle` for HTML (#6843, Alex Toldaiev). + + * INSTALL.md: Remove references to `pandoc-citeproc` (#6857). + + * CONTRIBUTING: describe hlint and how it's used (#6840, Albert + Krewinkel). + +## pandoc 2.11.1.1 (2020-11-07) + + * Citeproc: improve punctuation in in-text note citations (#6813). + Previously in-text note citations inside a footnote would sometimes have + the final period stripped, even if it was needed (e.g. on the end of + 'ibid'). + + * Use citeproc 0.1.1.1. This improves the decision about when + to use `ibid` in cases where citations are used inside + a footnote (#6813). + + * Support `nocase` spans for `csljson` output. + + * Require latest commonmark, commonmark-extensions. + This fixes a bug with `autolink_bare_uris` and commonmark. + + * LaTeX reader: better handling of `\\` inside math in table cells (#6811). + + * DokuWiki writer: translate language names for code elements + and improve whitespace (#6807). + + * MediaWiki writer: use `syntaxhighlight` tag instead of deprecated + `source` for highlighted code (#6810). Also support `startFrom` + attribute and `numberLines`. + + * Lint code in PRs and when committing to master (#6790, + Albert Krewinkel). + + * doc/filters.md: describe technical details of filter invocations (#6815, + Albert Krewinkel). + + +## pandoc 2.11.1 (2020-11-03) + + * DocBook Reader: fix duplicate bibliography bug (#6773, Nils Carlson). + + * HTML reader: + + + Parse contents of iframes (#6770). + + Parse inline svg as image unless `raw_html` is set in the reader (in + which case the svg is passed through as raw HTML) (#6770). + + * LaTeX reader: + + + Fix bug parsing macro arguments (#6796). If `\cL` is + defined as `\mathcal{L}`, and `\til` as `\tilde{#1}`, then + `\til\cL` should expand to `\tilde{\mathcal{L}}`, but + pandoc was expanding it to `\tilde\mathcal{L}`. This is + fixed by parsing the arguments in "verbatim mode" when the + macro expands arguments at the point of use. + + Properly support optional (cite) argument for + `\blockquote` from `csquotes` (#6802). + + * LaTeX writer: Improved calculation of table column widths. + We now have LaTeX do the calculation, using `\tabcolsep`. + So we should now have accurate relative column widths no + matter what the text width. The default template has been modified to load + the calc package if tables are used. + + * HTML writer: Fix duplicate "class" attribute for table + rows (Andy Morris). + + * Text.Pandoc.Filter: allow shorter YAML representation of Citeproc + (Albert Krewinkel). The map-based YAML representation of filters expects + `type` and `path` fields. The path field had to be present for all filter + types, but is not used for citeproc filters. The field can now be omitted + when type is "citeproc", as described in the MANUAL. + + * Text.Pandoc.Error: Add `PandocBibliographyError` constructor + for `PandocError` [API change]. This ensures that bibliography parsing + errors generate messages that include the bibliography file name -- + otherwise it can be quite mysterious where it is coming from. + + * Citeproc: properly handle `csl` field with `data:` URI (#6783). + This is used with the JATS writer, so this fixes a regression + in pandoc 2.11 with JATS output and citeproc. + + * Allow `citation-abbreviations` in defaults file. + + * JATS templates: ensure `jats_publishing` output is valid + (Albert Krewinkel). + + * LaTeX template: Fix `CSLRightInline`, so that it does not + run over the right margin. + + * HTML template: default CSS tweaks (Mauro Bieg and John + MacFarlane). + + - Fix margin before codeblock + - Add `monobackgroundcolor` variable, making the background color + and padding of code optional. + - Ensure that backgrounds from highlighting styles take precedence over + monobackgroundcolor + - Remove list markers from TOC + - Add margin-bottom where needed + - Remove italics from blockquote styling + - Change borders and spacing in tables to be more consistent with other + output formats + - Style h5, h6 + - Set font-size for print media to 12pt. + - Reduce interline space. + - Reduce interparagraph space. + - Reduce line width. + - Remove the special `line-height: 1` for table cells. + - Remove the special line-height for pre. + - Ensure that there is a bit more space before a heading + than after. + - Slightly reduced space after title header. + - Add CSS example to MANUAL + + * man template: Change comment that triggers `tbl` from + `.\"t` to `'\" t`, as specified in groff_man(7) (#6803). + + * Use latest commonmark, commonmark-extensions. + This fixes a bug with nested blocks in footnotes with the + `footnote` extension to `commonmark`. See jgm/commonmark-hs#63. + + * Citeproc: use comma for in-text citations inside footnotes. + When an author-in-text citation like `@foo` occurs in a footnote, + we now render it with: `AUTHOR NAME + COMMA + SPACE + REST`. + Previously we rendered: `AUTHOR NAME + SPACE + "(" + REST + ")"`. + This gives better results. Note that normal citations are still + rendered in parentheses. + + * Use latest citeproc: + + + citeproc no longer capitalizes notes, so we do it + in pandoc when appropriate. + + Closes #6783. + + * Clarify manual on `--track-changes` (#6801). + + * Add `doc/jats.md` to document pandoc's handling of JATS + (#6794, Albert Krewinkel). + + * Fix code example in lua-filters.md (#6795). + +## pandoc 2.11.0.4 (2020-10-21) + + * Commonmark writer: fix regression with fenced divs (#6768). + Starting with 2.10.1, fenced divs no longer render with + HTML div tags in commonmark output. This is a regression + due to our transition from cmark-gfm. This commit fixes it. + + * Use released version of citeproc. (This fixes a mis-step + in the 2.11.0.3 release, which is now deprecated.) + + * Use latest sylighting, with support for `groovy`. + + * Document that --html-q-tags requires the smart extension on the reader + (#6766). + +## pandoc 2.11.0.3 (2020-10-20) + + * Use latest citeproc (closes #6765). This fixes a problem with + author-in-text citations for references including both an author + and an editor. Previously, both were included in the text, but only + the author should be. + + * With `--citeproc`, ensure that the final period is removed when + citations that occur in notes in note-based styles get put in + parentheses. See jgm/citeproc#20. + + * Normalize rewritten image paths with `--extract-media` (#6761). + This change will avoid mixed paths like this one when + `--extract-media` is used with a Word file: + `![](C:\Git\TIJ4\Markdown/media/image30.wmf)`. Instead we'll get + `![](C:\Git\TIJ4\Markdown`media`image30.wmf)`. + + * Modify `--version` output. Use space more efficiently and report the + citeproc and ipynb versions, along with skylighting, texmath, and + pandoc-types. Drop the word "default" before "user data directory." + + * DocBook reader: bibliomisc and anchor support (#6754, Nils Carlson). + Also ensure that bibliodiv without a title no longer results in + an empty Header. + + * ConTeXt template: adds `\setupinterlinespace` to fonts larger + than normal (#6763, Denis Maier). + + * LaTeX template: Do not load amssymb if not needed (#6469, Angelo Peronio). + See <https://tex.stackexchange.com/a/549938>. + + * Relax upper bound on hslua, allow hslua-1.3.* (Albert Krewinkel). + + * MANUAL: + + + Improve explanation of "indent" variable (#6767, Cyrus Yip). + + Remove org from list of input formats supporting raw_tex (#6753, + Nick Fleisher). + + +## pandoc 2.11.0.2 (2020-10-15) + + * Fix handling of `xdata` in bibtex/biblatex bibliographies (#6752). + + * Fix some small typos in the API documentation (#6751, Michael Hoffmann). + + * Require citeproc 0.1.0.2. This fixes a regression from pandoc-citeproc + involving spacing between components of a reference in certain styles + (e.g. `cell.csl`). + + * Fix typos in comments, doc strings, error messages, and tests + (Albert Krewinkel, #6738). + +## pandoc 2.11.0.1 (2020-10-13) + + * LaTeX reader: support more acronym commands (#6746): + `\acl`, `\aclp`, and capitalized versions of already + supported commands. + + * Commonmark reader: add `pipe_table` extension *after* defaults (#6739). + Otherwise we get bad results for non-table, non-paragraph + lines containing pipe characters. + + * Markdown writer: Fix autolinks rendering for gfm (#6740). + Previously, autolinks rendered as raw HTML, due to the + `class="uri"` added by pandoc's markdown reader. + + * LaTeX writer: + + + Escape option values in lstlistings environment (#6742). + + Fix handling of `lang` `pt-BR` (#2953). For polyglossia we now + use `\setmainlanguage[variant=brazilian]{portuguese}` and for babel + `\usepackage[shorthands=off,main=brazilian]{babel}`. + + * Depend on latest citeproc (0.1.0.1). + + + This fixes the citation number issue with ieee.csl and other + styles that do not explicitly sort bibliographies (#6741). (Pandoc + was numbering them by their order in the bibliography file, + rather than the order cited, as required by the CSL spec.) + + Fixes groupin/collapsing with citation items with prefixes. + + * default.latex: fix `CSLReference` macro definition. + + * Fix MANUAL.txt CSL JSON conversion examples. + + * Fix spelling errors in changelog, MANUAL.txt, `doc/org.md` (#6738). + + +## pandoc 2.11 (2020-10-11) + + * Add `--citeproc` (`-C`) option to trigger built-in citation processing. + It is no longer necessary to use the external `pandoc-citeproc` + filter. `--citeproc` behaves like a filter and can be positioned + relative to other filters as they appear on the command line. + + The new built-in citation processing uses the citeproc library, + a reimplementation of CSL citation processing that fixes many + of the shortcomings of pandoc-citeproc. In general, citation + processing should work much the same as it did with pandoc-citeproc, + but with greater fidelity to CSL styles and better performance. + (The tests from the pandoc-citeproc package have been carried + over to pandoc.) The following differences should be noted: + + - At this point, only some of the writers (HTML, ms, LaTeX) properly + interpret CSL display styles. You should get decent output in + all formats (at least as good as with pandoc-citeproc), but + indentation and block-alignment may not be right. + + - pandoc-citeproc searches the `~/.csl` directory for `.csl` + styles. Pandoc instead searches the `csl` subdirectory of + the pandoc user data directory (e.g., `~/.pandoc/csl` or + `~/.local/share/pandoc/csl`). Users who already keep + CSL styles in `~/.csl` may find it convenient to add a + symlink. + + - Some of the bibliography formats supported by pandoc-citeproc (via + hs-bibutils) are no longer supported: Copac, EndNote, + ISI, MEDLINE, MODS, and RIS. If you use one of these formats, + you may use the `bibutils` utility to convert to BibLaTeX. + We now support only BibTeX, BibLaTeX, CSL JSON, + and pandoc's YAML/Markdown analogue of CSL JSON. + + - pandoc-citeproc would always retrieve the independent parent + of a dependent style by doing an HTTP request. pandoc will + now first seek the independent parent locally (in the resource + path or in the `csl` subdirectory of the pandoc user data + directory) before resorting to HTTP. In addition, you may + omit the `.csl` extension, e.g. `--csl zoology`. + + - Using the `--bibliography` option (or including + `bibliography` in YAML metadata) no longer triggers + citation processing implicitly: one must always use the + `--citeproc` option if citation processing is wanted. + + * Add `csljson` as and input and output format. This allows pandoc + to convert between `csljson` and other bibliography formats + (e.g. `-f csljson -t markdown -s` or `-f bibtex -t csljson`), + and to generate formatted versions of CSL JSON bibliographies + (e.g., `pandoc -f csljson --citeproc pl.json -o pl.pdf`). + + * Added `bibtex`, `biblatex` as input formats. This allows pandoc + to convert between BibLaTeX and BibTeX and other bibliography formats, + and to generated formatted versions of BibTeX/BibLaTeX bibliographies + (e.g., `pandoc -f biblatex --citeproc pl.bib -o pl.pdf`). + + * Raise informative errors when YAML metadata parsing fails (#6730). + Previously the command would succeed, returning empty metadata, + with no errors or warnings. + + * Sort languages in `--list-highlight-languages` output (#6718, + Albert Krewinkel). Languages were previously sorted by their + long name, which leads to unexpected results). + + * Add CSS to default HTML template (#6601, Mauro Bieg). This + greatly improves the default typography in pandoc's HTML + output. The CSS is sensitive to a number of variables + (e.g. `mainfont`, `fontsize`, `linestretch`): see the manual for + details. To restore the earlier, more spartan output, you can + disable this with `-M document-css=false`. + + * Support `--toc-depth` option for ODT writer (#6696, niszet). + + * Fix issues with Windows UNC paths with some options (#5127). + + * Remove `fenced_code_blocks` and `backtick_code_blocks` from allowed + `commonmark` and `gfm` extensions. These shouldn't really be counted + as extensions, because they can't be disabled in commonmark. + Adjust markdown writer to check for the commonmark variant in addition + to extensions. + + * Add these extensions to `gfm` and `commonmark`: + `fenced_code_blocks`, `backtick_code_blocks`, `fenced_code_attributes`. + These can't really be disabled in the reader, but they need to be enabled + in the writer or we just get indented code. + + * Make sure proper set of extensions is recognized for `commonmark_x`. + + * Allow `gfm_auto_identifiers`, `ascii_identifiers` extensions for `docx`. + + * Markdown reader: + + + Add `Maybe FilePath` parameter to `yamlToMeta` [API change]. + + Export `yamlToRefs` [API change], a version of `yamlToMeta` + specialized to references. + + Set `citationNoteNum` accurately in citations. + + Revise abbreviation support. Don't insert a nonbreaking space after a + potential abbreviation if it comes right before a note or citation. + This causes problems for citeproc's moving of note citations. + + * LaTeX reader: + + + Support missing siunitx commands (#6658). + + Support `squared`, `cubed`, `tothe` in siunitx (#6657). + + Improved uncertainty handling in slunitx. + + Factored out siunitx stuff into separate unexposed module. + + Fix improper empty cell filtering (#6689, Christian Despres). + + Fix parsing of "show name" in `\newtheorem` (#6734). + Previously we were just treating it as a string and + ignoring accents and formatting. + + Prevent wrong nesting of `\multirow` and `\multicolumn` table + cells (#6603, Laurent P. René de Cotret). + + Table cell parser not consuming spaces correctly (#6596, + Laurent P. René de Cotret). + + Change `SIRange` to `SIrange` (#6617, Emerson Harkin). + + Allow blank lines inside `\author` (#6324). + + * DocBook reader: + + + Don't squelch space at end of emphasis and other inline elements; + instead, move it outside the element (#6719). + + Implement table cell alignment (#6698, Nils Carlson). + + Implement column span support for tables (#6492, Nils Carlson). + + Update list of block level tags (#6610). + + + * JATS reader: + + + Don't squelch space at end of emphasis and other inline elements; + instead, move it outside the element (#6719). + + * RST reader: + + + Apply `.. class::` directly to following Header rather than creating + a surrounding Div (#6699). + + * Docx reader: + + + Allow empty dates in comments and tracked changes (#6726, Diego + Balseiro). + + * Markdown writer: + + + Be less aggressive about using quotes for YAML values, + allowing e.g. a quotation mark or bracket as long as it's not at the + beginning of the line. + + Use double quotes for YAML metadata (#6727). + + Sort YAML metadata keys in Markdown output case-insensitive. + + + * Asciidoc writer: + + + Support asciidoctor's block figures (#6538, argent0). + + * LaTeX writer: + + + Fix spacing issue with list in definition list. + When a list occurs at the beginning of a definition list definition, + it can start on the same line as the label, which looks bad. + Fix that by starting such lists with an `\item[]`. + + * HTML writer: + + + Support intermediate table headers (#5314, Albert Krewinkel). + + Support attributes on all table elements (Albert Krewinkel). + + Render table footers if present (#6314, Albert Krewinkel). + + Fix addition of `doc-biblioentry` role. + + Support colspans and rowspans in HTML tables (#6312, Albert Krewinkel). + + * ICML writer: + + + Support internal document links (#5541, Leonard Rosenthol). + + Changed default link state to invisible (#6676, Leonard Rosenthol). + + * Docx writer: + + + Better handle list items whose contents are lists (#5948, Michael + Hoffmann). If the first element of a bulleted or ordered list is + another list, then that first item would previously disappear if the + target format is docx. + + Separate adjacent tables (#4315). Word combines adjacent tables, + so to prevent this we insert an empty paragraph between two + adjacent tables. + + * Org writer: + + + Don't force blank line after headings (#6554). + + * OpenDocument writer: + + + Implement table cell alignment (#6700 Nils Carson, Mauro Bieg). + + New table cell support with row and column spans (#6682, Nils Carson). + + Syntax highlighting for inline code (#6711, niszet). + + * Add Text.Pandoc.Citeproc module, exporting `processCitations` + [API change]. This depends on several other, unexported + modules under Text.Pandoc.Citeproc. + + * Add module Text.Pandoc.Writers.CslJson, exporting `writeCslJson`. + [API change] + + * Add module Text.Pandoc.Readers.CslJson, exporting `readCslJson`. + [API change] + + * Add module Text.Pandoc.Readers.BibTeX, exporting `readBibTeX` and + `readBibLaTeX`. [API change] + + * Text.Pandoc.Filter: Add `CiteprocFilter` constructor to Filter. + [API change] This runs the processCitations transformation. + We need to treat it like a filter so it can be placed + in the sequence of filter runs (after some, before others). + In FromYAML, this is parsed from `citeproc` or `{type: citeproc}`, + so this special filter may be specified either way in a defaults file + (or by `citeproc: true`, though this gives no control of positioning + relative to other filters). + + * Add new exported module Text.Pandoc.Writers.AnnotatedTable [API change] + (#6655, Christian Despres). This module (which should generally + be imported qualified to avoid name conflicts) provides a + `Table` type that mirrors the structure of a pandoc `Table`, + but with added inferred information so that the writers do not have to + lay out tables themselves. The `toTable` and `fromTable` functions convert + between an annotated `Table` and a regular pandoc `Table`. In addition to + producing a `Table` with coherent and well-formed annotations, the + `toTable` function also normalizes its input table like the table + builder does. Tests ensure that `toTable` normalizes tables exactly + like the table builder, and that its annotations are coherent. + + * Text.Pandoc.Logging: + + + Remove unused `CouldNotParseYamlMetadata` constructor for `LogMessage` + [API change]. + + Add `CiteprocWarning` constructor to `LogMessage` [API change]. + + * Text.Pandoc.Readers.Metadata: export `yamlBsToRefs` [API change]. + These allow specifying an id filter so we parse only references + that are used in the document. + + * Text.Pandoc.Parsing: + + + Export ParseError [API change]. + + Add `stateInNote` and `stateNoteNumber` to `ParserState` + [API change]. These are used to populate note numbers for citation + processing. + + * Fix apparent typos in sample.lua (#6729, William Lupton). + Also make the writer less aggressive in escaping quotes. + + * Text.Pandoc.Options: + + + `defaultMathJaxURL`: use `tex-chtml-full` instead of `tex-mml-chtml` + (#6599, Kolen Cheung). This drops the MathML support (which we + don't need for HTML math rendering) and includes the full JavaScript, + which makes it possible to use `--self-contained` (though there may + still be issues if the required math fonts aren't available). This + change should also reduce latency in pages with lots of formulas. + + Add `/tex-chtml-full.js` to `defaultMathJaxURL` (#6593) Previously we + added this in processing command line options, but not in processing + defaults files, which was inconsistent. + + * epub.css: Fix cover page selectors and add note explaining their use + (#6649, a-vrma). + + * Add data files needed for Text.Pandoc.Citeproc: these include + `default.csl` in the data directory and a `citeproc` directory that + is only used at compile-time for biblatex localizations. Note that we've + added `file-embed` as a mandatory rather than a conditional + dependency, because of the biblatex localization files. + + * Lua filters: + + + Add SimpleTable for backwards compatibility (#6575, Albert Krewinkel). + A new type `SimpleTable` is made available to Lua filters. It is + similar to the `Table` type in pandoc versions before 2.10; + conversion functions from and to the new Table type are provided. + Old filters using tables now require minimal changes and can use, e.g., + + if PANDOC_VERSION > {2,10,1} then + pandoc.Table = pandoc.SimpleTable + end + + and + + function Table (tbl) + tbl = pandoc.utils.to_simple_table(tbl) + … + return pandoc.utils.from_simple_table(tbl) + end + + to work with the current pandoc version. + + + Make `attr` argument optional in `Table` constructor (Albert Krewinkel). + This changes the Lua API. It is highly unlikely for this change to affect + existing filters, since the documentation for the new Table constructor + (and type) was incomplete and partly wrong before. The Lua API is now + more consistent, as all constructors for elements with attributes now + take attributes as the last parameter. + + * MANUAL.txt: + + * Add a dedicated Citations section which consolidates the information + the manual used to contain about citation processing, and incorporates + some information formerly found in the pandoc-citeproc man page. + + Add note about lualatex using `selnolig`. + + Remove duplicate `seriespage` (#6568, Blake Eryx). + + Remove lists of support extensions for markdown variants (#6604). + Instead, offer the advice to use `--list-extensions=FORMAT`. + + Fix position of attributes in header (Albert Krewinkel). + + Delete obsolete section on compact and loose lists (#6684). + + + * doc/lua-filters.md: + + + Add info on how to debug Lua filters (#6732, Ian Max Andolina). + + Document Underline type and constructor (Albert Krewinkel). + + Document `body` field (Albert Krewinkel). + + Add missing header attribute + + Add missing Link.title field (Albert Krewinkel). + + Make the setting-the-date example conditional (the-solipsist). + This makes the example a bit more realistic. + + Remove outdated link table example. + + * doc/org.md: + + + Add section on tables (Albert Krewinkel). + + Add section on handling of unknown directives (Albert Krewinkel). + + * CONTRIBUTING.md: fix typo (#6584, Dmitry Volodin). + + * Use golden test framework for command tests. This means that + `--accept` can be used to update expected output. + + * Use the `smart` extension when generating pandoc's man page (#6613). + + * Release-candidate: don't build windows i386. + So far we haven't been able to figure out how to get + stack to use a 32-bit ghc. + + * Use `null` instead of deprecated `Builder.isNull`. + + * Makefile: + + + Fix macospkg target to fetch target from S3 artifacts. + + Fix pandoc-templates target to include all partials. + + * Remove duplicated dependency in pandoc.cabal (#6591, Felix Yan). + + * Sort build depends in pandoc.cabal alphabetically (#6691, + Albert Krewinkel). + + * Add .travis.yml for macos release candidate build (#6622). + We need to build the release candidate on Travis rather + than GitHub actions, because GH has macos 10.15, and + binaries compiled on that OS will not work with 10.13. + This build is only triggered on `rc/*` branches. + + * Remove instructions for building pandoc-citeproc from CI and + release binary build instructions. We will no longer distribute + pandoc-citeproc. + + * Fix math rendering in trypandoc (this broke after + commit d8ad766d17603784b86fc5c2e1b22864125d04d1). + + * Use latest versions of skylighting, commonmark (#6589), + comonmark-extensions, commonmark-pandoc, texmath. + + * Relax version bounds for hslua, hslua-module-text, bytestring. + + * Use released pandoc-types 1.22. This changes the JSON + encoding slightly for the new table types introduced + in 1.21, so they're more consistent with the rest. + Developers of libraries for pandoc filters will want + to take note. + + * Fix hlint suggestions, update hlint.yaml (#6680, Christian Despres). + + * Code cleanup (#6678, Joseph C. Sible). + + * Add haddocks to functions in Text.Pandoc.Writers.Shared (Albert + Krewinkel). + + * Remove duplicate `tshow` definition. + + * Linux release candidate build: use ghc-musl container. This simplifies + our build process (over using a customized alpine container). + + +## pandoc 2.10.1 (2020-07-23) + + * Add `commonmark_x` output format. This is `commonmark` with a number + of useful pandoc extensions enabled. + + * Many more extensions now work with `commonmark` and `gfm`. + + * Add generic `attributes` extension. This allows attributes to + be added to any block or inline element in a uniform way. Since + the Pandoc AST doesn't include attributes on each element type, + the attributes will sometimes be added by creating a surrounding + Div or Span container. Currently this extension is only + compatible with the `commonmark` and `gfm` readers. + + To add an attribute to a block-level element, e.g. a paragraph, + put it before the block: + ``` + {#mypara} + This is a paragraph. + ``` + Multiple attributes may be used and will be combined: + ``` + {#mypara} + {.blue .warning key="val"} + This is a paragraph. + ``` + To add an attribute to an inline-level element, put it + immediately after the element: + ``` + *emphasized text*{.special} + ``` + + * Support `--number-sections` for docx output (#1413). + + * LaTeX reader: + + + Support `\SIRange` reader (#6418, Emerson Harkin). + + Support table col-span and row-span (#6311, Laurent P. René de Cotret). + Supports `\multirow` and `\multicolumn`. + + Support amsthm: `\newtheorem`, `\theoremstyle`, and theorem and + proof environments, including labels and references. The only thing + that is unsupported is the second optional argument, which causes + numbering to be reset after the specified series is incremented. + + Moved some code to T.P.LaTeX.Parsing. We need to reduce the size + of the LaTeX reader to ease compilation on resource-limited systems. + + * RST reader: + + + Fix csv tables with multiline cells (#6549). + + Fix spurious newlines in some attributes from directives. + + Avoid extra newline in included code blocks. + + * Commonmark reader: + + + Switch from cmark-gfm to commonmark-hs for commonmark and gfm + parsing. This avoids depending on a C library + and allows us to support more pandoc extensions for + `commonmark` and `gfm`. + + * DocBook reader: + + + Parse releaseinfo as metadata (#6542). + + * Docx reader: + + + Only use `bCs/iCs` on runs with `rtl` or `cs` property (#6514, Nikolay + Yakimov). + + Code cleanup/refactoring (Nikolay Yakimov). + + * Org reader (Albert Krewinkel): + + + Respect export setting which disables entities + MathML-like entities, e.g., `\alpha`, can be disabled with the + `#+OPTION: e:nil` export setting (Albert Krewinkel). + + Respect export setting disabling footnotes. Footnotes can be removed + from the final document with the `#+OPTION: f:nil` export setting. + + Respect tables-excluding export setting. Tables can be removed from + the final document with the `#+OPTION: |:nil` export setting. + + * Markdown writer: + + + Move `asciify` out of `escapeString`. Otherwise `unsmartify` + doesn't catch quotes that have already been turned to entities. + + Add `writeCommonmark` (new exported function, API change). + + Use unicode super/subscript characters when possible if the + `superscript` or `subscript` extension or `raw_html` aren't available. + + Render caption as following paragraph when `table_caption` extension + is not enabled. + + Use numerical labels for reference links that are longer + than 999 characters or contain square brackets, for conformity + with commonmark (#6560). + + * Commonmark writer: + + + Instead of using cmark-gfm, use `writeCommonmark` from the + Markdown writer. This function calls the markdown writer + with appropriate extensions and a few small modifications + (e.g. not requiring backslashes before spaces inside + super/subscripts). With this change `comonmark` and + `gfm` output can be used with a wider selection of + extensions. + + * Jira writer: keep image caption as alt attribute (#6529, Albert + Krewinkel). + + * HTML writer: + + + Improve alt-text/caption handling for HTML5 (#6491, Albert Krewinkel). + Screen readers read an image's `alt` attribute and the figure caption, + both of which come from the same source in pandoc. The figure caption is + hidden from screen readers with the `aria-hidden` attribute. This + improves accessibility. For HTML4, where `aria-hidden` is not allowed, + pandoc still uses an empty `alt` attribute to avoid duplicate contents. + + * Ms writer: + + + Fix code highlighting with blank lines. Previously blank lines + were simply omitted from highlighted code. + + Escape starting periods in ms writer code blocks (#6505, Michael + Hoffmann). If a line of ms code block output starts with a period (.), + it should be prepended by `\&` so that it is not interpreted as a roff + command. + + * Text.Pandoc.Extensions: + + + Add `raw_markdown` extension (which only affects `ipynb` + input). + + Trim down `githubMarkdownExtensions`. + Previously it included all of the following, which make + sense for the legacy `markdown_github` but not for `gfm`, + since they are part of base commonmark and thus + can't be turned off in `gfm`: + + - `Ext_all_symbols_escapable` + - `Ext_backtick_code_blocks` + - `Ext_fenced_code_blocks` + - `Ext_space_in_atx_header` + - `Ext_intraword_underscores` + - `Ext_lists_without_preceding_blankline` + - `Ext_shortcut_reference_links` + + These have been removed from `githubMarkdownExtensions`, though + they're still turned on for legacy `markdown_github`. + + Add `Ext_attributes` constructor for `Extension` [API change]. + + * LaTeX template: use selnolig to selectively suppress ligatures with + lualatex (#6534). + + * Benchmark bytestring readers (Nikolay Yakimov). + + * Documentation: + + + Update using-the-pandoc-api.md (favonia). + + Fix Typos in lua-filters.md (tajmone). + + Rewrite Raw HTML/TeX section in MANUAL.txt to avoid duplicate + headings for the extensions. + + Fix typo in MANUAL.txt (Benjamin Wuethrich). + + Remove duplicate 'titlepage' in MANUAL.txt (Blake Eryx). + + CONTRIBUTING.md: Advertise the official nightlies in GitHub actions. + Replaces #6500, thanks to @ickc. + + + +## pandoc 2.10 (2020-06-29) + + * Use pandoc-types 1.21. This adds two things: + + + A native Underline constructor for Inline (#6277, Vaibhav Sagar). + + More expressive types for tables (#1024, Christian Despres). + Tables can now take attributes; and rowspans and colspans, + column headers, multiple row headers, table head and foot + can all be represented. (Note, however, that reader and + writer support for these features is still lacking, so + most users won't see any differences in table conversion + yet. These changes just lay the foundation for further + improvements.) + + * Support new Underline element in readers and writers (#6277, + Vaibhav Sagar). + + * Support new Table type (Christian Despres). + The Builder.simpleTable now only adds a row to the TableHead + when the given header row is not null. This uncovered an + inconsistency in the readers: some would unconditionally + emit a header filled with empty cells, even if the header + was not present. Now every reader has the conditional + behaviour. Only the XWiki writer depended on the header row + being always present; it now pads its head as necessary. + + * Add an option to disable certificate validation (#6156, Cédric Couralet, + Cécile Chemin, Juliette Fourcot). This commit adds the option + `--no-check-certificate`, which disables certificate checking when + resources are fetched by HTTP. + + * Unify defaults and markdown metadata parsers (#6328, Nikolay + Yakimov). Clean up code in Text.Pandoc.Readers.Metadata and + properly handle errors in `yamlToMeta`. This fixes parsing + of Boolean fields in metadata withinin defaults files and reduces + code duplication. + + * Docbook reader: + + + Implement `<procedure>` (#6442, Mathieu Boespflug). + + Implement `<phrase>` (#6438, Mathieu Boespflug). + + Treat envar and systemitem like code (#6435, Mathieu Boespflug). + + Implement `<replaceable>` (#6437, Mathieu Boespflug) + + Map `<simplesect>` to unnumbered section (#6436, Mathieu Boespflug). + + * JATS reader: + + + Handle "label" element in section title (#6288). + + Parse abstract element into metadata field of same name + (#6480, Albert Krewinkel). + + * Jira reader (Albert Krewinkel): + + + Resolve multiple parsing problems, including issues with empty + table cells, faulty recognition of closing emphasis characters, and + parsing of image attributes (#6212, #6219, #6220). + + Two consecutive markup chars are now parsed verbatim (#6343); + styled text must not be empty. + + Newlines are no longer allowed within styled text (#6325). + + Links to anchors are now parsed as links (#6407). + + Retain image attributes (#6234). Jira images attributes as in + `!image.jpg|align=right!` are retained as key-value pairs. Thumbnail + images, such as `!example.gif|thumbnail!`, are marked by a + `thumbnail` class in their attributes. + + Use Underline for inserted text (#6237). Previously, the span was + marked with the non-standard class `inserted`. + + Improve icon conversion for `(/)`, `(x)`, `(!)`, `(?)` + `(+)`, `(-)`, `(off)`, `(*)`. (#6236, #6264). + + Support citations, attachment links, and user links (#6231, #6238, + #6239). + + Resolve parsing issues of blockquote, color (#6233, #6235). + + * HTML reader: + + + Parse attributes into table attributes. + + Support `<bdo>` (#5794, Tristan de Cacqueray). + + Add `summary` to list of block-level HTML tags (#6385). + This improves support for summary/details inside Markdown. + NOTE: you need to include a blank line before the closing + `</details>`, if you want the last part of the content to + be parsed as a paragraph. + + Fix parsing unclosed th elements in a table (#6247). + + * Commonmark reader: Implement `implicit_figures` extension (#6350). + + * Markdown Reader: + + + Fix inline code in lists (#6284, Nikolay Yakimov). + Previously inline code containing list markers was sometimes + parsed incorrectly. + + Don't require blank line after grid table (#6481). + This allows grid tables to be enclosed in fenced divs with no + intervening blank lines. + + * LaTeX reader: + + + Don't parse beyond `\end{document}` (#6380). + This required some internal changes to `\subfile` handling. + + Better handling of `\lettrine`. SmallCaps instead of Span + for the part after the initial capital. Ensure that both + arguments are parsed, so that in Markdown both + are treated as raw LateX. (Closes #6258.) + + * Org reader (Albert Krewinkel): + + + Recognize images with uppercase extensions (#6472). + + Keep unknown keyword lines as raw org. The lines of unknown + keywords, like `#+SOMEWORD: value` are no longer read as metadata, + but kept as raw `org` blocks. This ensures that more information + is retained when round-tripping org-mode files; additionally, + this change makes it possible to support non-standard org + extensions via filters. + + Unify keyword handling. Handling of export settings and other + keywords (like `#+LINK`) has been combined and unified. + + Support `LATEX_HEADER_EXTRA` and `HTML_HEAD_EXTRA` + settings. These export settings are treated like their non-extra + counterparts, i.e., the values are added to the `header-includes` + metadata list. + + Allow multiple `#+SUBTITLE` export settings. The values of all + lines are read as inlines and collected in the `subtitle` + metadata field. + + Read `#+INSTITUTE` values as text with markup. The value is + stored in the `institute` metadata field and used in the + default beamer presentation template. + + The behavior of the `#+AUTHOR` and `#+KEYWORD` export + settings has changed: Org now allows multiple such lines + and adds a space between the contents of each line. Pandoc + now always parses these settings as meta inlines; setting + values are no longer treated as comma-separated lists. + Note that a Lua filter can be used to restore the previous + behavior. + + Read description lines as inlines (#6485). `#+DESCRIPTION` lines + are now treated as text with markup. If multiple such + lines are given, then all lines are read and separated by soft + linebreaks. + + Honor tex export option (#4070). The `tex` export option can be set + with `#+OPTION: tex:nil` and allows three settings: + `t` (the default) causes LaTeX fragments to be parsed as TeX or added + as raw TeX. `nil` removes all LaTeX fragments from the document. + `verbatim` treats LaTeX as text. + + + * RST reader: + + + Pass arbitrary attributes through in code blocks (#6465). + Exceptions: name (which becomes the id), class (which becomes the + classes), and number-lines (which is treated specially to fit + with pandoc highlighting). + + Handle `date::` directive (#6276). + + * Textile reader: support `pre.` for code blocks (#6454). + + * Ipynb reader: + + + Implement `raw_markdown` extension (#5408). Specifying + `-f ipynb+raw_markdown` will cause Markdown cells + to be represented as raw Markdown blocks, instead of being + parsed. This is not what you want when going from `ipynb` + to other formats, but it may be useful when going from `ipynb` + to Markdown or to `ipynb`, to avoid semantically insignificant + changes in the contents of the Markdown cells that might + otherwise be introduced. + + Handle application/pdf output as image (#6430). + + Properly handle image/svg+xml as an image (#6430). + + * Docx reader: + + + Distinguish between docx parsing and docx container unpacking errors. + + * MediaWiki reader: + + + Fix `gfm_auto_identifiers` so that `-` is not replaced by `_` (#6335). + + * Vimwiki reader: + + + Add nested syntax highlighting (#6256, Vlad Hanciuta). + Nested syntaxes are specified like this: + ``` + {{{sql + SELECT * FROM table + }}} + ``` + The preformatted code block parser has been extended to check if the + first attribute of the block is not a `key=value` pair, and in that + case it will be considered as a class. + + + * Jira writer (Albert Krewinkel): + + + Always escape braces (#6478). Braces are now always escaped, even + within words or when surrounded by whitespace. Jira and + Confluence treat braces specially. + + Convert Underline to inserted text (`+inserted+`). + + Add image attributes (#6234). Image attributes are added + to the output as image parameters. If the image has a + class "thumbnail", then a thumbnail image is generated; + all other attributes are discarded in this case. + + * LaTeX writer: + + + Ensure that `-M csquotes` works even in fragment mode (#6265). + + Escape `^` specially for listings (#6460). + + Create hypertarget for links with identifier (#6360). + + Distinguish between single and double quotes when using enquote + package (#6457, dbecher-ito). + + Add support for customizable alignment of columns in beamer (#6331, + andrebauer). + + Add support for customizable alignment of columns in beamer + (#4805, #4150, andrebauer). + + * HTML writer: + + + Use CSS in favor of `<br>` for display math (#6372) + Some CSS to ensure that display math is + displayed centered and on a new line is now included + in the default HTML-based templates; this may be + overridden if the user wants a different behavior. + + * Org writer: + + + Clean-up Div handling (Albert Krewinkel). + + * Docx writer: + + + Enable column and row bands for tables (#6371). + This change will not have any effect with the default style. + However, it enables users to use a style (via a reference.docx) + that turns on row and/or column bands. + + * OpenDocument (and ODT) writer: + + + Add custom-style "Abstract" in metadata abstract. + This ensures that the abstract is rendered with style Abstract. + + Enable custom-style attribute on a Div. + This allows you to apply a custom style to contained paragraphs. + + * DocBook writer: + + + Add id of figure to enclosed image. + + Add personname element to docbook author (#6244). + + * FB2 writer: + + + Properly handle cover-image containing spaces (#6391). + + * Markdown writer: + + + Ensure consistent padding for pipe tables (#6240). + + Avoid unnecessary escapes before intraword `_` when + `intraword_underscores` extension is enabled (#6296). + + * RST writer: + + + Properly handle images with same alt text (#6194). + Previously we created duplicate references for these in rendering RST. + + * AsciiDoc writer: + + + Add blank line after Div (#6308). + + * Haddock Writer: + + + Support Haddock tables (Joe Hermaszewski). + See this PR on Haddock for details on the table format: + <https://github.com/haskell/haddock/pull/718>. + + * PowerPoint writer (Jesse Rosenthal): + + + Write math input verbatim in speaker notes (#6301). + OMML in speaker notes would lead to corrupt PowerPoint output. We now + output the OMML verbatim as LaTeX in the speaker notes. + + * LaTeX template: Make polyglossia package options list-aware + (#6444, Frederik Elwert). + + * Reveal.js template: + + + Update template for reveal.js 4.0.0 (#6390, Salim B). + + Update template with newly available options (#6347, Jake Zimmerman). + + Use CDN version of revealjs v4 by default (#6408). + + * opendocument template: Add abstract and subtitle to opendocument + template (#6369). + + * reference.odt: clean up styles. Add Abstract. + Change Author, Date to centered paragraphs with no character + styling. + + * epub.css: wrap overlong lines in highlighted code blocks (#6242). + This fixes a problem in iBooks v2.4 with our earlier + horizontally scrolling code blocks. The problem seems to + be a bug in iBooks, not pandoc, but since iBooks is a major + target we're changing pandoc's default behavior so that + pandoc-produced epubs work on that platform. + + * Text.Pandoc.PDF: + + + Use `--enable-local-file-access` in invoking `wkhtmltopdf` (#6474). + `wkhtmltopdf` changed in recent versions to require this for + access to local files. This fixes PDF via HTML5 with `--css`. + + Send verbose output to stderr, not stdout (#6483). + + * Text.Pandoc.MIME: Fix MIME type for TrueType fonts in EPUBs + (#6464, Michael Reed). + + * Text.Pandoc.Shared: + + + `makeSections`: omit number attribute when unnumbered class + is present (#6339). Previously the attribute was included but given + an empty value, and this caused the table of contents creation + functions in Text.Pandoc.Writers.Shared to think these items had + numbers, which meant that they were included in the TOC even if the + `unlisted` class was used. + + Deprecate `underlineSpan` in Shared in favor of + `Text.Pandoc.Builder.underline` (Vaibhav Sagar). + + `renderTags'`: use self-closing tag for col element (#6295). + + * Text.Pandoc.UUID: Fix `getRandomUUID`, which previously would + return the same value twice in a row. Make `getRandomUUID` + polymorphic in PandocMonad. Remove `getUUID` (#6228, Joseph C. Sible). + + * Text.Pandoc.Class: Generalize `PandocIO` functions to `MonadIO`. + + * Fixed Katex standalone script (#6399, Lucas Escot). + Global macros are now persistent when using the HTML Writer with the + `--katex` option. + + * Lua subsystem (Albert Krewinkel): + + + Use new type PandocLua for all pandoc Lua operations (API change). + The new type `PandocLua` is an instance of the `PandocMonad` typeclass + and can thus be used in a way similar to `PandocIO`. + + Use PandocError for exceptions in Lua subsystem (API change). + The PandocError type is used throughout the Lua subsystem. All Lua + functions throw an exception of this type if an error occurs. The + `LuaException` type is removed and no longer exported from + `Text.Pandoc.Lua`. In its place, a new constructor `PandocLuaError` + is added to PandocError. + + * Lua filters: improve error messages for failing filters (#6332, + Albert Krewinkel). Print the Lua error properly instead of + displaying their `show` string. + + * Use latest skylighting. This fixes a bug with lua multiline + comments (and may improve handling of other syntaxes as well). + IT also adds `aria-hidden="true"` to the empty a elements, which + helps people who use screen readers. + + * Use latest texmath. + + * Require latest doctemplates 0.8.2. + This adds support for template pipes `first`, `rest`, + `last`, `allbutlast`. + + * Revert 0e48a02 and dependency on base-noprelude, which hasn't + been updated for ghc 8.10 (see #6187). + + * Dependency adjustments: + + + Allow haddock-library 1.9.x. + + Allow hslua 1.1 (#6243, Felix Yan). + + Allow base64-bytestring 1.1. + + Use latest jira-wiki-markup. + + Allow http-client 0.7. + + Allow tasty 1.3.x. + + Allow aeson 1.5 (#6400, Felix Yan). + + Remove unused dependency `vector` (#6462, Laurent P. René de Cotret). + + Bump QuickCheck upper bound. + + * Significant code cleanup and simplification (Joseph C. Sible, #6223, + #6209, #6225, #6229, #6226, #6340). + + * Remove unnecessary hlint ignores (#6341, Joseph C. Sible). + + * Remove obsolete RelaxedPolyRec extension (#6487, Nikolay Yakimov). + + * trypandoc improvements (Mike Tzou): + + + Add standalone option to the command text (#6210). + + Update third party libraries. + + * MANUAL.txt: + + + Clarify template partial naming (#6476, Mauro Bieg). + + Describe `jira` as "Jira/Confluence wiki markup" (#6351, Albert + Krewinkel). In the past, Jira's wiki markup was also used by -- and + could be imported into -- Atlassian Confluence. + + Add link to print-css.rocks (#6272, Mauro Bieg). + + Clarify pipe table column width adjustment (#6254). + + Fix ATX header syntax. + + Fix misleading note about image size conversions (#6353). + + Update links to reveal.js documentation (#6386, Salim B). + + Separate adjacent verbatim code blocks (#6307, tom-audm). + + * org.md: + + + Document behavior of `smart` extension (#4387, Albert Krewinkel). + + Describe all supported export options in detail. + + * lua-filters.md: + + + Fix description of BulletList Lua type (Levi Gruspe). + + Use pandoc.system module in TikZ example (Albert + Krewinkel). Showcase temporary directory handling with + `with_temporary_directory` and `with_working_directory`. + + * INSTALL.md: fix FreeBSD port link (#6422, Mo). + The FreeBSD port was renamed from pandoc to hs-pandoc in 2010. + The old pandoc port is still at version 1.5.1.1 + + * Propagate `(DY)LD_LIBRARY_PATH` in tests (#6376, Lila). + + * Bump `cabal-version` to 2.2 (#6377). + + * Make it possible to compile using Stack on NixOS (#6439, Mathieu + Boespflug). + + * CI action to check for commit message length (Nikolay Yakimov, #6398). + + +## pandoc 2.9.2.1 (2020-03-23) + + * Markdown reader: Fix table alignment when heading begins with t (#6153). + Due to a typo (`t` instead of `\t`) we were center aligning column + headings that begin with a lowercase `t`! + + * Text.Pandoc.Readers.Roff: + + + Fix parsing of `\.` in man/ms readers (#6175). + Previously due to a typo it was being parsed as `` ` ``. + + Fix parsing of `\'` in man/ms readers (#6175). It was being parsed + as a backtick. + + * Jira reader (Albert Krewinkel): + + + Fix parsing of tables without preceding blankline (#6198). + A bug was fixed which caused faulty parsing if a table was not + preceded by a newline and the first table cell had no space + after the initial `|` characters. + + Fix parsing of strikeout, emphasis (#6196). A bug was fixed which + caused non-emphasized text containing digits and/or non-special + symbols (like dots) to sometimes be parsed incorrectly. + + Support colored inline text, indented lists (#6183, #6184). + + * Ms writer: + + + Fix definition lists so indent even when paragraph indent is + set to 0 (as is the default). Also ensure indent for display math + that falls back to TeX. + + Use `.QS/.QE` instead of `.RS/.RE` for block quotes. + + * EPUB writer: fix regression on detection of front/back/bodymatter + (#6170). This bug caused sections with epub:type `dedication` to be + misplaced in bodymatter instead of frontmatter as specified + in the manual. The same problem would affect other epub:types. + The pattern matching needed to be changed with the use of + `makeSection`. + + * AsciiDoc writer: remove redundant `otherwise` guard in + `inlineToAsciiDoc` (#6146, Ryan Scott). + + * Text.Pandoc.Class: + + + Fix missing import when data files are not embedded (Albert Krewinkel). + + Subdivide Text.Pandoc.Class into small unexported modules + and ensure that all functions have Haddock documentation (#6106, + Albert Krewinkel). + + Finer grained imports of Text.Pandoc.Class submodules (#6203, Albert + Krewinkel). + + * Text.Pandoc.XML: Add to list of HTML5 attributes: + `allow`, `autocapitalize`, `decoding`, `enterkeyhint`, + `imagesizes`, `imagesrcset`, `loading`. + + * Use implicit Prelude (#6187, Albert Krewinkel). + The previous behavior was introduced as a fix for #4464. It seems that + this change alone did not fix the issue, and `stack ghci` and `cabal + repl` only work with GHC 8.4.1 or newer, as no custom Prelude is loaded + for these versions. Given this, it seems cleaner to revert to the + implicit Prelude. + + * Always use custom prelude (#6187, Albert Krewinkel). + Previously, the custom prelude was used only with older GHC versions, as + a workaround for problems with ghci. The ghci problems are resolved by + replacing package `base` with `base-noprelude`, allowing for consistent + use of the custom prelude across all GHC versions. + + * Remove outdated checks for no longer supported base versions + (Albert Krewinkel). + + * PDF via wkhtmltopdf: put user-specified options last (#6171). + Certain options (e.g. `cover`) need to come after flags on + the command line. + + * Text.Pandoc.App: set resource path at the beginning so it can affect + things like include-in-header (#5982). + + * Change macOS release candidate CI process so that notarized + packages can be produced (#6169). + + * Make MANUAL more explicit about nonbreaking space handling by + `all_symbols_escapable` (#6154, Fabien Schurter). + + * trypandoc (Mike Tzou): + + + Add checkbox for standalone option (#6189). + + Use strict mode for JavaScript code (#6188). + + Fetch resources over https (#6188). + + Remove unnecessary attributes on style, script elements (#6188). + + * Use details tag to make GitHub releases changelog collapsible. + + * Update filter code in doc/filters.md so it works with latest pandoc + (#6185). + + * linux/Dockerfile: upgrade to alpine 3.11 (#6180, Albert Krewinkel). + This is used to build the static linux binaries. + + +## pandoc 2.9.2 (2020-02-15) + + * Add `csv` as an input format (#6100). The CSV table is converted into a + pandoc simple table. A new module Text.Pandoc.Readers.CSV + exports `readCSV` [API change]. + + * Introduce new format variants for JATS writer (#6014, Albert Krewinkel): + + - `jats_archiving` for the "Archiving and Interchange Tag Set", + - `jats_publishing` for the "Journal Publishing Tag Set", and + - `jats_articleauthoring` for the "Article Authoring Tag Set." + + The `jats` output format is now an alias for `jats_archiving`. + The module Text.Pandoc.Writers.JATS now exports + `writeJatsArchiving`, `writeJatsPublishing`, and + `writeJatsArticleAuthoring`, as well as the legacy + `writeJATS` [API change]. + + * `--defaults`: Support `bibliography` and `csl` fields. + Move `addMeta` from Text.Pandoc.App.CommandLineOptions to + Text.Pandoc.App.Opt (internal change). + + * Add timing info for filters in `--verbose` mode (#6112). + When verbose mode is specified (verbosity == INFO), print a + notice when running a filter and when a filter completes (including + timing). + + * LaTeX reader: + + + Allow `&` in LaTeX citation keys (#6110). + + Improve caption and label parsing. + + Don't emit empty Span elements for labels. + + Put tables with labels in a surrounding Div. + + Resolve `\ref` to table numbers (#6137). + + Skip comments in more places where this is needed (#6114). + + Allow beamer overlays for all commands in all raw tex (#6043). + This affects parsing of raw tex in LaTeX and in Markdown and + other formats. + + Improve parsing of raw environments (#6034). If parsing fails + in a raw environment (e.g. due to special characters like unescaped + `_`), try again as a verbatim environment, which is less sensitive to + special characters. This allows us to capture special environments + that change catcodes as raw tex when `-f latex+raw_tex` is used. + + * RST reader: + + + Add highlight directive (#6140, Lucas Escot). + + * MediaWiki writer: + + + Prevent triple `[[[` which confuses MediaWiki (#6119). + + * HTML reader: + + + Don't parse `data-id` as `id` attribute. And similarly don't + parse any `data-X` as `X` when `X` is a valid HTML attribute. + + * Org reader: + + + Simplify parsing of sub- and superscripts (#6127, Albert Krewinkel). + Speeds up parsing of single-word, markup-less sub- and superscripts. + + * LaTeX writer: + + + Group biblatex citations even with prefix and suffix (#5849, Ethan + Riley). Previously biblatex citations were only grouped if there + was no prefix. This patch allows them to be grouped in subgroups split + by prefixes and suffixes, which allows better citation sorting. + + Fix regression in handling of columns in beamer slides (#6033). + Columns in title slides were causing problems with + slide division. + + Fix duplicate frame classes in LaTeX/Beamer output (#6107). + + * HTML writer: + + + Fix duplicate attributes on headings (#6062), regression from 2.7.x. + + Fix `--number-offset` with HTML TOC. Eventually it would be worth + adding a parameter to `makeSections` so this could be done at that + level; then it would also affect other writers that construct + TOC manually. + + reveal.js: restore old behavior for 2D nesting (#6032). + The fix to #6030 actually changed behavior, so that the + 2D nesting occurred at slide level N-1 and N, instead of + at the top-level section. This commit restores the v2.7.3 behavior. + If there are more than 2 levels, the top level is horizontal + and the rest are collapsed to vertical. + + reveal.js: ensure that pauses work even in title slides (#5819). + + * Markdown writer: + + + Fix regression: spurious dots in markdown_mmd metadata output (#6133). + + * Docx writer: + + + Fix regression with Compact style on tight lists (#6072). + Starting in 2.8, the docx writer no longer distinguishes between tight + and loose lists, since the Compact style is omitted. This is a + side-effect of the fix to #5670, as explained in the changelog. This + patch fixes the problem by extending the exception currently offered to + Plain blocks inside tables to Plain blocks inside list items. + + * Jira writer: + + + Fix output of table headers (Albert Krewinkel, #6035). + + * Add Text.Pandoc.Image with unexported svgToPng. + + * Text.Pandoc.XML: Export `html5Attributes`, `html4Attributes`, + `rdfaAttributes` (formerly unexported in Text.Pandoc.Writers.HTML). + [API change] + + * Text.Pandoc.Shared: Export a new function `findM` (#6125, + Joseph C. Sible). + + * Text.Pandoc.Logging: Add `RunningFilter`, `FilterCompleted` + constructors to LogMessage [API change]. + + * Text.Pandoc.CSV: fix bug in CSV parser; previously an extra blank record + would sometimes be inserted at the end. + + * LaTeX template: add space option to xeCJK with PassOptionsToPackage + (#6002). Otherwise we can get a clash with documentclasses that + already load the package. + + * Lua filters: + + + Allow filtering of element lists (#6038, Albert Krewinkel). Lists of + Inline and Block elements can now be filtered via `Inlines` and + `Blocks` functions, respectively. This is helpful if a filter + conversion depends on the order of elements rather than a single + element. For example, the following filter can be used to remove all + spaces before a citation: + + function isSpaceBeforeCite (spc, cite) + return spc and spc.t == 'Space' + and cite and cite.t == 'Cite' + end + + function Inlines (inlines) + for i = #inlines-1,1,-1 do + if isSpaceBeforeCite(inlines[i], inlines[i+1]) then + inlines:remove(i) + end + end + return inlines + end + + + Add methods `insert`, `remove`, and `sort` to pandoc.List + (Albert Krewinkel). Example of use: + + local numbers = pandoc.List {2, 3, 1} + numbers:sort() -- numbers is now {1, 2, 3} + + Make `pandoc.List` a callable constructor (Albert Krewinkel). + It is now possible to construct a new List via + `pandoc.List()` instead of `pandoc.List:new()`. + + Add tests for pandoc.List module (Albert Krewinkel). + + * Text.Pandoc.App.CommandLineOptions: Change `setVariable` to use `Text` + instead of `String`. This avoids some unnecessary unpacking. + + * Use versioned directory for windows release zipfile. + Also remove old `make-windows-installer.bat`, superseded by GitHub + actions workflow, and modify `pandoc.wxs` for new paths. + + * Extensive code cleanup (#6141, #6128, #6129, #6130, #6123, + #6105, 6102, #6117, #6124, #6115, #6116, #6111, Joseph C. Sible). + + * Fix hlint warnings (Albert Krewinkel). + + * Use latest doclayout, doctemplates (#6031). The new version of + doclayout fixes a memory leak that affected `--include-in-header` with + large files (and possibly other cases involving extremely long lines). + + * Use latest texmath. + + * Use latest skylighting and fix test suite (#6086). + + * sample.lua: Fix typo in descriptive comments (#6136, Caleb Maclennan). + Fix typo in error message (#6135). + + * Add Docker and GH Actions instructions/links to INSTALL.md. + + * Update filter documentation (#6065). Improve cabal v2 instructions. + Remove example using pandoc API directly (we have other + docs for that and it was outdated). + + * Lua filter docs: + + + Cross-link constructors and types (Albert Krewinkel). + Thanks to @bpj for the idea. + + Sort pandoc.List methods alphabetically (Albert Krewinkel). + + Unify, fix anchors and internal links (#6061, Albert Krewinkel). + Links and anchors now follow consistent conventions, like + lowercase-only anchor names. This breaks some links to specific + sections in the document, but will make it much easier to link + documentation in the future. + + Clarify filter function execution order (#6059, Albert Krewinkel). + + * In docs, update URLs and use `https:` wherever possible (#6090, + Salim B). + +## pandoc 2.9.1.1 (2020-01-05) + + * Markdown reader: + + + Fix parsing bug affected indented code after raw HTML (#6009, #5360). + + * LaTeX writer: + + + Fix regression in beamer slide structure with certain slide levels + (#6030). + + Allow framebreaks for beamer's TOC (Heiko Schlittermann, #6012) + + Properly handle unnumbered headings level 4+ (#6018). + Previously the `\paragraph` command was used instead of + `\paragraph*` for unnumbered level 4 headings. + + * HTML writer: + + + Fix revealjs slide structure regression with certain slide levels + (#6030). + + Add newlines to make slide show output more readable. + + * Org writer: + + + Remove extra spaces from table cells (Albert Krewinkel, #6024). + + * JATS template: Update JATS dtd (Arfon Smith, #6020). Use the archiving + and interchange DTD rather than the more restrictive journal publishing + DTD (which doesn't permit ext-link as a valid child). + + * Text.Pandoc.PDF: Fix `runTeXProgram` so that the input source is always + overwritten (#6027). Previously it wasn't overridden if the file already + existed, which led to bad results on subsequent runs when + `pdf-engine-opt=-output-directory=` was used to specify an explicit temp + dir. + + * Text.Pandoc.BCP47: Change `getLang` to handle block-level contents + (#6008). Some readers (e.g. RST) will populate the `lang` metadata field + with block-level content. `getLang` has been modified to handle this. + Previously in these cases the LaTeX writer would not properly set the + "main language" of the document. + + * Fix `test/tables.org` (Albert Krewinkel). + + * Use HTTPS in copyright message (Felix Yan, #6010) + + +## pandoc 2.9.1 (2019-12-23) + + * Add Jira reader (Albert Krewinkel, #5556). + + * Jira writer: use jira-wiki-markup renderer (Albert Krewinkel, + #5926). The following improvements are included in this change: + + + non-jira raw blocks are fully discarded instead of showing + as blank lines; + + table cells can contain multiple blocks; + + unnecessary blank lines are removed from the output; + + markup chars within words are properly surrounded by + braces; + + preserving soft linebreaks via `--wrap=preserve` is + supported. + + Note that backslashes are rendered as HTML entities, as there + appears no alternative to produce a plain backslash if it is + followed by markup. This may cause problems when used with + confluence, where rendering seems to fail in this case. + + * Fix regression with `--number-sections`. Starting with 2.8, + `--number-sections` also had the effect of `--section-divs`, + even if `--section-divs` was not specified. + + * Improved table of contents generation in markdown, RTF, + commonmark, better handling cases where section headings are + enclosed in divs. + + * Ensure that later default file values for `variable` replace + earlier ones (5988). + + * HTML reader: Add `nav` to list of block-level tags. + + * Org reader (Albert Krewinkel): + + + Wrap named table in Div, using name as id (#5984). + Tables which are given a name via `#+NAME:` or `#+LABEL:` + are wrapped in an additional Div, with the name set as the + Div's ID. + + Report parsing errors properly. + + Fix parsing problem for colons in headline (#5993). + + * Text.Pandoc.PDF: Ensure UTF8 when printing source in + `--verbose` mode, avoiding an error on platforms that + default to something other than UTF-8 (#5997). + + * Text.Pandoc.Templates: Strip directory before trying to find + partial in data files (#5987). + + * Text.Pandoc.Shared: Improve `makeSections` so we don't get + doubled "number" attributes in EPUB output (or anywhere + else) (#5986). + + * Added tests for `--toc` and `--section-divs`. + + * Text.Pandoc.MIME: Added glsl MIME type for WebGL maps (#6000, + Jared Lander). + + * MANUAL: A bit clearer explanation for `--base-header-level`. + We now say exactly how to translate between the deprecated + `--base-header-level` and `--shift-heading-level-by`. + + * lua-filters.md: + + + Remove spurious dot in title (#5996, Mauro Bieg). + + Replace metadata example with image centering (#6004, + Albert Krewinkel). Thanks to @efx for proposing this filter. + + +## pandoc 2.9 (2019-12-11) + + * Text.Pandoc.Templates [API change] + + + Add Monad wrappers `WithDefaultPartials` and `WithPartials`. + Wrapping these around an instance of `PandocMonad` gives + us different instances of `TemplateMonad`, with different + search behavior in retrieving partials. + To compile a template and limit partial search to pandoc's + data files, use `runWithDefaultPartials (compileTemplate ...)`. + To compile a template and allow partials to be found locally + (either on the file system or via HTTP, in the event that + the main template has an absolute URL), ue + `runWithPartials (compileTemplate ...)`. + + Export `getTemplate`, which seeks a template locally, + or via HTTP if the template has an absolute URL, falling + back to the data files if not found. + + Export `compileDefaultTemplate` -- does `getDefaultTemplate` + and compiles the result, raising an error on failure. + + * Text.Pandoc.Class [API change] + + + Remove `TemplateMonad` instances for `PandocIO` and `PandocPure`. + These were too limiting and caused a bug whereby a local + partial could be used even when the default template was requested. + We now rely on instances provided in the Templates module. + + * Text.Pandoc.App.OutputSettings: Simplify template retrieval code. + + * ConTeXt template: Adjust to title formatting (#5949, Denis Maier). + Add `\setupinterlinespace` to `title`, `subtitle`, `date` and `author` + elements: otherwise longer titles that run over multiple lines will look + squashed as `\tfd` etc. won't adapt the line spacing to the font size. + + * reveal.js template: Add title-slide-attributes variable (#5981, + Frederik Elwert). + + * More informative JSON parse error (#5973). + + * Use external emojis package (forked from pandoc). Removed emoji data + in Text.Pandoc.Emoji. + + * Fix regression in `makeSections` (#5965). + Previously `hierarchicalize` (the ancestor of `makeSections`) would put + header attributes on the containing Div. In 2.8 this behavior changed, + which broke some tools depending on pandoc. Here we roll back this change, + so that attributes again migrate from the header to the containing Div when + `makeSections` is run. Note that attributes are retained on the header as + well (unlike before) -- with the exception of the `id` attribute, which of + course cannot be duplicated. + + * Fix `--toc-depth` regression in 2.8 (#5967). + + * Use doctemplates 0.8. Rename template 'filters' as 'pipes' + to avoid confusion with the other notion of filter used by pandoc. + + * Fix README.md so that relative links from manual become absolute. + Previously they'd be broken links when viewed on GitHub or Hackage. + So we add the base URL for the pandoc manual. + + * Document display math syntax in manual. + +## pandoc 2.8.1 (2019-12-05) + + * Add `ascii_identifiers` as a supported extension for `markdown`. + This fixes a regression in 2.8. + + * Fix regression with behavior of `--variable` (#5962). + Previously `-Vfoo=1 -Vfoo=2` would produce a list value for foo; + with 2.8 it produced just `2`. This commit restores the earlier + behavior. + + * Roll back part of of `--shift-heading-level-by` change (#5957). + With positive heading shifts, starting in 2.8 this option + caused metadata titles to be removed and changed to regular + headings. This behavior is incompatible with the old + behavior of `--base-header-level` and breaks old workflows, + so we have rolled back the change. Note that there is now an + asymmetry in positive and negative heading level shifts: + With positive shifts, the metadata title stays the same and + does not get changed to a heading in the body, while with + negative shifts, a heading can be converted into the + metadata title. + + * Text.Pandoc.Shared: Fix `makeSections` so it doesn't turn + column Divs into sections. + + * HTML writer: add task-list class to ul if all elements are + task list items. This will allow styling unordered task + lists in a way that omits the bullet. + + * HTML-based templates: Add CSS to suppress bullet on unordered task lists. + + * ConTeXt template: Fix `\startcslreferences` and use ConTeXt syntax + conventions (#5945, Denis Maier). The old version had a too large + a skip at the beginning of the reference list. + + * LaTeX template: keep the `\author{}` command even if author is not + specified (#5961, Yihui Xie). Avoids a LaTeX warning. + + * Generate Emoji module with TH. + + + Add Text.Pandoc.Emoji.TH. + + Replace long literal list in Text.Pandoc.Emoji with one-liner + generating it from `emoji.json` using TH. + + Add Makefile target to download `emoji.json`. + + Remove `tools/emoji.hs`. + + * Increase GC allocation space for compilation in cabal.project. + + * Clean up manual on PDF generation backend options (#5940). + + * Update release checklist to include code signing step and update + Windows release-candidate builds (#5950). + + +## pandoc 2.8.0.1 (2019-11-26) + + * List `pdf` in `--list-output-formats`. + * EPUB writer: Fix regression with `--css` (#5937). In 2.8 `--css` + would not have an effect on EPUB output. + * RST writer: Use grid tables for one-column tables, since + simple tables clash with heading syntax in this case (#5936). + * Add unexported module Text.Pandoc.Readers.Metadata (see #5914). + * Use doctemplates 0.7.2, which adds the `nowrap` filter to + templates. + * Update default man template using `nowrap` for .TH heading (#5929). + * HTML templates: Add support for `toc-title` variable (#5930, + Alexandre Franke). + * Remove `grffile` (LaTeX package) requirement in MANUAL.txt + (#5927, Ian Max Andolina). + * Use skylighting 0.8.3. + +## pandoc 2.8 (2019-11-22) + + * Improvements in templates system (from doctemplates): + + + Pandoc templates now support a number of new features that + have been added in doctemplates: notably, `elseif`, `it`, + partials, filters, and syntax to control nesting and reflowing of + text. These changes make pandoc more suitable out of the + box for generating plain-text documents from data in YAML + metadata. It can create enumerated lists and even tabular + structures. + + We now used templates parameterized on doclayout Doc types. + The main impact of this change is better reflowing of + content interpolated into templates. Previously, + interpolated variables were rendered independently and + interpolated as strings, which could lead to overly long + lines. Now the templates interpolated as Doc values which + may include breaking spaces, and reflowing occurs after + template interpolation rather than before. + + Remove code from the LaTeX, Docbook, and JATS writers that + looked in the template for strings to determine whether it + is a book or an article, or whether csquotes is used. This + was always kludgy and unreliable. + + Change template code to use new API for doctemplates. + + * Add `--defaults`/`-d` option. This adds the ability to specify + a collection of default values for options in a YAML file. For + example, one might define a set of defaults for letters, + and then do `pandoc -d letter myletter.md -o myletter.pdf`. + See the documentation of this feature in MANUAL.txt. + + * Raise error on unsupported extensions (#4338). + + * The `--list-extensions[=FORMAT]` option now lists only + extensions that affect the given FORMAT. + + * Add `-L` option as shortcut for `--lua-filter`. + + * Add `--shift-heading-level-by` option and deprecate + `--base-heading-level` (#5615). The new option does + everything the old one does, but also allows negative shifts. + It also promotes the document metadata (if not null) to a + level-1 heading with a +1 shift, and demotes an initial + level-1 heading to document metadata with a -1 shift. This + supports converting documents that use an initial level-1 + heading for the document title. + + * Allow `--metadata-file` to be used repeatedly to include + multiple metadata files (Owen McGrath, #5702). Values in + files specified first will be overridden by those in later + files. + + * `--ascii` now uses numerical hex character references (#5718). + + * Allow PDF output to stdout (#5751). PDF output now behaves like other + binary formats: it will not be output to the terminal, but can be + sent to stdout using either `-o -` or a pipe. The intermediate format + will be determined based on the setting of `--pdf-engine`. + + * Make some writers sensitive to 'unlisted' class on headings (#1762). + If this is present on a heading with the 'unnumbered' class, + the heading won't appear in the TOC. This class has no + effect if 'unnumbered' is not also specified. This affects HTML-based + writers (including slide shows and EPUB), LateX (including beamer), RTF, + and PowerPoint. Other writers do not yet support `unlisted`. + + * Fix `gfm_auto_identifiers` behavior with emojis (#5813). Note that + we also now use emoji names for emojis when `ascii_identifiers` + is enabled. + + * When `--ipynb-output` is used with the default "best" format, strip + ANSI escape codes for non-ipynb output (#5633). These cause problems + in many formats, including LaTeX. + + * Don't look for template files remotely for remote input (#5579). + Previously pandoc would look for the template at a remote URL when a + URL was used for the input file, instead of taking it from the + data directory. + + * Allow combining `-Vheader-includes` and `--include-in-header` (#5904). + Previously `header-includes` set as a variable would be + clobbered by material included using `--include-in-header`. + + * Change merge behavior for metadata. Previously, if a document + contained two YAML metadata blocks that set the same field, the + conflict would be resolved in favor of the first. Now it is resolved + in favor of the second (due to a change in pandoc-types). + This makes the behavior more uniform with other things in pandoc + (such as reference links and `--metadata-file`). + + * Don't add a newline to fragment output if there's already one. + + * Change exit codes and document in MANUAL.txt: + + + `PandocAppError` was 1, is now 4 + + `PandocOptionError` was 2, is now 6 + + `PandocMakePDFError` was 65, is now 66 + + * Switch to new pandoc-types and use Text instead of String [API change]. + (Christian Despres, #5884). + + * HTML reader: + + + Better handling of `<q>` with cite attribute (#5798, Ole Martin Ruud). + If a `<q>` tag has a `cite` attribute, we interpret it as a Quoted + element with an inner Span. + + Add support for HTML `<samp>` element (#5792, Amogh Rathore). + The `<samp>` element is parsed as Code with class `sample`. + + Add support for HTML `<var>` element (#5799, Amogh Rathore). + The `<var>` element is parsed as Code with class `variable`. + + Add support for `<mark>` elements (Florian B, #5797). Parse + `<mark>` elements from HTML as Spans with class `mark`. + + Add support for `<kbd>` elements, parsing them as Span with class + `kbd` (Daniele D'Orazio, #5796). + + Add support for `<dfn>`, parsing this as a Span with class `dfn` + (#5882, Florian Beeres). + + * Markdown reader: + + + Headers: don't parse content over newline boundary (#5714). + + Handle inline code more eagerly within lists (Brian Leung, #5627). + + Removed some needless lookaheads. + + Don't parse footnote body unless extension enabled. + + Fix small super/subscript issue (#5878). Superscripts and subscripts + cannot contain spaces, but newlines were previously allowed + (unintentionally). This led to bad interactions in some cases + with footnotes. With this change newlines are also not allowed inside + super/subscripts. + + Use `take1WhileP` for `str`, table row. This yields a small but + measurable performance improvement. + + + * LaTeX reader: + + + Fix parsing of optional arguments that contain braced text (#5740). + + Don't try to parse includes if `raw_tex` is set (#5673). + When the `raw_tex` extension is set, we just carry through + `\usepackage`, `\input`, etc. verbatim as raw LaTeX. + + Properly handle optional arguments for macros (#5682). + + Fix `\\` in `\parbox` inside a table cell (#5711). + + Improve `withRaw` so it can handle cases where the token string is + modified by a parser (e.g. accent when it only takes part of a Word + token) (#5686). This fixes a bug that caused the ends of + certain documents to be dropped. + + Handle `\passthrough` macro used by latex writer (#5659). + + Support tex `\tt` command (#5654). + + Search for image with list of extensions like latex does, if an + extension is not provided (#4933). + + Handle `\looseness` command values better (#4439). + + Add `mbox` and `hbox` handling (Vasily Alferov, #5586). + When `+raw_tex` is enabled, these are passed through literally. + Otherwise, they are handled in a way that emulates LaTeX's behavior. + + Properly handle `\providecommand` and `\provideenvironment` (#5635). + They are now ignored if the corresponding command or environment + is already defined. + + Support epigraph command in LaTeX Reader (oquechy, #3523). + + Ensure that expanded macros in raw LaTeX end with a space + if the original did (#4442). + + Treat `ly` environment from lilypond as verbatim (Urs Liska, #5671). + + Add `tikzcd` to list of special environments (Eigil Rischel). + This allows it to be processed by filters, in the same way that + one can do for `tikzpicture`. + + * Roff reader: + + + Better support for `while`. + + More improvements in parsing conditionals. + + Fix problem parsing comments before macro. + + Improve handling of groups. + + Better parsing of groups (#5410). We now allow groups + where the closing `\\}` isn't at the beginning of a line. + + * RST reader: + + + Keep `name` property in `imgAttr` (Brian Leung, #5619). + + Fixed parsing of indented blocks (#5753). We were requiring + consistent indentation, but this isn't required by RST. + + Use title, not admonition-title, for admonition title. + This puts RST reader into alignment with docbook reader. + + Don't strip final underscore from absolute URI (#5763). + + Avoid spurious warning when resolving links to internal anchors + ending with `_` (#5763). + + * Org reader: + + + Accept `ATTR_LATEX` in block attributes (Albert Krewinkel, #5648). + Attributes for LaTeX output are accepted as valid block attributes; + however, their values are ignored. + + Modify handling of example blocks (Brian Leung, #5717). + + Allow the `-i` switch to ignore leading spaces (Brian Leung). + + Handle awkwardly-aligned code blocks within lists (Brian Leung). + Code blocks in Org lists must have their `#+BEGIN_` aligned in a + reasonable way, but their other components can be + positioned otherwise. + + Fix parsing of empty comment lines (#5856, Albert Krewinkel). + Comment lines in Org-mode can be completely empty. + + * Muse reader (Alexander Krotov): + + + Add RTL support (#5551). + + Do not allow closing asterisks to be followed by `*`. + + Do not split series of asterisks into symbols and emphasis (#5821). + + Do not terminate emphasis on `*` not followed by space. + + * DokuWiki reader: + + + Parse markup inside monospace ('') (#5916, Alexander Krotov). + + * Docx reader: + + + Move style-parsing-specific code to a new unexported module, + Text.Pandoc.Readers.Docx.Parse.Styles (Nikolay Yakimov). + + Move StyleMap to docx writer (Nikolay Yakimov). + + Only use LTR when it is overriding BiDi setting (#5723, Jesse + Rosenthal). The left-to-right direction setting in docx is used + in the spec only for overriding an explicit right-to-left setting. + We only process it when it happens in a paragraph set with BiDi. + This is especially important for docs exported from Google Docs, + which explicitly (and unnecessarily) set `rtl=0` for every paragraph. + + Fix list number resumption for sublists (#4324). + The first list item of a sublist should not resume numbering + from the number of the last sublist item of the same level, + if that sublist was a sublist of a different list item. + + * Docbook reader: + + + Richer parse for admonitions (Michael Peyton Jones, #1234). + Instead of parsing admonitions as blockquotes, we now parse + them as Divs with an appropriate class. We also handle titles + for admonitions as a nested Div with the "title" class. + + Fix nesting of chapters and sections (#5864, Florian Klink, + Félix Baylac-Jacqué). + + Fix bug with entities in mathphrase element (#5885). + + * MediaWiki reader: + + + Skip optional `{{table}}` template (#5757). + + * LaTeX reader: + + + Fix dollar-math parsing to ensure that space is left between a + control sequence and a following letter (#5836). + + In `untokenize`, ensure space between control sequence + and following letter (#5836). + + Don't omit macro definitions defined in the preamble. + These were formerly omitted (though they still affected macro + resolution if `latex_macros` was set). Now they are included in + the document body. + + Parse macro definitions as raw LaTeX when `latex_macros` is + disabled. (When `latex_macros` is enabled, we omit them, since + pandoc is applying the macros itself.) + + Fix a hang/memory leak in certain circumstances (#5845). + + Text.Pandoc.Readers.LaTeX.Parsing: add `[Tok]` parameter to + `rawLaTeXParser`. This allows us to repeat retokenizing + unnecessarily in e.g. `rawLaTeXBlock`. + + Add KOMA-Script metadata commands (#5910, Andrew Dunning). + Add all titling commands to existing definition for `\dedication`. + + Parse `\micro` siunitx unit command (#5921, Jose Luis Duran). + + * Markdown writer: + + + Ensure proper nesting when we have long ordered list markers (#5705). + + Make `plain` output plainer (#5741). Previously we used the following + Project Gutenberg conventions for plain output: extra space before and + after level 1 and 2 headings, all-caps for strong emphasis, + underscores surrounding regular emphasis. Now these + conventions are used only when the `gutenberg` extension is + enabled. By default, Strong and Emph are rendered without + special formatting, and headings are rendered without + special formatting, and with only one blank line following. + To restore the former behavior, use `-t plain+gutenberg`. + + Prefer using raw_attribute when enabled (#4311). + The `raw_attribute` will be used to mark raw bits, even HTML + and LaTeX, and even when `raw_html` and `raw_tex` are + enabled, as they are by default. To get the old behavior, + disable `raw_attribute` in the writer. + + Prefer `pipe_tables` to raw HTML even when we must + lose width information (#2608, #4497). + + Improve escaping in list items (#5918). + + * AsciiDoc writer: + + + Don't include `+` in code blocks for regular asciidoc. + This is asciidoctor-specific. + + Handle admonitions (#5690). + + * LaTeX writer: + + + Add thin space when needed in LaTeX quote ligatures (#5684). + + Use `\hspace{0pt}` for 0-width space U+200B (#5756). + + Use `cslreferences` environment for csl bibliographies. + This allows bibliographies to receive special formatting. + The template now contains definition of this environment (enabled + only when CSL is used). It also defines a `\cslhangindent` length. + This is set to 2em by default when the bibliography style specifies + a hanging indent. To override the length, you can use e.g. + `\setlength{\cslhangindent}{7em}` in header-includes. + See jgm/pandoc-citeproc#410. + + Strip off `{}` around locator for biblatex/natbib output (#5722). + + Fix line breaks at start of paragraph (#3324). + Previously we just omitted these. Now we render them + using `\hfill\break` instead of `\\`. This is a revision + of a PR by @sabine (#5591) who should be credited with the idea. + + We no longer look in the template or header-includes to see if a + book or article documentclass is used, or to see whether the + `csquotes` package is used. To use `csquotes` for LaTeX, set + `csquotes` in your variables or metadata. To specify a book + style, use the `documentclass` variable or + `--top-level-division`. + + Fix horizontal rule (#5801). We change to use 0.5pt rather than + `\linethickness`, which apparently only ever worked "by accident" + and no longer works with recent updates to texlive. + + * ConTeXt writer: + + + Add option to include source files in ConTeXt PDFs (Tristan + Stenner, #5578). The metadata field or variable + (`includesource`) can be set to attach the source documents + to the resulting PDF. + + Customizable type of PDF/A for the ConTeXt writer (Karl + Pettersson, #5608). The `pdfa` variable may now be set in metadata. + Also updated color profile settings in accordance with ConTeXt wiki, + and made ICC profile and output intent for PDF/A customizable + using `pdfaiccprofile` and `pdfaintent`. + + Unit tests: adjust code property to avoid an irrelevant + failure involving inline code with two consecutive newlines. + + Set `csl-hanging-indent` variable if needed. + + Use special environment for CSL references. + + Use braces, not start/stop, for inline language tags. + This prevents unwanted gobbling of spaces. + + * HTML writer: + + + Use numeric character references with `--ascii` (#5718). + Previously we used named character references with html5 output. + But these aren't valid XML, and we aim to produce html5 that is + also valid XHTML (polyglot markup). (This is also needed for epub3.) + + Ensure that line numbers in code blocks get id-prefix (#5650). + + Ensure TeX formulas are rendered correctly (Philip Pesca, + #5658). The web service passed in to `--webtex` may render + formulas using inline or display style by default. + Prefixing formulas with the appropriate command ensures + they are rendered correctly. + + Render inline formulas correctly with `--webtex` (Philip + Pesca, #5655). We add `\textstyle` to the beginning of the + formula to ensure it will be rendered in inline style. + + Pass through `aria-` attributes to HTML5 (#5642). + + Render a Quoted element with an inner Span with + `cite` attribute using a `<q>` tag (#5798, Ole Martin Ruud). + + Render a Span with class `mark` using the `<mark>` element + (Florian Beeres, #5797). + + Render Span with class `dfn` using `<dfn>` element + (Florian Beeres, #5882). + + Render Span with class `kbd` using `<kbd>` element (Daniele + D'Orazio, #5796). + + Render Code with class `variable` using `<var>` element + (Amogh Rathore, #5799). + + Render Code with class `sample` using `<samp>` element + (Amogh Rathore, #5799). + + * EPUB writer: + + + Improve splitting into chapters (#5761), using `makeSection`. + + Avoid issuing warning multiple times when title not set (see #5760). + + Use svg tag wrapper for cover image (#5638). In addition, the + code generating the image has been moved to the template, to make it + more customizable. NOTE: Those who use custom EPUB + templates will need to adjust their templates, adding the + code to generate the cover image. (Previously this was just + inserted into 'body'.) + + Improve toChapters, making it work better if there are Divs + around sections. + + Add support for EPUB2 covers (blmage, #3992). + + Do not override existing "fileN" medias when writing to EPUB format + (blmage, #4206). + + Ensure that `lang` variable is set on all chapters (so that it + will add an `xml:lang` attribute on the `html` element). + + * RST writer: + + + Removed remnants of `admonition-title`. + + Fix handling of `:align:` on figures and images (#4420). + When the image has the `align-right` (etc.) class, we now use + an `:align:` attribute. + + Improve spacing for tables with no width information (#5899). + If a simple table would be too wide, we use a grid table. + + Fix backslash escaping after strings (Albert Krewinkel, #5906). + The check whether a complex inline element following a string must + be escaped, now depends on the last character of the string instead + of the first. + + Ensure there's a blank line before tables (#5898). + + * Dokuwiki writer: + + + Handle mixed lists without HTML fallback (#5107). + + * XWiki writer: + + + Fix multiline table (Zihang Chen, #5683). + + * Muse writer: + + + Add RTL support (Alexander Krotov, #5551). + + * Man writer: + + + Suppress non-absolute link URLs (#5770). Absolute URLs are + still printed in parentheses following the link text, but relative + URLs are suppressed (just as internal links starting with '#' + always have been). + + Improved definition list term output. Now we boldface code but + not other things. This matches the most common style in man pages + (particularly option lists). + + * Ms writer: + + + Use `.LP` instead of `.PP` for line block (#5588). + + Use boldface for definition terms in DefinitionLists. + + * JATS writer: + + + Do not emit empty `<fn-group>` (Mauro Bieg, #5595). + + Update template to v1.1dtd (#5632, Arfon Smith). + + Update `data/jats.csl` to avoid commas between editor + name-part elements. (#5629) + + Add `abstract` to template (Mauro Bieg). + + * TEI writer: + + + Don't strip hash from internal links (#5922). + + * Jira writer: + + + Remove escapeStringForJira for code blocks (Jan-Otto Kröpke). + + Remove extraneous newline after single-line block quotes + (#5858, Albert Krewinkel). + + Improve escaping of special characters, using backslash escapes + instead of HTML entities (#5858, Albert Krewinkel). + + * OpenDocument writer: + + + Avoid duplicate attributes (#4634). We use the innermost + attribute in nested cases. + + If `native_numbering` extension is set, use native OpenDocument + enumeration for figures and tables (Nils Carlson). + + Place caption before table (#5681, Dmitry Pogodin). + + * ODT writer: + + + Add a test for MathML formulas in ODT documents (blmage). + + Improve the parsing of frames in ODT documents (blmage). + + * Docx writer: + + + Make handling of styles more robust in localized versions + of Word (Nikolay Yakimov, #5523, #5052, #5074). We now use + style names, not ids, for assigning semantic meaning, since + the ids can change depending on the locale. Style name + comparisons are case-insensitive, since those are + case-insensitive in Word. Since docx style names can have + spaces in them, and pandoc-markdown classes can't, anywhere + when style name is used as a class name, spaces are + replaced with ASCII dashes `-`. Code styles, i.e. "Source + Code" and "Verbatim Char" now honor style inheritance. Docx + Reader now honours "Compact" style (used in + Pandoc-generated docx). The side-effect is that "Compact" + style no longer shows up in docx+styles output. Styles + inherited from "Compact" will still show up. + + Re-use Readers.Docx.Parse for StyleMap (#5766, Nikolay Yakimov). + + Internal improvements and code simplification (Nikolay Yakimov). + + Preserve built-in styles in DOCX with custom style (Ben Steinberg, + #5670). This change prevents custom styles on divs and spans + from overriding styles on certain elements inside them, like + headings, blockquotes, and links. On those elements, the + "native" style is required for the element to display correctly. + This change also allows nesting of custom styles; in order to do so, + it removes the default "Compact" style applied to Plain blocks, + except when inside a table. + + Add `proofState` to list of elements carried over from + settings.xml in the reference.docx (Krystof Beuermann, #5703). + + Change order of `ilvl` and `numId` in `document.xml` (Agustín + Martín Barbero, #5645). Also, make list para properties go first. + This reordering of properties shouldn't be necessary but + it seems Word Online does not understand the docx correctly otherwise. + + * PowerPoint writer: + + + Code formatting is now context dependent (Jeroen de Haas, #5573). + This commit alters the way in which the Powerpoint writer treats + inline code and code blocks. Inline code is now formatted at + the same size as the surrounding text. Code blocks are now given + a margin and font size according to their level. + Furthermore this commit allows changing the font with which code is + formatted via the `monofont` option. + + Start numbering at appropriate numbers (Jesse Rosenthal, #5709). + Starting numbers for ordered lists were previously ignored. Now + we specify the number if it is something other than 1. + + * Text.Pandoc.Parsing: + + + Add `manyChar`, `many1Char`, `manyTillChar`, `many1TillChar`, + `many1Till`, `manyUntil`, `mantyUntilChar`: these are like their + unsuffixed counterparts but pack some or all of their output + (Christian Despres, #5884). + + Add `stateAllowLineBreaks` to `ParserState` [API change]. + + Fix inline parsing in grid table cells (#5708). + + Change type of `setLastStrPos` so it takes a `Maybe SourcePos` + rather than a `SourcePos` [API change]. + + Make `parseFromString'` and `gridTableWith` and + `gridTableWith'` polymorphic in the parser state, + constraining it with `HasLastStrPosition` [API change]. + + `parseFromString'`: reset `stateLastStrPos` to `Nothing` before parse. + + Rename takeWhileP -> take1WhileP and clean it up. + (It doesn't match the empty sequence.) + + * Text.Pandoc.PDF: + + + For PDFs via HTML, ensure temp file is deleted even if the pdf + program is not found (#5720). + + Better detection of a Cygwin environment (#5451). + + Don't assume tex log file is UTF8-encoded (#5872). + Fall back to latin1 if it can't be read as UTF-8. + + * Text.Pandoc.Extensions: + + + Export new function `getAllExtensions`, which returns the + extensions that affect a given format (whether enabled by default + or not) [API change]. + + Change type of `parseFormatSpec` from + `Either ParseError (String, Extensions -> Extensions)` + to `Either ParseError (String, [Extension], [Extension])` + [API change]. + + Add `Ext_gutenberg` constructor to `Extension` [API change]. + + Add `Ext_native_numbering` constructor to `Extension` [API change] + (Nils Carlson). + + * Text.Pandoc.Readers, Text.Pandoc.Writers: + + + Change type of `getReader` and `getWriter` so they return + a value in the PandocMonad instance rather than an Either + [API change]. Exceptions for unknown formats and unsupported + extensions are now raised by these functions. + + * Text.Pandoc.App + + + Change `optMetadataFile` type from `Maybe FilePath` to `[FilePath]` + (Owen McGrath, #5702) [API change]. + + * Text.Pandoc.Logging: + + + Add `CouldNotDeduceFormat` constructor to `LogMessage` [API change]. + Issue this warning when we're falling back to markdown or + html because we don't recognize the extension of the input or + output files. + + Clarify warning for missing title (#5760). + + Add `UnusualConversion` constructor to `LogMessage` [API change] + (Mauro Bieg, #5736). Emit warning on `-f latex -o out.pdf`. + + * Lua filters: + + + Improve function documentation (Albert Krewkinkel). + + Traverse nested blocks and inlines in correct order (Albert + Krewinkel, #5667). Traversal methods are updated to use the new + Walk module so that sequences with nested Inline (or Block) elements + are traversed in the order in which they appear in the linearized + document. + + New unexported module `Text.Pandoc.Lua.Walk` (Albert Krewinkel). + Lua filters must be able to traverse sequences of AST + elements and to replace elements by splicing sequences back + in their place. Special `Walkable` instances can be used for + this; those are provided in a new module + `Text.Pandoc.Lua.Walk`. + + `Attr` values can now be given as normal Lua tables (Albert + Krewinkel, #5744). This can be used as a convenient alternative + to constructing `Attr` values with `pandoc.Attr`. Identifiers + are taken from the `id` field, classes must be given as + space separated words in the `class` field. All remaining fields + are included as attributes. With this change, the following lines + now create equal elements: + ``` + pandoc.Span('test', {id = 'test', class = 'a b', check = 1}) + pandoc.Span('test', pandoc.Attr('test', {'a','b'}, {check = 1})) + ``` + This also works when using the *attr* setter: + ``` + local span = pandoc.Span 'text' + span.attr = {id = 'test', class = 'a b', check = 1} + ``` + Furthermore, the *attributes* field of AST elements can now be a + plain key-value table even when using the `attributes` accessor: + ``` + local span = pandoc.Span 'test' + span.attributes = {check = 1} -- works as expected now + ``` + + Export `make_sections`, remove `hierarchicalize`. Lua filters that + use `hierarchicalize` will need to be rewritten to use + `make_sections`. + + Add a `clone()` method to all AST elements (Albert Krewinkel, #5568). + + Fix Lua function names in pandoc.system (niszet). Change + `get_current_directory` to `get_working_directory` and + `with_temp_directory` to `with_temporary_directory`, to + conform to the manual. + + * Text.Pandoc.Error: + + + Add constructors `PandocUnknownReaderError`, + `PandocUnknownWriterError`, `PandocUnsupportedExtensionError`. + [API change]. + + Better message for `PandocShouldNeverHappenError`. + + Better message for `PandocTemplateError`. + + * Text.Pandoc.Emoji: + + + Update emoji list (#5666). Done using new `tools/emojis.hs`, + which uses the list from the gem GitHub uses. Future updates + can be done with this tool. + + * Text.Pandoc.PDF: + + + Pass value of `--dpi` to `rsvg-convert` when converting SVG to PDF + in the process of creating a PDF (#5721). + + * Text.Pandoc.Shared: + + + Replace `Element` and `makeHierarchical` with `makeSections`. + Now that we have Divs, we can use them to represent the + structure of sections, and we don't need a special Element type. + `makeSections` reorganizes a block list, adding Divs with class + `section` around sections, and adding numbering if needed. + This change also fixes some longstanding issues recognizing section + structure when the document contains Divs (#3057, see also #997). + + Remove `Element` type [API change] + + Remove `makeHierarchicalize` [API change] + + Add `makeSections` [API change] + + Export `deLink` [API change] + + Make `filterIpynbOutput` strip ANSI escapes from code in output + for non-ipynb formats, when the default "best" option is used with + `--ipynb-output` (#5633). + + Fix `camelCaseToHyphenated` so it handles `ABCDef` better. + + Improve `isTight` (#5857). If a list has an empty item, + this should not count against its being a tight list. + + Export `htmlSpanLikeElements` [API change] (Daniele D'Orazio, #5796). + This is a mapping of HTML span-like elements that are internally + represented as a Span with a single class. + + Change the implementation of `htmlSpanLikeElements` to retain + classes and attributes (#5882, Florian Beeres). + + * Text.Pandoc.Slides: recognize content in Divs when determining + slide level. + + * Text.Pandoc.SelfContained: + + + Omit content-type on type attribute for `<style>` (#5725). + It doesn't seem to be valid for HTML5, and as a result Chrome + ignores the style element. + + * Text.Pandoc.Pretty has been removed [API change]. + We now use the new external doclayout module instead. + + * Text.Pandoc.Writers.Shared: + + + Remove `metaToJSON`, `metaToJSON'` [API change]. + + Modify `addVariablesToContext`, `defField`, `setField`, `getField`, + `resetField` to work with Context rather than JSON values. [API change] + + Export new function `endsWithPlain` [API change]. + + Change `gridTables` so it does better at keeping the widths of + columns (#4320) and does better at figuring out column widths + when no widths are given (#5899). + + * Text.Pandoc.Options + + + Change type of `writerTemplate` to `Maybe Template` instead + of `Maybe String`. + + Change To/FromJSON instances for `HTMLMathMethod`, `CiteMethod`, + `ObfuscationMethod`, `TrackChanges`, `WrapOption`, + `TopLevelDivision`, `ReferenceLocation`, `HTMLSlideVariant` (#5790). + In each case we use lowercase (or hyphenated lowercase) for + constructors to line up more closely with command-line option + values. This is a breaking change for those who manually decode or + encode JSON for these data types (e.g. for `ReaderOptions` or + `WriterOptions`). + + * Text.Pandoc.Filters: + + + Add `FromYAML` instance for `Filter`. + + `applyFilters`: Add and apply filters in order (not reversed) + This changes `applyFilters` from Text.Pandoc.Filter so + that it does a left fold rather than a right fold, applying + the filters in the order listed. + + * Text.Pandoc.XML: + + + Change `toEntities` to emit numerical hex character references + (#5718). + + * Text.Pandoc.Highlighting: + + + Add additional listings languages (Wandmalfarbe). + + * Text.Pandoc.MediaBag: + + + Some of the types using Strings were switched to use FilePath instead + (Christian Despres, #5884). + + * Text.Pandoc.Templates: + + + Don't import/export `varListToJSON` [API change]. It is removed in + doctemplates >= 0.3. + + Change type of `renderTemplate'` [API change]. Return value is + now Text rather than being polymorphic. This makes room for + upcoming removal of the `TemplateTarget` class from doctemplates. + + * Text.Pandoc.App.Opt [API changes]: + + + More convenient To/FromJSON instances. Make the field names + like `strip-empty-paragraphs` rather than `optStripEmptyParagraphs`. + Anyone who is using JSON serialization of Opt will need to adjust + things accordingly. + + Change `optHighlightStyle` to a `Maybe String` instead of + `Maybe Style`. Do the parsing/loading of themes later, after + option parsing. + + Remove `optBaseHeaderLevel` from `Opt`. We now just use + `optShiftHeadingLevelBy`, to avoid redundancy. + + Change `optShiftHeadingLevel` to `optShiftHeadingLevelBy` to + match the option. + + Custom FromJSON instance for `LineEnding`, so either `CRLF` + or `crlf` will work. + + Change `optVariables` from `[(String, String)]` to `Context Text`. + + Change `optMetadata` to `Meta`, to allow structured values. + The current behavior of the `--metadata` option stays the same. + + Rename `optReader`, `optWriter` as `optFrom`, `optTo`. + + Add `FromYAML` instances to `Opt` and to all subsidiary types. + + Rename `optMetadataFile` to `optMetadataFiles`. + + Rename `optPDFEngineArgs` to `optPDFEngineOpts`. + + Rename `optWrapText` to `optWrap`. + + Add `IpynbOutput` enumerated type: use this instead of + a string for `optIpynbOutput`. + + Change optInputFiles to a `Maybe [FilePath]` (#5888) [API change]. + `Nothing` means: nothing specified. + `Just []` means: an empty list specified (e.g. in defaults). + + List fields in Opt so they aren't reversed (#5881) [API change]. + Previously `optIncludeInHeader`, etc. were in reverse order. + + The `sourcefile` variable is now always a list. It used to be + sometimes a string, sometimes a list (when there was more than one). + + * Template changes: + + + default.latex: added code for `cslreferences` environment, + to be used for pandoc-citeproc references. A `csl-hanging-indent` + variable (set automatically if there is a `hanging-ident` + class on the references Div) controls whether contents of this + environment receive a hanging indent. + + default.latex: Add `space` as default option for xeCJK, so that + spaces between words are preserved (#5855, jeongminkim-islab). + This is necessary for Korean. + + default.latex: Remove include of `grffile` (#5848). + This package used to be needed for proper handling of image filenames + containing periods (in addition to the period before the extension). + It no longer works with the latest LaTeX kernel and graphicx, + so we have removed it. Future versions of graphicx will handle + these filenames without the need for `grffile`. + + default.context: add a saner default for page numbers. + Previously they appeared centered at the top of the page; + now we put them centered at the bottom, unless the `pagenumbering` + variable is set. + + default.context: define a start-stop-pair `cslreferences` to + allow for hanging indents in the bibliography (#5875, Denis Maier). + + default.ms: update defaults. Use Palatino font, use slightly + wider interparagraph space, don't indent paragraphs, + and put page numbers on the bottom. This brings ms output + closer to default LaTeX output. + + default.revealjs: add navigationMode (Mauro Bieg, #5657). + + default.muse: handle multiple authors better. + + docbook4, docbook5 templates: add indentation to body. + + HTML-based templates: use `styles.html` partial to avoid + code duplication. + + HTML-based templates: change indentation of styles in template. + + * reference.docx (#5820): + + + Change Block Text (block quote) style so that the same font + is used as in the body text, and the block text is indented + left and right. + + All headings now have a uniform color. + + Level-1 headings no longer set `w:themeShade="B5"`. + + Level-2 headings are now 14 point rather than 16 point. + + Level-3 headings are now 12 point rather than 14 point. + + Level-4 headings are italic rather than bold. + + * epub.css: Add CSS for hanging-indent div to support pandoc-citeproc's + new hanging indents. + + * pandoc.cabal: + + + Repeat ghc-options in all stanzas. + + Remove conditionals for ghc < 8 (Albert Krewinkel, #5693). + + Compile with `-Wcpp-undef` and `-fhide-source-paths` when possible + (Albert Krewinkel). + + Add cabal.project to extra-source-files (Albert Krewinkel). + + Add dependency on skylighting-core (#5729). Even though it shouldn't + be needed, some tools require it. + + Require latest pandoc-types, texmath, skylighting, haddock-library. + + Ensure TemplateHaskell is added to other-extensions when it is + used (Vanessa McHale, #5728). + + Remove `derive_json_via_th` flag; always use TH. This cuts down + on code duplication and reduces the chance for errors. See #4083. + + * Makefile: + + + Add ghci target. + + Add ghcid target. + + Remove references to obsolete flag (#5694). + + * Benchmarks: fix failure on ipynb. + + * Use MathJax 3 (zorkow). + + * KaTeX math: respect `classoption=fleqn` variable, + bump KaTeX version to 0.11.1 (#5815, Mauro Bieg). + + * Fix redundant constraint compiler warnings (Pete Ryland, #5625). + + * Use throwError instead of fail when appropriate. + + * Use Prelude.fail to avoid ambiguity with fail from GHC.Base. + + * Add `diff-zip.sh` to tools (John MacFarlane, Agustín Martín Barbero). + This is intended to make it easier to test differences in zip + containers, like epub, docx, or odt. + + * Add `.gitattributes` (#5747). This ensures that the golden files + in `test/fb2/reader/` don't have newlines converted. This should fix + a test failure on GitHub CI with Windows. + + * Reorder options in `--help`. + + * Revise code for HsYAML-0.2.0.0 (@vijayphoenix, #5704). + + * Remove blank line in code example in Haddocks (Leif Metcalf, #5679). + + * Fix trypandoc with `getReader`/`getWriter` changes. + + * Allow building pandoc with GHC 8.8. + + * linux tarball: add architecture `-amd64` to filename. + Now it will be: `pandoc-VERSION-linux-ARCH.tar.gz`. + + * MANUAL.txt: + + + Add section for exit codes. + + Document some pptx limitations in slide show section: + No incremental display (#5689). No pause with `. . .` (#5701). + + reveal.js flags (Mauro Bieg, #5653). + + Document addition of `data-` prefix to unknown attributes in HTML5. + + Link to YAML spec (Mauro Bieg, #5687). + + Fix capitalization of "Linux" (#5859, Marcus Stollsteimer). + + Use a table for exit codes. + + Put all template variable docs into one section. + + Use ATX headers consistently. + + Add fuller documentation of templates (#5779), including + new template syntax, partials, etc. + + Add documentation for the variable `hyperrefoptions` (Wandmalfarbe). + + Clarify when macro definitions are passed as raw latex. + In Markdown input, they are always passed through. In LaTeX, only if + `latex_macros` is disabled. + + Clarify that `--dpi` provides a default and doesn't override + dpi values specified in the images themselves (#5721). + + Document how to use custom writers with `--standalone` (#5866). + + Clarify `--preserve-tabs` default. + + * INSTALL.md: + + + Fix instructions for libicu. + + Add Void Linux instructions (Volodymyr Kozachnyskyi). + + * CONTRIBUTING.md: + + + Add information on tests (Agustín Martín Barbero, #5652). + + Add information about command test naming to CONTRIBUTING (Florian B). + + * Fix typos in changelog and comments (#5896, Brian Wignall). + + * doc/lua-filters.md: + + + Fix mistakes in mediabag module docs (#5851, Albert Krewinkel). + + Improve metadata replacement example in lua-filters doc (#5851). + + Mention which Lua version is shipped with pandoc (Albert Krewinkel, + #5892). + +## pandoc 2.7.3 (2019-06-11) + + * Add `jira` (Atlassian's Jira wiki markup) as output format (#2497, + Albert Krewinkel). + + * Add `tex_math_dollars` to `multimarkdownExtensions` (#5512). + This form is now supported in multimarkdown, + in addition to `tex_math_double_backslash`. + + * Fix `--self-contained` so it works when output format has extensions. + Previously if you used `--self-contained` with `html-smart` or + `html+smart`, it wouldn't work. + + * Add template variable `curdir` with working directory + from which pandoc is run (#5464). + + * Markdown reader: don't create implicit reference for empty header + (#5549). + + * Muse reader: allow images inside link descriptions (Alexander Krotov). + + * HTML reader: epub related fixes. + + + With epub extensions, check for `epub:type` in addition to `type`. + + Fix problem with noteref parsing which caused block-level + content to be eaten with the noteref. + + Rename `pAnyTag` to `pAny`. + + Refactor note resolution. + + Trim definition list terms (Alexander Krotov). + + * LaTeX reader: + + + Add braces when resolving `\DeclareMathOperator` + (#5441). These seem to be needed for xelatex but not pdflatex. + + Allow newlines in `\mintinline`. + + Pass through unknown listings language as class (#5540). + Previously if the language was not in the list of languages supported + by listings, it would not be added as a class, so highlighting + would not be triggered. + + `rawLaTeXInline`: Include trailing `{}`s in raw latex commands (#5439). + This change affects the markdown reader and other readers that allow raw + LaTeX. Previously, trailing `{}` would be included for unknown + commands, but not for known commands. However, they are sometimes used + to avoid a trailing space after the command. The chances that a `{}` + after a LaTeX command is not part of the command are very small. + + * MediaWiki reader: handle multiple attributes in table row (#5471, + chinapedia). + + * Docx reader: Add support for `w:rtl` (#5545). Elements with this + property are put into Span inlines with `dir="rtl"`. + + * DocBook reader: Issue `IgnoredElement` warnings. + + * Org reader (Albert Krewinkel): + + + Fix planning elements in headers level 3 and higher + (#5494). Planning info is now always placed before + the subtree contents. Previously, the planning info was placed after + the content if the header's subtree was converted to a list, which + happens with headers of level 3 and higher per default. + + Omit, but warn about unknown export options. Unknown export + options are properly ignored and omitted from the output. + + Prefer plain symbols over math symbols (#5483). + Symbols like `\alpha` are output plain and unemphasized, not as math. + + Recognize emphasis after TODO/DONE keyword (#5484). + + * FB2 reader: + + + Skip unknown elements rather than throwing errors (#5560). + Sometimes custom elements are used (e.g. `id` element + inside `author`); previously the reader would halt with an error. + Now it skips the element and issues an `IgnoredElement` warning. + + Parse notes (#5493, Alexander Krotov). + + Internal improvements (Alexander Krotov). + + * OpenDocument writer: Roll back automatic figure/table numbering + (#5474). This was added in pandoc 2.7.2, but it makes it impossible + to use pandoc-crossref. So this has been rolled back for now, + until we find a good solution to make this behavior optional + (or a creative way to let pandoc-crossref and this feature + to coexist). + + * New module Text.Pandoc.Writers.Jira, exporting `writeJira` [API + change] (Albert Krewinkel). + + * EPUB writer: + + + Don't include 'landmarks' if there aren't any. + Previously we could get an empty ol element, which caused + validation errors with epubcheck. + + Ensure unique ids for styleesheets in content.opf (#5463). + + Make stylesheet link compatible with kindlegen (#5466, + Eric Schrijver). Pandoc omitted `type="text/css"` from both + `<style>` and `<rel="stylesheet">` elements in all templates, which + is valid according to the spec. However, Amazon’s kindlegen software + relies on this attribute on `<link>` elements when detecting + stylesheets to include. + + * HTML writer: + + + Output video and audio elements depending on file + extension of the image path (Mauro Bieg). + + Emit empty alt tag in figures (#5518, Mauro Bieg). + The same text is already in the <figcaption> and + screen-readers would read it twice, see #4737. + + Don't add variation selector if it's already there. + This fixes round-trip failures. + + Prevent gratuitous emojification on iOS (#5469). + iOS chooses to render a number of Unicode entities, including '↩', as + big colorful emoji. This can be defeated by appending Unicode + VARIATION SELECTOR-15'/'VARIATION SELECTOR-16'. So we now append this + character when escaping strings, for both '↩' and '↔'. If other + characters prove problematic, they can simply be added to + `needsVariationSelector`. + Add `class="heading"` to level 7+ Headers + rendered as `<p>` elements (#5457). + + * RST writer: treat Span with no attributes as transparent (#5446). + Previously an Emph inside a Span was being treated as + nested markup and ignored. With this patch, the Span + is just ignored. + + * LaTeX writer: + + + Include inline code attributes with `--listings` (#5420). + + Don't produce columns environment unless beamer (#5485). + + Fix footnote in image caption. Regression: the fix for #4683 broke + this case. + + Don't highlight code in headings (#5574). This causes + compilation errors. + + Use `\mbox` to get proper behavior inside `\sout` (#5529). + + * EPUB writer: Fix document section assignments (#5546). + For example, introduction should go in bodymatter, not frontmatter, and + epigraph, conclusion, and afterward should go in bodymatter, not + backmatter. For the full list of assignments, see the manual. + + * Markdown writer: + + + Add backslashes to avoid unwanted interpretation of + definition list terms as other kinds of block (#554). + + Ensure the code fence is long enough (#5519). + Previously too few backticks were used when the code block + contained an indented line of backticks. (Ditto tildes.) + + Handle labels with integer names (Jesse Rosenthal, #5495). + Previously if labels had integer names, it could produce a conflict + with auto-labeled reference links. Now we test for a conflict and + find the next available integer. This involves adding a new state + variable `stPrevRefs` to keep track of refs used in other document + parts when using `--reference-location=block|section` + + * Textile writer: fix closing tag for math output (Albert Krewinkel). + Opening and closing tag for math output match now. + + * Org writer: always indent src blocks content by 2 spaces (#5440, Albert + Krewinkel). Emacs always uses two spaces when indenting the content of + src blocks, e.g., when exiting a `C-c '` edit-buffer. Pandoc used to + indent contents by the space-equivalent of one tab, but now always uses + two spaces, too. + + * Asciidoc writer: + + + Use `` `+...+` `` form for inline code. + The old `` `a__b__c` `` yields emphasis inside code in asciidoc. + To get a pure literal code span, use `` `+a__b__c+` ``. + + Use proper smart quotes with asciidoctor (#5487). + Asciidoctor has a different format for smart quotes. + + Use doubled ## when necessary for spans (#5566). + + Ensure correct nesting of strong/emph (#5565): strong + must be the outer element. + + * JATS writer: + + + Wrap elements with p when needed (#5570). The JATS spec restricts + what elements can go inside `fn` and `list-item`. So we wrap other + elements inside `<p specific-use="wrapper">` when needed. + + Properly handle footnotes (#5511) according to "best practice." + (Group them at the end in `<fn-group>` and use `<xref>` elements + to link them.) + + Fix citations with PMID so they validate (#5481). This includes + an update to data/jats.csl. + + Ensure validity of `<pub-date>` by parsing the date and + extracting year, month, and day, as expected. Also add an + iso-8601-date attribute automatically. + + Don't use `<break>` element for LineBreak. It is only + allowed in a few special contexts, and not in `<p>` elements. + + Don't make `<string-name>` a child of `<string>`, which is illegal. + + * FB2 writer: + + + Do not wrap note references into `<sup>` and brackets + (Alexander Krotov). Existing FB2 readers, such as FBReader, already + display links with type="note" as a superscript. + + Use genre metadata field (#5478). + + * Muse writer: do not escape empty line after `<br>` (Alexander Krotov). + + * Add unicode code point in "Missing character" warning (#5538). + If the character isn't in the console font, the message is pretty useless, + so we show the code point for anything non-ASCII. + + * Lua: add Version type to simplify comparisons (Albert Krewinkel). + Version specifiers like `PANDOC_VERSION` and `PANDOC_API_VERSION` are + turned into `Version` objects. The objects simplify version-appropriate + comparisons while maintaining backward-compatibility. + A function `pandoc.types.Version` is added as part of the newly + introduced module `pandoc.types`, allowing users to create version + objects in scripts. + + * pandoc lua module (Albert Krewinkel): + + - Fix deletion of nonexistent attributes (#5569). + - Better tests for Attr and AttributeList. + + * pandoc.mediabag lua module (Albert Krewinkel): + + + Add function `delete` for deleting a single item. + + Add function `empty` for removing all entries. + + Add function `items` for iterating over mediabag. + + * Text.Pandoc.Class: Fix handling of `file:` URL scheme in + `downloadOrRead` (#5517, Mauro Bieg). Previously `file:/` + URLs were handled wrongly and pandoc attempted to make HTTP + requests, which failed. + + * Text.Pandoc.MIME: add `mediaCategory` [API change] (Mauro Bieg). + + * Text.Pandoc.Shared: + + + Add `onlySimpleTableCells` [API change] + (Mauro Bieg) and use this to consolidate simple-table detection + (#5524). This fixes an inconsistency in the HTML reader, which did not + treat tables with `<p>` inside cells as simple. + + `metaToJSON`: treat digits starting with 0 as a string, not a number + (#5479). This fixes a regression in YAML metadata in pandoc 2.7.2. + + * Text.Pandoc.Logging: Add `IgnoredElement` constructor for + `LogMessage`. `SkippedConetnt` doesn't work for some XML-based + readers which don't have access to parsec source positions. + + * Text.Pandoc.Asciify: Add Turkish undotted-i (#5433, Mauro Bieg). + + * Improve output of Lua tests (#5499, Albert Krewinkel). + This makes use of tasty-lua, a package to write tests in Lua + and integrate the results into Tasty output. Test output becomes + more informative: individual tests and test groups become visible + in test output. Failures are reported with helpful error messages. + + * Lua: add `pandoc.system` module (#5468, Albert Krewinkel). + The `system` Lua module provides utility functions to interact with the + operating- and file system. E.g. + `print(pandoc.system.get_current_directory())` + or + ```lua + pandoc.system.with_temporary_directory('tikz', function (dir) + -- write and compile a TikZ file with pdflatex + end) + ``` + + * LaTeX template: Add pdflang to hypersetup if lang is set (#5443). + + * beamer template: Fix using Beamer with geometry (#5505, Daniel Maslowski). + Beamer already loads geometry, so we need to use the `\geometry` + command to set geometry options. + + * EPUB2/3 templates: Move inline styles to default epub.css (#5466). + NOTE: Those who use a custom CSS stylesheet with EPUB should + add these lines: + + code{ white-space: pre-wrap; } + span.smallcaps{ font-variant: small-caps; } + span.underline{ text-decoration: underline; } + q { quotes: "“" "”" "‘" "’"; } + div.column{ display: inline-block; vertical-align: top; width: 50%; } + + * reveal.js template: + + + Updates for revealjs 3.8.0 (#5435, ebiim). + + Remove reference to head.min.js (#5448, Winnie Hellmann). + NOTE: users will need to update reveal.js to at least 3.8.0 + for their presentations generated with this version of pandoc + to work correctly. + + * Text.Pandoc.PDF: + + + Replace `</>` with literal `/` (#5451). + We use forward-slash for a directory separator in tmpDir, + even on Windows (because that's what tex likes). So we + should not put a backslash between the tmpDir and the + filename on Windows. This is harmless enough in normal + Windows setups, but it breaks on Cygwin. + Thanks to @cc2x for noticing and diagnosing the problem. + + Allow use of `-output-directory` in `--pdf-engine-opt` (#5462). + This is currently possible with `mklatex` and `-outdir`, but + was not yet possible with xelatex and `-output-directory`. + + For PDF via ms/pdfroff, make TOC appear at beginning and in + PDF bookmarks (#5553). Previously the TOC appeared at the end + of the document, and was not bookmarked. To keep it at the end, + add `--pdf-engine-opt=--no-toc-relocation` to your command line. + + * Fix broken links in documents (#5473, Shim Myeongseob). + Also, use absolute links to pandoc.org when possible, so that + the links can be followed by people viewing these documents + on GitHub. + + * Improved sample lua tikz filter in lua-filters docs (#5445, + Matthew Doty). There are three changes: + + + It only processes elements which begin with `\begin{tikzpicture}` + + It uses pdf2svg instead of imagemagick to preserve fidelity + + The images produced have transparent backgrounds + + * MANUAL.txt: + + + Add note about `title-meta`, `author-meta`, `date-meta` (#5486). + + Fix typo (#5489, Christian Krause). + + * add test/tables.xwiki to git and pandoc.cabal (#5498, Mauro Bieg). + + * Disable missing-home-modules warning in `stack.yaml`. + Otherwise `stack ghci` fails. + + +## pandoc 2.7.2 (2019-04-05) + + * Add XWiki writer (#1800, Derek Chen-Becker). + Add `Text.Pandoc.Writers.XWiki`, exporting `writeXWiki` [API change]. + + * Dokuwiki Reader: parse single curly brace (#5416, Mauro Bieg). + + * Vimwiki reader: improve handling of internal links (#5414). + We no longer append `.html` to link targets, and we add a title + `wikilink`. This mirrors behavior of other wiki readers. Generally + the `.html` extension is not wanted. It may be important for output + to HTML in certain circumstances, but it can always be added using a + filter that matches on links with title `wikilink`. + + If your workflow requires the current behavior, here is a lua filter + that will add the `.html` extension: + + ```lua + function Link(el) + if el.title == 'wikilink' then + el.target = el.target .. ".html" + end + return el + end + ``` + * ipynb reader: + + + Use format `ipynb` for raw cell where no format given. + + Avoid introducing spurious `.0` on integers in metadata. + + * Markdown reader: fenced div takes priority over setext header. + + * HTML reader: read `data-foo` attribute into `foo` (#5392). + The HTML writer adds the `data-` prefix for HTML5 for nonstandard + attributes. But the attributes are represented in the AST without + the `data-` prefix, so we should strip this when reading HTML. + + * LaTeX reader: Improve autolink detection (#5340). + + * PowerPoint writer (Jesse Rosenthal): + + + Expand builtin reference doc to model all layouts. + The previous built-in reference doc had only title and content + layouts. Add in a section-header slide and a two-content slide, so + users can more easily modify it to build their own templates. + + Always open up in slide view. When editing a + template/reference-doc, the user might be in Master view, but when + producing a slide show, it is assumed that slide view will be + desired. + + Remove `handoutsMasterList` from template presentation.xml + + Fix numerous errors in templating (#5402). Previously, some templates + produced by Office 365 (MacOS) would not render with `--reference-doc` + correctly. We now apply correct shapes for content, and build + shape trees correctly. + + Make default placeholder type for template lookup. + + Apply speaker notes to metadata slide if applicable. + + Test for speaker notes after breaking header. + + Correctly handle notes after section-title header. + Previously, if notes came after a section-title header (ie, a level-1 + header in a slide-level=2 presentation), they would go on the next + slide. This keeps them on the slide with the header. + + Internal improvements. + + * ipynb writer: + + + Use format `ipynb` for raw cell where no format given. + According to nbformat docs, this is supposed to render in every + format. We don't do that, but we at least preserve it as a raw + block in markdown, so you can round-trip. + + Consolidate adjacent raw blocks. Sometimes pandoc creates two + HTML blocks, e.g. one for the open tag and one for a close tag. + If these aren't consolidated, only one will show up in output cell. + + Fixed carry-over of nbformat from metadata. + + Preserve `nbformat_minor` if it's given. This helps with round-tripping. + + * LaTeX writer: + + + Avoid inadvertently creating ?` or !` ligatures (#5407). + These are upside down ? and !, resp. + + Fix footnotes in table caption and cells (#5367). This fixes a + bug wherein footnotes appeared in the wrong order, and with + duplicate numbers, when in table captions and cells. + We now use regular `\footnote` commands, even in the table + caption and the minipages containing cells. Apparently + longtable knows how to handle this. + + * HTML writer: Don't add data- prefix to RDFa attributes (#5403). + + * JATS writer: Ensure that plain strings go inside `<pub-id>` tag (#5397). + + * Markdown writer: + + + Better rendering of numbers (#5398). If the number is integral, + we render it as an integral not a float. + + Proper rendering of empty map in YAML metadata (#5398). Should + be `{}`, not empty string. + + Properly escape attributes in Markdown writer (#5369). + + Be sure implicit figures work in list contexts (#5368). + Previously they would sometimes not work: e.g., when they + occurred in final paragraphs in lists that were originally + parsed as Plain and converted later using PlainToPara. + + * Docx writer: Use `w:br` without attributes for line breaks (#5377). + We previously added the attribute `type="textWrapping"`, but + this causes problems on Word Online. + + * LaTeX template (Andrew Dunning): + + + Ensure correct heading/table order (#5365). Improve workaround + (#1658) for tables following headings. The new solution works whether + or not the `indent` variable is enabled. + + Remove `subparagraph` variable. The default is now to use run-in + style for level 4 and 5 headings (`\paragraph` and `\subparagraph`). + To get the previous default behavior (where these were formatted as + blocks, like `\subsubsection`), set the `block-headings` variable. + + Add pandoc to PDF metadata (#5388). + + Group graphics-related code (#5389). + + Move `\setstretch` after front matter (#5179). Ensures that + `\maketitle`, `\tableofcontents`, and so forth are not affected by + changes to line spacing. + + * Update data/jats.csl to avoid commas between name-part elements + (#5397). + + * Add support for golang (`go`) with `--listings` (#5427). + + * Text.Pandoc.Shared - improve `metaToJSON` behavior with numbers. + We now do a better job marshalling numbers from MetaString + or MetaInlines into JSON Number. + + * Text.Pandoc.Writers.Shared: `metaValueToJSON`: use Number Values for + integers. Pandoc's MetaValue doesn't have a distinguished number type, + so numbers are put in MetaStrings. If the MetaString consists + entirely of digits, we convert it to a Number. We should probably + consider adding a MetaNumber constructor to MetaValue, for better + round-tripping with JSON etc. This change aids round-tripping in + ipynb metadata fields, like `toc_depth`. + + * Text.Pandoc.Class: `fetchItem`: don't treat UNC paths as + protocol-relative URLs (#5127). These are paths beginning `//?/UNC/...`. + + * Text.Pandoc.ImageSize: Improve `pdfSize` so it handles + a wider range of PDFs (#4322, with help from Richard Davis). + + * Text.Pandoc.Pretty: avoid stack overflow by using strict sum (#5401). + + * Fix harmless error in file-scope code (#5422). + + * MANUAL.txt: + + + Improve 'header' and 'heading' usage (#5423, Andrew + Dunning). The term 'header' was being used where 'heading' + is more appropriate. + + Add paragraph on options affecting markdown in ipynb. + + * stack.yaml - remove -Wmissing-home-modules + This seems to cause problems with stack ghci. Remove RTS options. + + * Add ghc-options to cabal.project. + + * appveyor.yml - use ghc 8.6.4. Fixes segfault issues on Windows (#5037). + + * linux build process: Remove clone of pandoc-citeproc (#5366). + It wasn't being used; cabal.project specifies the version to use. + +## pandoc 2.7.1 (2019-03-14) + + * Add tectonic as an option for --pdf-engine (#5345, Cormac Relf). + Runs tectonic on STDIN instead of a temporary .tex file, so that it + looks in the working directory for `\include` and `\input` like the rest + of the engines. Allows overriding the output directory + args with `--pdf-engine-opt=--outdir --pdf-engine-opt="$DIR"`. + + * Allow `-o/--output` to be used with `--print-default-data-file`, + `--print-highlighting-style`, `--print-default-template`. + Note that `-o` must occur BEFORE the `--print*` command on the command + line (this is documented, #5357). + + * LaTeX reader: + + + Support `\underline`, `\ul`, `\uline` (#5359, Paul + Tilley). These are parsed as a Span with class `underline`, as + with other readers. + + Ensure that `\Footcite` and `\Footcites` get put in a note. + + * ipynb reader: + + + Remove sensitivity to `raw_html`, `raw_tex` extensions. + We now include every output format. Pruning is handled by + `--ipynb-output`. + + Better handling of cell metadata. We now include even complex cell + metadata in the Div's attributes (as JSON, in complex cases, or + as plain strings in simple cases). + + * ipynb writer: + + + Recurse into native divs for output cell data (#5354). + + Render cell metadata fields from div attributes. + + * Docx writer: avoid extra copy of abstractNum and num elements + in numbering.xml. This caused pandoc-produced docx files to + be uneditable using Word Online (#5358). + + * Markdown writer: improve handling of raw blocks/inline. + We now emit raw content using `raw_attribute` when no more + direct method is available. Use of `raw_attribute` can be + forced by disabling `raw_html` and `raw_tex`. + + * LaTeX writer: Add classes for frontmatter support (#5353, Andrew Dunning) + and remove frontmatter from `scrreprt`. + + * LaTeX template: + + + Improve readability (#5363, Andrew Dunning). + + Robust section numbering removal (#5351, Andrew Dunning). + Ensures that section numbering does not reappear with custom + section levels. See <https://tex.stackexchange.com/questions/473653/>. + + Better handling of front/main/backmatter (#5348). + In pandoc 2.7 we assumed that every class with chapters would accept + `\frontmatter`, `\mainmatter`, and `\backmatter`. This is not so (e.g. + report does not). So pandoc 2.7 breaks on report class by including an + unsupported command. Instead of the `book-class` variable, we use two + variables, `has-chapters` and `has-frontmatter`, and set these + intelligently in the writer. + + * Text.Pandoc.Shared: Improve `filterIpynbOutput`. Ensure that + images are prioritized over text. `best` should include everything + for ipynb. + + * Tests.Old: specify `--data-dir=../data` to ensure tests can find + data files even if they haven't been installed. Remove old + `pandoc_datadir` environment variable, which hasn't done anything for a + long time. + + * MANUAL.txt: Add recommendation to use `raw_attribute` with ipynb (#5354). + + * Use cmark-gfm-hs 0.1.8 (note that 0.1.7 is buggy). + + * Use latest pandoc-citeproc, texmath. + + +## pandoc 2.7 (2019-03-03) + + * Use XDG data directory for user data directory (#3582). Instead of + `$HOME/.pandoc`, the default user data directory is now + `$XDG_DATA_HOME/pandoc`, where `XDG_DATA_HOME` defaults to + `$HOME/.local/share` but can be overridden by setting the + environment variable. If this directory is missing, then + `$HOME/.pandoc` is searched instead, for backwards compatibility. + However, we recommend moving local pandoc data files from + `$HOME/.pandoc` to `$HOME/.local/share/pandoc`. On Windows the + default user data directory remains the same. + + * Slide show formats behavior change: content under headers + less than slide level is no longer ignored, but included in + the title slide (for HTML slide shows) or in a slide after + the title slide (for beamer). This change makes possible + 2D reveal.js slideshows with content in the top slide on + each stack (#4317, #5237). + + * Add command line option `--ipynb-output=all|none|best` (#5339). + Output cells in ipynb notebooks often contain several different + versions of an output, with different MIME types, e.g. an HTML + table and a plain-text fallback. Specifying `--ipynb-output=best` + (the default) ensures that the best version for the output format + is used. `all` includes all versions, and `none` suppresses them + all, leaving output cells empty. + + * `asciidoctor` is now an output format separate from `asciidoc`, + to accommodate some minor implementation-specific differences + (currently just in the treatment of display math). + + * Add `latexmk` as an option for `--pdf-engine` (#3195). + Note that you can use `--pdf-engine-opt=-outdir=bar` to specify + a persistent temp directory. + + * Markdown reader: + + + Improve tight/loose list handling (#5285). Previously the + algorithm allowed list items with a mix of Para and Plain, which + is never wanted. + + Add newline when parsing blocks in YAML (#5271). Otherwise last + block gets parsed as a Plain rather than a Para. This is a + regression in pandoc 2.x. This patch restores pandoc 1.19 + behavior. + + Make `yamlToMeta` respect extensions (#5272, Mauro Bieg). + This adds a `ReaderOptions` parameter to `yamlToMeta` [API change]. + + Fix bug parsing fenced code blocks (#5304). Previously parsing + would break if the code block contained a string of backticks of + sufficient length followed by something other than end of line. + + * LaTeX reader: don't let `\egroup` match `{`. `braced` now actually + requires nested braces. Otherwise some legitimate command and + environment definitions can break. + + * Docx reader (Jesse Rosenthal): + + + Rename `getDocumentPath` as `getDocumentXmlPath`. + + Use field notation for setting `ReaderEnv`. + + Figure out `document.xml` path once at the beginning of parsing, and + add it to the environment, so we can avoid repeated lookups. + + Dynamically determine main document xml path (#5277). + The desktop Word program places the main document file in + `word/document.xml`, but the online word places it in + `word/document2.xml`. This file path is actually stated in the root + `_rels/.rels` file, in the `Relationship` element with an + `http://../officedocument` type. + + Fix paths in archive to prevent Windows failure (#5277). + Some paths in archives are absolute (have an opening slash) which, for + reasons unknown, produces a failure in the test suite on MS + Windows. This fixes that by removing the leading slash if it exists. + + Add comments to aid code readability. + + Trim space inside the last inline (#5273). + + Unwrap sdt elements in footnotes and comments (#5302). + + * Muse reader (Alexander Krotov): + + + Test that block level markup does not break `<verbatim>`. + + Add secondary note support. + + * ipynb reader: handle images referring to attachments. Previously + we didn't strip off the attachment: prefix, so even though the + attachment was available in the mediabag, pandoc couldn't find it. + + * JATS reader: + + + Fix parsing of figures (#5321). This ensures that a figure + containing a single image is parsed as a pandoc "implicit + figure" (i.e., a Para with a single Image whose title attribute + begins with `fig:`). More complex figures will still be parsed + as divs. + + Support `fig-group` block element (#5317). + + Handle citations with multiple references (#5310). The `rid` + attribute can have a space-separated list of ids. + + * AsciiDoc Writer: Add `writeAsciiDoctor` [API change, Tarik Graba]. + Handle display math appropriately for Asciidoctor. + + * JATS writer: wrap figure caption in `<p>` to fix validation (#5290, + Mauro Bieg). + + * HTML writer: + + + Implement WAI-ARIA roles for (end)notes, citations, and + bibliography (#4213). Note that doc-biblioref is only used when + link-citations produces links, since it belongs on links. + + Include content (including speaker notes) in title slides + (#4317, #5237). + + * ipynb writer: + + + Ensure final newline. + + Only include metadata under `jupyter` field. + + Don't create attachments for images with absolute URIs, + including data: URIs (#5303). + + Keep plain text fallbacks in output even if a richer format is + included (#5293). We don't know what output format will be needed. + See the `--ipynb-output` command line option for a way to control + what formats are included in the output. + + * Markdown writer: use `markdown="1"` when appropriate for Divs: + when `native_divs` and `markdown_in_html_blocks` are disabled + but `raw_html` and `markdown_attribute` are enabled. + + * LaTeX writer: + + + Use right fold for `escapeString`. This is more elegant than + the explicit recursive code we were using. + + Avoid `{}` after control sequences when escaping. + `\ldots{}.` doesn't behave as well as `\ldots.` with the latex + ellipsis package. This patch causes pandoc to avoid emitting + the `{}` when it is not necessary. Now `\ldots` and other + control sequences used in escaping will be followed by either + a `{}`, a space, or nothing, depending on context. + + For beamer, include contents under headers superordinate to + slidelevel (#4317). Currently we keep the fancy title slide, and + add a new slide with the same title and whatever content was + under the header. + + * Powerpoint writer (Jesse Rosenthal): support underlines. + Use span with single class "underline" as in docx writer. + + * Muse writer: escape secondary notes (Alexander Krotov). + + * FB2 writer: add section identifiers support (#5229, John KetzerX). + + * Make `--fail-if-warnings` work for PDF output (#5343). + + * Lua filters (Albert Krewinkel): + + + Load module `pandoc` before calling `init.lua` (#5287). The file + `init.lua` in pandoc's data directory is run as part of pandoc's + Lua initialization process. Previously, the `pandoc` module was + loaded in `init.lua`, and the structure for marshaling was + set up after. This allowed simple patching of element + marshaling, but made using `init.lua` more difficult. Now, all + required modules are now loaded before calling `init.lua`. The + file can be used entirely for user customization. Patching + marshaling functions, while discouraged, is still possible via + the `debug` module. + + All Lua modules bundled with pandoc, i.e., `pandoc.List`, + `pandoc.mediabag`, `pandoc.utils`, and `text` are re-exported from the + `pandoc` module. They are assigned to the fields `List`, `mediabag`, + `utils`, and `text`, respectively. + + * Text.Pandoc.Lua (Albert Krewinkel): + + + Split `StackInstances` into smaller Marshaling modules. + + Get `CommonState` from Lua global. This allows more control over + the common state from within Lua scripts. + + * LaTeX template: + + + Support the `subject` metadata variable (#5289, Pascal Wagler). + + Add `\frontmatter`, `\mainmatter`, `\backmatter` + for book classes (#5306). + + * epub3 template: Add titlepage class to section (#5269). + + * HTML5 template: Add ARIA role `doc-toc` for table of contents (#4213). + + * Make `--metadata-file` use selected extensions (#5279, #5272, Mauro Bieg). + + * Text.Pandoc.Shared: + + + Remove `withTempDir` [API change]. + + Add new exported function `defaultUserDataDirs` [API change]. + + Add `filterIpynbOutput` [API change]. + + `compactify`: Avoid lists with a mix of Plain and Para elements + (#5285). + + * Text.Pandoc.Translations: reorder alphabetically and remove `Author` + (#5334, Mauro Bieg). + + * Text.Pandoc.Extensions: + + + More carefully groom ipynb default extensions. + + Add `all_symbols_escapable` to `githubMarkdownExtensions`. + + * Text.Pandoc.PDF: + + + Use system temp directory when possible (#1192). Previously we + created temp dirs in the working directory, partly (a) because + there were problems using the system temp directory on Windows, + when their pathnames included tildes, and partly (b) because + programs like `epstopdf.pl` would not be allowed to write to + directories outside the working directory in restricted mode. We + now (a) use the system temp dir except when the path includes + tildes, and (b) set `TEXMFOUTPUT` when creating the PDF, so that + subsidiary programs can use the system temp directory. This + addresses problems that occurred when pandoc was used in a + synced directory (such as Dropbox). + + Change types of subsidiary functions to PandocIO, to allow + warnings to be threaded through (#5343). + + * Text.Pandoc.MIME: add WebP (#5267, Mauro Bieg). + + * Tests: avoid calling `findPandoc` multiple times. + + * Old tests: remove need for temp files by using `pipeProcess`. + + * Added simple ipynb reader/writer tests (#5274). + + * Rearrange `--help` output in a more rational way, with common + options at the beginning and options grouped by function (#5336). + + * trypandoc: Add JATS and other missing formats (Arfon Smith, #5291). + + * Add missing copyright notices and remove license boilerplate (#4592, + Albert Krewinkel). + + * Use latest basement/foundation on 32bit windows. + + * Use latest skylighting (#5328). Custom syntax definitions no + longer try to load `language.dtd`. + + * Require texmath 0.11.2.1 + + * Use latest pandoc-citeproc (0.16.1.1). + + * MANUAL.txt: + + + Clarify variable substitution indentation in templates (#5338, + Agustín Martín Barbero). + + Reorder custom-styles section (#5324, Mauro Bieg). + +## pandoc 2.6 (2019-01-30) + + * Support ipynb (Jupyter notebook) as input and output format. + + + Add `ipynb` as input and output format (extension `.ipynb`). + + Added Text.Pandoc.Readers.Ipynb [API change]. + + Added Text.Pandoc.Writers.Ipynb [API change]. + + Add `PandocIpynbDecodingError` constructor to Text.Pandoc.Error.Error + [API change]. + + Depend on ipynb library. + + Note: there is no template for ipynb. + + * Add DokuWiki reader (#1792, Alexander Krotov). This adds + Text.Pandoc.Readers.DokuWiki [API change], and adds `dokuwiki` + as an input format. + + * Implement task lists (#3051, Mauro Bieg). Added `task_lists` + extension. Task lists are supported from markdown and gfm input. + They should work, to some degree, in all output formats, though in + most formats you'll get a bullet list with a unicode character for + the box. In HTML, you get checkboxes and in LaTeX/PDF output, a + box is used as the list marker. API changes: + + + Added constructor `Ext_task_lists` to `Extension`. + + Added `taskListItemFromAscii` and `taskListItemToAscii` to + Text.Pandoc.Shared. + + * Allow some command line options to take URL in addition to FILE. + `--include-in-header`, `--include-before-body`, `--include-after-body`. + + * HTML reader: + + + Handle empty `start` attribute (see #5162). + + Treat `textarea` as a verbatim environment (#5241) and preserve + spacing. + + * RST reader: + + + Change treatment of `number-lines` directive (Brian Leung, + #5207). Directives of this type without numeric inputs should + not have a `startFrom` attribute; with a blank value, the + writers can produce extra whitespace. + + Removed superfluous `sourceCode` class on code blocks (#5047). + + Handle `sourcecode` directive as synonym for `code` (#5204). + + * Markdown reader: + + + Remove `sourceCode` class for literate Haskell code blocks + (#5047). Reverse order of `literate` and `haskell` classes on + code blocks when parsing literate Haskell, so `haskell` is + first. + + Treat `<textarea>` as a verbatim environment (#5241). + + * Org reader: + + + Handle `minlevel` option differently (#5190, Brian Leung). + When `minlevel` exceeds the original minimum level observed in + the file to be included, every heading should be shifted + rightward. + + Allow for case of `:minlevel == 0` (#5190). + + Fix treatment of links to images (#5191, Albert Krewinkel). + Links with descriptions which are pointing to images are no + longer parsed as inline images, but as links. + + Add support for #+SELECT_TAGS (Brian Leung). + + Separate filtering logic from conversion function (Brian Leung). + + * TWiki reader: Fix performance issue with underscores (#3921). + + * MediaWiki reader: use `_` instead of `-` in auto-identifiers (#4731). + We may not still be exactly matching mediawiki's algorithm. + + * LaTeX reader: + + + Remove `sourceCode` class for literate Haskell code blocks + (#5047). Reverse order of `literate` and `haskell` classes on + code blocks when parsing literate Haskell, so `haskell` is + first. + + Support `\DeclareMathOperator` (#5149). + + Support `\inputminted` (#5103). + + Support `\endinput` (#5233). + + Allow includes with dots like `cc_by_4.0`. Previously the `.0` + was interpreted as a file extension, leading pandoc not to add + `.tex` (and thus not to find the file). The new behavior matches + tex more closely. + + * Man reader: + + + Use `mapLeft` from Shared instead of defining own. + + * Docx reader (Jesse Rosenthal): + + + Handle level overrides (#5134). + + * Docx writer: + + + Support custom properties (#3024, #5252, Agustín Martín Barbero). + Also supports additional core properties: `subject`, `lang`, + `category`, `description`. + + Make Level into a real type, instead of an alias for a tuple + (Jesse Rosenthal). + + * ICML writer (Mauro Bieg): + + + Support custom-styles (#5137, see #2106). + + Support unnumbered headers (#5140). + + * Texinfo writer: Use header identifier for anchor if present (#4731). + Previously we were overwriting an existing identifier with a new one. + + * Org writer: Preserve line-numbering for example and code blocks + (Brian Leung). + + * Man/Ms writers: Don't escape `-` as `\-`. The `\-` gets rendered + in HTML and PDF as a unicode minus sign. + + * Ms writer: Ensure we have a newline after .EN in display math (#5251). + + * RST writer: Don't wrap simple table header lines (#5128). + + * Asciidoc writer: Shorter delimiters for tables, blockquotes + (#4364). This matches asciidoctor reference docs. + + * Dokuwiki writer: Remove automatic `:` prefix before internal image + links (#5183, Damien Clochard). This prevented users from making + relative image links. + + * Zimwiki writer: remove automatic colon prefix before internal + images (#5183, Damien Clochard). + + * MediaWiki writer: fix caption, use 'thumb' instead of 'frame' + (#5105). Captions used to have the word 'caption' prepended; this + has been removed. Also, 'thumb' is used instead of 'frame' to + allow images to be resized. + + * reveal.js writer: + + + Ensure that we don't get > 2 levels of section nesting, + even with slide level > 2 (#5168). + + If slide level == N but there is no N-level header, make + sure the next header with level > N gets treated as a slide + and put in a section, rather than remaining loose (#5168). + + * Markdown writer: + + + Make `plain` RawBlocks pass through in `plain` output. + + Include needed whitespace after HTML figure (#5121). + We use HTML for a figure in markdown dialects that can't + represent it natively. + + * Commonmark writer: + + + Fix handling of SoftBreak with `hard_line_breaks` (#5195). + + Implement `--toc` (`writerTableOfContents`) + in commonmark/gfm writers (#5172). + + * EPUB writer: + + + Ensure that picture transforms are done on metadata too. + + Small fixes to `nav.xhtml`: + Add 'landmarks' id attribute to the landmarks nav. + Replace old default CSS removing numbers from ol.toc li + with new rules that match `nav#toc ol, nav#landmarks ol`. + We keep the `toc` class on `ol` for backwards compatibility. + + * LaTeX writer: + + + Make raw content marked `beamer` pass through in `beamer` + output (pandoc/lua-filters#40). + + Beamer: avoid duplicated `fragile` property in some cases + (#5208). + + Add `#` special characters for listings (#4939). + This character needs special handling in `\lstinline`. + + * RTF writer: use `toTableOfContents` from Shared to replace + old duplicated code. + + * Pptx writer: + + + Support custom properties. Also supports additional core + properties: `subject`, `category`, `description` (#5252, + Agustín Martín Barbero). + + Use `toTableOfContents` from Shared to replace old duplicated code. + + * ODT writer (Augustín Martín Barbero): + + + Fix typo in custom properties (#2839). + + Improve standard properties, including the following core + properties: `generator` (Pandoc/VERSION), `description`, `subject`, + `keywords`, `initial-creator` (from authors), `creation-date` + (actual creation date) (#5252). + + * Custom writers: + + + Allow '-' in filenames for custom lua writers (#5187). + + sample.lua: add `SingleQuoted`, `DoubleQuoted` (#5104). + + sample.lua: Add a missing `>` (MichaWiedenmann). + + * reveal.js template: Add `zoomKey` config (#4249). + + * HTML5 template: Remove unnecessary type="text/css" on style and + link for HTML5 (#5146). + + * LaTeX template (Andrew Dunning, except where noted): + + + Prevent fontspec from scaling `mainfont` to match the default + font, Latin Modern. A main font set to 12pt could + previously appear between 11pt to 13pt depending on its design. + To return to the earlier rendering, use `-V + mainfontoptions="Scale=MatchLowercase"` (#5212, #5218). + + Display monospaced fonts without TeX ligatures when using + `--pdf-engine=lualatex`. It now matches the behaviour of other + engines (#5212, #5218). + + Remove the deprecated `romanfont` variable. The functionality of + `mainfont` is identical (#5218). + + Render `\subtitle` with the standard document classes. + Previously, `subtitle` only appeared when using the KOMA-Script + classes or Beamer (#5213, #5244). + + Use Babel instead of Polyglossia for LuaLaTeX. This avoids + several language selection problems, notably with retaining + French spacing conventions when switching to a verbatim + environment or another language; and in printing Greek text + without hyphenation (#5193). + + Use the [`xurl`](https://ctan.org/pkg/xurl) package if + available, improving the appearance of URLs by allowing them to + break at additional points (#5193). + + Use [`bookmark`](https://ctan.org/pkg/bookmark) if available + to correct heading levels in PDF bookmarks: see the [KOMA-Script + 3.26 release notes](https://komascript.de/release3.26) (#5193). + + Require the [`xcolor`](https://ctan.org/pkg/xcolor) package to + avoid a possible error when using additional packages alongside + footnotes in tables (#5193, closes #4861). + + Remove obsolete `fixltx2e` package, which has no functionality + with TeX Live 2015 or later (#5193). + + Allow multiple `fontfamilies.options` (#5193, closes #5194). + + Restrict `institute` variable to Beamer (#5219). + + Use [`footnotehyper`](https://ctan.org/pkg/footnotehyper) + package if available to make footnotes in tables compatible + with `hyperref` (#5234). + + Number parts and chapters in book classes only if the + `numbersections` variable is set, for consistency with other + output formats. To return to the previous behaviour, use + `-V numbersections -V secnumdepth=0` (#5235). + + Reindent file (#5193). + + Use built-in parskip handling with KOMA-Script classes (#5143, Enno). + + Set default listings language for lua, assembler (#5227, John + MacFarlane). Otherwise we get an error when trying to compile code + with lua or assembler code. To change the default dialect + (currently 5.3 for lua and x86masm for assembler), you can use + `--include-in-header` to inject something like + `\lstset{defaultdialect=[5.2]Lua}`. + + * Text.Pandoc.Readers: Changed types of `readJSON`; it now runs + in an instance of PandocMonad, like the other readers and + writers. [API change] + + * Text.Pandoc.Writers: Changed types of `writeJSON`; it now runs + in an instance of PandocMonad, like the other readers and + writers. [API change] + + * Text.Pandoc.Error: Added `PandocUTF8DecodingError` constructor + for `PandocError`. [API change] + + * Text.Pandoc.Writers.Shared - add `toTableOfContents`. [API change] + This is refactored out from the Markdown writer. + It can be used in other writers to create a table of contents. + + * Improve error messages for UTF-8 decoding errors. Now we give + the filename and byte offset (#4765). + + * Text.Pandoc.XML: Strip out illegal XML characters in + `escapeXMLString` (#5119). + + * Text.Pandoc.Process: update `pipeProcess` (Albert Krewinkel). + The implementation of `pipeProcess` was rewritten to fix sporadic + failures caused by prematurely closed pipes. + + * Use `safeRead` instead of `read` everywhere in the code + (John MacFarlane, Mauro Bieg, #5162, #5180). + + * Text.Pandoc.SelfContained: Decompress `.svgz` when + converting to `data:` URI (#5163, Alexander Krotov). + + * Text.Pandoc.Parsing: Remove unused `HasHeaderMap` + (#5175, Alexander Krotov). [API change] + + * Normalize Windows paths to account for change in ghc 8.6 (#5127). + When pandoc is compiled with ghc 8.6, Windows paths are treated + differently, and paths beginning `\\server` no longer work. + This commit rewrites such patsh to `\\?\UNC\server` which works. + The change operates at the level of argument parsing, so it + only affects the command line program. + + * Simplify/fix reading of `--metadata` values on command line + to avoid problems relating to hvr/HsYAML#7 (#5177). + + * data/pandoc.lua: auto-fix nested constructor arguments (Albert + Krewinkel). Incorrect types to pandoc element constructors are + automatically converted to the correct types when possible. This was + already done for most constructors, but conversions are now also done + for nested types (like lists of lists). + + * Removed custom Setup.hs, use build-type: simple. The only thing we + gained from the custom build was automatic installation of the man + page when using 'cabal install'. But custom builds cause problems, + e.g., with cross-compilation. Installation of the man page is + better handled by packagers. Note to packagers (e.g. Debian): it + may be necessary to add a step installing the man page with the + next release. + + * Allow latest http-client, tasty, zip-archive, Glob. + + * Require skylighting >= 0.7.5, adding support for sml, J, + typescript. + + * Tests: Cleaned up `findPandoc` in `Tests.Helpers`, so it + works well with cabal v2. + + * INSTALL.md: + + + Use button for installer links (John MacFarlane, Mauro Bieg, + #5167). + + Fix links and bump required stack version (max). + + Improve installation notes on associated software (Andrew + Dunning). Includes explanation of how to install related tools + with package managers (since the method of installing + `rsvg-convert` is not obvious). + + * doc/org.md: improve documentation of org features (Albert + Krewinkel). + + * doc/lua-filters.md: use 3rd level headers for module fields. + + * MANUAL: + + + Clarify automatic identifiers (#5201). We remove + non-alphanumerics. This includes, e.g., emojis. + + Fix example for Div with id (Geoffrey Ely). + + Update list of LaTeX packages used. + + Make it clear that `hard_line_breaks` works in `gfm` (see #5195). + + Mention `raw_attribute` in documentation for `raw_html` and + `raw_tex` (#5240, thanks to @eiro). + + Clarify that `$sep$` must come right before `$endfor$` in templates + (#5243, Lev Givon). + + Document metadata support for docx, odt, pptx writers (Agustín + Martín Barbero). + + Reorganize template variables (#5249, Andrew Dunning). + Add additional headings to categorize variables, and + alphabetize when there is large number; add more examples. + + Document `date-meta` template variable (#5260, Tristan Stenner). + + * trypandoc: Fix CSS and viewport. + +## pandoc 2.5 (2018-11-27) + + * Text.Pandoc.App: split into several unexported submodules (Albert + Krewinkel): Text.Pandoc.App.FormatHeuristics, + Text.Pandoc.App.Opt, Text.Pandoc.App.CommandLineOptions, + Text.Pandoc.App.OutputSettings. This is motivated partly by the + desire to reduce recompilations when something is modified, + since App previously depended on virtually every other module. + + * Text.Pandoc.Extensions + + + Semantically, `gfm_auto_identifiers` is now a modifier of + `auto_identifiers`; for identifiers to be set, `auto_identifiers` must + be turned on, and then the type of identifier produced depends on + `gfm_auto_identifiers` and `ascii_identifiers` are set. Accordingly, + `auto_identifiers` is now added to `githubMarkdownExtensions` (#5057). + + Remove `ascii_identifiers` from `githubMarkdownExtensions`. + GitHub doesn't seem to strip non-ascii characters any more. + + * Text.Pandoc.Lua.Module.Utils (Albert Krewinkel) + + + Test AST object equality via Haskell (#5092). Equality of Lua + objects representing pandoc AST elements is tested by unmarshalling + the objects and comparing the result in Haskell. + A new function `equals` which performs this test has been added to the + `pandoc.utils` module. + + Improve stringify. Meta value strings (MetaString) + and booleans (MetaBool) are now converted to the literal string and the + lowercase boolean name, respectively. Previously, all values of these + types were converted to the empty string. + + * Text.Pandoc.Parsing: Remove Functor and Applicative constraints where Monad + already exists (Alexander Krotov). + + * Text.Pandoc.Pretty: Don't render BreakingSpace at end of line + or beginning of line (#5050). + + * Text.Pandoc.Readers.Markdown + + + Fix parsing of citations, quotes, and underline emphasis + after symbols. Starting with pandoc 2.4, citations, quoted inlines, + and underline emphasis were no longer recognized after certain + symbols, like parentheses (#5099, #5053). + + In pandoc 2.4, a soft break after an abbreviation would be + relocated before it to allow for insertion of a nonbreaking + space after the abbreviation. This behavior is here reverted. + A soft break after an abbreviation will remain, and no nonbreaking + space will be added. Those who care about this issue should take care not + to end lines with an abbreviation, or to insert nonbreaking spaces + manually. + + * Text.Pandoc.Readers.FB2: Do not throw error for unknown elements in + `<body>` (Alexander Krotov). Some libraries include custom elements + in their FB2 files. + + * Text.Pandoc.Readers.HTML + + + Allow `tfoot` before body rows (#5079). + + Parse `<small>` as a Span with class "small" (#5080). + + Allow thead containing a row with `td` rather than `th` (#5014). + + * Text.Pandoc.Readers.LaTeX + + + Cleaned up handling of dimension arguments. Allow decimal points, + preceding space. + + Don't allow arguments for verbatim, etc. + + Allow space before bracketed options. + + Allow optional arguments after `\\` in tables. + + Improve parsing of `\tiny`, `\scriptsize`, etc. Parse as raw, + but know that these font changing commands take no arguments. + + * Text.Pandoc.Readers.Muse + + + Trim whitespace before parsing grid table cells (Alexander Krotov). + + Add grid tables support (Alexander Krotov). + + * Text.Pandoc.Shared + + + For bibliography match Div with id `refs`, not class `references`. + This was a mismatch between pandoc's docx, epub, latex, and markdown + writers and the behavior of pandoc-citeproc, which actually looks for a + div with id `refs` rather than one with class `references`. + + Exactly match GitHub's identifier generating algorithm (#5057). + + Add parameter for `Extensions` to `uniqueIdent` and + `inlineListToIdentifier` (#5057). [API change] + This allows these functions to be sensitive to the settings of + `Ext_gfm_auto_identifiers` and `Ext_ascii_identifiers`, and allows us to + use `uniqueIdent` in the CommonMark reader, replacing custom code. It + also means that `gfm_auto_identifiers` can now be used in all formats. + + * Text.Pandoc.Writers.AsciiDoc + + + Use `.`+ as list markers to support nested ordered lists (#5087). + + Support list number styles (#5089). + + Render Spans using `[#id .class]#contents#` (#5080). + + * Text.Pandoc.Writers.CommonMark + + + Respect `--ascii` (#5043, quasicomputational). + + Make sure `--ascii` affects quotes, super/subscript. + + * Text.Pandoc.Writers.Docx + + + Fix bookmarks to headers with long titles (#5091). + Word has a 40 character limit for bookmark names. In addition, bookmarks + must begin with a letter. Since pandoc's auto-generated identifiers may + not respect these constraints, some internal links did not work. With + this change, pandoc uses a bookmark name based on the SHA1 hash of the + identifier when the identifier isn't a legal bookmark name. + + Add bookmarks to code blocks (Nikolay Yakimov). + + Add bookmarks to images (Nikolay Yakimov). + + Refactor common bookmark creation code into a function (Nikolay Yakimov). + + * Text.Pandoc.Writers.EPUB: Handle calibre metadata (#5098). + Nodes of the form + + <meta name="calibre:series" content="Classics on War and Politics"/> + + are now included from an epub XML metadata file. You can also include + this information in your YAML metadata, like so: + + calibre: + series: Classics on War and Policitics + + In addition, ibooks-specific metadata can now be included via an XML + file. (Previously, it could only be included via YAML metadata, see + #2693.) + + * Text.Pandoc.Writers.HTML: Use plain `"` instead of `"` outside of + attributes. + + * Text.Pandoc.Writers.ICML: Consolidate adjacent strings, inc. spaces. + This avoids splitting up the output unnecessarily into separate elements. + + * Text.Pandoc.Writers.LaTeX: Don't emit `[<+->]` unless beamer output, even + if `writerIncremental` is True (#5072). + + * Text.Pandoc.Writers.Muse (Alexander Krotov). + + + Output tables as grid tables if they have multi-line cells. + + Indent simple tables only on the top level. + + Output tables with one column as grid tables. + + Add support for `--reference-location`. + + Internal improvements. + + * Text.Pandoc.Writers.OpenDocument: Fix list indentation (Nils Carlson, + #5095). This was a regression in pandoc 2.4. + + * Text.Pandoc.Writers.RTF: Fix warnings for skipped raw inlines. + + * Text.Pandoc.Writers.Texinfo: Add blank line before `@menu` section (#5055). + + * Text.Pandoc.XML: in `toHtml5Entities`, prefer shorter entities + when there are several choices for a particular character. + + * data/abbreviations + + + Add additional abbreviations (Andrew Dunning) + Many of these borrowed from the Chicago Manual of Style 10.42, + 'Scholarly abbreviations'. + + * Templates + + + Asciidoc template: add :lang: to title header is lang is set in + metadata (#5088). + + * pandoc.cabal: Add cabal flag `derive_json_via_th` (Albert Krewinkel) + Disabling the flag will cause derivation of ToJSON and FromJSON + instances via GHC Generics instead of Template Haskell. The flag is + enabled by default, as deriving via Generics can be slow (see #4083). + + * trypandoc: + + + Tweaked drop-down lists. + + Put link to site in footer. + + Preselect output format. + + Update on change of in or out format. + + Add man input format. + + * MANUAL.txt: + + + Fix outdated description of latex_macros extension. + + Clarified placement of bibliography. + + Added "A note on security." + + Fix note on curly brace syntx for locators. + + Document new explicit syntax for citeproc locators. + + Remove confusing cross-links for some extensions. + + Don't put pandoc in code ticks in heading. + + Document that `--ascii` works for gfm and commonmark too. + + Add `man` to `--from` options. + + * doc/customizing-pandoc.md: various improvements (Mauro Bieg). + + +## pandoc 2.4 (2018-11-03) + +### New features + + * New input format `man` (Yan Pashkovsky, John MacFarlane). + +### Behavior changes + + * `--ascii` is now implemented in the writers, not in Text.Pandoc.App, + via the new `writerPreferAscii` field in `WriterOptions`. + Now the `write*` functions for Docbook, HTML, ICML, JATS, LaTeX, + Ms, Markdown, and OPML are sensitive to `writerPreferAscii`. + Previously the to-ascii translation was done in Text.Pandoc.App, + and thus not available to those using the writer functions + directly. + + * `--ascii` now works with Markdown output. HTML5 character reference + entities are used. + + * `--ascii` now works with LaTeX output. 100% ASCII output can't be + guaranteed, but the writer will use commands like `\"{a}` and `\l` + whenever possible, to avoid emitting a non-ASCII character. + + * For HTML5 output, `--ascii` now uses HTML5 character reference + entities rather than numerical entities. + + * Improved detection of format based on extension (in Text.Pandoc.App). + We now ensure that if someone tries to convert a file for a + format that has a pandoc writer but not a reader, it won't just + default to markdown. + + * Add viz. to abbreviations file (#5007, Nick Fleisher). + + * AsciiDoc writer: always use single-line section headers, + instead of the old underline style (#5038). Previously the single-line + style would be used if `--atx-headers` was specified, but + now it is always used. + + * RST writer: Use simple tables when possible (#4750). + + * CommonMark (and gfm) writer: Add plain text fallbacks. (#4528, + quasicomputational). Previously, the writer would unconditionally + emit HTML output for subscripts, superscripts, strikeouts (if the + strikeout extension is disabled) and small caps, even with + `raw_html` disabled. Now there are plain-text (and, where + possible, fancy Unicode) fallbacks for all of these corresponding + (mostly) to the Markdown fallbacks, and the HTML output is only + used when `raw_html` is enabled. + + * Powerpoint writer: support raw openxml (Jesse Rosenthal, #4976). + This allows raw openxml blocks and inlines to be used in the pptx + writer. Caveats: (1) It's up to the user to write + well-formed openxml. The chances for corruption, especially with + such a brittle format as pptx, is high. (2) Because of + the tricky way that blocks map onto shapes, if you are using + a raw block, it should be the only block on a slide + (otherwise other text might end up overlapping it). (3) The + pptx ooxml namespace abbreviations are different from the + docx ooxml namespaces. Again, it's up to the user to get it + right. Unzipped document and ooxml specification should be + consulted. + + * With `--katex` in HTML formats, do not use the autorenderer (#4946). + We no longer surround formulas with `\(..\)` or `\[..\]`. Instead, + we tell katex to convert the contents of span elements with + class "math". Since math has already been identified, this + avoids wasted time parsing for LaTeX delimiters. Note, however, + that this may yield unexpected results if you have span elements + with class "math" that don't contain LaTeX math. + Also, use latest version of KaTeX by default (0.9.0). + + * The man writer now produces ASCII-only output, using groff escapes, + for portability. + + * ODT writer: + + + Add title, author and date to metadata; any remaining + metadata fields are added as `meta:user-defined` tags. + + Implement table caption numbering (#4949, Nils Carlson). + Captioned tables are numbered and labeled with format "Table 1: + caption", where "Table" is replaced by a translation, depending + on the value of `lang` in metadata. Uncaptioned tables are not + enumerated. + + OpenDocument writer: Implement figure numbering in captions (#4944, + Nils Carlson). Figure captions are now numbered 1, 2, 3, ... + The format in the caption is "Figure 1: caption" and so on + (where "Figure" is replaced by a translation, depending on the + value of `lang` in the metadata). Captioned figures are numbered + consecutively and uncaptioned figures are not enumerated. This + is necessary in order for LibreOffice to generate an + Illustration Index (Table of Figures) for included figures. + + * RST reader: Pass through fields in unknown directives as div attributes + (#4715). Support `class` and `name` attributes for all directives. + + * Org reader: Add partial support for `#+EXCLUDE_TAGS` option. (#4284, + Brian Leung). Headers with the corresponding tags should not + appear in the output. + + * Log warnings about missing title attributes now include a + suggestion about how to fix the problem (#4909). + + * Lua filter changes (Albert Krewinkel): + + + Report traceback when an error occurs. A proper Lua traceback is + added if either loading of a file or execution of a filter + function fails. This should be of help to authors of Lua filters + who need to debug their code. + + + Allow access to pandoc state (#5015). Lua filters and custom + writers now have read-only access to most fields of pandoc's + internal state via the global variable `PANDOC_STATE`. + + + Push ListAttributes via constructor (Albert Krewinkel). + This ensures that ListAttributes, as present in OrderedList elements, + have additional accessors (viz. `start`, `style`, and `delimiter`). + + + Rename ReaderOptions fields, use snake_case. Snake case is used + in most variable names, using camelCase for these fields was an + oversight. A metatable is added to ensure that the old field + names remain functional. + + + Iterate over AST element fields when using `pairs`. This makes + it possible to iterate over all ield names of an AST element by + using a generic `for` loop with pairs`: + + for field_name, field_content in pairs(element) do + ... + end + + Raw table fields of AST elements should be considered an + implementation detail and might change in the future. Accessing + element properties should always happen through the fields + listed in the Lua filter docs. + + Note that the iterator currently excludes the `t`/`tag` field. + + + Ensure that MetaList elements behave like Lists. Methods usable + on Lists can also be used on MetaList objects. + + + Fix MetaList constructor (Albert Krewinkel). Passing a MetaList + object to the constructor `pandoc.MetaList` now returns the + passed list as a MetaList. This is consistent with the + constructor behavior when passed an (untagged) list. + + * Custom writers: Custom writers have access to the global variable + `PANDOC_DOCUMENT`(Albert Krewinkel, #4957). The variable contains + a userdata wrapper around the full pandoc AST and exposes two + fields, `meta` and `blocks`. The field content is only + marshaled on-demand, performance of scripts not accessing the + fields remains unaffected. + +### API changes + + * Text.Pandoc.Options: add `writerPreferAscii` to `WriterOptions`. + + * Text.Pandoc.Shared: + + + Export `splitSentences`. This was previously duplicated in the Man and + Ms writers. + + Add `ToString` typeclass (Alexander Krotov). + + * New exported module Text.Pandoc.Filter (Albert Krewinkel). + + * Text.Pandoc.Parsing + + + Generalize `gridTableWith` to any `Char` Stream (Alexander Krotov). + + Generalize `readWithM` from `[Char]` to any `Char` Stream + that is a `ToString` instance (Alexander Krotov). + + * New exposed module Text.Pandoc.Filter (Albert Krewinkel). + + * Text.Pandoc.XML: add `toHtml5Entities`. + + * New exported module Text.Pandoc.Readers.Man (Yan Pashkovsky, John + MacFarlane). + + * Text.Pandoc.Writers.Shared + + + Add exported functions `toSuperscript` and + `toSubscript` (quasicomputational, #4528). + + Remove exported functions `metaValueToInlines`, + `metaValueToString`. Add new exported functions + `lookupMetaBool`, `lookupMetaBlocks`, `lookupMetaInlines`, + `lookupMetaString`. Use these whenever possible for uniformity + in writers (Mauro Bieg, #4907). (Note that + removed function `metaValueToInlines` was in previous + released versions.) + + Add `metaValueToString`. + + * Text.Pandoc.Lua + + + Expose more useful internals (Albert Krewinkel): + + - `runFilterFile` to run a Lua filter from file; + - data type `Global` and its constructors; and + - `setGlobals` to add globals to a Lua environment. + + This module also contains `Pushable` and `Peekable` instances + required to get pandoc's data types to and from Lua. Low-level + Lua operation remain hidden in Text.Pandoc.Lua. + + + Rename `runPandocLua` to `runLua` (Albert Krewinkel). + + + Remove `runLuaFilter`, merging this into Text.Pandoc.Filter.Lua's + `apply` (Albert Krewinkel). + +### Bug fixes and under-the-hood improvements + + * Text.Pandoc.Parsing + + + Make `uri` accept any stream with Char tokens (Alexander Krotov). + + Rewrite `uri` without `withRaw` (Alexander Krotov). + + Generalize `parseFromString` and `parseFromString'` to any + streams with Char token (Alexander Krotov) + + Rewrite `nonspaceChar` using `noneOf` (Alexander Krotov) + + * Text.Pandoc.Shared: Reimplement `mapLeft` using `Bifunctor.first` + (Alexander Krotov). + + * Text.Pandoc.Pretty: Simplify `Text.Pandoc.Pretty.offset` + (Alexander Krotov). + + * Text.Pandoc.App + + + Work around HXT limitation for --syntax-definition with windows + drive (#4836). + + Always preserve tabs for man format. We need it for tables. + + Split command line parsing code into a separate unexported + module, Text.Pandoc.App.CommandLineOptions (Albert Krewinkel). + + * Text.Pandoc.Readers.Roff: new unexported module for tokenizing + roff documents. + + * New unexported module Text.Pandoc.RoffChar, provided character + escape tables for roff formats. + + * Text.Pandoc.Readers.HTML: Fix `htmlTag` and `isInlineTag` to + accept processing instructions (#3123, regression since 2.0). + + * Text.Pandoc.Readers.JATS: Use `foldl'` instead of `maximum` to + account for empty lists (Alexander Krotov). + + * Text.Pandoc.Readers.RST: Don't allow single-dash separator in + headerless table (#4382). + + * Text.Pandoc.Readers.Org: Parse empty argument array in inline src + blocks (Brian Leung). + + * Text.Pandoc.Readers.Vimwiki: + + + Get rid of `F`, `runF` and `stateMeta'` in favor of `stateMeta` + (Alexander Krotov). + + Parse `Text` without converting to `[Char]` (Alexander Krotov). + + * Text.Pandoc.Readers.Creole: Parse `Text` without converting to + `[Char]` (Alexander Krotov). + + * Text.Pandoc.Readers.LaTeX + + + Allow space at end of math after `\` (#5010). + + Add support for `nolinkurl` command (#4992, Brian Leung). + + Simplified type on `doMacros'`. + + Tokenize before pulling tokens, rather than after (#4408). This + has some performance penalty but is more reliable. + + Make macroDef polymorphic and allow in inline context. + Otherwise we can't parse something like `\lowercase{\def\x{Foo}}`. + I have actually seen tex like this in the wild. + + Improved parsing of `\def`, `\let`. We now correctly parse: + ``` + \def\bar{hello} + \let\fooi\bar + \def\fooii{\bar} + \fooi +\fooii + + \def\bar{goodbye} + \fooi +\fooii + ``` + + Improve parsing of `\def` argspec. + + Skip `\PackageError` commands (see #4408). + + Fix bugs omitting raw tex (#4527). The default is `-raw_tex`, + so no raw tex should result unless we explicitly say `+raw_tex`. + Previously some raw commands did make it through. + + Moved `isArgTok` to Text.Pandoc.Readers.LaTeX.Parsing. + + Moved `babelLangToBCP`, `polyglossiaLangToBCP` to new module, + Text.Pandoc.Readers.LaTeX.Lang (unexported). + + Simplified accent code using unicode-transforms. + New dependency on unicode-transforms package for normalization. + + Allow verbatim blocks ending with blank lines (#4624). + + Support `breq` math environments: `dmath`, `dgroup`, `darray`. + This collects some of the general-purpose code from the LaTeX reader, + with the aim of making the module smaller. + + * Text.Pandoc.Readers.Markdown + + + Fix awkward soft break movements before abbreviations (#4635). + + Add updateStrPos in a couple places where needed. + + * Text.Pandoc.Readers.Docx: Trigger bold/italic with bCs, iCs + (#4947). These are variants for "complex scripts" like Arabic + and are now treated just like b, i (bold, italic). + + * Text.Pandoc.Readers.Muse (Alexander Krotov) + + + Try to parse lists before trying to parse table. + This ensures that tables inside lists are parsed correctly. + + Forbid whitespace after opening and before closing markup + elements. + + Parse page breaks. + + Simplify `museToPandocTable` to get rid of partial functions. + + Allow footnotes to start with empty line. + + Make sure that the whole text is parsed. + + Allow empty headers. Previously empty headers caused parser to + terminate without parsing the rest of the document. + + Allow examples to be indented with tabs. + + Remove indentation from examples indicated by `{{{` and `}}}`. + + Fix parsing of empty cells. + + Various changes to internals. + + Rewrite some parsers in applicative style. + + Avoid tagsoup dependency. + + Allow table caption to contain `+`. + + * Text.Pandoc.Writers.LaTeX + + + Add newline if math ends in a comment (#4880). This prevents the + closing delimiter from being swalled up in the comment. + + With `--listings`, don't pass through org-babel attributes (#4889). + + With `--biblatex`, use `\autocite` when possible (#4960). + `\autocites{a1}{a2}{a3}` will not collapse the entries. So, if + we don't have prefixes and suffixes, we use instead + `\autocite{a1,a2,a3}`. + + Fix description lists contining highlighted code (#4662). + + * Text.Pandoc.Writers.Man + + + Don't wrap `.SH` and `.SS` lines (#5019). + + Avoid unnecessary `.RS`/`.RE` pair in definition lists with + one paragraph definitions. + + Moved common groff functions to Text.Pandoc.Writers.Groff. + * Fix strong/code combination on man (should be `\f[CB]` not + `\f[BC]`, see #4973). + + Man writer: use `\f[R]` instead of `\f[]` to reset font + (Alexander Krotov, #4973). + + Move `splitSentences` to Text.Pandoc.Shared. + + * Text.Pandoc.Writers.Docx + + + Add framework for custom properties (#3034). So far, we don't + actually write any custom properties, but we have the + infrastructure to add this. + + + Handle tables in table cells (#4953). Although this is not + documented in the spec, some versions of Word require a `w:p` + element inside every table cell. Thus, we add one when the + contents of a cell do not already include one (e.g. when a table + cell contains a table). + + * Text.Pandoc.Writers.AsciiDoc: Prevent illegal nestings. + Adjust header levels so that n+1 level headers are only + found under n level headers, and the top level is 1. + + * Text.Pandoc.Writers.OpenDocument: Improve bullet/numbering + alignment (#4385). This change eliminates the large gap we used + to have between bullet and text, and also ensures that numbers + in numbered lists will be right-aligned. + + * Text.Pandoc.Writers.ZimWiki + + + Number ordered list items sequentially, rather than always + with 1 (#4962). + + Remove extra indentation on lists (#4963). + + * Text.Pandoc.Writers.EPUB: Use metadata field `css` instead of + `stylesheet` (Mauro Bieg, #4990). + + * Text.Pandoc.Writers.Markdown: Ensure blank between raw block and + normal content (#4629). Otherwise a raw block can prevent a + paragraph from being recognized as such. + + * Text.Pandoc.Writers.Ms + + + Removed old `escapeBar`. We don't need this now that we use + `@` for math delim. + + Moved common code to Text.Pandoc.Writers.Roff and to + Text.Pandoc.RoffChar. + + Move `splitSentences` to Text.Pandoc.Shared (to avoid duplication + with the man writer). + + * Text.Pandoc.Writers.Muse (Alexander Krotov). + + + Add support for grid tables. + + Fix Muse writer style. + + Use `length` instead of `realLength` to calculate definition + indentation. Muse parsers don't take character width into + account when calculating indentation. + + Do not insert newline before lists. + + Use lightweight markup after `</em>` tag. + + * New unexported module Text.Pandoc.Writers.Roff, providing functions + useful for all roff format writers (man, ms). + + * Text.Pandoc.Lua + + + Move globals handling to separate module Text.Pandoc.Lua.Global + (Albert Krewinkel). + + + Lua filter internals: push Shared.Element as userdata (Albert + Krewinkel). Hierarchical Elements were pushed to Lua as plain + tables. This is simple, but has the disadvantage that marshaling + is eager: all child elements will be marshaled as part of the + object. Using a Lua userdata object instead allows lazy access + to fields, causing content marshaling just (but also each time) + when a field is accessed. Filters which do not traverse the full + element contents tree become faster as a result. + +### Default template changes + + * LaTeX template: + + + Add variable `hyperrefoptions` (#4925, Mathias Walter). + + Add variable `romanfont`, `romanfontoptions` (#4665, OvidiusCicero). + + * AsciiDoc template: use single-line style for title. + + * revealjs template: Fix typo in the socket.io javascript plugin (#5006, + Yoan Blanc). + + * Text.Pandoc.Lua.Util: add missing docstring to `defineHowTo` + (Albert Krewinkel). + + * data/pandoc.lua: add datatype ListAttributes (Albert Krewinkel) + + * data/sample.lua: replace custom pipe function with pandoc.utils.pipe + (Albert Krewinkel). + +### Documentation improvements + + * INSTALL.md + + + Add chromeos install instructions (#4958) (Evan Pratten). + + Add note about TinyTeX. + + * MANUAL.txt + + + Change `groff` -> `roff`. + + Implement `--ascii` for Markdown writer. + + Clarify LaTeX image dimensions output (Mauro Bieg). + + * doc/customizing-pandoc.md: added skeleton (Mauro Bieg, #3288). + + * doc/getting-started.md: Added title to test1.md to avoid warning. + + * doc/lua-filters.md: merge type references into main document, + fix description of Code.text (Albert Krewinkel). + +### Build infrastructure improvements + + * Makefile + + + Makefile: added quick-cabal, full-cabal targets. + + Make .msi download targets insensitive to order of appveyor builds. + + * Update benchmarks for ghc 8.6.1. + + * pandoc.cabal: + + + Enable more compiler warnings (Albert Krewinkel). + + Make base lower bound 4.8. + + Bump upper bound for QuickCheck. + + Bump upper bound for binary. + + Updated version bounds for containers and haddock-library (#4974). + + Added docx/docPropos/custom.xml to cabal data-files. + + Require skylighting 0.7.4 (#4920). + + New dependency on unicode-transforms package for normalization. + + * Improved .travis.yml testing and test with GHC 8.6.1 (Albert Krewinkel). + + * Added `tools/changelog-helper.sh`. + + * Added test/grofftest.sh for testing the man reader on real man pages. + +## pandoc 2.3.1 (2018-09-28) + + * RST reader: + + + Parse RST inlines containing newlines (#4912, Francesco Occhipinti). + This eliminates a regression introduced after pandoc 2.1.1, which + caused inline constructions containing newlines not to be recognized. + + Fix bug with internal link targets (#4919). They were gobbling up + indented content underneath. + + * Markdown reader: distinguish autolinks in the AST. With this change, + autolinks are parsed as Links with the `uri` class. (The same is true + for bare links, if the `autolink_bare_uris` extension is enabled.) + Email autolinks are parsed as Links with the `email` class. This + allows the distinction to be represented in the AST. + + * Org reader: + + + Force inline code blocks to honor export options (Brian Leung). + + Parse empty argument array in inline src blocks (Brian Leung). + + * Muse reader (Alexander Krotov): + + + Added additional tests. + + Do not allow code markup to be followed by digit. + + Remove heading level limit. + + Simplify `<literal>` tag parsers + + Parse Text instead of String. Benchmark shows 7% improvement. + + Get rid of HTML parser dependency. + + Various code improvements. + + * ConTeXt writer: change `\` to `/` in Windows image paths (#4918). + We do this in the LaTeX writer, and it avoids problems. + Note that `/` works as a LaTeX path separator on Windows. + + * LaTeX writer: + + + Add support for multiprenote and multipostnote arguments + with `--biblatex` (Brian Leung, #4930). The multiprenotes occur before + the first prefix of a multicite, and the multipostnotes follow the + last suffix. + + Fix a use of `last` that might take empty list. If you ran with + `--biblatex` and have an empty document (metadata but no blocks), + pandoc would previously raise an error because of the use of + `last` on an empty list. + + * RTF writer: Fix build failure with ghc-8.6.1 caused by missing + MonadFail instance (Jonas Scholl). + + * ODT Writer: Improve table header row style handling (Nils Carlson). + This changes the way styles for cells in the header row + and normal rows are handled in ODT tables. + Previously a new (but identical) style was generated for + every table, specifying the style of the cells within the table. + After this change there are two style definitions for table cells, + one for the cells in the header row, one for all other cells. + This doesn't change the actual styles, but makes post-processing + changes to the table styles much simpler as it is no longer + necessary to introduce new styles for header rows and there are + now only two styles where there was previously one per table. + + * HTML writer: + + + Don't add `uri` class to presumed autolinks. Formerly the `uri` + class was added to autolinks by the HTML writer, but it had to + guess what was an autolink and could not distinguish + `[http://example.com](http://example.com)` from + `<http://example.com>`. It also incorrectly recognized + `[pandoc](pandoc)` as an autolink. Now the HTML writer + simply passes through the `uri` attribute if it is present, + but does not add anything. + + Avoid adding extra section nestings for revealjs. + Previously revealjs title slides at level (slidelevel - 1) + were nested under an extra section element, even when + the section contained no additional (vertical) content. + That caused problems for some transition effects. + + Omit unknown attributes in EPUB2 output. For example, + `epub:type` attributes should not be passed through, + or the epub produced will not validate. + + * JATS writer: remove 'role' attribute on 'bold' and 'sc' elements (#4937). + The JATS spec does not allow these. + + * Textile writer: don't represent `uri` class explicitly + for autolinks (#4913). + + * Lua filters (Albert Krewinkel): + + + Cleanup filter execution code. + + Better error on test failure. + + * HTML, Muse reader tests: reduce time taken by round-trip test. + + * Added cabal.project. + + * MANUAL: `epub:type` is only useful for epub3 (Maura Bieg). + + * Use hslua v1.0.0 (Albert Krewinkel). + + * Fix `translations/ru` to use modern Russian orthography + (Ivan Trubach). + + * Build Windows binary using ghc 8.6.1 and cabal new-build. This + fixes issues with segfaults in the 32-bit Windows binaries (#4283). + +## pandoc 2.3 (2018-09-16) + + * Add `--metadata-file` option (Mauro Bieg, #1960), which allows + users to specify metadata in a YAML file, regardless of the + input format (#1960). + + * Text.Pandoc.Writers.Shared: export `isDisplayMath` (API change). + + * Text.Pandoc.Readers.Markdown: export `yamlToMeta` (API change, + Mauro Bieg). + + * Text.Pandoc.Readers.LaTeX.Types: + + + New type `ArgSpec` (API change). + + Second parameter of `Macro` constructor is now `[ArgSpec]` instead of + `Int` (API change). + + * Markdown reader: + + + Use `tex` instead of `latex` for raw tex-ish content. We can't + always tell if it's LaTeX, ConTeXt, or plain TeX. Better just to + use `tex` always. Note that if `context` or `latex` specifically + is desired, you can still force that in a markdown document by + using the raw attribute. Note that this change may affect some + filters, if they assume that raw tex parsed by the Markdown reader + will be RawBlock (Format `latex`). In most cases it should be + trivial to modify the filters to accept `tex` as well. + + Refactor and reorganize YAML code (Mauro Bieg). + + Make `example_lists` work for interrupted lists + without `startnum` (#4908). + + * HTML reader: + + + Parse `<script type="math/tex` tags as math (#4877). + These are used by MathJax in some configurations. + + Extract spaces inside links instead of trimming them + (Alexander Krotov, #4845). + + Added round-trip tests (Alexander Krotov). + + Make parsing sensitive to the `raw_tex` extension (#1126). This now + allows raw LaTeX environments, `\ref`, and `\eqref` to be parsed + (which is helpful for translation HTML documents using MathJaX). + + * Org reader (Albert Krewinkel): + + + Respect export option `p` for planning info. Inclusion of planning info + (`*DEADLINE*`, `*SCHEDULED*`, and `*CLOSED*`) can be controlled via the + `p` export option: setting the option to `t` will add all planning + information in a *Plain* block below the respective headline. + + Org reader internals: don't rely on RecordWildCards and ViewPatterns + ghc extensions. + + Strip planning info from output. Planning info is parsed, but not + included in the output (as is the default with Emacs Org-mode, #4867). + + * LaTeX reader: + + + Handle parameter patterns for `\def` (#4768, #4771). + For example: `\def\foo#1[#2]{#1 and #2}`. + + Allow `%` characters in URLs. This affects `\href` and `\url` (#4832). + + Fixed parsing of `\texorpdfstring`. We were returning the wrong + argument as the content. + + Support `blockcquote`, `foreignblockquote`, `foreigncblockquote`, + `hyphenblockquote`, `hyphencblockquote`, `enquote*`, `foreignquote`, + `hyphenquote` from `csquotes` (#4848). Note that `foreignquote` + will be parsed as a regular Quoted inline (not using the quotes + appropriate to the foreign language). + + Support more text-mode accents (#4652). Add support for `\|`, `\b`, `\G`, + `\h`, `\d`, `\f`, `\r`, `\t`, `\U`, `\i`, `\j`, `\newtie`, + `\textcircled`. Also fall back to combining characters when composed + characters are not available. + + Resolve `\ref` for figure numbers. + + Support `mintinline` (#4365, Marc Schreiber). + + Fix siunitx unit commands so they are only recognized in + siunitx contexts (#4842). For example, `\l` outside of an + siunitx context should be l-slash, not l (for liter). + + Fix double `unnumbered` class (#4838). The `unnumbered` class + was being included twice for starred sections. + + * RST reader: Don't skip link definitions after comments (#4860). + + * Muse reader (Alexander Krotov): + + + Close the `</quote>` in indented tag test. + There is already a separate test for unclosed `</quote>`. + + Autonumber sections in the correct order. Parsing now stops + at each section header to ensure the header is registered before + parsing of the next section starts. + + Move duplicate code into `headingStart` function. + + Allow newline after opening `*` or `**`. + + Don't allow digits after closing marker in lightweight markup + This change makes reader more compatible with Emacs Muse. + + Parse `<verse>` tag in one pass instead of using + `parseFromString`. This change makes it possible to have + verbatim `</verse>` tag inside verse. + + * ODT reader: deal gracefully with missing `<office:font-face-decls/>` + (#4336). This allows pandoc to parse ODT document produced by KDE's + Calligra. + + * Muse writer (Alexander Krotov): + + + Output headers without asterisks if not on the top level. + + Never wrap definition list terms. + + Set `envInsideBlock = True` when rendering notes. + + Use `""` instead of `[]` for empty String. + + Check for whitespace in the beginning and end of Str's. + + Escape `-`, `;` and `>` in the beginning of strings. + + Escape list markers in the beginning of notes. + + Normalize inline list before testing if tags should be used. + + Use tags instead of lightweight markup for empty strings. + + Use lightweight markup when possible. + + Escape empty strings. This guarantees that `conditionalEscapeString` + never returns empty string. + + Wrap conditionalEscapeString result into `Muse` type. + This removes the need to pass `envInsideLinkDescription` to it. + + Separate `shouldEscapeString` function. + + Simplify inline list rendering. + + Replace newlines in strings with spaces. + + * Docx writer: + + + Add MetaString case for abstract, subtitle (#4900, Mauro Bieg). + + Properly handle display math in spans (#4826). This isn't a + complete solution, since other nestings of display math may still + cause problems, but it should work for what is by far the most + common case. + + * HTML writer: + + + Always output `<dt>` element, even if it is empty (#4883, + Alexander Krotov). + + Don't prefix `epub:` attributes with `data-`. + + * Org writer: Don't escape literal `_`, `^` (#4882). Org doesn't + recognize these escapes. + + * ODT writer: Fix percentage image scaling (#4881, Nils Carlson). + Image scaling was broken when a width was set to a percentage. + + * EPUB writer: set `epub:type` on body element in each chapter, + depending on the `epub:type` of the first section (#4823). This + only affects epub3. See + http://www.idpf.org/epub/profiles/edu/structure/#h.l0bzsloklt10 + + * FB2 writer: put `coverpage` element between title and date rather than in + `document-info` element (#4854). + + * Markdown writer: Escape `~` if strikeout extension enabled (#4840). + + * Haddock writer: Use proper format for latex math in haddock (#4571, Joe + Hermaszewski). Inline math in `\(..\)`, display math in `\[..\]`, + tex is now used. Previously we'd "fake it with unicode" and fall + back to tex when that didn't work. But newer haddock versions + support latex math. + + * TEI writer: + + + Ensure that title element is always present, even if empty (#4839). + + Put author tags in the template, rather than adding them in + the writer (#4839). + + * LaTeX writer/template: be sensitive to `filecolor` variable (#4822). + `linkcolor` only affects internal links, and `urlcolor` only + affects linked URLs. For external links, the option to use is + `filecolor`. + + * ConTeXt writer: output raw `tex` blocks as well as `context` (#969). + + * RST writer: + + + Use `.. raw:: latex` for `tex` content. + + Use `.. container` for generic Divs, instead of raw HTML. + + Render Divs with admonition classes as admonitions (#4833). + Also omit Div with class `admonition-title`. These are generated + by the RST reader and should be omitted on round-trip. + + * Text.Pandoc.PDF: fix message printed when rsvg-convert is not available + (#4855, Antonio Terceiro). + + * HTML5 template: add the `title-block-header` identifier to the + `header` element, to make it easier to style precisely (#4767, + J. B. Rainsberger). + + * OpenDocument template: Remove unnecessary indenting of TOC title (#4798, + José de Mattos Neto). + + * latex template: Add support for $toc-title$ to LaTeX (and PDF) + (#4853, Wandmalfarbe). + + * TEI template: improve `publicationStmt`. Add support for + `publisher`, `address`, `pubPlace`, and `date` variables. + + * beamer template: Support "toc-title" (#4835, Cyril Roelandt). + + * Text.Pandoc.Extensions: Fix haddock on `Ext_footnotes` (Chris Martin). + + * Lua: cleanup Lua utils, remove unused functions (Albert Krewinkel). + + * MANUAL.txt: + + + Clarify that `--biblatex/--natbib` don't work directly for PDF + (#4904). + + Document `epub:type` attribute (Mauro Bieg, #4901) + + Clarify when `--resource-path` has an effect. + + More detail on customization in syntax highlighting section. + + Document encoding issue with `--listings` (#4871, Damien Clochard). + + Remove docs on removed `--katex-stylesheet` (Mauro Bieg, #4862). + + Use https for context wiki links (#4910). + + * CONTRIBUTING.md: + + + Link to lua-filters repository (#4874). + + Fix mistake in REPL instructions for stack. (#4849, Brian Leung). + + * lua-filters.md: add links to filters, and to lua-filters repository + (#4874). + + * INSTALL.md: + + + Indicate that cabal >= 2.0 is needed. + + Added chocolatey installation method (#4844, Miodrag Milić). + + * Travis: exclude round-trip tests, except for nightly test which can fail. + + * Use latest texmath, pandoc-citeproc. + + * Use a patched version of foundation until + https://github.com/haskell-foundation/foundation/pull/503 + is fixed. + + * Clean up appveyor build and Windows package creation. + We now use 64-bit stack and ghc 8.4.3, lts-12 for the 64-bit build. The + WiX-based msi is now 64-bit for 64-bit builds (fixing #4795). + + * Remove obsolete RELEASE-CHECKLIST.md. + + * Added additional compiler warnings in Makefile and CI builds. + +## pandoc 2.2.3.2 (2018-08-07) + + * Markdown reader: Properly handle boolean values in YAML metadata (#4819). + This fixes a regression in 2.2.3, which cause boolean values to + be parsed as MetaInlines instead of MetaBool. + + We here record another undocumented (but desirable) change in 2.2.3: + numerical metadata fields are now parsed as MetaInlines rather than + MetaString. + +## pandoc 2.2.3.1 (2018-08-06) + + * Markdown reader: Fix parsing of embedded mappings in YAML metadata + (#4817). This fixes a regression in 2.2.3 which caused embedded + mappings (e.g. mappings in sequences) not to work in YAML metadata. + +## pandoc 2.2.3 (2018-08-05) + + * RST reader: improve parsing of inline interpreted text roles (#4811). + + + Use a Span with class "title-reference" for the default + title-reference role. + + Use `B.text` to split up contents into `Space`s, `SoftBreak`s, + and `Str`s for `title-reference`. + + Use Code with class "interpreted-text" instead of Span and Str for + unknown roles. (The RST writer has also been modified to round-trip + this properly.) + + Disallow blank lines in interpreted text. + + Backslash-escape now works in interpreted text. + + Backticks followed by alphanumerics no longer end interpreted text. + + Remove support for nested inlines (Francesco Occhipinti). + RST does not allow nested emphasis, links, or other inline + constructs. This fixes several bugs (#4581, #4561, #4792). + + * Org reader: fix parsers relying on `parseFromString` (#4784, Albert + Krewinkel). Emphasis was not parsed when it followed directly after + some block types (e.g., lists). + + * Markdown reader: Allow unquoted numbers and booleans as YAML mapping + keys. Previously in 2.2.2 you could not do + ``` + --- + 0: bar + ... + ``` + but only + ``` + --- + '0': bar + ... + ``` + With this change, both forms work. + + * DocBook reader: metadata handling improvements. + Now we properly parse title and subtitle elements that are direct + children of book and article (as well as children of bookinfo, + articleinfo, or info). We also now use the `subtitle` metadata + field for subtitles, rather than tacking the subtitle on to the + title. + + * RST writer: + + + Allow images to be directly nested within links (#4810, Francesco + Occhipinti). + + Use `titleblock` instead of `title` variable for title block (#4803, + Francesco Occhipinti). `titleblock` contains a properly formatted + title and subtitle (using top-level headers). `title` and + `subtitle` variables are still available and just contain the + title and subtitle text. Note that this change will require an + update to custom rst templates. + + Render Code with class "interpreted-text" as interpreted text role. + + * MediaWiki writer: Avoid extra blank line in tables with empty cells + (#4794). Note that the old output is semantically identical, but the + new output looks better. + + * Lua Utils module: add function `blocks_to_inlines` (#4799, Albert + Krewinkel). Exposes a function converting which flattenes a list of + blocks into a list of inlines. An example use case would be the + conversion of Note elements into other inlines. + + * RST template: use `titleblock` instead of `title`. Users of + custom RST templates will want to update this. + + * LaTeX template: Moved some beamer code in default.latex template. + This change allows beamer themes to change the template and font (as + Metropolis does) (#4450). + + * Better error message on `-t pdf -o out.pdf` (#1155, Mauro Bieg). + + * Added test case for #4669 to repository. + + * INSTALL.md: Fix broken link for cabal-install (#4806, ChanHoHo). + + * MANUAL.txt: + + + Add beamer info for slide backgrounds (#4802, John Muccigrosso). + + Clarify when `csquotes` is used in LaTeX writer (#4514). + + Add `commonmark` to list of output formats where `raw_tex` has an + effect (see #4527). + + +## pandoc 2.2.2.1 (2018-07-19) + + * Fix regression finding templates in user data directory (#4777). + Under version 2.2.1 and prior pandoc found latex templates in the + templates directory under the data directory, but this broke in 2.2.2. + + * Fix for bug in parsing `\input` in `rawLaTeXBlock` and + `rawLaTeXInline` (#4781). (This primarily affects the markdown + reader, and other readers that accept raw tex.) + Starting in 2.2.2, everything after an `\input` (or `\include`) + in a markdown file would be parsed as raw LaTeX. + + * MANUAL: + + + Clarify `gfm` vs `markdown_github` (#4783, Mauro Bieg). + * Use `keywords` instead of `tags` in YAML metadata example (#4779). + Unlike `tags`, `keywords` is used in some of the writers + and default templates. + + * Add missing `rollingLinks` option to revealjs template (#4778, + Igor Khorlo). + +## pandoc 2.2.2 (2018-07-16) + + * Use HsYAML instead of yaml for translations and YAML metadata (#4747). + yaml wraps a C library; HsYAML is pure Haskell. Advances #4535. + + Note: HsYAML implements YAML 1.2, in which the valid true + values are `true`, `True`, `TRUE`. This means a change in + the semantics of YAML metadata that could affect users: + `y`, `yes`, and `on` no longer count as true values. + + * Fix regression: make `--pdf-engine` work with full paths (#4681, Mauro + Bieg). + + * CommonMark reader: Handle `ascii_identifiers` extension (#4742, + Anders Waldenborg). Non-ascii characters were not stripped from + identifiers even if the `ascii_identifiers` extension was + enabled (which is is by default for gfm). + + * TikiWiki reader: Improve list parsing (#4722, Mauro Bieg). + Remove trailing Space from list items. Parse lists that have no space + after marker. + + * LaTeX reader: + + + Treat `lilypond` as a verbatim environment (#4725). + + Parse figure label into Image id (#4700, Mauro Bieg). + + Beamer: Allow "noframenumbering" option (#4696, Raymond Ehlers). + + Allow spaces around `\graphicspath` arguments (#4698). + + Handle includes without surrounding blanklines (#4553). + In addition, `\input` can now be used in an inline context, + e.g. to provide part of a paragraph, as it can in LaTeX. + + In `rawLaTeXBlock`, handle macros that resolve to a + `\begin` or `\end` (#4667). + + In `rawLaTeXBlock`, don't expand macros in macro definitions (#4653). + Note that this only affected LaTeX in markdown. + + Tighten up reading of beamer overlay specifications (#4669). + Ideally we'd turn these on only when reading beamer, but currently + beamer is not distinguished from latex as an input format. + This commit also activates parsing of overlay specifications + after commands in general (e.g. `\item`), since they can occur + in many contexts in beamer. + + Parse more siunitx unit commands (#4296, #4773). + + Be more forgiving in key/value option parsing (#4761). + + * Markdown reader: + + + Allow empty code spans, e.g. `` ` ` ``. + + Emojis are now wrapped in Spans with class `emoji` and + attribute `data-emoji` (Anders Waldenborg, #4743). + This allows the writer to handle them in a special way + (e.g. using a special font, or just rendering the + emoji name). + + * Muse reader (Alexander Krotov, except where indicated): + + + Get rid of non-exhaustive pattern match warning (Mauro Bieg). + + Add support for floating images. + + Add support for images with specified width. + + Parse image URLs without "guard" and "takeExtension". + + Split link and image parsing into separate functions. + + Parse links starting with "URL:" explicitly instead of trying to strip + "URL:" prefix after parsing. + + * Texinfo writer: Use `@sup` and `@sub` instead of custom macros (#4728, + Alexander Krotov). + + * Markdown writer: Preserve `implicit_figures` with attributes, even if + `implicit_attributes` is not set, by rendering in raw HTML (#4677). + + * Markdown and commonmark/github writers now respect the `emoji` + extension. So, `-f markdown+emoji -t markdown+emoji` now leaves + `:smile:` as `:smile:` rather than converting it to a smile + character. + + * Docx writer: Be sensitive to `toc` in YAML metadata (#4645). + + * ODT/OpenDocument writer: Make internal links work (#4358). + This adds proper bookmarks to the headers with non-null IDs. + + * EPUB writer: Properly escape pagetitle. Previously we weren't + escaping `&` and other XML characters in the pagetitle, so a title + containing a `&` would be invalid. + + * AsciiDoc Writer: Eescape square brackets at start of line (#4545, + Mauro Bieg). + + * RST writer: + + + Don't treat 'example' as a syntax name (#4748). + This fixes conversions from org with example blocks. + + Support `--number-sections` via the `section-numbering` + directive in standalone output. + + * reveal.js writer and template: reuse mathjax URL + provided by the argument to `--mathjax` or the normal pandoc default, + rather than a hard-coded one in the template (#4701). + + * LaTeX writer: + + + Properly handle footnotes in table captions (#4683). + Refactored code from figure captions to use in both places. + + In beamer output, fix single digit column percentage (#4690, Mauro + Bieg). + + * FB2 writer (Alexander Krotov): + + + Convert Plain to Para in annotation (#2424). + + Fix order of items in title-info (#2424). + + * Custom writer: fix error message on script failure (Albert Krewinkel). + Error messages produced by Lua were not displayed by Pandoc. + + * Text.Pandoc.Emoji now exports `emojiToInline`, which returns a Span + inline containing the emoji character and some attributes with metadata + (class `emoji`, attribute `data-emoji` with emoji name). (API change, + Anders Waldenborg, #4743). + + * Text.Pandoc.PDF: + + + Revert fix for #4484 (only compress images on last run, #4755). + This will mean some increase in the time it takes to + produce an image-heavy PDF with xelatex, but it will + make tables of contents correct, which is more important. + + Fix logic error in `runTeXProgram`. We were running the tex program + one more time than requested. This should speed up PDF production. + + * Allow `--template` to take a URL as argument. + + * Text.Pandoc.Highlighting: Add missing re-export of `breezeDark` + highlighting style (#4687, Adrian Sieber, API change). + + * Clarify macOS install in INSTALL.md (#4661). Make the binary package + installer the recommended method, and note that on some older versions of + macOS, homebrew installs from source and takes a lot of disk space + (#4664, Ian). + + * MANUAL: + + + Clarify EPUB linked media (#4756, Mauro Bieg) + + Update manual for "true" YAML values. Now that we're using HsYAML and + YAML 1.2, the valid true values are `true`, `True`, `TRUE`. NOTE! + `y`, `yes`, `on` no longer count as true values. + + Document `-F` as alias for `--filter` (thanks to Gandalf Saxe). + + Update manual on how math is rendered in LaTeX. + + Add proxy description (#4131, Mauro Bieg). + + Clarify that `--toc` requires `--standalone` (#4703). + + Update citation styles link (#4699, wiefling). + + * In API docs, clarify how `Ext_east_asian_line_breaks` extension works + (kaizshang91). Note that it will not take effect when readers/writers + are called as libraries (#4674). + + * Improved translations/fr (#4766, lux-lth). + + * Removed inadvertently added `.orig` files from repository (#4648). + + * Remove `network-uri` flag and use 'Network.Socket'. + This removes a compiler warning. There is no need for the old + `network-uri` flag, since network 2.6 was released in 2014. + + * Add stack.lts10.yaml, stack.lts11.yaml. use lts-12 in stack.yaml. + + * Bump upper bounds for dependent packages. + + * Exclude foundation 0.0.21 for ghc 7.10. Otherwise cabal gets + confused because of the way ghc 7.10 is excluded in foundation's + cabal file. This can be removed when haskell-foundation/foundation#500 + is fixed. + + * Require cabal-version >= 2.0. This is needed for haddock-library. + + + + +## pandoc 2.2.1 (2018-05-10) + + * Restored and undeprecated gladtex for HTML math (#4607). + + + Added `GladTeX` constructor to `Text.Pandoc.Options.HTMLMathMethod` + [API change, reverts removal in v2.2] + + Restored and undeprecated `--gladtex` option, removed in v2.2. + + * LaTeX reader: Handle `$` in `/text{..}` inside math (#4576). + + * Org reader: Fix image filename recognition (Albert Krewinkel). + Use a function from the filepath library to check whether a string is a + valid file name. The custom validity checker that was used before gave + wrong results (e.g. for absolute file paths on Windows, + kawabata/ox-pandoc#52). + + * FB2 reader: Replace some errors with warnings (Alexander Krotov). + + * HTML writer: + + + Strip links from headers when creating TOC (#4340). + Otherwise the TOC entries will not link to the sections. + + Fix regression with tex math environments in HTML + MathJax (#4639). + + * Muse writer (Alexander Krotov): Add support for left-align and + right-align classes (#4542). + + * Docx writer: Support underline (#4633). + + * Text.Pandoc.Parsing: Lookahead for non-whitespace after + `singleQuoteStart` and `doubleQuoteStart` (#4637). + + * `test-pandoc-utils.lua`: more robust testing on both windows + and \*nix. Previously the pipe tests were only run if + `\bin/false` and `/bin/sed` were present, which they aren't + in default MacOS and Windows systems. Fixed by using `tr` + and `false`, which should always be in the path on a \*nix + system, and `find` and `echo` for Windows. + + * Text.Pandoc.Shared: add `uriPathToPath`. + This adjusts the path from a file: URI in a way that is sensitive + to Windows/Linux differences. Thus, on Windows, + `/c:/foo` gets interpreted as `c:/foo`, but on Linux, + `/c:/foo` gets interpreted as `/c:/foo`. See #4613. + + * Use `uriPathToPath` with file: URIs (#4613). + + * Revert piping HTML to pdf-engine (Mauro Bieg, #4413). Use a temp + file as before. + + * Text.Pandoc.Class: Catch IO errors when writing media files + and issue a warning, rather than an error (Francesco Occhipinti, #4559). + + * Don't lowercase custom writer filename (Alexander Krotov, #4610). + + * MANUAL (Mauro Bieg): + + + Clarify truthiness in template variables (#2281). + + Clarify pipe table width calculation (#4520). + + * ConTeXt template: New Greek fallback typeface (Pablo Rodríguez, #4405). + CMU Serif gives better typographic results than the previous + Greek fallback DejaVu Serif. + + * Make HTML template polyglot (#4606, OvidiusCicero), by making + `<link rel="stylesheet" href="$css$">` self-closing. + + * Use texmath 0.11, allowing better translation of non-ASCII + characters in math (#4642). + + +## pandoc 2.2 (2018-04-27) + + * New input format: `fb2` (FictionBook2) (Alexander Krotov). + + * Make `--ascii` work for all XML formats (ICML, OPML, JATS,...), + and for `ms` and `man`. + + * Remove deprecated `--latexmathml`, `--gladtex`, `--mimetex`, `--jsmath`, `-m`, + `--asciimathml` options. + + * New module Text.Pandoc.Readers.FB2, exporting readFB2 (Alexander + Krotov, API change). + + * Markdown reader: + + + Allow empty key-value attributes, like `title=""` (#2944). + + Handle table w/o following blank line in fenced div (#4560). + + Remove "fallback" for `doubleQuote` parser. Previously the + parser tried to be efficient -- if no end double quote was found, + it would just return the contents. But this could backfire in a + case `**this should "be bold**`, since the fallback would return + the content `"be bold**` and the closing boldface delimiter + would never be encountered. + + Improve computation of the relative width of the last column in a + multiline table, so we can round-trip tables without constantly + shrinking the last column. + + * EPUB reader: + + + Fix images with space in file path (#4344). + + * LaTeX reader: + + + Properly resolve section numbers with `\ref` and chapters (#4529). + + Parse sloppypar environment (#4517, Marc Schreiber). + + Improve handling of raw LaTeX (for markdown etc.) (#4589, #4594). + Previously there were some bugs in how macros were handled. + + Support `\MakeUppercase`, `\MakeLowercase`, `\uppercase`, + `\lowercase`, and also `\MakeTextUppercase` and + `\MakeTextLowercase` from textcase (#4959). + + * Textile reader: + + + Fixed tables with no body rows (#4513). + Previously these raised an exception. + + * Mediawiki reader: + + + Improve table parsing (#4508). This fixes detection of table + attributes and also handles `!` characters in cells. + + * DocBook reader: + + + Properly handle title in `section` element (#4526). + Previously we just got `section_title` for `section` (though `sect1`, + `sect2`, etc. were handled properly). + + Read tex math as output by asciidoctor (#4569, Joe Hermaszewski). + + * Docx reader: + + + Combine adjacent CodeBlocks with the same attributes into + a single CodeBlock. This prevents a multiline codeblock in + Word from being read as different paragraphs. + + * RST reader: + + + Allow < 3 spaces indent under directives (#4579). + + Fix anonymous redirects with backticks (#4598). + + * Muse reader (Alexander Krotov): + + + Add support for Text::Amuse multiline headings. + + Add `<math>` tag support. + + Add support for `<biblio>` and `<play>` tags. + + Allow links to have empty descriptions. + + Require block `<literal>` tags to be on separate lines. + + Allow `-` in anchors. + + Allow verse to be indented. + + Allow nested footnotes. + + Internal improvements. + + * Muse writer (Alexander Krotov): + + + Escape `>` only at the beginning of a line. + + Escape `]` in image title. + + Escape `]` brackets in URLs as `%5D`. + + Only escape brackets when necessary. + + Escape ordered list markers. + + Do not escape list markers unless preceded by space. + + Escape strings starting with space. + + Escape semicolons and markers after line break. + + Escape `;` to avoid accidental comments. + + Don't break headers, line blocks and tables with line breaks. + + Correctly output empty headings. + + Escape horizontal rule only if at the beginning of the line. + + Escape definition list terms starting with list markers. + + Place header IDs before header. + + Improve span writing. + + Do not join Spans in normalization. + + Don't align ordered list items. + + Remove key-value pairs from attributes before normalization. + + Enable `--wrap=preserve` for all tests by default. + + Reduced `<verbatim>` tags in output. + + Internal changes. + + * RST writer: + + + Use more consistent indentation (#4563). Previously we + used an odd mix of 3- and 4-space indentation. Now we use 3-space + indentation, except for ordered lists, where indentation must + depend on the width of the list marker. + + Flatten nested inlines (#4368, Francesco Occhipinti). + Nested inlines are not valid RST syntax, so we flatten them following + some readability criteria discussed in #4368. + + * EPUB writer: + + + Ensure that `pagetitle` is always set, even when structured titles + are used. This prevents spurious warnings about empty title + elements (#4486). + + * FB2 writer (Alexander Krotov): + + + Output links inline instead of producing notes. Previously all links + were turned into footnotes with unclickable URLs inside. + + Allow emphasis and notes in titles. + + Don't intersperse paragraph with empty lines. + + Convert metadata value `abstract` to book annotation. + + Use `<empty-line />` for `HorizontalRule` rather than `LineBreak`. + FB2 does not have a way to represent line breaks inside paragraphs; + previously we used `<empty-line />` elements, but these are not allowed + inside paragraphs. + + * Powerpoint writer (Jesse Rosenthal): + + + Handle Quoted Inlines (#4532). + + Simplify code with `ParseXml`. + + Allow fallback options when looking for placeholder type. + + Check reference-doc for all layouts. + + Simplify speaker notes logic. + + Change notes state to a simpler per-slide value. + + Remove `Maybe` from `SpeakerNotes` in `Slide`. `mempty` + means no speaker notes. + + Add tests for improved speaker notes. + + Handle speaker notes earlier in the conversion process. + + Keep notes with related blocks (#4477). Some blocks automatically + split slides (imgs, tables, `column` divs). We assume that any + speaker notes immediately following these are connected to these + elements, and keep them with the related blocks, splitting after them. + + Remove `docProps/thumbnail.jpeg` in data dir (Jesse Rosenthal, #4588). + It contained a nonfree ICC color calibration profile and is not needed + for production of a powerpoint document. + + * Markdown writer: + + + Include a blank line at the end of the row in a single-row multiline + table, to prevent it from being interpreted as a simple table (#4578). + + * CommonMark writer: + + + Correctly ignore LaTeX raw blocks when `raw_tex` is not + enabled (#4527, quasicomputational). + + * EPUB writer: + + + Add `epub:type="footnotes"` to notes section in EPUB3 (#4489). + + * LaTeX writer: + + + In beamer, don't use format specifier for default ordered lists + (#4556). This gives better results for styles that put ordered list + markers in boxes or circles. + + Update `\lstinline` delimiters (#4369, Tim Parenti). + + * Ms writer: + + + Use `\f[R]` rather than `\f[]` to reset font (#4552). + + Use `\f[BI]` and `\f[CB]` in headers, instead of `\f[I]` and `\f[C]`, + since the header font is automatically bold (#4552). + + Use `\f[CB]` rather than `\f[BC]` for monospace bold (#4552). + + Create pdf anchor for a Div with an identifier (#4515). + + Escape `/` character in anchor ids (#4515). + + Improve escaping for anchor ids: we now use _uNNN_ instead of uNNN + to avoid ambiguity. + + * Man writer: + + + Don't escape U+2019 as `'` (#4550). + + * Text.Pandoc.Options: + + + Removed `JsMath`, `LaTeXMathML`, and `GladTeX` constructors from + `Text.Pandoc.Options.HTMLMathMethod` [API change]. + + * Text.Pandoc.Class: + + + `writeMedia`: unescape URI-escaping in file path. This avoids + writing things like `file%20one.png` to the file system. + + * Text.Pandoc.Parsing: + + + Fix `romanNumeral` parser (#4480). We previously accepted 'DDC' + as 1100. + + `uri`: don't treat `*` characters at end as part of URI (#4561). + + * Text.Pandoc.MIME: + + + Use the alias `application/eps` for EPS (#2067). + This will ensure that we retain the eps extension after reading the + image into a mediabag and writing it again. + + * Text.Pandoc.PDF: + + + Use `withTempDir` in `html2pdf`. + + With `xelatex`, don't compress images til the last run (#4484). + This saves time for image-heavy documents. + + Don't try to convert EPS files (#2067). `pdflatex` converts them + itself, and JuicyPixels can't do it. + + For `pdflatex`, use a temp directory in the working directory. + Otherwise we can have problems with the EPS conversion pdflatex + tries to do, which can't operate on a file above the working + directory without `--shell-escape`. + + * Changes to tests to accommodate changes in pandoc-types. + In <https://github.com/jgm/pandoc-types/pull/36> we changed + the table builder to pad cells. This commit changes tests + (and two readers) to accord with this behavior. + + * Set default extensions for `beamer` same as `latex`. + + * LaTeX template: + + + Add `beameroption` variable (#4359, Étienne Bersac). + + Use `pgfpages` package; this is needed for notes on second + screen in beamer (Étienne Bersac). + + Add `background-image` variable (#4601, John Muccigrosso). + + * reveal.js template: Add `background-image` variable (#4600, + John Muccigrosso). + + * ms template: Fix date. Previously `.ND` was used, but this only + works if you have a title page, which we don't. Thanks to @teoric. + + * Removed pragmas for unused extensions (#4506, Anabra). + + * Fix bash completion for `--print-default-data-file` (#4549). + Previously this looked in the filesystem, even if pandoc + was compiled with `embed_data_files` (and sometimes it looked + in a nonexistent build directory). Now the bash completion + script just includes a hard-coded list of data file names. + + * MANUAL: + + + Clarify template vs metadata variables (#4501, Mauro Bieg). + + Fix raw content example (#4479, Mauro Bieg). + + Specify that you use html for raw output in epub. + + Add examples for raw docx blocks (#4472, Tristan Stenner). + The documentation states that the target format name should match + the output format, which isn't the case for `docx`/`openxml` and + some others. + + Don't say that `empty_paragraphs` affects markdown output (#4540). + + Consolidate input/output format documentation (#4577, Mauro Bieg). + + * New README template. Take in/out formats from manual. + + * Fix example in lua-filters docs (#4459, HeirOfNorton). + + * Use the `-threaded` GHC flag when building benchmarks (#4587, + Francesco Occhipinti). + + * Bump temporary upper bound to 1.4. + + * Use pandoc-citeproc 0.14.3.1. + + * Use texmath-0.10.1.2 (fixes escapes in math in ms, #4597). + + * Removed old lib directory. This was used for something long ago, + but plays no role now. + + * Removed unneeded data file `LaTeXMathML.js`. + + * Create 64- and 32-bit versions of Windows binary packages. + +## pandoc 2.1.3 (2018-03-18) + + * Docx reader (Jesse Rosenthal): + + + Add tests for nested smart tags. + + Parse nested smart tags. + + Make unwrapSDT into a general `unwrap` function that can unwrap both + nested SDT tags and smartTags. This makes the SmartTags constructor in + the Docx type unnecessary, so we remove it (#4446). + + Remove unused `docxWarnings` (Alexander Krotov). + + * RST reader: Allow unicode bullet characters (#4454). + + * Haddock reader: Better table handling, using haddock-library's + new table support, if compiled against a version that + includes it. Note that tables with col/rowspans will not + translate well into Pandoc. + + * Muse reader (Alexander Krotov): + + + Various internal improvements. + + Require closing tag to have the same indentation as opening. + + Do not reparse blocks inside unclosed block tag (#4425). + + Parse `<class>` tag (supported by Emacs Muse). + + Do not produce empty Str element for unindented verse lines. + + * LaTeX reader: + + + Add support to parse unit string of `\SI` command (closes #4296, + Marc Schreiber). + + * Haddock writer: In the writer, we now render tables always as + grid tables, since Haddock supports these. + + * DokuWiki writer: rewrite backSlashLineBreaks (#4445, Mauro Bieg). + + * Docx writer: Fixed formatting of `DefaultStyle` ordered lists in + docx writer. We want decimal for the top level, not lower roman. + + * RST writer: + + + Strip whitespace at beginning and ending of inline containers + (#4327, Francesco Occhipinti). + + Filter out empty inline containers (#4434). There is nothing in + RST that corresponds to e.g. `Emph []`, so we just ignore elements + like this (Francesco Occhipinti). + + * Muse writer (Alexander Krotov): + + + Support spans with anchors. + + Replace smallcaps with emphasis before normalization. + + Output smallcaps as emphasis. + + Expand Cite before list normalization. + + Write empty inline lists as `<verbatim></verbatim>`. + + Remove empty Str from the beginning of inline lists during normalization. + + Escape "-" to avoid creating bullet lists. + + Fix math expansion for more than one expression per paragraph. + + Expand math before inline list normalization. + + * Dokuwiki writer: fix LineBreaks in Tables (#4313, Mauro Bieg). + + * Ms writer: + + + Asciify pdf anchors, since unicode anchors don't work (#4436). + Internal links should be converted automatically, so this shouldn't + affect users directly. + + Don't escape hyphens as `\-`; that's for a minus sign (#4467). + + * Beamer writer: put hyperlink after `\begin{frame}` and not in the title + (#4307). If it's in the title, then we get a titlebar on slides with + the `plain` attribute, when the id is non-null. This fixes a regression + in 2.0. + + * EPUB writer: Remove notes from TOC in nav.xhtml (#4453, Mauro Bieg). + + * JATS writer: Remove extraneous, significant whitespace (#4335, + Nokome Bentley). + + * html2pdf: inject base tag with current working directory (#4413, Mauro + Bieg). This helps ensure that linked resources are included. + + * Add Semigroup instances for everything for which we defined a + Monoid instance previously (API change): + + + Text.Pandoc.Class.FileTree. + + Text.Pandoc.Translations.Translations. + + Text.Pandoc.Extensions.Extensions. + + Text.Pandoc.Readers.Odt.StyleReader.Styles. + + Text.Pandoc.Pretty.Doc. + + Text.Pandoc.MediaBag.MediaBag. + + * Add custom Prelude to give clean code for Monoid and Semigroup + that works with ghc 7.10-8.4. The custom Prelude (`prelude/Prelude`) + is used for ghc versions < 8.4. `NoImplicitPrelude` is used + in all source files, and Prelude is explicitly imported + (this is necessary for ghci to work properly with the custom prelude). + + * Text.Pandoc.Writers.Shared (Francesco Occhipinti): + + + Export `stripLeadingTrailingSpace`. + + Don't wrap lines in grid tables when `--wrap=none` (#4320). + + `gridTable`: Don't wrap lines in tables when `--wrap=none`. Instead, + expand cells, even if it results in cells that don't respect relative + widths or surpass page column width. This change affects RST, + Markdown, and Haddock writers. + + * Raise error if someone tries to print docx, odt, etc. template (#4441). + + * LaTeX template: Provide `bidi` package's option using + `\PassOptionsToPackage` (#4357, Václav Haisman). This avoid a + clash when `polyglossia` loads it first and then it is loaded again + for XeLaTeX. + + * ConTeXt template: Added `pdfa` variable to generate PDF/A (#4294, Henri + Menke). Instructions on how to install the ICC profiles on ConTeXt + standalone can be found in the wiki: + <http://wiki.contextgarden.net/PDFX#ICC_profiles>. + If the ICC profiles are not available the log will contain error + messages. + + * Use latest pandoc-types, skylighting + + * Use latest pandoc-citeproc in binary package. + + * Bump upper bound for time, criterion, haddock-library, exceptions, + http-types, aeson, haddock-library. + + * Bump upper bound tasty-quickcheck 0.10 (#4429, Felix Yan). + + * pandoc.cabal: fix up other-extensions and language fields. + Language is now consistently `Haskell2010`, and other-extensions + is consistently `NoImplicitPrelude`. Everything else to be specified + in the module header as needed. + + * Removed `old-locale` flag and Text.Pandoc.Compat.Time. + This is no longer necessary since we no longer support ghc 7.8. + + * Make `weigh-pandoc` into a benchmark program. + Remove `weigh-pandoc` flag. `weigh-pandoc` is now built (and run) + automatically when you build (and run) benchmarks. + + * MANUAL: add instructions for background images reveal.js (#4325, John + Muccigrosso). + + * appveyor: use VS 2013 environment instead of VS 2015 for Windows builds. + +## pandoc 2.1.2 (2018-03-02) + + * Markdown reader: + + + Fix parsing bug with nested fenced divs (#4281). Previously we allowed + "nonindent spaces" before the opening and closing `:::`, but this + interfered with list parsing, so now we require the fences to be flush with + the margin of the containing block. + + * Commonmark reader: + + + `raw_html` is now on by default. It can be disabled explicitly + using `-f commonmark-raw_html`. + + * Org reader (Albert Krewinkel): + + + Move citation tests to separate module. + + Allow changing emphasis syntax (#4378). The characters allowed before + and after emphasis can be configured via `#+pandoc-emphasis-pre` and + `#+pandoc-emphasis-post`, respectively. This allows to change which + strings are recognized as emphasized text on a per-document or even + per-paragraph basis. Example: + + #+pandoc-emphasis-pre: "-\t ('\"{" + #+pandoc-emphasis-post: "-\t\n .,:!?;'\")}[" + + * LaTeX reader: + + + Fixed comments inside citations (#4374). + + Fix regression in package options including underscore (#4424). + + Make `--trace` work. + + Fixed parsing of `tabular*` environment (#4279). + + * RST reader: + + + Fix regression in parsing of headers with trailing space (#4280). + + * Muse reader (Alexander Krotov): + + + Enable `<literal>` tags even if amuse extension is enabled. + Amusewiki disables <literal> tags for security reasons. + If user wants similar behavior in pandoc, RawBlocks and RawInlines + can be removed or replaced with filters. + + Remove space prefix from `<literal>` tag contents. + + Do not consume whitespace while looking for closing end tag. + + Convert alphabetical list markers to decimal in round-trip test. + Alphabetical lists are an addition of Text::Amuse. + They are not present in Emacs Muse and can be ambiguous + when list starts with "i.", "c." etc. + + Allow `<quote>` and other tags to be indented. + + Allow single colon in definition list term. + + Fix parsing of verse in lists. + + Improved parsing efficiency. Avoid `parseFromString`. + Lists are parsed in linear instead of exponential time now. + + Replace ParserState with MuseState. + + Prioritize lists with roman numerals over alphabetical lists. + This is to make sure "i." starts a roman numbered list, + instead of a list with letter "i" (followed by "j", "k", ..."). + + Fix directive parsing. + + Parse definition lists with multiple descriptions. + + Parse next list item before parsing more item contents. + + Fixed a bug: headers did not terminate lists. + + Move indentation parsing from `definitionListItem` to `definitionList`. + + Paragraph indentation does not indicate nested quote. + Muse allows indentation to indicate quotation or alignment, + but only on the top level, not within a <quote> or list. + + Require that block tags are on separate lines. + Text::Amuse already explicitly requires it anyway. + + Fix matching of closing inline tags. + + Various internal changes. + + Fix parsing of nested definition lists. + + Require only one space for nested definition list indentation. + + Do not remove trailing whitespace from `<code>`. + + Fix parsing of trailing whitespace. Newline after whitespace now + results in softbreak instead of space. + + * Docx reader (Jesse Rosenthal, except where noted): + + + Handle nested sdt tags (#4415). + + Don't look up dependant run styles if `+styles` is enabled. + + Move pandoc inline styling inside custom-style span. + + Read custom styles (#1843). This will read all paragraph and + character classes as divs and spans, respectively. Dependent styles + will still be resolved, but will be wrapped with appropriate style + tags. It is controlled by the `+styles` extension (`-f docx+styles`). + This can be used in conjunction with the `custom-style` feature in the + docx writer for a pandoc-docx editing workflow. Users can convert from + an input docx, reading the custom-styles, and then use that same input + docx file as a reference-doc for producing an output docx file. Styles + will be maintained across the conversion, even if pandoc doesn't + understand them. + + Small change to Fields hyperlink parser. Previously, unquoted string + required a space at the end of the line (and consumed it). Now we + either take a space (and don't consume it), or end of input. + + Pick table width from the longest row or header (Francesco Occhipinti, + #4360). + + * Muse writer (Alexander Krotov): + + + Change verse markup: `> ` instead of `<verse>` tag. + + Remove empty strings during inline normalization. + + Don't indent nested definition lists. + + Use unicode quotes for quoted text. + + Write image width specified in percent in Text::Amuse mode. + + Don't wrap displayMath into `<verse>`. + + Escape nonbreaking space (`~~`). + + Join code with different attributes during normalization. + + Indent lists inside Div. + + Support definitions with multiple descriptions. + + * Powerpoint writer (Jesse Rosenthal): + + + Use table styles This will use the default table style in the + reference-doc file. As a result they will be easier when using + in a template, and match the color scheme. + + Remove empty slides. Because of the way that slides were split, these + could be accidentally produced by comments after images. When animations + are added, there will be a way to add an empty slide with either + incremental lists or pauses. + + Implement syntax highlighting. Note that background colors can't + be implemented in PowerPoint, so highlighting styles that require + these will be incomplete. + + New test framework for pptx. We now compare the output of the + Powerpoint writer with files that we know to (a) not be corrupt, + and (b) to show the desired output behavior (details below). + + Add `notesMaster` to `presentation.xml` if necessary. + + Ignore links and (end)notes in speaker notes. + + Output speaker notes. + + Read speaker note templates conditionally. If there are speaker + notes in the presentation, we read in the notesMasters templates + from the reference pptx file. + + Fix deletion track changes (#4303, Jesse Rosenthal). + + * Markdown writer: properly escape @ to avoid capture as citation + (#4366). + + * LaTeX writer: + + + Put hypertarget inside figure environment (#4388). + This works around a problem with the endfloat package and + makes pandoc's output compatible with it. + + Fix image height with percentage (#4389). This previously caused + the image to be resized to a percentage of textwidth, rather than + textheight. + + * ConTeXt writer (Henri Menke): + + + New section syntax and support `--section-divs` (#2609). + `\section[my-header]{My Header}` -> + `\section[title={My Header},reference={my-header}]`. + The ConTeXt writer now supports the `--section-divs` option to + write sections in the fenced style, with `\startsection` and + `\stopsection`. + + xtables: correct wrong usage of caption (Henri Menke). + + * Docx writer: + + + Fix image resizing with multiple images (#3930, Andrew Pritchard). + + Use new golden framework (Jesse Rosenthal). + + Make more deterministic to facilitate testing (Jesse Rosenthal). + - `getUniqueId` now calls to the state to get an incremented digit, + instead of calling to P.uniqueHash. + - we always start the PRNG in mkNumbering/mkAbstractNum with the same + seed (1848), so our randoms should be the same each time. + + Fix ids in comment writing (Jesse Rosenthal). Comments from + `--track-changes=all` were producing corrupt docx, because the + writer was trying to get id from the `(ID,_,_)` field of + the attributes, and ignoring the "id" entry in the key-value pairs. We + now check both. + + * Ms writer: Added papersize variable. + + * TEI writer: + + + Use `height` instead of `depth` for images (#4331). + + Ensure that id prefix is always used. + + Don't emit `role` attribute; that was a leftover from the + Docbook writer. + + Use 'xml:id', not 'id' attribute (#4371). + + * AsciiDoc writer: + + + Do not output implicit heading IDs (#4363, Alexander + Krotov). Convert to `asciidoc-auto_identifiers` for old behaviour. + + * RST writer: + + + Remove `blockToRST'` moving its logic into `fixBlocks` + (Francesco Occhipinti). + + Insert comment between lists and quotes (#4248, Francesco Occchipinti). + + * RST template: remove definition of 'math' role as raw. + This used to be needed prior to v 0.8 of docutils, but + now math support is built-in. + + * Slides: Use divs to set incremental/non-incremental (#4381, + Jesse Rosenthal). The old method (list inside blockquote) still + works, but we are encouraging the use of divs with class + `incremental` or `nonincremental`. + + * Text.Pandoc.ImageSize: + + + Make image size detection for PDFs more robust (#4322). + + Determine image size for PDFs (#4322). + + EMF Image size support (#4375, Andrew Pritchard). + + * Text.Pandoc.Extensions: + + + Add `Ext_styles` (Jesse Rosenthal, API change). This will be used in + the docx reader (defaulting to off) to read pargraph and character + styles not understood by pandoc (as divs and spans, respectively). + + Made `Ext_raw_html` default for `commonmark` format. + + * Text.Pandoc.Parsing: + + + Export `manyUntil` (Alexander Krotov, API change). + + Export improved `sepBy1` (Alexander Krotov). + + Export list marker parsers: `upperRoman`, `lowerRoman`, + `decimal`, `lowerAlpha`, `upperAlpha` (Alexander Krotov, API change). + + * Tests/Lua: fix tests on windows (Albert Krewinkel). + + * Lua: register script name in global variable (#4393). The name of the Lua + script which is executed is made available in the global Lua variable + `PANDOC_SCRIPT_FILE`, both for Lua filters and custom writers. + + * Tests: Abstract powerpoint tests out to OOXML tests (Jesse Rosenthal). + There is very little pptx-specific in these tests, so we abstract out + the basic testing function so it can be used for docx as well. This + should allow us to catch some errors in the docx writer that slipped + by the roundtrip testing. + + * Lua filters: store constructors in registry (Albert Krewinkel). Lua + functions used to construct AST element values are stored in the Lua + registry for quicker access. Getting a value from the registry is much + faster than getting a global value (partly to idiosyncrasies of hslua); + this change results in a considerable performance boost. + + * Documentation: + + + `doc/org.md` Add draft of Org-mode documentation (Albert Krewinkel). + + `doc/lua-filters.md`: document global vars set for filters + (Albert Krewinkel). + + INSTALL.md: mention Stack version. (#4343, Adam Brandizzi). + + MANUAL: add documentation on custom styles (Jesse Rosenthal). + + MANUAL.txt: Document incremental and nonincremental divs (Jesse + Rosenthal). Blockquoted lists are still described, but fenced divs are + presented in preference. + + MANUAL.txt: document header and footer variables (newmana). + + MANUAL.txt: self-contained implies standalone (#4304, Daniel Lublin). + + CONTRIBUTING.md: label was renamed. (#4310, Alexander Brandizzi). + + * Require tagsoup 0.14.3 (#4282), fixing HTML tokenization bug. + + * Use latest texmath. + + * Use latest pandoc-citeproc. + + * Allow exceptions 0.9. + + * Require aeson-pretty 0.8.5 (#4394). + + * Bump blaze-markup, blaze-html lower bounds to 0.8, 0.9 (#4334). + + * Update tagsoup to 0.14.6 (Alexander Krotov, #4282). + + * Removed ghc-prof-options. As of cabal 1.24, sensible defaults are used. + + * Update default.nix to current nixpkgs-unstable for hslua-0.9.5 (#4348, + jarlg). + +## pandoc 2.1.1 (2018-01-18) + + * Markdown reader: + + + Don't coalesce adjacent raw LaTeX blocks if they are separated by a + blank line. See lierdakil/pandoc-crossref#160. + + Improved `inlinesInBalancedBrackets` (#4272, jgm/pandoc-citeproc#315). + The change both improves performance and fixes a regression whereby + normal citations inside inline notes and figure captions were not + parsed correctly. + + * RST reader: + + + Better handling for headers with an anchor (#4240). Instead of creating a + Div containing the header, we put the id directly on the header. + This way header promotion will work properly. + + Add aligned environment when needed in math (#4254). `rst2latex.py` + uses an `align*` environment for math in `.. math::` blocks, so this + math may contain line breaks. If it does, we put the math in an + `aligned` environment to simulate `rst2latex.py`'s behavior. + + * HTML reader: + + + Fix col width parsing for percentages < 10% (#4262, n3fariox). + + * LaTeX reader: + + + Advance source position at end of stream. + + Pass through macro defs in `rawLaTeXBlock` even if the `latex_macros` + extension is set (#4246). This reverts to earlier behavior and is + probably safer on the whole, since some macros only modify things in + included packages, which pandoc's macro expansion can't modify. + + Fixed pos calculation in tokenizing escaped space. + + Allow macro definitions inside macros (#4253). Previously we went into + an infinite loop with + ``` + \newcommand{\noop}[1]{#1} + \noop{\newcommand{\foo}[1]{#1}} + \foo{hi} + ``` + + Fix inconsistent column widths (#4238). This fixes a bug whereby column + widths for the body were different from widths for the header in some + tables. + + * Docx reader (Jesse Rosenthal): + + + Parse hyperlinks in `instrText` tags (#3389, #4266). This was a form of + hyperlink found in older versions of word. The changes introduced for + this, though, create a framework for parsing further fields in MS Word + (see the spec, ECMA-376-1:2016, §17.16.5, for more on these fields). + We introduce a new module, `Text.Pandoc.Readers.Docx.Fields` which + contains a simple parsec parser. At the moment, only simple hyperlink + fields are accepted, but that can be extended in the future. + + * Muse reader (Alexander Krotov): + + + Parse `~~` as non-breaking space in Text::Amuse mode. + + Refactor list parsing. + + * Powerpoint writer (Jesse Rosenthal): + + + Change reference to `notesSlide` to `endNotesSlide`. + + Move image sizing into `picProps`. + + Improve table placement. + + Make our own `_rels/.rels` file. + + Import reference-doc images properly. + + Move `Presentation.hs` out of `PandocMonad`. + + Refactor into separate modules. T.P.W.Powerpoint.Presentation + defines the Presentation datatype and goes Pandoc->Presentation; + T.P.W.Pandoc.Output goes Presentation->Archive. + Text.Pandoc.Writers.Powerpoint a thin wrapper around the two modules. + + Avoid overlapping blocks in column output. + + Position images correctly in two-column layout. + + Make content shape retrieval environment-aware. + + Improve image handling. We now determine image and caption placement + by getting the dimensions of the content box in a given layout. + This allows for images to be correctly sized and positioned in a + different template. Note that images without captions and headers are + no longer full-screened. We can't do this dependably in different + layouts, because we don't know where the header is (it could be to + the side of the content, for example). + + Read presentation size from reference file. Our presentation size is + now dependent on the reference/template file we use. + + Handle (sub)headers above slidelevel correctly. Above the slidelevel, + subheaders will be printed in bold and given a bit of extra space + before them. Note that at the moment, no distinction is made between + levels of headers above the slide header, though that can be changed. + + Check for required files. Since we now import from reference/dist + file by glob, we need to make sure that we're getting the files we + need to make a non-corrupt Powerpoint. This performs that check. + + Improve templating using `--reference-doc`. Templating should work + much more reliably now. + + Include Notes slide in TOC. + + Set notes slide header to slide-level. + + Add table of contents. This is triggered by the `--toc` flag. Note + that in a long slide deck this risks overrunning the text box. The user + can address this by setting `--toc-depth=1`. + + Set notes slide number correctly. + + Clean up adding metadata slide. We want to count the slide numbers + correctly if it's in there. + + Add anchor links. For anchor-type links (`[foo](#bar)`) we produce + an anchor link. In powerpoint these are links to slides, so we keep + track of a map relating anchors to the slides they occur on. + + Make the slide number available to the blocks. For anchors, + block-processing functions need to know what slide number + they're in. We make the `envCurSlideId` available to blocks. + + Move `curSlideId` to environment. + + Allow setting `toc-title` in metadata. + + Link notes to endnotes slide. + + * Markdown writer: + + + Fix cell width calculation (#4265). Previously we could get + ever-lengthening cell widths when a table was run repeatedly through + `pandoc -f markdown -t markdown`. + + * LaTeX writer: + + + Escape `&` in lstinline (Robert Schütz). + + * ConTeXt writer: + + + Use xtables instead of Tables (#4223, Henri Menke). + Default to xtables for context output. Natural Tables are used + if the new `ntb` extension is set. + + * HTML writer: + + + Fixed footnote backlinks with `--id-prefix` (#4235). + + * `Text.Pandoc.Extensions`: Added `Ext_ntb` constructor (API change, + Henri Menke). + + * `Text.Pandoc.ImageSize`: add derived `Eq` instance to `Dimension` + (Jesse Rosenthal, API change). + + * Lua filters (Albert Krewinkel): + + + Make `PANDOC_READER_OPTIONS` available. + The options which were used to read the document are made available to + Lua filters via the `PANDOC_READER_OPTIONS` global. + + Add lua module `pandoc.utils.run_json_filter`, which runs a JSON filter + on a Pandoc document. + + Refactor filter-handling code into `Text.Pandoc.Filter.JSON`, + `Text.Pandoc.Filter.Lua`, and `Text.Pandoc.Filter.Path`. + + Improve error messages. Provide more context about the task + which caused an error. + + * data/pandoc.lua (Albert Krewinkel): + + + Accept singleton inline as a list. Every constructor which accepts a + list of inlines now also accepts a single inline element for + convenience. + + Accept single block as singleton list. Every constructor which accepts + a list of blocks now also accepts a single block element for + convenience. Furthermore, strings are accepted as shorthand for + `{pandoc.Str "text"}` in constructors. + + Add attr, listAttributes accessors. Elements with + attributes got an additional `attr` accessor. Attributes were + accessible only via the `identifier`, `classes`, and `attributes`, + which was in conflict with the documentation, which indirectly states + that such elements have the an `attr` property. + + Drop `_VERSION`. Having a `_VERSION` became superfluous, as this + module is closely tied to the pandoc version, which is available via + `PANDOC_VERSION`. + + Fix access to Attr components. Accessing an Attr value (e.g., + ` Attr().classes`) was broken; the more common case of accessing it via + an Inline or Block element was unaffected by this. + + * Move `metaValueToInlines` to from Docx writer to + `Text.Pandoc.Writers.Shared`, so it can be used by other writers + (Jesse Rosenthal). + + * MANUAL.txt: + + + Clarify otherlangs in LaTeX (#4072). + + Clarify `latex_macros` extension. + + Recommend use of `raw_attribute` extension in header includes (#4253). + + * Allow latest QuickCheck, tasty, criterion. + + * Remove custom prelude and ghc 7.8 support. + + * Reduce compiler noise (exact paths for compiled modules). + +## pandoc 2.1 (2018-01-07) + + * Allow filters and lua filters to be interspersed (#4196). Previously + we ran all lua filters before JSON filters. Now we run filters in + the order they are presented on the command line, whether lua or JSON. + There are two incompatible API changes: The type of `applyFilters` + has changed, and `applyLuaFilters` has been removed. `Filter` is + also now exported. + + * Use latest skylighting and omit the `missingIncludes` check, fixing + a major performance regression in earlier releases of the 2.x series + (#4226). Behavior change: If you use a custom syntax definition that + refers to a syntax you haven't loaded, pandoc will now complain when + it is highlighting the text, rather than doing a check at the start. + This change dramatically speeds up invocations of pandoc on short + inputs. + + * Text.Pandoc.Class: make `FileTree` opaque (don't export + `FileTree` constructor). This forces users to interact with it using + `insertInFileTree` and `getFileInfo`, which normalize file names. + + * Markdown reader: + + + Rewrite `inlinesInBalancedBrackets`. The rewrite is much more + direct, avoiding `parseFromString`. And it performs significantly + better; unfortunately, parsing time still increases exponentially + (see #1735). + + Avoid parsing raw tex unless `\` + letter seen. This seems to + help with the performance problem, #4216. + + * LaTeX reader: Simplified a check for raw tex command. + + * Muse reader (Alexander Krotov): + + + Enable round trip test (#4107). + + Automatically translate `#cover` into `#cover-image`. + Amusewiki uses #cover directive to specify cover image. + + * Docx reader (Jesse Rosenthal): + + + Allow for insertion/deletion of paragraphs (#3927). + If the paragraph has a deleted or inserted paragraph break (depending + on the track-changes setting) we hold onto it until the next + paragraph. This takes care of accept and reject. For this we introduce + a new state which holds the ils from the previous para if necessary. + For `--track-changes=all`, we add an empty span with class + `paragraph-insertion`/`paragraph-deletion` at the end of the paragraph + prior to the break to be inserted or deleted. + + Remove unused anchors (#3679). Docx produces a lot of anchors with + nothing pointing to them---we now remove these to produce cleaner + output. Note that this has to occur at the end of the process + because it has to follow link/anchor rewriting. + + Read multiple children of `w:sdtContents`. + + Combine adjacent anchors. There isn't any reason to have numerous + anchors in the same place, since we can't maintain docx's + non-nesting overlapping. So we reduce to a single anchor. + + Improved tests. + + * Muse writer (Alexander Krotov): don't escape URIs from AST + + * Docx writer: + + + Removed redundant subtitle in title (Sebastian Talmon). + + `firstRow` table definition compatibility for Word 2016 (Sebastian + Talmon). Word 2016 seems to use a default value of "1" for table + headers, if there is no firstRow definition (although a default + value of 0 is documented), so all tables get the first Row formatted + as header. Setting the parameter to 0 if the table has no header + row fixes this for Word 2016 + + Fix custom styles with spaces in the name (#3290). + + * Powerpoint writer (Jesse Rosenthal): + + + Ignore Notes div for parity with other slide outputs. + + Set default slidelevel correctly. We had previously defaulted to + slideLevel 2. Now we use the correct behavior of defaulting to the + highest level header followed by content. We change an expected test + result to match this behavior. + + Split blocks correctly for linked images. + + Combine adjacent runs. + + Make inline code inherit code size. Previously (a) the code size + wasn't set when we force size, and (b) the properties was set from + the default, instead of inheriting. + + Simplify `replaceNamedChildren` function. + + Allow linked images. The following markdown: + `[![Image Title](image.jpg)](http://www.example.com)` + will now produce a linked image in the resulting PowerPoint file. + + Fix error with empty table cell. We require an empty `<a:p>` tag, + even if the cell contains no paragraphs---otherwise PowerPoint + complains of corruption. + + Implement two-column slides. This uses the columns/column div + format described in the pandoc manual. At the moment, only two + columns (half the screen each) are allowed. Custom widths are not + supported. + + Added more tests. + + * OpenDocument/ODT writers: improved rendering of formulas (#4170, oltolm). + + * Lua filters (Albert Krewinkel): + + + `data/pandoc.lua`: drop 'pandoc-api-version' from Pandoc objects + + The current pandoc-types version is made available to Lua programs in + the global `PANDOC_API_VERSION`. It contains the version as a list of + numbers. + + The pandoc version available as a global `PANDOC_VERSION` (a list + of numbers). + + `data/pandoc.lua`: make `Attr` an `AstElement`. + + `data/pandoc.lua`: make all types subtypes of `AstElement`. + `Pandoc`, `Meta`, and `Citation` were just plain functions and did + not set a metatable on the returned value, which made it difficult + to amend objects of these types with new behavior. They are now + subtypes of AstElement, meaning that all their objects can gain + new features when a method is added to the behavior object + (e.g., `pandoc.Pandoc.behavior`). + + `data/pandoc.lua`: split type and behavior tables. Clearly distinguish + between a type and the behavioral properties of an instance of that + type. The behavior of a type (and all its subtypes) can now be + amended by adding methods to that types `behavior` object, without + exposing the type objects internals. E.g.: + ```lua + pandoc.Inline.behavior.frob = function () print'42' end + local str = pandoc.Str'hello' + str.frob() -- outputs '42' + ``` + + `data/pandoc.lua`: fix Element inheritance. Extending all elements + of a given type (e.g., all inline elements) was difficult, as the + table used to lookup unknown methods would be reset every time a + new element of that type was created, preventing recursive property + lookup. This is was changed in that all methods and attributes of + supertypes are now available to their subtypes. + + `data/pandoc.lua`: fix attribute names of Citation (#4222). The + fields were named like the Haskell fields, not like the documented, + shorter version. The names are changed to match the documentation + and Citations are given a shared metatable to enable simple + extensibility. + + `data/pandoc.lua`: drop function `pandoc.global_filter`. + + Bump `hslua` version to 0.9.5. This version fixes a bug that made it + difficult to handle failures while getting lists or a Map from Lua. + A bug in pandoc, which made it necessary to always pass a tag when + using MetaList or MetaBlock, is fixed as a result. Using the pandoc + module's constructor functions for these values is now optional + (if still recommended). + + Stop exporting `pushPandocModule` (API change). The introduction + of `runPandocLua` renders direct use of this function obsolete. + + Update generation of module docs for lua filters. + + `Lua.Module.Utils`: make stringify work on `MetaValues` (John + MacFarlane). I'm sure this was intended in the first place, + but currently only `Meta` is supported. + + * Improve benchmarks. + + + Set the default extensions properly. + + Improve benchmark argument parsing. You can now say + `make bench BENCHARGS="markdown latex reader"` and both the + markdown and latex readers will be benchmarked. + + * MANUAL.txt simplify and add more structure (Mauro Bieg). + + * Generate README.md from template and MANUAL.txt. + `make README.md` will generate the README.md after changes + to MANUAL.txt have been made. + + * Update copyright notices to include 2018 (Albert Krewinkel). + +## pandoc 2.0.6 (2017-12-28) + + * Added `jats` as an input format. + + + Add Text.Pandoc.Readers.JATS, exporting `readJATS` (API + change) (Hamish Mackenzie). + + Improved citation handling in JATS reader. JATS citations + are now converted to pandoc citations, and JATS ref-lists + are converted into a `references` field in metadata, suitable + for use with pandoc-citeproc. Thus a JATS article with embedded + bibliographic information can be processed with pandoc and + pandoc-citeproc to produce a formatted bibliography. + + * Allow `--list-extensions` to take an optional FORMAT argument. + This lists the extensions set by default for the selected FORMAT. + The extensions are now alphabetized, and the `+` or `-` + indicating the default setting comes before, rather than after, + the extension. + + * Markdown reader: + + + Preserve original whitespace between blocks. + + Recognize `\placeformula` as context. + + Be pickier about table captions. A caption starts with a `:` which + can't be followed by punctuation. Otherwise we can falsely interpret + the start of a fenced div, or even a table header line like + `:--:|:--:`, as a caption. + + Always use four space rule for example lists. It would be awkward + to indent example list contents to the first non-space character after + the label, since example list labels are often long. Thanks to + Bernhard Fisseni for the suggestion. + + Improve raw tex parsing. Note that the Markdown reader is also + affected by the `latex_macros` extension changes described below + under the LaTeX reader. + + * LaTeX reader: + + + `latex_macros` extension changes (#4179). Don't pass through macro + definitions themselves when `latex_macros` is set. The macros + have already been applied. If `latex_macros` is enabled, then + `rawLaTeXBlock` in Text.Pandoc.Readers.LaTeX will succeed in parsing + a macro definition, and will update pandoc's internal macro map + accordingly, but the empty string will be returned. + + Export `tokenize`, `untokenize` (API change). + + Use `applyMacros` in `rawLaTeXBlock`, `rawLaTeXInline`. + + Refactored `inlineCommand`. + + Fix bug in tokenizer. Material following `^^` was + dropped if it wasn't a character escape. This only affected + invalid LaTeX, so we didn't see it in the wild, but it appeared + in a QuickCheck test failure. + + Fix regression in LateX tokenization (#4159). This mainly affects the + Markdown reader when parsing raw LaTeX with escaped spaces. + + Add tests of LaTeX tokenizer. + + Support `\foreignlanguage` from babel. + + Be more tolerant of `&` character (#4208). This allows us to parse + unknown tabular environments as raw LaTeX. + + * Muse reader (Alexander Krotov): + + + Parse anchors immediately after headings as IDs. + + Require that note references does not start with 0. + + Parse empty comments correctly. + + * Org reader (Albert Krewinkel): + + + Fix asterisks-related parsing error (#4180). + + Support minlevel option for includes (#4154). The level of headers + in included files can be shifted to a higher level by specifying a + minimum header level via the `:minlevel` parameter. E.g. + `#+include: "tour.org" :minlevel 1` will shift the headers in + tour.org such that the topmost headers become level 1 headers. + + Break-up org reader test file into multiple modules. + + * OPML reader: + + + Enable raw HTML and other extensions by default for notes + (#4164). This fixes a regression in 2.0. Note that extensions can + now be individually disabled, e.g. `-f opml-smart-raw_html`. + + * RST reader: + + + Allow empty list items (#4193). + + More accurate parsing of references (#4156). Previously we erroneously + included the enclosing backticks in a reference ID (#4156). This + change also disables interpretation of syntax inside references, as + in docutils. So, there is no emphasis in `` `my *link*`_ ``. + + * Docx reader: + + + Continue lists after interruption (#4025, Jesse Rosenthal). + Docx expects that lists will continue where they left off after an + interruption and introduces a new id if a list is starting again. So + we keep track of the state of lists and use them to define a "start" + attribute, if necessary. + + Add tests for structured document tags unwrapping (Jesse Rosenthal). + + Preprocess Document body to unwrap `w:sdt` elements (Jesse Rosenthal, + #4190). + + * Plain writer: + + + Don't linkify table of contents. + + * RST writer: + + + Fix anchors for headers (#4188). We were missing an `_`. + + * PowerPoint writer (Jesse Rosenthal): + + + Treat lists inside BlockQuotes as lists. We don't yet produce + incremental lists in PowerPoint, but we should at least treat lists + inside BlockQuotes as lists, for compatibility with other slide formats. + + Add ability to force size. This replaces the more specific + `blockQuote runProp`, which only affected the size of blockquotes. We + can use this for notes, etc. + + Implement notes. This currently prints all notes on a final slide. + Note that at the moment, there is a danger of text overflowing the + note slide, since there is no logic for adding further slides. + + Implement basic definition list functionality to PowerPoint writer. + + Don't look for default template file for Powerpoint (#4181). + + Add pptx to isTextFormat list. This is used to check standalone + and not writing to the terminal. + + Obey slide level option (Jesse Rosenthal). + + Introduce tests. + + * Docx writer: + + + Ensure that `distArchive` is the one that comes with pandoc + (#4182). Previously a `reference.docx` in `~/.pandoc` (or the user data + dir) would be used instead, and this could cause problems because a + user-modified docx sometimes lacks vital sections that we count + on the `distArchive` to supply. + + * Org writer: + + + Do not wrap "-" to avoid accidental bullet lists (Alexander Krotov). + + Don't allow fn refs to wrap to beginning of line (#4171, with help from + Alexander Krotov). Otherwise they can be interpreted as footnote + definitions. + + * Muse writer (Alexander Krotov): + + + Don't wrap note references to the next line (#4172). + + * HTML writer: + + + Use br elements in line blocks instead of relying on CSS + (#4162). HTML-based templates have had the custom CSS for + `div.line-block` removed. Those maintaining custom templates will want + to remove this too. We still enclose line blocks in a div with class + `line-block`. + + * LaTeX writer: + + + Use `\renewcommand` for `\textlatin` with babel (#4161). + This avoids a clash with a deprecated `\textlatin` command defined + in Babel. + + Allow fragile=singleslide attribute in beamer slides (#4169). + + Use `\endhead` after `\toprule` in headerless tables (#4207). + + * FB2 writer: + + + Add cover image specified by `cover-image` meta (Alexander Krotov, + #4195). + + * JATS writer (Hamish Mackenzie): + + + Support writing `<fig>` and `<table-wrap>` elements + with `<title>` and `<caption>` inside them by using Divs with class set + to one of `fig`, `table-wrap` or `caption` (Hamish Mackenzie). The + title is included as a Heading so the constraint on where Heading can + occur is also relaxed. + + Leave out empty alt attributes on links. + + Deduplicate image mime type code. + + Make `<p>` optional in `<td>` and `<th>` (#4178). + + Self closing tags for empty xref (#4187). + + Improve support for code language. + + * Custom writer: + + + Use init file to setup Lua interpreter (Albert Krewinkel). + The same init file (`data/init`) that is used to setup the Lua + interpreter for Lua filters is also used to setup the interpreter of + custom writers.lua. + + Define instances for newtype wrapper (Albert Krewinkel). The custom + writer used its own `ToLuaStack` instance definitions, which made + it difficult to share code with Lua filters, as this could result + in conflicting instances. A `Stringify` wrapper is introduced to + avoid this problem. + + Added tests for custom writer. + + Fixed definition lists and tables in `data/sample.lua`. + + * Fixed regression: when target is PDF, writer extensions were being + ignored. So, for example, `pandoc -t latex-smart -o file.pdf` + did not work properly. + + * Lua modules (Albert Krewinkel): + + + Add `pandoc.utils` module, to hold utility functions. + + Create a Haskell module Text.Pandoc.Lua.Module.Pandoc to + define the `pandoc` lua module. + + Make a Haskell module for each Lua module. Move definitions for the + `pandoc.mediabag` modules to a separate Haskell module. + + Move `sha1` from the main `pandoc` module to `pandoc.utils`. + + Add function `pandoc.utils.hierarchicalize` (convert list of + Pandoc blocks into (hierarchical) list of Elements). + + Add function `pandoc.utils.normalize_date` (parses a date and + converts it (if possible) to "YYYY-MM-DD" format). + + Add function `pandoc.utils.to_roman_numeral` (allows conversion + of numbers below 4000 into roman numerals). + + Add function `pandoc.utils.stringify` (converts any AST element + to a string with formatting removed). + + `data/init.lua`: load `pandoc.utils` by default + + Turn pipe, read into full Haskell functions. The `pipe` and `read` + utility functions are converted from hybrid lua/haskell functions + into full Haskell functions. This avoids the need for intermediate + `_pipe`/`_read` helper functions, which have dropped. + + pandoc.lua: re-add missing MetaMap function. This was a bug + introduced in version 2.0.4. + + * Text.Pandoc.Class: Add `insertInFileTree` [API change]. This gives + a pure way to insert an ersatz file into a `FileTree`. In addition, we + normalize paths both on insertion and on lookup. + + * Text.Pandoc.Shared: export `blocksToInlines'` (API change, Maura Bieg). + + * Text.Pandoc.MIME: Add opus to MIME type table as audio/ogg (#4198). + + * Text.Pandoc.Extensions: Alphabetical order constructors for + `Extension`. This makes them appear in order in `--list-extensions`. + + * Allow lenient decoding of latex error logs, which are not always + properly UTF8-encoded (#4200). + + * Update latex template to work with recent versions of beamer. + The old template produced numbered sections with some recent + versions of beamer. Thanks to Thomas Hodgson. + + * Updated reference.docx (#4175). Instead of just "Hello, world", the + document now contains exemplars of most of the styles that have an + effect on pandoc documents. This makes it easier to see the effect + of style changes. + + * Removed `default.theme` data file (#4096). It is no longer needed now + that we have `--print-highlight-style`. + + * Added `stack.lts9.yaml` for building with lts 9 and ghc 8.0.2. + We still need this for the alpine static linux build, since + we don't have ghc 8.2.2 for that yet. + + * Removed `stack.pkg.yaml`. We only really need `stack.yaml`; we + can put flag settings for pandoc-citeproc there. + + * Makefile: Add 'trypandoc' and 'pandoc-templates' targets to + make releases easier. + + * MANUAL.txt: + + + Add note on what formats have `+smart` by default. + + Use native syntax for custom-style (#4174, Mauro Bieg). + + Introduce dedicated Extensions section, since some extensions + affect formats other than markdown (Mauro Bieg, #4204). + + Clarify default html output for `--section-divs` (Richard Edwards). + + * filters.md: say that Text.Pandoc.JSON comes form pandoc-types. + Closes jgm/pandoc-website#16. + + * epub.md: Delete removed `-S` option from command (#4151, Georger Araújo). + +## pandoc 2.0.5 (2017-12-12) + + * Fix a bug in 2.0.4, whereby pandoc could not read the theme files + generated with `--print-highlight-style` (#4133). Improve JSON + serialization of styles. + + * Fix CSS issues involving line numbers (#4128). + Highlighted code blocks are now enclosed in a div with class `sourceCode`. + Highlighting CSS no longer sets a generic color for pre and code; we only + set these for class `sourceCode`. + + * `--pdf-engine-opt`: fix bug where option order was reversed (#4137). + + * Add PowerPoint (pptx) writer (Jesse Rosenthal). + It works following the standard Pandoc conventions for making other + sorts of slides. Caveats: + + + Syntax highlighting is not yet implemented. (This is difficult + because there are no character classes in Powerpoint.) + + Footnotes and Definition lists are not yet implemented. (Notes will + usually take the form of a final slide. + + Image placement and auto-resizing has a few glitches. + + Reference powerpoint files don't work dependably from the command + line. This will be implemented, but at the moment users are advised + to change themes from within Powerpoint. + + * Create shared Text.Pandoc.Writers.OOXML module (Jesse Rosenthal). + This is for functions used by both Powerpoint and Docx writers. + + * Add default pptx data for Powerpoint writer (Jesse Rosenthal). + + * Add `empty_paragraphs` extension. + + + Deprecate `--strip-empty-paragraphs` option. Instead we now + use an `empty_paragraphs` extension that can be enabled on + the reader or writer. By default, disabled. + + Add `Ext_empty_paragraphs` constructor to `Extension`. + + Revert "Docx reader: don't strip out empty paragraphs." + This reverts commit d6c58eb836f033a48955796de4d9ffb3b30e297b. + + Implement `empty_paragraphs` extension in docx reader and writer, + opendocument writer, html reader and writer. + + Add tests for `empty_paragraphs` extension. + + * Markdown reader: + + + Don't parse native div as table caption (#4119). + + Improved computation of column widths in pipe tables. + Pipe tables with lines longer than the text width (as set + by `--columns`) are now scaled to text width, with the relative + widths of columns determined by the ratios between the + header lines. Previously we computed column widths using + the ratio of header line lengths to column width, so that + tables with narrow header lines were extremely thin, which + was very rarely the desired result. + + * LaTeX reader: fix `\` before newline (#4134). This should be a space, + as long as it's not followed by a blank line. This has been fixed at the + tokenizer level. + + * Muse reader (Alexander Krotov): + + + Add test for `#disable-tables` directive in Emacs mode. + + Don't allow emphasis to be preceded by letter. + + Add underline support in Emacs Muse mode.. + + Support multiline directives in Amusewiki mode + + * Man writer: omit internal links (#4136). That is, just print the link + text without the URL. + + * Markdown reader: accept processing instructions as raw HTML (#4125). + + * Lua filters (Albert Krewinkel): + + + Use script to initialize the interpreter. The file `init.lua` is + used to initialize the Lua interpreter which is used in Lua filters. + This gives users the option to require libraries which they want to + use in all of their filters, and to extend default modules. + + Fix package loading for Lua 5.1. The list of package searchers is + named `package.loaders` in Lua 5.1 and LuaJIT, and `package.searchers` + in Lua 5.2 and later. + + Refactor lua module handling. The integration with Lua's package/module + system is improved: A pandoc-specific package searcher is prepended to + the searchers in `package.searchers`. The modules `pandoc` and + `pandoc.mediabag` can now be loaded via `require`. + + Bump lower bound of hslua. The release hslua 0.9.3 contains a new + function which makes using Haskell functions as package loaders much + easier. + + * reveal.js template: add title-slide identifier to title slide (#4120). + This allows it to be styled more easily. + + * LaTeX template: Added support for `pagestyle` variable (#4135, + Thomas Hodgson) + + * Add `-threaded` to ghc-options for executable (#4130, fixes a build + error on linux). + + +## pandoc 2.0.4 (2017-12-03) + + * Add `--print-highlight-style` option. This generates a JSON version + of a highlighting style, which can be saved as a `.theme` file, modified, + and used with `--highlight-style` (#4106, #4096). + + * Add `--strip-empty-paragraphs` option. This works for any input format. + It is primarily intended for use with docx and odt documents where + empty paragraphs have been used for inter-paragraph spaces. + + * Support `--webtex` for `gfm` output. + + * Recognize `.muse` file extension. + + * Support beamer `\alert` in LaTeX reader. Closes #4091. + + * Docx reader: don't strip out empty paragraphs (#2252). + Users who have a conversion pipeline from docx may want to consider adding + `--strip-empty-paragraphs` to the command line. + + * Org reader (Albert Krewinkel): Allow empty list items (#4090). + + * Muse reader (Alexander Krotov): + + + Parse markup in definition list terms. + + Allow definition to end with EOF. + + Make code blocks round trip. + + Drop common space prefix from list items. + + Add partial round trip test. + + Don't interpret XML entities. + + Remove `nested`. + + Parse `~~` as non-breaking space in Emacs mode. + + Correctly remove indentation from notes. Exactly one space is + required and considered to be part of the marker. + + Allow list items to be empty. + + Add ordered list test. + + Add more multiline definition tests. + + Don't allow blockquotes within lists. + + Fix reading of multiline definitions. + + Add inline `<literal>` support. + + Concatenate inlines of the same type + + * Docx writer: allow empty paragraphs (#2252). + + * CommonMark/gfm writer: + + + Use raw html for native divs/spans (#4113). This allows a pandoc + markdown native div or span to be rendered in gfm using raw html tags. + + Implement `raw_html` and `raw_tex` extensions. Note that `raw_html` + is enabled by default for `gfm`, while `raw_tex` is disabled by default. + + * Muse writer (Alexander Krotov): + + + Test that inline math conversion result is normalized. + Without normalization this test produced + `<em>a</em><em>b</em><em>c</em>`. + + Improve inline list normalization and move to writer. + + Escape hash symbol. + + Escape `----` to avoid accidental horizontal rules. + + Escape only `</code>` inside code tag. + + Additional `<verbatim>` is not needed as `<code>` is verbatim already. + + * LaTeX writer: + + + Allow specifying just width or height for image size. + Previously both needed to be specified (unless the image was + being resized to be smaller than its original size). + If height but not width is specified, we now set width to + textwidth. If width but not height is specified, we now set + height to textheight. Since we have `keepaspectratio`, this + yields the desired result. + + Escape `~` and `_` in code with `--listings` (#4111). + + * HTML writer: export `tagWithAttributes`. This is a helper allowing + other writers to create single HTML tags. + + * Let papersizes `a0`, `a1`, `a2`, ... be case-insensitive by + converting the case as needed in LaTeX and ConTeXt writers. + + * Change `fixDisplayMath` from `Text.Pandoc.Writers.Shared` + so that it no longer produces empty `Para`'s as an artifact. + + * `Text.Pandoc.Shared.blocksToInlines`: rewrote using builder. + This gives us automatic normalization, so we don't get + for example two consecutive Spaces. + + * Include default CSS for 'underline' class in HTML-based templates. + + * revealjs template: add `tex2jax` configuration for the + math plugin. With the next release of reveal.js, this will + fix the problem of `$`s outside of math contexts being + interpreted as math delimiters (#4027). + + * `pandoc.lua` module for use in lua filters (Albert Krewinkel): + + + Add basic lua List module (#4099, #4081). The List module is + automatically loaded, but not assigned to a global variable. It can be + included in filters by calling `List = require 'List'`. Lists of blocks, + lists of inlines, and lists of classes are now given `List` as a metatable, + making working with them more convenient. E.g., it is now possible to + concatenate lists of inlines using Lua's concatenation operator `..` + (requires at least one of the operants to have `List` as a metatable): + + function Emph (emph) + local s = {pandoc.Space(), pandoc.Str 'emphasized'} + return pandoc.Span(emph.content .. s) + end + + The `List` metatable is assigned to the tables which get passed to + the constructors `MetaBlocks`, `MetaInline`, and `MetaList`. This + enables the use of the resulting objects as lists. + + `Lua/StackInstances`: push Pandoc and Meta via constructor. + Pandoc and Meta elements are now pushed by calling the respective + constructor functions of the pandoc Lua module. This makes serialization + consistent with the way blocks and inlines are pushed to lua and allows + to use List methods with the `blocks` value. + + Add documentation for pandoc.List in `lua-filters.md`. + + * Use latest tagsoup. This fixes a bug in parsing HTML tags with + `&` (but not a valid entity) following them (#4094, #4088). + + * Use skylighting 0.4.4.1, fixing the color of unmarked code text + when `numberLines` is used (#4103). + + * Make `normalizeDate` more forgiving (Mauro Bieg, #4101), not + requiring a leading 0 on single-digit days. + + * Fix `--help` output for `--highlight-style` to include `FILE` (Mauro + Bieg, #4095). + + * Clearer deprecation warning for `--latexmathml, --asciimathml, -m`. + Previously we only mentioned `--latexmathml`, even if `-m` was + used. + + * Changelog: fix description of lua filters in 2.0 release + (Albert Krewinkel). Lua filters were initially run *after* conventional + (JSON) filters. However, this was changed later to make it easier to deal + with files in the mediabag. The changelog is updated to describe that + feature of the 2.0 release correctly. + + * Change Generic JSON instances to TemplateHaskell (Jasper Van der Jeugt, + #4085). This reduces compile time and memory usage significantly. + + * `lua-filters.md`: Added tikz filter example. + + * Create alternative zip file for macOS binaries. + + * Create alternative zip file for Windows binaries. + + * Update INSTALL.md since we now provide zips for binaries. + + * Relax `http-types` dependency (Justus Sagemüller, #4084). + + * Add `epub.md`, `getting-started.md` to docs. These used to live in + the website repo. + + * Add `packages` target to Makefile. + + * Bump bounds for binary, http-types, tasty-hunit + +## pandoc 2.0.3 (2017-11-20) + + * Lua filters: preload text module (Albert Krewinkel, #4077). + The `text` module is preloaded in lua. The module contains some UTF-8 + aware string functions, implemented in Haskell. The module is loaded on + request only, e.g.: + + text = require 'text' + function Str (s) + s.text = text.upper(s.text) + return s + end + + * Allow table-like access to attributes in lua filters (Albert Krewinkel, + #4071). Attribute lists are represented as associative lists in Lua. Pure + associative lists are awkward to work with. A metatable is attached to + attribute lists, allowing to access and use the associative list as if + the attributes were stored in as normal key-value pair in table. + Note that this changes the way `pairs` works on attribute lists. Instead + of producing integer keys and two-element tables, the resulting iterator + function now returns the key and value of those pairs. Use `ipairs` to + get the old behavior. Warning: the new iteration mechanism only works if + pandoc has been compiled with Lua 5.2 or later (current default: 5.3). + + * Text.Pandoc.Parsing.uri: allow `&` and `=` as word characters (#4068). + This fixes a bug where pandoc would stop parsing a URI with an + empty attribute: for example, `&a=&b=` wolud stop at `a`. + (The uri parser tries to guess which punctuation characters + are part of the URI and which might be punctuation after it.) + + * Introduce `HasSyntaxExtensions` typeclass (Alexander Krotov, #4074). + + + Added new `HasSyntaxExtensions` typeclass for `ReaderOptions` and + `WriterOptions`. + + Reimplemented `isEnabled` function from `Options.hs` to accept both + `ReaderOptions` and `WriterOptions`. + + Replaced `enabled` from `CommonMark.hs` with new `isEnabled`. + + * Add `amuse` extension (Alexander Krotov) to enable Amuse wiki + behavior for `muse`. New `Ext_amuse` constructor for + `Extension`. Note: this is switched on by default; for + Emacs behavior, use `muse-amuse`. + + * Muse reader (Alexander Krotov): + + + Count only one space as part of list item marker. + + Produce SoftBreaks on newlines. Now wrapping can be preserved + with `--wrap=preserve`. + + Add Text::Amuse footnote extensions. Footnote end is indicated by + indentation, so footnotes can be placed anywhere in the text, + not just at the end of it. + + Accept Emacs Muse definition lists when `-amuse`. + Emacs Muse does not require indentation. + + * HTML reader: + + + Ensure we don't produce level 0 headers (#4076), even for chapter + sections in epubs. This causes problems because writers aren't set + up to expect these. + + Allow spaces after `\(` and before `\)` with `tex_math_single_backslash`. + Previously `\( \frac{1}{a} < \frac{1}{b} \)` was not parsed as math in + `markdown` or `html` `+tex_math_single_backslash`. + + * MANUAL: clarify that math extensions work with HTML. + Clarify that `tex_math_dollars` and `tex_math_single_backslash` + will work with HTML as well as Markdown. + + * Creole reader: Fix performance issue for longer lists (Sascha Wilde, + #4067). + + * RST reader: better support for 'container' directive (#4066). + Create a div, incorporate name attribute and classes. + + * LaTeX reader: + + + Support column specs like `*{2}{r}` (#4056). This is equivalent to + `rr`. We now expand it like a macro. + + Allow optional args for parbox (#4056). + + Allow optional arguments on `\footnote` (#4062). + + * EPUB writer: Fixed path for cover image (#4069). It was previously + `media/media/imagename`, and should have been `media/imagename`. + + * Markdown writer: fix bug with doubled footnotes in grid tables + (#4061). + + * LaTeX template: include natbib/biblatex after polyglossia (#4073). + Otherwise we seem to get an error; biblatex wants polyglossia + language to be defined. + + * Added examples to lua filters documentation. + + +## pandoc 2.0.2 (2017-11-12) + + * Deprecated ancient HTML math methods: `--latexmathml`, `--gladtex`, + `--mimetex`, `--jsmath`. + + * Fixed URIs in `data/jats.csl`. They were being rendered twice, + leading to invalid XML in default JATS output with pandoc-citeproc. + + * `lua-filters.md`: use real-world man page filter as example. + + * Add lua filter functions `walk_inline` and `walk_block` + in the pandoc module, to apply filters inside particular + inline and block elements. + + * Refactored some code from `Text.Pandoc.Lua.PandocModule` + into new internal module `Text.Pandoc.Lua.Filter`. + + * Markdown reader: + + + Allow fenced code blocks to be indented 1-3 spaces (#4011). + This brings our handling of them into alignment with CommonMark's. + + Fix YAML metadata with "chomp" (`|-`). Previously if a + YAML block under `|-` contained a blank line, pandoc would + not parse it as metadata. + + * Removed `etc.` from abbreviations file. Often `etc.` ends a + sentence, and we want the period to be treated as a + sentence-ending period. + + * Fix regression with `--metadata` (#4054). Values specified with + `--metadata` should replace a metadata value set in the document + itself, rather than creating a list including a new value. + + * EPUB writer: + + + Fix EPUB OCF structure. #3720 had been improperly implemented. + + Fix modified paths for raw HTML tags (src, poster, etc.) + (#4050, #4055). This had not been updated for the new EPUB + container layout, with a separate text/ subdirectory. + + Fix image paths with empty `--epub-subdirectory`. + + * Miscellaneous code cleanup (Alexander Krotov). + + * Use pandoc-types 1.17.3, which adds `Walkable` instances + for `[Block] Block` and `[Inline] Inline`. + + * Remove obsolete `stack.full.yaml` (#4052). + + * Change to using pandoc-citeproc 0.12.1 in binary packages. + + * Consolidate math output method documentation (#4049, Mauro Bieg). + + * `MANUAL.txt`: fix header level of "Extension: emoji" (Albert Krewinkel). + + * Use lua filter to generate man page from `MANUAL.txt`, replacing old + Haskell filters. This is easier and faster. + + * Improved `INSTALL.md`. + + * Update commands to extract deb archive on Linux (#4043, Salim B). + + +## pandoc 2.0.1.1 (2017-11-04) + + * Improved fix to #3989 (parsing of HTML tags containing + `>` in an attribute or comment). The previous fix (in 2.0.1) only + worked in certain cases. + + * FB2 writer (Alexander Krotov): + + + Add `unrecognised` genre to `<title-info>` + (Alexander Krotov). XML schema requires at least one genre. + + Remove `<annotation>` from `<body>`. + + * CommonMark writer: fix strikethrough for `gfm` (#4038). + + * Use texmath 0.10, which adds support for a wider range of + symbols and fixes default column alignments in MathML + and OMML. + + * Highlighting fixes, using skylighting 0.4.3.2: + + + Fix invalid CSS. + + Support `lineAnchors` (or `line-anchors`) in HTML code blocks. + + Ensure that code lines don't get duplicate identifiers (#4031). + The line identifiers are built using the code block's identifier + as a prefix. If the code block has null identifier, we use + `cb1`, `cb2`, etc. + + * Added a few abbreviations to `data/abbreviations`, + and sorted the list (#3984, Wandmalfarbe). + + * Improved support for columns in HTML writer (#4028). + + + Remove `width` attribute from the `div`. + + Remove space between `<div class="column">` elements, + since this prevents columns whose widths sum to 100% + (the space takes up space). + + Move as much as possible of the CSS to the template. + + Ensure that all the HTML-based templates (including epub) + contain the CSS for columns. + + Columns default to 50% width unless they are given a width + attribute. So if you want two equal-width columns, you + can use a div with class `column` and no `width` attribute. + + * SelfContained: use `base64` for css links with media attribute (#4026). + This fixes `--self-contained` with S5. + + * Improve `pandoc-template-mode.el` (Vaclav Haisman). + + * INSTALL.md: MacOS instructions needed xar -f (adam234). + + * MANUAL.txt: + + + Clarify that --setext-headers doesn't affect gfm output (#4035). + + Clarify what is needed to open and close a div in `fenced_divs` + (#4039, Tristano Ajmone). + + Removed reference to `default.beamer` in docs (#4024). + Also added mention of other templates affecting PDF output + with different settings. + + +## pandoc 2.0.1 (2017-10-31) + + * Fixed regression in parsing of HTML comments in markdown and other + non-HTML formats (`Text.Pandoc.Readers.HTML.htmlTag`) (#4019). + The parser stopped at the first `>` character, even if it wasn't + the end of the comment. + + * Creole reader (Sascha Wilde): + + + Fix some minor typos and formatting. + + Add additional test on nowiki-block after para. + + Fix lists with trailing white space. + + * LaTeX reader: handle `%` comment right after command. + For example, `\emph%`. + + * Markdown reader: make sure fenced div closers work in lists. + Previously the following failed: + + ::: {.class} + 1. one + 2. two + ::: + + and you needed a blank line before the closing `:::`. + + * Make `fenced_divs` affect the Markdown writer. If `fenced_divs` is + enabled, Divs will be rendered as fenced divs. + + * LaTeX/Beamer writer: support "blocks" inside columns and other Divs + (#4016). + + * HTML Writer: consistently use dashed class-names (Mauro Bieg, #3556). + Note: this change may require some changes in CSS rules. + `footnoteRef` has become `footnote-ref`, `titleslide` has + become `title-slide`, and `footnoteBack` has become `footnote-back`. + + * JATS writer: Properly pass through author metadata (#4020). + + * FB2 writer (Alexander Krotov): + + + Write blocks outside of `<p>` in definitions. + + Make bullet lists consistent with ordered lists, repeating + the marker for the outer list rather than indenting sublists, + since indentation does not work in readers. + + Add new style FB2 tests. + + * `Text.Pandoc.ImageSize`: Add `Millimeter` constructor to `Dimension` + (#4012) [API change]. Now sizes given in 'mm' are no longer converted + to 'cm'. + + * Revise documentation of small caps syntax (Andrew Dunning, #4013). + + * Fix broken reference links in manual (Andrew Dunning, #4014) + + * Fixed example of slide columns structure in changelog (#4015). + Also documented this feature in MANUAL.txt. + + +## pandoc 2.0.0.1 (2017-10-30) + + * EPUB writer: + + + Fixed filepaths for nonstandard epub-subdirectory values. + + Ensure that epub2 is recognized as a non-text format, + so that a template is used. + + Don't include "prefix" attribute for ibooks for epub2. + It doesn't validate. + + Fix stylesheet paths; previously we had an incorrect + stylesheet path for the cover page and nav page. + + * LaTeX reader: + + + Insert space when needed in macro expansion (#4007). + Sometimes we need to insert a space after a control sequence + to prevent it merging with a following letter. + + Allow unbraced arguments for macros (#4007). + + Allow body of macro definition to be unbraced (#4007). + + * Linux package build: ensure that pandoc-citeproc is statically linked. + + * trypandoc: add native, ms. + + +## pandoc 2.0 (2017-10-29) + +### New features + + * New output format `ms` (groff ms). Complete support, including + tables, math, syntax highlighting, and PDF bookmarks. The writer uses + texmath's new eqn writer to convert math to eqn format, so a ms file + produced with this writer should be processed with `groff -ms -e` if + it contains math. + + * New output format `jats` (Journal Article Tag Suite). This is an XML + format used in archiving and publishing articles. Note that a + URI-encoded CSL stylesheet (`data/jats.csl`) is added automatically + unless a stylesheet is specified using `--css`. + + * New output format `gfm` (GitHub-flavored CommonMark) (#3841). + This uses bindings to GitHub's fork of cmark, so it should parse + gfm exactly as GitHub does (excepting certain postprocessing + steps, involving notifications, emojis, etc.). `markdown_github` + has been deprecated in favor of `gfm`. + + * New output format `muse` (Emacs Muse) (Alexander Krotov, #3489). + + * New input format `gfm` (GitHub-flavored CommonMark) (#3841). + This uses bindings to GitHub's fork of cmark. `markdown_github` + has been deprecated in favor of `gfm`. + + * New input format `muse` (Emacs Muse) reader (Alexander Krotov, #3620). + + * New input format `tikiwiki` (TikiWiki markup) (rlpowell, #3800). + + * New input format `vimwiki` (Vimwiki markup) (Yuchen Pei, #3705). + Note that there is a new data file, `data/vimwiki.css`, which can + be used to display the HTML produced by this reader and + pandoc's HTML writer in the style of vimwiki's own HTML + export. + + * New input format `creole` (Creole 1.0) (#3994, Sascha Wilde). + + * New syntax for Divs, with `fenced_divs` extension enabled by + default (#168). This gives an attractive, plain-text way to create + containers for block-level content. + + * Added new syntax for including raw content in any output format, + enabled by the `raw_attribute` extension (which is on by default + for `markdown` and `multimarkdown`). The syntax is the same as + for fenced code blocks or code inlines, only with `{=FORMAT}` for + attributes, where `FORMAT` is the name of the output format + (e.g., `ms`, `html`). + + * Implement multicolumn support for slide formats (#1710). + The structure expected is: + + :::::::::::::: {.columns} + ::: {.column width="40%"} + contents... + ::: + ::: {.column width="60%"} + contents... + ::: + :::::::::::::: + + Support has been added for beamer and all HTML slide formats. + + * Allows line comments in templates, beginning with `$--` (#3806). + (Requires doctemplates 0.2.1.) + + * Add `--eol=crlf|lf|native` flag and writer option to control line endings + (Stefan Dresselhaus, #3663, #2097). + + * Add `--log` option to save log messages in JSON format to a file (#3392). + + * Add `--request-header` option, to set request headers when pandoc + makes HTTP requests to fetch external resources. For example: + `--request-header User-Agent:blah`. + + * Added lua filters (Albert Krewinkel, #3514). The new `--lua-filter` + option works like `--filter` but takes pathnames of special lua filters + and uses the lua interpreter baked into pandoc, so that no external + interpreter is needed. Note that lua filters are all applied after + regular filters, regardless of their position on the command line. + For documentation of lua filters, see `doc/lua-filters.md`. + + * Set `PANDOC_READER_OPTIONS` in environment where filters are run. + This contains a JSON representation of `ReaderOptions`, so filters + can access it. + + * Support creation of pdf via groff `ms` and pdfroff. + `pandoc -t ms -o output.pdf input.txt`. + + * Support for PDF generation via HTML and `weasyprint` or `prince` + (Mauro Bieg, #3909). `pandoc -t html5 -o output.pdf --pdf-engine=prince`. + + * Added `--epub-subdirectory` option (#3720). This specifies the + subdirectory in the OCF container that holds the EPUB specific content. + We now put all EPUB related content in an `EPUB/` subdirectory by default + (later this will be configurable). + + ``` + mimetype + META-INF/ + com.apple.ibooks.display-options.xml + container.xml + EPUB/ <<--configurable-->> + fonts/ <<--static-->> + font.otf + media/ <<--static-->> + cover.jpg + fig1.jpg + styles/ <<--static-->> + stylesheet.css + content.opf + toc.ncx + text/ <<--static-->> + ch001.xhtml + ``` + + * Added `--resource-path=SEARCHPATH` command line option (#852). + SEARCHPATH is separated by the usual character, depending on OS + (: on unix, ; on windows). Default resource path is just working + directory. However, the working directory must be explicitly + specified if the `--resource-path` option is used. + + * Added --abbreviations=FILE option for custom abbreviations file + (#256). Dfault abbreviations file (`data/abbreviations`) contains + a list of strings that will be recognized by pandoc's + Markdown parser as abbreviations. (A nonbreaking space will + be inserted after the period, preventing a sentence space in + formats like LaTeX.) Users can override the default by putting a file + abbreviations in their user data directory (`~/.pandoc` on *nix). + + * Allow a theme file as argument to `--highlight-style`. + Also include a sample, `default.theme`, in `data/`. + + * Allow `--syntax-definition` option for dynamic loading of syntax + highlighting definitions (#3334). + + * Lists in `markdown` by default now use the CommonMark variable + nesting rules (#3511). The indentation required for a block-level + item to be included in a list item is no longer fixed, but is + determined by the first line of the list item. To be included in + the list item, a block must be indented to the level of the first + non-space content after the list marker. Exception: if are 5 or more + spaces after the list marker, then the content is interpreted as an + indented code block, and continuation paragraphs must be indented + two spaces beyond the end of the list marker. See the CommonMark + spec for more details and examples. + + Documents that adhere to the four-space rule should, in most cases, + be parsed the same way by the new rules. Here are some examples + of texts that will be parsed differently: + + - a + - b + + will be parsed as a list item with a sublist; under the four-space + rule, it would be a list with two items. + + - a + + code + + Here we have an indented code block under the list item, even though it + is only indented six spaces from the margin, because it is four spaces + past the point where a continuation paragraph could begin. With the + four-space rule, this would be a regular paragraph rather than a code + block. + + - a + + code + + Here the code block will start with two spaces, whereas under + the four-space rule, it would start with `code`. With the four-space + rule, indented code under a list item always must be indented eight + spaces from the margin, while the new rules require only that it + be indented four spaces from the beginning of the first non-space + text after the list marker (here, `a`). + + This change was motivated by a slew of bug reports from people + who expected lists to work differently (#3125, #2367, #2575, #2210, + #1990, #1137, #744, #172, #137, #128) and by the growing prevalance + of CommonMark (now used by GitHub, for example). Those who + prefer the old behavior can use `-f markdown+four_space_rule`. + + * Added `four_space_rule` extension. This triggers the old pandoc + parsing rule for content nested under list items (the "four space + rule"). + + * Added `spaced_reference_links` extension (#2602). It allows whitespace + between the two parts of a reference link: e.g. + + [a] [b] + + [b]: url + + This was previously enabled by default; now it is forbidden by default. + + * Add `space_in_atx_header` extension (#3512). This is enabled by default + in pandoc and GitHub markdown but not the other flavors. + This requirse a space between the opening #'s and the header + text in ATX headers (as CommonMark does but many other implementations + do not). This is desirable to avoid falsely capturing things ilke + + #hashtag + + or + + #5 + + * Add `sourcefile` and `outputfile` template variables (Roland Hieber, + #3431). + + * Allow ibooks-specific metadata in epubs (#2693). You can now have + the following fields in your YAML metadata, and it will be treated + appropriately in the generated EPUB: + + ``` + ibooks: + version: 1.3.4 + specified-fonts: false + ipad-orientation-lock: portrait-only + iphone-orientation-lock: landscape-only + binding: true + scroll-axis: vertical + ``` + + +### Behavior changes + + * Reader functions no longer presuppose that CRs have been + stripped from the input. (They strip CRs themselves, before + parsing, to simplify the parsers.) + + * Added support for translations (localization) (#3559). + Currently this only affects the LaTeX reader, for things + like `\figurename`. Translation data files for 46 languages + can be found in `data/translations`. + + * Make `--ascii` work with DocBook output too. + + * Rename `--latex-engine` to `--pdf-engine`, + and `--latex-engine-opt` to `--pdf-engine-opt`. + + * Removed `--parse-raw` and `readerParseRaw`. These were confusing. + Now we rely on the `+raw_tex` or `+raw_html` extension with latex or html + input. Thus, instead of `--parse-raw -f latex` we use `-f latex+raw_tex`, + and instead of `--parse-raw -f html` we use `-f html+raw_html`. + + * With `--filter` R filters are now recognized, even if they are + not executable (#3940, #3941, Andrie de Vries). + + * Support SVG in PDF output, converting with `rsvg2pdf` (#1793). + + * Make epub an alias for epub3, not epub2. + + * Removed `--epub-stylesheet`; use `--css` instead (#3472, #847). + Multiple stylesheets may be used. Stylesheets will be taken both from + `--css` and from the `stylesheet` metadata field (which can contain + either a file path or a list of them). + + * `--mathml` and MathML in HTMLMathMethod no longer take an argument. + The argument was for a bridge JavaScript that used to be necessary + in 2004. We have removed the script already. + + * `--katex` improvements. The latest version is used, and the + autoload script is loaded by default. + + * Change MathJax CDN default since old one is shutting down (#3544). + Note: The new URL requires a version number, which we'll have + to update manually in subsequent pandoc releases in order to + take advantage of mathjax improvements. + + * `--self-contained`: don't incorporate elements with `data-external="1"` + (#2656). You can leave an external link as it is by adding the attribute + data-external="1" to the element. Pandoc will then not try to + incorporate its content when `--self-contained` is used. This is + similar to a feature already supported by the EPUB writer. + + * Allow `--extract-media` to work with non-binary input formats + (#1583, #2289). If `--extract-media` is supplied with a non-binary + input format, pandoc will attempt to extract the contents of all + linked images, whether in local files, data: uris, or external uris. + They will be named based on the sha1 hash of the contents. + + * Make `papersize: a4` work regardless of the case of `a4`. + It is converted to `a4` in LaTeX and `A4` in ConTeXt. + + * Make `east_asian_line_breaks` affect all readers/writers (#3703). + + * Underlined elements are now treated consistently by readers + (#2270, hftf); they are always put in a Span with class `underline`. + This allows the user to treat them differently from other emphasis, + using a filter. Docx, Org, Textile, Txt2Tags, and HTML readers + have been changed. + + * Improved behavior of `auto_identifiers` when there are explicit ids + (#1745). Previously only autogenerated ids were added to the list + of header identifiers in state, so explicit ids weren't taken + into account when generating unique identifiers. Duplicated + identifiers could result. This simple fix ensures that explicitly given + identifiers are also taken into account. + + * Use `table-of-contents` for contents of toc, make `toc` a boolean + (#2872). Changed markdown, rtf, and HTML-based templates accordingly. + This allows you to set `toc: true` in the metadata; this + previously produced strange results in some output formats. + For backwards compatibility, `toc` is still set to the + toc contents. But it is recommended that you update templates + to use `table-of-contents` for the toc contents and `toc` + for a boolean flag. + + * Change behavior with binary format output to stdout. + Previously, for binary formats, output to stdout was disabled + unless we could detect that the output was being piped (and not + sent to the terminal). Unfortunately, such detection is not + possible on Windows, leaving windows users no way to pipe binary + output. So we have changed the behavior in the following way: + + + Output to stdout is allowed when it can be determined that + the output is being piped (on non-Windows platforms). + + If the `-o` option is not used, binary output is never sent + to stdout by default; instead, an error is raised. + + If `-o -` is used, binary output is sent to stdout, regardless + of whether it is being piped. This works on Windows too. + + * Better error behavior: uses of `error` have been replaced by + raising of `PandocError`, which can be trapped and handled by the + calling program. + + * Removed `hard_line_breaks` extension from `markdown_github` (#3594). + GitHub has two Markdown modes, one for long-form documents like READMEs + and one for short things like issue comments. In issue comments, a line + break is treated as a hard line break. In README, wikis, etc., it is + treated as a space as in regular Markdown. Since pandoc is more likely to + be used to convert long-form documents from GitHub Markdown, + `-hard_line_breaks` is a better default. + + * Include `backtick_code_blocks` extension in `mardkown_mmd` (#3637). + + * Escape `MetaString` values (as added with `-M/--metadata` flag) (#3792). + Previously they would be transmitted to the template without any + escaping. Note that `--M title='*foo*'` yields a different result from + + --- + title: *foo* + --- + + In the latter case, we have emphasis; in the former case, just + a string with literal asterisks (which will be escaped + in formats, like Markdown, that require it). + + * Allow `em`, `cm`, `in` for image height/width in HTML, LaTeX (#3450). + + * HTML writer: Insert `data-` in front of unsupported attributes. Thus, + a span with attribute `foo` gets written to HTML5 with `data-foo`, so + it is valid HTML5. HTML4 is not affected. This will allow us to use + custom attributes in pandoc without producing invalid HTML. (With help + from Wandmalfarbe, #3817.) + + * Plain writer: improved super/subscript rendering. We now + handle more non-digit characters for which there are + sub/superscripted unicode characters. When unicode + sub/superscripted characters are not available, we use + `_(..)` or `^(..)` (#3518). + + * Docbook, JATS, TEI writers: print INFO message when omitting interior + header (#3750). This only applies to section headers inside list items, + e.g., which were otherwise silently omitted. + + * Change to `--reference-links` in Markdown writer (#3701). With + `--reference-location` of `section` or `block`, pandoc will now repeat + references that have been used in earlier sections. The Markdown + reader has also been modified, so that *exactly* repeated references + do not generate a warning, only references with the same label but + different targets. The idea is that, with references after every block, + one might want to repeat references sometimes. + + * ODT/OpenDocument writer: + + + Support `lang` attribute (#1667). + + Added support for `--toc` (#2836). Thanks to @anayrat. + + * Docx writer: + + + `lang` meta, see #1667 (Mauro Bieg, #3515). + + Change `FigureWithCaption` to `CaptionedFigure` (iandol, #3658). + + Use `Table` rather than `Table Normal` for table style (#3275). + `Table Normal` is the default table style and can't be modified. + + Pass through comments (#2994). We assume that comments are defined as + parsed by the docx reader: + + I want <span class="comment-start" id="0" author="Jesse Rosenthal" + date="2016-05-09T16:13:00Z">I left a comment.</span>some text to + have a comment <span class="comment-end" id="0"></span>on it. + + We assume also that the id attributes are unique and properly + matched between comment-start and comment-end. + + Bookmark improvements. Bookmark start/end now surrounds content rather + than preceding it. Bookmarks generated for Div with id + (jgm/pandoc-citeproc#205). + + Add `keywords` metadata to docx document properties (Ian). + + * RST writer: support unknown interpreted text roles by + parsing them as `Span` with `role` attributes (#3407). This + way they can be manipulated in the AST. + + * HTML writer: + + + Line block: Use class instead of style attribute (#1623). We now + issue `<div class="line-block">` and include a default definition + for `line-block` in the default templates, instead of hard-coding a + `style` on the div. + + Add class `footnoteBack` to footnote back references (Timm Albers). + This allows for easier CSS styling. + + Render SmallCaps as span with smallcaps class (#1592), rather than + using a style attribute directly. This gives the user more flexibility + in styling small caps in CSS. + + With reveal.js we use `data-src` instead of `src` for images for + lazy loading. + + Special-case `.stretch` class for images in reveal.js (#1291). + Now in reveal.js, an image with class `stretch` in a paragraph + by itself will stretch to fill the whole screen, with no + caption or figure environment. + + * Added warnings for non-rendered blocks to writers. + + * Writers now raise an error on template failure. + + * When creating a PDF via LaTeX, warn if the font is missing some + characters (#3742). + + * Remove initial check for PDF-creating program (#3819). + Instead, just try running it and raise the exception if it + isn't found at that point. This improves things for users of Cygwin + on Windows, where the executable won't be found by `findExecutable` + unless `.exe` is added. The same exception is raised as before, but + at a later point. + + * Readers issue warning for duplicate header identifiers (#1745). + Autogenerated header identifiers are given suffixes so as not to clash + with previously used header identifiers. But they may still coincide with + an explicit identifier that is given for a header later in the document, + or with an identifier on a div, span, link, or image. We now issue + a warning in this case, so users can supply an explicit identifier. + + * CommonMark reader now supports `emoji`, `hard_line_breaks`, `smart`, + and `raw_html` extensions. + + * Markdown reader: + + + Don't allow backslash + newline to affect block structure (#3730). + Note that as a result of this change, the following, which formerly + produced a header with two lines separated by a line break, will + now produce a header followed by a paragraph: + + # Hi\ + there + + This may affect some existing documents that relied on + this undocumented and unintended behavior. This change makes pandoc + more consistent with other Markdown implementations, and with itself + (since the two-space version of a line break doesn't work inside ATX + headers, and neither version works inside Setext headers). + + + * Org reader (Albert Krewinkel, unless noted): + + + Support `table.el` tables (#3314). + + Support macros (#3401). + + Support the `#+INCLUDE:` file inclusion mechanism (#3510). + Recognized include types are `example`, `export`, `src`, and + normal org file inclusion. Advanced features like line numbers + and level selection are not implemented yet. + + Interpret more meta value as inlines. The values of the following + meta variables are now interpreted using org-markup instead of + treating them as pure strings: `keywords` (comma-separated list of + inlines), `subtitle` (inline values), `nocite` (inline values, can + be repeated). + + Support `\n` export option (#3940). This turns all newlines in the + text into hard linebreaks. + + * RST reader: + + + Improved admonition support (#223). We no longer add an + `admonition` class, we just use the class for the type of admonition, + `note` for example. We put the word corresponding to the label in + a paragraph inside a `Div` at the beginning of the admonition with + class `admonition-title`. This is about as close as we can get to + RST's own output. + + Initial support of `.. table` directive. This allows adding captions + to tables. + + Support `.. line-block` directive. This is deprecated but may still + be in older documents. + + Support scale and align attributes of images (#2662). + + Implemented implicit internal header links (#3475). + + Support RST-style citations (#853). The citations appear at the end + of the document as a definition list in a special div with id + `citations`. Citations link to the definitions. + + Recurse into bodies of unknown directives (#3432). + In most cases it's better to preserve the content than + to emit it. This isn't guaranteed to have good results; + it will fail spectacularly for unknown raw or verbatim directives. + + Handle chained link definitions (#262). For example, + + .. _hello: + .. _goodbye: example.com + + Here both `hello` and `goodbye` should link to `example.com`. + + Support anchors (#262). E.g. + + `hello` + + .. _hello: + + paragraph + + This is supported by putting "paragraph" in a `Div` with id `hello`. + + Support `:widths:` attribute for table directive. + + Implement csv-table directive (#3533). Most attributes are supported, + including `:file:` and `:url:`. + + Support unknown interpreted text roles by parsing them as Span + with "role" attributes (#3407). This way they can be manipulated in + the AST. + + * HTML reader: parse a span with class `smallcaps` as `SmallCaps`. + + * LaTeX reader: + + + Implemented `\graphicspath` (#736). + + Properly handle column prefixes/suffixes. For example, in + `\begin{tabular}{>{$}l<{$}>{$}l<{$} >{$}l<{$}}` + each cell will be interpreted as if it has a `$` + before its content and a `$` after (math mode). + + Handle komascript `\dedication` (#1845). It now adds a + `dedication` field to metadata. It is up to the user to supply + a template that uses this variable. + + Support all `\textXX` commands, where XX = `rm`, `tt`, `up`, `md`, + `sf`, `bf` (#3488). Spans with a class are used when there is + nothing better. + + Expand `\newenvironment` macros (#987). + + Add support for LaTeX subfiles package (Marc Schreiber, #3530). + + Better support for subfigure package (#3577). + A figure with two subfigures turns into two pandoc + figures; the subcaptions are used and the main caption + ignored, unless there are no subcaptions. + + Add support for `\vdots` (Marc Schreiber, #3607). + + Add basic support for hyphenat package (Marc Schreiber, #3603). + + Add basic `\textcolor` support (Marc Schreiber). + + Add support for `tabularx` environment (Marc Schreiber, #3632). + + Better handling of comments inside math environments (#3113). + This solves a problem with commented out `\end{eqnarray}` inside + an eqnarray (among other things). + + Parse tikzpicture as raw verbatim environment if `raw_tex` extension + is selected (#3692). Otherwise skip with a warning. This is better + than trying to parse it as text! + + Add `\colorbox` support (Marc Schreiber). + + Set identifiers on Spans used for `\label`. + + Have `\setmainlanguage` set `lang` in metadata. + + Support etoolbox's `\ifstrequal`. + + Support `plainbreak`, `fancybreak` et al from the memoir class + (bucklereed, #3833). + + Support `\let`. Also, fix regular macros so they're expanded at the + point of use, and NOT also the point of definition. `\let` macros, + by contrast, are expanded at the point of definition. Added an + `ExpansionPoint` field to `Macro` to track this difference. + + Support simple `\def` macros. Note that we still don't support + macros with fancy parameter delimiters, like `\def\foo#1..#2{...}`. + + Support `\chaptername`, `\partname`, `\abstractname`, etc. (#3559, + obsoletes #3560). + + Put content of `\ref`, `\label`, `\eqref` commands into `Span` with + attributes, so they can be handled in filters (Marc Schreiber, #3639) + + Add Support for `glossaries` and `acronym` package (Marc Schreiber, + #3589). Acronyms are not resolved by the reader, but acronym and + glossary information is put into attributes on Spans so that they + can be processed in filters. + + Use `Link` instead of `Span` for `\ref`. This makes more sense + semantically and avoids unnecessary `Span [Link]` nestings when + references are resolved. + + Rudimentary support for `\hyperlink`. + + Support `\textquoteleft|right`, `\textquotedblleft|right` (#3849). + + Support `\lq`, `\rq`. + + Implement `\newtoggle`, `\iftoggle`, `\toggletrue|false` from etoolbox + (#3853). + + Support `\RN` and `\Rn`, from biblatex (bucklereed, #3854). + + Improved support for `\hyperlink`, `\hypertarget` (#2549). + + Support `\k` ogonek accent. + + Improve handling of accents. Handle ogonek, and fall back correctly + with forms like `\"{}`. + + Better support for ogonek accents. + + Support for `\faCheck` and `\faClose` (Marc Schreiber, #3727). + + Support for `xspace` (Marc Schreiber, #3797). + + Support `\setmainlanguage` or `\setdefaultlanguage` (polyglossia) + and `\figurename`. + + Better handling of `\part` in LaTeX (#1905). Now we parse chapters as + level 0 headers, and parts as level -1 headers. After parsing, we + check for the lowest header level, and if it's less than 1 we bump + everything up so that 1 is the lowest header level. So `\part` will + always produce a header; no command-line options are needed. + + Add block version of `\textcolor` (Marc Schreiber). + + `\textcolor` works as inline and block command (Marc Schreiber). + + `\textcolor` will be parse as span at the beginning of a paragraph + (Marc Schreiber). + + Read polyglossia/babel `\text(LANG){...}` (bucklereed) + + Improved handling of include files in LaTeX reader (#3971). + Previously `\include` wouldn't work if the included file + contained, e.g., a begin without a matching end. + + Support `\expandafter` (#3983). + + Handle `\DeclareRobustCommand` (#3983). Currently it's just treated + as a synonym for `\newcommand`. + + Handle `\lettrine` (Mauro Bieg). + + * Math improvements due to updates in texmath: + + + Improved handling of accents and upper/lower delimiters. + + Support for output in GNU eqn format (used with *roff). + + Allow `\boldsymbol` + a token without braces, and similarly + with other styling commands. + + Improve parsing of `\mathop` to allow multi-character operator names. + + Add thin space after math operators when "faking it with + unicode." + + * `walk` is now used instead of `bottomUp` in the `ToJSONFilter` + instance for `a -> [a]` (pandoc-types). Note that behavior + will be slightly different, since `bottomUp`'s treatment of + a function `[a] -> [a]` is to apply it to each sublist of a + list, while walk applies it only to maximal sublists. + Usually the latter behavior is what is wanted, and the + former can be simulated when needed. But there may be + existing filters that need to be rewritten in light of the + new behavior. Performance should be improved. + + * There are some changes to syntax highlighting due to revisions + in the `skylighting` library: + + + Support for `powershell` has been added, and many syntax + definitions have been updated. + + Background colors have been added to the `kate` style. + + The way highlighted code blocks are formatted in HTML has + been changed (David Baynard), in ways that may require + changes in hard-coded CSS affecting highlighting. + (If you haven't included hard-coded highlighting CSS in + your template, you needn't change anything.) + + +### API changes + + * New module `Text.Pandoc.Class` (Jesse Rosenthal, John MacFarlane). + This contains definitions of the `PandocMonad` typeclass, the + `PandocIO` and `PandocPure` monads, and associated functions. + + * Changed types of all writers and readers. + + + We now use `Text` instead of `String` in the interface (#3731). + (We have not yet changed the internals of most readers to work + with `Text`, but making this change in the API now opens up a + path to doing that.) + + The result is now of form `m a` with constraint `PandocMonad m`. + Readers and writers can be combined to form monadic values which + can be run using either `runIO` or `runPure`. If `runIO` is used, + then both readers and writers will be able to do IO when needed + (for include files, for example); if `runPure` is used, + then the functions are pure and will not touch IO. + + Where previously you used + `writeRST def (readMarkdown def "[foo](url)")`, now you + would use + `runPure $ readMarkdown def (pack "[foo](url)") >>= writeRST def`. + + * New module `Text.Pandoc.Readers` (Albert Krewinkel). This + contains reader helper functions formerly defined in the + top-level `Text.Pandoc` module. + + + Changed `StringReader` -> `TextReader`. + + `getReader` now returns a pair of a reader and + `Extensions`, instead of building the extensions into the + reader (#3659). The calling code must explicitly set + `readerExtensions` using the `Extensions` returned. The + point of the change is to make it possible for the calling + code to determine what extensions are being used. + + * New module `Text.Pandoc.Writers` (Albert Krewinkel). + This contains writer helper functions formerly defined in the + top-level `Text.Pandoc` module. + + + Changed `StringWriter` -> `TextWriter`. + + `getWriter` now returns a pair of a reader and + `Extensions`, instead of building the extensions into the + reader (#3659). The calling code must explicitly set + `readerExtensions` using the `Extensions` returned. The + point of the change is to make it possible for the calling + code to determine what extensions are being used. + + * New module `Text.Pandoc.Lua`, exporting `runLuaFilter` (Albert Krewinkel, + #3514). + + * New module `Text.Pandoc.App`. This abstracts out the functionality + of the command line program (`convertWithOpts`), so it can be reproduced + e.g. in a desktop or web application. Instead of exiting, we throw errors + (#3548), which are caught (leading to exit) in pandoc.hs, but allow other + users of `Text.Pandoc.App` to recover. `pandoc.hs` is now a 2-liner. + The module also exports some utility functions for parsing options + and running filters. + + * New module `Text.Pandoc.Logging` (exported module) (#3392). + This now contains the `Verbosity` definition previously in + `Text.Pandoc.Options`, as well as a new `LogMessage` datatype that will + eventually be used instead of raw strings for warnings. This will enable + us, among other things, to provide machine-readable warnings if desired. + Include ToJSON instance and showLogMessage. This gives us the possibility + of both machine-readable and human-readable output for log messages. + + * New module `Text.Pandoc.BCP47`, with `getLang`, `Lang(..)`, `parseBCP47`. + + * New module `Text.Pandoc.Translations`, exporting `Term`, + `Translations`, `readTranslations`. + + * New module `Text.Pandoc.Readers.LaTeX.Types', exporting `Macro`, `Tok`, + `TokType`, `Line`, `Column`. + + * `Text.Pandoc.Error`: added many new constructors for `PandocError`. + + * Expose some previously private modules (#3260). These are often + helpful to people writing their own reader or writer modules: + + + `Text.Pandoc.Writers.Shared` + + `Text.Pandoc.Parsing` + + `Text.Pandoc.Asciify` + + `Text.Pandoc.Emoji` + + `Text.Pandoc.ImageSize` + + `Text.Pandoc.Highlighting` +` + * New module `Text.Pandoc.Extensions` (Albert Krewinkel): + Extension parsing and processing functions were defined in the top-level + `Text.Pandoc` module. These functions are moved to the Extensions + submodule as to enable reuse in other submodules. + + * Add `Ext_raw_attribute` constructor for `Extension`. + + * Add `Ext_fenced_divs` constructor for `Extension'. + + * Add `Ext_four_space_rule` constructor in `Extension`. + + * Add `Ext_gfm_auto_identifiers` constructor for `Extension`. + + * Add `Monoid` instance for `Extensions`. + + * Add `Text.Pandoc.Writers.Ms`, exporting `writeMs`. + + * Add `Text.Pandoc.Writers.JATS`, exporting `writeJATS`. + + * Add `Text.Pandoc.Writers.Muse`, exporting `writeMuse`. + + * Add `Text.Pandoc.Readers.Muse`, exporting `readMuse`. + + * Add `Text.Pandoc.Readers.TikiWiki`, exporting `readTikiWiki`. + + * Add `Text.Pandoc.Readers.Vimwiki`, exporting `readVimwiki`. + + * Add `Text.Pandoc.Readers.Creole`, exporting `readCreole`. + + * Export `setVerbosity` from `Text.Pandoc`. + + * `Text.Pandoc.Pretty`: Add `Eq` instance for `Doc`. + + * `Text.Pandoc.XML`: `toEntities`: changed type to `Text -> Text`. + + * `Text.Pandoc.UTF8`: + + + Export `fromText`, `fromTextLazy`, `toText`, `toTextLazy`. + Define `toString`, `toStringLazy` in terms of them. + + Add new functions parameterized on `Newline`: `writeFileWith`, + `putStrWith`, `putStrLnWith`, `hPutStrWith`, `hPutStrLnWith`. + + * `Text.Pandoc.MediaBag`: removed `extractMediaBag`. + + * `Text.Pandoc.Highlighting`: + + + `highlighting` now returns an Either rather than Maybe. + This allows us to display error information returned by the skylighting + library. Display a warning if the highlighting library throws an error. + + Add parameter for `SyntaxMap` to `highlight`. + + * `Text.Pandoc.Writers.Math`: + + + Export `defaultMathJaxURL`, `defaultKaTeXURL`. This will ensure that + we only need to update these in one place. + + * `Text.Pandoc.SelfContained`: + + + Removed `WriterOptions` parameter from `makeSelfContained`. + + Put `makeSelfContained` in PandocMonad instead of IO. This removes + the need to pass MediaBag around and improves exceptions. It also + opens up the possibility of using makeSelfContained purely. + + Export `makeDataURI`. + + * `Text.Pandoc.ImageSize`: + + + Export `lengthToDim`, new function `scaleDimension`. + + Export `inEm` from ImageSize (#3450). + + Change `showFl` and `show` instance for `Dimension` so + extra decimal places are omitted. + + Added `Em` as a constructor of `Dimension`. + + Add `WriterOptions` parameter to `imageSize` signature (Mauro Bieg). + + * `Text.Pandoc.Templates`: + + + Change type of `renderTemplate'`. Now it runs in `PandocMonad` + and raises a proper `PandocTemplateError` if there are problems, rather + than failing with uncatchable `error`. + + Change signature of `getDefaultTemplate`. Now it runs in any instance + of `PandocMonad`, and returns a `String` rather than an `Either` value. + And it no longer takes a `datadir` parameter, since this can be + retrieved from `CommonState`. + + * `Text.Pandoc.Options`: + + + Added `writerEpubSubdirectory` to `WriterOptions` (#3720). + The EPUB writer now takes its EPUB subdirectory from this option. + + In `WriterOptions`, rename `writerLaTeXEngine` to `writerPdfEngine` + and `writerLaTeXArgs` to `writerPdfArgs` (Mauro Bieg, #3909). + + Add `writerSyntaxMap` to `WriterOptions`. + + Removed `writerEpubStylesheet` from `WriterOptions`. + + Remove `writerUserDataDir` from `WriterOptions`. It is now carried + in `CommonState` in `PandocMonad` instances. (And thus it can be used + by readers too.) + + Changed `writerEpubMetadata` to a `Maybe String`. + + Removed `readerApplyMacros` from `ReaderOptions`. Now we just check + the `latex_macros` reader extension. + + FromJSON/ToJSON instances for `ReaderOptions`. + + In `HTMLMathMethod`, the `KaTeX` contsructor now takes only + one string (for the KaTeX base URL), rather than two. + + Removed `writerSourceURL` from `WriterOptions`. We now use + `stSourceURL` in `CommonState`, which is set by `setInputFiles`. + + * `Text.Pandoc.Shared`: + + + `tabFilter` now takes a `Text`, not `String`. + + `openURL`: Changed type from an Either. Now it will just raise + an exception to be trapped later. + + Remove `normalizeSpaces` (#1530). + + Remove `warn`. (Use `report` from `Text.Pandoc.Class` instead.) + + Export a new function `crFilter`. + + Add `eastAsianLineBreakFilter` (previously in Markdown reader). + + Provide custom `isURI` that rejects unknown schemes. + (Albert Krewinkel, #2713). We also export the set of known + `schemes`. The new function replaces the function of the same name + from `Network.URI`, as the latter did not check whether a scheme is + well-known. All official IANA schemes (as of 2017-05-22) are + included in the set of known schemes. The four non-official schemes + `doi`, `isbn`, `javascript`, and `pmid` are kept. + + Remove `err`. + + Remove `readDataFile`, `readDefaultDataFile`, `getReferenceDocx`, + `getReferenceODT`. These now live in `Text.Pandoc.Class`, + where they are defined in terms of `PandocMonad` + primitives and have different signatures. + + Remove `openURL`. Use `openURL` from `Text.Pandoc.Class` instead. + + Add `underlineSpan`. + + * `Text.Pandoc.Readers.HTML`: export new `NamedTag` class. + + * `Text.Pandoc.Readers.Markdown`: remove `readDocxWithWarnings`. + With the new API one can simply use `getLog` after running + the reader. + + * `Text.Pandoc.Readers.LaTeX`: Changed types for `rawLaTeXInline` + and `rawLaTeXBlock`. (Both now return a `String`, and they are + polymorphic in state.) + + +### Bug fixes and under-the-hood improvements + + * TEI writer: Added identifiers on `<div>` elements. + + * DokuWiki reader: Better handling for code block in list item (#3824). + + * Custom writer: Remove old preprocesesor conditionals (Albert Krewinkel). + + * ZimWiki writer: Removed internal formatting from note and table cells, + because ZimWiki does not support it (Alex Ivkin, #3446). + + * MediaWiki writer: + + + Updated list of syntax highlighting languages (#3461). + Now `r` gets you `<source>` rather than `<code>` (among others). + + Add display attribute on `<math>` tags (#3452). This allows display + math to be rendered properly. + + Remove newline before `</ref>` (#2652). + + Don't softbreak lines inside list items (#3531). + + * Org writer: + + + Reduce to two spaces after bullets (#3417, Albert Krewinkel). + + Add unit tests (Alexander Krotov). + + Stop using raw HTML to wrap divs (Albert Krewinkel, #3771). + + Do not strip `#` from Org anchor links (Alexander Krotov). + + * CommonMark writer: + + + Avoid excess blank lines at end of output. + + Prefer pipe tables to HTML tables even if it means losing relative + column width information (#3734). + + Support table, strikethrough extensions, when enabled (as with gfm). + Note that we bypass the commonmark writer from cmark and construct our + own pipe tables, with better results. + + Properly support `--wrap=none`. + + Use smallcaps class for `SmallCaps` (#1592). + + Omit "fig:" prefix in image titles. This is used internally to + indicate internal figures. + + * RST writer: + + + Properly handle table captions. + + Don't wrap lines in in definition list terms. Wrapping is not allowed. + + Implemented `+/-smart` and improved escaping with `+smart`. + + Add empty comments when needed to avoid including a blockquote + in the indented content of a preceding block (#3675). + + Improve grid table output, fix bug with empty rows (#3516). + Uses the new `gridTable` in Writers.Shared, which is here + improved to better handle 0-width cells. + + Remove space at beginning/end of RST code span (#3496). Otherwise + we get invalid RST. There seems to be no way to escape the space. + + Add header anchors when header has non-standard id (#3937). + + Correctly handle inline code containing backticks, using a `:literal:` + role (#3974). + + Don't backslash-escape word-internal punctuation (#3978). + + * Markdown writer: + + + Don't include variables in metadata blocks. Previously variables set + on the command line were included in e.g. YAML metadata, contrary to + documentation and intentions. + + Improved escaping with `+smart`. + + Fixed grid tables embedded in grid tables (#2834). + + Use span with class 'smallcaps' for SmallCaps, instead of a style + attribute as before (#1592). + + Escape initial `%` in a paragraph if the `pandoc_title_blocks` + extension is enabled (#3454). Otherwise in a document starting with + a literal `%` the first line is wrongly interpreted as a title. + + Fixed false ordered lists in YAML metadata (#3492, #1685). Now we + properly escape things that would otherwise start ordered lists, + such as + + --- + title: 1. inline + ... + + Better handling of tables with empty columns (#3337). We now + calculate the number of columns based on the longest row (or the + length of aligns or widths). + + Escape unordered list markers at beginning of paragraph (#3497), to + avoid false interpretation as a list. + + Escape `|` appropriately. + + Ensure space before list at top level (#3487). + + Avoid spurious blanklines at end of document after tables and list, + for example. + + Fixed bugs in simple/multiline list output (#3384). + Previously we got overlong lists with `--wrap=none`. This is fixed. + Previously a multiline list could become a simple list (and would + always become one with `--wrap=none`). + + Don't emit a simple table if `simple_tables` disabled (#3529). + + Case-insensitive reference links (David A Roberts, #3616). + Ensure that we do not generate reference links whose labels differ only + by case. Also allow implicit reference links when the link + text and label are identical up to case. + + Put space before reference link definitions (Mauro Bieg, #3630). + + Better escaping for links (David A. Roberts, #3619). Previously the + Markdown writer would sometimes create links where there were none + in the source. This is now avoided by selectively escaping bracket + characters when they occur in a place where a link might be created. + + Added missing `\n` (David A. Roberts, #3647). + + Fixed duplicated reference links with `--reference-links` + and `--reference-location=section` (#3674). Also ensure that there + are no empty link references `[]`. + + Avoid inline surround-marking with empty content (#3715). + E.g. we don't want `<strong></strong>` to become `****`. + Similarly for emphasis, super/subscript, strikeout. + + Don't allow soft break in header (#3736). + + Make sure `plain`, `markdown_github`, etc. work for raw. + Previously only `markdown` worked. Note: currently a raw block labeled + `markdown_github` will be printed for any `markdown` format. + + Ensure that `+` and `-` are escaped properly so they don't cause + spurious lists (#3773). Previously they were only + if succeeded by a space, not if they were at end of line. + + Use pipe tables if `raw_html` disabled and `pipe_tables` enabled, + even if the table has relative width information (#3734). + + Markdown writer: don't crash on `Str ""`. + + Make `Span` with null attribute transparent. That is, we don't use + brackets or `<span>` tags to mark spans when there are no attributes; + we simply output the contents. + + Escape pipe characters when `pipe_tables` enabled (#3887). + + Better escaping of `<` and `>`. If `all_symbols_escapable` is set, + we backslash escape these. Otherwise we use entities as before. + + When writing plain, don't use ` ` to separate list and indented + code. There's no need for it in this context, since this isn't to be + interpreted using Markdown rules. + + Preserve classes in JS obfuscated links (Timm Albers, #2989). + HTML links containing classes originally now preserve them when using + javascript email obfuscation. + + Render `SmallCaps` as a native span when `native_spans` are enabled. + + Always write attributes with `bracketed_spans` (d-dorazio). + + * Man writer: + + + Fix handling of nested font commands (#3568). Previously pandoc emitted + incorrect markup for bold + italic, for example, or bold + code. + + Avoid error for definition lists with no definitions (#3832). + + * DocBook writer: + + + Fix internal links with `writerIdentifierPrefix opt` + (#3397, Mauro Bieg). + + * Docx writer: + + + Don't include bookmarks on headers unless non-null id (#3476). + + Support 9 levels of headers (#1642). + + Allow 9 list levels (#3519). + + Don't take `distArchive` from datadir (#3322). The docx writer takes + components from the distribution's version of `reference.docx` when it + can't find them in a user's custom `reference.docx`. Previously, we + allowed a `reference.docx` in the data directory (e.g. `~/.pandoc`) + to be used as the distribution's reference.docx. This led to a + bizarre situation where pandoc would produce a good docx using + `--template ~/.pandoc/ref.docx`, but if `ref.docx` were moved to + `~/.pandoc/reference.docx`, it would then produce a corrupted docx. + + Fixed handling of soft hyphen (0173) (#3691). + + Better handling of keywords (#3719). + + Cleaner code for handling dir and style attributes for `Div`. + + Use `Set` for dynamic styles to avoid duplicates. + + Removed redundant element from data/docx/word/numbering.xml. + The elements we need are generated when the document is + compiled; this didn't do anything. + + Activate `evenAndOddHeaders` from reference docx (#3901, + Augustín Martín Barbero). + + * ODT/OpenDocument writer: + + + Calculate aspect ratio for percentage-sized images (Mauro Bieg, #3239). + + Use more widely available bullet characters (#1400). The old + characters weren't available in some font sets. These seem to work + well on Windows and Linux versions of LibreOffice. + + Wider labels for lists (#2421). This avoids overly narrow labels for + ordered lists with `()` delimiters. However, arguably it creates + overly wide labels for bullets. Also, lists now start flush with + the margin, rather than indented. + + Fixed dropped elements in some ordered lists (#2434). + + * FB2 writer: + + + Don't render `RawBlock` as code. + + Don't fail with an error on interior headers (e.g. in list) (#3750). + Instead, omit them with an INFO message. + + Add support for "lang" metadata (Alexander Krotov, #3625). + + Format `LineBlock` as poem (Alexander Krotov). Previously writer + produced one paragraph with `<empty-line/>` elements, which are not + allowed inside `<p>` according to FB2 schema. + + Replace `concatMap` with `cMap` (Alexander Krotov). + + Write FB2 lists without nesting blocks inside `<p>` (Alexander + Krotov, #4004) + + * HTML writer: + + + Make sure `html4`, `html5` formats work for raw blocks/inlines. + + Render raw inline environments when `--mathjax` used (#3816). + We previously did this only with raw blocks, on the assumption + that math environments would always be raw blocks. This has changed + since we now parse them as inline environments. + + Ensure we don't get two style attributes for width and height. + + Report when not rendering raw inline/block. + + Issue warning if no title specified and template used (#3473). + + Info message if `lang` is unspecified (#3486). + + Removed unused parameter in `dimensionsToAttributeList`. + + Avoid two class attributes when adding `uri` class (#3716). + + Fix internal links with `writerIdentifierPrefix opt` (#3397, Mauro + Bieg). + + Use revealjs's math plugin for mathjax (#3743). This is a thin + wrapper around mathjax that makes math look better on revealjs. + + Slidy: use h1 for all slides, even if they were originally + level 2 headers (#3566). Otherwise the built-in table of contents + in Slidy breaks. + + * LaTeX writer: + + + Don't render LaTeX images with data: URIs (#3636). Note that + `--extract-media` can be used when the input contains data: URIs. + + Make highlighted code blocks work in footnotes (Timm Albers). + + Don't use figure inside table cell (#3836). + + Use proper code for list enumerators (#3891). This should fix problems + with lists that don't use arabic numerals. + + Always add hypertarget when there's a non-empty identifier (#2719). + Previously the hypertargets were only added when there was actually + a link to that identifier. + + Use `%` after hypertarget before code block. + + Add `\leavevmode` before hypertarget at start of paragraph (#2704, + fixes formatting problems in beamer citations). + + Don't use `lstinline` in `\item[..]` (#645). If you do, the contents + of item disappear or are misplaced. Use `\texttt` instead. + + Fix problem with escaping in `lstinline` (#1629). Previously the + LaTeX writer created invalid LaTeX when `--listings` was specified and + a code span occurred inside emphasis or another construction. + + Fix error with line breaks after empty content (#2874). LaTeX + requires something before a line break, so we insert a `~` if no + printable content has yet been emitted. + + Use BCP47 parser. + + Fixed detection of otherlangs (#3770). We weren't recursing into + inline contexts. + + Handle language in inline code with `--listings` (#3422). + + Write euro symbol directly in LaTeX (Andrew Dunning, #3801). + The textcomp package allows pdfLaTeX to parse `€` directly, making the + `\euro` command unneeded. + + Fixed footnotes in table captions (#2378). Note that if the table has + a first page header and a continuation page header, the notes will + appear only on the first occurrence of the header. + + In `writeBeamer` output, allow hyperlinks to frames (#3220). + Previously you could link to a header above or below slide level but + not *to* slide level. This commit changes that. Hypertargets are + inserted inside frame titles; technically the reference is to just + after the title, but in normal use (where slides are viewed full + screen in a slide show), this does not matter. + + Remove `\strut` at beginning of table cells (#3436). This fixes a + problem with alignment of lists in table cells. The `\strut` at the + end seems to be enough to avoid the too-close spacing that motivated + addition of the strut in #1573. + + Add partial siunitx Support (Marc Schreiber, #3588). + + * ConTeXt writer: + + + Refactored to use BCP47 module. + + Remove unnecessary `$` (Alexander Krotov, #3482). + + Use header identifiers for chapters (#3968). + + * EPUB writer: + + + `title_page.xhtml` is now put in `text/`. + + Don't strip formatting in TOC (#1611). + + * Textile reader: + + + Fix bug for certain links in table cells (#3667). + + Allow 'pre' code in list item (#3916). + + * HTML reader: + + + Added warnings for ignored material (#3392). + + Better sanity checks to avoid parsing unintended things as + raw HTML in the Markdown reader (#3257). + + Revise treatment of `li` with `id` attribute (#3596). Previously we + always added an empty div before the list item, but this created + problems with spacing in tight lists. Now we do this: If the list + item contents begin with a `Plain` block, we modify the `Plain` + block by adding a `Span` around its contents. Otherwise, we add a + `Div` around the contents of the list item (instead of adding an + empty `Div` to the beginning, as before). + + Add `details` tag to list of block tags (#3694). + + Removed `button` from block tag list (#3717). It is already in the + `eitherBlockOrInlineTag` list, and should be both places. + + Use `Set`s instead of lists for block tag lookup. + + Rewrote to use `Text` throughout. Effect on memory usage is modest + (< 10%). + + Use the lang value of `<html>` to set the lang meta value (bucklereed, + #3765). + + Ensure that paragraphs are closed properly when the parent block + element closes, even without `</p>` (#3794). + + Parse `<figure>` and `<figcaption>` (Mauro Bieg, #3813). + + Parse `<main>` like `<div role=main>` (bucklereed, #3791). + `<main>` closes `<p>` and behaves like a block element generally + + Support column alignments (#1881). These can be set either + with a `width` attribute or with `text-width` in a `style` attribute. + + Modified state type to be an instance of `HasLogMessages`, so + `registerHeader` can issue warnings. + + `</td>` or `</th>` should close any open block tag (#3991). + + `<td>` should close an open `<th>` or `<td>`. + + `htmlTag` improvements (#3989). We previously failed on cases + where an attribute contained a `>` character. This patch fixes the + bug, which especially affects raw HTML in Markdown. + + * Txt2Tags reader: + + + Newline is not indentation (Alexander Krotov). + + * MediaWiki reader: + + + Allow extra hyphens after `|-` in tables (#2649). + + Allow blank line after table start (#2649). + + Fixed more table issues (#2649). + + Ensure that list starts begin at left margin (#2606). Including when + they're in tables or other list items. + + Make smart double quotes depend on `smart` extension (#3585). + + Don't do curly quotes inside `<tt>` contexts (#3585). Even if `+smart`. + + Modified state type to be an instance of `HasLogMessages`, so + `registerHeader` can issue warnings. + + * TWiki reader (Alexander Krotov): + + + Remove unnecessary `$` (#3597). + + Simplify `linkText` (#3605). + + * EPUB reader: + + + Minor refactoring, avoiding explicit MediaBag handling. + This all works behind the scenes in CommonState plumbing. + + * Docx reader: + + + Don't drop smartTag contents (#2242). + + Handle local namespace declarations (#3365). Previously we didn't + recognize math, for example, when the xmlns declaration occurred on + the element and not the root. + + More efficient trimSps (#1530). Replacing `trimLineBreaks`. This + does the work of `normalizeSpaces` as well, so we avoid the need for + that function here. + + Avoid 0-level headers (Jesse Rosenthal, #3830). We used to parse + paragraphs styled with "HeadingN" as "nth-level header." But if a + document has a custom style named "Heading0", this will produce a + 0-level header, which shouldn't exist. We only parse this style + if N>0. Otherwise we treat it as a normal style name, and + follow its dependencies, if any. + + Add tests for avoiding zero-level header (Jesse Rosenthal). + + * ODT reader: + + + Replaced `collectRights` with Rights from `Data.Either`. + + Remove dead code (Albert Krewinkel). + + * Org reader (Albert Krewinkel, unless noted). + + + Don't allow tables inside list items (John MacFarlane, #3499). + + Disallow tables on list marker lines (#3499). + + Convert markup at beginning of footnotes (John MacFarlane, #3576). + + Allow emphasized text to be followed by `[` (#3577). + + Handle line numbering switch for src blocks. + The line-numbering switch that can be given to source blocks (`-n` with + an start number as an optional parameter) is parsed and translated to a + class/key-value combination used by highlighting and other readers and + writers. + + Stop adding rundoc prefix to src params. Source block parameter names + are no longer prefixed with `rundoc`. This was intended to simplify + working with the rundoc project, a babel runner. However, the rundoc + project is unmaintained, and adding those markers is not the reader's + job anyway. The original language that is specified for a source + element is now retained as the `data-org-language` attribute and only + added if it differs from the translated language. + + Allow multi-word arguments to src block params (#3477). The reader now + correctly parses src block parameter list even if parameter arguments + contain multiple words. + + Avoid creating `nullMeta` by applying `setMeta` directly + (Alexander Krotov). + + Replace `sequence . map` with `mapM`. + + Fix smart parsing behavior. Parsing of smart quotes and special + characters can either be enabled via the `smart` language extension or + the `'` and `-` export options. Smart parsing is active if either the + extension or export option is enabled. Only smart parsing of special + characters (like ellipses and en and em dashes) is enabled by default, + while smart quotes are disabled. Previously, all smart parsing was + disabled unless the language extension was enabled. + + Subject full doc tree to headline transformations (Albert Krewinkel, + #3695). Emacs parses org documents into a tree structure, which is + then post-processed during exporting. The reader is changed to do the + same, turning the document into a single tree of headlines starting + at level 0. + + Fix cite parsing behaviour (Herwig Stuetz). Until now, `org-ref` + cite keys included special characters also at the end. This caused + problems when citations occur right before colons or at the end of + a sentence. With this change, all non alphanumeric characters at + the end of a cite key are ignored. This also adds `,` to the list + of special characters that are legal in cite keys to better mirror + the behaviour of org-export. + + Fix module names in haddock comments. Copy-pasting had lead to + haddock module descriptions containing the wrong module names. + + Recognize babel result blocks with attributes (#3706). Babel + result blocks can have block attributes like captions and names. + Result blocks with attributes were not recognized and were parsed + as normal blocks without attributes. + + Include tags in headlines. The Emacs default is to include tags in the + headline when exporting. Instead of just empty spans, which contain the + tag name as attribute, tags are rendered as small caps and wrapped in + those spans. Non-breaking spaces serve as separators for multiple tags. + + Respect export option for tags (#3713). Tags are appended to + headlines by default, but will be omitted when the `tags` export option + is set to nil. + + Use `tag-name` attribute instead of `data-tag-name`. + + Use `org-language` attribute rather than `data-org-language`. + + Modified state type to be an instance of `HasLogMessages`, so + `registerHeader` can issue warnings. + + End footnotes after two blank lines. Footnotes can not only be + terminated by the start of a new footnote or a header, but also by two + consecutive blank lines. + + Update emphasis border chars (#3933). The org reader was updated to + match current org-mode behavior: the set of characters which are + acceptable to occur as the first or last character in an org emphasis + have been changed and now allows all non-whitespace chars at the + inner border of emphasized text (see `org-emphasis-regexp-components`). + + * RST reader: + + + Fixed small bug in list parsing (#3432). Previously the parser didn't + handle properly this case: + + * - a + - b + * - c + - d + + Handle multiline cells in simple tables (#1166). + + Parse list table directive (Keiichiro Shikano, #3432). + + Make use of `anyLineNewline` (Alexander Krotov, #3686). + + Use `anyLineNewline` in `rawListItem` (Alexander Krotov, #3702). + + Reorganize block parsers for ~20% faster parsing. + + Fixed `..include::` directive (#3880). + + Handle blank lines correctly in line blocks (Alexander Krotov, #3881). + Previously pandoc would sometimes combine two line blocks separated + by blanks, and ignore trailing blank lines within the line block. + + Fix indirect hyperlink targets (#512). + + * Markdown reader: + + + Allow attributes in reference links to start on next line (#3674). + + Parse YAML metadata in a context that sees footnotes defined in + the body of the document (#1279). + + When splitting pipe table cells, skip tex math (#3481). + You might have a `|` character inside math. (Or for that matter + something that the parser might mistake for raw HTML.) + + Treat span with class `smallcaps` as SmallCaps. + This allows users to specify small caps in Markdown this way: + `[my text]{.smallcaps}` (#1592). + + Fixed internal header links (#2397). + This patch also adds `shortcut_reference_links` to the list + of mmd extensions. + + Treat certain environments as inline + when they occur without space surrounding them (#3309, #2171). + E.g. equation, math. This avoids incorrect vertical space + around equations. + + Optimized `nonindentSpaces`. Makes the benchmark go from 40 to 36 ms. + + Allow latex macro definitions indented 1-3 spaces. + Previously they only worked if nonindented. + + Improved parsing of indented raw HTML blocks (#1841). + Previously we inadvertently interpreted indented HTML as + code blocks. This was a regression. We now seek to determine the + indentation level of the contents of an HTML block, and (optionally) + skip that much indentation. As a side effect, indentation may be + stripped off of raw HTML blocks, if `markdown_in_html_blocks` is + used. This is better than having things interpreted as indented + code blocks. + + Fixed smart quotes after emphasis (#2228). E.g. in `*foo*'s 'foo'`. + + Warn for notes defined but not used (#1718). + + Use `anyLineNewline` (Alexander Krotov). + + Interpret YAML metadata as Inlines when possible (#3755). If + the metadata field is all on one line, we try to interpret it as + Inlines, and only try parsing as Blocks if that fails. If it + extends over one line (including possibly the `|` or `>` character + signaling an indented block), then we parse as Blocks. This was + motivated by some German users finding that `date: '22. Juin 2017'` + got parsed as an ordered list. + + Fixed spurious parsing as citation as reference def (#3840). + We now disallow reference keys starting with `@` if the + `citations` extension is enabled. + + Parse `-@roe` as suppress-author citation (pandoc-citeproc#237). + Previously only `[-@roe]` (with brackets) was recognized as + suppress-author, and `-@roe` was treated the same as `@roe`. + + Fixed parsing of fenced code after list when there is no intervening + blank line (#3733). + + Allow raw latex commands starting with `\start` (#3558). Previously + these weren't allowed because they were interpreted as starting + ConTeXt environments, even without a corresponding `\stop`... + + Added `inlines`, `inlines1`. + + Require nonempty alt text for `implicit_figures` (#2844). + A figure with an empty caption doesn't make sense. + + Removed texmath macro material; now all this is handled + in the LaTeX reader functions. + + Fixed bug with indented code following raw LaTeX (#3947). + + * LaTeX reader: + + + Rewrote LaTeX reader with proper tokenization (#1390, + #2118, #3236, #3779, #934, #982). This rewrite is primarily + motivated by the need to get macros working properly. A side benefit + is that the reader is significantly faster. We now tokenize the + input text, then parse the token stream. Macros modify the token + stream, so they should now be effective in any context, including + math. Thus, we no longer need the clunky macro processing + capacities of texmath. + + Parse `\,` to `\8198` (six-per-em space) (Henri Werth). + + Allow `\newcommand\foo{blah}` without braces. + + Support `\lstinputlisting` (#2116). + + Issue warnings when skipping unknown latex commands (#3392). + + Include contents of `\parbox`. + + Allow `\hspace` and `\vspace` to count as raw block or inline. + Previously we would refuse to parse anything as raw inline if + it was in the `blockCommands` list. Now we allow exceptions + if they're listed under ignoreInlines in inlineCommands. + This should make it easier e.g. to include an `\hspace` + between two side-by-side raw LaTeX tables. + + Don't drop contents of `\hypertarget`. + + Handle spaces before `\cite` arguments. + + Allow newpage, clearpage, pagebreak in inline contexts as well as + block contexts (#3494). + + Treat `{{xxx}}` the same as `{xxx}` (#2115). + + Use `pMacroDefinition` in macro (for more direct parsing). + Note that this means that `macro` will now parse one + macro at a time, rather than parsing a whole group together. + + Fixed failures on `\ref{}`, `\label{}` with `+raw_tex`. Now these + commands are parsed as raw if `+raw_tex`; otherwise, their argument + is parsed as a bracketed string. + + Don't crash on empty `enumerate` environment (#3707). + + Handle escaped `&` inside table cell (#3708). + + Handle block structure inside table cells (#3709). `minipage` is no + longer required. + + Handle some width specifiers on table columns (#3709). Currently + we only handle the form `0.9\linewidth`. Anything else would have + to be converted to a percentage, using some kind arbitrary assumptions + about line widths. + + Make sure `\write18` is parsed as raw LaTeX. The change is in the + LaTeX reader's treatment of raw commands, but it also affects the + Markdown reader. + + Fixed regression with starred environment names (#3803). + + Handle optional args in raw `\titleformat` (#3804). + + Improved heuristic for raw block/inline. An unknown command at the + beginning of the line that could be either block or inline is + treated as block if we have a sequence of block commands followed by + a newline or a `\startXXX` command (which might start a raw ConTeXt + environment). + + Don't remove macro definitions from the output, even if + `Ext_latex_macros` is set, so that macros will be applied. + Since they're only applied to math in Markdown, removing the macros + can have bad effects. Even for math macros, keeping them should be + harmless. + + Removed `macro`. It is no longer necessary, since the + `rawLaTeXBlock` parser will parse macro definitions. This also avoids + the need for a separate `latexMacro` parser in the Markdown reader. + + Use `label` instead of `data-label` for label in caption (#3639). + + Fixed space after `\figurename` etc. + + Resolve references to section numbers. + + Fix `\let\a=0` case, with single character token. + + Allow `@` as a letter in control sequences. `@` is commonly used + in macros using `\makeatletter`. Ideally we'd make the tokenizer + sensitive to `\makeatletter` and `\makeatother`, but until then this + seems a good change. + + Track header numbers and correlate with labels. + + Allow `]` inside group in option brackets (#3857). + + lstinline with braces can be used (verb cannot be used with braces) + (Marc Schreiber, #3535). + + Fix keyval function: pandoc did not parse options in braces correctly + (Marc Schreiber, #3642). + + When parsing raw LaTeX commands, include trailing space (#1773). + Otherwise things like `\noindent foo` break and turn into + `\noindentfoo`. Affects `-f latex+raw_tex` and `-f markdown` (and other + formats that allow `raw_tex`). + + Don't treat "..." as Quoted (#3958). This caused quotes to be omitted in + `\texttt` contexts. + + Add tests for existing `\includegraphics` behaviour (Ben Firshman). + + Allow space before `=` in bracketd options (Ben Firshman). + + Be more forgiving in parsing command options. This was needed, for + example, to make some minted options work. + + Strip off quotes in `\include` filenames. + + * Added `Text.Pandoc.CSV`, simple (unexported) CSV parser. + + * `Text.Pandoc.PDF`: + + + Got `--resource-path` working with PDF output (#852). + + Fetch images when generating PDF via context (#3380). + To do this, we create the temp directory as a subdirectory + of the working directory. Since context mk IV by default looks + for images in the parent directory, this works. + + Use `report` instead of `warn`, make it sensitive to verbosity settings. + + Use `fillMediaBag` and `extractMedia` to extract media to temp dir. + This reduces code duplication. + + `html2pdf`: use stdin instead of intermediate HTML file + + Removed useless `TEXINPUTS` stuff for `context2pdf`. mkiv context + doesn't use `TEXINPUTS`. + + * `Text.Pandoc.Pretty`: + + + Simplified definition of `realLength`. + + Don't error for blocks of size < 1. Instead, resize to 1 (see #1785). + + * `Text.Pandoc.MIME`: + + + Use `application/javascript` (not `application/x-javascript`). + + Added `emf` to mimeTypes with type `application/x-msmetafile` (#1713). + + * `Text.Pandoc.ImageSize`: + + + Improve SVG image size code (Marc Schreiber, #3580). + + Make `imageSize` recognize basic SVG dimensions (Mauro Bieg, #3462). + + * Use `Control.Monad.State.Strict` throughout. This gives 20-30% speedup + and reduction of memory usage in most of the writers. + + * Use `foldrWithKey` instead of deprecated `foldWithKey`. + + * `Text.Pandoc.SelfContained`: + + + Fixed problem with embedded fonts (#3629). + + Refactored getData from `getDataURI` in `SelfContained`. + + Don't use data URIs for script or style (#3423). Instead, just use + script or style tags with the content inside. The old method with + data URIs prevents certain optimizations outside pandoc. Exception: + data URIs are still used when a script contains `</script>` or a + style contains `</`. + + SelfContained: Handle URL inside material retrieved from a URL + (#3629). This can happen e.g. with an @import of a google web font. + (What is imported is some CSS which contains an url reference + to the font itself.) Also, allow unescaped pipe (|) in URL. + + Load resources from `data-src` (needed for lazy loading in + reveal.js slide shows). + + Handle `data-background-image` attribute on section (#3979). + + * `Text.Pandoc.Parsing`: + + + Added `indentWith` (Alexander Krotov, #3687). + + Added `stateCitations` to `ParserState`. + + Removed `stateChapters` from `ParserState`. + + In `ParserState`, make `stateNotes'` a Map, add `stateNoteRefs`. + + Added `gobbleSpaces` and `gobbleAtMostSpaces`. + + Adjusted type of `insertIncludedFile` so it can be used with token + parser. + + Replace old texmath macro stuff from Parsing. Use Macro from + Text.Pandoc.Readers.LaTeX.Types instead. + + Export `insertIncludedFile`. + + Added `HasLogMessages`, `logMessage`, `reportLogMessages` (#3447). + + Replace partial with total function (Albert Krewinkel). + + Introduce `HasIncludeFiles` type class (Albert Krewinkel). The + `insertIncludeFile` function is generalized to work with all parser + states which are instances of that class. + + Add `insertIncludedFilesF` which returns F blocks (Albert Krewinkel). + The `insertIncludeFiles` function was generalized and renamed + to `insertIncludedFiles'`; the specialized versions are based on that. + + `many1Till`: Check for the end condition before parsing (Herwig + Stuetz). By not checking for the end condition before the first + parse, the parser was applied too often, consuming too much of the + input. This only affects `many1Till p end` where `p` matches on a + prefix of `end`. + + Provide `parseFromString` (#3690). This is a version of + `parseFromString` specialied to ParserState, which resets + `stateLastStrPos` at the end. This is almost always what we want. + This fixes a bug where `_hi_` wasn't treated as emphasis in the + following, because pandoc got confused about the position of the + last word: `- [o] _hi_`. + + Added `takeP`, `takeWhileP` for efficient parsing of `[Char]`. + + Fix `blanklines` documentation (Alexander Krotov, #3843). + + Give less misleading line information with `parseWithString`. + Previously positions would be reported past the end of the chunk. + We now reset the source position within the chunk and report + positions "in chunk." + + Add `anyLineNewline` (Alexander Krotov). + + Provide shared F monad functions for Markdown and Org readers + (Albert Krewinkel). The `F` monads used for delayed evaluation + of certain values in the Markdown and Org readers are based on a + shared data type capturing the common pattern of both `F` types. + + Add `returnF` (Alexander Krotov). + + Avoid parsing `Notes:**` as a bare URI (#3570). This avoids parsing + bare URIs that start with a scheme + colon + `*`, `_`, or `]`. + + Added `readerAbbreviations` to `ParserState`. Markdown reader + now consults this to determine what is an abbreviation. + + Combine grid table parsers (Albert Krewinkel, #3638). The grid table + parsers for markdown and rst was combined into one single + parser `gridTable`, slightly changing parsing behavior of both + parsers: (1) The markdown parser now compactifies block content + cell-wise: pure text blocks in cells are now treated as paragraphs + only if the cell contains multiple paragraphs, and as plain blocks + otherwise. Before, this was true only for single-column tables. (2) + The rst parser now accepts newlines and multiple blocks in header + cells. + + Generalize tableWith, gridTableWith (Albert Krewinkel). + The parsing functions `tableWith` and `gridTableWith` are generalized + to work with more parsers. The parser state only has to be an + instance of the `HasOptions` class instead of requiring a concrete + type. Block parsers are required to return blocks wrapped into a + monad, as this makes it possible to use parsers returning results + wrapped in `Future`s. + + * `Text.Pandoc.Shared`: + + + Simplify `toRomanNumeral` using guards (Alexander Krotov, #3445) + + `stringify`: handle Quoted better (#3958). Previously we were losing + the quotation marks in Quoted elements. + + * `Text.Pandoc.Writers.Shared`: + + + Export `metaToJSON'`, `addVariablesToJSON` (#3439). + This allows us to add the variables AFTER using the metadata + to generate a YAML header (in the Markdown writer). + + Added `unsmartify` (previously in RST writer). + Undo literal double curly quotes. Previously we left these. + + Generalize type of `metaToJSON` so it can take a Text. Previously a + String was needed as argument; now any ToJSON instance will do. + + Added `gridTable` (previously in Markdown writer). + + `gridTable`: Refactored to use widths in chars. + + `gridTable`: remove unnecessary extra space in cells. + + Fixed `addVariablesToJSON`. It was previously not allowing multiple + values to become lists. + + Pipe tables: impose minimum cell size (see #3526). + + +### Default template changes + + * HTML templates (including EPUB and HTML slide show templates): + + + Make default.html5 polyglot markup conformant (John Luke Bentley, + #3473). Polyglot markup is HTML5 that is also valid XHTML. See + <https://www.w3.org/TR/html-polyglot>. With this change, pandoc's + html5 writer creates HTML that is both valid HTML5 and valid XHTML. + + Regularized CSS in html/epub/html slide templates (#3485). + All templates now include `code{white-space: pre-wrap}` + and CSS for `q` if `--html-q-tags` is used. Previously some templates + had `pre` and others `pre-wrap`; the `q` styles were only sometimes + included. + + CSS for `.smallcaps`, (Mauro Bieg, #1592) + + `default.revealjs`: make `history` default to true. + + `default.revealjs`: use lazy loading (#2283). + + `default.revealjs`: add `mathjax` variable and some conditional code + to use the MathJaX plugin. + + `default.slidy` uses `https` instead of `http` (ickc, #3848). + + `default.dzslides`: Load Google Font using HTTPS by default + (Yoan Blanc). + + * DocBook5 template: Use `lang` and `subtitle` variables (Jens Getreu, + #3855). + + * LaTeX/Beamer template: + + + Combine LaTeX/Beamer templates (Andrew Dunning, #3878). + `default.beamer` has been removed; beamer now uses the + `default.latex` template. Beamer-specific parts are conditional + on the `beamer` variable set by the writer. Note that + `pandoc -D beamer` will return this (combined) template. + + Use `xcolor` for `colorlinks` option (Andrew Dunning, #3877). + Beamer loads `xcolor` rather than `color`, and thus the + `dvipsnames` option doesn't take effect. This also provides a wider + range of colour selections with the `svgnames` option. + + Use starred versions of `xcolor` names (Andrew Dunning). + Prevents changes to documents defined using the `dvipsnames` list (e.g. + `Blue` gives a different result with svgnames enabled). + + Load `polyglossia` after header-includes (#3898). It needs to be + loaded as late as possible. + + Use `unicode-math` (Vaclav Haisman). Use `mathspec` with only + XeLaTeX on request. + + Don't load `fontspec` before `unicode-math` (over there). + The `unicode-math` package loads `fontspec` so explicit loading of + `fontspec` before `unicode-math` is not necessary. + + Use `unicode-math` by default in default.latex template. mathspec will + be used in xelatex if the `mathspec` variable is set; otherwise + unicode-math will be used (Václav Haisman). + + Use `dvipsnames` options when `colorlinks` specified (otherwise + we get an error for `maroon`) (Thomas Hodgson). + + Added beamer `titlegraphic` and `logo` variables (Thomas Hodgson). + + Fix typo in fix for notes in tables (#2378, zeeMonkeez). + + Fix `hyperref` options clash (Andrew Dunning, #3847) Avoids an options + clash when loading a package (e.g. `tufte-latex`) that uses + `hyperref` settings different from those in the template. + + Add `natbiboptions` variable (#3768). + + Fix links inside captions in LaTeX output with links-as-notes + (Václav Haisman, #3651). Declare our redefined `\href` robust. + + Load `parskip` before `hyperref` (Václav Haisman, #3654). + + Allow setting Japanese fonts when using LuaLaTeX (Václav Haisman, + #3873). by using the `luatexja-fontspec` and `luatexja-preset` + packages. Use existing `CJKmainfont` and `CJKoptions` template + variables. Add `luatexjafontspecoptions` for `luatexja-fontspec` + and `luatexjapresetoptions` for `luatexja-preset`. + + Added `aspectratio` variable to beamer template (Václav Haisman, + #3723). + + Modified template.latex to fix XeLaTex being used with tables + (lwolfsonkin, #3661). Reordered `lang` variable handling to + immediately before `bidi`. + + * ConTeXt template: Improved font handling: `simplefonts` is now + obsolete in ConTeXt (Pablo Rodríguez). + + +### Documentation improvements + + * MANUAL.txt: + + + Add URL for Prince HTML > PDF engine (Ian, #3919). + + Document that content above slide-level will be omitted in + slide shows. See #3460, #2265. + + Explain `--webtex` SVG url (Mauro Bieg, #3471) + + Small clarification in YAML metadata section. + + Document that html4 is technically XHTML 1.0 transitional. + + Remove refs to highlighting-kate (#3672). + + Document ibooks specific epub metadata. + + Clarify that mathml is used for ODT math. + + Mention limitations of Literate Haskell Support (#3410, + Joachim Breitner). + + Add documentation of limitations of grid tables (Stephen + McDowell, #3864). + + Clarify that meta-json contains transformed values (Jakob Voß, + #3491) Make clear that template variable `meta-json` does not + contain plain text values or JSON output format but field values + transformed to the selected output format. + + * COPYRIGHT: + + + Clarify that templates are dual-licensed. + + Clarify that pandoc-types is BSD3 licensed. + + List new files not written by jgm (Albert Krewinkel). + + Update dates in copyright notices (Albert Krewinkel). This follows + the suggestions given by the FSF for GPL licensed software. + <https://www.gnu.org/prep/maintain/html_node/Copyright-Notices.html> + + * INSTALL.md: + + + Improved instructions for tests with patterns. + + Put RPM-based distros on separate point (Mauro Bieg, #3449) + + * CONTRIBUTING.md: + + + Fixed typos (Wandmalfarbe, #3479). + + Add "ask on pandoc-discuss" (Mauro Bieg). + + * Add lua filter documentation in `doc/lua-filters.md`. Note that the + end of this document is autogenerated from `data/pandoc.lua` + using `make doc/lua-filters.md`, which uses `tools/ldoc.ltp` + (Albert Krewinkel). + + * Add `doc/filters.md`. This is the old scripting tutorial from + the website. + + * Add `doc/using-the-pandoc-api.md` (#3289). This gives an introduction + to using pandoc as a Haskell library. + + +### Build infrastructure improvements + + * Removed `data/templates` submodule. Templates are now a subtree + in `data/templates`. This removes the need to do `git submodule + update`. + + * Renamed `tests` -> `test`. + + * Remove `https` flag. Always build with HTTPS support. + + * Use `file-embed` instead of `hsb2hs` to embed data files when + `embed_data_files` flag is set. `file-embed` gives us better dependency + tracking: if a data file changes, ghc/stack/cabal know to recompile + the Data module. This also removes `hsb2hs` as a build dependency. + + * Add `custom-setup` stanza to pandoc, lowercase field names. + + * Add `static` Cabal flag. + + * Name change OSX -> MacOS. Add a -MacOS suffix to mac package rather + than -OSX. Changed local names from osx to macos. + + * make_macos_package.sh - Use strip to reduce executable size. + + * Revised binary linux package. Now a completely static executable + is created, using Docker and alpine. We create both a deb and a + tarball. The old `deb` directory has been replaced with a `linux` + directory. Running `make` in the `linux` directory should + perform the build, putting the binary packages in `artifacts/`. + + * `linux/control.in`: add `Replaces:`, so existing pandoc-citeproc and + pandoc-data packages will be uninstalled; this package provides + both (#3822). Add latex packages as 'suggested', update + description. + + * Remove cpphs build requirement -- it is no longer needed. + + * Replaced `{deb,macos,windows}/stack.yaml` with `stack.pkg.yaml`. + + * Name change OSX -> macOS (ickc, #3869). + + * Fix casing of Linux, UNIX, and Windows (ickc). + + * `.travis.yml`: create a source dist and do cabal build and test there. + That way we catch errors due to files missing from the data + section of pandoc.cabal. + + * Makefile: + + + Split `make haddock` from `make full`. + + Add BRANCH variable for winpkg. + + Add `lint` target. + + Improve `make full`. Disable optimizations. + Build everything, inc. trypandoc and benchmarks. Use parallel build. + + Allow `make test` to take `TESTARGS`. + + * Added new command tests (`Tests.Command`), using small text files + in `test/command/`. Any files added in this directory will be treated + as shell tests (see smart.md for an example). This makes it very easy + to add regression tests etc. + + * Test fixes so we can find data files. In old tests & command tests, + we now set the environment variable `pandoc_datadir`. In lua tests, + we set the datadir explicitly. + + * Refactored `compareOutput` in docx writer test. + + * Consolidated some common functions in `Tests.Helper`. + + * Small change to unbalanced bracket test to speed up test suite. + + * Speed up Native writer quickcheck tests. + + * Use tasty for tests rather than test-framework. + + * Add simple Emacs mode to help with Pandoc templates editing. + (Václav Haisman, #3889). `tools/pandoc-template-mode.el` + + +## pandoc 1.19.2.4 (2017-09-10) + + * Add dependencies on texmath and skylighting to the executable. + This is needed for dependency version numbers to be available, + with Cabal > 2. + +## pandoc 1.19.2.3 (2017-09-09) + + * Add CPP to Setup.hs so it works with Cabal >= 2 and < 2. + +## pandoc 1.19.2.2 (2017-09-08) + + * Fix build with GHC 8.2.1 (#3876, Peter Simons). Setup.hs does not + compile with Cabal 2.x, so we require an earlier version via + setup-depends. The following packages need newer versions with + GHC 8.2.1 and had their constraints relaxed accordingly: + executable-path, process, syb, and time. + +## pandoc 1.19.2.1 (2017-01-31) + + * Require skylighting >= 0.1.1.4. + * Adjust test output for skylighting version. + * Relax upper bounds on blaze-html and blaze-markup. + +## pandoc 1.19.2 (2017-01-29) + + * Use skylighting library instead of highlighting-kate for syntax + highlighting. Skylighting is faster and more accurate (#3363). + Later we'll be able to add features like warning messages, dynamic + loading of xml syntax definitions, and dynamic loading of themes. + + * Added a new highlight style, `breezeDark`. + + * Text.Pandoc.Highlighting: Update list of `listings` languages (#3374). + This allows more languages to be used when using the `--listings` + option. + + * OpenDocument writer: + + + Small refactoring. Removed separate 'parent' parameter in paraStyle. + + Don't profilerate text styles unnecessarily (#3371). + This change makes the writer create only as many temporary + text styles as are absolutely necessary. It also consolidates + adjacent nodes with the same style. + + * Org reader (Albert Krewinkel): + + + Allow short hand for single-line raw blocks (Albert Krewinkel, + #3366). Single-line raw blocks can be given via `#+FORMAT: raw line`, + where `FORMAT` must be one of `latex`, `beamer`, `html`, or `texinfo`. + + Accept org-ref citations followed by commas (Albert Krewinkel). + Bugfix for an issue which, whenever the citation was immediately + followed by a comma, prevented correct parsing of org-ref citations. + + Ensure emphasis markup can be nested. Nested emphasis markup (e.g. + `/*strong and emphasized*/`) was interpreted incorrectly in that the + inner markup was not recognized. + + Remove pipe char irking the haddock coverage tool (Albert Krewinkel). + + * Docx reader: Empty header should be list of lists (Jesse Rosenthal). + In the past, the docx reader wrote an empty header as an empty list. It + should have the same width as a row (and be filled with empty cells). + + * MediaWiki reader: + + + Improved handling of display math (#3362). Sometimes display math is + indented with more than one colon. Previously we handled these cases + badly, generating definition lists and missing the math. + + Fix quotation mark parsing (#3336, tgkokk). Change MediaWiki reader's + behavior when the smart option is parsed to match other readers' + behavior. + + * Markdown reader: + + + Fixed `-f markdown_github-hard_line_breaks+escaped_line_breaks` + (#3341). Previously this did not properly enable escaped line breaks. + + Disallow space between inline code and attributes (#3326, #3323, + Mauro Bieg). + + * DocBook5 writer: make id attribute xml:id, fixes #3329 (#3330, Mauro Bieg). + + * Added some test cases for ODT reader (#3306, #3308, Hubert Plociniczak). + + * LaTeX writer: allow tables with empty cells to count as "plain." + This addresses a problem of too-wide tables when empty cells + are used. Thanks to Joost Kremers for reporting the issue. + + * Org writer: prefix footnote numbers with `fn:` (Albert Krewinkel). + Unprefixed numbers where used by older org-mode versions, but are no + longer supported. + + * HTML writer: don't process pars with empty RawInline, (#1040, #3327, + Mauro Bieg). + + * Markdown writer: Fix display math with `--webtex` (#3298). + + * Fix sample.lua so it properly handles raw blocks/inlines (#3358, + bumper314). + + * Templates: + + + default.latex: Moved geometry after hyperref (Václav Haisman). + Otherwise PDF sizes can be wrong in some circumstances. + + Copied a few changes from default.latex to default.beamer + (Wandmalfarbe). + + default.latex, default.beamer: Changed position of `\VerbatimNotes` + and `fancyvrb`. This fixes hyperlinks on footnotes in documents + that contain verbatim in notes (#3361). (Note: the beamer template + was updated to match the LaTeX template, but at this point verbatim + in notes seems not to work in beamer.) + + default.latex: Allow passing `microtypeoptions` to microtype + (Václav Haisman). + + default.latex: Add hyphen option to url package. + + default.docbook5: Fix namespace declarations (Mauro Bieg). + + * Moved `make_osx_package.sh` to `osx/` directory. + + * Travis continuous integration: + + + Fix false positives with dist build. + + Speed improvements (Kolen Cheung, #3304, #3357). + + * MANUAL.txt: + + + Clarify that blank space is needed around footnotes (#3352). + + Fixed typo (#3351, Alexey Rogechev). + + Note that `--wrap=auto` does not work in HTML output. + + Default `--columns` width is 72, not 80. + + Fixed broken links (#3316, Kolen Cheung). + + Document usage of `@*` in nocite section (#3333, John Muccigrosso). + + * INSTALL.md: + + + Indent code so it's properly formatted (#3335, Bheesham Persaud). + + Added instructions for extracting binary from OSX, Windows packages. + + * CONTRIBUTING.md: Describe labels currently used in issue tracker + (Albert Krewinkel). The labels have changed over time, the list of + labels is updated to reflect the current set of labels used in the + issue tracker. + + * Rearrange and extend badges in README (Albert Krewinkel, #3354) + + * Bumped version bounds for dependencies. + + +## pandoc 1.19.1 (2016-12-10) + + * Set `PANDOC_VERSION` environment variable for filters (#2640). + This allows filters to check the pandoc version that produced + the JSON they are receiving. + + * Docx reader: Ensure one-row tables don't have header (#3285, + Jesse Rosenthal). Tables in MS Word are set by default to have + special first-row formatting, which pandoc uses to determine whether + or not they have a header. This means that one-row tables will, by + default, have only a header -- which we imagine is not what people + want. This change ensures that a one-row table is not understood to + be a header only. Note that this means that it is impossible to + produce a header-only table from docx, even though it is legal + pandoc. But we believe that in nearly all cases, it will be an + accidental (and unwelcome) result + + * HTML reader: + + + Fixed some bad regressions in HTML table parser (#3280). + This regression leads to the introduction of empty rows + in some circumstances. + + Understand `style=width:` as well as `width` in `col` (#3286). + + * RST reader: + + + Print warnings when keys, substitition, notes not found. + Previously the parsers failed and we got raw text. Now we get a + link with an empty URL, or empty inlines in the case of a note or + substitution. + + + Fix hyperlink aliases (#3283). + + * Man writer: Ensure that periods are escaped at beginning of line + (#3270). + + * LaTeX writer: Fix unnumbered headers when used with `--top-level` + (#3272, Albert Krewinkel). Fix interaction of top-level + divisions `part` or `chapter` with unnumbered headers when + emitting LaTeX. Headers are ensured to be written using + stared commands (like `\subsection*{}`). + + * LaTeX template: use comma not semicolon to separate keywords for + `pdfkeywords`. Thanks to Wandmalfarbe. + + * Markdown writer: Fixed incorrect word wrapping (#3277). + Previously pandoc would sometimes wrap lines too early due to + this bug. + + * Text.Pandoc.Pretty: Added `afterBreak` [API change]. This makes it + possible to insert escape codes for content that needs escaping at the + beginning of a line. + + * Removed old MathMLInHTML.js from 2004, which should no longer + be needed for MathML with modern browsers. + + * Fixed tests with dynamic linking (#2709). + + * Makefile: Use stack instead of cabal for targets. This is just + a convenience for developers. + + * Fixed bash completion of filenames with space (#2749). + + * MANUAL: improved documentation on how to create a custom + `reference.docx`. + + * Fix minor spelling typos in the manual (#3273, Anthony Geoghegan) + +## pandoc 1.19 (2016-12-01) + + * Changed resolution of filter paths. + + + We now first treat the argument of `--filter` as a full (absolute + or relative) path, looking for a program there. If it's found, we + run it. + + If not, and if it is a simple program name or a relative path, we + try resolving it relative to `$DATADIR/filters`. + + If this fails, then we treat it as a program name and look in the + user's PATH. + + Removed a hardcoded '/' that may have caused problems with + Windows paths. + + Previously if you did `--filter foo` and you had `foo` in your path and + also an executable `foo` in your working directory, the one in the path + would be used. Now the one in the working directory is used. + + In addition, when you do `--filter foo/bar.hs`, pandoc will now find a + filter `$DATADIR/filters/foo/bar.hs` -- assuming there isn't a + `foo/bar.hs` relative to the working directory. + + * Allow `file://` URIs as arguments (#3196). Also improved default reader + format detection. Previously with a URI ending in .md or .markdown, + pandoc would assume HTML input. Now it treats these as markdown. + + * Allow to overwrite top-level division type heuristics (#3258, + Albert Krewinkel). Pandoc uses heuristics to determine the most + reasonable top-level division type when emitting LaTeX or + Docbook markup. It is now possible to overwrite this implicitly set + top-level division via the `top-level-division` command line parameter. + + * Text.Pandoc.Options \[API changes\]: + + + Removed `writerStandalone` field in `WriterOptions`, made + `writerTemplate` a `Maybe` value. Previously setting + `writerStandalone = True` did nothing unless a template was provided + in writerTemplate. Now a fragment will be generated if + `writerTemplate` is `Nothing`; otherwise, the specified template + will be used and standalone output generated. + + `Division` has been renamed `TopLevelDivision` (#3197). The + `Section`, `Chapter`, and `Part` constructors were renamed to + `TopLevelSection`, `TopLevelChapter`, and + `TopLevelPart`, respectively. An additional `TopLevelDefault` + constructor was added, which is now also the new default value of + the `writerTopLevelDivision` field in `WriterOptions`. + + * Improved error if they give wrong arg to `--top-level-division`. + + * Use new module from texmath to lookup MS font codepoints in Docx reader. + Removed unexported module Text.Pandoc.Readers.Docx.Fonts. Its code now + lives in texmath (0.9). + + * DocBook reader: Fixed xref lookup (#3243). It previously only worked + when the qnames lacked the docbook namespace URI. + + * HTML reader: + + + Improved table parsing (#3027). We now check explicitly for non-1 + rowspan or colspan attributes, and fail when we encounter them. + Previously we checked that each row had the same number of cells, + but that could be true even with rowspans/colspans. And there are + cases where it isn't true in tables that we can handle fine -- e.g. + when a tr element is empty. So now we just pad rows with empty cells + when needed. + + Treat `<math>` as MathML by default unless something else is + explicitly specified in xmlns. Provided it parses as MathML, + of course. Also fixed default which should be to inline math if no + display attribute is used. + + Only treat "a" element as link if it has href (#3226). Otherwise + treat as span. + + * Docx reader (Jesse Rosenthal): + + + Add a placeholder value for CHART. We wrap `[CHART]` in a + `<span class="chart">`. Note that it maps to inlines because, in + docx, anything in a drawing tag can be part of a larger paragraph. + + Be more specific in parsing images We not only want `w:drawing`, + because that could also include charts. Now we specify + `w:drawing/pic:pic`. This shouldn't change behavior at all, but it's + a first step toward allowing other sorts of drawing data as well. + + Abstract out function to avoid code repetition. + + Update tests for img title and alt (#3204). + + Handle Alt text and titles in images. We use the "description" field + as alt text and the "title" field as title. These can be accessed + through the "Format Picture" dialog in Word. + + Docx reader utils: handle empty namespace in `elemName`. Previously, + if given an empty namespace `(elemName ns "" "foo")` `elemName` + would output a QName with a `Just ""` namespace. This is never what + we want. Now we output a `Nothing`. If someone *does* want a + `Just ""` in the namespace, they can enter the QName + value explicitly. + + * ODT reader/writer: + + + Inline code when text has a special style (Hubert Plociniczak). When + a piece of text has a text `Source_Text` then we assume that this is + a piece of the document that represents a code that needs to + be inlined. Adapted the writer to also reflect that change. + Previously it was just writing a 'preformatted' text using a + non-distinguishable font style. Code blocks are still not recognized + by the ODT reader. That's a separate issue. + + Infer table's caption from the paragraph (#3224, + Hubert Plociniczak). ODT's reader always put empty captions for the + parsed tables. This commit + + 1. checks paragraphs that follow the table definition + 2. treats specially a paragraph with a style named 'Table' + 3. does some postprocessing of the paragraphs that combines tables + followed immediately by captions + + The ODT writer used the `TableCaption` style for the caption + paragraph. This commit follows the OpenOffice approach which allows + for appending captions to table but uses a built-in style named + `Table` instead of `TableCaption`. Users of a custom `reference.odt` + should change the style's name from `TableCaption` to `Table`. + + * ODT reader: Infer tables' header props from rows (#3199, + Hubert Plociniczak). ODT reader simply provided an empty header list + which meant that the contents of the whole table, even if not empty, was + simply ignored. While we still do not infer headers we at least have to + provide default properties of columns. + + * Markdown reader: + + + Allow reference link labels starting with `@...` if `citations` + extension disabled (#3209). Example: in + + \[link text\]\[@a\] + + `link text` isn't hyperlinked because `[@a]` is parsed as + a citation. Previously this happened whether or not the `citations` + extension was enabled. Now it happens only if the `citations` + extension is enabled. + + Allow alignments to be specified in Markdown grid tables. For + example, + + +-------+---------------+--------------------+ + | Right | Left | Centered | + +=========:+:=================+:=============:+ + | Bananas | $1.34 | built-in wrapper | + +-------+---------------+--------------------+ + + + Allow Small Caps elements to be created using bracketed spans (as + they already can be using HTML-syntax spans) (#3191, Kolen Cheung). + + * LaTeX reader: + + + Don't treat `\vspace` and `\hspace` as block commands (#3256). + Fixed an error which came up, for example, with `\vspace` inside + a caption. (Captions expect inlines.) + + Improved table handling. We can now parse all of the tables emitted + by pandoc in our tests. The only thing we don't get yet are + alignments and column widths in more complex tables. See #2669. + + Limited support for minipage. + + Allow for `[]`s inside LaTeX optional args. Fixes cases like: + + Handle BVerbatim from fancyvrb (#3203). + + Handle hungarumlaut (#3201). + + Allow beamer-style `<...>` options in raw LaTeX (also in Markdown) + (#3184). This allows use of things like `\only<2,3>{my content}` in + Markdown that is going to be converted to beamer. + + * Use pre-wrap for code in dzslides template (Nicolas Porcel). Otherwise + overly long code will appear on every slide. + + * Org reader (Albert Krewinkel): + + + Respect column width settings (#3246). Table column properties can + optionally specify a column's width with which it is displayed in + the buffer. Some exporters, notably the ODT exporter in org-mode + v9.0, use these values to calculate relative column widths. The org + reader now implements the same behavior. Note that the org-mode + LaTeX and HTML exporters in Emacs don't support this feature yet, + which should be kept in mind by users who use the column + widths parameters. + + Allow HTML attribs on non-figure images (#3222). Images which are + the only element in a paragraph can still be given HTML attributes, + even if the image does not have a caption and is hence not a figure. + The following will add set the `width` attribute of the image to + `50%`: + + +ATTR\_HTML: :width 50% + ======================= + + \[\[file:image.jpg\]\] + + + Support `ATTR_HTML` for special blocks (#3182). Special + blocks (i.e. blocks with unrecognized names) can be prefixed with an + `ATTR_HTML` block attribute. The attributes defined in that + meta-directive are added to the `Div` which is used to represent the + special block. + + Support the `todo` export option. The `todo` export option allows to + toggle the inclusion of TODO keywords in the output. Setting this to + `nil` causes TODO keywords to be dropped from headlines. The default + is to include the keywords. + + Add support for todo-markers. Headlines can have optional + todo-markers which can be controlled via the `#+TODO`, `#+SEQ_TODO`, + or `#+TYP_TODO` meta directive. Multiple such directives can be + given, each adding a new set of recognized todo-markers. If no + custom todo-markers are defined, the default `TODO` and `DONE` + markers are used. Todo-markers are conceptually separate from + headline text and are hence excluded when autogenerating + headline IDs. The markers are rendered as spans and labelled with + two classes: One class is the markers name, the other signals the + todo-state of the marker (either `todo` or `done`). + + * LaTeX writer: + + + Use `\autocites*` when "suppress-author" citation used. + + Ensure that simple tables have simple cells (#2666). If cells + contain more than a single Plain or Para, then we need to set + nonzero widths and put contents into minipages. + + Remove invalid inlines in sections (#3218, Hubert Plociniczak). + + * Markdown writer: + + + Fix calculation of column widths for aligned multiline tables + (#1911, Björn Peemöller). This also fixes excessive CPU and memory + usage for tables when `--columns` is set in such a way that cells + must be very tiny. Now cells are guaranteed to be big enough so that + single words don't need to line break, even if this pushes the line + length above the column width. + + Use bracketed form for native spans when `bracketed_spans` + enabled (#3229). + + Fixed inconsistent spacing issue (#3232). Previously a tight bullet + sublist got rendered with a blank line after, while a tight ordered + sublist did not. Now we don't get the blank line in either case. + + Fix escaping of spaces in super/subscript (#3225). Previously two + backslashes were inserted, which gave a literal backslash. + + Adjust widths in Markdown grid tables so that they match + on round-trip. + + * Docx writer: + + + Give full detail when there are errors converting tex math. + + Handle title text in images (Jesse Rosenthal). We already handled + alt text. This just puts the image "title" into the docx + "title" attr. + + Fixed XML markup for empty cells (#3238). Previously the Compact + style wasn't being applied properly to empty cells. + + * HTML writer: + + + Updated `renderHtml` import from blaze-html. + + * Text.Pandoc.Pretty: + + + Fixed some bugs that caused blank lines in tables (#3251). The bugs + caused spurious blank lines in grid tables when we had things like + `blankline $$ blankline`. + + Add exported function `minOffet` \[API change\] (Björn Peemöller). + + Added error message for illegal call to `block` (Björn Peemöller). + + * Text.Pandoc.Shared: + + + Put `warn` in MonadIO. + + `fetchItem`: Better handling of protocol-relative URL (#2635). If + URL starts with `//` and there is no "base URL" (as there would be + if a URL were used on the command line), then default to http:. + + * Export Text.Pandoc.getDefaultExtensions \[API change\] (#3178). + + * In --version, trap error in `getAppUserDataDirectory` (#3241). This + fixes a crash with `pandoc --version` on unusual systems with no real + user (e.g. SQL Server 2016). + + * Added weigh-pandoc for memory usage diagnostics (#3169). + + * Use correct mime types for woff and woff2 (#3228). + + * Remove make\_travis\_yml.hs (#3235, Kolen Cheung). + + * changelog: Moved an item that was misplaced in the 1.17.2 section to the + 1.18 section where it belongs. + + * CONTRIBUTING.md: minor change in wording and punctuation (#3252, + Kolen Cheung). + + * Further revisions to manual for `--version` changes (#3244). + + + +## pandoc 1.18 (2016-10-26) + + * Added `--list-input-formats`, `--list-output-formats`, + `--list-extensions`, `--list-highlight-languages`, and + `--list-highlight-styles` (#3173). Removed list of highlighting + languages from `--version` output. Removed list of input and output + formats from default `--help` output. + + * Added `--reference-location=block|section|document` option + (Jesse Rosenthal). This determines whether Markdown link references + and footnotes are placed at the end of the document, the end of the + section, or the end of the top-level block. + + * Added `--top-level-division=section|chapter|part` (Albert Krewinkel). + This determines what a level-1 header corresponds to in LaTeX, + ConTeXt, DocBook, and TEI output. The default is `section`. + The `--chapters` option has been deprecated in favor of + `--top-level-division=chapter`. + + * Added `LineBlock` constructor for `Block` (Albert Krewinkel). This + is now used in parsing RST and Markdown line blocks, DocBook + `linegroup`/`line` combinations, and Org-mode `VERSE` blocks. + Previously `Para` blocks with hard linebreaks were used. `LineBlock`s + are handled specially in the following output formats: AsciiDoc + (as `[verse]` blocks), ConTeXt (`\startlines`/`\endlines`), + HTML (`div` with a style), Markdown (line blocks if `line_blocks` + is enabled), Org-mode (`VERSE` blocks), RST (line blocks). In + other output formats, a paragraph with hard linebreaks is emitted. + + * Allow binary formats to be written to stdout (but not to tty) (#2677). + Only works on posix, since we use the unix library to check whether + output is to tty. On Windows, pandoc works as before and always requires + an output file parameter for binary formats. + + * Changed JSON output format (Jesse Rosenthal). Previously we used + generically generated JSON, but this was subject to change depending + on the version of aeson pandoc was compiled with. To ensure stability, + we switched to using manually written ToJSON and FromJSON + instances, and encoding the API version. **Note:** pandoc filter + libraries will need to be revised to handle the format change. + Here is a summary of the essential changes: + + + The toplevel JSON format is now `{"pandoc-api-version" : + [MAJ, MIN, REV], "meta" : META, "blocks": BLOCKS}` + instead of `[{"unMeta": META}, [BLOCKS]]`. + Decoding fails if the major and minor version numbers don't + match. + + Leaf nodes no longer have an empty array for their "c" value. + Thus, for example, a `Space` is encoded as `{"t":"Space"}` + rather than `{"t":"Space","c":[]}` as before. + + * Removed `tests/Tests/Arbitrary.hs` and added a `Text.Pandoc.Arbitrary` + module to pandoc-types (Jesse Rosenthal). This makes it easier + to use QuickCheck with pandoc types outside of pandoc itself. + + * Add `bracketed_spans` Markdown extension, enabled by default + in pandoc `markdown`. This allows you to create a native span + using this syntax: `[Here is my span]{#id .class key="val"}`. + + * Added `angle_brackets_escapable` Markdown extension (#2846). + This is needed because github flavored Markdown has a slightly + different set of escapable symbols than original Markdown; + it includes angle brackets. + + * Export `Text.Pandoc.Error` in `Text.Pandoc` [API change]. + + * Print highlighting-kate version in `--version`. + + * `Text.Pandoc.Options`: + + + `Extension` has new constructors `Ext_brackted_spans` and + `Ext_angle_brackets_escapable` [API change]. + + Added `ReferenceLocation` type [API change] (Jesse Rosenthal). + + Added `writerReferenceLocation` field to `WriterOptions` (Jesse + Rosenthal). + + * `--filter`: we now check `$DATADIR/filters` for filters before + looking in the path (#3127, Jesse Rosenthal, thanks to Jakob + Voß for the idea). Filters placed in this directory need not + be executable; if the extension is `.hs`, `.php`, `.pl`, `.js`, + or `.rb`, pandoc will run the right interpreter. + + * For `--webtex`, replace deprecated Google Chart API by CodeCogs as + default (Kolen Cheung). + + * Removed `raw_tex` extension from `markdown_mmd` defaults (Kolen Cheung). + + * Execute .js filters with node (Jakob Voß). + + * Textile reader: + + + Support `bc..` extended code blocks (#3037). Also, remove trailing + newline in code blocks (consistently with Markdown reader). + + Improve table parsing. We now handle cell and row attributes, mostly + by skipping them. However, alignments are now handled properly. + Since in pandoc alignment is per-column, not per-cell, we + try to devine column alignments from cell alignments. + Table captions are also now parsed, and textile indicators + for thead and tfoot no longer cause parse failure. (However, + a row designated as tfoot will just be a regular row in pandoc.) + + Improve definition list parsing. We now allow multiple terms + (which we concatenate with linebreaks). An exponential parsing + bug (#3020) is also fixed. + + Disallow empty URL in explicit link (#3036). + + * RST reader: + + + Use Div instead of BlockQuote for admonitions (#3031). + The Div has class `admonition` and (if relevant) one of the + following: `attention`, `caution`, `danger`, `error`, `hint`, + `important`, `note`, `tip`, `warning`. **Note:** This will change + the rendering of some RST documents! The word ("Warning", "Attention", + etc.) is no longer added; that must be done with CSS or a filter. + + A Div is now used for `sidebar` as well. + + Skip whitespace before note (Jesse Rosenthal, #3163). RST requires a + space before a footnote marker. We discard those spaces so that footnotes + will be adjacent to the text that comes before it. This is in line with + what rst2latex does. + + Allow empty lines when parsing line blocks (Albert Krewinkel). + + * Markdown reader: + + + Allow empty lines when parsing line blocks (Albert Krewinkel). + + Allow attributes on autolinks (#3183, Daniele D'Orazio). + + * LaTeX reader: + + + More robust parsing of unknown environments (#3026). + We no longer fail on things like `^` inside options for tikz. + + Be more forgiving of non-standard characters, e.g. `^` outside of math. + Some custom environments give these a meaning, so we should try not to + fall over when we encounter them. + + Drop duplicate `*` in bibtexKeyChars (Albert Krewinkel) + + * MediaWiki reader: + + + Fix for unquoted attribute values in mediawiki tables (#3053). + Previously an unquoted attribute value in a table row + could cause parsing problems. + + Improved treatment of verbatim constructions (#3055). + Previously these yielded strings of alternating Code and Space + elements; we now incorporate the spaces into the Code. Emphasis + etc. is still possible inside these. + + Properly interpret XML tags in pre environments (#3042). They are meant + to be interpreted as literal text. + + * EPUB reader: don't add root path to data: URIs (#3150). + Thanks to @lep for the bug report and patch. + + * Org reader (Albert Krewinkel): + + + Preserve indentation of verse lines (#3064). Leading spaces in verse + lines are converted to non-breaking spaces, so indentation is preserved. + + Ensure image sources are proper links. Image sources as those in plain + images, image links, or figures, must be proper URIs or relative file + paths to be recognized as images. This restriction is now enforced + for all image sources. This also fixes the reader's usage of uncleaned + image sources, leading to `file:` prefixes not being deleted from + figure images. Thanks to @bsag for noticing this bug. + + Trim verse lines properly (Albert Krewinkel). + + Extract meta parsing code to module. Parsing of meta-data is well + separable from other block parsing tasks. Moving into new module to + get small files and clearly arranged code. + + Read markup only for special meta keys. Most meta-keys should be read + as normal string values, only a few are interpreted as marked-up text. + + Allow multiple, comma-separated authors. Multiple authors can be + specified in the `#+AUTHOR` meta line if they are given as a + comma-separated list. + + Give precedence to later meta lines. The last meta-line of any given + type is the significant line. Previously the value of the first line + was kept, even if more lines of the same type were encountered. + + Read LaTeX_header as header-includes. LaTeX-specific header commands + can be defined in `#+LaTeX_header` lines. They are parsed as + format-specific inlines to ensure that they will only show up in LaTeX + output. + + Set documentclass meta from LaTeX_class. + + Set classoption meta from LaTeX_class_options. + + Read HTML_head as header-includes. HTML-specific head content can be + defined in `#+HTML_head` lines. They are parsed as format-specific + inlines to ensure that they will only show up in HTML output. + + Respect `author` export option. The `author` option controls whether + the author should be included in the final markup. Setting + `#+OPTIONS: author:nil` will drop the author from the final meta-data + output. + + Respect `email` export option. The `email` option controls whether the + email meta-field should be included in the final markup. Setting + `#+OPTIONS: email:nil` will drop the email field from the final + meta-data output. + + Respect `creator` export option. The `creator` option controls whether + the creator meta-field should be included in the final markup. Setting + `#+OPTIONS: creator:nil` will drop the creator field from the final + meta-data output. Org-mode recognizes the special value `comment` for + this field, causing the creator to be included in a comment. This is + difficult to translate to Pandoc internals and is hence interpreted the + same as other truish values (i.e. the meta field is kept if it's + present). + + Respect unnumbered header property (#3095). Sections the `unnumbered` + property should, as the name implies, be excluded from the automatic + numbering of section provided by some output formats. The Pandoc + convention for this is to add an "unnumbered" class to the header. The + reader treats properties as key-value pairs per default, so a special + case is added to translate the above property to a class instead. + + Allow figure with empty caption (Albert Krewinkel, #3161). + A `#+CAPTION` attribute before an image is enough to turn an image into + a figure. This wasn't the case because the `parseFromString` function, + which processes the caption value, would fail on empty values. Adding + a newline character to the caption value fixes this. + + * Docx reader: + + + Use XML convenience functions (Jesse Rosenthal). + The functions `isElem` and `elemName` (defined in Docx/Util.hs) make + the code a lot cleaner than the original XML.Light functions, but they + had been used inconsistently. This puts them in wherever applicable. + + Handle anchor spans with content in headers. Previously, we would only + be able to figure out internal links to a header in a docx if the + anchor span was empty. We change that to read the inlines out of the + first anchor span in a header. + + Let headers use existing id. Previously we always generated an id for + headers (since they wouldn't bring one from Docx). Now we let it use an + existing one if possible. This should allow us to recurs through anchor + spans. + + Use all anchor spans for header ids. Previously we only used the first + anchor span to affect header ids. This allows us to use all the anchor + spans in a header, whether they're nested or not (#3088). + + Test for nested anchor spans in header. This ensures that anchor spans + in header with content (or with other anchor spans inside) will resolve + to links to a header id properly. + + * ODT reader (Hubert Plociniczak) + + + Include list's starting value. Previously the starting value of + the lists' items has been hardcoded to 1. In reality ODT's list + style definition can provide a new starting value in one of its + attributes. + + Infer caption from the text following the image. + Frame can contain other frames with the text boxes. + + Add `fig:` to title for Image with a caption (as expected + by pandoc's writers). + + Basic support for images in ODT documents. + + Don't duplicate text for anchors (#3143). When creating an anchor + element we were adding its representation as well as the original + content, leading to text duplication. + + * DocBook writer: + + + Include an anchor element when a div or span has an id (#3102). + Note that DocBook does not have a class attribute, but at least this + provides an anchor for internal links. + + * LaTeX writer: + + + Don't use * for unnumbered paragraph, subparagraph. The starred + variants don't exist. This helps with part of #3058...it gets rid of + the spurious `*`s. But we still have numbers on the 4th and 5th level + headers. + + Properly escape backticks in verbatim (#3121, Jesse Rosenthal). + Otherwise they can cause unintended ligatures like `` ?` ``. + + Handle NARRAOW NO-BREAK SPACE into LaTeX (Vaclav Zeman) as `\,`. + + Don't include `[htbp]` placement for figures (#3103, Václav Haisman). + This allows figure placement defaults to be changed by the user + in the template. + + * TEI writer: remove heuristic to detect book template (Albert Krewinkel). + TEI doesn't have `<book>` elements but only generic `<divN>` division + elements. Checking the template for a trailing `</book>` is nonsensical. + + * MediaWiki writer: transform filename with underscores in images (#3052). + `foo bar.jpg` becomes `foo_bar.jpg`. This was already done + for internal links, but it also needs to happen for images. + + * ICML writer: replace partial function (!!) in table handling (#3175, + Mauro Bieg). + + * Man writer: allow section numbers that are not a single digit (#3089). + + * AsciiDoc writer: avoid unnecessary use of "unconstrained" emphasis + (#3068). In AsciiDoc, you must use a special form of emphasis + (double `__`) for intraword emphasis. Pandoc was previously using + this more than necessary. + + * EPUB writer: use stringify instead of plain writer for metadata + (#3066). This means that underscores won't be used for emphasis, + or CAPS for bold. The metadata fields will just have unadorned + text. + + * Docx Writer: + + + Implement user-defined styles (Jesse Rosenthal). Divs and Spans + with a `custom-style` key in the attributes will apply the corresponding + key to the contained blocks or inlines. + + Add ReaderT env to the docx writer (Jesse Rosenthal). + + Clean up and streamline RTL behavior (Jesse Rosenthal, #3140). + You can set `dir: rtl` in YAML metadata, or use `-M dir=rtl` + on the command line. For finer-grained control, you can set + the `dir` attribute in Div or Span elements. + + * Org writer (Albert Krewinkel): + + + Remove blank line after figure caption. Org-mode only treats an image + as a figure if it is directly preceded by a caption. + + Ensure blank line after figure. An Org-mode figure should be surrounded + by blank lines. The figure would be recognized regardless, but images + in the following line would unintentionally be treated as figures as + well. + + Ensure link targets are paths or URLs. Org-mode treats links as + document internal searches unless the link target looks like a URL or + file path, either relative or absolute. This change ensures that this + is always the case. + + Translate language identifiers. Pandoc and Org-mode use different + programming language identifiers. An additional translation between + those identifiers is added to avoid unexpected behavior. This fixes a + problem where language specific source code would sometimes be output + as example code. + + Drop space before footnote markers (Albert Krewinkel, #3162). + The writer no longer adds an extra space before footnote markers. + + * Markdown writer: + + + Don't emit HTML for tables unless `raw_html` extension is set (#3154). + Emit `[TABLE]` if no suitable table formats are enabled and raw HTML + is disabled. + + Check for the `raw_html` extension before emitting a raw HTML block. + + Abstract out note/ref function (Jesse Rosenthal). + + Add ReaderT monad for environment variables (Jesse Rosenthal). + + * HTML, EPUB, slidy, revealjs templates: Use `<p>` instead of `<h1>` for + subtitle, author, date (#3119). Note that, as a result of this change, + authors may need to update CSS. + + * revealjs template: Added `notes-server` option + (jgm/pandoc-templates#212, Yoan Blanc). + + * Beamer template: + + + Restore whitespace between paragraphs. This was + a regression in the last release (jgm/pandoc-templates#207). + + Added `themeoptions` variable (Carsten Gips). + + Added `beamerarticle` variable. This causes the `beamerarticle` + package to be loaded in beamer, to produce an article from beamer + slides. (Carsten Gips) + + Added support for `fontfamilies` structured variable + (Artem Klevtsov). + + Added hypersetup options (Jake Zimmerman). + + * LaTeX template: + + + Added dummy definition for `\institute`. + This isn't a standard command, and we want to avoid a crash when + `institute` is used with the default template. + + Define default figure placement (Václav Haisman), since pandoc + no longer includes `[htbp]` for figures. Users with custom templates + will want to add this. See #3103. + + Use footnote package to fix notes in tables (jgm/pandoc-templates#208, + Václav Haisman). + + * Moved template compiling/rendering code to a separate library. + `doctemplates`. This allows the pandoc templating system to be + used independently. + + * Text.Pandoc.Error: Fix out of index error in `handleError` + (Matthew Pickering). The fix is to not try to show the exact line when + it would cause an out-of-bounds error as a result of included files. + + * Text.Pandoc.Shared: Add `linesToBlock` function (Albert Krewinkel). + + * Text.Pandoc.Parsing.emailAddress: tighten up parsing of email + addresses. Technically `**@user` is a valid email address, but if we + allow things like this, we get bad results in markdown flavors + that autolink raw email addresses (see #2940). So we exclude a few + valid email addresses in order to avoid these more common bad cases. + + * Text.Pandoc.PDF: Don't crash with nonexistent image (#3100). Instead, + emit the alt text, emphasized. This accords with what the ODT writer + currently does. The user will still get a warning about a nonexistent + image. + + * Fix example in API documentation (#3176, Thomas Weißschuh). + + * Tell where to get tarball in INSTALL (#3062). + + * Rename README to MANUAL.txt and add GitHub-friendly README.md + (Albert Krewinkel, Kolen Cheung). + + * Replace COPYING with Markdown version COPYING.md from GNU (Kolen Cheung). + + * MANUAL.txt: + + + Put note on structured vars in separate paragraph (#2148, Albert + Krewinkel). Make it clearer that structured author variables require a + custom template + + Note that `--katex` works best with `html5` (#3077). + + Fix the LaTeX and EPUB links in manual (Morton Fox). + + Document `biblio-title` variable. + + * Improve spacing of footnotes in `--help` output (Waldir Pimenta). + + * Update KaTeX to v0.6.0 (Kolen Cheung). + + * Allow latest dependencies. + + * Use texmath 0.8.6.6 (#3040). + + * Allow http-client 0.4.30, which is the version in stackage lts. + Previously we required 0.5. + Remove CPP conditionals for earlier versions. + + * Remove support for GHC < 7.8 (Jesse Rosenthal). + + + Remove Compat.Monoid. + + Remove an inline monad compatibility macro. + + Remove Text.Pandoc.Compat.Except. + + Remove directory compat. + + Change constraint on mtl. + + Remove unnecessary CPP condition in UTF8. + + Bump base lower bound to 4.7. + + Remove 7.6 build from .travis.yaml. + + Bump supported ghc version in CONTRIBUTING.md. + + Add note about GHC version support to INSTALL. + + Remove GHC 7.6 from list of tested versions (Albert Krewinkel). + + Remove TagSoup compat. + + Add EOL note to time compat module. Because time 1.4 is a boot library + for GHC 7.8, we will support the compatibility module as long as we + support 7.8. But we should be clear about when we will no longer need + it. + + Remove blaze-html CPP conditional. + + Remove unnecessary CPP in custom Prelude. + +## pandoc 1.17.2 (2016-07-17) + + * Added Zim Wiki writer, template and tests. `zimwiki` is now + a valid output format. (Alex Ivkin) + + * Changed email-obfuscation default to no obfuscation (#2988). + + `writerEmailObfuscation` in `defaultWriterOptions` is now + `NoObfuscation`. + + the default for the command-line `--email-obfuscation` option is + now `none`. + + * Docbook writer: Declare xlink namespace in Docbook5 output (Ivo Clarysse). + + * Org writer: + + + Support arbitrary raw inlines (Albert Krewinkel). + Org mode allows arbitrary raw inlines ("export snippets" in Emacs + parlance) to be included as `@@format:raw foreign format text@@`. + + Improve Div handling (Albert Krewinkel). Div blocks handling is + changed to make the output look more like idiomatic org mode: + - Div-wrapped content is output as-is if the div's attribute is the + null attribute. + - Div containers with an id but neither classes nor key-value pairs + are unwrapped and the id is added as an anchor. + - Divs with classes associated with greater block elements are + wrapped in a `#+BEGIN`...`#+END` block. + - The old behavior for Divs with more complex attributes is kept. + + * HTML writer: Better support for raw LaTeX environments (#2758). + Previously we just passed all raw TeX through when MathJax + was used for HTML math. This passed through too much. + With this patch, only raw LaTeX environments that MathJax + can handle get passed through. + This patch also causes raw LaTeX environments to be treated + as math, when possible, with MathML and WebTeX output. + + * Markdown writer: use raw HTML for simple, pipe tables with linebreaks + (#2993). Markdown line breaks involve a newline, and simple and pipe + tables can't contain one. + + * Make --webtex work with the Markdown writer (#1177). + This is a convenient option for people using + websites whose Markdown flavors don't provide for math. + + * Docx writer: + + + Set paragraph to FirstPara after display math (Jesse Rosenthal). + We treat display math like block quotes, and apply FirstParagraph style + to paragraphs that follow them. These can be styled as the user + wishes. (But, when the user is using indentation, this allows for + paragraphs to continue after display math without indentation.) + + Use actual creation time as doc prop (Jesse Rosenthal). + Previously, we had used the user-supplied date, if available, for Word's + document creation metadata. This could lead to weird results, as in + cases where the user post-dates a document (so the modification might be + prior to the creation). Here we use the actual computer time to set the + document creation. + + * LaTeX writer: + + + Don't URI-escape image source (#2825). Usually this is a local file, + and replacing spaces with `%20` ruins things. + + Allow 'standout' as a beamer frame option (#3007). + `## Slide title {.standout}`. + + * RST reader: Fixed links with no explicit link text. The link + `` `<foo>`_ `` should have `foo` as both its link text and its URL. + See RST spec at <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#embedded-uris-and-aliases> + Closes Debian #828167 -- reported by Christian Heller. + + * Textile reader: + + + Fixed attributes (#2984). Attributes can't be followed by + a space. So, `_(class)emph_` but `_(noclass) emph_`. + + Fixed exponential parsing bug (#3020). + + Fix overly aggressive interpretation as images (#2998). + Spaces are not allowed in the image URL in textile. + + * LaTeX reader: + + + Fix `\cite` so it is a NormalCitation not AuthorInText. + + Strip off double quotes around image source if present (#2825). + Avoids interpreting these as part of the literal filename. + + * Org reader: + + + Add semicolon to list of special chars (Albert Krewinkel) + Semicolons are used as special characters in citations syntax. This + ensures the correct parsing of Pandoc-style citations: `[prefix; @key; + suffix]`. Previously, parsing would have failed unless there was a space + or other special character as the last <prefix> character. + + Add support for "Berkeley-style" cites (Albert Krewinkel, #1978). + A specification for an official Org-mode citation syntax was drafted by + Richard Lawrence and enhanced with the help of others on the orgmode + mailing list. Basic support for this citation style is added to the + reader. + + Support arbitrary raw inlines (Albert Krewinkel). + Org mode allows arbitrary raw inlines ("export snippets" in Emacs + parlance) to be included as `@@format:raw foreign format text@@`. + + Remove partial functions (Albert Krewinkel, #2991). + Partial functions like `head` lead to avoidable errors and should be + avoided. They are replaced with total functions. + + Support figure labels (Albert Krewinkel, #2496, #2999). + Figure labels given as `#+LABEL: thelabel` are used as the ID of the + respective image. This allows e.g. the LaTeX to add proper `\label` + markup. + + Improve tag and properties type safety (Albert Krewinkel). + Specific newtype definitions are used to replace stringly typing of tags + and properties. Type safety is increased while readability is improved. + + Parse as headlines, convert to blocks (Albert Krewinkel). + Emacs org-mode is based on outline-mode, which treats documents as trees + with headlines are nodes. The reader is refactored to parse into a + similar tree structure. This simplifies transformations acting on + document (sub-)trees. + * Refactor comment tree handling (Albert Krewinkel). + Comment trees were handled after parsing, as pattern matching on lists + is easier than matching on sequences. The new method of reading + documents as trees allows for more elegant subtree removal. + * Support archived trees export options (Albert Krewinkel). + Handling of archived trees can be modified using the `arch` option. + Archived trees are either dropped, exported completely, or collapsed to + include just the header when the `arch` option is nil, non-nil, or + `headline`, respectively. + * Put export setting parser into module (Albert Krewinkel). + Export option parsing is distinct enough from general block parsing to + justify putting it into a separate module. + * Support headline levels export setting (Albert Krewinkel). + The depths of headlines can be modified using the `H` option. Deeper + headlines will be converted to lists. + * Replace ugly code with view pattern (Albert Krewinkel). + Some less-than-smart code required a pragma switching of overlapping + pattern warnings in order to compile seamlessly. Using view patterns + makes the code easier to read and also doesn't require overlapping + pattern checks to be disabled. + * Fix parsing of verbatim inlines (Albert Krewinkel, #3016). + Org rules for allowed characters before or after markup chars were not + checked for verbatim text. This resultet in wrong parsing outcomes of + if the verbatim text contained e.g. space enclosed markup characters as + part of the text (`=is_substr = True=`). Forcing the parser to update + the positions of allowed/forbidden markup border characters fixes this. + + * LaTeX template: fix for obscure hyperref/xelatex issue. + Here's a minimal case: + + \documentclass[]{article} + \usepackage{hyperref} + \begin{document} + \section{\%á} + \end{document} + + Without this change, this fails on the second invocation of xelatex. + This affects inputs this like `# %á` with pdf output via xelatex. + + * trypandoc: call results 'html' instead of 'result'. + This is for better compatibility with babelmark2. + + * Document MultiMarkdown as input/output format (Albert Krewinkel, #2973). + MultiMarkdown was only mentioned as a supported Markdown dialect but not + as a possible input or output format. A brief mention is added + everywhere the other supported markdown dialects are mentioned. + + * Document Org mode as a format containing raw HTML (Albert Krewinkel) + Raw HTML is kept when the output format is Emacs Org mode. + + * Implement `RawInline` and `RawBlock` in sample lua custom writer (#2985). + + * Text.Pandoc.Shared: + + + Introduce blocksToInlines function (Jesse Rosenthal). + This is a lossy function for converting `[Block] -> [Inline]`. Its main + use, at the moment, is for docx comments, which can contain arbitrary + blocks (except for footnotes), but which will be converted to spans. + This is, at the moment, pretty useless for everything but the basic + `Para` and `Plain` comments. It can be improved, but the docx reader + should probably emit a warning if the comment contains more than this. + + Add BlockQuote to blocksToInlines (Jesse Rosenthal). + + Add further formats for `normalizeDate` (Jesse Rosenthal). + We want to avoid illegal dates -- in particular years with greater than + four digits. We attempt to parse series of digits first as `%Y%m%d`, then + `%Y%m`, and finally `%Y`. + + `normalizeDate` should reject illegal years (Jesse Rosenthal). + We only allow years between 1601 and 9999, inclusive. The ISO 8601 + actually says that years are supposed to start with 1583, but MS Word + only allows 1601-9999. This should stop corrupted word files if the date + is out of that range, or is parsed incorrectly. + + Improve year sanity check in normalizeDate (Jesse Rosenthal). + Previously we parsed a list of dates, took the first one, and then + tested its year range. That meant that if the first one failed, we + returned nothing, regardless of what the others did. Now we test for + sanity before running `msum` over the list of Maybe values. Anything + failing the test will be Nothing, so will not be a candidate. + + * Docx reader: + + + Add simple comment functionality. (Jesse Rosenthal). + This adds simple track-changes comment parsing to the docx reader. It is + turned on with `--track-changes=all`. All comments are converted to + inlines, which can list some information. In the future a warning will be + added for comments with formatting that seems like it will be excessively + denatured. Note that comments can extend across blocks. For that reason + there are two spans: `comment-start` and `comment-end`. `comment-start` + will contain the comment. `comment-end` will always be empty. The two + will be associated by a numeric id. + + Enable warnings in top-level reader (Jesse Rosenthal). + Previously we had only allowed for warnings in the parser. Now we allow + for them in the `Docx.hs` as well. The warnings are simply concatenated. + + Add warning for advanced comment formatting. (Jesse Rosenthal). + We can't guarantee we'll convert every comment correctly, though we'll + do the best we can. This warns if the comment includes something other + than Para or Plain. + + Add tests for warnings. (Jesse Rosenthal). + + Add tests for comments (Jesse Rosenthal). + We test for comments, using all track-changes options. Note that we + should only output comments if `--track-changes=all`. We also test for + emitting warnings if there is complicated formatting. + + * README: update to include track-changes comments. (Jesse Rosenthal) + + * Improved Windows installer - don't ignore properties set on command-line. + See #2708. Needs testing to see if this resolves the issue. + Thanks to @nkalvi. + + * Process markdown extensions on command line in L->R order (#2995). + Previously they were processed, very unintuitively, in R->L + order, so that `markdown-tex_math_dollars+tex_math_dollars` + had `tex_math_dollars` disabled. + + * Added `secnumdepth` variable to LaTeX template (#2920). + + * Include table of contents in README.html in Windows package. + + * Writers: treat SoftBreak as space for stripping (Jesse Rosenthal) + In Writers.Shared, we strip leading and trailing spaces for display + math. Since SoftBreak's are treated as spaces, we should strip those + too. + + * beamer, latex templates: pass biblatexoptions directly in package load. + This allows runtime optinos to be used. Fixes jgm/pandoc-citeproc#201 + + * CPP workaround for deprecation of `parseUrl` in http-client. + + * Removed some redundant class constraints. + + * make_oxs_package.sh - use OSX env variable. + + * Added `winpkg` target to Makefile. This downloads the windows package + from appveyor and signs it using the key. + + * Document Org mode as a format containing raw TeX (Albert Krewinkel). + Raw TeX is kept verbatim when the output format is Emacs Org mode. + + * Support math with haddock-library >= 1.4. + + * Removed `-rtsopts` from library stanza. It has no effect, and Hackage + wouldn't accept the package. + + * Update library dependency versions. + +## pandoc 1.17.1 (2016-06-04) + + * New output format: `docbook5` (Ivo Clarysse). + + * `Text.Pandoc.Options`: Add `writerDocBook5` to `WriterOptions` + (API change). + + * Org writer: + + + Add :PROPERTIES: drawer support (Albert Krewinkel, #1962). + This allows header attributes to be added to org documents in the form + of `:PROPERTIES:` drawers. All available attributes are stored as + key/value pairs. This reflects the way the org reader handles + `:PROPERTIES:` blocks. + + Add drawer capability (Carlos Sosa). For the implementation of the + Drawer element in the Org Writer, we make use of a generic Block + container with attributes. The presence of a `drawer` class defines + that the `Div` constructor is a drawer. The first class defines the + drawer name to use. The key-value list in the attributes defines + the keys to add inside the Drawer. Lastly, the list of Block elements + contains miscellaneous blocks elements to add inside of the Drawer. + + Use `CUSTOM_ID` in properties (Albert Krewinkel). The `ID` property is + reserved for internal use by Org-mode and should not be used. + The `CUSTOM_ID` property is to be used instead, it is converted to the + `ID` property for certain export format. + + * LaTeX writer: + + + Ignore `--incremental` unless output format is beamer (#2843). + + Fix polyglossia to babel env mapping (Mauro Bieg, #2728). + Allow for optional argument in square brackets. + + Recognize `la-x-classic` as Classical Latin (Andrew Dunning). + This allows one to access the hyphenation patterns in CTAN's + hyph-utf8. + + Add missing languages from hyph-utf8 (Andrew Dunning). + + Improve use of `\strut` with `\minipage` inside tables + (Jose Luis Duran). This improves spacing in multiline + tables. + + Use `{}` around options containing special chars (#2892). + + Avoid lazy `foldl`. + + Don't escape underscore in labels (#2921). Previously they were + escaped as `ux5f`. + + brazilian -> brazil for polyglossia (#2953). + + * HTML writer: Ensure mathjax link is added when math appears in footnote + (#2881). Previously if a document only had math in a footnote, the + MathJax link would not be added. + + * EPUB writer: set `navpage` variable on nav page. + This allows templates to treat it differently. + + * DocBook writer: + + + Use docbook5 if `writerDocbook5` is set (Ivo Clarysse). + + Properly handle `ulink`/`link` (Ivo Clarysse). + + * EPUB reader: + + + Unescape URIs in spine (#2924). + + EPUB reader: normalise link id (Mauro Bieg). + + * Docx Reader: + + + Parse `moveTo` and `moveFrom` (Jesse Rosenthal). + `moveTo` and `moveFrom` are track-changes tags that are used when a + block of text is moved in the document. We now recognize these tags and + treat them the same as `insert` and `delete`, respectively. So, + `--track-changes=accept` will show the moved version, while + `--track-changes=reject` will show the original version. + + Tests for track-changes moving (Jesse Rosenthal). + + * ODT, EPUB, Docx readers: throw `PandocError` on unzip failure + (Jesse Rosenthal) Previously, `readDocx`, `readEPUB`, and `readOdt` + would error out if zip-archive failed. We change the archive extraction + step from `toArchive` to `toArchiveOrFail`, which returns an Either value. + + * Markdown, HTML readers: be more forgiving about unescaped `&` in + HTML (#2410). We are now more forgiving about parsing invalid HTML with + unescaped `&` as raw HTML. (Previously any unescaped `&` + would cause pandoc not to recognize the string as raw HTML.) + + * Markdown reader: + + + Fix pandoc title blocks with lines ending in 2 spaces (#2799). + + Added `-s` to markdown-reader-more test. + + * HTML reader: fixed bug in `pClose`. This caused exponential parsing + behavior in documnets with unclosed tags in `dl`, `dd`, `dt`. + + * MediaWiki reader: Allow spaces before `!` in MediaWiki table header + (roblabla). + + * RST reader: Support `:class:` option for code block in RST reader + (Sidharth Kapur). + + * Org reader (all Albert Krewinkel, except where noted otherwise): + + + Stop padding short table rows. + Emacs Org-mode doesn't add any padding to table rows. The first + row (header or first body row) is used to determine the column count, + no other magic is performed. + + Refactor rows-to-table conversion. This refactors + the codes conversing a list table lines to an org table ADT. + The old code was simplified and is now slightly less ugly. + + Fix handling of empty table cells, rows (Albert Krewinkel, #2616). + This fixes Org mode parsing of some corner cases regarding empty cells + and rows. Empty cells weren't parsed correctly, e.g. `|||` should be + two empty cells, but would be parsed as a single cell containing a pipe + character. Empty rows where parsed as alignment rows and dropped from + the output. + + Fix spacing after LaTeX-style symbols. + The org-reader was dropping space after unescaped LaTeX-style symbol + commands: `\ForAll \Auml` resulted in `∀Ä` but should give `∀ Ä` + instead. This seems to be because the LaTeX-reader treats the + command-terminating space as part of the command. Dropping the trailing + space from the symbol-command fixes this issue. + + Print empty table rows. Empty table rows should not + be dropped from the output, so row-height is always set to be at least 1. + + Move parser state into separate module. + The org reader code has become large and confusing. Extracting smaller + parts into submodules should help to clean things up. + + Add support for sub/superscript export options. + Org-mode allows to specify export settings via `#+OPTIONS` lines. + Disabling simple sub- and superscripts is one of these export options, + this options is now supported. + + Support special strings export option Parsing of special strings + (like `...` as ellipsis or `--` as en dash) can be toggled using the `-` + option. + + Support emphasized text export option. Parsing of emphasized text can + be toggled using the `*` option. This influences parsing of text marked + as emphasized, strong, strikeout, and underline. Parsing of inline math, + code, and verbatim text is not affected by this option. + + Support smart quotes export option. Reading of smart quotes can be + toggled using the `'` option. + + Parse but ignore export options. All known export options are parsed + but ignored. + + Refactor block attribute handling. A parser state attribute was used + to keep track of block attributes defined in meta-lines. Global state + is undesirable, so block attributes are no longer saved as part of the + parser state. Old functions and the respective part of the parser state + are removed. + + Use custom `anyLine`. Additional state changes need to be made after + a newline is parsed, otherwise markup may not be recognized correctly. + This fixes a bug where markup after certain block-types would not be + recognized. + + Add support for `ATTR_HTML` attributes (#1906). + Arbitrary key-value pairs can be added to some block types using a + `#+ATTR_HTML` line before the block. Emacs Org-mode only includes these + when exporting to HTML, but since we cannot make this distinction here, + the attributes are always added. The functionality is now supported + for figures. + + Add `:PROPERTIES:` drawer support (#1877). + Headers can have optional `:PROPERTIES:` drawers associated with them. + These drawers contain key/value pairs like the header's `id`. The + reader adds all listed pairs to the header's attributes; `id` and + `class` attributes are handled specially to match the way `Attr` are + defined. This also changes behavior of how drawers of unknown type + are handled. Instead of including all unknown drawers, those are not + read/exported, thereby matching current Emacs behavior. + + Use `CUSTOM_ID` in properties. See above on Org writer changes. + + Respect drawer export setting. The `d` export option can be used + to control which drawers are exported and which are discarded. + Basic support for this option is added here. + + Ignore leading space in org code blocks (Emanuel Evans, #2862). + Also fix up tab handling for leading whitespace in code blocks. + + Support new syntax for export blocks. Org-mode version 9 + uses a new syntax for export blocks. Instead of `#+BEGIN_<FORMAT>`, + where `<FORMAT>` is the format of the block's content, the new + format uses `#+BEGIN_export <FORMAT>` instead. Both types are + supported. + + Refactor `BEGIN...END` block parsing. + + Fix handling of whitespace in blocks, allowing content to be indented + less then the block header. + + Support org-ref style citations. The *org-ref* package is an + org-mode extension commonly used to manage citations in org + documents. Basic support for the `cite:citeKey` and + `[[cite:citeKey][prefix text::suffix text]]` syntax is added. + + Split code into separate modules, making for cleaner code and + better decoupling. + + * Added `docbook5` template. + + * `--mathjax` improvements: + + + Use new CommonHTML output for MathJax (updated default MathJax URL, + #2858). + + Change default mathjax setup to use `TeX-AMS_CHTML` configuration. + This is designed for cases where the input is always TeX and maximal + conformity with TeX is desired. It seems to be smaller and load faster + than what we used before. See #2858. + + Load the full MathJax config to maximize loading speed (KolenCheung). + + * Bumped upper version bounds to allow use of latest packages + and compilation with ghc 8. + + * Require texmath 0.8.6.2. Closes several texmath-related bugs (#2775, + #2310, #2310, #2824). This fixes behavior of roots, e.g. + `\sqrt[3]{x}`, and issues with sub/superscript positioning + and matrix column alignment in docx. + + * README: + + + Clarified documentation of `implicit_header_references` (#2904). + + Improved documentation of `--columns` option. + + * Added appveyor setup, with artefacts (Jan Schulz). + + * stack.yaml versions: Use proper flags used for texmath, pandoc-citeproc. + + * LaTeX template: support for custom font families (vladipus). + Needed for correct polyglossia operation with Cyrillic fonts and perhaps + can find some other usages. Example usage in YAML metadata: + + fontfamilies: + - name: \cyrillicfont + font: Liberation Serif + - name: \cyrillicfonttt + options: Scale=MatchLowercase + font: Liberation + + * Create unsigned msi as build artifact in appveyor build. + + * On travis, test with ghc 8.0.1; drop testing for ghc 7.4.1. + + + +## pandoc 1.17.0.3 (2016-03-24) + + * LaTeX writer: Fixed position of label in figures (#2813). + Previously the label wasn't in the right place, and `\ref` + wouldn't work properly. + * Added .tei test files to pandoc.cabal so they'll be included + in tarball (#2811). + * Updated copyright dates. + +## pandoc 1.17.0.2 (2016-03-23) + + * Fixed serious regression in `htmlInBalanced`, which caused + newlines to be omitted in some raw HTML blocks in Markdown + (#2804). + +## pandoc 1.17.0.1 (2016-03-21) + + * File scope is no longer used when there are no input files (i.e., + when input comes from stdin). Previously file scope was triggered + when the `json` reader was specified and input came from `stdin`, + and this caused no output to be produced. (Fix due to Jesse Rosenthal; + thanks to Fedor Sheremetyev for calling the bug to our attention.) + * Improved documentation of templates (#2797). + +## pandoc 1.17 (2016-03-20) + + * Added `--file-scope` option (Jesse Rosenthal). + By default pandoc operates on multiple files by first concatenating + them (around extra line breaks) and then processing the joined file. So + it only parses a multi-file document at the document scope. This has the + benefit that footnotes and links can be in different files, but for + some purposes it is useful to parse the individual files first + and then combine their outputs (e.g. when the files use footnotes + or links with the same labels). The `--file-scope` option causes + pandoc to parse the files first, and then combine the parsed output, + instead of combining before parsing. `--file-scope` is selected + automatically for binary input files (which cannot be concatenated) + and for pandoc json. + + * Add TEI Writer (Chris Forster) and `tei` output format. + + * Added a general `ByteStringReader` with warnings, used by the docx + reader (API change, Jesse Rosenthal). + + * Add `readDocxWithWarnings` (API change, Jesse Rosenthal). + + * Changed type of `Shared.uniqueIdent` argument from + `[String]` to `Set String`. This avoids performance problems in documents + with many identically named headers (API change, #2671). + + * Removed `tex_math_single_backslash` from `markdown_github` options + (#2707). + + * Make language extensions as well as full language names + trigger syntax highlighting. For example, `py` will now work as + well as `python` (jgm/highlighting-kate#83). + + * Added `institute` variable to latex, beamer templates (Fraser + Tweedale, Josef Svenningsson). + + * Docx reader (Jesse Rosenthal): + + + Handle alternate content. Some word functions (especially graphics) + give various choices for content so there can be backwards compatibility. + + Don't turn numbered headers into lists. + + Docx Reader: Add state to the parser, for warnings + + Update feature checklist in source code. + + Get rid of `Modifiable` typeclass. + + Add tests for adjacent hyperlinks. + + Add a "Link" modifier to `Reducible`. We want to make sure that + links have their spaces removed, and are appropriately smushed + together (#2689). + + * HTML reader: + + + Fixed behavior of base tag (#2777). + If the base path does not end with slash, the last component + will be replaced. E.g. base = `http://example.com/foo` + combines with `bar.html` to give `http://example.com/bar.html`. + If the href begins with a slash, the whole path of the base + is replaced. E.g. base = `http://example.com/foo/` combines + with `/bar.html` to give `http://example.com/bar.html`. + + Rewrote `htmlInBalanced`. This version avoids an exponential + performance problem with `<script>` tags, and it should be faster + in general (#2730). + + Properly handle an empty cell in a simple table (#2718). + + Handle multiple `<meta>` tags with same name. Put them in a list + in the metadata so they are all preserved, rather than (as before) + throwing out all but one.. + + * Markdown reader: + + + Improved pipe table parsing (#2765). + + Allow `+` separators in pipe table cells. We already allowed + them in the header, but not in the body rows, for some reason. + This gives compatibility with org-mode tables. + + Don't cross line boundary parsing pipe table row. + Previously an Emph element could be parsed across the newline + at the end of the pipe table row. + + Use `htmlInBalanced` for `rawVerbatimBlock`, for better + performance (#2730). + + Fixed bug with smart quotes around tex math. + + * LaTeX reader: + + + Handle interior `$` characters in math (#2743). For example, + `$$\hbox{$i$}$$`. + + `inlineCommand` now gobbles an empty `{}` after any command (#2687). + This gives better results when people write e.g. `\TeX{}` in Markdown. + + Properly handle LaTeX "math" environment as inline math (#2171). + + * Textile reader: Support `>`, `<`, `=`, `<>` text alignment attributes. + Closes #2674. + + * Org reader (Albert Krewinkel): + + + Prefix even empty figure names with "fig:" (#2643). The + convention used by pandoc for figures is to mark them by prefixing + the name with `fig:`. The org reader failed to do this if a figure + had no name. + + Refactor link-target processing (#2684). + + * ConTeXt writer: Fix whitespace at line beginning in line blocks (#2744). + Thanks to @c-foster. + + * HTML writer: Don't include alignment attribute for default table columns. + Previously these were given "left" alignment. Better to leave off + alignment attributes altogether (#2694). + + * Markdown writer: Use hyphens for YAML metadata block bottom line, for + better compatibility with other Markdown flavors (Henrik Tramberend). + + * LaTeX writer: + + + Use image identifier to create a label and hypertarget for + figures (Mauro Bieg). + + Avoid double toprule in headerless table with caption (#2742). + + Clean up options parser (Jesse Rosenthal). + + Treat `memoir` template with `article` option as article, instead + of treating all `memoir` templates as books. + + Allow more flexible table alignment (Henrik Tramberend, #2665). + New default is not to include `[c]` option (which is the default + anyway if no positioning is specified). Now LaTeX emplates can + control the overall table alignment in a document by setting the + longtable length variables `LTleft` and `LTright`. For example, + `\setlength\LTleft\parindent\setlength\LTright\fill` + will create left-aligned tables that respect paragraph indentation. + + * Docx writer: Handle image alt text (#2754, Mauro Bieg). + + * Org writer - pass through RawInline with format "org". + + * DokuWiki writer: use `$$` for display math. + + * Custom writer: Pass attributes parameter to CaptionedImage (#2697). + + * Make protocol-relative URIs work again (#2737). + + * make_osx_package.sh: Use env variable for developer id certs. + + * Raise `tagsoup` lower bound to 0.13.7 to fix entity-related + problems (#2734). + + * Allow `zip-archive` 0.3. + + * Allow `aeson` 0.11. + +## pandoc 1.16.0.2 (2016-01-12) + + * Depend on deepseq rather than deepseq-generics (fpco/stackage#1096). + + * Fixed regression in latex smart quote parsing (#2645). + In cases where a match was not found for a quote, everything + from the open quote to the end of the paragraph was being dropped. + +## pandoc 1.16.0.1 (2016-01-10) + + * Fixed regression with `--latex-engine` (#2618). In 1.16 + `--latex-engine` raises an error if a full path is given. + + * Org reader: Fix function dropping subtrees tagged `:noexport` + (Albert Krewinkel, #2628): + + * Markdown reader: renormalize table column widths if they exceed 100% + (#2626). + + * Textile reader: don't allow block HTML tags in inline contexts. + The reader previously did allow this, following redcloth, + which happily parses + + Html blocks can be <div>inlined</div> as well. + + as + + <p>Html blocks can be <div>inlined</div> as well.</p> + + This is invalid HTML. The above sample now produces; + + <p>Html blocks can be</p> + <div> + <p>inlined</p> + </div> + <p>as well.</p> + + * Improved default template lookup for custom lua scripts (#2625). + Previously, if you tried to do `pandoc -s -t /path/to/lua/script.lua`, + pandoc would look for the template in + `~/.pandoc/templates/default./path/to/lua/script.lua`. + With this change it will look in the more reasonable + `~/.pandoc/templates/default.script.lua`. This makes it possible to + store default templates for custom writers. + + * RST, Markdown writers: Fixed rendering of grid tables with blank rows + (#2615). + + * LaTeX writer: restore old treatment of Span (#2624). A Span is + now rendered with surrounding `{}`, as it was before 1.16. + + * Entity handling fixes: improved handling of entities like + `⟨` that require a trailing semicolon. Allow uppercase + `x` in numerical hexadecimal character references, working + around a tagsoup bug. + + * `stack.yaml` - use lts-4.0, but with older aeson to avoid excessive + memory use on compile. With aeson 0.10 we were getting an out of + memory error on a 2GB Ubuntu 64-bit VM. + + * Improved deb package creation script. Made `DPKGVER` work. + Renamed `COMMIT` to `TREE`. You should now be able to do + `TREE=1.16.0.1 DPKGVER=2 make deb`. + + +## pandoc 1.16 (2016-01-02) + + * Added `Attr` field to `Link` and `Image` (Mauro Bieg, #261, API change). + + + Added syntax for link and image attributes to pandoc's Markdown. + + Updated readers and writers to use link and image attributes + when appropriate. + + Support image attributes in Docx, Textile, RST readers. + + * Renamed link attribute extensions. The old `link_attributes` is + now `mmd_link_attributes`, and `link_attributes` now enables the + new pandoc-style link and image attributes (API change). + Note: this change could break some existing workflows. + + * Implemented `SoftBreak` and new `--wrap` option (#1701, API change). + Added threefold wrapping option. + + + Command line option: deprecated `--no-wrap`, added + `--wrap=[auto|none|preserve]` + + Added `WrapOption`, exported from `Text.Pandoc.Options` + + Changed type of `writerWrapText` in `WriterOptions` from + `Bool` to `WrapOption`. + + Modified `Text.Pandoc.Shared` functions to allow `SoftBreak`. + + Supported `SoftBreak` in readers and writers. + + * Text.Pandoc.Options: Added `writerDpi` to `WriterOptions` (API + change, Mauro Bieg). + + * Added `--dpi` command-line option (Mauro Bieg). + + * Rationalized behavior of `--no-tex-ligatures` and `--smart` (#2541). + This change makes `--no-tex-ligatures` affect the LaTeX reader + as well as the LaTeX and ConTeXt writers. If it is used, + the LaTeX reader will parse characters `` ` ``, `'`, and `-` + literally, rather than parsing ligatures for quotation marks + and dashes. And the LaTeX writer will print unicode quotation + mark and dash characters literally, rather than converting + them to the standard ASCII ligatures. Note that `--smart` has + no effect on the LaTeX reader. `--smart` is still the default + for all input formats when LaTeX or ConTeXt is the output format, + *unless* `--no-tex-ligatures` is used. + + Some examples to illustrate the logic: + + ``` + % echo "'hi'" | pandoc -t latex + `hi' + % echo "'hi'" | pandoc -t latex --no-tex-ligatures + 'hi' + % echo "'hi'" | pandoc -t latex --no-tex-ligatures --smart + ‘hi’ + % echo "'hi'" | pandoc -f latex --no-tex-ligatures + <p>'hi'</p> + % echo "'hi'" | pandoc -f latex + <p>’hi’</p> + ``` + + * Removed deprecated options `--offline` and `--html5`. + + * Fixed language code for Czech (`cs` not `cz`) (#2597). + + * Implemented `east_asian_line_breaks` extension (#2586). + In `Text.Pandoc.Options`, added `Ext_east_asian_line_breaks` constructor + to `Extension` (API change). This extension is like + `ignore_line_breaks`, but smarter -- it only ignores line breaks + between two East Asian wide characters. This makes it better suited + for writing with a mix of East Asian and non-East Asian scripts. + + * Added support for PDF creation via `wkhtmltopdf`. + To use this: `pandoc -t html5 -o result.pdf` (and add `--mathjax` + if you have math.) Margins can be set using the variables + `margin-top`, `margin-bottom`, `margin-left`, `margin-right`. + Other styling can be done through CSS. + + * Fixed cite key parsing regression (jgm/pandoc-citeproc#201). + We were capturing final colons as in `[@foo: bar]`; the citation id + was being parsed as `@foo:`. + + * ICML writer: + + + Fixed image syntax for local files (#2589). + + Changed type of `writeICML` (Mauro Bieg). + API change: It is now `WriterOptions -> Pandoc -> IO String`. + Also handle new image attributes. + + Intersperse line breaks instead of appending them to + every `ParagraphStyleRange` (Mauro Bieg, #2501). + + Add `Cite` style to citations (Mauro Bieg). + + Added figure handling (#2590, Mauro Bieg). + + Better handling of math. Instead of just printing the raw tex, + we now try to fake it with unicode characters. + + * HTML writer: Include `example` class for example lists (#2524). + + * ODT/OpenDocument writer: improved image attributes (Mauro Bieg). + + + Support for percentage widths/heights + + Use `Attr` instead of title to get dimensions from ODT walker + to `writeOpenDocument`. + + * AsciiDoc writer: + + + Support anchors in spans and divs with id elements + (jgm/pandoc-citeproc#143). + + Fixed code blocks (#1861). + + * Haddock writer: omit formatting inside links, which isn't supported + by Haddock (#2515). + + * MediaWiki writer: Fixed spacing issues in table cells. + + + Start cell on new line unless it's a single Para or Plain + (#2606). + + For single Para or Plain, insert a space after the `|` to + avoid problems when the text begins with a character like + `-` (#2604). + + * Beamer writer: mark frame as fragile when it contains verbatim (#1613). + + * LaTeX writer: + + + Add support for GAP highlighting using listings (Raniere Silva). + + Consider `header-includes` content as well as templates + when determining whether to use csquotes (Andreas Lööw). + + Create defaults for geometry using `margin-left` etc. + If `geometry` has no value, but `margin-left`, `margin-right`, + `margin-top`, and/or `-margin-bottom` are given, a default value + for `geometry` is created from these. Note that these variables + already affect PDF production via HTML5 with `wkhtmltopdf`. + + * ConTeXt writer: set default layout based on `margin-left`, etc. + This sets up `\setuplayout` based on the variables `margin-left`, + `margin-right`, `margin-bottom`, and `margin-top`, if no layout + is given. + + * Docx writer: better handling of PDF images. Previously we tried + to get the image size from the image even if an explicit size was + specified. Since we still can't get image size for PDFs, this made + it impossible to use PDF images in docx. Now we don't try to get + the image size when a size is already explicitly specified. + + * Markdown writer: use raw HTML for link/image attributes when + the `link_attributes` extension is unset and `raw_html` is set (#2554). + + * MediaWiki reader: interpret markup inside `<tt>`, `<code>` (#2607). + + * LaTeX reader: + + + Improved smart quote parsing (#2555). This fixes redering of + unmatched quotes. + + Use curly quotes for unmatched ` (#2555). + + Allow blank space between braced arguments of commands (#2592). + + * Markdown reader: + + + Improved pipe table relative widths. Previously pipe table + columns got relative widths (based on the header underscore lines) + when the source of one of the rows was greater in width than the + column width. This gave bad results in some cases where much of + the width of the row was due to nonprinting material (e.g. link + URLs). Now pandoc only looks at printable width (the width of a + plain string version of the source), which should give better results. + Thanks to John Muccigrosso for bringing up the issue. + + Fixed parsing bug with macros. Previously macro definitions in + indented code blocks were being parsed as macro definitions, not code. + + * Textile reader: skip over attribute in image source (#2515). + We don't have a place yet for styles or sizes on images, but + we can skip the attributes rather than incorrectly taking them + to be part of the filename. + + * Docx reader: Handle dummy list items (Jesse Rosenthal). + These come up when people create a list item and then delete the + bullet. It doesn't refer to any real list item, and we used to ignore + it. + + * CommonMark reader/writer rewritten to use latest `cmark`. + + * Fixed Emoji character definitions (#2523). There were many bugs in the + definitions. + + * `Text.Pandoc.CSS`: + + + Added `pickStylesToKVs` function to extract multiple properties at + once (API change, Mauro Bieg). + + Parse CSS that doesn't contain the optional semicolon (Mauro Bieg). + + * `trypandoc`: sort drop-down lists. + + * Beamer template: + + + Made `\euro` conditional on presence of character. + for xelatex and lualatex, as it is for pdflatex (Andrew Dunning). + + Moved `header-includes` before setting of title (Thomas Hodgson), + to match the LaTeX template (jgm/pandoc-templates#168). + + Added `section-titles` variable (defaults to true) + to enable/suppress section title pages in beamer + slide shows (Thomas Hodgson). + + Moved beamer themes after fonts, so that themes can + change fonts. (Previously the fonts set were being + clobbered by lmodern.sty.) (Thomas Hodgson). + + * Beamer/LaTeX template changes (Thomas Hodgson): + + Added `thanks` variable + + Use `parskip.sty` when `indent` isn't set (fall back to using + `setlength` as before if `parskip.sty` isn't available). + + Use `biblio-style` with biblatex. + + Added `biblatexoptions` variable. + + * LaTeX template changes: + + + Added `paper` after `$papersize$` variable in latex template. + Thus you can say `papersize: a4` and the latex will contain + `a4paper`. This change may break some existing workflows; if + you currently specify `a4paper`, you'll get `a4paperpaper` which + is meaningless. However, the change seems worth it, as it will + make the `papersize` variable work uniformly across ConTeXt, LaTeX, + and html->pdf via wkhtmltopdf. + + Only pass options to color package if `colorlinks` is set + (Andrew Dunning). + + Make definition of `\euro` conditional in xelatex/lualatex, + as it is already for pdflatex (Andrew Dunning). + + Removed setting of `subject` in PDF metadata. + This used to be set to the subtitle, but really the subtitle + need not give the subject. Also, `subtitle` can contain formatting, + so we'd need, at least, a plain text version for this. + + Moved `header-includes` before setting of `\title`, `\author`, + etc. This allows these macros to be redefined. + + Use `\subtitle` command for `subtitle`, instead of tacking it + on to the title as before. We give a no-op fallback definition if it + is not defined. This change should produce much better results + in classes that support `\subtitle`. With the default article + class, which does not define `\subtitle`, subtitles will no + longer be printed unless the user defines `\subtitle` and + redefines `\maketitle`. + + Moved redefinitions of `\paragraph` and `\subparagraph` to + before header-includes. + + * Context template: + + + Use `simplefonts` for font loading (Paolo Rodríguez). This is + needed for things to work on ConTeXt stable from TeXLive 2015. + + Revert use of `\setuphead` in title block (Andrew Dunning, + Rik Kabel). + + * Update LaTeX/ConTeXt link colour usage (Andrew Dunning). + + * Fixed man template so disabling hyphenation actually works. + The command needs to come after .TH. + + * Added 'navigation' variable to beamer template (#2543). + Valid values are `empty` (the default), `horizontal`, `vertical`, + and `frame`. Note that this changes the default behavior from + `horizontal` to `empty`. Closes #2543. + + * Added `toc` to HTML slide format templates (Andrew Dunning), + so that `--toc` creates a contents slide. + + * Added `stack.full.yaml` to build `pandoc-citeproc` as well. + + * Allow pipe tables with no body rows (#2556). + Previously this raised a runtime error. + + * Shared: Improved `fetchItem` so that `C:/Blah/Blah.jpg` isn't treated + as URL. The Haskell URI parsing routines will accept "C:" as a + scheme, so we rule that out manually. This helps with + `--self-contained` and absolute Windows paths. + + * Define a `meta-json` variable for all writers (#2019). This contains + a JSON version of all the metadata, in the format selected for the + writer. So, for example, to get just the YAML metadata, you can run + pandoc with the following custom template: `$meta-json$`. The intent + is to make it easier for static site generators and other tools to get + at the metadata. + + * Document limitations of --self-contained (#2553). + + * Improved Citations section of README (#2551). Added information + about `link-citations` and a link to the pandoc-citeproc man page. + + * `ImageSize`: use `safeRead` instead of `readMaybe`, which isn't + in base < 4.6. + + * Allow .adoc file extension for AsciiDoc (Andrew Dunning). + + * Improved implicit pandoc-citeproc inclusion. + The filter pandoc-citeproc is automatically used when + `--bibliography` is specified on the command line, unless + `--natbib` or `--biblatex` is used. However, previously this + only worked if `--bibliography` was spelled out in full, and not + if `--biblio` was used. + + * reveal.js: Interpret pauses correctly for all headers (#2530). + Previously, when using headers below the slide level, pauses are left + uninterpreted into pauses. In my opinion, unexpected behavior but + intentional looking at the code. + + * Remove redundant `center` variable for reveal.js (Andrew Dunning). + + * Parsing: Add `extractIdClass`, modified type of `KeyTable` (Mauro + Bieg, API change). + + * ImageSize: Added functions for converting between image dimensions + (Mauro Bieg). + + * Use lts-3.18 in stack.yaml. This avoids Windows build + issues with the HTTP library. + + * Bump version bounds for dependencies. + +## pandoc 1.15.2.1 (2015-11-16) + + * Added two missing test files, and `stack.yaml`, to + `extra-source-files` so they're included in the source tarball. + + * reveal.js template: Fixed parallaxBackground options. + `parallaxBackgroundHorizontal` and `parallaxBackgroundVertical` + need integer values, not strings. (Vaughn Iverson) + +## pandoc 1.15.2 (2015-11-15) + + * `pandoc my.md -t context -o my.pdf` will now create a PDF using + ConTeXt rather than LaTeX (#2463). + + * Fixed omitted `url(...)` in CSS data-uri with `--self-contained` (#2489). + + * Added `emoji` Markdown extension, enabled by default in `markdown_github` + (#2523). Added `Ext_emoji` to `Extension` in `Text.Pandoc.Options` + (API change). + + * `Text.Pandoc.Readers.HTML.parseTags`: Fixed over-eager raw HTML inline + parsing (#2469). Tightened up the inline HTML parser so it disallows + TagWarnings. + + * Derive `Generic` instances for the types in `Text.Pandoc.Options`. + + * Org reader: + + + Fix paragraph/list interaction (Albert Krewinkel, #2464). + Paragraphs can be followed by lists, even if there is no blank line + between the two blocks. However, this should only be true if the + paragraph is not within a list, were the preceding block should be + parsed as a plain instead of paragraph (to allow for compact lists). + Thanks to @rgaiacs for bringing this up. + + Allow toggling header args (Albert Krewinkel, #2269). + Org-mode allows to skip the argument of a code block header argument if + it's toggling a value. Argument-less headers are now recognized, + avoiding weird parsing errors. + + Fix markup parsing in headers (Albert Krewinkel, #2504). + Markup as the very first item in a header wasn't recognized. This was + caused by an incorrect parser state: positions at which inline markup + can start need to be marked explicitly by changing the parser state. + This wasn't done for headers. The proper function to update the state + is now called at the beginning of the header parser, fixing this issue. + + Fix emphasis rules for smart parsing (Albert Krewinkel, #2513). + Smart quotes, ellipses, and dashes should behave like normal quotes, + single dashes, and dots with respect to text markup parsing. + + Require whitespace around definition list markers (#2518). + This rule was not checked before, resulting in bugs with footnotes + and some link types. + + * Markdown reader: + + + Pipe tables with long lines now get relative cell widths (#2471). + If a pipe table contains a line longer than the column width (as set by + `--columns` or 80 by default), relative widths are computed based on the + widths of the separator lines relative to the column width. This should + solve persistent problems with long pipe tables in LaTeX/PDF output, and + give more flexibility for determining relative column widths in other + formats, too. For narrower pipe tables, column widths of 0 are used, + telling pandoc not to specify widths explicitly in output formats that + permit this. + + Improved parser for `mmd_title_block`. We now allow blank metadata + fields. These were explicitly disallowed before. + + Citation keys can now contain `://`, so URLs and DOIs can be used + as citation keys (jgm/pandoc-citeproc#166). + + * Beamer template: fix incompatibility of section slides with natbib. + Natbib (and presumably biblatex) bibliography commands create + their own section. Since these are in frame environments, + we have an incompatibility with the `\AtBeginSection` macro + which creates a special frame when a new section occurs. + (We can't have a frame inside another frame.) This change disables + `\AtBeginSection` inside bibliography slides. Thinks to Yihui Xie for + bringing the problem to my attention. This supersedes #145. See + discussion there. + + * Textile reader: don't do smart punctuation unless explicitly asked + (#2480). Note that although smart punctuation is part of the textile + spec, it's not always wanted when converting from textile + to, say, Markdown. So it seems better to make this an option. + + * LaTeX reader: Handle `comment` environment (Arata Mizuki). + The `comment` environment is handled in a similar way to the + `verbatim` environment, except that its content is discarded. + + * Docx reader: Follow relationships correctly in foot/endnotes (#2258, + Jesse Rosenthal). This fixes a problem with links in notes. + + * LaTeX and ConTeXt writers: support `lang` attribute on divs and spans + (mb21). For LaTeX, also collect `lang` and `dir` attributes on spans and + divs to set the `lang`, `otherlangs` and `dir` variables if they aren’t set + already. See #895. + + * LaTeX writer: + + + Use proper command for `\textarabic` (mb21). + + Added `de-CH-1901`, fixed `el-polyton` in `toPloyglossia` (Nick Bart). + + Use `\hypertarget` and `\hyperlink` for links. This works correctly + to link to Div or Span elements. We now don't bother defining `\label` + for Div or Span elements. Closes jgm/pandoc-citeproc#174. + + Avoid footnotes in list of figures (#1506). + + Properly handle footnotes in captions (#1506). + + Add `\protect` to `\hyperlink` (#2490). Thanks to Hadrien Mary. + + Set `colorlinks` if `linkcolor`, `urlcolor`, `citecolor`, or + `toccolor` is set (#2508). + + * Textile writer: support start number in ordered lists (#2465). + + * OpenDocument writer: Allow customization of opendocument + automatic styles. Automatic styles can now be inserted in the + template, which now provides the enclosing `<office:automatic-styles>` + tags (#2520). + + * Docx writer: insert space between footnote reference and note (#2527). + This matches Word's default behavior. + + * EPUB writer: don't download linked media when `data-external` attribute + set (#2473). By default pandoc downloads all linked media and includes it + in the EPUB container. This can be disabled by setting `data-external` on + the tags linking to media that should not be downloaded. Example: + + <audio controls="1"> + <source src="http://www.sixbarsjail.it/tmp/bach_toccata.mp3" + type="audio/mpeg"></source> + </audio> + + * HTML writer: use width on whole table if col widths sum to < 100%. + Otherwise some browsers display the table with the columns + separated far apart. + + * AsciiDoc template: Fix `author` and `date`; add `keywords`, + `abstract` (Andrew Dunning). + + * HTML-based templates (Andrew Dunning): + + + Use en dash instead of hyphen between title prefix and title. + + Add `keywords` to metadata. + + Add `lang`, `dir`, `quotes` where missing. + + Always make author and date display conditional. + + Updated dzslides template from source. + + * Man template: make "generated by" comment conditional. + + * LaTeX, Beamer templates: + + + Add `babel-otherlangs` for language divs/spans; `babel-newcommands`, + filled by commands that make babel understand the polyglossia-style + language directives (mb21, #137). + + Improved formatting of conditionals; `$for$` is always provided to allow + multiple options (Andrew Dunning, #141). + + Use `Ligatures=TeX` rather than `Mapping=tex-text` with `fontspec` + to improve support for LuaTeX (Andrew Dunning, #135). + + Revise `hyperref` usage (Andrew Dunning, #139, #141): + - use same options for all LaTeX engines; + - add `subtitle` and `keywords` to PDF metadata; + - do not override `hyperref` link coloring without user input, effectively making + the `hidelinks` option the default (removed as a separate variable); + - link colors can be enabled (using a slightly darker version of the old + defaults) using a new `colorlinks` variable, automatically used by + the LaTeX writer when custom colors are specified; + - `pdfborder={0 0 0}` is automatically set by `hyperref` with + `colorlinks`, and is only applied if `colorlinks` is disabled. + + * ConTeXt template (Andrew Dunning): + + + New variables for controlling styles: `linkstyle`, `linkcolor`, + `linkcontrastcolor`, `layout`, `pagenumbering`, `whitespace`, `indenting`, + `interlinespace`, `headertext`, `footertext`, `mainfont`, `sansfont`, + `monofont`, `mathfont`, `fontsize`. + + Default template no longer supports MkII. + + Improve writing of title block (suppressing numbering of first page). + + Add `title` `subtitle`, `author`, `date`, `keywords` to PDF metadata. + + Support `subtitle`, `abstract`. + + Support list of figures (`lof`), list of tables (`lot`). + + Disable link styling by default. + + Define styles for all section types. + + Enable microtype. + + Improved formatting of conditionals. + + * Beamer template: added code to prevent slide breaks inside paragraphs + (#2422, thanks to Nick Bart). This will matter, in practice, only when + `allowframebreaks` is used. It is especially helpful for bibliography + slides. + + * OpenDocument template: Add `<office:automatic-styles>` tag around + automatic styles. The writer now longer provides this (see #2520). + + * Restored Text.Pandoc.Compat.Monoid. + + * Do not export (<>) from custom Prelude. The Prelude now matches + base 4.8 Prelude's API. + + * Don't use custom prelude with ghc 7.10. Use the custom prelude + only for earlier versions. This change makes `stack ghci` and + `cabal repl` work (#2503), at least with ghc 7.10. + + * Changed § to % in operators from Odt.Arrows.Utils (#2457). + This prevents problems building haddocks with "C" locale. + + * Change default for old-locale flag to False. + + * Use stack in deb, osx, and Windows package generators. + + * Added Vagrantfile for building deb in vm. + This should help in automating binary package creation. 'make package' + will make the package. 'make package COMMIT=blah' will make the package + from commit blah. + + * README: + + + Consistent capitalization for pandoc and Markdown. + + Fixed `auto_identifiers` examples (Benoit Schweblin). + + Improved documentation of template variables (Andrew Dunning). + +## pandoc 1.15.1 (2015-10-15) + + * `pandocVersion` is now defined in `Text.Pandoc.Shared` + and reexported from `Text.Pandoc` (Alex Vong). This allows + writers to access it. (Alex Vong) (API change) + + * For `markdown_mmd`, add: `implicit_figures`, `superscripts`, + `subscripts` (#2401). + + * Added `odt` as input format (MarLinn). Added new module + `Text.Pandoc.Reader.ODT` (API change). Fully implemented features: + Paragraphs, Headers, Basic styling, Unordered lists, Ordered lists, + External Links, Internal Links, Footnotes, Endnotes, Blockquotes. + Partly implemented features: Citations, Tables. + + * Markdown Reader: + + + Add basic tests for each header style (Ophir Lifshitz). + + Add implicit header ref tests for headers with spaces (Ophir Lifshitz). + + Skip spaces in headers (Ophir Lifshitz). + + Handle 'id' and 'class' in parsing key/value attributes (#2396). + `# Header {id="myid" class="foo bar"}` + is now equivalent to `# Header {#myid .foo .bar}`. + + Use '=' instead of '#' for atx-style headers in markdown+lhs. + (Kristof Bastiaensen) + + Pipe tables: allow indented columns. Previously the left-hand column + could not start with 4 or more spaces indent. This was inconvenient + for right-aligned left columns. Note that the first (header column) + must still have 3 or fewer spaces indentation, or the table will be + treated as an indented code block. + + Fix regression: allow HTML comments containing `--`. + Technically this isn't allowed in an HTML comment, but + we've always allowed it, and so do most other implementations. + It is handy if e.g. you want to put command line arguments + in HTML comments. + + * LaTeX reader: + + + Don't eat excess whitespace after macros with only optional + arguments (#2446). + + Support longtable (#2411). + + Implement `\Cite` (#2335). + + Support abstract environment. The abstract populates an + `abstract` metadata field. + + Properly handle booktabs lines. Lines aren't part of the + pandoc table model, so we just ignore them (#2307). + + * HTML reader: + + + Handle type attribute on ol, e.g. `<ol type="i">` (#2313). + + Updated for new automatic header attributes. + + Add auto identifiers if not present on headers. This makes + TOC linking work properly. + + Detect `font-variant` with `pickStyleAttrProps` (Ophir Lifshitz). + + Test `<ol>` type, class, and inline list-style(-type) CSS + (Ophir Lifshitz). + + Better handling of "section" elements (#2438). Previously + `<section>` tags were just parsed as raw HTML blocks. With + this change, section elements are parsed as Div elements with + the class "section". + + * MediaWiki reader: handle unquoted table attributes (#2355). + + * DocBook reader: + + + Added proper support for DocBook `xref` elements (Frerich Raabe). + Added `dbContent` field to reader state, so we can lookup + cross refs. + + Handle `informalexample` (#2319). + + * Docx Reader: + + + Create special punctuation test (Ophir Lifshitz). + + Parse soft, no-break hyphen elements (Ophir Lifshitz). + + Updated headers test (Ophir Lifshitz). Replaced `styles.xml` + in `headers.docx` with pandoc's current `styles.xml`, which + contains styles for Heading 1 through 6. Added Heading 4 + through 7 to the test document. Note that Heading 7 is not + parsed as a Heading because there is no Heading 7 style. + + * RST reader: better handling of indirect roles. + Previously the parser failed on this kind of case + + .. role:: indirect(code) + + .. role:: py(indirect) + :language: python + + :py:`hi` + + Now it correctly recognizes `:py:` as a code role. + + * Org reader: + + + Add auto identifiers if not present on headers + (#2354, Juliusz Gonera). + + Allow verse blocks to contain empty lines (#2402, + Albert Krewinkel). + + * EPUB reader: stop mangling external URLs (#2284). + + * RST writer: + + + Don't insert `\ ` when complex expression in matched pairs. + E.g. `` [:sup:`3`] `` is okay; you don't need `` [:sup:`3`\ ] ``. + + Ensure that `\ ` is inserted when needed before Cite and Span + elements that begin with a "complex" element (jgm/pandoc-citeproc#157). + + Normalize headers only in "standalone" mode (#2394). + + * Haddock writer: escape `*` and `^` (G. Bataille). + + * Markdown writer: + + + In TOC, add links to headers (#829). + + Use unicode super/subscripts for digits in plain output + (when the `superscripts` and `subscripts` extensions are + not enabled). + + * Docx writer: + + + Moved invalid character stripping to `formattedString`. + This avoids an inefficient generic traversal (#2356). + + Use user data directory for `reference.docx` archive. + This allows the test suite to work without installing pandoc first. + It also brings the docx writer in line with the odt writer. + + Tests: docx writer tests now use `../data` for data directory. + This allows tests to be run without installing first. + + Tests: Use real jpg (not empty) for docx tests to avoid warning. + + * LaTeX writer: + + + Fixed detection of 'chapters' from template. + If a documentclass isn't specified in metadata, but the + template has a hardwired bookish documentclass, act as if + `--chapters` was used. This was the default in earlier + versions, but it has been broken for a little while. + + Correctly recognize book documentclass in metadata (#2395). + + Set language-related variables automatically, depending + on the value of the `lang` field, which is now always + assumed to be in BCP47 format (mb21, #1614, #2437). + + Add `\protect` to `\hyperdef` in inline context. This way we + don't get an error when this is used as a moveable argument (#2136). + + Support all frame attributes in Beamer. + + Percent-encode more special characters in URLs (#1640, #2377). + The special characters are '<','>','|','"','{','}','[',']','^', '`'. + + * HTML writer: + + + Update KaTeX JS and CSS versions (Emily Eisenberg). + + For dzslides, add `role="note"` for speaker notes (#1693). + + Percent-encode more special characters in URLs (#1640, #2377). + The special characters are '<','>','|','"','{','}','[',']','^', '`'. + + Render Div with class `section` as `<section>` in HTML5. + + * EPUB writer: + + + In TOC, replace literal `<br/>` with space (#2105). + + With `--webtex`, include image file rather than `data:` URI (#2363). + + * Native writer: format Div properly, with blocks separated. + + * Support bidirectional text output with XeLaTeX, ConTeXt and HTML + (#2191, mb21). + + * Reference Docx: + + + Add missing Header 6 style (steel blue) (Ophir Lifshitz). + + Correct `outlineLvl` for Header styles (Ophir Lifshitz). + + * Templates + + + Beamer: Add `innertheme`, `outertheme` variables + (Guilhem Bonnefille, #121). Add space after colon in figure caption. + Integrate recent font and language updates from LaTeX template; + allow use of `mainfont` variable for changing the slide text + in XeTeX and LuaTeX (Andrew Dunning, #131). + + LaTeX: Add `mainfontoptions`, `sansfontoptions`, + `monofontoptions`, `mathfontoptions`, `fontfamilyoptions` + (Andrew Dunning, #122). Support handling of bidirectional + text (mb21, #120). Improve reliability of superscripts/subscripts + under XeTeX and prevent letters and numbers from appearing on a + different baseline by removing use of the `realscripts` package + (via `xltxtra`). To restore use of OpenType characters for these + features under XeTeX or LuaTeX, add `\usepackage{realscripts}` to + `header-includes` (Andrew Dunning, #130). Remove redundant + reference to `xunicode` (Andrew Dunning, #130). Add `fontenc`, + `indent`, `subparagraph` variables (Andrew Dunning). + Allow use of `hidelinks` variable for `hyperref` package (Hugo Roy, + #113). Prevent package clash with `tufte-latex` and other classes that + include `hyperref` or `color` (Xavier Olive, #115). + + ConTeXt: Support handling of bidirectional text (mb21, #120). + + LaTeX and ConTeXt: Use more specific language variables. + Instead of directly using `lang`, we now use `babel-lang` and + `polyglossia-lang` and `context-lang`. These variables are set by + the writers to the necessary values, based on the `lang` variable + (which now always takes a value in BCP47 format). (mb21, #114, #129). + + HTML: Support handling of bidirectional text (mb21, #120). + Move HTML5 shiv after CSS and fix URL (Andrew Dunning). + Add dir attribute in html5 (Andrew Dunning). + + reveal.js: Add `controls`, `progress` variables (Grégoire Pineau, #127). + Add `width`, `height` variables (Anrew Dunning). Update template + from 3.1 source (Andrew Dunning). All configuration options are now + available as variables, but are only be included if set (reveal.js + uses defaults otherwise). + + man: Added comment stating that the page is autogenerated by pandoc, + giving version. Added `adjusting` and `hyphenate` variables + (Alex Vong, #123). + + * epub.css: added selectors for nested emphasis (Pablo Rodriguez). + + * MediaBag: ensure that `/` is always used as path separator. + + * `sample.lua`: define `CaptionedImage`, add newline at end (#2393). + + * Added `--bash-completion` option. This generates a bash completion + script. To use: `eval "$(pandoc --bash-completion)"`. + + * Text.Pandoc.Error: Define Typeable and Exception instances + for PandocError (#2386). + + * Text.Pandoc.Parsing: `toKey`: strip off outer brackets. + This makes keys with extra space at the beginning and end + work: e.g. + + [foo]: bar + + [ foo ] + + will now be a link to bar (it wasn't before). + + * Text.Pandoc: disable `auto_identifiers` for epub. + The epub writer inserts its own auto identifiers; + this is more complex due to splitting into "chapter" files. + + * Renamed Text.Pandoc.Compat.Locale -> Text.Pandoc.Compat.Time. + It now reexports Data.Time. + + * Use custom Prelude to avoid compiler warnings. + + + The (non-exported) prelude is in prelude/Prelude.hs. + + It exports Monoid and Applicative, like base 4.8 prelude, + but works with older base versions. + + It exports (<>) for mappend. + + It hides 'catch' on older base versions. + + * Added a `stack.ymal` and stack install instructions to INSTALL. + + * Clarified what is "out of scope" in README and CONTRIBUTING.md. + + * Added note to CONTRIBUTING.md about ghc versions and travis. + + * Clarify docs on block quotes. The space after `>` is optional (#2346). + + * Removed obsolete reference to default.csl (#2372). + + * List all styles in manual for `--reference-docx` (Chris Black) + + * Don't capitalize header links in man page. + + * Added section on repl to CONTRIBUTING.md. + + * README: Added space after backslash in image example (#2329). + + * Document details of citation locator terms (Nick Bart). + + * Fixed some internal links in README (#2309). + + * Improve CSL documentation, variables documentations, + links, and cross-references in README. (Andrew Dunning) + + * Fix build failure with `--flags=-https` (Sergei Trofimovich). + + * Use `newManager` instead of `withManager` in recent `http-client`. + This avoids a deprecation warning. + + * Allow building with latest versions of http-types, + HUnit, criterion, syb, aeson. + + * Updated benchmark program for new criterion API. + + * Setup.hs: rewrite so as not to use process, directory, filepath. + Using anything outside base is dangerous, since older + versions of ghc may link against two different versions. + + * Added appveyor (Windows continuous integration) builds. + + * New `.travis.yml`. Autgenerated using `make_travis_yml.hs`. + This script has been modified in a few ways, e.g. to add `GHCOPTS`. + `make .travis.yml` regenerates it based on the tested-with + field of the cabal file. + +## pandoc 1.15.0.6 (2015-07-15) + + * `--self-contained`: Fixed overaggressive CSS minimization + (#2301, 2286). Previously `--self-contained` wiped out all + spaces in CSS, including semantically significant spaces. + This was a regression from 1.14.x. + + * Markdown reader: don't allow bare URI links or autolinks in link + label (#2300). Added test cases. + + * `Text.Pandoc.Parsing`, `uri`: Improved bare autolink detection (#2299). + Previously we disallowed `-` at the end of an autolink, + and disallowed the combination `=-`. This commit liberalizes the + rules for allowing punctuation in a bare URI, and adds test cases. + One potential drawback is that you can no longer put a bare + URI in em dashes like this: + `this uri---http://example.com---is an example.` + But in this respect we now match github's treatment of bare URIs. + + * HTML writer: support speaker notes in dzslides. + With this change `<div class="notes">` and also `<div class="notes" + role="note">` will be output if `-t dzslides` is used. So we can + have speaker notes in dzslides too. Thanks to maybegeek. + + * Updated dzslides template. + + * Improved documentation of options to print system default files (#2298). + `--print-default-data-file` and `--print-default-template`. + + * DokuWiki writer: use `$..$` for Math instead of `<math>..</math>` + (Tiziano Müller). MathJax seems currently to be the only maintained + math rendering extension for DokuWiki. + + * `Text.Pandoc.Shared`: Changed `hierarchicalize` so it treats references + div as top-level header (#2294). This fixes a bug with `--section-divs`, + where the final references section added by pandoc-citeproc, enclosed in + its own div, got nested in the div for the section previous to it. + + * Allow vector 0.11. + + * Require cmark > 0.4. + +## pandoc 1.15.0.5 (2015-07-10) + + * HTML writer: Fixed email javascript obfuscation with `mailto:` + URLs (#2280). This fixes a potential security issue. Because + single quotes weren't being escaped in the link portion, a + specially crafted email address could allow javascript code injection. + + * RST reader: allow inline formatting in definition list field + names (Lars-Dominik Braun). + + * PDF: Make sure `--latex-engine-opt` goes before the filename + on the command line. LaTeX needs the argument to come after + the options (#1779). + + * CommonMark writer: fixed tags used for super/subscript. + + * ConTeXt template: activate hanging indent for definition lists + (mb21). + + * Make cabal require `hsb2hs` >= 0.3.1 if `embed_data_files` specified. + This is done by adding `hookedPrograms` in `Setup.hs`, which allows us + to include `hsb2hs` in Build-Tools in cabal. + + * Improved Windows installer (thanks to nkalvi). + + + When per-machine installation is chosen, the system path + is updated instead of the user's. + + An appropriate default is used for per-machine installation + directory. + + Admin privileges are no longer required for a per-user install + + * Travis: unpack sdist for build to catch packaging bugs. + + * Improved documentation on where user templates go (#2272). + +## pandoc 1.15.0.4 (2015-07-03) + + * Added pandoc.1 man page to the repository. It is no longer + built as part of the cabal build process. (This proved too + fragile.) pandoc.1 can be regenerated (`make man/pandoc.1`) + when `README` is changed. + + * Copying of the man page now respects `--destdir` (#2262). + + * Improved error messages for filters. User is now informed if + the filter requires an interpreter that isn't found in the path, + or if the filter returns an error status. + +## pandoc 1.15.0.3 (2015-07-02) + + * Ensure target directory is created when installing man page. + +## pandoc 1.15.0.2 (2015-07-02) + + * Added files needed for building man page to Extra-Source-Files. + +## pandoc 1.15.0.1 (2015-07-01) + + * Man page is now built and installed as part of the cabal build + process. Removed Makefile target for man page. + +## pandoc 1.15 (2015-07-01) + + * Man page changes: + + + Removed `--man1`, `--man5` options (breaking change). + + Removed `Text.Pandoc.ManPages` module (breaking API change). + + Makefile target for `man/man1/pandoc.1`. This uses pandoc to + create the man page from README using a custom template and filters. + + Added `man/` directory with template and filters needed to build + man page. + + We no longer have two man pages: `pandoc.1` and `pandoc_markdown.5`. + Now there is just pandoc.1, which has all the content from README. + This change was needed because of the extensive cross-references + between parts of the README. + + Removed old `data/pandoc.1.template` and + `data/pandoc_markdown.5.template`. + + * OpenDocument writer: Do not add a carriage return after a hard + line break (Michael Chladek). + + * ConTeXt writer: + + + use `\goto` for internal links. + + Added a `%` at end for `\reference` to avoid spurious space. + + * Ignore sandbox on 'make quick' + +## pandoc 1.14.1 (2015-06-30) + + * Added `--man1` and `--man5` options to pandoc, allowing + pandoc to generate its own man pages. Man pages are no longer + automatically generated in the build process (the process for + this was too complex and prone to failure, #2190). The + `make-pandoc-man-pages` executable has been removed. The + `man/` directory has been removed, and man page templates + have been moved to `data/`. NOTE TO PACKAGERS: You will no + longer find pandoc's man pages in `man/`, but you can + generate them using `pandoc --man1 > pandoc.1` and `pandoc + --man5 > pandoc_markdown.5`. + + * Added new unexported module: `Text.Pandoc.ManPages`. + + * `README` now acts like a data file (even though it isn't in + `data/`). So, for example, `pandoc --print-default-data-file README` + will produce the README.) This change was required for the `--man1` + and `--man5` options, since the man pages are produced from the + README, but it may be useful for other purposes as well. + + * Allow `reference.docx` and `reference.odt` to be used with + `--print-default-data-file` and to shadow defaults if placed in + the user data directory. Note that as of 1.14, we no longer + include these files as data files; instead, we include their + components. This change causes pandoc to behave as if it has + these data files; they are constructed on demand when needed + using `getDefaultReferenceDocx` and `getDefaultReferenceODT`. + + * Fixed regression in CSS parsing with `--self-contained` (#2224). + Pandoc 1.14.0.x used css-text to parse the CSS, but its parser + silently drops big sections of CSS. This commit replaces the + use of css-text with a small but principled CSS preprocessor, + which removes whitespace and comments and replaces `url()` with + base 64 data when possible. + + * Use `https://` instead of `//` for MathJax and KaTeX CDN URLs (#1920). + This will allow math to work when pages are being viewed locally. + + * `Text.Pandoc.Options`: Export `plainExtensions`. + These are the extensions used in `plain` output. + + * LaTeX reader: Don't parse `_` and `^` as sub/superscript outside of + math mode; treat them as regular inline text. Normally these will + cause an error in LaTeX, but there are contexts (e.g. `alltt` + environments) where they are allowed. + + * HTML reader: allow `<body>` to close `<head>`. + + * DocBook reader: support `mediaobject`s and `figures` (#2184, mb21). + + * RST reader: Fix reference names with special characters + (Lars-Dominik Braun). + + * Textile writer: escape `+` and `-` as entities (#2225). + + * DokuWiki writer: Use proper `<code>` tags for code blocks (#2213). + + * Plain writer: don't use symbols for super/subscript (#2237). + Simplified code by using `plainExtensions`. + + * InDesign writer: Properly escape URLs containing more than one + colon character (gohai). + + * Docx writer: Make sure we use dist version of `reference.docx` + (and not the user's version) for certain settings. Taking some + settings values from a user-supplied reference.docx can lead to + corruption. This fixes a regression from the last release (#2249). + + * `Text.Pandoc.Shared`: exports `getDefaultReferenceDocx` and + `getDefaultReferenceODT` (API change). These functions have been + removed from the Docx and ODT writers. + + * LaTeX template (Xavier Olive): + + Added `CJKmainfont` and `CJKoptions` variables. + + Allow dvipsnames (e.g. `MidnightBlue`) for colors (Xavier Olive). + + * Epub templates: use `author.role`, not `author.type`. + + * Bump cmark version to >= 0.3.4. + + * Improved Windows installer (#2205, thanks to nkalvi). + Users can now select a per-user or systemwide install, and can set + the installation path. At the end of installation, the install location + is given. The install location is also now given in the list of + installed programs in Control Panel. Cleaner WiX syntax is used for + setting the path. + + * Added `download_stats` target to Makefile. + +## pandoc 1.14.0.4 (2015-06-02) + + * Added missing commonmark template. + + * Improved try pandoc (moved button, show raw command). + +## pandoc 1.14.0.3 (2015-06-01) + + * Allow compilation with syb 0.5.*. + + * Custom writer: fixed some compiler warnings for ghc < 7.10. + +## pandoc 1.14.0.2 (2015-05-31) + + * Allow building with hslua 0.4. + +## pandoc 1.14.0.1 (2015-05-28) + + * Fixed problem with building of `reference.docx` and `reference.odt` + when the `embed_data_files` flag is used. Instead of having a phase + of the build where `reference.docx` and `reference.odt` are created + from their constituent data files, we now construct these archives + from their constituents when a `docx` or `odt` is built. The + constituent files have been moved from `extra-source-files` to + `data-files`, and `reference.docx` and `reference.odt` have been + removed. Users can create their own `reference.docx` or + `reference.odt` by using pandoc to create a simple `docx` or `odt`. + `make-reference-files.hs` has been removed, simplifying the build + process (#2187) + + * Don't include generated man pages in extra-source-files (#2189). + + * Bumped upper bound for aeson. + + * ConTeXt writer: create internal link anchors for Div elements with + identifiers. (This is needed for linked citations to work.) + +## pandoc 1.14 (2015-05-27) + +### New features + + * Added `commonmark` as input and output format. + + * Added `--verbose` flag for debugging output in PDF production (#1840, + #1653). + + * Allow wildcards in `--epub-embed-font` arguments (#1939). + + * Added `--latex-engine-opt` option (#969, #1779, Sumit Sahrawat). + + * Added `shortcut_reference_links` extension (Konstantin Zudov, #1977). + This is enabled by default for those markdown flavors that + support reading shortcut reference links, namely: `markdown`, + `markdown_strict`, `markdown_github`, `markdown_php`. + If the extension is enabled, the reader parses shortcut reference + links like `[foo]`, and the writer creates such links unless doing + so would cause problems. Users of markdown flavors that support + shortcut reference links should not notice a difference in reading + markdown, but the markdown pandoc produces may differ. + If shortcut links are not desired, the extension can be disabled + in the normal way. + +### Behavior changes + + * `--toc` is now supported for `docx` output (#458, Nikolay Yakimov). + A "dirty" TOC is created at the beginning of document. + It can be regenerated after the document has been opened. + + * An implicit `--filter pandoc-citeproc` is now triggered only when the + `--bibliography` option is used, and not when the `bibliography` + field in metadata is specified (#1849). + + * Markdown reader: + + + Reference links with `implicit_header_references` are no longer + case-sensitive (#1606). + + Definition lists no longer require indentation for first line (#2087). + Previously the body of the definition (after the `:` or `~` marker) + needed to be in column 4. This commit relaxes that requirement, + to better match the behavior of PHP Markdown Extra. So, now + this is a valid definition list: + + foo + : bar + + Resolve a potentially ambiguity with table captions: + + foo + + : bar + + ----- + table + ----- + + Is "bar" a definition, or the caption for the table? We'll count + it as a caption for the table. + + Disallow headerless pipe tables (#1996), to conform to GFM and PHP + Markdown Extra. Note: If you have been using headerless pipe tables, + this change may cause existing tables to break. + + Allow pipe tables with header but no body (#2017). + + Allow a digit as first character of a citation key (Matthias Troffaes). + See https://github.com/jgm/pandoc-citeproc/issues/97 + + * LaTeX reader: + + + Don't limit includes to `.tex` extension (#1882). + If the extension is not `.tex`, it must be given explicitly in + the `\input` or `\include`. + + * Docx reader: + + + Allow numbering in the style file. This allows inherited styles + with numbering (lists) (Jesse Rosenthal). + + * Org reader: + + + Support smart punctuation (Craig Bosma). + + Drop trees with a :noexport: tag (Albert Krewinkel). Trees having a + `:noexport:` tag set are not exported. This mirrors org-mode. + + Put header tags into empty spans (Albert Krewinkel, #2160). + Org mode allows headers to be tagged: `* Headline :TAG1:TAG2`. + Instead of being interpreted as part of the headline, the tags are now + put into the attributes of empty spans. Spans without textual content + won't be visible by default, but they are detectable by filters. They + can also be styled using CSS when written as HTML. + + Generalize code block result parsing (Albert Krewinkel). + Previously, only code blocks were recognized as result blocks; + now, any kind of block can be the result. + + * Append newline to the LineBreak in Dokuwiki, HTML, EPUB, + LaTeX, MediaWiki, OpenDocument, Texinfo writers (#1924, Tim Lin). + + * HTML writer: + + + Add "inline" or "display" class to math spans (#1914). + This allows inline and display math to be styled differently. + + Include raw latex blocks if `--mathjax` specified (#1938). + + Require highlighting-kate >= 0.5.14 (#1903). + This ensures that all code blocks will be wrapped in a `div` + with class `sourceCode`. Also, the default highlighting CSS + now adds `div.sourceCode { x-overflow: auto; }`, which means + that code blocks (even with line numbers) will acquire a scroll + bar on screens too small to display them (e.g. mobile phones). + See also jgm/highlighting-kate#65. + + * LaTeX writer: + + + Use a declaration for tight lists (Jose Luis Duran, Joseph + Harriott). Previously, pandoc hard-coded some commands to make + tight lists in LaTeX. Now we use a custom command instead, + allowing the styling to be changed in a macro in the header. + (Note: existing templates may need to be modified to include + the definition of this macro. See the current template.) + + Beamer output: if the header introducing a slide has the + class `fragile`, add the `[fragile]` option to the slide (#2119). + + * MediaWiki writer: + + + Use `File:` instead of the deprecated `Image:` for images and + other media files (Greg Rundlett). + + * DocBook writer: + + + Render a `Div (id,_,_) [Para _]` element as a `para` element + with an `id` attribute. This makes links to citations work in + DocBook with pandoc-citeproc. + + * RST writer: + + + Normalize headings to sequential levels (Nikolay Yakimov). + This is pretty much required by docutils. + + Treat headings in block quotes, etc as rubrics (Nikolay Yakimov). + + Better handling of raw latex inline (#1961). We use + `` :raw-latex:`...` `` and add a definition for this role to + the template. + + * EPUB writer: + + + Remove `linear=no` from cover `itemref` (#1609). + + Don't use `sup` element for epub footnotes (#1995). + Instead, just use an a element with class `footnoteRef`. + This allows more styling options, and provides better results + in some readers (e.g. iBooks, where anything inside the a + tag breaks popup footnotes). + + Take TOC title from `toc-title` metadata field. + + * Docx writer: + + + Implemented `FirstParagraph` style (Jesse Rosenthal). + Following the ODT writer, we add the `FirstParagraph` style to the + first text paragraph following an image, blockquote, table, heading, + or beginning of document. This allows it to be styled differently. + The default is for it to be the same as `Normal`. + + Added `BodyText` style (Jesse Rosenthal). + We apply a `BodyText` style to all unstyled paragraphs. This is, + essentially, the same as `Normal`, except that since not everything + inherits from `BodyText` (the metadata won't, for example, or + the headers or footnote numbers), we can change the text in the body + without having to make exceptions for everything. If we do want to + change *everything*, we can still do it through `Normal`. + + Altered `Blockquote` style slightly (Jesse Rosenthal). + Since `BlockQuote` derives from `BodyText`, we just want to specify + by default that it won't indent, regardless of what `BodyText` does. + Note that this will not produce any visible difference in the default + configuration. + + Take TOC title from `toc-title` metadata field (Nikolay Yakimov). + + Added a style to figure images (Nikolay Yakimov). + Figures with empty captions use style `Figure`. + Figures with nonempty captions use style `Figure with Caption`, which + is based on `Figure`, and additionally has `keepNext` set. + + * ODT writer: + + + Added figure captions (Nikolay Yakimov). The following styles are + used for figures: + `Figure` -- for figure with empty caption), + `FigureWithCaption` (based on `Figure`) -- for figure with caption, + `FigureCaption` (based on `Caption`) -- for figure captions. + Also, `TableCaption` (based on `Caption`) is used for table captions. + +### API changes + + * New `Text.Pandoc.Error` module with `PandocError` type + (Matthew Pickering). + + * All readers now return `Either PandocError Pandoc` instead of `Pandoc` + (Matthew Pickering). This allows better handling of errors. + + * Added `Text.Pandoc.Writers.CommonMark`, exporting `writeCommonMark`. + + * Added `Text.Pandoc.Readers.CommonMark`, exporting `readCommonMark`. + + * Derive `Data` and `Typeable` instances for `MediaBag`, `Extension`, + `ReaderOptions`, `EPUBVersion`, `CiteMethod`, `ObfuscationMethod`, + `HTMLSlideVariant`, `TrackChanges`, `WriterOptions` (Shabbaz + Youssefi). + + * New `Ext_shortcut_reference_links` constructor for `Extension` + (Konstantin Zudov). + +### Bug fixes + + * Markdown reader: + + + Allow smart `'` after inline math (#1909, Nikolay Yakimov). + + Check for tex macros after indented code (#1973). + + Rewrote `charsInBalancedBrackets` for efficiency. + + Make sure a closing `</div>` doesn't get included in a + definition list item (#2127). + + Don't parse bracketed text as citation if it might be a link, + image, or footnote (Nikolay Yakimov). + + Require space after key in mmd title block (#2026, Nikolay + Yakimov). Require space after key-value delimiter colon in mmd title + block. + + Require nonempty value in mmd title block (Nikolay Yakimov). + + Disable all metadata block extensions when parsing + metadata field values (#2026, Nikolay Yakimov). Otherwise we + could get a mmd title block inside YAML metadata, for example. + + * HTML reader: + + + Improve self-closing tag detection in `htmlInBalanced` (#2146). + + Handle tables with `<th>` in body rows (#1859, mb21). + + Fixed `htmlTag` (#1820). If the tag parses as a comment, we check + to see if the input starts with `<!--`. If not, it's bogus comment + mode and we fail `htmlTag`. + + Handle `base` tag; if it has an `href` value, this is added to + all relative URLs in links and images. + + * DocBook reader: + + + Look inside "info" elements for section titles (#1931). + + * Docx reader: + + + Parse images in deprecated vml format (Jesse Rosenthal). + + Allow sub/superscript verbatims (Jesse Rosenthal). + Verbatim usually shuts off all other run styles, but we don't want it + to shut off sub/superscript. + + * LaTeX reader: + + + Handle `tabular*` environment (#1850). + Note that the table width is not actually parsed or taken into + account, but pandoc no longer chokes on it. + + Ignore options in `\lstinline` rather than raising error (#1997). + + Add some test cases for simple tables (Mathias Schenner). + + Handle valign argument in tables (Mathias Schenner) (currently + we just ignore this). + + Allow non-empty colsep in tables (Mathias Schenner). + The `tabular` environment allows non-empty column separators + with the "@{...}" syntax. Previously, pandoc would fail to + parse tables if a non-empty colsep was present. With this + commit, these separators are still ignored, but the table gets + parsed. A test case is included. + + Recognize `\newpage` as a block command. + + Allow block content in `\title{}` (#2001). + + Check for block-level newcommand aliases in blockCommand (Nikolay + Yakimov). + + Guard against paragraph starting with inline macro (Nikolay Yakimov). + + Properly gobble spaces after `\\` (#2007). + + * Textile reader: + + + Handle newlines in table cells, and empty cells (#1919). + + * Org reader: + + + Allow image links with non-image targets (Hans-Peter Deifel). + This matches behavior of Org-Mode for links like + `[[http://example.com][https://www.haskell.org/static/img/logo.png]]`. + + * Docbook writer: + + + Don't print empty id attributes (thanks to Steve Horne). + + * HTML writer: + + + Fixed list-style-type for numbered example lists. + Should be "decimal," not "example" (#1902). + + Do not omit missing `alt` attribute on `img` tag (#1131, + Konstantin Zudov). + + Allow multiple colgroups in table (#2122). + + In revealjs, ensure that lists in speaker notes don't add "fragment" + classes, which can cause additional keypresses to be needed to + advance a slide (#1394). + + * LaTeX writer: + + + Don't escape `$` in URL (#1913). + + Don't use listings in headers (Matthew Pickering, #1963). + + Recognize book documentclass if set in metadata (#1971). + This sets `--chapters` implicitly if the documentclass in metadata + is a book documentclass. Previously this was done only if a book + documentclass was set in a variable. + + Add a `\label` in `\hyperdef` for Div, Span (or links don't work). + + Make `mainlang` work when `lang` is in metadata (#2174). + + * Texinfo writer: + + + Fix wrapping by using breakable spaces (Tim Lin). + + * RST writer: + + + Fixed toc depth in RST writer. Previously the depth was being + rendered as a floating point number with a decimal point. + + * Markdown writer: + + + Improved escaping (#2086). `<` should not be escaped as `\<`, for + compatibility with original Markdown. We now escape `<` and `>` + with entities. Also, we now backslash-escape square brackets. + + Avoid introducing spurious list items through wrapping (#1946). + + Don't emit span tags if plain or raw HTML disabled. + + * MediaWiki writer: + + + Convert spaces to underscores in wikilink URL (#1982), like MediaWiki. + + * AsciiDoc writer: + + + Insert some needed blank lines (#1860). + + Avoid wrapping after list marker (#1858). + + * EPUB writer: + + + Properly handle internal links to IDs in spans, divs (#1884). + + Use plain writer for metadata dc: fields (#2121). + This gives better results when we have, e.g. multiple paragraphs. + Note that tags aren't allowed in these fields. + + Properly handle image links without an extension (#1855). + + Improved chapter splitting and internal link rewriting (#1887, + #2162, #2163). This will ensure that internal links work and + that the references section produced by pandoc-citeproc is + in its own chapter. + + Fixed handling of svg images (#2183). + + * ICML writer: + + + Better handling of raw blocks and inlines (#1951). + Previously these were always escaped and printed verbatim. + Now they are ignored unless the format is `icml`, in which + case they are passed through unescaped. + + Fixed image URIs in ICML output (gohai). + + * Custom writer: + + + Raise error if loadstring returns an error status. + + Raise `PandocLuaException` instead of using 'error'. + Eventually we'll change the return type so that no exception + is involved, but at least this can be trapped. + + Use UTF-8 aware bytestring conversion. + + Set foreign encoding to UTF-8 (Nikolay Yakimov, #2101, #1634). + Also factored out ByteString, since it's only used as an intermediate + representation. + + * Docx writer: + + + Copy hyphenation settings from reference.docx (Nikolay Yakimov). + + Filter out illegal XML characters (#1992, Matthew Pickering). + + Added `noProof` to docx syntax highlighting `SourceCode` style. + + Added footnotes id -1 and 0 (Jesse Rosenthal). + Word uses, by default, footnotes with id -1 and 0 for separators. If a + user modifies `reference.docx`, they will end up with a `settings.xml` + file that references these footnotes, but no such footnotes in the + document. This will produce a corruption error. Here we add these to the + document and `settings.xml` file, so future modifications won't break + the file. + + Handle lists correctly inside table cells (Jesse Rosenthal). + Previously we didn't transform lists inside table cells. + + Set firstRow information in tables (Nikolay Yakimov). + + Don't replace `SourceCode` style in `reference.docx` if it is defined + there (Nikolay Yakimov, #1872). If `--no-highlight` specified, remove + any `SourceCode` and `*Tok` styles in `reference.docx`. + + Attempt to match international style names (#1607, Nikolay Yakimov). + + Set these styles as custom (Nikolay Yakimov): `Author`, `Abstract`, + `Compact`, `Image Caption`, `Table Caption`, `Definition Term`, + `Definition`, `First Paragraph`. + + Rename these styles to correspond with Word `Normal.dotm` (Nikolay + Yakimov): `Block Quote -> Block Text`, `Link -> Hyperlink`, + `Footnote Ref -> Footnote Reference`. + + Added `Caption` style (Nikolay Yakimov). + + Changed these styles' inheritance (Nikolay Yakimov): + `Image Caption <- Caption`, `Table Caption <- Caption`. + + Remove `SourceCode` style from `reference.docx` (#1872). + This is added automatically by the docx writer. + + Added toc heading style to `reference.docx` (Nikolay Yakimov). + + * `Text.Pandoc.PDF` + + + Don't suggest "Try xelatex" if xelatex already in use (mb21, #1832). + + More comprehensible errors on image conversion (#2067). + EPS can't be supported without shelling out to something like + ImageMagick, but at least we can avoid mysterious error messages. + + * `Text.Pandoc.Shared`: + + + Make safeRead safe (#1801, Matthew Pickering). + + Added `mapLeft`, `hush` (Matthew Pickering). + + * `Text.Pandoc.Pretty`: + + + Remove partial function (Matthew Pickering). + + * `Text.Pandoc.SelfContained`: + + + Add `;charset=utf-8` to script mime type if missing (#1842). + + Improved building of data URIs (#1940). Now base64 is used except + for `text/*` mime types. + + `cssURLs` no longer tries to fetch fragment URLs (#2121). + + Properly handle data URIs in css urls (#2129). + Use a proper CSS parser (adds dependency on `text-css`). + + * `Text.Pandoc.UTF8`: + + + Better handling of bare CRs in input files (#2132). + Previously we just stripped them out; now we convert + other line ending styles to LF line endings. + + * `Text.Pandoc.ImageSize`: + + + Fixed some exif header parsing bugs (#1834). + + Make imageSize return an Either, not a Maybe (#1834). + Use `runGetOrFail` (with `binary >= 0.7`) to return `Left` on + parse failure (rather than `error`). + + Improved warnings when image size can't be determined. + + Removed error landmines (Matthew Pickering). + + * Added woff2 to MIME types (Alfred Wechselberger). + + * pandoc: When a binary input format is used, warn that file + arguments past the first one are being ignored (Matthew Pickering). + +### Template changes + + * LaTeX template: + + + Degrade gracefully if `\paragraph` not defined. + + Include `grffile` together with `graphicx` (#2074). + This properly handles filenames containing spaces and dots. + + Redefine `\paragraph`, `\subparagraph`... to behave more + like section headers (#1658). + + Import hyperref before polyglossia to avoid an error with xelatex, + "please load package hyperref before bidi package" (Nick Bart). + + Added `toccolor` variable to control link color in toc (Kaixhin). + + * LaTeX, Beamer templates: + + + Provide `\tightlist`, which is now used by the LaTeX writer. + + Use polyglossia in beamer (#85). + + Use `bibliography` instead of `biblio-files` + (#1661). Also use `\addbibresource` instead of `\bibliography` for + biblatex. + + Added `setotherlanguages` in polyglossia. This uses an `otherlang` + variable that is derived from a comma-separated list in `lang`; + the last language is `mainlang` and the others are `otherlang`. + + * EPUB templates: + + + Use `div`, not `p`, for "rights" on title page. + + Added header-includes, include-before, include-after (#1987). + + * OpenDocument template: + + + Use `text:p` instead of `text:h` for title. + Using `text:h` causes problems with numbering. Closes #2059. + Thanks to @nkalvi for diagnosing this. + + * reveal.js template: + + + Link to non-minified css, js. The minified versions no longer + ship with the library. + + Correctly include style CSS (#1949). + + New configurable options options: `center`, `maxScale`, `slideNuber` + (Dmitry Smirnov, pandoc-templates#89). + + Moved custom CSS after theme. This allows custom CSS to modify + themes, instead of being replaced by them. + + Allow `center` to be set to false. + +### Under the hood improvements + + * Removed pre-built `reference.docx` and `reference.odt` (Nikolay + Yakimov). Instead the repository now includes the component text files, + and the zipped binaries are built from these using a helper + program, `make-reference-files`. This should make maintenance of + these components easier going forward. + + * `Text.Pandoc.Parsing`: + + + Added new `<+?>` combinator (Nikolay Yakimov). + + Added `stateHeaderKeys` to `ParserState`. + + * `make_deb.sh` fixes: + + + Detect architecture. + + Add Installed-Size to debian package control file (#1900). + + Use `fakeroot` to get permissions right. + + Use `mkdir` and `cp` instead of `install`. + + Set permissions of directories to 755. + + Install in `/usr` rather than `/usr/local`. + + Compress man pages. + + Combine copyright files for `pandoc`, `pandoc-citeproc`. + + * Added `Text.Pandoc.Compat.Locale` and `old-locale` flag + to assist with transition to `time` 1.5. + + * Updated CONTRIBUTING.md with information about issue tags (Matthew + Pickering). + + * Updated travis installs to the new sudo-less syntax (Tim Lin). + + * Updated dependency version bounds. + + * EPUB tests: don't use `joinPath`, which varies across platforms. + Instead, use a forward-slash to join paths, regardless of the + platform. This matches the way `MediaBag` now works. + + * Clarify JSON input and output in usage message (Caleb McDaniel). + + * Improved INSTALL instructions. + + * Always build man pages. Removed make-pandoc-man-pages flag. + + * Makefile: removed man target, now that we generate man pages by default. + + * README: + + + Fixed typos (J. Lewis Muir). + + Added documentation on backtick_code_blocks (#2135, Nikolay Yakimov). + + Added note on in-field markup in biblio databases (Nick Bart). + + Fixed misleading example of raw HTML block. + + Various minor formatting and consistency fixes for the program + options (Andreas Lööw). + + Made definition lists for options all "loose" for consistency. + + Added YAML biblio format to table, and note on `pandoc-citeproc`'s + `--bib2json` and `--bib2yaml` options (Nick Bart). + + Removed obsolete reference to `mods2yaml` (Nick Bart). + + Added section on syntax highlighting. + + Documented `toccolor` variable. + +## pandoc 1.13.2.1 (2015-04-15) + + * Updated to build with ghc 7.10.1. + + * Bumped package upper bounds for filepath, blaze-html, blaze-markup. + +## pandoc 1.13.2 (2014-12-20) + + * TWiki Reader: add new new twiki reader (API chaneg, Alexander Sulfrian). + + * Markdown reader: + + + Better handling of paragraph in div (#1591). + Previously text that ended a div would be parsed as Plain + unless there was a blank line before the closing div tag. + + Don't treat a citation as a reference link label (#1763). + + Fix autolinks with following punctuation (#1811). + The price of this is that autolinked bare URIs can no longer + contain `>` characters, but this is not a big issue. + + Fix `Ext_lists_without_preceding_blankline` bug (#1636, Artyom). + + Allow `startnum` to work without `fancy_lists`. Formerly + `pandoc -f markdown-fancy_lists+startnum` did not work properly. + + * RST reader (all Daniel Bergey): + + + Parse quoted literal blocks (#65). RST quoted literal blocks are + the same as indented literal blocks (which pandoc already supports) + except that the quote character is preserved in each line. + + Parse RST class directives. The class directive accepts one or more + class names, and creates a Div value with those classes. If the + directive has an indented body, the body is parsed as the children of + the Div. If not, the first block following the directive is made a + child of the Div. This differs from the behavior of rst2xml, which + does not create a Div element. Instead, the specified classes are + applied to each child of the directive. However, most Pandoc Block + constructors to not take an Attr argument, so we can't duplicate this + behavior. + + Warn about skipped directives. + + Literal role now produces Code. Code role should have "code" class. + + Improved support for custom roles + + - Added `sourceCode` to classes for `:code:` role, and anything + inheriting from it. + - Add the name of the custom role to classes if the Inline + constructor supports Attr. + - If the custom role directive does not specify a parent role, + inherit from the `:span:` role. + + This differs somewhat from the `rst2xml.py` behavior. If a custom + role inherits from another custom role, Pandoc will attach both + roles' names as classes. `rst2xml.py` will only use the class of + the directly invoked role (though in the case of inheriting from a + `:code:` role with a `:language:` defined, it will also provide the + inherited language as a class). + + Warn about ignored fields in role directives. + + * LaTeX reader: + + + Parse label after caption into a span instead of + inserting an additional paragraph of bracketed text (#1747). + + Parse math environments as inline when possible (#1821). + + Better handling of `\noindent` and `\greektext` (#1783). + + Handle `\texorpdfstring` more gracefully. + + Handle `\cref` and `\sep` (Wikiwide). + + Support `\smartcite` and `\Smartcite` from biblatex. + + * HTML reader: + + + Retain display type of MathML output (#1719, Matthew Pickering). + + Recognise `<br>` tags inside `<pre>` blocks (#1620, Matthew Pickering). + + Make `embed` tag either block or inline (#1756). + + * DocBook reader: + + + Handle `keycombo`, `keycap` (#1815). + + Get string content in inner tags for literal elements (#1816). + + Handle `menuchoice` elements better, with a `>` between (#1817). + + Include `id` on section headers (#1818). + + Document/test "type" as implemented (Brian O'Sullivan). + + Add support for calloutlist and callout (Brian O'Sullivan). + We treat a calloutlist as a bulleted list. This works well in practice. + + Add support for `classname` (Bryan O'Sullivan). + + * Docx reader: + + + Fix window path for image lookup (Jesse Rosenthal). + Don't use os-sensitive "combine", since we always want the paths in our + zip-archive to use forward-slashes. + + Single-item headers in ordered lists are headers (Jesse Rosenthal). + When users number their headers, Word understands that as a single item + enumerated list. We make the assumption that such a list is, in fact, + a header. + + Rewrite rewriteLink to work with new headers (Jesse Rosenthal). + There could be new top-level headers after making lists, so we have to + rewrite links after that. + + Use polyglot header list (Jesse Rosenthal). + We're just keeping a list of header formats that different languages + use as their default styles. At the moment, we have English, German, + Danish, and French. We can continue to add to this. + This is simpler than parsing the styles file, and perhaps less + error-prone, since there seems to be some variations, even within a + language, of how a style file will define headers. + + Remove header class properly in other langs (Jesse Rosenthal). + When we encounter one of the polyglot header styles, we want to remove + that from the par styles after we convert to a header. To do that, we + have to keep track of the style name, and remove it appropriately. + + Account for external link URLs with anchors. Previously, if a URL + had an anchor, the reader would incorrectly identify it as an + internal link and return only the anchor as URL. (Caleb McDaniel) + + Fix for Issue #1692 (i18n styles) (Nikolay Yakimov). + + * Org reader: + + + Added state changing blanklines (Jesse Rosenthal). + This allows us to emphasize at the beginning of a new paragraph (or, in + general, after blank lines). + + Fixed bug with bulleted lists: + + - a + - b + * c + + was being parsed as a list, even though an unindented `*` + should make a heading. See + <http://orgmode.org/manual/Plain-lists.html#fn-1>. + + Org reader: absolute, relative paths in link (#1741, Albert + Krewinkel). The org reader was too restrictive when parsing links; + some relative links and links to files given as absolute paths + were not recognized correctly. + + Org reader: allow empty links (jgm/gitit#471, Albert Krewinkel). + This is important for use in gitit, which uses empty links + for wikilinks. + + Respect indent when parsing Org bullet lists (#1650, Timothy + Humphries). Fixes issue with top-level bullet list parsing. + + Fix indent issue for definition lists (Timothy Humphries, + see #1650, #1698, #1680). + + Parse multi-inline terms correctly in definition list (#1649, + Matthew Pickering). + + Fix rules for emphasis recognition (Albert Krewinkel). + Things like `/hello,/` or `/hi'/` were falsy recognized as emphasised + strings. This is wrong, as `,` and `'` are forbidden border chars and + may not occur on the inner border of emphasized text. + + Drop COMMENT document trees (Albert Krewinkel). + Document trees under a header starting with the word `COMMENT` are + comment trees and should not be exported. Those trees are dropped + silently (#1678). + + Properly handle links to `file:target` (Albert Krewinkel). + Org links like `[[file:target][title]]` were not handled correctly, + parsing the link target verbatim. The org reader is changed such that + the leading `file:` is dropped from the link target (see #756, #1812). + + Parse LaTeX-style MathML entities (#1657, Albert Krewinkel). + Org supports special symbols which can be included using LaTeX syntax, + but are actually MathML entities. Examples for this are + `\nbsp` (non-breaking space), `\Aacute` (the letter A with accent acute) + or `\copy` (the copyright sign ©) + + * EPUB reader: + + + URI handling improvements. Now we outsource most of the work to + `fetchItem'`. Also, do not include queries in file extensions (#1671). + + * LaTeX writer: + + + Use `\texorpdfstring` for section captions when needed (Vaclav Zeman). + + Handle consecutive linebreaks (#1733). + + Protect graphics in headers (Jesse Rosenthal). + Graphics in `\section`/`\subsection` etc titles need to be `\protect`ed. + + Put `~` before header in list item text (Jesse Rosenthal). + Because of the built-in line skip, LaTeX can't handle a section header + as the first element in a list item. + + Avoid using reserved characters as `\lstinline` delimiters (#1595). + + Better handling of display math in simple tables (#1754). + We convert display math to inline math in simple tables, + since LaTeX can't deal with display math in simple tables. + + Escape spaces in code (#1694, Bjorn Buckwalter). + + * MediaWiki writer: + + + Fixed links with URL = text. Previously these were rendered as bare + words, even if the URL was not an absolute URL (#1825). + + * ICML writer: + + + Don't force all citations into footnotes. + + * RTF writer: + + + Add blankline at end of output (#1732, Matthew Pickering). + + * RST writer: + + + Ensure blank line after figure. + + Avoid excess whitespace after last list item (#1777). + + Wrap line blocks with spaces before continuations (#1656). + + Fixed double-rendering of footnotes in RST tables (#1769). + + * DokuWiki writer: + + + Better handling of block quotes. This change ensures that + multiple paragraph blockquotes are rendered using native `>` + rather than as HTML (#1738). + + Fix external images (#1739). Preface relative links with ":", + absolute URIs without. (Timothy Humphries) + + * HTML writer: + + + Use protocol-relative URL for mathjax. + + Put newline btw img and caption paragraph. + + MathML now outputted with tex annotation (#1635, Matthew Pickering). + + Add support for KaTeX HTML math (#1626, Matthew Pickering). + This adds `KaTeX` to `HTMLMathMethod` (API change). + + Don't double render when `email-obfuscation=none` (#1625, Matthew + Pickering). + + Make header attributes work outside top level (#1711). + Previously they only appeared on top level header elements. + Now they work e.g. in blockquotes. + + * ODT writer: + + + Correctly handle images without extensions (#1729). + + Strip querystring in ODT write (#1682, Todd Sifleet). + + * FB2 writer: + + + Add newline to output. + + * EPUB writer: + + + Don't add `sourceURL` to absolute URIs (#1669). + + Don't use unsupported `opf:title-type` for epub2. + + Include "landmarks" section in nav document for epub3 (#1757). + + Removed playOrder from navpoint elements in ncx file (#1760). + These aren't required, and they make manual modification of epubs + difficult. + + Extract title even from structured title. + + Don't include nav node in spine unless `--toc` was requested. + Previously we included it in the spine with `linear="no"`, leading + to odd results in some readers (#1593). + + Fixed absolute URI detection (#1672). + + Correctly resolve relative URIs (#1671). + + Use regular page template for `nav.xhtml`, including doctype (#1759). + + * Docx writer: + + + Put docx table captions above tables (#1641, Nikolay Yakimov). + + Get the page width from the reference docx file, and use + it to scale images that are too large to fit (Grégory Bataille). + + Partial fix for #1607 (Nikolay Yakimov). International heading styles + are inferred based on `<w:name val="heading #">` fallback, if there + are no en-US "Heading#" styles + + Look in user data dir for archive `reference.docx`. + + Renumber header and footer relationships to avoid collisions (Jesse + Rosenthal). We previously took the old relationship names of the + headers and footer in secptr. That led to collisions. We now make + a map of available names in the relationships file, and then rename + in secptr. + + * ConTeXt writer: + + + Add function toLabel (Mark Szepieniec). + This function can be used to sanitize reference labels so that + they do not contain any of the illegal characters \#[]",{}%()|= . + Currently only Links have their labels sanitized, because they + are the only Elements that use passed labels. + + * `Text.Pandoc.Shared`: + + + Moved import of `toChunks` outside of CPP conditional (#1590). + + Fix `inDirectory` to reset to the original directory in case + an exception occurs (Freiric Barral). + + * Templates: + + + LaTeX template: load polyglossia before bibtex (jgm/pandoc-templates#70). + Thanks to bluebirch. + + LaTeX template: Added `\VerbatimFootnotes` if there is verbatim in notes + (#1616). + + LaTeX template: Add shorthands=off to babel options (#1648). + + EPUB, EPUB3 templates: Added `id="cover"` to body of cover page. + This aids styling, making it possible for example to set 0 margins + on the title page (#1758). + + EPUB, EPUB3 templates: Handle structured metadata on titlepage. + Previously we just expected 'title', 'subtitle', 'author', 'date'. + Now we still support those, but also support the format recommended + for epub metadata in the pandoc README: + + --- + title: + - type: main + text: My Book + - type: subtitle + text: An investigation of metadata + creator: + - role: author + text: John Smith + - role: editor + text: Sarah Jones + identifier: + - scheme: DOI + text: doi:10.234234.234/33 + publisher: My Press + rights: (c) 2007 John Smith, CC BY-NC + ... + + * `Text.Pandoc.Templates.getDefaultTemplate`: + don't fail when called with "fb2" (#1660). + + * `Text.Pandoc.Parsing`: + + + Fixed `inlineMath` so it handles `\text{..}` containing `$`. + For example: `$x = \text{the $n$th root of $y$}` (#1677). + + Change `parseFromString` to fail if not all input is consumed. + (Matthew Pickering) + + Moved `addWarning` from Markdown reader to `Parsing`, so it can be + used by more readers (API change, Daniel Bergey). + + * `Text.Pandoc.Pretty`: + + + Improve performance of `realLength` (Matthew Pickering). + + Make CR + BLANKLINE = BLANKLINE. This fixes an extra blank line we + were getting at the end of markdown fragments (as well as rst, org, + etc.) (#1705). + + * `Text.Pandoc.MIME`: + + + Add mime type for WebVTT (Jason Ronallo). + + Changed mime type for `otf` to `application/vnd.ms-opentype` (#1761). + This is needed for epub3 validation. + + * `Text.Pandoc.MediaBag`: + + + Fix Windows specific path problems (#1597). + + * `Text.Pandoc.Shared`: + + + Make `collapseFilePath` OS-agnostic (Matthew Pickering). + + * Link the test suite using `-threaded`. + This allows the test suite to be run using `+RTS -N`. + + * Added `network` dependency under `network-uri` flag in test section. + + * Give better error messages when someone tries to convert from + pdf, doc, odt (#1683). + + * Added `track` to list of tags treated by `--self-contained` (#1664). + + +## pandoc 1.13.1 (2014-08-30) + + * Fixed `--self-contained` with Windows paths (#1558). + Previously `C:\foo.js` was being wrongly interpreted as a URI. + + * HTML reader: improved handling of tags that can be block or inline. + Previously a section like this would be enclosed in a paragraph, + with RawInline for the video tags (since video is a tag that can + be either block or inline): + + <video controls="controls"> + <source src="../videos/test.mp4" type="video/mp4" /> + <source src="../videos/test.webm" type="video/webm" /> + <p> + The videos can not be played back on your system.<br/> + Try viewing on Youtube (requires Internet connection): + <a href="http://youtu.be/etE5urBps_w">Relative Velocity on + Youtube</a>. + </p> + </video> + + This change will cause the video and source tags to be parsed + as RawBlock instead, giving better output. + The general change is this: when we're parsing a "plain" sequence + of inlines, we don't parse anything that COULD be a block-level tag. + + * Docx reader: + + + Be sensitive to user styles. Note that "Hyperlink" is + "blacklisted," as we don't want the default underline styling to be + inherited by all links by default (Jesse Rosenthal). + + Read single paragraph in table cell as `Plain` (Jesse Rosenthal). + This makes to docx reader's native output fit with the way the markdown + reader understands its markdown output. + + * Txt2Tags reader: + + + Header is now parsed only if standalone flag is set (Matthew Pickering). + + The header is now parsed as meta information. The first line is the + `title`, the second is the `author` and third line is the `date` + (Matthew Pickering). + + Corrected formatting of `%%mtime` macro (Matthew Pickering). + + Fixed crash when reading from stdin. + + * Textile writer: Extended the range of cases where native textile + tables will be used (as opposed to raw HTML): we now handle any + alignment type, but only for simple tables with no captions. + + * EPUB writer: Don't use page-progression-direction in EPUB2, which + doesn't support it. Also, if page-progression-direction not specified + in metadata, don't include the attribute even in EPUB3; not including it + is the same as including it with the value "default", as we did before. + (#1550) + + * Org writer: Accept example lines with indentation at the beginning + (Calvin Beck). + + * DokuWiki writer: + + + Refactor to use Reader monad (Matthew Pickering). + + Avoid using raw HTML in table cells; instead, use `\\` + instead of newlines (Jesse Rosenthal). + + Properly handle HTML table cell alignments, and use spacing + to make the tables look prettier (#1566). + + * Docx writer: + + + Bibliography entries get `Bibliography` style (#1559). + + Implement change tracking (Jesse Rosenthal). + + * LaTeX writer: + + + Fixed a bug that caused a table caption to repeat across all pages + (Jose Luis Duran). + + Improved vertical spacing in tables and made it customizable using + standard lengths set by booktab. See + <https://groups.google.com/forum/#!msg/pandoc-discuss/qMu6_5lYy0o/ZAU7lzAIKw0J> + (Jose Luis Duran). + + Added `\strut` to fix spacing in multiline tables (Jose Luis Duran). + + Use `\tabularnewline` instead of `\\` in table cells (Jose Luis Duran). + + Made horizontal rules more flexible (Jose Luis Duran). + + * Text.Pandoc.MIME: + + + Added `MimeType` (type synonym for `String`) and `getMimeTypeDef`. + Code cleanups (Artyom Kazak). + + * Templates: + + + LaTeX template: disable microtype protrusion for typewriter font (#1549, + thanks lemzwerg). + + * Improved OSX build procedure. + + * Added `network-uri` flag, to deal with split of `network-uri` from + `network`. + + * Fix build dependencies for the `trypandoc` flag, so that they are + ignored if `trypandoc` flag is set to False (Gabor Pali). + + * Updated README to remove outdated claim that `--self-contained` + looks in the user data directory for missing files. + +## pandoc 1.13.0.1 (2014-08-17) + + * Docx writer: + + + Fixed regression which bungled list numbering (#1544), causing + all lists to appear as basic ordered lists. + + Include row width in table rows (Christoffer Ackelman, Viktor Kronvall). + Added a property to all table rows where the sum of column widths + is specified in pct (fraction of 5000). This helps persuade Word + to lay out the table with the widths we specify. + + * Fixed a bug in Windows 8 which caused pandoc not to find the + `pandoc-citeproc` filter (#1542). + + * Docx reader: miscellaneous under-the-hood improvements (Jesse Rosenthal). + Most significantly, the reader now uses Builder, leading to some + performance improvements. + + * HTML reader: Parse appropriately styled span as SmallCaps. + + * Markdown writer: don't escape `$`, `^`, `~` when `tex_math_dollars`, + `superscript`, and `subscript` extensions, respectively, are + deactivated (#1127). + + * Added `trypandoc` flag to build CGI executable used in the online + demo. + + * Makefile: Added 'quick', 'osxpkg' targets. + + * Updated README in templates to indicate templates license. + The templates are dual-licensed, BSD3 and GPL2+. + +## pandoc 1.13 (15 August 2014) + +### New features + + * Added `docx` as an input format (Jesse Rosenthal). The docx + reader includes conversion of native Word equations to pandoc + LaTeX `Math` elements. Metadata is taken from paragraphs at the + beginning of the document with styles `Author`, `Title`, `Subtitle`, + `Date`, and `Abstract`. + + * Added `epub` as an input format (Matthew Pickering). The epub + reader includes conversion of MathML to pandoc LaTeX `Math` + elements. + + * Added `t2t` (Txt2Tags) as an input format (Matthew Pickering). + Txt2tags is a lightweight markup format described at + <http://txt2tags.org/>. + + * Added `dokuwiki` as an output format (Clare Macrae). + + * Added `haddock` as an output format. + + * Added `--extract-media` option to extract media contained in a zip + container (docx or epub) while adjusting image paths to point to the + extracted images. + + * Added a new markdown extension, `compact_definition_lists`, that + restores the syntax for definition lists of pandoc 1.12.x, allowing + tight definition lists with no blank space between items, and + disallowing lazy wrapping. (See below under behavior changes.) + + * Added an extension `epub_html_exts` for parsing HTML in EPUBs. + + * Added extensions `native_spans` and `native_divs` to activate + parsing of material in HTML span or div tags as Pandoc Span + inlines or Div blocks. + + * `--trace` now works with the Markdown, HTML, Haddock, EPUB, + Textile, and MediaWiki readers. This is an option intended + for debugging parsing problems; ordinary users should not need + to use it. + +### Behavior changes + + * Changed behavior of the `markdown_attribute` extension, to bring + it in line with PHP markdown extra and multimarkdown. Setting + `markdown="1"` on an outer tag affects all contained tags, + recursively, until it is reversed with `markdown="0"` (#1378). + + * Revised markdown definition list syntax (#1429). Both the reader + and writer are affected. This change brings pandoc's definition list + syntax into alignment with that used in PHP markdown extra and + multimarkdown (with the exception that pandoc is more flexible about + the definition markers, allowing tildes as well as colons). Lazily + wrapped definitions are now allowed. Blank space is required + between list items. The space before a definition is used to determine + whether it is a paragraph or a "plain" element. **WARNING: This change + may break existing documents!** Either check your documents for + definition lists without blank space between items, or use + `markdown+compact_definition_lists` for the old behavior. + + * `.numberLines` now works in fenced code blocks even if no language + is given (#1287, jgm/highlighting-kate#40). + + * Improvements to `--filter`: + + + Don't search PATH for a filter with an explicit path. + This fixed a bug wherein `--filter ./caps.py` would run `caps.py` from + the system path, even if there was a `caps.py` in the working directory. + + Respect shebang if filter is executable (#1389). + + Don't print misleading error message. + Previously pandoc would say that a filter was not found, + even in a case where the filter had a syntax error. + + * HTML reader: + + + Parse `div` and `span` elements even without `--parse-raw`, + provided `native_divs` and `native_spans` extensions are set. + Motivation: these now generate native pandoc Div and Span + elements, not raw HTML. + + Parse EPUB-specific elements if the `epub_html_exts` + extension is enabled. These include `switch`, `footnote`, + `rearnote`, `noteref`. + + * Org reader: + + + Support for inline LaTeX. Inline LaTeX is now accepted and parsed by the + org-mode reader. Both math symbols (like `\tau`) and LaTeX commands (like + `\cite{Coffee}`), can be used without any further escaping (Albert + Krewinkel). + + * Textile reader and writer: + + + The `raw_tex` extension is no longer set by default. You can + enable it with `textile+raw_tex`. + + * DocBook reader: + + + Support `equation`, `informalequation`, `inlineequation` elements with + `mml:math` content. This is converted into LaTeX and put into a Pandoc + Math inline. + + * Revised `plain` output, largely following the style of Project + Gutenberg: + + + Emphasis is rendered with `_underscores_`, strong emphasis + with ALL CAPS. + + Headings are rendered differently, with space to set them off, + not with setext style underlines. Level 1 headers are ALL CAPS. + + Math is rendered using unicode when possible, but without the + distracting emphasis markers around variables. + + Footnotes use a regular `[n]` style. + + * Markdown writer: + + + Horizontal rules are now a line across the whole page. + + Prettier pipe tables. Columns are now aligned (#1323). + + Respect the `raw_html` extension. `pandoc -t markdown-raw_html` + no longer emits any raw HTML, including span and div tags + generated by Span and Div elements. + + Use span with style for `SmallCaps` (#1360). + + * HTML writer: + + + Autolinks now have class `uri`, and email autolinks have class + `email`, so they can be styled. + + * Docx writer: + + + Document formatting is carried over from `reference.docx`. + This includes margins, page size, page orientation, header, + and footer, including images in headers and footers. + + Include abstract (if present) with `Abstract` style (#1451). + + Include subtitle (if present) with `Subtitle` style, rather + than tacking it on to the title (#1451). + + * Org writer: + + + Write empty span elements with an id attribute as org anchors. + For example `Span ("uid",[],[]) []` becomes `<<uid>>`. + + * LaTeX writer: + + + Put table captions above tables, to match the conventional + standard. (Previously they appeared below tables.) + + Use `\(..\)` instead of `$..$` for inline math (#1464). + + Use `\nolinkurl` in email autolinks. This allows them to be styled + using `\urlstyle{tt}`. Thanks to Ulrike Fischer for the solution. + + Use `\textquotesingle` for `'` in inline code. Otherwise we get + curly quotes in the PDF output (#1364). + + Use `\footnote<.>{..}` for notes in beamer, so that footnotes + do not appear before the overlays in which their markers appear + (#1525). + + Don't produce a `\label{..}` for a Div or Span element. Do produce + a `\hyperdef{..}` (#1519). + + * EPUB writer: + + + If the metadata includes `page-progression-direction` (which can be + `ltr` or `rtl`, the `page-progression-direction` attribute will + be set in the EPUB spine (#1455). + + * Custom lua writers: + + + Custom writers now work with `--template`. + + Removed HTML header scaffolding from `sample.lua`. + + Made citation information available in lua writers. + + * `--normalize` and `Text.Pandoc.Shared.normalize` now consolidate + adjacent `RawBlock`s when possible. + +### API changes + + * Added `Text.Pandoc.Readers.Docx`, exporting `readDocx` (Jesse Rosenthal). + + * Added `Text.Pandoc.Readers.EPUB`, exporting `readEPUB` (Matthew + Pickering). + + * Added `Text.Pandoc.Readers.Txt2Tags`, exporting `readTxt2Tags` (Matthew + Pickering). + + * Added `Text.Pandoc.Writers.DokuWiki`, exporting `writeDokuWiki` + (Clare Macrae). + + * Added `Text.Pandoc.Writers.Haddock`, exporting `writeHaddock`. + + * Added `Text.Pandoc.MediaBag`, exporting `MediaBag`, `lookupMedia`, + `insertMedia`, `mediaDirectory`, `extractMediaBag`. The docx and epub + readers return a pair of a `Pandoc` document and a `MediaBag` with + the media resources they contain. This can be extracted using + `--extract-media`. Writers that incorporate media (PDF, Docx, + ODT, EPUB, RTF, or HTML formats with `--self-contained`) will look + for resources in the `MediaBag` generated by the reader, in addition to + the file system or web. + + * `Text.Pandoc.Readers.TexMath`: Removed deprecated `readTeXMath`. + Renamed `readTeXMath'` to `texMathToInlines`. + + * `Text.Pandoc`: Added `Reader` data type (Matthew Pickering). + `readers` now associates names of readers with `Reader` + structures. This allows inclusion of readers, like the docx + reader, that take binary rather than textual input. + + * `Text.Pandoc.Shared`: + + + Added `capitalize` (Artyom Kazak), and replaced uses of + `map toUpper` (which give bad results for many languages). + + Added `collapseFilePath`, which removes intermediate `.` and + `..` from a path (Matthew Pickering). + + Added `fetchItem'`, which works like `fetchItem` but searches + a `MediaBag` before looking on the net or file system. + + Added `withTempDir`. + + Added `removeFormatting`. + + Added `extractSpaces` (from HTML reader) and generalized its type + so that it can be used by the docx reader (Matthew Pickering). + + Added `ordNub`. + + Added `normalizeInlines`, `normalizeBlocks`. + + `normalize` is now `Pandoc -> Pandoc` instead of + `Data a :: a -> a`. Some users may need to change their uses of + `normalize` to the newly exported `normalizeInlines` or + `normalizeBlocks`. + + * `Text.Pandoc.Options`: + + + Added `writerMediaBag` to `WriterOptions`. + + Removed deprecated and no longer used `readerStrict` in + `ReaderOptions`. This is handled by `readerExtensions` now. + + Added `Ext_compact_definition_lists`. + + Added `Ext_epub_html_exts`. + + Added `Ext_native_divs` and `Ext_native_spans`. + This allows users to turn off the default pandoc behavior of + parsing contents of div and span tags in markdown and HTML + as native pandoc Div blocks and Span inlines. + + * `Text.Pandoc.Parsing`: + + + Generalized `readWith` to `readWithM` (Matthew Pickering). + + Export `runParserT` and `Stream` (Matthew Pickering). + + Added `HasQuoteContext` type class (Matthew Pickering). + + Generalized types of `mathInline`, `smartPunctuation`, `quoted`, + `singleQuoted`, `doubleQuoted`, `failIfInQuoteContext`, + `applyMacros` (Matthew Pickering). + + Added custom `token` (Matthew Pickering). + + Added `stateInHtmlBlock` to `ParserState`. This is used to keep + track of the ending tag we're waiting for when we're parsing inside + HTML block tags. + + Added `stateMarkdownAttribute` to `ParserState`. This is used + to keep track of whether the markdown attribute has been set in + an enclosing tag. + + Generalized type of `registerHeader`, using new type classes + `HasReaderOptions`, `HasIdentifierList`, `HasHeaderMap` (Matthew + Pickering). These allow certain common functions to be reused + even in parsers that use custom state (instead of `ParserState`), + such as the MediaWiki reader. + + Moved `inlineMath`, `displayMath` from Markdown reader to Parsing, + and generalized their types (Matthew Pickering). + + * `Text.Pandoc.Pretty`: + + + Added `nestle`. + + Added `blanklines`, which guarantees a certain number of blank lines + (and no more). + +### Bug fixes + + * Markdown reader: + + + Fixed parsing of indented code in list items. Indented code + at the beginning of a list item must be indented eight spaces + from the margin (or edge of the container), or four spaces + from the list marker, whichever is greater. + + Fixed small bug in HTML parsing with `markdown_attribute`, which + caused incorrect tag nesting for input like + `<aside markdown="1">*hi*</aside>`. + + Fixed regression with intraword underscores (#1121). + + Improved parsing of inline links containing quote characters (#1534). + + Slight rewrite of `enclosure`/`emphOrStrong` code. + + Revamped raw HTML block parsing in markdown (#1330). + We no longer include trailing spaces and newlines in the + raw blocks. We look for closing tags for elements (but without + backtracking). Each block-level tag is its own `RawBlock`; + we no longer try to consolidate them (though `--normalize` will do so). + + Combine consecutive latex environments. This helps when you have + two minipages which can't have blank lines between them (#690, #1196). + + Support smallcaps through span. + `<span style="font-variant:small-caps;">foo</span>` will be + parsed as a `SmallCaps` inline, and will work in all output + formats that support small caps (#1360). + + Prevent spurious line breaks after list items (#1137). When the + `hard_line_breaks` option was specified, pandoc would formerly + produce a spurious line break after a tight list item. + + Fixed table parsing bug (#1333). + + Handle `c++` and `objective-c` as language identifiers in + github-style fenced blocks (#1318). + + Inline math must have nonspace before final `$` (#1313). + + * LaTeX reader: + + + Handle comments at the end of tables. This resolves the issue + illustrated in <http://stackoverflow.com/questions/24009489>. + + Correctly handle table rows with too few cells. LaTeX seems to + treat them as if they have empty cells at the end (#241). + + Handle leading/trailing spaces in `\emph` better. + `\emph{ hi }` gets parsed as `[Space, Emph [Str "hi"], Space]` + so that we don't get things like `* hi *` in markdown output. + Also applies to `textbf` and some other constructions (#1146). + + Don't assume preamble doesn't contain environments (#1338). + + Allow (and discard) optional argument for `\caption` (James Aspnes). + + * HTML reader: + + + Fixed major parsing problem with HTML tables. Table cells were + being combined into one cell (#1341). + + Fixed performance issue with malformed HTML tables. + We let a `</table>` tag close an open `<tr>` or `<td>` (#1167). + + Allow space between `<col>` and `</col>`. + + Added `audio` and `source` in `eitherBlockOrInline`. + + Moved `video`, `svg`, `progress`, `script`, `noscript`, `svg` from + `blockTags` to `eitherBlockOrInline`. + + `map` and `object` were mistakenly in both lists; they have been removed + from `blockTags`. + + Ignore `DOCTYPE` and `xml` declarations. + + * MediaWiki reader: + + + Don't parse backslash escapes inside `<source>` (#1445). + + Tightened up template parsing. + The opening `{{` must be followed by an alphanumeric or `:`. + This prevents the exponential slowdown in #1033. + + Support "Bild" for images. + + * DocBook reader: + + + Better handle elements inside code environments. Pandoc's document + model does not allow structure inside code blocks, but at least this way + we preserve the text (#1449). + + Support `<?asciidoc-br?>` (#1236). + + * Textile reader: + + + Fixed list parsing. Lists can now start without an intervening + blank line (#1513). + + HTML block-level tags that do not start a line are parsed as + inline HTML and do not interrupt paragraphs (as in RedCloth). + + * Org reader: + + + Make tildes create inline code (#1345). Also relabeled `code` and + `verbatim` parsers to accord with the org-mode manual. + + Respect `:exports` header argument in code blocks (Craig Bosma). + + Fixed tight lists with sublists (#1437). + + * EPUB writer: + + + Avoid excess whitespace in `nav.xhtml`. This should improve + TOC view in iBooks (#1392). + + Fixed regression on cover image. + In 1.12.4 and 1.12.4.2, the cover image would not appear properly, + because the metadata id was not correct. Now we derive the id from the + actual cover image filename, which we preserve rather than using + "cover-image." + + Keep newlines between block elements. This allows + easier diff-ability (#1424). + + Use `stringify` instead of custom `plainify`. + + Use `renderTags'` for all tag rendering. This properly handles tags + that should be self-closing. Previously `<hr/>` would appear in EPUB + output as `<hr></hr>` (#1420). + + Better handle HTML media tags. + + Handle multiple dates with OPF `event` attributes. Note: in EPUB3 we + can have only one dc:date, so only the first one is used. + + * LaTeX writer: + + + Correctly handle figures in notes. Notes can't contain figures in + LaTeX, so we fake it to avoid an error (#1053). + + Fixed strikeout + highlighted code (#1294). + Previously strikeout highlighted code caused an error. + + * ConTeXt writer: + + + Improved detection of autolinks with URLs containing escapes. + + * RTF writer: + + + Improved image embedding: `fetchItem'` is now used to get the + images, and calculated image sizes are indicated in the RTF. + + Avoid extra paragraph tags in metadata (#1421). + + * HTML writer: + + + Deactivate "incremental" inside slide speaker notes (#1394). + + Don't include empty items in the table of contents for + slide shows. (These would result from creating a slide + using a horizontal rule.) + + * MediaWiki writer: + + + Minor renaming of `st` prefixed names. + + * AsciiDoc writer: + + + Double up emphasis and strong emphasis markers in intraword + contexts, as required by asciidoc (#1441). + + * Markdown writer: + + + Avoid wrapping that might start a list, blockquote, or header (#1013). + + Use Span instead of (hackish) `SmallCaps` in `plainify`. + + Don't use braced attributes for fenced code (#1416). + If `Ext_fenced_code_attributes` is not set, the first class + attribute will be printed after the opening fence as a bare word. + + Separate adjacent lists of the same kind with an HTML comment (#1458). + + * PDF writer: + + + Fixed treatment of data uris for images (#1062). + + * Docx writer: + + + Use Compact style for empty table cells (#1353). + Otherwise we get overly tall lines when there are empty + table cells and the other cells are compact. + + Create overrides per-image for `media/` in reference docx. + This should be somewhat more robust and cover more types of images. + + Improved `entryFromArchive` to avoid an unneeded parse. + + Section numbering carries over from reference.docx (#1305). + + Simplified `abstractNumId` numbering. Instead of sequential numbering, + we assign numbers based on the list marker styles. + + * `Text.Pandoc.Options`: + + + Removed `Ext_fenced_code_attributes` from `markdown_github` + extensions. + + * `Text.Pandoc.ImageSize`: + + + Use default instead of failing if image size not found + in exif header (#1358). + + ignore unknown exif header tag rather than crashing. + Some images seem to have tag type of 256, which was causing + a runtime error. + + * `Text.Pandoc.Shared`: + + + `fetchItem`: unescape URI encoding before reading local file (#1427). + + `fetchItem`: strip a fragment like `?#iefix` from the extension before + doing mime lookup, to improve mime type guessing. + + Improved logic of `fetchItem`: absolute URIs are fetched from the net; + other things are treated as relative URIs if `sourceURL` is `Just _`, + otherwise as file paths on the local file system. + + `fetchItem` now properly handles links without a protocol (#1477). + + `fetchItem` now escapes characters not allowed in URIs before trying + to parse the URIs. + + Fixed runtime error with `compactify'DL` on certain lists (#1452). + + * `pandoc.hs`: Don't strip path off of `writerSourceURL`: the path is + needed to resolve relative URLs when we fetch resources (#750). + + * `Text.Pandoc.Parsing` + + + Simplified `dash` and `ellipsis` (#1419). + + Removed `(>>~)` in favor of the equivalent `(<*)` (Matthew Pickering). + + Generalized functions to use `ParsecT` (Matthew Pickering). + + Added `isbn` and `pmid` to list of recognized schemes (Matthew + Pickering). + +### Template changes + + * Added haddock template. + * EPUB3: Added `type` attribute to `link` tags. They are supposed to + be "advisory" in HTML5, but kindlegen seems to require them. + * EPUB3: Put title page in section with `epub:type="titlepage"`. + * LaTeX: Made `\subtitle` work properly (#1327). + * LaTeX/Beamer: remove conditional around date (#1321). + * LaTeX: Added `lot` and `lof` variables, which can be set to + get `\listoftables` and `\listoffigures` (#1407). Note that + these variables can be set at the command line with `-Vlot -Vlof` + or in YAML metadata. + +### Under the hood improvements + + * Rewrote normalize for efficiency (#1385). + + * Rewrote Haddock reader to use `haddock-library` (#1346). + + + This brings pandoc's rendering of haddock markup in line + with the new haddock. + + Fixed line breaks in `@` code blocks. + + alex and happy are no longer build-depends. + + * Added `Text.Pandoc.Compat.Directory` to allow building against + different versions of the `directory` library. + + + Added `Text.Pandoc.Compat.Except` to allow building against + different versions of `mtl`. + + * Code cleanup in some writers, using Reader monad to avoid + passing options parameter around (Matej Kollar). + + * Improved readability in `pandoc.hs`. + + * Miscellaneous code cleanups (Artyom Kazak). + + * Avoid `import Prelude hiding (catch)` (#1309, thanks to Michael + Thompson). + + * Changed `http-conduit` flag to `https`. Depend on `http-client` + and `http-client-tls` instead of `http-conduit`. (Note: pandoc still + depends on `conduit` via `yaml`.) + + * Require `highlighting-kate >= 0.5.8.5` (#1271, #1317, Debian #753299). + This change to highlighting-kate means that PHP fragments no longer need + to start with `<?php`. It also fixes a serious bug causing failures with + ocaml and fsharp. + + * Require latest `texmath`. This fixes `\tilde{E}` and allows + `\left` to be used with `]`, `)` etc. (#1319), among many other + improvements. + + * Require latest `zip-archive`. This has fixes for unicode path names. + + * Added tests for plain writer. + + * `Text.Pandoc.Templates`: + + + Fail informatively on template syntax errors. + With the move from parsec to attoparsec, we lost good error + reporting. In fact, since we weren't testing for end of input, + malformed templates would fail silently. Here we revert back to + Parsec for better error messages. + + Use `ordNub` (#1022). + + * Benchmarks: + + + Made benchmarks compile again (Artyom Kazak). + + Fixed so that the failure of one benchmark does not prevent others + from running (Artyom Kazak). + + Use `nfIO` instead of the `getLength` trick to force full evaluation. + + Changed benchmark to use only the test suite, so that benchmarks + run more quickly. + + * Windows build script: + + + Add `-windows` to file name. + + Use one install command for pandoc, pandoc-citeproc. + + Force install of pandoc-citeproc. + + * `make_osx_package`: Call zip file `pandoc-VERSION-osx.zip`. + The zip should not be named `SOMETHING.pkg.zip`, or OSX finder + will extract it into a folder named `SOMETHING.pkg`, which it + will interpret as a defective package (#1308). + + * `README`: + + + Made headers for all extensions so they have IDs and can be + linked to (Beni Cherniavsky-Paskin). + + Fixed typos (Phillip Alday). + + Fixed documentation of attributes (#1315). + + Clarified documentation on small caps (#1360). + + Better documentation for `fenced_code_attributes` extension + (Caleb McDaniel). + + Documented fact that you can put YAML metadata in a separate file + (#1412). + + +## pandoc 1.12.4.2 (2014-05-14) + + * Require highlighting-kate >= 0.5.8. Fixes a performance regression. + + * Shared: `addMetaValue` now behaves slightly differently: + if both the new and old values are lists, it concatenates their + contents to form a new list. + + * LaTeX reader: + + + Set `bibliography` in metadata from `\bibliography` or + `\addbibresource` command. + + Don't error on `%foo` with no trailing newline. + + * Org reader: + + + Support code block headers (`#+BEGIN_SRC ...`) (Albert Krewinkel). + + Fix parsing of blank lines within blocks (Albert Krewinkel). + + Support pandoc citation extension (Albert Krewinkel). This can + be turned off by specifying `org-citation` as the input format. + + * Markdown reader: + + + `citeKey` moved to `Text.Pandoc.Parsing` so it can be used by + other readers (Albert Krewinkel). + + * `Text.Pandoc.Parsing`: + + + Added `citeKey` (see above). + + Added `HasLastStrPosition` type class and `updateLastStrPos` + and `notAfterString` functions. + + * Updated copyright notices (Albert Krewinkel). + + * Added default.icml to data files so it installs with the package. + + * OSX package: + + + The binary is now built with options to ensure that it can be + used with OSX 10.6+. + + Moved OSX package materials to osx directory. + + Added OSX package uninstall script, included in the zip container + (thanks to Daniel T. Staal). + +## pandoc 1.12.4 (2014-05-07) + + * Made it possible to run filters that aren't executable + (#1096). Pandoc first tries to find the executable (searching + the path if path isn't given). If it fails, but the file + exists and has a `.py`, `.pl`, `.rb`, `.hs`, or `.php` + extension, pandoc runs the filter using the appropriate + interpreter. This should make it easier to use filters on + Windows, and make it more convenient for everyone. + + * Added Emacs org-mode reader (Albert Krewinkel). + + * Added InDesign ICML Writer (mb21). + + * MediaWiki reader: + + + Accept image links in more languages (Jaime Marquínez Ferrándiz). + + Fixed bug in certain nested lists (#1213). If a level 2 list was + followed by a level 1 list, the first item of the level 1 list + would be lost. + + Handle table rows containing just an HTML comment (#1230). + + * LaTeX reader: + + + Give better location information on errors, pointing to line + numbers within included files (#1274). + + LaTeX reader: Better handling of `table` environment (#1204). + Positioning options no longer rendered verbatim. + + Better handling of figure and table with caption (#1204). + + Handle `@{}` and `p{length}` in tabular. The length is not actually + recorded, but at least we get a table (#1180). + + Properly handle `\nocite`. It now adds a `nocite` metadata + field. Citations there will appear in the bibliography but not + in the text (unless you explicitly put a `$nocite$` variable + in your template). + + * Markdown reader: + + + Ensure that whole numbers in YAML metadata are rendered without + decimal points. (This became necessary with changes to aeson + and yaml libraries. aeson >= 0.7 and yaml >= 0.8.8.2 are now required.) + + Fixed regression on line breaks in strict mode (#1203). + + Small efficiency improvements. + + Improved parsing of nested `div`s. Formerly a closing `div` tag + would be missed if it came right after other block-level tags. + + Avoid backtracking when closing `</div>` not found. + + Fixed bug in reference link parsing in `markdown_mmd`. + + Fixed a bug in list parsing (#1154). When reading a raw list + item, we now strip off up to 4 spaces. + + Fixed parsing of empty reference link definitions (#1186). + + Made one-column pipe tables work (#1218). + + * Textile reader: + + + Better support for attributes. Instead of being ignored, attributes + are now parsed and included in Span inlines. The output will be a bit + different from stock textile: e.g. for `*(foo)hi*`, we'll get + `<em><span class="foo">hi</span></em>` instead of + `<em class="foo">hi</em>`. But at least the data is not lost. + + Improved treatment of HTML spans (%) (#1115). + + Improved link parsing. In particular we now pick up on attributes. + Since pandoc links can't have attributes, we enclose the whole link in + a span if there are attributes (#1008). + + Implemented correct parsing rules for inline markup (#1175, Matthew + Pickering). + + Use Builder (Matthew Pickering). + + * DocBook reader: + + + Better treatment of `formalpara`. We now emit the title (if present) + as a separate paragraph with boldface text (#1215). + + Set metadata `author` not `authors`. + + Added recognition of `authorgroup` and `releaseinfo` elements (#1214, + Matthew Pickering). + + Converted current meta information parsing in DocBook to a more + extensible version which is aware of the more recent meta + representation (Matthew Pickering). + + * HTML reader: + + + Require tagsoup 0.13.1, to fix a bug with parsing of script tags + (#1248). + + Treat processing instructions & declarations as block. Previously + these were treated as inline, and included in paragraph tags in HTML + or DocBook output, which is generally not what is wanted (#1233). + + Updated `closes` with rules from HTML5 spec. + + Use Builder (Matthew Pickering, #1162). + + * RST reader: + + + Remove duplicate `http` in PEP links (Albert Krewinkel). + + Make rst figures true figures (#1168, CasperVector) + + Enhanced Pandoc's support for rST roles (Merijn Verstaaten). + rST parser now supports: all built-in rST roles, new role definition, + role inheritance, though with some limitations. + + Use `author` rather than `authors` in metadata. + + Better handling of directives. We now correctly handle field + lists that are indented more than three spaces. We treat an + `aafig` directive as a code block with attributes, so it can be + processed in a filter (#1212). + + * LaTeX writer: + + + Mark span contents with label if span has an ID (Albert Krewinkel). + + Made `--toc-depth` work well with books in latex/pdf output (#1210). + + Handle line breaks in simple table cells (#1217). + + Workaround for level 4-5 headers in quotes. These previously produced + invalid LaTeX: `\paragraph` or `\subparagraph` in a `quote` environment. + This adds an `mbox{}` in these contexts to work around the problem. + See <http://tex.stackexchange.com/a/169833/22451> (#1221). + + Use `\/` to avoid en-dash ligature instead of `-{}-` (Vaclav Zeman). + This is to fix LuaLaTeX output. The `-{}-` sequence does not avoid the + ligature with LuaLaTeX but `\/` does. + + Fixed string escaping in `hyperref` and `hyperdef` (#1130). + + * ConTeXt writer: Improved autolinks (#1270). + + * DocBook writer: + + + Improve handling of hard line breaks in Docbook writer + (Neil Mayhew). Use a `<literallayout>` for the entire paragraph, not + just for the newline character. + + Don't let line breaks inside footnotes influence the enclosing + paragraph (Neil Mayhew). + + Distinguish tight and loose lists in DocBook output, using + `spacing="compact"` (Neil Mayhew, #1250). + + * Docx writer: When needed files are not present in the user's + `reference.docx`, fall back on the versions in the `reference.docx` + in pandoc's data files. This fixes a bug that occurs when a + `reference.docx` saved by LibreOffice is used. (#1185) + + * EPUB writer: + + + Include extension in epub ids. This fixes a problem with duplicate + extensions for fonts and images with the same base name but different + extensions (#1254). + + Handle files linked in raw `img` tags (#1170). + + Handle media in `audio` source tags (#1170). + Note that we now use a `media` directory rather than `images`. + + Incorporate files linked in `video` tags (#1170). `src` and `poster` + will both be incorporated into `content.opf` and the epub container. + + * HTML writer: + + + Add colgroup around col tags (#877). Also affects EPUB writer. + + Fixed bug with unnumbered section headings. Unnumbered section + headings (with class `unnumbered`) were getting numbers. + + Improved detection of image links. Previously image links with + queries were not recognized, causing `<embed>` to be used instead + of `<img>`. + + * Man writer: Ensure that terms in definition lists aren't line wrapped + (#1195). + + * Markdown writer: + + + Use proper escapes to avoid unwanted lists (#980). Previously we used + 0-width spaces, an ugly hack. + + Use longer backtick fences if needed (#1206). If the content contains a + backtick fence and there are attributes, make sure longer fences are + used to delimit the code. Note: This works well in pandoc, but github + markdown is more limited, and will interpret the first string of three + or more backticks as ending the code block. + + * RST writer: Avoid stack overflow with certain tables (#1197). + + * RTF writer: Fixed table cells containing paragraphs. + + * Custom writer: + + + Correctly handle UTF-8 in custom lua scripts (#1189). + + Fix bugs with lua scripts with mixed-case filenames and + paths containing `+` or `-` (#1267). Note that `getWriter` + in `Text.Pandoc` no longer returns a custom writer on input + `foo.lua`. + + * AsciiDoc writer: Handle multiblock and empty table cells + (#1245, #1246). Added tests. + + * `Text.Pandoc.Options`: Added `readerTrace` to `ReaderOptions` + + * `Text.Pandoc.Shared`: + + + Added `compactify'DL` (formerly in markdown reader) (Albert Krewinkel). + + Fixed bug in `toRomanNumeral`: numbers ending with '9' would + be rendered as Roman numerals ending with 'IXIV' (#1249). Thanks to + Jesse Rosenthal. + + `openURL`: set proxy with value of http_proxy env variable (#1211). + Note: proxies with non-root paths are not supported, due to + limitations in `http-conduit`. + + * `Text.Pandoc.PDF`: + + + Ensure that temp directories deleted on Windows (#1192). The PDF is + now read as a strict bytestring, ensuring that process ownership will + be terminated, so the temp directory can be deleted. + + Use `/` as path separators in a few places, even on Windows. + This seems to be necessary for texlive (#1151, thanks to Tim Lin). + + Use `;` for `TEXINPUTS` separator on Windows (#1151). + + Changes to error reporting, to handle non-UTF8 error output. + + * `Text.Pandoc.Templates`: + + + Removed unneeded datatype context (Merijn Verstraaten). + + + YAML objects resolve to "true" in conditionals (#1133). + Note: If `address` is a YAML object and you just have `$address$` + in your template, the word `true` will appear, which may be + unexpected. (Previously nothing would appear.) + + * `Text.Pandoc.SelfContained`: Handle `poster` attribute in `video` + tags (#1188). + + * `Text.Pandoc.Parsing`: + + + Made `F` an instance of Applicative (#1138). + + Added `stateCaption`. + + Added `HasMacros`, simplified other typeclasses. + Removed `updateHeaderMap`, `setHeaderMap`, `getHeaderMap`, + `updateIdentifierList`, `setIdentifierList`, `getIdentifierList`. + + Changed the smart punctuation parser to return `Inlines` + rather than `Inline` (Matthew Pickering). + + Changed `HasReaderOptions`, `HasHeaderMap`, `HasIdentifierList` + from typeclasses of monads to typeclasses of states. This simplifies + the instance definitions and provides more flexibility. Generalized + type of `getOption` and added a default definition. Removed + `askReaderOption`. Added `extractReaderOption`. Added + `extractHeaderMap` and `updateHeaderMap` in `HasHeaderMap`. + Gave default definitions for `getHeaderMap`, `putHeaderMap`, + `modifyHeaderMap`. Added `extractIdentifierList` and + `updateIdentifierList` in `HasIdentifierList`. Gave defaults + for `getIdentifierList`, `putIdentifierList`, and + `modifyIdentifierList`. The ultimate goal here is to allow different + parsers to use their own, tailored parser states (instead of + `ParserState`) while still using shared functions. + + * Template changes: + + + LaTeX template: Use `fontenc` package only with `pdflatex` (#1164). + + LaTeX template: Add `linestretch` and `fontfamily` variables. + + LaTeX template: Conditionalize author and date commands. + + Beamer template: Consistent styles for figure and table captions + (aaronwolen). + + LaTeX and beamer template: Adjust widths correctly for oversized + images. Use `\setkeys{Gin}{}` to set appropriate defaults for + `\includegraphics` (Yihui Xie, Garrick Aden-Buie). Load + `upquote` only after `fontenc` (Yihui Xie). + + Beamer template: Added caption package (#1200). + + Beamer template: changes for better unicode handling (KarolS). + + DocBook template: use `authorgroup` if there are authors. + + revealjs template: Move `include-after` to end (certainlyakey). + + revealjs template: Fixed PDF print function (#1220, kevinkenan). + + * Bumped version bounds of dependencies. + + * Added a `--trace` command line option, for debugging backtracking + bugs. So far this only works with the markdown reader. + + * MathMLinHTML: Fixed deprecation warning (#362, gwern, Albert Krewinkel). + + * Updated travis script to test with multiple GHC versions. + + * Force failure of a Travis build if GHC produces warnings (Albert + Krewinkel). + + * Add `.editorconfig` (Albert Krewinkel). + See <http://editorconfig.org/> for details. + + * Give more useful error message if '-t pdf' is specified (#1155). + + * Added `Cite`, `SmallCaps` to `Arbitrary` instance (#1269). + + * Allow `html4` as a synonym of `html` as a reader (it already works + as a writer). + + * README: + + + Added an explanation of how to use YAML metadata to + force items to appear in the bibliography without citations in + the text (like LaTeX `\nocite`). + + Added note to `--bibtex/--natbib`: not for use in making PDF + (#1194, thanks to nahoj). + + Added explanatory notes about `--natbib` and `--biblatex`. + + Added specification of legal syntax for citation keys. + + Fixed variable defaults documentation (Albert Krewinkel). + + * Removed copyright statements for files that have been removed + (Albert Krewinkel). + + * Moved some doc files from `data-files` to `extra-source-files` (#1123). + They aren't needed at runtime. We keep README and COPYRIGHT in data + to ensure that they'll be available on all systems on which pandoc + is installed. + + * Use cabal sandboxes in Windows build script. + +## pandoc 1.12.3.3 (2014-02-03) + + * To changes to source; recompiled tarball with latest alex and + happy, so they will work with GHC 7.8. + +## pandoc 1.12.3.2 (2014-02-03) + + * Bumped version bounds for blaze-html, blaze-markup. + + * ImageSize: Avoid use of lookAhead, which is not in binary >= 0.6 + (#1124). + + * Fixed mediawiki ordered list parsing (#1122). + + * HTML reader: Fixed bug reading inline math with `$$` (#225). + + * Added support for LaTeX style literate Haskell code blocks in rST + (Merijn Verstraaten). + +## pandoc 1.12.3.1 (2014-01-14) + + * Relaxed version constraint on binary, allowing the use of binary 0.5. + + +## pandoc 1.12.3 (2014-01-10) + + * The `--bibliography` option now sets the `biblio-files` variable. + So, if you're using `--natbib` or `--biblatex`, you can just use + `--bibliography=foo.bib` instead of `-V bibliofiles=foo`. + + * Don't run pandoc-citeproc filter if `--bibliography` is + used together with `--natbib` or `--biblatex` (Florian Eitel). + + * Template changes: + + + Updated beamer template to include booktabs. + + Added `abstract` variable to LaTeX template. + + Put `header-includes` after `title` in LaTeX template (#908). + + Allow use of `\includegraphics[size]` in beamer. + This just required porting a macro definition from the default + LaTeX template to the default beamer template. + + * `reference.docx`: Include `FootnoteText` style. + Otherwise Word ignores the style, even when specified in the `pPr`. + (#901) + + * `reference.odt`: Tidied `styles.xml`. + + * Relaxed version bounds for dependencies. + + * Added `withSocketsDo` around http conduit code in `openURL`, + so it works on Windows (#1080). + + * Added `Cite` function to `sample.lua`. + + * Markdown reader: + + + Fixed regression in title blocks (#1089). + If author field was empty, date was being ignored. + + Allow backslash-newline hard line breaks in grid and + multiline table cells. + + Citation keys may now start with underscores, and may contain + underscores adjacent to internal punctuation. + + * LaTeX reader: + + + Add support for `Verb` macro (jrnold) (#1090). + + Support babel-style quoting: `` "`..."' ``. + + * Properly handle script blocks in strict mode. (That is, + `markdown-markdown_in_html_blocks`.) Previously a spurious + `<p>` tag was being added (#1093). + + * Docbook reader: Avoid failure if `tbody` contains no `tr` or `row` + elements. + + * LaTeX writer: + + + Factored out function for table cell creation. + + Better treatment of footnotes in tables. + Notes now appear in the regular sequence, rather than in the + table cell. (This was a regression in 1.10.) + + * HTML reader: Parse name/content pairs from meta tags as metadata. + Closes #1106. + + * Moved `fixDisplayMath` from Docx writer to `Writer.Shared`. + + * OpenDocument writer: Fixed `RawInline`, `RawBlock` so they don't escape. + + * ODT writer: Use mathml for proper rendering of formulas. + Note: LibreOffice's support for this seems a bit buggy. But + it should be better than what we had before. + + * RST writer: Ensure no blank line after def in definition list (#992). + + * Markdown writer: Don't use tilde code blocks with braced attributes in + `markdown_github` output. A consequence of this change is that the + backtick form will be preferred in general if both are enabled. That + is good, as it is much more widespread than the tilde form. (#1084) + + * Docx writer: Fixed problem with some modified reference docx files. + Include `word/_rels/settings.xml.rels` if it exists, as well as other + `rels` files besides the ones pandoc generates explicitly. + + * HTML writer: + + + With `--toc`, headers no longer link to themselves (#1081). + + Omit footnotes from TOC entries. Otherwise we get doubled + footnotes when headers have notes! + + * EPUB writer: + + + Avoid duplicate notes when headings contain notes. + This arose because the headings are copied into the metadata + "title" field, and the note gets rendered twice. We strip the + note now before putting the heading in "title". + + Strip out footnotes from toc entries. + + Fixed bug with `--epub-stylesheet`. Now the contents of + `writerEpubStylesheet` (set by `--epub-stylesheet`) + should again work, and take precedence over a stylesheet specified + in the metadata. + + * `Text.Pandoc.Pretty`: Added `nestle`. API change. + + * `Text.Pandoc.MIME`: Added `wmf`, `emf`. + + * `Text.Pandoc.Shared`: `fetchItem` now handles image URLs beginning + with `//`. + + * `Text.Pandoc.ImageSize`: Parse EXIF format JPEGs. Previously + we could only get size information for JFIF format, which led + to squished images in Word documents. Closes #976. + + * Removed old `MarkdownTest_1.0.3` directory (#1104). + + +## pandoc 1.12.2.1 (2013-12-08) + + * Markdown reader: Fixed regression in list parser, involving + continuation lines containing raw HTML (or even verbatim raw HTML). + +## pandoc 1.12.2 (2013-12-07) + + * Metadata may now be included in YAML blocks in a markdown document. + For example, + + --- + title: + - type: main + text: My Book + - type: subtitle + text: An investigation of metadata + creator: + - role: author + text: John Smith + - role: editor + text: Sarah Jones + identifier: + - scheme: DOI + text: doi:10.234234.234/33 + publisher: My Press + rights: (c) 2007 John Smith, CC BY-NC + cover-image: img/mypic.jpg + stylesheet: style.css + ... + + Metadata may still be provided using `--epub-metadata`; it will + be merged with the metadata in YAML blocks. + + * EPUB writer: + + + `meta` tags are now used instead of `opf` attributes for EPUB3. + + Insert "svg" property as needed in opf (EPUB 3). + + Simplify `imageTypeOf` using `getMimeType`. + + Add properties attribute to `cover-image` item for EPUB 3. + + Don't include node for `cover.xhtml` if no cover! + + Ensure that same identifier is used throughout (#1044). + If an identifier is given in metadata, we use that; otherwise + we generate a random uuid. + + Add cover reference to guide element (EPUB 2) (Shaun Attfield). + Fixes an issue with Calibre putting the cover at the end of the book + if the spine has `linear="no"`. Apparently this is best practice + for other converters as well: + <http://www.idpf.org/epub/20/spec/OPF_2.0.1_draft.htm#Section2.6>. + + Allow `stylesheet` in metadata. The value is a path to the stylesheet. + + Allow partial dates: `YYYY`, `YYYY-MM`. + + * Markdown writer: Fix rendering of tight sublists (#1050). + Previously a spurious blank line was included after a tight sublist. + + * ODT writer: Add `draw:name` attribute to `draw:frame` elements (#1069). + This is reported to be necessary to avoid an error from recent + versions of Libre Office when files contain more than one image + Thanks to wmanley for reporting and diagnosing the problem. + + * ConTeXt writer: Don't hardcode figure/table placement and numbering. + Instead, let this be set in the template, using `\setupfloat`. + Thanks to on4aa and Aditya Mahajan for the suggestion (#1067). + + * Implemented CSL flipflopping spans in DOCX, LaTeX, and HTML writers. + + * Fixed bug with markdown intraword emphasis. Closes #1066. + + * Docbook writer: Hierarchicalize block content in metadata. + Previously headers just disappeared from block-level metadata + when it was used in templates. Now we apply the 'hierarchicalize' + transformation. Note that a block headed by a level-2 header will + turn into a `<sect1>` element. + + * OpenDocument writer: Skip raw HTML (#1035). + Previously it was erroneously included as verbatim text. + + * HTML/EPUB writer, footnotes: Put `<sup>` tag inside `<a>` tags. + This allows better control of formatting, since the `<a>` + tags have a distinguishing class (#1049). + + * Docx writer: + + + Use mime type info returned by fetchItem. + + Fixed core metadata (#1046). + Don't create empty date nodes if no date given. + Don't create multiple `dc:creator` nodes; instead separate by + semicolons. + + Fix URL for core-properties in `_rels/.rels` (#1046). + + * Plain writer: don't print `<span>` tags. + + * LaTeX writer: + + + Fix definition lists with internal links in terms (#1032). + This fix puts braces around a term that contains an internal + link, to avoid problems with square brackets. + + Properly escape pdftitle, pdfauthor (#1059). + + Use booktabs package for tables (thanks to Jose Luis Duran). + + * Updated beamer template. Now references should work properly + (in a slide) when `--biblatex` or `--natbib` is used. + + * LaTeX reader: + + + Parse contents of curly quotes or matched `"` as quotes. + + Support `\textnormal` as span with class `nodecor`. + This is needed for pandoc-citeproc. + + Improved citation parsing. This fixes a run-time error that occurred + with `\citet{}` (empty list of keys). It also ensures that empty keys + don't get produced. + + * MediaWiki reader: Add automatic header identifiers. + + * HTML reader: + + + Use pandoc `Div` and `Span` for raw `<div>`, `<span>` when + `--parse-raw`. + + Recognize `svg` tags as block level content (thanks to MinRK). + + Parse LaTeX math if appropriate options are set. + + * Markdown reader: + + + Yaml block must start immediately after `---`. If there's a blank + line after `---`, we interpreted it as a horizontal rule. + + Correctly handle empty bullet list items. + + Stop parsing "list lines" when we hit a block tag. + This fixes exponential slowdown in certain input, e.g. + a series of lists followed by `</div>`. + + * Slides: Preserve `<div class="references">` in references slide. + + * `Text.Pandoc.Writer.Shared`: + + + Fixed bug in `tagWithAttrs`. A space was omitted before key-value + attributes, leading to invalid HTML. + + `normalizeDate`: Allow dates with year only (thanks to Shaun Attfield). + + Fixed bug in `openURL` with `data:` URIs. Previously the base-64 + encoded bytestring was returned. We now decode it so it's a proper + image! + + * DocBook reader: Handle numerical attributes starting with decimal. + Also use `safeRead` instead of `read`. + + * `Text.Pandoc.Parsing`: + + + Generalized type of `registerHeader`, using new type classes + `HasReadeOptions`, `HasIdentifierList`, `HasHeaderMap`. + These allow certain common functions to be reused + even in parsers that use custom state (instead of `ParserState`), + such as the MediaWiki reader. + + Moved inlineMath, displayMath from Markdown reader to Parsing. + Generalize their types and export them from Parsing. (API change.) + + * `Text.Pandoc.Readers.TexMath`: Export `readTeXMath'`, which attends + to display/inline. Deprecate `readTeXMath`, and use `readTeXMath'` + in all the writers. Require `texmath >= 0.6.5.2`. + + * `Text.Pandoc.MIME`: + + + Add entry for `jfif`. + + In looking up extensions, drop the encoding info. + E.g. for 'image/jpg;base64' we should lookup 'image/jpg'. + + * Templates: Changed how array variables are resolved. Previously if + `foo` is an array (which might be because multiple values were set on + the command line), `$foo$` would resolve to the concatenation of the + elements of foo. This is rarely useful behavior. It has been changed + so that the first value is rendered. Of course, you can still iterate + over the values using `$for(foo)$`. This has the result that you can + override earlier settings using `-V` by putting new values later on the + command line, which is useful for many purposes. + + * `Text.Pandoc`: Don't default to `pandocExtensions` for all writers. + + * Allow "epub2" as synonym for "epub", "html4" for "html". + + * Don't look for slidy files in data files with `--self-contained`. + + * Allow `https:` command line arguments to be downloaded. + + * Fixed `make_osx_package.sh` so data files embedded in `pandoc-citeproc`. + +## pandoc 1.12.1 (2013-10-20) + + * `Text.Pandoc.Definition`: Changed default JSON serialization format. + Instead of `{"Str": "foo"}`, for example, we now have `{"t": "Str", + "c": "foo"}`. This new format is easier to work with outside of Haskell. + Incidentally, "t" stands for "tag", "c" for "contents". + + * MediaWiki reader: Trim contents of `<math>` tags, to avoid problems + when converting to markdown (#1027). + + * LaTeX reader: + + + Ensure that preamble doesn't contribute to the text of + the document. + + Fixed character escaping in `\url{}`. Previously `\~` wasn't handled + properly, among others. + + Parse `{groups}` as `Span`. This is needed for accurate conversion of + bibtex titles, since we need to know what was protected from + titlecase conversions. + + * LaTeX writer: + + + Specially escape non-ascii characters in labels. + Otherwise we can get compile errors and other bugs when + compiled with pdflatex (#1007). Thanks to begemotv2718 for the fix. + + Add link anchors for code blocks with identifiers (#1025). + + * Throughout the code, use `isURI` instead of `isAbsoluteURI`. + It allows fragments identifiers. + + * Slide formats: + + + A Div element with class "notes" is treated as speaker + notes. Currently beamer goes to `\note{}`, revealjs to + `<aside class="notes">`, and the notes are simply suppressed in + other formats (#925). + + Fixed `. . .` (pause) on HTML slide formats. Closes #1029. + The old version caused a pause to be inserted before the first + material on a slide. This has been fixed. + + Removed data files for s5, slideous, slidy. + Users of s5 and slideous will have to download the needed + files, as has been documented for some time in the README. + By default, slidy code will be sought on the web, as before. + + * HTML writer: Insert command to typeset mathjax only in slideous output + (#966, #1012). + + * RST writer: Skip spaces after display math. Otherwise we get indentation + problems, and part of the next paragraph may be rendered as part of the + math. + + * OpenDocument writer: Fix formatting of strikeout code (#995), + thanks to wilx. don't use `font-face-decls` variable. + + * Fixed test suite so it works with cabal sandboxes. + +## pandoc 1.12.0.2 (2013-09-20) + + * Removed an unused dependency (`stringable`) from pandoc.cabal. + This will help packagers, but users should not need to upgrade. + +## pandoc 1.12.0.1 (2013-09-20) + + * Allow `--metadata` to be repeated for the same key to form a list. + This also has the effect that `--bibliography` can be repeated, + as before. + + * Handle boolean values in `--metadata`. Note that anything not parseable + as a YAML boolean or string is treated as a literal string. + You can get a string value with "yes", or any of the strings interpretable + as booleans, by quoting it: + + -M boolvalue=yes -M stringvalue='"yes"' + + * LaTeX writer: Don't print references if `--natbib` or `--biblatex` + option used. + + * DOCX writer: Add `settings.xml` to the zip container. Fixes a bug + in which docx files could not be read by some versions of Word + and LibreOffice (#990). + + * Fixed a regression involving slide shows with bibliographies. + The Div container around references messed up the procedure for carving + a document into slides. So we now remove the surrounding Div in + `prepSlides`. + + * More informative error message when a filter is not found in path. + + * Depend on pandoc-types 1.12.1. This provide `ToJSONFilter` + instances for `Data a => a -> [a]` and `Data a => a -> IO [a]`. + + * Don't use unicode_collation in building OSX package: + it adds something like 50MB of dependencies to the package. + + * Declare alex and happy as build-tools (#986). + +## pandoc 1.12 (2013-09-15) + +### New features + + * Much more flexible metadata, including arbitrary fields and structured + values. Metadata can be specified flexibly in pandoc markdown using + YAML metadata blocks, which may occur anywhere in the document: + + --- + title: Here is my title. + abstract: | + This is the abstract. + + 1. It can contain + 2. block content + and *inline markup* + + tags: [cat, dog, animal] + ... + + Metadata fields automatically populate template variables. + + * Added `opml` (OPML) as input and output format. The `_note` attribute, + used in OmniOutliner and supported by multimarkdown, is supported. + We treat the contents as markdown blocks under a section header. + + * Added `haddock` (Haddock markup) as input format (David Lazar). + + * Added `revealjs` output format, for reveal.js HTML 5 slide shows. + (Thanks to Jamie F. Olson for the initial patch.) + Nested vertical stacks are used for hierarchical structure. + Results for more than one level of nesting may be odd. + + * Custom writers can now be written in lua. + + pandoc -t data/sample.lua + + will load the script sample.lua and use it as a custom writer. + (For a sample, do `pandoc --print-default-data-file sample.lua`.) + Note that pandoc embeds a lua interpreter, so lua need not be + installed separately. + + * New `--filter/-F` option to make it easier to run "filters" + (Pandoc AST transformations that operate on JSON serializations). + Filters are always passed the name of the output format, so their + behavior can be tailored to it. The repository + <https://github.com/jgm/pandocfilters> contains + a python module for writing pandoc filters in python, with + a number of examples. + + * Added `--metadata/-M` option. + This is like `--variable/-V`, but actually adds to metadata, not + just variables. + + * Added `--print-default-data-file` option, which allows printing + of any of pandoc's data files. (For example, + `pandoc --print-default-data-file reference.odt` will print + `reference.odt`.) + + * Added syntax for "pauses" in slide shows: + + This gives + + . . . + + me pause. + + * New markdown extensions: + + + `ignore_line_breaks`: causes intra-paragraph line breaks to be ignored, + rather than being treated as hard line breaks or spaces. This is useful + for some East Asian languages, where spaces aren't used between words, + but text is separated into lines for readability. + + `yaml_metadata_block`: Parse YAML metadata blocks. (Default.) + + `ascii_identifiers`: This will force `auto_identifiers` to use ASCII + only. (Default for `markdown_github`.) (#807) + + `lists_without_preceding_blankline`: Allow lists to start without + preceding blank space. (Default for `markdown_github`.) (#972) + +### Behavior changes + + * `--toc-level` no longer implies `--toc`. + Reason: EPUB users who don't want a visible TOC may still want + to set the TOC level for in the book navigation. + + * `--help` now prints in and out formats in alphabetical order, and + says something about PDF output (#720). + + * `--self-contained` now returns less verbose output (telling you + which URLs it is fetching, but not giving the full header). In + addition, there are better error messages when fetching a URL fails. + + * Citation support is no longer baked in to core pandoc. Users who + need citations will need to install and use a separate filter + (`--filter pandoc-citeproc`). This filter will take `bibliography`, + `csl`, and `citation-abbreviations` from the metadata, though it + may still be specified on the command line as before. + + * A `Cite` element is now created in parsing markdown whether or not + there is a matching reference. + + * The `pandoc-citeproc` script will put the bibliography at the + end of the document, as before. However, it will be put inside a `Div` + element with class "references", allowing users some control + over the styling of references. A final header, if any, will + be included in the `Div`. + + * The markdown writer will not print a bibliography if the + `citations` extension is enabled. (If the citations are formatted + as markdown citations, it is redundant to have a bibliography, + since one will be generated automatically.) + + * Previously we used to store the directory of the first input file, + even if it was local, and used this as a base directory for finding + images in ODT, EPUB, Docx, and PDF. This has been confusing to many + users. So we now look for images relative to the current + working directory, even if the first file argument is in another + directory. Note that this change may break some existing workflows. + If you have been assuming that relative links will be interpreted + relative to the directory of the first file argument, you'll need + to make that the current directory before running pandoc. (#942) + + * Better error reporting in some readers, due to changes in `readWith`: + the line in which the error occurred is printed, with a caret pointing + to the column. + + * All slide formats now support incremental slide view for definition lists. + + * Parse `\(..\)` and `\[..\]` as math in MediaWiki reader. + Parse `:<math>...</math>` as display math. These notations are used with + the MathJax MediaWiki extension. + + * All writers: template variables are set automatically from metadata + fields. However, variables specified on the command line with + `--variable` will completely shadow metadata fields. + + * If `--variable` is used to set many variables with the same name, + a list is created. + + * Man writer: The `title`, `section`, `header`, and `footer` can now + all be set individually in metadata. The `description` variable has been + removed. Quotes have been added so that spaces are allowed in the + title. If you have a title that begins + + COMMAND(1) footer here | header here + + pandoc will still parse it into a title, section, header, and + footer. But you can also specify these elements explicitly (#885). + + * Markdown reader + + + Added support for YAML metadata blocks, which can come anywhere + in the document (not just at the beginning). A document can contain + multiple YAML metadata blocks. + + HTML span and div tags are parsed as pandoc Span and Div elements. + + * Markdown writer + + + Allow simple tables to be printed as grid tables, + if other table options are disabled. This means you can do + `pandoc -t markdown-pipe_tables-simple_tables-multiline_tables` + and all tables will render as grid tables. + + Support YAML title block (render fields in alphabetical order + to make output predictable). + +### API changes + + * `Meta` in `Text.Pandoc.Definition` has been changed to allow + structured metadata. (Note: existing code that pattern-matches + on `Meta` will have to be revised.) Metadata can now contain + indefinitely many fields, with content that can be a string, + a Boolean, a list of `Inline` elements, a list of `Block` + elements, or a map or list of these. + + * A new generic block container (`Div`) has been added to `Block`, + and a generic inline container (`Span`) has been added to `Inline`. + These can take attributes. They will render in HTML, Textile, + MediaWiki, Org, RST and Markdown (with `markdown_in_html` + extension) as HTML `<div>` and `<span>` elements; in other formats + they will simply pass through their contents. But they can be + targeted by scripts. + + * `Format` is now a newtype, not an alias for String. + Equality comparisons are case-insensitive. + + * Added `Text.Pandoc.Walk`, which exports hand-written tree-walking + functions that are much faster than the SYB functions from + `Text.Pandoc.Generic`. These functions are now used where possible + in pandoc's code. (`Tests.Walk` verifies that `walk` and `query` + match the generic traversals `bottomUp` and `queryWith`.) + + * Added `Text.Pandoc.JSON`, which provides `ToJSON` and `FromJSON` + instances for the basic pandoc types. They use GHC generics and + should be faster than the old JSON serialization using + `Data.Aeson.Generic`. + + * Added `Text.Pandoc.Process`, exporting `pipeProcess`. + This is a souped-up version of `readProcessWithErrorcode` that + uses lazy bytestrings instead of strings and allows setting + environment variables. (Used in `Text.Pandoc.PDF`.) + + * New module `Text.Pandoc.Readers.OPML`. + + * New module `Text.Pandoc.Writers.OPML`. + + * New module `Text.Pandoc.Readers.Haddock` (David Lazar). + This is based on Haddock's own lexer/parser. + + * New module `Text.Pandoc.Writers.Custom`. + + * In `Text.Pandoc.Shared`, `openURL` and `fetchItem` now return an + Either, for better error handling. + + * Made `stringify` polymorphic in `Text.Pandoc.Shared`. + + * Removed `stripTags` from `Text.Pandoc.XML`. + + * `Text.Pandoc.Templates`: + + + Simplified `Template` type to a newtype. + + Removed `Empty`. + + Changed type of `renderTemplate`: it now takes a JSON context + and a compiled template. + + Export `compileTemplate`. + + Export `renderTemplate'` that takes a string instead of a compiled + template. + + Export `varListToJSON`. + + * `Text.Pandoc.PDF` exports `makePDF` instead of `tex2pdf`. + + * `Text.Pandoc`: + + + Made `toJsonFilter` an alias for `toJSONFilter` from `Text.Pandoc.JSON`. + + Removed `ToJsonFilter` typeclass. `ToJSONFilter` from + `Text.Pandoc.JSON` should be used instead. (Compiling against + pandoc-types instead of pandoc will also produce smaller executables.) + * Removed the deprecated `jsonFilter` function. + + Added `readJSON`, `writeJSON` to the API (#817). + + * `Text.Pandoc.Options`: + + + Added `Ext_lists_without_preceding_blankline`, + `Ext_ascii_identifiers`, `Ext_ignore_line_breaks`, + `Ext_yaml_metadataBlock` to `Extension`. + + Changed `writerSourceDirectory` to `writerSourceURL` and changed the + type to a `Maybe`. `writerSourceURL` is set to 'Just url' when the + first command-line argument is an absolute URL. (So, relative links + will be resolved in relation to the first page.) Otherwise, 'Nothing'. + + All bibliography-related fields have been removed from + `ReaderOptions` and `WriterOptions`: `writerBiblioFiles`, + `readerReferences`, `readerCitationStyle`. + + * The `Text.Pandoc.Biblio` module has been removed. Users of the + pandoc library who want citation support will need to use + `Text.CSL.Pandoc` from `pandoc-citeproc`. + +### Bug fixes + + * In markdown, don't autolink a bare URI that is followed by `</a>` + (#937). + + * `Text.Pandoc.Shared` + + + `openURL` now follows redirects (#701), properly handles `data:` + URIs, and prints diagnostic output to stderr rather than stdout. + + `readDefaultDataFile`: normalize the paths. This fixes bugs in + `--self-contained` on pandoc compiled with `embed_data_files` (#833). + + Fixed `readDefaultDataFile` so it works on Windows. + + Better error messages for `readDefaultDataFile`. Instead of + listing the last path tried, which can confuse people who are + using `--self-contained`, so now we just list the data file name. + + URL-escape pipe characters. Even though these are legal, `Network.URI` + doesn't regard them as legal in URLs. So we escape them first (#535). + + * Mathjax in HTML slide shows: include explicit "Typeset" call. + This seems to be needed for some formats (e.g. slideous) and won't + hurt in others (#966). + + * `Text.Pandoc.PDF` + + + On Windows, create temdir in working directory, since the system + temp directory path may contain tildes, which can cause + problems in LaTeX (#777). + + Put temporary output directory in `TEXINPUTS` (see #917). + + `makePDF` tries to download images that are not found locally, + if the first argument is a URL (#917). + + If compiling with `pdflatex` yields an encoding error, offer + the suggestion to use `--latex-engine=xelatex`. + + * Produce automatic header identifiers in parsing textile, RST, + and LaTeX, unless `auto_identifiers` extension is disabled (#967). + + * `Text.Pandoc.SelfContained`: Strip off fragment, query of relative URL + before treating as a filename. This fixes `--self-contained` when used + with CSS files that include web fonts using the method described here: + <http://paulirish.com/2009/bulletproof-font-face-implementation-syntax/> + (#739). Handle `src` in `embed`, `audio`, `source`, `input` tags. + + * `Text.Pandoc.Parsing`: `uri` parser no longer treats punctuation before + percent-encoding, or a `+` character, as final punctuation. + + * `Text.Pandoc.ImageSize`: Handle EPS (#903). This change will make + EPS images properly sized on conversion to Word. + + * Slidy: Use slidy.js rather than slidy.js.gz. + Reason: some browsers have trouble with the gzipped js file, + at least on the local file system (#795). + + * Markdown reader + + + Properly handle blank line at beginning of input (#882). + + Fixed bug in unmatched reference links. The input + `[*infile*] [*outfile*]` was getting improperly parsed: + "infile" was emphasized, but "*outfile*" was literal (#883). + + Allow internal `+` in citation identifiers (#856). + + Allow `.` or `)` after `#` in ATX headers if no `fancy_lists`. + + Do not generate blank title, author, or date metadata elements. + Leave these out entirely if they aren't present. + + Allow backtick code blocks not to be preceded by blank line (#975). + + * Textile reader: + + + Correctly handle entities. + + Improved handling of `<pre>` blocks (#927). Remove internal HTML tags + in code blocks, rather than printing them verbatim. Parse attributes + on `<pre>` tag for code blocks. + + * HTML reader: Handle non-simple tables (#893). Column widths are read from + `col` tags if present, otherwise divided equally. + + * LaTeX reader + + + Support alltt environment (#892). + + Support `\textasciitilde`, `\textasciicircum` (#810). + + Treat `\textsl` as emphasized text reader (#850). + + Skip positional options after `\begin{figure}`. + + Support `\v{}` for hacek (#926). + + Don't add spurious ", " to citation suffixes. + This is added when needed in pandoc-citeproc. + + Allow spaces in alignment spec in tables, e.g. `{ l r c }`. + + Improved support for accented characters (thanks to Scott Morrison). + + Parse label after section command and set id (#951). + + * RST reader: + + + Don't insert paragraphs where docutils doesn't. + `rst2html` doesn't add `<p>` tags to list items (even when they are + separated by blank lines) unless there are multiple paragraphs in the + list. This commit changes the RST reader to conform more closely to + what docutils does (#880). + + Improved metadata. Treat initial field list as metadata when + standalone specified. Previously ALL fields "title", "author", + "date" in field lists were treated as metadata, even if not at + the beginning. Use `subtitle` metadata field for subtitle. + + Fixed 'authors' metadata parsing in reST. Semicolons separate + different authors. + + * MediaWiki reader + + + Allow space before table rows. + + Fixed regression for `<ref>URL</ref>`. + `<` is no longer allowed in URLs, according to the uri parser + in `Text.Pandoc.Parsing`. Added a test case. + + Correctly handle indented preformatted text without preceding + or following blank line. + + Fixed `|` links inside table cells. Improved attribute parsing. + + Skip attributes on table rows. Previously we just crashed if + rows had attributes, now we ignore them. + + Ignore attributes on headers. + + Allow `Image:` for images (#971). + + Parse an image with caption in a paragraph by itself as a figure. + + * LaTeX writer + + + Don't use ligatures in escaping inline code. + + Fixed footnote numbers in LaTeX/PDF tables. This fixes a bug + wherein notes were numbered incorrectly in tables (#827). + + Always create labels for sections. Previously the labels were only + created when there were links to the section in the document (#871). + + Stop escaping `|` in LaTeX math. + This caused problems with array environments (#891). + + Change `\` to `/` in paths. `/` works even on Windows in LaTeX. + `\` will cause major problems if unescaped. + + Write id for code block to label attribute in LaTeX when listings + is used (thanks to Florian Eitel). + + Scale LaTeX tables so they don't exceed columnwidth. + + Avoid problem with footnotes in unnumbered headers (#940). + + * Beamer writer: when creating beamer slides, add `allowframebreaks` option + to the slide if it is one of the header classes. It is recommended + that your bibliography slide have this attribute: + + # References {.allowframebreaks} + + This causes multiple slides to be created if necessary, depending + on the length of the bibliography. + + * ConTeXt writer: Properly handle tables without captions. The old output + only worked in MkII. This should work in MkIV as well (#837). + + * MediaWiki writer: Use native mediawiki tables instead of HTML (#720). + + * HTML writer: + + + Fixed `--no-highlight` (Alexander Kondratskiy). + + Don't convert to lowercase in email obfuscation (#839). + + Ensure proper escaping in `<title>` and `<meta>` fields. + + * AsciiDoc writer: + + + Support `--atx-headers` (Max Rydahl Andersen). + + Don't print empty identifier blocks `([[]])` on headers (Max + Rydahl Andersen). + + * ODT writer: + + + Fixing wrong numbered-list indentation in open document format + (Alexander Kondratskiy) (#369). + + `reference.odt`: Added pandoc as "generator" in `meta.xml`. + + Minor changes for ODF 1.2 conformance (#939). We leave the + nonconforming `contextual-spacing` attribute, which is provided by + LibreOffice itself and seems well supported. + + * Docx writer: + + + Fixed rendering of display math in lists. + In 1.11 and 1.11.1, display math in lists rendered as a new list + item. Now it always appears centered, just as outside of lists, + and in proper display math style, no matter how far indented the + containing list item is (#784). + + Use `w:br` with `w:type` `textWrapping` for linebreaks. + Previously we used `w:cr` (#873). + + Use Compact style for Plain block elements, to + differentiate between tight and loose lists (#775). + + Ignore most components of `reference.docx`. + We take the `word/styles.xml`, `docProps/app.xml`, + `word/theme/theme1.xml`, and `word/fontTable.xml` from + `reference.docx`, ignoring everything else. This should help + with the corruption problems caused when different versions of + Word resave the reference.docx and reorganize things. + + Made `--no-highlight` work properly. + + * EPUB writer + + + Don't add `dc:creator` tags if present in EPUB metadata. + + Add `id="toc-title"` to `h1` in `nav.xhtml` (#799). + + Don't put blank title page in reading sequence. + Set `linear="no"` if no title block. Addresses #797. + + Download webtex images and include as data URLs. + This allows you to use `--webtex` in creating EPUBs. + Math with `--webtex` is automatically made self-contained. + + In `data/epub.css`, removed highlighting styles (which + are no longer needed, since styles are added by the HTML + writer according to `--highlighting-style`). Simplified + margin fields. + + If resource not found, skip it, as in Docx writer (#916). + + * RTF writer: + + + Properly handle characters above the 0000-FFFF range. + Uses surrogate pairs. Thanks to Hiromi Ishii for the patch. + + Fixed regression with RTF table of contents. + + Only autolink absolute URIs. This fixes a regression, #830. + + * Markdown writer: + + + Only autolink absolute URIs. This fixes a regression, #830. + + Don't wrap attributes in fenced code blocks. + + Write full metadata in MMD style title blocks. + + Put multiple authors on separate lines in pandoc titleblock. + Also, don't wrap long author entries, as new lines get treated + as new authors. + + * `Text.Pandoc.Templates`: + + + Fixed bug retrieving default template for markdown variants. + + Templates can now contain "record lookups" in variables; + for example, `author.institution` will retrieve the `institution` + field of the `author` variable. + + More consistent behavior of `$for$`. When `foo` is not a list, + `$for(foo)$...$endfor$` should behave like $if(foo)$...$endif$. + So if `foo` resolves to "", no output should be produced. + See pandoc-templates#39. + + * Citation processing improvements (now part of pandoc-citeproc): + + + Fixed `endWithPunct` The new version correctly sees a sentence + ending in '.)' as ending with punctuation. This fixes a bug which + led such sentences to receive an extra period at the end: '.).'. + Thanks to Steve Petersen for reporting. + + Don't interfere with Notes that aren't citation notes. + This fixes a bug in which notes not generated from citations were + being altered (e.g. first letter capitalized) (#898). + + Only capitalize footnote citations when they have a prefix. + + Changes in suffix parsing. A suffix beginning with a digit gets 'p' + inserted before it before passing to citeproc-hs, so that bare numbers + are treated as page numbers by default. A suffix not beginning with + punctuation has a space added at the beginning (rather than a comma and + space, as was done before for not-author-in-text citations). + The result is that `\citep[23]{item1}` in LaTeX will be interpreted + properly, with '23' treated as a locator of type 'page'. + + Many improvements to citation rendering, due to fixes in citeproc-hs + (thanks to Andrea Rossato). + + Warnings are issued for undefined citations, which are rendered + as `???`. + + Fixed hanging behavior when locale files cannot be found. + +### Template changes + + * DocBook: Use DocBook 4.5 doctype. + + * Org: '#+TITLE:' is inserted before the title. + Previously the writer did this. + + * LaTeX: Changes to make mathfont work with xelatex. + We need the mathspec library, not just fontspec, for this. + We also need to set options for setmathfont (#734). + + * LaTeX: Use `tex-ansi` mapping for `monofont`. + This ensures that straight quotes appear as straight, rather than + being treated as curly. See #889. + + * Made `\includegraphics` more flexible in LaTeX template. + Now it can be used with options, if needed. Thanks to Bernhard Weichel. + + * LaTeX/Beamer: Added `classoption` variable. + This is intended for class options like `oneside`; it may + be repeated with different options. (Thanks to Oliver Matthews.) + + * Beamer: Added `fonttheme` variable. (Thanks to Luis Osa.) + + * LaTeX: Added `biblio-style` variable (#920). + + * DZSlides: title attribute on title section. + + * HTML5: add meta tag to allow scaling by user (Erik Evenson) + +### Under-the-hood improvements + + * Markdown reader:Improved strong/emph parsing, using the strategy of + <https://github.com/jgm/Markdown>. The new parsing algorithm requires + no backtracking, and no keeping track of nesting levels. It will give + different results in some edge cases, but these should not affect normal + uses. + + * Added `Text.Pandoc.Compat.Monoid`. + This allows pandoc to compile with `base` < 4.5, where `Data.Monoid` + doesn't export `<>`. Thanks to Dirk Ullirch for the patch. + + * Added `Text.Pandoc.Compat.TagSoupEntity`. + This allows pandoc to compile with `tagsoup` 0.13.x. + Thanks to Dirk Ullrich for the patch. + + * Most of `Text.Pandoc.Readers.TeXMath` has been moved to the + `texmath` module (0.6.4). (This allows `pandoc-citeproc` to + handle simple math in bibliography fields.) + + * Added `Text.Pandoc.Writers.Shared` for shared functions used + only in writers. `metaToJSON` is used in writers to create a + JSON object for use in the templates from the pandoc metadata + and variables. `getField`, `setField`, and `defField` are + for working with JSON template contexts. + + * Added `Text.Pandoc.Asciify` utility module. + This exports functions to create ASCII-only versions of identifiers. + + * `Text.Pandoc.Parsing` + + + Generalized state type on `readWith` (API change). + + Specialize readWith to `String` input. (API change). + + In `ParserState`, replace `stateTitle`, `stateAuthors`, `stateDate` + with `stateMeta` and `stateMeta'`. + + * `Text.Pandoc.UTF8`: use strict bytestrings in reading. The use of lazy + bytestrings seemed to cause problems using pandoc on 64-bit Windows + 7/8 (#874). + + * Factored out `registerHeader` from markdown reader, added to + `Text.Pandoc.Parsing`. + + * Removed `blaze_html_0_5` flag, require `blaze-html` >= 0.5. + Reason: < 0.5 does not provide a monoid instance for Attribute, + which is now needed by the HTML writer (#803). + + * Added `http-conduit` flag, which allows fetching https resources. + It also brings in a large number of dependencies (`http-conduit` + and its dependencies), which is why for now it is an optional flag + (#820). + + * Added CONTRIBUTING.md. + + * Improved INSTALL instructions. + + * `make-windows-installer.bat`: Removed explicit paths for executables. + + * `aeson` is now used instead of `json` for JSON. + + * Set default stack size to 16M. This is needed for some large + conversions, esp. if pandoc is compiled with 64-bit ghc. + + * Various small documentation improvements. + Thanks to achalddave and drothlis for patches. + + * Removed comment that chokes recent versions of CPP (#933). + + * Removed support for GHC version < 7.2, since pandoc-types now + requires at least GHC 7.2 for GHC generics. + + +## pandoc 1.11.1 (2013-03-17) + + * Markdown reader: + + + Fixed regression in which parentheses were lost in link URLs. + Added tests. Closes #786. + + Better handling of unmatched double quotes in `--smart` mode. + These occur frequently in fiction, since it is customary not to + close quotes in dialogue if the speaker does not change between + paragraphs. The unmatched quotes now get turned into literal + left double quotes. (No `Quoted` inline is generated, however.) + Closes #99 (again). + + * HTML writer: Fixed numbering mismatch between TOC and sections. + `--number-offset` now affects TOC numbering as well + as section numbering, as it should have all along. Closes #789. + + * Markdown writer: Reverted 1.11 change that caused citations to be rendered + as markdown citations, even if `--bibliography` was specified, unless + `citation` extension is disabled. Now, formatted citations are always + printed if `--bibliography` was specified. If you want to reformat + markdown keeping pandoc markdown citations intact, don't use + `--bibliography`. Note that citations parsed from LaTeX documents will + be rendered as pandoc markdown citations when `--bibliography` is not + specified. + + * ODT writer: Fixed regression leading to corrupt ODTs. + This was due to a change in the `Show` instance for + `Text.Pandoc.Pretty.Doc`. Closes #780. + + * Fixed spacing bugs involving code block attributes in + RST reader and Markdown writer. Closes #763. + + * Windows package: Various improvements due to Fyodor Sheremetyev. + + + Automatically set installation path (Program Files or Local App Data). + + Set system PATH environment variable when installing for all users. + + Pandoc can installed for all users using the following command. + `msiexec /i pandoc-1.11.msi ALLUSERS=1`. + + * Bumped QuickCheck version bound. + +## pandoc 1.11 (2013-03-09) + + * Added `--number-offset` option. (See README for description.) + + * Added `--default-image-extension` option. (See README for description.) + + * `--number-sections` behavior change: headers with class `unnumbered` + will not be numbered. + + * `--version` now reports the default data directory. + + * `Text.Pandoc.Parsing` is no longer exposed. (API change.) + + * `Text.Pandoc.Highlighting` is no longer exposed. (API change.) + + * `Text.Pandoc.Shared`: Changed type of `Element`. `Sec` now includes + a field for `Attr` rather than just `String`. (API change.) + + * Added `markdown_github` as input format. This was an accidental + omission in 1.10. + + * Added `readerDefaultImageExtension` field to `ReaderOptions`. (API + change.) + + * Added `writerNumberOffset` field in `WriterOptions`. (API change.) + + * Beamer template: + + + Fixed captions with longtable. Thanks to Joost Kremers. + + Provide `\Oldincludegraphics` as in LaTeX template (Benjamin Bannier). + + * LaTeX template: + + + Load microtype after fonts. Microtype needs to know + what fonts are being used. Thanks to dfc for the patch. + + Set `secnumdepth` to 5 if `--number-sections` specified. + This yields behavior equivalent to the other writers, numbering + level 4 and 5 headers too. Closes #753. + + * HTML reader: + + + Handle `<colgroup>` tag. + + Preserve all header attributes. + + * LaTeX reader: + + + Parse `\hrule` as `HorizontalRule`. Closes #746. + + Parse starred variants of `\section` etc. as headers with + attribute `unnumbered`. + + Read optional attributes in `lstlisting` and `Verbatim` environments. + We convert these to pandoc standard names, e.g. `numberLines` + for `numbers=left`, `startFrom=100` from `firstnumber=100`. + + Handle language attribute for lstlistings. + + Better support for Verbatim and minted environments. Closes #763. + + * Markdown reader: + + + `-` in an attribute context = `.unnumbered`. The point of this + is to provide a way to specify unnumbered headers in non-English + documents. + + Fixed bug parsing key/value attributes. Parsing failed if you + had an unquoted attribute immediately before the final '}'. + + Make backslash escape work in attributes. + + Fix title block parsing. Now if `mmd_title_blocks` is specified, + pandoc will parse a MMD title block if it sees one, even if + `pandoc_title_blocks` is enabled. + + Refactoring: `litChar` now includes entities, so we don't need + to use `fromEntities` e.g. on titles. + + Allow spaces around borders in pipe tables. Closes #772. + + Allow all punctuation in angle-bracket autolinks. Previously + things like `----` were disallowed, because the uri parser + treated them as trailing punctuation. Closes #768. + + Make `implicit_header_references` work properly when + headers are given explicit identifiers. + + Check for tables before line blocks. Otherwise some pipe + tables get treated as line blocks. + + Allow `&` in emails (for entities). + + Properly handle entities in titles and links. A markdown link + `<http://göogle.com>` should be a link to `http://göogle.com`. + Closes #723. + + * Textile reader: + + + Handle attributes on headers. + + * LaTeX reader: + + + Add `fig:` as title for images with captions. + This is needed for them to be rendered as figures. Closes #766. + + Never emit an empty paragraph. See #761. + + Handle `\caption` for images in figures. Closes #766. + + Parse `\section*`, etc. as unnumbered sections. + + * HTML writer: + + + Support header attributes. The attributes go on + the enclosing `section` or `div` tag if `--section-divs` is specified. + + Fixed a regression (only now noticed) in html+lhs output. + Previously the bird tracks were being omitted. + + * LaTeX writer: + + + Omit lists with no items to avoid LaTeX errors. + + Support line numbering with `--listings`. + If `numberLines` class is present, we add `numbers=left`; + if `startFrom` is present, we add `firstnumber=`. (#763) + + * ConTeXt writer: + + + Removed `\placecontent`. This produced a duplicate toc, + in conjunction with `\placelist`. + + Use `\title`, `\subject` etc. for headers with + `unnumbered` class. + + * Textile writer: + + + Support header attributes. + + * Markdown writer: + + + Use grid tables when needed, and if enabled. Closes #740. + + Render citations as pandoc-markdown citations. + Previously citations were rendered as citeproc-formatted citations + by default. Now we render them as pandoc citations, e.g. `[@item1]`, + unless the `citations` extension is disabled. + If you still want formatted citations in your markdown output, + use `pandoc -t markdown-citations`. + + * RST writer: + + + Support `:number-lines:` in code blocks. + + * Docx writer: + + + Better treatment of display math. Display math inside a + paragraph is now put in a separate paragraph, so it will render + properly (centered and without extra blank lines around it). + Partially addresses #742. + + Content types and document rels xml files are now created from + scratch, rather than being taken over from `reference.docx`. + This fixes problems that arise when you edit the `reference.docx` + with Word. + + We also now encode mime types for each individual image rather + than using defaults. This should allow us to handle a wider + range of image types (including PDF). Closes #414. + + Changed style names in `reference docx`. + `FootnoteReference` -> `FootnoteRef`, `Hyperlink` -> `Link`. + The old names got changed by Word when the `reference.docx` was + edited. Closes #414. + + * EPUB writer: + + + Fix section numbering. Previously the numbering restarted from 1 + in each chapter (with `--number-sections`), though the numbers in + the table of contents were correct. + + Headers with "unnumbered" attribute are not numbered. (Nor do they + cause an increment in running numbering.) Section numbers now work + properly, even when there is material before the first numbered section. + + Include HTML TOC, even in epub2. The TOC is included in `<spine>`, + but `linear` is set to `no` unless the `--toc` option is specified. + Include `<guide>` element in OPF. This should allow the TOC to + be usable in Kindles when converted with kindlegen. Closes #773. + + * `Text.Pandoc.Parsing`: Optimized `oneOfStringsCI`. + This dramatically reduces the speed penalty that comes from enabling the + `autolink_bare_uris` extension. The penalty is still substantial (in one + test, from 0.33s to 0.44s), but nowhere near what it used to be. + The RST reader is also much faster now, as it autodetects URIs. + + * `Text.Pandoc.Shared`: `hierarchicalize` will not number section + with class "unnumbered". Unnumbered sections get `[]` for their + section number. + + * `Text.Pandoc.Pretty`: + + + Fixed `chomp` so it works inside `Prefixed` elements. + + Changed `Show` instance so it is better for debugging. + + * `Text.Pandoc.ImageSize`: Added `Pdf` to `ImageType`. + + * `Text.Pandoc.UTF8`: Strip off BOM if present. Closes #743. + + * Windows installer improvements: + + + The installer is now signed with a certificate (thanks to + Fyodor Sheremetyev). + + WiX is used instead of InnoSetup. The installer is now a + standard msi file. + + The version number is now auto-detected, and need not be + updated separately. + + * OSX installer improvements: + + + The package and pandoc executable are now signed with a + certificate (thanks to Fyodor Sheremetyev). + + RTF version of license is used. + + Use full path for sysctl in `InstallationCheck` script (jonahbull). + Closes #580. + + * Converted COPYING to markdown. + + * pandoc.cabal: Require latest versions of highlighting-kate, + texmath, citeproc-hs, zip-archive. + +## pandoc 1.10.1 (2013-01-23) + + * Markdown reader: various optimizations, leading to a + significant performance boost. + + * RST reader: Allow anonymous form of inline links: + `` `hello <url>`__ `` Closes #724. + + * Mediawiki reader: Don't require newlines after tables. + Thanks to jrunningen for the patch. Closes #733. + + * Fixed LaTeX macro parsing. Now LaTeX macro definitions are preserved + when output is LaTeX, and applied when it is another format. + Partially addresses #730. + + * Markdown and RST readers: Added parser to `block` that skips blank + lines. This fixes a subtle regression involving grid tables with + empty cells. Also added test for grid table with empty cells. + Closes #732. + + * RST writer: Use `.. code:: language` for code blocks with language. + Closes #721. + + * DocBook writer: Fixed output for hard line breaks, adding a newline + between `<literallayout>` tags. + + * Markdown writer: Use an autolink when link text matches url. + Previously we also checked for a null title, but this + test fails for links produced by citeproc-hs in bibliographies. + So, if the link has a title, it will be lost on conversion + to an autolink, but that seems okay. + + * Markdown writer: Set title, author, date variables as before. + These are no longer used in the default template, since we use + titleblock, but we set them anyway for those who use custom templates. + + * LaTeX writer: Avoid extra space at start/end of table cell. + Thanks to Nick Bart for the suggestion of using @{}. + + * `Text.Pandoc.Parsing`: + + + More efficient version of `anyLine`. + + Type of `macro` has changed; the parser now returns `Blocks` + instead of `Block`. + + * Relaxed old-time version bound, allowing 1.0.*. + + * Removed obsolete `hsmarkdown` script. Those who need `hsmarkdown` + should create a symlink as described in the README. + +## pandoc 1.10.0.5 (2013-01-23) + + * Markdown reader: Try `lhsCodeBlock` before `rawTeXBlock`. Otherwise + `\begin{code}...\end{code}` isn't handled properly in markdown+lhs. + Thanks to Daniel Miot for noticing the bug and suggesting the fix. + + * Markdown reader: Fixed bug with headerless grid tables. + The 1.10 code assumed that each table header cell contains exactly one + block. That failed for headerless tables (0) and also for tables with + multiple blocks in a header cell. The code is fixed and tests provided. + Thanks to Andrew Lee for pointing out the bug. + + * Markdown reader: Fixed regressions in fenced code blocks. Closes #722. + + + Tilde code fences can again take a bare language string + (`~~~ haskell`), not just curly-bracketed attributes + (`~~~ {.haskell}`). + + Backtick code blocks can take the curly-bracketed attributes. + + Backtick code blocks don't *require* a language. + + Consolidated code for the two kinds of fenced code blocks. + + * LaTeX template: Use `\urlstyle{same}` to avoid monospace URLs. + + * Markdown writer: Use proportional font for email autolinks with + obfuscation. Closes #714. + + * Corrected name of `blank_before_blockquote` in README. Closes #718. + + * `Text.Pandoc.Shared`: Fixed bug in `uri` parser. + The bug prevented an autolink at the end of a string (e.g. + at the end of a line block line) from counting as a link. Closes #711. + + * Use the `hsb2hs` preprocessor instead of TH for embed_data_files. + This should work on Windows, unlike the TH solution with + file-embed. + + * Eliminated use of TH in test suite. + + * Added `Text.Pandoc.Data` (non-exported) to hold the association + list of embedded data files, if the `embed_data_files` flag is selected. + This isolates the code that needs special treatment with file-embed or + `hsb2hs`. + + * Changes to `make-windows-installer.bat`. + + + Exit batch file if any of the cabal-dev installs fail. + + There's no longer any need to reinstall `highlighting-kate`. + + Don't start with a `cabal update`; leave that to the user. + + Force reinstall of pandoc. + + * Fixed EPUB writer so it builds with blaze-html 0.4.x. Thanks to + Jens Petersen. + +## pandoc 1.10.0.4 (2013-01-20) + + * Fixed bug with escaped % in LaTeX reader. Closes #710. + +## pandoc 1.10.0.3 (2013-01-20) + + * Added further missing fb2 tests to cabal file. + +## pandoc 1.10.0.2 (2013-01-20) + + * Added fb2 tests to cabal file's extra-source-files. + +## pandoc 1.10.0.1 (2013-01-20) + + * Bump version bounds on test-framework packages. + +## pandoc 1.10 (2013-01-19) + +### New features + + * New input formats: `mediawiki` (MediaWiki markup). + + * New output formats: `epub3` (EPUB v3 with MathML), + `fb2` (FictionBook2 ebooks). + + * New `--toc-depth` option, specifying how many levels of + headers to include in a table of contents. + + * New `--epub-chapter-level` option, specifying the header + level at which to divide EPUBs into separate files. + Note that this normally affects only performance, not the + visual presentation of the EPUB in a reader. + + * Removed the `--strict` option. Instead of using `--strict`, + one can now use the format name `markdown_strict` for either input + or output. This gives more fine-grained control that `--strict` + did, allowing one to convert from pandoc's markdown to strict + markdown or vice versa. + + * It is now possible to enable or disable specific syntax + extensions by appending them (with `+` or `-`) to the writer + or reader name. For example, + + pandoc -f markdown-footnotes+hard_line_breaks + + disables footnotes and enables treating newlines as hard + line breaks. The literate Haskell extensions are now implemented + this way as well, using either `+lhs` or `+literate_haskell`. + For a list of extension names, see the README under + "Pandoc's Markdown." + + * The following aliases have been introduced for specific + combinations of markdown extensions: `markdown_phpextra`, + `markdown_github`, `markdown_mmd`, `markdown_strict`. These aliases + work just like regular reader and writer names, and can be modified + with extension modifiers as described above. (Note that conversion + from one markdown dialect to another does not work perfectly, + because there are differences in markdown parsers besides + just the extensions, and because pandoc's internal document model is + not rich enough to capture all of the extensions.) + + * New `--html-q-tags` option. The previous default was to use `<q>` + tags for smart quotes in HTML5. But `<q>` tags are also valid HTML4. + Moreover, they are not a robust way of typesetting quotes, since + some user agents don't support them, and some CSS resets (e.g. + bootstrap) prevent pandoc's quotes CSS from working properly. + We now just insert literal quote characters by default in both + `html` and `html5` output, but this option is provided for + those who still want `<q>` tags. + + * The markdown reader now prints warnings (to stderr) about + duplicate link and note references. Closes #375. + + * Markdown syntax extensions: + + + Added pipe tables. Thanks to François Gannaz for the initial patch. + These conform to PHP Markdown Extra's pipe table syntax. A subset + of org-mode table syntax is also supported, which means that you can + use org-mode's nice table editor to create tables. + + + Added support for RST-style line blocks. These are + useful for verse and addresses. + + + Attributes can now be specified for headers, using the same + syntax as in code blocks. (However, currently only the + identifier has any effect in most writers.) For example, + + # My header {#foo} + + See [the header above](#foo). + + + Pandoc will now act as if link references have been defined + for all headers without explicit identifiers. + So, you can do this: + + # My header + + Link to [My header]. + Another link to [it][My header]. + + Closes #691. + + * LaTeX reader: + + + Command macros now work everywhere, including non-math. + Environment macros still not supported. + + `\input` now works, as well as `\include`. TEXINPUTS is used. + Pandoc looks recursively into included files for more included files. + +### Behavior changes + + * The Markdown reader no longer puts the text of autolinks in a + `Code` inline. This means that autolinks will no longer appear + in a monospace font. + + * The character `/` can now appear in markdown citation keys. + + * HTML blocks in strict_markdown are no longer required to begin + at the left margin. Technically this is required, according to + the markdown syntax document, but `Markdown.pl` and other markdown + processors are more liberal. + + * The `-V` option has been changed so that if there are duplicate + variables, those specified later on the command line take precedence. + + * Tight lists now work in LaTeX and ConTeXt output. + + * The LaTeX writer no longer relien on the `enumerate` package. + Instead, it uses standard LaTeX commands to change the list numbering + style. + + * The LaTeX writer now uses `longtable` instead of `ctable`. This allows + tables to be split over page boundaries. + + * The RST writer now uses a line block to render paragraphs containing + linebreaks (which previously weren't supported at all). + + * The markdown writer now applies the `--id-prefix` to footnote IDs. + Closes #614. + + * The plain writer no longer uses backslash-escaped line breaks + (which are not very "plain"). + + * `Text.Pandoc.UTF8`: Better error message for invalid UTF8. + Read bytestring and use `Text`'s decodeUtf8 instead of using + `System.IO.hGetContents`. This way you get a message saying + "invalid UTF-8 stream" instead of "invalid byte sequence." + You are also told which byte caused the problem. + + * Docx, ODT, and EPUB writers now download images specified by a URL + instead of skipping them or raising an error. + + * EPUB writer: + + + The default CSS now left-aligns headers by default, instead of + centering. This is more consistent with the rest of the writers. + + A proper multi-level table of contents is now used in `toc.ncx`. + There is no longer a subsidiary table of contents at the beginning + of each chapter. + + Code highlighting now works by default. + + Section divs are used by default for better semantic markup. + + The title is used instead of "Title Page" in the table of contents. + Otherwise we have a hard-coded English string, which looks + strange in ebooks written in other languages. Closes #572. + + * HTML writer: + + + Put mathjax in span with class "math". Closes #562. + + Put citations in a span with class "citation." In HTML5, also include + a `data-cite` attribute with a space-separated list of citation + keys. + + * `Text.Pandoc.UTF8`: use universalNewlineMode in reading. + This treats both `\r\n` and `\n` as `\n` on input, no matter + what platform we're running on. + + * Citation processing is now done in the Markdown and LaTeX + readers, not in `pandoc.hs`. This makes it easier for library users + to use citations. + +### Template changes + + * HTML: Added css to template to preserve spaces in `<code>` tags. + Thanks to Dirk Laurie. + + * Beamer: Remove English-centric strings in section pages. + Section pages used to have "Section" and a number as well as the + section title. Now they just have the title. Similarly for part + and subsection. Closes #566. + + * LaTeX, ConTeXt: Added papersize variable. + + * LaTeX, Beamer templates: Use longtable instead of ctable. + + * LaTeX, Beamer templates: Don't require 'float' package for tables. + We don't actually seem to use the '[H]' option. + + * Markdown, plain: Fixed titleblock so it is just a single string. + Previously separate title, author, and date variables were used, + but this didn't allow different kinds of title blocks. + + * EPUB: + + + Rationalized templates. Previously there were three different + templates involved in epub production. There is now just one + template, `default.epub` or `default.epub3`. It can now be + overridden using `--template`, just like other templates. + The titlepage is now folded into the default template. + A `titlepage` variable selects it. + + UTF-8, lang tag, meta tags, title element. + + * Added scale-to-width feature to beamer template + +### API changes + + * `Text.Pandoc.Definition`: Added `Attr` field to `Header`. + Previously header identifiers were autogenerated by the writers. + Now they are added in the readers (either automatically or explicitly). + + * `Text.Pandoc.Builder`: + + + `Inlines` and `Blocks` are now synonyms for `Many Inline` and + `Many Block`. `Many` is a newtype wrapper around `Seq`, with + custom Monoid instances for `Many Inline` and `Many Block. This + allows `Many` to be made an instance of `Foldable` and `Traversable`. + + The old `Listable` class has been removed. + + The module now exports `isNull`, `toList`, `fromList`. + + The old `Read` and `Show` instances have been removed; derived + instances are now used. + + Added `headerWith`. + + * The readers now take a `ReaderOptions` rather than a `ParserState` + as a parameter. Indeed, not all parsers use the `ParserState` type; + some have a custom state. The motivation for this change was to separate + user-specifiable options from the accounting functions of parser state. + + * New module `Text.Pandoc.Options`. This includes the `WriterOptions` + formerly in `Text.Pandoc.Shared`, and its associated + data types. It also includes a new type `ReaderOptions`, which + contains many options formerly in `ParserState`, and its associated + data types: + + + `ParserState.stateParseRaw` -> `ReaderOptions.readerParseRaw`. + + `ParserState.stateColumns` -> `ReaderOptions.readerColumns`. + + `ParserState.stateTabStop` -> `ReaderOptions.readerTabStop`. + + `ParserState.stateOldDashes` -> `ReaderOptions.readerOldDashes`. + + `ParserState.stateLiterateHaskell` -> `ReaderOptions.readerLiterateHaskell`. + + `ParserState.stateCitations` -> `ReaderOptions.readerReferences`. + + `ParserState.stateApplyMacros` -> `ReaderOptions.readerApplyMacros`. + + `ParserState.stateIndentedCodeClasses` -> + `ReaderOptions.readerIndentedCodeClasses`. + + Added `ReaderOptions.readerCitationStyle`. + + * `WriterOptions` now includes `writerEpubVersion`, `writerEpubChapterLevel`, + `writerEpubStylesheet`, `writerEpubFonts`, `writerReferenceODT`, + `writerReferenceDocx`, and `writerTOCDepth`. `writerEPUBMetadata` has + been renamed `writerEpubMetadata` for consistency. + + * Changed signatures of `writeODT`, `writeDocx`, `writeEPUB`, since they no + longer stylesheet, fonts, reference files as separate parameters. + + * Removed `writerLiterateHaskell` from `WriterOptions`, and + `readerLiterateHaskell` from `ReaderOptions`. LHS is now handled + by an extension (`Ext_literate_haskell`). + + * Removed deprecated `writerXeTeX`. + + * Removed `writerStrict` from `WriterOptions`. Added `writerExtensions`. + Strict is now handled through extensions. + + * `Text.Pandoc.Options` exports `pandocExtensions`, `strictExtensions`, + `phpMarkdownExtraExtensions`, `githubMarkdownExtensions`, + and `multimarkdownExtensions`, as well as the `Extensions` type. + + * New `Text.Pandoc.Readers.MediaWiki` module, exporting + `readMediaWiki`. + + * New `Text.Pandoc.Writers.FB2` module, exporting `writeFB2` + (thanks to Sergey Astanin). + + * `Text.Pandoc`: + + + Added `getReader`, `getWriter` to `Text.Pandoc`. + + `writers` is now an association list `(String, Writer)`. + A `Writer` can be a `PureStringWriter`, an `IOStringWriter`, or + an `IOByteStringWriter`. ALL writers are now in the 'writers' + list, including the binary writers and FB2 writer. This allows + code in `pandoc.hs` to be simplified. + + Changed type of `readers`, so all readers are in IO. + Users who want pure readers can still get them form the reader + modules; this just affects the function `getReader` that looks up + a reader based on the format name. The point of this change is to + make it possible to print warnings from the parser. + + * `Text.Pandoc.Parsing`: + + + `Text.Parsec` now exports all Parsec functions used in pandoc code. + No other module directly imports Parsec. This will make it easier + to change the parsing backend in the future, if we want to. + + `Text.Parsec` is used instead of `Text.ParserCombinators.Parsec`. + + Export the type synonym `Parser`. + + Export `widthsFromIndices`, `NoteTable'`, `KeyTable'`, `Key'`, `toKey'`, + `withQuoteContext`, `singleQuoteStart`, `singleQuoteEnd`, + `doubleQuoteStart`, `doubleQuoteEnd`, `ellipses`, `apostrophe`, + `dash`, `nested`, `F(..)`, `askF`, `asksF`, `runF`, `lineBlockLines`. + + `ParserState` is no longer an instance of `Show`. + + Added `stateSubstitutions` and `stateWarnings` to `ParserState`. + + Generalized type of `withQuoteContext`. + + Added `guardEnabled`, `guardDisabled`, `getOption`. + + Removed `failIfStrict`. + + `lookupKeySrc` and `fromKey` are no longer exported. + + * `Data.Default` instances are now provided for `ReaderOptions`, + `WriterOptions`, and `ParserState`. `Text.Pandoc` re-exports `def`. + Now you can use `def` (which is re-exported by `Text.Pandoc`) instead + of `defaultWriterOptions` (which is still defined). Closes #546. + + * `Text.Pandoc.Shared`: + + + Added `safeRead`. + + Renamed `removedLeadingTrailingSpace` to `trim`, + `removeLeadingSpace` to `triml`, and `removeTrailingSpace` to `trimr`. + + Count `\r` as space in `trim` functions. + + Moved `renderTags'` from HTML reader and `Text.Pandoc.SelfContained` + to `Shared`. + + Removed `failUnlessLHS`. + + Export `compactify'`, formerly in Markdown reader. + + Export `isTightList`. + + Do not export `findDataFile`. + + `readDataFile` now returns a strict ByteString. + + Export `readDataFileUTF8` which returns a String, like the + old `readDataFile`. + + Export `fetchItem` and `openURL`. + + * `Text.Pandoc.ImageSize`: Use strict, not lazy bytestrings. + Removed `readImageSize`. + + * `Text.Pandoc.UTF8`: Export `encodePath`, `decodePath`, + `decodeArg`, `toString`, `fromString`, `toStringLazy`, + `fromStringLazy`. + + * `Text.Pandoc.UTF8` is now an exposed module. + + * `Text.Pandoc.Biblio`: + + + csl parameter now a `String` rather than a `FilePath`. + + Changed type of `processBiblio`. It is no longer in the IO monad. + It now takes a `Maybe Style` argument rather than parameters for CSL + and abbrev filenames. (`pandoc.hs` now calls the functions to parse + the style file and add abbreviations.) + + * Markdown reader now exports `readMarkdownWithWarnings`. + + * `Text.Pandoc.RTF` now exports `writeRTFWithEmbeddedImages` instead of + `rtfEmbedImage`. + +### Bug fixes + + * Make `--ascii` work properly with `--self-contained`. Closes #568. + + * Markdown reader: + + + Fixed link parser to avoid exponential slowdowns. Closes #620. + Previously the parser would hang on input like this: + + [[[[[[[[[[[[[[[[[[hi + + We fixed this by making the link parser parser characters + between balanced brackets (skipping brackets in inline code spans), + then parsing the result as an inline list. One change is that + + [hi *there]* bud](/url) + + is now no longer parsed as a link. But in this respect pandoc behaved + differently from most other implementations anyway, so that seems okay. + + + Look for raw html/latex blocks before tables. + Otherwise the following gets parsed as a table: + + \begin{code} + -------------- + -- My comment. + \end{code} + + Closes #578. + + * RST reader: + + + Added support for `:target:` on `.. image::` blocks + and substitutions. + + Field list fixes: + + - Fixed field lists items with body beginning after a new line + (Denis Laxalde). + - Allow any char but ':' in names of field lists in RST reader + (Denis Laxalde). + - Don't allow line breaks in field names. + - Require whitespace after field list field names. + - Don't create empty definition list for metadata field lists. + Previously a field list consisting only of metadata fields (author, + title, date) would be parsed as an empty DefinitionList, which is + not legal in LaTeX and not needed in any format. + + + Don't recognize inline-markup starts inside words. + For example, `2*2 = 4*1` should not contain an emphasized + section. Added test case for "Literal symbols". Closes #569. + + Allow dashes as separator in simple tables. Closes #555. + + Added support for `container`, `compound`, `epigraph`, + `rubric`, `highlights`, `pull-quote`. + + Added support for `.. code::`. + + Made directive labels case-insensitive. + + Removed requirement that directives begin at left margin. + This was (correctly) not in earlier releases; docutils doesn't + make the requirement. + + Added support for `replace::` and `unicode::` substitutions. + + Ignore unknown interpreted roles. + + Renamed image parser to `subst`, since it now handles all + substitution references. + + * Textile reader: + + + Allow newlines before pipes in table. Closes #654. + + Fixed bug with list items containing line breaks. + Now pandoc correctly handles hard line breaks inside list items. + Previously they broke list parsing. + + Implemented comment blocks. + + Fixed bug affected words ending in hyphen. + + Properly handle links with surrounding brackets. + Square brackets need to be used when the link isn't surrounded by + spaces or punctuation, or when the URL ending may be ambiguous. + Closes #564. + + Removed nullBlock. Better to know about parsing problems than + to skip stuff when we get stuck. + + Allow ID attributes on headers. + + Textile reader: Avoid parsing dashes as strikeout. + Previously the input + + text-- + text-- + text-- + text-- + + would be parsed with strikeouts rather than dashes. This fixes + the problem by requiring that a strikeout delimiting - not be + followed by a -. Closes #631. + + Expanded list of `stringBreakers`. + This fixes a bug on input like "(_hello_)" which should + be a parenthesized emphasized "hello". + The new list is taken from the PHP source of textile 2.4. + + Fixed autolinks. Previously the textile reader and writer + incorrectly implemented RST-style autolinks for URLs and email + addresses. This has been fixed. Now an autolink is done this way: + `"$":http://myurl.com`. + + Fixed footnotes bug in textile. This affected notes occurring + before punctuation, e.g. `foo[1].`. Closes #518. + + * LaTeX reader: + + + Better handling of citation commands. + + Better handling of `\noindent`. + + Added a 'try' in rawLaTeXBlock, so we can handle `\begin` without `{`. + Closes #622. + + Made `rawLaTeXInline` try to parse block commands as well. This + is usually what we want, given how `rawLaTeXInline` is used in + the markdown and textile readers. If a block-level LaTeX command + is used in the middle of a paragraph (e.g. `\subtitle` inside a title), + we can treat it as raw inline LaTeX. + + Handle `\slash` command. Closes #605. + + Basic `\enquote` support. + + Fixed parsing of paragraphs beginning with a group. Closes #606. + + Use curly quotes for bare straight quotes. + + Support obeylines environment. Closes #604. + + Guard against "begin", "end" in inlineCommand and + blockCommand. + + Better error messages for environments. Now it should tell you that + it was looking for \end{env}, instead of giving "unknown parse error." + + * HTML reader: + + + Added HTML 5 tags to list of block-level tags. + + HTML reader: Fixed bug in `htmlBalanced`, which + caused hangs in parsing certain markdown input using + strict mode. + + Parse `<q>` as `Quoted DoubleQuote`. + + Handle nested `<q>` tags properly. + + Modified `htmlTag` for fewer false positives. + A tag must start with `<` followed by `!`,`?`, `/`, or a letter. + This makes it more useful in the wikimedia and markdown parsers. + + * DocBook reader: Support title in "figure" element. Closes #650. + + * MediaWiki writer: + + + Remove newline after `<br/>` in translation of `LineBreak` + There's no particular need for a newline (other than making the + generated MediaWiki source look nice to a human), and in fact + sometimes it is incorrect: in particular, inside an enumeration, list + items cannot have embedded newline characters. (Brent Yorgey) + + Use `<code>` not `<tt>` for Code. + + * Man writer: Escape `-` as `\-`. + Unescaped `-`'s become hyphens, while `\-`'s are left as ascii minus + signs. That is preferable for use with command-line options. See + <http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html>. Thanks + to Andrea Bolognani for bringing the issue to our attention. + + * RST writer: + + + Improved line block output. Use nonbreaking spaces for + initial indent (otherwise lost in HTML and LaTeX). + Allow multiple paragraphs in a single line block. + Allow soft breaks w continuations in line blocks. + + Properly handle images with no alt text. Closes #678. + + Fixed bug with links with duplicate text. We now (a) use anonymous + links for links with inline URLs, and (b) use an inline link instead + of a reference link if the reference link would require a label that + has already been used for a different link. Closes #511. + + Fixed hyperlinked images. Closes #611. Use `:target:` + field when you have a simple linked image. + + Don't add `:align: center` to figures. + + * Texinfo writer: Fixed internal cross-references. + Now we insert anchors after each header, and use `@ref` instead of `@uref` + for links. Commas are now escaped as `@comma{}` only when needed; + previously all commas were escaped. (This change is needed, in part, + because `@ref` commands must be followed by a real comma or period.) Also + insert a blank line in from of `@verbatim` environments. + + * DocBook writer: + + + Made --id-prefix work in DocBook as well as HTML. + Closes #607. + + Don't include empty captions in figures. Closes #581. + + * LaTeX writer: + + + Use `\hspace*` for nonbreaking space after line break, + since `~` spaces after a line break are just ignored. + Closes #687. + + Don't escape `_` in URLs or hyperref identifiers. + + Properly escape strings inside `\url{}`. Closes #576. + + Use `[fragile]` only for slides containing code rendered + using listings. Closes #649. + + Escape `|` as `\vert` in LaTeX math. This avoids a clash with + highlighting-kate's macros, which redefine `|` as a short verbatim + delimiter. Thanks to Björn Peemöller for raising this issue. + + Use minipage rather than parbox for block containers in tables. + This allows verbatim code to be included in grid tables. + Closes #663. + + Prevent paragraphs containing only linebreaks or spaces. + + * HTML writer: + + + Included `highlighting-css` for code spans, too. + Previously it was only included if used in a code block. Closes #653. + + Improved line breaks with `<dd>` tags. We now put a newline between + `</dd>` and `<dd>` when there are multiple definitions. + + Changed mathjax cdn url so it doesn't use https. (This caused + problems when used with `--self-contained`.) See #609. + + * EPUB writer: + + + `--number-sections` now works properly. + + Don't strip meta and link elements in epub metadata. + Patch from aberrancy. Closes #589. + + Fixed a couple validation bugs. + + Use ch001, ch002, etc. for chapter filenames. This improves sorting + of chapters in some readers, which apparently sort ch2 after ch10. + Closes #610. + + * ODT writer: properly set title property (Arlo O'Keeffe). + + * Docx writer: + + + Fixed bug with nested lists. Previously a list like + + 1. one + - a + - b + 2. two + + would come out with a bullet instead of "2." + Thanks to Russell Allen for reporting the bug. + + Use `w:cr` in `w:r` instead of `w:br` for linebreaks. + This seems to fix a problem viewing pandoc-generated + docx files in LibreOffice. + + Use integer ids for bookmarks. Closes #626. + + Added nsid to abstractNum elements. This helps when merging + word documents with numbered or bulleted lists. Closes #627. + + Use separate footnotes.xml for notes. + This seems to help LibreOffice convert the file, even though + it was valid docx before. Closes #637. + + Use rIdNN identifiers for r:embed in images. + + Avoid reading image files again when we've already processed them. + + Fixed typo in `referenc.docx` that prevented image captions from + working. Thanks to Huashan Chen. + + * `Text.Pandoc.Parsing`: + + + Fixed bug in `withRaw`, which didn't correctly handle the case + where nothing is parsed. + + Made `emailAddress` parser more correct. Now it is based on RFC 822, + though it still doesn't implement quoted strings in email addresses. + + Revised URI parser. It now allows many more schemes, allows + uppercase URIs, and better handles trailing punctuation and + trailing slashes in bare URIs. Added many tests. + + Simplified and improved singleQuoteStart. This makes `'s'`, `'l'`, + etc. parse properly. Formerly we had some English-centric heuristics, + but they are no longer needed. Closes #698. + + * `Text.Pandoc.Pretty`: Added wide punctuation range to `charWidth`. + This fixes bug with Chinese commas in markdown and reST tables, and + a bug that caused combining characters to be dropped. + + * `Text.Pandoc.MIME`: Added MIME types for .wof and .eot. Closes #640. + + * `Text.Pandoc.Biblio`: + + + Run `mvPunc` and `deNote` on metadata too. + This fixed a bug with notes on titles using footnote styles. + + Fixed bug in fetching CSL files from CSL data directory. + + * `pandoc.hs`: Give correct value to `writerSourceDirectory` when a URL + is provided. It should be the URL up to the path. + + * Fixed/simplified diff output for tests. + Biblio: Make sure mvPunc and deNote run on metadata too. + This fixed a bug with notes on titles using footnote styles. + +### Under the hood improvements + + * We no longer depend on `utf8-string`. Instead we use functions + defined in `Text.Pandoc.UTF8` that use `Data.Text`'s conversions. + + * Use `safeRead` instead of using `reads` directly (various modules). + + * "Implicit figures" (images alone in a paragraph) are now handled + differently. The markdown reader gives their titles the prefix `fig:`; the + writers look for this before treating the image as a figure. Though this + is a bit of a hack, it has two advantages: (i) implicit figures can be + limited to the markdown reader, and (ii) they can be deactivated by turning + off the `implicit_figures` extension. + + * `catch` from `Control.Exception` is now used instead of the + old Preface `catch`. + + * `Text.Pandoc.Shared`: Improved algorithm for `normalizeSpaces` + and `oneOfStrings` (which is now non-backtracking). + + * `Text.Pandoc.Biblio`: Remove workaround for `toCapital`. + Now citeproc-hs is fixed upstream, so this is no longer needed. + Closes #531. + + * Textile reader: Improved speed of `hyphenedWords`. + This speeds up the textile reader by about a factor of 4. + + * Use `Text.Pandoc.Builder` in RST reader, for more flexibility, + better performance, and automatic normalization. + + * Major rewrite of markdown reader: + + + Use `Text.Pandoc.Builder` instead of lists. This also + means that everything is normalized automatically. + + Move to a one-pass parsing strategy, returning values in the reader + monad, which are then run (at the end of parsing) against the final + parser state. + + * In HTML writer, we now use `toHtml` instead of pre-escaping. + We work around the problem that blaze-html unnecessarily escapes `'` + by pre-escaping just the `'` characters, instead of the whole string. + If blaze-html later stops escaping `'` characters, we can simplify + `strToHtml` to `toHtml`. Closes #629. + + * Moved code for embedding images in RTFs from `pandoc.hs` to the + RTF writer (which now exports `writeRTFWithEmbeddedImages`). + + * Moved citation processing from `pandoc.hs` into the readers. + This makes things more convenient for library users. + + * The man pages are now built by an executable `make-pandoc-man-pages`, + which has its own stanza in the cabal file so that dependencies can be + handled by Cabal. Special treatment in `Setup.hs` ensures that this + executable never gets installed; it is only used to create the man pages. + + * The cabal file has been modified so that the pandoc library is used + in building the pandoc executable. (This required moving `pandoc.hs` + from `src` to `.`.) This cuts compile time in half. + + * The `executable` and `library` flags have been removed. + + * `-threaded` has been removed from ghc-options. + + * Version bounds of dependencies have been raised, and the + `blaze_html_0_5` flag now defaults to True. Pandoc now compiles on + GHC 7.6. + + * We now require base >= 4.2. + + * Integrated the benchmark program into cabal. One can now do: + + cabal configure --enable-benchmarks && cabal build + cabal bench --benchmark-option='markdown' --benchmark-option='-s 20' + + The benchmark now uses README + testsuite, so benchmark results + from older versions aren't comparable. + + * Integrated test suite with cabal. + To run tests, configure with `--enable-tests`, then `cabal test`. + You can specify particular tests using `--test-options='-t markdown'`. + No output is shown unless tests fail. The Haskell test modules + have been moved from `src/` to `tests/`. + + * Moved all data files and templates to the `data/` subdirectory. + + * Added an `embed_data_files` cabal flag. This causes all + data files to be embedded in the binary, so that the binary + is self-sufficient and can be relocated anywhere, copied on + a USB key, etc. The Windows installer now uses this. + (Since we no longer have the option to build the executable + without the library, this is the only way to get a relocatable + binary on Windows.) + + * Removed pcre3.dll from windows package. + It isn't needed unless highlighting-kate is compiled with the + `pcre-light` flag. By default, regex-prce-builtin is used. + + +## pandoc 1.9.4.5 (2012-10-21) + + * Raised version bounds on network, base64-bytestring, json, + and template-haskell. + +## pandoc 1.9.4.4 (2012-10-20) + + * Removed `tests` flag and made test suite into a proper cabal + test suite, which can now be enabled using `--enable-tests` + and run with `cabal test`. + + * Moved man page creation out of `Setup.hs` and into an + executable built by Cabal, but never installed. This + allows dependencies to be specified, and solves a problem + with 1.9.4.3, which could only be installed if `data-default` + had already been installed. + + * Updated `lhs-latex.tex` test for latest highlighting-kate + representation of backticks. + +## pandoc 1.9.4.3 (2012-10-20) + + * Removed `-threaded` from default compile flags. + + * Modified modules to compile with GHC 7.6 and latest version of time + package. + +## pandoc 1.9.4.2 (2012-06-29) + + * Don't encode/decode file paths if base >= 4.4. + Prior to base 4.4, filepaths and command line arguments were treated + as unencoded lists of bytes, not unicode strings, so we had to work + around that by encoding and decoding them. This commit adds CPP + checks for the base version that intelligibly enable encoding/decoding + when needed. Fixes a bug with multilingual filenames when pandoc was + compiled with ghc 7.4 (#540). + + * Don't generate an empty H1 after hrule slide breaks. + We now use a slide-level header with contents `[Str "\0"]` to mark + an hrule break. This avoids creation of an empty H1 in these + contexts. Closes #484. + + * Docbook reader: Added support for "bold" emphasis. Thanks to mb21. + + * In make_osx_package.sh, ensure citeproc-hs is built with the + embed_data_files flag. + + * MediaWiki writer: Avoid extra blank lines after sublists (Gavin Beatty). + + * ConTeXt writer: Don't escape `&`, `^`, `<`, `>`, `_`, + simplified escapes for `}` and `{` to `\{` and `\}` (Aditya Mahajan). + + * Fixed handling of absolute URLs in CSS imports with `--self-contained`. + Closes #535. + + * Added webm to mime types. Closes #543. + + * Added some missing exports and tests to the cabal file + (Alexander V Vershilov). + + * Compile with `-rtsopts` and `-threaded` by default. + +## pandoc 1.9.4.1 (2012-06-08) + + * Markdown reader: Added `cf.` and `cp.` to list of likely abbreviations. + + * LaTeX template: Added `linkcolor`, `urlcolor` and `links-as-notes` + variables. Make TOC links black. + + * LaTeX template improvements. + + + Don't print date unless one is given explicitly in the document. + + Simplified templates. + + Use fontenc [T1] by default, and lmodern. + + Use microtype if available. + + * Biblio: + + + Add comma to beginning of bare suffix, e.g. `@item1 [50]`. + Motivation: `@item1 [50]` should be as close as possible to + `[@item1, 50]`. + + Added workaround for a bug in citeproc-hs 0.3.4 that causes footnotes + beginning with a citation to be empty. Closes #531. + + * Fixed documentation on mixed lists. Closes #533. + +## pandoc 1.9.4 (2012-06-03) + + * Simplified `Text.Pandoc.Biblio` and fixed bugs with citations inside + footnotes and captions. We now handle note citations by inserting + footnotes during initial citation processing, and doing a separate + pass later to remove notes inside notes. + + * Added 'zenburn' highlight style from highlighting-kate. + + * Added Slideous writer. Slideous is an HTML + javascript slide show + format, similar to Slidy, but works with IE 7. (Jonas Smedegaard) + + * LaTeX writer: + + + Ensure we don't have extra blank lines at ends of cells. + This can cause LaTeX errors, as they are interpreted as new paragraphs. + + More consistent interblock spacing. + + Require highlighting-kate >= 0.5.1, for proper highlighted inline + code in LaTeX. Closes #527. + + Ensure that a Verbatim at the end of a footnote is followed by + a newline. (Fixes a regression in the previous version.) + + In default template, use black for internal links and TOC. + Added commented-out code to use footnotes for links, as would + be suitable in print output. + + * Beamer writer: When `--incremental` is used, lists inside + a block quote should appear all at once. (This makes Beamer + output consistent with the HTML slide show formats.) + + * ConTeXt writer: + + + Escape `%` as `\letterpercent{}` not `\letterpercent `, + to avoid gobbling spaces after the `%` sign. + + Ensure space after `\stopformula`. + + * Markdown writer: + + + Use `:` form instead of `~` in definition lists, for better + compatibility with other markdown implementations. + + Don't wrap the term, because it breaks definition lists. + + Use a nonzero space to prevent false recognition + of list marker in ordered lists. Closes #516. + + * Org writer: Add space before language name. Closes #523. + + * Docx writer: Simplified bullet characters so they work properly + with Word 2007. Closes #520. + + * LaTeX reader: Support `\centerline`. + + * RST reader: handle figures. Closes #522. + + * Textile reader: fix for `<notextile>` and `==`. Closes #517. + (Paul Rivier) + +## pandoc 1.9.3 (2012-05-12) + + * Added docbook reader (with contributions from Mauro Bieg). + + * Fixed bug in `fromEntities`. The previous version would turn + `hi & low you know;` into `hi &`. + + * HTML reader: + + + Don't skip nonbreaking spaces. + Previously a paragraph containing just ` ` would be rendered + as an empty paragraph. Thanks to Paul Vorbach for pointing out the bug. + + Support `<col>` and `<caption>` in tables. Closes #486. + + * Markdown reader: + + + Don't recognize references inside delimited code blocks. + + Allow list items to begin with lists. + + * LaTeX reader: + + + Handle `\bgroup`, `\egroup`, `\begingroup`, `\endgroup`. + + Control sequences can't be followed by a letter. + This fixes a bug where `\begingroup` was parsed as `\begin` + followed by `group`. + + Parse 'dimension' arguments to unknown commands. e.g. `\parindent0pt` + + Make `\label` and `\ref` sensitive to `--parse-raw`. + If `--parse-raw` is selected, these will be parsed as raw latex + inlines, rather than bracketed text. + + Don't crash on unknown block commands (like `\vspace{10pt}`) + inside `\author`; just skip them. Closes #505. + + * Textile reader: + + + Implemented literal escapes with `==` and `<notextile>`. Closes #473. + + Added support for LaTeX blocks and inlines (Paul Rivier). + + Better conformance to RedCloth inline parsing (Paul Rivier). + + Parse '+text+' as emphasized (should be underlined, but this + is better than leaving literal plus characters in the output. + + * Docx writer: Fixed multi-paragraph list items. Previously they each + got a list marker. Closes #457. + + * LaTeX writer: + + + Added `--no-tex-ligatures` option to avoid replacing + quotation marks and dashes with TeX ligatures. + + Use `fixltx2e` package to provide `\textsubscript`. + + Improve spacing around LaTeX block environments: + quote, verbatim, itemize, description, enumerate. + Closes #502. + + Use blue instead of pink for URL links in latex/pdf output. + + * ConTeXt writer: Fixed escaping of `%`. + In text, `%` needs to be escaped as `\letterpercent`, not `\%` + Inside URLs, `%` needs to be escaped as `\%` + Thanks to jmarca and adityam for the fix. Closes #492. + + * Texinfo writer: Escape special characters in node titles. + This fixes a problem pointed out by Joost Kremers. Pandoc used + to escape an '@' in a chapter title, but not in the corresponding + node title, leading to invalid texinfo. + + * Fixed document encoding in texinfo template. + Resolves Debian Bug #667816. + + * Markdown writer: + + + Don't force delimited code blocks to be flush left. + Fixes bug with delimited code blocks inside lists etc. + + Escape `<` and `$`. + + * LaTeX writer: Use `\hyperref[ident]{text}` for internal links. + Previously we used `\href{\#ident}{text}`, which didn't work on + all systems. Thanks to Dirk Laurie. + + * RST writer: Don't wrap link references. Closes #487. + + * Updated to use latest versions of blaze-html, mtl. + + +## pandoc 1.9.2 (2012-04-05) + + * LaTeX reader: + + + Made `lstlisting` work as a proper verbatim environment. + + Fixed bug parsing LaTeX tables with one column. + + * LaTeX writer: + + + Use `{}` around `ctable` caption, so that formatting can be used. + + Don't require eurosym package unless document has a €. + + * LaTeX template: Added variables for `geometry`, `romanfont`, + `sansfont`, `mathfont`, `mainfont` so users can more easily + customize fonts. + + * PDF writer: + + + Run latex engine at least two times, to ensure + that PDFs will have hyperlinked bookmarks. + + Added PDF metadata (title,author) in LaTeX standalone + PDF output. + + * Texinfo writer: retain directories in image paths. (Peter Wang) + + * RST writer: Better handling of inline formatting, in accord + with docutils' "inline markup recognition rules" (though we don't + implement the unicode rules fully). Now `hi*there*hi` gets + rendered properly as `hi\ *there*\ hi`, and unnecessary + `\ ` are avoided around `:math:`, `:sub:`, `:sup:`. + + * RST reader: + + + Parse `\ ` as null, not escaped space. + + Allow `` :math:`...` `` even when not followed by blank + or `\`. This does not implement the complex rule docutils follows, + but it should be good enough for most purposes. + + Add support for the rST default-role directive. (Greg Maslov) + + * Text.Pandoc.Parsing: Added `stateRstDefaultRole` field to `ParserState`. + (Greg Maslov) + + * Markdown reader: Properly handle citations nested in other inline + elements. + + * Markdown writer: don't replace empty alt in image with "image". + + * DZSlides: Updated template.html and styles in default template. + Removed bizarre CSS for `q` in dzslides template. + + * Avoid repeated `id` attribute in section and header in HTML slides. + + * README improvements: new instructions on internal links, + removed misleading note on reST math. + + * Build system: + + + Fixed Windows installer so that dzslides works. + + Removed stripansi.sh. + + Added .travis.yml for Travis continuous integration support.. + + Fixed upper bound for zlib (Sergei Trofimovich). + + Fixed upper bound for test-framework. + + Updated haddocks for haddock-2.10 (Sergei Trofimovich). + + +## pandoc 1.9.1.2 (2012-03-09) + + * Added `beamer+lhs` as output format. + + * Don't escape `<` in `<style>` tags with `--self-contained`. + This fixes a bug which prevented highlighting from working + when using `--self-contained`. + + * PDF: run latex engine three times if `--toc` specified. + This fixes page numbers in the table of contents. + + * Docx writer: Added TableNormal style to tables. + + * LaTeX math environment fixes. `aligned` is now used instead of + the nonexistent `aligned*`. `multline` instead of the nonexistent + `multiline`. + + * LaTeX writer: Use `\textasciitilde` for literal `~`. + + * HTML writer: Don't escape contents of EQ tags with --gladtex. + This fixes a regression from 1.8. + + * Use `<q>` tags for Quoted items for HTML5 output. + The quote style can be changed by modifying the template + or including a css file. A default quote style is included. + + * LaTeX reader: Fixed accents (\~{a}, `\c{c}`). + Correctly handle \^{}. Support "minted" as a LaTeX verbatim block. + + * Updated LaTeX template for better language support. + Use `polyglossia` instead of `babel` with xetex. + Set `lang` as documentclass option. + `\setmainlanguage` will use the last of a comma-separated + list of languages. Thanks to François Gannaz. + + * Fixed default LaTeX template so `\euro` and `€` work. The + `eurosym` package is needed if you are using pdflatex. + + * Fixed escaping of period in man writer (thanks to Michael Thompson). + + * Fixed list label positions in beamer. + + * Set `mainlang` variable in context writer. + This parallels behavior of latex writer. `mainlang` is the last + of a comma-separated list of languages in lang. + + * EPUB language metadat: convert e.g. `en_US` from locale to `en-US`. + + * Changed `-V` so that you can specify a key without a value. + Such keys get the value `true`. + + * Fixed permissions on installed man pages - thanks Magnus Therning. + + * Windows installer: require XP or higher. The installer is + now compiled on a Windows 7 machine, which fixes a problem + using citation functions on Windows 7. + + * OSX package: Check for 64-bit Intel CPU before installing. + + +## pandoc 1.9.1.1 (2012-02-11) + + * Better handling of raw latex environments in markdown. Now + + \begin{equation} + a_1 + \end{equation} + + turns into a raw latex block as expected. + + * Improvements to LaTeX reader: + + + Skip options after block commands. + + Correctly handle `{\\}` in braced. + + Added a needed 'try'. + + Citations: add `, ` to suffix if it doesn't start with space or + punctuation. Otherwise we get no space between the year and the + suffix in author-date styles. + + * Added two needed data files for S5. This fixes a problem with + `pandoc -t s5 --self-contained`. Also removed `slides.min.js`, + which was no longer being used. + + * Fixed some minor problems in `reference.docx`: + name on "Date" style, `xCs` instead of `xIs`. + + * Fixed a problem creating docx files using a reference docx + modified using Word. The problem seems to be that Word + modifies `_rels/.rels`, changing the Type of the Relationship to + `docProps/core.xml`. Pandoc now changes this back to the correct + value if it has been altered, fixing the problem. + + * Fixed html5 template so it works properly with highlighting. + +## pandoc 1.9.1 (2012-02-09) + + * LaTeX reader: + + + Fixed regression in 1.9; properly handle escaped $ in latex math. + + Put LaTeX verse environments in blockquotes. + + * Markdown reader: + + + Limit nesting of strong/emph. This avoids exponential lookahead + in parasitic cases, like `a**a*a**a*a**a*a**a*a**a*a**a*a**a*a**`. + + Improved attributes syntax (in code blocks/spans): (1) + Attributes can contain line breaks. (2) Values in key-value + attributes can be surrounded by either double or single quotes, or + left unquoted if they contain no spaces. + + * Headers no longer wrap in markdown or RST writers. + + * Added `stateMaxNestingLevel` to `ParserState`. + We set this to 6, so you can still have `Emph` inside `Emph`, + just not indefinitely. + + * More efficient implementation of `nowrap` in `Text.Pandoc.Pretty`. + + * `Text.Pandoc.PDF`: Only run latex twice if `\tableofcontents` + is present. + + * Require highlighting-kate >= 0.5.0.2, texmath >= 0.6.0.2. + +## pandoc 1.9.0.5 (2012-02-06) + + * Changed cabal file so that build-depends for the test program + are not required unless the tests flag is used. + + * LaTeX writer: insert `{}` between adjacent hyphens so they don't + form ligatures (dashes) in code spans. + +## pandoc 1.9.0.4 (2012-02-06) + + * Raised version bound on test-framework to avoid problems + compiling tests on GHC 7.4.1. + + * LaTeX reader: Use raw LaTeX as fallback inline text for Cites, + so citations don't just disappear unless you process with + citeproc. Ignore `\bibliographystyle`, `\nocite`. + + * Simplified tex2pdf; it will always run latex twice to + resolve table of contents and hyperrefs. + +## pandoc 1.9.0.3 (2012-02-06) + + * Require Cabal >= 1.10. + + * Tweaked cabal file to meet Cabal 1.10 requirements. + +## pandoc 1.9.0.2 (2012-02-05) + + * Allow build with json 0.4 or 0.5. Otherwise we can't build with + ghc 6.12. + +## pandoc 1.9 (2012-02-05) + +### New features + + * Added a Microsoft Word `docx` writer. The writer includes support + for highlighted code and for math (which is converted from TeX to OMML, + Office's native math markup language, using texmath's new OMML module). + A new option `--reference-docx` allows the user to customize the + styles. + + * Added an `asciidoc` writer (<http://www.methods.co.nz/asciidoc/>). + + * Better support for slide shows: + + + Added a `dzslides` writer. DZSlides is a lightweight HTML5/javascript + slide show format due to Paul Rouget (<http://paulrouget.com/dzslides/>). + + + Added a LaTeX `beamer` writer. Beamer is a LaTeX package for creating + slide presentations. + + + New, flexible rules for dividing documents into sections and slides + (see the "Structuring the slide show" in the User's Guide). These + are backward-compatible with the old rules, but they allow slide + shows to be organized into sections and subsections containing + multiple slides. + + + A new `--slide-level` option allows users to override defaults + and select a slide level below the first header level with content. + + * A new `--self-contained` option produces HTML output that does not + depend on an internet connection or the presence of any external + files. Linked images, CSS, and javascript is downloaded (or fetched + locally) and encoded in `data:` URIs. This is useful for making portable + `HTML slide shows. The --offline` option has been deprecated and is now + `treated as a synonym or --self-contained`. + + * Support for PDF output: + + + Removed the old `markdown2pdf`. + + `pandoc` can now create PDFs (assuming you have latex and a set of + appropriate packages installed): just specify an output file with the + `.pdf` extension. + + A new option `--latex-engine` allows you to specify `pdflatex`, + `xelatex`, or `lualatex` as the processor. + + * Highlighting changes: + + + Syntax highlighting is now a standard feature; the `highlighting` + flag is no longer needed when compiling. + + A new `--no-highlight` option allows highlighting to be disabled. + + Highlighting now works in `docx`, `latex`, and `epub`, as well as + `html`, `html5`, `dzslides`, `s5`, and `slidy`. + + A new `--highlight-style` option selects between various highlighting + color themes. + + * Internal links to sections now work in ConTeXt and LaTeX as well as HTML. + + * LaTeX `\include` and `\usepackage` commands are now processed, + provided the files are in the working directory. + + * EPUB improvements: + + + Internal and external links now work in EPUB. + + Raw HTML is allowed. + + New `--epub-embed-font` option. + + Customizable templates for EPUB pages offer more control over + formatting: `epub-page.html`, `epub-coverimage.html`, + `epub-titlepage.html`. + + * `--mathml` now works with DocBook. + + * Added support for math in RST reader and writer. Inline math uses the + `` :math:`...` `` construct. Display math uses + + .. math:: ... + + or if the math is multiline, + + .. math:: + + ... + + These constructions are now supported now by `rst2latex.py`. + + * Github syntax for fenced code blocks is supported in pandoc's + markdown. You can now write + + ```ruby + x = 2 + ``` + + instead of + + ~~~ {.ruby} + x = 2 + ~~~~ + + * Easier scripting: a new `toJsonFilter` function makes it easier to + write Haskell scripts to manipulate the Pandoc AST. + See [Scripting with pandoc](scripting.html#pandoc-1.9-changes). + +### Behavior changes + + * Fixed parsing of consecutive lists in markdown. + Pandoc previously behaved like Markdown.pl for consecutive + lists of different styles. Thus, the following would be parsed + as a single ordered list, rather than an ordered list followed + by an unordered list: + + 1. one + 2. two + + - one + - two + + This change makes pandoc behave more sensibly, parsing this as + two lists. Any change in list type (ordered/unordered) or in + list number style will trigger a new list. Thus, the following + will also be parsed as two lists: + + 1. one + 2. two + + a. one + b. two + + Since we regard this as a bug in Markdown.pl, and not something + anyone would ever rely on, we do not preserve the old behavior + even when `--strict` is selected. + + * Dashes work differently with `--smart`: `---` is always em-dash, + and `--` is always en-dash. Pandoc no longer tries to guess when + `-` should be en-dash. *Note:* This may change how existing documents + look when processed with pandoc. A new option, `--old-dashes`, + is provided for legacy documents. + + * The markdown writer now uses setext headers for levels 1-2. + The old behavior (ATX headers for all levels) can be restored + using the new `--atx-headers` option. + + * Links are now allowed in markdown image captions. They are also + allowed in links, but will appear there as regular text. So, + + [link with [link](/url)](/url) + + will turn into + + <p><a href="/url">link with link</a></p> + + * Improved handling of citations using `citeproc-hs-0.3.4`. + Added `--citation-abbreviations` option. + + * Citation keys can no longer end with a punctuation character. + This means that `@item1.` will be parsed as a citation with key + 'item1', followed by a period, instead of a citation with key + 'item1.', as was the case previously. + + * In HTML output, citations are now put in a span with class `citation`. + + * The markdown reader now recognizes DocBook block and inline tags. + It was always possible to include raw DocBook tags in a markdown + document, but now pandoc will be able to distinguish block from + inline tags and behave accordingly. Thus, for example, + + <sidebar> + hello + </sidebar> + + will not be wrapped in `<para>` tags. + + * The LaTeX parser has been completely rewritten; it is now much more + accurate, robust, and extensible. However, there are two important + changes in how it treats unknown LaTeX. (1) Previously, unknown + environments became BlockQuote elements; now, they are treated + as "transparent", so `\begin{unknown}xyz\end{unknown}` is the + same as `xyz`. (2) Previously, arguments of unknown commands + were passed through with their braces; now the braces are stripped + off. + + * `--smart` is no longer selected automatically with `man` output. + + * The deprecated `--xetex` option has been removed. + + * The `--html5`/`-5` option has been deprecated. Use `-t html5` + instead. `html5` and `html5+lhs` are now separate output formats. + + * Single quotes are no longer escaped in HTML output. They do not + need to be escaped outside of attributes. + + * Pandoc will no longer transform leading newlines in code + blocks to `<br/>` tags. + + * The ODT writer now sizes images appropriately, using the image + size and DPI information embedded in the image. + + * `--standalone` is once again implicitly for a non-text output format + (ODT, EPUB). You can again do `pandoc test.txt -o test.odt` + and get a standalone ODT file. + + * The Docbook writer now uses `<sect1>`, `<sect2>`, etc. instead of + `<section>`. + + * The HTML writer now uses `<del>` for strikeout. + + * In HTML output with `--section-divs`, the classes `section` and + `level[1,2,..6]` are put on the `div` tags so they can be styled. + In HTML 5 output with `--section-divs`, the classes + `level[1,2,...6]` are put on `section` tags. + + * EPUB writer changes: + + + The `lang` variable now sets the language + in the metadata (if it is not set, we default to the locale). + + EPUB: UTF-8 is used rather than decimal entities. + + * Added `titleslide` class to title slide in S5 template. + + * In HTML, EPUB, and docx metadata, the date is normalized into + YYYY-MM-DD format if possible. (This is required for validation.) + + * Attributes in highlighted code blocks are now preserved in HTML. + The container element will have the classes, id, and key-value attributes + you specified in the delimited code block. Previously these were stripped + off. + + * The reference backlink in the HTML writer no longer has a special + `footnoteBacklink` class. + + * The HTML template has been split into `html` and `html5` templates. + + * Author and date are treated more consistently in HTML templates. + Authors are now `<h2>`, date `<h3>`. + + * URLs are hyphenated in the ConTeXt writer (B. Scott Michel). + + * In `Text.Pandoc.Builder`, `+++` has been replaced by `<>`. + +### Bug fixes + + * Better support for combining characters and East Asian wide characters + in markdown and reST. + + * Better handling of single quotes with `--smart`. + Previously `D'oh l'*aide*` would be parsed with left and right single + quotes instead of apostrophes. This kind of error is now fixed. + + * Highlighting: Use `reads` instead of `read` for better error handling. + Fixes crash on `startNum="abc"`. + + * Added blank comment after directives in rst template. + + * Unescape entities in citation `refId`. The `refId`s coming + from citeproc contain XML numeric entities, and these don't match with the + citation keys parsed by pandoc. Solution is to unescape them. + + * HTML reader: Fixed bug parsing tables with both thead and tbody. + + * Markdown reader: + + + Better handling of escapes in link URLs and titles. + + Fixed backslash escapes in reference links. + + Fixed bug in table/hrule parsing, by checking that the top + line of a table is not followed by a blank line. This bug caused + slowdowns on some files with hrules and tables, as pandoc tried to + interpret the hrules as the tops of multiline tables. + + Fixed bug in code block attribute parser. Previously the ID attribute + got lost if it didn't come first. Now attributes can come in any order. + + * RST reader: allow footnotes followed by newline without space characters. + + * LaTeX reader: + + + Ignore empty groups {}, { }. + + LaTeX reader: Handle `\@`. + + LaTeX reader: Don't crash on commands like `\itemsep`. + + LaTeX reader: Better handling of letter environments. + + * RST writer: Fixed bug involving empty table cells. isSimple was being + calculated in a way that assumed there were no non-empty cells. + + * ConTeXt writer: + + + Made `--toc` work even without `--number-sections`. + + Escape # in link URLs. + + Use buffering for footnotes containing code blocks. + + Changed 'descr' to 'description', fixed alignment. + + * LaTeX writer: + + + Escape euro character. + + Don't escape `~` inside `\href{...}`. + + Escape `#` in href URLs. + + Improved detection of book classes. We now check the + `documentclass` variable, and if that is not set, we look through + the template itself. Also, we have added the KOMA classes scrreprt + and scrbook. You can now make a book using + `pandoc -V documentclass:book mybook.txt -o mybook.pdf` + + LHS files now set the "listings" variable, so that the definition + of the `code` environment will be included in the template. + + Links are colored blue by default (this can be changed by + modifying `hyperref` settings in the template). + + Added `lang` variable to LaTeX template. + + * HTML writer: + + + Fixed bug in HTML template with html5 and mathml. + + Don't use self-closing img, br, hr tags for HTML5. + + Use `<section>` for footnotes if HTML5. + + Update HTML templates to use Content-Style-Type meta tag. + + Use separate variables for meta-date, meta-author. + This makes footnotes work in author and date fields. + + Use 'vertical-align:middle' in WebTeX math for better alignment. + + * S5/slidy writer: Make footnotes appear on separate slide at end. + + * MIME: Added 'layout-cache' to getMimeType. This ensures that the + META-INF/manifest.xml for ODT files will have everything it needs, so + that ODT files modified by LibreOffice can be used as `--reference-odt`. + + * `Text.Pandoc.Templates`: Return empty string for json template. + + * `Text.Pandoc.Biblio`: + + + Expand citations recursively inside nested inlines. + + Treat `\160` as space when parsing locator and suffix. + This fixes a bug with "p. 33" when `--smart` is used. Previously + the whole "p. 33" would be included in the suffix, with no locator. + + Put whole author-in-text citation in a Cite. Previously just the + date and other info went in the Cite. + + Don't add comma+space to prefix if it ends in punctuation. + + * Updated chicago-author-date.csl. The old version did not work + properly for edited volumes with no author. + + * EPUB writer: + + + Add date to EPUB titlepage and metadata. + + Added TOC identifier in EPUB page template. + + Don't generate superfluous file `cover-image.jpg`. + +### Under the hood improvements + + * Modified `make_osx_package.sh` to use cabal-dev. + Items are no longer installed as root. + Man pages are zipped and given proper permissions. + + * Modified windows installer generator to use cabal-dev. + + * Setup: Making man pages now works with cabal-dev (at least on OSX). In + Setup.hs we now invoke 'runghc' in a way that points it to the correct + package databases, instead of always falling back to the default user + package db. + + * Updated to work with GHC 7.4.1. + + * Removed dependency on old-time. + + * Removed dependency on dlist. + + * New slidy directory for "self-contained." + + * TeXMath writer: Use unicode thin spaces for thin spaces. + + * Markdown citations: don't strip off initial space in locator. + +### API changes + + * Removed `Apostrophe`, `EmDash`, `EnDash`, and `Ellipses` + from the native `Inline` type in pandoc-types. Now we use `Str` + elements with unicode. + + * Improvements to `Text.Pandoc.Builder`: + + + `Inlines` and `Blocks` are now newtypes (not synonyms for + sequences). + + Instances are defined for `IsString`, `Show`, `Read`, `Monoid`, + and a new `Listable` class, which allows these to be manipulated + to some extent like lists. Monoid append includes automatic + normalization. + + `+++` has been replaced by `<>` (mappend). + + * Use blaze-html instead of xhtml for HTML generation. + This changes the type of `writeHtml`. + + * `Text.Pandoc.Shared`: + + + Added `warn` and `err`. + + Removed `unescapeURI`, modified `escapeURI`. + (See under [behavior changes], above.) + + * Changes in URI escaping: Previously the readers escaped URIs by + converting unicode characters to octets and then percent encoding. + Now unicode characters are left as they are, and `escapeURI` only + percent-encodes space characters. This gives more readable + URIs, and works well with modern user agents. URIs are no longer unescaped + at all on conversion to `markdown`, `asciidoc`, `rst`, `org`. + + * New module `Text.Pandoc.SelfContained`. + + * New module `Text.Pandoc.Docx`. + + * New module `Text.Pandoc.PDF`. + + * Added `writerBeamer` to `WriterOptions`. + + * Added `normalizeDate` to `Text.Pandoc.Shared`. + + * Added `splitStringWithIndices` in `Text.Pandoc.Shared`. + This is like `splitWithIndices`, but it is sensitive to distinctions + between wide, combining, and regular characters. + + * `Text.Pandoc.Pretty`: + + + Added `chomp` combinator. + + Added `beforeNonBreak` combinator. This allows you to include + something conditionally on it being before a nonblank. + Used for RST inline math. + + Added `charWidth` function. All characters marked W or F in the unicode + spec EastAsianWidth.txt get width 2. + + Added `realLength`, based on `charWidth`. `realLength` is now + used in calculating offsets. + + * New module `Text.Pandoc.Slides`, for common functions for breaking + a document into slides. + + * Removed `Text.Pandoc.S5`, which is no longer needed. + + * Removed `Text.Pandoc.CharacterReferences`. Moved + `characterReference` to `Text.Pandoc.Parsing`. + `decodeCharacterReferences` is replaced by `fromEntities` + in `Text.Pandoc.XML`. + + * Added `Text.Pandoc.ImageSize`. This is intened for use + in `docx` and `odt` writers, so the size and dpi of images + can be calculated. + + * Removed `writerAscii` in `WriterOptions`. + + * Added `writerHighlight` to `WriterOptions`. + + * Added `DZSlides` to `HTMLSlideVariant`. + + * `writeEPUB` has a new argument for font files to embed. + + * Added `stateLastStrPos` to `ParserState`. This lets us keep track + of whether we're parsing the position immediately after a regular + (non-space, non-symbol) string, which is useful for distinguishing + apostrophes from single quote starts. + + * `Text.Pandoc.Parsing`: + + + `escaped` now returns a `Char`. + + Removed `charsInBalanced'`, added a character parser as + a parameter of `charsInBalanced`. This is needed for + proper handling of escapes, etc. + + Added `withRaw`. + + * Added `toEntities` to `Text.Pandoc.XML`. + + * `Text.Pandoc.Readers.LaTeX`: + + + Export `handleIncludes`. + + Export `rawLaTeXBlock` instead of `rawLaTeXEnvironment'`. + + * Added `ToJsonFilter` class and `toJsonFilter` function to + `Text.Pandoc`, deprecating the old `jsonFilter` function. + + * `Text.Pandoc.Highlighting`: + + + Removed `highlightHtml`, `defaultHighlightingCss`. + + Export `formatLaTeXInline`, `formatLaTeXBlock`, and `highlight`, plus + key functions from highlighting-kate. + + Changed types of highlighting function. `highlight` returns a + `Maybe`, not an `Either`. + + +## pandoc 1.8.2.1 (2011-08-01) + + * Adjusted Arbitrary instance to help avoid timeouts in tests. + + * Added `Tests.Writers.Markdown` to cabal file. + + * Relaxed version bounds on pandoc-types, test-framework. + +## pandoc 1.8.2 (2011-07-30) + + * 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! + + * 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: Set `\emergencystretch` to prevent overfull lines. + + 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. + + * 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`. + + * Added `nonspaceChar` to `Text.Pandoc.Parsing`. + + * 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 `<link>` 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. + + +## pandoc 1.8.1.2 (2011-07-16) + + * 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: 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 `<b>`, `<emph>`, 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 (2011-02-13) + + * `markdown2pdf`: Removed some debugging lines accidentally included + in the 1.8.1 release. With those lines, the temp directory is created + in the working directory, and it is not deleted. This fix restores + the original behavior. + +## pandoc 1.8.1 (2011-02-13) + + * Added `--ascii` option. Currently supported only in HTML writer, + which it causes to use numerical entities instead of UTF-8. + + * EPUB writer: `--toc` now works to provide a table of contents + at the beginning of each chapter. + + * LaTeX writer: Change figure defaults to `htbp`. + This prevents "too many unprocessed floats." Resolves + Issue #285. + + * `Text.Pandoc.UTF8`: Encode filenames even when using recent + base. + + * `markdown2pdf`: Fixed filename encoding issues. With help from Paulo + Tanimoto. Resolves Issue #286. + + * HTML writer: Put line breaks in section divs. + + * `Text.Pandoc.Shared`: Make `writerSectionDivs` default to False. + +## pandoc 1.8.0.3 (2011-02-05) + + * Fixed Source-repository stanza in cabal file. + +## pandoc 1.8.0.2 (2011-02-05) + + * HTML writer: + + + Stringify alt text instead of converting to HTML. + + Break lines after block elements, not inside tags. + HTML output now closely resembles that of tidy. Resolves Issue #134. + + * Markdown reader: Fixed bug in footnote block parser (pointed out + by Jesse Rosenthal). The problem arose when the blank line + at the end of a footnote block contained indenting spaces. + + * Shared: Improved 'normalize' function so it normalizes Spaces too. + In normal form, Space elements only occur to separate two non-Space + elements. So, we never have [Space], or [, ..., Space]. + + * Tests: + + + Improved Arbitrary instance. + + Added timeout for test instances. + + * README: + + + Added section on four-space rule for lists. Resolves Issue #283. + + Clarified optional arguments on math options. + + * markdown2pdf: Fixed bug with output file extensions. + Previously `markdown2pdf test.txt -o test.en.pdf` would produce + `test.pdf`, not `test.en.pdf`. Thanks to Paolo Tanimoto for the fix. + +## pandoc 1.8.0.1 (2011-01-31) + + * Revised Interact.hs so that it works with the CPP macros + in the UTF8 module. + + * Revised Setup.hs so that we don't call MakeManPage.hs unless + the man pages are out of date. + +## pandoc 1.8 (2011-01-30) + +### New features + + * Support for citations using Andrea Rossato's `citeproc-hs` 0.3. + You can now write, for example, + + Water is wet [see @doe99, pp. 33-35; also @smith04, ch. 1]. + + and, when you process your document using `pandoc`, specifying + a citation style using `--csl` and a bibliography using `--bibliography`, + the citation will be replaced by an appropriately formatted + citation, and a list of works cited will be added to the end + of the document. + + This means that you can switch effortlessly between different citation + and bibliography styles, including footnote, numerical, and author-date + formats. The bibliography can be in any of the following formats: MODS, + BibTeX, BibLaTeX, RIS, EndNote, EndNote XML, ISI, MEDLINE, Copac, or JSON. + See the README for further details. + + Citations are supported in the markdown reader, using a special + syntax, and in the LaTeX reader, using natbib or biblatex syntax. + (Thanks to Nathan Gass for the natbib and biblatex support.) + + * New `textile` reader and writer. Thanks to Paul Rivier for contributing + the `textile` reader, an almost complete implementation of the textile + syntax used by the ruby [RedCloth library](http://redcloth.org/textile). + Resolves Issue #51. + + * New `org` writer, for Emacs Org-mode, contributed by Puneeth Chaganti. + + * New `json` reader and writer, for reading and writing a JSON + representation of the native Pandoc AST. These are much faster + than the `native` reader and writer, and should be used for + serializing Pandoc to text. To convert between the JSON representation + and native Pandoc, use `encodeJSON` and `decodeJSON` from + `Text.JSON.Generic`. + + * A new `jsonFilter` function in `Text.Pandoc` makes it easy + to write scripts that transform a JSON-encoded pandoc document. + For example: + + -- removelinks.hs - removes links from document + import Text.Pandoc + main = interact $ jsonFilter $ bottomUp removeLink + where removeLink (Link xs _) = Emph xs + removeLink x = x + + To use this to remove links while translating markdown to LaTeX: + + pandoc -t json | runghc removelinks.hs | pandoc -f json -t latex + + * Attributes are now allowed in inline `Code` elements, for example: + + In this code, `ulist ! [theclass "special"] << elts`{.haskell} is... + + The attribute syntax is the same as for delimited code blocks. + `Code` inline has an extra argument place for attributes, just like + `CodeBlock`. Inline code will be highlighted in HTML output, if pandoc + is compiled with highlighting support. Resolves Issue #119. + + * New `RawBlock` and `RawInline` elements (replacing `RawHtml`, + `HtmlInline`, and `TeX`) provide lots of flexibility in writing + scripts to transform Pandoc documents. Scripts can now change + how each element is rendered in each output format. + + * You can now define LaTeX macros in markdown documents, and pandoc + will apply them to TeX math. For example, + + \newcommand{\plus}[2]{#1 + #2} + $\plus{3}{4}$ + + yields `3+4`. Since the macros are applied in the reader, they + will work in every output format, not just LaTeX. + + * LaTeX macros can also be used in LaTeX documents (both in math + and in non-math contexts). + + * A new `--mathjax` option has been added for displaying + math in HTML using MathJax. Resolves issue #259. + + * Footnotes are now supported in the RST reader. (Note, however, + that unlike docutils, pandoc ignores the numeral or symbol used in + the note; footnotes are put in an auto-numbered ordered list.) + Resolves Issue #258. + + * A new `--normalize` option causes pandoc to normalize the AST + before writing the document. This means that, for example, + `*hi**there*` will be rendered as `<em>hithere</em>` + instead of `<em>hi</em><em>there</em>`. This is not the default, + because there is a significant performance penalty. + + * A new `--chapters` command-line option causes headers + in DocBook, LaTeX, and ConTeXt to start with "chapter" (level one). + Resolves Issue #265. + + * In DocBook output, `<chapter>` is now used for top-level + headers if the template contains `<book>`. Resolves Issue #265. + + * A new `--listings` option in `pandoc` and `markdown2pdf` causes + the LaTeX writer to use the listings package for code blocks. + (Thanks to Josef Svennigsson for the pandoc patch, and Etienne + Millon for the markdown2pdf patch.) + + * `markdown2pdf` now supports `--data-dir`. + + * URLs in autolinks now have class "url" so they can be styled. + + * Improved prettyprinting in most formats. Lines will be wrapped + more evenly and duplicate blank lines avoided. + + * New `--columns` command-line option sets the column width for + line wrapping and relative width calculations for tables. + + * Made `--smart` work in HTML, RST, and Textile readers, as well + as markdown. + + * Added `--html5` option for HTML5 output. + + * Added support for listings package in LaTeX reader + (Puneeth Chaganti). + + * Added support for simple tables in the LaTeX reader. + + * Added support for simple tables in the HTML reader. + + * Significant performance improvements in many readers and writers. + +### API and program changes + + * Moved `Text.Pandoc.Definition` from the `pandoc` package to a new + auxiliary package, `pandoc-types`. This will make it possible for other + programs to supply output in Pandoc format, without depending on the whole + pandoc package. + + * Added `Attr` field to `Code`. + + * Removed `RawHtml`, `HtmlInline`, and `TeX` elements; added generic + `RawBlock` and `RawInline`. + + * Moved generic functions to `Text.Pandoc.Generic`. Deprecated + `processWith`, replacing it with two functions, `bottomUp` and `topDown`. + Removed previously deprecated functions `processPandoc` and `queryPandoc`. + + * Added `Text.Pandoc.Builder`, for building `Pandoc` structures. + + * `Text.Pandoc` now exports association lists `readers` and `writers`. + + * Added `Text.Pandoc.Readers.Native`, which exports `readNative`. + `readNative` can now read full pandoc documents, block lists, blocks, + inline lists, or inlines. It will interpret `Str "hi"` + as if it were `Pandoc (Meta [] [] []) [Plain [Str "hi"]]`. + This should make testing easier. + + * Removed deprecated `-C/--custom-header` option. + Use `--template` instead. + + * `--biblio-file` has been replaced by `--bibliography`. + `--biblio-format` has been removed; pandoc now guesses the format + from the file extension (see README). + + * pandoc will treat an argument as a URI only if it has an + `http(s)` scheme. Previously pandoc would treat some + Windows pathnames beginning with `C:/` as URIs. + + * The `--sanitize-html` option and the `stateSanitize` field in + `ParserState` have been removed. Sanitization is better done in the + resulting HTML using `xss-sanitize`, which is based on pandoc's + sanitization, but improved. + + * pandoc now adds a newline to the end of its output in fragment + mode (= not `--standalone`). + + * Added support for `lang` in `html` tag in the HTML template, + so you can do `pandoc -s -V lang=es`, for example. + + * `highlightHtml` in `Text.Pandoc.Highlighting` now takes + a boolean argument that selects between "inline" and + "block" HTML. + + * `Text.Pandoc.Writers.RTF` now exports `rtfEmbedImage`. + Images are embedded in RTF output when possible (png, jpeg). + Resolves Issue #275. + + * Added `Text.Pandoc.Pretty`. This is better suited for pandoc than the + `pretty` package. Changed all writers that used + `Text.PrettyPrint.HughesPJ` to use `Text.Pandoc.Pretty` instead. + + * Rewrote `writeNative` using the new prettyprinting module. It is + now much faster. The output has been made more consistent and compressed. + `writeNative` is also now sensitive to writerStandalone`, and will simply + `print a block list if writerStandalone` is False. + + * Removed `Text.Pandoc.Blocks`. `Text.Pandoc.Pretty` allows you to define + blocks and concatenate them, so a separate module is no longer needed. + + * `Text.Pandoc.Shared`: + + + Added `writerColumns`, `writerChapters`, and `writerHtml5` to + `WriterOptions`. + + Added `normalize`. + + Removed unneeded prettyprinting functions: + `wrapped`, `wrapIfNeeded`, `wrappedTeX`, `wrapTeXIfNeeded`, `hang'`, + `BlockWrapper`, `wrappedBlocksToDoc`. + + Made `splitBy` take a test instead of an element. + + Added `findDataFile`, refactored `readDataFile`. + + Added `stringify`. Rewrote `inlineListToIdentifier` using `stringify`. + + Fixed `inlineListToIdentifier` to treat `\160` as ' '. + + * `Text.Pandoc.Readers.HTML`: + + + Removed `rawHtmlBlock`, `anyHtmlBlockTag`, `anyHtmlInlineTag`, + `anyHtmlTag`, `anyHtmlEndTag`, `htmlEndTag`, `extractTagType`, + `htmlBlockElement`, `htmlComment` + + Added `htmlTag`, `htmlInBalanced`, `isInlineTag`, `isBlockTag`, + `isTextTag` + + * Moved `smartPunctuation` from `Text.Pandoc.Readers.Markdown` + to `Text.Pandoc.Readers.Parsing`, and parameterized it with + an inline parser. + + * Ellipses are no longer allowed to contain spaces. + Previously we allowed '. . .', ' . . . ', etc. This caused + too many complications, and removed author's flexibility in + combining ellipses with spaces and periods. + + * Allow linebreaks in URLs (treat as spaces). Also, a string of + consecutive spaces or tabs is now parsed as a single space. If you have + multiple spaces in your URL, use `%20%20`. + + * `Text.Pandoc.Parsing`: + + + Removed `refsMatch`. + + Hid `Key` constructor. + + Removed custom `Ord` and `Eq` instances for `Key`. + + Added `toKey` and `fromKey` to convert between `Key` and `[Inline]`. + + Generalized type on `readWith`. + + * Small change in calculation of relative widths of table columns. + If the size of the header > the specified column width, use + the header size as 100% for purposes of calculating + relative widths of columns. + + * Markdown writer now uses some pandoc-specific features when `--strict` + is not specified: `\` newline is used for a hard linebreak instead of + two spaces then a newline. And delimited code blocks are used when + there are attributes. + + * HTML writer: improved gladTeX output by setting ENV appropriately + for display or inline math (Jonathan Daugherty). + + * LaTeX writer: Use `\paragraph`, `\subparagraph` for level 4,5 headers. + + * LaTeX reader: + + + `\label{foo}` and `\ref{foo}` now become `{foo}` instead of `(foo)`. + + `\index{}` commands are skipped. + + * Added `fontsize` variable to default LaTeX template. + This makes it easy to set the font size using `markdown2pdf`: + `markdown2pdf -V fontsize=12pt input.txt`. + + * Fixed problem with strikeout in LaTeX headers when using + hyperref, by adding a command to the default LaTeX template + that disables `\sout` inside pdf strings. Thanks to Joost Kremers + for the fix. + + * The `COLUMNS` environment variable no longer has any effect. + +### Under-the-hood improvements + + * Pandoc now compiles with GHC 7. (This alone leads to a + significant performance improvement, 15-20%.) + + * Completely rewrote HTML reader using tagsoup as a lexer. The + new reader is faster and more accurate. Unlike the + old reader, it does not get bogged down on some input + (Issues #277, 255). And it handles namespaces in tags + (Issue #274). + + * Replaced `escapeStringAsXML` with a faster version. + + * Rewrote `spaceChar` and some other parsers in Text.Pandoc.Parsing + for a significant performance boost. + + * Improved performance of all readers by rewriting parsers. + + * Simplified Text.Pandoc.CharacterReferences by using + entity lookup functions from TagSoup. + + * `Text.Pandoc.UTF8` now uses the unicode-aware IO functions + from `System.IO` if base >= 4.2. This gives support for + windows line endings on windows. + + * Remove duplications in documentation by generating the + pandoc man page from README, using `MakeManPage.hs`. + + * README now includes a full description of markdown syntax, + including non-pandoc-specific parts. A new `pandoc_markdown` + man page is extracted from this, so you can look up markdown + syntax by doing `man pandoc_markdown`. + + * Completely revised test framework (with help from Nathan Gass). + The new test framework is built when the `tests` Cabal flag is set. It + includes the old integration tests, but also some new unit and quickcheck + tests. Test output has been much improved, and you can now specify a glob + pattern after `cabal test` to indicate which tests should be run; + for example `cabal test citations` will run all the citation tests. + + * Added a shell script, `stripansi.sh`, for filtering ANSI control + sequences from test output: `cabal test | ./stripansi.sh > test.log`. + + * Added `Interact.hs` to make it easier to use ghci while developing. + `Interact.hs` loads `ghci` from the `src` directory, specifying + all the options needed to load pandoc modules (including + specific package dependencies, which it gets by parsing + dist/setup-config). + + * Added `Benchmark.hs`, testing all readers + writers using criterion. + + * Added `stats.sh`, to make it easier to collect and archive + benchmark and lines-of-code stats. + + * Added upper bounds to all cabal dependencies. + + * Include man pages in extra-source-files. This allows users to + install pandoc from the tarball without needing to build the man + pages. + +### Bug fixes + + * Filenames are encoded as UTF8. Resolves Issue #252. + + * Handle curly quotes better in `--smart` mode. Previously, curly quotes + were just parsed literally, leading to problems in some output formats. + Now they are parsed as `Quoted` inlines, if `--smart` is specified. + Resolves Issue #270. + + * Text.Pandoc.Parsing: Fixed bug in grid table parser. + Spaces at end of line were not being stripped properly, + resulting in unintended LineBreaks. + + * Markdown reader: + + + Allow HTML comments as inline elements in markdown. + So, `aaa <!-- comment --> bbb` can be a single paragraph. + + Fixed superscripts with links: `^[link](/foo)^` gets + recognized as a superscripted link, not an inline note followed by + garbage. + + Fixed regression, making markdown reference keys case-insensitive again. + Resolves Issue #272. + + Properly handle abbreviations (like `Mr.`) at the end of a line. + + Better handling of intraword underscores, avoiding exponential + slowdowns in some cases. Resolves Issue #182. + + Fixed bug in alignments in tables with blank rows in the header. + + * RST reader: + + + Field lists now allow spaces in field names, and + block content in field values. (Thanks to Lachlan Musicman + for pointing out the bug.) + + Definition list items are now always `Para` instead of + `Plain`, matching behavior of `rst2xml.py`. + + In image blocks, the description is parsed properly and + used for the alt attribute, not also the title. + + Skip blank lines at beginning of file. Resolves + Debian #611328. + + * LaTeX reader: + + + Improved parsing of preamble. + Previously you'd get unexpected behavior on a document that + contained `\begin{document}` in, say, a verbatim block. + + Allow spaces between `\begin` or `\end` and `{`. + + Support `\L` and `\l`. + + Skip comments inside paragraphs. + + * LaTeX writer: + + + Escape strings in `\href{..}`. + + In nonsimple tables, put cells in `\parbox`. + + * OpenDocument writer: don't print raw TeX. + + * Markdown writer: + + + Fixed bug in `Image`. URI was getting unescaped twice! + + Avoid printing extra blank lines at the end if there are + no notes or references. + + * LaTeX and ConTeXt: Escape `[` and `]` as `{[}` and `{]}`. + This avoids unwanted interpretation as an optional argument. + + * ConTeXt writer: Fixed problem with inline code. Previously + `}` would be rendered `\type{}}`. Now we check the string for '}' and '{'. + If it contains neither, use `\type{}`; otherwise use `\mono{}` + with an escaped version of the string. + + * `:` now allowed in HTML tags. Resolves Issue #274. + + + +## pandoc 1.6 (2010-07-24) + ++ New EPUB and HTML Slidy writers. (Issue #122) + + - [EPUB] is a standard ebook format, used in Apple's iBooks for + the iPad and iPhone, Barnes and Noble's nook reader, the Sony + reader, and many other devices, and by online ebook readers like + [bookworm]. (Amazon's Kindle uses a different format, MobiPocket, + but EPUB books can easily be converted to Kindle format.) Now you + can write your book in markdown and produce an ebook with a single + command! I've put up a short [tutorial here]. + - [Slidy], like S5, is a system for producing HTML+javascript slide shows. + ++ All input is assumed to be UTF-8, no matter what the locale and ghc + version, and all output is UTF-8. This reverts to pre-1.5 behavior. + Also, a BOM, if present, is stripped from the input. + ++ Markdown now supports grid tables, whose cells can contain + arbitrary block elements. (Issue #43) + ++ Sequentially numbered example lists in markdown with `@` marker. + ++ Markdown table captions can begin with a bare colon and no longer need + to include the English word "table." Also, a caption can now occur + either before or after the table. (Issue #227) + ++ New command-line options: + + - `--epub-stylesheet` allows you to specify a CSS file that will + be used to style your ebook. + - `--epub-metadata` allows you to specify metadata for the ebook. + - `--offline` causes the generated HTML slideshow to include all + needed scripts and stylesheets. + - `--webtex` causes TeX math to be converted to images using the + Google Charts API (unless a different URL is specified). + - `--section-divs` causes div tags to be added around each section + in an HTML document. (Issue #230, 239) + ++ Default behavior of S5 writer in standalone mode has changed: + previously, it would include all needed scripts and stylesheets + in the generated HTML; now, only links are included unless + the `--offline` option is used. + ++ Default behavior of HTML writer has changed. Between 1.2 and 1.5, + pandoc would enclose sections in div tags with identifiers on the + div tags, so that the sections can be manipulated in javascript. + This caused undesirable interactions with raw HTML div tags. So, + starting with 1.6, the default is to put the identifiers directly + on the header tags, and not to include the divs. The `--section-divs` + option selects the 1.2-1.5 behavior. + ++ API changes: + + - `HTMLMathMethod`: Added `WebTeX`, removed `MimeTeX`. + - `WriterOptions`: Added `writerUserDataDir`, `writerSourceDirectory`, + `writerEPUBMetadata` fields. Removed `writerIncludeBefore`, + `writerIncludeAfter`. + - Added `headerShift` to `Text.Pandoc.Shared`. + - Moved parsing code and `ParserState` from `Text.Pandoc.Shared` + to a new module, `Text.Pandoc.Parsing`. + - Added `stateHasChapters` to `ParserState`. + - Added `HTMLSlideVariant`. + - Made `KeyTable` a map instead of an association list. + - Added accessors for `Meta` fields (`docTitle`, `docAuthors`, `docDate`). + - `Pandoc`, `Meta`, `Inline`, and `Block` have been given `Ord` instances. + - Reference keys now have a type of their own (`Key`), with its + own `Ord` instance for case-insensitive comparison. + - Added `Text.Pandoc.Writers.EPUB`. + - Added `Text.Pandoc.UUID`. + - Removed `Text.Pandoc.ODT`, added `Text.Pandoc.Writers.ODT`. + Removed `saveOpenDocumentAsODT`, added `writeODT`. + - Added `Text.Pandoc.Writers.Native` and `writeNative`. + Removed `prettyPandoc`. + - Added `Text.Pandoc.UTF8` for portable UTF8 string IO. + - Removed `Text.Pandoc.Writers.S5` and the `writeS5` function. + Moved `s5Includes` to a new module, `Text.Pandoc.S5`. + To write S5, you now use `writeHtml` with `writerSlideVariant` + set to `S5Slides` or `SlidySlides`. + ++ Template changes. If you use custom templates, please update them, + particularly if you use syntax highlighting with pandoc. The old HTML + templates hardcoded highlighting CSS that will no longer work with + the most recent version of highlighting-kate. + + - HTML template: avoid empty meta tag if no date. + - HTML template: Use default highlighting CSS from highlighting-kate + instead of hard-coding the CSS into the template. + - HTML template: insert-before text goes before the title, and + immediately after the `<body>` tag, as documented. (Issue #241) + - Added slidy and s5 templates. + - Added amssymb to preamble of latex template. (github Issue 1) + ++ Removed excess newlines at the end of output. Note: because output + will not contain an extra newline, you may need to make adjustments + if you are inserting pandoc's output into a template. + ++ In S5 and slidy, horizontal rules now cause a new slide, so you + are no longer limited to one slide per section. + ++ Improved handling of code in man writer. Inline code is now monospace, + not bold, and code blocks now use .nf (no fill) and .IP (indented para). + ++ HTML reader parses `<tt>` as Code. (Issue #247) + ++ html+lhs output now contains bird tracks, even when compiled without + highlighting support. (Issue #242) + ++ Colons are now no longer allowed in autogenerated XML/HTML identifiers, + since they have a special meaning in XML. + ++ Code improvements in ODT writer. Remote images are now replaced with + their alt text rather than a broken link. + ++ LaTeX reader improvements: + + - Made latex `\section`, `\chapter` parsers more forgiving of whitespace. + - Parse `\chapter{}` in latex. + - Changed `rawLaTeXInline` to accept `\section`, `\begin`, etc. + - Use new `rawLaTeXInline'` in LaTeX reader, and export `rawLaTeXInline` + for use in markdown reader. + - Fixes bug wherein `\section{foo}` was not recognized as raw TeX + in markdown document. + ++ LaTeX writer: images are automatically shrunk if they would extend + beyond the page margin. + ++ Plain, markdown, RST writers now use unicode for smart punctuation. + ++ Man writer converts math to unicode when possible, as in other writers. + ++ `markdown2pdf` can now recognize citeproc options. + ++ Command-line arguments are converted to UTF-8. (Issue #234) + ++ `Text.Pandoc.TeXMath` has been rewritten to use texmath's parser. + This allows it to handle a wider range of formulas. Also, if a formula + cannot be converted, it is left in raw TeX; formulas are no longer + partially converted. + ++ Unicode curly quotes are left alone when parsing smart quotes. (Issue #143) + ++ Cabal file changes: + + - Removed parsec < 3 restriction. + - Added 'threaded' flag for architectures where GHC lacks a threaded + runtime. + - Use 'threaded' only for markdown2pdf; it is not needed for pandoc. + - Require highlighting-kate 0.2.7. + ++ Use explicit imports from `Data.Generics`. Otherwise we have a + conflict with the 'empty' symbol, introduced in syb >= 0.2. (Issue #237) + ++ New data files: slidy/slidy.min.js, slidy/slidy.min.css, epub.css. + +[EPUB]: http://en.wikipedia.org/wiki/EPUB +[Slidy]: http://www.w3.org/Talks/Tools/Slidy +[bookworm]: http://bookworm.oreilly.com/ +[tutorial here]: http://johnmacfarlane.net/pandoc/epub.html + +## pandoc 1.5.1.1 (2010-03-29) + ++ Fixed header identifiers (uniqueIdent in Shared) so they + work as advertized in README and are guaranteed to be + valid XHTML names. Thanks to Xyne for reporting the bug. + +## pandoc 1.5.1 (2010-03-23) + ++ Fixed treatment of unicode characters in URIs. ++ Revised Setup.hs so it works with debian's build process. ++ Fixed bug in OpenDocument writer that led to invalid + XML for some input. + +## pandoc 1.5.0.1 (2010-03-21) + ++ HTML writer: Fixed error in math writer (with MathML option) + that caused an infinite loop for unparsable MathML. + +## pandoc 1.5 (2010-03-20) + ++ Moved repository to [github](http://github.com/jgm/pandoc). ++ New `--mathml` option, for display of TeX math as MathML. ++ New `--data-dir` option, allowing users to specify a data + directory other than `~/.pandoc`. Files placed in this directory + will be used instead of system defaults. ++ New `--base-header-level` option. For example, `--base-header-level=2` + changes level 1 headers to level 2, level 2 to level 3, etc. ++ New 'plain' output format: plain text without pictures, hyperlinks, + inline formatting, or anything else that looks even vaguely + markupish. ++ Titles and authors in title blocks can now span multiple lines, + as long as the continuation lines begin with a space character. ++ When given an absolute URI as a parameter, pandoc will fetch + the content via HTTP. ++ The HTML reader has been made much more forgiving. It no + longer requires well-formed xhtml as input. ++ `html2markdown` has been removed; it is no longer necessary, given + the last two changes. `pandoc` can be used by itself to convert + web pages to markdown or other formats. ++ `hsmarkdown` has also been removed. Use `pandoc --strict` instead. + Or symlink pandoc's executable to `hsmarkdown`; `pandoc` will then + behave like `hsmarkdown` used to. ++ An image in a paragraph by itself is now rendered as a figure + in most writers, with the alt text as the caption. ++ Incomplete support for reST tables (simple and grid). Thanks to + Eric Kow. Colspans and rowspans not yet supported. ++ In mediawiki, links with relative URLs are now formatted as wikilinks. + Also, headers have been promoted: `= head =` is now level 1 instead of + level 2. ++ The markdown reader now handles "inverse bird tracks" when parsing + literate haskell. These are used for haskell example code that + is not part of the literate program. ++ The `-B` and `-A` options now imply `-s` and no longer work in + fragment mode. ++ Headerless tables are now printed properly in all writers. + In addition, tbody, thead, and cols are used in HTML and Docbook + tables. ++ Improved build system; removed obsolete Makefile. ++ In LaTeX writer, `\chapter` is now used instead of `\section`. + when the documentclass is book, report, or memoir. ++ Many small bug fixes. See [changelog] for details. + +## pandoc 1.4 (2010-01-02) + ++ New template system replaces old headers, giving users much + more control over pandoc's output in `--standalone` mode. + Added `--template` and `--variable` options. The `--print-default-header` + option is now `--print-default-template`. See README under + "Templates" for details. ++ The old `--custom-header` option should still work, but it has + been deprecated. ++ New `--reference-odt` option allows users to customize styles + in ODT output. ++ Users may now put custom templates, s5 styles, and a reference + ODT in the `~/.pandoc` directory, where they will override system + defaults. See README for details. ++ Unicode is now used whenever possible in HTML and XML output. Entities + are used only where necessary (`>`, `<`, `"`, `&`). ++ Authors and dates may now include formatting and notes. ++ Added `--xetex` option for `pandoc` and `markdown2pdf`. ++ Windows installer now includes highlighting support and + `markdown2pdf` and `hsmarkdown` wrappers. ++ Pandoc no longer requires Template Haskell, which should make + it more portable. ++ Pandoc can now be built on GHC 6.12, as well as earlier versions. ++ See README for other small improvements and bug fixes. + +## pandoc 1.3 (2009-12-10) + ++ Added `--id-prefix` option to help prevent duplicate + identifiers when you're generating HTML fragments. ++ Added `--indented-code-classes` option, which specifies + default highlighting syntax for indented code blocks. ++ `--number-sections` now affects HTML output. ++ Improved syntax for markdown definition lists. ++ Better looking simple tables. ++ Markdown tables without headers are now possible. ++ New hard line break syntax: backslash followed by newline. ++ Improved performance of markdown reader by ~10% by eliminating the + need for a separate parsing pass for notes. ++ Improved syntax highlighting for literate Haskell. ++ Support for "..code-block" directive in RST reader. ++ Windows binary now includes highlighting support. ++ Many bug fixes and small improvements. See [changelog] + for details. + +## pandoc 1.2.1 (2009-07-18) + ++ Improved the efficiency of the markdown reader's + abbreviation parsing (should give a big performance + boost with `--smart`). ++ HTML writer now wraps sections in divs with unique + identifiers, for easier manipulation. ++ Improved LaTeX reader's coverage of math modes. ++ Added a portable Haskell version of markdown2pdf (thanks + to Paolo Tanimoto). ++ Made `--strict` compatible with `--standalone` and `--toc.` ++ Many other small improvements and bug fixes. + See [changelog] for details. + +## pandoc 1.2 (2009-03-01) + ++ Added support for literate Haskell. lhs support is triggered by + '+lhs' suffixes in formats. For example, 'latex+lhs' is literate + Haskell LaTeX. '.lhs' files are treated by default as literate + markdown. ++ Added `--email-obfuscation` option. ++ Brought citeproc support up to date for citeproc-hs-0.2. ++ Many bugs fixed. See [changelog] for details. + +## pandoc 1.1 (2008-11-06) + ++ New `--jsmath` option supporting use of pandoc with [jsMath]. ++ Classes on HTML table output for better CSS styling. ++ Windows installer no longer requires admin privileges. ++ Many bugs fixed. See [changelog] for details. + +## pandoc 1.0 (2008-09-13) + ++ New writers for MediaWiki, GNU Texinfo (thanks to Peter Wang), + OpenDocument XML (thanks to Andrea Rossato), and ODT (OpenOffice + document). ++ New [delimited code blocks](README.html#delimited-code-blocks), + with optional syntax highlighting. ++ Reorganized build system: pandoc can now be built using standard + Cabal tools. It can be compiled on Windows without Cygwin. + The tests can also be run without perl or unix tools. ++ LaTeXMathML replaces ASCIIMathML for rendering math in HTML. ++ Support for "displayed" math. ++ Common abbreviations are now handled more intelligently, with + a non-breaking space (and not a sentence-ending space) after + the period. ++ Code is -Wall clean. ++ Many bug fixes and small improvements. See [changelog] for + full details. + +## pandoc 0.46 (2008-01-08) + ++ Added a `--sanitize-html` option (and a corresponding parameter + in `ParserState` for those using the pandoc libraries in programs). + This option causes pandoc to sanitize HTML (in HTML or Markdown + input) using a whitelist method. Possibly harmful HTML elements + are replaced with HTML comments. This should be useful in the + context of web applications, where pandoc may be used to convert + user input into HTML. ++ Made -H, -A, and -B options cumulative: if they are specified + multiple times, multiple files will be included. ++ Many bug fixes and small improvements. See [changelog] for full + details. + +## pandoc 0.45 (2007-12-09) + ++ Many bug fixes and structural improvements. See [changelog] for + full details. ++ Improved treatment of math. Math is now rendered using unicode + by default in HTML, RTF, and DocBook output. For more accurate + display of math in HTML, `--gladtex`, `--mimetex`, and `--asciimathml` + options are provided. See the [User's Guide](README.html#math) for + details. ++ Removed support for box-style block quotes in markdown. ++ More idiomatic ConTeXt output. ++ Text wrapping in ConTeXt and LaTeX output. ++ Pandoc now correctly handles all standard line endings + (CR, LF, CRLF). ++ New `--no-wrap` option that disables line wrapping and minimizes + whitespace in HTML output. ++ Build process is now compatible with both GHC 6.8 and GHC 6.6. + GHC and GHC_PKG environment variables may be used to specify + which version of the compiler to use, when multiple versions are + installed. + +## pandoc 0.44 (2007-09-03) + + [ John MacFarlane ] + + * Fixed bug in HTML writer: when --toc was used, anchors were put around + headers, which is invalid XHTML (block content within inline element). + Now the anchors are put inside the header tags. Resolves Issue #23. + + * Added xmlns attribute to html element in html writer tests. + This attribute is added by more recent versions of the + xhtml library (>= 3000), and is required for valid XHTML. + + [ Recai Oktaş ] + + * On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build + command instead of 'runhaskell', which, on some platforms (such as s390, + alpha, m68k), throws the following error: + + runhaskell Setup.hs configure --prefix=/usr + ghc-6.6.1: not built for interactive use + + This causes a serious FTBFS bug. Closes: #440668. + +## pandoc 0.43 (2007-09-02) + + [ John MacFarlane ] + + * The focus of this release is performance. The markdown parser + is about five times faster than in 0.42, based on benchmarks + with the TextMate manual. + + * Main.hs: Replaced CRFilter and tabFilter with single function + tabFilter, which operates on the whole string rather than breaking + it into lines, and handles dos-style line-endings as well as tabs. + + * Added separate LaTeX reader and native reader tests; removed + round-trip tests. + + * Text.Pandoc.Shared: + + + Removed tabsToSpaces and tabsInLine (they were used only in Main.hs.) + + General code cleanup (to elimante warnings when compiling with -Wall.) + + Added 'wrapped' function, which helps wrap text into paragraphs, + using the prettyprinting library. + + Rewrote charsInBalanced and charsInBalanced'. + - Documented restriction: open and close must be distinct characters. + - Rearranged options for greater efficiency. + - Bug fix: Changed inner call to charsInBalanced inside + charsInBalanced' to charsInBalanced'. + + anyLine now requires that the line end with a newline (not eof). + This is a harmless assumption, since we always add newlines to the + end of a block before parsing with anyLine, and it yields a 10% speed + boost. + + Removed unnecessary 'try' in anyLine. + + Removed unneeded 'try' from romanNumeral parser. + + Use notFollowedBy instead of notFollowedBy' in charsInBalanced. + + Removed unneeded 'try' in parseFromString. + + Removed unneeded 'try' from stringAnyCase. (Now it behaves + like 'string'.) + + Changed definition of 'enclosed' in Text.Pandoc.Shared so that + 'try' is not automatically applied to the 'end' parser. Added + 'try' in calls to 'enclosed' where needed. Slight speed increase. + + * Writers: + + + Replaced individual wrapping routines in RST, Man, and Markdown + writers with 'wrapped' from Text.Pandoc.Shared. + + Rewrote LaTeX writer to use the prettyprinting library, + so we get word wrapping, etc. + + Modified latex writer tests for new latex writer using prettyprinter. + + Fixed bug in LaTeX writer: autolinks would not cause + `\usepackage{url}` to be put in the document header. Also, changes + to state in enumerated list items would be overwritten. + + In Markdown writer, escape paragraphs that begin with ordered list + markers, so they don't get interpreted as ordered lists. + + * Text.Pandoc.Reades.LaTeX: + + + Fixed bug in LaTeX reader, which wrongly assumed that the roman + numeral after "enum" in "setcounter" would consist entirely of + "i"s. 'enumiv' is legitimate. + + LaTeX command and environment names can't contain numbers. + + Rearranged order of parsers in inline for slight speed improvement. + + Added '`' to special characters and 'unescapedChar'. + + * Text.Pandoc.Readers.RST: + + + Removed unneeded try's in RST reader; also minor code cleanup. + + Removed tabchar. + + Rearranged parsers in inline (doubled speed). + + * Text.Pandoc.Readers.Markdown: + + + Skip notes parsing if running in strict mode. (This yields a nice + speed improvement in strict mode.) + + Simplify autolink parsing code, using Network.URI to test for + URIs. Added dependency on network library to debian/control and + pandoc.cabal. + + More perspicuous definition of nonindentSpaces. + + Removed unneeded 'try' in 'rawLine'. + + Combined linebreak and whitespace into a new whitespace parser, to + avoid unnecessary reparsing of space characters. + + Removed unnecessary 'try' in 'codeBlock', 'ellipses', 'noteMarker', + 'multilineRow', 'dashedLine', 'rawHtmlBlocks'. + + Use lookAhead in parsers for setext headers and definition lists + to see if the next line begins appropriately; if not, don't waste + any more time parsing. + + Don't require blank lines after code block. (It's sufficient to + end code block with a nonindented line.) + + Changed definition of 'emph': italics with '_' must not + be followed by an alphanumeric character. This is to help + prevent interpretation of e.g. `[LC_TYPE]: my_type` as + `[LC<em>TYPE]:my</em>type`. + + Improved Markdown.pl-compatibility in referenceLink: the two parts + of a reference-style link may be separated by one space, but not + more... [a] [link], [not] [a link]. + + Fixed markdown inline code parsing so it better accords with + Markdown.pl: the marker for the end of the code section is a clump + of the same number of `'s with which the section began, followed + by a non-` character. So, for example, + ` h ``` i ` -> `<code>h ``` i</code>`. + + Split 'title' into 'linkTitle' and 'referenceTitle', since the + rules are slightly different. + + Rewrote 'para' for greater efficiency. + + Rewrote link parsers for greater efficiency. + + Removed redundant 'referenceLink' in definition of inline (it's + already in 'link'). + + Refactored escapeChar so it doesn't need 'try'. + + Refactored hrule for performance in Markdown reader. + + More intelligent rearranging of 'inline' so that most frequently + used parsers are tried first. + + Removed tabchar parser, as whitespace handles tabs anyway. + + * Text.Pandoc.CharacterReferences: + + + Refactored. + + Removed unnecessary 'try's for a speed improvement. + + Removed unnecessary '&' and ';' from the entity table. + + * Build process: + + + Makefile: Get VERSION from cabal file, not Main.hs. + + Modified MacPorts Portfile: + - Depend on haddock + - Build and install libraries and library documentation in + addition to pandoc executable + - Added template item for md5 sum in Portfile.in. + - Incorporated changes from MacPorts repository (r28278). + + FreeBSD port: Don't try to generate distinfo in Makefile. + It can be made using 'make makesum' in FreeBSD. + + Make both freebsd and macports targets depend on tarball. + + * Website and documentation: + + + Updated INSTALL instructions. + + Added pandocwiki demo to website. + + Removed local references to Portfile, since pandoc is now in the + MacPorts repository. + +## pandoc 0.42 (2007-08-26) + + [ John MacFarlane ] + + * Main.hs: Use utf8 conversion on the extra files loaded with + the -H, -C, -B, and -A options. This fixes problems with unicode + characters in these files. + + * Exposed Text.Pandoc.ASCIIMathML, since it is imported in + Text.Pandoc.Readers.HTML and without it we get a linking error when + using the library. + + * Markdown reader: + + + Added new rule for enhanced markdown ordered lists: if the list + marker is a capital letter followed by a period (including a + single-letter capital roman numeral), then it must be followed by + at least two spaces. The point of this is to avoid accidentally + treating people's initials as list markers: a paragraph might begin, + "B. Russell was an English philosopher," and this shouldn't be + treated as a list. Documented change in README. + + Blocks that start with "p. " and a digit are no longer treated + as ordered lists (it's a page number). + + Added a needed 'try' to listItem. + + Removed check for a following setext header in endline. + A full test is too inefficient (doubles benchmark time), and the + substitute we had before is not 100% accurate. + + Don't use Code elements for autolinks if --strict specified. + + * LaTeX writer: When a footnote ends with a Verbatim environment, the + close } of the footnote cannot occur on the same line or an error occurs. + Fixed this by adding a newline before the closing } of every footnote. + + * HTML writer: + + Removed incorrect "{}" around style information in HTML tables. + Column widths now work properly in HTML. + + If --strict option is specified (and --toc is not), don't include + identifiers in headers, for better Markdown compatibility. + + * Build process: + + + Separated $(web_dest) and website targets. + + In website, index.txt is now constructed from template index.txt.in. + + Added freebsd target to Markefile. This creates the freebsd Makefile + from Makefile.in, and creates distinfo. Removed Makefile and distinfo + from the repository. + + Added macport target to Makefile. Portfile is built from template + Portfile.in. + + Removed OSX package targets. (Too many difficulties involving + dependencies on dynamic libraries.) + + More complete INSTALL instructions for all architectures. + + * Website: + + Added a programming demo, pandocwiki. + + [ Recai Oktaş ] + + * Do not forget to close pandoc's ITP. Closes: #391666 + +## pandoc 0.41 (2007-08-19) + + [ John MacFarlane ] + + * Fixed bugs in HTML reader: + + Skip material at end *only if* `</html>` is present (previously, + only part of the document would be parsed if an error was + found; now a proper error message is given). + + Added new constant eitherBlockOrInline with elements that may + count either as block-level or as inline. Modified isInline and + isBlock to take this into account. + + Modified rawHtmlBlock to accept any tag (even an inline tag): + this is innocuous, because rawHtmlBlock is tried only if a regular + inline element can't be parsed. + + Added a necessary 'try' in definition of 'para'. + + * Fixed bug in markdown ordered list parsing. The problem was that + anyOrderedListStart did not check for a space following the + ordered list marker. So in 'A.B. 2007' the parser would be + expecting a list item, but would not find one, causing an error. + Fixed a similar bug in the RST reader. Resolves Issue #22. + + * Refactored RST and Markdown readers using parseFromString. + + * LaTeX reader will now skip anything after \end{document}. + + * Fixed blockquote output in markdown writer: previously, block + quotes in indented contexts would be indented only in the first + line. + + * Added note to INSTALL about variations in versions of the xhtml + library that can lead to failed tests (thanks to Leif LeBaron). + +## pandoc 0.4 (2007-01-16) + + [ John MacFarlane ] + + * Added two new output formats: groff man pages and ConTeXt. By + default, output files with extensions ".ctx" and ".context" are + assumed to be ConTeXt, and output files with single-digit extensions + are assumed to be man pages. + + * Enhanced ordered lists (documented in README, under Lists): + + The OrderedList block element now stores information about + list number style, list number delimiter, and starting number. + + The readers parse this information when possible. + + The writers use this information to style ordered lists. + + The enhancement can be disabled using the --strict option. + + * Added support for tables (with a new Table block element). Two kinds + of tables are supported: a simple table with one-line rows, and a + more complex variety with multiline rows. All output formats are + supported, but only markdown tables are parsed at the moment. The + syntax is documented in README. + + * Added support for definition lists (with a new DefinitionList block + element). All output and input formats are supported. The syntax is + documented in README. + + * Added support for superscripts and subscripts (with new Superscript + and Subscript inline elements). All input and output + formats. The syntax is documented in README. + + * Added support for strikeout (with a new Strikeout inline element). + All input and output formats are supported. Thanks to Bradley Kuhn, + who contributed a patch. The syntax is documented in README. Resolves + Issue #18. + + * Added a --toc|--table-of-contents option. This causes an automatically + generated table of contents (or an instruction that creates one) to + be inserted at the beginning of the document. Not supported in S5, + DocBook, or man page writers. + + * Modified the -m|--asciimathml option: + + + If an optional URL argument is provided, a link is inserted + instead of the contents of the ASCIIMathML.js script. + + Nothing is inserted unless the document actually contains + LaTeX math. + + * Removed Blank block element as unnecessary. + + * Removed Key and Note blocks from the Pandoc data structure. All + links are now stored as explicit links, and note contents are + stored with the (inline) notes. + + + All link Targets are now explicit (URL, title) pairs; there + is no longer a 'Ref' target. + + Markdown and RST parsers now need to extract data from key and + note blocks and insert them into the relevant inline elements. + Other parsers have been simplified, since there is no longer any need + to construct separate key and note blocks. + + Markdown, RST, and HTML writers need to construct lists of + notes; Markdown and RST writers need to construct lists of link + references (when the --reference-links option is specified); and + the RST writer needs to construct a list of image substitution + references. All writers have been rewritten to use the State monad + when state is required. + + Several functions (generateReference, keyTable, + replaceReferenceLinks, replaceRefLinksBlockList, and some auxiliaries + used by them) have been removed from Text.Pandoc.Shared, since + they are no longer needed. New functions and data structures + (Reference, isNoteBlock, isKeyBlock, isLineClump) have been + added. The functions inTags, selfClosingTag, inTagsSimple, and + inTagsIndented have been moved to the DocBook writer, since that + is now the only module that uses them. NoteTable is now exported + in Text.Pandoc.Shared. + + Added stateKeys and stateNotes to ParserState; removed stateKeyBlocks, + stateKeysUsed, stateNoteBlocks, stateNoteIdentifiers, stateInlineLinks. + + Added writerNotes and writerReferenceLinks to WriterOptions. + + * Added Text.Pandoc module that exports basic readers, writers, + definitions, and utility functions. This should export everything + needed for most uses of Pandoc libraries. The haddock documentation + includes a short example program. + + * Text.Pandoc.ASCIIMathML is no longer an exported module. + + * Added Text.Pandoc.Blocks module to help in printing markdown + and RST tables. This module provides functions for working with + fixed-width blocks of text--e.g., placing them side by side, as + in a table row. + + * Refactored to avoid reliance on Haskell's Text.Regex library, which + (a) is slow, and (b) does not properly handle unicode. This fixed + some strange bugs, e.g. in parsing S-cedilla, and improved performance. + + + Replaced 'gsub' with a general list function 'substitute' + that does not rely on Text.Regex. + + Rewrote extractTagType in HTML reader so that it doesn't use + regexs. + + In Markdown reader, replaced email regex test with a custom email + autolink parser (autoLinkEmail). Also replaced selfClosingTag regex + with a custom function isSelfClosingTag. + + Modified Docbook writer so that it doesn't rely on Text.Regex for + detecting 'mailto' links. + + Removed escapePreservingRegex and reamped entity-handling + functions in Text.Pandoc.Shared and Text.Pandoc.CharacterReferences to + avoid reliance on Text.Regex (see below on character reference + handling changes). + + * Renamed Text.Pandoc.Entities as Text.Pandoc.CharacterReferences. + + * Changed handling of XML entities. Entities are now parsed (and unicode + characters returned) in the Markdown and HTML readers, rather than being + handled in the writers. In HTML and Docbook writers, UTF-8 is now used + instead of entities for characters above 128. This makes the HTML and + DocBook output much more readable and more easily editable. + + + Removed sgmlHexEntity, sgmlDecimalEntity, sgmlNamedEntity, and + sgmlCharacterEntity regexes from Text.Pandoc.Shared. + + Renamed escapeSGMLChar to escapeCharForXML. Added escapeStringForXML. + Moved both functions to Text.Pandoc.Writers.Docbook. + + Added characterReference parser to Text.Pandoc.CharacterReferences. + This parses a string and return a unicode character. + + Rewrote decodeCharacterReferences to use the new parser instead of + Text.Regex. + + Added new charRef parser for Markdown and HTML, which replaces the + old 'entity' parser. Added '&' as a special character in Markdown reader. + + Modified HTML and Markdown readers to call decodeEntities on all raw + strings (e.g. authors, dates, link titles), to ensure that no + unprocessed entities are included in the native representation of + the document. (In the HTML reader, most of this work is done by a + change in extractAttributeName.) + + In XML and Markdown output, escape unicode nonbreaking space as ' ', + since a unicode non-breaking space is impossible to distinguish visually + from a regular space. (Resolves Issue #3.) + + Removed encodeEntitiesNumerical. + + Use Data.Map for entityTable and (new) reverseEntityTable, for a + slight performance boost over the old association list. + + Removed unneeded decodeEntities from 'str' parser in HTML and + Markdown readers. + + * Text.Pandoc.UTF8: Renamed encodeUTF8 to toUTF8, decodeUTF8 to + fromUTF8, for clarity. + + * Replaced old haskell98 module names replaced by hierarchical module + names, e.g. List by Data.List. Removed haskell98 from dependencies + in pandoc.cabal, and added mtl (needed for state monad). Substituted + xhtml for html. + + * Refactored and cleaned up character escaping in writers, using + backslashEscapes and escapeStringUsing functions. + + * Instead of adding `\n\n` to the end of an input string in Main.hs, + this is now done in the readers. This makes the libraries behave + the way you'd expect from the pandoc program. Resolves Issue #10. + + * URLs and email addresses in autolinks are now typeset as Code. + + * In Main.hs, changed putStr to putStrLn -- mainly because MacOS X + doesn't display the whole output unless there's a line ending. + + * Major code cleanup in all modules, for greater consistency, concision, + and readability. + + * HTML reader: + + + Fixed several bugs (extractTagType, attribute parsing). + + Remove Null blocks in lists of blocks when possible. + + Allow HTML comments as raw HTML inline. + + * Markdown reader: + + + Ordered list items may no longer begin with uppercase letters, or + letters greater than 'n'. (This prevents first initials and page + reference, e.g. 'p. 400', from being parsed as beginning lists.) + Also, numbers beginning list items may no longer end with ')', + which is now allowed only after letters. Note: These changes + may cause documents to be parsed differently. Users should take + care in upgrading. + + Changed autoLink parsing to conform better to Markdown.pl's + behavior. `<google.com>` is not treated as a link, but + `<http://google.com>`, `<ftp://google.com>`, and + `<mailto:google@google.com>` are. + + Cleaned up handling of embedded quotes in link titles. Now these are + stored as a '"' character, not as '"'. + + Use lookAhead parser for the 'first pass' (looking for reference keys), + instead of parsing normally, then using setInput to reset input. This + yields a slight performance boost. + + Fixed several bugs in smart quote recognition. + + Fixed bug in indentSpaces (which didn't properly handle + cases with mixed spaces and tabs). + + Consolidated 'text', 'special', and 'inline' into 'inline'. + + Fixed bug which allowed URL and title to be separated by multiple blank + lines in links and reference keys. They can be on separate lines but + can't have blank lines between them. + + Correctly handle bracketed text inside inline footnotes and links,using + new function inlinesInBalanced. Resolves Issue #14. + + Fixed bug in footnotes: links in footnotes were not being + processed. Solution: three-stage parse. First, get all the + reference keys and add information to state. Next, get all the + notes and add information to state. (Reference keys may be needed + at this stage.) Finally, parse everything else. + + Replaced named constants like 'emphStart' with literals. + + Removed an extra occurrence of escapedChar in definition of inline. + + * RST reader: + + + Allow the URI in a RST hyperlink target to start on the line + after the reference key. + + Added 'try' in front of 'string', where needed, or used a different + parser. This fixes a bug where ````` would not be correctly parsed as + a verbatim `. + + Fixed slow performance in parsing inline literals in RST reader. The + problem was that ``#`` was seen by 'inline' as a potential link or image. + Fix: inserted 'notFollowedBy (char '`')' in link parsers. + Resolves Issue #8. + + Use lookAhead instead of getInput/setInput in RST reader. Removed + unneeded getState call, since lookAhead automatically saves and + restores the parser state. + + Allow hyperlink target URIs to be split over multiple lines, and + to start on the line after the reference. Resolves Issue #7. + + Fixed handling of autolinks. + + * LaTeX reader: + + + Replaced `choice [(try (string ...), ...]` idiom with `oneOfStrings`, + for clarity. + + Added clauses for tilde and caret. Tilde is `\ensuremath{\sim}`, and + caret is `\^{}`, not `\^` as before. + + Added parsing for `\url`. + + Parse `\texttt{}` as code, provided there's nothing fancy inside. + + * HTML writer: + + + Modified HTML writer to use the Text.XHtml library. This results + in cleaner, faster code, and it makes it easier to use Pandoc in + other projects, like wikis, which use Text.XHtml. Two functions are + now provided, writeHtml and writeHtmlString: the former outputs an + Html structure, the latter a rendered string. The S5 writer is also + changed, in parallel ways (writeS5, writeS5String). + + The Html header is now written programmatically, so it has been + removed from the 'headers' directory. The S5 header is still + needed, but the doctype and some of the meta declarations have + been removed, since they are written programmatically. This change + introduces a new dependency on the xhtml package. + + Fixed two bugs in email obfuscation involving improper escaping + of '&' in the `<noscript>` section and in `--strict` mode. Resolves + Issue #9. + + Fixed another bug in email obfuscation: If the text to be obfuscated + contains an entity, this needs to be decoded before obfuscation. + Thanks to thsutton for the patch. Resolves Issue #15. + + Changed the way the backlink is displayed in HTML footnotes. + Instead of appearing on a line by itself, it now generally + appears on the last line of the note. (Exception: when the + note does not end with a Plain or Para block.) This saves space + and looks better. + + Added automatic unique identifiers to headers: + - The identifier is derived from the header via a scheme + documented in README. + - WriterState now includes a list of header identifiers and a table + of contents in addition to notes. + - The function uniqueIdentifiers creates a list of unique identifiers + from a list of inline lists (e.g. headers). + - This list is part of WriterState and gets consumed by blockToHtml + each time a header is encountered. + + Include CSS for .strikethrough class in header only if strikethrough + text appears in the document. + + If the 'strict' option is specified, elements that do not appear in + standard markdown (like definition lists) are passed through as + raw HTML. + + Simplified treatment of autolinks, using pattern matching instead of + conditionals. + + * Markdown writer: + + + Links in markdown output are now printed as inline links by default, + rather than reference links. A --reference-links option has been added + that forces links to be printed as reference links. Resolves Issue #4. + + Use autolinks when possible. Instead of `[site.com](site.com)`, + use `<site.com>`. + + * LaTeX writer: + + + Rewrote to use the State monad. The preamble now includes only those + packages that are actually required, given the document's content. + Thus, for example, if strikeout is not used, ulem is not required. + Modified LaTeXHeader accordingly. + + Modified LaTeX writer to insert `\,` between consecutive quotes. + + Removed unused function tableRowColumnWidths. + + Simplified code for escaping special characters. + + Leave extra blank line after `\maketitle`. + + Include empty `\author{}` when no author specified to avoid LaTeX + errors. + + Include fancyvrb code in header only if needed -- that is, only + if there is actually code in a footnote. + + Use `\url{}` for autolinks. + + Include [mathletters] option in ucs package, so that basic unicode + Greek letters will work correctly. + + * RST writer: Force blank line before lists, so that sublists will + be handled correctly. + + * Docbook writer: Fixed a bug: email links with text, like + [foo](me@bar.baz), were being incorrectly treated as autolinks. + + * Removed Text.ParserCombinators.Pandoc and moved all its functions to + Text.Pandoc.Shared. + + * Text.Pandoc.Shared: + + + Added defaultWriterOptions. + + Added writerTableOfContents to WriterOptions. + + Added writerIgnoreNotes option to WriterOptions. This is needed + for processing header blocks for a table of contents, since notes on + headers should not appear in the TOC. + + Added prettyprinting for native Table format. + + Removed some unneeded imports. + + Moved escape and nullBlock parsers from + Text.ParserCombinators.Pandoc, since the latter is for + general-purpose parsers that don't depend on Text.Pandoc.Definition. + + Moved isHeaderBlock from Text.Pandoc.Writers.HTML. + + Moved Element, headerAtLeast, and hierarchicalize from Docbook + writer, because HTML writer now uses these in constructing a table + of contents. + + Added clauses for new inline elements (Strikeout, Superscript, + Subscript) to refsMatch. + + Removed backslashEscape; added new functions escapeStringUsing and + backslashEscapes. + + Moved failIfStrict from markdown reader, since it is now used also + by the HTML reader. + + Added a 'try' to the definition of indentSpaces. + + In definition of 'reference', added check to make sure it's not a note + reference. + + Added functions: camelCaseToHyphenated, toRomanNumeral, + anyOrderedListMarker, orderedListmarker, orderedListMarkers, + charsInBalanced', withHorizDisplacement, romanNumeral + + Fixed a bug in the anyLine parser. Previously it would parse an empty + string "", but it should fail on an empty string, or we get an error + when it is used inside "many" combinators. + + Removed followedBy' parser, replacing it with the lookAhead parser from + Parsec. + + Added some needed 'try's before multicharacter parsers, especially in + 'option' contexts. + + Removed the 'try' from the 'end' parser in 'enclosed', so that + 'enclosed' behaves like 'option', 'manyTill', etc. + + Added lineClump parser, which parses a raw line block up to and + including any following blank lines. + + Renamed parseFromStr to parseFromString. + + Added a 'try' to the 'end' parser in 'enclosed'. This makes errors in + the use of 'enclosed' less likely. Removed some now-unnecessary 'try's + in calling code. + + Removed unneeded 'try' in blanklines. + + Removed endsWith function and rewrote calling functions to use + isSuffixOf instead. + + Added >>~ combinator. + + Fixed bug in normalizeSpaces: Space:Str "":Space should compress to + Space. + + * Refactored runtests.pl; added separate tests for tables. + + * Shell scripts: + + + Added -asxhtml flag to tidy in html2markdown. This will + perhaps help the parser, which expects closing tags. + + Modified markdown2pdf to run pdflatex a second time if --toc or + --table-of-contents was specified; otherwise the table of + contents won't appear. + + Modified markdown2pdf to print a helpful message if the 'ulem' + LaTeX package is required and not found. + + * Changes to build process: + + + Dropped support for compilation with GHC 6.4. GHC 6.6 or higher + is now required. + + Removed cabalize and Pandoc.cabal.in. The repository now contains + pandoc.cabal itself. + + Pandoc.cabal has been changed to pandoc.cabal, because HackageDB + likes the cabal file to have the same name as the tarball. + + Expanded and revised the package description in pandoc.cabal. + Revised the package synopsis. + + The tarball built by 'make tarball' now contains files built from + templates (including man pages and shell scripts), so pandoc can + be built directly using Cabal tools, without preprocessing. + + Executable binaries are now stripped before installing. + + Man pages are now generated from markdown sources, using pandoc's + man page writer. + + Use HTML version of README (instead of RTF) in Mac OS X installer. + + Instead of testing for the existence of a pandoc symlink in build-exec, + use ln -f. + + * Documentation: + + + Updated README and man pages with information on new features. + + Updated INSTALL instructions with some useful clarifications and + links. + + Updated web content. + + * Added FreeBSD port. + + [ Recai Oktaş ] + + * debian/control: + + + Changed pandoc's Build-Depends to include libghc6-mtl-dev and + libghc6-xhtml-dev. Removed libghc6-html-dev. + + Suggest texlive-latex-recommended | tetex-extra instead of + tetex-bin. This brings in fancyvrb and unicode support. + + +## pandoc 0.3 (2007-01-05) + + [ John MacFarlane ] + + * Changes in pandoc options: + + + Allow options to follow or precede arguments. + + Changed '--smartypants' to '--smart' and adjusted symbols accordingly. + + Added '--strict' option. + + Added '-o/--output' option. + + Added '--dump-args' and '--ignore-args' options (for use in wrappers). + + Modified '-v' and '-h' output to go to STDERR, not STDOUT, and return + error conditions. This is helpful for writing wrappers. + + Added copyright message to '-v' output, modeled after FSF messages. + + Reformatted usage message so that it doesn't wrap illegibly. + + Removed extra blanks after '-h' and '-D' output. + + * Added docbook writer. + + * Added implicit setting of default input and output format based + on input and output filename extensions. These defaults are + overridden if explicit input and output formats are specified using + '-t', '-f', '-r', or '-w' options. Documented in pandoc(1) man page + and README. + + * Allow ordered list items to begin with (single) letters, as well + as numbers. The list item marker may now be terminated either by + '.' or by ')'. This extension to standard markdown is documented + in README. + + * Revised footnote syntax. (See README for full details.) The + '[^1]' format now standard in markdown extensions is supported, + as are inline footnotes with this syntax: `^[My note.]`. + The earlier footnote syntax `^(1)` is no longer supported. + + * Improved HTML representation of footnotes. All footnotes + are now auto-numbered and appear in an ordered list at the + end of the HTML document. Since the default appearance is now + acceptable, the old footnote styles have been removed from the + HTML header. + + * Bug fixes: + + + Fixed a serious bug in the markdown, LaTeX, and RST readers. + These readers ran 'runParser' on processed chunks of text to handle + embedded block lists in lists and quotation blocks. But then + any changes made to the parser state in these chunks was lost, + as the state is local to the parser. So, for example, footnotes + didn't work in quotes or list items. The fix: instead of calling + runParser on some raw text, use setInput to make it the input, then + parse it, then use setInput to restore the input to what it was + before. This is shorter and more elegant, and it fixes the problem. + + Fixed bug in notFollowedBy' combinator (adding 'try' before + 'parser'). Adjusted code that uses this combinator accordingly. + + Fixed bug in RTF writer that caused improper indentation on + footnotes occurring in indented blocks like lists. + + Fixed parsing of metadata in LaTeX reader. Now the title, author, + and date are parsed correctly. Everything else in the preamble + is skipped. + + Modified escapedChar in LaTeX reader to allow a `\` at the end of a + line to count as escaped whitespace. + + Modified LaTeX reader to produce inline links rather than reference + links. Otherwise, links in footnotes aren't handled properly. + + Fixed handling of titles in links in Markdown reader, so that + embedded quotation marks are now handled properly. + + Fixed Markdown reader's handling of embedded brackets in links. + + Fixed Markdown reader so that it only parses bracketed material + as a reference link if there is actually a corresponding key. + + Revised inline code parsing in Markdown reader to conform to + markdown standard. Now any number of `s can begin inline code, + which will end with the same number of `s. For example, to + have two backticks as code, write ``` `` ```. Modified Markdown + writer accordingly. + + Fixed bug in text-wrapping routine in Markdown and RST writers. + Now LineBreaks no longer cause wrapping problems. + + Supported hexadecimal numerical entity references as well as + decimal ones. + + Fixed bug in Markdown reader's handling of underscores and other + inline formatting markers inside reference labels: for example, + in '[A_B]: /url/a_b', the material between underscores was being + parsed as emphasized inlines. + + Changed Markdown reader's handling of backslash escapes so that + only non-alphanumeric characters can be escaped. Strict mode + follows Markdown.pl in only allowing a select group of punctuation + characters to be escaped. + + Modified HTML reader to skip a newline following a `<br>` tag. + Otherwise the newline will be treated as a space at the beginning + of the next line. + + * Made handling of code blocks more consistent. Previously, some + readers allowed trailing newlines, while others stripped them. + Now, all readers strip trailing newlines in code blocks. Writers + insert a newline at the end of code blocks as needed. + + * Modified readers to make spacing at the end of output more consistent. + + * Minor improvements to LaTeX reader: + + + `\thanks` now treated like a footnote. + + Simplified parsing of LaTeX command arguments and options. + commandArgs now returns a list of arguments OR options (in + whatever order they appear). The brackets are included, and + a new stripFirstAndLast function is provided to strip them off + when needed. This fixes a problem in dealing with \newcommand + and \newenvironment. + + * Revised RTF writer: + + + Default font is now Helvetica. + + An `\f0` is added to each `\pard`, so that font resizing works + correctly. + + * Moved handling of "smart typography" from the writers to the Markdown + and LaTeX readers. This allows great simplification of the writers + and more accurate smart quotes, dashes, and ellipses. DocBook can + now use `<quote>`. The '--smart' option now toggles an option in + the parser state rather than a writer option. Several new kinds + of inline elements have been added: Quoted, Ellipses, Apostrophe, + EmDash, EnDash. + + * Changes in HTML writer: + + + Include title block in header even when title is null. + + Made javascript obfuscation of emails even more obfuscatory, + by combining it with entity obfuscation. + + * Changed default ASCIIMathML text color to black. + + * Test suite: + + + Added --strip-trailing-cr option to diff in runtests.pl, for + compatibility with Windows. + + Added regression tests with footnotes in quote blocks and lists. + + * Makefile changes: + + + osx-pkg target creates a Mac OS X package (directory). New osx + directory contains files needed for construction of the package. + + osx-dmg target creates a compressed disk image containing the package. + + win-pkg target creates Windows binary package. + + tarball target creates distribution source tarball. + + website target generates pandoc's website automatically, including + demos. New 'web' directory contains files needed for construction + of the website (which will be created as the 'pandoc' subdirectory + of 'web'). + + Makefile checks to see if we're running Windows/Cygwin; if so, + a '.exe' extension is added to each executable in EXECS. + + * Removed all wrappers except markdown2pdf and html2markdown. + + * Added new wrapper hsmarkdown, to be used as a drop-in replacement + for Markdown.pl. hsmarkdown calls pandoc with the '--strict' + option and disables other options. + + * Added code to html2markdown that tries to determine the character + encoding of an HTML file, by parsing the "Content-type" meta tag. + + + If the encoding can't be determined, then if the content is local, + the local encoding is used; if it comes from a URL, UTF-8 is used + by default. + + If input is from STDIN, don't try to determine character encoding. + + Encoding can be specified explicitly using '-e' option. + + * Improved warning messages in wrappers: + + + Print warning if iconv not available + + More user-friendly error messages in markdown2pdf, when + pdflatex fails. + + * Code cleanup: + + + Renamed 'Text/Pandoc/HtmlEntities' module to + 'Text/Pandoc/Entities'. Also changed function names so as + not to be HTML-specific. + + Refactored SGML string escaping functions from HTML and Docbook + writers into Text/Pandoc/Shared. (escapeSGML, stringToSGML) + + Removed 'BlockQuoteContext' from ParserContext, as it isn't + used anywhere. + + Removed splitBySpace and replaced it with a general, polymorphic + splitBy function. + + Refactored LaTeX reader for clarity (added isArg function). + + Converted some CR's to LF's in src/ui/default/print.css. + + Added license text to top of source files. + + Added module data for haddock to source files. + + Reformatted code for consistency. + + * Rewrote documentation and man pages. Split README into INSTALL + and README. + + * Split LICENSE into COPYING and COPYRIGHT. + + * Removed TODO, since we now maintain ToDo on the wiki. + + * Made COPYRIGHT in top level a symlink to debian/copyright, to avoid + duplication. + + [ Recai Oktaş ] + + * Revamped build process to conform to debian standards and created + a proper debian package. Closes: #391666. + + * Modified build process to support GHC 6.6. + + + The package can still be compiled using GHC 6.4.2, though because + of dependencies the "make deb" target works only with GHC 6.6+. + + The script 'cabalize' is used to create an appropriate + 'Pandoc.cabal' from 'Pandoc.cabal.in', depending on the GHC and + Cabal versions. + + * Refactored template processing (fillTemplates.pl). + + * Modified wrapper scripts to make them more robust and portable. + To avoid code duplication and ensure consistency, wrappers are + generated via a templating system from templates in src/wrappers. + + + Wrappers now accept multiple filenames, when appropriate. + + Spaces and tabs allowed in filenames. + + getopts shell builtin is used for portable option parsing. + + Improved html2markdown's web grabber code, making it more robust, + configurable and verbose. Added '-e', '-g' options. + + +## pandoc 0.2 (2006-08-14) + + * Fixed unicode/utf-8 translation + +## pandoc 0.1 (2006-08-14) + + * Initial creation of debian package + diff --git a/citeproc/biblatex-localization/UKenglish.lbx.strings b/citeproc/biblatex-localization/UKenglish.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/UKenglish.lbx.strings diff --git a/citeproc/biblatex-localization/USenglish.lbx.strings b/citeproc/biblatex-localization/USenglish.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/USenglish.lbx.strings diff --git a/citeproc/biblatex-localization/american.lbx.strings b/citeproc/biblatex-localization/american.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/american.lbx.strings diff --git a/citeproc/biblatex-localization/australian.lbx.strings b/citeproc/biblatex-localization/australian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/australian.lbx.strings diff --git a/citeproc/biblatex-localization/austrian.lbx.strings b/citeproc/biblatex-localization/austrian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/austrian.lbx.strings @@ -0,0 +1,1 @@ +january|J\"anner|J\"an\adddot diff --git a/citeproc/biblatex-localization/brazil.lbx.strings b/citeproc/biblatex-localization/brazil.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/brazil.lbx.strings diff --git a/citeproc/biblatex-localization/brazilian.lbx.strings b/citeproc/biblatex-localization/brazilian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/brazilian.lbx.strings @@ -0,0 +1,233 @@ +bibliography|Bibliografia|Bibliografia +references|Refer\^encias|Refer\^encias +shorthands|Lista de abreviaturas|Abreviaturas +editor|editor|ed\adddot +editors|editores|ed\adddot +compiler|compilador|comp\adddot +compilers|compiladores|comp\adddot +redactor|redator|red\adddot +redactors|redatores|red\adddot +reviser|revisor|rev\adddot +revisers|revisores|rev\adddot +founder|fundador|fund\adddot +founders|fundadores|fund\adddot +continuator|continuador|cont\adddot +continuators|continuadores|cont\adddot +collaborator|colaborador|colab\adddot +collaborators|colaboradores|colab\adddot +translator|tradutor|trad\adddot +translators|tradutores|trad\adddot +commentator|coment\'ario|coment\adddot +commentators|coment\'ario|coment\adddot +annotator|notas|notas +annotators|notas|notas +commentary|coment\'ario|coment\adddot +annotations|notas|notas +foreword|pref\'acio|pref\adddot +afterword|posf\'acio|posf\adddot +organizer|organizador|org\adddot +organizers|organizadores|org\adddot +byauthor|por|por +byeditor|editado por|ed\adddotspace por +bycompiler|compilado por|comp\adddotspace por +byredactor|redigido por|red\adddotspace por +byreviser|revisado por|rev\adddotspace por +byreviewer|resenhado por|res\adddotspace por +byfounder|fundado por|fund\adddotspace por +bycontinuator|continuado por|cont\adddotspace por +bytranslator|traduzido \lbx@lfromlang\ por|trad\adddot\ \lbx@sfromlang\ por +bycommentator|comentado por|coment\adddot\ por +byannotator|anotado por|anot\adddot\ por +byorganizer|organizado por|org\adddotspace por +withcommentator|com coment\'ario de|com coment\adddot\ de +withannotator|com notas de|com notas de +withforeword|com pref\'acio de|com pref\adddot\ de +withafterword|com posf\'acio de|com posf\adddot\ de +and|e|e +andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +volume|volume|vol\adddot +volumes|volumes|vol\adddot +involumes|em|em +jourvol|volume|v\adddot +jourser|s\'erie|s\'er\adddot +book|livro|livro +part|parte|parte +issue|n\'umero|n\'um\adddot +newseries|nova s\'erie|nova s\'er\adddot +oldseries|s\'erie antiga|s\'er\adddot\ antiga +reprint|reimpress\~ao|reimpr\adddot +reprintof|reimpress\~ao de|reimpr\adddotspace de +reprintas|reimpresso como|reimpr\adddotspace como +reprintfrom|reimpresso de|reimpr\adddotspace de +translationas|traduzido como|trad\adddotspace como +translationfrom|traduzido do|trad\adddotspace do +reviewof|resenha de|res\adddotspace de +origpubas|originalmente publicado como|orig\adddotspace pub\adddotspace como +origpubin|originalmente publicado em|orig\adddotspace pub\adddotspace em +astitle|como|como +bypublisher|por|por +nodate|sem\space data|s\adddot d\adddot +page|p\'agina|p\adddot +pages|p\'aginas|pp\adddot +column|coluna|col\adddot +columns|colunas|col\adddot +line|linha|l\adddot +lines|linhas|ll\adddot +verse|verso|v\adddot +verses|versos|vv\adddot +paragraph|par\'agrafo|par\adddot +paragraphs|par\'agrafos|par\adddot +pagetotal|p\'agina|p\adddot +pagetotals|p\'aginas|pp\adddot +columntotal|coluna|col\adddot +columntotals|colunas|col\adddot +linetotal|linha|l\adddot +linetotals|linhas|ll\adddot +versetotal|verso|v\adddot +versetotals|versos|vv\adddot +paragraphtotal|par\'agrafo|par\adddot +paragraphtotals|par\'agrafos|par\adddot +in|em|em +inseries|em|em +ofseries|de|de +number|n\'umero|n\adddot +chapter|cap\'\i tulo|cap\adddot +bathesis|trabalho de conclus\~ao|trab\adddotspace de conc\adddot +phdthesis|tese de doutorado|tese de dout\adddot +candthesis|| +resreport|relat\'orio de pesquisa|rel\adddotspace de pesq\adddot +techreport|relat\'orio t\'ecnico|rel\adddotspace t\'ecn\adddot +software|software|software +datacd|CD-ROM|CD-ROM +audiocd|CD de \'audio|CD de \'audio +version|vers\~ao|vers\~ao +urlfrom|dispon\'ivel em|disp\adddotspace em +urlseen|acesso em|acesso em +submitted|submetido|submetido +inpress|no prelo|no prelo +prepublished|pr\'e-publicado|pr\'e-publicado +citedas|doravante citado como|doravante citado como +thiscite|especialmente|esp\adddot +seenote|ver nota|ver nota +quotedin|apud|apud +idem|idem|idem +idemsm|idem|idem +idemsf|eadem|eadem +idemsn|idem|idem +idempm|eidem|eidem +idempf|eaedem|eaedem +idempn|eadem|eadem +idempp|eidem|eidem +ibidem|ibidem|ibid\adddot +opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot +loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot +confer|cf\adddot|cf\adddot +sequens|sq\adddot|sq\adddot +sequentes|sqq\adddot|sqq\adddot +passim|passim|passim +see|ver|ver +seealso|ver tamb\'em|ver tamb\'em +backrefpage|ver p\'agina|ver p\adddot +backrefpages|ver p\'aginas|ver pp\adddot +january|janeiro|jan\adddot +february|fevereiro|fev\adddot +april|abril|abr\adddot +may|maio|mai\adddot +june|junho|jun\adddot +july|julho|jul\adddot +august|agosto|ago\adddot +september|setembro|set\adddot +october|outubro|out\adddot +november|novembro|nov\adddot +december|dezembro|dez\adddot +langamerican|ingl\^es|ingl\^es +langbulgarian|b\'ulgaro|b\'ulgaro +langcatalan|catal\~ao|catal\~ao +langcroatian|croata|croata +langczech|tcheco|tcheco +langdanish|dinamarqu\^es|dinamarqu\^es +langenglish|ingl\^es|ingl\^es +langfinnish|finland\^es|finland\^es +langestonian|estoniano|estoniano +langfrench|franc\^es|franc\^es +langgalician|galego|galego +langgerman|alem\~ao|alem\~ao +langgreek|grego|grego +langhungarian|h\'ungaro|h\'ungaro +langitalian|italiano|italiano +langjapanese|japon\^es|japon\^es +langlatin|latim|latim +langlatvian|let\~ao|let\~ao +langlithuanian|lituano|lituano +langnorwegian|noruegu\^es|noruegu\^es +langpolish|polon\^es|polon\^es +langrussian|russo|russo +langserbian|s\'ervio|s\'ervio +langslovak|eslovaco|eslovaco +langslovene|esloveno|esloveno +langspanish|espanhol|espanhol +langswedish|sueco|sueco +langturkish|turco|turco +langukrainian|ucraniano|ucraniano +fromamerican|do ingl\^es|do ingl\^es +frombulgarian|do b\'ulgaro|do b\'ulgaro +fromcatalan|do catal\~ao|do catal\~ao +fromcroatian|do croata|do croata +fromczech|do tcheco|do tcheco +fromdanish|do dinamarqu\^es|do dinamarqu\^es +fromenglish|do ingl\^es|do ingl\^es +fromestonian|do estoniano|do estoniano +fromfinnish|do finland\^es|do finland\^es +fromfrench|do franc\^es|do franc\^es +fromgalician|do galego|do galego +fromgerman|do alem\~ao|do alem\~ao +fromgreek|do grego|do grego +fromhungarian|do h\'ungaro|do h\'ungaro +fromitalian|do italiano|do italiano +fromjapanese|do japon\^es|do japon\^es +fromlatin|do latim|do latim +fromlatvian|do let\~ao|do let\~ao +fromlithuanian|do lituano|do lituano +fromnorwegian|do noruegu\^es|do noruegu\^es +frompolish|do polon\^es|do polon\^es +fromrussian|do russo|do russo +fromserbian|do s\'ervio|do s\'ervio +fromslovak|do eslovaco|do eslovaco +fromslovene|do esloveno|do esloveno +fromspanish|do espanhol|do espanhol +fromswedish|do sueco|do sueco +fromturkish|do turco|do turco +fromukrainian|do ucraniano|do ucraniano +countryde|Alemanha|DE +countryeu|Uni\~ao Europeia|EU +countryep|Uni\~ao Europeia|EP +countryuk|Reino Unido|GB +countryus|Estados Unidos|US +patent|patente|pat\adddot +patentde|patente alem\~a|pat\adddot\ alem\~a +patenteu|patente europeia|pat\adddot\ europeia +patentfr|patente francesa|pat\adddot\ francesa +patentuk|patente brit\^anica|pat\adddot\ brit\^anica +patentus|patente americana|pat\adddot\ americana +patreq|pedido de patente|ped\adddot\ de pat\adddot +patreqde|pedido de patente alem\~a|ped\adddot\ de pat\adddot\ alem\~a +patreqeu|pedido de patente europeia|ped\adddot\ de pat\adddot\ europeia +patreqfr|pedido de patente francesa|ped\adddot\ de pat\adddot\ francesa +patrequk|pedido de patente brit\^anica|ped\adddot\ de pat\adddot\ brit\^anica +patrequs|pedido de patente americana|ped\adddot\ de pat\adddot\ americana +file|arquivo|arquivo +library|biblioteca|biblioteca +abstract|resumo|resumo +annotation|notas|notas +commonera|Era Comum|EC +beforecommonera|antes da Era Comum|AEC +annodomini|depois de Cristo|d\adddot C\adddot +beforechrist|antes de Cristo|a\adddot C\adddot +circa|circa|ca\adddot +spring|primavera|primavera +summer|ver\~ao|ver\~ao +autumn|outono|outono +winter|inverno|inverno +am|AM|AM +pm|PM|PM diff --git a/citeproc/biblatex-localization/british.lbx.strings b/citeproc/biblatex-localization/british.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/british.lbx.strings @@ -0,0 +1,3 @@ +organizer|organiser|org\adddot +organizers|organisers|orgs\adddot +byorganizer|organised by|org\adddotspace by diff --git a/citeproc/biblatex-localization/bulgarian.lbx.strings b/citeproc/biblatex-localization/bulgarian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/bulgarian.lbx.strings @@ -0,0 +1,28 @@ +bibliography|Библиография|Библиография +references|Литература|Литература +shorthands|Списък на съкращенията|Съкращения +editor|редактор|ред\adddot +editors|редактори|ред\adddot +compiler|съставител|съст\adddot +compilers|съставители|съст\adddot +redactor|редактор|ред\adddot +redactors|редактори|ред\adddot +reviser|коректор|кор\adddotspace кор\adddot +revisers|коректор|кор\adddotspace кор\adddot +founder|основател|осн\adddot +founders|основатели|осн\adddot +continuator|продължител|прод\adddot +continuators|продължител|прод\adddot +collaborator|участник|участ\adddot +collaborators|участници|участ\adddot +translator|преводач|прев\adddot +translators|преводачи|прев\adddot +commentator|коментатор|комент\adddot +commentators|коментатори|комент\adddot +annotator|бележки|бел\adddot +annotators|бележки|бел\adddot +commentary|комментар|комент\adddot +annotations|бележки|бел\adddot +introduction|уводна статия|ув\adddotspace ст\adddot +foreword|предговор|предг\adddot +afterword|послеслов|послесл\adddot diff --git a/citeproc/biblatex-localization/canadian.lbx.strings b/citeproc/biblatex-localization/canadian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/canadian.lbx.strings diff --git a/citeproc/biblatex-localization/catalan.lbx.strings b/citeproc/biblatex-localization/catalan.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/catalan.lbx.strings @@ -0,0 +1,158 @@ +bibliography|Bibliografia|Bibliografia +references|Refer\`encies|Refer\`encies +shorthands|Llista d'abreviatures|Abreviatures +editor|editor|ed\adddot +editors|editors|ed\adddot +compiler|compilador|comp\adddot +compilers|compiladors|comp\adddot +redactor|redactor|red\adddot +redactors|redactors|red\adddot +reviser|revisor|rev\adddot +revisers|revisors|rev\adddot +founder|fundador|fund\adddot +founders|fundadors|fund\adddot +continuator|continuador|cont\adddot +continuators|continuadors|cont\adddot +collaborator|co\l.laborador|co\l.l\adddot +collaborators|co\l.laboradors|co\l.l\adddot +translator|traductor|trad\adddot +translators|traductors|trad\adddot +commentator|comentarista|com\adddot +commentators|comentaristes|com\adddot +annotator|anotador|anot\adddot +annotators|anotadors|anot\adddot +commentary|comentari|com\adddot +annotations|notes|n\adddot +introduction|introducci\'o|intr\adddot +foreword|pr\`oleg|pr\`ol\adddot +editortr|editor i traductor|ed\adddotspace i trad\adddot +editorstr|editors i traductors|ed\adddotspace i trad\adddot +editorco|editor i comentarista|ed\adddotspace i com\adddot +editorsco|editors i comentaristes|ed\adddotspace i com\adddot +editoran|editor i anotador|ed\adddotspace i anot\adddot +editorsan|editors i anotadors|ed\adddotspace i anot\adddot +organizer|organitzador|org\adddot +organizers|organitzadors|org\adddot +byorganizer|organitzat per|org\adddotspace per +byauthor|per|per +byeditor|edici\'o a cura \smartof|ed\adddotspace\smartof +bycompiler|compilaci\'o a cura \smartof|comp\adddotspace\smartof +byredactor|redacci\'o a cura \smartof|red\adddotspace\smartof +byreviser|revisi\'o a cura \smartof|rev\adddotspace\smartof +byreviewer|ressenya a cura \smartof|ress\adddotspace\smartof +byfounder|fundat per|fund\adddotspace per +bycontinuator|continuat per|cont\adddotspace per +bycollaborator|amb la co\l.laboraci\'o \smartof|amb la co\l.l\adddotspace\smartof +bytranslator|traducci\'o \lbx@fromlang\ a cura \smartof|trad\adddotspace\lbx@fromlang\ \smartof +bycommentator|comentari a cura \smartof|com\adddotspace\smartof +byannotator|notes a cura \smartof|n\adddotspace\smartof +withcommentator|amb un comentari a cura \smartof|amb un com\adddotspace\smartof +withannotator|amb notes a cura \smartof|amb n\adddotspace\smartof +withintroduction|amb una introducci\'o a cura \smartof|amb una intr\adddotspace\smartof +withforeword|amb un pr\`oleg a cura \smartof|amb un pr\`ol\adddotspace\smartof +and|i|i +andothers|et al\adddot|et al\adddot +andmore|i m\'es|i m\'es +volume|volum|vol\adddot +volumes|volums|vol\adddot +involumes|en|en +jourvol|volum|vol\adddot +jourser|s\`erie|s\`er\adddot +book|llibre|llib\adddot +part|part|part +issue|n\'umero|n\'um\adddot +newseries|s\`erie nova|s\`erie nova +oldseries|s\`erie antiga|s\`erie ant\adddot +edition|edici\'o|ed\adddot +reprint|reimpressi\'o|reimpr\adddot +reprintof|reimpressi\'o \smartof|reimpr\adddotspace\smartof +reprintas|reimpr\`es com|reimpr\adddotspace com +reprintfrom|reimpr\`es \smartof|reimpr\adddotspace\smartof +reviewof|ressenya \smartof|ress\adddotspace\smartof +translationof|traducci\'o \smartof|trad\adddotspace\smartof +origpubas|publicat origin\`ariament com|pub\adddotspace orig\adddotspace com +origpubin|publicat origin\`ariament el|pub\adddotspace orig\adddotspace el +astitle|com|com +bypublisher|per|per +page|p\`agina|p\`ag\adddot +pages|p\`agines|p\`ag\adddot +column|columna|col\adddot +columns|columnes|cols\adddot +nodate|sine data|s\adddotspace d\adddot +verse|vers|v\adddot +verses|versos|v\adddot +section|apartat|\S +sections|apartats|\S +paragraph|par\`agraf|\P +paragraphs|par\`agrafs|\P +pagetotal|p\`agina|p\`ag\adddot +pagetotals|p\`agines|p\`ag\adddot +columntotal|columna|col\adddot +columntotals|columnes|col\adddot +versetotal|vers|v\adddot +versetotals|versos|v\adddot +sectiontotal|secci\'o|\S +sectiontotals|seccions|\S +paragraphtotal|par\`agrafs|\P +paragraphtotals|par\`agrafs|\P +in|a|a +inseries|a|a +ofseries|\smartof|\smartof +number|n\'umero|n\'um\adddot +bathesis|treball final de grau|treb\adddotspace fin\adddotspace de gr\adddot +mathesis|treball final de m\`aster|treb\adddotspace fin\adddotspace de m\`ast\adddot +phdthesis|tesi doctoral|tesi doct\adddot +candthesis|tesi de candidatura|tesi de cand\adddot +resreport|informe de recerca|inf\adddotspace de rec\adddot +techreport|informe t\`ecnic|inf\adddotspace t\`ec\adddot +software|programari|prog\adddot +datacd|CD de dades|CD de dades +audiocd|CD d'\`audio|CD d'\`audio +version|versi\'o|vers\adddot +urlfrom|disponible a|disp\adddotspace a +urlseen|consultat|cons\adddot +inpreparation|en preparaci\'o|en prep\adddot +inpress|a impremta|a impr\adddot +prepublished|pre-publicat|pre-publicat +submitted|enviat a publicar|env\adddotspace a pub\adddot +forthcoming|properament|prop\adddot +citedas|d'ara endavant citat com|d'ara end\adddotspace cit\adddotspace com +thiscite|concretament|concr\adddot +seenote|vegeu la nota|v\adddotspace la n\adddot +quotedin|citat a|cit\adddotspace a +opcit|\`op\adddotspace cit\adddot|\`op\adddotspace cit\adddot +loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot +confer|cf\adddot|cf\adddot +sequens|seq\adddot|seq\adddot +sequentes|et seq\adddot|et seq\adddot +passim|p\`assim|p\`assim +see|vegeu|v\adddot +seealso|vegeu tamb\'e|v\adddotspace tamb\'e +backrefpage|vegeu la p\`agina|v\adddotspace la p\`ag\adddot +backrefpages|vegeu les p\`agines|v\adddotspace les p\`ag\adddot +january|gener|gen\adddot +february|febrer|febr\adddot +april|abril|abr\adddot +may|maig|maig +june|juny|juny +july|juliol|jul\adddot +august|agost|ag\adddot +september|setembre|set\adddot +october|octubre|oct\adddot +november|novembre|nov\adddot +december|desembre|des\adddot +langamerican|angl\`es americ\`a|ang\adddotspace amer\adddot +langbrazilian|portugu\`es brasiler|port\adddotspace bras\adddot +langbulgarian|b\'ulgar|b\'ulg\adddot +langcatalan|catal\`a|cat\adddot +langczech|txec|txec +langcroatian|croat|croat +langdanish|dan\`es|dan\adddot +langdutch|neerland\`es|neerl\adddot +langenglish|angl\`es|ang\adddot +langestonian|estoni\`a|eston\adddot +langfinnish|fin\`es|fin\adddot +langfrench|franc\`es|fr\adddot +langgalician|gallec|gal\adddot +langgerman|alemany|al\adddot +langgreek|grec|grec diff --git a/citeproc/biblatex-localization/croatian.lbx.strings b/citeproc/biblatex-localization/croatian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/croatian.lbx.strings @@ -0,0 +1,214 @@ +bibliography|Bibliografija|Bibliografija +references|Literatura|Literatura +shorthands|Popis kratica|Kratice +editor|urednik|ur\adddot +editors|urednici|ur\adddot +redactor|redaktor|redaktor +redactors|redaktori|redaktori +reviser|korektor|korektor +revisers|korektori|korektori +collaborator|suradnik|sur\adddot +collaborators|suradnici|sur\adddot +translator|prijevod|prev\adddot +translators|prijevod|prev\adddot +commentator|komentator|komentator +commentators|komentatori|komentatori +commentary|komentar|komentar +introduction|uvod|uvod +foreword|predgovor|predgovor +afterword|pogovor|pogovor +editortr|prijevod i obrada|ur\adddotspace i prev\adddot +editorstr|prijevod i obrada|ur\adddotspace i prev\adddot +organizer|organizacija|organizacija +organizers|organizacija|organizacija +byorganizer|organizacija|organizacija +byauthor|autor|autor +byeditor|obrada|ur\adddot +byredactor|redaktura|red\adddot +byreviser|korektura|kor\adddot +byreviewer|recenzija|recenzija +bycontinuator|nastavio|nastavio +bycollaborator|u suradnji s|u sur\adddotspace s +bycommentator|komentari|komentari +withcommentator|komentari|komentari +withintroduction|uvod|uvod +withforeword|predgovor|predgovor +withafterword|pogovor|pogovor +and|i|i +andothers|i drugi|i dr\adddot +andmore|i drugi|i dr\adddot +volume|sv\adddot|sv\adddot +volumes|sv\adddot|sv\adddot +involumes|u|u +jourvol|sv\adddot|sv\adddot +jourser|serija|serija +book|knjiga|knj\adddot +part|dio|dio +issue|izd\adddot|izd\adddot +newseries|nova serija|nova serija +oldseries|stara serija|stara serija +edition|izdanje|izdanje +reprint|pretisak|pretisak +reprintof|pretisak|pretisak +reprintas|iznova otisnuto kao|iznova otisnuto kao +reprintfrom|iznova otisnut|iznova otisnut +translationof|prijevod|prijevod +translationas|prev\adddotspace kao|prev\adddotspace kao +translationfrom|prijevod|prijevod +reviewof|osvrt na|osvrt na +origpubas|izvorno obj\adddotspace kao|izv\adddotspace obj\adddotspace kao +origpubin|izvorno obj\adddot|izv\adddotspace obj\adddot +astitle|kao|kao +bypublisher|| +nodate|bez datuma|bez datuma +page|stranica|str\adddot +pages|stranice|str\adddot +column|stupac|stupac +columns|stupci|stupci +line|linija|l\adddot +lines|linije|ll\adddot +verse|stih|stih +verses|stihovi|stihovi +section|odjeljak|\S +sections|odjeljci|\S\S +paragraph|stavak|st\adddot +paragraphs|stavci|st\adddot +pagetotal|str\adddot|str\adddot +pagetotals|str\adddot|str\adddot +columntotal|stupac|stupac +columntotals|stupaca|stupaca +linetotal|linija|lin\adddot +linetotals|linija|lin\adddot +versetotal|stih|st\adddot +versetotals|stihova|st\adddot +sectiontotal|odjeljak|odj\adddot +sectiontotals|odjeljaka|odj\adddot +paragraphtotal|stavak|st\adddot +paragraphtotals|stavaka|st\adddot +in|| +inseries|u seriji|u seriji +ofseries|iz serije|iz serije +number|broj|br\adddot +chapter|poglavlje|pogl\adddot +bathesis|diplomski rad|dipl\adddotspace rad +mathesis|magistarski rad|mag\adddotspace rad +phdthesis|doktorska disertacija|disertacija +software|softver|softver +datacd|CD-ROM|CD-ROM +audiocd|audio CD|audio CD +version|verzija|verzija +url|adresa|adresa +urlfrom|dostupno na|dost\adddotspace na +urlseen|pogledano|pogledano +inpreparation|u pripremi|u pripremi +submitted|predan|predan +inpress|u tisku|u tisku +prepublished|pred objavom|pred obj\adddot +citedas|dalje citirano kao|dalje citirano kao +thiscite|napose|napose +quotedin|citirano u|citirano u +idem|idem|idem +idemsm|idem|idem +idemsf|eadem|eadem +idemsn|idem|idem +idempm|eidem|eidem +idempf|eaedem|eaedem +idempn|eadem|eadem +idempp|eidem|eidem +ibidem|ibidem|ibid\adddot +opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot +loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot +confer|usporedi|usp\adddot +sequens|sq\adddot|sq\adddot +sequentes|sqq\adddot|sqq\adddot +passim|passim|pass\adddot +see|vidi|v\adddot +seealso|pogledaj i|pogl\adddotspace i +backrefpage|citirano na stranci|cit\adddotspace na str\adddot +backrefpages|cited on pages|cit\adddotspace na str\adddot +april|travanj|travanj +may|svibanj|svibanj +june|lipanj|lipanj +july|srpanj|srpanj +august|kolovoz|kolovoz +september|rujan|rujan +october|listopad|listopad +november|studeni|studeni +december|prosinac|prosinac +dateapril|travnja|travnja +datemay|svibnja|svibnja +datejune|lipnja|lipnja +datejuly|srpnja|srpnja +dateaugust|kolovoza|kolovoza +dateseptember|rujna|rujna +dateoctober|listopada|listopada +datenovember|studenoga|studenoga +datedecember|prosinca|prosinca +langamerican|engleski|engleski +langbrazilian|portugalski|portugalski +langbulgarian|bugarski|bugarski +langcatalan|katalonski|katalonski +langcroatian|hrvatski|hrvatski +langdanish|danski|danski +langdutch|nizozemski|nizozemski +langenglish|engleski|engleski +langestonian|estonski|estonski +langfinnish|finski|finski +langfrench|francuski|francuski +langgalician|galicijski|galicijski +langhungarian|ma\dj arski|ma\dj arski +langitalian|talijanski|talijanski +langjapanese|japanski|japanski +langlatin|latinski|latinski +langlatvian|letonski|letonski +langpolish|poljski|poljski +langportuguese|portugalski|portugalski +langrussian|ruski|ruski +langslovene|slovenski|slovenski +langukrainian|ukrajinski|ukrajinski +fromamerican|s engleskog|s engleskog +frombrazilian|s portugalskog|s portugalskog +frombulgarian|s bugarskog|s bugarskog +fromcatalan|s katalonskog|s katalonskog +fromcroatian|s hrvatskog|s hrvatskog +fromdanish|s danskog|s danskog +fromdutch|s nizozemskog|s nizozemskog +fromenglish|s engleskog|s engleskog +fromestonian|s estonskog|s estonskog +fromfinnish|s finskog|s finskog +fromfrench|s francuskog|s francuskog +fromgalician|s galicijskog|s galicijskog +fromhungarian|s ma\dj arskog|s ma\dj arskog +fromitalian|s talijanskog|s talijanskog +fromjapanese|s japanskog|s japanskog +fromlatin|s latinskog|s latinskog +fromlatvian|s letonskog|s letonskog +frompolish|s poljskog|s poljskog +fromportuguese|s portugalskog|s portugalskog +fromrussian|s ruskog|s ruskog +fromslovene|sa slovenskog|sa slovenskog +fromukrainian|s ukrajinskog|s ukrajinskog +countryeu|Europska unija|EU +countryep|Europska unija|EP +countryfr|Francuska|FR +countryuk|Velika Britanija|GB +patent|patent|pat\adddot +patenteu|europski patent|europski pat\adddot +patentfr|francuski patent|francuski pat\adddot +patentuk|britanski patent|britanski pat\adddot +patentus|US patent|US pat\adddot +patreq|patentni zahtjev|pat\adddot\ zahtjev +patreqeu|europski patentni zahtjev|EU pat\adddotspace zahtjev +patrequs|US patentni zahtjev|US pat\adddot\ zahtjev +file|datoteka|datoteka +library|biblioteka|biblioteka +commonera|n\adddotspace e\adddot|n\adddotspace e\adddot +beforecommonera|pr\adddotspace n\adddotspace e\adddot|pr\adddotspace n\adddotspace e\adddot +annodomini|poslije Krista|p\adddotspace Kr\adddot +beforechrist|prije Krista|pr\adddotspace Kr\adddot +circa|oko|cca\adddot +summer|ljeto|ljeto +autumn|jesen|jesen +winter|zima|zima +am|prije podne|AM +pm|poslije podne|PM diff --git a/citeproc/biblatex-localization/czech.lbx.strings b/citeproc/biblatex-localization/czech.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/czech.lbx.strings @@ -0,0 +1,91 @@ +bibliography|Bibliografie|Bibliografie +references|Odkazy|Odkazy +shorthands|Seznam zkratek|Zkratky +editor|editor|ed\adddot +compiler|sestavil|sest\adddot +compilers|sestavili|sest\adddot +redactor|redaktor|red\adddot +reviser|korektor|kor\adddot +founder|zakladatel|zakl\adddot +annotations|anotace|anot\adddot +afterword|doslov|dosl\adddot +byauthor|| +bycompiler|sestaveno|sest\adddot +withannotator|s\addnbspace anotacemi od|s\addnbspace anot\adddot\ od +withafterword|s\addnbspace doslovem od|s\addnbspace dosl\adddot\ od +and|a|a +andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +volume|svazek|sv\adddot +volumes|svazky|sv\adddot +involumes|in|in +book|kniha|kniha +reprint|dotisk|dotisk +reprintof|dotisk|dotisk +reprintas|dotisknuto jako|dotisknuto jako +reprintfrom|dotisknuto z\addnbspace|dotisknuto z\addnbspace +reviewof|recenze|recenz\adddot +astitle|jako|jako +bypublisher|| +page|strana|s\adddot +pages|strany|s\adddot +column|sloupec|sl\adddot +columns|sloupce|sl\adddot +section|sekce|\S +sections|sekce|\S\S +paragraph|odstavec|ods\adddot +paragraphs|odstavce|ods\adddot +pagetotal|strana|s\adddot +pagetotals|strany|s\adddot +columntotal|sloupec|sl\adddot +columntotals|sloupce|sl\adddot +sectiontotal|sekce|\S +sectiontotals|sekce|\S\S +paragraphtotal|odstavec|ods\adddot +paragraphtotals|odstavce|ods\adddot +in|in|in +inseries|in|in +ofseries|z|z +chapter|kapitola|kap\adddot +datacd|CD-ROM|CD-ROM +audiocd|audio CD|audio CD +version|verze|ver\adddot +url|URL|URL +inpress|v\addnbspace tisku|v\addnbspace tisku +idem|idem|idem +idemsm|idem|idem +idemsf|eadem|eadem +idemsn|idem|idem +idempm|eidem|eidem +idempf|eaedem|eaedem +idempn|eadem|eadem +idempp|eidem|eidem +ibidem|ibidem|ibid\adddot +opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot +loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot +confer|cf\adddot|cf\adddot +sequens|sq\adddot|sq\adddot +sequentes|sqq\adddot|sqq\adddot +passim|passim|pass\adddot +see|viz|viz +january|leden|led\adddot +april|duben|dub\adddot +august|srpen|srp\adddot +november|listopad|lis\adddot +december|prosinec|pros\adddot +langlatin|latina|lat\adddot +fromlatin|z\addnbspace latiny|z\addnbspace lat\adddot +countryfr|Francie|FR +patent|patent|pat\adddot +patentus|US patent|US pat\adddot +file|soubor|soub\adddot +library|knihovna|knih\adddot +abstract|abstrakt|abst\adddot +annotation|anotace|anot\adddot +annodomini|po Kristu|po Kr\adddot +circa|cirka|ca\adddot +spring|jaro|jaro +autumn|podzim|podzim +winter|zima|zima +am|AM|AM +pm|PM|PM diff --git a/citeproc/biblatex-localization/danish.lbx.strings b/citeproc/biblatex-localization/danish.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/danish.lbx.strings @@ -0,0 +1,106 @@ +bibliography|Bibliografi|Bibliografi +references|Litteraturhenvisninger|Litteratur +shorthands|Forkortelser|Forkortelser +editor|redakt\o r|red\adddot +editors|redakt\o rer|red\adddot +compiler|kompilator|kompilator +compilers|kompilatorer|kompilatorer +redactor|medredakt\o r|medred\adddot +redactors|medredakt\o rer|medred\adddot +reviser|revision|rev\adddot +revisers|revision|rev\adddot +founder|stifter|stifter +founders|stiftere|stiftere +continuator|videref\o rer|videref\adddot +continuators|videref\o rere|videref\adddot +collaborator|medarbejder|medarb\adddot +collaborators|medarbejdere|medarb\adddot +translator|overs\ae tter|overs\adddot +translators|overs\ae ttere|overs\adddot +commentator|kommentator|komm\adddot +commentators|kommentatorer|komm\adddot +annotator|kommentator|komm\adddot +annotators|kommentatorer|komm\adddot +commentary|kommentar|komm\adddot +annotations|annoteringer|ann\adddot +introduction|indledning|indl\adddot +foreword|forord|forord +afterword|efterord|efterord +organizer|organisator|org\adddot +organizers|organisatorer|org\adddot +byorganizer|organiseret af|org\adddotspace av +byauthor|af|af +byeditor|redigeret af|red\adddotspace af +bycompiler|kompileret af|komp\adddotspace af +byredactor|bearbejdet af|bearb\adddotspace af +byreviser|revideret af|rev\adddotspace af +byreviewer|bed\o mt af|bed\adddotspace af +byfounder|stiftet af|stiftet af +bycontinuator|videref\o rt af|videref\adddotspace af +bycollaborator|i samarbejde med|i samarb\adddotspace m\adddot +bycommentator|kommenteret af|komm\adddot\ af +byannotator|annoteret af|ann\adddot\ af +withcommentator|med kommentarer af|m\adddotspace komm\adddot\ af +withannotator|med annoteringer af|m\adddotspace ann\adddot\ af +withintroduction|med indledning af|m\adddotspace indl\adddot\ af +withforeword|med forord af|m\adddotspace forord af +withafterword|med efterord af|m\adddotspace efterord af +and|og|og +andothers|med flere|m.fl\adddot +andmore|med mere|m.m\adddot +volume|bind|bd\adddot +volumes|bind|bd\adddot +involumes|i|i +jourvol|\aa rgang|\aa rg\adddot +jourser|r\ae kke|rk\adddot +book|bog|bog +part|del|del +issue|nummer|nr\adddot +newseries|ny r\ae kke|ny rk\adddot +oldseries|gammel r\ae kke|gl. rk\adddot +edition|udgave|udg\adddot +reprint|genoptryk|genoptr\adddot +reprintof|genoptryk af|genoptr\adddot\ af +reprintas|genoptryk under titlen|genoptr\adddot\ under titlen +reprintfrom|genoptryk fra|genoptr\adddot\ fra +translationof|overs\ae ttelse af|overs\adddot\ af +translationas|oversat under titlen|overs\adddotspace\ under titlen +translationfrom|oversat fra|overs\adddotspace\ fra +reviewof|bed\o mmelse af|bed\adddotspace af +origpubas|oprindeligt udgivet som|opr\adddot\ udg\adddot\ som +origpubin|oprindeligt udgivet i|opr\adddot\ udg\adddot\ i +astitle|under titlen|under titlen +bypublisher|af|af +nodate|uden \aa rstal|u.\aa\adddot +page|side|s\adddot +pages|sider|s\adddot +column|spalte|sp\adddot +columns|spalter|sp\adddot +line|linje|l\adddot +lines|linjer|l\adddot +verse|vers|v\adddot +verses|vers|v\adddot +section|paragraf|par\adddot +sections|paragraffer|par\adddot +paragraph|afsnit|afsn\adddot +paragraphs|afsnit|afsn\adddot +pagetotal|side|s\adddot +pagetotals|sider|s\adddot +columntotal|spalte|sp\adddot +columntotals|spalter|sp\adddot +line|linje|l\adddot +lines|linjer|l\adddot +verse|vers|v\adddot +verses|vers|v\adddot +linetotal|linje|l\adddot +linetotals|linje|l\adddot +versetotal|vers|v\adddot +versetotals|vers|v\adddot +sectiontotal|paragraf|par\adddot +sectiontotals|paragraffer|par\adddot +paragraphtotal|afsnit|afsn\adddot +paragraphtotals|afsnit|afsn\adddot +in|i|i +inseries|i r\ae kken|i rk\adddot +ofseries|fra r\ae kken|fra rk\adddot +number|nummer|nr\adddot diff --git a/citeproc/biblatex-localization/dutch.lbx.strings b/citeproc/biblatex-localization/dutch.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/dutch.lbx.strings @@ -0,0 +1,23 @@ +bibliography|Bibliografie|Bibliografie +references|Referenties|Referenties +shorthands|Lijst van afkortingen|Afkortingen +editor|redacteur|red\adddot +editors|redacteurs|red\adddot +compiler|samensteller|samenst\adddot +compilers|samenstellers|samenst\adddot +founder|oprichter|opr\adddot +founders|oprichters|opr\adddot +continuator|opvolger|opv\adddot +continuators|opvolgers|opv\adddot +redactor|redacteur|red\adddot +redactors|redacteuren|red\adddot +reviser|revisor|rev\adddot +revisers|revisors|rev\adddot +collaborator|medewerker|med\adddot +collaborators|medewerkers|med\adddot +translator|vertaler|vert\adddot +translators|vertalers|vert\adddot +commentator|commentator|comm\adddot +commentators|commentatoren|comm\adddot +annotator|annotator|annot\adddot +annotators|annotatoren|annot\adddot diff --git a/citeproc/biblatex-localization/english.lbx.strings b/citeproc/biblatex-localization/english.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/english.lbx.strings @@ -0,0 +1,254 @@ +bibliography|Bibliography|Bibliography +references|References|References +shorthands|List of Abbreviations|Abbreviations +editor|editor|ed\adddot +editors|editors|eds\adddot +compiler|compiler|comp\adddot +compilers|compilers|comp\adddot +redactor|redactor|red\adddot +redactors|redactors|red\adddot +reviser|reviser|rev\adddot +revisers|revisers|rev\adddot +founder|founder|found\adddot +founders|founders|found\adddot +continuator|continued|cont\adddot +continuators|continued|cont\adddot +collaborator|collaborator|collab\adddot +collaborators|collaborators|collab\adddot +translator|translator|trans\adddot +translators|translators|trans\adddot +commentator|commentator|comm\adddot +commentators|commentators|comm\adddot +annotator|annotator|annot\adddot +annotators|annotators|annot\adddot +commentary|commentary|comm\adddot +annotations|annotations|annot\adddot +introduction|introduction|intro\adddot +foreword|foreword|forew\adddot +afterword|afterword|afterw\adddot +organizer|organizer|org\adddot +organizers|organizers|orgs\adddot +byorganizer|organized by|org\adddotspace by +byauthor|by|by +byeditor|edited by|ed\adddotspace by +bycompiler|compiled by|comp\adddotspace by +byredactor|redacted by|red\adddotspace by +byreviser|revised by|rev\adddotspace by +byreviewer|reviewed by|rev\adddotspace by +byfounder|founded by|found\adddotspace by +bycontinuator|continued by|cont\adddotspace by +bycollaborator|in collaboration with|in collab\adddotspace with +bytranslator|translated \lbx@lfromlang\ by|trans\adddot\ \lbx@sfromlang\ by +bycommentator|commented by|comm\adddot\ by +byannotator|annotated by|annot\adddot\ by +withcommentator|with a commentary by|with a comment\adddot\ by +withannotator|with annotations by|with annots\adddot\ by +withintroduction|with an introduction by|with an intro\adddot\ by +withforeword|with a foreword by|with a forew\adddot\ by +withafterword|with an afterword by|with an afterw\adddot\ by +and|and|and +andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +volume|volume|vol\adddot +volumes|volumes|vols\adddot +involumes|in|in +jourvol|volume|vol\adddot +jourser|series|ser\adddot +book|book|book +part|part|part +issue|issue|issue +newseries|new series|new ser\adddot +oldseries|old series|old ser\adddot +edition|edition|ed\adddot +reprint|reprint|repr\adddot +reprintof|reprint of|repr\adddotspace of +reprintas|reprinted as|rpt\adddotspace as +reprintfrom|reprinted from|repr\adddotspace from +reviewof|review of|rev\adddotspace of +translationof|translation of|trans\adddotspace of +translationas|translated as|trans\adddotspace as +translationfrom|translated from|trans\adddotspace from +origpubas|originally published as|orig\adddotspace pub\adddotspace as +origpubin|originally published in|orig\adddotspace pub\adddotspace in +astitle|as|as +bypublisher|by|by +nodate|no date|n\adddot d\adddot +page|page|p\adddot +pages|pages|pp\adddot +column|column|col\adddot +columns|columns|cols\adddot +line|line|l\adddot +lines|lines|ll\adddot +verse|verse|v\adddot +verses|verses|vv\adddot +section|section|\S +sections|sections|\S\S +paragraph|paragraph|par\adddot +paragraphs|paragraphs|par\adddot +pagetotal|page|p\adddot +pagetotals|pages|pp\adddot +columntotal|column|col\adddot +columntotals|columns|cols\adddot +linetotal|line|l\adddot +linetotals|lines|ll\adddot +versetotal|verse|v\adddot +versetotals|verses|vv\adddot +sectiontotal|section|\S +sectiontotals|sections|\S\S +paragraphtotal|paragraph|par\adddot +paragraphtotals|paragraphs|par\adddot +in|in|in +inseries|in|in +ofseries|of|of +number|number|no\adddot +chapter|chapter|chap\adddot +bathesis|Bachelor's thesis|BA\addabbrvspace thesis +mathesis|Master's thesis|MA\addabbrvspace thesis +phdthesis|PhD\addabbrvspace thesis|PhD\addabbrvspace thesis +candthesis|Candidate thesis|Cand\adddotspace thesis +resreport|research report|research rep\adddot +techreport|technical report|tech\adddotspace rep\adddot +software|computer software|comp\adddotspace software +datacd|CD-ROM|CD-ROM +audiocd|audio CD|audio CD +version|version|version +url|address|address +urlfrom|available from|available from +urlseen|visited on|visited on +inpreparation|in preparation|in preparation +submitted|submitted|submitted +forthcoming|forthcoming|forthcoming +inpress|in press|in press +prepublished|pre-published|pre-published +citedas|henceforth cited as|henceforth cited as +thiscite|especially|esp\adddot +seenote|see note|see n\adddot +quotedin|quoted in|qtd\adddotspace in +idem|idem|idem +idemsm|idem|idem +idemsf|eadem|eadem +idemsn|idem|idem +idempm|eidem|eidem +idempf|eaedem|eaedem +idempn|eadem|eadem +idempp|eidem|eidem +ibidem|ibidem|ibid\adddot +opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot +loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot +confer|cf\adddot|cf\adddot +sequens|sq\adddot|sq\adddot +sequentes|sqq\adddot|sqq\adddot +passim|passim|pass\adddot +see|see|see +seealso|see also|see also +backrefpage|cited on page|cit\adddotspace on p\adddot +backrefpages|cited on pages|cit\adddotspace on pp\adddot +january|January|Jan\adddot +february|February|Feb\adddot +march|March|Mar\adddot +april|April|Apr\adddot +may|May|May +june|June|June +july|July|July +august|August|Aug\adddot +september|September|Sept\adddot +october|October|Oct\adddot +november|November|Nov\adddot +december|December|Dec\adddot +langamerican|American|American +langbrazilian|Brazilian|Brazilian +langbulgarian|Bulgarian|Bulgarian +langcatalan|Catalan|Catalan +langcroatian|Croatian|Croatian +langczech|Czech|Czech +langdanish|Danish|Danish +langdutch|Dutch|Dutch +langenglish|English|English +langestonian|Estonian|Estonian +langfinnish|Finnish|Finnish +langfrench|French|French +langgalician|Galician|Galician +langgerman|German|German +langgreek|Greek|Greek +langhungarian|Hungarian|Hungarian +langitalian|Italian|Italian +langjapanese|Japanese|Japanese +langlatin|Latin|Latin +langlatvian|Latvian|Latvian +langlithuanian|Lithuanian|Lithuanian +langnorwegian|Norwegian|Norwegian +langpolish|Polish|Polish +langportuguese|Portuguese|Portuguese +langrussian|Russian|Russian +langserbian|Serbian|Serbian +langslovak|Slovak|Slovak +langslovene|Slovene|Slovene +langspanish|Spanish|Spanish +langswedish|Swedish|Swedish +langturkish|Turkish|Turkish +langukrainian|Ukrainian|Ukrainian +fromamerican|from the American|from the American +frombrazilian|from the Brazilian|from the Brazilian +frombulgarian|from the Bulgarian|from the Bulgarian +fromcatalan|from the Catalan|from the Catalan +fromcroatian|from the Croatian|from the Croatian +fromczech|from the Czech|from the Czech +fromdanish|from the Danish|from the Danish +fromdutch|from the Dutch|from the Dutch +fromenglish|from the English|from the English +fromestonian|from the Estonian|from the Estonian +fromfinnish|from the Finnish|from the Finnish +fromfrench|from the French|from the French +fromgalician|from the Galician|from the Galician +fromgerman|from the German|from the German +fromgreek|from the Greek|from the Greek +fromhungarian|from the Hungarian|from the Hungarian +fromitalian|from the Italian|from the Italian +fromjapanese|from the Japanese|from the Japanese +fromlatin|from the Latin|from the Latin +fromlatvian|from the Latvian|from the Latvian +fromlithuanian|from the Lithuanian|from the Lithuanian +fromnorwegian|from the Norwegian|from the Norwegian +frompolish|from the Polish|from the Polish +fromportuguese|from the Portuguese|from the Portuguese +fromrussian|from the Russian|from the Russian +fromserbian|from the Serbian|from the Serbian +fromslovak|from the Slovak|from the Slovak +fromslovene|from the Slovene|from the Slovene +fromspanish|from the Spanish|from the Spanish +fromswedish|from the Swedish|from the Swedish +fromturkish|from the Turkish|from the Turkish +fromukrainian|from the Ukrainian|from the Ukrainian +countryde|Germany|DE +countryeu|European Union|EU +countryep|European Union|EP +countryfr|France|FR +countryuk|United Kingdom|GB +countryus|United States of America|US +patent|patent|pat\adddot +patentde|German patent|German pat\adddot +patenteu|European patent|European pat\adddot +patentfr|French patent|French pat\adddot +patentuk|British patent|British pat\adddot +patentus|U.S\adddotspace patent|U.S\adddotspace pat\adddot +patreq|patent request|pat\adddot\ req\adddot +patreqde|German patent request|German pat\adddot\ req\adddot +patreqeu|European patent request|European pat\adddot\ req\adddot +patreqfr|French patent request|French pat\adddot\ req\adddot +patrequk|British patent request|British pat\adddot\ req\adddot +patrequs|U.S\adddotspace patent request|U.S\adddotspace pat\adddot\ req\adddot +file|file|file +library|library|library +abstract|abstract|abstract +annotation|annotations|annotations +commonera|Common Era|CE +beforecommonera|Before Common Era|BCE +annodomini|Anno Domini|AD +beforechrist|Before Christ|BC +circa|circa|ca\adddot +spring|Spring|Spr\adddot +summer|Summer|Sum\adddot +autumn|Autumn|Aut\adddot +winter|Winter|Win\adddot +am|AM|AM +pm|PM|PM diff --git a/citeproc/biblatex-localization/estonian.lbx.strings b/citeproc/biblatex-localization/estonian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/estonian.lbx.strings @@ -0,0 +1,178 @@ +bibliography|bibliograafia|bibliograafia +references|viited|viited +editor|toimetaja|toim\adddot +editors|toimetajad|toim\adddot +compiler|koostaja|koost\adddot +compilers|koostajad|koost\adddot +redactor|toimetaja|toim\adddot +redactors|toimetajad|toim\adddot +reviser|toimetaja|toim\adddot +revisers|toimetajad|toim\adddot +founder|asutaja|asutaja +founders|asutajad|asutajad +commentator|kommenteerija|kommenteerija +commentators|kommenteerijad|kommenteerijad +annotator|kommenteerija|kommenteerija +annotators|kommenteerijad|kommenteerijad +commentary|kommentaarid|kommentaarid +annotations|kommentaarid|kommentaarid +introduction|sissejuhatus|sissejuhatus +organizer|korraldaja|korraldaja +organizers|korraldajad|korraldajad +byorganizer|korraldanud|korraldanud +byauthor|kirjutanud|kirj\adddot +byeditor|toimetanud|toim\adddot +bycompiler|koostanud|koost\adddot +byredactor|toimetanud|toim\adddot +byreviewer|vaadanud|vaadanud +byfounder|asutanud|asutanud +bycommentator|kommenteerinud|kommenteerinud +byannotator|kommenteerinud|kommenteerinud +withcommentator|koos kommentaaridega|koos kommentaaridega +withannotator|koos kommentaaridega|koos kommentaaridega +withintroduction|koos tutvustusega|koos tutvustusega +and|ja|ja +involumes|osas|osas +jourser|seeria|seeria +book|raamat|raamat +part|osa|osa +issue|number|nr\adddot +newseries|uus seerias|uus seer\adddot +oldseries|vana seeria|vana seer\adddot +reviewof|arvustus teosest|arvustus teosest +origpubas|algselt avaldatud kui|algselt avaldatud kui +origpubin|algselt avaldatud aastal|algselt avaldatud aastal +astitle|pealkirjaga|pealkirjaga +column|veerg|veerg +columns|veerud|veerud +line|rida|rida +lines|read|read +verse|salm|salm +verses|salmid|salmid +section|jagu|jagu +sections|jaod|jaod +columntotal|veerge kokku|veerge kokku +columntotals|veergusid kokku|veergusid kokku +linetotal|ridu kokku|ridu kokku +linetotals|ridasid kokku|ridasid kokku +versetotal|salmi kokku|salmi kokku +versetotals|salmesid kokku|salmesid kokku +sectiontotal|jagusid kokku|jagusid kokku +sectiontotals|jagusid kokku|jagusid kokku +in|teoses|teoses +inseries|sarjas|sarjas +ofseries|sarjast|sarjast +number|number|nr +resreport|uuringuraport|uuringuraport +techreport|tehniline raport|tehniline raport +software|tarkvara|tarkvara +datacd|CD-ROM|CD-ROM +audiocd|audioplaat|audioplaat +version|versioon|versioon +url|aadress|aadress +urlfrom|saadaval|saadaval +urlseen|vaadatud|vaadatud +inpreparation|koostamisel|koostamisel +submitted|esitatud|esitatud +forthcoming|tulevases|tulevases +citedas|edaspidi viidatud kui|edaspidi viidatud kui +thiscite|eriti|eriti +quotedin|noteeritud|noteeritud +see|vaata|vt +seealso|vaata ka|vt ka +backrefpage|viidatud lehel|viidatud lehel +january|jaanuar|jaanuar +february|veebruar|veebruar +april|aprill|aprill +may|mai|mai +june|juuni|juuni +july|juuli|juuli +august|august|august +september|september|september +october|oktoober|oktoober +november|november|november +december|detsember|detsember +langamerican|Ameerika inglise keel|Ameerika inglise keel +langbrazilian|brasiilia keel|brasiilia keel +langbulgarian|bulgaaria keel|bulgaaria keel +langcatalan|katalaani keel|katalaani keel +langcroatian|horvaadi keel|horvaadi keel +langdanish|taani keel|taani keel +langdutch|hollandi keel|hollandi keel +langenglish|inglise keel|inglise keel +langestonian|eesti keel|eesti keel +langfinnish|soome keel|soome keel +langfrench|prantsuse keel|prantsuse keel +langgalician|galeegi keel|galeegi keel +langgerman|saksa keel|saksa keel +langgreek|kreeka keel|kreeka keel +langhungarian|ungari keel|ungari keel +langitalian|itaalia keel|itaalia keel +langjapanese|jaapani keel|jaapani keel +langlatin|ladina keel|ladina keel +langnorwegian|norra keel|norra keel +langpolish|poola keel|poola keel +langportuguese|portugali keel|portugali keel +langrussian|vene keel|vene keel +langslovak|slovakia keel|slovakia keel +langslovene|sloveeni keel|sloveeni keel +langspanish|hispaania keel|hispaania keel +langswedish|rootsi keel|rootsi keel +langukrainian|ukraina keel|ukraina keel +fromamerican|Ameerika inglise keelest|Ameerika inglise keelest +frombrazilian|brasiilia keelest|brasiilia keelest +frombulgarian|bulgaaria keelest|bulgaaria keelest +fromcatalan|katalani keelest|kalatalani keelest +fromcroatian|horvaadi keelest|horvaadi keelest +fromdanish|taani keelest|taani keelest +fromdutch|hollandi keelest|hollandi keelest +fromenglish|inglise keelest|inglise keelest +fromestonian|eesti keelest|eesti keelest +fromfinnish|soome keelest|soome keelest +fromfrench|prantsuse keelest|prantsuse keelest +fromgalician|galeegi keelest|galeegi keelest +fromgerman|saksa keelest|saksa keelest +fromgreek|kreeka keelest|kreeka keelest +fromhungarian|ungari keelest|ungari keelest +fromitalian|itaalia keelest|itaalia keelest +fromjapanese|jaapani keelest|jaapani keelest +fromlatin|ladina keelest|ladina keelest +fromnorwegian|norra keelest|norra keelest +fromportuguese|portugali keelest|portugali keelest +fromrussian|vene keelest|vene keelest +fromslovak|slovakia keelest|slovakia keelest +fromslovene|sloveenia keelest|sloveenia keelest +fromspanish|hispaania keelest|hispaania keelest +fromswedish|rootsi keelest|rootsi keelest +fromukrainian|ukraina keelest|ukraina keelest +countryde|Saksamaa|DE +countryeu|Euroopa Liit|EL +countryep|Euroopa Parlament|EP +countryfr|Prantsusmaa|FR +countryuk|Suurbritannia|GB +countryus|Ameerika|US +patent|patent|pat\adddot +patentde|Saksa patent|Saksa pat\adddot +patenteu|Euroopa patent|Euroopa pat\adddot +patentfr|Prantsuse patent|Prantsuse pat\adddot +patentuk|Briti patent|Briti pat\adddot +patentus|U.S\adddotspace patent|U.S\adddotspace pat\adddot +patreq|patendi taotlus|pat\adddotspace taotl\adddot +patreqde|Saksa patendi taotlus|Saksa pat\adddotspace taotl\adddot +patreqeu|Euroopa patendi taotlus|Euroopa pat\adddotspace taotl\adddot +patreqfr|Prantsuse patendi taotlus|Prantsuse pat\adddotspace taotl\adddot +patrequk|Briti patendi taotlus|Briti pat\adddotspace taotl\adddot +patrequs|U.S\adddotspace patendi taotlus.|U.S\adddotspace pat\adddotspace taotl\adddot +file|fail|fail +library|raamatukogu|raamatukogu +abstract|teesid|teesid +annotation|kommentaarid|kommentaarid +commonera|meie ajaarvamise j\"argi|m\adddot a\adddot j +beforecommonera|enne meie ajaarvamist|e\adddot m\adddot a +annodomini|p\"arast Kristust|pKr +beforechrist|enne Kristust|eKr +spring|kevadel|kevadel +summer|suvel|suvel +winter|talvel|talvel +am|AM|AM +pm|PM|PM diff --git a/citeproc/biblatex-localization/finnish.lbx.strings b/citeproc/biblatex-localization/finnish.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/finnish.lbx.strings @@ -0,0 +1,254 @@ +bibliography|Kirjallisuusluettelo|Kirjallisuus +references|Viitteet|Viitteet +shorthands|Lyhenteet|Lyhenteet +editor|toimittanut|toim\adddot +editors|toimittaneet|toim\adddot +compiler|koontanut|koontanut +compilers|koontaneet|koontaneet +redactor|toimittanut|toim\adddot +redactors|toimittaneet|toim\adddot +reviser|toimittanut|toim\adddot +revisers|toimittaneet|toim\adddot +founder|perustaja|perustaja +founders|perustajat|perustajat +continuator|jatkaja|jatkaja +continuators|jatkajat|jatkajat +collaborator|avustaja|avustaja +collaborators|avustajat|avustajat +translator|k\"a\"ant\"anyt|k\"a\"ant\adddot +translators|k\"a\"ant\"anyt|k\"a\"ant\adddot +commentator|kommentaarin kirjoittanut|kommentaarin kirjoittanut +commentators|kommentaarin kirjoittaneet|kommentaarin kirjoittaneet +annotator|selityksin varustanut|selityksin varustanut +annotators|selityksin varustaneet|selityksin varustaneet +commentary|kommentaari|kommentaari +annotations|selitykset|selitykset +introduction|johdanto|johdanto +foreword|esipuhe|esipuhe +afterword|j\"alkisanat|j\"alkisanat +organizer|toimittanut|toim\adddot +organizers|toimittaneet|toim\adddot +byorganizer|toimittanut|toim\adddot +byauthor|kirjoittanut|kirj\adddot +byeditor|toimittanut|toim\adddot +bycompiler|koontanut|koontanut +byredactor|toimittanut|toim\adddot +byreviser|toimittanut|toim\adddot +byreviewer|toimittanut|toim\adddot +byfounder|perustanut|perustanut +bycontinuator|jatkanut|jatkanut +bycollaborator|yhteisty\"oss\"a|yhteisty\"oss\"a +bytranslator|\lbx@lfromlang k\"a\"ant\"anyt|\lbx@sfromlang k\"a\"ant\adddot +bycommentator|kommentaarin kirjoittanut|kommentaarin kirjoittanut +byannotator|selityksin varustanut|selityksin varustanut +withcommentator|kommentaarin kirjoittanut|kommentaarin kirjoittanut +withannotator|selityksin varustanut|selityksin varustanut +withintroduction|johdannon kirjottanut|johdannon kirjottanut +withforeword|esipuheen kirjoittanut|esipuheen kirjoittanut +withafterword|j\"alkisanat kirjoittanut|j\"alkisanat kirjoittanut +and|ja|ja +andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +andmore|jne\adddot|jne\adddot +volume|volyymi|vol\adddot +volumes|volyymit|vol\adddot +involumes|| +jourvol|volyymi|vol\adddot +jourser|sarja|sarja +book|kirja|kirja +part|osa|osa +issue|numero|numero +newseries|uusi sarja|uusi sarja +oldseries|vanha sarja|vanha sarja +edition|painos|painos +reprint|j\"alkipainos|j\"alkipainos +reprintof|julkaistu aiemmin nimell\"a|julkaistu aiemmin nimell\"a +reprintas|julkaistu uudelleen nimell\"a|julkaistu uudelleen nimell\"a +reprintfrom|julkaistu aiemmin nimell\"a|julkaistu aiemmin nimell\"a +translationof|k\"a\"ann\"os teoksesta|k\"a\"ann\"os teoksesta +translationas|k\"a\"annetty nimell\"a|k\"a\"annetty nimell\"a +translationfrom|k\"a\"annetty kielest\"a|k\"a\"annetty kielest\"a +reviewof|arvostelu teoksesta|arvostelu teoksesta +origpubas|julkaistu ensi kerran nimell\"a|julkaistu ensi kerran nimell\"a +origpubin|julkaistu ensi kerran vuonna|julkaistu ensi kerran vuonna +astitle|nimell\"a|nimell\"a +bypublisher|julkaissut|julkaissut +page|sivu|s\adddot +pages|sivut|s\adddot +column|palsta|palsta +columns|palstat|palstat +line|rivi|rivi +lines|rivit|rivit +nodate|ei julkaisup\"aiv\"a\"a|ei julkaisup\"aiv\"a\"a +verse|s\"ae|s\"ae +verses|s\"akeet|s\"akeet +section|kohta|kohta +sections|kohdat|kohdat +paragraph|kappale|kappale +paragraphs|kappaleet|kappaleet +pagetotal|sivu|s\adddot +pagetotals|sivut|s\adddot +columntotal|palsta|palsta +columntotals|palstat|palstat +linetotal|rivi|rivi +linetotals|rivit|rivit +versetotal|s\"ae|s\"ae +versetotals|s\"akeet|s\"akeet +sectiontotal|kohta|kohta +sectiontotals|kohdat|kohdat +paragraphtotal|kappale|kappale +paragraphtotals|kappaleet|kappaleet +in|teoksessa|teoksessa +inseries|sarjassa|sarjassa +ofseries|sarjassa|sarjassa +number|numero|nro +chapter|luku|luku +bathesis|tutkielma|tutkielma +mathesis|tutkielma|tutkielma +phdthesis|tohtorinv\"ait\"oskirja|tohtorinv\"ait\"oskirja +candthesis|kanditaatintutkielma|kanditaatintutkielma +resreport|tutkimusraportti|tutkimusraportti +techreport|tekninen raportti|tekninen raportti +software|ohjelmisto|ohjelmisto +datacd|data-CD|data-CD +audiocd|\"a\"ani-CD|\"a\"ani-CD +version|versio|versio +url|url|url +urlfrom|saatavilla osoitteesta|saatavilla osoitteesta +urlseen|viitattu|viitattu +inpreparation|valmisteilla|valmisteilla +submitted|l\"ahetetty|l\"ahetetty +forthcoming|hyv\"aksytty julkaistavaksi|hyv\"aksytty julkaistavaksi +inpress|painossa|painossa +prepublished|esijulkaistu|esijulkaistu +citedas|jatkossa|jatkossa +thiscite|sama|sama +seenote|katso viite|katso viite +quotedin|lainattu teoksessa|lainattu teoksessa +idem|idem|id\adddot +idemsf|idem|id\adddot +idemsm|idem|id\adddot +idemsn|idem|id\adddot +idempf|idem|id\adddot +idempm|idem|id\adddot +idempn|idem|id\adddot +idempp|idem|id\adddot +ibidem|ibidem|ibid\adddot +opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot +loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot +confer|cf\adddot|cf\adddot +sequens|sq\adddot|sq\adddot +sequentes|sqq\adddot|sqq\adddot +passim|passim|pass\adddot +see|katso|ks\adddot +seealso|katso my\"os|katso my\"os +backrefpage|katso sivu|ks\adddotspace s\adddot +backrefpages|katso sivut|ks\adddotspace s\adddot +january|tammikuuta|tammikuuta +february|helmikuuta|helmikuuta +march|maaliskuuta|maaliskuuta +april|huhtikuuta|huhtikuuta +may|toukokuuta|toukokuuta +june|kes\"akuuta|kes\"akuuta +july|hein\"akuuta|hein\"akuuta +august|elokuuta|elokuuta +september|syyskuuta|syyskuuta +october|lokakuuta|lokakuuta +november|marraskuuta|marraskuuta +december|joulukuuta|joulukuuta +basicjanuary|tammikuu|tammikuu +basicfebruary|helmikuu|helmikuu +basicmarch|maaliskuu|maaliskuu +basicapril|huhtikuu|huhtikuu +basicmay|toukokuu|toukokuu +basicjune|kes\"akuu|kes\"akuu +basicjuly|hein\"akuu|hein\"akuu +basicaugust|elokuu|elokuu +basicseptember|syyskuu|syyskuu +basicoctober|lokakuu|lokakuu +basicnovember|marraskuu|marraskuu +basicdecember|joulukuu|joulukuu +langamerican|amerikanenglanti|amerikanenglanti +langbrazilian|brasilianportugali|brasilianportugali +langbulgarian|bulgaria|bulgaria +langcatalan|katalonia|katalonia +langcroatian|kroatia|kroatia +langdanish|tanska|tanska +langdutch|hollanti|hollanti +langenglish|englanti|englanti +langestonian|viro|viro +langfinnish|suomi|suomi +langfrench|ranska|ranska +langgalician|galicia|galicia +langgerman|saksa|saksa +langgreek|kreikka|kreikka +langhungarian|unkari|unkari +langitalian|italia|italia +langlatin|latina|latina +langlatvian|latvia|latvia +langnorwegian|norja|norja +langpolish|puola|puola +langportuguese|portugali|portugali +langrussian|ven\"aj\"a|ven\"aj\"a +langslovak|slovakia|slovakia +langslovene|slovenia|slovenia +langspanish|espanja|espanja +langswedish|ruotsi|ruotsi +fromamerican|englannin kielest\"a|englannin kielest\"a +frombrazilian|portugalin kielest\"a|portugalin kielest\"a +frombulgarian|bulgarian kielest\"a|bulgarian kielest\"a +fromcatalan|katalonian kielest\"a|katalonian kielest\"a +fromcroatian|kroatian kielest\"a|kroatian kielest\"a +fromdanish|tanskan kielest\"a|tanskan kielest\"a +fromdutch|hollannin kielest\"a|hollannin kielest\"a +fromenglish|englannin kielest\"a|englannin kielest\"a +fromestonian|viron kielest\"a|viron kielest\"a +fromfinnish|suomen kielest\"a|suomen kielest\"a +fromfrench|ranskan kielest\"a|ranskan kielest\"a +fromgalician|galician kielest\"a|galician kielest\"a +fromgerman|saksan kielest\"a|saksan kielest\"a +fromgreek|kreikan kielest\"a|kreikan kielest\"a +fromhungarian|unkarin kielest\"a|unkarin kielest\"a +fromitalian|italian kielest\"a|italian kielest\"a +fromlatin|latinan kielest\"a|latinan kielest\"a +fromlatvian|latvian kielest\"a|latvian kielest\"a +fromnorwegian|norjan kielest\"a|norjan kielest\"a +frompolish|puolan kielest\"a|puolan kielest\"a +fromportuguese|portugalin kielest\"a|portugalin kielest\"a +fromrussian|ven\"aj\"an kielest\"a|ven\"aj\"an kielest\"a +fromslovak|slovakian kielest\"a|slovakian kielest\"a +fromslovene|slovenian kielest\"a|slovenian kielest\"a +fromspanish|espanjan kielest\"a|espanjan kielest\"a +fromswedish|ruotsin kielest\"a|ruotsin kielest\"a +countryde|Saksa|DE +countryeu|Euroopan Unioni|EU +countryep|Euroopan Unioni|EP +countryfr|Ranska|FR +countryuk|Iso-Britannia|GB +countryus|Yhdysvallat|US +patent|patentti|pat\adddot +patentde|saksalainen patentti|saksalainen pat\adddot +patenteu|Euroopan Unionin patentti|Euroopan Unionin pat\adddot +patentfr|ranskalainen patentti|ranskalainen pat\adddot +patentuk|isobritannialainen patentti|isobritannialainen pat\adddot +patentus|yhdysvaltalainen patentti|yhdysvaltalainen pat\adddot +patreq|patenttihakemus|pat\adddot\ hak\adddot +patreqde|saksalainen patenttihakemus|saksalainen pat\adddot\ hak\adddot +patreqeu|Euroopan Unionin patenttihakemus|Euroopan Unionin pat\adddot\ hak\adddot +patreqfr|ranskalainen patenttihakemus|ranskalainen pat\adddot\ hak\adddot +patrequk|isobritannialainen patenttihakemus|isobritannialainen pat\adddot\ hak\adddot +patrequs|yhdysvaltalainen patenttihakemus|yhdysvaltalainen pat\adddot\ hak\adddot +file|tiedosto|tiedosto +library|kirjasto|kirjasto +abstract|tiivistelm\"a|tiivistelm\"a +annotation|selitykset|selitykset +commonera|j\"alkeen ajanlaskun alun|jaa\adddot +beforecommonera|ennen ajanlaskun alkua|eaa\adddot +annodomini|j\"alkeen Kristuksen syntym\"an|jKr\adddot +beforechrist|ennen Kristuksen syntym\"a\"a|eKr\adddot +circa|noin|n\adddot +spring|kev\"at|kev\"at +summer|kes\"a|kes\"a +autumn|syksy|syksy +winter|talvi|talvi +am|ap\adddot|ip\adddot +pm|ip\adddot|ip\adddot diff --git a/citeproc/biblatex-localization/french.lbx.strings b/citeproc/biblatex-localization/french.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/french.lbx.strings @@ -0,0 +1,245 @@ +bibliography|Bibliographie|Bibliographie +references|R\'ef\'erences|R\'ef\'erences +shorthands|Liste des abr\'eviations|Abr\'eviations +editor|\'editeur|\'ed\adddot +editors|\'editeurs|\'ed\adddot +compiler|compilateur|comp\adddot +compilers|compilateurs|comp\adddot +redactor|r\'edacteur|r\'ed\adddot +redactors|r\'edacteurs|r\'ed\adddot +reviser|r\'eviseur|r\'ev\adddot +revisers|r\'eviseurs|r\'ev\adddot +founder|fondateur|fond\adddot +founders|fondateurs|fond\adddot +continuator|continuateur|cont\adddot +continuators|continuateurs|cont\adddot +collaborator|collaborateur|coll\adddot +collaborators|collaborateurs|coll\adddot +translator|traducteur|trad\adddot +translators|traducteurs|trad\adddot +commentator|commentateur|comm\adddot +commentators|commentateurs|comm\adddot +annotator|annotateur|annot\adddot +annotators|annotateurs|annot\adddot +commentary|commentaires|comment\adddot +annotations|annotations|annot\adddot +introduction|introduction|introd\adddot +foreword|pr\'eface|pr\'ef\adddot +afterword|postface|postf\adddot +editortr|\'editeur et traducteur|\'ed\adddotspace et trad\adddot +editorstr|\'editeurs et traducteurs|\'ed\adddotspace et trad\adddot +organizer|organisateur|org\adddot +organizers|organisateurs|org\adddot +byorganizer|organis\'e par|org\adddotspace par +byauthor|par|par +byeditor|sous la direction \smartof|sous la dir\adddotspace\smartof +bycompiler|compil\'e par|comp\adddotspace par +byredactor|r\'edig\'e par|r\'ed\adddotspace par +byreviser|r\'evis\'e par|r\'ev\adddotspace par +byreviewer|examin\'e par|ex\adddotspace par +byfounder|d\'ecouvert par|d\'ecouv\adddotspace par +bycontinuator|continu\'e par|cont\adddotspace par +bytranslator|traduit \lbx@lfromlang\ par|trad\adddotspace \lbx@sfromlang\ par +bycommentator|comment\'e par|comm\adddotspace par +byannotator|annot\'e par|annot\adddotspace par +withcommentator|avec des commentaires \smartof|avec des comment\adddotspace\smartof +withannotator|avec des annotations \smartof|avec des annot\adddotspace\smartof +withintroduction|avec une introduction \smartof|avec une introd\adddotspace\smartof +withforeword|avec une pr\'eface \smartof|avec une pr\'ef\adddotspace\smartof +withafterword|avec une postface \smartof|avec une postf\adddotspace\smartof +and|et|et +andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +volume|tome|t\adddot +volumes|tomes|t\adddot +involumes|en|en +jourvol|tome|t\adddot +jourser|s\'erie|s\'er\adddot +book|livre|livre +part|partie|partie +issue|\'edition|\'ed\adddot +newseries|nouvelle s\'erie|nouv\adddotspace s\'er\adddot +oldseries|ancienne s\'erie|anc\adddotspace s\'er\adddot +edition|\'edition|\'ed\adddot +reprint|r\'eimpression|r\'eimpr\adddot +reprintof|r\'eimpression de|r\'eimpr\adddotspace de +reprintas|r\'eimpression sous le titre|r\'eimpr\adddotspace sous le titre +reprintfrom|r\'eimpression \`a partir \smartof|r\'eimpr\adddotspace \`a part\adddotspace\smartof +translationof|traduction de|trad\adddotspace de +translationas|traduit sous le titre|trad\adddotspace sous le titre +translationfrom|traduit de|trad\adddotspace de +reviewof|critique de|crit.\adddotspace de +origpubas|publi\'e \`a l'origine sous le titre|pub\adddotspace \`a l'orig\adddotspace sous le titre +origpubin|publi\'e \`a l'origine en|pub\adddotspace \`a l'orig\adddotspace en +astitle|sous le titre|sous le titre +bypublisher|par|par +page|page|p\adddot +pages|pages|p\adddot +column|colonne|col\adddot +columns|colonnes|col\adddot +line|ligne|l\adddot +lines|lignes|l\adddot +verse|vers|v\adddot +verses|vers|v\adddot +section|section|sect\adddot +sections|sections|sect\adddot +paragraph|paragraphe|\S +paragraphs|paragraphes|\S +pagetotal|page|p\adddot +pagetotals|pages|p\adddot +columntotal|colonne|col\adddot +columntotals|colonnes|col\adddot +linetotal|ligne|l\adddot +linetotals|lignes|l\adddot +versetotal|vers|v\adddot +versetotals|vers|v\adddot +sectiontotal|section|sect\adddot +sectiontotals|sections|sect\adddot +paragraphtotal|paragraphe|\S +paragraphtotals|paragraphes|\S +in|in|in +inseries|in|in +ofseries|de|de +number|num\'ero|n\textsuperscript{o +chapter|chapitre|chap\adddot +bathesis|m\'emoire de bachelor|m\'em\adddotspace de bach\adddot +mathesis|m\'emoire de master|m\'em\adddotspace de mast\adddot +phdthesis|th\`ese de doctorat|th\`ese de doct\adddot +candthesis|th\`ese de candidature|th\`ese de cand\adddot +resreport|rapport scientifique|rapp\adddotspace scient\adddot +techreport|rapport technique|rapp\adddotspace tech\adddot +software|logiciel|logiciel +datacd|c\'ed\'erom|c\'ed\'erom +audiocd|disque compact audio|CD +version|version|version +url|adresse|adresse +urlfrom|disponible \`a l'adresse|disp\adddotspace \`a l'adr\adddot +urlseen|visit\'e le|visit\'e le +inpreparation|en pr\'eparation|en pr\'ep\adddot +submitted|soumis|soumis +inpress|sous presse|sous presse +prepublished|pr\'epubli\'e|pr\'epubl\adddot +citedas|d\'esign\'e ci-apr\`es par|ci-apr\`es +thiscite|sp\'ecialement|sp\'ec\adddot +seenote|voir note|cf\adddotspace note +quotedin|cit\'e dans|cit\'e dans +idem|idem|idem +idemsm|idem|idem +idemsf|eadem|eadem +idemsn|idem|idem +idempm|eidem|eidem +idempf|eaedem|eaedem +idempn|eadem|eadem +idempp|eidem|eidem +ibidem|ibidem|ibid\adddot +opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot +loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot +confer|cf\adddot|cf\adddot +sequens|sq\adddot|sq\adddot +sequentes|sqq\adddot|sqq\adddot +passim|passim|pass\adddot +see|cf\adddot|cf\adddot +seealso|cf\adddotspace aussi|cf\adddotspace aussi +backrefpage|cf\adddotspace page|cf\adddotspace p\adddot +backrefpages|cf\adddotspace pages|cf\adddotspace p\adddot +january|janvier|jan\adddot +february|f\'evrier|f\'ev\adddot +march|mars|mars +april|avril|avr\adddot +may|mai|mai +june|juin|juin +july|juillet|juill\adddot +august|ao\^ut|ao\^ut +september|septembre|sept\adddot +october|octobre|oct\adddot +november|novembre|nov\adddot +december|d\'ecembre|d\'ec\adddot +langamerican|am\'ericain|am\'ericain +langbrazilian|br\'esilien|br\'esilien +langbulgarian|bulgare|bulgare +langcatalan|catalan|catalan +langcroatian|croate|croate +langczech|tch\`eque|tch\`eque +langdanish|danois|danois +langdutch|n\'eerlandais|n\'eerlandais +langenglish|anglais|anglais +langestonian|estonien|estonien +langfinnish|finnois|finnois +langgalician|galicien|galicien +langgerman|allemand|allemand +langgreek|grec|grec +langhungarian|hongrois|hongrois +langitalian|italien|italien +langjapanese|japonais|japonais +langlatin|latin|latin +langlatvian|letton|letton +langnorwegian|norv\'egien|norv\'egien +langpolish|polonais|polonais +langportuguese|portugais|portugais +langrussian|russe|russe +langserbian|serbe|serbe +langslovak|slovaque|slovaque +langslovene|slov\`ene|slov\`ene +langspanish|espagnol|espagnol +langswedish|su\'edois|su\'edois +langukrainian|ukrainien|ukrainien +fromamerican|de l'am\'ericain|de l'am\'ericain +frombrazilian|du br\'esilien|du br\'esilien +frombulgarian|du bulgare|du bulgare +fromcatalan|du catalan|du catalan +fromcroatian|du croate|du croate +fromczech|du tch\`eque|du tch\`eque +fromdanish|du danois|du danois +fromdutch|du n\'eerlandais|du n\'eerlandais +fromenglish|de l'anglais|de l'anglais +fromestonian|de l'estonien|de l'estonien +fromfinnish|du finnois|du finnois +fromgalician|du galicien|du galicien +fromgerman|de l'allemand|de l'allemand +fromgreek|du grec|du grec +fromhungarian|du hongrois|du hongrois +fromitalian|de l'italien|de l'italien +fromjapanese|du japonais|du japonais +fromlatin|du latin|du latin +fromlatvian|du letton|du letton +fromnorwegian|du norv\'egien|du norv\'egien +frompolish|du polonais|du polonais +fromportuguese|du portugais|du portugais +fromrussian|du russe|du russe +fromserbian|du serbe|du serbe +fromslovak|du slovaque|du slovaque +fromslovene|du slov\`ene|du slov\`ene +fromspanish|de l'espagnol|de l'espagnol +fromswedish|du su\'edois|du su\'edois +fromukrainian|de l'ukrainien|de l'ukrainien +countryde|Allemagne|DE +countryeu|Union europ\'eenne|EU +countryep|Union europ\'eenne|EP +countryfr|France|FR +countryuk|Royaume-Uni|GB +countryus|\'Etats-Unis|US +patent|brevet|brev\adddot +patentde|brevet allemand|brev\adddotspace allem\adddot +patenteu|brevet europ\'een|brev\adddotspace europ\adddot +patentuk|brevet britannique|brev\adddotspace brit\adddot +patentus|brevet am\'ericain|brev\adddotspace am\'er\adddot +patreq|demande de brevet|demande de brev\adddot +patreqde|demande de brevet allemand|demande de brev\adddotspace allem\adddot +patreqeu|demande de brevet europ\'een|demande de brev\adddotspace europ\adddot +patrequk|demande de brevet britannique|demande de brev\adddotspace brit\adddot +patrequs|demande de brevet am\'ericain|demande de brev\adddotspace am\'er\adddot +file|fichier|fichier +library|biblioth\`eque|biblioth\adddot +abstract|r\'esum\'e|r\'es\adddot +annotation|annotations|annotations +commonera|de l'\`ere commune|EC +beforecommonera|avant l'\`ere commune|AEC +annodomini|apr\`es J\'esus-Christ|apr\adddotspace J\adddot-C\adddot +beforechrist|avant J\'esus-Christ|av\adddotspace J\adddot-C\adddot +circa|vers|vers +spring|printemps|printemps +summer|\'et\'e|\'et\'e +autumn|automne|automne +winter|hiver|hiver +am|AM|AM +pm|PM|PM diff --git a/citeproc/biblatex-localization/galician.lbx.strings b/citeproc/biblatex-localization/galician.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/galician.lbx.strings @@ -0,0 +1,28 @@ +bibliography|Bibliograf\'ia|Bibliograf\'ia +references|Referencias|Referencias +shorthands|Lista de abreviaturas|Abreviaturas +editor|editor|ed\adddot +editors|editores|eds\adddot +compiler|compilador|comp\adddot +compilers|compiladores|comp\adddot +redactor|redactor|red\adddot +redactors|redactores|red\adddot +reviser|revisor|rev\adddot +revisers|revisores|revs\adddot +founder|fundador|fund\adddot +founders|fundadores|fund\adddot +continuator|continuador|cont\adddot +continuators|continuadores|cont\adddot +collaborator|colaborador|col\adddot +collaborators|colaboradores|cols\adddot +translator|tradutor|trad\adddot +translators|tradutores|trads\adddot +commentator|comentador|coment\adddot +commentators|comentadores|coments\adddot +annotator|anotador|anot\adddot +annotators|anotadores|anots\adddot +commentary|comentario|coment\adddot +annotations|notas|notas +introduction|introduci\'on|introd\adddot +foreword|prefacio|pref\adddot +afterword|posfacio|posf\adddot diff --git a/citeproc/biblatex-localization/german.lbx.strings b/citeproc/biblatex-localization/german.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/german.lbx.strings @@ -0,0 +1,28 @@ +bibliography|Literaturverzeichnis|Literatur +references|Literaturverzeichnis|Literatur +shorthands|Sigelverzeichnis|Sigel +editor|Herausgeber|Hrsg\adddot +editors|Herausgeber|Hrsg\adddot +compiler|Kompilator|Komp\adddot +compilers|Kompilatoren|Komp\adddot +redactor|Bearbeiter|Bearb\adddot +redactors|Bearbeiter|Bearb\adddot +reviser|\"Uberarbeiter|\"Uberarb\adddot +revisers|\"Uberarbeiter|\"Uberarb\adddot +founder|Begr\"under|Begr\adddot +founders|Begr\"under|Begr\adddot +continuator|Fortf\"uhrer|Fortf\adddot +continuators|Fortf\"uhrer|Fortf\adddot +collaborator|Mitarbeiter|Mitarb\adddot +collaborators|Mitarbeiter|Mitarb\adddot +translator|\"Ubersetzer|\"Ubers\adddot +translators|\"Ubersetzer|\"Ubers\adddot +commentator|Kommentator|Komm\adddot +commentators|Kommentatoren|Komm\adddot +annotator|Kommentator|Komm\adddot +annotators|Kommentatoren|Komm\adddot +commentary|Kommentar|Komm\adddot +annotations|Erl\"auterungen|Erl\"aut\adddot +introduction|Einleitung|Einl\adddot +foreword|Vorwort|Vorw\adddot +afterword|Nachwort|Nachw\adddot diff --git a/citeproc/biblatex-localization/greek.lbx.strings b/citeproc/biblatex-localization/greek.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/greek.lbx.strings @@ -0,0 +1,9 @@ +bibliography|Βιβλιογραφία|Βιβλιογραφία +references|Αναφορές|Αναφορές +shorthands|Κατάλογος συντμήσεων|Συντμήσεις +editor|επιμελητής|επιμελητής +editors|επιμελητές|επιμελητές +compiler|συντάκτης|συντάκτης +compilers|συντάκτες|συντάκτες +redactor|συντάκτης|συντάκτης +redactors|συντάκτες|συντάκτες diff --git a/citeproc/biblatex-localization/hungarian.lbx.strings b/citeproc/biblatex-localization/hungarian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/hungarian.lbx.strings diff --git a/citeproc/biblatex-localization/icelandic.lbx.strings b/citeproc/biblatex-localization/icelandic.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/icelandic.lbx.strings @@ -0,0 +1,7 @@ +bibliography|Heimildaskr\'a|Heimildaskr\'a +references|Heimildir|Heimildir +shorthands|Listi yfir skammstafanir|Skammstafanir +editor|ristj\'ori|ritstj\adddot +editors|ritstj\'orar|ritstj\adddot +compiler|samantekt|samantekt +compilers|samantekt|samantekt diff --git a/citeproc/biblatex-localization/italian.lbx.strings b/citeproc/biblatex-localization/italian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/italian.lbx.strings @@ -0,0 +1,9 @@ +bibliography|Bibliografia|Bibliografia +references|Riferimenti bibliografici|Riferimenti bibliografici +shorthands|Elenco delle sigle|Sigle +editor|curatore|cur\adddot +editors|curatori|cur\adddot +compiler|compilatore|comp\adddot +compilers|compilatori|comp\adddot +redactor|redattore|red\adddot +redactors|redattori|red\adddot diff --git a/citeproc/biblatex-localization/latvian.lbx.strings b/citeproc/biblatex-localization/latvian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/latvian.lbx.strings @@ -0,0 +1,75 @@ +redactor|redaktors|redakt\adddot +redactors|redaktori|radakt\adddot +reviser|revidents|revid\adddot +revisers|revidenti|revid\adddot +introduction|ievads|ievads +byeditor|izdevis|izdevis +bytranslator|tulkojis|tulk\adddot +withintroduction|ar ievadu no|ar ievadu no +byeditortr|izdevis un tulkojis|izdev\adddotspace un tulk\adddot +and|un|un +andothers|un citi|u\adddotspace c\adddot +jourvol|izdevums|izdev\adddot +issue|izdevums|izdev\adddot +edition|izdevums|izdev\adddot +translationof|tulkojums no|tulk\adddotspace no +translationfrom|tulkots no|tulk\adddotspace no +reviewof|recenzija|recenz\adddot +bypublisher|no|no +nodate|bez datuma|bez dat\adddot +page|lappuse|lpp\adddot +pages|lappuses|lpp\adddot +column|sleja|sleja +columns|slejas|slejas +line|rinda|rinda +lines|rindas|rindas +verse|pants|pants +verses|panti|panti +paragraph|rindkopa|rindk\adddot +paragraphs|rindkopas|rindk\adddot +pagetotal|lappuse|lpp\adddot +pagetotals|lappuses|lpp\adddot +columntotal|sleja|sleja +columntotals|slejas|slejas +linetotal|rinda|rinda +linetotals|rindas|rindas +versetotal|pants|pants +versetotals|panti|panti +paragraphtotal|rindkopa|rindk\adddot +paragraphtotals|rindkopas|rindk\adddot +in|| +number|numurs|nr\adddot +datacd|datu CD|datu CD +audiocd|audio CD|audio CD +version|versija|versija +url|pieejams|pieejams +urlfrom|pieejams no|pieejams no +inpreparation|tiek gatavots|tiek gatavots +submitted|iesniegts|iesniegts +march|marts|marts +may|maijs|maijs +august|augusts|aug\adddot +september|septembris|sept\adddot +october|oktobris|okt\adddot +november|novembris|nov\adddot +december|decembris|dec\adddot +langfinnish|somu|somu +langrussian|krievu|krievu +langswedish|zviedru|zviedru +fromfinnish|no somu|no somu +fromrussian|no krievu|no krievu +fromswedish|no zviedru|no zviedru +countryep|Eiropas Parlaments|EP +countryfr|Francija|FR +patent|patents|patents +patenteu|Eiropas patents|Eiropas pat\adddot +patentus|ASV patents|ASV pat\adddot +file|fails|fails +circa|ap|ap +spring|pavasaris|pav\adddot +summer|vasara|vas\adddot +autumn|rudens|rud\adddot +winter|ziema|ziema +am|AM|AM +pm|PM|PM +dateyear|gada|g\adddot diff --git a/citeproc/biblatex-localization/lithuanian.lbx.strings b/citeproc/biblatex-localization/lithuanian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/lithuanian.lbx.strings @@ -0,0 +1,31 @@ +bibliography|Bibliografija|Bibliografija +references|Literatūros sąrašas|Literatūra +shorthands|Santrumpų sąrašas|Santrumpos +editor|sudarytojas|sud\adddot +editors|sudarytojai|sud\adddot +compiler|parengėjas|pareng\adddot +compilers|parengėjai|pareng\adddot +redactor|redaktorius|red\adddot +redactors|redaktoriai|red\adddot +reviser|korektorius|kor\adddot +revisers|korektoriai|kor\adddot +founder|pradininkas|prad\adddot +founders|pradininkai|prad\adddot +continuator|tęsėjas|tęs\adddot +continuators|tęsėjai|tęs\adddot +collaborator|bendradarbis|bendr\adddot +collaborators|bendradarbiai|bendr\adddot +translator|vertėjas|vert\adddot +translators|vertėjai|vert\adddot +commentator|komentarų autorius|koment\adddotspace aut\adddot +commentators|komentarų autoriai|koment\adddotspace aut\adddot +annotator|paaiškinimų autorius|paaišk\adddotspace aut\adddot +annotators|paaiškinimų autoriai|paaišk\adddotspace aut\adddot +commentary|komentarai|koment\adddot +annotations|paaiškinimai|paaišk\adddot +introduction|įvadas|įv\adddot +foreword|pratarmė|prat\adddot +afterword|pabaigos žodis|pab\adddotspace žodis +organizer|organizatorius|org\adddot +organizers|organizatoriai|org\adddot +byorganizer|organizavo|org\adddot diff --git a/citeproc/biblatex-localization/magyar.lbx.strings b/citeproc/biblatex-localization/magyar.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/magyar.lbx.strings @@ -0,0 +1,29 @@ +bibliography|Irodalomjegyz\'ek|Irodalom +references|Hivatkoz\'asok|Hivatkoz\'asok +shorthands|R\"ovid\'it\'esek jegyz\'eke|R\"ovid\'it\'esek +compiler|\"ossze\'all\'it\'o|\"ossze\'all\adddot +compilers|\"ossze\'all\'it\'ok|\"ossze\'all\adddot +reviser|korrektor|korr\adddot +revisers|korrektorok|korr\adddot +founder|alap\'it\'o|alap\adddot +founders|alap\'it\'ok|alap\adddot +%continuator|| +%continuators|| +translator|ford\'it\'o|ford\adddot +translators|ford\'it\'ok|ford\adddot +commentator|komment\'ator|komm\adddot +commentators|komment\'atorok|komm\adddot +annotator|jegyzetek \'ir\'oja|jegyz\adddot +annotators|jegyzetek \'ir\'oi|jegyz\adddot +commentary|komment\'ar|komm\adddot +annotations|jegyzetek|jegyz\adddot +introduction|bevezet\'es|bev\adddot +afterword|ut\'osz\'o|ut\'osz\'o +byorganizer|szervezte|szerv\adddot +byauthor|\'irta|\'irta +byeditor|szerkesztette|szerk\adddot +bycompiler|\"ossze\'all\'itotta|\"ossze\'all\adddot +byredactor|sajt\'o al\'a rendezte|kiad\adddot +byreviser|jav\'itotta|jav\adddot +byreviewer|b\'ir\'alta|b\'ir\adddot +byfounder|alap\'itotta|alap\adddot diff --git a/citeproc/biblatex-localization/naustrian.lbx.strings b/citeproc/biblatex-localization/naustrian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/naustrian.lbx.strings @@ -0,0 +1,2 @@ +citedas|im Folgenden zitiert als|im Folgenden zit\adddotspace als +january|J\"anner|J\"an\adddot diff --git a/citeproc/biblatex-localization/newzealand.lbx.strings b/citeproc/biblatex-localization/newzealand.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/newzealand.lbx.strings diff --git a/citeproc/biblatex-localization/ngerman.lbx.strings b/citeproc/biblatex-localization/ngerman.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/ngerman.lbx.strings @@ -0,0 +1,1 @@ +citedas|im Folgenden zitiert als|im Folgenden zit\adddotspace als diff --git a/citeproc/biblatex-localization/norsk.lbx.strings b/citeproc/biblatex-localization/norsk.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/norsk.lbx.strings @@ -0,0 +1,98 @@ +bibliography|Bibliografi|Bibliografi +references|Referanser|Referanser +shorthands|Forkortelser|Forkortelser +compiler|kompilator|komp\adddot +compilers|kompilatorer|komp\adddot +redactor|bearbeidelse|bearb\adddot +redactors|bearbeidelse|bearb\adddot +reviser|revisjon|rev\adddot +revisers|revisjon|rev\adddot +founder|grunnlegger|grunnl\adddot +founders|grunnleggere|grunnl\adddot +collaborator|samarbeid|samarb\adddot +collaborators|samarbeid|samarb\adddot +translator|oversetter|overs\adddot +translators|oversettere|overs\adddot +commentator|kommentarer|komm\adddot +commentators|kommentarer|komm\adddot +annotator|forklaringer|forkl\adddot +annotators|forklaringer|forkl\adddot +commentary|kommentarer|komm\adddot +annotations|forklaringer|forkl\adddot +introduction|innledning|innl\adddot +foreword|forord|forord +afterword|etterord|etterord +organizer|organisator|org\adddot +organizers|organisatorer|org\adddot +byorganizer|organisert av|org\adddotspace av +byauthor|av|av +byeditor|redigert av|red\adddotspace av +bycompiler|kompilert av|komp\adddotspace av +byredactor|bearbeidet av|bearb\adddotspace av +byreviser|revidert av|rev\adddotspace av +byreviewer|kritikk ved|krit\adddotspace ved +byfounder|grunnlagt av|grunnl\adddotspace av +bycollaborator|i samarbeid med|i samarb\adddotspace med +bytranslator|oversatt \lbx@lfromlang\ av|overs\adddot\ \lbx@sfromlang\ av +bycommentator|kommentert av|komm\adddot\ av +byannotator|forklart av|forkl\adddot\ av +withcommentator|med kommentarer av|med komm\adddot\ av +withannotator|med forklaringer av|med forkl\adddot\ av +withintroduction|med innledning av|med innl\adddot\ av +withforeword|med forord av|med forord av +withafterword|med etterord av|med etterord av +and|og|og +andothers|med flere|mfl\adddot +andmore|med mer|m.m\adddot +volume|bind|bd\adddot +volumes|bind|bd\adddot +involumes|i|i +jourser|serie|ser\adddot +book|bok|bok +part|del|del +issue|nummer|nr\adddot +newseries|ny serie|ny ser\adddot +oldseries|gammel serie|gl\adddotspace ser\adddot +edition|utgave|utg\adddot +reprint|opptrykk|opptr\adddot +reprintof|opptrykk av|opptr\adddotspace av +reprintas|trykt om som|tr\adddotspace om som +reprintfrom|opptrykk fra|opptr\adddotspace fra +translationof|oversettelse av|overs\adddotspace av +translationas|oversatt som|overs\adddotspace som +translationfrom|oversatt fra|overs\adddotspace fra +reviewof|kritikk av|krit\adddotspace av +origpubas|opprinnelig utgitt som|oppr\adddot\ utg\adddot\ som +origpubin|opprinnelig utgitt i|oppr\adddot\ utg\adddot\ i +astitle|som|som +bypublisher|av|av +nodate|udatert|udatert +page|side|s\adddot +pages|sider|s\adddot +column|spalte|sp\adddot +columns|spalter|sp\adddot +line|linje|l\adddot +lines|linjer|l\adddot +verse|vers|v\adddot +verses|vers|v\adddot +section|avsnitt|avsn\adddot +sections|avsnitt|avsn\adddot +paragraph|avsnitt|avsn\adddot +paragraphs|avsnitt|avsn\adddot +pagetotal|side|s\adddot +pagetotals|sider|s\adddot +columntotal|spalte|sp\adddot +columntotals|spalter|sp\adddot +linetotal|linje|l\adddot +linetotals|linjer|l\adddot +versetotal|vers|v\adddot +versetotals|vers|v\adddot +sectiontotal|avsnitt|avsn\adddot +sectiontotals|avsnitt|avsn\adddot +paragraphtotal|avsnitt|avsn\adddot +paragraphtotals|avsnitt|avsn\adddot +in|i|i +inseries|i|i +ofseries|av|av +number|nummer|nr\adddot +chapter|kapittel|kap\adddot diff --git a/citeproc/biblatex-localization/nswissgerman.lbx.strings b/citeproc/biblatex-localization/nswissgerman.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/nswissgerman.lbx.strings @@ -0,0 +1,2 @@ +citedas|im Folgenden zitiert als|im Folgenden zit\adddotspace als +countryuk|Grossbritannien|GB diff --git a/citeproc/biblatex-localization/nynorsk.lbx.strings b/citeproc/biblatex-localization/nynorsk.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/nynorsk.lbx.strings @@ -0,0 +1,28 @@ +references|Referansar|Referansar +shorthands|Forkortingar|Forkortingar +compilers|kompilatorar|komp\adddot +redactor|omarbeiding|omarb\adddot +redactors|omarbeiding|omarb\adddot +founder|grunnleggjar|grunnl\adddot +founders|grunnleggjarar|grunnl\adddot +translator|omsetjar|oms\adddot +translators|omsetjarar|oms\adddot +commentator|kommentarar|komm\adddot +commentators|kommentarar|komm\adddot +annotator|forklaringar|forkl\adddot +annotators|forklaringar|forkl\adddot +commentary|kommentarar|komm\adddot +annotations|forklaringar|forkl\adddot +introduction|innleiing|innl\adddot +organizers|organisatorar|org\adddot +byredactor|omarbeidd av|omarb\adddotspace av +withcommentator|med kommentarar av|med komm\adddot\ av +withannotator|med forklaringar av|med forkl\adddot\ av +withintroduction|med innleiing av|med innl\adddot\ av +andothers|med fleire|mfl\adddot +andmore|med meir|m.m\adddot +oldseries|gamal serie|gl\adddotspace ser\adddot +translationof|omsetjing av|oms\adddotspace av +translationas|omsett som|oms\adddotspace som +origpubas|opphavleg utgitt som|opph\adddot\ utg\adddot\ som +origpubin|opphavleg utgitt i|opph\adddot\ utg\adddot\ i diff --git a/citeproc/biblatex-localization/polish.lbx.strings b/citeproc/biblatex-localization/polish.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/polish.lbx.strings @@ -0,0 +1,100 @@ +bibliography|Bibliografia|Bibliografia +references|Bibliografia|Bibliografia +editor|redaktor|red\adddot +editors|redaktorzy|red\adddot +compiler|redaktor|red\adddot +compilers|redaktorzy|red\adddot +redactor|redaktor|red\adddot +redactors|redaktorzy|red\adddot +reviser|korektor|kor\adddot +revisers|korektorzy|kor\adddot +collaborator|uczestnik|ucz\adddot +collaborators|uczestnicy|ucz\adddot +translator|t\l umacz|t\l um\adddot +translators|t\l umacze|t\l um\adddot +commentator|komentator|kom\adddot +commentators|komentatorzy|kom\adddot +annotator|uwaga|uw\adddot +annotators|uwagi|uw\adddot +commentary|komentarz|kom\adddot +annotations|komentarze|kom\adddot +foreword|przedmowa|przedm\adddot +afterword|pos\l owie|pos\l \adddot +editortr|redaktor i t\l umacz|red\adddotspace i per\adddot +editorstr|redaktorzy i t\l umacze|red\adddotspace i per\adddot +editorco|redaktor i komentator|red\adddotspace i kom\adddot +translatorco|t\l umacz i komentator|t\l um\adddotspace i kom\adddot +translatorsco|t\l umacze i komentatorzy|t\l um\adddotspace i kom\adddot +organizer|organizator|org\adddot +organizers|organizatorzy|org\adddot +byorganizer|organizowane|org\adddot +byauthor|autorstwo|aut\adddot +byeditor|redagowa\l|red\adddot +byredactor|zredagowano|zred\adddot +byreviser|poprawione|popr\adddot +byreviewer|recenzja|rec\adddot +bytranslator|t\l umaczenie \lbx@lfromlang|t\l um\adddotspace \lbx@sfromlang +bycommentator|skomentowane przez|skom\adddot +byannotator|uwagi od|uw\adddot +withcommentator|komentarze|kom\adddot +withannotator|uwagi|uw\adddot +withforeword|przedmowa|przedm\adddot +withafterword|pos\l owie|pos\l \adddot +byeditoran|zredagowany i z uwagami|zredag\adddotspace i z uw\adddot +byeditoraf|zredagowany, z pos\l owiem|zred., z pos\l \adddot +byeditorcofo|zredagowany, komentarze i przedmowa|zred., kom\adddotspace i przedm\adddot +byeditorcoaf|zredagowany, komentarze i pos\l owie|zred., kom\adddotspace i pos\l \adddot +byeditoranfo|zredagowany, uwagi i przedmowa|zred., uw\adddotspace i przedm\adddot +byeditoranaf|zredagowany, uwagi i pos\l owie|zred., uw\adddotspace i pos\l \adddot +and|i|i +andothers|i inni|i in\adddot +andmore|i inni|i in\adddot +volume|tom|t\adddot +volumes|tomy|t\adddot +involumes|w|w +jourvol|tom|t\adddot +jourser|seria|ser\adddot +issue|wydanie|wyd\adddot +newseries|nowa seria|now\adddotspace ser\adddot +oldseries|stara seria|star\adddotspace ser\adddot +edition|wydruk|wyd\adddot +reprint|przedruk|przedr\adddot +reprintof|przedruk|przedr\adddot +reprintas|przedrukowano jako|przedr\adddotspace jako +reprintfrom|przedrukowano z|przedr\adddotspace z +translationof|t\l umaczenie|t\l um\adddot +translationas|t\l umaczenie jako|t\l um\adddotspace jako +translationfrom|t\l umaczenie z|t\l um\adddotspace z +reviewof|recenzja na\addcolon|rec\adddotspace na\addcolon +origpubin|pierwodruk wydano w|pierw\adddotspace wyd\adddotspace w +astitle|pod tytu\l em|pod tyt\adddot +page|strona|s\adddot +pages|strony|s\adddot +column|kolumna|kol\adddot +columns|kolumny|kol\adddot +line|linijka|l\adddot +lines|linijki|l\adddot +nodate|bez daty|b\adddot d\adddot +verse|werset|wer\adddot +verses|wersety|wer\adddot +section|paragraf|par\adddot +sections|paragrafy|par\adddot +paragraph|akapit|akap\adddot +paragraphs|akapity|akap\adddot +pagetotal|strona|s\adddot +pagetotals|strony|s\adddot +columntotal|kolumna|kol\adddot +columntotals|kolumny|kol\adddot +linetotal|wers|wer\adddot +linetotals|wersy|wer\adddot +versetotal|wiersz|wier\adddot +versetotals|wiersze|wier\adddot +sectiontotal|paragraf|par\adddot +sectiontotals|paragrafy|par\adddot +paragraphtotal|akapit|akap\adddot +paragraphtotals|akapit|akap\adddot +in|w|w +inseries|w|w +ofseries|z|z +number|numer|nr\adddot +chapter|rozdzia\l |rozd\adddot diff --git a/citeproc/biblatex-localization/portuges.lbx.strings b/citeproc/biblatex-localization/portuges.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/portuges.lbx.strings diff --git a/citeproc/biblatex-localization/portuguese.lbx.strings b/citeproc/biblatex-localization/portuguese.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/portuguese.lbx.strings @@ -0,0 +1,95 @@ +bibliography|Bibliografia|Bibliografia +references|Refer\^encias|Refer\^encias +shorthands|Lista de Abreviaturas|Abreviaturas +editor|editor|ed\adddot +editors|editores|eds\adddot +compiler|compilador|comp\adddot +compilers|compiladores|comp\adddot +redactor|redator|red\adddot +redactors|redatores|red\adddot +reviser|revisor|rev\adddot +revisers|revisores|rev\adddot +founder|fundador|fund\adddot +founders|fundadores|fund\adddot +continuator|continuador|cont\adddot +continuators|continuadores|cont\adddot +collaborator|colaborador|col\adddot +collaborators|colaboradores|col\adddot +translator|tradutor|trad\adddot +translators|tradutores|trad\adddot +commentator|comentador|coment\adddot +commentators|comentadores|coment\adddot +annotator|anotador|anot\adddot +annotators|anotadores|anot\adddot +commentary|coment\'ario|coment\adddot +annotations|notas|notas +foreword|pref\'acio|pref\adddot +afterword|posf\'acio|posf\adddot +organizer|organizador|org\adddot +organizers|organizadores|orgs\adddot +byorganizer|organizado por|org\adddotspace por +byauthor|por|por +byeditor|editado por|ed\adddotspace por +bycompiler|compilado por|comp\adddotspace por +byredactor|redigido por|red\adddotspace por +byreviser|revisto por|rev\adddotspace por +byreviewer|resenhado por|res\adddotspace por +byfounder|fundado por|fund\adddotspace por +bycontinuator|continuado por|cont\adddotspace por +bytranslator|traduzido \lbx@lfromlang\ por|trad\adddot\ \lbx@sfromlang\ por +bycommentator|comentado por|coment\adddot\ por +byannotator|notas de|notas de +withcommentator|com coment\'arios de|com coment\adddot\ de +withannotator|com notas de|com notas de +withforeword|com pref\'acio de|com pref\adddot\ de +withafterword|com posf\'acio de|com posf\adddot\ de +and|e|e +andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +volume|volume|vol\adddot +volumes|volumes|vols\adddot +involumes|em|em +jourvol|volume|vol\adddot +jourser|s\'erie|s\'er\adddot +book|livro|livro +part|parte|parte +issue|n\'umero|n\'umero +newseries|nova s\'erie|nova s\'er\adddot +oldseries|s\'erie antiga|s\'er\adddot\ antiga +reprint|reimpress\~ao|reimpr\adddot +reprintof|reimpress\~ao de|reimpr\adddotspace de +reprintas|reimpresso como|reimpr\adddotspace como +reprintfrom|reimpresso|reimpr\adddot +translationas|traduzido como|trad\adddotspace como +translationfrom|traduzido do|trad\adddotspace do +reviewof|resenha de|res\adddotspace de +origpubas|originalmente publicado como|orig\adddotspace pub\adddotspace como +origpubin|originalmente publicado em|orig\adddotspace pub\adddotspace em +astitle|como|como +bypublisher|por|por +nodate|sem data|s\adddot d\adddot +page|p\'agina|p\adddot +pages|p\'aginas|pp\adddot +column|coluna|col\adddot +columns|colunas|cols\adddot +line|linha|l\adddot +lines|linhas|ll\adddot +verse|verso|v\adddot +verses|versos|vv\adddot +paragraph|par\'agrafo|par\adddot +paragraphs|par\'agrafo|par\adddot +pagetotal|p\'agina|p\adddot +pagetotals|p\'aginas|pp\adddot +columntotal|coluna|col\adddot +columntotals|colunas|cols\adddot +linetotal|linha|l\adddot +linetotals|linhas|ll\adddot +versetotal|verso|v\adddot +versetotals|versos|vv\adddot +paragraphtotal|par\'agrafo|par\adddot +paragraphtotals|par\'agrafo|par\adddot +in|em|em +inseries|em|em +ofseries|de|de +number|n\'umero|n\adddot\textordmasculine +chapter|cap\'\i tulo|cap\adddot diff --git a/citeproc/biblatex-localization/russian.lbx.strings b/citeproc/biblatex-localization/russian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/russian.lbx.strings @@ -0,0 +1,102 @@ +bibliography|Список литературы|Список литературы +references|Список литературы|Список литературы +shorthands|Список сокращений|Сокращения +editor|редактор|ред\adddot +editors|редакторы|ред\adddot +compiler|составитель|сост\adddot +compilers|составители|сост\adddot +redactor|редактор|ред\adddot +redactors|редакторы|ред\adddot +reviser|ревизионный корректор|ревиз\adddotspace кор\adddot +revisers|ревизионные корректоры|ревиз\adddotspace кор\adddot +founder|основатель|осн\adddot +founders|основатели|осн\adddot +continuator|продолжатель|прод\adddot +continuators|продолжатели|прод\adddot +collaborator|участник|участ\adddot +collaborators|участники|участ\adddot +translator|переводчик|пер\adddot +translators|переводчики|пер\adddot +commentator|комментатор|коммент\adddot +commentators|комментаторы|коммент\adddot +annotator|примечания|примеч\adddot +annotators|примечания|примеч\adddot +commentary|комментарий|коммент\adddot +annotations|примечания|примеч\adddot +introduction|вступительная статья|вступ\adddotspace ст\adddot +foreword|предисловие|предисл\adddot +afterword|послесловие|послесл\adddot +organizer|организатор|орг\adddot +organizers|организаторы|орг\adddot +byorganizer|организатор|орг\adddot +byauthor|| +byeditor|под редакцией|под\addabbrvspace ред\adddot +bycompiler|составитель|сост\adddot +byredactor|под редакцией|под\addabbrvspace ред\adddot +byreviser|исправлено|испр\adddot +byreviewer|рецензия|рец\adddot +byfounder|учредитель|учр\adddot +bycontinuator|продолжение|продолж\adddot +bycollaborator|при участии|при\addabbrvspace уч\adddot +bytranslator|перевод \lbx@lfromlang|пер\adddot\ \lbx@sfromlang +bycommentator|комментарии|коммент\adddot +byannotator|примечания|примеч\adddot +withcommentator|комментарии|коммент\adddot +withannotator|примечания|примеч\adddot +withintroduction|вступительная статья|вступ\adddotspace ст\adddot +withforeword|предисловие|предисл\adddot +withafterword|послесловие|послесл\adddot +and|и|и +andothers|и\addabbrvspace др\adddot|и\addabbrvspace др\adddot +andmore|и\addabbrvspace др\adddot|и\addabbrvspace др\adddot +volume|том|т\adddot +volumes|томах|т\adddot +involumes|в|в +jourvol|том|т\adddot +jourser|серия|сер\adddot +book|книга|кн\adddot +part|часть|ч\adddot +issue|выпуск|вып\adddot +newseries|новая серия|нов\adddotspace сер\adddot +oldseries|старая серия|стар\adddotspace сер\adddot +edition|издание|изд\adddot +reprint|переиздание|переизд\adddot +reprintof|переиздание|переизд\adddot +reprintas|переиздано как|переизд\adddotspace как +reprintfrom|переиздано с|переизд\adddotspace с +translationof|перевод по изданию\addcolon|пер\adddotspace по изд\adddot\addcolon +translationas|перевод\addcolon|пер\adddot\addcolon +translationfrom|перевод с|пер\adddotspace с +reviewof|рецензия на\addcolon|рец\adddotspace на\addcolon +astitle|\addcolon|\addcolon +bypublisher|\addcomma|\addcomma +nodate|б\adddot г\adddot|б\adddot г\adddot +page|страница|с\adddot +pages|страницы|с\adddot +column|колонка|кол\adddot +columns|колонки|кол\adddot +line|строка|строка +lines|строки|строка +verse|стих|стих +verses|стихи|стихи +section|параграф|\S +sections|параграфы|\S\S +paragraph|абзац|абз\adddot +paragraphs|абзацы|абз\adddot +pagetotal|страница|с\adddot +pagetotals|страницы|с\adddot +columntotal|колонка|кол\adddot +columntotals|колонки|кол\adddot +linetotal|строка|строка +linetotals|строки|строка +versetotal|стих|стих +versetotals|стихи|стихи +sectiontotal|параграф|\S +sectiontotals|параграфы|\S\S +paragraphtotal|абзац|абз\adddot +paragraphtotals|абзацы|абз\adddot +in|в|в +inseries|в|в +ofseries|из|из +number|номер|№ +chapter|глава|гл\adddot diff --git a/citeproc/biblatex-localization/serbian.lbx.strings b/citeproc/biblatex-localization/serbian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/serbian.lbx.strings diff --git a/citeproc/biblatex-localization/serbianc.lbx.strings b/citeproc/biblatex-localization/serbianc.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/serbianc.lbx.strings diff --git a/citeproc/biblatex-localization/slovak.lbx.strings b/citeproc/biblatex-localization/slovak.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/slovak.lbx.strings @@ -0,0 +1,82 @@ +references|Referencie|Referencie +shorthands|Zoznam skratiek|Skratky +editor|editor|ed\adddot +editors|editori|ed\adddot +compilers|zostavovatelia|zost\adddot +redactor|redaktor|red\adddot +redactors|redaktori|red\adddot +reviser|korektor|kor\adddot +revisers|korektori|kor\adddot +founders|zakladatelia|zakl\adddot +translators|prekladatelia|prekl\adddot +foreword|predhovor|predh\adddot +afterword|doslov|dosl\adddot +byauthor|| +withforeword|s\addnbspace predhovorom od|s\addnbspace predh\adddot\ od +withafterword|s\addnbspace doslovom od|s\addnbspace dosl\adddot\ od +and|a|a +andothers|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +andmore|et\addabbrvspace al\adddot|et\addabbrvspace al\adddot +involumes|in|in +book|kniha|kniha +edition|vydanie|vyd\adddot +reviewof|recenzia|recenz\adddot +translationof|preklad|prekl\adddot +astitle|ako|ako +bypublisher|| +page|strana|s\adddot +pages|strany|s\adddot +line|riadok|r\adddot +lines|riadky|r\adddot +section|sekcia|\S +sections|sekcie|\S\S +paragraph|odsek|ods\adddot +paragraphs|odseky|ods\adddot +pagetotal|strana|s\adddot +pagetotals|strany|s\adddot +linetotal|riadok|r\adddot +linetotals|riadky|r\adddot +sectiontotal|sekcia|\S +sectiontotals|sekcie|\S\S +paragraphtotal|odsek|ods\adddot +paragraphtotals|odseky|ods\adddot +in|in|in +inseries|in|in +ofseries|z|z +chapter|kapitola|kap\adddot +datacd|CD-ROM|CD-ROM +audiocd|audio CD|audio CD +version|verzia|ver\adddot +url|URL|URL +idem|idem|idem +idemsm|idem|idem +idemsf|eadem|eadem +idemsn|idem|idem +idempm|eidem|eidem +idempf|eaedem|eaedem +idempn|eadem|eadem +idempp|eidem|eidem +ibidem|ibidem|ibid\adddot +opcit|op\adddotspace cit\adddot|op\adddotspace cit\adddot +loccit|loc\adddotspace cit\adddot|loc\adddotspace cit\adddot +confer|cf\adddot|cf\adddot +sequens|sq\adddot|sq\adddot +sequentes|sqq\adddot|sqq\adddot +passim|passim|pass\adddot +march|marec|mar\adddot +august|august|aug\adddot +september|september|sept\adddot +november|november|nov\adddot +december|december|dec\adddot +countryde|Nemecko|DE +patent|patent|pat\adddot +patentus|US patent|US pat\adddot +abstract|abstrakt|abst\adddot +annodomini|po Kristovi|po Kr\adddot +beforechrist|pred Kristom|pred Kr\adddot +circa|cirka|ca\adddot +spring|jar|jar +summer|leto|leto +winter|zima|zima +am|AM|AM +pm|PM|PM diff --git a/citeproc/biblatex-localization/slovene.lbx.strings b/citeproc/biblatex-localization/slovene.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/slovene.lbx.strings @@ -0,0 +1,28 @@ +bibliography|Literatura|Literatura +references|Literatura|Literatura +shorthands|Kratice|Kratice +editor|urednik|ur\adddot +editors|uredniki|ur\adddot +compiler|sestavljalec|sest\adddot +compilers|sestavljalci|sest\adddot +redactor|redaktor|redaktor +redactors|redaktorji|redaktorji +reviser|korektor|korektor +revisers|korektorji|korektorji +founder|snovalec|snovalec +founders|snovalci|snovalci +continuator|nadaljevalec|nadaljevalec +continuators|nadaljevalci|nadaljevalci +collaborator|sodelavec|sod\adddot +collaborators|sodelavci|sod\adddot +translator|prevajalec|prev\adddot +translators|prevajalci|prev\adddot +commentator|komentator|komentator +commentators|komentatorji|komentatorji +annotator|anotator|anotator +annotators|anotatorji|anotatorji +commentary|komentar|komentar +annotations|opombe|op\adddot +introduction|uvod|uvod +foreword|predgovor|predg\adddot +afterword|spremna beseda|spr\adddotspace b\adddot diff --git a/citeproc/biblatex-localization/slovenian.lbx.strings b/citeproc/biblatex-localization/slovenian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/slovenian.lbx.strings diff --git a/citeproc/biblatex-localization/spanish.lbx.strings b/citeproc/biblatex-localization/spanish.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/spanish.lbx.strings @@ -0,0 +1,190 @@ +references|Referencias|Referencias +shorthands|Lista de abreviaturas|Abreviaturas +editor|edici\'on|ed\adddot +editors|edici\'on|eds\adddot +commentator|comentario|com\adddot +commentators|comentarios|coms\adddot +annotator|anotaciones|anot\adddot +annotators|anotaciones|anots\adddot +commentary|comentario|com\adddot +annotations|notas|notas +introduction|introducci\'on|intr\adddot +foreword|pr\'ologo|pr\'ol\adddot +organizer|organizaci\'on|org\adddot +organizers|organizaci\'on|orgs\adddot +byorganizer|organizado por|org\adddotspace por +byauthor|de|de +byeditor|editado por|ed\adddotspace por +bycompiler|compilado por|comp\adddotspace por +byredactor|redacci\'on de|red\adddotspace de +byreviser|revisado por|rev\adddotspace por +byfounder|fundado por|fund\adddotspace por +bycontinuator|continuado por|cont\adddotspace por +bytranslator|traducido \lbx@lfromlang\ por|trad\adddot \lbx@sfromlang\ por +bycommentator|comentado por|com\adddotspace por +byannotator|anotado por|anot\adddotspace por +withcommentator|con comentario de|con com\adddotspace de +withannotator|con notas de|con notas de +withintroduction|con introduci\'on de|con intr\adddotspace de +withforeword|con pr\'ologo de|con pr\'ol\adddotspace de +and|y|y +andothers|y~col\adddot|y~col\adddot +andmore|et\adddotspace al\adddot|et\adddotspace al\adddot +volume|volumen|vol\adddot +volumes|vol\'umenes|vols\adddot +involumes|en|en +jourvol|volumen|vol\adddot +jourser|\'epoca|\'ep\adddot +book|libro|libro +part|parte|parte +issue|n\'umero|n\'um\adddot +newseries|nueva \'epoca|n\adddotspace \'ep\adddot +oldseries|antigua \'epoca|ant\adddotspace \'ep\adddot +edition|edici\'on|ed\adddot +reprintas|reimpreso como|reimp\adddotspace como +translationas|traducido como|trad\adddotspace como +translationfrom|traducido del|trad\adddotspace del +origpubas|publicado originalmente como|pub\adddotspace orig\adddotspace como +origpubin|publicado originalmente en|pub\adddot orig\adddot en +bypublisher|por la editorial|por la ed\adddot +page|p\'agina|p\'ag\adddot +pages|p\'aginas|p\'ags\adddot +column|columna|col\adddot +columns|columnas|cols\adddot +verse|verso|v\adddot +verses|versos|vv\adddot +sections|secciones|secs\adddot +pagetotal|p\'agina|p\'ag\adddot +pagetotals|p\'aginas|p\'ags\adddot +columntotal|columna|col\adddot +columntotals|columnas|cols\adddot +versetotal|verso|v\adddot +versetotals|versos|vv\adddot +sectiontotals|secciones|secs\adddot +in|en|en +inseries|en|en +ofseries|de|de +number|n\'umero|n\sptext{o +chapter|cap\'itulo|cap\adddot +bathesis|Tesis de licenciatura|Tesis de lic\adddot +phdthesis|Tesis doctoral|Tesis doct\adddot +candthesis|Tesis de candidatura doctoral|Tesis de cand\adddotspace doct\adddot +techreport|informe t\'ecnico|inf\adddotspace t\'ec\adddot +software|programa|prog\adddot +datacd|disco de datos|CD de datos +audiocd|disco de audio|CD de audio +version|versi\'on|ver\adddot +url|direcci\'on|direcci\'on +urlfrom|disponible desde|disp\adddotspace desde +urlseen|visitado|visitado +submitted|enviado|enviado +forthcoming|pr\'oximamente|prox\adddot +inpress|en prensa|en prensa +prepublished|previamente publicado|prepublicado +citedas|citado en adelante como|cit\adddotspace en adelante como +thiscite|especialmente|esp\adddot +seenote|ver nota|ver n\adddot +quotedin|citado en|cit\adddotspace en +loccit|loc\adddotspace cit\adddot|loc\adddot cit\adddot +confer|cf\adddot|cf\adddot +sequens|s\adddot|s\adddot +sequentes|ss\adddot|ss\adddot +passim|p\'assim|p\'assim +see|v\'ease|vid\adddot +seealso|v\'ease tambi\'en|vid\adddotspace tambi\'en +backrefpage|v\'ease p\'agina|vid\adddotspace p\'ag\adddot +backrefpages|v\'eanse p\'aginas|vid\adddotspace p\'ags\adddot +january|enero|ene\adddot +february|febrero|feb\adddot +march|marzo|mar\adddot +april|abril|abr\adddot +may|mayo|mayo +june|junio|jun\adddot +july|julio|jul\adddot +august|agosto|ago\adddot +september|septiembre|sep\adddot +october|octubre|oct\adddot +november|noviembre|nov\adddot +december|diciembre|dic\adddot +langbrazilian|brasile\~no|brasile\~no +langbulgarian|b\'ulgaro|b\'ulgaro +langcroatian|croata|croata +langczech|checo|checo +langdanish|dan\'es|dan\'es +langdutch|neerland\'es|neerland\'es +langenglish|ingl\'es|ingl\'es +langestonian|estonio|estonio +langfrench|franc\'es|franc\'es +langgalician|gallego|gallego +langgerman|alem\'an|alem\'an +langgreek|griego|griego +langhungarian|h\'ungaro|h\'ungaro +langitalian|italiano|italiano +langjapanese|japon\'es|japon\'es +langlatvian|lituano|lituano +langnorwegian|noruego|noruego +langpolish|polaco|polaco +langportuguese|portugu\'es|portugu\'es +langrussian|ruso|ruso +langslovak|eslovaco|eslovaco +langslovene|esloveno|esloveno +langspanish|espa\~nol|espa\~nol +langswedish|sueco|sueco +langukrainian|ucraniano|ucraniano +frombrazilian|del brasile\~no|del brasile\~no +frombulgarian|del b\'ulgaro|del b\'ulgaro +fromcroatian|del croata|del croata +fromczech|del checo|del checo +fromdanish|del dan\'es|del dan\'es +fromdutch|del neerland\'es|del neerland\'es +fromenglish|del ingl\'es|del ingl\'es +fromestonian|del estonio|del estonio +fromfrench|del franc\'es|del franc\'es +fromgalician|del gallego|del gallego +fromgerman|del alem\'an|del alem\'an +fromgreek|del griego|del griego +fromhungarian|del h\'ungaro|del h\'ungaro +fromitalian|del italiano|del italiano +fromjapanese|del japon\'es|del japon\'es +fromlatvian|del lituano|del lituano +fromnorwegian|del noruego|del noruego +frompolish|del polaco|del polaco +fromportuguese|del portugu\'es|del portugu\'es +fromrussian|del ruso|del ruso +fromslovak|del eslovaco|del eslovaco +fromslovene|del esloveno|del esloveno +fromspanish|del espa\~nol|del espa\~nol +fromswedish|del sueco|del sueco +fromukrainian|del ucraniano|del ucraniano +countryde|Alemania|DE +countryeu|Uni\'on Europea|EU +countryep|Uni\'on Europea|EP +countryfr|Francia|FR +countryuk|Reino Unido|GB +countryus|Estados Unidos|US +patent|patente|pat\adddot +patentde|patente alemana|pat\adddotspace alemana +patenteu|patente europea|pat\adddotspace europea +patentfr|patente francesa|pat\adddotspace francesa +patentuk|patente brit\'anica|pat\adddotspace brit\'anica +patentus|patente estadounidense|pat\adddotspace estadounidense +patreq|solicitud de patente|sol\adddotspace de pat\adddot +patreqde|solicitud de patente alemana|sol\adddotspace de pat\adddot alemana +patreqeu|solicitud de patente europea|sol\adddotspace de pat\adddot europea +patreqfr|solicitud de patente francesa|sol\adddotspace de pat\adddot francesa +patrequk|solicitud de patente brit\'anica|sol\adddotspace de pat\adddot brit\'anica +patrequs|solicitud de patente estadounidense|sol\adddotspace de pat\adddot estadounidense +file|archivo|archivo +library|biblioteca|bibl\adddot +abstract|resumen|resumen +commonera|era com\'un|e\adddotspace c\adddot +beforecommonera|antes de la era com\'un|a\adddotspace e\adddotspace c\adddot +annodomini|despu\'es de Cristo|d\adddotspace C\adddot +beforechrist|antes de Cristo|a\adddotspace C\adddot +circa|circa|ca\adddot +spring|primavera|prim\adddot +summer|verano|ver\adddot +autumn|oto\~no|ot\adddot +winter|invierno|inv\adddot +am|a\adddotspace m\adddot|a\adddot m\adddot +pm|p\adddotspace m\adddot|p\adddot m\adddot diff --git a/citeproc/biblatex-localization/swedish.lbx.strings b/citeproc/biblatex-localization/swedish.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/swedish.lbx.strings @@ -0,0 +1,9 @@ +bibliography|Litteraturf\"orteckning|Litteratur +references|Referenser|Referenser +shorthands|F\"orkortningar|F\"orkortningar +editor|utgivare|utg\adddot +editors|utgivare|utg\adddot +compiler|sammanst\"allare|sammanst\adddot +compilers|sammanst\"allare|sammanst\adddot +redactor|redakt\"or|red\adddot +redactors|redakt\"orer|red\adddot diff --git a/citeproc/biblatex-localization/swissgerman.lbx.strings b/citeproc/biblatex-localization/swissgerman.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/swissgerman.lbx.strings @@ -0,0 +1,1 @@ +countryuk|Grossbritannien|GB diff --git a/citeproc/biblatex-localization/turkish.lbx.strings b/citeproc/biblatex-localization/turkish.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/turkish.lbx.strings @@ -0,0 +1,157 @@ +references|Kaynaklar|Kaynaklar +shorthands|K\i saltmalar dizini|K\i saltmalar +compiler|derleyen|der\adddot +compilers|derleyenler|der\adddot +redactor|yay\i na haz\i rlayan|yay\adddot\ haz\adddot +redactors|yay\i na haz\i rlayanlar|yay\adddot\ haz\adddot +reviser|tashih eden|tashih\adddot +revisers|tashih edenler|tashih\adddot +founder|kurucu|kur\adddot +founders|kurucular|kur\adddot +continuator|tamamlayan|tam\adddot +continuators|tamamlayanlar|tam\adddot +collaborator|ortak|ortak +collaborators|ortaklar|ortaklar +commentator|yorumlayan|yrm\adddot +commentators|yorumlayanlar|yrm\adddot +commentary|yorum|yrm\adddot +byauthor|yazar|yazar +bycompiler|derleyen|der\adddot +byredactor|yay\i na haz\i rlayan|yay\adddot\ haz\adddot +byreviser|tashih|tashih +byfounder|kurucu|kur\adddot +bycontinuator|tamamlayan|tam\adddot +bycommentator|yorumlayan|yrm\adddot +withcommentator|yorumlar\i yla katk\i da bulunan|yrm\adddot\ kat\adddot\ bul\adddot +and|ve|ve +volume|cilt|c\adddot +volumes|cilt|c\adddot +jourvol|cilt|c\adddot +jourser|seri|seri +book|kitap|kitap +part|k\i s\i m|k\i s\i m +issue|say\i|say\i +newseries|yeni seri|yeni seri +oldseries|eski seri|eski seri +edition|bask\i|bs\adddot +reprint|yeni bask\i s\i|yeni bask\i s\i +reprintof|yeni bask\i s\i|yeni bask\i s\i +reprintas|yeni bask\i s\i|yeni bask\i s\i +reprintfrom|yeni bask\i s\i|yeni bask\i s\i +reviewof|derlenen eser|der\adddot\ eser +origpubas|as\i l eser|as\i l eser +origpubin|as\i l eser yay\i n tarihi|as\i l eser yay\i n tarihi +bypublisher|yay\i n evi|yay\i n evi +nodate|tarih yok|t\adddot y\adddot +page|sayfa|s\adddot +pages|sayfalar|ss\adddot +line|sat\i r|sat\adddot +lines|sat\i rlar|sat\adddot +verse|m\i sra|m\i s\adddot +verses|m\i sralar|m\i s\adddot +paragraph|paragraf|par\adddot +paragraphs|paragraflar|par\adddot +pagetotal|toplam sayfa|s\adddot +pagetotals|toplam sayfalar|ss\adddot +linetotal|toplam sat\i r|sat\adddot +linetotals|toplam sat\i rlar|sat\adddot +versetotal|toplam m\i sra|m\i s\adddot +versetotals|toplam m\i sralar|m\i s\adddot +paragraphtotal|toplam paragraf|par\adddot +paragraphtotals|toplam paragraflar|par\adddot +inseries|serilerde|serilerde +ofseries|serilerde|serilerde +number|numara|no\adddot +bathesis|lisans tezi|lis\adddot\ tezi +phdthesis|doktora tezi|dok\adddot\ tezi +candthesis|aday tezi|aday tezi +techreport|teknik rapor|tek\adddot\ rap\adddot +software|bilgisayar yaz\i l\i m\i|bilg\adddot\ yaz\adddot +datacd|CD|CD +audiocd|ses CD'si|ses CD'si +version|versiyon|ver\adddot +forthcoming|yak\i nda|yak\i nda +prepublished|taslak bas\i m\i|taslak bas\i m\i +citedas|at\i f olarak|at\i f olarak +seenote|nota bak\i n\i z|nota bkz\adddot +quotedin|al\i nt\i|al\i nt\i +idem|ayn\i|ayn\i +idemsm|ayn\i|ayn\i +idemsf|ayn\i|ayn\i +idemsn|ayn\i|ayn\i +idempm|ayn\i lar\i|ayn\i lar\i +idempf|ayn\i lar\i|ayn\i lar\i +idempn|ayn\i lar\i|ayn\i lar\i +idempp|ayn\i lar\i|ayn\i lar\i +loccit|at\i f yap\i lan yer|at\i f yap\adddot\ yer +sequens|takip eden|takip eden +sequentes|takip eden|takip eden +passim|rastgele|rastgele +see|bak\i n\i z|bkz\adddot +seealso|ayr\i ca bak\i n\i z|ayr\i ca bkz\adddot +january|Ocak|Ocak +march|Mart|Mar\adddot +april|Nisan|Nis\adddot +may|May\i s|May\adddot +june|Haziran|Haz\adddot +july|Temmuz|Tem\adddot +october|Ekim|Ekim +november|Kas\i m|Kas\adddot +december|Aral\i k|Ara\adddot +langamerican|Amerikanca|Amerikanca +langbrazilian|Brezilyanca|Brezilyanca +langbulgarian|Bulgarca|Bulgarca +langcatalan|Katalanca|Katalanca +langdanish|Danimarkanca|Danimarkanca +langestonian|Estonca|Estonca +langfinnish|Fince|Fince +langfrench|Frans\i zca|Frans\i zca +langgalician|Galce|Galce +langgerman|Almanca|Almanca +langgreek|Yunanca|Yunanca +langhungarian|Macarca|Macarca +langjapanese|Japonca|Japonca +langlatin|Latince|Latince +langlatvian|Letonca|Letonca +langlithuanian|Litvanca|Litvanca +langpolish|Polonyaca|Polonyaca +langportuguese|Portekizce|Portekizce +langslovene|Slovence|Slovence +langukrainian|Ukraynaca|Ukraynaca +fromamerican|Amerikanca'dan|Amerikanca'dan +frombrazilian|Brezilyanca'dan|Brezilyanca'dan +frombulgarian|Bulgarca'dan|Bulgarca'dan +fromcatalan|Katalanca'dan|Katalanca'dan +fromdanish|Danimarkanca'dan|Danimarkanca'dan +fromestonian|Estonyaca'dan|Estonyaca'dan +fromfinnish|Fince'den|Fince'den +fromfrench|Frans\i zca'dan|Frans\i zca'dan +fromgalician|Galyaca'dan|Galyaca'dan +fromgerman|Almanca'dan|Almanca'dan +fromgreek|Yunanca'dan|Yunanca'dan +fromhungarian|Macarca'dan|Macarca'dan +fromjapanese|Japonca'dan|Japonca'dan +fromlatin|Latince'den|Latince'den +fromlatvian|Latvianca'dan|Latvianca'dan +fromlithuanian|Litvanca'dan|Litvanca'dan +frompolish|Polonyaca'dan|Polonyaca'dan +fromportuguese|Portekizce'den|Portekizce'den +fromslovene|Slovence'den|Slovence'den +fromukrainian|Ukraynaca'dan|Ukraynaca'dan +countryde|Almanya|DE +countryfr|Fransa|FR +patent|patent|pat\adddot +patentde|Alman patenti|Alman pat\adddot +patenteu|Avrupa patenti|Avrupa pat\adddot +patentfr|Frans\i z patenti|Frans\i z pat\adddot +patentus|Amerika patenti|Amerika pat\adddot +patreq|patent beklemede|pat\adddot\ bek\adddot +patreqde|Alman patenti beklemede|Alman pat\adddot\ bek\adddot +patreqeu|Avrupa patenti beklemede|Avrupa pat\adddot\ bek\adddot +patreqfr|Frans\i z patenti beklemede|Frans\i z pat\adddot\ bek\adddot +patrequs|Amerika patenti beklemede|Amerika pat\adddot\ bek\adddot +file|dosya|dosya +commonera|milattan sonra|MS +annodomini|milattan sonra|MS +summer|Yaz|Yaz +autumn|Sonbahar|Sonbahar diff --git a/citeproc/biblatex-localization/ukrainian.lbx.strings b/citeproc/biblatex-localization/ukrainian.lbx.strings new file mode 100644 --- /dev/null +++ b/citeproc/biblatex-localization/ukrainian.lbx.strings @@ -0,0 +1,102 @@ +bibliography|Перелік літератури|Література +references|Перелік літератури|Література +shorthands|Перелік скорочень|Скорочення +editor|редактор|ред\adddot +editors|редактори|ред\adddot +compiler|укладач|уклад\adddot +compilers|укладачі|уклад\adddot +redactor|редактор|ред\adddot +redactors|редактори|ред\adddot +reviser|ревізійний коректор|ревіз\adddotspace кор\adddot +revisers|ревізійні коректори|ревіз\adddotspace кор\adddot +founder|засновник|засн\adddot +founders|засновник|засн\adddot +continuator|продовжувач|прод\adddot +continuators|продовжувачі|прод\adddot +collaborator|учасник|учас\adddot +collaborators|учасники|учас\adddot +translator|перекладач|пер\adddot +translators|перекладачі|пер\adddot +commentator|коментатор|комент\adddot +commentators|коментатори|комент\adddot +annotator|примітки|прим\adddot +annotators|примітки|прим\adddot +commentary|коментар|комент\adddot +annotations|примітки|прим\adddot +introduction|вступна стаття|вступ\adddotspace ст\adddot +foreword|передмова|передм\adddot +afterword|післямова|післям\adddot +organizer|організатор|орг\adddot +organizers|організатори|орг\adddot +byorganizer|організатор|орг\adddot +byauthor|згідно автора|згідн\adddot авт\adddot +byeditor|за редакцією|за\addabbrvspace ред\adddot +bycompiler|укладач|уклад\adddot +byredactor|за редакцією|за\addabbrvspace ред\adddot +byreviser|виправлено|випр\adddot +byreviewer|рецензія|рец\adddot +byfounder|засновник|засн\adddot +bycontinuator|продовження|продовж\adddot +bycollaborator|за участю|за\addabbrvspace уч\adddot +bytranslator|переклад \lbx@lfromlang|пер\adddot\ \lbx@sfromlang +bycommentator|коментарі|комент\adddot +byannotator|примітки|прим\adddot +withcommentator|коментарі|комент\adddot +withannotator|примітки|прим\adddot +withintroduction|вступна стаття|вступ\adddotspace ст\adddot +withforeword|передмовие|передм\adddot +withafterword|післямовие|післям\adddot +and|та|та +andothers|та\addabbrvspace ін\adddot|та\addabbrvspace ін\adddot +andmore|та\addabbrvspace ін\adddot|та\addabbrvspace ін\adddot +volume|том|т\adddot +volumes|томах|т\adddot +involumes|в|в +jourvol|том|т\adddot +jourser|серія|сер\adddot +book|книга|кн\adddot +part|частина|ч\adddot +issue|випуск|вип\adddot +newseries|нова серія|нов\adddotspace сер\adddot +oldseries|стара серія|стар\adddotspace сер\adddot +edition|видання|вид\adddot +reprint|перевидання|перевид\adddot +reprintof|перевидання|перевид\adddot +reprintas|перевидано як|перевид\adddotspace як +reprintfrom|перевидано з|перевид\adddotspace з +translationof|переклад по виданню\addcolon|пер\adddotspace по вид\adddot\addcolon +translationas|переклад\addcolon|пер\adddot\addcolon +translationfrom|переклад з|пер\adddotspace з +reviewof|рецензія на\addcolon|рец\adddotspace на\addcolon +astitle|\addcolon|\addcolon +bypublisher|\addcomma|\addcomma +nodate|б\adddot р\adddot|б\adddot р\adddot +page|сторінка|с\adddot +pages|сторінки|с\adddot +column|колонка|кол\adddot +columns|колонки|кол\adddot +line|рядок|рядок +lines|рядки|рядки +verse|вірш|вірш +verses|вірші|вірші +section|параграф|\S +sections|параграфи|\S\S +paragraph|абзац|абз\adddot +paragraphs|абзаци|абз\adddot +pagetotal|сторінка|с\adddot +pagetotals|сторінки|с\adddot +columntotal|колонка|кол\adddot +columntotals|колонки|кол\adddot +linetotal|рядок|рядок +linetotals|рядки|рядки +versetotal|вірш|вірш +versetotals|вірші|вірші +sectiontotal|параграф|\S +sectiontotals|параграфи|\S\S +paragraphtotal|абзац|абз\adddot +paragraphtotals|абзаци|абз\adddot +in|в|в +inseries|в|в +ofseries|із|із +number|номер|№ +chapter|глава|гл\adddot diff --git a/data/LaTeXMathML.js b/data/LaTeXMathML.js deleted file mode 100644 --- a/data/LaTeXMathML.js +++ /dev/null @@ -1,198 +0,0 @@ -/* -LaTeXMathML.js from http://math.etsu.edu/LaTeXMathML/ -Adapted by Jeff Knisely and Douglas Woodall from ASCIIMathML.js v. 1.4.7, -(c) 2005 Peter Jipsen http://www.chapman.edu/~jipsen. -Released under the GNU General Public License version 2 or later. -See the GNU General Public License (at http://www.gnu.org/copyleft/gpl.html) -for more details. -*/ -var checkForMathML=true;var notifyIfNoMathML=true;var alertIfNoMathML=false;var mathcolor="";var mathfontfamily="";var showasciiformulaonhover=true;var isIE=document.createElementNS==null;if(document.getElementById==null) -alert("This webpage requires a recent browser such as \nMozilla/Netscape 7+ or Internet Explorer 6+MathPlayer") -function AMcreateElementXHTML(t){if(isIE)return document.createElement(t);else return document.createElementNS("http://www.w3.org/1999/xhtml",t);} -function AMnoMathMLNote(){var nd=AMcreateElementXHTML("h3");nd.setAttribute("align","center") -nd.appendChild(AMcreateElementXHTML("p"));nd.appendChild(document.createTextNode("To view the "));var an=AMcreateElementXHTML("a");an.appendChild(document.createTextNode("LaTeXMathML"));an.setAttribute("href","http://www.maths.nott.ac.uk/personal/drw/lm.html");nd.appendChild(an);nd.appendChild(document.createTextNode(" notation use Internet Explorer 6+"));an=AMcreateElementXHTML("a");an.appendChild(document.createTextNode("MathPlayer"));an.setAttribute("href","http://www.dessci.com/en/products/mathplayer/download.htm");nd.appendChild(an);nd.appendChild(document.createTextNode(" or Netscape/Mozilla/Firefox"));nd.appendChild(AMcreateElementXHTML("p"));return nd;} -function AMisMathMLavailable(){if(navigator.appName.slice(0,8)=="Netscape") -if(navigator.appVersion.slice(0,1)>="5")return null;else return AMnoMathMLNote();else if(navigator.appName.slice(0,9)=="Microsoft") -try{var ActiveX=new ActiveXObject("MathPlayer.Factory.1");return null;}catch(e){return AMnoMathMLNote();} -else return AMnoMathMLNote();} -var AMcal=[0xEF35,0x212C,0xEF36,0xEF37,0x2130,0x2131,0xEF38,0x210B,0x2110,0xEF39,0xEF3A,0x2112,0x2133,0xEF3B,0xEF3C,0xEF3D,0xEF3E,0x211B,0xEF3F,0xEF40,0xEF41,0xEF42,0xEF43,0xEF44,0xEF45,0xEF46];var AMfrk=[0xEF5D,0xEF5E,0x212D,0xEF5F,0xEF60,0xEF61,0xEF62,0x210C,0x2111,0xEF63,0xEF64,0xEF65,0xEF66,0xEF67,0xEF68,0xEF69,0xEF6A,0x211C,0xEF6B,0xEF6C,0xEF6D,0xEF6E,0xEF6F,0xEF70,0xEF71,0x2128];var AMbbb=[0xEF8C,0xEF8D,0x2102,0xEF8E,0xEF8F,0xEF90,0xEF91,0x210D,0xEF92,0xEF93,0xEF94,0xEF95,0xEF96,0x2115,0xEF97,0x2119,0x211A,0x211D,0xEF98,0xEF99,0xEF9A,0xEF9B,0xEF9C,0xEF9D,0xEF9E,0x2124];var CONST=0,UNARY=1,BINARY=2,INFIX=3,LEFTBRACKET=4,RIGHTBRACKET=5,SPACE=6,UNDEROVER=7,DEFINITION=8,TEXT=9,BIG=10,LONG=11,STRETCHY=12,MATRIX=13;var AMsqrt={input:"\\sqrt",tag:"msqrt",output:"sqrt",ttype:UNARY},AMroot={input:"\\root",tag:"mroot",output:"root",ttype:BINARY},AMfrac={input:"\\frac",tag:"mfrac",output:"/",ttype:BINARY},AMover={input:"\\stackrel",tag:"mover",output:"stackrel",ttype:BINARY},AMatop={input:"\\atop",tag:"mfrac",output:"",ttype:INFIX},AMchoose={input:"\\choose",tag:"mfrac",output:"",ttype:INFIX},AMsub={input:"_",tag:"msub",output:"_",ttype:INFIX},AMsup={input:"^",tag:"msup",output:"^",ttype:INFIX},AMtext={input:"\\mathrm",tag:"mtext",output:"text",ttype:TEXT},AMmbox={input:"\\mbox",tag:"mtext",output:"mbox",ttype:TEXT};var AMsymbols=[{input:"\\alpha",tag:"mi",output:"\u03B1",ttype:CONST},{input:"\\beta",tag:"mi",output:"\u03B2",ttype:CONST},{input:"\\gamma",tag:"mi",output:"\u03B3",ttype:CONST},{input:"\\delta",tag:"mi",output:"\u03B4",ttype:CONST},{input:"\\epsilon",tag:"mi",output:"\u03B5",ttype:CONST},{input:"\\varepsilon",tag:"mi",output:"\u025B",ttype:CONST},{input:"\\zeta",tag:"mi",output:"\u03B6",ttype:CONST},{input:"\\eta",tag:"mi",output:"\u03B7",ttype:CONST},{input:"\\theta",tag:"mi",output:"\u03B8",ttype:CONST},{input:"\\vartheta",tag:"mi",output:"\u03D1",ttype:CONST},{input:"\\iota",tag:"mi",output:"\u03B9",ttype:CONST},{input:"\\kappa",tag:"mi",output:"\u03BA",ttype:CONST},{input:"\\lambda",tag:"mi",output:"\u03BB",ttype:CONST},{input:"\\mu",tag:"mi",output:"\u03BC",ttype:CONST},{input:"\\nu",tag:"mi",output:"\u03BD",ttype:CONST},{input:"\\xi",tag:"mi",output:"\u03BE",ttype:CONST},{input:"\\pi",tag:"mi",output:"\u03C0",ttype:CONST},{input:"\\varpi",tag:"mi",output:"\u03D6",ttype:CONST},{input:"\\rho",tag:"mi",output:"\u03C1",ttype:CONST},{input:"\\varrho",tag:"mi",output:"\u03F1",ttype:CONST},{input:"\\varsigma",tag:"mi",output:"\u03C2",ttype:CONST},{input:"\\sigma",tag:"mi",output:"\u03C3",ttype:CONST},{input:"\\tau",tag:"mi",output:"\u03C4",ttype:CONST},{input:"\\upsilon",tag:"mi",output:"\u03C5",ttype:CONST},{input:"\\phi",tag:"mi",output:"\u03C6",ttype:CONST},{input:"\\varphi",tag:"mi",output:"\u03D5",ttype:CONST},{input:"\\chi",tag:"mi",output:"\u03C7",ttype:CONST},{input:"\\psi",tag:"mi",output:"\u03C8",ttype:CONST},{input:"\\omega",tag:"mi",output:"\u03C9",ttype:CONST},{input:"\\Gamma",tag:"mo",output:"\u0393",ttype:CONST},{input:"\\Delta",tag:"mo",output:"\u0394",ttype:CONST},{input:"\\Theta",tag:"mo",output:"\u0398",ttype:CONST},{input:"\\Lambda",tag:"mo",output:"\u039B",ttype:CONST},{input:"\\Xi",tag:"mo",output:"\u039E",ttype:CONST},{input:"\\Pi",tag:"mo",output:"\u03A0",ttype:CONST},{input:"\\Sigma",tag:"mo",output:"\u03A3",ttype:CONST},{input:"\\Upsilon",tag:"mo",output:"\u03A5",ttype:CONST},{input:"\\Phi",tag:"mo",output:"\u03A6",ttype:CONST},{input:"\\Psi",tag:"mo",output:"\u03A8",ttype:CONST},{input:"\\Omega",tag:"mo",output:"\u03A9",ttype:CONST},{input:"\\frac12",tag:"mo",output:"\u00BD",ttype:CONST},{input:"\\frac14",tag:"mo",output:"\u00BC",ttype:CONST},{input:"\\frac34",tag:"mo",output:"\u00BE",ttype:CONST},{input:"\\frac13",tag:"mo",output:"\u2153",ttype:CONST},{input:"\\frac23",tag:"mo",output:"\u2154",ttype:CONST},{input:"\\frac15",tag:"mo",output:"\u2155",ttype:CONST},{input:"\\frac25",tag:"mo",output:"\u2156",ttype:CONST},{input:"\\frac35",tag:"mo",output:"\u2157",ttype:CONST},{input:"\\frac45",tag:"mo",output:"\u2158",ttype:CONST},{input:"\\frac16",tag:"mo",output:"\u2159",ttype:CONST},{input:"\\frac56",tag:"mo",output:"\u215A",ttype:CONST},{input:"\\frac18",tag:"mo",output:"\u215B",ttype:CONST},{input:"\\frac38",tag:"mo",output:"\u215C",ttype:CONST},{input:"\\frac58",tag:"mo",output:"\u215D",ttype:CONST},{input:"\\frac78",tag:"mo",output:"\u215E",ttype:CONST},{input:"\\pm",tag:"mo",output:"\u00B1",ttype:CONST},{input:"\\mp",tag:"mo",output:"\u2213",ttype:CONST},{input:"\\triangleleft",tag:"mo",output:"\u22B2",ttype:CONST},{input:"\\triangleright",tag:"mo",output:"\u22B3",ttype:CONST},{input:"\\cdot",tag:"mo",output:"\u22C5",ttype:CONST},{input:"\\star",tag:"mo",output:"\u22C6",ttype:CONST},{input:"\\ast",tag:"mo",output:"\u002A",ttype:CONST},{input:"\\times",tag:"mo",output:"\u00D7",ttype:CONST},{input:"\\div",tag:"mo",output:"\u00F7",ttype:CONST},{input:"\\circ",tag:"mo",output:"\u2218",ttype:CONST},{input:"\\bullet",tag:"mo",output:"\u2022",ttype:CONST},{input:"\\oplus",tag:"mo",output:"\u2295",ttype:CONST},{input:"\\ominus",tag:"mo",output:"\u2296",ttype:CONST},{input:"\\otimes",tag:"mo",output:"\u2297",ttype:CONST},{input:"\\bigcirc",tag:"mo",output:"\u25CB",ttype:CONST},{input:"\\oslash",tag:"mo",output:"\u2298",ttype:CONST},{input:"\\odot",tag:"mo",output:"\u2299",ttype:CONST},{input:"\\land",tag:"mo",output:"\u2227",ttype:CONST},{input:"\\wedge",tag:"mo",output:"\u2227",ttype:CONST},{input:"\\lor",tag:"mo",output:"\u2228",ttype:CONST},{input:"\\vee",tag:"mo",output:"\u2228",ttype:CONST},{input:"\\cap",tag:"mo",output:"\u2229",ttype:CONST},{input:"\\cup",tag:"mo",output:"\u222A",ttype:CONST},{input:"\\sqcap",tag:"mo",output:"\u2293",ttype:CONST},{input:"\\sqcup",tag:"mo",output:"\u2294",ttype:CONST},{input:"\\uplus",tag:"mo",output:"\u228E",ttype:CONST},{input:"\\amalg",tag:"mo",output:"\u2210",ttype:CONST},{input:"\\bigtriangleup",tag:"mo",output:"\u25B3",ttype:CONST},{input:"\\bigtriangledown",tag:"mo",output:"\u25BD",ttype:CONST},{input:"\\dag",tag:"mo",output:"\u2020",ttype:CONST},{input:"\\dagger",tag:"mo",output:"\u2020",ttype:CONST},{input:"\\ddag",tag:"mo",output:"\u2021",ttype:CONST},{input:"\\ddagger",tag:"mo",output:"\u2021",ttype:CONST},{input:"\\lhd",tag:"mo",output:"\u22B2",ttype:CONST},{input:"\\rhd",tag:"mo",output:"\u22B3",ttype:CONST},{input:"\\unlhd",tag:"mo",output:"\u22B4",ttype:CONST},{input:"\\unrhd",tag:"mo",output:"\u22B5",ttype:CONST},{input:"\\sum",tag:"mo",output:"\u2211",ttype:UNDEROVER},{input:"\\prod",tag:"mo",output:"\u220F",ttype:UNDEROVER},{input:"\\bigcap",tag:"mo",output:"\u22C2",ttype:UNDEROVER},{input:"\\bigcup",tag:"mo",output:"\u22C3",ttype:UNDEROVER},{input:"\\bigwedge",tag:"mo",output:"\u22C0",ttype:UNDEROVER},{input:"\\bigvee",tag:"mo",output:"\u22C1",ttype:UNDEROVER},{input:"\\bigsqcap",tag:"mo",output:"\u2A05",ttype:UNDEROVER},{input:"\\bigsqcup",tag:"mo",output:"\u2A06",ttype:UNDEROVER},{input:"\\coprod",tag:"mo",output:"\u2210",ttype:UNDEROVER},{input:"\\bigoplus",tag:"mo",output:"\u2A01",ttype:UNDEROVER},{input:"\\bigotimes",tag:"mo",output:"\u2A02",ttype:UNDEROVER},{input:"\\bigodot",tag:"mo",output:"\u2A00",ttype:UNDEROVER},{input:"\\biguplus",tag:"mo",output:"\u2A04",ttype:UNDEROVER},{input:"\\int",tag:"mo",output:"\u222B",ttype:CONST},{input:"\\oint",tag:"mo",output:"\u222E",ttype:CONST},{input:":=",tag:"mo",output:":=",ttype:CONST},{input:"\\lt",tag:"mo",output:"<",ttype:CONST},{input:"\\gt",tag:"mo",output:">",ttype:CONST},{input:"\\ne",tag:"mo",output:"\u2260",ttype:CONST},{input:"\\neq",tag:"mo",output:"\u2260",ttype:CONST},{input:"\\le",tag:"mo",output:"\u2264",ttype:CONST},{input:"\\leq",tag:"mo",output:"\u2264",ttype:CONST},{input:"\\leqslant",tag:"mo",output:"\u2264",ttype:CONST},{input:"\\ge",tag:"mo",output:"\u2265",ttype:CONST},{input:"\\geq",tag:"mo",output:"\u2265",ttype:CONST},{input:"\\geqslant",tag:"mo",output:"\u2265",ttype:CONST},{input:"\\equiv",tag:"mo",output:"\u2261",ttype:CONST},{input:"\\ll",tag:"mo",output:"\u226A",ttype:CONST},{input:"\\gg",tag:"mo",output:"\u226B",ttype:CONST},{input:"\\doteq",tag:"mo",output:"\u2250",ttype:CONST},{input:"\\prec",tag:"mo",output:"\u227A",ttype:CONST},{input:"\\succ",tag:"mo",output:"\u227B",ttype:CONST},{input:"\\preceq",tag:"mo",output:"\u227C",ttype:CONST},{input:"\\succeq",tag:"mo",output:"\u227D",ttype:CONST},{input:"\\subset",tag:"mo",output:"\u2282",ttype:CONST},{input:"\\supset",tag:"mo",output:"\u2283",ttype:CONST},{input:"\\subseteq",tag:"mo",output:"\u2286",ttype:CONST},{input:"\\supseteq",tag:"mo",output:"\u2287",ttype:CONST},{input:"\\sqsubset",tag:"mo",output:"\u228F",ttype:CONST},{input:"\\sqsupset",tag:"mo",output:"\u2290",ttype:CONST},{input:"\\sqsubseteq",tag:"mo",output:"\u2291",ttype:CONST},{input:"\\sqsupseteq",tag:"mo",output:"\u2292",ttype:CONST},{input:"\\sim",tag:"mo",output:"\u223C",ttype:CONST},{input:"\\simeq",tag:"mo",output:"\u2243",ttype:CONST},{input:"\\approx",tag:"mo",output:"\u2248",ttype:CONST},{input:"\\cong",tag:"mo",output:"\u2245",ttype:CONST},{input:"\\Join",tag:"mo",output:"\u22C8",ttype:CONST},{input:"\\bowtie",tag:"mo",output:"\u22C8",ttype:CONST},{input:"\\in",tag:"mo",output:"\u2208",ttype:CONST},{input:"\\ni",tag:"mo",output:"\u220B",ttype:CONST},{input:"\\owns",tag:"mo",output:"\u220B",ttype:CONST},{input:"\\propto",tag:"mo",output:"\u221D",ttype:CONST},{input:"\\vdash",tag:"mo",output:"\u22A2",ttype:CONST},{input:"\\dashv",tag:"mo",output:"\u22A3",ttype:CONST},{input:"\\models",tag:"mo",output:"\u22A8",ttype:CONST},{input:"\\perp",tag:"mo",output:"\u22A5",ttype:CONST},{input:"\\smile",tag:"mo",output:"\u2323",ttype:CONST},{input:"\\frown",tag:"mo",output:"\u2322",ttype:CONST},{input:"\\asymp",tag:"mo",output:"\u224D",ttype:CONST},{input:"\\notin",tag:"mo",output:"\u2209",ttype:CONST},{input:"\\begin{eqnarray}",output:"X",ttype:MATRIX,invisible:true},{input:"\\begin{array}",output:"X",ttype:MATRIX,invisible:true},{input:"\\\\",output:"}&{",ttype:DEFINITION},{input:"\\end{eqnarray}",output:"}}",ttype:DEFINITION},{input:"\\end{array}",output:"}}",ttype:DEFINITION},{input:"\\big",tag:"mo",output:"X",atval:"1.2",ieval:"2.2",ttype:BIG},{input:"\\Big",tag:"mo",output:"X",atval:"1.6",ieval:"2.6",ttype:BIG},{input:"\\bigg",tag:"mo",output:"X",atval:"2.2",ieval:"3.2",ttype:BIG},{input:"\\Bigg",tag:"mo",output:"X",atval:"2.9",ieval:"3.9",ttype:BIG},{input:"\\left",tag:"mo",output:"X",ttype:LEFTBRACKET},{input:"\\right",tag:"mo",output:"X",ttype:RIGHTBRACKET},{input:"{",output:"{",ttype:LEFTBRACKET,invisible:true},{input:"}",output:"}",ttype:RIGHTBRACKET,invisible:true},{input:"(",tag:"mo",output:"(",atval:"1",ttype:STRETCHY},{input:"[",tag:"mo",output:"[",atval:"1",ttype:STRETCHY},{input:"\\lbrack",tag:"mo",output:"[",atval:"1",ttype:STRETCHY},{input:"\\{",tag:"mo",output:"{",atval:"1",ttype:STRETCHY},{input:"\\lbrace",tag:"mo",output:"{",atval:"1",ttype:STRETCHY},{input:"\\langle",tag:"mo",output:"\u2329",atval:"1",ttype:STRETCHY},{input:"\\lfloor",tag:"mo",output:"\u230A",atval:"1",ttype:STRETCHY},{input:"\\lceil",tag:"mo",output:"\u2308",atval:"1",ttype:STRETCHY},{input:")",tag:"mo",output:")",rtag:"mi",atval:"1",ttype:STRETCHY},{input:"]",tag:"mo",output:"]",rtag:"mi",atval:"1",ttype:STRETCHY},{input:"\\rbrack",tag:"mo",output:"]",rtag:"mi",atval:"1",ttype:STRETCHY},{input:"\\}",tag:"mo",output:"}",rtag:"mi",atval:"1",ttype:STRETCHY},{input:"\\rbrace",tag:"mo",output:"}",rtag:"mi",atval:"1",ttype:STRETCHY},{input:"\\rangle",tag:"mo",output:"\u232A",rtag:"mi",atval:"1",ttype:STRETCHY},{input:"\\rfloor",tag:"mo",output:"\u230B",rtag:"mi",atval:"1",ttype:STRETCHY},{input:"\\rceil",tag:"mo",output:"\u2309",rtag:"mi",atval:"1",ttype:STRETCHY},{input:"|",tag:"mo",output:"\u2223",atval:"1",ttype:STRETCHY},{input:"\\|",tag:"mo",output:"\u2225",atval:"1",ttype:STRETCHY},{input:"\\vert",tag:"mo",output:"\u2223",atval:"1",ttype:STRETCHY},{input:"\\Vert",tag:"mo",output:"\u2225",atval:"1",ttype:STRETCHY},{input:"\\mid",tag:"mo",output:"\u2223",atval:"1",ttype:STRETCHY},{input:"\\parallel",tag:"mo",output:"\u2225",atval:"1",ttype:STRETCHY},{input:"/",tag:"mo",output:"/",atval:"1.01",ttype:STRETCHY},{input:"\\backslash",tag:"mo",output:"\u2216",atval:"1",ttype:STRETCHY},{input:"\\setminus",tag:"mo",output:"\\",ttype:CONST},{input:"\\!",tag:"mspace",atname:"width",atval:"-0.167em",ttype:SPACE},{input:"\\,",tag:"mspace",atname:"width",atval:"0.167em",ttype:SPACE},{input:"\\>",tag:"mspace",atname:"width",atval:"0.222em",ttype:SPACE},{input:"\\:",tag:"mspace",atname:"width",atval:"0.222em",ttype:SPACE},{input:"\\;",tag:"mspace",atname:"width",atval:"0.278em",ttype:SPACE},{input:"~",tag:"mspace",atname:"width",atval:"0.333em",ttype:SPACE},{input:"\\quad",tag:"mspace",atname:"width",atval:"1em",ttype:SPACE},{input:"\\qquad",tag:"mspace",atname:"width",atval:"2em",ttype:SPACE},{input:"\\prime",tag:"mo",output:"\u2032",ttype:CONST},{input:"'",tag:"mo",output:"\u02B9",ttype:CONST},{input:"''",tag:"mo",output:"\u02BA",ttype:CONST},{input:"'''",tag:"mo",output:"\u2034",ttype:CONST},{input:"''''",tag:"mo",output:"\u2057",ttype:CONST},{input:"\\ldots",tag:"mo",output:"\u2026",ttype:CONST},{input:"\\cdots",tag:"mo",output:"\u22EF",ttype:CONST},{input:"\\vdots",tag:"mo",output:"\u22EE",ttype:CONST},{input:"\\ddots",tag:"mo",output:"\u22F1",ttype:CONST},{input:"\\forall",tag:"mo",output:"\u2200",ttype:CONST},{input:"\\exists",tag:"mo",output:"\u2203",ttype:CONST},{input:"\\Re",tag:"mo",output:"\u211C",ttype:CONST},{input:"\\Im",tag:"mo",output:"\u2111",ttype:CONST},{input:"\\aleph",tag:"mo",output:"\u2135",ttype:CONST},{input:"\\hbar",tag:"mo",output:"\u210F",ttype:CONST},{input:"\\ell",tag:"mo",output:"\u2113",ttype:CONST},{input:"\\wp",tag:"mo",output:"\u2118",ttype:CONST},{input:"\\emptyset",tag:"mo",output:"\u2205",ttype:CONST},{input:"\\infty",tag:"mo",output:"\u221E",ttype:CONST},{input:"\\surd",tag:"mo",output:"\\sqrt{}",ttype:DEFINITION},{input:"\\partial",tag:"mo",output:"\u2202",ttype:CONST},{input:"\\nabla",tag:"mo",output:"\u2207",ttype:CONST},{input:"\\triangle",tag:"mo",output:"\u25B3",ttype:CONST},{input:"\\therefore",tag:"mo",output:"\u2234",ttype:CONST},{input:"\\angle",tag:"mo",output:"\u2220",ttype:CONST},{input:"\\diamond",tag:"mo",output:"\u22C4",ttype:CONST},{input:"\\Diamond",tag:"mo",output:"\u25C7",ttype:CONST},{input:"\\neg",tag:"mo",output:"\u00AC",ttype:CONST},{input:"\\lnot",tag:"mo",output:"\u00AC",ttype:CONST},{input:"\\bot",tag:"mo",output:"\u22A5",ttype:CONST},{input:"\\top",tag:"mo",output:"\u22A4",ttype:CONST},{input:"\\square",tag:"mo",output:"\u25AB",ttype:CONST},{input:"\\Box",tag:"mo",output:"\u25A1",ttype:CONST},{input:"\\wr",tag:"mo",output:"\u2240",ttype:CONST},{input:"\\arccos",tag:"mi",output:"arccos",ttype:UNARY,func:true},{input:"\\arcsin",tag:"mi",output:"arcsin",ttype:UNARY,func:true},{input:"\\arctan",tag:"mi",output:"arctan",ttype:UNARY,func:true},{input:"\\arg",tag:"mi",output:"arg",ttype:UNARY,func:true},{input:"\\cos",tag:"mi",output:"cos",ttype:UNARY,func:true},{input:"\\cosh",tag:"mi",output:"cosh",ttype:UNARY,func:true},{input:"\\cot",tag:"mi",output:"cot",ttype:UNARY,func:true},{input:"\\coth",tag:"mi",output:"coth",ttype:UNARY,func:true},{input:"\\csc",tag:"mi",output:"csc",ttype:UNARY,func:true},{input:"\\deg",tag:"mi",output:"deg",ttype:UNARY,func:true},{input:"\\det",tag:"mi",output:"det",ttype:UNARY,func:true},{input:"\\dim",tag:"mi",output:"dim",ttype:UNARY,func:true},{input:"\\exp",tag:"mi",output:"exp",ttype:UNARY,func:true},{input:"\\gcd",tag:"mi",output:"gcd",ttype:UNARY,func:true},{input:"\\hom",tag:"mi",output:"hom",ttype:UNARY,func:true},{input:"\\inf",tag:"mo",output:"inf",ttype:UNDEROVER},{input:"\\ker",tag:"mi",output:"ker",ttype:UNARY,func:true},{input:"\\lg",tag:"mi",output:"lg",ttype:UNARY,func:true},{input:"\\lim",tag:"mo",output:"lim",ttype:UNDEROVER},{input:"\\liminf",tag:"mo",output:"liminf",ttype:UNDEROVER},{input:"\\limsup",tag:"mo",output:"limsup",ttype:UNDEROVER},{input:"\\ln",tag:"mi",output:"ln",ttype:UNARY,func:true},{input:"\\log",tag:"mi",output:"log",ttype:UNARY,func:true},{input:"\\max",tag:"mo",output:"max",ttype:UNDEROVER},{input:"\\min",tag:"mo",output:"min",ttype:UNDEROVER},{input:"\\Pr",tag:"mi",output:"Pr",ttype:UNARY,func:true},{input:"\\sec",tag:"mi",output:"sec",ttype:UNARY,func:true},{input:"\\sin",tag:"mi",output:"sin",ttype:UNARY,func:true},{input:"\\sinh",tag:"mi",output:"sinh",ttype:UNARY,func:true},{input:"\\sup",tag:"mo",output:"sup",ttype:UNDEROVER},{input:"\\tan",tag:"mi",output:"tan",ttype:UNARY,func:true},{input:"\\tanh",tag:"mi",output:"tanh",ttype:UNARY,func:true},{input:"\\gets",tag:"mo",output:"\u2190",ttype:CONST},{input:"\\leftarrow",tag:"mo",output:"\u2190",ttype:CONST},{input:"\\to",tag:"mo",output:"\u2192",ttype:CONST},{input:"\\rightarrow",tag:"mo",output:"\u2192",ttype:CONST},{input:"\\leftrightarrow",tag:"mo",output:"\u2194",ttype:CONST},{input:"\\uparrow",tag:"mo",output:"\u2191",ttype:CONST},{input:"\\downarrow",tag:"mo",output:"\u2193",ttype:CONST},{input:"\\updownarrow",tag:"mo",output:"\u2195",ttype:CONST},{input:"\\Leftarrow",tag:"mo",output:"\u21D0",ttype:CONST},{input:"\\Rightarrow",tag:"mo",output:"\u21D2",ttype:CONST},{input:"\\Leftrightarrow",tag:"mo",output:"\u21D4",ttype:CONST},{input:"\\iff",tag:"mo",output:"~\\Longleftrightarrow~",ttype:DEFINITION},{input:"\\Uparrow",tag:"mo",output:"\u21D1",ttype:CONST},{input:"\\Downarrow",tag:"mo",output:"\u21D3",ttype:CONST},{input:"\\Updownarrow",tag:"mo",output:"\u21D5",ttype:CONST},{input:"\\mapsto",tag:"mo",output:"\u21A6",ttype:CONST},{input:"\\longleftarrow",tag:"mo",output:"\u2190",ttype:LONG},{input:"\\longrightarrow",tag:"mo",output:"\u2192",ttype:LONG},{input:"\\longleftrightarrow",tag:"mo",output:"\u2194",ttype:LONG},{input:"\\Longleftarrow",tag:"mo",output:"\u21D0",ttype:LONG},{input:"\\Longrightarrow",tag:"mo",output:"\u21D2",ttype:LONG},{input:"\\Longleftrightarrow",tag:"mo",output:"\u21D4",ttype:LONG},{input:"\\longmapsto",tag:"mo",output:"\u21A6",ttype:CONST},AMsqrt,AMroot,AMfrac,AMover,AMsub,AMsup,AMtext,AMmbox,AMatop,AMchoose,{input:"\\acute",tag:"mover",output:"\u00B4",ttype:UNARY,acc:true},{input:"\\grave",tag:"mover",output:"\u0060",ttype:UNARY,acc:true},{input:"\\breve",tag:"mover",output:"\u02D8",ttype:UNARY,acc:true},{input:"\\check",tag:"mover",output:"\u02C7",ttype:UNARY,acc:true},{input:"\\dot",tag:"mover",output:".",ttype:UNARY,acc:true},{input:"\\ddot",tag:"mover",output:"..",ttype:UNARY,acc:true},{input:"\\mathring",tag:"mover",output:"\u00B0",ttype:UNARY,acc:true},{input:"\\vec",tag:"mover",output:"\u20D7",ttype:UNARY,acc:true},{input:"\\overrightarrow",tag:"mover",output:"\u20D7",ttype:UNARY,acc:true},{input:"\\overleftarrow",tag:"mover",output:"\u20D6",ttype:UNARY,acc:true},{input:"\\hat",tag:"mover",output:"\u005E",ttype:UNARY,acc:true},{input:"\\widehat",tag:"mover",output:"\u0302",ttype:UNARY,acc:true},{input:"\\tilde",tag:"mover",output:"~",ttype:UNARY,acc:true},{input:"\\widetilde",tag:"mover",output:"\u02DC",ttype:UNARY,acc:true},{input:"\\bar",tag:"mover",output:"\u203E",ttype:UNARY,acc:true},{input:"\\overbrace",tag:"mover",output:"\uFE37",ttype:UNARY,acc:true},{input:"\\overbracket",tag:"mover",output:"\u23B4",ttype:UNARY,acc:true},{input:"\\overline",tag:"mover",output:"\u00AF",ttype:UNARY,acc:true},{input:"\\underbrace",tag:"munder",output:"\uFE38",ttype:UNARY,acc:true},{input:"\\underbracket",tag:"munder",output:"\u23B5",ttype:UNARY,acc:true},{input:"\\underline",tag:"munder",output:"\u00AF",ttype:UNARY,acc:true},{input:"\\displaystyle",tag:"mstyle",atname:"displaystyle",atval:"true",ttype:UNARY},{input:"\\textstyle",tag:"mstyle",atname:"displaystyle",atval:"false",ttype:UNARY},{input:"\\scriptstyle",tag:"mstyle",atname:"scriptlevel",atval:"1",ttype:UNARY},{input:"\\scriptscriptstyle",tag:"mstyle",atname:"scriptlevel",atval:"2",ttype:UNARY},{input:"\\textrm",tag:"mstyle",output:"\\mathrm",ttype:DEFINITION},{input:"\\mathbf",tag:"mstyle",atname:"mathvariant",atval:"bold",ttype:UNARY},{input:"\\textbf",tag:"mstyle",atname:"mathvariant",atval:"bold",ttype:UNARY},{input:"\\mathit",tag:"mstyle",atname:"mathvariant",atval:"italic",ttype:UNARY},{input:"\\textit",tag:"mstyle",atname:"mathvariant",atval:"italic",ttype:UNARY},{input:"\\mathtt",tag:"mstyle",atname:"mathvariant",atval:"monospace",ttype:UNARY},{input:"\\texttt",tag:"mstyle",atname:"mathvariant",atval:"monospace",ttype:UNARY},{input:"\\mathsf",tag:"mstyle",atname:"mathvariant",atval:"sans-serif",ttype:UNARY},{input:"\\mathbb",tag:"mstyle",atname:"mathvariant",atval:"double-struck",ttype:UNARY,codes:AMbbb},{input:"\\mathcal",tag:"mstyle",atname:"mathvariant",atval:"script",ttype:UNARY,codes:AMcal},{input:"\\mathfrak",tag:"mstyle",atname:"mathvariant",atval:"fraktur",ttype:UNARY,codes:AMfrk},{input:"\\textcolor",tag:"mstyle",atname:"mathvariant",atval:"mathcolor",ttype:BINARY},{input:"\\colorbox",tag:"mstyle",atname:"mathvariant",atval:"background",ttype:BINARY}];function compareNames(s1,s2){if(s1.input>s2.input)return 1 -else return-1;} -var AMnames=[];function AMinitSymbols(){AMsymbols.sort(compareNames);for(i=0;i<AMsymbols.length;i++)AMnames[i]=AMsymbols[i].input;} -var AMmathml="http://www.w3.org/1998/Math/MathML";function AMcreateElementMathML(t){if(isIE)return document.createElement("m:"+t);else return document.createElementNS(AMmathml,t);} -function AMcreateMmlNode(t,frag){if(isIE)var node=document.createElement("m:"+t);else var node=document.createElementNS(AMmathml,t);node.appendChild(frag);return node;} -function newcommand(oldstr,newstr){AMsymbols=AMsymbols.concat([{input:oldstr,tag:"mo",output:newstr,ttype:DEFINITION}]);} -function AMremoveCharsAndBlanks(str,n){var st;st=str.slice(n);for(var i=0;i<st.length&&st.charCodeAt(i)<=32;i=i+1);return st.slice(i);} -function AMposition(arr,str,n){if(n==0){var h,m;n=-1;h=arr.length;while(n+1<h){m=(n+h)>>1;if(arr[m]<str)n=m;else h=m;} -return h;}else -for(var i=n;i<arr.length&&arr[i]<str;i++);return i;} -function AMgetSymbol(str){var k=0;var j=0;var mk;var st;var tagst;var match="";var more=true;for(var i=1;i<=str.length&&more;i++){st=str.slice(0,i);j=k;k=AMposition(AMnames,st,j);if(k<AMnames.length&&str.slice(0,AMnames[k].length)==AMnames[k]){match=AMnames[k];mk=k;i=match.length;} -more=k<AMnames.length&&str.slice(0,AMnames[k].length)>=AMnames[k];} -AMpreviousSymbol=AMcurrentSymbol;if(match!=""){AMcurrentSymbol=AMsymbols[mk].ttype;return AMsymbols[mk];} -AMcurrentSymbol=CONST;k=1;st=str.slice(0,1);if("0"<=st&&st<="9")tagst="mn";else tagst=(("A">st||st>"Z")&&("a">st||st>"z")?"mo":"mi");return{input:st,tag:tagst,output:st,ttype:CONST};} -var AMpreviousSymbol,AMcurrentSymbol;function AMparseSexpr(str){var symbol,node,result,result2,i,st,newFrag=document.createDocumentFragment();str=AMremoveCharsAndBlanks(str,0);symbol=AMgetSymbol(str);if(symbol==null||symbol.ttype==RIGHTBRACKET) -return[null,str,null];if(symbol.ttype==DEFINITION){str=symbol.output+AMremoveCharsAndBlanks(str,symbol.input.length);symbol=AMgetSymbol(str);if(symbol==null||symbol.ttype==RIGHTBRACKET) -return[null,str,null];} -str=AMremoveCharsAndBlanks(str,symbol.input.length);switch(symbol.ttype){case SPACE:node=AMcreateElementMathML(symbol.tag);node.setAttribute(symbol.atname,symbol.atval);return[node,str,symbol.tag];case UNDEROVER:if(isIE){if(symbol.input.substr(0,4)=="\\big"){str="\\"+symbol.input.substr(4)+str;symbol=AMgetSymbol(str);symbol.ttype=UNDEROVER;str=AMremoveCharsAndBlanks(str,symbol.input.length);}} -return[AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output)),str,symbol.tag];case CONST:var output=symbol.output;if(isIE){if(symbol.input=="'") -output="\u2032";else if(symbol.input=="''") -output="\u2033";else if(symbol.input=="'''") -output="\u2033\u2032";else if(symbol.input=="''''") -output="\u2033\u2033";else if(symbol.input=="\\square") -output="\u25A1";else if(symbol.input.substr(0,5)=="\\frac"){var denom=symbol.input.substr(6,1);if(denom=="5"||denom=="6"){str=symbol.input.replace(/\\frac/,"\\frac ")+str;return[node,str,symbol.tag];}}} -node=AMcreateMmlNode(symbol.tag,document.createTextNode(output));return[node,str,symbol.tag];case LONG:node=AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output));node.setAttribute("minsize","1.5");node.setAttribute("maxsize","1.5");node=AMcreateMmlNode("mover",node);node.appendChild(AMcreateElementMathML("mspace"));return[node,str,symbol.tag];case STRETCHY:if(isIE&&symbol.input=="\\backslash") -symbol.output="\\";node=AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output));if(symbol.input=="|"||symbol.input=="\\vert"||symbol.input=="\\|"||symbol.input=="\\Vert"){node.setAttribute("lspace","0em");node.setAttribute("rspace","0em");} -node.setAttribute("maxsize",symbol.atval);if(symbol.rtag!=null) -return[node,str,symbol.rtag];else -return[node,str,symbol.tag];case BIG:var atval=symbol.atval;if(isIE) -atval=symbol.ieval;symbol=AMgetSymbol(str);if(symbol==null) -return[null,str,null];str=AMremoveCharsAndBlanks(str,symbol.input.length);node=AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output));if(isIE){var space=AMcreateElementMathML("mspace");space.setAttribute("height",atval+"ex");node=AMcreateMmlNode("mrow",node);node.appendChild(space);}else{node.setAttribute("minsize",atval);node.setAttribute("maxsize",atval);} -return[node,str,symbol.tag];case LEFTBRACKET:if(symbol.input=="\\left"){symbol=AMgetSymbol(str);if(symbol!=null){if(symbol.input==".") -symbol.invisible=true;str=AMremoveCharsAndBlanks(str,symbol.input.length);}} -result=AMparseExpr(str,true,false);if(symbol==null||(typeof symbol.invisible=="boolean"&&symbol.invisible)) -node=AMcreateMmlNode("mrow",result[0]);else{node=AMcreateMmlNode("mo",document.createTextNode(symbol.output));node=AMcreateMmlNode("mrow",node);node.appendChild(result[0]);} -return[node,result[1],result[2]];case MATRIX:if(symbol.input=="\\begin{array}"){var mask="";symbol=AMgetSymbol(str);str=AMremoveCharsAndBlanks(str,0);if(symbol==null) -mask="l";else{str=AMremoveCharsAndBlanks(str,symbol.input.length);if(symbol.input!="{") -mask="l";else do{symbol=AMgetSymbol(str);if(symbol!=null){str=AMremoveCharsAndBlanks(str,symbol.input.length);if(symbol.input!="}") -mask=mask+symbol.input;}}while(symbol!=null&&symbol.input!=""&&symbol.input!="}");} -result=AMparseExpr("{"+str,true,true);node=AMcreateMmlNode("mtable",result[0]);mask=mask.replace(/l/g,"left ");mask=mask.replace(/r/g,"right ");mask=mask.replace(/c/g,"center ");node.setAttribute("columnalign",mask);node.setAttribute("displaystyle","false");if(isIE) -return[node,result[1],null];var lspace=AMcreateElementMathML("mspace");lspace.setAttribute("width","0.167em");var rspace=AMcreateElementMathML("mspace");rspace.setAttribute("width","0.167em");var node1=AMcreateMmlNode("mrow",lspace);node1.appendChild(node);node1.appendChild(rspace);return[node1,result[1],null];}else{result=AMparseExpr("{"+str,true,true);node=AMcreateMmlNode("mtable",result[0]);if(isIE) -node.setAttribute("columnspacing","0.25em");else -node.setAttribute("columnspacing","0.167em");node.setAttribute("columnalign","right center left");node.setAttribute("displaystyle","true");node=AMcreateMmlNode("mrow",node);return[node,result[1],null];} -case TEXT:if(str.charAt(0)=="{")i=str.indexOf("}");else i=0;if(i==-1) -i=str.length;st=str.slice(1,i);if(st.charAt(0)==" "){node=AMcreateElementMathML("mspace");node.setAttribute("width","0.33em");newFrag.appendChild(node);} -newFrag.appendChild(AMcreateMmlNode(symbol.tag,document.createTextNode(st)));if(st.charAt(st.length-1)==" "){node=AMcreateElementMathML("mspace");node.setAttribute("width","0.33em");newFrag.appendChild(node);} -str=AMremoveCharsAndBlanks(str,i+1);return[AMcreateMmlNode("mrow",newFrag),str,null];case UNARY:result=AMparseSexpr(str);if(result[0]==null)return[AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output)),str];if(typeof symbol.func=="boolean"&&symbol.func){st=str.charAt(0);if(st=="^"||st=="_"||st==","){return[AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output)),str,symbol.tag];}else{node=AMcreateMmlNode("mrow",AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output)));if(isIE){var space=AMcreateElementMathML("mspace");space.setAttribute("width","0.167em");node.appendChild(space);} -node.appendChild(result[0]);return[node,result[1],symbol.tag];}} -if(symbol.input=="\\sqrt"){if(isIE){var space=AMcreateElementMathML("mspace");space.setAttribute("height","1.2ex");space.setAttribute("width","0em");node=AMcreateMmlNode(symbol.tag,result[0]) -node.appendChild(space);return[node,result[1],symbol.tag];}else -return[AMcreateMmlNode(symbol.tag,result[0]),result[1],symbol.tag];}else if(typeof symbol.acc=="boolean"&&symbol.acc){node=AMcreateMmlNode(symbol.tag,result[0]);var output=symbol.output;if(isIE){if(symbol.input=="\\hat") -output="\u0302";else if(symbol.input=="\\widehat") -output="\u005E";else if(symbol.input=="\\bar") -output="\u00AF";else if(symbol.input=="\\grave") -output="\u0300";else if(symbol.input=="\\tilde") -output="\u0303";} -var node1=AMcreateMmlNode("mo",document.createTextNode(output));if(symbol.input=="\\vec"||symbol.input=="\\check") -node1.setAttribute("maxsize","1.2");if(isIE&&symbol.input=="\\bar") -node1.setAttribute("maxsize","0.5");if(symbol.input=="\\underbrace"||symbol.input=="\\underline") -node1.setAttribute("accentunder","true");else -node1.setAttribute("accent","true");node.appendChild(node1);if(symbol.input=="\\overbrace"||symbol.input=="\\underbrace") -node.ttype=UNDEROVER;return[node,result[1],symbol.tag];}else{if(!isIE&&typeof symbol.codes!="undefined"){for(i=0;i<result[0].childNodes.length;i++) -if(result[0].childNodes[i].nodeName=="mi"||result[0].nodeName=="mi"){st=(result[0].nodeName=="mi"?result[0].firstChild.nodeValue:result[0].childNodes[i].firstChild.nodeValue);var newst=[];for(var j=0;j<st.length;j++) -if(st.charCodeAt(j)>64&&st.charCodeAt(j)<91)newst=newst+ -String.fromCharCode(symbol.codes[st.charCodeAt(j)-65]);else newst=newst+st.charAt(j);if(result[0].nodeName=="mi") -result[0]=AMcreateElementMathML("mo").appendChild(document.createTextNode(newst));else result[0].replaceChild(AMcreateElementMathML("mo").appendChild(document.createTextNode(newst)),result[0].childNodes[i]);}} -node=AMcreateMmlNode(symbol.tag,result[0]);node.setAttribute(symbol.atname,symbol.atval);if(symbol.input=="\\scriptstyle"||symbol.input=="\\scriptscriptstyle") -node.setAttribute("displaystyle","false");return[node,result[1],symbol.tag];} -case BINARY:result=AMparseSexpr(str);if(result[0]==null)return[AMcreateMmlNode("mo",document.createTextNode(symbol.input)),str,null];result2=AMparseSexpr(result[1]);if(result2[0]==null)return[AMcreateMmlNode("mo",document.createTextNode(symbol.input)),str,null];if(symbol.input=="\\textcolor"||symbol.input=="\\colorbox"){var tclr=str.match(/\{\s*([#\w]+)\s*\}/);str=str.replace(/\{\s*[#\w]+\s*\}/,"");if(tclr!=null){if(IsColorName.test(tclr[1].toLowerCase())){tclr=LaTeXColor[tclr[1].toLowerCase()];}else{tclr=tclr[1];} -node=AMcreateElementMathML("mstyle");node.setAttribute(symbol.atval,tclr);node.appendChild(result2[0]);return[node,result2[1],symbol.tag];}} -if(symbol.input=="\\root"||symbol.input=="\\stackrel")newFrag.appendChild(result2[0]);newFrag.appendChild(result[0]);if(symbol.input=="\\frac")newFrag.appendChild(result2[0]);return[AMcreateMmlNode(symbol.tag,newFrag),result2[1],symbol.tag];case INFIX:str=AMremoveCharsAndBlanks(str,symbol.input.length);return[AMcreateMmlNode("mo",document.createTextNode(symbol.output)),str,symbol.tag];default:return[AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output)),str,symbol.tag];}} -function AMparseIexpr(str){var symbol,sym1,sym2,node,result,tag,underover;str=AMremoveCharsAndBlanks(str,0);sym1=AMgetSymbol(str);result=AMparseSexpr(str);node=result[0];str=result[1];tag=result[2];symbol=AMgetSymbol(str);if(symbol.ttype==INFIX){str=AMremoveCharsAndBlanks(str,symbol.input.length);result=AMparseSexpr(str);if(result[0]==null) -result[0]=AMcreateMmlNode("mo",document.createTextNode("\u25A1"));str=result[1];tag=result[2];if(symbol.input=="_"||symbol.input=="^"){sym2=AMgetSymbol(str);tag=null;underover=((sym1.ttype==UNDEROVER)||(node.ttype==UNDEROVER));if(symbol.input=="_"&&sym2.input=="^"){str=AMremoveCharsAndBlanks(str,sym2.input.length);var res2=AMparseSexpr(str);str=res2[1];tag=res2[2];node=AMcreateMmlNode((underover?"munderover":"msubsup"),node);node.appendChild(result[0]);node.appendChild(res2[0]);}else if(symbol.input=="_"){node=AMcreateMmlNode((underover?"munder":"msub"),node);node.appendChild(result[0]);}else{node=AMcreateMmlNode((underover?"mover":"msup"),node);node.appendChild(result[0]);} -node=AMcreateMmlNode("mrow",node);}else{node=AMcreateMmlNode(symbol.tag,node);if(symbol.input=="\\atop"||symbol.input=="\\choose") -node.setAttribute("linethickness","0ex");node.appendChild(result[0]);if(symbol.input=="\\choose") -node=AMcreateMmlNode("mfenced",node);}} -return[node,str,tag];} -function AMparseExpr(str,rightbracket,matrix){var symbol,node,result,i,tag,newFrag=document.createDocumentFragment();do{str=AMremoveCharsAndBlanks(str,0);result=AMparseIexpr(str);node=result[0];str=result[1];tag=result[2];symbol=AMgetSymbol(str);if(node!=undefined){if((tag=="mn"||tag=="mi")&&symbol!=null&&typeof symbol.func=="boolean"&&symbol.func){var space=AMcreateElementMathML("mspace");space.setAttribute("width","0.167em");node=AMcreateMmlNode("mrow",node);node.appendChild(space);} -newFrag.appendChild(node);}}while((symbol.ttype!=RIGHTBRACKET)&&symbol!=null&&symbol.output!="");tag=null;if(symbol.ttype==RIGHTBRACKET){if(symbol.input=="\\right"){str=AMremoveCharsAndBlanks(str,symbol.input.length);symbol=AMgetSymbol(str);if(symbol!=null&&symbol.input==".") -symbol.invisible=true;if(symbol!=null) -tag=symbol.rtag;} -if(symbol!=null) -str=AMremoveCharsAndBlanks(str,symbol.input.length);var len=newFrag.childNodes.length;if(matrix&&len>0&&newFrag.childNodes[len-1].nodeName=="mrow"&&len>1&&newFrag.childNodes[len-2].nodeName=="mo"&&newFrag.childNodes[len-2].firstChild.nodeValue=="&"){var pos=[];var m=newFrag.childNodes.length;for(i=0;matrix&&i<m;i=i+2){pos[i]=[];node=newFrag.childNodes[i];for(var j=0;j<node.childNodes.length;j++) -if(node.childNodes[j].firstChild.nodeValue=="&") -pos[i][pos[i].length]=j;} -var row,frag,n,k,table=document.createDocumentFragment();for(i=0;i<m;i=i+2){row=document.createDocumentFragment();frag=document.createDocumentFragment();node=newFrag.firstChild;n=node.childNodes.length;k=0;for(j=0;j<n;j++){if(typeof pos[i][k]!="undefined"&&j==pos[i][k]){node.removeChild(node.firstChild);row.appendChild(AMcreateMmlNode("mtd",frag));k++;}else frag.appendChild(node.firstChild);} -row.appendChild(AMcreateMmlNode("mtd",frag));if(newFrag.childNodes.length>2){newFrag.removeChild(newFrag.firstChild);newFrag.removeChild(newFrag.firstChild);} -table.appendChild(AMcreateMmlNode("mtr",row));} -return[table,str];} -if(typeof symbol.invisible!="boolean"||!symbol.invisible){node=AMcreateMmlNode("mo",document.createTextNode(symbol.output));newFrag.appendChild(node);}} -return[newFrag,str,tag];} -function AMparseMath(str){var result,node=AMcreateElementMathML("mstyle");var cclr=str.match(/\\color\s*\{\s*([#\w]+)\s*\}/);str=str.replace(/\\color\s*\{\s*[#\w]+\s*\}/g,"");if(cclr!=null){if(IsColorName.test(cclr[1].toLowerCase())){cclr=LaTeXColor[cclr[1].toLowerCase()];}else{cclr=cclr[1];} -node.setAttribute("mathcolor",cclr);}else{if(mathcolor!="")node.setAttribute("mathcolor",mathcolor);};if(mathfontfamily!="")node.setAttribute("fontfamily",mathfontfamily);node.appendChild(AMparseExpr(str.replace(/^\s+/g,""),false,false)[0]);node=AMcreateMmlNode("math",node);if(showasciiformulaonhover) -node.setAttribute("title",str.replace(/\s+/g," "));if(false){var fnode=AMcreateElementXHTML("font");fnode.setAttribute("face",mathfontfamily);fnode.appendChild(node);return fnode;} -return node;} -function AMstrarr2docFrag(arr,linebreaks){var newFrag=document.createDocumentFragment();var expr=false;for(var i=0;i<arr.length;i++){if(expr)newFrag.appendChild(AMparseMath(arr[i]));else{var arri=(linebreaks?arr[i].split("\n\n"):[arr[i]]);newFrag.appendChild(AMcreateElementXHTML("span").appendChild(document.createTextNode(arri[0])));for(var j=1;j<arri.length;j++){newFrag.appendChild(AMcreateElementXHTML("p"));newFrag.appendChild(AMcreateElementXHTML("span").appendChild(document.createTextNode(arri[j])));}} -expr=!expr;} -return newFrag;} -function AMprocessNodeR(n,linebreaks){var mtch,str,arr,frg,i;if(n.childNodes.length==0){if((n.nodeType!=8||linebreaks)&&n.parentNode.nodeName!="form"&&n.parentNode.nodeName!="FORM"&&n.parentNode.nodeName!="textarea"&&n.parentNode.nodeName!="TEXTAREA"&&n.parentNode.nodeName!="pre"&&n.parentNode.nodeName!="PRE"){str=n.nodeValue;if(!(str==null)){str=str.replace(/\r\n\r\n/g,"\n\n");str=str.replace(/\x20+/g," ");str=str.replace(/\s*\r\n/g," ");mtch=(str.indexOf("\$")==-1?false:true);str=str.replace(/([^\\])\$/g,"$1 \$");str=str.replace(/^\$/," \$");arr=str.split(" \$");for(i=0;i<arr.length;i++) -arr[i]=arr[i].replace(/\\\$/g,"\$");if(arr.length>1||mtch){if(checkForMathML){checkForMathML=false;var nd=AMisMathMLavailable();AMnoMathML=nd!=null;if(AMnoMathML&¬ifyIfNoMathML) -if(alertIfNoMathML) -alert("To view the ASCIIMathML notation use Internet Explorer 6 +\nMathPlayer (free from www.dessci.com)\nor Firefox/Mozilla/Netscape");else AMbody.insertBefore(nd,AMbody.childNodes[0]);} -if(!AMnoMathML){frg=AMstrarr2docFrag(arr,n.nodeType==8);var len=frg.childNodes.length;n.parentNode.replaceChild(frg,n);return len-1;}else return 0;}}}else return 0;}else if(n.nodeName!="math"){for(i=0;i<n.childNodes.length;i++) -i+=AMprocessNodeR(n.childNodes[i],linebreaks);} -return 0;} -function AMprocessNode(n,linebreaks,spanclassAM){var frag,st;if(spanclassAM!=null){frag=document.getElementsByTagName("span") -for(var i=0;i<frag.length;i++) -if(frag[i].className=="AM") -AMprocessNodeR(frag[i],linebreaks);}else{try{st=n.innerHTML;}catch(err){} -if(st==null||st.indexOf("\$")!=-1) -AMprocessNodeR(n,linebreaks);} -if(isIE){frag=document.getElementsByTagName('math');for(var i=0;i<frag.length;i++)frag[i].update()}} -var inAppendix=false;var sectionCntr=0;var IEcommentWarning=true;var biblist=[];var bibcntr=0;var LaTeXCounter=[];LaTeXCounter["definition"]=0;LaTeXCounter["proposition"]=0;LaTeXCounter["lemma"]=0;LaTeXCounter["theorem"]=0;LaTeXCounter["corollary"]=0;LaTeXCounter["example"]=0;LaTeXCounter["exercise"]=0;LaTeXCounter["subsection"]=0;LaTeXCounter["subsubsection"]=0;LaTeXCounter["figure"]=0;LaTeXCounter["equation"]=0;LaTeXCounter["table"]=0;var LaTeXColor=[];LaTeXColor["greenyellow"]="#D9FF4F";LaTeXColor["yellow"]="#FFFF00";LaTeXColor["goldenrod"]="#FFE529";LaTeXColor["dandelion"]="#FFB529";LaTeXColor["apricot"]="#FFAD7A";LaTeXColor["peach"]="#FF804D";LaTeXColor["melon"]="#FF8A80";LaTeXColor["yelloworange"]="#FF9400";LaTeXColor["orange"]="#FF6321";LaTeXColor["burntorange"]="#FF7D00";LaTeXColor["bittersweet"]="#C20300";LaTeXColor["redorange"]="#FF3B21";LaTeXColor["mahogany"]="#A60000";LaTeXColor["maroon"]="#AD0000";LaTeXColor["brickred"]="#B80000";LaTeXColor["red"]="#FF0000";LaTeXColor["orangered"]="#FF0080";LaTeXColor["rubinered"]="#FF00DE";LaTeXColor["wildstrawberry"]="#FF0A9C";LaTeXColor["salmon"]="#FF789E";LaTeXColor["carnationpink"]="#FF5EFF";LaTeXColor["magenta"]="#FF00FF";LaTeXColor["violetred"]="#FF30FF";LaTeXColor["rhodamine"]="#FF2EFF";LaTeXColor["mulberry"]="#A314FA";LaTeXColor["redviolet"]="#9600A8";LaTeXColor["fuchsia"]="#7303EB";LaTeXColor["lavender"]="#FF85FF";LaTeXColor["thistle"]="#E069FF";LaTeXColor["orchid"]="#AD5CFF";LaTeXColor["darkorchid"]="#9933CC";LaTeXColor["purple"]="#8C24FF";LaTeXColor["plum"]="#8000FF";LaTeXColor["violet"]="#361FFF";LaTeXColor["royalpurple"]="#401AFF";LaTeXColor["blueviolet"]="#1A0DF5";LaTeXColor["periwinkle"]="#6E73FF";LaTeXColor["cadetblue"]="#616EC4";LaTeXColor["cornflowerblue"]="#59DEFF";LaTeXColor["midnightblue"]="#007091";LaTeXColor["navyblue"]="#0F75FF";LaTeXColor["royalblue"]="#0080FF";LaTeXColor["blue"]="#0000FF";LaTeXColor["cerulean"]="#0FE3FF";LaTeXColor["cyan"]="#00FFFF";LaTeXColor["processblue"]="#0AFFFF";LaTeXColor["skyblue"]="#61FFE0";LaTeXColor["turquoise"]="#26FFCC";LaTeXColor["tealblue"]="#1FFAA3";LaTeXColor["aquamarine"]="#2EFFB2";LaTeXColor["bluegreen"]="#26FFAB";LaTeXColor["emerald"]="#00FF80";LaTeXColor["junglegreen"]="#03FF7A";LaTeXColor["seagreen"]="#4FFF80";LaTeXColor["green"]="#00FF00";LaTeXColor["forestgreen"]="#00E000";LaTeXColor["pinegreen"]="#00BF29";LaTeXColor["limegreen"]="#80FF00";LaTeXColor["yellowgreen"]="#8FFF42";LaTeXColor["springgreen"]="#BDFF3D";LaTeXColor["olivegreen"]="#009900";LaTeXColor["rawsienna"]="#8C0000";LaTeXColor["sepia"]="#4D0000";LaTeXColor["brown"]="#660000";LaTeXColor["tan"]="#DB9470";LaTeXColor["gray"]="#808080";LaTeXColor["grey"]="#808080";LaTeXColor["black"]="#000000";LaTeXColor["white"]="#FFFFFF";var IsColorName=/^(?:greenyellow|yellow|goldenrod|dandelion|apricot|peach|melon|yelloworange|orange|burntorange|bittersweet|redorange|mahogany|maroon|brickred|red|orangered|rubinered|wildstrawberry|salmon|carnationpink|magenta|violetred|rhodamine|mulberry|redviolet|fuchsia|lavender|thistle|orchid|darkorchid|purple|plum|violet|royalpurple|blueviolet|periwinkle|cadetblue|cornflowerblue|midnightblue|navyblue|royalblue|blue|cerulean|cyan|processblue|skyblue|turquoise|tealblue|aquamarine|bluegreen|emerald|junglegreen|seagreen|green|forestgreen|pinegreen|limegreen|yellowgreen|springgreen|olivegreen|rawsienna|sepia|brown|tan|gray|grey|black|white)$/;var IsCounter=/^(?:definition|proposition|lemma|theorem|corollary|example|exercise|subsection|subsubsection|figure|equation|table)$/;var IsLaTeXElement=/^(?:displayequation|title|author|address|date|abstract|keyword|section|subsection|subsubsection|ref|cite|thebibliography|definition|proposition|lemma|theorem|corollary|example|exercise|itemize|enumerate|enddefinition|endproposition|endlemma|endtheorem|endcorollary|endexample|endexercise|enditemize|endenumerate|LaTeXMathMLlabel|LaTeXMathML|smallskip|medskip|bigskip|quote|quotation|endquote|endquotation|center|endcenter|description|enddescription|inlinemath)$/;var IsTextOnlyArea=/^(?:form|textarea|pre)$/i;var tableid=0;function makeNumberString(cntr){if(sectionCntr>0){if(inAppendix){return"A"+sectionCntr+"."+cntr;}else{return sectionCntr+"."+cntr;}}else{return""+cntr;}};function LaTeXpreProcess(thebody){var TheBody=thebody;if(TheBody.hasChildNodes()){if(!(IsLaTeXElement.test(TheBody.className))) -{for(var i=0;i<TheBody.childNodes.length;i++){LaTeXpreProcess(TheBody.childNodes[i])}}} -else{if(TheBody.nodeType==3&&!(IsTextOnlyArea.test(TheBody.parentNode.nodeName))) -{var str=TheBody.nodeValue;if(!(str==null)){str=str.replace(/\\%/g,"<per>");str=str.replace(/%[^\n]*(?=\n)/g,"");str=str.replace(/%[^\r]*(?=\r)/g,"");str=str.replace(/%[^\n]*$/,"") -if(isIE&&str.match(/%/g)!=null&&IEcommentWarning){alert("Comments may not have parsed properly. Try putting in <pre class='LaTeX><div>..</div></pre> structure.");IEcommentWarning=false;} -str=str.replace(/<per>/g,"%");if(str.match(/XXX[\s\S]*/)!=null){var tmp=str.match(/XXX[\s\S]*/)[0];var tmpstr=tmp.charCodeAt(7)+"::"+tmp.charCodeAt(8)+"::"+tmp.charCodeAt(9)+"::"+tmp.charCodeAt(10)+"::"+tmp.charCodeAt(11)+"::"+tmp.charCodeAt(12)+"::"+tmp.charCodeAt(13);alert(tmpstr);} -str=str.replace(/([^\\])\\(\s)/g,"$1\u00A0$2");str=str.replace(/\\quad/g,"\u2001");str=str.replace(/\\qquad/g,"\u2001\u2001");str=str.replace(/\\enspace/g,"\u2002");str=str.replace(/\\;/g,"\u2004");str=str.replace(/\\:/g,"\u2005");str=str.replace(/\\,/g,"\u2006");str=str.replace(/\\thinspace/g,"\u200A");str=str.replace(/([^\\])~/g,"$1\u00A0");str=str.replace(/\\~/g,"~");str=str.replace(/\\\[/g," <DEQ> $\\displaystyle{");str=str.replace(/\\\]/g,"}$ <DEQ> ");str=str.replace(/\$\$/g,"${$<DEQ>$}$");str=str.replace(/\\begin\s*\{\s*array\s*\}/g,"\\begin{array}");str=str.replace(/\\end\s*\{\s*array\s*\}/g,"\\end{array}");str=str.replace(/\\begin\s*\{\s*eqnarray\s*\}/g," <DEQ>eqno$\\begin{eqnarray}");str=str.replace(/\\end\s*\{\s*eqnarray\s*\}/g,"\\end{eqnarray}$<DEQ> ");str=str.replace(/\\begin\s*\{\s*eqnarray\*\s*\}/g," <DEQ>$\\begin{eqnarray}");str=str.replace(/\\end\s*\{\s*eqnarray\*\s*\}/g,"\\end{eqnarray}$<DEQ> ");str=str.replace(/\\begin\s*\{\s*displaymath\s*\}/g," <DEQ> $\\displaystyle{");str=str.replace(/\\end\s*\{\s*displaymath\s*\}/g,"}$ <DEQ> ");str=str.replace(/\\begin\s*\{\s*equation\s*\*\s*\}/g," <DEQ> $\\displaystyle{");str=str.replace(/\\end\s*\{\s*equation\s*\*\s*\}/g,"}$ <DEQ> ");str=str.replace(/\\begin\s*\{\s*equation\s*\}/g," <DEQ>eqno$\\displaystyle{");str=str.replace(/\\end\s*\{\s*equation\s*\}/g,"}$ <DEQ> ");str=str.split("<DEQ>");var newFrag=document.createDocumentFragment();for(var i=0;i<str.length;i++){if(i%2){var DEQtable=document.createElement("table");DEQtable.className='displayequation';var DEQtbody=document.createElement("tbody");var DEQtr=document.createElement("tr");var DEQtdeq=document.createElement("td");DEQtdeq.className='eq';str[i]=str[i].replace(/\$\}\$/g,"$\\displaystyle{");str[i]=str[i].replace(/\$\{\$/g,"}");var lbl=str[i].match(/\\label\s*\{\s*(\w+)\s*\}/);var ISeqno=str[i].match(/^eqno/);str[i]=str[i].replace(/^eqno/," ");str[i]=str[i].replace(/\\label\s*\{\s*\w+\s*\}/," ");DEQtdeq.appendChild(document.createTextNode(str[i]));DEQtr.appendChild(DEQtdeq);str[i]=str[i].replace(/\\nonumber/g,"");if(ISeqno!=null||lbl!=null){var DEQtdno=document.createElement("td");DEQtdno.className='eqno';LaTeXCounter["equation"]++;var eqnoString=makeNumberString(LaTeXCounter["equation"]);var DEQanchor=document.createElement("a");if(lbl!=null){DEQanchor.id=lbl[1]};DEQanchor.className="eqno";var anchorSpan=document.createElement("span");anchorSpan.className="eqno";anchorSpan.style.display="none";anchorSpan.appendChild(document.createTextNode(eqnoString));DEQanchor.appendChild(anchorSpan);DEQtdno.appendChild(DEQanchor);var DEQspan=document.createElement("span");DEQspan.className="eqno";DEQspan.appendChild(document.createTextNode("("+eqnoString+")"));DEQtdno.appendChild(DEQspan);DEQtr.appendChild(DEQtdno);} -DEQtbody.appendChild(DEQtr);DEQtable.appendChild(DEQtbody);newFrag.appendChild(DEQtable);} -else{str[i]=str[i].replace(/\$\}\$/g,"");str[i]=str[i].replace(/\$\{\$/g,"");str[i]=str[i].replace(/\\maketitle/g,"");str[i]=str[i].replace(/\\begin\s*\{\s*document\s*\}/g,"");str[i]=str[i].replace(/\\end\s*\{\s*document\s*\}/g,"");str[i]=str[i].replace(/\\documentclass[^\}]*?\}/g,"");str[i]=str[i].replace(/\\usepackage[^\}]*?\}/g,"");str[i]=str[i].replace(/\\noindent/g,"");str[i]=str[i].replace(/\\notag/g,"");str[i]=str[i].replace(/\\ref\s*\{\s*(\w+)\}/g," \\[ref\\]$1\\[ ");str[i]=str[i].replace(/\\url\s*\{\s*([^\}\n]+)\}/g," \\[url\\]$1\\[ ");str[i]=str[i].replace(/\\href\s*\{\s*([^\}]+)\}\s*\{\s*([^\}]+)\}/g," \\[href\\]$1\\]$2\\[ ");str[i]=str[i].replace(/\\cite\s*\{\s*(\w+)\}/g," \\[cite\\]$1\\[ ");str[i]=str[i].replace(/\\qed/g,"\u220E");str[i]=str[i].replace(/\\endproof/g,"\u220E");str[i]=str[i].replace(/\\proof/g,"\\textbf{Proof: }");str[i]=str[i].replace(/\\n(?=\s)/g," \\[br\\] \\[ ");str[i]=str[i].replace(/\\newline/g," \\[br\\] \\[ ");str[i]=str[i].replace(/\\linebreak/g," \\[br\\] \\[ ");str[i]=str[i].replace(/\\smallskip/g," \\[logicalbreak\\]smallskip\\[ ");str[i]=str[i].replace(/\\medskip/g," \\[logicalbreak\\]medskip\\[ ");str[i]=str[i].replace(/\\bigskip/g," \\[logicalbreak\\]bigskip\\[ ");str[i]=str[i].replace(/[\n\r]+[ \f\n\r\t\v\u2028\u2029]*[\n\r]+/g," \\[logicalbreak\\]LaTeXMathML\\[ ");if(isIE){str[i]=str[i].replace(/\r/g," ");} -str[i]=str[i].replace(/\\bibitem\s*([^\{]*\{\s*\w*\s*\})/g," \\[bibitem\\]$1\\[ ");str[i]=str[i].replace(/\\bibitem\s*/g," \\[bibitem\\] \\[ ");str[i]=str[i].replace(/\\item\s*\[\s*(\w+)\s*\]/g," \\[alistitem\\]$1\\[ ");str[i]=str[i].replace(/\\item\s*/g," \\[alistitem\\] \\[ ");str[i]=str[i].replace(/\\appendix/g," \\[appendix\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*figure\s*\}([\s\S]+?)\\end\s*\{\s*figure\s*\}/g," \\[figure\\]$1\\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*table\s*\}([\s\S]+?)\\end\s*\{\s*table\s*\}/g," \\[table\\]$1\\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*theorem\s*\}/g," \\[theorem\\]Theorem \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*theorem\s*\}/g," \\[endtheorem\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*definition\s*\}/g," \\[definition\\]Definition \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*definition\s*\}/g," \\[enddefinition\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*lemma\s*\}/g," \\[lemma\\]Lemma \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*lemma\s*\}/g," \\[endlemma\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*corollary\s*\}/g," \\[corollary\\]Corollary \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*corollary\s*\}/g," \\[endcorollary\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*proposition\s*\}/g," \\[proposition\\]Proposition \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*proposition\s*\}/g," \\[endproposition\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*example\s*\}/g," \\[example\\]Example \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*example\s*\}/g," \\[endexample\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*exercise\s*\}/g," \\[exercise\\]Exercise \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*exercise\s*\}/g," \\[endexercise\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*thebibliography\s*\}\s*\{\s*\w+\s*\}/g," \\[thebibliography\\]References \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*thebibliography\s*\}/g," \\[thebibliography\\]References \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*thebibliography\s*\}/g," \\[endthebibliography\\]References \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*proof\s*\}/g," \\[proof\\]Proof: \\[ ");if(isIE){str[i]=str[i].replace(/\\end\s*\{\s*proof\s*\}/g,"\u220E \\[endproof\\] \\[ ");}else{str[i]=str[i].replace(/\\end\s*\{\s*proof\s*\}/g," \\[endproof\\] \\[ ");} -str[i]=str[i].replace(/\\title\s*\{\s*([^\}]+)\}/g," \\[title\\] \\[$1 \\[endtitle\\] \\[ ");str[i]=str[i].replace(/\\author\s*\{\s*([^\}]+)\}/g," \\[author\\] \\[$1 \\[endauthor\\] \\[ ");str[i]=str[i].replace(/\\address\s*\{\s*([^\}]+)\}/g," \\[address\\] \\[$1 \\[endaddress\\] \\[ ");str[i]=str[i].replace(/\\date\s*\{\s*([^\}]+)\}/g," \\[date\\] \\[$1 \\[enddate\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*keyword\s*\}/g," \\[keyword\\] \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*keyword\s*\}/g," \\[endkeyword\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*abstract\s*\}/g," \\[abstract\\] \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*abstract\s*\}/g," \\[endabstract\\] \\[ ");str[i]=str[i].replace(/\\begin\s*\{\s*(?!array|tabular)(\w+)\s*\}/g," \\[$1\\] \\[ ");str[i]=str[i].replace(/\\end\s*\{\s*(?!array|tabular)(\w+)\s*\}/g," \\[end$1\\] \\[ ");var sectionIndex=str[i].search(/\\section\s*\{\s*[\s\S]+\}/);while(sectionIndex>=0){str[i]=str[i].replace(/\\section\s*\{/," \\[section\\]");var delimcnt=1;for(var ii=sectionIndex;ii<str[i].length;ii++){if(str[i].charAt(ii)=="{"){delimcnt++};if(str[i].charAt(ii)=="}"){delimcnt--};if(delimcnt==0){str[i]=str[i].substring(0,ii)+"\\[ "+str[i].substring(ii+1,str[i].length);break;}};sectionIndex=str[i].search(/\\section\s*\{\s*[\s\S]+\}/);} -sectionIndex=str[i].search(/\\subsection\s*\{\s*[\s\S]+\}/);while(sectionIndex>=0){str[i]=str[i].replace(/\\subsection\s*\{/," \\[subsection\\]");var delimcnt=1;for(var ii=sectionIndex;ii<str[i].length;ii++){if(str[i].charAt(ii)=="{"){delimcnt++};if(str[i].charAt(ii)=="}"){delimcnt--};if(delimcnt==0){str[i]=str[i].substring(0,ii)+"\\[ "+str[i].substring(ii+1,str[i].length);break;}};sectionIndex=str[i].search(/\\subsection\s*\{\s*[\s\S]+\}/);} -sectionIndex=str[i].search(/\\subsubsection\s*\{\s*[\s\S]+\}/);while(sectionIndex>=0){str[i]=str[i].replace(/\\subsubsection\s*\{/," \\[subsubsection\\]");var delimcnt=1;for(var ii=sectionIndex;ii<str[i].length;ii++){if(str[i].charAt(ii)=="{"){delimcnt++};if(str[i].charAt(ii)=="}"){delimcnt--};if(delimcnt==0){str[i]=str[i].substring(0,ii)+"\\[ "+str[i].substring(ii+1,str[i].length);break;}};sectionIndex=str[i].search(/\\subsubsection\s*\{\s*[\s\S]+\}/);} -var CatToNextEven="";var strtmp=str[i].split("\\[");for(var j=0;j<strtmp.length;j++){if(j%2){var strtmparray=strtmp[j].split("\\]");switch(strtmparray[0]){case"section":var nodeTmp=document.createElement("H2");nodeTmp.className='section';sectionCntr++;for(var div in LaTeXCounter){LaTeXCounter[div]=0};var nodeAnchor=document.createElement("a");if(inAppendix){nodeAnchor.className='appendixsection';}else{nodeAnchor.className='section';} -var nodeNumString=makeNumberString("");var anchorSpan=document.createElement("span");anchorSpan.className="section";anchorSpan.style.display="none";anchorSpan.appendChild(document.createTextNode(nodeNumString));nodeAnchor.appendChild(anchorSpan);nodeTmp.appendChild(nodeAnchor);var nodeSpan=document.createElement("span");nodeSpan.className='section';nodeSpan.appendChild(document.createTextNode(nodeNumString+" "));nodeTmp.appendChild(nodeSpan);nodeTmp.appendChild(document.createTextNode(strtmparray[1]));newFrag.appendChild(nodeTmp);break;case"subsection":var nodeTmp=document.createElement("H3");nodeTmp.className='subsection';LaTeXCounter["subsection"]++;LaTeXCounter["subsubsection"]=0;var nodeAnchor=document.createElement("a");nodeAnchor.className='subsection';var nodeNumString=makeNumberString(LaTeXCounter["subsection"]);var anchorSpan=document.createElement("span");anchorSpan.className="subsection";anchorSpan.style.display="none";anchorSpan.appendChild(document.createTextNode(nodeNumString));nodeAnchor.appendChild(anchorSpan);nodeTmp.appendChild(nodeAnchor);var nodeSpan=document.createElement("span");nodeSpan.className='subsection';nodeSpan.appendChild(document.createTextNode(nodeNumString+". "));nodeTmp.appendChild(nodeSpan);nodeTmp.appendChild(document.createTextNode(strtmparray[1]));newFrag.appendChild(nodeTmp);break;case"subsubsection":var nodeTmp=document.createElement("H4");nodeTmp.className='subsubsection';LaTeXCounter["subsubsection"]++;var nodeAnchor=document.createElement("a");nodeAnchor.className='subsubsection';var nodeNumString=makeNumberString(LaTeXCounter["subsection"]+"."+LaTeXCounter["subsubsection"]);var anchorSpan=document.createElement("span");anchorSpan.className="subsubsection";anchorSpan.style.display="none";anchorSpan.appendChild(document.createTextNode(nodeNumString));nodeAnchor.appendChild(anchorSpan);nodeTmp.appendChild(nodeAnchor);var nodeSpan=document.createElement("span");nodeSpan.className='subsubsection';nodeSpan.appendChild(document.createTextNode(nodeNumString+". "));nodeTmp.appendChild(nodeSpan);nodeTmp.appendChild(document.createTextNode(strtmparray[1]));newFrag.appendChild(nodeTmp);break;case"href":var nodeTmp=document.createElement("a");nodeTmp.className='LaTeXMathML';nodeTmp.href=strtmparray[1];nodeTmp.appendChild(document.createTextNode(strtmparray[2]));newFrag.appendChild(nodeTmp);break;case"url":var nodeTmp=document.createElement("a");nodeTmp.className='LaTeXMathML';nodeTmp.href=strtmparray[1];nodeTmp.appendChild(document.createTextNode(strtmparray[1]));newFrag.appendChild(nodeTmp);break;case"figure":var nodeTmp=document.createElement("table");nodeTmp.className='figure';var FIGtbody=document.createElement("tbody");var FIGlbl=strtmparray[1].match(/\\label\s*\{\s*(\w+)\s*\}/);strtmparray[1]=strtmparray[1].replace(/\\label\s*\{\w+\}/g,"");var capIndex=strtmparray[1].search(/\\caption\s*\{[\s\S]+\}/);var FIGcap="";if(capIndex>=0){var tmp=strtmparray[1];var delimcnt=0;var capstart=-1;for(var pos=capIndex;pos<tmp.length;pos++){if(tmp.charAt(pos)=="{"){delimcnt++};if(tmp.charAt(pos)=="}"){delimcnt--};if(delimcnt==1&&capstart<0){capstart=pos+1};if(delimcnt==0&&capstart>0){capend=pos-1;FIGcap=tmp.substring(capstart,pos);break}}} -var FIGtr2=document.createElement("tr");var FIGtd2=document.createElement("td");FIGtd2.className="caption";var FIGanchor=document.createElement("a");FIGanchor.className="figure";if(FIGlbl!=null){FIGanchor.id=FIGlbl[1];} -LaTeXCounter["figure"]++;var fignmbr=makeNumberString(LaTeXCounter["figure"]);var anchorSpan=document.createElement("span");anchorSpan.className="figure";anchorSpan.style.display="none";anchorSpan.appendChild(document.createTextNode(fignmbr));FIGanchor.appendChild(anchorSpan);FIGtd2.appendChild(FIGanchor);var FIGspan=document.createElement("span");FIGspan.className="figure";FIGspan.appendChild(document.createTextNode("Figure "+fignmbr+". "));FIGtd2.appendChild(FIGspan);FIGtd2.appendChild(document.createTextNode(""+FIGcap));FIGtr2.appendChild(FIGtd2);FIGtbody.appendChild(FIGtr2);var IsSpecial=false;var FIGinfo=strtmparray[1].match(/\\includegraphics\s*\{([^\}]+)\}/);if(FIGinfo==null){FIGinfo=strtmparray[1].match(/\\includegraphics\s*\[[^\]]*\]\s*\{\s*([^\}]+)\s*\}/);} -if(FIGinfo==null){FIGinfo=strtmparray[1].match(/\\special\s*\{\s*([^\}]+)\}/);IsSpecial=true};if(FIGinfo!=null){var FIGtr1=document.createElement("tr");var FIGtd1=document.createElement("td");FIGtd1.className="image";var FIGimg=document.createElement("img");var FIGsrc=FIGinfo[1];FIGimg.src=FIGsrc;FIGimg.alt="Figure "+FIGsrc+" did not load";FIGimg.title="Figure "+fignmbr+". "+FIGcap;FIGimg.id="figure"+fignmbr;FIGtd1.appendChild(FIGimg);FIGtr1.appendChild(FIGtd1);FIGtbody.appendChild(FIGtr1);} -nodeTmp.appendChild(FIGtbody);newFrag.appendChild(nodeTmp);break;case"table":var nodeTmp=document.createElement("table");if(strtmparray[1].search(/\\centering/)>=0){nodeTmp.className='LaTeXtable centered';nodeTmp.align="center";}else{nodeTmp.className='LaTeXtable';};tableid++;nodeTmp.id="LaTeXtable"+tableid;var TABlbl=strtmparray[1].match(/\\label\s*\{\s*(\w+)\s*\}/);strtmparray[1]=strtmparray[1].replace(/\\label\s*\{\w+\}/g,"");var capIndex=strtmparray[1].search(/\\caption\s*\{[\s\S]+\}/);var TABcap="";if(capIndex>=0){var tmp=strtmparray[1];var delimcnt=0;var capstart=-1;for(var pos=capIndex;pos<tmp.length;pos++){if(tmp.charAt(pos)=="{"){delimcnt++};if(tmp.charAt(pos)=="}"){delimcnt--};if(delimcnt==1&&capstart<0){capstart=pos+1};if(delimcnt==0&&capstart>0){capend=pos-1;TABcap=tmp.substring(capstart,pos);break}}} -if(TABcap!=""){var TABtbody=document.createElement("tbody");var TABcaption=document.createElement("caption");TABcaption.className="LaTeXtable centered";var TABanchor=document.createElement("a");TABanchor.className="LaTeXtable";if(TABlbl!=null){TABanchor.id=TABlbl[1];} -LaTeXCounter["table"]++;var tabnmbr=makeNumberString(LaTeXCounter["table"]);var anchorSpan=document.createElement("span");anchorSpan.className="LaTeXtable";anchorSpan.style.display="none";anchorSpan.appendChild(document.createTextNode(tabnmbr));TABanchor.appendChild(anchorSpan);TABcaption.appendChild(TABanchor);var TABspan=document.createElement("span");TABspan.className="LaTeXtable";TABspan.appendChild(document.createTextNode("Table "+tabnmbr+". "));TABcaption.appendChild(TABspan);TABcaption.appendChild(document.createTextNode(""+TABcap));nodeTmp.appendChild(TABcaption);} -var TABinfo=strtmparray[1].match(/\\begin\s*\{\s*tabular\s*\}([\s\S]+)\\end\s*\{\s*tabular\s*\}/);if(TABinfo!=null){var TABtbody=document.createElement('tbody');var TABrow=null;var TABcell=null;var row=0;var col=0;var TABalign=TABinfo[1].match(/^\s*\{([^\}]+)\}/);TABinfo=TABinfo[1].replace(/^\s*\{[^\}]+\}/,"");TABinfo=TABinfo.replace(/\\hline/g,"");TABalign[1]=TABalign[1].replace(/\|/g,"");TABalign[1]=TABalign[1].replace(/\s/g,"");TABinfo=TABinfo.split("\\\\");for(row=0;row<TABinfo.length;row++){TABrow=document.createElement("tr");TABinfo[row]=TABinfo[row].split("&");for(col=0;col<TABinfo[row].length;col++){TABcell=document.createElement("td");switch(TABalign[1].charAt(col)){case"l":TABcell.align="left";break;case"c":TABcell.align="center";break;case"r":TABcell.align="right";break;default:TABcell.align="left";};TABcell.appendChild(document.createTextNode(TABinfo[row][col]));TABrow.appendChild(TABcell);} -TABtbody.appendChild(TABrow);} -nodeTmp.appendChild(TABtbody);} -newFrag.appendChild(nodeTmp);break;case"logicalbreak":var nodeTmp=document.createElement("p");nodeTmp.className=strtmparray[1];nodeTmp.appendChild(document.createTextNode("\u00A0"));newFrag.appendChild(nodeTmp);break;case"appendix":inAppendix=true;sectionCntr=0;break;case"alistitem":var EndDiv=document.createElement("div");EndDiv.className="endlistitem";newFrag.appendChild(EndDiv);var BegDiv=document.createElement("div");BegDiv.className="listitem";if(strtmparray[1]!=" "){var BegSpan=document.createElement("span");BegSpan.className="listitemmarker";var boldBegSpan=document.createElement("b");boldBegSpan.appendChild(document.createTextNode(strtmparray[1]+" "));BegSpan.appendChild(boldBegSpan);BegDiv.appendChild(BegSpan);} -newFrag.appendChild(BegDiv);break;case"br":newFrag.appendChild(document.createElement("br"));break;case"bibitem":newFrag.appendChild(document.createElement("br"));var nodeTmp=document.createElement("a");nodeTmp.className='bibitem';var nodeSpan=document.createElement("span");nodeSpan.className='bibitem';bibcntr++;var lbl=strtmparray[1].match(/\{\s*(\w+)\s*\}/);strtmparray[1]=strtmparray[1].replace(/\s*\{\s*\w+\s*\}/g,"");strtmparray[1]=strtmparray[1].replace(/^\s*\[/,"");strtmparray[1]=strtmparray[1].replace(/\s*\]$/,"");strtmparray[1]=strtmparray[1].replace(/^\s+|\s+$/g,"");if(lbl==null){biblist[bibcntr]="bibitem"+bibcntr}else{biblist[bibcntr]=lbl[1];};nodeTmp.name=biblist[bibcntr];nodeTmp.id=biblist[bibcntr];if(strtmparray[1]!=""){nodeSpan.appendChild(document.createTextNode(strtmparray[1]));}else{nodeSpan.appendChild(document.createTextNode("["+bibcntr+"]"));} -nodeTmp.appendChild(nodeSpan);newFrag.appendChild(nodeTmp);break;case"cite":var nodeTmp=document.createElement("a");nodeTmp.className='cite';nodeTmp.name='cite';nodeTmp.href="#"+strtmparray[1];newFrag.appendChild(nodeTmp);break;case"ref":var nodeTmp=document.createElement("a");nodeTmp.className='ref';nodeTmp.name='ref';nodeTmp.href="#"+strtmparray[1];newFrag.appendChild(nodeTmp);break;default:var nodeTmp=document.createElement("div");nodeTmp.className=strtmparray[0];if(IsCounter.test(strtmparray[0])){LaTeXCounter[strtmparray[0]]++;var nodeAnchor=document.createElement("a");nodeAnchor.className=strtmparray[0];var divnum=makeNumberString(LaTeXCounter[strtmparray[0]]);var anchorSpan=document.createElement("span");anchorSpan.className=strtmparray[0];anchorSpan.appendChild(document.createTextNode(divnum));anchorSpan.style.display="none";nodeAnchor.appendChild(anchorSpan);nodeTmp.appendChild(nodeAnchor);var nodeSpan=document.createElement("span");nodeSpan.className=strtmparray[0];nodeSpan.appendChild(document.createTextNode(strtmparray[1]+" "+divnum+". "));nodeTmp.appendChild(nodeSpan);} -if(isIE){if(strtmparray[0]==("thebibliography"||"abstract"||"keyword"||"proof")){var nodeSpan=document.createElement("span");nodeSpan.className=strtmparray[0];nodeSpan.appendChild(document.createTextNode(strtmparray[1]));nodeTmp.appendChild(nodeSpan);}} -if(strtmparray[0]=="endenumerate"||strtmparray[0]=="enditemize"||strtmparray[0]=="enddescription"){var endDiv=document.createElement("div");endDiv.className="endlistitem";newFrag.appendChild(endDiv);} -newFrag.appendChild(nodeTmp);if(strtmparray[0]=="enumerate"||strtmparray[0]=="itemize"||strtmparray[0]=="description"){var endDiv=document.createElement("div");endDiv.className="listitem";newFrag.appendChild(endDiv);}}}else{strtmp[j]=strtmp[j].replace(/\\\$/g,"<per>");strtmp[j]=strtmp[j].replace(/\$([^\$]+)\$/g," \\[$1\\[ ");strtmp[j]=strtmp[j].replace(/<per>/g,"\\$");strtmp[j]=strtmp[j].replace(/\\begin\s*\{\s*math\s*\}([\s\S]+?)\\end\s*\{\s*math\s*\}/g," \\[$1\\[ ");var strtmptmp=strtmp[j].split("\\[");for(var jjj=0;jjj<strtmptmp.length;jjj++){if(jjj%2){var nodeTmp=document.createElement("span");nodeTmp.className='inlinemath';nodeTmp.appendChild(document.createTextNode("$"+strtmptmp[jjj]+"$"));newFrag.appendChild(nodeTmp);}else{var TagIndex=strtmptmp[jjj].search(/\\\w+/);var tmpIndex=TagIndex;while(tmpIndex>-1){if(/^\\textcolor/.test(strtmptmp[jjj].substring(TagIndex,strtmptmp[jjj].length))){strtmptmp[jjj]=strtmptmp[jjj].replace(/\\textcolor\s*\{\s*(\w+)\s*\}\s*/," \\[textcolor\\]$1\\]|");}else{if(/^\\colorbox/.test(strtmptmp[jjj].substring(TagIndex,strtmptmp[jjj].length))){strtmptmp[jjj]=strtmptmp[jjj].replace(/\\colorbox\s*\{\s*(\w+)\s*\}\s*/," \\[colorbox\\]$1\\]|");}else{strtmptmp[jjj]=strtmptmp[jjj].substring(0,TagIndex)+strtmptmp[jjj].substring(TagIndex,strtmptmp[jjj].length).replace(/\\\s*(\w+)\s*/," \\[$1\\]|");}} -TagIndex+=strtmptmp[jjj].substring(TagIndex,strtmptmp[jjj].length).search(/\|/);TagIndex++;strtmptmp[jjj]=strtmptmp[jjj].replace(/\\\]\|/,"\\] ");if(strtmptmp[jjj].charAt(TagIndex)=="{"){strtmptmp[jjj]=strtmptmp[jjj].substring(0,TagIndex)+strtmptmp[jjj].substring(TagIndex+1,strtmptmp[jjj].length);var delimcnt=1;for(var kk=TagIndex;kk<strtmptmp[jjj].length;kk++){if(strtmptmp[jjj].charAt(kk)=="{"){delimcnt++};if(strtmptmp[jjj].charAt(kk)=="}"){delimcnt--};if(delimcnt==0){break;}} -strtmptmp[jjj]=strtmptmp[jjj].substring(0,kk)+"\\[ "+strtmptmp[jjj].substring(kk+1,strtmptmp[jjj].length);TagIndex=kk+3;}else{strtmptmp[jjj]=strtmptmp[jjj].substring(0,TagIndex)+"\\[ "+strtmptmp[jjj].substring(TagIndex+1,strtmptmp[jjj].length);TagIndex=TagIndex+3;} -if(TagIndex<strtmptmp[jjj].length){tmpIndex=strtmptmp[jjj].substring(TagIndex,strtmptmp[jjj].length).search(/\\\w+/);} -else{tmpIndex=-1};TagIndex+=tmpIndex;} -strtmptmp[jjj]=strtmptmp[jjj].replace(/\\\\\s*\\\\/g,"\\\\");strtmptmp[jjj]=strtmptmp[jjj].replace(/\\\\/g," \\[br\\] \\[ ");strtmptmp[jjj]=strtmptmp[jjj].replace(/\\label\s*\{\s*(\w+)\s*\}/g," \\[a\\]$1\\[ ");var strlbls=strtmptmp[jjj].split("\\[");for(var jj=0;jj<strlbls.length;jj++){if(jj%2){var strtmparray=strlbls[jj].split("\\]");switch(strtmparray[0]){case"textcolor":var nodeTmp=document.createElement("span");nodeTmp.className='LaTeXColor';if(IsColorName.test(strtmparray[1].toLowerCase())){nodeTmp.style.color=LaTeXColor[strtmparray[1].toLowerCase()];}else{nodeTmp.style.color=strtmparray[1];};nodeTmp.appendChild(document.createTextNode(strtmparray[2]));newFrag.appendChild(nodeTmp);break;case"colorbox":var nodeTmp=document.createElement("span");nodeTmp.className='LaTeXColor';if(IsColorName.test(strtmparray[1].toLowerCase())){nodeTmp.style.background=LaTeXColor[strtmparray[1].toLowerCase()];}else{nodeTmp.style.background=strtmparray[1];};nodeTmp.appendChild(document.createTextNode(strtmparray[2]));newFrag.appendChild(nodeTmp);break;case"br":newFrag.appendChild(document.createElement("br"));break;case"a":var nodeTmp=document.createElement("a");nodeTmp.className='LaTeXMathMLlabel';nodeTmp.id=strtmparray[1];nodeTmp.style.display="none";newFrag.appendChild(nodeTmp);break;default:var nodeTmp=document.createElement("span");nodeTmp.className=strtmparray[0];nodeTmp.appendChild(document.createTextNode(strtmparray[1])) -newFrag.appendChild(nodeTmp);}}else{newFrag.appendChild(document.createTextNode(strlbls[jj]));}}}}}}}};TheBody.parentNode.replaceChild(newFrag,TheBody);}}} -return TheBody;} -function LaTeXDivsAndRefs(thebody){var TheBody=thebody;var EndDivClass=null;var AllDivs=TheBody.getElementsByTagName("div");var lbl2id="";var lblnode=null;for(var i=AllDivs.length-1;i>=0;i--){EndDivClass=AllDivs[i].className.match(/end\w+/);if(EndDivClass!=null){EndDivClass=EndDivClass[0];var DivClass=EndDivClass.substring(3,EndDivClass.length);var EndDivNode=AllDivs[i];break;}} -while(EndDivClass!=null){var newFrag=document.createDocumentFragment();var RootNode=EndDivNode.parentNode;var ClassCount=1;while(EndDivNode.previousSibling!=null&&ClassCount>0){switch(EndDivNode.previousSibling.className){case EndDivClass:ClassCount++;newFrag.insertBefore(EndDivNode.previousSibling,newFrag.firstChild);break;case DivClass:if(EndDivNode.previousSibling.nodeName=="DIV"){ClassCount--;if(lbl2id!=""){EndDivNode.previousSibling.id=lbl2id;lbl2id=""} -if(ClassCount==0){RootNode=EndDivNode.previousSibling;}else{newFrag.insertBefore(EndDivNode.previousSibling,newFrag.firstChild);}};break;case'LaTeXMathMLlabel':lbl2id=EndDivNode.previousSibling.id;EndDivNode.parentNode.removeChild(EndDivNode.previousSibling);break;default:newFrag.insertBefore(EndDivNode.previousSibling,newFrag.firstChild);}} -RootNode.appendChild(newFrag);EndDivNode.parentNode.removeChild(EndDivNode);AllDivs=TheBody.getElementsByTagName("DIV");for(i=AllDivs.length-1;i>=0;i--){EndDivClass=AllDivs[i].className.match(/end\w+/);if(EndDivClass!=null){ClassCount=0;EndDivClass=EndDivClass[0];DivClass=EndDivClass.substring(3,EndDivClass.length);EndDivNode=AllDivs[i];RootNode=EndDivNode.parentNode;break;}}} -var AllDivs=TheBody.getElementsByTagName("div");var DIV2LI=null;for(var i=0;i<AllDivs.length;i++){if(AllDivs[i].className=="itemize"||AllDivs[i].className=="enumerate"||AllDivs[i].className=="description"){if(AllDivs[i].className=="itemize"){RootNode=document.createElement("UL");}else{RootNode=document.createElement("OL");} -RootNode.className='LaTeXMathML';if(AllDivs[i].hasChildNodes()){AllDivs[i].removeChild(AllDivs[i].firstChild)};while(AllDivs[i].hasChildNodes()){if(AllDivs[i].firstChild.hasChildNodes()){DIV2LI=document.createElement("LI");while(AllDivs[i].firstChild.hasChildNodes()){DIV2LI.appendChild(AllDivs[i].firstChild.firstChild);} -if(DIV2LI.firstChild.className=="listitemmarker"){DIV2LI.style.listStyleType="none";} -RootNode.appendChild(DIV2LI)} -AllDivs[i].removeChild(AllDivs[i].firstChild);} -AllDivs[i].appendChild(RootNode);}} -var AllAnchors=TheBody.getElementsByTagName("a");for(var i=0;i<AllAnchors.length;i++){if(AllAnchors[i].className=="ref"||AllAnchors[i].className=="cite"){var label=AllAnchors[i].href.match(/\#(\w+)/);if(label!=null){var labelNode=document.getElementById(label[1]);if(labelNode!=null){var TheSpans=labelNode.getElementsByTagName("SPAN");if(TheSpans!=null){var refNode=TheSpans[0].cloneNode(true);refNode.style.display="inline" -refNode.className=AllAnchors[i].className;AllAnchors[i].appendChild(refNode);}}}}} -return TheBody;} -var AMbody;var AMnoMathML=false,AMtranslated=false;function translate(spanclassAM){if(!AMtranslated){AMtranslated=true;AMinitSymbols();var LaTeXContainers=[];var AllContainers=document.getElementsByTagName('*');var ExtendName="";for(var k=0,l=0;k<AllContainers.length;k++){ExtendName=" "+AllContainers[k].className+" ";if(ExtendName.match(/\sLaTeX\s/)!=null){LaTeXContainers[l]=AllContainers[k];l++;}};if(LaTeXContainers.length>0){for(var m=0;m<LaTeXContainers.length;m++){AMbody=LaTeXContainers[m];try{AMbody=LaTeXDivsAndRefs(LaTeXpreProcess(AMbody));}catch(err){alert("Unknown Error: Defaulting to Original LaTeXMathML");} -if(AMbody.tagName=="PRE"){var PreChilds=document.createDocumentFragment();var DivChilds=document.createElement("DIV");while(AMbody.hasChildNodes()){DivChilds.appendChild(AMbody.firstChild);} -PreChilds.appendChild(DivChilds);AMbody.parentNode.replaceChild(PreChilds,AMbody);AMbody=DivChilds;} -AMprocessNode(AMbody,false,spanclassAM);}}else{AMbody=document.getElementsByTagName("body")[0];try{AMbody=LaTeXDivsAndRefs(LaTeXpreProcess(AMbody));}catch(err){alert("Unknown Error: Defaulting to Original LaTeXMathML");} -AMprocessNode(AMbody,false,spanclassAM);}}} -if(isIE){document.write("<object id=\"mathplayer\" classid=\"clsid:32F66A20-7614-11D4-BD11-00104BD3F987\"></object>");document.write("<?import namespace=\"m\" implementation=\"#mathplayer\"?>");} -function generic() -{translate();};if(typeof window.addEventListener!='undefined') -{window.addEventListener('load',generic,false);} -else if(typeof document.addEventListener!='undefined') -{document.addEventListener('load',generic,false);} -else if(typeof window.attachEvent!='undefined') -{window.attachEvent('onload',generic);} -else -{if(typeof window.onload=='function') -{var existing=onload;window.onload=function() -{existing();generic();};} -else -{window.onload=generic;}} diff --git a/data/abbreviations b/data/abbreviations --- a/data/abbreviations +++ b/data/abbreviations @@ -1,23 +1,43 @@ +aet. +aetat. al. Apr. Aug. +bk. Bros. +c. Capt. cf. ch. +chap. +chs. Co. +col. Corp. cp. +d. Dec. Dr. e.g. +ed. +eds. esp. +f. +fasc. Feb. +ff. +fig. +fl. +fol. +fols. +Fr. Gen. Gov. Hon. i.e. +ill. Inc. +incl. Jan. Jr. Jul. @@ -29,6 +49,9 @@ Mr. Mrs. Ms. +n. +n.b. +nn. No. Nov. Oct. @@ -37,8 +60,13 @@ pp. Pres. Prof. +pt. +q.v. Rep. Rev. +s.v. +s.vv. +saec. sec. Sen. Sep. @@ -46,5 +74,7 @@ Sgt. Sr. St. +univ. +viz. vol. vs. diff --git a/data/bash_completion.tpl b/data/bash_completion.tpl --- a/data/bash_completion.tpl +++ b/data/bash_completion.tpl @@ -4,7 +4,7 @@ _pandoc() { - local cur prev opts lastc informats outformats datadir + local cur prev opts lastc informats outformats highlight_styles datafiles COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" @@ -14,7 +14,7 @@ informats="%s" outformats="%s" highlight_styles="%s" - datadir="%s" + datafiles="%s" case "${prev}" in --from|-f|--read|-r) @@ -29,12 +29,16 @@ COMPREPLY=( $(compgen -W "references javascript none" -- ${cur}) ) return 0 ;; + --ipynb-output) + COMPREPLY=( $(compgen -W "all none best" -- ${cur}) ) + return 0 + ;; --pdf-engine) - COMPREPLY=( $(compgen -W "pdflatex lualatex xelatex wkhtmltopdf weasyprint prince context pdfroff" -- ${cur}) ) + COMPREPLY=( $(compgen -W "pdflatex lualatex xelatex latexmk tectonic wkhtmltopdf weasyprint prince context pdfroff groff" -- ${cur}) ) return 0 ;; --print-default-data-file) - COMPREPLY=( $(compgen -W "reference.odt reference.docx $(find ${datadir} | sed -e 's/.*\/data\///')" -- ${cur}) ) + COMPREPLY=( $(compgen -W "${datafiles}" -- ${cur}) ) return 0 ;; --wrap) @@ -53,8 +57,16 @@ COMPREPLY=( $(compgen -W "section chapter part" -- ${cur}) ) return 0 ;; - --highlight-style) + --highlight-style|--print-highlight-style) COMPREPLY=( $(compgen -W "${highlight_styles}" -- ${cur}) ) + return 0 + ;; + --eol) + COMPREPLY=( $(compgen -W "crlf lf native" -- ${cur}) ) + return 0 + ;; + --markdown-headings) + COMPREPLY=( $(compgen -W "setext atx" -- ${cur}) ) return 0 ;; *) diff --git a/data/creole.lua b/data/creole.lua new file mode 100644 --- /dev/null +++ b/data/creole.lua @@ -0,0 +1,190 @@ +-- A sample custom reader for Creole 1.0 (common wiki markup) +-- http://www.wikicreole.org/wiki/CheatSheet + +-- For better performance we put these functions in local variables: +local P, S, R, Cf, Cc, Ct, V, Cs, Cg, Cb, B, C, Cmt = + lpeg.P, lpeg.S, lpeg.R, lpeg.Cf, lpeg.Cc, lpeg.Ct, lpeg.V, + lpeg.Cs, lpeg.Cg, lpeg.Cb, lpeg.B, lpeg.C, lpeg.Cmt + +local whitespacechar = S(" \t\r\n") +local specialchar = S("/*~[]\\{}|") +local wordchar = (1 - (whitespacechar + specialchar)) +local spacechar = S(" \t") +local newline = P"\r"^-1 * P"\n" +local blankline = spacechar^0 * newline +local endline = newline * #-blankline +local endequals = spacechar^0 * P"="^0 * spacechar^0 * newline +local cellsep = spacechar^0 * P"|" + +local function trim(s) + return (s:gsub("^%s*(.-)%s*$", "%1")) +end + +local function ListItem(lev, ch) + local start + if ch == nil then + start = S"*#" + else + start = P(ch) + end + local subitem = function(c) + if lev < 6 then + return ListItem(lev + 1, c) + else + return (1 - 1) -- fails + end + end + local parser = spacechar^0 + * start^lev + * #(- start) + * spacechar^0 + * Ct((V"Inline" - (newline * spacechar^0 * S"*#"))^0) + * newline + * (Ct(subitem("*")^1) / pandoc.BulletList + + + Ct(subitem("#")^1) / pandoc.OrderedList + + + Cc(nil)) + / function (ils, sublist) + return { pandoc.Plain(ils), sublist } + end + return parser +end + +-- Grammar +G = P{ "Doc", + Doc = Ct(V"Block"^0) + / pandoc.Pandoc ; + Block = blankline^0 + * ( V"Header" + + V"HorizontalRule" + + V"CodeBlock" + + V"List" + + V"Table" + + V"Para") ; + Para = Ct(V"Inline"^1) + * newline + / pandoc.Para ; + HorizontalRule = spacechar^0 + * P"----" + * spacechar^0 + * newline + / pandoc.HorizontalRule; + Header = (P("=")^1 / string.len) + * spacechar^1 + * Ct((V"Inline" - endequals)^1) + * endequals + / pandoc.Header; + CodeBlock = P"{{{" + * blankline + * C((1 - (newline * P"}}}"))^0) + * newline + * P"}}}" + / pandoc.CodeBlock; + Placeholder = P"<<<" + * C(P(1) - P">>>")^0 + * P">>>" + / function() return pandoc.Div({}) end; + List = V"BulletList" + + V"OrderedList" ; + BulletList = Ct(ListItem(1,'*')^1) + / pandoc.BulletList ; + OrderedList = Ct(ListItem(1,'#')^1) + / pandoc.OrderedList ; + Table = (V"TableHeader" + Cc{}) + * Ct(V"TableRow"^1) + / function(headrow, bodyrows) + local numcolumns = #(bodyrows[1]) + local aligns = {} + local widths = {} + for i = 1,numcolumns do + aligns[i] = pandoc.AlignDefault + widths[i] = 0 + end + return pandoc.utils.from_simple_table( + pandoc.SimpleTable({}, aligns, widths, headrow, bodyrows)) + end ; + TableHeader = Ct(V"HeaderCell"^1) + * cellsep^-1 + * spacechar^0 + * newline ; + TableRow = Ct(V"BodyCell"^1) + * cellsep^-1 + * spacechar^0 + * newline ; + HeaderCell = cellsep + * P"=" + * spacechar^0 + * Ct((V"Inline" - (newline + cellsep))^0) + / function(ils) return { pandoc.Plain(ils) } end ; + BodyCell = cellsep + * spacechar^0 + * Ct((V"Inline" - (newline + cellsep))^0) + / function(ils) return { pandoc.Plain(ils) } end ; + Inline = V"Emph" + + V"Strong" + + V"LineBreak" + + V"Link" + + V"URL" + + V"Image" + + V"Str" + + V"Space" + + V"SoftBreak" + + V"Escaped" + + V"Placeholder" + + V"Code" + + V"Special" ; + Str = wordchar^1 + / pandoc.Str; + Escaped = P"~" + * C(P(1)) + / pandoc.Str ; + Special = specialchar + / pandoc.Str; + Space = spacechar^1 + / pandoc.Space ; + SoftBreak = endline + * # -(V"HorizontalRule" + V"CodeBlock") + / pandoc.SoftBreak ; + LineBreak = P"\\\\" + / pandoc.LineBreak ; + Code = P"{{{" + * C((1 - P"}}}")^0) + * P"}}}" + / trim / pandoc.Code ; + Link = P"[[" + * C((1 - (P"]]" + P"|"))^0) + * (P"|" * Ct((V"Inline" - P"]]")^1))^-1 * P"]]" + / function(url, desc) + local txt = desc or {pandoc.Str(url)} + return pandoc.Link(txt, url) + end ; + Image = P"{{" + * #-P"{" + * C((1 - (S"}"))^0) + * (P"|" * Ct((V"Inline" - P"}}")^1))^-1 + * P"}}" + / function(url, desc) + local txt = desc or "" + return pandoc.Image(txt, url) + end ; + URL = P"http" + * P"s"^-1 + * P":" + * (1 - (whitespacechar + (S",.?!:;\"'" * #whitespacechar)))^1 + / function(url) + return pandoc.Link(pandoc.Str(url), url) + end ; + Emph = P"//" + * Ct((V"Inline" - P"//")^1) + * P"//" + / pandoc.Emph ; + Strong = P"**" + * Ct((V"Inline" -P"**")^1) + * P"**" + / pandoc.Strong ; +} + +function Reader(input, reader_options) + return lpeg.match(G, tostring(input)) +end diff --git a/data/default.csl b/data/default.csl new file mode 100644 --- /dev/null +++ b/data/default.csl @@ -0,0 +1,3933 @@ +<?xml version="1.0" encoding="utf-8"?> +<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" page-range-format="chicago-16" version="1.0"> + <!-- This file was generated by the Style Variant Builder <https://github.com/citation-style-language/style-variant-builder>. To contribute changes, modify the template and regenerate variants. --> + <info> + <title>Chicago Manual of Style 18th edition (author-date) + CMOS with Bluebook (author-date [13.102]) + http://www.zotero.org/styles/chicago-author-date + + + + + Andrew Dunning + https://orcid.org/0000-0003-0464-5036 + + + + + + + + + + + + + + + + + + Chicago-style source citations (with Bluebook for legal citations), author-date system + 2025-08-07T00:00:00+00:00 + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License + + + + + ahead of print + unsigned + ed. + + vol. + vols. + + comp. + ed. + + ed. and trans. + eds. and trans. + + + ed. and trans. + eds. and trans. + + edited and translated by + edited and translated by + ed. and trans. + ed. and trans. + ill. + Pub. L. + unpublished manuscript + originally published as + paper + + under + under + at + trans. + + + + + + + vol. + vols + + + ed. and trans. + eds and trans. + + + ed. and trans. + eds and trans. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/docbook-entities.txt b/data/docbook-entities.txt new file mode 100644 --- /dev/null +++ b/data/docbook-entities.txt @@ -0,0 +1,2237 @@ +aacgr 03AC +Aacgr 0386 +aacute 00E1 +Aacute 00C1 +abreve 0103 +Abreve 0102 +ac 223E +acd 223F +acE 223E 0333 +acirc 00E2 +Acirc 00C2 +acute 00B4 +acy 0430 +Acy 0410 +aelig 00E6 +AElig 00C6 +af 2061 +afr 1D51E +Afr 1D504 +agr 03B1 +Agr 0391 +agrave 00E0 +Agrave 00C0 +alefsym 2135 +aleph 2135 +alpha 03B1 +Alpha 0391 +amacr 0101 +Amacr 0100 +amalg 2A3F +amp 0026 +AMP 0026 +and 2227 +And 2A53 +andand 2A55 +andd 2A5C +andslope 2A58 +andv 2A5A +ang 2220 +ange 29A4 +angle 2220 +angmsd 2221 +angmsdaa 29A8 +angmsdab 29A9 +angmsdac 29AA +angmsdad 29AB +angmsdae 29AC +angmsdaf 29AD +angmsdag 29AE +angmsdah 29AF +angrt 221F +angrtvb 22BE +angrtvbd 299D +angsph 2222 +angst 00C5 +angzarr 237C +aogon 0105 +Aogon 0104 +aopf 1D552 +Aopf 1D538 +ap 2248 +apacir 2A6F +ape 224A +apE 2A70 +apid 224B +apos 0027 +ApplyFunction 2061 +approx 2248 +approxeq 224A +aring 00E5 +Aring 00C5 +ascr 1D4B6 +Ascr 1D49C +Assign 2254 +ast 002A +asymp 2248 +asympeq 224D +atilde 00E3 +Atilde 00C3 +auml 00E4 +Auml 00C4 +awconint 2233 +awint 2A11 +b.alpha 1D6C2 +b.beta 1D6C3 +b.chi 1D6D8 +b.delta 1D6C5 +b.Delta 1D6AB +b.epsi 1D6C6 +b.epsiv 1D6DC +b.eta 1D6C8 +b.gamma 1D6C4 +b.Gamma 1D6AA +b.gammad 1D7CB +b.Gammad 1D7CA +b.iota 1D6CA +b.kappa 1D6CB +b.kappav 1D6DE +b.lambda 1D6CC +b.Lambda 1D6B2 +b.mu 1D6CD +b.nu 1D6CE +b.omega 1D6DA +b.Omega 1D6C0 +b.phi 1D6D7 +b.Phi 1D6BD +b.phiv 1D6DF +b.pi 1D6D1 +b.Pi 1D6B7 +b.piv 1D6E1 +b.psi 1D6D9 +b.Psi 1D6BF +b.rho 1D6D2 +b.rhov 1D6E0 +b.sigma 1D6D4 +b.Sigma 1D6BA +b.sigmav 1D6D3 +b.tau 1D6D5 +b.Theta 1D6AF +b.thetas 1D6C9 +b.thetav 1D6DD +b.upsi 1D6D6 +b.UpsiUpsilon +b.xi 1D6CF +b.Xi 1D6B5 +b.zeta 1D6C7 +backcong 224C +backepsilon 03F6 +backprime 2035 +backsim 223D +backsimeq 22CD +Backslash 2216 +Barv 2AE7 +barvee 22BD +barwed 2305 +Barwed 2306 +barwedge 2305 +bbrk 23B5 +bbrktbrk 23B6 +bcong 224C +bcy 0431 +Bcy 0411 +bdquo 201E +becaus 2235 +because 2235 +Because 2235 +bemptyv 29B0 +bepsi 03F6 +bernou 212C +Bernoullis 212C +beta 03B2 +Beta 0392 +beth 2136 +between 226C +bfr 1D51F +Bfr 1D505 +bgr 03B2 +Bgr 0392 +bigcap 22C2 +bigcirc 25EF +bigcup 22C3 +bigodot 2A00 +bigoplus 2A01 +bigotimes 2A02 +bigsqcup 2A06 +bigstarUB starf +bigtriangledown 25BD +bigtriangleup 25B3 +biguplus 2A04 +bigvee 22C1 +bigwedge 22C0 +bkarow 290D +blacklozengeUB lozf +blacksquare 25AA +blacktriangleUB utrif +blacktriangledownUB dtrif +blacktriangleleftUB ltrif +blacktrianglerightUB rtrif +blank 2423 +blk12 2592 +blk14 2591 +blk34 2593 +block 2588 +bne 003D 20E5 +bnequiv 2261 20E5 +bnot 2310 +bNot 2AED +bopf 1D553 +Bopf 1D539 +bot 22A5 +bottom 22A5 +bowtie 22C8 +boxbox 29C9 +boxdl 2510 +boxdL 2555 +boxDl 2556 +boxDL 2557 +boxdr 250C +boxdR 2552 +boxDr 2553 +boxDR 2554 +boxh 2500 +boxH 2550 +boxhd 252C +boxhD 2565 +boxHd 2564 +boxHD 2566 +boxhu 2534 +boxhU 2568 +boxHu 2567 +boxHU 2569 +boxminus 229F +boxplus 229E +boxtimes 22A0 +boxul 2518 +boxuL 255B +boxUl 255C +boxUL 255D +boxur 2514 +boxuR 2558 +boxUr 2559 +boxUR 255A +boxv 2502 +boxV 2551 +boxvh 253C +boxvH 256A +boxVh 256B +boxVH 256C +boxvl 2524 +boxvL 2561 +boxVl 2562 +boxVL 2563 +boxvr 251C +boxvR 255E +boxVr 255F +boxVR 2560 +bprime 2035 +breve 02D8 +Breve 02D8 +brvbar 00A6 +bscr 1D4B7 +Bscr 212C +bsemi 204F +bsim 223D +bsime 22CD +bsol 005C +bsolb 29C5 +bsolhsub 27C8 +bull 2022 +bulletUB bull +bump 224E +bumpe 224F +bumpE 2AAE +bumpeq 224F +Bumpeq 224E +cacute 0107 +Cacute 0106 +cap 2229 +Cap 22D2 +capand 2A44 +capbrcup 2A49 +capcap 2A4B +capcup 2A47 +capdot 2A40 +CapitalDifferentialD 2145 +caps 2229 FE00 +caret 2041 +caron 02C7 +Cayleys 212D +ccaps 2A4D +ccaron 010D +Ccaron 010C +ccedil 00E7 +Ccedil 00C7 +ccirc 0109 +Ccirc 0108 +Cconint 2230 +ccups 2A4C +ccupssm 2A50 +cdot 010B +Cdot 010A +cedil 00B8 +Cedilla 00B8 +cemptyv 29B2 +cent 00A2 +centerdotUM middot +CenterDotUM middot +cfr 1D520 +Cfr 212D +chcy 0447 +CHcy 0427 +check 2713 +checkmarkUB check +chi 03C7 +Chi 03A7 +cir 25CB +circ 02C6 +circeq 2257 +circlearrowleft 21BA +circlearrowright 21BB +circledast 229B +circledcirc 229A +circleddash 229D +CircleDot 2299 +circledRUM reg +circledS 24C8 +CircleMinus 2296 +CirclePlus 2295 +CircleTimes 2297 +cire 2257 +cirE 29C3 +cirfnint 2A10 +cirmid 2AEF +cirscir 29C2 +ClockwiseContourIntegral 2232 +CloseCurlyDoubleQuoteUM rdquo +CloseCurlyQuoteUM rsquo +clubs 2663 +clubsuitUB clubs +colon 003A +Colon 2237 +colone 2254 +Colone 2A74 +coloneq 2254 +comma 002C +commat 0040 +comp 2201 +compfn 2218 +complement 2201 +complexes 2102 +cong 2245 +congdot 2A6D +Congruent 2261 +conint 222E +Conint 222F +ContourIntegral 222E +copf 1D554 +Copf 2102 +coprod 2210 +Coproduct 2210 +copy 00A9 +COPY 00A9 +copysr 2117 +CounterClockwiseContourIntegral 2233 +crarr 21B5 +cross 2717 +Cross 2A2F +cscr 1D4B8 +Cscr 1D49E +csub 2ACF +csube 2AD1 +csup 2AD0 +csupe 2AD2 +ctdot 22EF +cudarrl 2938 +cudarrr 2935 +cuepr 22DE +cuesc 22DF +cularr 21B6 +cularrp 293D +cup 222A +Cup 22D3 +cupbrcap 2A48 +cupcap 2A46 +CupCap 224D +cupcup 2A4A +cupdot 228D +cupor 2A45 +cups 222A FE00 +curarr 21B7 +curarrm 293C +curlyeqprec 22DE +curlyeqsucc 22DF +curlyvee 22CE +curlywedge 22CF +curren 00A4 +curvearrowleft 21B6 +curvearrowright 21B7 +cuvee 22CE +cuwed 22CF +cwconint 2232 +cwint 2231 +cylcty 232D +dagger 2020 +Dagger 2021 +daleth 2138 +darr 2193 +dArr 21D3 +Darr 21A1 +dash 2010 +dashv 22A3 +Dashv 2AE4 +dbkarow 290F +dblac 02DD +dcaron 010F +Dcaron 010E +dcy 0434 +Dcy 0414 +dd 2146 +DD 2145 +ddaggerUB Dagger +ddarr 21CA +DDotrahd 2911 +ddotseq 2A77 +deg 00B0 +Del 2207 +delta 03B4 +Delta 0394 +demptyv 29B1 +dfisht 297F +dfr 1D521 +Dfr 1D507 +dgr 03B4 +Dgr 0394 +dHar 2965 +dharl 21C3 +dharr 21C2 +DiacriticalAcute 00B4 +DiacriticalDot 02D9 +DiacriticalDoubleAcute 02DD +DiacriticalGrave 0060 +DiacriticalTilde 02DC +diam 22C4 +diamond 22C4 +Diamond 22C4 +diamondsuitUB diams +diams 2666 +die 00A8 +DifferentialD 2146 +digamma 03DD +disin 22F2 +divUM divide +divide 00F7 +divideontimes 22C7 +divonx 22C7 +djcy 0452 +DJcy 0402 +dlcorn 231E +dlcrop 230D +dollar 0024 +dopf 1D555 +Dopf 1D53B +dot 02D9 +Dot 00A8 +DotDot 20DC +doteq 2250 +doteqdot 2251 +DotEqual 2250 +dotminus 2238 +dotplus 2214 +dotsquare 22A1 +doublebarwedge 2306 +DoubleContourIntegral 222F +DoubleDot 00A8 +DoubleDownArrow 21D3 +DoubleLeftArrow 21D0 +DoubleLeftRightArrow 21D4 +DoubleLeftTee 2AE4 +DoubleLongLeftArrow 27F8 +DoubleLongLeftRightArrow 27FA +DoubleLongRightArrow 27F9 +DoubleRightArrow 21D2 +DoubleRightTee 22A8 +DoubleUpArrow 21D1 +DoubleUpDownArrow 21D5 +DoubleVerticalBar 2225 +downarrowUM darr +Downarrow 21D3 +DownArrowUM darr +DownArrowBar 2913 +DownArrowUpArrow 21F5 +DownBreve 0311 +downdownarrows 21CA +downharpoonleft 21C3 +downharpoonright 21C2 +DownLeftRightVector 2950 +DownLeftTeeVector 295E +DownLeftVector 21BD +DownLeftVectorBar 2956 +DownRightTeeVector 295F +DownRightVector 21C1 +DownRightVectorBar 2957 +DownTee 22A4 +DownTeeArrow 21A7 +drbkarow 2910 +drcorn 231F +drcrop 230C +dscr 1D4B9 +Dscr 1D49F +dscy 0455 +DScy 0405 +dsol 29F6 +dstrok 0111 +Dstrok 0110 +dtdot 22F1 +dtri 25BF +dtrif 25BE +duarr 21F5 +duhar 296F +dwangle 29A6 +dzcy 045F +DZcy 040F +dzigrarr 27FF +eacgr 03AD +Eacgr 0388 +eacute 00E9 +Eacute 00C9 +easter 2A6E +ecaron 011B +Ecaron 011A +ecir 2256 +ecirc 00EA +Ecirc 00CA +ecolon 2255 +ecy 044D +Ecy 042D +eDDot 2A77 +edot 0117 +eDot 2251 +Edot 0116 +ee 2147 +eeacgr 03AE +EEacgr 0389 +eegr 03B7 +EEgr 0397 +efDot 2252 +efr 1D522 +Efr 1D508 +eg 2A9A +egr 03B5 +Egr 0395 +egrave 00E8 +Egrave 00C8 +egs 2A96 +egsdot 2A98 +el 2A99 +Element 2208 +elinters 23E7 +ell 2113 +els 2A95 +elsdot 2A97 +emacr 0113 +Emacr 0112 +empty 2205 +emptyset 2205 +EmptySmallSquare 25FB +emptyv 2205 +EmptyVerySmallSquare 25AB +emsp 2003 +emsp13 2004 +emsp14 2005 +eng 014B +ENG 014A +ensp 2002 +eogon 0119 +Eogon 0118 +eopf 1D556 +Eopf 1D53C +epar 22D5 +eparsl 29E3 +eplus 2A71 +epsi 03B5 +epsilon 03B5 +Epsilon 0395 +epsiv 03F5 +eqcirc 2256 +eqcolon 2255 +eqsim 2242 +eqslantgtr 2A96 +eqslantless 2A95 +Equal 2A75 +equals 003D +EqualTilde 2242 +equest 225F +Equilibrium 21CC +equiv 2261 +equivDD 2A78 +eqvparsl 29E5 +erarr 2971 +erDot 2253 +escr 212F +Escr 2130 +esdot 2250 +esim 2242 +Esim 2A73 +eta 03B7 +Eta 0397 +eth 00F0 +ETH 00D0 +euml 00EB +Euml 00CB +euro 20AC +excl 0021 +exist 2203 +Exists 2203 +expectation 2130 +exponentiale 2147 +ExponentialE 2147 +fallingdotseq 2252 +fcy 0444 +Fcy 0424 +female 2640 +ffilig FB03 +fflig FB00 +ffllig FB04 +ffr 1D523 +Ffr 1D509 +filig FB01 +FilledSmallSquare 25FC +FilledVerySmallSquare 25AA +fjlig 0066 006A +flat 266D +fllig FB02 +fltns 25B1 +fnof 0192 +fopf 1D557 +Fopf 1D53D +forall 2200 +ForAll 2200 +fork 22D4 +forkv 2AD9 +Fouriertrf 2131 +fpartint 2A0D +frac12 00BD +frac13 2153 +frac14 00BC +frac15 2155 +frac16 2159 +frac18 215B +frac23 2154 +frac25 2156 +frac34 00BE +frac35 2157 +frac38 215C +frac45 2158 +frac56 215A +frac58 215D +frac78 215E +frasl 2044 +frown 2322 +fscr 1D4BB +Fscr 2131 +gacute 01F5 +gamma 03B3 +Gamma 0393 +gammad 03DD +Gammad 03DC +gap 2A86 +gbreve 011F +Gbreve 011E +Gcedil 0122 +gcirc 011D +Gcirc 011C +gcy 0433 +Gcy 0413 +gdot 0121 +Gdot 0120 +ge 2265 +gE 2267 +gel 22DB +gEl 2A8C +geq 2265 +geqq 2267 +geqslant 2A7E +ges 2A7E +gescc 2AA9 +gesdot 2A80 +gesdoto 2A82 +gesdotol 2A84 +gesl 22DB FE00 +gesles 2A94 +gfr 1D524 +Gfr 1D50A +gg 226B +Gg 22D9 +ggg 22D9 +ggr 03B3 +Ggr 0393 +gimel 2137 +gjcy 0453 +GJcy 0403 +gl 2277 +gla 2AA5 +glE 2A92 +glj 2AA4 +gnap 2A8A +gnapprox 2A8A +gne 2A88 +gnE 2269 +gneq 2A88 +gneqq 2269 +gnsim 22E7 +gopf 1D558 +Gopf 1D53E +grave 0060 +GreaterEqual 2265 +GreaterEqualLess 22DB +GreaterFullEqual 2267 +GreaterGreater 2AA2 +GreaterLess 2277 +GreaterSlantEqual 2A7E +GreaterTilde 2273 +gscr 210A +Gscr 1D4A2 +gsim 2273 +gsime 2A8E +gsiml 2A90 +gt 003E +Gt 226B +GT 003E +gtcc 2AA7 +gtcir 2A7A +gtdot 22D7 +gtlPar 2995 +gtquest 2A7C +gtrapprox 2A86 +gtrarr 2978 +gtrdot 22D7 +gtreqless 22DB +gtreqqless 2A8C +gtrless 2277 +gtrsim 2273 +gvertneqq 2269 FE00 +gvnE 2269 FE00 +Hacek 02C7 +hairsp 200A +half 00BD +hamilt 210B +hardcy 044A +HARDcy 042A +harr 2194 +hArr 21D4 +harrcir 2948 +harrw 21AD +Hat 005E +hbar 210F +hcirc 0125 +Hcirc 0124 +hearts 2665 +heartsuitUB hearts +hellip 2026 +hercon 22B9 +hfr 1D525 +Hfr 210C +HilbertSpace 210B +hksearow 2925 +hkswarow 2926 +hoarr 21FF +homtht 223B +hookleftarrow 21A9 +hookrightarrow 21AA +hopf 1D559 +Hopf 210D +horbar 2015 +HorizontalLine 2500 +hscr 1D4BD +Hscr 210B +hslash 210F +hstrok 0127 +Hstrok 0126 +HumpDownHump 224E +HumpEqual 224F +hybull 2043 +hyphen 2010 +iacgr 03AF +Iacgr 038A +iacute 00ED +Iacute 00CD +ic 2063 +icirc 00EE +Icirc 00CE +icy 0438 +Icy 0418 +idiagr 0390 +idigr 03CA +Idigr 03AA +Idot 0130 +iecy 0435 +IEcy 0415 +iexcl 00A1 +iff 21D4 +ifr 1D526 +Ifr 2111 +igr 03B9 +Igr 0399 +igrave 00EC +Igrave 00CC +ii 2148 +iiiint 2A0C +iiint 222D +iinfin 29DC +iiota 2129 +ijlig 0133 +IJlig 0132 +Im 2111 +imacr 012B +Imacr 012A +image 2111 +ImaginaryI 2148 +imagline 2110 +imagpart 2111 +imath 0131 +imof 22B7 +imped 01B5 +Implies 21D2 +in 2208 +incare 2105 +infin 221E +infintie 29DD +inodot 0131 +int 222B +Int 222C +intcal 22BA +integers 2124 +Integral 222B +intercal 22BA +Intersection 22C2 +intlarhk 2A17 +intprod 2A3C +InvisibleComma 2063 +InvisibleTimes 2062 +iocy 0451 +IOcy 0401 +iogon 012F +Iogon 012E +iopf 1D55A +Iopf 1D540 +iota 03B9 +Iota 0399 +iprod 2A3C +iquest 00BF +iscr 1D4BE +Iscr 2110 +isin 2208 +isindot 22F5 +isinE 22F9 +isins 22F4 +isinsv 22F3 +isinv 2208 +it 2062 +itilde 0129 +Itilde 0128 +iukcyUkrainian +IukcyUkrainian +iuml 00EF +Iuml 00CF +jcirc 0135 +Jcirc 0134 +jcy 0439 +Jcy 0419 +jfr 1D527 +Jfr 1D50D +jmath 0237 +jopf 1D55B +Jopf 1D541 +jscr 1D4BF +Jscr 1D4A5 +jsercy 0458 +Jsercy 0408 +jukcyUkrainian +JukcyUkrainian +kappa 03BA +Kappa 039A +kappav 03F0 +kcedil 0137 +Kcedil 0136 +kcy 043A +Kcy 041A +kfr 1D528 +Kfr 1D50E +kgr 03BA +Kgr 039A +kgreen 0138 +khcy 0445 +KHcy 0425 +khgr 03C7 +KHgr 03A7 +kjcy 045C +KJcy 040C +kopf 1D55C +Kopf 1D542 +kscr 1D4C0 +Kscr 1D4A6 +lAarr 21DA +lacute 013A +Lacute 0139 +laemptyv 29B4 +lagran 2112 +lambda 03BB +Lambda 039B +lang 27E8 +Lang 27EA +langd 2991 +langle 27E8 +lap 2A85 +Laplacetrf 2112 +laquo 00AB +larr 2190 +lArr 21D0 +Larr 219E +larrb 21E4 +larrbfs 291F +larrfs 291D +larrhk 21A9 +larrlp 21AB +larrpl 2939 +larrsim 2973 +larrtl 21A2 +lat 2AAB +latail 2919 +lAtail 291B +late 2AAD +lates 2AAD FE00 +lbarr 290C +lBarr 290E +lbbrk 2772 +lbraceUM lcub +lbrackUM lsqb +lbrke 298B +lbrksld 298F +lbrkslu 298D +lcaron 013E +Lcaron 013D +lcedil 013C +Lcedil 013B +lceil 2308 +lcub 007B +lcy 043B +Lcy 041B +ldca 2936 +ldquo 201C +ldquor 201E +ldrdhar 2967 +ldrushar 294B +ldsh 21B2 +le 2264 +lE 2266 +LeftAngleBracket 27E8 +leftarrowUM larr +Leftarrow 21D0 +LeftArrowUM larr +LeftArrowBar 21E4 +LeftArrowRightArrow 21C6 +leftarrowtail 21A2 +LeftCeiling 2308 +LeftDoubleBracket 27E6 +LeftDownTeeVector 2961 +LeftDownVector 21C3 +LeftDownVectorBar 2959 +LeftFloor 230A +leftharpoondown 21BD +leftharpoonup 21BC +leftleftarrows 21C7 +leftrightarrow 2194 +Leftrightarrow 21D4 +LeftRightArrow 2194 +leftrightarrows 21C6 +leftrightharpoons 21CB +leftrightsquigarrow 21AD +LeftRightVector 294E +LeftTee 22A3 +LeftTeeArrow 21A4 +LeftTeeVector 295A +leftthreetimes 22CB +LeftTriangle 22B2 +LeftTriangleBar 29CF +LeftTriangleEqual 22B4 +LeftUpDownVector 2951 +LeftUpTeeVector 2960 +LeftUpVector 21BF +LeftUpVectorBar 2958 +LeftVector 21BC +LeftVectorBar 2952 +leg 22DA +lEg 2A8B +leq 2264 +leqq 2266 +leqslant 2A7D +les 2A7D +lescc 2AA8 +lesdot 2A7F +lesdoto 2A81 +lesdotor 2A83 +lesg 22DA FE00 +lesges 2A93 +lessapprox 2A85 +lessdot 22D6 +lesseqgtr 22DA +lesseqqgtr 2A8B +LessEqualGreater 22DA +LessFullEqual 2266 +LessGreater 2276 +lessgtr 2276 +LessLess 2AA1 +lesssim 2272 +LessSlantEqual 2A7D +LessTilde 2272 +lfisht 297C +lfloor 230A +lfr 1D529 +Lfr 1D50F +lg 2276 +lgE 2A91 +lgr 03BB +Lgr 039B +lHar 2962 +lhard 21BD +lharu 21BC +lharul 296A +lhblk 2584 +ljcy 0459 +LJcy 0409 +ll 226A +Ll 22D8 +llarr 21C7 +llcorner 231E +Lleftarrow 21DA +llhard 296B +lltri 25FA +lmidot 0140 +Lmidot 013F +lmoust 23B0 +lmoustache 23B0 +lnap 2A89 +lnapprox 2A89 +lne 2A87 +lnE 2268 +lneq 2A87 +lneqq 2268 +lnsim 22E6 +loang 27EC +loarr 21FD +lobrk 27E6 +longleftarrow 27F5 +Longleftarrow 27F8 +LongLeftArrow 27F5 +longleftrightarrow 27F7 +Longleftrightarrow 27FA +LongLeftRightArrow 27F7 +longmapsto 27FC +longrightarrow 27F6 +Longrightarrow 27F9 +LongRightArrow 27F6 +looparrowleft 21AB +looparrowright 21AC +lopar 2985 +lopf 1D55D +Lopf 1D543 +loplus 2A2D +lotimes 2A34 +lowast 2217 +lowbar 005F +LowerLeftArrow 2199 +LowerRightArrow 2198 +loz 25CA +lozengeUB loz +lozf 29EB +lpar 0028 +lparlt 2993 +lrarr 21C6 +lrcorner 231F +lrhar 21CB +lrhard 296D +lrm 200E +lrtri 22BF +lsaquo 2039 +lscr 1D4C1 +Lscr 2112 +lsh 21B0 +Lsh 21B0 +lsim 2272 +lsime 2A8D +lsimg 2A8F +lsqb 005B +lsquo 2018 +lsquor 201A +lstrok 0142 +Lstrok 0141 +lt 003C +Lt 226A +LT 003C +ltcc 2AA6 +ltcir 2A79 +ltdot 22D6 +lthree 22CB +ltimes 22C9 +ltlarr 2976 +ltquest 2A7B +ltri 25C3 +ltrie 22B4 +ltrif 25C2 +ltrPar 2996 +lurdshar 294A +luruhar 2966 +lvertneqq 2268 FE00 +lvnE 2268 FE00 +macr 00AF +male 2642 +malt 2720 +malteseUB malt +map 21A6 +Map 2905 +mapsto 21A6 +mapstodown 21A7 +mapstoleft 21A4 +mapstoup 21A5 +marker 25AE +mcomma 2A29 +mcy 043C +Mcy 041C +mdash 2014 +mDDot 223A +measuredangle 2221 +MediumSpace 205F +Mellintrf 2133 +mfr 1D52A +Mfr 1D510 +mgr 03BC +Mgr 039C +mho 2127 +micro 00B5 +mid 2223 +midast 002A +midcir 2AF0 +middot 00B7 +minus 2212 +minusb 229F +minusd 2238 +minusdu 2A2A +MinusPlus 2213 +mlcp 2ADB +mldr 2026 +mnplus 2213 +models 22A7 +mopf 1D55E +Mopf 1D544 +mp 2213 +mscr 1D4C2 +Mscr 2133 +mstpos 223E +mu 03BC +Mu 039C +multimap 22B8 +mumap 22B8 +nabla 2207 +nacute 0144 +Nacute 0143 +nang 2220 20D2 +nap 2249 +napE 2A70 0338 +napid 224B 0338 +napos 0149 +napprox 2249 +natur 266E +naturalUB natur +naturals 2115 +nbsp 00A0 +nbump 224E 0338 +nbumpe 224F 0338 +ncap 2A43 +ncaron 0148 +Ncaron 0147 +ncedil 0146 +Ncedil 0145 +ncong 2247 +ncongdot 2A6D 0338 +ncup 2A42 +ncy 043D +Ncy 041D +ndash 2013 +ne 2260 +nearhk 2924 +nearr 2197 +neArr 21D7 +nearrow 2197 +nedot 2250 0338 +NegativeMediumSpace 200B +NegativeThickSpace 200B +NegativeThinSpace 200B +NegativeVeryThinSpace 200B +nequiv 2262 +nesear 2928 +nesim 2242 0338 +NestedGreaterGreater 226B +NestedLessLess 226A +NewLine 000A +nexist 2204 +nexists 2204 +nfr 1D52B +Nfr 1D511 +nge 2271 +ngE 2267 0338 +ngeq 2271 +ngeqq 2267 0338 +ngeqslant 2A7E 0338 +nges 2A7E 0338 +nGg 22D9 0338 +ngr 03BD +Ngr 039D +ngsim 2275 +ngt 226F +nGt 226B 20D2 +ngtr 226F +nGtv 226B 0338 +nharr 21AE +nhArr 21CE +nhpar 2AF2 +ni 220B +nis 22FC +nisd 22FA +niv 220B +njcy 045A +NJcy 040A +nlarr 219A +nlArr 21CD +nldr 2025 +nle 2270 +nlE 2266 0338 +nleftarrow 219A +nLeftarrow 21CD +nleftrightarrow 21AE +nLeftrightarrow 21CE +nleq 2270 +nleqq 2266 0338 +nleqslant 2A7D 0338 +nles 2A7D 0338 +nless 226E +nLl 22D8 0338 +nlsim 2274 +nlt 226E +nLt 226A 20D2 +nltri 22EA +nltrie 22EC +nLtv 226A 0338 +nmid 2224 +NoBreak 2060 +NonBreakingSpaceUM nbsp +nopf 1D55F +Nopf 2115 +not 00AC +Not 2AEC +NotCongruent 2262 +NotCupCap 226D +NotDoubleVerticalBar 2226 +NotElement 2209 +NotEqual 2260 +NotEqualTilde 2242 0338 +NotExists 2204 +NotGreater 226F +NotGreaterEqual 2271 +NotGreaterFullEqual 2267 0338 +NotGreaterGreater 226B 0338 +NotGreaterLess 2279 +NotGreaterSlantEqual 2A7E 0338 +NotGreaterTilde 2275 +NotHumpDownHump 224E 0338 +NotHumpEqual 224F 0338 +notin 2209 +notindot 22F5 0338 +notinE 22F9 0338 +notinva 2209 +notinvb 22F7 +notinvc 22F6 +NotLeftTriangle 22EA +NotLeftTriangleBar 29CF 0338 +NotLeftTriangleEqual 22EC +NotLess 226E +NotLessEqual 2270 +NotLessGreater 2278 +NotLessLess 226A 0338 +NotLessSlantEqual 2A7D 0338 +NotLessTilde 2274 +NotNestedGreaterGreater 2AA2 0338 +NotNestedLessLess 2AA1 0338 +notni 220C +notniva 220C +notnivb 22FE +notnivc 22FD +NotPrecedes 2280 +NotPrecedesEqual 2AAF 0338 +NotPrecedesSlantEqual 22E0 +NotReverseElement 220C +NotRightTriangle 22EB +NotRightTriangleBar 29D0 0338 +NotRightTriangleEqual 22ED +NotSquareSubset 228F 0338 +NotSquareSubsetEqual 22E2 +NotSquareSuperset 2290 0338 +NotSquareSupersetEqual 22E3 +NotSubset 2282 20D2 +NotSubsetEqual 2288 +NotSucceeds 2281 +NotSucceedsEqual 2AB0 0338 +NotSucceedsSlantEqual 22E1 +NotSucceedsTilde 227F 0338 +NotSuperset 2283 20D2 +NotSupersetEqual 2289 +NotTilde 2241 +NotTildeEqual 2244 +NotTildeFullEqual 2247 +NotTildeTilde 2249 +NotVerticalBar 2224 +npar 2226 +nparallel 2226 +nparsl 2AFD 20E5 +npart 2202 0338 +npolint 2A14 +npr 2280 +nprcue 22E0 +npre 2AAF 0338 +nprec 2280 +npreceq 2AAF 0338 +nrarr 219B +nrArr 21CF +nrarrc 2933 0338 +nrarrw 219D 0338 +nrightarrow 219B +nRightarrow 21CF +nrtri 22EB +nrtrie 22ED +nsc 2281 +nsccue 22E1 +nsce 2AB0 0338 +nscr 1D4C3 +Nscr 1D4A9 +nshortmid 2224 +nshortparallel 2226 +nsim 2241 +nsime 2244 +nsimeq 2244 +nsmid 2224 +nspar 2226 +nsqsube 22E2 +nsqsupe 22E3 +nsub 2284 +nsube 2288 +nsubE 2AC5 0338 +nsubset 2282 20D2 +nsubseteq 2288 +nsubseteqq 2AC5 0338 +nsucc 2281 +nsucceq 2AB0 0338 +nsup 2285 +nsupe 2289 +nsupE 2AC6 0338 +nsupset 2283 20D2 +nsupseteq 2289 +nsupseteqq 2AC6 0338 +ntgl 2279 +ntilde 00F1 +Ntilde 00D1 +ntlg 2278 +ntriangleleft 22EA +ntrianglelefteq 22EC +ntriangleright 22EB +ntrianglerighteq 22ED +nu 03BD +Nu 039D +num 0023 +numero 2116 +numsp 2007 +nvap 224D 20D2 +nvdash 22AC +nvDash 22AD +nVdash 22AE +nVDash 22AF +nvge 2265 20D2 +nvgt 003E 20D2 +nvHarr 2904 +nvinfin 29DE +nvlArr 2902 +nvle 2264 20D2 +nvlt 003C 20D2 +nvltrie 22B4 20D2 +nvrArr 2903 +nvrtrie 22B5 20D2 +nvsim 223C 20D2 +nwarhk 2923 +nwarr 2196 +nwArr 21D6 +nwarrow 2196 +nwnear 2927 +oacgr 03CC +Oacgr 038C +oacute 00F3 +Oacute 00D3 +oast 229B +ocir 229A +ocirc 00F4 +Ocirc 00D4 +ocy 043E +Ocy 041E +odash 229D +odblac 0151 +Odblac 0150 +odiv 2A38 +odot 2299 +odsold 29BC +oelig 0153 +OElig 0152 +ofcir 29BF +ofr 1D52C +Ofr 1D512 +ogon 02DB +ogr 03BF +Ogr 039F +ograve 00F2 +Ograve 00D2 +ogt 29C1 +ohacgr 03CE +OHacgr 038F +ohbar 29B5 +ohgr 03C9 +OHgr 03A9 +ohm 03A9 +oint 222E +olarr 21BA +olcir 29BE +olcross 29BB +oline 203E +olt 29C0 +omacr 014D +Omacr 014C +omega 03C9 +Omega 03A9 +omicron 03BF +Omicron 039F +omid 29B6 +ominus 2296 +oopf 1D560 +Oopf 1D546 +opar 29B7 +OpenCurlyDoubleQuoteUM ldquo +OpenCurlyQuoteUM lsquo +operp 29B9 +oplus 2295 +or 2228 +Or 2A54 +orarr 21BB +ord 2A5D +order 2134 +orderof 2134 +ordf 00AA +ordm 00BA +origof 22B6 +oror 2A56 +orslope 2A57 +orv 2A5B +oS 24C8 +oscr 2134 +Oscr 1D4AA +oslash 00F8 +Oslash 00D8 +osol 2298 +otilde 00F5 +Otilde 00D5 +otimes 2297 +Otimes 2A37 +otimesas 2A36 +ouml 00F6 +Ouml 00D6 +ovbar 233D +OverBar 203E +OverBrace 23DE +OverBracket 23B4 +OverParenthesis 23DC +par 2225 +para 00B6 +parallel 2225 +parsim 2AF3 +parsl 2AFD +part 2202 +PartialD 2202 +pcy 043F +Pcy 041F +percnt 0025 +period 002E +permil 2030 +perp 22A5 +pertenk 2031 +pfr 1D52D +Pfr 1D513 +pgr 03C0 +Pgr 03A0 +phgr 03C6 +PHgr 03A6 +phi 03C6 +Phi 03A6 +phiv 03D5 +phmmat 2133 +phone 260E +pi 03C0 +Pi 03A0 +pitchfork 22D4 +piv 03D6 +planck 210F +planckh 210E +plankv 210F +plus 002B +plusacir 2A23 +plusb 229E +pluscir 2A22 +plusdo 2214 +plusdu 2A25 +pluse 2A72 +PlusMinusUM plusmn +plusmn 00B1 +plussim 2A26 +plustwo 2A27 +pmUM plusmn +Poincareplane 210C +pointint 2A15 +popf 1D561 +Popf 2119 +pound 00A3 +pr 227A +Pr 2ABB +prap 2AB7 +prcue 227C +pre 2AAF +prE 2AB3 +prec 227A +precapprox 2AB7 +preccurlyeq 227C +Precedes 227A +PrecedesEqual 2AAF +PrecedesSlantEqual 227C +PrecedesTilde 227E +preceq 2AAF +precnapprox 2AB9 +precneqq 2AB5 +precnsim 22E8 +precsim 227E +prime 2032 +Prime 2033 +primes 2119 +prnap 2AB9 +prnE 2AB5 +prnsim 22E8 +prod 220F +Product 220F +profalar 232E +profline 2312 +profsurf 2313 +prop 221D +Proportion 2237 +Proportional 221D +propto 221D +prsim 227E +prurel 22B0 +pscr 1D4C5 +Pscr 1D4AB +psgr 03C8 +PSgr 03A8 +psi 03C8 +Psi 03A8 +puncsp 2008 +qfr 1D52E +Qfr 1D514 +qint 2A0C +qopf 1D562 +Qopf 211A +qprime 2057 +qscr 1D4C6 +Qscr 1D4AC +quaternions 210D +quatint 2A16 +quest 003F +questeq 225F +quot 0022 +QUOT 0022 +rAarr 21DB +race 223D 0331 +racute 0155 +Racute 0154 +radic 221A +raemptyv 29B3 +rang 27E9 +Rang 27EB +rangd 2992 +range 29A5 +rangle 27E9 +raquo 00BB +rarr 2192 +rArr 21D2 +Rarr 21A0 +rarrap 2975 +rarrb 21E5 +rarrbfs 2920 +rarrc 2933 +rarrfs 291E +rarrhk 21AA +rarrlp 21AC +rarrpl 2945 +rarrsim 2974 +rarrtl 21A3 +Rarrtl 2916 +rarrw 219D +ratail 291A +rAtail 291C +ratio 2236 +rationals 211A +rbarr 290D +rBarr 290F +RBarr 2910 +rbbrk 2773 +rbraceUM rcub +rbrackUM rsqb +rbrke 298C +rbrksld 298E +rbrkslu 2990 +rcaron 0159 +Rcaron 0158 +rcedil 0157 +Rcedil 0156 +rceil 2309 +rcub 007D +rcy 0440 +Rcy 0420 +rdca 2937 +rdldhar 2969 +rdquo 201D +rdquor 201D +rdsh 21B3 +Re 211C +real 211C +realine 211B +realpart 211C +reals 211D +rect 25AD +reg 00AE +REG 00AE +ReverseElement 220B +ReverseEquilibrium 21CB +ReverseUpEquilibrium 296F +rfisht 297D +rfloor 230B +rfr 1D52F +Rfr 211C +rgr 03C1 +Rgr 03A1 +rHar 2964 +rhard 21C1 +rharu 21C0 +rharul 296C +rho 03C1 +Rho 03A1 +rhov 03F1 +RightAngleBracket 27E9 +rightarrowUM rarr +Rightarrow 21D2 +RightArrowUM rarr +RightArrowBar 21E5 +RightArrowLeftArrow 21C4 +rightarrowtail 21A3 +RightCeiling 2309 +RightDoubleBracket 27E7 +RightDownTeeVector 295D +RightDownVector 21C2 +RightDownVectorBar 2955 +RightFloor 230B +rightharpoondown 21C1 +rightharpoonup 21C0 +rightleftarrows 21C4 +rightleftharpoons 21CC +rightrightarrows 21C9 +rightsquigarrow 219D +RightTee 22A2 +RightTeeArrow 21A6 +RightTeeVector 295B +rightthreetimes 22CC +RightTriangle 22B3 +RightTriangleBar 29D0 +RightTriangleEqual 22B5 +RightUpDownVector 294F +RightUpTeeVector 295C +RightUpVector 21BE +RightUpVectorBar 2954 +RightVector 21C0 +RightVectorBar 2953 +ring 02DA +risingdotseq 2253 +rlarr 21C4 +rlhar 21CC +rlm 200F +rmoust 23B1 +rmoustache 23B1 +rnmid 2AEE +roang 27ED +roarr 21FE +robrk 27E7 +ropar 2986 +ropf 1D563 +Ropf 211D +roplus 2A2E +rotimes 2A35 +RoundImplies 2970 +rpar 0029 +rpargt 2994 +rppolint 2A12 +rrarr 21C9 +Rrightarrow 21DB +rsaquo 203A +rscr 1D4C7 +Rscr 211B +rsh 21B1 +Rsh 21B1 +rsqb 005D +rsquo 2019 +rsquor 2019 +rthree 22CC +rtimes 22CA +rtri 25B9 +rtrie 22B5 +rtrif 25B8 +rtriltri 29CE +RuleDelayed 29F4 +ruluhar 2968 +rx 211E +sacute 015B +Sacute 015A +sbquo 201A +sc 227B +Sc 2ABC +scap 2AB8 +scaron 0161 +Scaron 0160 +sccue 227D +sce 2AB0 +scE 2AB4 +scedil 015F +Scedil 015E +scirc 015D +Scirc 015C +scnap 2ABA +scnE 2AB6 +scnsim 22E9 +scpolint 2A13 +scsim 227F +scy 0441 +Scy 0421 +sdot 22C5 +sdotb 22A1 +sdote 2A66 +searhk 2925 +searr 2198 +seArr 21D8 +searrow 2198 +sect 00A7 +semi 003B +seswar 2929 +setminus 2216 +setmn 2216 +sext 2736 +sfgr 03C2 +sfr 1D530 +Sfr 1D516 +sfrown 2322 +sgr 03C3 +Sgr 03A3 +sharp 266F +shchcy 0449 +SHCHcy 0429 +shcy 0448 +SHcy 0428 +ShortDownArrow 2193 +ShortLeftArrow 2190 +shortmid 2223 +shortparallel 2225 +ShortRightArrow 2192 +ShortUpArrow 2191 +shy 00AD +sigma 03C3 +Sigma 03A3 +sigmaf 03C2 +sigmav 03C2 +sim 223C +simdot 2A6A +sime 2243 +simeq 2243 +simg 2A9E +simgE 2AA0 +siml 2A9D +simlE 2A9F +simne 2246 +simplus 2A24 +simrarr 2972 +slarr 2190 +SmallCircle 2218 +smallsetminus 2216 +smashp 2A33 +smeparsl 29E4 +smid 2223 +smile 2323 +smt 2AAA +smte 2AAC +smtes 2AAC FE00 +softcy 044C +SOFTcy 042C +sol 002F +solb 29C4 +solbar 233F +sopf 1D564 +Sopf 1D54A +spades 2660 +spadesuitUB spades +spar 2225 +sqcap 2293 +sqcaps 2293 FE00 +sqcup 2294 +sqcups 2294 FE00 +Sqrt 221A +sqsub 228F +sqsube 2291 +sqsubset 228F +sqsubseteq 2291 +sqsup 2290 +sqsupe 2292 +sqsupset 2290 +sqsupseteq 2292 +squ 25A1 +square 25A1 +Square 25A1 +SquareIntersection 2293 +SquareSubset 228F +SquareSubsetEqual 2291 +SquareSuperset 2290 +SquareSupersetEqual 2292 +SquareUnion 2294 +squarf 25AA +squf 25AA +srarr 2192 +sscr 1D4C8 +Sscr 1D4AE +ssetmn 2216 +ssmile 2323 +sstarf 22C6 +star 2606 +Star 22C6 +starf 2605 +straightepsilon 03F5 +straightphi 03D5 +strns 00AF +sub 2282 +Sub 22D0 +subdot 2ABD +sube 2286 +subE 2AC5 +subedot 2AC3 +submult 2AC1 +subne 228A +subnE 2ACB +subplus 2ABF +subrarr 2979 +subset 2282 +Subset 22D0 +subseteq 2286 +subseteqq 2AC5 +SubsetEqual 2286 +subsetneq 228A +subsetneqq 2ACB +subsim 2AC7 +subsub 2AD5 +subsup 2AD3 +succ 227B +succapprox 2AB8 +succcurlyeq 227D +Succeeds 227B +SucceedsEqual 2AB0 +SucceedsSlantEqual 227D +SucceedsTilde 227F +succeq 2AB0 +succnapprox 2ABA +succneqq 2AB6 +succnsim 22E9 +succsim 227F +SuchThat 220B +sum 2211 +Sum 2211 +sung 266A +sup 2283 +Sup 22D1 +sup1 00B9 +sup2 00B2 +sup3 00B3 +supdot 2ABE +supdsub 2AD8 +supe 2287 +supE 2AC6 +supedot 2AC4 +Superset 2283 +SupersetEqual 2287 +suphsol 27C9 +suphsub 2AD7 +suplarr 297B +supmult 2AC2 +supne 228B +supnE 2ACC +supplus 2AC0 +supset 2283 +Supset 22D1 +supseteq 2287 +supseteqq 2AC6 +supsetneq 228B +supsetneqq 2ACC +supsim 2AC8 +supsub 2AD4 +supsup 2AD6 +swarhk 2926 +swarr 2199 +swArr 21D9 +swarrow 2199 +swnwar 292A +szlig 00DF +Tab 0009 +target 2316 +tau 03C4 +Tau 03A4 +tbrk 23B4 +tcaron 0165 +Tcaron 0164 +tcedil 0163 +Tcedil 0162 +tcy 0442 +Tcy 0422 +tdot 20DB +telrec 2315 +tfr 1D531 +Tfr 1D517 +tgr 03C4 +Tgr 03A4 +there4 2234 +therefore 2234 +Therefore 2234 +theta 03B8 +Theta 0398 +thetasym 03D1 +thetav 03D1 +thgr 03B8 +THgr 0398 +thickapprox 2248 +thicksim 223C +ThickSpace 205F 200A +thinsp 2009 +ThinSpaceUB thinsp +thkap 2248 +thksim 223C +thorn 00FE +THORN 00DE +tilde 02DC +Tilde 223C +TildeEqual 2243 +TildeFullEqual 2245 +TildeTilde 2248 +times 00D7 +timesb 22A0 +timesbar 2A31 +timesd 2A30 +tint 222D +toea 2928 +top 22A4 +topbot 2336 +topcir 2AF1 +topf 1D565 +Topf 1D54B +topfork 2ADA +tosa 2929 +tprime 2034 +trade 2122 +TRADE 2122 +triangleUB utri +triangledownUB dtri +triangleleftUB ltri +trianglelefteq 22B4 +triangleq 225C +trianglerightUB rtri +trianglerighteq 22B5 +tridot 25EC +trie 225C +triminus 2A3A +TripleDot 20DB +triplus 2A39 +trisb 29CD +tritime 2A3B +trpezium 23E2 +tscr 1D4C9 +Tscr 1D4AF +tscy 0446 +TScy 0426 +tshcy 045B +TSHcy 040B +tstrok 0167 +Tstrok 0166 +twixt 226C +twoheadleftarrow 219E +twoheadrightarrow 21A0 +uacgr 03CD +UacgrUpsilon +uacute 00FA +UacuteU with acute +uarr 2191 +uArr 21D1 +Uarr 219F +Uarrocir 2949 +ubrcy 045E +UbrcyU +ubreve 016D +UbreveU +ucirc 00FB +UcircU with circumflex +ucy 0443 +UcyU +udarr 21C5 +udblac 0171 +UdblacU +udhar 296E +udiagr 03B0 +udigr 03CB +UdigrUpsilon +ufisht 297E +ufr 1D532 +UfrU +ugr 03C5 +UgrUpsilon +ugrave 00F9 +UgraveU with grave +uHar 2963 +uharl 21BF +uharr 21BE +uhblk 2580 +ulcorn 231C +ulcorner 231C +ulcrop 230F +ultri 25F8 +umacr 016B +UmacrU +uml 00A8 +UnderBar 005F +UnderBrace 23DF +UnderBracket 23B5 +UnderParenthesis 23DD +Union 22C3 +UnionPlus 228E +uogon 0173 +UogonU +uopf 1D566 +UopfU +uparrowUM uarr +Uparrow 21D1 +UpArrowUM uarr +UpArrowBar 2912 +UpArrowDownArrow 21C5 +updownarrow 2195 +Updownarrow 21D5 +UpDownArrow 2195 +UpEquilibrium 296E +upharpoonleft 21BF +upharpoonright 21BE +uplus 228E +UpperLeftArrow 2196 +UpperRightArrow 2197 +upsi 03C5 +UpsiUpsilon capital Upsilon +upsih 03D2 +upsilon 03C5 +UpsilonUgr +UpTee 22A5 +UpTeeArrow 21A5 +upuparrows 21C8 +urcorn 231D +urcorner 231D +urcrop 230E +uring 016F +UringU +urtri 25F9 +uscr 1D4CA +UscrU +utdot 22F0 +utilde 0169 +UtildeU +utri 25B5 +utrif 25B4 +uuarr 21C8 +uuml 00FC +UumlU with diaeresis +uwangle 29A7 +vangrt 299C +varepsilon 03F5 +varkappa 03F0 +varnothing 2205 +varphi 03D5 +varpi 03D6 +varpropto 221D +varr 2195 +vArrUpdownarrow A: up&down dbl arrow +varrho 03F1 +varsigma 03C2 +varsubsetneq 228A FE00 +varsubsetneqq 2ACB FE00 +varsupsetneq 228B FE00 +varsupsetneqq 2ACC FE00 +vartheta 03D1 +vartriangleleft 22B2 +vartriangleright 22B3 +vBar 2AE8 +Vbar 2AEB +vBarv 2AE9 +vcy 0432 +Vcy 0412 +vdash 22A2 +vDash 22A8 +Vdash 22A9 +VDash 22AB +Vdashl 2AE6 +vee 2228 +Vee 22C1 +veebar 22BB +veeeq 225A +vellip 22EE +verbar 007C +Verbar 2016 +vertUM verbar +Vert 2016 +VerticalBar 2223 +VerticalLineUM verbar +VerticalSeparator 2758 +VerticalTilde 2240 +VeryThinSpaceUB hairsp +vfr 1D533 +Vfr 1D519 +vltri 22B2 +vnsub 2282 20D2 +vnsup 2283 20D2 +vopf 1D567 +Vopf 1D54D +vprop 221D +vrtri 22B3 +vscr 1D4CB +Vscr 1D4B1 +vsubne 228A FE00 +vsubnE 2ACB FE00 +vsupne 228B FE00 +vsupnE 2ACC FE00 +Vvdash 22AA +vzigzag 299A +wcirc 0175 +Wcirc 0174 +wedbar 2A5F +wedge 2227 +Wedge 22C0 +wedgeq 2259 +weierp 2118 +wfr 1D534 +Wfr 1D51A +wopf 1D568 +Wopf 1D54E +wp 2118 +wr 2240 +wreath 2240 +wscr 1D4CC +Wscr 1D4B2 +xcap 22C2 +xcirc 25EF +xcup 22C3 +xdtri 25BD +xfr 1D535 +Xfr 1D51B +xgr 03BE +Xgr 039E +xharr 27F7 +xhArr 27FA +xi 03BE +Xi 039E +xlarr 27F5 +xlArr 27F8 +xmap 27FC +xnis 22FB +xodot 2A00 +xopf 1D569 +Xopf 1D54F +xoplus 2A01 +xotime 2A02 +xrarr 27F6 +xrArr 27F9 +xscr 1D4CD +Xscr 1D4B3 +xsqcup 2A06 +xuplus 2A04 +xutri 25B3 +xvee 22C1 +xwedge 22C0 +yacute 00FD +Yacute 00DD +yacy 044F +YAcy 042F +ycirc 0177 +Ycirc 0176 +ycy 044B +YcyU +yen 00A5 +yfr 1D536 +Yfr 1D51C +yicyUkrainian +YIcyUkrainian +yopf 1D56A +Yopf 1D550 +yscr 1D4CE +Yscr 1D4B4 +yucy 044E +YUcyU +yuml 00FF +Yuml 0178 +zacute 017A +Zacute 0179 +zcaron 017E +Zcaron 017D +zcy 0437 +Zcy 0417 +zdot 017C +Zdot 017B +zeetrf 2128 +ZeroWidthSpace 200B +zeta 03B6 +Zeta 0396 +zfr 1D537 +Zfr 2128 +zgr 03B6 +Zgr 0396 +zhcy 0436 +ZHcy 0416 +zigrarr 21DD +zopf 1D56B +Zopf 2124 +zscr 1D4CF +Zscr 1D4B5 +zwj 200D +zwnj 200C diff --git a/data/docx/[Content_Types].xml b/data/docx/[Content_Types].xml --- a/data/docx/[Content_Types].xml +++ b/data/docx/[Content_Types].xml @@ -1,2 +1,2 @@ - + diff --git a/data/docx/_rels/.rels b/data/docx/_rels/.rels --- a/data/docx/_rels/.rels +++ b/data/docx/_rels/.rels @@ -1,2 +1,3 @@ - + + diff --git a/data/docx/docProps/custom.xml b/data/docx/docProps/custom.xml new file mode 100644 --- /dev/null +++ b/data/docx/docProps/custom.xml @@ -0,0 +1,2 @@ + + diff --git a/data/docx/word/document.xml b/data/docx/word/document.xml --- a/data/docx/word/document.xml +++ b/data/docx/word/document.xml @@ -15,9 +15,7 @@ - -Title - + Title @@ -25,9 +23,7 @@ - -Subtitle - + Subtitle @@ -35,9 +31,7 @@ - -Author - + Author @@ -45,20 +39,15 @@ - -Date - + Date - - -Abstract - + Abstract @@ -67,9 +56,7 @@ - -Heading 1 - + Heading 1 @@ -79,9 +66,7 @@ - -Heading 2 - + Heading 2 @@ -91,9 +76,7 @@ - -Heading 3 - + Heading 3 @@ -103,9 +86,7 @@ - -Heading 4 - + Heading 4 @@ -115,9 +96,7 @@ - -Heading 5 - + Heading 5 @@ -127,9 +106,7 @@ - -Heading 6 - + Heading 6 @@ -139,9 +116,7 @@ - -Heading 7 - + Heading 7 @@ -151,9 +126,7 @@ - -Heading 8 - + Heading 8 @@ -163,9 +136,7 @@ - -Heading 9 - + Heading 9 @@ -174,9 +145,7 @@ - -First Paragraph. - + First Paragraph. @@ -184,57 +153,39 @@ - -Body Text. Body Text Char. - + Body Text. Body Text Char. - - - + - -Verbatim Char - + Verbatim Char - -. - + . - - - + - -Hyperlink - + Hyperlink - -. - + . - - - + - -Footnote. - + Footnote. @@ -248,9 +199,7 @@ - -Block Text. - + Block Text. @@ -258,22 +207,19 @@ - -Table caption. - + Table caption. - - + @@ -288,9 +234,7 @@ - -Table - + Table @@ -307,9 +251,7 @@ - -Table - + Table @@ -322,9 +264,7 @@ - -1 - + 1 @@ -335,9 +275,7 @@ - -2 - + 2 @@ -348,9 +286,7 @@ - -Image Caption - + Image Caption @@ -358,9 +294,7 @@ - -DefinitionTerm - + DefinitionTerm @@ -368,9 +302,7 @@ - -Definition - + Definition @@ -378,9 +310,7 @@ - -DefinitionTerm - + DefinitionTerm @@ -388,11 +318,13 @@ - -Definition - + Definition - + + + + + diff --git a/data/docx/word/fontTable.xml b/data/docx/word/fontTable.xml --- a/data/docx/word/fontTable.xml +++ b/data/docx/word/fontTable.xml @@ -1,52 +1,52 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/docx/word/footnotes.xml b/data/docx/word/footnotes.xml --- a/data/docx/word/footnotes.xml +++ b/data/docx/word/footnotes.xml @@ -1,7 +1,21 @@ - - - - - - Footnote Text. + + + + + + + + + + + + + Footnote Text. + + + + Footnote Block Text + + + diff --git a/data/docx/word/settings.xml b/data/docx/word/settings.xml --- a/data/docx/word/settings.xml +++ b/data/docx/word/settings.xml @@ -1,13 +1,9 @@ - + - - - - @@ -16,29 +12,23 @@ + + + + - - - - - - - - - - - + - - + + - + diff --git a/data/docx/word/styles.xml b/data/docx/word/styles.xml --- a/data/docx/word/styles.xml +++ b/data/docx/word/styles.xml @@ -3,10 +3,10 @@ - + - + @@ -20,14 +20,14 @@ - + + - @@ -47,57 +47,120 @@ + + + - - - + + - - - - - - + + + - + + + + + + + + + + + + + + + + - - - - + + + - - + + + + - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -107,7 +170,7 @@ - + @@ -123,194 +186,371 @@ - + + + - + - - - - - - + + + + - + + + + - + - - - - + + - + + + + - + - - - - + + - + + + + - + - - - - - - + + + + - + + + + - + - - - - - - + + - + + + + - + - - - - + + + + - + + + + - + - - - - + + - + + + + - + - - - - + + + + - + + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -320,14 +560,8 @@ - + - - - - - - @@ -337,6 +571,18 @@ + + + + + + + + + + + + @@ -357,6 +603,14 @@ + + + + + + + + @@ -420,6 +674,10 @@ + + + + diff --git a/data/docx/word/theme/theme1.xml b/data/docx/word/theme/theme1.xml --- a/data/docx/word/theme/theme1.xml +++ b/data/docx/word/theme/theme1.xml @@ -1,2 +1,293 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/epub.css b/data/epub.css --- a/data/epub.css +++ b/data/epub.css @@ -1,18 +1,217 @@ /* This defines styles and classes used in the book */ -body { margin: 5%; text-align: justify; font-size: medium; } -code { font-family: monospace; } -h1 { text-align: left; } -h2 { text-align: left; } -h3 { text-align: left; } -h4 { text-align: left; } -h5 { text-align: left; } -h6 { text-align: left; } +@page { + margin: 10px; +} +html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, +blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, +ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, +fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, figure, figcaption, footer, header, +hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video, ol, +ul, li, dl, dt, dd { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + vertical-align: baseline; +} +html { + line-height: 1.2; + font-family: Georgia, serif; + color: #1a1a1a; +} +p { + text-indent: 0; + margin: 1em 0; + widows: 2; + orphans: 2; +} +img { + max-width: 100%; +} +sup { + vertical-align: super; + font-size: smaller; +} +sub { + vertical-align: sub; + font-size: smaller; +} +h1 { + margin: 3em 0 0 0; + font-size: 2em; + page-break-before: always; + line-height: 150%; +} +h2 { + margin: 1.5em 0 0 0; + font-size: 1.5em; + line-height: 135%; +} +h3 { + margin: 1.3em 0 0 0; + font-size: 1.3em; +} +h4 { + margin: 1.2em 0 0 0; + font-size: 1.2em; +} +h5 { + margin: 1.1em 0 0 0; + font-size: 1.1em; +} +h6 { + font-size: 1em; +} +h1, h2, h3, h4, h5, h6 { + text-indent: 0; + text-align: left; + font-weight: bold; + page-break-after: avoid; + page-break-inside: avoid; +} + +ol, ul { + margin: 1em 0 0 1.7em; +} +li > ol, li > ul { + margin-top: 0; +} +blockquote { + margin: 1em 0 1em 1.7em; +} +code { + font-family: Menlo, Monaco, 'Lucida Console', Consolas, monospace; + font-size: 85%; + margin: 0; + hyphens: manual; +} +pre { + margin: 1em 0; + overflow: auto; +} +pre code { + padding: 0; + overflow: visible; + overflow-wrap: normal; +} +.sourceCode { + background-color: transparent; + overflow: visible; +} +hr { + background-color: #1a1a1a; + border: none; + height: 1px; + margin: 1em 0; +} +table { + margin: 1em 0; + border-collapse: collapse; + width: 100%; + overflow-x: auto; + display: block; +} +table caption { + margin-bottom: 0.75em; +} +tbody { + margin-top: 0.5em; + border-top: 1px solid #1a1a1a; + border-bottom: 1px solid #1a1a1a; +} +th, td { + padding: 0.25em 0.5em 0.25em 0.5em; +} +th { + border-top: 1px solid #1a1a1a; +} +header { + margin-bottom: 4em; + text-align: center; +} +#TOC li { + list-style: none; +} +#TOC ul { + padding-left: 1.3em; +} +#TOC > ul { + padding-left: 0; +} +#TOC a:not(:hover) { + text-decoration: none; +} +code { + white-space: pre-wrap; +} +span.smallcaps { + font-variant: small-caps; +} + +/* This is the most compatible CSS, but it only allows two columns: */ +div.column { + display: inline-block; + vertical-align: top; + width: 50%; +} +/* If you can rely on CSS3 support, use this instead: */ +/* div.columns { + display: flex; + gap: min(4vw, 1.5em); +} +div.column { + flex: auto; + overflow-x: auto; +} */ + +div.hanging-indent { + margin-left: 1.5em; + text-indent: -1.5em; +} +ul.task-list { + list-style: none; +} +ul.task-list li input[type="checkbox"] { + width: 0.8em; + margin: 0 0.8em 0.2em -1.6em; + vertical-align: middle; +} +.display.math { + display: block; + text-align: center; + margin: 0.5rem auto; +} + +/* For title, author, and date on the cover page */ h1.title { } -h2.author { } -h3.date { } -ol.toc { padding: 0; margin-left: 1em; } -ol.toc li { list-style-type: none; margin: 0; padding: 0; } -a.footnote-ref { vertical-align: super; } -em, em em em, em em em em em { font-style: italic;} -em em, em em em em { font-style: normal; } +p.author { } +p.date { } +nav#toc ol, nav#landmarks ol { + padding: 0; + margin-left: 1em; +} +nav#toc ol li, nav#landmarks ol li { + list-style-type: none; + margin: 0; + padding: 0; +} +a.footnote-ref { + vertical-align: super; +} +em, em em em, em em em em em { + font-style: italic; +} +em em, em em em em { + font-style: normal; +} +q { + quotes: "“" "”" "‘" "’"; +} +@media screen { /* Workaround for iBooks issue; see #6242 */ + .sourceCode { + overflow: visible !important; + white-space: pre-wrap !important; + } +} diff --git a/data/init.lua b/data/init.lua --- a/data/init.lua +++ b/data/init.lua @@ -1,7 +1,3 @@ -- This Lua script is run every time the Lua interpreter is started when running -- a Lua filter. It can be customized to load additional modules or to alter the -- default modules. - -pandoc = require 'pandoc' -pandoc.mediabag = require 'pandoc.mediabag' -pandoc.utils = require 'pandoc.utils' diff --git a/data/jats.csl b/data/jats.csl deleted file mode 100644 --- a/data/jats.csl +++ /dev/null @@ -1,205 +0,0 @@ - - - diff --git a/data/odt/Configurations2/accelerator/current.xml b/data/odt/Configurations2/accelerator/current.xml deleted file mode 100644 --- a/data/odt/Configurations2/accelerator/current.xml +++ /dev/null diff --git a/data/odt/META-INF/manifest.xml b/data/odt/META-INF/manifest.xml --- a/data/odt/META-INF/manifest.xml +++ b/data/odt/META-INF/manifest.xml @@ -1,12 +1,8 @@ - - + + - - - - diff --git a/data/odt/Thumbnails/thumbnail.png b/data/odt/Thumbnails/thumbnail.png deleted file mode 100644 Binary files a/data/odt/Thumbnails/thumbnail.png and /dev/null differ diff --git a/data/odt/content.xml b/data/odt/content.xml --- a/data/odt/content.xml +++ b/data/odt/content.xml @@ -1,2 +1,82 @@ -Hello World! + + + + + + + + + + + + + + + + + + + + + + + + + + + + Title + Subtitle + Author + Date + Abstract. + Heading 1 + Heading 2 + Heading 3 + Heading 4 + Heading 5 + Heading 6 + First Paragraph. + Body Text. Emphasis. Strong Emphasis. Strikeout. Superscript. Subscript. Source Text. Highlighted. Hyperlink. Footnote.1Footnote text. + Block quote. + Preformatted Text. + + + Bullet list item. + + + + + Numbered list item. + + + Table caption. + + + + + + + Table Heading + + + Table Heading + + + + + + Table Contents + + + Table Contents + + + + Image caption. + Definition Term + Definition. + + + diff --git a/data/odt/meta.xml b/data/odt/meta.xml --- a/data/odt/meta.xml +++ b/data/odt/meta.xml @@ -6,7 +6,7 @@ xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:grddl="http://www.w3.org/2003/g/data-view#" - office:version="1.2"> + office:version="1.3"> -002174710874truefalseview23041304100217451087300false100falsetruefalsefalse1473719falsetruefalsefalsetruefalsefalsefalsefalsefalsefalsefalsefalsetruefalse0falsefalsefalsefalsefalsefalsefalsefalsefalsefalsetruetruefalsefalsetruetruetruefalsehigh-resolution147371910falsefalsefalsetruefalsefalsetruefalsetruetruefalsefalsefalsefalsetruetruefalsetruetruetruefalsefalsefalse0falsefalsetruetrue diff --git a/data/odt/styles.xml b/data/odt/styles.xml --- a/data/odt/styles.xml +++ b/data/odt/styles.xml @@ -27,7 +27,7 @@ xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" -xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2"> +xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.3"> @@ -73,6 +73,41 @@ style:font-size-complex="12pt" style:language-complex="zxx" style:country-complex="none" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -232,18 +288,40 @@ + style:font-family-complex="'Courier New'" + style:font-family-generic-complex="modern" + style:font-pitch-complex="fixed" + style:font-size-complex="10pt" + fo:language="zxx" /> - + + style:font-family-complex="'Courier New'" + style:font-family-generic-complex="modern" + style:font-pitch-complex="fixed" + fo:language="zxx" /> + + + - - - - - - - diff --git a/data/pandoc.List.lua b/data/pandoc.List.lua deleted file mode 100644 --- a/data/pandoc.List.lua +++ /dev/null @@ -1,120 +0,0 @@ ---[[ -List.lua - -Copyright © 2017 Albert Krewinkel - -Permission to use, copy, modify, and/or distribute this software for any purpose -with or without fee is hereby granted, provided that the above copyright notice -and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS -OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF -THIS SOFTWARE. -]] - ---- Pandoc's List type and helper methods --- @classmod pandoc.List --- @author Albert Krewinkel --- @copyright © 2017 Albert Krewinkel --- @license MIT -local List = { - _VERSION = "0.1.0" -} - -function List:new (o) - o = o or {} - setmetatable(o, self) - self.__index = self - return o -end - -function List:__call (o) - return self:new(o) -end - ---- Concatenates two lists. --- @param list second list concatenated to the first --- @return a new list containing all elements from list1 and list2 -function List:__concat (list) - local res = List.clone(self) - List.extend(res, list) - return res -end - ---- Returns a (shallow) copy of the list. -function List:clone () - local lst = setmetatable({}, getmetatable(self)) - List.extend(lst, self) - return lst -end - ---- Checks if the list has an item equal to the given needle. --- @param needle item to search for --- @param init index at which the search is started --- @return true if a list item is equal to the needle, false otherwise -function List:includes (needle, init) - return not (List.find(self, needle, init) == nil) -end - ---- Returns the value and index of the first occurrence of the given item. --- @param needle item to search for --- @param init index at which the search is started --- @return first item equal to the needle, or nil if no such item exists. --- @return index of that element -function List:find (needle, init) - return List.find_if(self, function(x) return x == needle end, init) -end - ---- Returns the value and index of the first element for which the predicate ---- holds true. --- @param pred the predicate function --- @param init index at which the search is started --- @return first item for which `test` succeeds, or nil if no such item exists. --- @return index of that element -function List:find_if (pred, init) - init = (init == nil and 1) or (init < 0 and #self - init) or init - for i = init, #self do - if pred(self[i], i) then - return self[i], i - end - end - return nil -end - ---- Adds the given list to the end of this list. --- @param list list to appended -function List:extend (list) - for i = 1, #list do - self[#self + 1] = list[i] - end -end - ---- Returns a copy of the current list by applying the given function to all --- elements. --- @param fn function which is applied to all list items. -function List:map (fn) - local res = setmetatable({}, getmetatable(self)) - for i = 1, #self do - res[i] = fn(self[i], i) - end - return res -end - ---- Returns a new list containing all items satisfying a given condition. --- @param pred condition items must satisfy. --- @return a new list containing all items for which `test` was true. -function List:filter (pred) - local res = setmetatable({}, getmetatable(self)) - for i = 1, #self do - if pred(self[i], i) then - res[#res + 1] = self[i] - end - end - return res -end - -return List diff --git a/data/pandoc.lua b/data/pandoc.lua deleted file mode 100644 --- a/data/pandoc.lua +++ /dev/null @@ -1,911 +0,0 @@ ---[[ -pandoc.lua - -Copyright © 2017 Albert Krewinkel - -Permission to use, copy, modify, and/or distribute this software for any purpose -with or without fee is hereby granted, provided that the above copyright notice -and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS -OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF -THIS SOFTWARE. -]] - ---- --- Lua functions for pandoc scripts. --- --- @author Albert Krewinkel --- @copyright © 2017 Albert Krewinkel --- @license MIT -local M = { - _VERSION = "0.3.0" -} - -local List = require 'pandoc.List' - ------------------------------------------------------------------------- --- The base class for pandoc's AST elements. --- @type Element --- @local -local Element = {} - ---- Create a new element subtype --- @local -function Element:make_subtype(o) - o = o or {} - setmetatable(o, self) - self.__index = self - return o -end - ---- Create a new element given its tag and arguments --- @local -function Element:new(tag, ...) - local element = { t = tag } - local content = {...} - -- special case for unary constructors - if #content == 1 then - element.c = content[1] - -- Don't set 'c' field if no further arguments were given. This is important - -- for nullary constructors like `Space` and `HorizontalRule`. - elseif #content > 0 then - element.c = content - end - setmetatable(element, self) - self.__index = self - return element -end - ---- Create a new constructor --- @local --- @param tag Tag used to identify the constructor --- @param fn Function to be called when constructing a new element --- @param accessors names to use as accessors for numerical fields --- @return function that constructs a new element -function Element:create_constructor(tag, fn, accessors) - local constr = self:make_subtype({tag = tag, getters = {}, setters = {}}) - - -- Add accessors to the metatable - if type(accessors) == "string" then - constr.getters[accessors] = function(elem) - return elem.c - end - constr.setters[accessors] = function(elem, v) - elem.c = v - end - else - for i = 1, #(accessors or {}) do - if type(accessors[i]) == "string" then - constr.getters[accessors[i]] = function(elem) - return elem.c[i] - end - constr.setters[accessors[i]] = function(elem, v) - elem.c[i] = v - end - else -- only two levels of nesting are supported - for k, v in ipairs(accessors[i]) do - constr.getters[v] = function(elem) - return elem.c[i][k] - end - constr.setters[v] = function(elem, v) - elem.c[i][k] = v - end - end - end - end - end - - function constr:new(...) - local obj = fn(...) - setmetatable(obj, self) - self.__index = function(t, k) - if getmetatable(t).getters[k] then - return getmetatable(t).getters[k](t) - elseif k == "t" then - return getmetatable(t)["tag"] - else - return getmetatable(t)[k] - end - end - self.__newindex = function(t, k, v) - if getmetatable(t).setters[k] then - getmetatable(t).setters[k](t, v) - else - rawset(t, k, v) - end - end - return obj - end - self.constructor = self.constructor or {} - self.constructor[tag] = constr - return constr -end - ---- Calls the constructor, creating a new element. --- @local -function Element.__call(t, ...) - return t:new(...) -end - ------------------------------------------------------------------------- ---- Pandoc Document --- @section document - ---- A complete pandoc document --- @function Pandoc --- @tparam {Block,...} blocks document content --- @tparam[opt] Meta meta document meta data -function M.Pandoc(blocks, meta) - meta = meta or {} - return { - ["blocks"] = List:new(blocks), - ["meta"] = meta, - ["pandoc-api-version"] = {1,17,0,5}, - } -end - --- DEPRECATED synonym: -M.Doc = M.Pandoc - ------------------------------------------------------------------------- --- Meta --- @section Meta - ---- Create a new Meta object. It sets the metatable of the given table to ---- `Meta`. --- @function Meta --- @tparam meta table table containing document meta information -M.Meta = {} -M.Meta.__call = function(t, meta) - return setmetatable(meta, t) -end -setmetatable(M.Meta, M.Meta) - - ------------------------------------------------------------------------- --- MetaValue --- @section MetaValue -M.MetaValue = Element:make_subtype{} -M.MetaValue.__call = function(t, ...) - return t:new(...) -end ---- Meta blocks --- @function MetaBlocks --- @tparam {Block,...} blocks blocks - ---- Meta inlines --- @function MetaInlines --- @tparam {Inline,...} inlines inlines - ---- Meta list --- @function MetaList --- @tparam {MetaValue,...} meta_values list of meta values -M.meta_value_list_types = { - "MetaBlocks", - "MetaInlines", - "MetaList", -} -for i = 1, #M.meta_value_list_types do - M[M.meta_value_list_types[i]] = M.MetaValue:create_constructor( - M.meta_value_list_types[i], - function(content) - return List:new(content) - end - ) -end - ---- Meta map --- @function MetaMap --- @tparam table key_value_map a string-indexed map of meta values -M.MetaMap = M.MetaValue:create_constructor( - "MetaMap", - function (mm) return mm end -) - ---- Creates string to be used in meta data. --- Does nothing, lua strings are meta strings. --- @function MetaString --- @tparam string str string value -function M.MetaString(str) - return str -end - ---- Creates boolean to be used in meta data. --- Does nothing, lua booleans are meta booleans. --- @function MetaBool --- @tparam boolean bool boolean value -function M.MetaBool(bool) - return bool -end - ------------------------------------------------------------------------- --- Blocks --- @section Block - ---- Block elements -M.Block = Element:make_subtype{} -M.Block.__call = function (t, ...) - return t:new(...) -end - ---- Creates a block quote element --- @function BlockQuote --- @tparam {Block,...} content block content --- @treturn Block block quote element -M.BlockQuote = M.Block:create_constructor( - "BlockQuote", - function(content) return {c = content} end, - "content" -) - ---- Creates a bullet (i.e. unordered) list. --- @function BulletList --- @tparam {{Block,...},...} content list of items --- @treturn Block block quote element -M.BulletList = M.Block:create_constructor( - "BulletList", - function(content) return {c = content} end, - "content" -) - ---- Creates a code block element --- @function CodeBlock --- @tparam string text code string --- @tparam[opt] Attr attr element attributes --- @treturn Block code block element -M.CodeBlock = M.Block:create_constructor( - "CodeBlock", - function(text, attr) return {c = {attr or M.Attr(), text}} end, - {{"identifier", "classes", "attributes"}, "text"} -) - ---- Creates a definition list, containing terms and their explanation. --- @function DefinitionList --- @tparam {{{Inline,...},{Block,...}},...} content list of items --- @treturn Block block quote element -M.DefinitionList = M.Block:create_constructor( - "DefinitionList", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a div element --- @function Div --- @tparam {Block,...} content block content --- @tparam[opt] Attr attr element attributes --- @treturn Block code block element -M.Div = M.Block:create_constructor( - "Div", - function(content, attr) - return {c = {attr or M.Attr(), List:new(content)}} - end, - {{"identifier", "classes", "attributes"}, "content"} -) - ---- Creates a block quote element. --- @function Header --- @tparam int level header level --- @tparam {Inline,...} content inline content --- @tparam[opt] Attr attr element attributes --- @treturn Block header element -M.Header = M.Block:create_constructor( - "Header", - function(level, content, attr) - return {c = {level, attr or M.Attr(), content}} - end, - {"level", {"identifier", "classes", "attributes"}, "content"} -) - ---- Creates a horizontal rule. --- @function HorizontalRule --- @treturn Block horizontal rule -M.HorizontalRule = M.Block:create_constructor( - "HorizontalRule", - function() return {} end -) - ---- Creates a line block element. --- @function LineBlock --- @tparam {{Inline,...},...} content inline content --- @treturn Block block quote element -M.LineBlock = M.Block:create_constructor( - "LineBlock", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a null element. --- @function Null --- @treturn Block null element -M.Null = M.Block:create_constructor( - "Null", - function() return {} end -) - ---- Creates an ordered list. --- @function OrderedList --- @tparam {{Block,...},...} items list items --- @param[opt] listAttributes list parameters --- @treturn Block -M.OrderedList = M.Block:create_constructor( - "OrderedList", - function(items, listAttributes) - listAttributes = listAttributes or {1, M.DefaultStyle, M.DefaultDelim} - return {c = {listAttributes, List:new(items)}} - end, - {{"start", "style", "delimiter"}, "content"} -) - ---- Creates a para element. --- @function Para --- @tparam {Inline,...} content inline content --- @treturn Block block quote element -M.Para = M.Block:create_constructor( - "Para", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a plain element. --- @function Plain --- @tparam {Inline,...} content inline content --- @treturn Block block quote element -M.Plain = M.Block:create_constructor( - "Plain", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a raw content block of the specified format. --- @function RawBlock --- @tparam string format format of content --- @tparam string text string content --- @treturn Block block quote element -M.RawBlock = M.Block:create_constructor( - "RawBlock", - function(format, text) return {c = {format, text}} end, - {"format", "text"} -) - ---- Creates a table element. --- @function Table --- @tparam {Inline,...} caption table caption --- @tparam {AlignDefault|AlignLeft|AlignRight|AlignCenter,...} aligns alignments --- @tparam {int,...} widths column widths --- @tparam {Block,...} headers header row --- @tparam {{Block,...}} rows table rows --- @treturn Block block quote element -M.Table = M.Block:create_constructor( - "Table", - function(caption, aligns, widths, headers, rows) - return { - c = { - List:new(caption), - List:new(aligns), - List:new(widths), - List:new(headers), - List:new(rows) - } - } - end, - {"caption", "aligns", "widths", "headers", "rows"} -) - - ------------------------------------------------------------------------- --- Inline --- @section Inline - ---- Inline element class -M.Inline = Element:make_subtype{} -M.Inline.__call = function (t, ...) - return t:new(...) -end - ---- Creates a Cite inline element --- @function Cite --- @tparam {Inline,...} content List of inlines --- @tparam {Citation,...} citations List of citations --- @treturn Inline citations element -M.Cite = M.Inline:create_constructor( - "Cite", - function(content, citations) - return {c = {List:new(citations), List:new(content)}} - end, - {"citations", "content"} -) - ---- Creates a Code inline element --- @function Code --- @tparam string text brief image description --- @tparam[opt] Attr attr additional attributes --- @treturn Inline code element -M.Code = M.Inline:create_constructor( - "Code", - function(text, attr) return {c = {attr or M.Attr(), text}} end, - {{"identifier", "classes", "attributes"}, "text"} -) - ---- Creates an inline element representing emphasised text. --- @function Emph --- @tparam {Inline,..} content inline content --- @treturn Inline emphasis element -M.Emph = M.Inline:create_constructor( - "Emph", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a Image inline element --- @function Image --- @tparam {Inline,..} caption text used to describe the image --- @tparam string src path to the image file --- @tparam[opt] string title brief image description --- @tparam[opt] Attr attr additional attributes --- @treturn Inline image element -M.Image = M.Inline:create_constructor( - "Image", - function(caption, src, title, attr) - title = title or "" - attr = attr or M.Attr() - return {c = {attr, List:new(caption), {src, title}}} - end, - {{"identifier", "classes", "attributes"}, "caption", {"src", "title"}} -) - ---- Create a LineBreak inline element --- @function LineBreak --- @treturn Inline linebreak element -M.LineBreak = M.Inline:create_constructor( - "LineBreak", - function() return {} end -) - ---- Creates a link inline element, usually a hyperlink. --- @function Link --- @tparam {Inline,..} content text for this link --- @tparam string target the link target --- @tparam[opt] string title brief link description --- @tparam[opt] Attr attr additional attributes --- @treturn Inline image element -M.Link = M.Inline:create_constructor( - "Link", - function(content, target, title, attr) - title = title or "" - attr = attr or M.Attr() - return {c = {attr, List:new(content), {target, title}}} - end, - {{"identifier", "classes", "attributes"}, "content", {"target", "title"}} -) - ---- Creates a Math element, either inline or displayed. --- @function Math --- @tparam "InlineMath"|"DisplayMath" mathtype rendering specifier --- @tparam string text Math content --- @treturn Inline Math element -M.Math = M.Inline:create_constructor( - "Math", - function(mathtype, text) - return {c = {mathtype, text}} - end, - {"mathtype", "text"} -) ---- Creates a DisplayMath element (DEPRECATED). --- @function DisplayMath --- @tparam string text Math content --- @treturn Inline Math element -M.DisplayMath = M.Inline:create_constructor( - "DisplayMath", - function(text) return M.Math("DisplayMath", text) end, - {"mathtype", "text"} -) ---- Creates an InlineMath inline element (DEPRECATED). --- @function InlineMath --- @tparam string text Math content --- @treturn Inline Math element -M.InlineMath = M.Inline:create_constructor( - "InlineMath", - function(text) return M.Math("InlineMath", text) end, - {"mathtype", "text"} -) - ---- Creates a Note inline element --- @function Note --- @tparam {Block,...} content footnote block content -M.Note = M.Inline:create_constructor( - "Note", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a Quoted inline element given the quote type and quoted content. --- @function Quoted --- @tparam "DoubleQuote"|"SingleQuote" quotetype type of quotes to be used --- @tparam {Inline,..} content inline content --- @treturn Inline quoted element -M.Quoted = M.Inline:create_constructor( - "Quoted", - function(quotetype, content) return {c = {quotetype, List:new(content)}} end, - {"quotetype", "content"} -) ---- Creates a single-quoted inline element (DEPRECATED). --- @function SingleQuoted --- @tparam {Inline,..} content inline content --- @treturn Inline quoted element --- @see Quoted -M.SingleQuoted = M.Inline:create_constructor( - "SingleQuoted", - function(content) return M.Quoted(M.SingleQuote, content) end, - {"quotetype", "content"} -) ---- Creates a single-quoted inline element (DEPRECATED). --- @function DoubleQuoted --- @tparam {Inline,..} content inline content --- @treturn Inline quoted element --- @see Quoted -M.DoubleQuoted = M.Inline:create_constructor( - "DoubleQuoted", - function(content) return M.Quoted("DoubleQuote", content) end, - {"quotetype", "content"} -) - ---- Creates a RawInline inline element --- @function RawInline --- @tparam string format format of the contents --- @tparam string text string content --- @treturn Inline raw inline element -M.RawInline = M.Inline:create_constructor( - "RawInline", - function(format, text) return {c = {format, text}} end, - {"format", "text"} -) - ---- Creates text rendered in small caps --- @function SmallCaps --- @tparam {Inline,..} content inline content --- @treturn Inline smallcaps element -M.SmallCaps = M.Inline:create_constructor( - "SmallCaps", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a SoftBreak inline element. --- @function SoftBreak --- @treturn Inline softbreak element -M.SoftBreak = M.Inline:create_constructor( - "SoftBreak", - function() return {} end -) - ---- Create a Space inline element --- @function Space --- @treturn Inline space element -M.Space = M.Inline:create_constructor( - "Space", - function() return {} end -) - ---- Creates a Span inline element --- @function Span --- @tparam {Inline,..} content inline content --- @tparam[opt] Attr attr additional attributes --- @treturn Inline span element -M.Span = M.Inline:create_constructor( - "Span", - function(content, attr) - return {c = {attr or M.Attr(), List:new(content)}} - end, - {{"identifier", "classes", "attributes"}, "content"} -) - ---- Creates a Str inline element --- @function Str --- @tparam string text content --- @treturn Inline string element -M.Str = M.Inline:create_constructor( - "Str", - function(text) return {c = text} end, - "text" -) - ---- Creates text which is striked out. --- @function Strikeout --- @tparam {Inline,..} content inline content --- @treturn Inline strikeout element -M.Strikeout = M.Inline:create_constructor( - "Strikeout", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a Strong element, whose text is usually displayed in a bold font. --- @function Strong --- @tparam {Inline,..} content inline content --- @treturn Inline strong element -M.Strong = M.Inline:create_constructor( - "Strong", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a Subscript inline element --- @function Subscript --- @tparam {Inline,..} content inline content --- @treturn Inline subscript element -M.Subscript = M.Inline:create_constructor( - "Subscript", - function(content) return {c = List:new(content)} end, - "content" -) - ---- Creates a Superscript inline element --- @function Superscript --- @tparam {Inline,..} content inline content --- @treturn Inline strong element -M.Superscript = M.Inline:create_constructor( - "Superscript", - function(content) return {c = List:new(content)} end, - "content" -) - - ------------------------------------------------------------------------- --- Helpers --- @section helpers - -local function assoc_key_equals (x) - return function (y) return y[1] == x end -end - --- Lookup a value in an associative list --- @function lookup --- @tparam {{key, value},...} alist associative list --- @param key key for which the associated value is to be looked up -local function lookup(alist, key) - return (List.find_if(alist, assoc_key_equals(key)) or {})[2] -end - ---- Return an iterator which returns key-value pairs of an associative list. --- @function apairs --- @tparam {{key, value},...} alist associative list -local apairs = function (alist) - local i = 1 - local cur - function nxt () - cur = rawget(alist, i) - if cur then - i = i + 1 - return cur[1], cur[2] - end - return nil - end - return nxt, nil, nil -end - --- AttributeList, a metatable to allow table-like access to attribute lists --- represented by associative lists. -local AttributeList = { - __index = function (t, k) - if type(k) == "number" then - return rawget(t, k) - else - return lookup(t, k) - end - end, - - __newindex = function (t, k, v) - local cur, idx = List.find_if(t, assoc_key_equals(k)) - if v == nil then - table.remove(t, idx) - elseif cur then - cur[2] = v - elseif type(k) == "number" then - rawset(t, k, v) - else - rawset(t, #t + 1, {k, v}) - end - end, - - __pairs = apairs -} - --- convert a table to an associative list. The order of key-value pairs in the --- alist is undefined. The table should either contain no numeric keys or --- already be an associative list. --- @tparam table associative list or table without numeric keys. --- @treturn table associative list -local to_alist = function (tbl) - if #tbl ~= 0 or next(tbl) == nil then - -- probably already an alist - return tbl - end - local alist = {} - local i = 1 - for k, v in pairs(tbl) do - alist[i] = {k, v} - i = i + 1 - end - return alist -end - --- Attr -M.Attr = {} -M.Attr._field_names = {identifier = 1, classes = 2, attributes = 3} ---- Create a new set of attributes (Attr). --- @function Attr --- @tparam[opt] string identifier element identifier --- @tparam[opt] {string,...} classes element classes --- @tparam[opt] table attributes table containing string keys and values --- @return element attributes -M.Attr.__call = function(t, identifier, classes, attributes) - identifier = identifier or '' - classes = List:new(classes or {}) - attributes = setmetatable(to_alist(attributes or {}), AttributeList) - local attr = {identifier, classes, attributes} - setmetatable(attr, t) - return attr -end -M.Attr.__index = function(t, k) - return rawget(t, k) or - rawget(t, M.Attr._field_names[k]) or - rawget(getmetatable(t), k) -end -M.Attr.__newindex = function(t, k, v) - if M.Attr._field_names[k] then - rawset(t, M.Attr._field_names[k], v) - else - rawset(t, k, v) - end -end -setmetatable(M.Attr, M.Attr) - - ---- Creates a single citation. --- @function Citation --- @tparam string id citation identifier (like a bibtex key) --- @tparam AuthorInText|SuppressAuthor|NormalCitation mode citation mode --- @tparam[opt] {Inline,...} prefix citation prefix --- @tparam[opt] {Inline,...} suffix citation suffix --- @tparam[opt] int note_num note number --- @tparam[opt] int hash hash number -M.Citation = function(id, mode, prefix, suffix, note_num, hash) - prefix = prefix or {} - suffix = suffix or {} - note_num = note_num or 0 - hash = hash or 0 - return { - citationId = id, - citationPrefix = prefix, - citationSuffix = suffix, - citationMode = mode, - citationNoteNum = note_num, - citationHash = hash, - } -end - - ------------------------------------------------------------------------- --- Constants --- @section constants - ---- Author name is mentioned in the text. --- @see Citation --- @see Cite -M.AuthorInText = "AuthorInText" - ---- Author name is suppressed. --- @see Citation --- @see Cite -M.SuppressAuthor = "SuppressAuthor" - ---- Default citation style is used. --- @see Citation --- @see Cite -M.NormalCitation = "NormalCitation" - ---- Table cells aligned left. --- @see Table -M.AlignLeft = "AlignLeft" - ---- Table cells right-aligned. --- @see Table -M.AlignRight = "AlignRight" - ---- Table cell content is centered. --- @see Table -M.AlignCenter = "AlignCenter" - ---- Table cells are alignment is unaltered. --- @see Table -M.AlignDefault = "AlignDefault" - ---- Default list number delimiters are used. --- @see OrderedList -M.DefaultDelim = "DefaultDelim" - ---- List numbers are delimited by a period. --- @see OrderedList -M.Period = "Period" - ---- List numbers are delimited by a single parenthesis. --- @see OrderedList -M.OneParen = "OneParen" - ---- List numbers are delimited by a double parentheses. --- @see OrderedList -M.TwoParens = "TwoParens" - ---- List are numbered in the default style --- @see OrderedList -M.DefaultStyle = "DefaultStyle" - ---- List items are numbered as examples. --- @see OrderedList -M.Example = "Example" - ---- List are numbered using decimal integers. --- @see OrderedList -M.Decimal = "Decimal" - ---- List are numbered using lower-case roman numerals. --- @see OrderedList -M.LowerRoman = "LowerRoman" - ---- List are numbered using upper-case roman numerals --- @see OrderedList -M.UpperRoman = "UpperRoman" - ---- List are numbered using lower-case alphabetic characters. --- @see OrderedList -M.LowerAlpha = "LowerAlpha" - ---- List are numbered using upper-case alphabetic characters. --- @see OrderedList -M.UpperAlpha = "UpperAlpha" - - ------------------------------------------------------------------------- --- Helper Functions --- @section helpers - ---- Use functions defined in the global namespace to create a pandoc filter. --- All globally defined functions which have names of pandoc elements are --- collected into a new table. --- @return A list of filter functions --- @usage --- -- within a file defining a pandoc filter: --- function Str(text) --- return pandoc.Str(utf8.upper(text)) --- end --- --- return {pandoc.global_filter()} --- -- the above is equivallent to --- -- return {{Str = Str}} -function M.global_filter() - local res = {} - function is_filter_function(k) - return M.Inline.constructor[k] or - M.Block.constructor[k] or - k == "Meta" or k == "Doc" or k == "Pandoc" or - k == "Block" or k == "Inline" - end - for k, v in pairs(_G) do - if is_filter_function(k) then - res[k] = v - end - end - return res -end - ------------------------------------------------------------------------- --- Functions which have moved to different modules -local utils = require 'pandoc.utils' -M.sha1 = utils.sha1 - -return M diff --git a/data/pptx/[Content_Types].xml b/data/pptx/[Content_Types].xml --- a/data/pptx/[Content_Types].xml +++ b/data/pptx/[Content_Types].xml @@ -1,2 +1,2 @@ - + diff --git a/data/pptx/_rels/.rels b/data/pptx/_rels/.rels --- a/data/pptx/_rels/.rels +++ b/data/pptx/_rels/.rels @@ -1,2 +1,2 @@ - + diff --git a/data/pptx/docProps/app.xml b/data/pptx/docProps/app.xml --- a/data/pptx/docProps/app.xml +++ b/data/pptx/docProps/app.xml @@ -1,2 +1,2 @@ -18Microsoft Macintosh PowerPointOn-screen Show (4:3)42000falseTheme1Slide Titles2Office ThemeTitleSlide Titlefalsefalsefalse14.0000 +249Microsoft Macintosh PowerPointOn-screen Show (16:9)154200falseFonts Used2Theme1Slide Titles4ArialCalibriOffice ThemePresentation TitleSlide TitleSection headerSlide Title for Two-Contentfalsefalsefalse16.0000 diff --git a/data/pptx/docProps/core.xml b/data/pptx/docProps/core.xml --- a/data/pptx/docProps/core.xml +++ b/data/pptx/docProps/core.xml @@ -1,2 +1,2 @@ -TitleJesse RosenthalJesse Rosenthal12017-06-05T14:10:58Z2017-06-05T14:12:07Z +TitleJesse RosenthalJesse Rosenthal52017-06-05T14:10:58Z2022-01-02T22:49:03Z diff --git a/data/pptx/docProps/thumbnail.jpeg b/data/pptx/docProps/thumbnail.jpeg deleted file mode 100644 Binary files a/data/pptx/docProps/thumbnail.jpeg and /dev/null differ diff --git a/data/pptx/ppt/_rels/presentation.xml.rels b/data/pptx/ppt/_rels/presentation.xml.rels --- a/data/pptx/ppt/_rels/presentation.xml.rels +++ b/data/pptx/ppt/_rels/presentation.xml.rels @@ -1,2 +1,2 @@ - + diff --git a/data/pptx/ppt/notesMasters/_rels/notesMaster1.xml.rels b/data/pptx/ppt/notesMasters/_rels/notesMaster1.xml.rels new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/notesMasters/_rels/notesMaster1.xml.rels @@ -0,0 +1,2 @@ + + diff --git a/data/pptx/ppt/notesMasters/notesMaster1.xml b/data/pptx/ppt/notesMasters/notesMaster1.xml new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/notesMasters/notesMaster1.xml @@ -0,0 +1,2 @@ + +1/2/22Click to edit Master text stylesSecond levelThird levelFourth levelFifth level‹#› diff --git a/data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels b/data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/notesSlides/_rels/notesSlide1.xml.rels @@ -0,0 +1,2 @@ + + diff --git a/data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels b/data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/notesSlides/_rels/notesSlide2.xml.rels @@ -0,0 +1,2 @@ + + diff --git a/data/pptx/ppt/notesSlides/notesSlide1.xml b/data/pptx/ppt/notesSlides/notesSlide1.xml new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/notesSlides/notesSlide1.xml @@ -0,0 +1,2 @@ + +Here is a noteWith another paragraph.1 diff --git a/data/pptx/ppt/notesSlides/notesSlide2.xml b/data/pptx/ppt/notesSlides/notesSlide2.xml new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/notesSlides/notesSlide2.xml @@ -0,0 +1,2 @@ + +A speaker note on this slide too.2 diff --git a/data/pptx/ppt/presProps.xml b/data/pptx/ppt/presProps.xml --- a/data/pptx/ppt/presProps.xml +++ b/data/pptx/ppt/presProps.xml @@ -1,2 +1,2 @@ - + diff --git a/data/pptx/ppt/presentation.xml b/data/pptx/ppt/presentation.xml --- a/data/pptx/ppt/presentation.xml +++ b/data/pptx/ppt/presentation.xml @@ -1,2 +1,2 @@ - + diff --git a/data/pptx/ppt/slideLayouts/slideLayout1.xml b/data/pptx/ppt/slideLayouts/slideLayout1.xml --- a/data/pptx/ppt/slideLayouts/slideLayout1.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout1.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master subtitle style6/5/17‹#› +Click to edit Master title styleClick to edit Master subtitle style1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout10.xml b/data/pptx/ppt/slideLayouts/slideLayout10.xml --- a/data/pptx/ppt/slideLayouts/slideLayout10.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout10.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level6/5/17‹#› +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout11.xml b/data/pptx/ppt/slideLayouts/slideLayout11.xml --- a/data/pptx/ppt/slideLayouts/slideLayout11.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout11.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level6/5/17‹#› +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout2.xml b/data/pptx/ppt/slideLayouts/slideLayout2.xml --- a/data/pptx/ppt/slideLayouts/slideLayout2.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout2.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level6/5/17‹#› +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout3.xml b/data/pptx/ppt/slideLayouts/slideLayout3.xml --- a/data/pptx/ppt/slideLayouts/slideLayout3.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout3.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text styles6/5/17‹#› +Click to edit Master title styleClick to edit Master text styles1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout4.xml b/data/pptx/ppt/slideLayouts/slideLayout4.xml --- a/data/pptx/ppt/slideLayouts/slideLayout4.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout4.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text stylesSecond levelThird levelFourth levelFifth level6/5/17‹#› +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text stylesSecond levelThird levelFourth levelFifth level1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout5.xml b/data/pptx/ppt/slideLayouts/slideLayout5.xml --- a/data/pptx/ppt/slideLayouts/slideLayout5.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout5.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text stylesClick to edit Master text stylesSecond levelThird levelFourth levelFifth level6/5/17‹#› +Click to edit Master title styleClick to edit Master text stylesClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text stylesClick to edit Master text stylesSecond levelThird levelFourth levelFifth level1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout6.xml b/data/pptx/ppt/slideLayouts/slideLayout6.xml --- a/data/pptx/ppt/slideLayouts/slideLayout6.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout6.xml @@ -1,2 +1,2 @@ -Click to edit Master title style6/5/17‹#› +Click to edit Master title style1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout7.xml b/data/pptx/ppt/slideLayouts/slideLayout7.xml --- a/data/pptx/ppt/slideLayouts/slideLayout7.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout7.xml @@ -1,2 +1,2 @@ -6/5/17‹#› +1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout8.xml b/data/pptx/ppt/slideLayouts/slideLayout8.xml --- a/data/pptx/ppt/slideLayouts/slideLayout8.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout8.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text styles6/5/17‹#› +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth levelClick to edit Master text styles1/2/22‹#› diff --git a/data/pptx/ppt/slideLayouts/slideLayout9.xml b/data/pptx/ppt/slideLayouts/slideLayout9.xml --- a/data/pptx/ppt/slideLayouts/slideLayout9.xml +++ b/data/pptx/ppt/slideLayouts/slideLayout9.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text styles6/5/17‹#› +Click to edit Master title styleClick to edit Master text styles1/2/22‹#› diff --git a/data/pptx/ppt/slideMasters/_rels/slideMaster1.xml.rels b/data/pptx/ppt/slideMasters/_rels/slideMaster1.xml.rels --- a/data/pptx/ppt/slideMasters/_rels/slideMaster1.xml.rels +++ b/data/pptx/ppt/slideMasters/_rels/slideMaster1.xml.rels @@ -1,2 +1,2 @@ - + diff --git a/data/pptx/ppt/slideMasters/slideMaster1.xml b/data/pptx/ppt/slideMasters/slideMaster1.xml --- a/data/pptx/ppt/slideMasters/slideMaster1.xml +++ b/data/pptx/ppt/slideMasters/slideMaster1.xml @@ -1,2 +1,2 @@ -Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level6/5/17‹#› +Click to edit Master title styleClick to edit Master text stylesSecond levelThird levelFourth levelFifth level1/2/22‹#› diff --git a/data/pptx/ppt/slides/_rels/slide1.xml.rels b/data/pptx/ppt/slides/_rels/slide1.xml.rels --- a/data/pptx/ppt/slides/_rels/slide1.xml.rels +++ b/data/pptx/ppt/slides/_rels/slide1.xml.rels @@ -1,2 +1,2 @@ - + diff --git a/data/pptx/ppt/slides/_rels/slide2.xml.rels b/data/pptx/ppt/slides/_rels/slide2.xml.rels --- a/data/pptx/ppt/slides/_rels/slide2.xml.rels +++ b/data/pptx/ppt/slides/_rels/slide2.xml.rels @@ -1,2 +1,2 @@ - + diff --git a/data/pptx/ppt/slides/_rels/slide3.xml.rels b/data/pptx/ppt/slides/_rels/slide3.xml.rels new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/slides/_rels/slide3.xml.rels @@ -0,0 +1,2 @@ + + diff --git a/data/pptx/ppt/slides/_rels/slide4.xml.rels b/data/pptx/ppt/slides/_rels/slide4.xml.rels new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/slides/_rels/slide4.xml.rels @@ -0,0 +1,2 @@ + + diff --git a/data/pptx/ppt/slides/slide1.xml b/data/pptx/ppt/slides/slide1.xml --- a/data/pptx/ppt/slides/slide1.xml +++ b/data/pptx/ppt/slides/slide1.xml @@ -1,2 +1,2 @@ -TitleSubtitle +Presentation TitlePresentation Subtitle diff --git a/data/pptx/ppt/slides/slide2.xml b/data/pptx/ppt/slides/slide2.xml --- a/data/pptx/ppt/slides/slide2.xml +++ b/data/pptx/ppt/slides/slide2.xml @@ -1,2 +1,2 @@ -Slide TitleHello, world. +Slide TitleHello, world. diff --git a/data/pptx/ppt/slides/slide3.xml b/data/pptx/ppt/slides/slide3.xml new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/slides/slide3.xml @@ -0,0 +1,2 @@ + +Section header diff --git a/data/pptx/ppt/slides/slide4.xml b/data/pptx/ppt/slides/slide4.xml new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/slides/slide4.xml @@ -0,0 +1,2 @@ + +Slide Title for Two-ContentSome content on the left.Some content on the right. diff --git a/data/pptx/ppt/theme/theme2.xml b/data/pptx/ppt/theme/theme2.xml new file mode 100644 --- /dev/null +++ b/data/pptx/ppt/theme/theme2.xml @@ -0,0 +1,2 @@ + + diff --git a/data/pptx/ppt/viewProps.xml b/data/pptx/ppt/viewProps.xml --- a/data/pptx/ppt/viewProps.xml +++ b/data/pptx/ppt/viewProps.xml @@ -1,2 +1,2 @@ - + diff --git a/data/sample.lua b/data/sample.lua deleted file mode 100644 --- a/data/sample.lua +++ /dev/null @@ -1,343 +0,0 @@ --- This is a sample custom writer for pandoc. It produces output --- that is very similar to that of pandoc's HTML writer. --- There is one new feature: code blocks marked with class 'dot' --- are piped through graphviz and images are included in the HTML --- output using 'data:' URLs. --- --- Invoke with: pandoc -t sample.lua --- --- Note: you need not have lua installed on your system to use this --- custom writer. However, if you do have lua installed, you can --- use it to test changes to the script. 'lua sample.lua' will --- produce informative error messages if your code contains --- syntax errors. - --- Character escaping -local function escape(s, in_attribute) - return s:gsub("[<>&\"']", - function(x) - if x == '<' then - return '<' - elseif x == '>' then - return '>' - elseif x == '&' then - return '&' - elseif x == '"' then - return '"' - elseif x == "'" then - return ''' - else - return x - end - end) -end - --- Helper function to convert an attributes table into --- a string that can be put into HTML tags. -local function attributes(attr) - local attr_table = {} - for x,y in pairs(attr) do - if y and y ~= "" then - table.insert(attr_table, ' ' .. x .. '="' .. escape(y,true) .. '"') - end - end - return table.concat(attr_table) -end - --- Run cmd on a temporary file containing inp and return result. -local function pipe(cmd, inp) - local tmp = os.tmpname() - local tmph = io.open(tmp, "w") - tmph:write(inp) - tmph:close() - local outh = io.popen(cmd .. " " .. tmp,"r") - local result = outh:read("*all") - outh:close() - os.remove(tmp) - return result -end - --- Table to store footnotes, so they can be included at the end. -local notes = {} - --- Blocksep is used to separate block elements. -function Blocksep() - return "\n\n" -end - --- This function is called once for the whole document. Parameters: --- body is a string, metadata is a table, variables is a table. --- This gives you a fragment. You could use the metadata table to --- fill variables in a custom lua template. Or, pass `--template=...` --- to pandoc, and pandoc will add do the template processing as --- usual. -function Doc(body, metadata, variables) - local buffer = {} - local function add(s) - table.insert(buffer, s) - end - add(body) - if #notes > 0 then - add('
    ') - for _,note in pairs(notes) do - add(note) - end - add('
') - end - return table.concat(buffer,'\n') .. '\n' -end - --- The functions that follow render corresponding pandoc elements. --- s is always a string, attr is always a table of attributes, and --- items is always an array of strings (the items in a list). --- Comments indicate the types of other variables. - -function Str(s) - return escape(s) -end - -function Space() - return " " -end - -function SoftBreak() - return "\n" -end - -function LineBreak() - return "
" -end - -function Emph(s) - return "" .. s .. "" -end - -function Strong(s) - return "" .. s .. "" -end - -function Subscript(s) - return "" .. s .. "" -end - -function Superscript(s) - return "" .. s .. "" -end - -function SmallCaps(s) - return '' .. s .. '' -end - -function Strikeout(s) - return '' .. s .. '' -end - -function Link(s, src, tit, attr) - return "" .. s .. "" -end - -function Image(s, src, tit, attr) - return "" -end - -function Code(s, attr) - return "" .. escape(s) .. "" -end - -function InlineMath(s) - return "\\(" .. escape(s) .. "\\)" -end - -function DisplayMath(s) - return "\\[" .. escape(s) .. "\\]" -end - -function Note(s) - local num = #notes + 1 - -- insert the back reference right before the final closing tag. - s = string.gsub(s, - '(.*)↩' .. s .. '') - -- return the footnote reference, linked to the note. - return '' .. num .. '' -end - -function Span(s, attr) - return "" .. s .. "" -end - -function RawInline(format, str) - if format == "html" then - return str - else - return '' - end -end - -function Cite(s, cs) - local ids = {} - for _,cit in ipairs(cs) do - table.insert(ids, cit.citationId) - end - return "" .. s .. "" -end - -function Plain(s) - return s -end - -function Para(s) - return "

" .. s .. "

" -end - --- lev is an integer, the header level. -function Header(lev, s, attr) - return "" .. s .. "" -end - -function BlockQuote(s) - return "
\n" .. s .. "\n
" -end - -function HorizontalRule() - return "
" -end - -function LineBlock(ls) - return '
' .. table.concat(ls, '\n') .. - '
' -end - -function CodeBlock(s, attr) - -- If code block has class 'dot', pipe the contents through dot - -- and base64, and include the base64-encoded png as a data: URL. - if attr.class and string.match(' ' .. attr.class .. ' ',' dot ') then - local png = pipe("base64", pipe("dot -Tpng", s)) - return '' - -- otherwise treat as code (one could pipe through a highlighter) - else - return "
" .. escape(s) ..
-           "
" - end -end - -function BulletList(items) - local buffer = {} - for _, item in pairs(items) do - table.insert(buffer, "
  • " .. item .. "
    • ") - end - return "
      \n" .. table.concat(buffer, "\n") .. "\n
    " -end - -function OrderedList(items) - local buffer = {} - for _, item in pairs(items) do - table.insert(buffer, "
  • " .. item .. "
    • ") - end - return "
      \n" .. table.concat(buffer, "\n") .. "\n
    " -end - -function DefinitionList(items) - local buffer = {} - for _,item in pairs(items) do - local k, v = next(item) - table.insert(buffer, "
    " .. k .. "
    \n
    " .. - table.concat(v, "
    \n
    ") .. "
    ") - end - return "
    \n" .. table.concat(buffer, "\n") .. "\n
    " -end - --- Convert pandoc alignment to something HTML can use. --- align is AlignLeft, AlignRight, AlignCenter, or AlignDefault. -function html_align(align) - if align == 'AlignLeft' then - return 'left' - elseif align == 'AlignRight' then - return 'right' - elseif align == 'AlignCenter' then - return 'center' - else - return 'left' - end -end - -function CaptionedImage(src, tit, caption, attr) - return '
    \n\n' .. - '

    ' .. caption .. '

    \n
    ' -end - --- Caption is a string, aligns is an array of strings, --- widths is an array of floats, headers is an array of --- strings, rows is an array of arrays of strings. -function Table(caption, aligns, widths, headers, rows) - local buffer = {} - local function add(s) - table.insert(buffer, s) - end - add("") - if caption ~= "" then - add("") - end - if widths and widths[1] ~= 0 then - for _, w in pairs(widths) do - add('') - end - end - local header_row = {} - local empty_header = true - for i, h in pairs(headers) do - local align = html_align(aligns[i]) - table.insert(header_row,'') - empty_header = empty_header and h == "" - end - if empty_header then - head = "" - else - add('') - for _,h in pairs(header_row) do - add(h) - end - add('') - end - local class = "even" - for _, row in pairs(rows) do - class = (class == "even" and "odd") or "even" - add('') - for i,c in pairs(row) do - add('') - end - add('') - end - add('\n" .. s .. "" -end - --- The following code will produce runtime warnings when you haven't defined --- all of the functions you need for the custom writer, so it's useful --- to include when you're working on a writer. -local meta = {} -meta.__index = - function(_, key) - io.stderr:write(string.format("WARNING: Undefined function '%s'\n",key)) - return function() return "" end - end -setmetatable(_G, meta) - diff --git a/data/templates/affiliations.jats b/data/templates/affiliations.jats new file mode 100644 --- /dev/null +++ b/data/templates/affiliations.jats @@ -0,0 +1,36 @@ +$-- +$-- Affiliations +$-- + +$-- wrap affiliation if it has a known institution identifier +$if(it.group)$ +${it.group} +$endif$ +$if(it.department)$ +${it.department} +$endif$ + +$if(it.organization)$ +${it.organization} +$else$ +${it.name} +$endif$ +$if(it.isni)$ +${it.isni} +$endif$ +$if(it.ringgold)$ +${it.ringgold} +$endif$ +$if(it.ror)$ +${it.ror} +$endif$ +$for(it.pid)$ +${it.id} +$endfor$ +$if(it.street-address)$, +$for(it.street-address)$ +${it}$sep$, +$endfor$ +$else$$if(it.city)$, $it.city$$endif$$endif$$if(it.country)$, +$it.country$$endif$ + diff --git a/data/templates/after-header-includes.latex b/data/templates/after-header-includes.latex new file mode 100644 --- /dev/null +++ b/data/templates/after-header-includes.latex @@ -0,0 +1,10 @@ +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{$if(urlstyle)$$urlstyle$$else$same$endif$} +$if(links-as-notes)$ +% Make links footnotes instead of hotlinks: +\DeclareRobustCommand{\href}[2]{#2\footnote{\url{#1}}} +$endif$ +$if(verbatim-in-note)$ +\VerbatimFootnotes % allow verbatim text in footnotes +$endif$ diff --git a/data/templates/article.jats_publishing b/data/templates/article.jats_publishing new file mode 100644 --- /dev/null +++ b/data/templates/article.jats_publishing @@ -0,0 +1,252 @@ +$if(article.type)$ +
    +$else$ +
    +$endif$ + + +$if(journal.publisher-id)$ +$journal.publisher-id$ +$endif$ +$if(journal.nlm-ta)$ +$journal.nlm-ta$ +$endif$ +$if(journal.pmc)$ +$journal.pmc$ +$endif$ +$-- Fallback: an empty journal-id in case none is available. +$if(journal.publisher-id)$ +$elseif(journal.nlm-ta)$ +$elseif(journal.pmc)$ +$else$ + +$endif$ + +$if(journal.title)$ +$journal.title$ +$endif$ +$if(journal.abbrev-title)$ +$journal.abbrev-title$ +$endif$ + +$if(journal.pissn)$ +$journal.pissn$ +$endif$ +$if(journal.eissn)$ +$journal.eissn$ +$endif$ +$-- At least one issn element is required; use empty issn as fallback +$if(journal.pissn)$ +$elseif(journal.eissn)$ +$else$ + +$endif$ + +$journal.publisher-name$ +$if(journal.publisher-loc)$ +$journal.publisher-loc$ +$endif$ + + + +$if(article.publisher-id)$ +$article.publisher-id$ +$endif$ +$if(article.doi)$ +$article.doi$ +$endif$ +$if(article.pmid)$ +$article.pmid$ +$endif$ +$if(article.pmcid)$ +$article.pmcid$ +$endif$ +$if(article.art-access-id)$ +$article.art-access-id$ +$endif$ +$if(article.heading)$ + + +$article.heading$ + +$if(article.categories)$ + +$for(article.categories)$ +$article.categories$ +$endfor$ + +$endif$ + +$endif$ +$if(title)$ + +$title$ +$if(subtitle)$ +${subtitle} +$endif$ + +$endif$ +$if(author)$ + +$for(author)$ + +$if(author.orcid)$ +$author.orcid$ +$endif$ +$if(author.surname)$ + +$if(author.non-dropping-particle)$${author.non-dropping-particle} $endif$$author.surname$ +$author.given-names$$if(author.dropping-particle)$ ${author.dropping-particle}$endif$ +$if(author.prefix)$ +${author.prefix} +$endif$ +$if(author.suffix)$ +${author.suffix} +$endif$ + +$elseif(author.name)$ +$author.name$ +$else$ +$author$ +$endif$ +$for(author.roles)$ +$if(it.credit)$ +$if(it.name)$$it.name$$else$$it.credit-name$$endif$ +$elseif(it.name)$ +$it.name$ +$endif$ +$endfor$ +$if(author.email)$ +$author.email$ +$endif$ +$-- if affiliations are listed separately, then create links. Otherwise +$-- include them here. +$if(affiliation)$ +$for(author.affiliation)$ + +$endfor$ +$else$ +$for(author.affiliation)$ +${ it:affiliations.jats() } +$endfor$ +$endif$ +$if(author.cor-id)$ +* +$endif$ + +$endfor$ +$for(affiliation)$ +${ it:affiliations.jats() } +$endfor$ + +$endif$ +$if(article.author-notes)$ + +$if(article.author-notes.corresp)$ +$for(article.author-notes.corresp)$ +* E-mail: $article.author-notes.corresp.email$ +$endfor$ +$endif$ +$if(article.author-notes.conflict)$ +

    $article.author-notes.conflict$

     +$endif$ +$if(article.author-notes.con)$ +

    $article.author-notes.con$

     +$endif$ +     +$endif$ +$if(date)$ + +$if(date.day)$ +$date.day$ +$endif$ +$if(date.month)$ +$date.month$ +$endif$ +$date.year$ + +$endif$ +$if(article.volume)$ +$article.volume$ +$endif$ +$if(article.issue)$ +$article.issue$ +$endif$ +$if(article.fpage)$ +$article.fpage$ +$endif$ +$if(article.lpage)$ +$article.lpage$ +$endif$ +$if(article.elocation-id)$ +$article.elocation-id$ +$endif$ +$if(history)$ + + +$endif$ + +$for(copyright.statement)$ +$copyright.statement$ +$endfor$ +$for(copyright.year)$ +$copyright.year$ +$endfor$ +$for(copyright.holder)$ +$copyright.holder$ +$endfor$ +$if(copyright.text)$ + +$copyright.text$ + +$endif$ +$for(license)$ + +$if(it.link)$ +${it.link} +$endif$ +$if(it.text)$${it.text}$else$${it}$endif$ + +$endfor$ + +$if(abstract)$ + +$abstract$ + +$endif$ +$if(tags)$ + +$for(tags)$ +$tags$ +$endfor$ + +$endif$ +$if(article.funding-statement)$ + +$article.funding-statement$ + +$endif$ +     +$if(notes)$ +$notes$ +$endif$ +     + +$body$ + + +$if(back)$ +$back$ +$endif$ + +$if(floats-group)$ + +$floats-group$ + +$endif$ +
    + diff --git a/data/templates/common.latex b/data/templates/common.latex new file mode 100644 --- /dev/null +++ b/data/templates/common.latex @@ -0,0 +1,263 @@ +$if(linestretch)$ +\usepackage{setspace} +$endif$ +$-- +$-- paragraph formatting +$-- +$if(indent)$ +$else$ +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +$endif$ +$if(beamer)$ +$else$ +$if(block-headings)$ +% Make \paragraph and \subparagraph free-standing +\makeatletter +\ifx\paragraph\undefined\else + \let\oldparagraph\paragraph + \renewcommand{\paragraph}{ + \@ifstar + \xxxParagraphStar + \xxxParagraphNoStar + } + \newcommand{\xxxParagraphStar}[1]{\oldparagraph*{#1}\mbox{}} + \newcommand{\xxxParagraphNoStar}[1]{\oldparagraph{#1}\mbox{}} +\fi +\ifx\subparagraph\undefined\else + \let\oldsubparagraph\subparagraph + \renewcommand{\subparagraph}{ + \@ifstar + \xxxSubParagraphStar + \xxxSubParagraphNoStar + } + \newcommand{\xxxSubParagraphStar}[1]{\oldsubparagraph*{#1}\mbox{}} + \newcommand{\xxxSubParagraphNoStar}[1]{\oldsubparagraph{#1}\mbox{}} +\fi +\makeatother +$endif$ +$endif$ +$-- +$-- verbatim in notes +$-- +$if(verbatim-in-note)$ +\usepackage{fancyvrb} +$endif$ +$-- highlighting +$if(listings)$ +\usepackage{listings} +\newcommand{\passthrough}[1]{#1} +\lstset{defaultdialect=[5.3]Lua} +\lstset{defaultdialect=[x86masm]Assembler} +$endif$ +$if(lhs)$ +\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} +$endif$ +$if(highlighting-macros)$ +$highlighting-macros$ +$endif$ +$-- +$-- tables +$-- +$if(tables)$ +\usepackage{longtable,booktabs,array} +\newcounter{none} % for unnumbered tables +$if(multirow)$ +\usepackage{multirow} +$endif$ +\usepackage{calc} % for calculating minipage widths +$if(beamer)$ +\usepackage{caption} +% Make caption package work with longtable +\makeatletter +\def\fnum@table{\tablename~\thetable} +\makeatother +$else$ +% Correct order of tables after \paragraph or \subparagraph +\usepackage{etoolbox} +\makeatletter +\patchcmd\longtable{\par}{\if@noskipsec\mbox{}\fi\par}{}{} +\makeatother +% Allow footnotes in longtable head/foot +\IfFileExists{footnotehyper.sty}{\usepackage{footnotehyper}}{\usepackage{footnote}} +\makesavenoteenv{longtable} +$endif$ +$endif$ +$-- +$-- graphics +$-- +$if(graphics)$ +\usepackage{graphicx} +\makeatletter +\newsavebox\pandoc@box +\newcommand*\pandocbounded[1]{% scales image to fit in text height/width + \sbox\pandoc@box{#1}% + \Gscale@div\@tempa{\textheight}{\dimexpr\ht\pandoc@box+\dp\pandoc@box\relax}% + \Gscale@div\@tempb{\linewidth}{\wd\pandoc@box}% + \ifdim\@tempb\p@<\@tempa\p@\let\@tempa\@tempb\fi% select the smaller of both + \ifdim\@tempa\p@<\p@\scalebox{\@tempa}{\usebox\pandoc@box}% + \else\usebox{\pandoc@box}% + \fi% +} +% Set default figure placement to htbp +\def\fps@figure{htbp} +\makeatother +$endif$ +$if(svg)$ +\usepackage{svg} +$endif$ +$-- +$-- strikeout/underline +$-- +$if(strikeout)$ +\ifLuaTeX + \usepackage{luacolor} + \usepackage[soul]{lua-ul} +\else + \usepackage{soul} +$if(beamer)$ + \makeatletter + \let\HL\hl + \renewcommand\hl{% fix for beamer highlighting + \let\set@color\beamerorig@set@color + \let\reset@color\beamerorig@reset@color + \HL} + \makeatother +$endif$ +$if(CJKmainfont)$ + \ifXeTeX + % soul's \st doesn't work for CJK: + \usepackage{xeCJKfntef} + \renewcommand{\st}[1]{\sout{#1}} + \fi +$endif$ +\fi +$endif$ +$-- +$-- CSL citations +$-- +$if(csl-refs)$ +% definitions for citeproc citations +\NewDocumentCommand\citeproctext{}{} +\NewDocumentCommand\citeproc{mm}{% + \begingroup\def\citeproctext{#2}\cite{#1}\endgroup} +\makeatletter + % allow citations to break across lines + \let\@cite@ofmt\@firstofone + % avoid brackets around text for \cite: + \def\@biblabel#1{} + \def\@cite#1#2{{#1\if@tempswa , #2\fi}} +\makeatother +\newlength{\cslhangindent} +\setlength{\cslhangindent}{1.5em} +\newlength{\csllabelwidth} +\setlength{\csllabelwidth}{3em} +\newenvironment{CSLReferences}[2] % #1 hanging-indent, #2 entry-spacing + {\begin{list}{}{% + \setlength{\itemindent}{0pt} + \setlength{\leftmargin}{0pt} + \setlength{\parsep}{0pt} + % turn on hanging indent if param 1 is 1 + \ifodd #1 + \setlength{\leftmargin}{\cslhangindent} + \setlength{\itemindent}{-1\cslhangindent} + \fi + % set entry spacing + \setlength{\itemsep}{#2\baselineskip}}} + {\end{list}} +\usepackage{calc} +\newcommand{\CSLBlock}[1]{\hfill\break\parbox[t]{\linewidth}{\strut\ignorespaces#1\strut}} +\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{\strut#1\strut}} +\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{\strut#1\strut}} +\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1} +$endif$ +$-- +$-- Babel language support +$-- +$if(lang)$ +\ifLuaTeX +\usepackage[bidi=basic$if(shorthands)$$else$,shorthands=off$endif$$for(babeloptions)$,$babeloptions$$endfor$]{babel} +\else +\usepackage[bidi=default$if(shorthands)$$else$,shorthands=off$endif$$for(babeloptions)$,$babeloptions$$endfor$]{babel} +\fi +$if(babel-lang)$ +$if(mainfont)$ +\ifPDFTeX +\else +\babelfont{rm}[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$$if(mainfontfallback)$,RawFeature={fallback=mainfontfallback}$endif$]{$mainfont$} +\fi +$endif$ +$endif$ +$for(babelfonts/pairs)$ +\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$} +$endfor$ +\ifLuaTeX + \usepackage{selnolig} % disable illegal ligatures +\fi +$endif$ +$-- +$-- pagestyle +$-- +$if(pagestyle)$ +\pagestyle{$pagestyle$} +$endif$ +$-- +$-- prevent overfull lines +$-- +\setlength{\emergencystretch}{3em} % prevent overfull lines +$-- +$-- tight lists +$-- +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +$-- +$-- subfigure support +$-- +$if(subfigure)$ +\usepackage{subcaption} +$endif$ +$-- +$-- text direction support for pdftex +$-- +$if(dir)$ +\ifPDFTeX + \TeXXeTstate=1 + \newcommand{\RL}[1]{\beginR #1\endR} + \newcommand{\LR}[1]{\beginL #1\endL} + \newenvironment{RTL}{\beginR}{\endR} + \newenvironment{LTR}{\beginL}{\endL} +\fi +\ifluatex + \newcommand{\RL}[1]{\bgroup\textdir TRT#1\egroup} + \newcommand{\LR}[1]{\bgroup\textdir TLT#1\egroup} + \newenvironment{RTL}{\textdir TRT\pardir TRT\bodydir TRT}{} + \newenvironment{LTR}{\textdir TLT\pardir TLT\bodydir TLT}{} +\fi +$endif$ +$-- +$-- bibliography support support for natbib and biblatex +$-- +$if(natbib)$ +\usepackage[$natbiboptions$]{natbib} +\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} +$endif$ +$if(biblatex)$ +\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex} +$for(bibliography)$ +\addbibresource{$bibliography$} +$endfor$ +$endif$ +$-- +$-- csquotes +$-- +$if(csquotes)$ +\usepackage[$for(csquotesoptions)$$csquotesoptions$$sep$,$endfor$]{csquotes} +$endif$ diff --git a/data/templates/default.ansi b/data/templates/default.ansi new file mode 100644 --- /dev/null +++ b/data/templates/default.ansi @@ -0,0 +1,21 @@ +$if(titleblock)$ +$titleblock$ + +$endif$ +$for(header-includes)$ +$header-includes$ + +$endfor$ +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +$table-of-contents$ + +$endif$ +$body$ +$for(include-after)$ + +$include-after$ +$endfor$ diff --git a/data/templates/default.asciidoc b/data/templates/default.asciidoc --- a/data/templates/default.asciidoc +++ b/data/templates/default.asciidoc @@ -1,16 +1,24 @@ $if(titleblock)$ -$title$ += $title$ $if(author)$ $for(author)$$author$$sep$; $endfor$ -$endif$ $if(date)$ $date$ $endif$ +$elseif(date)$ +:revdate: $date$ +$endif$ $if(keywords)$ :keywords: $for(keywords)$$keywords$$sep$, $endfor$ $endif$ +$if(lang)$ +:lang: $lang$ +$endif$ $if(toc)$ :toc: +$endif$ +$if(math)$ +:stem: latexmath $endif$ $endif$ diff --git a/data/templates/default.bbcode b/data/templates/default.bbcode new file mode 100644 --- /dev/null +++ b/data/templates/default.bbcode @@ -0,0 +1,1 @@ +$body$ diff --git a/data/templates/default.beamer b/data/templates/default.beamer new file mode 100644 --- /dev/null +++ b/data/templates/default.beamer @@ -0,0 +1,204 @@ +$passoptions.latex()$ +\documentclass[ +$if(fontsize)$ + $fontsize$, +$endif$ + ignorenonframetext, +$if(handout)$ + handout, +$endif$ +$if(aspectratio)$ + aspectratio=$aspectratio$, +$endif$ +$if(babel-lang)$ + $babel-lang$, +$endif$ +$for(classoption)$ + $classoption$$sep$, +$endfor$ +]{$documentclass$} +$if(geometry)$ +\geometry{$for(geometry)$$geometry$$sep$,$endfor$} +$endif$ +\newif\ifbibliography +$if(background-image)$ +\usebackgroundtemplate{% + \includegraphics[width=\paperwidth]{$background-image$}% +} +% In beamer background-image does not work well when other images are used, so this is the workaround +\pgfdeclareimage[width=\paperwidth,height=\paperheight]{background}{$background-image$} +\usebackgroundtemplate{\pgfuseimage{background}} +$endif$ +\usepackage{pgfpages} +\setbeamertemplate{caption}[numbered] +\setbeamertemplate{caption label separator}{: } +\setbeamercolor{caption name}{fg=normal text.fg} +\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$ +$-- +$-- section numbering +$-- +$if(numbersections)$ +$else$ +% remove section numbering +\setbeamertemplate{part page}{ + \centering + \begin{beamercolorbox}[sep=16pt,center]{part title} + \usebeamerfont{part title}\insertpart\par + \end{beamercolorbox} +} +\setbeamertemplate{section page}{ + \centering + \begin{beamercolorbox}[sep=12pt,center]{section title} + \usebeamerfont{section title}\insertsection\par + \end{beamercolorbox} +} +\setbeamertemplate{subsection page}{ + \centering + \begin{beamercolorbox}[sep=8pt,center]{subsection title} + \usebeamerfont{subsection title}\insertsubsection\par + \end{beamercolorbox} +} +$endif$ +$for(beameroption)$ +\setbeameroption{$beameroption$} +$endfor$ +% Prevent slide breaks in the middle of a paragraph +\widowpenalties 1 10000 +\raggedbottom +$if(section-titles)$ +\AtBeginPart{ + \frame{\partpage} +} +\AtBeginSection{ + \ifbibliography + \else + \frame{\sectionpage} + \fi +} +\AtBeginSubsection{ + \frame{\subsectionpage} +} +$endif$ +$fonts.latex()$ +$-- Set Beamer theme before user font settings so they can override theme +$if(theme)$ +\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$} +$endif$ +$if(colortheme)$ +\usecolortheme[$for(colorthemeoptions)$$colorthemeoptions$$sep$,$endfor$]{$colortheme$} +$endif$ +$if(fonttheme)$ +\usefonttheme[$for(fontthemeoptions)$$fontthemeoptions$$sep$,$endfor$]{$fonttheme$} +$endif$ +$if(mainfont)$ +\usefonttheme{serif} % use mainfont rather than sansfont for slide text +$endif$ +$if(innertheme)$ +\useinnertheme[$for(innerthemeoptions)$$innerthemeoptions$$sep$,$endfor$]{$innertheme$} +$endif$ +$if(outertheme)$ +\useoutertheme[$for(outerthemeoptions)$$outerthemeoptions$$sep$,$endfor$]{$outertheme$} +$endif$ +$font-settings.latex()$ +$common.latex()$ +$for(header-includes)$ +$header-includes$ +$endfor$ +$after-header-includes.latex()$ +$hypersetup.latex()$ + +$if(title)$ +\title$if(shorttitle)$[$shorttitle$]$endif${\texorpdfstring{$title$}{$title-meta$}$if(thanks)$\thanks{$thanks$}$endif$} +$endif$ +$if(subtitle)$ +\subtitle$if(shortsubtitle)$[$shortsubtitle$]$endif${\texorpdfstring{$subtitle$}{$subtitle-meta$}} +$endif$ +\author$if(shortauthor)$[$shortauthor$]$endif${\texorpdfstring{$for(author)$$author$$sep$ \and $endfor$}{$author-meta$}} +\date$if(shortdate)$[$shortdate$]$endif${$date$} +$if(institute)$ +\institute$if(shortinstitute)$[$shortinstitute$]$endif${$for(institute)$$institute$$sep$ \and $endfor$} +$endif$ +$if(titlegraphic)$ +\titlegraphic{ +$for(titlegraphic)$ + \includegraphics$if(titlegraphicoptions)$[$for(titlegraphicoptions)$$titlegraphicoptions$$sep$, $endfor$]$endif${$titlegraphic$}$sep$\enspace +$endfor$} +$endif$ +$if(logo)$ +\logo{\includegraphics$if(logooptions)$[$for(logooptions)$$logooptions$$sep$, $endfor$]$endif${$logo$}} +$endif$ + +\begin{document} +$if(title)$ +\frame{\titlepage} +$if(abstract)$ +\begin{abstract} +$abstract$ +\end{abstract} +$endif$ +$endif$ + +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +$if(toc-title)$ +\renewcommand*\contentsname{$toc-title$} +$endif$ +\begin{frame}[allowframebreaks] +$if(toc-title)$ + \frametitle{$toc-title$} +$endif$ + \setcounter{tocdepth}{$toc-depth$} + \tableofcontents +\end{frame} +\setcounter{tocdepth}{$toc-depth$} +\tableofcontents +} +$endif$ +$if(lof)$ +\listoffigures +$endif$ +$if(lot)$ +\listoftables +$endif$ +$if(linestretch)$ +\setstretch{$linestretch$} +$endif$ +$body$ + +$if(natbib)$ +$if(bibliography)$ +$if(biblio-title)$ +$if(has-chapters)$ +\renewcommand\bibname{$biblio-title$} +$else$ +\renewcommand\refname{$biblio-title$} +$endif$ +$endif$ +\begin{frame}[allowframebreaks]{$biblio-title$} +$if(nocite-ids)$ + \nocite{$for(nocite-ids)$$it$$sep$, $endfor$} +$endif$ + \bibliographytrue + \bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$} +\end{frame} + +$endif$ +$endif$ +$if(biblatex)$ +\begin{frame}[allowframebreaks]{$biblio-title$} +$if(nocite-ids)$ + \nocite{$for(nocite-ids)$$it$$sep$, $endfor$} +$endif$ + \bibliographytrue + \printbibliography[heading=none] +\end{frame} + +$endif$ +$for(include-after)$ +$include-after$ + +$endfor$ +\end{document} diff --git a/data/templates/default.biblatex b/data/templates/default.biblatex new file mode 100644 --- /dev/null +++ b/data/templates/default.biblatex @@ -0,0 +1,10 @@ +$for(header-includes)$ +$header-includes$ +$endfor$ +$for(include-before)$ +$include-before$ +$endfor$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ diff --git a/data/templates/default.bibtex b/data/templates/default.bibtex new file mode 100644 --- /dev/null +++ b/data/templates/default.bibtex @@ -0,0 +1,10 @@ +$for(header-includes)$ +$header-includes$ +$endfor$ +$for(include-before)$ +$include-before$ +$endfor$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ diff --git a/data/templates/default.chunkedhtml b/data/templates/default.chunkedhtml new file mode 100644 --- /dev/null +++ b/data/templates/default.chunkedhtml @@ -0,0 +1,103 @@ + + + + + + +$for(author-meta)$ + +$endfor$ +$if(date-meta)$ + +$endif$ +$if(keywords)$ + +$endif$ +$if(description-meta)$ + +$endif$ + $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ + +$for(css)$ + +$endfor$ +$for(header-includes)$ + $header-includes$ +$endfor$ +$if(math)$ + $math$ +$endif$ + + +$for(include-before)$ +$include-before$ +$endfor$ + +$if(top)$ +$-- only print title block if this is NOT the top page +$else$ +$if(title)$ +
    +

    $title$

    +$if(subtitle)$ +

    $subtitle$

    +$endif$ +$for(author)$ +

    $author$

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

    $date$

    +$endif$ +$if(abstract)$ +
    +
    $abstract-title$
    +$abstract$ +
    +$endif$ +$endif$ +
    +$endif$ +$if(toc)$ + +$endif$ +$body$ +$for(include-after)$ +$include-after$ +$endfor$ + + diff --git a/data/templates/default.context b/data/templates/default.context --- a/data/templates/default.context +++ b/data/templates/default.context @@ -1,3 +1,8 @@ +$if(tagging)$ +\setupbackend[format=pdf/ua-2] +\enabledirectives[backend.usetags=mkiv] +\setuptagging[state=start] +$endif$ $if(context-lang)$ \mainlanguage[$context-lang$] $endif$ @@ -23,11 +28,11 @@ style=$linkstyle$, color=$linkcolor$, contrastcolor=$linkcontrastcolor$] +\setupurl[style=$urlstyle$] % make chapter, section bookmarks visible when opening document \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] -\setupinteractionscreen[option=bookmark] -\setuptagging[state=start] +\setupinteractionscreen[option={bookmark,title}] $if(papersize)$ \setuppapersize[$for(papersize)$$papersize$$sep$,$endfor$] @@ -37,21 +42,42 @@ $endif$ $if(pagenumbering)$ \setuppagenumbering[$for(pagenumbering)$$pagenumbering$$sep$,$endfor$] +$else$ +\setuppagenumbering[location={footer,middle}] $endif$ +$if(pdfa)$ +% attempt to generate PDF/A +\setupbackend + [format=PDF/A-$pdfa$, + profile={$if(pdfaiccprofile)$$for(pdfaiccprofile)$$pdfaiccprofile$$sep$,$endfor$$else$sRGB.icc$endif$}, + intent=$if(pdfaintent)$$pdfaintent$$else$sRGB IEC61966-2.1$endif$] +$endif$ +\setupstructure[state=start,method=auto] % use microtypography \definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes] +\definefontfeature[default:tnum][default][tnum=yes, pnum=no] \definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes] \setupalign[hz,hanging] \setupitaliccorrection[global, always] \setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted -\definefallbackfamily[mainface][rm][DejaVu Serif][preset=range:greek, force=yes] -\definefontfamily[mainface][rm][$if(mainfont)$$mainfont$$else$Latin Modern Roman$endif$] -\definefontfamily[mainface][mm][$if(mathfont)$$mathfont$$else$Latin Modern Math$endif$] -\definefontfamily[mainface][ss][$if(sansfont)$$sansfont$$else$Latin Modern Sans$endif$] -\definefontfamily[mainface][tt][$if(monofont)$$monofont$$else$Latin Modern Typewriter$endif$][features=none] +$-- set up font fallbacks +$for(mainfontfallback)$ +\definefallbackfamily[mainface][rm][$mainfontfallback/nowrap$][range=0x0000-0xFFFF, check=yes, force=no] +$endfor$ +$for(sansfontfallback)$ +\definefallbackfamily[mainface][ss][$sansfontfallback/nowrap$][range=0x0000-0xFFFF, check=yes, force=no] +$endfor$ +$for(monofontfallback)$ +\definefallbackfamily[mainface][tt][$monofontfallback/nowrap$][range=0x0000-0xFFFF, check=yes, force=no] +$endfor$ +\definefallbackfamily[mainface][rm][CMU Serif][preset=range:greek, force=yes] +\definefontfamily[mainface][rm][$if(mainfont)$$mainfont/nowrap$$else$Latin Modern Roman$endif$] +\definefontfamily[mainface][mm][$if(mathfont)$$mathfont/nowrap$$else$Latin Modern Math$endif$] +\definefontfamily[mainface][ss][$if(sansfont)$$sansfont/nowrap$$else$Latin Modern Sans$endif$] +\definefontfamily[mainface][tt][$if(monofont)$$monofont/nowrap$$else$Latin Modern Typewriter$endif$][features=none] \setupbodyfont[mainface$if(fontsize)$,$fontsize$$endif$] \setupwhitespace[$if(whitespace)$$whitespace$$else$medium$endif$] @@ -62,13 +88,17 @@ \setupinterlinespace[$for(interlinespace)$$interlinespace$$sep$,$endfor$] $endif$ -\setuphead[chapter] [style=\tfd,header=empty] -\setuphead[section] [style=\tfc] -\setuphead[subsection] [style=\tfb] +\setuphead[chapter] [style=\tfd\setupinterlinespace,header=empty] +\setuphead[section] [style=\tfc\setupinterlinespace] +\setuphead[subsection] [style=\tfb\setupinterlinespace] \setuphead[subsubsection] [style=\bf] \setuphead[subsubsubsection] [style=\sc] \setuphead[subsubsubsubsection][style=\it] +\definesectionlevels + [default] + [section, subsection, subsubsection, subsubsubsection, subsubsubsubsection] + $if(headertext)$ \setupheadertexts$for(headertext)$[$headertext$]$endfor$ $endif$ @@ -87,11 +117,43 @@ \setupitemize[autointro] % prevent orphan list intro \setupitemize[indentnext=no] +\defineitemgroup[enumerate] +\setupenumerate[each][fit][itemalign=left,distance=.5em,style={\feature[+][default:tnum]}] + \setupfloat[figure][default={here,nonumber}] \setupfloat[table][default={here,nonumber}] -\setupthinrules[width=15em] % width of horizontal rules +\setupxtable[frame=off] +\setupxtable[head][topframe=on] +\setupxtable[body][] +\setupxtable[foot][] +\setupxtable[lastrow][bottomframe=on] +$if(emphasis-commands)$ +$emphasis-commands$ +$endif$ +$if(highlighting-commands)$ +$highlighting-commands$ +$endif$ +$if(csl-refs)$ +\definemeasure[cslhangindent][1.5em] +\definenarrower[hangingreferences][left=\measure{cslhangindent}] +\definestartstop [cslreferences] [ + $if(csl-hanging-indent)$ + before={% + \starthangingreferences[left] + \setupindenting[-\leftskip,yes,first] + \doindentation + }, + after=\stophangingreferences, + $endif$ +] +$endif$ +$if(includesource)$ +$for(sourcefile)$ +\attachment[file=$curdir$/$sourcefile$,method=hidden] +$endfor$ +$endif$ $for(header-includes)$ $header-includes$ $endfor$ @@ -99,18 +161,18 @@ \starttext $if(title)$ \startalignment[middle] - {\tfd $title$} + {\tfd\setupinterlinespace $title$} $if(subtitle)$ \smallskip - {\tfa $subtitle$} + {\tfa\setupinterlinespace $subtitle$} $endif$ $if(author)$ \smallskip - {\tfa $for(author)$$author$$sep$\crlf $endfor$} + {\tfa\setupinterlinespace $for(author)$$author$$sep$\crlf $endfor$} $endif$ $if(date)$ \smallskip - {\tfa $date$} + {\tfa\setupinterlinespace $date$} $endif$ \bigskip \stopalignment @@ -128,11 +190,11 @@ $if(toc)$ \completecontent $endif$ -$if(lot)$ -\completelistoftables -$endif$ $if(lof)$ \completelistoffigures +$endif$ +$if(lot)$ +\completelistoftables $endif$ $body$ diff --git a/data/templates/default.djot b/data/templates/default.djot new file mode 100644 --- /dev/null +++ b/data/templates/default.djot @@ -0,0 +1,27 @@ +$if(title)$ +# $title$ + +$endif$ +$if(author)$ +$for(author)$ +$author$ +$endfor$ + +$endif$ +$if(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/data/templates/default.docbook4 b/data/templates/default.docbook4 --- a/data/templates/default.docbook4 +++ b/data/templates/default.docbook4 @@ -23,10 +23,10 @@ $endif$ $for(include-before)$ -$include-before$ + $include-before$ $endfor$ -$body$ + $body$ $for(include-after)$ -$include-after$ + $include-after$ $endfor$
    diff --git a/data/templates/default.docbook5 b/data/templates/default.docbook5 --- a/data/templates/default.docbook5 +++ b/data/templates/default.docbook5 @@ -28,10 +28,10 @@ $endif$ $for(include-before)$ -$include-before$ + $include-before$ $endfor$ -$body$ + $body$ $for(include-after)$ -$include-after$ + $include-after$ $endfor$ diff --git a/data/templates/default.dzslides b/data/templates/default.dzslides --- a/data/templates/default.dzslides +++ b/data/templates/default.dzslides @@ -12,20 +12,9 @@ $endif$ $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ - -$if(highlighting-css)$ - -$endif$ $if(css)$ $for(css)$ @@ -182,7 +171,7 @@

    $subtitle$

    $endif$
    - $if(author)$$for(author)$$author$$sep$, $endfor$$endif$ · $if(date)$$date$$endif$ + $if(author)$$for(author)$$author$$sep$, $endfor$ · $endif$$if(institute)$$for(institute)$$institute$$sep$, $endfor$ · $endif$$if(date)$$date$$endif$
    $endif$ diff --git a/data/templates/default.epub2 b/data/templates/default.epub2 --- a/data/templates/default.epub2 +++ b/data/templates/default.epub2 @@ -1,25 +1,20 @@ - +$pagetitle$ $if(highlighting-css)$ - + /* CSS for syntax highlighting */ + $highlighting-css$ $endif$ + $for(css)$ $endfor$ @@ -54,7 +49,20 @@ $if(rights)$
    $rights$
    $endif$ +$if(abstract)$ +
    +
    $abstract-title$
    +$abstract$ +
    +$endif$ $else$ +$if(coverpage)$ +
    + + + +
    +$else$ $for(include-before)$ $include-before$ $endfor$ @@ -62,6 +70,7 @@ $for(include-after)$ $include-after$ $endfor$ +$endif$ $endif$ diff --git a/data/templates/default.epub3 b/data/templates/default.epub3 --- a/data/templates/default.epub3 +++ b/data/templates/default.epub3 @@ -1,24 +1,19 @@ - +$pagetitle$ - $if(highlighting-css)$ - + /* CSS for syntax highlighting */ + $highlighting-css$ $endif$ + $for(css)$ $endfor$ @@ -26,9 +21,9 @@ $header-includes$ $endfor$ - + $if(titlepage)$ -
    +
    $for(title)$ $if(title.type)$

    $title.text$

    @@ -54,8 +49,21 @@ $if(rights)$
    $rights$
    $endif$ +$if(abstract)$ +
    +
    $abstract-title$
    +$abstract$ +
    +$endif$
    $else$ +$if(coverpage)$ +
    + + + +
    +$else$ $for(include-before)$ $include-before$ $endfor$ @@ -63,6 +71,7 @@ $for(include-after)$ $include-after$ $endfor$ +$endif$ $endif$ diff --git a/data/templates/default.html4 b/data/templates/default.html4 --- a/data/templates/default.html4 +++ b/data/templates/default.html4 @@ -3,7 +3,7 @@ - + $for(author-meta)$ $endfor$ @@ -13,30 +13,22 @@ $if(keywords)$ $endif$ - $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ - -$if(highlighting-css)$ + $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ -$endif$ $for(css)$ $endfor$ -$if(math)$ - $math$ -$endif$ $for(header-includes)$ $header-includes$ $endfor$ +$if(math)$ + $math$ +$endif$ $for(include-before)$ @@ -54,10 +46,19 @@ $if(date)$

    $date$

    $endif$ +$if(abstract)$ +
    +
    $abstract-title$
    +$abstract$
    $endif$ + +$endif$ $if(toc)$
    +$if(toc-title)$ +

    $toc-title$

    +$endif$ $table-of-contents$
    $endif$ diff --git a/data/templates/default.html5 b/data/templates/default.html5 --- a/data/templates/default.html5 +++ b/data/templates/default.html5 @@ -1,8 +1,8 @@ - + - + $for(author-meta)$ @@ -13,40 +13,29 @@ $if(keywords)$ $endif$ - $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ - -$if(highlighting-css)$ - -$endif$ $for(css)$ - + $endfor$ -$if(math)$ - $math$ -$endif$ - $for(header-includes)$ $header-includes$ $endfor$ +$if(math)$ + $math$ +$endif$ $for(include-before)$ $include-before$ $endfor$ $if(title)$ -
    +

    $title$

    $if(subtitle)$

    $subtitle$

    @@ -57,10 +46,19 @@ $if(date)$

    $date$

    $endif$ +$if(abstract)$ +
    +
    $abstract-title$
    +$abstract$ +
    +$endif$
    $endif$ $if(toc)$ -
    " .. caption .. "
    ' .. h .. '
    ' .. c .. '
    - - - - -
    *one*[a\ link](http://google.com)
    -\f[] -.fi -.PP -into -.IP -.nf -\f[C] - - - - - -
    onea\ link
    -\f[] -.fi -.PP -whereas \f[C]Markdown.pl\f[] will preserve it as is. -.PP -There is one exception to this rule: text between \f[C] +^D + +``` diff --git a/test/command/10867.md b/test/command/10867.md new file mode 100644 --- /dev/null +++ b/test/command/10867.md @@ -0,0 +1,26 @@ +``` +% pandoc -f native -t markdown-raw_html +[ Figure + ( "fig:foo" , [] , [ ( "label" , "1.1" ) ] ) + (Caption + Nothing + [ Plain + [ Str "Figure" , Space , Str "1.1:" , Space , Str "Figure" ] + ]) + [ Plain + [ Image + ( "" , [] , [] ) + [ Str "Figure" , Space , Str "1.1:" , Space , Str "Figure" ] + ( "./image.png" , "" ) + ] + ] +] +^D +:::: {#fig:foo .figure label="1.1"} +![Figure 1.1: Figure](./image.png) + +::: caption +Figure 1.1: Figure +::: +:::: +``` diff --git a/test/command/10884.md b/test/command/10884.md new file mode 100644 --- /dev/null +++ b/test/command/10884.md @@ -0,0 +1,17 @@ +``` +% pandoc -f markdown -t markdown + header1 header2 + --------- --------- + r1c1 r1c2 + r2c1 r2c2 + + : mycaption {#myid .myclass key="value"} +^D + header1 header2 + --------- --------- + r1c1 r1c2 + r2c1 r2c2 + + : mycaption {#myid .myclass key="value"} + +``` diff --git a/test/command/10889.md b/test/command/10889.md new file mode 100644 --- /dev/null +++ b/test/command/10889.md @@ -0,0 +1,16 @@ +``` +% pandoc +apple + +: pomaceous + + fruit +^D +
    +
    apple
    +
    +

    pomaceous

    +

    fruit

    +
    +
    +``` diff --git a/test/command/10890.md b/test/command/10890.md new file mode 100644 --- /dev/null +++ b/test/command/10890.md @@ -0,0 +1,15 @@ +``` +% pandoc --tab-stop=2 --from=native --to=markdown +[ DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "pomaceous" ] , Para [ Str "fruit" ] ] ] + ) + ] +] +^D +apple + +: pomaceous + + fruit +``` diff --git a/test/command/10912.md b/test/command/10912.md new file mode 100644 --- /dev/null +++ b/test/command/10912.md @@ -0,0 +1,16 @@ +``` +% pandoc -f docbook -t native + + +Para1 + + +Para2 + + +^D +[ OrderedList + ( 4 , Decimal , DefaultDelim ) + [ [ Para [ Str "Para1" ] ] , [ Para [ Str "Para2" ] ] ] +] +``` diff --git a/test/command/10915.md b/test/command/10915.md new file mode 100644 --- /dev/null +++ b/test/command/10915.md @@ -0,0 +1,8 @@ +``` +% pandoc -f latex +\newcommand{\a}{\ifmmode x \else y \fi} +$\a$ and \a +^D +

    x and y

    +``` + diff --git a/test/command/10919.md b/test/command/10919.md new file mode 100644 --- /dev/null +++ b/test/command/10919.md @@ -0,0 +1,21 @@ +# Org output with smart quotes turned on + +``` +% pandoc -t org+smart_quotes -s +"It's nice" she said. +^D +#+options: ':t + +"It's nice" she said. +``` + +Same test, but with special strings turned off. +``` +% pandoc -t org+smart_quotes-special_strings -s +"It's nice" she said. +^D +#+options: ':t +#+options: -:nil + +"It’s nice" she said. +``` diff --git a/test/command/10926.md b/test/command/10926.md new file mode 100644 --- /dev/null +++ b/test/command/10926.md @@ -0,0 +1,19 @@ +```` +% pandoc -f html -t gfm +
    test
    +^D +``` ruby +test +``` +```` + +```` +% pandoc -f html -t gfm +
    test
    +^D +``` ruby +test +``` +```` diff --git a/test/command/10942.md b/test/command/10942.md new file mode 100644 --- /dev/null +++ b/test/command/10942.md @@ -0,0 +1,97 @@ +Ungrouped field instruction: +``` +% pandoc -f rtf -t native +{\rtf1\ansi\deff0 +{\fonttbl{\f0\froman Times New Roman;}} +{\colortbl;\red0\green0\blue0;} +\deftab720 + +\trowd\trleft0\cellx2000\cellx4000 +\pard\intbl +{{\field{\*\fldinst HYPERLINK "https://example.com" }{\fldrslt {\hich\af0\loch\hich\af0\loch\cf0\f0\cf0\f0\loch +{\*\bkmkstart _dx_frag_StartFragment}{\*\bkmkend _dx_frag_StartFragment}Problem Text}}}}\cell +\pard\intbl Normal Text\cell +\row + +\trowd\trleft0\cellx2000\cellx4000 +\pard\intbl Simple Text\cell +\pard\intbl More Text\cell +\row +} +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Link + ( "" , [] , [] ) + [ Str "Problem" , Space , Str "Text" ] + ( "https://example.com" , "" ) + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "Normal" , Space , Str "Text" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "Simple" , Space , Str "Text" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "More" , Space , Str "Text" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` + +Additionally, ungrouped field result: +``` +% pandoc -f rtf -t native +{\rtf1\ansi\ansicpg1252\cocoartf2867 +\cocoatextscaling0\cocoaplatform1{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;} +\paperw11905\paperh16837\margl1133\margr1133\margb1133\margt1133 +\deftab720 +\pard\pardeftab720\partightenfactor0 +{\field{\*\fldinst{HYPERLINK "https://example.com"}}{\fldrslt +\f0\fs22 \cf2 \up0 \nosupersub \ul \ulc2 link}}} +^D +[ Para + [ Underline + [ Link + ( "" , [] , [] ) + [ Str "link" ] + ( "https://example.com" , "" ) + ] + ] +] +``` diff --git a/test/command/10965.md b/test/command/10965.md new file mode 100644 --- /dev/null +++ b/test/command/10965.md @@ -0,0 +1,50 @@ +``` +% pandoc -f markdown -t typst +::: {lang="en"} +This text should be in English. +::: +^D +#block[ +#set text(lang: "en"); +This text should be in English. + +] +``` + +``` +% pandoc -f markdown -t typst +::: {lang="fr"} +Ce texte devrait être en français. +::: +^D +#block[ +#set text(lang: "fr"); +Ce texte devrait être en français. + +] +``` + +``` +% pandoc -f markdown -t typst +::: {lang="de-DE"} +Dieser Text sollte auf Deutsch sein. +::: +^D +#block[ +#set text(lang: "de"); +Dieser Text sollte auf Deutsch sein. + +] +``` + +``` +% pandoc -f markdown -t typst +::: {lang=""} +This should not have lang set. +::: +^D +#block[ +This should not have lang set. + +] +``` diff --git a/test/command/10983.md b/test/command/10983.md new file mode 100644 --- /dev/null +++ b/test/command/10983.md @@ -0,0 +1,22 @@ +``` +% pandoc --citeproc --csl command/chicago-fullnote-bibliography.csl -t plain +--- +references: +- id: test4 + type: blog-post + title: "Username as author" + author: + - brtw + container-title: "Reddit" + issued: + year: 2004 +suppress-bibliography: true +... + +[@test4] +^D +[1] + +[1] brtw, “Username as Author,” Reddit, 2004. + +``` diff --git a/test/command/10984.md b/test/command/10984.md new file mode 100644 --- /dev/null +++ b/test/command/10984.md @@ -0,0 +1,16 @@ + ``` + % pandoc -f html -t djot +

    Hi +^D +{#foo .a .b} +# Hi +``` + +In this one the id is suppressed by the djot writer because +the same one would be automatically generated by the djot reader: +``` +% pandoc -f html -t djot +

    Introduction

    +^D +## Introduction +``` diff --git a/test/command/11006.md b/test/command/11006.md new file mode 100644 --- /dev/null +++ b/test/command/11006.md @@ -0,0 +1,56 @@ +``` +% pandoc -f html -t asciidoc +
      +
    • +

      Paragraph one

      +

      Paragraph two to force a list continuation

      +
        +
      • First nested
        • +
      • Second nested
        • +
      +
      • +
    + +

    How about ordered lists?

    + +
      +
    1. +

      Paragraph one

      +

      Paragraph two to force a list continuation

      +
      1. Nested item
      +
      2. +
    + +

    With non-default attributes:

    + +
      +
    1. +

      Paragraph one

      +

      Paragraph two to force a list continuation

      +
      1. Nested item
      +
      2. +
    +^D +* Paragraph one ++ +Paragraph two to force a list continuation + +** First nested +** Second nested + +How about ordered lists? + +. Paragraph one ++ +Paragraph two to force a list continuation + +.. Nested item + +With non-default attributes: + +. Paragraph one ++ +Paragraph two to force a list continuation +[start=5] +.. Nested item +``` diff --git a/test/command/11013.md b/test/command/11013.md new file mode 100644 --- /dev/null +++ b/test/command/11013.md @@ -0,0 +1,23 @@ +``` +% pandoc --csl command/chicago-fullnote-bibliography.csl -C --wrap=none -t plain +--- +references: +- id: test10 + type: blog-post + title: "Test 10: Lowercase username in brackets, Works!" + author: + - literal: "[deleted]" + container-title: "Reddit" + issued: + year: 2009 +... + +blah [@test10]. +^D +blah.[1] + +[deleted]. “Test 10: Lowercase Username in Brackets, Works!” Reddit, 2009. + +[1] [deleted], “Test 10: Lowercase Username in Brackets, Works!” Reddit, 2009. + +``` diff --git a/test/command/11014.md b/test/command/11014.md new file mode 100644 --- /dev/null +++ b/test/command/11014.md @@ -0,0 +1,9 @@ +``` +% pandoc -f djot -t html +{.foo} +- bar +^D +
      +
    • bar
      • +
    +``` diff --git a/test/command/11017.md b/test/command/11017.md new file mode 100644 --- /dev/null +++ b/test/command/11017.md @@ -0,0 +1,9 @@ +``` +% pandoc -t markdown -f typst +#show heading: smallcaps + += Introduction +^D +# [Introduction]{.smallcaps} + +``` diff --git a/test/command/11046.md b/test/command/11046.md new file mode 100644 --- /dev/null +++ b/test/command/11046.md @@ -0,0 +1,19 @@ +``` +% pandoc --citeproc -t plain+smart --csl command/chicago-note-bibliography.csl +--- +references: +- id: doe + title: Title + type: book + date: 2006 + author: John Doe +... + +blah blah [@doe]---blah blah. +^D +blah blah[1]---blah blah. + +John Doe. Title, n.d. + +[1] John Doe, Title. +``` diff --git a/test/command/11047.md b/test/command/11047.md new file mode 100644 --- /dev/null +++ b/test/command/11047.md @@ -0,0 +1,7 @@ +``` +% pandoc -t typst --wrap=auto +Full-time study: 2001-2003; Thesis submission: Nov 2005; Award: Jul 2006. +^D +Full-time study: 2001-2003; Thesis submission: Nov 2005; Award: Jul +\2006. +``` diff --git a/test/command/11048.md b/test/command/11048.md new file mode 100644 --- /dev/null +++ b/test/command/11048.md @@ -0,0 +1,48 @@ +``` +% pandoc -f biblatex -t markdown -s +@article{khatri2021spooky, + title = {Spooky action at a global distance: analysis of space-based + entanglement distribution for the quantum internet}, + author = {Khatri, Sumeet and Brady, Anthony J and Desporte, Ren{\'e}e A and + Bart, Manon P and Dowling, Jonathan P}, + journal = {{npj} Quantum Information}, + volume = {7}, + number = {1}, + pages = {4}, + doi = {10.1038/s41534-020-00327-5}, + url = {https://doi.org/10.1038/s41534-020-00327-5}, + year = {2021}, + publisher = {Nature Publishing Group UK London}, +} +^D +--- +nocite: "[@*]" +references: +- author: + - family: Khatri + given: Sumeet + - family: Brady + given: Anthony J + - family: Desporte + given: Renée A + - family: Bart + given: Manon P + - family: Dowling + given: Jonathan P + container-title: "[npj]{.nocase} Quantum Information" + doi: 10.1038/s41534-020-00327-5 + id: khatri2021spooky + issue: 1 + issued: 2021 + page: 4 + publisher: Nature Publishing Group UK London + title: "Spooky action at a global distance: Analysis of space-based + entanglement distribution for the quantum internet" + title-short: Spooky action at a global distance + type: article-journal + url: "https://doi.org/10.1038/s41534-020-00327-5" + volume: 7 +--- + + +``` diff --git a/test/command/11090.md b/test/command/11090.md new file mode 100644 --- /dev/null +++ b/test/command/11090.md @@ -0,0 +1,49 @@ +``` +% pandoc -f typst -t native +#include "command/11090/ch1.typ" + +== Chapter Two + +#figure( + image("command/11090/media/image1.png"), + caption: [This is an image.] +) +^D +[ Header + 2 ( "" , [] , [] ) [ Str "Chapter" , Space , Str "One" ] +, Figure + ( "" , [] , [] ) + (Caption + Nothing [ Para [ Str "An" , Space , Str "image." ] ]) + [ Para + [ Image + ( "" , [] , [] ) + [] + ( "command/11090/media/image1.png" , "" ) + ] + ] +, Header + 2 ( "" , [] , [] ) [ Str "Chapter" , Space , Str "Two" ] +, Figure + ( "" , [] , [] ) + (Caption + Nothing + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "image." + ] + ]) + [ Para + [ Image + ( "" , [] , [] ) + [] + ( "command/11090/media/image1.png" , "" ) + ] + ] +] +``` diff --git a/test/command/11090/ch1.typ b/test/command/11090/ch1.typ new file mode 100644 --- /dev/null +++ b/test/command/11090/ch1.typ @@ -0,0 +1,6 @@ +== Chapter One + +#figure( + image("media/image1.png"), + caption: [An image.] +) diff --git a/test/command/11101.md b/test/command/11101.md new file mode 100644 --- /dev/null +++ b/test/command/11101.md @@ -0,0 +1,15 @@ +``` +% pandoc -f typst -t native +First paragraph. + +#pagebreak() + +Second paragraph. +^D +[ Para [ Str "First" , Space , Str "paragraph." ] +, Div + ( "" , [ "page-break" ] , [ ( "wrapper" , "1" ) ] ) + [ HorizontalRule ] +, Para [ Str "Second" , Space , Str "paragraph." ] +] +``` diff --git a/test/command/11113.docx b/test/command/11113.docx new file mode 100644 Binary files /dev/null and b/test/command/11113.docx differ diff --git a/test/command/11113.md b/test/command/11113.md new file mode 100644 --- /dev/null +++ b/test/command/11113.md @@ -0,0 +1,7 @@ +``` +% pandoc command/11113.docx -t plain +^D +Colored:❤️😏📖👌😒🤍 + +BW: 😊︎ +``` diff --git a/test/command/11124.md b/test/command/11124.md new file mode 100644 --- /dev/null +++ b/test/command/11124.md @@ -0,0 +1,10 @@ +The heading is "unlinked" before adding it to the TOC. + +``` +% pandoc --to=latex + {-} +========================= +^D +\section*{\texorpdfstring{\url{http://example.com/}}{http://example.com/}}\label{httpexample.com} +\addcontentsline{toc}{section}{{http://example.com/}} +``` diff --git a/test/command/11128.md b/test/command/11128.md new file mode 100644 --- /dev/null +++ b/test/command/11128.md @@ -0,0 +1,23 @@ +``` +% pandoc -f html -t markdown_strict+pipe_tables-raw_html + + + + + + + + + + + + + + +
    SubjectGrade
    PhysicsPracticalA
    TheoryB+
    +^D +| **Subject** | | **Grade** | +|-------------|-----------|-----------| +| Physics | Practical | A | +| | Theory | B+ | +``` diff --git a/test/command/11140.md b/test/command/11140.md new file mode 100644 --- /dev/null +++ b/test/command/11140.md @@ -0,0 +1,71 @@ +``` +% pandoc -f rst -t native +.. figure:: image.png + :alt: my alt + + Caption +^D +[ Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "Caption" ] ]) + [ Plain + [ Image + ( "" , [] , [] ) + [ Str "my" , Space , Str "alt" ] + ( "image.png" , "" ) + ] + ] +] +``` + +``` +% pandoc -f rst -t native +.. figure:: image.png + + Caption +^D +[ Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "Caption" ] ]) + [ Plain + [ Image + ( "" , [] , [] ) [ Str "Caption" ] ( "image.png" , "" ) + ] + ] +] +``` + +``` +% pandoc -f native -t markdown +[ Figure + ( "" , [] , [] ) + (Caption + Nothing [ Plain [ Str "Caption" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [ Str "my", Space, Str "alt" ] ( "image.png" , "" ) + ] + ] +] +^D +![Caption](image.png){alt="my alt"} +``` + +Ignore `\pandocbounded`: +``` +% pandoc -f latex -t native +\begin{figure} +\centering +\pandocbounded{\includegraphics[keepaspectratio,alt={Caption}]{image.png}} +\caption{Caption} +\end{figure} +^D +[ Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "Caption" ] ]) + [ Para + [ Image + ( "" , [] , [] ) [ Str "Caption" ] ( "image.png" , "" ) + ] + ] +] +``` diff --git a/test/command/11150.md b/test/command/11150.md new file mode 100644 --- /dev/null +++ b/test/command/11150.md @@ -0,0 +1,29 @@ +``` +% pandoc -f rst +=== ===== +int float +=== ===== +10 9.90 +-10 9.90 +=== ===== +^D + + + + + + + + + + + + + + + + + +
    intfloat
    109.90
    -109.90
    + +``` diff --git a/test/command/11162.md b/test/command/11162.md new file mode 100644 --- /dev/null +++ b/test/command/11162.md @@ -0,0 +1,19 @@ +``` +% pandoc -f native -t rst +[ BulletList + [ [ Plain [ Str "list" ] + , CodeBlock ( "" , [ "ruby" ] , [] ) "code = 7 # comment" + ] + , [ Plain [ Str "second" , Space , Str "item" ] ] + ] +] +^D +- list + + .. code:: ruby + + code = 7 # comment + +- second item + +``` diff --git a/test/command/11188.md b/test/command/11188.md new file mode 100644 --- /dev/null +++ b/test/command/11188.md @@ -0,0 +1,80 @@ +Parsing PARAMETERS of Org-mode blocks + +``` +% pandoc -f org --to=native +#+attr_html: :width 10px +#+BEGIN_myex :this that +huhu +#+END_myex +^D +[ Div + ( "" + , [ "myex" ] + , [ ( "width" , "10px" ) , ( "this" , "that" ) ] + ) + [ Para [ Str "huhu" ] ] +] +``` + +Python-style parameters are accepted, too. + +``` +% pandoc -f org --to=native +#+BEGIN_myblock width=10px +[[image.svg][logo]] +#+END_myblock +^D +[ Div + ( "" , [ "myblock" ] , [ ( "width" , "10px" ) ] ) + [ Para + [ Span + ( "" + , [ "spurious-link" ] + , [ ( "target" , "image.svg" ) ] + ) + [ Emph [ Str "logo" ] ] + ] + ] +] +``` + +The fallback is to put the remainder of the line into a `parameters` +attribute. + +``` +% pandoc -f org --to=native +#+BEGIN_myblock these are parameters in an unsupported format +/OK/ +#+END_myblock +^D +[ Div + ( "" + , [ "myblock" ] + , [ ( "parameters" + , "these are parameters in an unsupported format" + ) + ] + ) + [ Para [ Emph [ Str "OK" ] ] ] +] +``` + +Also works on dynamic blocks. + +``` +% pandoc -f org --to=markdown +#+BEGIN: clocktable :scope subtree :maxlevel 3 +#+CAPTION: Clock summary at [2025-10-18 Sat 17:23] +| Headline | Time | +|--------------+--------| +| *Total time* | *0:00* | +#+END: +^D +::: {.clocktable scope="subtree" maxlevel="3"} + Headline Time + ---------------- ---------- + **Total time** **0:00** + + : Clock summary at \[2025-10-18 Sat 17:23\] +::: +``` diff --git a/test/command/11210.md b/test/command/11210.md new file mode 100644 --- /dev/null +++ b/test/command/11210.md @@ -0,0 +1,13 @@ +``` +% pandoc -t typst -f man +.PP +.IR login (1) +.PP +and a regular (paren) that should not be escaped. +^D +#emph[login]\(1) + +and a regular (paren) that should not be escaped. + +``` + diff --git a/test/command/11211.md b/test/command/11211.md new file mode 100644 --- /dev/null +++ b/test/command/11211.md @@ -0,0 +1,16 @@ +``` +% pandoc -f rtf -t native +{\field{\*\fldinst{\rtlch\ab0\ai0\af2\alang1025\afs22\ltrch\b0\i0\fs22\lang1033\langnp1033\langfe1033\langfenp1033 +\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1 HYPERLINK "https://example.com"}{\*\datafield 08d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b28000000680074007400700073003a002f002f006500780061006d0070006c0065002e0063006f006d000000}} +{\fldrslt{\rtlch\ab0\ai0\af2\alang1025\afs22\ltrch\b0\i0\fs22\lang1033\langnp1033\langfe1033\langfenp1033\loch\af2\dbch\af2\hich\f2\strike0\ul\cf2 link}}} +^D +[ Para + [ Underline + [ Link + ( "" , [] , [] ) + [ Str "link" ] + ( "https://example.com" , "" ) + ] + ] +] +``` diff --git a/test/command/11253.md b/test/command/11253.md new file mode 100644 --- /dev/null +++ b/test/command/11253.md @@ -0,0 +1,27 @@ +``` +% pandoc -f markdown -t native +\ifstrequal{hello}{hello}{TRUE}{FALSE} +\ifstrequal{hello}{world}{TRUE}{FALSE} +^D +[ Para + [ RawInline (Format "tex") "TRUE" + , SoftBreak + , RawInline (Format "tex") "FALSE" + ] +] +``` + +``` +% pandoc -f markdown-latex_macros -t native +\ifstrequal{hello}{hello}{TRUE}{FALSE} +\ifstrequal{hello}{world}{TRUE}{FALSE} +^D +[ Para + [ RawInline + (Format "tex") "\\ifstrequal{hello}{hello}{TRUE}{FALSE}" + , SoftBreak + , RawInline + (Format "tex") "\\ifstrequal{hello}{world}{TRUE}{FALSE}" + ] +] +``` diff --git a/test/command/1126.md b/test/command/1126.md new file mode 100644 --- /dev/null +++ b/test/command/1126.md @@ -0,0 +1,28 @@ +``` +% pandoc -f html -t latex +\begin{eqnarray} +A&=&B,\\ +C&=&D +\end{eqnarray} +^D +\textbackslash begin\{eqnarray\} A\&=\&B,\textbackslash\textbackslash{} +C\&=\&D \textbackslash end\{eqnarray\} +``` + +``` +% pandoc -f html+raw_tex -t latex +

    See \eqref{myeq}.

    +\begin{eqnarray} +A&=&B,\\ +C&=&D +\\label{myeq} +\end{eqnarray} +^D +See \eqref{myeq}. + +\begin{eqnarray} +A&=&B,\\ +C&=&D +\\label{myeq} +\end{eqnarray} +``` diff --git a/test/command/11266.md b/test/command/11266.md new file mode 100644 --- /dev/null +++ b/test/command/11266.md @@ -0,0 +1,19 @@ +``` +% pandoc -t latex +$$ +\begin{eqnarray} +S &\rightarrow& a A \nonumber \\ +A &\rightarrow& d B \ | \ b A \ | \ c A \nonumber \\ +B &\rightarrow& a c \ | \ b C \ | \ c A \nonumber \\ +C &\rightarrow& \epsilon \nonumber +\end{eqnarray} +$$ +^D + +\begin{eqnarray} +S &\rightarrow& a A \nonumber \\ +A &\rightarrow& d B \ | \ b A \ | \ c A \nonumber \\ +B &\rightarrow& a c \ | \ b C \ | \ c A \nonumber \\ +C &\rightarrow& \epsilon \nonumber +\end{eqnarray} +``` diff --git a/test/command/11270.md b/test/command/11270.md new file mode 100644 --- /dev/null +++ b/test/command/11270.md @@ -0,0 +1,25 @@ +``` +% pandoc -f markdown -t native -s +--- +header-includes: | + \makeatletter + \beamer@ignorenonframefalse + \makeatother +... + +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "header-includes" + , MetaBlocks + [ RawBlock + (Format "tex") + "\\makeatletter\n\\beamer@ignorenonframefalse\n\\makeatother" + ] + ) + ] + } + [] +``` diff --git a/test/command/11299.md b/test/command/11299.md new file mode 100644 --- /dev/null +++ b/test/command/11299.md @@ -0,0 +1,28 @@ +``` +% pandoc -f mediawiki -t native + + +x + +x + +x + +This is ''highlighted'' +^D +[ Para [ Str "" ] +, Para [ Code ( "" , [ "sample" ] , [] ) "x" ] +, Para [ Span ( "" , [ "kbd" ] , [] ) [ Str "x" ] ] +, Para [ Code ( "" , [ "variable" ] , [] ) "x" ] +, Para + [ Span + ( "" , [ "mark" ] , [] ) + [ Str "This" + , Space + , Str "is" + , Space + , Emph [ Str "highlighted" ] + ] + ] +] +``` diff --git a/test/command/11300.md b/test/command/11300.md new file mode 100644 --- /dev/null +++ b/test/command/11300.md @@ -0,0 +1,67 @@ +``` +% pandoc -f docbook -t native -s + + + + Book title + Book subtitle + + + + Chapter title + + My sentence + + +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "subtitle" + , MetaInlines [ Str "Book" , Space , Str "subtitle" ] + ) + , ( "title" + , MetaInlines [ Str "Book" , Space , Str "title" ] + ) + ] + } + [ Header + 1 ( "" , [] , [] ) [ Str "Chapter" , Space , Str "title" ] + , Para [ Str "My" , Space , Str "sentence" ] + ] +``` + +``` +% pandoc -f docbook -t native -s + + + + + Chapter title + + My sentence + + + Book title + Book subtitle + + +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "subtitle" + , MetaInlines [ Str "Book" , Space , Str "subtitle" ] + ) + , ( "title" + , MetaInlines [ Str "Book" , Space , Str "title" ] + ) + ] + } + [ Header + 1 ( "" , [] , [] ) [ Str "Chapter" , Space , Str "title" ] + , Para [ Str "My" , Space , Str "sentence" ] + ] +``` diff --git a/test/command/11309.md b/test/command/11309.md new file mode 100644 --- /dev/null +++ b/test/command/11309.md @@ -0,0 +1,6 @@ +``` +% pandoc -f rst -t native +Cho\ **co**\ late +^D +[ Para [ Str "Cho" , Strong [ Str "co" ] , Str "late" ] ] +``` diff --git a/test/command/11312.md b/test/command/11312.md new file mode 100644 --- /dev/null +++ b/test/command/11312.md @@ -0,0 +1,21 @@ +``` +% pandoc -f mediawiki -t texinfo +foofoo + + bar + baz + +foofoo +^D +@node Top +@top Top + +foofoo + +@example +bar +baz +@end example + +foofoo +``` diff --git a/test/command/11323.md b/test/command/11323.md new file mode 100644 --- /dev/null +++ b/test/command/11323.md @@ -0,0 +1,12 @@ +``` +% pandoc -f rst +foo- + bar +^D +
    +
    foo-
    +
    +

    bar

    +
    +
    +``` diff --git a/test/command/11341.md b/test/command/11341.md new file mode 100644 --- /dev/null +++ b/test/command/11341.md @@ -0,0 +1,9 @@ +``` +% pandoc -t commonmark -f html +

    The Hobbit
    or
    There and Back Again

    +^D +The Hobbit\ +or\ +There and Back Again +==================== +``` diff --git a/test/command/11342.md b/test/command/11342.md new file mode 100644 --- /dev/null +++ b/test/command/11342.md @@ -0,0 +1,33 @@ +Subfigures should be converted to *fig-group* elements. + +``` +% pandoc -f latex -t jats +\begin{figure}[H] + \begin{subfigure} + \centering + \includegraphics[height=1.5in]{assets/A.png} + \caption{Graph for function *A*.} + \label{fig:A} + \end{subfigure} + \begin{subfigure} + \centering + \includegraphics[height=1.5in]{assets/B.png} + \caption{Graph for function *B*.} + \label{fig:B} + \end{subfigure} + \label{fig:graphs} + \caption{Function graphs.} +\end{figure} +^D + +

    Function graphs.

    + +

    Graph for function *A*.

    + +     + +

    Graph for function *B*.

    + +     +     +``` diff --git a/test/command/11348.md b/test/command/11348.md new file mode 100644 --- /dev/null +++ b/test/command/11348.md @@ -0,0 +1,61 @@ +``` +% pandoc -f markdown -t native +$ invalid opening inline math$ + +$ +invalid opening inline math$ + +$invalid closing inline math $ + +$invalid closing inline math +$ + +$valid inline math$ +^D +[ Para + [ Str "$" + , Space + , Str "invalid" + , Space + , Str "opening" + , Space + , Str "inline" + , Space + , Str "math$" + ] +, Para + [ Str "$" + , SoftBreak + , Str "invalid" + , Space + , Str "opening" + , Space + , Str "inline" + , Space + , Str "math$" + ] +, Para + [ Str "$invalid" + , Space + , Str "closing" + , Space + , Str "inline" + , Space + , Str "math" + , Space + , Str "$" + ] +, Para + [ Str "$invalid" + , Space + , Str "closing" + , Space + , Str "inline" + , Space + , Str "math" + , SoftBreak + , Str "$" + ] +, Para [ Math InlineMath "valid inline math" ] +] +``` diff --git a/test/command/11362.md b/test/command/11362.md new file mode 100644 --- /dev/null +++ b/test/command/11362.md @@ -0,0 +1,17 @@ +``` +% pandoc -f markdown -t asciidoc +This is a _test_[^1]. + +And yet another **one**[^1]. + +We can also try to write #hashtags [this]{.test}. + +[^1]: Test footnote. +^D +This is a __test__footnote:[Test footnote.]. + +And yet another **one**footnote:[Test footnote.]. + +We can also try to write ++#++hashtags [.test]#this#. + +``` diff --git a/test/command/11364.md b/test/command/11364.md new file mode 100644 --- /dev/null +++ b/test/command/11364.md @@ -0,0 +1,75 @@ +``` +% pandoc -f rtf -t native +{\rtf1\ansi\deff3\adeflang1025 +{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f4\fnil\fprq0\fcharset2 OpenSymbol{\*\falt Arial Unicode MS};}{\f5\fswiss\fprq2\fcharset0 Liberation Sans{\*\falt Arial};}{\f6\fnil\fprq2\fcharset0 Noto Sans CJK SC;}{\f7\fnil\fprq2\fcharset0 Matangi Light;}{\f8\fnil\fprq0\fcharset128 Matangi Light;}{\f9\fnil\fprq0\fcharset128 OpenSymbol{\*\falt Arial Unicode MS};}} +{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;} +{\stylesheet{\s0\snext0\widctlpar\hyphpar0\ltrpar\kerning1\cf0\rtlch\af7\afs24\alang1081\ltrch\hich\af3\afs24\alang1033\dbch\af10\langfe2052\loch\f3\fs24\lang1033 Normal;} +{\*\cs15\snext15\rtlch\af4\ltrch\hich\af4\dbch\af4\loch\f4 Bullets;} +{\s16\sbasedon0\snext17\sb240\sa120\keepn\rtlch\af7\afs28\ltrch\hich\af5\afs28\dbch\af6\loch\f5\fs28 Heading;} +{\s17\sbasedon0\snext17\sl276\slmult1\sb0\sa140 Body Text;} +{\s18\sbasedon17\snext18\rtlch\af8\ltrch List;} +{\s19\sbasedon0\snext19\sb120\sa120\noline\rtlch\af8\afs24\ai\ltrch\fs24\i caption;} +{\s20\sbasedon0\snext20\noline\rtlch\af8\ltrch Index;} +{\s21\sbasedon0\snext21\nowidctlpar\noline Table Contents;} +}{\*\listtable{\list\listtemplateid1 +{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f9\rtlch\af4\ltrch\fi-360\li720} +{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9702 ?;}{\levelnumbers;}\f9\rtlch\af4\ltrch\fi-360\li1080} +{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9642 ?;}{\levelnumbers;}\f9\rtlch\af4\ltrch\fi-360\li1440} +{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f9\rtlch\af4\ltrch\fi-360\li1800} +{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9702 ?;}{\levelnumbers;}\f9\rtlch\af4\ltrch\fi-360\li2160} +{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9642 ?;}{\levelnumbers;}\f9\rtlch\af4\ltrch\fi-360\li2520} +{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f9\rtlch\af4\ltrch\fi-360\li2880} +{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9702 ?;}{\levelnumbers;}\f9\rtlch\af4\ltrch\fi-360\li3240} +{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9642 ?;}{\levelnumbers;}\f9\rtlch\af4\ltrch\fi-360\li3600}\listid1} +{\list\listtemplateid2 +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0} +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0} +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0} +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0} +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0} +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0} +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0} +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0} +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}\listid2} +}{\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}{\*\generator LibreOffice/25.8.4.2$Linux_X86_64 LibreOffice_project/580$Build-2}{\info{\creatim\yr2025\mo12\dy28\hr10\min51}{\revtim\yr2025\mo12\dy28\hr10\min53}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab709 +\hyphauto1\viewscale140\formshade\nobrkwrptbl\paperh15840\paperw12240\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sftnnar\saftnnrlc\sectunlocked1\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\fet\aftnrstcont\aftnstart1\aftnnrlc +{\*\ftnsep\chftnsep}\pgndec\pard\plain \s0\widctlpar\hyphpar0\ltrpar\kerning1\cf0\rtlch\af7\afs24\alang1081\ltrch\hich\af3\afs24\alang1033\dbch\af10\langfe2052\loch\f3\fs24\lang1033{\listtext\pard\plain \rtlch\af4\ltrch\hich\af4\dbch\af4\loch\f4 \u8226\'95\tab}\ilvl0\ls1 \fi-360\li720\lin720\ql\ltrpar{ +List item} +\par \trowd\trql\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw10\brdrcf1\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw10\brdrcf1\clpadft3\clpadt55\clbrdrb\brdrs\brdrw10\brdrcf1\clpadfb3\clpadb55\clpadfr3\clpadr55\cellx4986\clbrdrt\brdrs\brdrw10\brdrcf1\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw10\brdrcf1\clpadft3\clpadt55\clbrdrb\brdrs\brdrw10\brdrcf1\clpadfb3\clpadb55\clbrdrr\brdrs\brdrw10\brdrcf1\clpadfr3\clpadr55\cellx9972\pard\plain \s21\nowidctlpar\noline\intbl\ql\ltrpar{ +A}\cell\pard\plain \s21\nowidctlpar\noline\intbl\ql\ltrpar{ +B}\cell\row\pard \pard\plain \s0\widctlpar\hyphpar0\ltrpar\kerning1\cf0\rtlch\af7\afs24\alang1081\ltrch\hich\af3\afs24\alang1033\dbch\af10\langfe2052\loch\f3\fs24\lang1033\ql\ltrpar +\par } +^D +[ BulletList + [ [ Para [ Str "List" , Space , Str "item" ] ] ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "A" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "B" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/11374.md b/test/command/11374.md new file mode 100644 --- /dev/null +++ b/test/command/11374.md @@ -0,0 +1,6 @@ +``` +% pandoc -f native -t asciidoc +[ Para [ SmallCaps [ Str "foo" ] ] ] +^D +[smallcaps]#foo# +``` diff --git a/test/command/11384.md b/test/command/11384.md new file mode 100644 --- /dev/null +++ b/test/command/11384.md @@ -0,0 +1,17 @@ +``` +% pandoc -t markdown -f native +[ Para [ Math DisplayMath "\ne = mc^2\n" ] ] +^D +$$ +e = mc^2 +$$ +``` + +But we need to collapse spaces around inline math: + +``` +% pandoc -t markdown -f native +[ Para [ Math InlineMath "\ne=mc\n" ]] +^D +$e=mc$ +``` diff --git a/test/command/11409.md b/test/command/11409.md new file mode 100644 --- /dev/null +++ b/test/command/11409.md @@ -0,0 +1,11 @@ +``` +% pandoc -t native +text^[sup]{.class}^ +^D +[ Para + [ Str "text" + , Superscript + [ Span ( "" , [ "class" ] , [] ) [ Str "sup" ] ] + ] +] +``` diff --git a/test/command/11420.md b/test/command/11420.md new file mode 100644 --- /dev/null +++ b/test/command/11420.md @@ -0,0 +1,15 @@ +```` +% pandoc -t revealjs --syntax-highlighting=idiomatic +# Slide + +```python +def hello(): + print("Hello") +``` +^D +
    +

    Slide

    +
    def hello():
+    print("Hello")
    +
    +```` diff --git a/test/command/11422.md b/test/command/11422.md new file mode 100644 --- /dev/null +++ b/test/command/11422.md @@ -0,0 +1,12 @@ +``` +% pandoc -f docbook -t markdown + + + Example without a title. + + +^D +::: example +Example without a title. +::: +``` diff --git a/test/command/11450.md b/test/command/11450.md new file mode 100644 --- /dev/null +++ b/test/command/11450.md @@ -0,0 +1,62 @@ +Test for \footnotemark and \footnotetext (issue #11450) + +``` +% pandoc -f latex -t native +Text\footnotemark{}. +\footnotetext{The footnote content.} +^D +[ Para + [ Str "Text" + , Note + [ Para + [ Str "The" + , Space + , Str "footnote" + , Space + , Str "content." + ] + ] + , Str "." + ] +] +``` + +With explicit footnote numbers: + +``` +% pandoc -f latex -t native +First\footnotemark[1] and second\footnotemark[2]. +\footnotetext[1]{First note.} +\footnotetext[2]{Second note.} +^D +[ Para + [ Str "First" + , Note [ Para [ Str "First" , Space , Str "note." ] ] + , Space + , Str "and" + , Space + , Str "second" + , Note [ Para [ Str "Second" , Space , Str "note." ] ] + , Str "." + ] +] +``` + +Mixed with regular footnotes: + +``` +% pandoc -f latex -t native +Text\footnotemark[1] and more\footnote{Regular footnote.} +\footnotetext[1]{Marked footnote.} +^D +[ Para + [ Str "Text" + , Note [ Para [ Str "Marked" , Space , Str "footnote." ] ] + , Space + , Str "and" + , Space + , Str "more" + , Note [ Para [ Str "Regular" , Space , Str "footnote." ] ] + ] +] +``` diff --git a/test/command/11455.md b/test/command/11455.md new file mode 100644 --- /dev/null +++ b/test/command/11455.md @@ -0,0 +1,26 @@ +``` +% pandoc -f textile -t html +| foo | bar | +| table +* item 1 +* item 2 +* item 3 | xxx | +^D + + + + + + + + + + + +
    foobar

    table

    +
      +
    • item 1
      • +
    • item 2
      • +
    • item 3
      • +
    		xxx
    +``` diff --git a/test/command/11463.md b/test/command/11463.md new file mode 100644 --- /dev/null +++ b/test/command/11463.md @@ -0,0 +1,13 @@ +``` +% pandoc -t typst +'hi' and \' +^D +'hi' and \' +``` + +``` +% pandoc -f markdown -t typst | pandoc -f typst -t markdown +"hi" \" 'hi' and \' +^D +"hi" \" 'hi' and \' +``` diff --git a/test/command/11479.md b/test/command/11479.md new file mode 100644 --- /dev/null +++ b/test/command/11479.md @@ -0,0 +1,31 @@ +``` +% pandoc -f docbook -t gfm + + + +Test. + + +Test 2. + + + +^D +> [!IMPORTANT] +> - Test. +> +> - Test 2. +``` + +``` +% pandoc -f gfm -t gfm +> [!IMPORTANT] +> - Test. +> +> - Test 2. +^D +> [!IMPORTANT] +> - Test. +> +> - Test 2. +``` diff --git a/test/command/11486.md b/test/command/11486.md new file mode 100644 --- /dev/null +++ b/test/command/11486.md @@ -0,0 +1,82 @@ +``` +% pandoc -t revealjs --template=command/11486/scroll.revealjs +--- +view: scroll +--- +^D + scrollActivationWidth: 0, + scrollSnap: 'mandatory', + scrollProgress: 'auto', +``` + +``` +% pandoc -t revealjs --template=command/11486/scroll.revealjs +--- +view: scroll +scrollSnap: false +--- +^D + scrollActivationWidth: 0, + scrollSnap: false, + scrollProgress: 'auto', +``` + +``` +% pandoc -t revealjs --template=command/11486/scroll.revealjs +--- +view: scroll +scrollSnap: proximity +--- +^D + scrollActivationWidth: 0, + scrollSnap: 'proximity', + scrollProgress: 'auto', +``` + +``` +% pandoc -t revealjs --template=command/11486/scroll.revealjs +--- +view: scroll +scrollActivationWidth: 500 +--- +^D + scrollActivationWidth: 500, + scrollSnap: 'mandatory', + scrollProgress: 'auto', +``` + +``` +% pandoc -t revealjs --template=command/11486/scroll.revealjs +--- +view: scroll +scrollProgress: true +--- +^D + scrollActivationWidth: 0, + scrollSnap: 'mandatory', + scrollProgress: true, +``` + +``` +% pandoc -t revealjs --template=command/11486/scroll.revealjs +--- +view: scroll +scrollProgress: false +--- +^D + scrollActivationWidth: 0, + scrollSnap: 'mandatory', + scrollProgress: false, +``` + +``` +% pandoc -t revealjs --template=command/11486/scroll.revealjs +--- +view: scroll +scrollProgress: auto +--- +^D + scrollActivationWidth: 0, + scrollSnap: 'mandatory', + scrollProgress: 'auto', +``` diff --git a/test/command/11486/scroll.revealjs b/test/command/11486/scroll.revealjs new file mode 100644 --- /dev/null +++ b/test/command/11486/scroll.revealjs @@ -0,0 +1,15 @@ +$if(view)$ + scrollActivationWidth: $scrollActivationWidth$, +$if(scrollSnap)$ + scrollSnap: '$scrollSnap/nowrap$', +$else$ + scrollSnap: false, +$endif$ +$if(scrollProgressAuto)$ + scrollProgress: 'auto', +$elseif(scrollProgress)$ + scrollProgress: $scrollProgress$, +$else$ + scrollProgress: false, +$endif$ +$endif$ diff --git a/test/command/11490.md b/test/command/11490.md new file mode 100644 --- /dev/null +++ b/test/command/11490.md @@ -0,0 +1,13 @@ +``` +% pandoc -t markdown +<&lt; +^D +\<\< +``` + +``` +% pandoc -t markdown +&#xa0; +^D +\  +``` diff --git a/test/command/11494.md b/test/command/11494.md new file mode 100644 --- /dev/null +++ b/test/command/11494.md @@ -0,0 +1,73 @@ +External images should not use [[File:...]] syntax. + +Inline external image: +``` +% pandoc -f native -t mediawiki +[Para [Image ("",[],[]) [] ("https://example.org/image.png", "")]] +^D +https://example.org/image.png +``` + +Inline local image (should still use [[File:]]): +``` +% pandoc -f native -t mediawiki +[Para [Image ("",[],[]) [] ("local.png", "")]] +^D +[[File:local.png]] +``` + +Figure with external image (from markdown): +``` +% pandoc -f markdown -t mediawiki +![](https://example.org/figure.png) +^D +https://example.org/figure.png +``` + +Local image (from markdown, no caption): +``` +% pandoc -f markdown -t mediawiki +![](local.png) +^D +[[File:local.png]] +``` + +Figure with caption and external image: +``` +% pandoc -f markdown -t mediawiki +![Caption](https://example.org/figure.png) +^D +
    +https://example.org/figure.png +
    +``` + +Figure with caption and local image: +``` +% pandoc -f markdown -t mediawiki +![Caption](local.png) +^D +
    +[[File:local.png|Caption]] +
    +``` + +SimpleFigure with external image (native format with fig: title): +``` +% pandoc -f native -t mediawiki +[Figure ("",[],[]) (Caption Nothing []) [Para [Image ("",[],[]) [Str "caption"] ("https://example.org/figure.png", "fig:")]]] +^D +
    +https://example.org/figure.png +
    +``` + +SimpleFigure with local image (native format with fig: title): +``` +% pandoc -f native -t mediawiki +[Figure ("",[],[]) (Caption Nothing []) [Para [Image ("",[],[]) [Str "caption"] ("local.png", "fig:")]]] +^D +
    +[[File:local.png|thumb|none|alt=caption|caption]] +
    +``` diff --git a/test/command/11498.md b/test/command/11498.md new file mode 100644 --- /dev/null +++ b/test/command/11498.md @@ -0,0 +1,121 @@ +``` +% pandoc -f markdown -t icml +![](command/11498.png){object-style="myStyle"} +^D + + + + + + + + + + + + + + + + + + + $ID/Embedded + + + + + + + + +``` +``` +% pandoc -s -f markdown -t icml +![](command/11498.png){object-style="myStyle"} +^D + + + + + + + + + $ID/NormalCharacterStyle + + + + + + + + + LeftAlign + . + + 10 + + + + + + + $ID/NormalParagraphStyle + + + + + + + + + + + + + $ID/None + + + + + + + + + + + + + + + + + + + + + + + + + + $ID/Embedded + + + + + + + + + + + + +``` diff --git a/test/command/11498.png b/test/command/11498.png new file mode 100644 Binary files /dev/null and b/test/command/11498.png differ diff --git a/test/command/11511.md b/test/command/11511.md new file mode 100644 --- /dev/null +++ b/test/command/11511.md @@ -0,0 +1,6 @@ +``` +% pandoc -f html -t typst +

    torch.utils.data.Dataset

    +^D +#link("http://torch.utils.data")[torch.utils.data]\.Dataset +``` diff --git a/test/command/11534.md b/test/command/11534.md new file mode 100644 --- /dev/null +++ b/test/command/11534.md @@ -0,0 +1,42 @@ +``` +% pandoc -f markdown+lists_without_preceding_blankline+alerts -t native +:::: caution +::: title +Caution +::: + +Foo bar, wuppie fluppie! +:::: +^D +[ Div + ( "" , [ "caution" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Caution" ] ] + , Para + [ Str "Foo" + , Space + , Str "bar," + , Space + , Str "wuppie" + , Space + , Str "fluppie!" + ] + ] +] +``` + +``` +% pandoc -f markdown+lists_without_preceding_blankline -t native +hello +- a +- b +c +^D +[ Para [ Str "hello" ] +, BulletList + [ [ Plain [ Str "a" ] ] + , [ Plain [ Str "b" , SoftBreak , Str "c" ] ] + ] +] + +``` + diff --git a/test/command/11542.md b/test/command/11542.md new file mode 100644 --- /dev/null +++ b/test/command/11542.md @@ -0,0 +1,47 @@ +``` +% pandoc -f native -t markdown +[ DefinitionList + [ ( [ Str "Input" ] + , [ [ CodeBlock ( "" , [] , [] ) "Term\n\n : Def" ] ] + ) + ] +] +^D +Input + +: Term + + : Def +``` + +``` +% pandoc -f markdown -t native +Input + +: Term + + : Def +^D +[ DefinitionList + [ ( [ Str "Input" ] + , [ [ CodeBlock ( "" , [] , [] ) "Term\n\n : Def" ] ] + ) + ] +] +``` + +``` +% pandoc -f native -t markdown+four_space_rule +[ DefinitionList + [ ( [ Str "Input" ] + , [ [ CodeBlock ( "" , [] , [] ) "Term\n\n : Def" ] ] + ) + ] +] +^D +Input + +: Term + + : Def +``` diff --git a/test/command/11562.md b/test/command/11562.md new file mode 100644 --- /dev/null +++ b/test/command/11562.md @@ -0,0 +1,10 @@ +``` +% pandoc -t mediawiki +[example](https://example.com/#/#room) + +[example](https://example.com/##) +^D +[https://example.com/#/#room example] + +[https://example.com/## example] +``` diff --git a/test/command/11571.md b/test/command/11571.md new file mode 100644 --- /dev/null +++ b/test/command/11571.md @@ -0,0 +1,18 @@ +``` +% pandoc -t markdown +::: +A +::: +^D +\::: A \::: +``` + +``` +% pandoc -t commonmark+fenced_divs +::: +A +::: +^D +\::: A \::: +``` + diff --git a/test/command/11583.md b/test/command/11583.md new file mode 100644 --- /dev/null +++ b/test/command/11583.md @@ -0,0 +1,16 @@ +``` +% pandoc -t typst +::: {lang=en} +1. item +2. item +3. item +::: +^D +#block[ +#set text(lang: "en"); ++ item ++ item ++ item + +] +``` diff --git a/test/command/11588.md b/test/command/11588.md new file mode 100644 --- /dev/null +++ b/test/command/11588.md @@ -0,0 +1,10 @@ +``` +% pandoc --typst-input foo=FOO --typst-input bar="bar bim" -f typst -t plain +#sys.inputs.at("foo"); + +#sys.inputs.at("bar"); +^D +FOO + +bar bim +``` diff --git a/test/command/11589.md b/test/command/11589.md new file mode 100644 --- /dev/null +++ b/test/command/11589.md @@ -0,0 +1,20 @@ +``` +% pandoc -f markdown -t native +t^[a]{.cb}\ b^ +t^[a]{fg=yellow bg=blue}\ b^ +^D +[ Para + [ Str "t" + , Superscript + [ Span ( "" , [ "cb" ] , [] ) [ Str "a" ] , Str "\160b" ] + , SoftBreak + , Str "t" + , Superscript + [ Span + ( "" , [] , [ ( "fg" , "yellow" ) , ( "bg" , "blue" ) ] ) + [ Str "a" ] + , Str "\160b" + ] + ] +] +``` diff --git a/test/command/11598.md b/test/command/11598.md new file mode 100644 --- /dev/null +++ b/test/command/11598.md @@ -0,0 +1,16 @@ +``` +% pandoc -f typst --wrap=none +#rotate(90deg, figure( + [body text here inside rotate], + caption: "Figure 1: How a caption gets lost when rotating", + supplement: none, +)) +^D +
    +
    +

    body text here inside rotate

    +

    Figure 1: How a caption gets lost when rotating

    +
    +
    + +``` diff --git a/test/command/11604.md b/test/command/11604.md new file mode 100644 --- /dev/null +++ b/test/command/11604.md @@ -0,0 +1,22 @@ +``` +% pandoc -f latex -t typst +\begin{table} + \caption{Caption}\label{tab} + \begin{tabular}{cc} + a & b \\ c & d + \end{tabular} +\end{table} +^D +#figure( + align(center)[#table( + columns: 2, + align: (center,center,), + [a], [b], + [c], [d], + )] + , caption: [Caption] + , kind: table + ) + + +``` diff --git a/test/command/11608.md b/test/command/11608.md new file mode 100644 --- /dev/null +++ b/test/command/11608.md @@ -0,0 +1,54 @@ +``` +% pandoc -f latex -t plain +\documentclass[english]{article} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{amsthm} +\theoremstyle{plain} +\newtheorem{thm}{\protect\theoremname} +\newtheorem{prop}[thm]{\protect\propositionname} +\usepackage{babel} +\providecommand{\propositionname}{Proposition} +\providecommand{\theoremname}{Theorem} + +\begin{document} +\begin{thm} +first theorem +\end{thm} +\begin{prop} +first proposition +\end{prop} + +\end{document} +
    +

    Theorem 1. first theorem

    +
    +
    +

    Proposition 2. first proposition

    +
    +jgm@Johns-MacBook-Air:~/src/pandoc % `make binpath` -f latex -t plain +\documentclass[english]{article} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage{amsthm} +\theoremstyle{plain} +\newtheorem{thm}{\protect\theoremname} +\newtheorem{prop}[thm]{\protect\propositionname} +\usepackage{babel} +\providecommand{\propositionname}{Proposition} +\providecommand{\theoremname}{Theorem} + +\begin{document} +\begin{thm} +first theorem +\end{thm} +\begin{prop} +first proposition +\end{prop} + +\end{document} +^D +Theorem 1. first theorem + +Proposition 2. first proposition +``` diff --git a/test/command/11635.md b/test/command/11635.md new file mode 100644 --- /dev/null +++ b/test/command/11635.md @@ -0,0 +1,28 @@ +``` +% pandoc -f man -t html +.TH "TEST" "1" "2026-05-08" "test v1.0.0" "test manual" +.SH HEADING +.TS +tab(;); +l l. +this is a table element \ +written in two lines;abcdefg +another \ +one;123456 +.TE +^D +

    HEADING

    + + + + + + + + + + + +
    this is a table element written in two +linesabcdefg
    another one123456
    +``` diff --git a/test/command/1166.md b/test/command/1166.md --- a/test/command/1166.md +++ b/test/command/1166.md @@ -17,28 +17,28 @@ ^D - + - + - - - + + + - - + + - + diff --git a/test/command/11664.md b/test/command/11664.md new file mode 100644 --- /dev/null +++ b/test/command/11664.md @@ -0,0 +1,35 @@ +``` +% pandoc -t markdown -f html +
    col 1 col 2
    1 Second column of row 1.

    2

    Second column of row 2. Second line of paragraph.

    2Second column of row 2. Second line of paragraph.

    3

    3
    • Second column of row 3.
    • Second item in bullet list (row 3, column 2).
    Row 4; column 1 will be empty.
    + + + + + + + + + + +
    +

    A

    B

    +     		+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do + eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut + enim ad minim veniam, quis nostrud exercitation ullamco laboris + nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor + in reprehenderit in voluptate velit esse cillum dolore eu fugiat + nulla pariatur. Excepteur sint occaecat cupidatat non proident, + sunt in culpa qui officia deserunt mollit anim id est laborum. +
    +^D ++---+------------------------------------------------------------------+ +| A | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do | +| | eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut | +| B | enim ad minim veniam, quis nostrud exercitation ullamco laboris | +| | nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor | +| | in reprehenderit in voluptate velit esse cillum dolore eu fugiat | +| | nulla pariatur. Excepteur sint occaecat cupidatat non proident, | +| | sunt in culpa qui officia deserunt mollit anim id est laborum. | ++---+------------------------------------------------------------------+ +``` diff --git a/test/command/11668.md b/test/command/11668.md new file mode 100644 --- /dev/null +++ b/test/command/11668.md @@ -0,0 +1,42 @@ +``` +% pandoc -f man -t html +TH "TEST" "1" "2026-05-25" "test v1.0.0" "test manual" +.SH HEADING +.TP 4 +This is the unindented tag. +This text, along with the table, should be indented. +.TS +tab(;); +l l. +aaa;bbb +ccc;ddd +.TE +This should still be indented, until some other macro is called to change it. +.PP +Like this. +^D +

    TH "TEST" "1" "2026-05-25" "test v1.0.0" "test manual"

    +

    HEADING

    +
    +
    This is the unindented tag.
    +
    +

    This text, along with the table, should be indented.

    + + + + + + + + + + + +
    aaabbb
    cccddd
    +

    This should still be indented, until some other macro is called to +change it.

    +
    +
    +

    Like this.

    + +``` diff --git a/test/command/11682.md b/test/command/11682.md new file mode 100644 --- /dev/null +++ b/test/command/11682.md @@ -0,0 +1,81 @@ +Cell paragraphs that use `\plain` after `\intbl`, together with a single +`\trowd` and `\row` row terminators, should produce a flat table rather +than deeply nested tables. + +``` +% pandoc -f rtf -t native +{\rtf1\ansi\deff0 +{\fonttbl{\f0 Times;}{\f1 Times;}{\f2 Times;}} +\trowd\trgaph60\trleft0 +\clvertalt\cellx3245 +\clvertalt\cellx6490 +\clvertalt\cellx9735 +\pard\intbl\s0\ql\plain\f0\fs20\plain\f2\fs22 A\plain\f1\fs22\cell +\pard\intbl\s0\ql\plain\f0\fs20\plain\f2\fs22 B\plain\f1\fs22\cell +\pard\intbl\s0\ql\plain\f0\fs20\plain\f2\fs22 C\plain\f1\fs22\cell +\intbl\row +\pard\intbl\s0\ql\plain\f0\fs20\plain\f2\fs22 1\plain\f1\fs22\cell +\pard\intbl\s0\ql\plain\f0\fs20\plain\f2\fs22 2\plain\f1\fs22\cell +\pard\intbl\s0\ql\plain\f0\fs20\plain\f2\fs22 3\plain\f1\fs22\cell +\intbl\row +} +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "A" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "B" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "C" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/1279.md b/test/command/1279.md --- a/test/command/1279.md +++ b/test/command/1279.md @@ -1,5 +1,5 @@ ``` -pandoc -s -t markdown +% pandoc -s -t markdown --- author: 'John Doe[^1]' date: 2014 @@ -9,7 +9,7 @@ [^1]: Dept. of This and That ^D --- -author: 'John Doe[^1]' +author: John Doe[^1] date: 2014 title: My Article --- diff --git a/test/command/1390.md b/test/command/1390.md --- a/test/command/1390.md +++ b/test/command/1390.md @@ -3,7 +3,13 @@ \newcommand\foo{+} Testing: $\mu\foo\eta$. ^D -[Para [Str "Testing:",Space,Math InlineMath "\\mu+\\eta",Str "."]] +[ Para + [ Str "Testing:" + , Space + , Math InlineMath "\\mu+\\eta" + , Str "." + ] +] ``` works! This fails? ^D diff --git a/test/command/4054.md b/test/command/4054.md --- a/test/command/4054.md +++ b/test/command/4054.md @@ -2,13 +2,20 @@ % pandoc -t native -s -M title=New % Old ^D -Pandoc (Meta {unMeta = fromList [("title",MetaString "New")]}) -[] +Pandoc + Meta + { unMeta = fromList [ ( "title" , MetaString "New" ) ] } + [] ``` ``` % pandoc -t native -s -M foo=1 -M foo=2 ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaList [MetaString "1",MetaString "2"])]}) -[] +Pandoc + Meta + { unMeta = + fromList + [ ( "foo" , MetaList [ MetaString "1" , MetaString "2" ] ) ] + } + [] ``` diff --git a/test/command/4056.md b/test/command/4056.md --- a/test/command/4056.md +++ b/test/command/4056.md @@ -5,7 +5,10 @@ \end{shaded} } ^D -[RawBlock (Format "latex") "\\parbox[t]{0.4\\textwidth}{\n\\begin{shaded}\n\\end{shaded}\n}"] +[ RawBlock + (Format "tex") + "\\parbox[t]{0.4\\textwidth}{\n\\begin{shaded}\n\\end{shaded}\n}" +] ``` ``` @@ -14,11 +17,41 @@ Blah & Foo & Bar \\ \end{tabular} ^D -[Table [] [AlignLeft,AlignRight,AlignRight] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Str "Blah"]] - ,[Plain [Str "Foo"]] - ,[Plain [Str "Bar"]]]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignRight , ColWidthDefault ) + , ( AlignRight , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Blah" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Foo" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Bar" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] ``` diff --git a/test/command/4063.md b/test/command/4063.md new file mode 100644 --- /dev/null +++ b/test/command/4063.md @@ -0,0 +1,44 @@ +``` +% pandoc -f html -t native + ++ + + + + + + +
    12
    +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.3 ) + , ( AlignDefault , ColWidth 0.7 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/4068.md b/test/command/4068.md --- a/test/command/4068.md +++ b/test/command/4068.md @@ -1,9 +1,33 @@ ``` -pandoc -f mediawiki -t native +% pandoc -f mediawiki -t native [https://domain.com/script.php?a=1&b=2&c=&d=4 open productname bugs] [http://domain.com?a=. open productname bugs] ^D -[Para [Link ("",[],[]) [Str "open",Space,Str "productname",Space,Str "bugs"] ("https://domain.com/script.php?a=1&b=2&c=&d=4","")] -,Para [Str "[",Link ("",[],[]) [Str "http://domain.com?a="] ("http://domain.com?a=",""),Str ".",Space,Str "open",Space,Str "productname",Space,Str "bugs]"]] +[ Para + [ Link + ( "" , [] , [] ) + [ Str "open" + , Space + , Str "productname" + , Space + , Str "bugs" + ] + ( "https://domain.com/script.php?a=1&b=2&c=&d=4" , "" ) + ] +, Para + [ Str "[" + , Link + ( "" , [] , [] ) + [ Str "http://domain.com?a=" ] + ( "http://domain.com?a=" , "" ) + , Str "." + , Space + , Str "open" + , Space + , Str "productname" + , Space + , Str "bugs]" + ] +] ``` diff --git a/test/command/4102.md b/test/command/4102.md new file mode 100644 --- /dev/null +++ b/test/command/4102.md @@ -0,0 +1,11 @@ +SmallCaps spans can have additional attributes. +``` +% pandoc -t latex -f markdown +[Populus]{.smallcaps lang=la} + +[Romanus]{.smallcaps} +^D +\foreignlanguage{latin}{\textsc{Populus}} + +\textsc{Romanus} +``` diff --git a/test/command/4119.md b/test/command/4119.md --- a/test/command/4119.md +++ b/test/command/4119.md @@ -1,5 +1,5 @@ ``` -pandoc -t native +% pandoc -t native | col1 | col2 | | ---- | ---- | | 1 | 2 | @@ -8,11 +8,56 @@ not a caption! :::::::::::::::: ^D -[Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[Plain [Str "col1"]] - ,[Plain [Str "col2"]]] - [[[Plain [Str "1"]] - ,[Plain [Str "2"]]]] -,Div ("",["notes"],[]) - [Para [Str "not",Space,Str "a",Space,Str "caption!"]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "col1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "col2" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Div + ( "" , [ "notes" ] , [] ) + [ Para + [ Str "not" , Space , Str "a" , Space , Str "caption!" ] + ] +] ``` diff --git a/test/command/4134.md b/test/command/4134.md --- a/test/command/4134.md +++ b/test/command/4134.md @@ -3,7 +3,7 @@ Hello.\ world. ^D -[Para [Str "Hello.\160world."]] +[ Para [ Str "Hello.\160world." ] ] ``` ``` @@ -11,7 +11,7 @@ Hello.\ world. ^D -[Para [Str "Hello.\160world."]] +[ Para [ Str "Hello.\160world." ] ] ``` ``` @@ -20,6 +20,5 @@ World. ^D -[Para [Str "Hello.\160"] -,Para [Str "World."]] +[ Para [ Str "Hello.\160" ] , Para [ Str "World." ] ] ``` diff --git a/test/command/4159.md b/test/command/4159.md --- a/test/command/4159.md +++ b/test/command/4159.md @@ -3,5 +3,7 @@ \newcommand{\gen}{a\ Gen\ b} abc ^D -[Para [Str "abc"]] +[ RawBlock (Format "tex") "\\newcommand{\\gen}{a\\ Gen\\ b}" +, Para [ Str "abc" ] +] ``` diff --git a/test/command/4162.md b/test/command/4162.md --- a/test/command/4162.md +++ b/test/command/4162.md @@ -3,8 +3,5 @@
    hi

     there
    ^D -[LineBlock - [[Str "hi"] - ,[] - ,[Str "\160there"]]] +[ LineBlock [ [ Str "hi" ] , [] , [ Str "\160there" ] ] ] ``` diff --git a/test/command/4164.md b/test/command/4164.md --- a/test/command/4164.md +++ b/test/command/4164.md @@ -2,19 +2,15 @@ % pandoc -f opml -t markdown test ^D -test -==== +# test -try ---- +## try Here is inline html: -
    - - bla bla - -
    +::: {} +``{=html} bla bla +::: ``` @@ -22,11 +18,9 @@ % pandoc -f opml-raw_html-native_divs -t markdown test ^D -test -==== +# test -try ---- +## try Here is inline html: diff --git a/test/command/4183.md b/test/command/4183.md --- a/test/command/4183.md +++ b/test/command/4183.md @@ -4,7 +4,13 @@ bar ^D -[Para [Image ("",[],[]) [] ("foo","fig:")]] +[ Figure + ( "" , [] , [] ) + (Caption Nothing []) + [ Plain + [ Image ( "" , [] , [] ) [ Str "bar" ] ( "foo" , "" ) ] + ] +] ``` ``` @@ -18,7 +24,14 @@ ^D -[Para [Image ("",[],[]) [Str "baz"] ("foo","fig:")]] +[ Figure + ( "" , [] , [] ) + (Caption + Nothing [ Div ( "" , [] , [] ) [ Plain [ Str "baz" ] ] ]) + [ Plain + [ Image ( "" , [] , [] ) [ Str "bar" ] ( "foo" , "" ) ] + ] +] ``` ``` @@ -28,5 +41,9 @@

    baz

    ^D -[Para [Image ("",[],[]) [Emph [Str "baz"]] ("foo","fig:")]] +[ Figure + ( "" , [] , [] ) + (Caption Nothing [ Para [ Emph [ Str "baz" ] ] ]) + [ Plain [ Image ( "" , [] , [] ) [] ( "foo" , "" ) ] ] +] ``` diff --git a/test/command/4186.md b/test/command/4186.md new file mode 100644 --- /dev/null +++ b/test/command/4186.md @@ -0,0 +1,64 @@ +``` +% pandoc -f org -t native +#+begin_example -i + This should retain the four leading spaces +#+end_example +^D +[ CodeBlock + ( "" , [] , [] ) + " This should retain the four leading spaces\n" +] +``` + +``` +% pandoc -f org -t html +- depth 1 + #+name: bob + #+begin_example -i + Vertical alignment is four spaces beyond the appearance of the word "depth". + #+end_example + - depth 2 + #+begin_example + Vertically aligned with the second appearance of the word "depth". + #+end_example + #+begin_example -i + Vertical alignment is four spaces beyond the second + appearance of the word "depth". + The "begin" portion is a component of + this deeper list element, so that guarantees + that the entire block must be a component of the + inner list element. + #+end_example + Still inside the inner list element + #+name: carrie + #+begin_example + This belongs to the outer list element, and is aligned accordingly, since the NAME attribute is not indented deeply enough. It is not enough for the BEGIN alone to be aligned deeply if the block is meant to have a NAME. + #+end_example + Still in the shallower list element since the preceding example + block forced the deeper list element to terminate. +Outside all lists. +^D +
      +

    • depth 1

      +
          Vertical alignment is four spaces beyond the appearance of the word "depth".
+
      +
        +

      • depth 2

        +
        Vertically aligned with the second appearance of the word "depth".
+
        +
            Vertical alignment is four spaces beyond the second
+    appearance of the word "depth".
+    The "begin" portion is a component of
+    this deeper list element, so that guarantees
+    that the entire block must be a component of the
+    inner list element.
+
        +

        Still inside the inner list element

        • +
      +
      This belongs to the outer list element, and is aligned accordingly, since the NAME attribute is not indented deeply enough. It is not enough for the BEGIN alone to be aligned deeply if the block is meant to have a NAME.
+
      +

      Still in the shallower list element since the preceding example block +forced the deeper list element to terminate.

      • +
    +

    Outside all lists.

    +``` diff --git a/test/command/4193.md b/test/command/4193.md --- a/test/command/4193.md +++ b/test/command/4193.md @@ -4,7 +4,7 @@ a - b ^D -[BulletList - [[Plain [Str "a"]] - ,[Plain [Str "b"]]]] +[ BulletList + [ [ Plain [ Str "a" ] ] , [ Plain [ Str "b" ] ] ] +] ``` diff --git a/test/command/4199.md b/test/command/4199.md --- a/test/command/4199.md +++ b/test/command/4199.md @@ -2,5 +2,8 @@ % pandoc -f latex -t native \foreignlanguage{ngerman}{foo} ^D -[Para [Span ("",[],[("lang","de-DE")]) [Str "foo"]]] +[ Para + [ Span ( "" , [] , [ ( "lang" , "de-DE" ) ] ) [ Str "foo" ] + ] +] ``` diff --git a/test/command/4235.md b/test/command/4235.md new file mode 100644 --- /dev/null +++ b/test/command/4235.md @@ -0,0 +1,15 @@ +``` +% pandoc --id-prefix=foo +This.^[Has a footnote.] +^D +

    This.1

    +
    +
    +
      +

    1. Has a footnote.↩︎

      2. +
    +
    +``` diff --git a/test/command/4240.md b/test/command/4240.md new file mode 100644 --- /dev/null +++ b/test/command/4240.md @@ -0,0 +1,44 @@ +``` +% pandoc -f rst -s -t native +===== +Title +===== + +-------- +Subtitle +-------- + +header1 +======= + +header2 +------- + +.. _id: + +header3 +~~~~~~~ + +.. _id2: +.. _id3: + +header4 +~~~~~~~ +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "subtitle" , MetaInlines [ Str "Subtitle" ] ) + , ( "title" , MetaInlines [ Str "Title" ] ) + ] + } + [ Header 1 ( "header1" , [] , [] ) [ Str "header1" ] + , Header 2 ( "header2" , [] , [] ) [ Str "header2" ] + , Header 3 ( "id" , [] , [] ) [ Str "header3" ] + , Header + 3 + ( "id3" , [] , [] ) + [ Str "header4" , Span ( "id2" , [] , [] ) [] ] + ] +``` diff --git a/test/command/4253.md b/test/command/4253.md new file mode 100644 --- /dev/null +++ b/test/command/4253.md @@ -0,0 +1,8 @@ +``` +% pandoc -f latex -t native +\newcommand{\noop}[1]{#1} +\noop{\newcommand{\foo}[1]{#1}} +\foo{hi} +^D +[ Para [ Str "hi" ] ] +``` diff --git a/test/command/4254.md b/test/command/4254.md new file mode 100644 --- /dev/null +++ b/test/command/4254.md @@ -0,0 +1,12 @@ +``` +% pandoc -f rst -t latex +.. math:: + + x &= y\\ + y &= z +^D +\[\begin{aligned} +x &= y\\ +y &= z +\end{aligned}\] +``` diff --git a/test/command/4280.md b/test/command/4280.md new file mode 100644 --- /dev/null +++ b/test/command/4280.md @@ -0,0 +1,7 @@ +``` +% pandoc -f rst -t native +Driver +------ +^D +[ Header 1 ( "driver" , [] , [] ) [ Str "Driver" ] ] +``` diff --git a/test/command/4281.md b/test/command/4281.md new file mode 100644 --- /dev/null +++ b/test/command/4281.md @@ -0,0 +1,21 @@ +``` +% pandoc -t native +:::: {.a} +- ::: {.b} + text + ::: + ::: {.c} + text + ::: +:::: +^D +[ Div + ( "" , [ "a" ] , [] ) + [ BulletList + [ [ Div ( "" , [ "b" ] , [] ) [ Para [ Str "text" ] ] + , Div ( "" , [ "c" ] , [] ) [ Para [ Str "text" ] ] + ] + ] + ] +] +``` diff --git a/test/command/4284.md b/test/command/4284.md new file mode 100644 --- /dev/null +++ b/test/command/4284.md @@ -0,0 +1,120 @@ +``` +% pandoc -f org -t native +#+EXCLUDE_TAGS:apple cat bye dog % + +* This should not appear :apple: +* NOEXPORT should appear if not specified in EXCLUDE_TAGS :noexport: +* This should not appear :cat:hi:laptop: +** Children of headers with excluded tags should not appear :xylophone: +* This should not appear :%: +^D +[ Header + 1 + ( "noexport-should-appear-if-not-specified-in-excludetags" + , [] + , [] + ) + [ Str "NOEXPORT" + , Space + , Str "should" + , Space + , Str "appear" + , Space + , Str "if" + , Space + , Str "not" + , Space + , Str "specified" + , Space + , Str "in" + , Space + , Str "EXCLUDE" + , Subscript [ Str "TAGS" ] + , Space + , Span + ( "" , [ "tag" ] , [ ( "tag-name" , "noexport" ) ] ) + [ SmallCaps [ Str "noexport" ] ] + ] +] +``` + +``` +% pandoc -f org -t native +#+EXCLUDE_TAGS:elephant +* This should not appear :elephant: +* This should appear :fawn: +^D +[ Header + 1 + ( "this-should-appear" , [] , [] ) + [ Str "This" + , Space + , Str "should" + , Space + , Str "appear" + , Space + , Span + ( "" , [ "tag" ] , [ ( "tag-name" , "fawn" ) ] ) + [ SmallCaps [ Str "fawn" ] ] + ] +] +``` + +``` +% pandoc -f org -t native +#+EXCLUDE_TAGS: giraffe +#+EXCLUDE_TAGS: hippo +* This should not appear :giraffe: +* This should not appear :hippo: +* This should appear :noexport: +^D +[ Header + 1 + ( "this-should-appear" , [] , [] ) + [ Str "This" + , Space + , Str "should" + , Space + , Str "appear" + , Space + , Span + ( "" , [ "tag" ] , [ ( "tag-name" , "noexport" ) ] ) + [ SmallCaps [ Str "noexport" ] ] + ] +] +``` + +``` +% pandoc -f org -t native +#+EXCLUDE_TAGS: +* NOEXPORT should appear if not specified in EXCLUDE_TAGS :noexport: +^D +[ Header + 1 + ( "noexport-should-appear-if-not-specified-in-excludetags" + , [] + , [] + ) + [ Str "NOEXPORT" + , Space + , Str "should" + , Space + , Str "appear" + , Space + , Str "if" + , Space + , Str "not" + , Space + , Str "specified" + , Space + , Str "in" + , Space + , Str "EXCLUDE" + , Subscript [ Str "TAGS" ] + , Space + , Span + ( "" , [ "tag" ] , [ ( "tag-name" , "noexport" ) ] ) + [ SmallCaps [ Str "noexport" ] ] + ] +] +``` diff --git a/test/command/4306.md b/test/command/4306.md new file mode 100644 --- /dev/null +++ b/test/command/4306.md @@ -0,0 +1,22 @@ +``` +% pandoc -f latex -t native +\documentclass{article} +\usepackage{hyperref} +\begin{document} +The file id is \nolinkurl{ESP_123_5235}. +\end{document} +^D +[ Para + [ Str "The" + , Space + , Str "file" + , Space + , Str "id" + , Space + , Str "is" + , Space + , Code ( "" , [] , [] ) "ESP_123_5235" + , Str "." + ] +] +``` diff --git a/test/command/4320.md b/test/command/4320.md new file mode 100644 --- /dev/null +++ b/test/command/4320.md @@ -0,0 +1,29 @@ +``` +% pandoc -f native -t rst --wrap=none +[Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 0.3) + ,(AlignDefault,ColWidth 0.3)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "one"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "two"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "ports"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [BlockQuote + [Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]])] + (TableFoot ("",[],[]) + [])] +^D ++--------------------+-------------------------------------+ +| one | two | ++====================+=====================================+ +| ports | **thisIsGoingToBeTooLongAnyway** | ++--------------------+-------------------------------------+ +``` diff --git a/test/command/4374.md b/test/command/4374.md new file mode 100644 --- /dev/null +++ b/test/command/4374.md @@ -0,0 +1,20 @@ +``` +% pandoc -f latex -t native +\cite{a% +} +^D +[ Para + [ Cite + [ Citation + { citationId = "a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline (Format "latex") "\\cite{a%\n}" ] + ] +] +``` diff --git a/test/command/4382.md b/test/command/4382.md new file mode 100644 --- /dev/null +++ b/test/command/4382.md @@ -0,0 +1,8 @@ +``` +% pandoc -f rst -t native +- + +===== +^D +[ BulletList [ [] ] , HorizontalRule ] +``` diff --git a/test/command/4420.md b/test/command/4420.md new file mode 100644 --- /dev/null +++ b/test/command/4420.md @@ -0,0 +1,9 @@ +``` +% pandoc -f native -t rst +[Para [Image ("",["align-right"],[("width","100px")]) [Str "image"] ("foo.png","fig:test")]] +^D +|image| + +.. |image| image:: foo.png + :width: 100px +``` diff --git a/test/command/4424.md b/test/command/4424.md new file mode 100644 --- /dev/null +++ b/test/command/4424.md @@ -0,0 +1,10 @@ +``` +% pandoc -f latex -t native +\documentclass{article} +\usepackage[sortlocale=en_GB]{biblatex} +\begin{document} +Test +\end{document} +^D +[ Para [ Str "Test" ] ] +``` diff --git a/test/command/4442.md b/test/command/4442.md new file mode 100644 --- /dev/null +++ b/test/command/4442.md @@ -0,0 +1,9 @@ +``` +% pandoc -f markdown -t latex +\newcommand{\myFruit}{Mango\xspace} +\myFruit is the king of fruits. +^D +\newcommand{\myFruit}{Mango\xspace} + +Mango is the king of fruits. +``` diff --git a/test/command/4454.md b/test/command/4454.md new file mode 100644 --- /dev/null +++ b/test/command/4454.md @@ -0,0 +1,9 @@ +``` +% pandoc -f rst -t native +• a +• b +^D +[ BulletList + [ [ Plain [ Str "a" ] ] , [ Plain [ Str "b" ] ] ] +] +``` diff --git a/test/command/4465.md b/test/command/4465.md new file mode 100644 --- /dev/null +++ b/test/command/4465.md @@ -0,0 +1,15 @@ +``` +% pandoc -f html -t markdown +
      +
    1. An ordered list can contain block-level elements ind html, it means that divs are also allowed.
      2. +
    2. Let's see the problem!
      This is an example.
      3. +
    +^D +1. An ordered list can contain block-level elements ind html, it means + that divs are also allowed. +2. Let\'s see the problem! + + ::: example + This is an example. + ::: +``` diff --git a/test/command/4470.md b/test/command/4470.md new file mode 100644 --- /dev/null +++ b/test/command/4470.md @@ -0,0 +1,27 @@ +``` +% pandoc -r latex -w plain +\newcommand{\foo}{123}\renewcommand\foo{456}\foo +^D +456 +``` + +``` +% pandoc -r latex -w plain +\newcommand\foo{123}\renewcommand\foo{456}\foo +^D +456 +``` + +``` +% pandoc -r latex -w plain +\newcommand{\foo}{123}\renewcommand{\foo}{456}\foo +^D +456 +``` + +``` +% pandoc -r latex -w plain +\newcommand\foo{123}\renewcommand{\foo}{456}\foo +^D +456 +``` diff --git a/test/command/4499.md b/test/command/4499.md new file mode 100644 --- /dev/null +++ b/test/command/4499.md @@ -0,0 +1,87 @@ +``` +% pandoc -f latex -t html +\mbox{abc def} ghi +^D +

    abc def ghi

    +``` + +``` +% pandoc -f latex+raw_tex -t native +\mbox{abc def} +^D +[ Para [ RawInline (Format "latex") "\\mbox{abc def}" ] ] +``` + +``` +% pandoc -f latex -t html +abc \mbox{\textit{def ghi} jkl} mno +^D +

    abc def ghi jkl mno

    +``` + +``` +% pandoc -f latex -t html +abc \mbox{def \\ ghi} jkl +^D +

    abc defghi jkl

    +``` + +``` +% pandoc -f latex -t html +abc \mbox{def +ghi} +^D +

    abc def ghi

    +``` + +``` +% pandoc -f latex -t html +abc \mbox{def \textit{ghi \\ jkl} +mno} pqr +^D +

    abc def ghijkl mno pqr

    +``` + +``` +% pandoc -f latex -t html +\hbox{abc def} ghi +^D +

    abc def ghi

    +``` + +``` +% pandoc -f latex+raw_tex -t native +\hbox{abc def} +^D +[ Para [ RawInline (Format "latex") "\\hbox{abc def}" ] ] +``` + +``` +% pandoc -f latex -t html +abc \hbox{\textit{def ghi} jkl} mno +^D +

    abc def ghi jkl mno

    +``` + +``` +% pandoc -f latex -t html +abc \hbox{def \\ ghi} jkl +^D +

    abc defghi jkl

    +``` + +``` +% pandoc -f latex -t html +abc \hbox{def +ghi} +^D +

    abc def ghi

    +``` + +``` +% pandoc -f latex -t html +abc \hbox{def \textit{ghi \\ jkl} +mno} pqr +^D +

    abc def ghijkl mno pqr

    +``` diff --git a/test/command/4513.md b/test/command/4513.md new file mode 100644 --- /dev/null +++ b/test/command/4513.md @@ -0,0 +1,32 @@ +``` +% pandoc -f textile -t native +|_. heading 1 |_. heading 2| +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "heading" , Space , Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "heading" , Space , Str "2" ] ] + ] + ]) + [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/4527.md b/test/command/4527.md new file mode 100644 --- /dev/null +++ b/test/command/4527.md @@ -0,0 +1,23 @@ +This command comes through as regular text: +``` +% pandoc -f latex+raw_tex -t native +\maketitle +^D +[ RawBlock (Format "latex") "\\maketitle" ] +``` + + +``` +% pandoc -f latex -t native +\maketitle +^D +[] +``` + +``` +% pandoc -f latex -t rst +\maketitle +Hello. +^D +Hello. +``` diff --git a/test/command/4528.md b/test/command/4528.md new file mode 100644 --- /dev/null +++ b/test/command/4528.md @@ -0,0 +1,156 @@ +# Rendering small caps, superscripts and subscripts with and without `raw_html` + +## Small caps + +``` +% pandoc --wrap=none -f latex -t commonmark-raw_html +This has \textsc{small caps} in it. +^D +This has SMALL CAPS in it. +``` + +``` +% pandoc --wrap=none -f latex -t commonmark+raw_html +This has \textsc{small caps} in it. +^D +This has small caps in it. +``` + +``` +% pandoc --wrap=none -f latex -t markdown_strict+raw_html +This has \textsc{small caps} in it. +^D +This has small caps in it. +``` + +## Strikeout + +``` +% pandoc --wrap=none -f html -t commonmark-raw_html-strikeout +This has strikeout in it. +^D +This has strikeout in it. +``` + +``` +% pandoc --wrap=none -f html -t commonmark+raw_html-strikeout +This has strikeout in it. +^D +This has strikeout in it. +``` + +``` +% pandoc --wrap=none -f html -t commonmark-raw_html+strikeout +This has strikeout in it. +^D +This has ~~strikeout~~ in it. +``` + +``` +% pandoc --wrap=none -f html -t commonmark+raw_html+strikeout +This has strikeout in it. +^D +This has ~~strikeout~~ in it. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict-raw_html-strikeout +This has strikeout in it. +^D +This has strikeout in it. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict+raw_html-strikeout +This has strikeout in it. +^D +This has strikeout in it. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict-raw_html+strikeout +This has strikeout in it. +^D +This has ~~strikeout~~ in it. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict+raw_html+strikeout +This has strikeout in it. +^D +This has ~~strikeout~~ in it. +``` + +## Superscript + +``` +% pandoc --wrap=none -f html -t commonmark-raw_html +This has superscript in it and 2 3 again. With emphasis: 2 3. With letters: foo. With a span: 2. +^D +This has ^(superscript) in it and ² ³ again. With emphasis: ^(*2* 3). With letters: ^(foo). With a span: ². +``` + +``` +% pandoc --wrap=none -f html -t commonmark+raw_html +This has superscript in it and 2 again. +^D +This has superscript in it and 2 again. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict-raw_html-superscript +This has superscript in it and 2 again. +^D +This has ^(superscript) in it and ² again. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict+raw_html-superscript +This has superscript in it and 2 again. +^D +This has superscript in it and 2 again. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict+raw_html+superscript +This has superscript in it and 2 again. +^D +This has ^superscript^ in it and ^2^ again. +``` + +## Subscript + +``` +% pandoc --wrap=none -f html -t commonmark-raw_html +This has subscript in it and 2 3 again. With emphasis: 2 3. With letters: foo. With a span: 2. +^D +This has _(subscript) in it and ₂ ₃ again. With emphasis: _(*2* 3). With letters: _(foo). With a span: ₂. +``` + +``` +% pandoc --wrap=none -f html -t commonmark+raw_html +This has subscript in it and 2 again. +^D +This has subscript in it and 2 again. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict-raw_html-subscript +This has subscript in it and 2 again. +^D +This has _(subscript) in it and ₂ again. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict+raw_html-subscript +This has subscript in it and 2 again. +^D +This has subscript in it and 2 again. +``` + +``` +% pandoc --wrap=none -f html -t markdown_strict+raw_html+subscript +This has subscript in it and 2 again. +^D +This has ~subscript~ in it and ~2~ again. +``` diff --git a/test/command/4529.md b/test/command/4529.md new file mode 100644 --- /dev/null +++ b/test/command/4529.md @@ -0,0 +1,36 @@ +``` +% pandoc -f latex -t plain+gutenberg +\chapter{First chapter}\label{sec:chp1} +The next chapter is Chapter~\ref{sec:chp2}. +\section{First section}\label{sec:chp1sec1} +The next section is Section~\ref{sec:chp2sec1}. + +\chapter{Second chapter}\label{sec:chp2} +The previous chapter is Chapter~\ref{sec:chp1}. +\section{First section}\label{sec:chp2sec1} +The previous section is Section~\ref{sec:chp1sec1}. +^D + + +FIRST CHAPTER + + +The next chapter is Chapter 2. + + +First section + +The next section is Section 2.1. + + + +SECOND CHAPTER + + +The previous chapter is Chapter 1. + + +First section + +The previous section is Section 1.1. +``` diff --git a/test/command/4545.md b/test/command/4545.md new file mode 100644 --- /dev/null +++ b/test/command/4545.md @@ -0,0 +1,20 @@ +``` +% pandoc -t asciidoc +Test 1 + +[my text] + +Test 2 +^D +Test 1 + +++[++my text++]++ + +Test 2 +``` +``` +% pandoc -t asciidoc +4\. foo +^D +{empty}4. foo +``` diff --git a/test/command/4550.md b/test/command/4550.md new file mode 100644 --- /dev/null +++ b/test/command/4550.md @@ -0,0 +1,7 @@ +``` +% pandoc -f markdown-smart -t ms +A ‘simple’ example +^D +.LP +A \(oqsimple\(cq example +``` diff --git a/test/command/4553.md b/test/command/4553.md new file mode 100644 --- /dev/null +++ b/test/command/4553.md @@ -0,0 +1,21 @@ +``` +% pandoc -f latex -t native +foo \include{command/bar} +^D +[ Para [ Str "foo" ] +, Para [ Emph [ Str "hi" , Space , Str "there" ] ] +] +``` + +``` +% pandoc -f latex -t native +foo \input{command/bar} +^D +[ Para + [ Str "foo" + , Space + , Emph [ Str "hi" , Space , Str "there" ] + ] +] +``` + diff --git a/test/command/4564.md b/test/command/4564.md new file mode 100644 --- /dev/null +++ b/test/command/4564.md @@ -0,0 +1,58 @@ +``` +% pandoc -f native -t rst --list-tables +[Table ("",[],[]) (Caption Nothing + [Plain [Str "Here",Space,Str "is",Space,Str "a",Space,Str "caption."]]) + [(AlignDefault,ColWidth 0.1527777777777778) + ,(AlignDefault,ColWidth 0.1388888888888889) + ,(AlignDefault,ColWidth 0.16666666666666666) + ,(AlignDefault,ColWidth 0.375)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Centered",SoftBreak,Str "Header"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Left",SoftBreak,Str "Aligned"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Right",SoftBreak,Str "Aligned"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Default",Space,Str "aligned"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain []] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]])] + (TableFoot ("",[],[]) + [])] +^D +.. list-table:: Here is a caption. + :widths: 11 10 12 27 + :header-rows: 1 + + * - Centered Header + - Left Aligned + - Right Aligned + - Default aligned + * - First + - + - 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/test/command/4576.md b/test/command/4576.md new file mode 100644 --- /dev/null +++ b/test/command/4576.md @@ -0,0 +1,6 @@ +``` +% pandoc -f latex -t native +$\rho_\text{D$_2$O}=866$ +^D +[ Para [ Math InlineMath "\\rho_\\text{D$_2$O}=866" ] ] +``` diff --git a/test/command/4578.md b/test/command/4578.md new file mode 100644 --- /dev/null +++ b/test/command/4578.md @@ -0,0 +1,14 @@ +``` +% pandoc -t markdown + ------ ------- --------------- --------------------- + One row 12.0 Example of a row that + spans multiple lines. + + ------ ------- --------------- --------------------- +^D + ------ ------- --------------- --------------------- + One row 12.0 Example of a row that + spans multiple lines. + + ------ ------- --------------- --------------------- +``` diff --git a/test/command/4579.md b/test/command/4579.md new file mode 100644 --- /dev/null +++ b/test/command/4579.md @@ -0,0 +1,58 @@ +``` +% pandoc -f rst -t native +.. list-table:: + :header-rows: 1 + + * - Foo + - Bar + * - spam + - ham +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Foo" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Bar" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "spam" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "ham" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/4589.md b/test/command/4589.md new file mode 100644 --- /dev/null +++ b/test/command/4589.md @@ -0,0 +1,14 @@ +``` +% pandoc -f markdown -t latex +\newcommand{\one}[1]{#1} +\newcommand{\two}[1]{#1} + +Formatting *is* working **here**. But sticking \one{two }\two{commands} +together *breaks* formatting. +^D +\newcommand{\one}[1]{#1} +\newcommand{\two}[1]{#1} + +Formatting \emph{is} working \textbf{here}. But sticking two commands +together \emph{breaks} formatting. +``` diff --git a/test/command/4594.md b/test/command/4594.md new file mode 100644 --- /dev/null +++ b/test/command/4594.md @@ -0,0 +1,24 @@ +``` +% pandoc -f markdown -t latex +Some **bold** text here. + +\begin{figure}[htbp] +\centering +\def\svgwidth{\columnwidth} +\import{img/}{vectors.pdf_tex} +\caption{Some caption.} +\end{figure} + +Some *italic* text here. +^D +Some \textbf{bold} text here. + +\begin{figure}[htbp] +\centering +\def\svgwidth{\columnwidth} +\import{img/}{vectors.pdf_tex} +\caption{Some caption.} +\end{figure} + +Some \emph{italic} text here. +``` diff --git a/test/command/4598.md b/test/command/4598.md new file mode 100644 --- /dev/null +++ b/test/command/4598.md @@ -0,0 +1,10 @@ +``` +% pandoc -f rst +`x`__ + +__ `xy`_ + +.. _`xy`: http://xy.org +^D +

    x

    +``` diff --git a/test/command/4624.md b/test/command/4624.md new file mode 100644 --- /dev/null +++ b/test/command/4624.md @@ -0,0 +1,33 @@ +``` +% pandoc -f latex -t native +\begin{Verbatim}[key1=value1] +code1 + +\end{Verbatim} + + +\begin{lstlisting}[key2=value2] +code2 + +\end{lstlisting} + +\begin{verbatim} +code3 +\end{verbatim} + +\begin{verbatim} +code4 + \end{verbatim} + +\begin{verbatim} +code5\end{verbatim} +^D +[ CodeBlock + ( "" , [] , [ ( "key1" , "value1" ) ] ) "code1\n" +, CodeBlock + ( "" , [] , [ ( "key2" , "value2" ) ] ) "code2\n " +, CodeBlock ( "" , [] , [] ) "code3" +, CodeBlock ( "" , [] , [] ) "code4" +, CodeBlock ( "" , [] , [] ) "code5" +] +``` diff --git a/test/command/4635.md b/test/command/4635.md new file mode 100644 --- /dev/null +++ b/test/command/4635.md @@ -0,0 +1,35 @@ +``` +% pandoc -f markdown -t native +(cf. +foo) +^D +[ Para [ Str "(cf." , SoftBreak , Str "foo)" ] ] +``` + +``` +% pandoc -f markdown -t native +a (cf. +foo) +^D +[ Para + [ Str "a" , Space , Str "(cf." , SoftBreak , Str "foo)" ] +] +``` + +``` +% pandoc -f markdown -t native +cf. +foo +^D +[ Para [ Str "cf." , SoftBreak , Str "foo" ] ] +``` + +``` +% pandoc -f markdown -t native +a cf. +foo +^D +[ Para + [ Str "a" , Space , Str "cf." , SoftBreak , Str "foo" ] +] +``` diff --git a/test/command/4637.md b/test/command/4637.md new file mode 100644 --- /dev/null +++ b/test/command/4637.md @@ -0,0 +1,6 @@ +``` +% pandoc -t latex +more \indextext{dogs}' than \indextext{cats}' +^D +more \indextext{dogs}' than \indextext{cats}' +``` diff --git a/test/command/4639.md b/test/command/4639.md new file mode 100644 --- /dev/null +++ b/test/command/4639.md @@ -0,0 +1,10 @@ +``` +% pandoc -t html --mathjax +\begin{equation} + E=mc^2 +\end{equation} +^D +

    \[\begin{equation} + E=mc^2 +\end{equation}\]

    +``` diff --git a/test/command/4653.md b/test/command/4653.md new file mode 100644 --- /dev/null +++ b/test/command/4653.md @@ -0,0 +1,8 @@ +``` +% pandoc -t latex +\let\tex\TeX +\renewcommand{\TeX}{\tex\xspace} +^D +\let\tex\TeX +\renewcommand{\TeX}{\tex\xspace} +``` diff --git a/test/command/4667.md b/test/command/4667.md new file mode 100644 --- /dev/null +++ b/test/command/4667.md @@ -0,0 +1,20 @@ +``` +% pandoc -t latex +--- +header-includes: +- \newcommand{\blandscape}{\begin{landscape}} +- \newcommand{\elandscape}{\end{landscape}} +... + +\blandscape + +testing + +\elandscape +^D +\begin{landscape} + +testing + +\end{landscape} +``` diff --git a/test/command/4669.md b/test/command/4669.md new file mode 100644 --- /dev/null +++ b/test/command/4669.md @@ -0,0 +1,33 @@ +``` +% pandoc -f latex -t native +{\tt <-} + +\begin{verbatim} + while (n > 0) { +\end{verbatim} +^D +[ Para + [ Span ( "" , [] , [] ) [ Code ( "" , [] , [] ) "<-" ] ] +, CodeBlock ( "" , [] , [] ) " while (n > 0) {" +] +``` + +``` +% pandoc -f latex -t native +\begin{itemize} +\item<1> one +\item<2-3,5> two +\item<2| @alert> three +\item four +\item five +\end{itemize} +^D +[ BulletList + [ [ Para [ Str "one" ] ] + , [ Para [ Str "two" ] ] + , [ Para [ Str "three" ] ] + , [ Para [ Str "four" ] ] + , [ Para [ Str "five" ] ] + ] +] +``` diff --git a/test/command/4677.md b/test/command/4677.md new file mode 100644 --- /dev/null +++ b/test/command/4677.md @@ -0,0 +1,9 @@ +``` +% pandoc --to "markdown-bracketed_spans-fenced_divs-link_attributes-simple_tables-multiline_tables-grid_tables-pipe_tables-fenced_code_attributes-markdown_in_html_blocks-table_captions-smart" +![Caption](img.png){#img:1} +^D +
    +Caption + +
    +``` diff --git a/test/command/4690.md b/test/command/4690.md new file mode 100644 --- /dev/null +++ b/test/command/4690.md @@ -0,0 +1,26 @@ +``` +% pandoc -t beamer +# title + +:::: {.columns} +::: {.column width="8%"} +content +::: +::: {.column width="84%"} +content2 +::: +:::: +^D +\begin{frame}{title} +\protect\phantomsection\label{title} +\begin{columns}[T] +\begin{column}{0.08\linewidth} +content +\end{column} + +\begin{column}{0.84\linewidth} +content2 +\end{column} +\end{columns} +\end{frame} +``` diff --git a/test/command/4715.md b/test/command/4715.md new file mode 100644 --- /dev/null +++ b/test/command/4715.md @@ -0,0 +1,31 @@ +``` +% pandoc -f rst -t native +.. toctree:: + :name: tree1 + :class: foo bar + :caption: Indice dei contenuti + :numbered: + :maxdepth: 3 + + premessa.rst + acquisizione-software.rst + riuso-software.rst +^D +[ Div + ( "tree1" + , [ "toctree" , "foo" , "bar" ] + , [ ( "caption" , "Indice dei contenuti" ) + , ( "numbered" , "" ) + , ( "maxdepth" , "3" ) + ] + ) + [ Para + [ Str "premessa.rst" + , SoftBreak + , Str "acquisizione-software.rst" + , SoftBreak + , Str "riuso-software.rst" + ] + ] +] + ``` diff --git a/test/command/4722.md b/test/command/4722.md new file mode 100644 --- /dev/null +++ b/test/command/4722.md @@ -0,0 +1,46 @@ +``` +% pandoc -f tikiwiki -t native +*Level 1 +*Level 1 +**Level 2 +***Level 3 +*Level 1 +^D +[ BulletList + [ [ Plain [ Str "Level" , Space , Str "1" ] ] + , [ Plain [ Str "Level" , Space , Str "1" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "2" ] + , BulletList [ [ Plain [ Str "Level" , Space , Str "3" ] ] ] + ] + ] + ] + , [ Plain [ Str "Level" , Space , Str "1" ] ] + ] +] +``` +``` +% pandoc -f tikiwiki -t native +#Level 1 +#Level 1 +##Level 2 +###Level 3 +#Level 1 +^D +[ OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Level" , Space , Str "1" ] ] + , [ Plain [ Str "Level" , Space , Str "1" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Level" , Space , Str "2" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Level" , Space , Str "3" ] ] ] + ] + ] + ] + , [ Plain [ Str "Level" , Space , Str "1" ] ] + ] +] +``` diff --git a/test/command/4742.md b/test/command/4742.md new file mode 100644 --- /dev/null +++ b/test/command/4742.md @@ -0,0 +1,62 @@ +Check that the commonmark reader handles the `ascii_identifiers` +extension properly. + +``` +% pandoc -f commonmark+gfm_auto_identifiers+ascii_identifiers -t native +# non ascii ⚠️ räksmörgås +^D +[ Header + 1 + ( "non-ascii-warning-raksmorgas" , [] , [] ) + [ Str "non" + , Space + , Str "ascii" + , Space + , Str "\9888\65039" + , Space + , Str "r\228ksm\246rg\229s" + ] +] +``` + +Note that the emoji here is actually a composite character, +formed from \9888 and \65039. The latter is a combining mark, +so it survives... + +``` +% pandoc -f commonmark+gfm_auto_identifiers-ascii_identifiers -t native +# non ascii ⚠️ räksmörgås +^D +[ Header + 1 + ( "non-ascii-warning-r\228ksm\246rg\229s" , [] , [] ) + [ Str "non" + , Space + , Str "ascii" + , Space + , Str "\9888\65039" + , Space + , Str "r\228ksm\246rg\229s" + ] +] +``` + +`gfm` should have `ascii_identifiers` disabled by default. + +``` +% pandoc -f gfm -t native +# non ascii ⚠️ räksmörgås +^D +[ Header + 1 + ( "non-ascii-warning-r\228ksm\246rg\229s" , [] , [] ) + [ Str "non" + , Space + , Str "ascii" + , Space + , Str "\9888\65039" + , Space + , Str "r\228ksm\246rg\229s" + ] +] +``` diff --git a/test/command/4743.md b/test/command/4743.md new file mode 100644 --- /dev/null +++ b/test/command/4743.md @@ -0,0 +1,47 @@ +Test that emojis are wrapped in Span + +``` +% pandoc -f commonmark+emoji -t native +My:thumbsup:emoji:heart: +^D +[ Para + [ Str "My" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "thumbsup" ) ] ) + [ Str "\128077" ] + , Str "emoji" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "heart" ) ] ) + [ Str "\10084\65039" ] + ] +] +``` + +``` +% pandoc -f markdown+emoji -t native +My:thumbsup:emoji:heart: +^D +[ Para + [ Str "My" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "thumbsup" ) ] ) + [ Str "\128077" ] + , Str "emoji" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "heart" ) ] ) + [ Str "\10084\65039" ] + ] +] +``` + +``` +% pandoc -f commonmark+emoji -t html +:zero: header +============= +My:thumbsup:emoji:heart:x :hearts: xyz +^D +

    0️⃣ header

    +

    My👍emoji❤️x ♥️ xyz

    +``` diff --git a/test/command/4746.md b/test/command/4746.md new file mode 100644 --- /dev/null +++ b/test/command/4746.md @@ -0,0 +1,56 @@ +``` +% pandoc -f latex -t native +\begin{tabular}{c c} + \begin{tabular}{c} a \\ \end{tabular} + & + \\ +\end{tabular} +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "a" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/4748.md b/test/command/4748.md new file mode 100644 --- /dev/null +++ b/test/command/4748.md @@ -0,0 +1,16 @@ +``` +% pandoc -f org -t rst +Before example block. +#+begin_example +This is in an example block. +#+end_example +After example block. +^D +Before example block. + +:: + + This is in an example block. + +After example block. +``` diff --git a/test/command/4768.md b/test/command/4768.md new file mode 100644 --- /dev/null +++ b/test/command/4768.md @@ -0,0 +1,7 @@ +``` +% pandoc -f latex -t plain +\def\foo#1!#2!#3{#1 or #2 and #3} +\foo aa!bbb bbb!{ccc} +^D +aa or bbb bbb and ccc +``` diff --git a/test/command/4781.md b/test/command/4781.md new file mode 100644 --- /dev/null +++ b/test/command/4781.md @@ -0,0 +1,40 @@ +``` +% pandoc -t native +Markdown parsed *here* + +\include{command/bar} + +*But not here* +^D +[ Para + [ Str "Markdown" + , Space + , Str "parsed" + , Space + , Emph [ Str "here" ] + ] +, RawBlock (Format "tex") "\\include{command/bar}" +, Para + [ Emph + [ Str "But" , Space , Str "not" , Space , Str "here" ] + ] +] +``` + +``` +% pandoc -t native +*here* \input{command/bar} + +*But not here* +^D +[ Para + [ Emph [ Str "here" ] + , Space + , RawInline (Format "tex") "\\input{command/bar}" + ] +, Para + [ Emph + [ Str "But" , Space , Str "not" , Space , Str "here" ] + ] +] +``` diff --git a/test/command/4794.md b/test/command/4794.md new file mode 100644 --- /dev/null +++ b/test/command/4794.md @@ -0,0 +1,18 @@ +``` +% pandoc -f markdown -t mediawiki +| Column1 | Column2 | Column3 | +| ------- | ------- | ------- | +| text | | text | +^D +{| class="wikitable" +|- +! Column1 +! Column2 +! Column3 +|- +| text +| +| text +|} + +``` diff --git a/test/command/4805-beamer-columns-alignment.md b/test/command/4805-beamer-columns-alignment.md new file mode 100644 --- /dev/null +++ b/test/command/4805-beamer-columns-alignment.md @@ -0,0 +1,40 @@ +``` +% pandoc -t beamer +:::: { .columns } +::: { .column align=center } +::: +::: { .column align=bottom } +::: +:::: + +:::: { .columns align=bottom .onlytextwidth } +::: { .column align=top } +::: +::: { .column align=top-baseline } +::: +:::: + +:::: { .columns totalwidth=7em } +:::: +^D +\begin{frame} +\begin{columns}[T] +\begin{column}[c]{0.48\linewidth} +\end{column} + +\begin{column}[b]{0.48\linewidth} +\end{column} +\end{columns} + +\begin{columns}[b,onlytextwidth] +\begin{column}[T]{0.48\linewidth} +\end{column} + +\begin{column}[t]{0.48\linewidth} +\end{column} +\end{columns} + +\begin{columns}[T,totalwidth=7em] +\end{columns} +\end{frame} +``` diff --git a/test/command/4811.md b/test/command/4811.md new file mode 100644 --- /dev/null +++ b/test/command/4811.md @@ -0,0 +1,60 @@ +No blank lines in inline interpreted roles: + +``` +% pandoc -f rst -t native +`no + +blank`:myrole: +^D +[ Para [ Str "`no" ] , Para [ Str "blank`:myrole:" ] ] +``` + +Backslash escape behaves properly in interpreted roles: + +``` +% pandoc -f rst -t native +`hi\ there`:sup: + +`hi\ there`:code: +^D +[ Para [ Superscript [ Str "hithere" ] ] +, Para [ Code ( "" , [] , [] ) "hi\\ there" ] +] +``` + +Backtick followed by alphanumeric doesn't end the span: +``` +% pandoc -f rst -t native +`hi`there`:myrole: +^D +[ Para + [ Code + ( "" , [ "interpreted-text" ] , [ ( "role" , "myrole" ) ] ) + "hi`there" + ] +] +``` + +Newline is okay, as long as not blank: +``` +% pandoc -f rst -t native +`hi +there`:myrole: +^D +[ Para + [ Code + ( "" , [ "interpreted-text" ] , [ ( "role" , "myrole" ) ] ) + "hi\nthere" + ] +] +``` + +Use span for title-reference: +``` +% pandoc -f rst -t native +`default` +^D +[ Para + [ Span ( "" , [ "title-ref" ] , [] ) [ Str "default" ] ] +] +``` diff --git a/test/command/4817.md b/test/command/4817.md new file mode 100644 --- /dev/null +++ b/test/command/4817.md @@ -0,0 +1,21 @@ +``` +% pandoc -t native -s +--- +foo: +- bar: bam +... +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "foo" + , MetaList + [ MetaMap + (fromList [ ( "bar" , MetaInlines [ Str "bam" ] ) ]) + ] + ) + ] + } + [] +``` diff --git a/test/command/4819.md b/test/command/4819.md new file mode 100644 --- /dev/null +++ b/test/command/4819.md @@ -0,0 +1,55 @@ +``` +% pandoc -f markdown -t native -s +--- +foo: 42 +... +^D +Pandoc + Meta + { unMeta = fromList [ ( "foo" , MetaInlines [ Str "42" ] ) ] + } + [] +``` + +``` +% pandoc -f markdown -t native -s +--- +foo: true +... +^D +Pandoc + Meta { unMeta = fromList [ ( "foo" , MetaBool True ) ] } [] +``` + +``` +% pandoc -f markdown -t native -s +--- +foo: True +... +^D +Pandoc + Meta { unMeta = fromList [ ( "foo" , MetaBool True ) ] } [] +``` + +``` +% pandoc -f markdown -t native -s +--- +foo: FALSE +... +^D +Pandoc + Meta { unMeta = fromList [ ( "foo" , MetaBool False ) ] } + [] +``` + +``` +% pandoc -f markdown -t native -s +--- +foo: no +... +^D +Pandoc + Meta { unMeta = fromList [ ( "foo" , MetaBool False ) ] } + [] +``` + diff --git a/test/command/4832.md b/test/command/4832.md new file mode 100644 --- /dev/null +++ b/test/command/4832.md @@ -0,0 +1,39 @@ +``` +% pandoc -f latex -t native +\url{http://example.com/foo%20bar.htm} +^D +[ Para + [ Link + ( "" , [ "uri" ] , [] ) + [ Str "http://example.com/foo%20bar.htm" ] + ( "http://example.com/foo%20bar.htm" , "" ) + ] +] +``` + +``` +% pandoc -f latex -t native +\url{http://example.com/foo{bar}.htm} +^D +[ Para + [ Link + ( "" , [ "uri" ] , [] ) + [ Str "http://example.com/foo{bar}.htm" ] + ( "http://example.com/foo{bar}.htm" , "" ) + ] +] +``` + +``` +% pandoc -f latex -t native +\href{http://example.com/foo%20bar}{Foobar} +^D +[ Para + [ Link + ( "" , [] , [] ) + [ Str "Foobar" ] + ( "http://example.com/foo%20bar" , "" ) + ] +] +``` + diff --git a/test/command/4833.md b/test/command/4833.md new file mode 100644 --- /dev/null +++ b/test/command/4833.md @@ -0,0 +1,20 @@ +``` +% pandoc -f native -t rst +[Div ("",["warning"],[]) + [Div ("",["title"],[]) + [Para [Str "Warning"]] + ,Para [Str "Hi"]]] +^D +.. warning:: + + Hi +``` +``` +% pandoc -f native -t rst +[Div ("",["unknown"],[]) + [Para [Str "Hi"]]] +^D +.. container:: unknown + + Hi +``` diff --git a/test/command/4842.md b/test/command/4842.md new file mode 100644 --- /dev/null +++ b/test/command/4842.md @@ -0,0 +1,6 @@ +``` +% pandoc -f latex -t native +\l +^D +[ Para [ Str "\322" ] ] +``` diff --git a/test/command/4845.md b/test/command/4845.md new file mode 100644 --- /dev/null +++ b/test/command/4845.md @@ -0,0 +1,21 @@ +``` +% pandoc -f html -t native +x leading trailing space x +^D +[ Plain + [ Str "x" + , Space + , Link + ( "" , [] , [] ) + [ Str "leading" + , Space + , Str "trailing" + , Space + , Str "space" + ] + ( "/foo" , "" ) + , Space + , Str "x" + ] +] +``` diff --git a/test/command/4848.md b/test/command/4848.md new file mode 100644 --- /dev/null +++ b/test/command/4848.md @@ -0,0 +1,92 @@ +``` +% pandoc -f latex -t native +\enquote*{hi} +^D +[ Para [ Quoted SingleQuote [ Str "hi" ] ] ] +``` + +``` +% pandoc -f latex -t native +\foreignquote{italian}{hi} +^D +[ Para + [ Quoted + DoubleQuote + [ Span ( "" , [] , [ ( "lang" , "it" ) ] ) [ Str "hi" ] ] + ] +] +``` + +``` +% pandoc -f latex -t native +\hyphenquote*{italian}{hi} +^D +[ Para + [ Quoted + SingleQuote + [ Span ( "" , [] , [ ( "lang" , "it" ) ] ) [ Str "hi" ] ] + ] +] +``` + +``` +% pandoc -f latex -t native +Lorem ipsum +\blockquote{dolor sit amet} +consectetuer. +^D +[ Para [ Str "Lorem" , Space , Str "ipsum" ] +, BlockQuote + [ Para + [ Str "dolor" , Space , Str "sit" , Space , Str "amet" ] + ] +, Para [ Str "consectetuer." ] +] +``` + +``` +% pandoc -f latex -t native +Lorem ipsum +\blockcquote[198]{Knu86}{dolor sit amet} +consectetuer. +^D +[ Para [ Str "Lorem" , Space , Str "ipsum" ] +, BlockQuote + [ Para + [ Str "dolor" , Space , Str "sit" , Space , Str "amet" ] + , Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = [] + , citationSuffix = [ Str "198" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [] + ] + ] +, Para [ Str "consectetuer." ] +] +``` + +``` +% pandoc -f latex -t native +Lorem ipsum +\foreignblockquote{italian}{dolor sit amet} +consectetuer. +^D +[ Para [ Str "Lorem" , Space , Str "ipsum" ] +, BlockQuote + [ Div + ( "" , [] , [ ( "lang" , "it" ) ] ) + [ Para + [ Str "dolor" , Space , Str "sit" , Space , Str "amet" ] + ] + ] +, Para [ Str "consectetuer." ] +] +``` + diff --git a/test/command/4860.md b/test/command/4860.md new file mode 100644 --- /dev/null +++ b/test/command/4860.md @@ -0,0 +1,20 @@ +``` +% pandoc -f rst -t native +This is broken_. + +.. ***** REFERENCES FOLLOW ***** +.. _broken: http://google.com +^D +[ Para + [ Str "This" + , Space + , Str "is" + , Space + , Link + ( "" , [] , [] ) + [ Str "broken" ] + ( "http://google.com" , "" ) + , Str "." + ] +] +``` diff --git a/test/command/4877.md b/test/command/4877.md new file mode 100644 --- /dev/null +++ b/test/command/4877.md @@ -0,0 +1,15 @@ +``` +% pandoc -f html -t native +My +^D +[ Plain + [ Str "My" , Space , Math InlineMath "\\mathcal{D}" ] +] +``` + +``` +% pandoc -f html -t native + +^D +[ Plain [ Math DisplayMath "\\mathcal{D}" ] ] +``` diff --git a/test/command/4880.md b/test/command/4880.md new file mode 100644 --- /dev/null +++ b/test/command/4880.md @@ -0,0 +1,7 @@ +``` +% pandoc -t latex +$x=y%comment$ +^D +\(x=y%comment +\) +``` diff --git a/test/command/4885.md b/test/command/4885.md new file mode 100644 --- /dev/null +++ b/test/command/4885.md @@ -0,0 +1,8 @@ +``` +% pandoc -f org -t markdown +This won't show the command. +src_maxima[:exports none :results raw]{tex('integrate(sin((e^x)/pi),x,0,inf));} $$\int_{0}^{\infty }{\sin \left({{e^{x}}\over{\pi}}\right)\;dx}$$ +^D +This won\'t show the command. +$$\int_{0}^{\infty }{\sin \left({{e^{x}}\over{\pi}}\right)\;dx}$$ +``` diff --git a/test/command/4908.md b/test/command/4908.md new file mode 100644 --- /dev/null +++ b/test/command/4908.md @@ -0,0 +1,16 @@ +``` +% pandoc -f markdown_mmd+fancy_lists+example_lists -t native -t plain +(@) Example one +(@) Example two + +some text + +(@) Example three +^D +(1) Example one +(2) Example two + +some text + +(3) Example three +``` diff --git a/test/command/4913.md b/test/command/4913.md new file mode 100644 --- /dev/null +++ b/test/command/4913.md @@ -0,0 +1,34 @@ +``` +% pandoc -f markdown -t html +[https://pandoc.org](https://pandoc.org) +^D +

    https://pandoc.org

    +``` + +``` +% pandoc -f markdown -t markdown +[https://pandoc.org](https://pandoc.org) +^D + +``` + +``` +% pandoc -f markdown -t html + +^D +

    https://pandoc.org

    +``` + +``` +% pandoc -f markdown -t html +{.foo} +^D +

    https://pandoc.org

    +``` + +``` +% pandoc -f markdown -t html + +^D +

    +``` diff --git a/test/command/4919.md b/test/command/4919.md new file mode 100644 --- /dev/null +++ b/test/command/4919.md @@ -0,0 +1,17 @@ +``` +% pandoc -f rst -t native +.. _`tgtmath`: + + .. math:: + :name: + + V = \frac{K}{r^2} +^D +[ Div + ( "tgtmath" , [] , [] ) + [ BlockQuote + [ Para [ Math DisplayMath "V = \\frac{K}{r^2}" ] ] + ] +] +``` + diff --git a/test/command/4928.md b/test/command/4928.md new file mode 100644 --- /dev/null +++ b/test/command/4928.md @@ -0,0 +1,221 @@ +``` +% pandoc -f latex -t native +\cites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72} +^D +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = [ Str "Multiprenote" , Space , Str "23" ] + , citationSuffix = [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65" , Str "," , Space , Str "multipostnote" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + (Format "latex") + "\\cites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72}" + ] + ] +] +``` + +``` +% pandoc -f latex -t native +\cites(Multiprenote)()[23][42]{Knu86}[65]{Nie72} +^D +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = [ Str "Multiprenote" , Space , Str "23" ] + , citationSuffix = [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = [ Str "65" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + (Format "latex") + "\\cites(Multiprenote)()[23][42]{Knu86}[65]{Nie72}" + ] + ] +] +``` + +``` +% pandoc -f latex -t native +\cites()(multipostnote)[23][42]{Knu86}[65]{Nie72} +^D +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = [ Str "23" ] + , citationSuffix = [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65" , Str "," , Space , Str "multipostnote" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + (Format "latex") + "\\cites()(multipostnote)[23][42]{Knu86}[65]{Nie72}" + ] + ] +] +``` + +``` +% pandoc -f latex -t native +\cites()()[23][42]{Knu86}[65]{Nie72} +^D +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = [ Str "23" ] + , citationSuffix = [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = [ Str "65" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + (Format "latex") "\\cites()()[23][42]{Knu86}[65]{Nie72}" + ] + ] +] +``` + +``` +% pandoc -f latex -t native +\cites(multipostnote)[23][42]{Knu86}[65]{Nie72} +^D +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = [ Str "23" ] + , citationSuffix = [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65" , Str "," , Space , Str "multipostnote" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + (Format "latex") + "\\cites(multipostnote)[23][42]{Knu86}[65]{Nie72}" + ] + ] +] +``` + +``` +% pandoc -f latex -t native +\cites(Multiprenote)(multipostnote){Knu86} +^D +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = [ Str "Multiprenote" ] + , citationSuffix = [ Str "," , Space , Str "multipostnote" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + (Format "latex") + "\\cites(Multiprenote)(multipostnote){Knu86}" + ] + ] +] +``` + +``` +% pandoc -f latex -t native +\footcites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72} +^D +[ Para + [ Note + [ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = + [ Str "Multiprenote" , Space , Str "23" ] + , citationSuffix = [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65" + , Str "," + , Space + , Str "multipostnote" + ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + (Format "latex") + "\\footcites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72}" + ] + , Str "." + ] + ] + ] +] +``` diff --git a/test/command/4933.md b/test/command/4933.md new file mode 100644 --- /dev/null +++ b/test/command/4933.md @@ -0,0 +1,10 @@ +``` +% pandoc -f latex -t native +\includegraphics{lalune} +^D +[ Para + [ Image + ( "" , [] , [] ) [ Str "image" ] ( "lalune.jpg" , "" ) + ] +] +``` diff --git a/test/command/4960.md b/test/command/4960.md new file mode 100644 --- /dev/null +++ b/test/command/4960.md @@ -0,0 +1,22 @@ +``` +% pandoc -t latex --biblatex +[@a1;@a2;@a3] +^D +\autocite{a1,a2,a3} +``` + +``` +% pandoc -t latex --biblatex +@a1 [@a2;@a3] +^D +\textcite{a1,a2,a3} +``` + +``` +% pandoc -t latex --biblatex +[@a1, blah; @a2; see @a3] +^D +\autocites[blah]{a1}{a2}[see][]{a3} +``` + + diff --git a/test/command/5010.md b/test/command/5010.md new file mode 100644 --- /dev/null +++ b/test/command/5010.md @@ -0,0 +1,21 @@ +``` +% pandoc -f latex -t latex +\(\left\{ \begin{matrix} +y\,\,\,\, \geqq \,\,\, f\,(\, x\,)\,\, \\ +y\,\,\, \leqq \,\,\, g\,(\, x\,)\, \\ +\end{matrix} \right.\ \) +^D +\(\left\{ \begin{matrix} +y\,\,\,\, \geqq \,\,\, f\,(\, x\,)\,\, \\ +y\,\,\, \leqq \,\,\, g\,(\, x\,)\, \\ +\end{matrix} \right.\ \) +``` + +``` +% pandoc -f markdown -t latex +$x\ $ +^D +\(x\ \) +``` + + diff --git a/test/command/5014.md b/test/command/5014.md new file mode 100644 --- /dev/null +++ b/test/command/5014.md @@ -0,0 +1,49 @@ +``` +% pandoc -f html -t native + + + + + + + + + + + +
    Name
    Accounts
    +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Name" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Accounts" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/5039.md b/test/command/5039.md new file mode 100644 --- /dev/null +++ b/test/command/5039.md @@ -0,0 +1,27 @@ +``` +% pandoc -f man -t plain +.ds foo bar +.ds bar baz +\*[\*[foo]] +^D +baz +``` + +``` +% pandoc -f man -t plain +.ds foo [bar] +.ds bar baz +\*\*[foo] +^D +baz +``` + +``` +% pandoc -f man -t html +.ds B-Font B +.ds I-Font I +.ds R-Font R +\f\*[B-Font]certtool\fP +^D +

    certtool

    +``` diff --git a/test/command/5050.md b/test/command/5050.md new file mode 100644 --- /dev/null +++ b/test/command/5050.md @@ -0,0 +1,7 @@ +``` +% pandoc -t rst + +x +^D +x +``` diff --git a/test/command/5053.md b/test/command/5053.md new file mode 100644 --- /dev/null +++ b/test/command/5053.md @@ -0,0 +1,14 @@ +``` +% pandoc +—_legibility_— +^D +

    —legibility—

    +``` + +``` +% pandoc +_filename_|_filetype_ +^D +

    filename|filetype

    +``` + diff --git a/test/command/5071.md b/test/command/5071.md new file mode 100644 --- /dev/null +++ b/test/command/5071.md @@ -0,0 +1,68 @@ +``` +% pandoc -f markdown -t html --number-sections +## First section + +### Subhead + +##### Subhead with gap + +## Second section +^D +

    1 First section

    +

    1.1 Subhead

    +
    1.1.0.1 Subhead with gap
    +

    2 Second section

    + +``` + +``` +% pandoc -f markdown -t html --number-sections +## First section + +### Subhead + +# Higher-level section + +## Sub +^D +

    0.1 First section

    +

    0.1.1 Subhead

    +

    1 Higher-level section

    +

    1.1 Sub

    +``` + +For backwards compatibility, we want it to work the old way, +giving numbers like 0.1, when `--number-offset` is used: +``` +% pandoc -f markdown -t html --number-sections --number-offset=2,2,2 +## First section + +### Subhead +^D +

    2.3 First section

    +

    2.3.1 Subhead

    + +``` + +``` +% pandoc -f markdown -t html --number-sections --number-offset=0,2,2 +## First section + +### Subhead +^D +

    0.3 First section

    +

    0.3.1 Subhead

    + +``` diff --git a/test/command/5072.md b/test/command/5072.md new file mode 100644 --- /dev/null +++ b/test/command/5072.md @@ -0,0 +1,14 @@ +``` +% pandoc -t latex -i +1. one +2. two +^D +\begin{enumerate} +\def\labelenumi{\arabic{enumi}.} +\tightlist +\item + one +\item + two +\end{enumerate} +``` diff --git a/test/command/5079.md b/test/command/5079.md new file mode 100644 --- /dev/null +++ b/test/command/5079.md @@ -0,0 +1,35 @@ +``` +% pandoc -f html -t native + + + + + + + + +
    Cell
    +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/5080.md b/test/command/5080.md new file mode 100644 --- /dev/null +++ b/test/command/5080.md @@ -0,0 +1,13 @@ +``` +% pandoc -t asciidoc +[foo *bar*]{.small .red key=val} +^D +[.small .red]#foo _bar_# +``` + +``` +% pandoc -f html -t asciidoc +SMALL +^D +[.small]#SMALL# +``` diff --git a/test/command/5081.md b/test/command/5081.md new file mode 100644 --- /dev/null +++ b/test/command/5081.md @@ -0,0 +1,8 @@ +``` +% pandoc -f rst +Go to `g`_ `g `_. +^D +

    Go to g g.

    + +``` diff --git a/test/command/5099.md b/test/command/5099.md new file mode 100644 --- /dev/null +++ b/test/command/5099.md @@ -0,0 +1,29 @@ +``` +% pandoc -t native +(@citation +^D +[ Para + [ Str "(" + , Cite + [ Citation + { citationId = "citation" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "@citation" ] + ] +] +``` + +``` +% pandoc -t native +('asd') +^D +[ Para + [ Str "(" , Quoted SingleQuote [ Str "asd" ] , Str ")" ] +] +``` diff --git a/test/command/5107.md b/test/command/5107.md new file mode 100644 --- /dev/null +++ b/test/command/5107.md @@ -0,0 +1,23 @@ +``` +% pandoc -f muse -t dokuwiki + - foo + 1. bar + - baz +^D + * foo + - bar + * baz + +``` +``` +% pandoc -f muse -t dokuwiki + - foo + 1. bar + 2. baz +^D + * foo + - bar + - baz + +``` + diff --git a/test/command/5116.md b/test/command/5116.md new file mode 100644 --- /dev/null +++ b/test/command/5116.md @@ -0,0 +1,107 @@ +``` +% pandoc -t latex +![This is a figure.](img.jpg) + + Right Left Center Default +------- ------ ---------- ------- + 12 12 12 12 + 123 123 123 123 + 1 1 1 1 + + : Demonstration of simple table syntax. +^D +\begin{figure} +\centering +\pandocbounded{\includegraphics[keepaspectratio,alt={This is a figure.}]{img.jpg}} +\caption{This is a figure.} +\end{figure} + +\begin{longtable}[]{@{}rlcl@{}} +\caption{Demonstration of simple table syntax.}\tabularnewline +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} +\endfirsthead +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} +\endhead +\bottomrule\noalign{} +\endlastfoot +12 & 12 & 12 & 12 \\ +123 & 123 & 123 & 123 \\ +1 & 1 & 1 & 1 \\ +\end{longtable} + +``` + +``` +% pandoc -t latex --figure-caption-position=above --table-caption-position=above +![This is a figure.](img.jpg) + + Right Left Center Default +------- ------ ---------- ------- + 12 12 12 12 + 123 123 123 123 + 1 1 1 1 + + : Demonstration of simple table syntax. +^D +\begin{figure} +\centering +\caption{This is a figure.} +\pandocbounded{\includegraphics[keepaspectratio,alt={This is a figure.}]{img.jpg}} +\end{figure} + +\begin{longtable}[]{@{}rlcl@{}} +\caption{Demonstration of simple table syntax.}\tabularnewline +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} +\endfirsthead +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} +\endhead +\bottomrule\noalign{} +\endlastfoot +12 & 12 & 12 & 12 \\ +123 & 123 & 123 & 123 \\ +1 & 1 & 1 & 1 \\ +\end{longtable} + +``` + +``` +% pandoc -t latex --figure-caption-position=below --table-caption-position=below +![This is a figure.](img.jpg) + + Right Left Center Default +------- ------ ---------- ------- + 12 12 12 12 + 123 123 123 123 + 1 1 1 1 + + : Demonstration of simple table syntax. +^D +\begin{figure} +\centering +\pandocbounded{\includegraphics[keepaspectratio,alt={This is a figure.}]{img.jpg}} +\caption{This is a figure.} +\end{figure} + +\begin{longtable}[]{@{}rlcl@{}} +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} +\endhead +\bottomrule\noalign{} +\tabularnewline +\caption{Demonstration of simple table syntax.} +\endlastfoot +12 & 12 & 12 & 12 \\ +123 & 123 & 123 & 123 \\ +1 & 1 & 1 & 1 \\ +\end{longtable} + +``` diff --git a/test/command/5119.md b/test/command/5119.md new file mode 100644 --- /dev/null +++ b/test/command/5119.md @@ -0,0 +1,9 @@ +``` +% pandoc -t docbook +hi +^D + + hi + +``` + diff --git a/test/command/512.md b/test/command/512.md --- a/test/command/512.md +++ b/test/command/512.md @@ -8,7 +8,8 @@ __ link1_ __ link2_ ^D -

    click here or click here

    +

    click here or click here

    ``` Multiple indirection: @@ -36,7 +37,7 @@ __ link1_ ^D -[WARNING] Circular reference 'link1' at line 1 column 15 +2> [WARNING] Circular reference 'link1' at line 8 column 1

    click here

    ``` diff --git a/test/command/5121.md b/test/command/5121.md new file mode 100644 --- /dev/null +++ b/test/command/5121.md @@ -0,0 +1,13 @@ +``` +% pandoc -f markdown -t markdown_strict +![My caption](./my-figure.jpg){width=500px} + +## Header 2 +^D +
    +My caption + +
    + +## Header 2 +``` diff --git a/test/command/5128.md b/test/command/5128.md new file mode 100644 --- /dev/null +++ b/test/command/5128.md @@ -0,0 +1,26 @@ +``` +% pandoc -f org -t rst --columns=78 +| Option | Meaning | +|--------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| =<= | Left alignment, additional characters are added to the right (default for string). | +| =>= | Right alignment, additional characters are added to the left. | +| =^= | Centered , the same amount of characters is added to the left and the right. | +| === | Padding. If a numeric value is printed with a sign, then additional characters are added after the sign. Otherwise it behaves like "=>=". This option is only available for numbers (default for numbers). | +^D ++--------+-------------------------------------------------------------------+ +| Option | Meaning | ++========+===================================================================+ +| ``<`` | Left alignment, additional characters are added to the right | +| | (default for string). | ++--------+-------------------------------------------------------------------+ +| ``>`` | Right alignment, additional characters are added to the left. | ++--------+-------------------------------------------------------------------+ +| ``^`` | Centered , the same amount of characters is added to the left and | +| | the right. | ++--------+-------------------------------------------------------------------+ +| ``=`` | Padding. If a numeric value is printed with a sign, then | +| | additional characters are added after the sign. Otherwise it | +| | behaves like "``>``". This option is only available for numbers | +| | (default for numbers). | ++--------+-------------------------------------------------------------------+ +``` diff --git a/test/command/5177.md b/test/command/5177.md new file mode 100644 --- /dev/null +++ b/test/command/5177.md @@ -0,0 +1,12 @@ +This should not give a "Prelude.read: no parse" error: + +``` +% pandoc -M foo=1e -s -t markdown +hi +^D +--- +foo: 1e +--- + +hi +``` diff --git a/test/command/5178.md b/test/command/5178.md new file mode 100644 --- /dev/null +++ b/test/command/5178.md @@ -0,0 +1,52 @@ +``` +% pandoc -f rst -t org +.. code:: haskell + :number-lines: 42 + + main = putStrLn "Hello World!" + unsafePerformIO main +^D +#+begin_src haskell -n 42 +main = putStrLn "Hello World!" +unsafePerformIO main +#+end_src +``` + +``` +% pandoc -f org -t native +#+begin_src lisp -n 20 + (+ 1 1) +#+end_src + +#+begin_src lisp +n 10 + (+ 2 2) +#+end_src +^D +[ CodeBlock + ( "" + , [ "commonlisp" , "numberLines" ] + , [ ( "org-language" , "lisp" ) , ( "startFrom" , "20" ) ] + ) + "(+ 1 1)\n" +, CodeBlock + ( "" + , [ "commonlisp" , "numberLines" , "continuedSourceBlock" ] + , [ ( "org-language" , "lisp" ) , ( "startFrom" , "10" ) ] + ) + "(+ 2 2)\n" +] +``` + +``` +% pandoc -f native -t org +[CodeBlock ("",["commonlisp","numberLines"],[("org-language","lisp"),("startFrom","20")]) "(+ 1 1)\n" +,CodeBlock ("",["commonlisp","numberLines","continuedSourceBlock"],[("org-language","lisp"),("startFrom","10")]) "(+ 2 2)\n"] +^D +#+begin_src lisp -n 20 +(+ 1 1) +#+end_src + +#+begin_src lisp +n 10 +(+ 2 2) +#+end_src +``` diff --git a/test/command/5182.md b/test/command/5182.md new file mode 100644 --- /dev/null +++ b/test/command/5182.md @@ -0,0 +1,9 @@ +``` +% pandoc -f rst -t native +.. include:: command/5182.txt +^D +[ CodeBlock + ( "" , [ "python" , "numberLines" ] , [] ) + "def func(x):\n return y" +] +``` diff --git a/test/command/5182.txt b/test/command/5182.txt new file mode 100644 --- /dev/null +++ b/test/command/5182.txt @@ -0,0 +1,5 @@ +.. code::python + :number-lines: + + def func(x): + return y diff --git a/test/command/5195.md b/test/command/5195.md new file mode 100644 --- /dev/null +++ b/test/command/5195.md @@ -0,0 +1,7 @@ +``` +% pandoc -f markdown_strict -t gfm+hard_line_breaks +Hello +there +^D +Hello there +``` diff --git a/test/command/5233.md b/test/command/5233.md new file mode 100644 --- /dev/null +++ b/test/command/5233.md @@ -0,0 +1,9 @@ +``` +% pandoc -f latex -t plain +foo +\endinput +bar +^D +foo +``` + diff --git a/test/command/5241.md b/test/command/5241.md new file mode 100644 --- /dev/null +++ b/test/command/5241.md @@ -0,0 +1,12 @@ +``` +% pandoc -f markdown -t html5 + +^D + +``` diff --git a/test/command/5271.md b/test/command/5271.md new file mode 100644 --- /dev/null +++ b/test/command/5271.md @@ -0,0 +1,41 @@ +``` +% pandoc -f markdown -t native -s +--- +abstract: | + This is the abstract. + + It consists of two paragraphs. +... +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "abstract" + , MetaBlocks + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "abstract." + ] + , Para + [ Str "It" + , Space + , Str "consists" + , Space + , Str "of" + , Space + , Str "two" + , Space + , Str "paragraphs." + ] + ] + ) + ] + } + [] +``` diff --git a/test/command/5285.md b/test/command/5285.md new file mode 100644 --- /dev/null +++ b/test/command/5285.md @@ -0,0 +1,32 @@ +``` +% pandoc -t native +- a + + b +- a + +- b +^D +[ BulletList + [ [ Para [ Str "a" ] , Para [ Str "b" ] ] + , [ Para [ Str "a" ] ] + , [ Para [ Str "b" ] ] + ] +] +``` + +``` +% pandoc -t native +- foo + + foo +- foo + + > foo +^D +[ BulletList + [ [ Para [ Str "foo" ] , Para [ Str "foo" ] ] + , [ Para [ Str "foo" ] , BlockQuote [ Para [ Str "foo" ] ] ] + ] +] +``` diff --git a/test/command/5304.md b/test/command/5304.md new file mode 100644 --- /dev/null +++ b/test/command/5304.md @@ -0,0 +1,24 @@ +```` +% pandoc -f markdown -t markdown +``` {.markdown} +`«sträng»` + +`` «sträng» `` + +``` «sträng» ``` + +````«sträng»```` +... +``` +^D +``` markdown +`«sträng»` + +`` «sträng» `` + +``` «sträng» ``` + +````«sträng»```` +... +``` +```` diff --git a/test/command/5321.md b/test/command/5321.md new file mode 100644 --- /dev/null +++ b/test/command/5321.md @@ -0,0 +1,41 @@ +``` +% pandoc -f jats -t native + + +

    bar

    + + + baz + +     +^D +[ Figure + ( "fig-1" , [] , [] ) + (Caption Nothing [ Plain [ Str "bar" ] ]) + [ Para + [ Image ( "" , [] , [] ) [ Str "baz" ] ( "foo.png" , "" ) ] + ] +] +``` + +``` +% pandoc -f jats -t native + + + foo +

    bar

    + + + baz + +     +^D +[ Figure + ( "fig-1" , [] , [] ) + (Caption + Nothing [ Plain [ Str "foo" , LineBreak , Str "bar" ] ]) + [ Para + [ Image ( "" , [] , [] ) [ Str "baz" ] ( "foo.png" , "" ) ] + ] +] +``` diff --git a/test/command/5340.md b/test/command/5340.md new file mode 100644 --- /dev/null +++ b/test/command/5340.md @@ -0,0 +1,14 @@ +``` +% pandoc -f html -t latex --wrap=preserve +https://example.com/foo-bar +https://example.com/foo--bar +https://example.com/foo-bar +https://example.com/foo--bar +https://example.com/foo%2D%2Dbar +^D +\url{https://example.com/foo-bar} +\url{https://example.com/foo--bar} +\url{https://example.com/foo\%2Dbar} +\url{https://example.com/foo\%2D\%2Dbar} +\url{https://example.com/foo\%2D\%2Dbar} +``` diff --git a/test/command/5360.md b/test/command/5360.md new file mode 100644 --- /dev/null +++ b/test/command/5360.md @@ -0,0 +1,22 @@ +``` +% pandoc -t native +::: {.foo} + + + + +
    hi
    +::: +^D +[ Div + ( "" , [ "foo" ] , [] ) + [ RawBlock (Format "html") "" + , RawBlock (Format "html") "" + , RawBlock (Format "html") "" + , RawBlock (Format "html") "" + , RawBlock (Format "html") "
    " + , Plain [ Str "hi" ] + , RawBlock (Format "html") "
    " + ] +] +``` diff --git a/test/command/5367.md b/test/command/5367.md new file mode 100644 --- /dev/null +++ b/test/command/5367.md @@ -0,0 +1,44 @@ +``` +% pandoc -t latex +hello[^1] + +: Sample table.[^2] + +----------- + Fruit[^3] +----------- + Bans[^4] +----------- + +dolly[^5] + +[^1]: doc footnote +[^2]: caption footnote +[^3]: header footnote +[^4]: table cell footnote +[^5]: doc footnote +^D +hello\footnote{doc footnote} + +\begin{longtable}[]{@{} + >{\centering\arraybackslash}p{(\linewidth - 0\tabcolsep) * \real{0.1667}}@{}} +\caption[Sample table.]{Sample table.\footnote{caption footnote}}\tabularnewline +\toprule\noalign{} +\begin{minipage}[b]{\linewidth}\centering +Fruit\footnote{header footnote} +\end{minipage} \\ +\midrule\noalign{} +\endfirsthead +\toprule\noalign{} +\begin{minipage}[b]{\linewidth}\centering +Fruit{} +\end{minipage} \\ +\midrule\noalign{} +\endhead +\bottomrule\noalign{} +\endlastfoot +Bans\footnote{table cell footnote} \\ +\end{longtable} + +dolly\footnote{doc footnote} +``` diff --git a/test/command/5368.md b/test/command/5368.md new file mode 100644 --- /dev/null +++ b/test/command/5368.md @@ -0,0 +1,49 @@ +``` +% pandoc -t native +1. foo + + ![bar](bar.png) +2. foo2 + + ![bar2](bar2.png) +3. foo3 + + ![foo3](foo3.png) + +Quux. +^D +[ OrderedList + ( 1 , Decimal , Period ) + [ [ Para [ Str "foo" ] + , Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "bar" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [ Str "bar" ] ( "bar.png" , "" ) + ] + ] + ] + , [ Para [ Str "foo2" ] + , Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "bar2" ] ]) + [ Plain + [ Image + ( "" , [] , [] ) [ Str "bar2" ] ( "bar2.png" , "" ) + ] + ] + ] + , [ Para [ Str "foo3" ] + , Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "foo3" ] ]) + [ Plain + [ Image + ( "" , [] , [] ) [ Str "foo3" ] ( "foo3.png" , "" ) + ] + ] + ] + ] +, Para [ Str "Quux." ] +] +``` diff --git a/test/command/5369.md b/test/command/5369.md new file mode 100644 --- /dev/null +++ b/test/command/5369.md @@ -0,0 +1,7 @@ +``` +% pandoc -f native -t markdown +[Div ("",[],[("tags","[\"o\\ne\",\"two\"]")]) [] ] +^D +::: {tags="[\"o\\ne\",\"two\"]"} +::: +``` diff --git a/test/command/5407.md b/test/command/5407.md new file mode 100644 --- /dev/null +++ b/test/command/5407.md @@ -0,0 +1,14 @@ +``` +% pandoc -t latex --wrap=preserve +hi there?“ +hi there!“ +hi there?‘ +hi there!‘ +hi there! +^D +hi there?{\kern0pt}`` +hi there!{\kern0pt}`` +hi there?{\kern0pt}` +hi there!{\kern0pt}` +hi there! +``` diff --git a/test/command/5410.md b/test/command/5410.md new file mode 100644 --- /dev/null +++ b/test/command/5410.md @@ -0,0 +1,7 @@ +``` +% pandoc -f man -t native +.ie n \{\ +'br\} +^D +[ Para [ LineBreak ] ] +``` diff --git a/test/command/5416.md b/test/command/5416.md new file mode 100644 --- /dev/null +++ b/test/command/5416.md @@ -0,0 +1,13 @@ +``` +% pandoc -f dokuwiki -t native +{ +^D +[ Para [ Str "{" ] ] +``` + +``` +% pandoc -f dokuwiki -t native +{{ +^D +[ Para [ Str "{{" ] ] +``` diff --git a/test/command/5420.md b/test/command/5420.md new file mode 100644 --- /dev/null +++ b/test/command/5420.md @@ -0,0 +1,6 @@ +``` +% pandoc --syntax-highlighting=idiomatic -t latex +`int a = 1;`{.cpp style=cpp} +^D +\passthrough{\lstinline[language={C++}, style=cpp]!int a = 1;!} +``` diff --git a/test/command/5439.md b/test/command/5439.md new file mode 100644 --- /dev/null +++ b/test/command/5439.md @@ -0,0 +1,6 @@ +``` +% pandoc -t latex +namespace\fshyp{}container +^D +namespace\fshyp{}container +``` diff --git a/test/command/5446.md b/test/command/5446.md new file mode 100644 --- /dev/null +++ b/test/command/5446.md @@ -0,0 +1,6 @@ +``` +% pandoc -f latex -t rst +{\em test test \/} +^D +*test test* +``` diff --git a/test/command/5474-figures.md b/test/command/5474-figures.md new file mode 100644 --- /dev/null +++ b/test/command/5474-figures.md @@ -0,0 +1,15 @@ +``` +% pandoc -t opendocument+native_numbering + +![First image](lalune.jpg) + +![Second image](lalune.jpg) + +^D + +Figure 1: First +image + +Figure 2: Second +image +``` diff --git a/test/command/5474-tables.md b/test/command/5474-tables.md new file mode 100644 --- /dev/null +++ b/test/command/5474-tables.md @@ -0,0 +1,63 @@ +``` +% pandoc -t opendocument+native_numbering + Right Left +------- ------ + 12 11 + +: First table + + Right Left +------- ------ + 13 14 + +: Second Table +^D +Table 1: First +table + + + + + + + Right + + + Left + + + + + + 12 + + + 11 + + + +Table 2: Second +Table + + + + + + + Right + + + Left + + + + + + 13 + + + 14 + + + +``` diff --git a/test/command/5476.md b/test/command/5476.md new file mode 100644 --- /dev/null +++ b/test/command/5476.md @@ -0,0 +1,12 @@ +``` +% pandoc -t latex +![moon^[the moon]](test/lalune.jpg) +^D +\begin{figure} +\centering +\pandocbounded{\includegraphics[keepaspectratio,alt={moon}]{test/lalune.jpg}} +\caption[moon]{moon\footnotemark{}} +\end{figure} +\footnotetext{the moon} +``` + diff --git a/test/command/5495.md b/test/command/5495.md new file mode 100644 --- /dev/null +++ b/test/command/5495.md @@ -0,0 +1,18 @@ +``` +% pandoc -t markdown --reference-links +All because of [1](#one) link... + +[This](#foo) will break Pandoc. + +[This](#bar) will make you laugh. +^D +All because of [1] link... + +[This] will break Pandoc. + +[This][2] will make you laugh. + + [1]: #one + [This]: #foo + [2]: #bar +``` diff --git a/test/command/5519.md b/test/command/5519.md new file mode 100644 --- /dev/null +++ b/test/command/5519.md @@ -0,0 +1,14 @@ +~~~ +% pandoc -t markdown +``````{.attr} + ``` + code + ``` +`````` +^D +```` attr + ``` + code + ``` +```` +~~~ diff --git a/test/command/5529.md b/test/command/5529.md new file mode 100644 --- /dev/null +++ b/test/command/5529.md @@ -0,0 +1,10 @@ +``` +% pandoc -t latex +~~`hello world`~~ + +~~_`hello world`_~~ +^D +\st{\mbox{\texttt{hello\ world}}} + +\st{\emph{\mbox{\texttt{hello\ world}}}} +``` diff --git a/test/command/5540.md b/test/command/5540.md new file mode 100644 --- /dev/null +++ b/test/command/5540.md @@ -0,0 +1,14 @@ +``` +% pandoc -f latex -t native +\begin{lstlisting}[language=myfunnylanguage] +Stay pure! +\end{lstlisting} +^D +[ CodeBlock + ( "" + , [ "myfunnylanguage" ] + , [ ( "language" , "myfunnylanguage" ) ] + ) + "Stay pure!" +] +``` diff --git a/test/command/5541-localLink.md b/test/command/5541-localLink.md new file mode 100644 --- /dev/null +++ b/test/command/5541-localLink.md @@ -0,0 +1,149 @@ +``` +% pandoc -f markdown -t icml -s + +# Header 1 + +this is some text + +## Header 2 + +some more text that [links to](#header-1) the first header. And this links to [some text](#spanner) in 2.1. + +## Header 2.1 + +if you can read this text, [and it's linked]{#spanner} - all good! + +^D + + + + + + + + + $ID/NormalCharacterStyle + + + + + + + + + LeftAlign + . + + 10 + + + + + + + $ID/NormalParagraphStyle + + + + + $ID/NormalParagraphStyle + + + + + $ID/NormalParagraphStyle + + + + + + + + + + + + + + + + + Header 1 + + +
    + + + this is some text + + +
    + + + + Header 2 + + +
    + + + some more text that + + + + the first header. And this links to + + + + in 2.1. + + +
    + + + + Header 2.1 + + +
    + + + if you can read this text, + + + + and it’s linked + + + - all good! + + + +     + + + Black + HyperlinkTextDestination/#spanner + + + + + Black + HyperlinkTextDestination/#header-1 + + +     +``` diff --git a/test/command/5541-nesting.md b/test/command/5541-nesting.md new file mode 100644 --- /dev/null +++ b/test/command/5541-nesting.md @@ -0,0 +1,98 @@ +``` +% pandoc -f html -t icml -s + +
    +
    + + + +
    +
    + +^D + + + + + + + + + $ID/NormalCharacterStyle + + + + + + + + + LeftAlign + . + + 10 + + + + + + + $ID/NormalParagraphStyle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $ID/Embedded + + + + + + + + + + + + + + + + +``` diff --git a/test/command/5541-urlLink.md b/test/command/5541-urlLink.md new file mode 100644 --- /dev/null +++ b/test/command/5541-urlLink.md @@ -0,0 +1,112 @@ +``` +% pandoc -f markdown -t icml -s + +# Header 1 + +this is some text + +## Header 2 + +some more text that [links to](https://www.pandoc.org) Pandoc. + +^D + + + + + + + + + $ID/NormalCharacterStyle + + + + + + + + + LeftAlign + . + + 10 + + + + + + + $ID/NormalParagraphStyle + + + + + $ID/NormalParagraphStyle + + + + + $ID/NormalParagraphStyle + + + + + + + + + + + + + + + + + Header 1 + + +
    + + + this is some text + + +
    + + + + Header 2 + + +
    + + + some more text that + + + + Pandoc. + + + +     + + + + Black + HyperlinkURLDestination/https%3a//www.pandoc.org + + +     +``` diff --git a/test/command/5543.md b/test/command/5543.md new file mode 100644 --- /dev/null +++ b/test/command/5543.md @@ -0,0 +1,8 @@ +``` +% pandoc -t markdown +1\. item +: description +^D +1\. item +: description +``` diff --git a/test/command/5549.md b/test/command/5549.md new file mode 100644 --- /dev/null +++ b/test/command/5549.md @@ -0,0 +1,8 @@ +``` +% pandoc -t native +## + +[] +^D +[ Header 2 ( "section" , [] , [] ) [] , Para [ Str "[]" ] ] +``` diff --git a/test/command/5565.md b/test/command/5565.md new file mode 100644 --- /dev/null +++ b/test/command/5565.md @@ -0,0 +1,6 @@ +``` +% pandoc -t asciidoc +***hi*** +^D +*_hi_* +``` diff --git a/test/command/5566.md b/test/command/5566.md new file mode 100644 --- /dev/null +++ b/test/command/5566.md @@ -0,0 +1,6 @@ +``` +% pandoc -t asciidoc -f html +foo foo foo foo +^D +fo[.c]##o## f[.c]##o##o [.c]##f##oo [.c]#foo# +``` diff --git a/test/command/5574.md b/test/command/5574.md new file mode 100644 --- /dev/null +++ b/test/command/5574.md @@ -0,0 +1,7 @@ +No highlighting inside heading: +``` +% pandoc -t latex +# `foo`{.cpp} +^D +\section{\texorpdfstring{\texttt{foo}}{foo}}\label{foo} +``` diff --git a/test/command/5619.md b/test/command/5619.md new file mode 100644 --- /dev/null +++ b/test/command/5619.md @@ -0,0 +1,66 @@ +``` +% pandoc -f rst -t native +.. figure:: img1.jpg + :width: 1in + :name: test + + The caption. Here's what piggybacking on caption would look like {#fig:1} +^D +[ Figure + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "The" + , Space + , Str "caption." + , Space + , Str "Here's" + , Space + , Str "what" + , Space + , Str "piggybacking" + , Space + , Str "on" + , Space + , Str "caption" + , Space + , Str "would" + , Space + , Str "look" + , Space + , Str "like" + , Space + , Str "{#fig:1}" + ] + ]) + [ Plain + [ Image + ( "test" , [] , [ ( "width" , "1in" ) ] ) + [ Str "The" + , Space + , Str "caption." + , Space + , Str "Here's" + , Space + , Str "what" + , Space + , Str "piggybacking" + , Space + , Str "on" + , Space + , Str "caption" + , Space + , Str "would" + , Space + , Str "look" + , Space + , Str "like" + , Space + , Str "{#fig:1}" + ] + ( "img1.jpg" , "" ) + ] + ] +] +``` diff --git a/test/command/5620.md b/test/command/5620.md new file mode 100644 --- /dev/null +++ b/test/command/5620.md @@ -0,0 +1,9 @@ +``` +% pandoc -t man +`-o`, `--output=`*OUTFILE* +: Write output to *OUTFILE* instead of `stdout`(3) +^D +.TP +\f[CR]\-o\f[R], \f[CR]\-\-output=\f[R]\f[I]OUTFILE\f[R] +Write output to \f[I]OUTFILE\f[R] instead of \f[CR]stdout\f[R](3) +``` diff --git a/test/command/5627.md b/test/command/5627.md new file mode 100644 --- /dev/null +++ b/test/command/5627.md @@ -0,0 +1,87 @@ +``` +% pandoc -t html +## Example + +1. One +2. Two `-->somethingsomethingsomethingsomething elseonetwo + + + + LeftAlign + . + + 10 + + + + + + + $ID/NormalParagraphStyle + + + + + $ID/NormalParagraphStyle + + + + + $ID/NormalParagraphStyle + + + + + + + + + + + + + + + + + Header 1 + + +
    + + + this is some text + + +
    + + + + Header 2 + + +
    + + + some more text that + + + + Pandoc. + + +
    + + + and some text that + + + + the first header + + + +     + + + Black + HyperlinkTextDestination/#header-1 + + + + + + Black + HyperlinkURLDestination/https%3a//www.pandoc.org + + + +``` diff --git a/test/command/6699.md b/test/command/6699.md new file mode 100644 --- /dev/null +++ b/test/command/6699.md @@ -0,0 +1,15 @@ +``` +% pandoc -f rst -t native +.. class:: allowframebreaks + +title +----- + +text +^D +[ Header + 1 ( "title" , [ "allowframebreaks" ] , [] ) [ Str "title" ] +, Para [ Str "text" ] +] +``` + diff --git a/test/command/6709.md b/test/command/6709.md new file mode 100644 --- /dev/null +++ b/test/command/6709.md @@ -0,0 +1,13 @@ +Tabs must be expanded even if --file-scope is used +```` +% pandoc -t native --file-scope --tab-stop=2 +``` +if true; then + echo "yup" +fi +``` +^D +[ CodeBlock + ( "" , [] , [] ) "if true; then\n echo \"yup\"\nfi" +] +```` diff --git a/test/command/6719.md b/test/command/6719.md new file mode 100644 --- /dev/null +++ b/test/command/6719.md @@ -0,0 +1,18 @@ +``` +% pandoc -f docbook -t native + +emphasized text + +^D +[ Para [ Emph [ Str "emphasized" , Space ] , Str "text" ] ] +``` + +``` +% pandoc -f jats -t native +

    + hi there +

    +^D +[ Para [ Emph [ Space , Str "hi" , Space ] , Str "there" ] ] +``` + diff --git a/test/command/6723.md b/test/command/6723.md new file mode 100644 --- /dev/null +++ b/test/command/6723.md @@ -0,0 +1,32 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/chicago-fullnote-bibliography.csl +references: +- id: doe + type: article + author: + - family: Doe + given: John + DOI: 10.1109/5.771073 + issued: + - year: 2020 + title: An article +... +Blah [@doe]. + +# References {-} + +^D +Blah.[^1] + +# References {#references .unnumbered} + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-doe .csl-entry} +Doe, John. "An Article," 2020. . +::: +:::: + +[^1]: John Doe, "An Article," 2020, . +``` diff --git a/test/command/6739.md b/test/command/6739.md new file mode 100644 --- /dev/null +++ b/test/command/6739.md @@ -0,0 +1,22 @@ +``` +% pandoc -f gfm +* `--argument` This item does not have a pipe character +* `--argA | --argB` This item has a pipe character +^D +
      +
    • --argument This item does not have a pipe +character
      • +
    • --argA | --argB This item has a pipe character
      • +
    +``` + +``` +% pandoc --mathjax -f gfm+tex_math_dollars +* $|x|$ +* $|y|$ +^D +
      +
    • \(|x|\)
      • +
    • \(|y|\)
      • +
    +``` diff --git a/test/command/6740.md b/test/command/6740.md new file mode 100644 --- /dev/null +++ b/test/command/6740.md @@ -0,0 +1,7 @@ +``` +% pandoc -t gfm + +^D + +``` + diff --git a/test/command/6741.md b/test/command/6741.md new file mode 100644 --- /dev/null +++ b/test/command/6741.md @@ -0,0 +1,145 @@ +``` +% pandoc --citeproc --csl command/ieee.csl -t plain +--- +title: 'A Simple Citations Test' +author: 'Joanna Doe' +references: +- author: + - family: Mathôt + given: S + container-title: Annual review of vision science + DOI: 10.1146/annurev-vision-030320-062352 + id: mathot2020 + issued: 2020 + title: "Tuning the senses: How the pupil shapes vision at the earliest + stage." + title-short: Tuning the senses + type: article-journal +- author: + - family: Zokaei + given: Nahid + - family: Board + given: Alexander G. + - family: Manohar + given: Sanjay G. + - family: Nobre + given: Anna C. + container-title: Proceedings of the National Academy of Sciences of + the United States of America + DOI: 10.1073/pnas.1909959116 + id: zokaei2019 + issued: 2019 + page: 201909959 + title: Modulation of the pupillary response by the content of visual + working memory + type: article-journal +- author: + - family: Suzuki + given: Y. + - family: Minami + given: T. + - family: Laeng + given: B. + - family: Nakauchi + given: S. + container-title: Acta Psychologica + DOI: 10.1016/j.actpsy.2019.102882 + id: suzuki2019 + issued: 2019 + page: 102882 + title: "Colorful glares: Effects of colors on brightness illusions + measured with pupillometry." + title-short: Colorful glares + type: article-journal + volume: 198 +- author: + - family: Brainard + given: David H. + - family: Hurlbert + given: Anya + container-title: Current Biology + DOI: 10.1016/j.cub.2015.05.020 + id: brainard2015a + issue: 13 + issued: 2015 + page: R551-R554 + title: "Colour vision: Understanding \\#TheDress" + title-short: Colour vision + type: article-journal + volume: 25 +- author: + - family: Cavanagh + given: Patrick + container-title: Limits of vision + editor: + - family: Crody-Dillon + given: John R. + id: cavanagh1991 + issued: 1991 + page: 234-250 + publisher: CRC Press + title: Vision at equiluminance + type: chapter +- author: + - family: Brainard + given: David H. + container-title: Annual Review of Vision Science + DOI: 10.1146/annurev-vision-082114-035341 + id: brainard2015 + issued: 2015 + page: 519-546 + title: Color and the cone mosaic + type: article-journal + volume: 1 +... + +# First Heading # +Here is some **text**. And a reference [@brainard2015;@brainard2015a]. + +# Second Heading # +Here is some *text*[@cavanagh1991]. And a reference [@cavanagh1991;@brainard2015]. + +# Third Heading # +Here is some [text]{.underline}. And a reference [@mathot2020;@zokaei2019;@suzuki2019]. + +::: {#refs} +## Bibliography ## +::: +^D +First Heading + +Here is some text. And a reference [1], [2]. + +Second Heading + +Here is some text[3]. And a reference [1], [3]. + +Third Heading + +Here is some text. And a reference [4]–[6]. + +Bibliography + +[1] D. H. Brainard, “Color and the cone mosaic,” Annual Review of Vision +Science, vol. 1, pp. 519–546, 2015. + +[2] D. H. Brainard and A. Hurlbert, “Colour vision: Understanding +#TheDress,” Current Biology, vol. 25, no. 13, pp. R551–R554, 2015. + +[3] P. Cavanagh, “Vision at equiluminance,” in Limits of vision, J. R. +Crody-Dillon, Ed. CRC Press, 1991, pp. 234–250. + +[4] S. Mathôt, “Tuning the senses: How the pupil shapes vision at the +earliest stage.” Annual review of vision science, 2020. + +[5] N. Zokaei, A. G. Board, S. G. Manohar, and A. C. Nobre, “Modulation +of the pupillary response by the content of visual working memory,” +Proceedings of the National Academy of Sciences of the United States of +America, p. 201909959, 2019. + +[6] Y. Suzuki, T. Minami, B. Laeng, and S. Nakauchi, “Colorful glares: +Effects of colors on brightness illusions measured with pupillometry.” +Acta Psychologica, vol. 198, p. 102882, 2019. + +``` + diff --git a/test/command/6752.md b/test/command/6752.md new file mode 100644 --- /dev/null +++ b/test/command/6752.md @@ -0,0 +1,36 @@ +``` +% pandoc -f biblatex -t csljson +@xdata{XDPubAlfredAKnopf, +    publisher   = {Alfred A.~Knopf}, +    address     = {New York, NY} +} +@book{Klinkenborg2012, +    author      = {Verlyn Klinkenborg}, +    title       = {Several short sentences about writing}, +    date        = {2012}, +    xdata       = {XDPubAlfredAKnopf}, +} +^D +[ + { + "author": [ + { + "family": "Klinkenborg", + "given": "Verlyn" + } + ], + "id": "Klinkenborg2012", + "issued": { + "date-parts": [ + [ + 2012 + ] + ] + }, + "publisher": "Alfred A. Knopf", + "publisher-place": "New York, NY", + "title": "Several short sentences about writing", + "type": "book" + } +] +``` diff --git a/test/command/6755.md b/test/command/6755.md new file mode 100644 --- /dev/null +++ b/test/command/6755.md @@ -0,0 +1,11 @@ +``` +%pandoc -f native -t opendocument +[Div ("divId",[],[]) + [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "div."]], +Para [Span ("spanId",[],[]) [Str "And",Space,Str "here",Space,Str "is",Space,Str "a",Space,Str "span."]]] +^D +Here +is a div. +And +here is a span. +``` diff --git a/test/command/6765.md b/test/command/6765.md new file mode 100644 --- /dev/null +++ b/test/command/6765.md @@ -0,0 +1,31 @@ +``` +% pandoc --citeproc -t plain +@book_chapter_1 [55] says blah. + +--- +csl: command/chicago-fullnote-bibliography.csl +references: +- id: book_chapter_1 + author: + - family: Author + given: Ann + container-title: A book + editor: + - family: Editor + given: Edward + issued: 2014 + page: 48-67 + publisher: A publisher + publisher-place: A place + title: A book chapter + type: chapter +... +^D +Ann Author[1] says blah. + +Author, Ann. “A Book Chapter.” In A Book, edited by Edward Editor, +48–67. A place: A publisher, 2014. + +[1] “A Book Chapter,” in A Book, ed. Edward Editor (A place: A +publisher, 2014), 55. +``` diff --git a/test/command/6768.md b/test/command/6768.md new file mode 100644 --- /dev/null +++ b/test/command/6768.md @@ -0,0 +1,21 @@ +``` +% pandoc -tcommonmark +::: custom_div +This is a div +::: +^D +
    + +This is a div + +
    +``` + +``` +% pandoc -tcommonmark-raw_html +::: custom_div +This is a div +::: +^D +This is a div +``` diff --git a/test/command/6774.md b/test/command/6774.md new file mode 100644 --- /dev/null +++ b/test/command/6774.md @@ -0,0 +1,63 @@ +``` +% pandoc -f native -t opendocument --quiet +[Header 1 ("chapter1",[],[]) [Str "The",Space,Str "Chapter"] +,Para [Str "Chapter",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "The",Space,Str "Chapter"] ("#chapter1","")]] +^D +The +Chapter +Chapter 1 references +The +Chapter +``` +``` +% pandoc -f native -t opendocument+xrefs_name --quiet +[Header 1 ("chapter1",[],[]) [Str "The",Space,Str "Chapter"] +,Para [Str "Chapter",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "The",Space,Str "Chapter"] ("#chapter1","")] +,Figure ("lalune",[],[]) (Caption Nothing [Para [Str "Voyage dans la Lune"]]) [Plain [Image ("",[],[]) [Str "lalune"] ("lalune.jpg","")]] +,Para [Str "Image",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "La",Space,Str "Lune"] ("#lalune","")]] +^D +The +Chapter +Chapter 1 references +The +Chapter + +Voyage dans la Lune +Image 1 references +La +Lune +``` +``` +% pandoc -f native -t opendocument+xrefs_number --quiet +[Header 1 ("chapter1",[],[]) [Str "The",Space,Str "Chapter"] +,Para [Str "Chapter",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "The",Space,Str "Chapter"] ("#chapter1","")] +,Figure ("lalune",[],[]) (Caption Nothing [Para [Str "lalune"]]) [Plain [Image ("",[],[]) [Str "lalune"] ("lalune.jpg","Voyage dans la Lune")]] +,Para [Str "Image",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "La",Space,Str "Lune"] ("#lalune","")]] +^D +The +Chapter +Chapter 1 references + + +lalune +Image 1 references + +``` +``` +% pandoc -f native -t opendocument+xrefs_number+xrefs_name --quiet +[Header 1 ("chapter1",[],[]) [Str "The",Space,Str "Chapter"] +,Para [Str "Chapter",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "The",Space,Str "Chapter"] ("#chapter1","")] +,Figure ("lalune",[],[]) (Caption Nothing [Para [Str "Voyage dans la Lune"]]) [Plain [Image ("",[],[]) [Str "lalune"] ("lalune.jpg","")]] +,Para [Str "Image",Space,Str "1",Space,Str "references",Space,Link ("",[],[]) [Str "La",Space,Str "Lune"] ("#lalune","")]] +^D +The +Chapter +Chapter 1 references +The +Chapter + +Voyage dans la Lune +Image 1 references +La +Lune +``` diff --git a/test/command/6783.md b/test/command/6783.md new file mode 100644 --- /dev/null +++ b/test/command/6783.md @@ -0,0 +1,26 @@ +``` +% pandoc -f markdown -t plain -s --citeproc +--- +references: +- author: + - family: Jupyter + given: Project + container-title: Proceedings of the 17th Python in Science Conference + id: 'ref-1' + issued: 2018 + title: 'Binder 2.0 - Reproducible, interactive, sharable environments for science at scale' + type: 'paper-conference' + volume: +... + +This is a test[@ref-1]. +^D + + +This is a test(Jupyter 2018). + +Jupyter, Project. 2018. “Binder 2.0 - Reproducible, Interactive, +Sharable Environments for Science at Scale.” Proceedings of the 17th +Python in Science Conference. +``` + diff --git a/test/command/6791.md b/test/command/6791.md new file mode 100644 --- /dev/null +++ b/test/command/6791.md @@ -0,0 +1,47 @@ +``` +% pandoc -f docbook -t native --quiet + + + + + + + +2 +1 + + + + +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.25 ) + , ( AlignDefault , ColWidth 0.25 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/6792.md b/test/command/6792.md new file mode 100644 --- /dev/null +++ b/test/command/6792.md @@ -0,0 +1,66 @@ +``` +% pandoc -f native -t opendocument -s --quiet +[Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 0.25) + ,(AlignDefault,ColWidth 0.25)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) + [Para [Str "1"]]]])] + (TableFoot ("",[],[]) + [])] +^D + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + 1 + + + + + + +``` diff --git a/test/command/6796.md b/test/command/6796.md new file mode 100644 --- /dev/null +++ b/test/command/6796.md @@ -0,0 +1,16 @@ +``` +% pandoc -f latex -t markdown +\newcommand{\cL}{\mathcal{L}} +\newcommand{\til}[1]{\tilde{#1}} + +$$\til\cL$$ + +\newcommand{\mc}[1]{\mathcal{#1}} +\newcommand{\dL}{\mc{L}} + +$$\til\dL$$ +^D +$$\tilde{\mathcal{L}}$$ + +$$\tilde{\mathcal{L}}$$ +``` diff --git a/test/command/6802.md b/test/command/6802.md new file mode 100644 --- /dev/null +++ b/test/command/6802.md @@ -0,0 +1,8 @@ +``` +% pandoc -f latex -t native +\blockquote[test][]{quote} +^D +[ BlockQuote [ Para [ Str "quote" ] , Para [ Str "test" ] ] +] + +``` diff --git a/test/command/6821.md b/test/command/6821.md new file mode 100644 --- /dev/null +++ b/test/command/6821.md @@ -0,0 +1,80 @@ +``` +% pandoc -f native -t latex +[ Para [ Code ( "" , [ "python" ] , [] ) "x = 5" ] +, Figure + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "test" + , Space + , Code ( "" , [ "python" ] , [] ) "x = 5" + ] + ]) + [ Plain + [ Image + ( "" , [] , [] ) + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "test" + , Space + , Code ( "" , [ "python" ] , [] ) "x = 5" + ] + ( "test.png" , "" ) + ] + ] +, Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain [ Code ( "" , [ "cpp" ] , [] ) "caption" ] ]) + [ ( AlignDefault , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ] + (TableFoot + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "A" ] ] + ] + ]) +, Para [ Code ( "" , [ "cpp" ] , [] ) "caption" ] +] +^D +\VERB|\NormalTok{x }\OperatorTok{=} \DecValTok{5}| + +\begin{figure} +\centering +\pandocbounded{\includegraphics[keepaspectratio,alt={This is a test x = 5}]{test.png}} +\caption{This is a test +\protect\VERB|\NormalTok{x }\OperatorTok{=} \DecValTok{5}|} +\end{figure} + +\begin{longtable}[]{@{}l@{}} +\caption{\protect\VERB|\NormalTok{caption}|}\tabularnewline +\toprule\noalign{} +\endfirsthead +\endhead +\midrule\noalign{} +A \\ +\bottomrule\noalign{} +\endlastfoot +\end{longtable} + +\VERB|\NormalTok{caption}| +``` diff --git a/test/command/6836.md b/test/command/6836.md new file mode 100644 --- /dev/null +++ b/test/command/6836.md @@ -0,0 +1,41 @@ +``` +% pandoc -t native +[@buchanan] + +(@foo) + +See @foo. + +[@buchanan] +^D +[ Para + [ Cite + [ Citation + { citationId = "buchanan" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "[@buchanan]" ] + ] +, OrderedList ( 1 , Example , TwoParens ) [ [] ] +, Para [ Str "See" , Space , Str "1." ] +, Para + [ Cite + [ Citation + { citationId = "buchanan" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 2 + , citationHash = 0 + } + ] + [ Str "[@buchanan]" ] + ] +] +``` + diff --git a/test/command/6837.md b/test/command/6837.md new file mode 100644 --- /dev/null +++ b/test/command/6837.md @@ -0,0 +1,29 @@ +``` +% pandoc -t markdown --markdown-headings=setext +## Hi + +### Ok +^D +Hi +-- + +### Ok +``` + +``` +% pandoc -t markdown+lhs +# Hi +^D +2> [WARNING] Rendering heading 'Hi' as a paragraph. +2> ATX headings cannot be used in literate Haskell, because '#' is not +2> allowed in column 1. Consider using --markdown-headings=setext. +Hi +``` + +``` +% pandoc -t markdown --markdown-headings=atx +Hi +-- +^D +## Hi +``` diff --git a/test/command/6844.md b/test/command/6844.md new file mode 100644 --- /dev/null +++ b/test/command/6844.md @@ -0,0 +1,27 @@ +Negative numbers with siunitx + +``` +% pandoc -f latex -t native +\SI{123}{\celsius} + +^D +[ Para [ Str "123\160\176C" ] ] +``` + +``` +% pandoc -f latex -t native +\SI{-123}{\celsius} + +^D +[ Para [ Str "\8722\&123\160\176C" ] ] +``` + +``` +% pandoc -f latex -t native +\SI{+123}{\celsius} + +^D +[ Para [ Str "123\160\176C" ] ] +``` + + diff --git a/test/command/6855.md b/test/command/6855.md new file mode 100644 --- /dev/null +++ b/test/command/6855.md @@ -0,0 +1,12 @@ +``` +% pandoc -t markdown +(@a) one +(@b) two + +See (@a--@b) +^D +(1) one +(2) two + +See (1--2) +``` diff --git a/test/command/6858.md b/test/command/6858.md new file mode 100644 --- /dev/null +++ b/test/command/6858.md @@ -0,0 +1,52 @@ +``` +% pandoc -t markdown -f man +.TH FvwmAnimate 1 "Date" Fvwm "Fvwm Modules" +.UC +.SH NAME +\fBFvwmAnimate\fP \- the fvwm animate module +.SH SYNOPSIS +Module FvwmAnimate [ModuleAlias] + +.IP "*FvwmAnimate: Color \fBcolor\fP" + +Tells \fBFvwmAnimate\fP what color to draw with. +The color is "XOR'ed" (exclusive ORed) onto the background. + +.IP "*FvwmAnimate: Pixmap \fBpixmap\fP" + +Tells \fBFvwmAnimate\fP to use \fBpixmap\fP to draw with. This can be useful +if \fB*FvwmAnimate: Color\fP gives poor results. +^D +# NAME + +**FvwmAnimate** - the fvwm animate module + +# SYNOPSIS + +Module FvwmAnimate \[ModuleAlias\] + +\*FvwmAnimate: Color color + +: Tells **FvwmAnimate** what color to draw with. The color is + \"XOR\'ed\" (exclusive ORed) onto the background. + +\*FvwmAnimate: Pixmap pixmap + +: Tells **FvwmAnimate** to use **pixmap** to draw with. This can be + useful if **\*FvwmAnimate: Color** gives poor results. +``` + +``` +% pandoc -t markdown -f man +.IP "\[bu]" + +hi + +.IP "\[bu]" + +there +^D +- hi + +- there +``` diff --git a/test/command/6869.md b/test/command/6869.md new file mode 100644 --- /dev/null +++ b/test/command/6869.md @@ -0,0 +1,19 @@ +``` +% pandoc -f latex -t native +\cite[„Aber“]{key} +^D +[ Para + [ Cite + [ Citation + { citationId = "key" + , citationPrefix = [] + , citationSuffix = [ Str "\8222Aber\8220" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline (Format "latex") "\\cite[\8222Aber\8220]{key}" ] + ] +] +``` diff --git a/test/command/6873.md b/test/command/6873.md new file mode 100644 --- /dev/null +++ b/test/command/6873.md @@ -0,0 +1,35 @@ +``` +% pandoc -f latex -t native --citeproc +\cite[„Etwas […{]} auslassen“]{key} +^D +2> [WARNING] Citeproc: citation key not found +[ Para + [ Cite + [ Citation + { citationId = "key" + , citationPrefix = [] + , citationSuffix = + [ Str "\8222Etwas" + , Space + , Str "[\8230" + , Span ( "" , [] , [] ) [ Str "]" ] + , Space + , Str "auslassen\8220" + ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(" + , Strong [ Str "key?" ] + , Str "\8222Etwas" + , Space + , Str "[\8230" + , Span ( "" , [] , [] ) [ Str "]" ] + , Space + , Str "auslassen\8220)" + ] + ] +] +``` diff --git a/test/command/6890.md b/test/command/6890.md new file mode 100644 --- /dev/null +++ b/test/command/6890.md @@ -0,0 +1,134 @@ +``` +% pandoc -t native --citeproc +--- +references: +- author: + - family: Früchtel + given: Frank + - family: Budde + given: Wolfgang + - family: Cyprian + given: Gudrun + edition: 3 + id: fruchtel-sozialer-2013a + issued: 2013 + language: de-DE + publisher: Springer VS + publisher-place: Wiesbaden, Germany + title: "Sozialer Raum und Soziale Arbeit Fieldbook: Methoden und + Techniken" + title-short: Sozialer Raum und Soziale Arbeit Fieldbook + type: book +--- + +@fruchtel-sozialer-2013a + +Some text.[^1] + +[^1]: @fruchtel-sozialer-2013a +^D +[ Para + [ Cite + [ Citation + { citationId = "fruchtel-sozialer-2013a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "Fr\252chtel" + , Space + , Str "et" + , Space + , Str "al." + , Space + , Str "(2013)" + ] + ] +, Para + [ Str "Some" + , Space + , Str "text." + , Note + [ Para + [ Cite + [ Citation + { citationId = "fruchtel-sozialer-2013a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 2 + , citationHash = 0 + } + ] + [ Str "Fr\252chtel" + , Space + , Str "et" + , Space + , Str "al." + , Space + , Str "(2013)" + ] + ] + ] + ] +, Div + ( "refs" + , [ "references" , "csl-bib-body" , "hanging-indent" ] + , [] + ) + [ Div + ( "ref-fruchtel-sozialer-2013a" , [ "csl-entry" ] , [] ) + [ Para + [ Str "Fr\252chtel," + , Space + , Str "Frank," + , Space + , Str "Wolfgang" + , Space + , Str "Budde," + , Space + , Str "and" + , Space + , Str "Gudrun" + , Space + , Str "Cyprian." + , Space + , Str "2013." + , Space + , Emph + [ Str "Sozialer" + , Space + , Str "Raum" + , Space + , Str "und" + , Space + , Str "Soziale" + , Space + , Str "Arbeit" + , Space + , Str "Fieldbook:" + , Space + , Str "Methoden" + , Space + , Str "und" + , Space + , Str "Techniken" + ] + , Str "." + , Space + , Str "3rd" + , Space + , Str "ed." + , Space + , Str "Springer" + , Space + , Str "VS." + ] + ] + ] +] +``` + diff --git a/test/command/6925.md b/test/command/6925.md new file mode 100644 --- /dev/null +++ b/test/command/6925.md @@ -0,0 +1,34 @@ +``` +% pandoc -f latex -t markdown +\documentclass{amsart} +\newtheorem{thm}{Theorem}[section] +\theoremstyle{definition} +\newtheorem{thm2}[section]{Theorem} +\begin{document} +\begin{thm} +a +\begin{figure} +\includegraphics[]{1.png} +\end{figure} +\end{thm} + +\begin{thm2} +a +\begin{figure} +\includegraphics[]{1.png} +\end{figure} +\end{thm2} +\end{document} +^D +::: thm +**Theorem 1**. *a* + +![](1.png) +::: + +::: thm2 +**Theorem 1**. a + +![](1.png) +::: +``` diff --git a/test/command/6948.md b/test/command/6948.md new file mode 100644 --- /dev/null +++ b/test/command/6948.md @@ -0,0 +1,31 @@ +Treat an image alone in its paragraph (but not a figure) +as an independent image: +``` +% pandoc -f native -t rst +[Para [Image ("",["align-center"],[]) [Str "https://pandoc.org/diagram.jpg"] ("https://pandoc.org/diagram.jpg","")]] +^D +|https://pandoc.org/diagram.jpg| + +.. |https://pandoc.org/diagram.jpg| image:: https://pandoc.org/diagram.jpg +``` + +Here we just omit the center attribute as it's not valid: +``` +% pandoc -f native -t rst +[Para [Str "hi",Space,Image ("",["align-center"],[]) [Str "https://pandoc.org/diagram.jpg"] ("https://pandoc.org/diagram.jpg","")]] +^D +hi |https://pandoc.org/diagram.jpg| + +.. |https://pandoc.org/diagram.jpg| image:: https://pandoc.org/diagram.jpg +``` + +But we can use top, middle, or bottom alignment: +``` +% pandoc -f native -t rst +[Para [Str "hi",Space,Image ("",["align-top"],[]) [Str "https://pandoc.org/diagram.jpg"] ("https://pandoc.org/diagram.jpg","")]] +^D +hi |https://pandoc.org/diagram.jpg| + +.. |https://pandoc.org/diagram.jpg| image:: https://pandoc.org/diagram.jpg + :align: top +``` diff --git a/test/command/6951.md b/test/command/6951.md new file mode 100644 --- /dev/null +++ b/test/command/6951.md @@ -0,0 +1,18 @@ +``` +% pandoc --citeproc -t plain --bibliography command/biblio.bib +--- +references: +- id: foo + title: Crazy + type: book +... + +[@foo; @item1] + +^D +(Crazy, n.d.; Doe 2005) + +Crazy. n.d. + +Doe, John. 2005. First Book. Cambridge University Press. +``` diff --git a/test/command/6958.md b/test/command/6958.md new file mode 100644 --- /dev/null +++ b/test/command/6958.md @@ -0,0 +1,10 @@ +Add thin space between single and double quotes. +``` +% pandoc -t latex+smart +--- +lang: en-GB +--- +'["On the Outside"]{}: Constructing Cycling Citizenship.' +^D +`\,{``On the Outside''}: Constructing Cycling Citizenship.' +``` diff --git a/test/command/6959.md b/test/command/6959.md new file mode 100644 --- /dev/null +++ b/test/command/6959.md @@ -0,0 +1,12 @@ +``` +% pandoc -t docx -o - | pandoc -f docx -t markdown --track-changes=all +[This is the comment]{.comment-start id="1" author="Mike" +date="2020-12-17T16:53:00Z"} [Here is my reply]{.comment-start id="2" +author="Mike" date="2020-12-17T17:39:00Z"} This is the content being +commented on [[]{.comment-end id="2"}]{.comment-end id="1"} +^D +[This is the comment]{.comment-start id="1" author="Mike" +date="2020-12-17T16:53:00Z"} [Here is my reply]{.comment-start id="2" +author="Mike" date="2020-12-17T17:39:00Z"} This is the content being +commented on [[]{.comment-end id="2"}]{.comment-end id="1"} +``` diff --git a/test/command/6970.md b/test/command/6970.md new file mode 100644 --- /dev/null +++ b/test/command/6970.md @@ -0,0 +1,12 @@ +``` +% pandoc -f html -t native +https://example.com +^D +[ Plain + [ Link + ( "foo" , [ "bar" , "baz" ] , [ ( "target" , "_blank" ) ] ) + [ Str "https://example.com" ] + ( "https://example.com" , "" ) + ] +] +``` diff --git a/test/command/6992.md b/test/command/6992.md new file mode 100644 --- /dev/null +++ b/test/command/6992.md @@ -0,0 +1,76 @@ +``` +% pandoc -f mediawiki -t native +{| class="wikitable" +!colspan=4 | template request +|- +| mode || No || String || MUST be "template" or omitted +|} +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 4) + [ Para [ Str "template" , Space , Str "request" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "mode" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "No" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "String" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Str "MUST" + , Space + , Str "be" + , Space + , Str "\"template\"" + , Space + , Str "or" + , Space + , Str "omitted" + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] + +``` diff --git a/test/command/6993.md b/test/command/6993.md new file mode 100644 --- /dev/null +++ b/test/command/6993.md @@ -0,0 +1,33 @@ +``` +% pandoc -f mediawiki -t native +'''Should be bold ''' +^D +[ Para + [ Strong + [ Str "Should" , Space , Str "be" , Space , Str "bold" ] + ] +] +``` + +``` +% pandoc -f mediawiki -t native +''' Should be bold''' +^D +[ Para + [ Strong + [ Str "Should" , Space , Str "be" , Space , Str "bold" ] + ] +] +``` + +``` +% pandoc -f mediawiki -t native +'' Should be emph '' +^D +[ Para + [ Emph + [ Str "Should" , Space , Str "be" , Space , Str "emph" ] + ] +] +``` + diff --git a/test/command/7003.md b/test/command/7003.md new file mode 100644 --- /dev/null +++ b/test/command/7003.md @@ -0,0 +1,58 @@ +``` +% pandoc -f latex -t native +\documentclass{article} +\usepackage{listings} + +\lstset{basicstyle=\ttfamily} + +\begin{filecontents*}[overwrite]{example.tex} +\documentclass{article} +\begin{document} +\section{Bar} +This a Bar section +\end{document} +\end{filecontents*} + +\begin{document} + +\section{With lstlisting environment} + +\begin{lstlisting} +\documentclass{article} +\begin{document} +\section{Foo} +This a Foo section +\end{document} +\end{lstlisting} + +\section{With lstinputlisting command} + +\lstinputlisting{example.tex} +\end{document} +^D +[ Header + 1 + ( "with-lstlisting-environment" , [] , [] ) + [ Str "With" + , Space + , Str "lstlisting" + , Space + , Str "environment" + ] +, CodeBlock + ( "" , [] , [] ) + "\\documentclass{article}\n\\begin{document}\n\\section{Foo}\nThis a Foo section\n\\end{document}" +, Header + 1 + ( "with-lstinputlisting-command" , [] , [] ) + [ Str "With" + , Space + , Str "lstinputlisting" + , Space + , Str "command" + ] +, CodeBlock + ( "" , [ "latex" ] , [] ) + "\\documentclass{article}\n\\begin{document}\n\\section{Bar}\nThis a Bar section\n\\end{document}" +] +``` diff --git a/test/command/7006.md b/test/command/7006.md new file mode 100644 --- /dev/null +++ b/test/command/7006.md @@ -0,0 +1,23 @@ +``` +% pandoc -t html +Test.[^fn] + +[^fn]: Foo: + + ![Caption.](/image.jpg) +^D +

    Test.1

    +
    +
    +
      +

    1. Foo:

      +
      +Caption. + +
      +↩︎
      2. +
    +
    +``` diff --git a/test/command/7009.md b/test/command/7009.md new file mode 100644 --- /dev/null +++ b/test/command/7009.md @@ -0,0 +1,8 @@ +``` +% pandoc -t gfm +3. a +4. b +^D +3. a +4. b +``` diff --git a/test/command/7016.md b/test/command/7016.md new file mode 100644 --- /dev/null +++ b/test/command/7016.md @@ -0,0 +1,51 @@ +``` +% pandoc --citeproc --to=jats_archiving --standalone +--- +csl: command/apa.csl +references: +- id: doe + type: article + author: + - family: Doe + given: Jane + container-title: Proceedings of the Academy of Test Inputs + doi: 10.x/nope + issued: 2021 + title: Another article +... +Blah [@doe]. +^D + + +
    + + + + + + + + + + + + + + + + +

    Blah (Doe, 2021).

    + + + + + + Doe, J. (2021). Another article. Proceedings + of the Academy of Test Inputs. + doi:10.x/nope + + + +
    +``` diff --git a/test/command/7041.md b/test/command/7041.md new file mode 100644 --- /dev/null +++ b/test/command/7041.md @@ -0,0 +1,23 @@ +``` +% pandoc -f html -t jats + + +
    Fly, you fools!
    +^D + + + + + + + + + + +

    + +

    Fly, you fools!

    + +

    +     +``` diff --git a/test/command/7042.md b/test/command/7042.md new file mode 100644 --- /dev/null +++ b/test/command/7042.md @@ -0,0 +1,149 @@ +``` +% pandoc -f markdown -t jats_publishing+element_citations --citeproc -s +--- +nocite: "[@*]" +references: +- author: + - family: Jane + given: Doe + container-title: Public Library of Tests + id: year-month + issued: 1999-08 + title: Year and month + type: article-journal +- accessed: 1999-01-22 + author: + - family: Negidius + given: Numerius + - literal: others + container-title: Public Library of Tests + id: access-date + issued: 1911-10-03 + title: Entry with access date and et al. + type: article-journal +- author: + - family: Beethoven + given: Ludwig + dropping-particle: van + - family: Bray + given: Jan + non-dropping-particle: de + container-title: Public Library of Tests + id: name-particles + issued: 1820 + title: Name particles, dropping and non-dropping + type: article-journal +- author: + - 宮水 三葉 + - 立花 瀧 + title: Big Book of Tests + id: book-with-japanese-authors + issued: 2016 + type: book +- author: + - family: Watson + given: J. D. + - family: Crick + given: F. H. C. + container-title: Nature + doi: '10.1038/171737a0' + id: full-journal-article-entry + issue: 4356 + issued: '1953-04-01' + page: 737-738 + pmid: 13054692 + title: 'Molecular Structure of Nucleic Acids: A Structure for Deoxyribose Nucleic Acid' + type: article-journal + volume: 171 +... +^D + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + JaneDoe + + Year and month + Public Library of Tests + 199908 + + + + + + NegidiusNumerius + + + Entry with access date and et al. + Public Library of Tests + 19111003 + 19990122 + + + + + + BeethovenLudwig van + de BrayJan + + Name particles, dropping and non-dropping + Public Library of Tests + 1820 + + + + + + 宮水 三葉 + 立花 瀧 + + Big Book of Tests + 2016 + + + + + + WatsonJ. D. + CrickF. H. C. + + Molecular Structure of Nucleic Acids: A Structure for Deoxyribose Nucleic Acid + Nature + 19530401 + 171 + 4356 + 10.1038/171737a0 + 13054692 + 737 + 738 + + + + +
    + +``` diff --git a/test/command/7058.md b/test/command/7058.md new file mode 100644 --- /dev/null +++ b/test/command/7058.md @@ -0,0 +1,6 @@ +``` +% pandoc -f latex -t markdown +5\(-\)8 \(x\) +^D +5$-$``{=html}8 $x$ +``` diff --git a/test/command/7064.md b/test/command/7064.md new file mode 100644 --- /dev/null +++ b/test/command/7064.md @@ -0,0 +1,32 @@ +``` +% pandoc -f rst -t html +.. csv-table:: Changes + :header: "Version", "Date", "Description" + :widths: 15, 15, 70 + :delim: $ + + 0.1.0 $ 18/02/2013 $ Initial Release +^D + + +++++ + + + + + + + + + + + + + + +
    Changes
    VersionDateDescription
    0.1.018/02/2013Initial Release
    +``` diff --git a/test/command/7067.md b/test/command/7067.md new file mode 100644 --- /dev/null +++ b/test/command/7067.md @@ -0,0 +1,90 @@ +``` +% pandoc -t biblatex +--- +references: +- id: garaud + author: + - family: Garaud + given: Marcel + container-title: Bulletin de la Societé des antiquaires de l’Ouest + collection-title: 4 + issued: + - year: 1967 + language: fr-FR + page: 11-27 + title: Recherches sur les défrichements dans la Gâtine poitevine aux XI^e^ et XII^e^ siècles + type: article-journal + volume: 9 +... +^D +@article{garaud, + author = {Garaud, Marcel}, + title = {Recherches sur les défrichements dans la Gâtine poitevine aux + XI\textsuperscript{e} et XII\textsuperscript{e} siècles}, + journal = {Bulletin de la Societé des antiquaires de l’Ouest}, + series = {4}, + volume = {9}, + pages = {11-27}, + date = {1967}, + langid = {fr-FR} +} +``` + +``` +% pandoc -t bibtex +--- +references: +- id: garaud + author: + - family: Garaud + given: Marcel + container-title: Bulletin de la Société des antiquaires de l’Ouest + collection-title: 4 + issued: + - year: 1967 + language: fr-FR + page: 11-27 + title: Recherches sur les défrichements dans la Gâtine poitevine aux XI^e^ et XII^e^ siècles + type: article-journal + volume: 9 +... +^D +@article{garaud, + author = {Garaud, Marcel}, + title = {{Recherches sur les défrichements dans la Gâtine poitevine + aux XI\textsuperscript{e} et XII\textsuperscript{e} siècles}}, + journal = {Bulletin de la Société des antiquaires de l’Ouest}, + series = {4}, + volume = {9}, + pages = {11-27}, + year = {1967} +} +``` + +This tests the titlecasing of a word with an accented second letter: +``` +% pandoc -t bibtex +--- +references: +- id: garaud + author: + - family: Garaud + given: Marcel + container-title: English Journal + issued: + - year: 1967 + language: en-US + title: Research on the défrichements in the Gâtine poitevine + type: article-journal + volume: 9 +... +^D +@article{garaud, + author = {Garaud, Marcel}, + title = {Research on the Défrichements in the {Gâtine} Poitevine}, + journal = {English Journal}, + volume = {9}, + year = {1967} +} +``` + diff --git a/test/command/7080.md b/test/command/7080.md new file mode 100644 --- /dev/null +++ b/test/command/7080.md @@ -0,0 +1,17 @@ +``` +% pandoc -f markdown_mmd -t native +![][image] + +[image]: image.png width=100px height=150px +^D +[ Para + [ Image + ( "" + , [] + , [ ( "width" , "100px" ) , ( "height" , "150px" ) ] + ) + [] + ( "image.png" , "" ) + ] +] +``` diff --git a/test/command/7092.md b/test/command/7092.md new file mode 100644 --- /dev/null +++ b/test/command/7092.md @@ -0,0 +1,10 @@ +``` +% pandoc -flatex+raw_tex -t native +\newcommand{\em}[1]{\emph{#1}} + +\em{\parseMe{foo}} +^D +[ Para + [ Emph [ RawInline (Format "latex") "\\parseMe{foo}" ] ] +] +``` diff --git a/test/command/7099.md b/test/command/7099.md new file mode 100644 --- /dev/null +++ b/test/command/7099.md @@ -0,0 +1,18 @@ +``` +% pandoc -f html -t native --verbose + +^D +2> [INFO] Skipped '' at input line 1 column 16 +[] +``` + +``` +% pandoc -f html -t native --verbose + +^D +2> [INFO] Fetching h:invalid@url... +2> [WARNING] Could not fetch resource h:invalid@url: Could not fetch h:invalid@url +2> InvalidUrlException "h:invalid@url" "Invalid scheme" +2> [INFO] Skipped '' at input line 1 column 29 +[] +``` diff --git a/test/command/7112.md b/test/command/7112.md new file mode 100644 --- /dev/null +++ b/test/command/7112.md @@ -0,0 +1,15 @@ +``` +% pandoc -f rst +.. csv-table:: + + setting, ``echo PATH="path"`` +^D + + + + + + + +
    settingecho PATH="path"
    +``` diff --git a/test/command/7129.md b/test/command/7129.md new file mode 100644 --- /dev/null +++ b/test/command/7129.md @@ -0,0 +1,55 @@ +``` +% pandoc -f latex -t native +\begin{tabular}{ll} \hline + FOO & BAR \\ \hline + foo & \verb|b&r| \\ \hline +\end{tabular} +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "FOO" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "BAR" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "foo" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Code ( "" , [] , [] ) "b&r" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/7132.md b/test/command/7132.md new file mode 100644 --- /dev/null +++ b/test/command/7132.md @@ -0,0 +1,10 @@ +``` +% pandoc -f markdown -t org --columns=72 +- This line has exactly the wrong number of characters before the number 5. +- Long line ending with a number (this time it is in parentheses and a 23) +^D +- This line has exactly the wrong number of characters before the + number 5. +- Long line ending with a number (this time it is in parentheses and + a 23) +``` diff --git a/test/command/7134.md b/test/command/7134.md new file mode 100644 --- /dev/null +++ b/test/command/7134.md @@ -0,0 +1,51 @@ +``` +% pandoc -f rst -t native +This is a paragraph. + + This is a block quote. + +.. + + This should be a second block quote. +^D +[ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "paragraph." + ] +, BlockQuote + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote." + ] + ] +, BlockQuote + [ Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "second" + , Space + , Str "block" + , Space + , Str "quote." + ] + ] +] +``` diff --git a/test/command/7145.md b/test/command/7145.md new file mode 100644 --- /dev/null +++ b/test/command/7145.md @@ -0,0 +1,72 @@ +``` +% pandoc -f mediawiki -t native +Maecenas at sapien tempor, pretium turpis ut, imperdiet augue.This is a multiline + +reference +with +empty + +linebreaks Nulla ut massa eget ex venenatis lobortis id in eros. +^D +[ Para + [ Str "Maecenas" + , Space + , Str "at" + , Space + , Str "sapien" + , Space + , Str "tempor," + , Space + , Str "pretium" + , Space + , Str "turpis" + , Space + , Str "ut," + , Space + , Str "imperdiet" + , Space + , Str "augue." + , Note + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "multiline" + ] + , Para + [ Str "reference" + , SoftBreak + , RawInline (Format "html") "" + , Str "with" + , RawInline (Format "html") "" + , SoftBreak + , Str "empty" + ] + , Para [ Str "linebreaks" ] + ] + , Space + , Str "Nulla" + , Space + , Str "ut" + , Space + , Str "massa" + , Space + , Str "eget" + , Space + , Str "ex" + , Space + , Str "venenatis" + , Space + , Str "lobortis" + , Space + , Str "id" + , Space + , Str "in" + , Space + , Str "eros." + ] +] +``` diff --git a/test/command/7155.md b/test/command/7155.md new file mode 100644 --- /dev/null +++ b/test/command/7155.md @@ -0,0 +1,33 @@ +``` +% pandoc -f markdown+tex_math_single_backslash -t native +\(x\) \[x\] +\\(x\\) \\[x\\] +^D +[ Para + [ Math InlineMath "x" + , Space + , Math DisplayMath "x" + , SoftBreak + , Str "\\(x\\)" + , Space + , Str "\\[x\\]" + ] +] +``` + +``` +% pandoc -f markdown+tex_math_double_backslash -t native +\(x\) \[x\] +\\(x\\) \\[x\\] +^D +[ Para + [ Str "(x)" + , Space + , Str "[x]" + , SoftBreak + , Math InlineMath "x" + , Space + , Math DisplayMath "x" + ] +] +``` diff --git a/test/command/7172.md b/test/command/7172.md new file mode 100644 --- /dev/null +++ b/test/command/7172.md @@ -0,0 +1,17 @@ +``` +% pandoc -t markdown +- one + - two +^D +- one + - two +``` + +``` +% pandoc -t markdown+four_space_rule +- one + - two +^D +- one + - two +``` diff --git a/test/command/7173.md b/test/command/7173.md new file mode 100644 --- /dev/null +++ b/test/command/7173.md @@ -0,0 +1,137 @@ +``` +% pandoc -f docbook -t latex + + + + +
    + Untitled Document + Word + + 1+2 + + + 1+2 + + + + +
    +^D +Word + +\[1 + 2\] +``` + +``` +% pandoc -f docbook -t latex + + + + +
    + Untitled Document + Word + + 1+2 + + + 1+2 + + + + +
    +^D +Word + +\[1 + 2\] +``` + +``` +% pandoc -f docbook -t latex + + + + +
    + Untitled Document + Word + + 1+2 + + + 1+2 + + + + +
    +^D +Word + +\[1 + 2\] +``` + +``` +% pandoc -f docbook -t latex + + + + +
    + Untitled Document + Word + + 1+2 + + + 1+2 + + + + +
    +^D +Word + +\[1 + 2\] +``` + +``` +% pandoc -f docbook -t latex + + + + +
    + Untitled Document + Word + + 1+2 + + + 1+2 + + + + +
    +^D +Word + +\[1 + 2\] +``` + diff --git a/test/command/7181.md b/test/command/7181.md new file mode 100644 --- /dev/null +++ b/test/command/7181.md @@ -0,0 +1,11 @@ +``` +% pandoc -t latex +![Global frog population.](slides.pdf){page=13,trim=1cm,clip,width=4cm} +^D +\begin{figure} +\centering +\pandocbounded{\includegraphics[keepaspectratio,page=13,trim=1cm,clip,width=4cm,alt={Global frog population.}]{slides.pdf}} +\caption{Global frog population.} +\end{figure} + +``` diff --git a/test/command/7201.md b/test/command/7201.md new file mode 100644 --- /dev/null +++ b/test/command/7201.md @@ -0,0 +1,47 @@ +``` +% pandoc -t revealjs --slide-level=1 +# Overview + +:::::::::::::: {.columns} +::: {.column width="40%"} + +Left column + +::: +::: {.column width="60%"} + +* First list + * subitem + +. . . + +* Second list + * subitem +::: +:::::::::::::: +^D +
    +

    Overview

    +
    +
    +

    Left column

    +
    +
      +
    • First list +
        +
      • subitem
        • +
      • +
    +
    +
      +
    • Second list +
        +
      • subitem
        • +
      • +
    +
    +
    +
    +
    + +``` diff --git a/test/command/7208.md b/test/command/7208.md new file mode 100644 --- /dev/null +++ b/test/command/7208.md @@ -0,0 +1,6 @@ +``` +% pandoc -t gfm +\ +^D +\ +``` diff --git a/test/command/7214.md b/test/command/7214.md new file mode 100644 --- /dev/null +++ b/test/command/7214.md @@ -0,0 +1,28 @@ +``` +% pandoc ++------------+----------+------------------+ +|日本語 | の文字列 | words in english | ++------------+----------+------------------+ +|abc defghij | def | xyz | ++------------+----------+------------------+ +^D + +++++ + + + + + + + + + + + + +
    日本語の文字列words in english
    abc defghijdefxyz
    +``` diff --git a/test/command/7216.md b/test/command/7216.md new file mode 100644 --- /dev/null +++ b/test/command/7216.md @@ -0,0 +1,19 @@ +``` +% pandoc -t latex +"This is some text in quotes. Another paragraph by the same speaker follows. The first paragraph should have no close quote. + +"The second paragraph should have open and close quotes." + +| "Open quote on this line, +| Close quote on the next line." +| "Quotes on the same line." +^D +``This is some text in quotes. Another paragraph by the same speaker +follows. The first paragraph should have no close quote. + +``The second paragraph should have open and close quotes.'' + +``Open quote on this line,\\ +Close quote on the next line.''\\ +``Quotes on the same line.'' +``` diff --git a/test/command/7219.md b/test/command/7219.md new file mode 100644 --- /dev/null +++ b/test/command/7219.md @@ -0,0 +1,25 @@ +``` +% pandoc --citeproc -t plain +--- +references: +- author: + - family: Reese + given: Trevor R. + collection-title: 3rd series + container-title: William and Mary Quarterly + id: reese + issued: 1958 + language: en-US + page: 168-190 + title: Georgia in Anglo-Spanish diplomacy, 1736-1739 + type: article-journal + volume: 15 +... +and also in -@reese +^D +and also in (1958) + +Reese, Trevor R. 1958. “Georgia in Anglo-Spanish Diplomacy, 1736-1739.” +William and Mary Quarterly, 3rd series, vol. 15: 168–90. + +``` diff --git a/test/command/7266.md b/test/command/7266.md new file mode 100644 --- /dev/null +++ b/test/command/7266.md @@ -0,0 +1,10 @@ +``` +% pandoc -f biblatex -t biblatex -s +@article{id, + annote = "annotation" +} +^D +@article{id, + annote = {annotation} +} +``` diff --git a/test/command/7272.md b/test/command/7272.md new file mode 100644 --- /dev/null +++ b/test/command/7272.md @@ -0,0 +1,30 @@ +``` +% pandoc -t latex -f html + + + + + + +
    + + text +
    + text2 +     +
    +^D +{\def\LTcaptype{none} % do not increment counter +\begin{longtable}[]{@{} + >{\raggedright\arraybackslash}p{(\linewidth - 0\tabcolsep) * \real{1.0000}}@{}} +\toprule\noalign{} +\endhead +\bottomrule\noalign{} +\endlastfoot +\begin{minipage}[t]{\linewidth}\raggedright +{ text\\ +text2 }\strut +\end{minipage} \\ +\end{longtable} +} +``` diff --git a/test/command/7278.md b/test/command/7278.md new file mode 100644 --- /dev/null +++ b/test/command/7278.md @@ -0,0 +1,38 @@ +``` +% pandoc -t beamer +# Slide + +Some blocks: + +## example block title {.example} + +text in block + +## alert block title {.alert} + +text in block + +## block title + +text in block +^D +\begin{frame}{Slide} +\protect\phantomsection\label{slide} +Some blocks: + +\begin{exampleblock}{example block title} +\protect\phantomsection\label{example-block-title} +text in block +\end{exampleblock} + +\begin{alertblock}{alert block title} +\protect\phantomsection\label{alert-block-title} +text in block +\end{alertblock} + +\begin{block}{block title} +\protect\phantomsection\label{block-title} +text in block +\end{block} +\end{frame} +``` diff --git a/test/command/7282.md b/test/command/7282.md new file mode 100644 --- /dev/null +++ b/test/command/7282.md @@ -0,0 +1,7 @@ +Don't crash on unmatched closing tag. +``` +% pandoc -f html -t native + +^D +[] +``` diff --git a/test/command/7288.md b/test/command/7288.md new file mode 100644 --- /dev/null +++ b/test/command/7288.md @@ -0,0 +1,40 @@ +``` +% pandoc -f rst -t ms +.. list-table:: + :widths: 50 50 + :header-rows: 1 + + * - Left + - Right + * - Long text that should be easy to break up into multiple lines + - Another long text that should be easy to break up into multiple lines + + Bar +^D +.PP +.na +.nr LLold \n[LL] +.TS +delim(@@) tab( ); +lw(35.0n) lw(35.0n). +T{ +Left +T} T{ +Right +T} +_ +T{ +.nr LL 35.0n +.LP +Long text that should be easy to break up into multiple lines +T} T{ +.nr LL 35.0n +.PP +Another long text that should be easy to break up into multiple lines +.PP +Bar +T} +.TE +.nr LL \n[LLold] +.ad +``` diff --git a/test/command/7299.md b/test/command/7299.md new file mode 100644 --- /dev/null +++ b/test/command/7299.md @@ -0,0 +1,23 @@ +``` +% pandoc -f latex -t plain +$1-{\ensuremath{r}\xspace}$ +^D +1 − r +``` + +``` +% pandoc -f latex -t plain +\newcommand{\foo}{Foo\xspace} + +$\text{\foo bar}$ +^D +Foo bar +``` + +``` +% pandoc -f latex -t plain +a\xspace b +^D +a b +``` + diff --git a/test/command/7321.md b/test/command/7321.md new file mode 100644 --- /dev/null +++ b/test/command/7321.md @@ -0,0 +1,24 @@ +``` +% pandoc -t plain --citeproc --wrap=none +--- +references: +- id: fenner2012a + title: One-click science marketing + author: + - family: Fenner + given: Martin + container-title: Nature Materials + volume: 11 + issue: 4 + publisher: Nature Publishing Group + type: article-journal + issued: + year: 2012 +--- + +[@fenner2012a, $a^2+b^2=c^2$] +^D +(Fenner 2012, a² + b² = c²) + +Fenner, Martin. 2012. “One-Click Science Marketing.” Nature Materials 11 (4). +``` diff --git a/test/command/7323.md b/test/command/7323.md new file mode 100644 --- /dev/null +++ b/test/command/7323.md @@ -0,0 +1,29 @@ +``` +% pandoc --citeproc -t plain +--- +references: +- id: smith + author: John Smith + issued: 2019 + title: Insects + type: book +... + +@smith [chap. 6] + +@smith [chapter 6] + +@smith [Chap. 6] + +@smith [Chapter 6] +^D +John Smith (2019, chap. 6) + +John Smith (2019, chap. 6) + +John Smith (2019, chap. 6) + +John Smith (2019, chap. 6) + +John Smith. 2019. Insects. +``` diff --git a/test/command/7324.md b/test/command/7324.md new file mode 100644 --- /dev/null +++ b/test/command/7324.md @@ -0,0 +1,25 @@ +``` +% pandoc --citeproc -t plain +--- +references: +- id: smith + author: John Smith + issued: 2019 + title: Insects + type: book +... + +@smith [, among others] + +@smith [ among others] + +@smith [among others] +^D +John Smith (2019, among others) + +John Smith (2019 among others) + +John Smith (2019, among others) + +John Smith. 2019. Insects. +``` diff --git a/test/command/7326.md b/test/command/7326.md new file mode 100644 --- /dev/null +++ b/test/command/7326.md @@ -0,0 +1,1227 @@ +Table with row and column spans +``` +% pandoc -f html -t asciidoc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Header 1Header 2Header 3Header 4
    body row 1column 2column 3column 4
    body row 2Cells may span columns.fff
    body row 3Cells may span rows. +
      +
    • Cells
      • +
    • can
      • +
    • contain
      • +
    • blocks.
      • +
    +     		+
      +
    • This is a very long line of text
      • +
    • Python
      • +
    • b
      • +
    • c
      • +
    +
    body row 4
    +^D +[width="100%",cols="17%,16%,15%,52%",options="header",] +|=== +|Header 1 |Header 2 |Header 3 |Header 4 +|body row 1 |column 2 |column 3 |column 4 +|body row 2 2+|Cells may span columns. |fff +|body row 3 .2+|Cells may span rows. .2+a| +* Cells +* can +* contain +* blocks. + +.2+a| +* This is a very long line of text +* http://www.python.org/[Python] +* b +* c + +|body row 4 +|=== +``` + +Header and footer. +AsciiDoc only supports 1 header and 1 footer row. +So for multiple header and/or footer rows all the extra rows become part of the table body. +``` +% pandoc -f html -t asciidoc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    InputsOutput
    ABA or B
    FalseFalseFalse
    TrueFalseTrue
    FalseTrueTrue
    TrueTrueTrue
    ABA or B
    InputsOutput
    + + + + + + + + + + + + + + + + + +
    Header
    Body 1-1Body 2-1
    Footer
    +^D +[cols=",,",options="header,footer",] +|=== +2+|Inputs |Output +|A |B |A or B +|False |False |False +|True |False |True +|False |True |True +|True |True |True +|A |B |A or B +2+|Inputs |Output +|=== + +[cols=",",options="header,footer",] +|=== +2+|Header +|Body 1-1 |Body 2-1 +2+|Footer +|=== +``` + +Table without header but with footer rows +``` +% pandoc -f html -t asciidoc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    FalseFalseFalse
    TrueFalseTrue
    FalseTrueTrue
    TrueTrueTrue
    ABA or B
    InputsOutput
    +^D +[width="100%",cols="37%,37%,26%",options="footer",] +|=== +|False |False |False +|True |False |True +|False |True |True +|True |True |True +|A |B |A or B +2+|Inputs |Output +|=== +``` + +Adjust row span for multiple header rows +``` +% pandoc -f html -t asciidoc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    LocationTemperature 1961-1990 in degree Celsius
    minmeanmax
    Antarctica-89.2N/A19.8
    Earth-89.21456.7
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Temperature 1961-1990 in degree CelsiusLocation
    minmeanmax
    -89.2N/A19.8Antarctica
    -89.21456.7Earth
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Temperature 1961-1990 in degree CelsiusLocationExtra
    minmeanmaxExtra 2
    -89.2N/A19.8AntarcticaExtra 3
    -89.21456.7EarthExtra 4
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    Header 1-1Header 1-2
    Header 2-1
    Header 3-1Header 3-2Header 3-3
    Body 1-1Body 1-2
    Body 2-1Body 2-2
    + + + + + + + + + + + + + + + + + +
    Header 1-1Header 1-2Header 1-3
    Header 2-1
    Header 3-1Header 3-2Header 3-3
    +^D +[width="63%",cols="49%,17%,17%,17%",options="header",] +|=== +|Location 3+|Temperature 1961-1990 in degree Celsius +| |min |mean |max +|Antarctica |-89.2 |N/A |19.8 +|Earth |-89.2 |14 |56.7 +|=== + +[width="63%",cols="19%,17%,17%,47%",options="header",] +|=== +3+|Temperature 1961-1990 in degree Celsius |Location +|min |mean |max | +|-89.2 |N/A |19.8 |Antarctica +|-89.2 |14 |56.7 |Earth +|=== + +[width="65%",cols="20%,16%,16%,27%,21%",options="header",] +|=== +3+|Temperature 1961-1990 in degree Celsius |Location |Extra +|min |mean |max | |Extra 2 +|-89.2 |N/A |19.8 |Antarctica |Extra 3 +|-89.2 |14 |56.7 |Earth |Extra 4 +|=== + +[cols=",,",options="header",] +|=== +|Header 1-1 2+|Header 1-2 +|Header 2-1 2+| +|Header 3-1 |Header 3-2 |Header 3-3 +.2+|Body 1-1 2+|Body 1-2 +|Body 2-1 |Body 2-2 +|=== + +[cols=",,",options="header",] +|=== +|Header 1-1 |Header 1-2 |Header 1-3 +| |Header 2-1 | +|Header 3-1 |Header 3-2 |Header 3-3 +|=== +``` + +Adjust row span in multiple footer rows. +``` +% pandoc -f html -t asciidoc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Body 1-1Body 1-2Body 1-3
    Footer 1-1/2Footer 1-3
    Footer 2-1Span 3Footer 2-3
    Span 2Footer 3-3
    Footer 4-3
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Body 1-1Body 1-2Body 1-3Body 1-4Body 1-5
    Body 2-1Body 2-2Body 2-3Body 2-4Body 2-5
    Footer 1-1/2/3Footer 1-4Footer 1-5
    Footer 2-1Span 3Footer 2-3Footer 2-4/5
    Span 2Footer 3-3/4Span 2
    Span 3Footer 4-4
    Footer 5-1Footer 5-2Footer 5-4Span 2
    Footer 6-1/2Footer 6-4
    + + + + + + + + + + + + + + + + + + + + + + + +
    Body 1Body 2Body 3Body 4
    Footer 1-1Span 3Span 2
    Footer 2-1
    Footer 3-1Footer 3-4
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Body 1-1Body 1-2Body 1-3Body 1-4
    Footer 1-1/2Span 6Footer 1-4
    Span 3Footer 2-2Footer 2-4
    Footer 3-2Footer 3-4
    Footer 4-2Footer 4-4
    Footer 5-1Footer 5-2Span 2
    Footer 6-1/2
    +^D +[width="100%",cols="40%,40%,20%",options="footer",] +|=== +|Body 1-1 |Body 1-2 |Body 1-3 +2+|Footer 1-1/2 |Footer 1-3 +|Footer 2-1 .2+|Span 3 |Footer 2-3 +|Span 2 |Footer 3-3 +| | |Footer 4-3 +|=== + +[cols=",,,,",options="footer",] +|=== +|Body 1-1 |Body 1-2 |Body 1-3 |Body 1-4 |Body 1-5 +|Body 2-1 |Body 2-2 |Body 2-3 |Body 2-4 |Body 2-5 +3+|Footer 1-1/2/3 |Footer 1-4 |Footer 1-5 +|Footer 2-1 .3+|Span 3 |Footer 2-3 2+|Footer 2-4/5 +.2+|Span 2 2+|Footer 3-3/4 .2+|Span 2 +.2+|Span 3 |Footer 4-4 +|Footer 5-1 |Footer 5-2 |Footer 5-4 |Span 2 +2+|Footer 6-1/2 | |Footer 6-4 | +|=== + +[cols=",,,",options="footer",] +|=== +|Body 1 |Body 2 |Body 3 |Body 4 +|Footer 1-1 2.2+|Span 3 .2+|Span 2 +|Footer 2-1 +|Footer 3-1 2+| |Footer 3-4 +|=== + +[cols=",,,",options="footer",] +|=== +|Body 1-1 |Body 1-2 |Body 1-3 |Body 1-4 +2+|Footer 1-1/2 .5+|Span 6 |Footer 1-4 +.3+|Span 3 |Footer 2-2 |Footer 2-4 +|Footer 3-2 |Footer 3-4 +|Footer 4-2 |Footer 4-4 +|Footer 5-1 |Footer 5-2 |Span 2 +2+|Footer 6-1/2 | | +|=== +``` + +Individual cell alignments +``` +% pandoc -f native -t asciidoc +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" , Space , Str "Header" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 2) + (ColSpan 2) + [ Plain [ Str "Center" , Space , Str "Headers" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignRight + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" , Space , Str "Header" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" , Space , Str "Header" ] ] + , Cell + ( "" , [] , [] ) + AlignRight + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" , Space , Str "Header" ] ] + , Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" , Space , Str "Header" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignRight + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "Right" , Space , Str "Body" ] ] + , Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "Left" , Space , Str "Body" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" , Space , Str "Body" ] ] + , Cell + ( "" , [] , [] ) + AlignRight + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" , Space , Str "Body" ] ] + ] + ] + ] + (TableFoot + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 3) + [ Plain [ Str "Center" , Space , Str "Footer" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "Left" , Space , Str "Footer" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 3) + (ColSpan 1) + [ Plain [ Str "Center" , Space , Str "Footer" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignRight + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "Right" , Space , Str "Footer" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "Center" , Space , Str "Footer" ] ] + ] + ]) +] +^D +[cols=",,",options="header,footer",] +|=== +<|Left Header 2+^|Center Headers +>|Right Header 2+| +^|Center Header >|Right Header <|Left Header +.2+>|Right Body 2+<|Left Body +^|Center Body >|Right Body +3+^|Center Footer +2+<|Left Footer .2+^|Center Footer +2+>|Right Footer +2+^|Center Footer | +|=== +``` + +Adjust row span for empty rows and handle empty rows in general +``` +% pandoc -f native -t asciidoc +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "Header" , Space , Str "1-1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 3) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "Header" , Space , Str "1-3" ] ] + ] + , Row ( "" , [] , [] ) [] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Header" , Space , Str "2-1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Header" , Space , Str "2-3" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 3) + (ColSpan 2) + [ Plain [ Str "Body" , Space , Str "1-1/2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 5) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "5" ] ] + ] + , Row ( "" , [] , [] ) [] + , Row ( "" , [] , [] ) [] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "2-1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "2-2" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "3-1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "3-2" ] ] + ] + , Row ( "" , [] , [] ) [] + ] + ] + (TableFoot + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 5) + (ColSpan 1) + [ Plain + [ Str "Span" , Space , Str "5" ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "Footer" , Space , Str "1-2" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 2) + [ Plain + [ Str "Span" , Space , Str "2" ] + ] + ] + , Row ( "" , [] , [] ) [] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "Footer" , Space , Str "3-2/3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "Footer" , Space , Str "4-2/3" ] ] + ] + ]) +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "1-1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "1-2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 3) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "4" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 5) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "2-2" ] ] + ] + , Row + ( "" , [] , [] ) [] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "3-2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "3-3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "4-2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "4-3" ] ] + ] + , Row + ( "" , [] , [] ) [] + , Row + ( "" , [] , [] ) [] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "6-1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "6-2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "6-3" ] ] + ] + ] + ] + (TableFoot + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Footer" , Space , Str "1-1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 8) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "8" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Footer" , Space , Str "1-3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 3) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Footer" , Space , Str "2-3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "2" ] ] + ] + , Row ( "" , [] , [] ) [] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Footer" , Space , Str "4-1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Footer" , Space , Str "4-3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Footer" , Space , Str "5-1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 3) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "2" ] ] + ] + , Row ( "" , [] , [] ) [] + ]) +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [ "rowspan-cell" ] , [] ) + AlignDefault + (RowSpan 6) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "1-2" ] ] + , Cell + ( "" , [ "rowspan-cell" ] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "2" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [ "rowspan-cell" ] , [] ) + AlignDefault + (RowSpan 3) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [ "rowspan-cell" ] , [] ) + AlignDefault + (RowSpan 4) + (ColSpan 1) + [ Plain [ Str "Span" , Space , Str "4" ] ] + ] + , Row ( "" , [] , [] ) [] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "3-2" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "4-2" ] ] + ] + , Row ( "" , [] , [] ) [] + , Row ( "" , [] , [] ) [] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +^D +[cols=",,",options="header,footer",] +|=== +|Header 1-1 |Span 3 |Header 1-3 +|Header 2-1 | |Header 2-3 +2+|Body 1-1/2 .3+|Span 5 +|Body 2-1 |Body 2-2 +|Body 3-1 |Body 3-2 +| | | +.3+|Span 5 2+|Footer 1-2 +2+|Span 2 +2+|Footer 3-2/3 +| 2+|Footer 4-2/3 +|=== + +[cols=",,",options="footer",] +|=== +|Body 1-1 |Body 1-2 .2+|Span 4 +.3+|Span 5 |Body 2-2 +|Body 3-2 |Body 3-3 +|Body 4-2 |Body 4-3 +| | | +|Body 6-1 |Body 6-2 |Span 6-3 +|Footer 1-1 .5+|Span 8 |Footer 1-3 +.2+|Span 3 |Footer 2-3 +|Span 2 +|Footer 4-1 |Footer 4-3 +|Footer 5-1 |Span 3 +|Span 2 | | +|=== + +[cols=",,",] +|=== +.5+|Span 6 |Body 1-2 .2+|Span 2 +.2+|Span 3 +.3+|Span 4 +|Body 3-2 +|Body 4-2 +| | | +| | | +|=== +``` diff --git a/test/command/7329.md b/test/command/7329.md new file mode 100644 --- /dev/null +++ b/test/command/7329.md @@ -0,0 +1,72 @@ +``` +% pandoc -f markdown -t org +- @item1 +- @item1 [p. 12] +- @item1 [p.12; see also @item2] +- [@item1] +- [-@item1] +- [see @item1 p. 12] +- [see @item1, p. 12] +- [see @item1, p. 12 and *passim*] +- [@item1;@item2] +- [see @item1; @item2] +^D +- [cite/t:@item1] +- [cite/t:@item1 p. 12] +- [cite/t:@item1 p.12; see also @item2] +- [cite:@item1] +- [cite/na:@item1] +- [cite:see @item1 p. 12] +- [cite:see @item1 p. 12] +- [cite:see @item1 p. 12 and /passim/] +- [cite:@item1; @item2] +- [cite:see @item1; @item2] +``` + +``` +% pandoc -f markdown -t org -C --bibliography command/biblio.bib +- [@item1] +^D +- (Doe 2005) + +<> + +<> +Doe, John. 2005. /First Book/. Cambridge University Press. +``` + + +``` +% pandoc -f markdown -t org-citations -C --bibliography command/biblio.bib +[@item1] +^D +(Doe 2005) + +<> + +<> +Doe, John. 2005. /First Book/. Cambridge University Press. +``` + +``` +% pandoc -f org -t markdown +- [cite/t:@item1] +- [cite/t:@item1 p. 12] +- [cite/t:@item1 p.12; see also @item2] +- [cite:@item1] +- [cite/na:@item1] +- [cite:see @item1 p. 12] +- [cite:see @item1 p. 12 and /passim/] +- [cite:@item1; @item2] +- [cite:see @item1; @item2] +^D +- @item1 +- @item1 [p. 12] +- @item1 [p.12; see also @item2] +- [@item1] +- [-@item1] +- [see @item1 p. 12] +- [see @item1 p. 12 and *passim*] +- [@item1; @item2] +- [see @item1; @item2] +``` diff --git a/test/command/7339.md b/test/command/7339.md new file mode 100644 --- /dev/null +++ b/test/command/7339.md @@ -0,0 +1,15 @@ +``` +% pandoc -f gfm -s -t native +--- +title: Test +--- + +Hi +^D +Pandoc + Meta + { unMeta = + fromList [ ( "title" , MetaInlines [ Str "Test" ] ) ] + } + [ Para [ Str "Hi" ] ] +``` diff --git a/test/command/7340.md b/test/command/7340.md new file mode 100644 --- /dev/null +++ b/test/command/7340.md @@ -0,0 +1,6 @@ +``` +% pandoc -f latex -t native +\(*\) +^D +[ Para [ Math InlineMath "*" ] ] +``` diff --git a/test/command/7376.md b/test/command/7376.md new file mode 100644 --- /dev/null +++ b/test/command/7376.md @@ -0,0 +1,16 @@ +``` +% pandoc --citeproc -t plain +--- +references: +- id: item1 + type: book + author: + - family: Doe + given: Jane + issued: 2020 + title: The title +... +^D + + +``` diff --git a/test/command/7394.md b/test/command/7394.md new file mode 100644 --- /dev/null +++ b/test/command/7394.md @@ -0,0 +1,85 @@ +``` +% pandoc -f markdown -t plain --citeproc +--- +csl: command/chicago-fullnote-bibliography.csl +references: +- author: + - family: Wandt + given: Manfred + edition: 6 + id: wandt2014ges-sv + issued: 2014 + publisher: Franz Vahlen + publisher-place: München + title: Gesetzliche schuldverhältnisse + title-short: Gesetzl SV + type: book +- author: + - family: Smith + given: Zenda + edition: 6 + id: smith2015 + issued: 2015 + publisher: Macmillan + publisher-place: New York + title: A verb and a noun + type: book +--- + +Hi^[@wandt2014ges-sv.]. + +Hi^[[@wandt2014ges-sv].]. + +Hi^[[See also @wandt2014ges-sv].]. + +Hi^[See also @wandt2014ges-sv.]. + +Hi^[@wandt2014ges-sv [@smith2015].]. + +Hi^[[@wandt2014ges-sv; @smith2015].]. + +Hi [@wandt2014ges-sv]. + +Hi [see also @wandt2014ges-sv]. + +^D +Hi[1]. + +Hi[2]. + +Hi[3]. + +Hi[4]. + +Hi[5]. + +Hi[6]. + +Hi.[7] + +Hi.[8] + +Smith, Zenda. A Verb and a Noun. 6th ed. New York: Macmillan, 2015. + +Wandt, Manfred. Gesetzliche Schuldverhältnisse. 6th ed. München: Franz +Vahlen, 2014. + +[1] Manfred Wandt, Gesetzliche Schuldverhältnisse, 6th ed. (München: +Franz Vahlen, 2014). + +[2] Wandt. + +[3] See also Wandt. + +[4] See also Wandt. + +[5] Wandt, Zenda Smith, A Verb and a Noun, 6th ed. (New York: Macmillan, +2015). + +[6] Wandt, Gesetzl SV; Smith, A Verb and a Noun. + +[7] Wandt, Gesetzl SV. + +[8] See also Wandt. +``` + diff --git a/test/command/7397.md b/test/command/7397.md new file mode 100644 --- /dev/null +++ b/test/command/7397.md @@ -0,0 +1,14 @@ +```` +% pandoc -t markdown +~~~~ { .haskell startFrom="100"} +qsort [] = [] +qsort (x:xs) = qsort (filter (< x) xs) ++ [x] ++ + qsort (filter (>= x) xs) +~~~~ +^D +``` {.haskell startFrom="100"} +qsort [] = [] +qsort (x:xs) = qsort (filter (< x) xs) ++ [x] ++ + qsort (filter (>= x) xs) +``` +```` diff --git a/test/command/7400.md b/test/command/7400.md new file mode 100644 --- /dev/null +++ b/test/command/7400.md @@ -0,0 +1,8 @@ +``` +% pandoc -t native -s +--- +# Comment only +... +^D +Pandoc Meta { unMeta = fromList [] } [] +``` diff --git a/test/command/7416.md b/test/command/7416.md new file mode 100644 --- /dev/null +++ b/test/command/7416.md @@ -0,0 +1,21 @@ +``` +% pandoc -f markdown -t html +![caption](../media/rId25.jpg "title"){alt="alt"} + +^D +
    +alt +
    caption
    +
    +``` + +``` +% pandoc -f markdown -t html +![caption](../media/rId25.jpg "title") + +^D +
    +caption + +
    +``` diff --git a/test/command/7434.md b/test/command/7434.md new file mode 100644 --- /dev/null +++ b/test/command/7434.md @@ -0,0 +1,23 @@ +``` +% pandoc -f markdown -t native +\begin{proof} +\newcommand{\x}{\left.\right.} +\x +\end{proof} + +1234567890abcdefghi + +[\*\a](x) +^D +[ RawBlock + (Format "tex") + "\\begin{proof}\n\\newcommand{\\x}{\\left.\\right.}\n\\left.\\right.\n\\end{proof}" +, Para [ Str "1234567890abcdefghi" ] +, Para + [ Link + ( "" , [] , [] ) + [ Str "*" , RawInline (Format "tex") "\\a" ] + ( "x" , "" ) + ] +] +``` diff --git a/test/command/7436.md b/test/command/7436.md new file mode 100644 --- /dev/null +++ b/test/command/7436.md @@ -0,0 +1,31 @@ +``` +% pandoc -f rst -t native +.. include:: command/three.txt + :code: + +.. include:: command/three.txt + :literal: + +.. include:: command/three.txt +^D +[ CodeBlock + ( "" , [ "" ] , [ ( "code" , "" ) ] ) + "1st line.\n2nd line.\n3rd line.\n" +, CodeBlock + ( "" , [ "" ] , [ ( "literal" , "" ) ] ) + "1st line.\n2nd line.\n3rd line.\n" +, Para + [ Str "1st" + , Space + , Str "line." + , SoftBreak + , Str "2nd" + , Space + , Str "line." + , SoftBreak + , Str "3rd" + , Space + , Str "line." + ] +] +``` diff --git a/test/command/7473.md b/test/command/7473.md new file mode 100644 --- /dev/null +++ b/test/command/7473.md @@ -0,0 +1,39 @@ +``` +% pandoc -f rst -t native +.. figure:: example.png + :figclass: foo bar + :align: right + :width: 1in + + This is a caption. +^D +[ Figure + ( "" , [ "foo" , "bar" , "align-right" ] , [] ) + (Caption + Nothing + [ Plain + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "caption." + ] + ]) + [ Plain + [ Image + ( "" , [] , [ ( "width" , "1in" ) ] ) + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "caption." + ] + ( "example.png" , "" ) + ] + ] +] +``` diff --git a/test/command/7482.md b/test/command/7482.md new file mode 100644 --- /dev/null +++ b/test/command/7482.md @@ -0,0 +1,47 @@ +``` +% pandoc -f html -t org + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Last N + creditsAverage grade
    14017.06571429
    8417.95595238
    6418.9734375
    3619.12777778
    2919.18275862
    1919.00526316
    +^D +| Last N credits | Average grade | +| 140 | 17.06571429 | +| 84 | 17.95595238 | +| 64 | 18.9734375 | +| 36 | 19.12777778 | +| 29 | 19.18275862 | +| 19 | 19.00526316 | +``` diff --git a/test/command/7494.md b/test/command/7494.md new file mode 100644 --- /dev/null +++ b/test/command/7494.md @@ -0,0 +1,62 @@ +``` +% pandoc -f latex -t plain +\def\foo{BAR} +{\foo +\def\foo{BAZ} +\foo +} +\foo +^D +BAR BAZ BAR +``` + +``` +% pandoc -f latex -t plain +\def\foo{BAR} +{\foo +\gdef\foo{BAZ} +\foo +} +\foo +^D +BAR BAZ BAZ +``` + +``` +% pandoc -f latex -t plain +\def\foo{BAR} +{\foo +\global\def\foo{BAZ} +\foo +} +\foo +^D +BAR BAZ BAZ +``` + +``` +% pandoc -f latex -t plain +\newcommand{\aaa}{BBB} +{ +\renewcommand{\aaa}{AAA} +\aaa +} +\aaa +^D +AAA BBB +``` + +``` +% pandoc -f latex -t markdown +\newcommand{\aaa}{BBB} +\begin{quote} +\renewcommand{\aaa}{AAA} +\aaa +\end{quote} +\aaa +^D +> AAA + +BBB +``` + diff --git a/test/command/7497.md b/test/command/7497.md new file mode 100644 --- /dev/null +++ b/test/command/7497.md @@ -0,0 +1,37 @@ +```` +% pandoc -f markdown-raw_tex -t latex +``` +\end{verbatim} +\LaTeX +\begin{verbatim} +``` +^D +\begin{Shaded} +\begin{Highlighting}[] +\NormalTok{\textbackslash{}end\{verbatim\}} +\NormalTok{\textbackslash{}LaTeX} +\NormalTok{\textbackslash{}begin\{verbatim\}} +\end{Highlighting} +\end{Shaded} +```` + +```` +% pandoc -f markdown-raw_tex -t latex +hi[^1] + +[^1]: + ``` + \end{Verbatim} + \LaTeX + \begin{Verbatim} + ``` +^D +hi\footnote{\begin{Shaded} +\begin{Highlighting}[] +\NormalTok{\textbackslash{}end\{Verbatim\}} +\NormalTok{\textbackslash{}LaTeX} +\NormalTok{\textbackslash{}begin\{Verbatim\}} +\end{Highlighting} +\end{Shaded} +} +```` diff --git a/test/command/7512.md b/test/command/7512.md new file mode 100644 --- /dev/null +++ b/test/command/7512.md @@ -0,0 +1,70 @@ +``` +% pandoc -t native -f latex +\begin{equation*} +[d,\delta]=0. +\end{equation*} +^D +[ Para + [ Math + DisplayMath + "\\begin{equation*}\n[d,\\delta]=0.\n\\end{equation*}" + ] +] +``` + +``` +% pandoc -t native -f latex +\begin{table}[htb] + \begin{tabular}{|c|c|} + $W$ & rel. err. \\[0mm] + [$\mu$m] & [\%]\\ + \end{tabular} +\end{table} +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "W" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "rel." , Space , Str "err." ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "[" , Math InlineMath "\\mu" , Str "m]" ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "[%]" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/7520.md b/test/command/7520.md new file mode 100644 --- /dev/null +++ b/test/command/7520.md @@ -0,0 +1,22 @@ +``` +% pandoc -f org -t native -s +:PROPERTIES: +:ID: d5b18943-98a3-4b2a-a545-41d17bf50f3e +:END: +#+title: Common Ground +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "id" + , MetaString "d5b18943-98a3-4b2a-a545-41d17bf50f3e" + ) + , ( "title" + , MetaInlines [ Str "Common" , Space , Str "Ground" ] + ) + ] + } + [] + +``` diff --git a/test/command/7521.md b/test/command/7521.md new file mode 100644 --- /dev/null +++ b/test/command/7521.md @@ -0,0 +1,11 @@ +``` +% pandoc --strip-comments +- one + +- two +^D +
      +
    • one
      • +
    • two
      • +
    +``` diff --git a/test/command/7525.md b/test/command/7525.md new file mode 100644 --- /dev/null +++ b/test/command/7525.md @@ -0,0 +1,33 @@ +``` +% pandoc -f latex -t native +\texttt{Normal code. \emph{Emph and code.} \textsc{\textbf{Bold small caps.}} \sout{Strikeout. \underline{Strikeout and underline.}}} +^D +[ Para + [ Code ( "" , [] , [] ) "Normal code. " + , Emph [ Code ( "" , [] , [] ) "Emph and code." ] + , Code ( "" , [] , [] ) " " + , SmallCaps + [ Strong [ Code ( "" , [] , [] ) "Bold small caps." ] ] + , Code ( "" , [] , [] ) " " + , Strikeout + [ Code ( "" , [] , [] ) "Strikeout. " + , Underline + [ Code ( "" , [] , [] ) "Strikeout and underline." ] + ] + ] +] +``` + +``` +% pandoc -f html -t native +hi +^D +[ Plain [ Strong [ Code ( "" , [] , [] ) "hi" ] ] ] +``` + +``` +% pandoc -f mediawiki -t native +''hey'' +^D +[ Para [ Emph [ Code ( "" , [] , [] ) "hey" ] ] ] +``` diff --git a/test/command/7529.md b/test/command/7529.md new file mode 100644 --- /dev/null +++ b/test/command/7529.md @@ -0,0 +1,7 @@ +``` +% pandoc -f html -t asciidoc +https://example.com/show.cgi?id=hi--there--everyone +^D +link:++https://example.com/show.cgi?id=hi--there--everyone++[] +``` + diff --git a/test/command/7546.md b/test/command/7546.md new file mode 100644 --- /dev/null +++ b/test/command/7546.md @@ -0,0 +1,6 @@ +``` +% pandoc -t html -f native +Span ("", [], [("","")]) [] +^D + +``` diff --git a/test/command/7557.md b/test/command/7557.md new file mode 100644 --- /dev/null +++ b/test/command/7557.md @@ -0,0 +1,20 @@ +``` +% pandoc -f org -t native +- 11. and 12. 09. meeting +^D +[ BulletList + [ [ Plain + [ Str "11." + , Space + , Str "and" + , Space + , Str "12." + , Space + , Str "09." + , Space + , Str "meeting" + ] + ] + ] +] +``` diff --git a/test/command/7568.md b/test/command/7568.md new file mode 100644 --- /dev/null +++ b/test/command/7568.md @@ -0,0 +1,16 @@ +``` +% pandoc -f rst +While `Labyrinth Lord: Revised Edition`_ (LLRE; PDF and POD) has been +criticized for not being a completely faithful retro-clone of the +Moldvay/Cook/Marsh Basic/Expert D&D rules (B/X), I think it still +holds a useful spot. + +.. _Labyrinth Lord\: Revised Edition: https://www.drivethrurpg.com/product/64332/Labyrinth-Lord-Revised-Edition +^D +

    While Labyrinth +Lord: Revised Edition (LLRE; PDF and POD) has been criticized for +not being a completely faithful retro-clone of the Moldvay/Cook/Marsh +Basic/Expert D&D rules (B/X), I think it still holds a useful +spot.

    +``` diff --git a/test/command/7573.md b/test/command/7573.md new file mode 100644 --- /dev/null +++ b/test/command/7573.md @@ -0,0 +1,11 @@ +``` +% pandoc --preserve-tabs +
      +
    1. one +
    +^D +
      +
    1. +one +
    +``` diff --git a/test/command/7582.md b/test/command/7582.md new file mode 100644 --- /dev/null +++ b/test/command/7582.md @@ -0,0 +1,28 @@ +``` +% pandoc -t revealjs +# Slide + +::: columns +:::: column +Left column +:::: + +. . . + +:::: column +Right column +:::: +::: +^D +
    +

    Slide

    +
    +
    +

    Left column

    +
    +

    Right column

    +
    +
    +
    + +``` diff --git a/test/command/7589.md b/test/command/7589.md new file mode 100644 --- /dev/null +++ b/test/command/7589.md @@ -0,0 +1,72 @@ +``` +% pandoc -f html -t native + + + + + + + + + + + + +
    experienceexpertiseparadigmshaskellnameimage
    +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "experience" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "expertise" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "paradigms" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "haskell" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "name" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "image" ] ] + ] + ]) + [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/7615.md b/test/command/7615.md new file mode 100644 --- /dev/null +++ b/test/command/7615.md @@ -0,0 +1,6 @@ +``` +% pandoc -f latex -t native +\texttt{\^} +^D +[ Para [ Code ( "" , [] , [] ) "^" ] ] +``` diff --git a/test/command/7623.md b/test/command/7623.md new file mode 100644 --- /dev/null +++ b/test/command/7623.md @@ -0,0 +1,12 @@ +``` +% pandoc -t native +[link $(0,1]$](url) +^D +[ Para + [ Link + ( "" , [] , [] ) + [ Str "link" , Space , Math InlineMath "(0,1]" ] + ( "url" , "" ) + ] +] +``` diff --git a/test/command/7632.md b/test/command/7632.md new file mode 100644 --- /dev/null +++ b/test/command/7632.md @@ -0,0 +1,66 @@ +``` +% pandoc -t native +(@a) First case + +[link to (@a)](url) +^D +[ OrderedList + ( 1 , Example , TwoParens ) + [ [ Plain [ Str "First" , Space , Str "case" ] ] ] +, Para + [ Link + ( "" , [] , [] ) + [ Str "link" , Space , Str "to" , Space , Str "(1)" ] + ( "url" , "" ) + ] +] +``` + +``` +% pandoc -t native +[@a]{.class} +^D +[ Para + [ Span + ( "" , [ "class" ] , [] ) + [ Cite + [ Citation + { citationId = "a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "@a" ] + ] + ] +] + +``` + +``` +% pandoc -t native +[@a](url) +^D +[ Para + [ Link + ( "" , [] , [] ) + [ Cite + [ Citation + { citationId = "a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "@a" ] + ] + ( "url" , "" ) + ] +] + +``` diff --git a/test/command/7668.md b/test/command/7668.md new file mode 100644 --- /dev/null +++ b/test/command/7668.md @@ -0,0 +1,36 @@ +``` +% pandoc -f bibtex -t csljson +%@Book{JW82, + author = {Richard A. Johnson and Dean W. Wichern}, + title = {Applied Multivariate Statistical Analysis}, + publisher= {Prentice-Hall}, + year = {1983} +} +@Book{JW83, + author = {Richard %A. + B. Johnson}, +% title = {Multivariate Analysis}, + year = "% + 1983" +} +^D +[ + { + "author": [ + { + "family": "Johnson", + "given": "Richard B." + } + ], + "id": "JW83", + "issued": { + "date-parts": [ + [ + 1983 + ] + ] + }, + "type": "book" + } +] +``` diff --git a/test/command/7678.md b/test/command/7678.md new file mode 100644 --- /dev/null +++ b/test/command/7678.md @@ -0,0 +1,62 @@ +``` +% pandoc -f bibtex -t csljson +@misc{doe, + author = "Jane Doe", + title = "Work", + year = "2021", + url = "%20and%20" +} +^D +[ + { + "URL": "%20and%20", + "author": [ + { + "family": "Doe", + "given": "Jane" + } + ], + "id": "doe", + "issued": { + "date-parts": [ + [ + 2021 + ] + ] + }, + "title": "Work", + "type": "" + } +] +``` +``` +% pandoc -f bibtex -t csljson +@misc{doe, + author = "Jane Doe", + title = "Work", + year = "2021", + doi = "%20and%20" +} +^D +[ + { + "DOI": "%20and%20", + "author": [ + { + "family": "Doe", + "given": "Jane" + } + ], + "id": "doe", + "issued": { + "date-parts": [ + [ + 2021 + ] + ] + }, + "title": "Work", + "type": "" + } +] +``` diff --git a/test/command/7691.docx b/test/command/7691.docx new file mode 100644 Binary files /dev/null and b/test/command/7691.docx differ diff --git a/test/command/7691.md b/test/command/7691.md new file mode 100644 --- /dev/null +++ b/test/command/7691.md @@ -0,0 +1,5 @@ +``` +% pandoc command/7691.docx +^D +

    Some text

    +``` diff --git a/test/command/7692.md b/test/command/7692.md new file mode 100644 --- /dev/null +++ b/test/command/7692.md @@ -0,0 +1,13 @@ +``` +% pandoc -t markdown +[https://example.com](https://example.com){.clz} +^D +[https://example.com](https://example.com){.clz} +``` + +``` +% pandoc -f markdown -t html | pandoc -f html -t markdown + +^D + +``` diff --git a/test/command/7697.md b/test/command/7697.md new file mode 100644 --- /dev/null +++ b/test/command/7697.md @@ -0,0 +1,27 @@ +``` +% pandoc -f rst -t mediawiki +.. _refsubpage1: + +heading +------- + +ref to top of this section: `refsubpage1`_. +^D + += heading = + +ref to top of this section: [[#refsubpage1|refsubpage1]]. +``` +``` +% pandoc -f markdown -t mediawiki +# Heading {#foo} +^D + += Heading = +``` +``` +% pandoc -f markdown -t mediawiki +# My Heading {#My_Heading} +^D += My Heading = +``` diff --git a/test/command/7713.md b/test/command/7713.md new file mode 100644 --- /dev/null +++ b/test/command/7713.md @@ -0,0 +1,29 @@ +``` +% pandoc +| aaaaaaaaaaaa | bbbbb | ccccccccccc | +| --- | --- | --- | +| | | cccccccccc cccccccccc cccccccccc cccccccccc cccccccccc cccccccccc | +^D + +++++ + + + + + + + + + + + + + + +
    aaaaaaaaaaaabbbbbccccccccccc
    cccccccccc cccccccccc cccccccccc cccccccccc cccccccccc +cccccccccc
    +``` diff --git a/test/command/7723.md b/test/command/7723.md new file mode 100644 --- /dev/null +++ b/test/command/7723.md @@ -0,0 +1,8 @@ +``` +% pandoc -t native +Bug![^1] + +[^1]: Note. +^D +[ Para [ Str "Bug!" , Note [ Para [ Str "Note." ] ] ] ] +``` diff --git a/test/command/7726.md b/test/command/7726.md new file mode 100644 --- /dev/null +++ b/test/command/7726.md @@ -0,0 +1,22 @@ +``` +% pandoc -t markdown +\# Hi + +\## Hi + +\### Hi + +\#### hi + +and #hi +^D +\# Hi + +\## Hi + +\### Hi + +\#### hi + +and #hi +``` diff --git a/test/command/7738.md b/test/command/7738.md new file mode 100644 --- /dev/null +++ b/test/command/7738.md @@ -0,0 +1,6 @@ +``` +% pandoc +![_](url.png) image +^D +

    _ image

    +``` diff --git a/test/command/7743.md b/test/command/7743.md new file mode 100644 --- /dev/null +++ b/test/command/7743.md @@ -0,0 +1,56 @@ +``` +% pandoc -f markdown+mark -t html +==Hi== +^D +

    Hi

    +``` + +``` +% pandoc -f markdown+mark -t latex +==Hi== +^D +\hl{Hi} +``` + +``` +% pandoc -f markdown+mark -t rst +==Hi== +^D +:mark:`Hi` +``` + +``` +% pandoc -f html -t markdown+mark +Hi +^D +==Hi== +``` + +``` +% pandoc -f html -t markdown +Hi +^D +[Hi]{.mark} +``` + +``` +% pandoc -f rst -t markdown+mark +:mark:`Hi` +^D +==Hi== +``` + +``` +% pandoc -f markdown+mark -t docx -o - | pandoc -f docx -t markdown+mark +==Hi== +^D +==Hi== +``` + +``` +% pandoc -f latex -t markdown+mark +\hl{Hi} +^D +==Hi== +``` + diff --git a/test/command/7761.md b/test/command/7761.md new file mode 100644 --- /dev/null +++ b/test/command/7761.md @@ -0,0 +1,35 @@ +``` +% pandoc --citeproc --csl command/chicago-fullnote-bibliography.csl -t plain +--- +references: +- id: noauthor + issued: 2020 + publisher: Oxford University Press + publisher-place: Oxford + title: Title + type: book +- id: author + author: + - family: Jones + given: Jim + issued: 2021 + title: Title + type: book + url: "https://duckduckgo.com/cite2021" +--- + +Text.[^n] + +[^n]: See @author. Another example of a sea level mapping tool with +similar limitations is @noauthor. +^D +Text.[1] + +Jones, Jim. Title, 2021. https://duckduckgo.com/cite2021. + +Title. Oxford: Oxford University Press, 2020. + +[1] See Jim Jones, Title, 2021, https://duckduckgo.com/cite2021. Another +example of a sea level mapping tool with similar limitations is Title +(Oxford: Oxford University Press, 2020). +``` diff --git a/test/command/7778.md b/test/command/7778.md new file mode 100644 --- /dev/null +++ b/test/command/7778.md @@ -0,0 +1,59 @@ +Here the thing to remember is that block level structure indications +take precedence over inline level structure indications: + +``` +% pandoc +Term +: Def + +^D +
    +
    Term
    +
    +Def <!– +
    +
    +comment def –> +
    +
    +``` + +``` +% pandoc +Term +: Def +test +^D +
    +
    Term
    +
    +Def test <!– +
    +
    +comment def and –> +
    +
    +``` + +``` +% pandoc +Term +: Def +`code +: comment def +more code` +^D +
    +
    Term
    +
    +Def `code +
    +
    +comment def more code` +
    +
    +``` diff --git a/test/command/7803.md b/test/command/7803.md new file mode 100644 --- /dev/null +++ b/test/command/7803.md @@ -0,0 +1,26 @@ +``` +% pandoc -f html -t asciidoc + +^D +* link:x.htm[_Xx_]_,_ +* link:x.htm[_Xx_]_,,_ +* link:x.htm[_Xx_]_1_ +* link:x.htm[_Xx_]1__1__ +* link:x.htm[_Xx_]_bcd_ +* link:x.htm[_Xx_]a__bcd__ +* link:x.htm[_Xx_]a__bcd__e +* link:x.htm[_Xx_] _,_ +* link:x.htm[_Xx_],_,_ +* link:x.htm[Xx]_,_ +``` diff --git a/test/command/7808.md b/test/command/7808.md new file mode 100644 --- /dev/null +++ b/test/command/7808.md @@ -0,0 +1,8 @@ +Wiki links should have no display text, if their display text matches +their target. +``` +% pandoc -f mediawiki -t mediawiki +[[Help]] [[Butter|Butter]] [[Bubbles|Everyone loves bubbles]] +^D +[[Help]] [[Butter]] [[Bubbles|Everyone loves bubbles]] +``` diff --git a/test/command/7810.md b/test/command/7810.md new file mode 100644 --- /dev/null +++ b/test/command/7810.md @@ -0,0 +1,43 @@ +``` +% pandoc -f org -t org +- + #+begin_example + aa + #+end_example +- test +^D +- + #+begin_example + aa + #+end_example + +- test +``` + +``` +% pandoc -f org -t org +- a +- +- a +- a +^D +- a +- +- a +- a +``` + +``` +% pandoc -f org -t org +- a + - b + - b +- a +- a +^D +- a + - b + - b +- a +- a +``` diff --git a/test/command/7813-meta.yaml b/test/command/7813-meta.yaml new file mode 100644 --- /dev/null +++ b/test/command/7813-meta.yaml @@ -0,0 +1,6 @@ +--- +abstract: | + a footnote[^1] in abstract. + + [^1]: content +... diff --git a/test/command/7813.md b/test/command/7813.md new file mode 100644 --- /dev/null +++ b/test/command/7813.md @@ -0,0 +1,26 @@ +``` +% pandoc --metadata-file command/7813-meta.yaml -t native -s +Hi +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "abstract" + , MetaBlocks + [ Para + [ Str "a" + , Space + , Str "footnote" + , Note [ Para [ Str "content" ] ] + , Space + , Str "in" + , Space + , Str "abstract." + ] + ] + ) + ] + } + [ Para [ Str "Hi" ] ] +``` diff --git a/test/command/7826.md b/test/command/7826.md new file mode 100644 --- /dev/null +++ b/test/command/7826.md @@ -0,0 +1,78 @@ +``` +% pandoc -t plain --citeproc +--- +bibliography: command/biblio.bib +suppress-bibliography: true +csl: command/american-medical-association.csl +notes-after-punctuation: true +--- + +In numerous recent works [@item1; @item2], statistician +Foo and Bar have criticized XXX. +^D +In numerous recent works,^(1,2) statistician Foo and Bar have criticized +XXX. +``` +``` +% pandoc -t plain --citeproc +--- +bibliography: command/biblio.bib +suppress-bibliography: true +csl: command/american-medical-association.csl +--- + +In numerous recent works [@item1; @item2], statistician +Foo and Bar have criticized XXX. +^D +In numerous recent works^(1,2), statistician Foo and Bar have criticized +XXX. +``` +``` +% pandoc -t plain --citeproc +--- +bibliography: command/biblio.bib +suppress-bibliography: true +csl: command/chicago-fullnote-bibliography.csl +notes-after-punctuation: false +--- + +In numerous recent works [@item1; @item2], statistician +Foo and Bar have criticized XXX. +^D +In numerous recent works[1], statistician Foo and Bar have criticized +XXX. + +[1] John Doe, First Book (Cambridge: Cambridge University Press, 2005); +John Doe, “Article,” Journal of Generic Studies 6 (2006): 33–34. +``` +``` +% pandoc -t plain --citeproc +--- +bibliography: command/biblio.bib +suppress-bibliography: true +csl: command/chicago-fullnote-bibliography.csl +--- + +In numerous recent works [@item1; @item2], statistician +Foo and Bar have criticized XXX. +^D +In numerous recent works,[1] statistician Foo and Bar have criticized +XXX. + +[1] John Doe, First Book (Cambridge: Cambridge University Press, 2005); +John Doe, “Article,” Journal of Generic Studies 6 (2006): 33–34. +``` +``` +% pandoc -t plain --citeproc +--- +bibliography: command/biblio.bib +suppress-bibliography: true +notes-after-punctuation: true +--- + +In numerous recent works [@item1; @item2], statistician +Foo and Bar have criticized XXX. +^D +In numerous recent works (Doe 2005, 2006), statistician Foo and Bar have +criticized XXX. +``` diff --git a/test/command/7847.md b/test/command/7847.md new file mode 100644 --- /dev/null +++ b/test/command/7847.md @@ -0,0 +1,85 @@ +``` +% pandoc -f html -t markdown_strict+pipe_tables + +++++ + + + + + + + + + + + + + + +
    aaabbbccc
    Consequat nisi sit amet nibh. Nunc mi tortor, tristique +sit amet, rhoncus porta, malesuada elementum, nisi.ccc
    +^D +| aaa | bbb | ccc | +|---------------|------------------------------------------|---------------| +| Consequat nisi sit amet nibh. Nunc mi tortor, tristique sit amet, rhoncus porta, malesuada elementum, nisi. | | ccc | + +``` + +``` +% pandoc -f html -t markdown_strict+pipe_tables + + + + + + + + + + + +
    aaabbbccc
    Consequat nisi sit amet nibh. Nunc mi tortor, tristique +sit amet, rhoncus porta, malesuada elementum, nisi.ccc
    +^D +| aaa | bbb | ccc | +|----|----|----| +| Consequat nisi sit amet nibh. Nunc mi tortor, tristique sit amet, rhoncus porta, malesuada elementum, nisi. | | ccc | + +``` + +``` +% pandoc -f html -t commonmark+pipe_tables + +++++ + + + + + + + + + + + + + + +
    aaabbbccc
    Consequat nisi sit amet nibh. Nunc mi tortor, tristique +sit amet, rhoncus porta, malesuada elementum, nisi.bbbccc
    +^D +| aaa | bbb | ccc | +|----|----|----| +| Consequat nisi sit amet nibh. Nunc mi tortor, tristique sit amet, rhoncus porta, malesuada elementum, nisi. | bbb | ccc | + +``` + + diff --git a/test/command/7857.md b/test/command/7857.md new file mode 100644 --- /dev/null +++ b/test/command/7857.md @@ -0,0 +1,21 @@ +``` +% pandoc --slide-level=2 -t beamer +# section + +::: notes +my note +::: + +## slide + +ok +^D +\section{section}\label{section} + +\note{my note} + +\begin{frame}{slide} +\protect\phantomsection\label{slide} +ok +\end{frame} +``` diff --git a/test/command/7858.md b/test/command/7858.md new file mode 100644 --- /dev/null +++ b/test/command/7858.md @@ -0,0 +1,6 @@ +``` +% pandoc -t html --columns=50 --wrap=auto +`neuth asontue stheuosnt aeosunth asnoetuh asneotuh snatehou snatoehu sntahe ousntahoe unstaheou sntaheou aoeu sthoeu sntaoeusnth ansoetuhs atoeuh saonteu` +^D +

    neuth asontue stheuosnt aeosunth asnoetuh asneotuh snatehou snatoehu sntahe ousntahoe unstaheou sntaheou aoeu sthoeu sntaoeusnth ansoetuhs atoeuh saonteu

    +``` diff --git a/test/command/7861.md b/test/command/7861.md new file mode 100644 --- /dev/null +++ b/test/command/7861.md @@ -0,0 +1,7 @@ +``` +% pandoc -s -t native --data-dir=command/7861 --metadata-file=../../7861.yaml +Hello +^D +2> Could not find metadata file '../../7861.yaml' +=> 98 +``` diff --git a/test/command/7861.yaml b/test/command/7861.yaml new file mode 100644 --- /dev/null +++ b/test/command/7861.yaml diff --git a/test/command/7861/metadata/placeholder b/test/command/7861/metadata/placeholder new file mode 100644 --- /dev/null +++ b/test/command/7861/metadata/placeholder diff --git a/test/command/7863.md b/test/command/7863.md new file mode 100644 --- /dev/null +++ b/test/command/7863.md @@ -0,0 +1,27 @@ +``` +% pandoc -f commonmark+yaml_metadata_block+sourcepos -t native +--- +key: + | + value +... + + +Text +^D +[ Div + ( "" + , [] + , [ ( "wrapper" , "1" ) , ( "data-pos" , "8:1-9:1" ) ] + ) + [ Para + [ Span + ( "" + , [] + , [ ( "wrapper" , "1" ) , ( "data-pos" , "8:1-8:5" ) ] + ) + [ Str "Text" ] + ] + ] +] +``` diff --git a/test/command/7871.md b/test/command/7871.md new file mode 100644 --- /dev/null +++ b/test/command/7871.md @@ -0,0 +1,14 @@ +``` +% pandoc -f html -t html + + +
    a
    +^D + + + + + + +
    a
    +``` diff --git a/test/command/7884.md b/test/command/7884.md new file mode 100644 --- /dev/null +++ b/test/command/7884.md @@ -0,0 +1,72 @@ +``` +% pandoc -f html+epub_html_exts -t native + +
    +

    Chapter 1

    +

    Here is a footnote.1

    +

    Here is a second footnote.2

    +
    +
    +
    +
      +

    1. This is a test↩︎

      2. +

    2. This is another test↩︎

      3. +
    +
    + +^D +[ Div + ( "chapter-1" + , [ "section" , "level1" ] + , [ ( "number" , "1" ) ] + ) + [ Header + 1 + ( "" , [] , [ ( "number" , "1" ) ] ) + [ Str "Chapter" , Space , Str "1" ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "footnote." + , Note + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "test" + ] + ] + ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "second" + , Space + , Str "footnote." + , Note + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "another" + , Space + , Str "test" + ] + ] + ] + ] +] + +``` diff --git a/test/command/7894.md b/test/command/7894.md new file mode 100644 --- /dev/null +++ b/test/command/7894.md @@ -0,0 +1,109 @@ +``` +% pandoc -f ris -t csljson +TY - BOOK +ID - Chang_Keisler_Model_Theory +AU - Chang, C. C. +AU - Keisler, H. Jerome +PY - 1990 +ET - 3 +TI - Model Theory +PU - North-Holland Press +PP - Amsterdam +KW - model theory +KW - logic +ER - +TY - JOUR +AU - Shannon, Claude E. +PY - 1948 +DA - July +TI - A Mathematical Theory of Communication +T2 - Bell System Technical Journal +SP - 379 +EP - 423 +VL - 27 +ER - +TY - JOUR +T1 - On computable numbers, with an application to the Entscheidungsproblem +A1 - Turing, Alan Mathison +JO - Proc. of London Mathematical Society +VL - 47 +IS - 1 +KW - decidability +KW - computability +SP - 230 +EP - 265 +Y1 - 1937 +ER - +^D +[ + { + "author": [ + { + "family": "Chang", + "given": "C. C." + }, + { + "family": "Keisler", + "given": "H. Jerome" + } + ], + "edition": "3", + "id": "Chang_Keisler_Model_Theory", + "issued": { + "date-parts": [ + [ + 1990 + ] + ] + }, + "keyword": "logic, model theory", + "publisher-place": "Amsterdam", + "title": "Model Theory", + "type": "book" + }, + { + "author": [ + { + "family": "Shannon", + "given": "Claude E." + } + ], + "container-title": "Bell System Technical Journal", + "id": "Shannon_1948", + "issued": { + "date-parts": [ + [ + 1948 + ] + ] + }, + "page": "379-423", + "title": "A Mathematical Theory of Communication", + "type": "article-journal", + "volume": "27" + }, + { + "author": [ + { + "family": "Turing", + "given": "Alan Mathison" + } + ], + "container-title": "Proc. of London Mathematical Society", + "id": "Turing_1937", + "issue": "1", + "issued": { + "date-parts": [ + [ + 1937 + ] + ] + }, + "keyword": "computability, decidability", + "page": "230-265", + "title": "On computable numbers, with an application to the Entscheidungsproblem", + "type": "article-journal", + "volume": "47" + } +] +``` diff --git a/test/command/7919.md b/test/command/7919.md new file mode 100644 --- /dev/null +++ b/test/command/7919.md @@ -0,0 +1,118 @@ +``` +% pandoc -f markdown +single column table | +------------------- | +item 1 | +item 2 | +^D + + + + + + + + + + + + + + +
    single column table
    item 1
    item 2
    +``` + +``` +% pandoc -f markdown +| single column table +| ------------------- +| item 1 +| item 2 +^D + + + + + + + + + + + + + + +
    single column table
    item 1
    item 2
    +``` + +``` +% pandoc -f markdown +single column table +------------------- +item 1 +item 2 +^D +

    single column table

    +

    item 1 item 2

    +``` + +``` +% pandoc -f gfm +single column table | +------------------- | +item 1 | +item 2 | +^D + + + + + + + + + + + + + + +
    single column table
    item 1
    item 2
    +``` + +``` +% pandoc -f gfm +| single column table +| ------------------- +| item 1 +| item 2 +^D + + + + + + + + + + + + + + +
    single column table
    item 1
    item 2
    +``` + +``` +% pandoc -f gfm +single column table +------------------- +item 1 +item 2 +^D +

    single column table

    +

    item 1 item 2

    +``` + diff --git a/test/command/7920.md b/test/command/7920.md new file mode 100644 --- /dev/null +++ b/test/command/7920.md @@ -0,0 +1,20 @@ +``` +% pandoc -t native +[hi]{#123} +^D +[ Para [ Span ( "123" , [] , [] ) [ Str "hi" ] ] ] +``` + +``` +% pandoc -t markdown +[hi]{#123} +^D +[hi]{#123} +``` + +``` +% pandoc -t markdown +# Hi {#123} +^D +# Hi {#123} +``` diff --git a/test/command/7930.md b/test/command/7930.md new file mode 100644 --- /dev/null +++ b/test/command/7930.md @@ -0,0 +1,98 @@ +``` +% pandoc -f latex -t native +We discuss foobar in notes \ref{note:X} and \ref{note:Y}. + +Foo.\footnote{\label{note:X}A note. See also note~\ref{note:Y}.} + +Bar.\footnote{\label{note:Y}Another note. See also +note~\ref{note:X}} +^D +[ Para + [ Str "We" + , Space + , Str "discuss" + , Space + , Str "foobar" + , Space + , Str "in" + , Space + , Str "notes" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "note:X" ) + ] + ) + [ Str "1" ] + ( "#note:X" , "" ) + , Space + , Str "and" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "note:Y" ) + ] + ) + [ Str "2" ] + ( "#note:Y" , "" ) + , Str "." + ] +, Para + [ Str "Foo." + , Note + [ Para + [ Span ( "note:X" , [] , [ ( "label" , "note:X" ) ] ) [] + , Str "A" + , Space + , Str "note." + , Space + , Str "See" + , Space + , Str "also" + , Space + , Str "note\160" + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "note:Y" ) + ] + ) + [ Str "2" ] + ( "#note:Y" , "" ) + , Str "." + ] + ] + ] +, Para + [ Str "Bar." + , Note + [ Para + [ Span ( "note:Y" , [] , [ ( "label" , "note:Y" ) ] ) [] + , Str "Another" + , Space + , Str "note." + , Space + , Str "See" + , Space + , Str "also" + , SoftBreak + , Str "note\160" + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "note:X" ) + ] + ) + [ Str "1" ] + ( "#note:X" , "" ) + ] + ] + ] +] +``` diff --git a/test/command/7939.md b/test/command/7939.md new file mode 100644 --- /dev/null +++ b/test/command/7939.md @@ -0,0 +1,9 @@ +``` +% pandoc -f latex -t native +\def\|{\verb|} +\vbox{ +\hbox{\|\begin{minipage}[t]%|} +} +^D +[ Para [ Code ( "" , [] , [] ) "\\begin{minipage}[t]%" ] ] +``` diff --git a/test/command/7941.md b/test/command/7941.md new file mode 100644 --- /dev/null +++ b/test/command/7941.md @@ -0,0 +1,6 @@ +``` +% pandoc -f commonmark_x -t commonmark_x +# Class setup +^D +# Class setup +``` diff --git a/test/command/7953.md b/test/command/7953.md new file mode 100644 --- /dev/null +++ b/test/command/7953.md @@ -0,0 +1,11 @@ +``` +% pandoc -f latex -t native +{foo\bgroup bar\egroup } +^D +[ Para + [ Span + ( "" , [] , [] ) + [ Str "foo" , Span ( "" , [] , [] ) [ Str "bar" ] ] + ] +] +``` diff --git a/test/command/7965.md b/test/command/7965.md new file mode 100644 --- /dev/null +++ b/test/command/7965.md @@ -0,0 +1,54 @@ +``` +% pandoc -f markdown -t gfm +Watson and Crick (1953) + +
    + +
    + +Watson, J. D., and F. H. C. Crick. 1953. “Molecular Structure of Nucleic +Acids: A Structure for Deoxyribose Nucleic Acid.” *Nature* 171 (4356): +737–38. . + +
    + +
    +^D +Watson and Crick (1953) + +
    + +
    + +Watson, J. D., and F. H. C. Crick. 1953. “Molecular Structure of Nucleic +Acids: A Structure for Deoxyribose Nucleic Acid.” *Nature* 171 (4356): +737–38. . + +
    + +
    +``` + +``` +% pandoc -f markdown -t gfm-raw_html +Watson and Crick (1953) + +
    + +
    + +Watson, J. D., and F. H. C. Crick. 1953. “Molecular Structure of Nucleic +Acids: A Structure for Deoxyribose Nucleic Acid.” *Nature* 171 (4356): +737–38. . + +
    + +
    +^D +Watson and Crick (1953) + +Watson, J. D., and F. H. C. Crick. 1953. “Molecular Structure of Nucleic +Acids: A Structure for Deoxyribose Nucleic Acid.” *Nature* 171 (4356): +737–38. . +``` + diff --git a/test/command/8003.md b/test/command/8003.md new file mode 100644 --- /dev/null +++ b/test/command/8003.md @@ -0,0 +1,6 @@ +``` +% pandoc -f markdown+ascii_identifiers +# Işık +^D +

    Işık

    +``` diff --git a/test/command/8011.md b/test/command/8011.md new file mode 100644 --- /dev/null +++ b/test/command/8011.md @@ -0,0 +1,15 @@ +``` +% pandoc -f docbook -t gfm + + +❏ a + + +✓ b + + +^D +- [ ] a + +- [x] b +``` diff --git a/test/command/8024.md b/test/command/8024.md new file mode 100644 --- /dev/null +++ b/test/command/8024.md @@ -0,0 +1,10 @@ +``` +% pandoc -d command/8024a.yaml -t markdown +Hello, if this works the text should be wrapped. +^D +Hello, if this +works the text +should be +wrapped. + +``` diff --git a/test/command/8024a.yaml b/test/command/8024a.yaml new file mode 100644 --- /dev/null +++ b/test/command/8024a.yaml @@ -0,0 +1,2 @@ +defaults: ${.}/8024b.yaml + diff --git a/test/command/8024b.yaml b/test/command/8024b.yaml new file mode 100644 --- /dev/null +++ b/test/command/8024b.yaml @@ -0,0 +1,3 @@ +wrap: auto +columns: 15 + diff --git a/test/command/8028.md b/test/command/8028.md new file mode 100644 --- /dev/null +++ b/test/command/8028.md @@ -0,0 +1,10 @@ +``` +% pandoc +foo^[a note + +with multiple paragraphs] +^D +

    foo^[a note

    +

    with multiple paragraphs]

    + +``` diff --git a/test/command/8047.md b/test/command/8047.md new file mode 100644 --- /dev/null +++ b/test/command/8047.md @@ -0,0 +1,6 @@ +``` +% pandoc --wrap=none +![](file.jpg){height=10em width=10em style='border: 1px solid black'} +^D +

    +``` diff --git a/test/command/8070.md b/test/command/8070.md new file mode 100644 --- /dev/null +++ b/test/command/8070.md @@ -0,0 +1,13 @@ +``` +% pandoc -f html -t asciidoc +

    12.1 +manual, Database Backup and Recovery User’s Guide: +Chapter 28 Transporting Data Across Platforms, +Steps to Transport a Database to a Different Platform Using Backup Sets

    +^D +https://docs.oracle.com/database/121/BRADV/rcmxplat.htm#BRADV724[12.1 +manual, Database Backup and Recovery User’s Guide: +[.enumeration_chapter]#Chapter 28# Transporting Data Across +Platforms, Steps to Transport a Database to a Different Platform +Using Backup Sets] +``` diff --git a/test/command/8079.md b/test/command/8079.md new file mode 100644 --- /dev/null +++ b/test/command/8079.md @@ -0,0 +1,19 @@ +``` +% pandoc -f html -t icml + + +
    one
    +^D + + + + + + one + + + +
    + + +``` diff --git a/test/command/8088.md b/test/command/8088.md new file mode 100644 --- /dev/null +++ b/test/command/8088.md @@ -0,0 +1,6 @@ +``` +% pandoc -t latex --biblatex +[@first, 1; @second; @third, 3] +^D +\autocites[1]{first}{second}[3]{third} +``` diff --git a/test/command/8097.md b/test/command/8097.md new file mode 100644 --- /dev/null +++ b/test/command/8097.md @@ -0,0 +1,9 @@ +``` +% pandoc --number-sec --number-offset=2 --wrap=none +# One + +# two +^D +

    3 One

    +

    4 two

    +``` diff --git a/test/command/8098.md b/test/command/8098.md new file mode 100644 --- /dev/null +++ b/test/command/8098.md @@ -0,0 +1,36 @@ +``` +% pandoc -t revealjs --slide-level=2 +# Title 1 + +## Slide 1 + +Text. + +::: fragment +### Sub Slide header + +Text. +::: + +## Slide 2 + +Text. +^D +
    +
    +

    Title 1

    + +
    +
    +

    Slide 1

    +

    Text.

    +
    +

    Sub Slide header

    +

    Text.

    +
    +
    +
    +

    Slide 2

    +

    Text.

    +
    +``` diff --git a/test/command/8110.md b/test/command/8110.md new file mode 100644 --- /dev/null +++ b/test/command/8110.md @@ -0,0 +1,41 @@ +``` +% pandoc -f mediawiki +{| class="wikitable" +! Header text +! Header text +! Header text + +|- +| Example +| Example +| Example + +|- +| Example +| Example +| Example +|} +^D + + + + + + + + + + + + + + + + + + + + +

    Header text

    Header text

    Header text

    Example

    Example

    Example

    Example

    Example

    Example

    + +``` diff --git a/test/command/8131.md b/test/command/8131.md new file mode 100644 --- /dev/null +++ b/test/command/8131.md @@ -0,0 +1,41 @@ +# TOC in gfm contains no HTML by default +``` +% pandoc --to=gfm --toc --standalone +# Head + +Content +^D +- [Head](#head) + +# Head + +Content +``` + +# Same in Markdown if link_attributes extension is disabled +``` +% pandoc --to=markdown-link_attributes --toc --standalone +# Head + +Content +^D +- [Head](#head) + +# Head + +Content +``` + +# IDs are added to TOC with the "attributes" CommonMark extension +``` +% pandoc --to=commonmark+gfm_auto_identifiers+attributes --toc -s +# Nam a sapien + +Lorem ipsum dolor sit amet, consectetuer adipiscing elit. +^D +- [Nam a sapien](#nam-a-sapien){#toc-nam-a-sapien} + +# Nam a sapien + +Lorem ipsum dolor sit amet, consectetuer adipiscing elit. +``` diff --git a/test/command/8150.md b/test/command/8150.md new file mode 100644 --- /dev/null +++ b/test/command/8150.md @@ -0,0 +1,55 @@ +Nested bullet lists +``` +% pandoc -f html -t markdown +
      +
    • L1
      • +
    • L2
      • +
        +
      • L3.1
        • +
      • L3.2
        • +
      +
    • L4
      • +
    +^D +- L1 +- L2 + - L3.1 + - L3.2 +- L4 +``` + +Nested ordered lists +``` +% pandoc -f html -t markdown +
      +
    1. L1
      2. +
    2. L2
      3. +
        +
      1. L3.1
        2. +
      2. L3.2
        3. +
      +
    +^D +1. L1 +2. L2 + 1. L3.1 + 2. L3.2 +``` + +Ordered list nested below an unordered list +``` +% pandoc -f html -t markdown +
      +
    • L1
      • +
    • L2
      • +
        +
      1. L3.1
        2. +
      2. L3.2
        3. +
      +
    +^D +- L1 +- L2 + 1. L3.1 + 2. L3.2 +``` diff --git a/test/command/8170.md b/test/command/8170.md new file mode 100644 --- /dev/null +++ b/test/command/8170.md @@ -0,0 +1,15 @@ +``` +% pandoc -f rtf -t html +{\rtf1\ansi\ansicpg1252\cocoartf2638 +\cocoascreenfonts1\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\froman\fcharset0 Times-Roman;} +{\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} +\margl1440\margr1440\vieww16800\viewh17280\viewkind0 +\pard\tx1080\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li180\fi440\sa120\pardirnatural\partightenfactor0 + +\f0\fs34 \cf0 In 5 +\fs20 \super th +\fs34 \nosupersub grade I found a bug.} +^D +

    In 5th grade I found a bug.

    +``` diff --git a/test/command/8174.md b/test/command/8174.md new file mode 100644 --- /dev/null +++ b/test/command/8174.md @@ -0,0 +1,44 @@ +```` +% pandoc -t native +```yaml {#id} +some: code +``` +^D +[ CodeBlock ( "id" , [ "yaml" ] , [] ) "some: code" ] +```` + +```` +% pandoc -t native +```yaml {.class #id} +some: code +``` +^D +[ CodeBlock + ( "id" , [ "yaml" , "class" ] , [] ) "some: code" +] +```` + + +```` +% pandoc -t native +```ab``` +^D +[ Para [ Code ( "" , [] , [] ) "ab" ] ] +```` + +```` +% pandoc -t native +```ab```{.class} +^D +[ Para [ Code ( "" , [ "class" ] , [] ) "ab" ] ] +```` + + +```` +% pandoc -t native +``` foo}{.bar} +test +``` +^D +[ Para [ Code ( "" , [] , [] ) "foo}{.bar} test" ] ] +```` diff --git a/test/command/8178.md b/test/command/8178.md new file mode 100644 --- /dev/null +++ b/test/command/8178.md @@ -0,0 +1,25 @@ +``` +% pandoc -f dokuwiki -t native +$\sum_{\substack{(i,j) \in I^2 \i \neq j}}$ +^D +[ Para + [ RawInline + (Format "latex") + "$\\sum_{\\substack{(i,j) \\in I^2 \\i \\neq j}}$" + ] +] +``` + +``` +% pandoc -f dokuwiki+tex_math_dollars -t native +$mc^2$ +^D +[ Para [ Math InlineMath "mc^2" ] ] +``` + +``` +% pandoc -f dokuwiki -t native +$mc^2$ +^D +[ Para [ Str "$mc^2$" ] ] +``` diff --git a/test/command/8179.md b/test/command/8179.md new file mode 100644 --- /dev/null +++ b/test/command/8179.md @@ -0,0 +1,6 @@ +``` +% pandoc -f latex -t native +\passthrough{\lstinline!\\textbf\{\}!} +^D +[ Para [ Code ( "" , [] , [] ) "\\textbf{}" ] ] +``` diff --git a/test/command/8182.md b/test/command/8182.md new file mode 100644 --- /dev/null +++ b/test/command/8182.md @@ -0,0 +1,6 @@ +``` +% pandoc -f dokuwiki -t rst +This //text and [[https://pandoc.org/|link]] are in italic//. +^D +This *text and* `link `__ *are in italic*. +``` diff --git a/test/command/8201.md b/test/command/8201.md new file mode 100644 --- /dev/null +++ b/test/command/8201.md @@ -0,0 +1,6 @@ +``` +% pandoc -f org -t html +[[file:d:/Home/Documents/test.png][Link Test]] +^D +

    Link Test

    +``` diff --git a/test/command/8204.md b/test/command/8204.md new file mode 100644 --- /dev/null +++ b/test/command/8204.md @@ -0,0 +1,51 @@ +Include abstract in Org output. +``` +% pandoc --to=org --standalone +--- +abstract: | + This is an *abstract*. + + It has multiple paragraphs. +--- +^D +#+begin_abstract +This is an /abstract/. + +It has multiple paragraphs. + +#+end_abstract +``` + +Parse abstract environment as *abstract* metadata field. +``` +% pandoc --from=org --to=markdown --standalone +#+begin_abstract + +This is an /abstract/. + +It has multiple paragraphs. +#+end_abstract + +Main text +^D +--- +abstract: | + This is an *abstract*. + + It has multiple paragraphs. +--- + +Main text +``` + +Uppercase ABSTRACT environment is not moved to metadata. +``` +% pandoc --from=org --to=markdown --standalone +#+BEGIN_ABSTRACT +Some text. +#+END_ABSTRACT +^D +::: ABSTRACT +Some text. +::: +``` diff --git a/test/command/8216.md b/test/command/8216.md new file mode 100644 --- /dev/null +++ b/test/command/8216.md @@ -0,0 +1,51 @@ +Misaligned separators in grid table +``` +% pandoc -f markdown -t html +: Grid Table + ++-----------------+:-:+ +|Some text |[text]{.class1 .class2 .class3}| ++-----------------+---+ +|Some text |[text]{.class1 .class2 .class3}| ++-----------------+---+ +|Some text |[text]{.class1 .class2 .class3}| ++-----------------+---+ +^D + + ++++ + + + + + + + + + + + + + + +
    Grid Table
    Some texttext
    Some texttext
    Some texttext
    +``` + +Missing cell + +``` +% pandoc -f markdown -t gfm ++------+ +| text | ++------+---+ +| text | 1 | ++------+---+ +^D +| | | +|------|-----| +| text | | +| text | 1 | +``` diff --git a/test/command/8219.md b/test/command/8219.md new file mode 100644 --- /dev/null +++ b/test/command/8219.md @@ -0,0 +1,16 @@ +``` +% pandoc -f html -t latex + + +
    onetwo
    +^D +\begin{longtable}[]{@{}ll@{}} +\caption{}\label{test}\tabularnewline +\toprule\noalign{} +\endfirsthead +\endhead +\bottomrule\noalign{} +\endlastfoot +one & two \\ +\end{longtable} +``` diff --git a/test/command/8236.md b/test/command/8236.md new file mode 100644 --- /dev/null +++ b/test/command/8236.md @@ -0,0 +1,15 @@ +``` +% pandoc -f org -t native + #+begin_src jupyter-python :session py :display plain + import pandas as pd + df = pd.read_csv('weight.csv', parse_dates=['Date'], index_col=0) + #+end_src +^D +[ CodeBlock + ( "" + , [ "python" , "code" ] + , [ ( "session" , "py" ) , ( "display" , "plain" ) ] + ) + "import pandas as pd\ndf = pd.read_csv('weight.csv', parse_dates=['Date'], index_col=0)\n" +] +``` diff --git a/test/command/8243.md b/test/command/8243.md new file mode 100644 --- /dev/null +++ b/test/command/8243.md @@ -0,0 +1,23 @@ +``` +% pandoc -f latex +\newenvironment{topics}{ +\newcommand{\topic}[2]{ \item{##1 / ##2} } +Topics: +\begin{itemize} +} +{ +\end{itemize} +} + +\begin{topics} +\topic{Foo}{Bar} +\topic{Baz}{Bim} +\end{topics} +^D +

    Topics:

    +
      +

    • Foo / Bar

      • +

    • Baz / Bim

      • +
    +``` + diff --git a/test/command/8251.md b/test/command/8251.md new file mode 100644 --- /dev/null +++ b/test/command/8251.md @@ -0,0 +1,13 @@ +``` +% pandoc -f native -t html +Link ("",["", "", ""],[]) [Str "foo"] ("https://example.com","") +^D +foo +``` + +``` +% pandoc -f native -t markdown +Link ("",["", "", ""],[]) [Str "foo"] ("https://example.com","") +^D +[foo](https://example.com){} +``` diff --git a/test/command/8254.md b/test/command/8254.md new file mode 100644 --- /dev/null +++ b/test/command/8254.md @@ -0,0 +1,20 @@ +``` +% pandoc -t native +Wow![@legras_michel_2010] +^D +[ Para + [ Str "Wow!" + , Cite + [ Citation + { citationId = "legras_michel_2010" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 2 + , citationHash = 0 + } + ] + [ Str "[@legras_michel_2010]" ] + ] +] +``` diff --git a/test/command/8256.md b/test/command/8256.md new file mode 100644 --- /dev/null +++ b/test/command/8256.md @@ -0,0 +1,33 @@ +``` +% pandoc -t opendocument -s + +--- +title: | + This *is* \ + a test +author: Someone +--- + +Testing. +^D + + + + + + + + + + + +This +isa +test +Someone +Testing. + + + +``` + diff --git a/test/command/8257.md b/test/command/8257.md new file mode 100644 --- /dev/null +++ b/test/command/8257.md @@ -0,0 +1,41 @@ +``` +% pandoc -f markdown -t html5 ++------+-------+ +| Item | Price | ++======+=======+ +| Eggs | 5£ | ++------+-------+ +| Spam | 3£ | ++======+=======+ +| Sum | 8£ | ++======+=======+ +^D + ++++ + + + + + + + + + + + + + + + + + + + + + + +
    ItemPrice
    Eggs5£
    Spam3£
    Sum8£
    +``` diff --git a/test/command/8281.md b/test/command/8281.md new file mode 100644 --- /dev/null +++ b/test/command/8281.md @@ -0,0 +1,15 @@ +``` +% pandoc -t html +# Title + +test + +. . . + +test +^D +

    Title

    +

    test

    +

    . . .

    +

    test

    +``` diff --git a/test/command/8302.md b/test/command/8302.md new file mode 100644 --- /dev/null +++ b/test/command/8302.md @@ -0,0 +1,6 @@ +``` +% pandoc -f org -t markdown +some text cite:&long-2004-tecton-evolut +^D +some text @long-2004-tecton-evolut +``` diff --git a/test/command/8307.md b/test/command/8307.md new file mode 100644 --- /dev/null +++ b/test/command/8307.md @@ -0,0 +1,49 @@ +``` +% pandoc -t commonmark -f html + + + + + + +
    hello
    +^D + + + + + + +
    hello
    +``` + +```` +% pandoc -t commonmark -f markdown +``` {=html} + + + + + + +
    hello
    +``` +^D + + + + + + +
    hello
    +```` diff --git a/test/command/8344.md b/test/command/8344.md new file mode 100644 --- /dev/null +++ b/test/command/8344.md @@ -0,0 +1,90 @@ +``` +% pandoc -t jats -s +--- +title: |- + My\ + document +... + +# Section\ +with line break + +Paragraph\ +with line break + +-------- +A B +--- --- +1\ 3 +2 4 + +*1\ 5\ +2* 6 + + 7 +-------- + +^D + + +
    + + + + + + + + + + + + +Mydocument + + + + + + + + Section<break/> +

    with line break

    +

    Paragraph + with line break

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    AB
    123 4
    1 + 256
    7
    +     +     + + + +
    +``` diff --git a/test/command/8354.md b/test/command/8354.md new file mode 100644 --- /dev/null +++ b/test/command/8354.md @@ -0,0 +1,38 @@ +``` +% pandoc -f markdown -t html --citeproc +--- +title: test +nocite: '[@*]' +references: +- author: + - family: Fekete + given: Jean-Daniel + - family: Freire + given: Juliana + DOI: 10.1109/MCG.2020.3006412 + id: feketeExploringReproducibilityVisualization2020 + ISSN: 1558-1756 + issue: 5 + issued: 2020-09 + page: 108-119 + source: IEEE Xplore + title: Exploring Reproducibility in Visualization + container-title: IEEE Computer Graphics and Applications + type: article-journal + volume: 40 +--- + +## References +^D +

    References

    +
    +
    +Fekete, Jean-Daniel, and Juliana Freire. 2020. “Exploring +Reproducibility in Visualization.” IEEE Computer Graphics and +Applications 40 (5): 108–19. https://doi.org/10.1109/MCG.2020.3006412. +
    +
    +``` diff --git a/test/command/8364.md b/test/command/8364.md new file mode 100644 --- /dev/null +++ b/test/command/8364.md @@ -0,0 +1,54 @@ +``` +% pandoc --citeproc -t jats -s +--- +reference-section-title: Bibliography +csl: command/apa.csl +references: +- author: + - family: Doe + given: John + id: test + issued: + date-parts: + - - 2006 + title: Test + type: 'article-journal' + volume: 81 +--- + +@test +^D + + +
    + + + + + + + + + + + + + + + + +

    Doe (2006)

    + + + + Bibliography + + Doe, J. (2006). Test, + 81. + + + +
    + +``` diff --git a/test/command/8365.md b/test/command/8365.md new file mode 100644 --- /dev/null +++ b/test/command/8365.md @@ -0,0 +1,50 @@ +``` +% pandoc -f jats -t native -s + + +
    + + + + + + + + + + + + + + + + +

    Doe (2006)

    + + + + Bibliography + + Doe, J. (2006). Test, + 81. + + + +
    +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "references" + , MetaList + [ MetaMap (fromList [ ( "id" , MetaString "test" ) ]) ] + ) + ] + } + [ Para [ Str "Doe" , Space , Str "(2006)" ] + , Header 1 ( "" , [] , [] ) [ Str "Bibliography" ] + , Div ( "refs" , [] , [] ) [] + ] +``` diff --git a/test/command/8380.md b/test/command/8380.md new file mode 100644 --- /dev/null +++ b/test/command/8380.md @@ -0,0 +1,31 @@ +``` +% pandoc -f man -t rst +LC_* +^D +LC\_\* +``` + +These examples of things that don't require escaping are taken +from the RST documentation: + +``` +% pandoc -f native -t rst +[Para [Str "2*x a**b O(N**2) e**(x*y) f(x)*f(y) a|b"] +,Para [Str "a**b O(N**2) e**(x*y) f(x)*f(y)"] +] +^D +2*x a**b O(N**2) e**(x*y) f(x)*f(y) a|b + +a**b O(N**2) e**(x*y) f(x)*f(y) +``` + +These examples of things that do require escaping are taken +from the RST documentation: + +``` +% pandoc -f native -t rst +Str "*4, class_, *args, **kwargs, `TeX-quoted', *ML, *.txt" +^D +\*4, class\_, \*args, \**kwargs, \`TeX-quoted', \*ML, \*.txt +``` + diff --git a/test/command/8402.md b/test/command/8402.md new file mode 100644 --- /dev/null +++ b/test/command/8402.md @@ -0,0 +1,52 @@ +``` +% pandoc --toc -s -t markdown +::: {.cell .markdown id="6u8qXoeFGdqt"} +# Summary +> Expand to see summary + +## Overview and Explanation +::: + +# Details + +## inner 1 +text + +## inner 2 + +### inner inner 1 + +## inner 3 +text +^D +- [Summary](#summary){#toc-summary} + - [Overview and + Explanation](#overview-and-explanation){#toc-overview-and-explanation} +- [Details](#details){#toc-details} + - [inner 1](#inner-1){#toc-inner-1} + - [inner 2](#inner-2){#toc-inner-2} + - [inner inner 1](#inner-inner-1){#toc-inner-inner-1} + - [inner 3](#inner-3){#toc-inner-3} + +::: {#6u8qXoeFGdqt .cell .markdown} +# Summary + +> Expand to see summary + +## Overview and Explanation +::: + +# Details + +## inner 1 + +text + +## inner 2 + +### inner inner 1 + +## inner 3 + +text +``` diff --git a/test/command/8437.md b/test/command/8437.md new file mode 100644 --- /dev/null +++ b/test/command/8437.md @@ -0,0 +1,44 @@ +``` +% pandoc -f markdown -t asciidoc +[![alt](https://img.shields.io/badge/License-Apache%202.0-blue.svg "title")](http://www.apache.org/licenses/LICENSE-2.0) +^D +http://www.apache.org/licenses/LICENSE-2.0[image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[alt,title="title"]] +``` + +``` +% pandoc -f markdown -t docbook +[![alt](https://img.shields.io/badge/License-Apache%202.0-blue.svg "title")](http://www.apache.org/licenses/LICENSE-2.0) +^D + + + + + title + + + + + alt + + + +``` + +``` +% pandoc -f docbook -t markdown + + + + + title + + + + + alt + + + +^D +[![alt](https://img.shields.io/badge/License-Apache%202.0-blue.svg "title")](http://www.apache.org/licenses/LICENSE-2.0) +``` diff --git a/test/command/8486.md b/test/command/8486.md new file mode 100644 --- /dev/null +++ b/test/command/8486.md @@ -0,0 +1,55 @@ +# Unnumbered and unlisted headings in ConTeXt + +``` +% pandoc --to=context +# Preface {.unlisted -} + +Nullam rutrum. + +# Introduction + +Nullam eu ante vel est convallis dignissim. + +# Methods + +Sed diam. Nulla posuere. Praesent fermentum tempor tellus. Nam +vestibulum accumsan nisl. Nam vestibulum accumsan nisl. + +# References {-} +^D +\startsubject[title={Preface},reference={preface},number=no,incrementnumber=no] + +Nullam rutrum. + +\stopsubject + +\startsectionlevel[title={Introduction},reference={introduction}] + +Nullam eu ante vel est convallis dignissim. + +\stopsectionlevel + +\startsectionlevel[title={Methods},reference={methods}] + +Sed diam. Nulla posuere. Praesent fermentum tempor tellus. Nam +vestibulum accumsan nisl. Nam vestibulum accumsan nisl. + +\stopsectionlevel + +\startsectionlevel[title={References},reference={references},number=no,incrementnumber=no] + +\stopsectionlevel +``` + +## Semantic Headings with `--top-level-division` +``` +% pandoc --to=context --top-level-division=chapter +# Bibliography {-} +None +^D +\startchapter[title={Bibliography},reference={bibliography},number=no,incrementnumber=no] + +None + +\stopchapter +``` diff --git a/test/command/8487.md b/test/command/8487.md new file mode 100644 --- /dev/null +++ b/test/command/8487.md @@ -0,0 +1,14 @@ +``` +% pandoc -f textile -t native +p>. + +p=. Links: +^D +[ Div + ( "" , [] , [ ( "style" , "text-align:right;" ) ] ) + [ Para [] ] +, Div + ( "" , [] , [ ( "style" , "text-align:center;" ) ] ) + [ Para [ Str "Links:" ] ] +] +``` diff --git a/test/command/8504.md b/test/command/8504.md new file mode 100644 --- /dev/null +++ b/test/command/8504.md @@ -0,0 +1,90 @@ +``` +% pandoc -f markdown -s -t biblatex +--- +references: +- id: Larsson_2016 + author: + - family: Larsson + given: Johan + citation-key: Larsson_2016 + issued: + - year: 2016 + medium: Windows + title: 'qualpalr: Automatic Generation of Qualitative Color Palettes' + type: software + URL: https://cran.r-project.org/package=qualpalr + version: 0.3.1 +... +^D +@software{Larsson_2016, + author = {Larsson, Johan}, + title = {Qualpalr: {Automatic} {Generation} of {Qualitative} {Color} + {Palettes}}, + version = {0.3.1}, + date = {2016}, + url = {https://cran.r-project.org/package=qualpalr} +} +``` + +``` +% pandoc -f markdown -s -t bibtex +--- +references: +- id: Larsson_2016 + author: + - family: Larsson + given: Johan + citation-key: Larsson_2016 + issued: + - year: 2016 + medium: Windows + title: 'qualpalr: Automatic Generation of Qualitative Color Palettes' + type: software + URL: https://cran.r-project.org/package=qualpalr + version: 0.3.1 +... +^D +@misc{Larsson_2016, + author = {Larsson, Johan}, + title = {Qualpalr: {Automatic} {Generation} of {Qualitative} {Color} + {Palettes}}, + year = {2016}, + url = {https://cran.r-project.org/package=qualpalr} +} +``` + +``` +% pandoc -f biblatex -s -t csljson +@software{Larsson_2016, + author = {Larsson, Johan}, + title = {Qualpalr: {Automatic} {Generation} of {Qualitative} {Color} + {Palettes}}, + version = {0.3.1}, + date = {2016}, + url = {https://cran.r-project.org/package=qualpalr} +} +^D +[ + { + "URL": "https://cran.r-project.org/package=qualpalr", + "author": [ + { + "family": "Larsson", + "given": "Johan" + } + ], + "id": "Larsson_2016", + "issued": { + "date-parts": [ + [ + 2016 + ] + ] + }, + "title": "Qualpalr: Automatic Generation of Qualitative Color Palettes", + "title-short": "Qualpalr", + "type": "software", + "version": "0.3.1" + } +] +``` diff --git a/test/command/8508.md b/test/command/8508.md new file mode 100644 --- /dev/null +++ b/test/command/8508.md @@ -0,0 +1,20 @@ +``` +% pandoc -t man +SEE ALSO +======== + +* [Milk](https://en.wikipedia.org/wiki/Milk) +* [EBNF](https://en.wikipedia.org/wiki/Extended_Backus–Naur_form) +^D +.SH SEE ALSO +.IP \(bu 2 +\c +.UR https://en.wikipedia.org/wiki/Milk +Milk +.UE \c +.IP \(bu 2 +\c +.UR https://en.wikipedia.org/wiki/Extended_Backus–Naur_form +EBNF +.UE \c +``` diff --git a/test/command/8511.md b/test/command/8511.md new file mode 100644 --- /dev/null +++ b/test/command/8511.md @@ -0,0 +1,16 @@ +# Conversion of icon-like sequences followed by alphanum char +## to Jira +``` +% pandoc -t jira +:P :P_ :PA :Pa :P2 +^D +\:P \:P\_ :PA :Pa :P2 +``` + +## from jira +``` +% pandoc -f jira -t markdown +\:PA +^D +\\:PA +``` diff --git a/test/command/8513.md b/test/command/8513.md new file mode 100644 --- /dev/null +++ b/test/command/8513.md @@ -0,0 +1,27 @@ +# Round-tripping tags in org +``` +% pandoc --from org --to org --columns=72 +* Header with tag :tag: +^D +* Header with tag :tag: +:PROPERTIES: +:CUSTOM_ID: header-with-tag +:END: +``` + +Multiple tags +``` +% pandoc --from org-auto_identifiers --to org --columns=78 +* Header with two tags :first:second: +^D +* Header with two tags :first:second: +``` + +Check that long headings work with tags + +``` +% pandoc --from org-auto_identifiers --to org --columns=40 +* Header with tag and more words which are not that interesting :tag: +^D +* Header with tag and more words which are not that interesting :tag: +``` diff --git a/test/command/853.md b/test/command/853.md --- a/test/command/853.md +++ b/test/command/853.md @@ -7,11 +7,14 @@ .. [CIT2002] This is the citation. It's just like a footnote, except the label is textual. ^D -

    Here is a citation reference: [CIT2002].

    +

    Here is a citation reference: [CIT2002].

    CIT2002
    -

    This is the citation. It's just like a footnote, except the label is textual.

    +
    +

    This is the citation. It's just like a footnote, except the label is +textual.

    diff --git a/test/command/8534.md b/test/command/8534.md new file mode 100644 --- /dev/null +++ b/test/command/8534.md @@ -0,0 +1,11 @@ +``` +% pandoc -f html -t texinfo + +foo bar baz bar foo + +^D +@node Top +@top Top + +foo @code{bar }@code{@var{baz}}@code{ bar} foo +``` diff --git a/test/command/8573.md b/test/command/8573.md new file mode 100644 --- /dev/null +++ b/test/command/8573.md @@ -0,0 +1,7 @@ +``` +% pandoc -f latex -t plain +\newenvironment{myenv}[1]{Open#1}{Close} +\begin{myenv}{x}Hello\end{myenv} +^D +OpenxHelloClose +``` diff --git a/test/command/8611.md b/test/command/8611.md new file mode 100644 --- /dev/null +++ b/test/command/8611.md @@ -0,0 +1,34 @@ +``` +% pandoc -f markdown -s -t bibtex +--- +nocite: "[@*]" +references: +- id: mcdowell:why + title: | + Why is Sellars's Essay Called "Empiricism and the Philosophy of Mind"? + author: + - family: McDowell + given: John + journal: Proceedings of the Aristotelian Society + type: chapter + container-title: 'Empiricism, Perceptual Knowledge, Normativity, and Realism: Essays on Wilfrid Sellars' + editor: + - family: deVries + given: Willem A. + issued: 2009 + publisher: Oxford University Press + publisher-place: Oxford +... +^D +@incollection{mcdowell:why, + author = {McDowell, John}, + editor = {deVries, Willem A.}, + publisher = {Oxford University Press}, + title = {Why Is {Sellars’s} {Essay} {Called} “{Empiricism} and the + {Philosophy} of {Mind}”?}, + booktitle = {Empiricism, Perceptual Knowledge, Normativity, and + Realism: Essays on Wilfrid Sellars}, + year = {2009}, + address = {Oxford} +} +``` diff --git a/test/command/8638.md b/test/command/8638.md new file mode 100644 --- /dev/null +++ b/test/command/8638.md @@ -0,0 +1,22 @@ +# Beamer tables must not use longtable footer +``` +% pandoc -t beamer +| fruit | price | +|---------|------:| +| apple | 2.05 | +| oranges | 4.25 | +^D +\begin{frame} +{\def\LTcaptype{none} % do not increment counter +\begin{longtable}[]{@{}lr@{}} +\toprule\noalign{} +fruit & price \\ +\midrule\noalign{} +\endhead +apple & 2.05 \\ +oranges & 4.25 \\ +\bottomrule\noalign{} +\end{longtable} +} +\end{frame} +``` diff --git a/test/command/8652.md b/test/command/8652.md new file mode 100644 --- /dev/null +++ b/test/command/8652.md @@ -0,0 +1,28 @@ +``` +% pandoc -t native +My text^[My note]isnot^[Text] +^D +[ Para + [ Str "My" + , Space + , Str "text" + , Note [ Para [ Str "My" , Space , Str "note" ] ] + , Str "isnot" + , Note [ Para [ Str "Text" ] ] + ] +] + +``` + +``` +% pandoc -t native +^[note1]test^[note2] +^D +[ Para + [ Note [ Para [ Str "note1" ] ] + , Str "test" + , Note [ Para [ Str "note2" ] ] + ] +] + +``` diff --git a/test/command/8653.md b/test/command/8653.md new file mode 100644 --- /dev/null +++ b/test/command/8653.md @@ -0,0 +1,23 @@ +``` +% pandoc -f rst -t native +.. role:: py:class(emphasis) + +:py:class:`foo` +^D +[ Para [ Emph [ Str "foo" ] ] ] +``` + +``` +% pandoc -f rst -t native +:py:class:`foo` +^D +[ Para + [ Code + ( "" + , [ "interpreted-text" ] + , [ ( "role" , "py:class" ) ] + ) + "foo" + ] +] +``` diff --git a/test/command/8659.md b/test/command/8659.md new file mode 100644 --- /dev/null +++ b/test/command/8659.md @@ -0,0 +1,54 @@ +# A single pipe is parsed as an empty table +``` +% pandoc -f org -t html +| +^D + + + + + +
    +``` +# Accepts an empty org table within a grid table cell + +The misaligned pipe in the first row is treated as an empty table. + +``` +% pandoc -f org -t html ++-----+-----+-----+-----------+ +| | | | | ++:====+=====+====:+==========:+ +| a | b | c | d | ++-----+-----+-----+-----------+ +^D + ++++++ + + + + + + + + + + + + + + + + +
    + + + + +
    abcd
    +``` diff --git a/test/command/8661.md b/test/command/8661.md new file mode 100644 --- /dev/null +++ b/test/command/8661.md @@ -0,0 +1,9 @@ +``` +% pandoc -f tsv -t gfm +a b c + 6 +^D +| a | b | c | +|-----|-----|-----| +| | | 6 | +``` diff --git a/test/command/8665.md b/test/command/8665.md new file mode 100644 --- /dev/null +++ b/test/command/8665.md @@ -0,0 +1,29 @@ +``` +% pandoc -f docbook -t asciidoc + + + + + h1 + h2 + + + + + + !@#$%^&*(){}|~?+-',."<>[]\` + + + col 2 + + + + + +^D +[cols=",",options="header",] +|=== +<|h1 <|h2 +<|!@++#++$%^&++*++()++{++}{vbar}~?{plus}-',."++<>[]\`++ <|col 2 +|=== +``` diff --git a/test/command/8666.md b/test/command/8666.md new file mode 100644 --- /dev/null +++ b/test/command/8666.md @@ -0,0 +1,40 @@ +``` +% pandoc -f docbook -t native + +Code title + +echo "hello world!" + + + +Example title +example content + + +Sidebar title +sidebar content + +^D +[ Div + ( "my_code_id" , [ "formalpara" ] , [] ) + [ Div + ( "" , [ "title" ] , [] ) + [ Plain [ Str "Code" , Space , Str "title" ] ] + , CodeBlock ( "" , [ "bash" ] , [] ) "echo \"hello world!\"" + ] +, Div + ( "my_example_id" , [ "example" ] , [] ) + [ Div + ( "" , [ "title" ] , [] ) + [ Plain [ Str "Example" , Space , Str "title" ] ] + , Para [ Str "example" , Space , Str "content" ] + ] +, Div + ( "my_sidebar_id" , [ "sidebar" ] , [] ) + [ Div + ( "" , [ "title" ] , [] ) + [ Plain [ Str "Sidebar" , Space , Str "title" ] ] + , Para [ Str "sidebar" , Space , Str "content" ] + ] +] +``` diff --git a/test/command/8681.md b/test/command/8681.md new file mode 100644 --- /dev/null +++ b/test/command/8681.md @@ -0,0 +1,14 @@ +# Include Jira panel title in resulting div +``` +% pandoc -f jira -t html +{panel:title=This is the title|titleBGColor=#cccccc|bgColor=#eeeeee} +Panel content +{panel} +^D +
    +
    +This is the title +
    +

    Panel content

    +
    +``` diff --git a/test/command/8689.md b/test/command/8689.md new file mode 100644 --- /dev/null +++ b/test/command/8689.md @@ -0,0 +1,12 @@ +# Org figures should be rendered implicit figures + +``` +% pandoc -f org -t markdown+implicit_figures +#+label: fig:bsdd-graphql-voyager-orig-detail +#+caption: Original bSDD GraphQL Schema: Detail of Classification and ClassificationProperty +[[./Classification-ClassificationProperty.png]] +^D +![Original bSDD GraphQL Schema: Detail of Classification and +ClassificationProperty](./Classification-ClassificationProperty.png){#fig:bsdd-graphql-voyager-orig-detail} + +``` diff --git a/test/command/8711.md b/test/command/8711.md new file mode 100644 --- /dev/null +++ b/test/command/8711.md @@ -0,0 +1,118 @@ +``` +% pandoc -f html-native_spans -t native + + + + +
    +

    a b

    +
    +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "a" , Space , Str "b" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] + +``` + +``` +% pandoc -f html-native_spans+raw_html -t native + + + + +
    +

    a b

    +
    +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ RawInline (Format "html") "" + , Str "a" + , RawInline (Format "html") "" + , Space + , RawInline (Format "html") "" + , Str "b" + , RawInline (Format "html") "" + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] + +``` + +``` +% pandoc -f html -t native + + + + +
    +

    a b

    +
    +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span ( "" , [ "foo" ] , [] ) [ Str "a" ] + , Space + , Span ( "" , [ "bar" ] , [] ) [ Str "b" ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] + +``` diff --git a/test/command/8738.md b/test/command/8738.md new file mode 100644 --- /dev/null +++ b/test/command/8738.md @@ -0,0 +1,6 @@ +``` +% pandoc -f native -t mediawiki +[Link ("",[],[]) [Link ("",[],[]) [Str "test"] ("https://bar.example.com",""),Str "Test"] ("https://foo.example.com","")] +^D +[https://foo.example.com testTest] +``` diff --git a/test/command/8745.md b/test/command/8745.md new file mode 100644 --- /dev/null +++ b/test/command/8745.md @@ -0,0 +1,52 @@ +# Alt text on images + +``` +% pandoc -f latex -t native +\documentclass[12pt]{article} +\usepackage{graphicx} +\begin{document} +Sample text +\begin{figure}[ht] + \includegraphics[alt={Upside down painting},width=0.5\textwidth]{New_York_City_I.jpg} + \caption{New York City by Piet Mondrian (Wikipedia)} + \label{fig:Mondrian} +\end{figure} +\includegraphics[alt={Face of a mandrill}]{mandrill.jpg} +\end{document} +^D +[ Para [ Str "Sample" , Space , Str "text" ] +, Figure + ( "fig:Mondrian" , [] , [ ( "latex-placement" , "ht" ) ] ) + (Caption + Nothing + [ Plain + [ Str "New" + , Space + , Str "York" + , Space + , Str "City" + , Space + , Str "by" + , Space + , Str "Piet" + , Space + , Str "Mondrian" + , Space + , Str "(Wikipedia)" + ] + ]) + [ Para + [ Image + ( "" , [] , [ ( "width" , "50%" ) ] ) + [ Str "Upside down painting" ] + ( "New_York_City_I.jpg" , "" ) + ] + ] +, Para + [ Image + ( "" , [] , [] ) + [ Str "Face of a mandrill" ] + ( "mandrill.jpg" , "" ) + ] +] +``` diff --git a/test/command/8764.md b/test/command/8764.md new file mode 100644 --- /dev/null +++ b/test/command/8764.md @@ -0,0 +1,50 @@ +``` +% pandoc -f html -t opendocument + + + + + + + + + + + + + +
    HeaderNormal cell (column 2)Normal cell (column 3)
    Normal cell (column 1)Normal cell (column 2)Normal cell (column 3)
    +^D + + + + + + + Header + + + Normal cell (column + 2) + + + Normal cell (column + 3) + + + + + Normal cell (column + 1) + + + Normal cell (column + 2) + + + Normal cell (column + 3) + + + +``` diff --git a/test/command/8770-block.md b/test/command/8770-block.md new file mode 100644 --- /dev/null +++ b/test/command/8770-block.md @@ -0,0 +1,75 @@ +``` +% pandoc -t html5 --reference-location=block +# Section 1 + +hello[^1] + +: Sample table.[^2] + +----------- + Fruit[^3] +----------- + Bans[^4] +----------- + +# Section 2 + +dolly[^5] + +[^1]: doc footnote +[^2]: caption footnote +[^3]: header footnote +[^4]: table cell footnote +[^5]: doc footnote +^D +

    Section 1

    +

    hello1

    + + + +++ + + + + + + + + + + +
    Sample table.2
    Fruit3
    Bans4
    + +

    Section 2

    +

    dolly5

    + +``` diff --git a/test/command/8770-document.md b/test/command/8770-document.md new file mode 100644 --- /dev/null +++ b/test/command/8770-document.md @@ -0,0 +1,66 @@ +``` +% pandoc -t html5 --reference-location=document +# Section 1 + +hello[^1] + +: Sample table.[^2] + +----------- + Fruit[^3] +----------- + Bans[^4] +----------- + +# Section 2 + +dolly[^5] + +[^1]: doc footnote +[^2]: caption footnote +[^3]: header footnote +[^4]: table cell footnote +[^5]: doc footnote +^D +

    Section 1

    +

    hello1

    + + +++ + + + + + + + + + + +
    Sample table.2
    Fruit3
    Bans4
    +

    Section 2

    +

    dolly5

    +
    +
    +
      +

    1. doc footnote↩︎

      2. +

    2. caption footnote↩︎

      3. +

    3. header footnote↩︎

      4. +

    4. table cell footnote↩︎

      5. +

    5. doc footnote↩︎

      6. +
    +
    +``` diff --git a/test/command/8770-section.md b/test/command/8770-section.md new file mode 100644 --- /dev/null +++ b/test/command/8770-section.md @@ -0,0 +1,72 @@ +``` +% pandoc -t html5 --reference-location=section +# Section 1 + +hello[^1] + +: Sample table.[^2] + +----------- + Fruit[^3] +----------- + Bans[^4] +----------- + +# Section 2 + +dolly[^5] + +[^1]: doc footnote +[^2]: caption footnote +[^3]: header footnote +[^4]: table cell footnote +[^5]: doc footnote +^D +

    Section 1

    +

    hello1

    + + +++ + + + + + + + + + + +
    Sample table.2
    Fruit3
    Bans4
    + +

    Section 2

    +

    dolly5

    + +``` diff --git a/test/command/8777.md b/test/command/8777.md new file mode 100644 --- /dev/null +++ b/test/command/8777.md @@ -0,0 +1,8 @@ +# Backslash escapes in markdown_strict + +``` +% pandoc --from=markdown_strict -t html +These are not escaped: \~ \" +^D +

    These are not escaped: \~ \"

    +``` diff --git a/test/command/8783.md b/test/command/8783.md new file mode 100644 --- /dev/null +++ b/test/command/8783.md @@ -0,0 +1,33 @@ +``` +% pandoc -f rtf -t native +{\rtf1\ansi\ansicpg1252\cocoartf2867 +\cocoatextscaling0\cocoaplatform1{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;} +{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid1\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid1} +{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2}} +{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} +\paperw11905\paperh16837\margl1133\margr1133\margb1133\margt1133 +\deftab720 +\pard\pardeftab720\partightenfactor0 + +\f0\fs22 \cf2 \up0 \nosupersub \ulnone First paragraph\ +\pard\tx20\tx360\pardeftab720\li360\fi-360\partightenfactor0 +\ls1\ilvl0\cf2 \up0 \nosupersub \ulnone {\listtext 1. }\cf2 \up0 \nosupersub \ulnone Numbered item\ +\pard\pardeftab720\partightenfactor0 +\cf2 Second paragraph\ +\pard\tx20\tx180\pardeftab720\li180\fi-180\partightenfactor0 +\ls2\ilvl0\cf2 \up0 \nosupersub \ulnone {\listtext \uc0\u8226 }\cf2 \up0 \nosupersub \ulnone Bullet item\ +\pard\pardeftab720\partightenfactor0 +\cf2 New paragraph} +^D +[ Para [ Str "First" , Space , Str "paragraph" ] +, OrderedList + ( 1 , Decimal , Period ) + [ [ Para [ Str "Numbered" , Space , Str "item" ] ] ] +, Para [ Str "Second" , Space , Str "paragraph" ] +, BulletList + [ [ Para [ Str "Bullet" , Space , Str "item" ] ] ] +, Para [ Str "New" , Space , Str "paragraph" ] +] +``` diff --git a/test/command/8789.md b/test/command/8789.md new file mode 100644 --- /dev/null +++ b/test/command/8789.md @@ -0,0 +1,42 @@ +# `\multicolumn` with column-type `p` + +``` +% pandoc --from=latex --to=html +\begin{tabular}{rrll} + \toprule + \textbf{First} & \textbf{Second} & \textbf{Third} & \textbf{Fourth} \\ \toprule + 160 & 1 & test & test \\\midrule + 160 & 2 & \multicolumn{2}{p{12cm}}{\textit{This is a test:} + \begin{equation*} + a^2+b^2 = c^2 + \end{equation*} + }\\ +\bottomrule +\end{tabular} +^D + + + + + + + + + + + + + + + + + + + + + + +
    FirstSecondThirdFourth
    1601testtest
    1602This is a test: a2 + b2 = c2
    + +``` diff --git a/test/command/8852.md b/test/command/8852.md new file mode 100644 --- /dev/null +++ b/test/command/8852.md @@ -0,0 +1,43 @@ +Github Formatted Markdown Identifiers +``` +% pandoc -f man+gfm_auto_identifiers -t html +.TH "TEST" "1" "2026-05-08" "test v1.0.0" "test manual" +.SH 1st HEADING +.SH C++ & Rust +.SH HEADING +.SH HEADING +^D +

    1st HEADING

    +

    C++ & Rust

    +

    HEADING

    +

    HEADING

    +``` + +Ascii Identifiers test +``` +% pandoc -f man+ascii_identifiers -t html +.TH "TEST" "1" "2026-05-08" "test v1.0.0" "test manual" +.SH Über den Flüssen +^D +

    Über den Flüssen

    +``` + +Headers without Auto Identifiers test +``` +% pandoc -f man-auto_identifiers -t native +.TH "TEST" "1" "2026-05-08" "test v1.0.0" "test manual" +.SS Level 2 +.SS different styles: +.SS Ordered +.SS Ordered +^D +[ Header + 2 ( "" , [] , [] ) [ Str "Level" , Space , Str "2" ] +, Header + 2 + ( "" , [] , [] ) + [ Str "different" , Space , Str "styles:" ] +, Header 2 ( "" , [] , [] ) [ Str "Ordered" ] +, Header 2 ( "" , [] , [] ) [ Str "Ordered" ] +] +``` diff --git a/test/command/8853.md b/test/command/8853.md new file mode 100644 --- /dev/null +++ b/test/command/8853.md @@ -0,0 +1,6 @@ +``` +% pandoc -f markdown+wikilinks_title_after_pipe --wrap=none +[[hi]] and ![[hi]] +^D +

    hi and hi

    +``` diff --git a/test/command/8863.md b/test/command/8863.md new file mode 100644 --- /dev/null +++ b/test/command/8863.md @@ -0,0 +1,11 @@ +``` +% pandoc -f dokuwiki -t native + * item 1 + * item 1.1 +^D +[ BulletList + [ [ Plain [ Str "item" , Space , Str "1" ] ] + , [ Plain [ Str "item" , Space , Str "1.1" ] ] + ] +] +``` diff --git a/test/command/8867.md b/test/command/8867.md new file mode 100644 --- /dev/null +++ b/test/command/8867.md @@ -0,0 +1,49 @@ +``` +% pandoc -f jats -t native -s + + + + + + © 2023, Ellerman et al + 2023 + Ellerman et al + + https://creativecommons.org/licenses/by/4.0/ + This document is distributed under a Creative Commons Attribution 4.0 International license. + + + +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "copyright" + , MetaMap + (fromList + [ ( "holder" , MetaString "Ellerman et al" ) + , ( "statement" + , MetaString "\169 2023, Ellerman et al" + ) + , ( "year" , MetaString "2023" ) + ]) + ) + , ( "license" + , MetaMap + (fromList + [ ( "link" + , MetaString + "https://creativecommons.org/licenses/by/4.0/" + ) + , ( "text" + , MetaString + "This document is distributed under a Creative Commons Attribution 4.0 International license." + ) + , ( "type" , MetaString "open-access" ) + ]) + ) + ] + } + [] +``` diff --git a/test/command/8869.md b/test/command/8869.md new file mode 100644 --- /dev/null +++ b/test/command/8869.md @@ -0,0 +1,20 @@ +Org arguments can either be single words, or quoted. + +``` +% pandoc -f org -t native +#+begin_src jupyter-julia :exports both +1 + 2 +#+end_src + +#+begin_src jupyter-julia :exports "both" +1 + 2 +#+end_src +^D +[ CodeBlock + ( "" , [ "julia" , "code" ] , [ ( "exports" , "both" ) ] ) + "1 + 2\n" +, CodeBlock + ( "" , [ "julia" , "code" ] , [ ( "exports" , "both" ) ] ) + "1 + 2\n" +] +``` diff --git a/test/command/8872.md b/test/command/8872.md new file mode 100644 --- /dev/null +++ b/test/command/8872.md @@ -0,0 +1,45 @@ + +``` +% pandoc -f latex -t native +\documentclass{amsart} +\newtheorem{theorem}{Theorem} +\begin{document} +\begin{theorem}\label{thm} +\begin{enumerate} +\item \label{item1}text1 +\item \label{item2}text2 +\item text3 +\end{enumerate} +\end{theorem} +\end{document} +^D +[ Div + ( "thm" , [ "theorem" ] , [] ) + [ Para + [ Strong [ Str "Theorem" , Space , Str "1" ] + , Str "." + , Space + , Space + , Emph [] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Para + [ Emph + [ Span ( "item1" , [] , [ ( "label" , "item1" ) ] ) [] + , Str "text1" + ] + ] + ] + , [ Para + [ Emph + [ Span ( "item2" , [] , [ ( "label" , "item2" ) ] ) [] + , Str "text2" + ] + ] + ] + , [ Para [ Emph [ Str "text3" ] ] ] + ] + ] +] +``` diff --git a/test/command/8880.md b/test/command/8880.md new file mode 100644 --- /dev/null +++ b/test/command/8880.md @@ -0,0 +1,42 @@ +Raw EPUB attributes are rendered in EPUB output. + +``` +% pandoc -f native -t epub --metadata title=Raw -o - | pandoc -f epub -t html +[ RawBlock (Format "epub") "

    ok

    " ] +^D +

    +

    +
    +

    Raw

    +

    ok

    +
    +``` + +Raw EPUB2 attributes are omitted from EPUB3 output. + +``` +% pandoc -f markdown -t epub3 --metadata title=Raw -o - | pandoc -f epub -t html +~~~ {=epub2} +

    ok

    +~~~ +^D +

    +

    +
    +

    Raw

    +
    +``` + +``` +% pandoc -f markdown -t epub3 --metadata title=Raw -o - | pandoc -f epub -t html +~~~ {=epub3} +

    ok

    +~~~ +^D +

    +

    +
    +

    Raw

    +

    ok

    +
    +``` diff --git a/test/command/8948.md b/test/command/8948.md new file mode 100644 --- /dev/null +++ b/test/command/8948.md @@ -0,0 +1,31 @@ +``` +% pandoc --embed-resources +![minimal](command/minimal.svg){.inline-svg} +![minimal](command/minimal.svg){.inline-svg} +^D +

    + + +

    +``` + +``` +% pandoc --embed-resources +![minimal](command/minimal.svg){.inline-svg} +![minimal](command/minimal.svg){#foo .inline-svg} +^D +

    + + +

    +``` + +``` +% pandoc --embed-resources +![minimal](command/minimal.svg) +^D +
    +minimal + +
    +``` diff --git a/test/command/8956.md b/test/command/8956.md new file mode 100644 --- /dev/null +++ b/test/command/8956.md @@ -0,0 +1,48 @@ +``` +% pandoc -iNtslidy +# One + +- one +- two +^D +
    +

    1 One

    +
      +
    • one
      • +
    • two
      • +
    +
    +``` + +```` +% pandoc -pstnative +``` + after tab +``` +^D +Pandoc + Meta { unMeta = fromList [] } + [ CodeBlock ( "" , [] , [] ) "\tafter tab" ] +```` + +``` +% pandoc -sfalse +hi +^D +

    hi

    +``` + +``` +% pandoc --standalone=false +hi +^D +

    hi

    +``` + +``` +% pandoc --standalone=FALSE +hi +^D +

    hi

    +``` + diff --git a/test/command/8957.md b/test/command/8957.md new file mode 100644 --- /dev/null +++ b/test/command/8957.md @@ -0,0 +1,7 @@ +``` +% pandoc -f latex -t html --wrap=none +![Sample figure caption.](fig.jpg){width="342pt" height="9pc"} +^D +

    ![Sample figure caption.](fig.jpg)width="342pt" height="9pc"

    + +``` diff --git a/test/command/8966.md b/test/command/8966.md new file mode 100644 --- /dev/null +++ b/test/command/8966.md @@ -0,0 +1,9 @@ +``` +% pandoc -t typst +**Samsonov T.E.** Shape-Adaptive Geometric Simplification of Heterogeneous Line Datasets / T. E. Samsonov, O. P. Yakimova // International Journal of Geographical Information Science. — 2017. — Vol. 31. — № 8. — pp. 1485-1520. +^D +#strong[Samsonov T.E.] Shape-Adaptive Geometric Simplification of +Heterogeneous Line Datasets / T. E. Samsonov, O. P. Yakimova /\/ +International Journal of Geographical Information Science. --- 2017. --- +Vol. 31. --- № 8. --- pp.~1485-1520. +``` diff --git a/test/command/8981.md b/test/command/8981.md new file mode 100644 --- /dev/null +++ b/test/command/8981.md @@ -0,0 +1,6 @@ +``` +% pandoc --wrap=none +consectetur [^\[link\]^](#ref "Title") +^D +

    consectetur [link]

    +``` diff --git a/test/command/8984.md b/test/command/8984.md new file mode 100644 --- /dev/null +++ b/test/command/8984.md @@ -0,0 +1,122 @@ +``` +% pandoc -f html -t native + + + + + + + + + + +
    ab
    cde
    +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 2) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "a" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "b" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "c" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "d" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "e" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] + +``` + +``` +% pandoc -f html -t native + + + + + + + + +
    Headingcontent
    content2
    +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 1) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "Heading" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "content" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "content2" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] + +``` diff --git a/test/command/8992.md b/test/command/8992.md new file mode 100644 --- /dev/null +++ b/test/command/8992.md @@ -0,0 +1,6 @@ +``` +% pandoc -t latex +[A theorem](https://en.wikipedia.org/wiki/Rice's_theorem). +^D +\href{https://en.wikipedia.org/wiki/Rice's_theorem}{A theorem}. +``` diff --git a/test/command/8997.md b/test/command/8997.md new file mode 100644 --- /dev/null +++ b/test/command/8997.md @@ -0,0 +1,77 @@ +``` +% pandoc -f org -t native +* has space after second colon +: aaa +: +: bbb + + +* has no space after second colon +: aaa +: +: bbb +^D +[ Header + 1 + ( "has-space-after-second-colon" , [] , [] ) + [ Str "has" + , Space + , Str "space" + , Space + , Str "after" + , Space + , Str "second" + , Space + , Str "colon" + ] +, CodeBlock ( "" , [] , [] ) "aaa\n\nbbb\n" +, Header + 1 + ( "has-no-space-after-second-colon" , [] , [] ) + [ Str "has" + , Space + , Str "no" + , Space + , Str "space" + , Space + , Str "after" + , Space + , Str "second" + , Space + , Str "colon" + ] +, CodeBlock ( "" , [] , [] ) "aaa\n\nbbb\n" +] +``` + +``` +% pandoc -f org -t native +* only the colon +: + +* only the colon and a space +: +^D +[ Header + 1 + ( "only-the-colon" , [] , [] ) + [ Str "only" , Space , Str "the" , Space , Str "colon" ] +, CodeBlock ( "" , [] , [] ) "\n" +, Header + 1 + ( "only-the-colon-and-a-space" , [] , [] ) + [ Str "only" + , Space + , Str "the" + , Space + , Str "colon" + , Space + , Str "and" + , Space + , Str "a" + , Space + , Str "space" + ] +, CodeBlock ( "" , [] , [] ) "\n" +] +``` diff --git a/test/command/9000.md b/test/command/9000.md new file mode 100644 --- /dev/null +++ b/test/command/9000.md @@ -0,0 +1,14 @@ +``` +% pandoc -t org --wrap=auto --columns=20 +[This is a link with a long description that should not +wrap](http://example.com) and +some regular text after it so we can see how wrapping works. +^D +[[http://example.com][This is a link with a long description that should not wrap]] +and some regular +text after it so we +can see how wrapping +works. + +``` + diff --git a/test/command/9002.docx b/test/command/9002.docx new file mode 100644 Binary files /dev/null and b/test/command/9002.docx differ diff --git a/test/command/9002.md b/test/command/9002.md new file mode 100644 --- /dev/null +++ b/test/command/9002.md @@ -0,0 +1,20 @@ +``` +% pandoc command/9002.docx -t html +^D + + ++++ + + + + + + + + +

    This is my table!
    ab
    +

    See Table 1 This is my table!

    +``` diff --git a/test/command/9017.md b/test/command/9017.md new file mode 100644 --- /dev/null +++ b/test/command/9017.md @@ -0,0 +1,54 @@ +``` +% pandoc -t jats --citeproc -s +--- +references: +- author: DeGroot + id: degroot_probability + title: Probability + issued: 2002 +title: Doc example with single reference +--- + +# I like + +[@degroot_probability]. +^D + + +
    + + + + + + + + + + + + +Doc example with single reference + + + + + + + + I like +

    (DeGroot 2002).

    +     + + + + + + DeGroot. 2002. + Probability. + + + +
    +``` diff --git a/test/command/9021.md b/test/command/9021.md new file mode 100644 --- /dev/null +++ b/test/command/9021.md @@ -0,0 +1,61 @@ +``` +% pandoc -t jats+element_citations --citeproc -s +--- +references: +- author: DeGroot + id: degroot_probability + title: Probability + issued: 2002 +title: Doc example with single reference +reference-section-title: Ref Title +--- + +# I like + +[@degroot_probability]. +^D + + +
    + + + + + + + + + + + + +Doc example with single reference + + + + + + + + I like +

    (DeGroot 2002).

    +     + + + + Ref Title + + + + DeGroot + + Probability + 2002 + + + + +
    + +``` diff --git a/test/command/9038.md b/test/command/9038.md new file mode 100644 --- /dev/null +++ b/test/command/9038.md @@ -0,0 +1,6 @@ +``` +% pandoc -t native +![foo] +^D +[ Para [ Str "![foo]" ] ] +``` diff --git a/test/command/9042.md b/test/command/9042.md new file mode 100644 --- /dev/null +++ b/test/command/9042.md @@ -0,0 +1,30 @@ +``` +% pandoc -f org +#+TITLE: Testing + +* Testing + +p. lower case + +P. Upper Case +^D +

    Testing

    +

    p. lower case

    +

    P. Upper Case

    +``` +``` +% pandoc -f org+fancy_lists +#+TITLE: Testing + +* Testing + +p. lower case + +P. Upper Case +^D +

    Testing

    +
      +

    1. lower case

      2. +

    2. Upper Case

      3. +
    +``` diff --git a/test/command/9043.md b/test/command/9043.md new file mode 100644 --- /dev/null +++ b/test/command/9043.md @@ -0,0 +1,13 @@ +``` +% pandoc -t latex +[**TreeTagger**](https://www.cis.uni-muenchen.de/~schmid/tools/TreeTagger/) +^D +\href{https://www.cis.uni-muenchen.de/~schmid/tools/TreeTagger/}{\textbf{TreeTagger}} +``` + +``` +% pandoc -t latex +[**TreeTagger**](https://www.cis.uni-muenchen.de/%E7schmid/tools/TreeTagger/) +^D +\href{https://www.cis.uni-muenchen.de/\%E7schmid/tools/TreeTagger/}{\textbf{TreeTagger}} +``` diff --git a/test/command/9045.md b/test/command/9045.md new file mode 100644 --- /dev/null +++ b/test/command/9045.md @@ -0,0 +1,10 @@ +``` +% pandoc -t latex +![hi](there.jpg){#foo} +^D +\begin{figure} +\centering +\pandocbounded{\includegraphics[keepaspectratio,alt={hi}]{there.jpg}} +\caption{hi}\label{foo} +\end{figure} +``` diff --git a/test/command/9047.md b/test/command/9047.md new file mode 100644 --- /dev/null +++ b/test/command/9047.md @@ -0,0 +1,47 @@ +tests meant to test the fixes of bug [#9047](https://github.com/jgm/pandoc/issues/9047) + +``` +% pandoc -f html -t html +
      +
      • +
      • +
      • +
      • +
    +^D +
      +
      • +
      • +
    • foobar
      • +
      • +
    +``` + +w/ rawHTML extension a checkbox by itself is kept +``` +% pandoc -f html+raw_html -t html+raw_html + +^D + + +``` + +w/ rawHTML extension, a checkbox in an `li` is handled properly +``` +% pandoc -f html+raw_html -t html+raw_html +
      +
    • foo
      • +
    +^D +
      +
      • +
    +``` + +w/o rawHTML extension, a checkbox outside of an `li` is properly ignored +``` +% pandoc -f html -t html +

    foo

    +^D +foo +``` diff --git a/test/command/9088.md b/test/command/9088.md new file mode 100644 --- /dev/null +++ b/test/command/9088.md @@ -0,0 +1,10 @@ +``` +% pandoc -t latex +| 0 - A +| 1 - B +| 2 - C +^D +~~~0 - A\\ +\strut ~~~1 - B\\ +\strut ~~~2 - C +``` diff --git a/test/command/9090.md b/test/command/9090.md new file mode 100644 --- /dev/null +++ b/test/command/9090.md @@ -0,0 +1,15 @@ +``` +% pandoc -f html -t gfm + + + + + + +
    invalid head cell +
    body cell
    +^D +| invalid head cell | +|-------------------| +| body cell | +``` diff --git a/test/command/9121.md b/test/command/9121.md new file mode 100644 --- /dev/null +++ b/test/command/9121.md @@ -0,0 +1,17 @@ +```` +% pandoc -t gfm +a $$x=y$$ b +^D +a +``` math +x=y +``` +b +```` + +```` +% pandoc -t gfm +a $x=y$ b +^D +a $`x=y`$ b +```` diff --git a/test/command/9136.md b/test/command/9136.md new file mode 100644 --- /dev/null +++ b/test/command/9136.md @@ -0,0 +1,89 @@ +Verify that the OpenDocument writer uses predefined list, paragraph, and +text styles instead of generating per-instance automatic styles. + +``` +% pandoc -t opendocument +- one +- two + +1. ordered one +2. ordered two + +Some *italic*, **bold**, ~~strike~~, and `code`. + +> A block quote. + +Final paragraph. +^D + + + one + + + two + + + + + ordered + one + + + ordered + two + + +Some +italic, +bold, +strike, and +code. +A block quote. +Final paragraph. +``` + +A non-default ordered list (start value other than 1, or non-decimal +format) generates a single named override style, not one per instance. + +``` +% pandoc -t opendocument +A) upper-alpha one +B) upper-alpha two + +5. start at five +6. and continue +^D + + + upper-alpha + one + + + upper-alpha + two + + + + + start at + five + + + and + continue + + +``` + +A nested block quote uses the predefined `Quotations` style for the +outer paragraph, and inherits indent from it for the inner paragraph. + +``` +% pandoc -t opendocument +> First. +> +> > Nested. +^D +First. +Nested. +``` diff --git a/test/command/9150.md b/test/command/9150.md new file mode 100644 --- /dev/null +++ b/test/command/9150.md @@ -0,0 +1,51 @@ +``` +% pandoc -f latex -t native +\hfill {\Large \textbf{Theoretische Grundlagen der Informatik}} +^D +[ Para + [ Span + ( "" , [] , [] ) + [ Strong + [ Str "Theoretische" + , Space + , Str "Grundlagen" + , Space + , Str "der" + , Space + , Str "Informatik" + ] + ] + ] +] +``` + +``` +% pandoc -f latex+raw_tex -t native +\hfill {\Large \textbf{Theoretische Grundlagen der Informatik}} +^D +[ Para + [ RawInline (Format "latex") "\\hfill " + , Span + ( "" , [] , [] ) + [ RawInline (Format "latex") "\\Large " + , Strong + [ Str "Theoretische" + , Space + , Str "Grundlagen" + , Space + , Str "der" + , Space + , Str "Informatik" + ] + ] + ] +] +``` + +``` +% pandoc -f latex+raw_tex -t native +\hskip 2pt plus 1pt minus 1pt +^D +[ RawBlock (Format "latex") "\\hskip 2pt plus 1pt minus 1pt" +] +``` diff --git a/test/command/9159.md b/test/command/9159.md new file mode 100644 --- /dev/null +++ b/test/command/9159.md @@ -0,0 +1,15 @@ +``` +% pandoc -t org -f markdown +\* See Blah + +\# not comment + +\| not table \| +^D +​* See Blah + +​# not comment + +​| not table | + +``` diff --git a/test/command/9171.md b/test/command/9171.md new file mode 100644 --- /dev/null +++ b/test/command/9171.md @@ -0,0 +1,65 @@ +``` +% pandoc -f markdown -t native +[link][link contents]{target="_blank"} +[link2](https://example.com){target="_blank"} + +[link contents]: https://example.com +^D +[ Para + [ Link + ( "" , [] , [ ( "target" , "_blank" ) ] ) + [ Str "link" ] + ( "https://example.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [ ( "target" , "_blank" ) ] ) + [ Str "link2" ] + ( "https://example.com" , "" ) + ] +] + +``` + +``` +% pandoc -f markdown -t native +[link][link contents]{#id1 target="_blank"} +[link2](https://example.com){target="_blank"} + +[link contents]: https://example.com {#id2 target="_nonblank"} +^D +[ Para + [ Link + ( "id1" , [] , [ ( "target" , "_blank" ) ] ) + [ Str "link" ] + ( "https://example.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [ ( "target" , "_blank" ) ] ) + [ Str "link2" ] + ( "https://example.com" , "" ) + ] +] + +``` + +``` +% pandoc -f markdown -t native +[link][link contents]{target="_blank"} +[link2](https://example.com){target="_blank"} + +[link contents]: https://example.com {.foo} +^D +[ Para + [ Link + ( "" , [ "foo" ] , [ ( "target" , "_blank" ) ] ) + [ Str "link" ] + ( "https://example.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [ ( "target" , "_blank" ) ] ) + [ Str "link2" ] + ( "https://example.com" , "" ) + ] +] + +``` diff --git a/test/command/9193.md b/test/command/9193.md new file mode 100644 --- /dev/null +++ b/test/command/9193.md @@ -0,0 +1,7 @@ +``` +% pandoc -t native +$a+% +b$ +^D +[ Para [ Math InlineMath "a+%\nb" ] ] +``` diff --git a/test/command/9196.md b/test/command/9196.md new file mode 100644 --- /dev/null +++ b/test/command/9196.md @@ -0,0 +1,6 @@ +``` +% pandoc -f rst --wrap=none +Define _`my target`, then reference `my target`_. +^D +

    Define my target, then reference my target.

    +``` diff --git a/test/command/9201.md b/test/command/9201.md new file mode 100644 --- /dev/null +++ b/test/command/9201.md @@ -0,0 +1,18 @@ +``` +% pandoc -f man -t markdown +.TH "EXAMPLE" "1" +.SH "OPTIONS" +.TP 8n +\fB\-\-help\fR +This is line one. +.sp +This is line two. +^D +# OPTIONS + +**\--help** + +: This is line one. + + This is line two. +``` diff --git a/test/command/9202.md b/test/command/9202.md new file mode 100644 --- /dev/null +++ b/test/command/9202.md @@ -0,0 +1,62 @@ +``` +% pandoc -f latex -t native +\begin{otherlanguage}{french} +Bonjour. +\end{otherlanguage} +^D +[ Div + ( "" , [] , [ ( "lang" , "fr" ) ] ) + [ Para [ Str "Bonjour." ] ] +] +``` + +``` +% pandoc -f latex -t native +\begin{otherlanguage*}{french} +Bonjour. +\end{otherlanguage*} +^D +[ Div + ( "" , [ "otherlanguage*" ] , [] ) + [ Para + [ Span ( "" , [] , [] ) [ Str "french" ] + , SoftBreak + , Str "Bonjour." + ] + ] +] +``` + +``` +% pandoc -f latex -t native +\textfrench{Bonjour} +^D +[ Para + [ Span ( "" , [] , [ ( "lang" , "fr" ) ] ) [ Str "Bonjour" ] + ] +] +``` + +``` +% pandoc -f latex -t native +\foreignlanguage{swissgerman}{Guten tag} +^D +[ Para + [ Span + ( "" , [] , [ ( "lang" , "de-CH-1901" ) ] ) + [ Str "Guten" , Space , Str "tag" ] + ] +] +``` + +``` +% pandoc -f latex -t native +\begin{french} +Bonjour. +\end{french} +^D +[ Div + ( "" , [] , [ ( "lang" , "fr" ) ] ) + [ Para [ Str "Bonjour." ] ] +] +``` diff --git a/test/command/9209.md b/test/command/9209.md new file mode 100644 --- /dev/null +++ b/test/command/9209.md @@ -0,0 +1,6 @@ +``` +% pandoc -t latex +## [Section]{#Section3} +^D +\subsection{\texorpdfstring{\protect\hypertarget{Section3}{}{Section}}{Section}}\label{section} +``` diff --git a/test/command/9218.md b/test/command/9218.md new file mode 100644 --- /dev/null +++ b/test/command/9218.md @@ -0,0 +1,22 @@ +# Escape special lines in Org-mode code blocks + +```` +% pandoc -f markdown -t org +``` org +** Click Application +*** Imports + +#+begin_src py +from addict import Dict +#+end_src +``` +^D +#+begin_src org +,** Click Application +,*** Imports + +,#+begin_src py +from addict import Dict +,#+end_src +#+end_src +```` diff --git a/test/command/9236.md b/test/command/9236.md new file mode 100644 --- /dev/null +++ b/test/command/9236.md @@ -0,0 +1,34 @@ +``` +% pandoc -t typst +![minimal](command/minimal.svg){width=3in} + +![minimal](command/minimal.svg){width=3in height=2in} + +![minimal](command/minimal.svg) + +And inline: ![minimal](command/minimal.svg){height=2in} and +![minimal](command/minimal.svg). +^D +#figure(image("command/minimal.svg", width: 3in, alt: "minimal"), + caption: [ + minimal + ] +) + +#figure(image("command/minimal.svg", height: 2in, width: 3in, alt: "minimal"), + caption: [ + minimal + ] +) + +#figure(image("command/minimal.svg", alt: "minimal"), + caption: [ + minimal + ] +) + +And inline: +#box(image("command/minimal.svg", height: 2in, alt: "minimal")) and +#box(image("command/minimal.svg", alt: "minimal")). + +``` diff --git a/test/command/9275.md b/test/command/9275.md new file mode 100644 --- /dev/null +++ b/test/command/9275.md @@ -0,0 +1,18 @@ +``` +% pandoc -t latex --biblatex +[@scott2000, p. 33] +[@scott2000, pp. 33-34 and elsewhere; @scott2001, ch. 4] +^D +\autocite[33]{scott2000} \autocites[33-34 and +elsewhere]{scott2000}[ch.~4]{scott2001} + +``` + +``` +% pandoc -t latex --biblatex -Mlang=de +[@scott2000, p. 33] +[@scott2000, S. 33] +^D +\autocite[p.~33]{scott2000} \autocite[33]{scott2000} + +``` diff --git a/test/command/9279.md b/test/command/9279.md new file mode 100644 --- /dev/null +++ b/test/command/9279.md @@ -0,0 +1,131 @@ +``` +% pandoc -f org -t native +#+LABEL: tbl:Cosasexample +#+CAPTION: Cosas ++-------+-------+ +| cosas | cosas | +| cosas | cosas | ++=======+=======+ +| cosas | cosas | +| cosas | cosas | ++-------+-------+ +^D +[ Table + ( "tbl:Cosasexample" , [] , [] ) + (Caption Nothing [ Plain [ Str "Cosas" ] ]) + [ ( AlignDefault , ColWidth 0.1111111111111111 ) + , ( AlignDefault , ColWidth 0.1111111111111111 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "cosas" , SoftBreak , Str "cosas" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "cosas" , SoftBreak , Str "cosas" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "cosas" , SoftBreak , Str "cosas" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "cosas" , SoftBreak , Str "cosas" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` + +``` +% pandoc -f org -t markdown +#+LABEL: tbl:Cosasexample +#+CAPTION: Cosas ++-------+-------+ +| cosas | cosas | +| cosas | cosas | ++=======+=======+ +| cosas | cosas | +| cosas | cosas | ++-------+-------+ +^D + --------------- + cosas cosas + cosas cosas + ------- ------- + cosas cosas + cosas cosas + + --------------- + + : Cosas {#tbl:Cosasexample} + +``` + +``` +% pandoc -f org -t markdown +#+LABEL: tbl:Cosasexample ++-------+-------+ +| cosas | cosas | +| cosas | cosas | ++=======+=======+ +| cosas | cosas | +| cosas | cosas | ++-------+-------+ +^D + --------------- + cosas cosas + cosas cosas + ------- ------- + cosas cosas + cosas cosas + + --------------- + +``` + +``` +% pandoc -f org -t markdown +#+CAPTION: Cosas ++-------+-------+ +| cosas | cosas | +| cosas | cosas | ++=======+=======+ +| cosas | cosas | +| cosas | cosas | ++-------+-------+ +^D + --------------- + cosas cosas + cosas cosas + ------- ------- + cosas cosas + cosas cosas + + --------------- + + : Cosas + +``` diff --git a/test/command/9293.md b/test/command/9293.md new file mode 100644 --- /dev/null +++ b/test/command/9293.md @@ -0,0 +1,29 @@ +``` +% pandoc -f mediawiki -t native +* Linearity in the first argument: +*:\begin{align} +\langle a \mathbf u, \mathbf v\rangle &= a \langle \mathbf u, \mathbf v\rangle. \\ +\langle \mathbf u + \mathbf v, \mathbf w\rangle &= \langle \mathbf u, \mathbf w\rangle+ \langle \mathbf v, \mathbf w\rangle. +\end{align} +^D +[ BulletList + [ [ Plain + [ Str "Linearity" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "first" + , Space + , Str "argument:" + ] + , Para + [ Math + DisplayMath + "\\begin{align}\n\\langle a \\mathbf u, \\mathbf v\\rangle &= a \\langle \\mathbf u, \\mathbf v\\rangle. \\\\\n\\langle \\mathbf u + \\mathbf v, \\mathbf w\\rangle &= \\langle \\mathbf u, \\mathbf w\\rangle+ \\langle \\mathbf v, \\mathbf w\\rangle.\n\\end{align}" + ] + ] + ] +] +``` diff --git a/test/command/934.md b/test/command/934.md --- a/test/command/934.md +++ b/test/command/934.md @@ -7,6 +7,38 @@ } \ddb{This should be italic and in quotes}{And this is the attribution} ^D -[Para [Emph [Quoted DoubleQuote [Str "This",Space,Str "should",Space,Str "be",Space,Str "italic",Space,Str "and",Space,Str "in",Space,Str "quotes"]]] -,Para [Strong [Str "And",Space,Str "this",Space,Str "is",Space,Str "the",Space,Str "attribution"]]] +[ Para + [ Emph + [ Quoted + DoubleQuote + [ Str "This" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "italic" + , Space + , Str "and" + , Space + , Str "in" + , Space + , Str "quotes" + ] + ] + ] +, Para + [ Strong + [ Str "And" + , Space + , Str "this" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "attribution" + ] + ] +] ``` diff --git a/test/command/9346.md b/test/command/9346.md new file mode 100644 --- /dev/null +++ b/test/command/9346.md @@ -0,0 +1,8 @@ +``` +% pandoc -f markdown -t markdown_strict+pipe_tables +|V1 |V2 |V3 |V4 |V5 |V6 |V7 |V8 |V9 |V10 |V11 |V12 |V13 |V14 |V15 |V16 |V17 |V18 |V19 |V20 |V21 |V22 |V23 |V24 |V25 |V26 |V27 |V28 |V29 |V30 |V31 |V32 |V33 |V34 |V35 |V36 |V37 |V38 |V39 |V40 |V41 |V42 |V43 |V44 |V45 |V46 |V47 |V48 |V49 |V50 |V51 |V52 |V53 |V54 |V55 |V56 |V57 |V58 |V59 |V60 |V61 |V62 |V63 |V64 |V65 |V66 |V67 |V68 |V69 |V70 |V71 |V72 | +|:--|:--|:--|:--|:--|:--|:--|:--|:--|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---| +^D +| V1 | V2 | V3 | V4 | V5 | V6 | V7 | V8 | V9 | V10 | V11 | V12 | V13 | V14 | V15 | V16 | V17 | V18 | V19 | V20 | V21 | V22 | V23 | V24 | V25 | V26 | V27 | V28 | V29 | V30 | V31 | V32 | V33 | V34 | V35 | V36 | V37 | V38 | V39 | V40 | V41 | V42 | V43 | V44 | V45 | V46 | V47 | V48 | V49 | V50 | V51 | V52 | V53 | V54 | V55 | V56 | V57 | V58 | V59 | V60 | V61 | V62 | V63 | V64 | V65 | V66 | V67 | V68 | V69 | V70 | V71 | V72 | +|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-|:-| +``` diff --git a/test/command/9350.md b/test/command/9350.md new file mode 100644 --- /dev/null +++ b/test/command/9350.md @@ -0,0 +1,14 @@ +``` +% pandoc -f html -t latex +
    +^D +{\def\LTcaptype{none} % do not increment counter +\begin{longtable}[]{@{}l@{}} +\toprule\noalign{} +\endhead +\bottomrule\noalign{} +\endlastfoot + \\ +\end{longtable} +} +``` diff --git a/test/command/9358.docx b/test/command/9358.docx new file mode 100644 Binary files /dev/null and b/test/command/9358.docx differ diff --git a/test/command/9358.md b/test/command/9358.md new file mode 100644 --- /dev/null +++ b/test/command/9358.md @@ -0,0 +1,45 @@ +Caption belongs to the second table: +``` +% pandoc -f docx -t html command/9358.docx +^D +

    Lorem gipsum

    + ++++ + + + + + + + + + + + + +
    AB
    CD
    +

    Lorem ipsum

    + + ++++ + + + + + + + + + + + + +

    Table 1 Numbers from 1 to 4
    12
    34
    +

    Lorem yipsum

    +``` diff --git a/test/command/9366.md b/test/command/9366.md new file mode 100644 --- /dev/null +++ b/test/command/9366.md @@ -0,0 +1,34 @@ +``` +% pandoc -f native -t latex +[ Para + [ Strikeout + [ Link + ( "" , [] , [] ) + [ Str "Example" ] + ( "https://example.com" , "" ) + ] + ] +, Para + [ Strikeout + [ Link + ( "" , [] , [] ) + [ Str "https://example.com" ] + ( "https://example.com" , "" ) + ] + ] +, Para + [ Strikeout + [ Link + ( "" , [] , [] ) + [ Str "info@example.com" ] + ( "mailto:info@example.com" , "" ) + ] + ] +] +^D +\st{\mbox{\href{https://example.com}{Example}}} + +\st{\mbox{\url{https://example.com}}} + +\st{\mbox{\href{mailto:info@example.com}{\nolinkurl{info@example.com}}}} +``` diff --git a/test/command/9371.md b/test/command/9371.md new file mode 100644 --- /dev/null +++ b/test/command/9371.md @@ -0,0 +1,30 @@ +``` +% pandoc -t latex +"'In this case (A), + +I get a kern to separate the quotes,' he said." + +"'Also in this case (B), I get a kern,' he added." + +"'But in this case (C), there is no kern,' + +he continued." + +"He concluded, + +'Nor in this case (D) is there a kern.'" +^D +``\,'In this case (A), + +I get a kern to separate the quotes,' he said.'' + +``\,`Also in this case (B), I get a kern,' he added.'' + +``\,`But in this case (C), there is no kern,' + +he continued.'' + +``He concluded, + +`Nor in this case (D) is there a kern.'\,'' +``` diff --git a/test/command/9386.md b/test/command/9386.md new file mode 100644 --- /dev/null +++ b/test/command/9386.md @@ -0,0 +1,17 @@ +``` +% pandoc -t typst --wrap=preserve +A string of text that is long enough that after 73 chars that includes a +/ slash creates a newline +^D +A string of text that is long enough that after 73 chars that includes a +\/ slash creates a newline +``` + +``` +% pandoc -t typst --wrap=preserve +A string of text that is long enough that after 73 chars that includes +a / slash creates a newline +^D +A string of text that is long enough that after 73 chars that includes +a / slash creates a newline +``` diff --git a/test/command/9387.md b/test/command/9387.md new file mode 100644 --- /dev/null +++ b/test/command/9387.md @@ -0,0 +1,23 @@ +``` +% pandoc -f html -t typst +
    +

    test

    +
    +

    See my label.

    +^D +#block[ +test + +] #label("my label") +See #link(label("my label"))[my label]. + +``` + +``` +% pandoc -f latex -t typst +\cite{10.1117/12.695309} +\cite{foo} +^D +#cite(label("10.1117/12.695309")) @foo + +``` diff --git a/test/command/9388.md b/test/command/9388.md new file mode 100644 --- /dev/null +++ b/test/command/9388.md @@ -0,0 +1,21 @@ +``` +% pandoc -f latex -t native +\begin{figure} +\centering +\includegraphics[width=0.5\linewidth,height=0.5\textheight]{figures/placeholder} +\caption{Example figure} +\end{figure} +^D +[ Figure + ( "" , [] , [] ) + (Caption + Nothing [ Plain [ Str "Example" , Space , Str "figure" ] ]) + [ Plain + [ Image + ( "" , [] , [ ( "width" , "50%" ) , ( "height" , "50%" ) ] ) + [] + ( "figures/placeholder" , "" ) + ] + ] +] +``` diff --git a/test/command/9391.docx b/test/command/9391.docx new file mode 100644 Binary files /dev/null and b/test/command/9391.docx differ diff --git a/test/command/9391.md b/test/command/9391.md new file mode 100644 --- /dev/null +++ b/test/command/9391.md @@ -0,0 +1,9 @@ +``` +% pandoc command/9391.docx -t html +^D +

    Lorem ipsum.

    +
    + +

    Blue square.

    +
    +``` diff --git a/test/command/9420.md b/test/command/9420.md new file mode 100644 --- /dev/null +++ b/test/command/9420.md @@ -0,0 +1,13 @@ +``` +% pandoc --embed-resources +![](command/9420.svg){.inline-svg} +^D +

    + + + + + + +

    +``` diff --git a/test/command/9420.svg b/test/command/9420.svg new file mode 100644 --- /dev/null +++ b/test/command/9420.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/test/command/9445.md b/test/command/9445.md new file mode 100644 --- /dev/null +++ b/test/command/9445.md @@ -0,0 +1,6 @@ +``` +% pandoc -f man -t markdown +\fB--c \fI +^D +**\--c** *\* +``` diff --git a/test/command/9452.md b/test/command/9452.md new file mode 100644 --- /dev/null +++ b/test/command/9452.md @@ -0,0 +1,19 @@ +``` +% pandoc -t typst +@something2024 says blah. + +Here is a sentence [@something2024]. + +With supplement [@something2024, p. 3]. + +And just the year [-@something2024]. +^D +#cite(, form: "prose") says blah. + +Here is a sentence @something2024. + +With supplement @something2024[p.~3]. + +And just the year (#cite(, form: "year")). + +``` diff --git a/test/command/9467.md b/test/command/9467.md new file mode 100644 --- /dev/null +++ b/test/command/9467.md @@ -0,0 +1,7 @@ +``` +% pandoc --embed-resources +![](command/9467.svg) +^D +

    + +``` diff --git a/test/command/9467.svg b/test/command/9467.svg new file mode 100644 --- /dev/null +++ b/test/command/9467.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + gradientshadedtriangle + + + + + + + + + + + + diff --git a/test/command/9472.md b/test/command/9472.md new file mode 100644 --- /dev/null +++ b/test/command/9472.md @@ -0,0 +1,85 @@ +``` +% pandoc -t latex -s +--- +lang: de-DE +--- + +More text in English. ['Zitat auf Deutsch.']{lang=de} + +[Bonjour]{lang=fr} [café]{lang="fr-FR"} +^D +% Options for packages loaded elsewhere +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{hyphens}{url} +\documentclass[ + french, + ngerman, +]{article} +\usepackage{xcolor} +\usepackage{amsmath,amssymb} +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering +\usepackage{iftex} +\ifPDFTeX + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provide euro and other symbols +\else % if luatex or xetex + \usepackage{unicode-math} % this also loads fontspec + \defaultfontfeatures{Scale=MatchLowercase} + \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} +\fi +\usepackage{lmodern} +\ifPDFTeX\else + % xetex/luatex font selection +\fi +% Use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +\IfFileExists{microtype.sty}{% use microtype if available + \usepackage[]{microtype} + \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +\ifLuaTeX +\usepackage[bidi=basic,shorthands=off]{babel} +\else +\usepackage[bidi=default,shorthands=off]{babel} +\fi +\ifLuaTeX + \usepackage{selnolig} % disable illegal ligatures +\fi +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{same} +% fallback for those not using the hyperref driver hyperxmp: +\makeatletter +\@ifundefined{xmpquote}{\newcommand{\xmpquote}[1]{#1}}{} +\makeatother +\hypersetup{ + pdflang={de-DE}, + hidelinks, + pdfcreator={LaTeX via pandoc}} + +\author{} +\date{} + +\begin{document} + +More text in English. \foreignlanguage{ngerman}{`Zitat auf Deutsch.'} + +\foreignlanguage{french}{Bonjour} \foreignlanguage{french}{café} + +\end{document} + +``` diff --git a/test/command/9475.md b/test/command/9475.md new file mode 100644 --- /dev/null +++ b/test/command/9475.md @@ -0,0 +1,102 @@ +``` +% pandoc -f org -t native +#+begin_note +Useful note. +#+end_note + +#+begin_warning +Be careful! +#+end_warning + +#+begin_tip +Try this... +#+end_tip + +#+begin_caution +Caution +#+end_caution + +#+name: foo +#+begin_important +Important +#+end_important +^D +[ Div + ( "" , [ "note" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Note" ] ] + , Para [ Str "Useful" , Space , Str "note." ] + ] +, Div + ( "" , [ "warning" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Warning" ] ] + , Para [ Str "Be" , Space , Str "careful!" ] + ] +, Div + ( "" , [ "tip" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Tip" ] ] + , Para [ Str "Try" , Space , Str "this\8230" ] + ] +, Div + ( "" , [ "caution" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Caution" ] ] + , Para [ Str "Caution" ] + ] +, Div + ( "foo" , [ "important" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Important" ] ] + , Para [ Str "Important" ] + ] +] + +``` + +``` +% pandoc -f native -t org +[ Div + ( "" , [ "note" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Note" ] ] + , Para [ Str "Useful" , Space , Str "note." ] + ] +, Div + ( "" , [ "warning" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Warning" ] ] + , Para [ Str "Be" , Space , Str "careful!" ] + ] +, Div + ( "" , [ "tip" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Tip" ] ] + , Para [ Str "Try" , Space , Str "this\8230" ] + ] +, Div + ( "" , [ "caution" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Caution" ] ] + , Para [ Str "Caution" ] + ] +, Div + ( "foo" , [ "important" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Important" ] ] + , Para [ Str "Important" ] + ] +] +^D +#+begin_note +Useful note. +#+end_note + +#+begin_warning +Be careful! +#+end_warning + +#+begin_tip +Try this... +#+end_tip + +#+begin_caution +Caution +#+end_caution + +#+name: foo +#+begin_important +Important +#+end_important +``` diff --git a/test/command/9478.md b/test/command/9478.md new file mode 100644 --- /dev/null +++ b/test/command/9478.md @@ -0,0 +1,9 @@ +``` +% pandoc -t typst --wrap=preserve +**- a - +- b** +^D +#strong[\- a - +\- b] +``` + diff --git a/test/command/9481.md b/test/command/9481.md new file mode 100644 --- /dev/null +++ b/test/command/9481.md @@ -0,0 +1,7 @@ +``` +% pandoc -f markdown+wikilinks_title_after_pipe +[a](https://example.com) +^D +

    a

    + +``` diff --git a/test/command/9516.md b/test/command/9516.md new file mode 100644 --- /dev/null +++ b/test/command/9516.md @@ -0,0 +1,17 @@ +``` +% pandoc --number-sections +# One {-} + +# Two + +# Three {-} + +# Four +^D +

    One

    +

    1 Two

    +

    Three

    +

    2 Four

    +``` diff --git a/test/command/9517.md b/test/command/9517.md new file mode 100644 --- /dev/null +++ b/test/command/9517.md @@ -0,0 +1,34 @@ +``` +% pandoc -f latex+raw_tex -t native +\begin{tabular}{l} +\begin{theorem} +Cats +\end{theorem} +\end{tabular} +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ RawBlock + (Format "latex") + "\\begin{theorem}\nCats\n\\end{theorem}" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/9555.md b/test/command/9555.md new file mode 100644 --- /dev/null +++ b/test/command/9555.md @@ -0,0 +1,13 @@ +``` +% pandoc -t native -f latex +a\@ b\@c + +\makeatletter +a\@ b\@c +\makeatother +a\@ b\@c +^D +[ Para [ Str "a" , Space , Str "bc" ] +, Para [ Str "ab" , SoftBreak , Str "a" , Space , Str "bc" ] +] +``` diff --git a/test/command/9569.md b/test/command/9569.md new file mode 100644 --- /dev/null +++ b/test/command/9569.md @@ -0,0 +1,19 @@ +``` +% pandoc -f docbook -t gfm + + Some content + +Spacer. + + A note with a title. Works, but the title is discarded. + Some content + +^D +> [!NOTE] +> Some content + +Spacer. + +> [!NOTE] +> Some content +``` diff --git a/test/command/9576.md b/test/command/9576.md new file mode 100644 --- /dev/null +++ b/test/command/9576.md @@ -0,0 +1,23 @@ +``` +% pandoc -t native +::: {#something} +Text with a footnote.[^3] + +[^3]: A footnote. +::: +^D +[ Div + ( "something" , [] , [] ) + [ Para + [ Str "Text" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "footnote." + , Note [ Para [ Str "A" , Space , Str "footnote." ] ] + ] + ] +] +``` diff --git a/test/command/9579.md b/test/command/9579.md new file mode 100644 --- /dev/null +++ b/test/command/9579.md @@ -0,0 +1,46 @@ +``` +% pandoc -t native +\begin{tabular}{p{2in}} +\end{tabular} + +# Test + +\begin{tabular}{p{2\linewidth}} +\end{tabular} +^D +[ RawBlock + (Format "tex") "\\begin{tabular}{p{2in}}\n\\end{tabular}" +, Header 1 ( "test" , [] , [] ) [ Str "Test" ] +, RawBlock + (Format "tex") + "\\begin{tabular}{p{2\\linewidth}}\n\\end{tabular}" +] +``` + +``` +% pandoc -f latex -t native +\begin{tabular}{p{2in}} +\end{tabular} + +Test + +\begin{tabular}{p{2\linewidth}} +\end{tabular} +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ] + (TableFoot ( "" , [] , [] ) []) +, Para [ Str "Test" ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidth 2.0 ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/9585.md b/test/command/9585.md new file mode 100644 --- /dev/null +++ b/test/command/9585.md @@ -0,0 +1,11 @@ +``` +% pandoc -f native -t typst +[ Header 2 ( "" , [] , [] ) [ Str "One" ] +, Header 2 ( "" , [ "unnumbered", "unlisted" ] , [] ) [ Str "Two" ] +, Header 2 ( "" , [] , [] ) [ Str "Three" ] +] +^D +== One +#heading(level: 2, outlined: false, numbering: none)[Two] +== Three +``` diff --git a/test/command/9586.md b/test/command/9586.md new file mode 100644 --- /dev/null +++ b/test/command/9586.md @@ -0,0 +1,7 @@ +``` +% pandoc -t typst +**1. April 2024** +^D +#strong[\1. April 2024] + +``` diff --git a/test/command/9597.md b/test/command/9597.md new file mode 100644 --- /dev/null +++ b/test/command/9597.md @@ -0,0 +1,6 @@ +``` +% pandoc -t latex +~~$T$~~ +^D +\st{$T$} +``` diff --git a/test/command/9603.docx b/test/command/9603.docx new file mode 100644 Binary files /dev/null and b/test/command/9603.docx differ diff --git a/test/command/9603.md b/test/command/9603.md new file mode 100644 --- /dev/null +++ b/test/command/9603.md @@ -0,0 +1,23 @@ +``` +% pandoc command/9603.docx -t html -f docx+styles +^D +

    A table with a contemporary style:

    + ++++ + + + + + + + + + + + + +
    TestColumn
    12
    +``` diff --git a/test/command/9616.md b/test/command/9616.md new file mode 100644 --- /dev/null +++ b/test/command/9616.md @@ -0,0 +1,16 @@ +``` +% pandoc -f bibtex -t csljson -s +@MISC {3252037, + TITLE = {Isomorphism between projective varieties $\mathbf{P}^{1}$ and a conic in $\mathbf{P}^{2}$}, + URL = {https://math.stackexchange.com/q/3252037} +} +^D +[ + { + "URL": "https://math.stackexchange.com/q/3252037", + "id": "3252037", + "title": "Isomorphism between projective varieties $\\mathbf{P}^{1}$ and a conic in $\\mathbf{P}^{2}$", + "type": "" + } +] +``` diff --git a/test/command/9630.md b/test/command/9630.md new file mode 100644 --- /dev/null +++ b/test/command/9630.md @@ -0,0 +1,12 @@ +``` +% pandoc -f dokuwiki + * [[https://example.com|https://example.com]] + * [[https://example.com/start#monitoring|https://example.com/start#monitoring]] +^D + + +``` diff --git a/test/command/9632.md b/test/command/9632.md new file mode 100644 --- /dev/null +++ b/test/command/9632.md @@ -0,0 +1,7 @@ +``` +% pandoc -f dokuwiki +[[.:supprimer-profil-windows|]] +^D +

    supprimer-profil-windows

    + +``` diff --git a/test/command/9635.md b/test/command/9635.md new file mode 100644 --- /dev/null +++ b/test/command/9635.md @@ -0,0 +1,16 @@ +``` +% pandoc +> ::: {.fence} +> that is +> not closed + +okay +^D +2> [WARNING] Div at _chunk line 1 column 1 unclosed at _chunk line 5 column 1, closing implicitly. +
    +
    +

    that is not closed

    +
    +
    +

    okay

    +``` diff --git a/test/command/9639.md b/test/command/9639.md new file mode 100644 --- /dev/null +++ b/test/command/9639.md @@ -0,0 +1,11 @@ +``` +% pandoc -f org -t native +#+title: repro + +* heading-name +:PROPERTIES: +:ID: 123abc +:END: +^D +[ Header 1 ( "123abc" , [] , [] ) [ Str "heading-name" ] ] +``` diff --git a/test/command/9644.md b/test/command/9644.md new file mode 100644 --- /dev/null +++ b/test/command/9644.md @@ -0,0 +1,7 @@ +``` +% pandoc -t latex +[$T$]{.underline} +[$T$]{.mark} +^D +\ul{$T$} \hl{$T$} +``` diff --git a/test/command/9652.md b/test/command/9652.md new file mode 100644 --- /dev/null +++ b/test/command/9652.md @@ -0,0 +1,9 @@ +```` +% pandoc -f markdown -t html --embed-resources +```{=html} + +``` +^D + + +```` diff --git a/test/command/9652.svg b/test/command/9652.svg new file mode 100644 --- /dev/null +++ b/test/command/9652.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/command/9657.md b/test/command/9657.md new file mode 100644 --- /dev/null +++ b/test/command/9657.md @@ -0,0 +1,7 @@ +``` +% pandoc -t opendocument +[Text here]{custom-style="Strikethrough"} +^D +Text +here +``` diff --git a/test/command/9676.md b/test/command/9676.md new file mode 100644 --- /dev/null +++ b/test/command/9676.md @@ -0,0 +1,9 @@ +``` +% pandoc -f latex +\def\foo{BAR} +\foo +\ifstrequal{BAR}{BAR}{\def\foo{BAZ}}{} +\foo +^D +

    BAR BAZ

    +``` diff --git a/test/command/9700.md b/test/command/9700.md new file mode 100644 --- /dev/null +++ b/test/command/9700.md @@ -0,0 +1,14 @@ +``` +% pandoc -t mediawiki +This is a normal sentence with a manual text footnote\* + +\* The footnote explains why it couldn't just be inside parentheses + +\#foobar \#foobar +^D +This is a normal sentence with a manual text footnote* + +* The footnote explains why it couldn’t just be inside parentheses + +#foobar #foobar +``` diff --git a/test/command/9716.md b/test/command/9716.md new file mode 100644 --- /dev/null +++ b/test/command/9716.md @@ -0,0 +1,13 @@ +``` +% pandoc -f markdown+alerts -t native +> [!TIP] +> A suggestion. +^D +[ Div + ( "" , [ "tip" ] , [] ) + [ Div ( "" , [ "title" ] , [] ) [ Para [ Str "Tip" ] ] + , Para [ Str "A" , Space , Str "suggestion." ] + ] +] + +``` diff --git a/test/command/9777-b.md b/test/command/9777-b.md new file mode 100644 --- /dev/null +++ b/test/command/9777-b.md @@ -0,0 +1,62 @@ +``` +% pandoc -f native -t typst +[ Table + ( "" , [] , [ ( "typst:figure:kind" , "figure" ) ] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "f" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "b" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +^D +#figure( + align(center)[#table( + columns: 2, + align: (auto,auto,), + table.header([f], [b],), + table.hline(), + [1], [2], + )] + , kind: figure + ) +``` + diff --git a/test/command/9777.md b/test/command/9777.md new file mode 100644 --- /dev/null +++ b/test/command/9777.md @@ -0,0 +1,58 @@ +``` +% pandoc -f native -t typst +[ Table + ( "" , [ "typst:no-figure" ] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "f" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "b" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +^D +#table( + columns: 2, + align: (auto,auto,), + table.header([f], [b],), + table.hline(), + [1], [2], +) +``` diff --git a/test/command/9792.md b/test/command/9792.md new file mode 100644 --- /dev/null +++ b/test/command/9792.md @@ -0,0 +1,21 @@ +``` +% pandoc -t gfm +- list item +
    + + - subitem +
    + + item _continue_ **with** formatting +- next list item +^D +- list item +
    + + - subitem + +
    + + item *continue* **with** formatting +- next list item +``` diff --git a/test/command/9797.md b/test/command/9797.md new file mode 100644 --- /dev/null +++ b/test/command/9797.md @@ -0,0 +1,39 @@ +``` +% pandoc -t native -f csv +"one_line_break: +four_line_breaks: + + + +last_line" +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "one_line_break:" + , LineBreak + , Str "four_line_breaks:" + , LineBreak + , LineBreak + , LineBreak + , LineBreak + , Str "last_line" + ] + ] + ] + ]) + [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/9805.md b/test/command/9805.md new file mode 100644 --- /dev/null +++ b/test/command/9805.md @@ -0,0 +1,10 @@ +``` +% pandoc -f rst -t native +word.*word +------------ +* abc +^D +[ Header 1 ( "word.word" , [] , [] ) [ Str "word.*word" ] +, BulletList [ [ Plain [ Str "abc" ] ] ] +] +``` diff --git a/test/command/9807.md b/test/command/9807.md new file mode 100644 --- /dev/null +++ b/test/command/9807.md @@ -0,0 +1,13 @@ +``` +% pandoc -f typst -t native +#let foo = [ + bar baz +] +*#foo* +^D +[ Para + [ Strong + [ SoftBreak , Str "bar" , Space , Str "baz" , SoftBreak ] + ] +] +``` diff --git a/test/command/9809.md b/test/command/9809.md new file mode 100644 --- /dev/null +++ b/test/command/9809.md @@ -0,0 +1,14 @@ +``` +% pandoc -f html -t native +
      +
    • Bullet point.
      • +

      Nested line.

      +
    +^D +[ BulletList + [ [ Para [ Str "Bullet" , Space , Str "point." ] + , Para [ Str "Nested" , Space , Str "line." ] + ] + ] +] +``` diff --git a/test/command/982.md b/test/command/982.md --- a/test/command/982.md +++ b/test/command/982.md @@ -7,5 +7,9 @@ y=x^2 \EEQ ^D -[Para [Math DisplayMath "y=x^2"]] +[ Para + [ Math + DisplayMath "\\begin{equation}\ny=x^2\n\\end{equation}" + ] +] ``` diff --git a/test/command/9865.md b/test/command/9865.md new file mode 100644 --- /dev/null +++ b/test/command/9865.md @@ -0,0 +1,53 @@ +```` +% pandoc +- example 1 +- ``` + one + two + ``` +- list item three +^D +
      +
    • example 1
      • +
    • one
+two
      • +
    • list item three
      • +
    +```` + +```` +% pandoc +- example 3 +- ``` +one +two +``` +- list item three +^D +
      +
    • example 3
      • +
    • one
+two
      • +
    • list item three
      • +
    +```` + +Here is a case that we used to handle differently, but +#9865 aligns pandoc's markdown parser with commonmark in letting +block level structure take precedence over inline level structure. + +```` +% pandoc +- a +- c +^D +
      +

    • a <!–

      • +

    • b

      • +
    +

    –> - c

    +```` diff --git a/test/command/987.md b/test/command/987.md --- a/test/command/987.md +++ b/test/command/987.md @@ -1,5 +1,5 @@ ``` -pandoc -f latex -t markdown +% pandoc -f latex -t markdown \documentclass{article} \newenvironment{flubble}{FOO}{BAR} \begin{document} diff --git a/test/command/9878.md b/test/command/9878.md new file mode 100644 --- /dev/null +++ b/test/command/9878.md @@ -0,0 +1,12 @@ +``` +% pandoc -f textile -t native +15% 50% +^D +[ Para [ Str "15%" , Space , Str "50%" ] ] +``` +``` +% pandoc -f textile -t native +15%. 70% +^D +[ Para [ Str "15%." , Space , Str "70%" ] ] +``` diff --git a/test/command/9902.md b/test/command/9902.md new file mode 100644 --- /dev/null +++ b/test/command/9902.md @@ -0,0 +1,6 @@ +``` +% pandoc -t native -f latex+raw_tex +\kern.1pt +^D +[ RawBlock (Format "latex") "\\kern.1pt" ] +``` diff --git a/test/command/9904.md b/test/command/9904.md new file mode 100644 --- /dev/null +++ b/test/command/9904.md @@ -0,0 +1,180 @@ +``` +% pandoc -f rst -t native --citeproc --bibliography command/biblio.bib +The axioms were introduced by :cite:t:`{see}item1`. +The axioms were introduced by :cite:t:`item1{p. 1166}`. +The axioms were introduced by :cite:t:`{see}item1{p. 1166}`. +Axioms were introduced :cite:`{see}item1`. +Axioms were introduced :cite:p:`item1{p. 1166}`. +Axioms were introduced :cite:p:`{see}item1{p. 1166}`. + +.. bibliography:: +^D +[ Para + [ Str "The" + , Space + , Str "axioms" + , Space + , Str "were" + , Space + , Str "introduced" + , Space + , Str "by" + , Space + , Cite + [ Citation + { citationId = "item1" + , citationPrefix = [ Str "see" ] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(see" , Space , Str "Doe;" , Space , Str "2005)" ] + , Str "." + , SoftBreak + , Str "The" + , Space + , Str "axioms" + , Space + , Str "were" + , Space + , Str "introduced" + , Space + , Str "by" + , Space + , Cite + [ Citation + { citationId = "item1" + , citationPrefix = [] + , citationSuffix = [ Str "p." , Space , Str "1166" ] + , citationMode = AuthorInText + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "Doe" , Space , Str "(2005," , Space , Str "1166)" ] + , Str "." + , SoftBreak + , Str "The" + , Space + , Str "axioms" + , Space + , Str "were" + , Space + , Str "introduced" + , Space + , Str "by" + , Space + , Cite + [ Citation + { citationId = "item1" + , citationPrefix = [ Str "see" ] + , citationSuffix = [ Str "p." , Space , Str "1166" ] + , citationMode = AuthorInText + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(see" + , Space + , Str "Doe;" + , Space + , Str "2005," + , Space + , Str "1166)" + ] + , Str "." + , SoftBreak + , Str "Axioms" + , Space + , Str "were" + , Space + , Str "introduced" + , Space + , Cite + [ Citation + { citationId = "item1" + , citationPrefix = [ Str "see" ] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(see" , Space , Str "Doe" , Space , Str "2005)" ] + , Str "." + , SoftBreak + , Str "Axioms" + , Space + , Str "were" + , Space + , Str "introduced" + , Space + , Cite + [ Citation + { citationId = "item1" + , citationPrefix = [] + , citationSuffix = [ Str "p." , Space , Str "1166" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(Doe" , Space , Str "2005," , Space , Str "1166)" ] + , Str "." + , SoftBreak + , Str "Axioms" + , Space + , Str "were" + , Space + , Str "introduced" + , Space + , Cite + [ Citation + { citationId = "item1" + , citationPrefix = [ Str "see" ] + , citationSuffix = [ Str "p." , Space , Str "1166" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(see" + , Space + , Str "Doe" + , Space + , Str "2005," + , Space + , Str "1166)" + ] + , Str "." + ] +, Div + ( "refs" + , [ "references" , "csl-bib-body" , "hanging-indent" ] + , [] + ) + [ Div + ( "ref-item1" , [ "csl-entry" ] , [] ) + [ Para + [ Str "Doe," + , Space + , Str "John." + , Space + , Str "2005." + , Space + , Emph [ Str "First" , Space , Str "Book" ] + , Str "." + , Space + , Str "Cambridge" + , Space + , Str "University" + , Space + , Str "Press." + ] + ] + ] +] + +``` diff --git a/test/command/9905.md b/test/command/9905.md new file mode 100644 --- /dev/null +++ b/test/command/9905.md @@ -0,0 +1,20 @@ +``` +% pandoc -t html5 +# Section Ψ {#Ψ} + +look at [Section Ψ](#Ψ). +^D +

    Section Ψ

    +

    look at Section Ψ.

    + +``` +``` +% pandoc -t html4 +# Section Ψ {#Ψ} + +look at [Section Ψ](#Ψ). +^D +

    Section Ψ

    +

    look at Section Ψ.

    + +``` diff --git a/test/command/9908.md b/test/command/9908.md new file mode 100644 --- /dev/null +++ b/test/command/9908.md @@ -0,0 +1,10 @@ +``` +% pandoc -f native -t markdown +[ BulletList + [ [ BlockQuote [ Para [ Str "a" ] , Para [ Str "b" ] ] ] ] +] +^D +- > a + > + > b +``` diff --git a/test/command/9943.md b/test/command/9943.md new file mode 100644 --- /dev/null +++ b/test/command/9943.md @@ -0,0 +1,24 @@ +``` +% pandoc -t man -s -Vpandoc-version=X.Y +--- +title: HELLO +section: 1 +--- +^D +.\" Automatically generated by Pandoc X.Y +.\" +.TH "HELLO" "1" "" "" +``` + +``` +% pandoc -t man -s -Vpandoc-version=X.Y +--- +title: HELLO +section: 1 +header: Head +--- +^D +.\" Automatically generated by Pandoc X.Y +.\" +.TH "HELLO" "1" "" "" "Head" +``` diff --git a/test/command/9945.md b/test/command/9945.md new file mode 100644 --- /dev/null +++ b/test/command/9945.md @@ -0,0 +1,28 @@ +``` +% pandoc -t typst --dpi 300 +![](image.jpg){width=300 height=300} +^D +#box(image("image.jpg", height: 1in, width: 1in)) +``` + +``` +% pandoc -t typst --dpi 600 +![](image.jpg){width=300px height=300px} +^D +#box(image("image.jpg", height: 0.5in, width: 0.5in)) +``` + +``` +% pandoc -t typst --dpi 600 +![](image.jpg){width=1in height=3cm} +^D +#box(image("image.jpg", height: 3cm, width: 1in)) +``` + + +``` +% pandoc -t typst --dpi 600 +![](image.jpg){.foo .bar baz=3} +^D +#box(image("image.jpg")) +``` diff --git a/test/command/9953.md b/test/command/9953.md new file mode 100644 --- /dev/null +++ b/test/command/9953.md @@ -0,0 +1,29 @@ +``` +% pandoc -f markdown -t native -s +--- +header-includes: | + \makeatletter + \let\old@verbatim@font=\verbatim@font + \def\verbatim@font{% + \fontsize{10}{12}% + \old@verbatim@font + } + \makeatother +... +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "header-includes" + , MetaBlocks + [ RawBlock + (Format "tex") + "\\makeatletter\n\\let\\old@verbatim@font=\\verbatim@font\n\\def\\verbatim@font{%\n\\fontsize{10}{12}%\n\\old@verbatim@font\n}\n\\makeatother" + ] + ) + ] + } + [] + +``` diff --git a/test/command/9987.md b/test/command/9987.md new file mode 100644 --- /dev/null +++ b/test/command/9987.md @@ -0,0 +1,10 @@ +``` +% pandoc -f bibtex -t bibtex +@misc{agency, + author = {{European Environment Agency}}, +} +^D +@misc{agency, + author = {{European Environment Agency}} +} +``` diff --git a/test/command/A.txt b/test/command/A.txt new file mode 100644 --- /dev/null +++ b/test/command/A.txt @@ -0,0 +1,1 @@ +this is a diff --git a/test/command/B.txt b/test/command/B.txt new file mode 100644 --- /dev/null +++ b/test/command/B.txt @@ -0,0 +1,1 @@ +here is b diff --git a/test/command/C.txt b/test/command/C.txt new file mode 100644 --- /dev/null +++ b/test/command/C.txt @@ -0,0 +1,1 @@ +and this is c diff --git a/test/command/D.txt b/test/command/D.txt new file mode 100644 --- /dev/null +++ b/test/command/D.txt @@ -0,0 +1,1 @@ +here's d diff --git a/test/command/adjacent_latex_blocks.md b/test/command/adjacent_latex_blocks.md new file mode 100644 --- /dev/null +++ b/test/command/adjacent_latex_blocks.md @@ -0,0 +1,10 @@ +``` +% pandoc -f markdown -t native +\listoffigures + +\listoftables +^D +[ RawBlock (Format "tex") "\\listoffigures" +, RawBlock (Format "tex") "\\listoftables" +] +``` diff --git a/test/command/advanced-optical-materials.csl b/test/command/advanced-optical-materials.csl new file mode 100644 --- /dev/null +++ b/test/command/advanced-optical-materials.csl @@ -0,0 +1,155 @@ + + diff --git a/test/command/alerts.md b/test/command/alerts.md new file mode 100644 --- /dev/null +++ b/test/command/alerts.md @@ -0,0 +1,55 @@ +``` +% pandoc -f rst -t gfm +.. note:: + This is my note. +^D +> [!NOTE] +> This is my note. +``` + +``` +% pandoc -f gfm -t rst +> [!WARNING] +> Be careful! +^D +.. warning:: + + Be careful! +``` + +``` +% pandoc -f gfm -t asciidoc +> [!TIP] +> A tip. +^D +[TIP] +==== +A tip. +==== +``` + +``` +% pandoc -f gfm -t docbook +> [!TIP] +> A tip. +^D + + Tip + + A tip. + + +``` + +``` +% pandoc -f docbook -t gfm + + Tip + + A tip. + + +^D +> [!TIP] +> A tip. +``` diff --git a/test/command/american-medical-association.csl b/test/command/american-medical-association.csl new file mode 100644 --- /dev/null +++ b/test/command/american-medical-association.csl @@ -0,0 +1,279 @@ + + diff --git a/test/command/annales.csl b/test/command/annales.csl new file mode 100644 --- /dev/null +++ b/test/command/annales.csl @@ -0,0 +1,334 @@ + + diff --git a/test/command/apa.csl b/test/command/apa.csl new file mode 100644 --- /dev/null +++ b/test/command/apa.csl @@ -0,0 +1,474 @@ + + diff --git a/test/command/archeologie-medievale.csl b/test/command/archeologie-medievale.csl new file mode 100644 --- /dev/null +++ b/test/command/archeologie-medievale.csl @@ -0,0 +1,291 @@ + + diff --git a/test/command/ascii.md b/test/command/ascii.md new file mode 100644 --- /dev/null +++ b/test/command/ascii.md @@ -0,0 +1,89 @@ +``` +% pandoc -t html --ascii +äéıå +^D +

    äéıå

    +``` + +``` +% pandoc -t latex --ascii +äéıå +^D +\"{a}\'{e}\i\r{a} +``` + +``` +% pandoc -t man --ascii +äéıå +^D +.PP +\(:a\('e\(.i\(oa +``` + +``` +% pandoc -t ms --ascii +äéıå +^D +.LP +\(:a\('e\(.i\(oa +``` + +``` +% pandoc -t docbook --ascii +äéıå +^D + + äéıå + +``` + +``` +% pandoc -t jats --ascii +äéıå +^D +

    äéıå

    +``` + +``` +% pandoc -t markdown-smart --ascii +"äéıå" +^D +“äéıå” +``` + +# CommonMark tests + +``` +% pandoc -f commonmark -t commonmark --ascii +hello … ok? … bye +^D +hello … ok? … bye +``` + +``` +% pandoc -f commonmark+smart -t commonmark-smart --ascii --wrap=none +"hi"...dog's breath---cat 5--6 +^D +“hi”…dog’s breath—cat 5–6 +``` + +``` +% pandoc -f commonmark+smart -t commonmark+smart --ascii +"hi"...dog's breath---cat 5--6 +^D +"hi"...dog's breath---cat 5--6 +``` + +``` +% pandoc -f commonmark -t commonmark --ascii +foo Ӓ bar +^D +foo Ӓ bar +``` + +``` +% pandoc -f commonmark -t commonmark --ascii +\[foo\](bar) +^D +\[foo\](bar) +``` diff --git a/test/command/author-in-text-move-note.md b/test/command/author-in-text-move-note.md new file mode 100644 --- /dev/null +++ b/test/command/author-in-text-move-note.md @@ -0,0 +1,19 @@ +``` +% pandoc --citeproc --csl command/chicago-fullnote-bibliography.csl -t plain +--- +references: +- id: foo + type: book + author: John Doe + title: A Book +... + +See @foo [p. 21], as well. +^D +See John Doe,[1] as well. + +John Doe. A Book, n.d. + +[1] A Book, n.d., 21. +``` + diff --git a/test/command/averroes.bib b/test/command/averroes.bib new file mode 100644 --- /dev/null +++ b/test/command/averroes.bib @@ -0,0 +1,95 @@ +@string{anch-ie = {Angew.~Chem. Int.~Ed.}} +@string{cup = {Cambridge University Press}} +@string{dtv = {Deutscher Taschenbuch-Verlag}} +@string{hup = {Harvard University Press}} +@string{jams = {J.~Amer. Math. Soc.}} +@string{jchph = {J.~Chem. Phys.}} +@string{jomch = {J.~Organomet. Chem.}} +@string{pup = {Princeton University Press}} + +@book{averroes/bland, + author = {Averroes}, + title = {The Epistle on the Possibility of Conjunction with the Active + Intellect by {Ibn Rushd} with the Commentary of {Moses Narboni}}, + date = 1982, + editor = {Bland, Kalman P.}, + translator = {Bland, Kalman P.}, + series = {Moreshet: Studies in {Jewish} History, Literature and Thought}, + number = 7, + publisher = {Jewish Theological Seminary of America}, + location = {New York}, + keywords = {primary}, + langid = {english}, + langidopts = {variant=american}, + indextitle = {Epistle on the Possibility of Conjunction, The}, + shorttitle = {Possibility of Conjunction}, + annotation = {A \texttt{book} entry with a \texttt{series} and a + \texttt{number}. Note the concatenation of the \texttt{editor} + and \texttt{translator} fields as well as the + \texttt{indextitle} field}, +} + +@book{averroes/hannes, + author = {Averroes}, + title = {Des Averro{\"e}s Abhandlung: \mkbibquote{{\"U}ber die + M{\"o}glichkeit der Conjunktion} oder \mkbibquote{{\"U}ber den + materiellen Intellekt}}, + date = 1892, + editor = {Hannes, Ludwig}, + translator = {Hannes, Ludwig}, + annotator = {Hannes, Ludwig}, + publisher = {C.~A. Kaemmerer}, + location = {Halle an der Saale}, + keywords = {primary}, + langid = {german}, + sorttitle = {Uber die Moglichkeit der Conjunktion}, + indexsorttitle= {Uber die Moglichkeit der Conjunktion}, + indextitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion}, + shorttitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion}, + annotation = {An annotated edition. Note the concatenation of the + \texttt{editor}, \texttt{translator}, and \texttt{annotator} + fields. Also note the \texttt{shorttitle}, + \texttt{indextitle}, \texttt{sorttitle}, and + \texttt{indexsorttitle} fields}, +} + +@book{averroes/hercz, + author = {Averroes}, + title = {Drei Abhandlungen {\"u}ber die Conjunction des separaten + Intellects mit dem Menschen}, + date = 1869, + editor = {Hercz, J.}, + translator = {Hercz, J.}, + publisher = {S.~Hermann}, + location = {Berlin}, + keywords = {primary}, + langid = {german}, + indexsorttitle= {Drei Abhandlungen uber die Conjunction}, + indextitle = {Drei Abhandlungen {\"u}ber die Conjunction}, + subtitle = {Von Averroes (Vater und Sohn), aus dem Arabischen + {\"u}bersetzt von Samuel Ibn Tibbon}, + shorttitle = {Drei Abhandlungen}, + annotation = {A \texttt{book} entry. Note the concatenation of the + \texttt{editor} and \texttt{translator} fields as well as the + \texttt{indextitle} and \texttt{indexsorttitle} fields}, +} + +@book{cicero, + author = {Cicero, Marcus Tullius}, + title = {De natura deorum. {\"U}ber das Wesen der G{\"o}tter}, + date = 1995, + editor = {Blank-Sangmeister, Ursula}, + translator = {Blank-Sangmeister, Ursula}, + afterword = {Thraede, Klaus}, + language = {langlatin and langgerman}, + publisher = {Reclam}, + location = {Stuttgart}, + langid = {german}, + indextitle = {De natura deorum}, + shorttitle = {De natura deorum}, + annotation = {A bilingual edition of Cicero's \emph{De natura deorum}, with + a German translation. Note the format of the \texttt{language} + field in the database file, the concatenation of the + \texttt{editor} and \texttt{translator} fields, and the + \texttt{afterword} field}, +} diff --git a/test/command/bar-endinput.tex b/test/command/bar-endinput.tex new file mode 100644 --- /dev/null +++ b/test/command/bar-endinput.tex @@ -0,0 +1,3 @@ +\emph{hi there} +\endinput +\emph{invisible} diff --git a/test/command/bar.tex b/test/command/bar.tex new file mode 100644 --- /dev/null +++ b/test/command/bar.tex @@ -0,0 +1,1 @@ +\emph{hi there} diff --git a/test/command/biblatex-266.md b/test/command/biblatex-266.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-266.md @@ -0,0 +1,34 @@ +``` +% pandoc -f biblatex -t markdown -s +@book{goethe2005, + langid = {german}, + location = {{Frankfurt am Main}}, + title = {Not A Real Book}, + date = {2005}, + author = {family=Goethe, given=Johann Wolfgang, prefix=von, useprefix=false and given=Antonie, prefix=van, family=Leeuwenhoek, useprefix=true}, editor = {Schöne, Albrecht} +} + +^D +--- +nocite: "[@*]" +references: +- author: + - dropping-particle: von + family: Goethe + given: Johann Wolfgang + - family: Leeuwenhoek + given: Antonie + non-dropping-particle: van + editor: + - family: Schöne + given: Albrecht + id: goethe2005 + issued: 2005 + language: de-DE + publisher-place: Frankfurt am Main + title: Not A Real Book + type: book +--- + + +``` diff --git a/test/command/biblatex-aksin.md b/test/command/biblatex-aksin.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-aksin.md @@ -0,0 +1,78 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Aksin et al. 2006) + +Aksin, Özge, Hayati Türkmen, Levent Artok, Bekir Çetinkaya, Chaoying Ni, +Orhan Büyükgüngör, and Erhan Özkal. 2006. “Effect of Immobilization on +Catalytic Characteristics of Saturated Pd-N-heterocyclic Carbenes in +Mizoroki-Heck Reactions.” *J. Organomet. Chem.* 691 (13): 3027–3036. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Aksin et al., 2006) + +Aksin, Ö., Türkmen, H., Artok, L., Çetinkaya, B., Ni, C., Büyükgüngör, +O., & Özkal, E. (2006). Effect of immobilization on catalytic +characteristics of saturated Pd-N-heterocyclic carbenes in Mizoroki-Heck +reactions. *J. Organomet. Chem.*, *691*(13), 3027–3036. + + +} + +@string{ jomch = {J.~Organomet. Chem.} } + +@Article{aksin, + author = {Aks{\i}n, {\"O}zge and T{\"u}rkmen, Hayati and Artok, Levent + and {\c{C}}etinkaya, Bekir and Ni, Chaoying and + B{\"u}y{\"u}kg{\"u}ng{\"o}r, Orhan and {\"O}zkal, Erhan}, + title = {Effect of immobilization on catalytic characteristics of + saturated {Pd-N}-heterocyclic carbenes in {Mizoroki-Heck} + reactions}, + journaltitle = jomch, + date = 2006, + volume = 691, + number = 13, + pages = {3027-3036}, + indextitle = {Effect of immobilization on catalytic characteristics}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Aksın + given: Özge + - family: Türkmen + given: Hayati + - family: Artok + given: Levent + - family: Çetinkaya + given: Bekir + - family: Ni + given: Chaoying + - family: Büyükgüngör + given: Orhan + - family: Özkal + given: Erhan + container-title: J. Organomet. Chem. + id: aksin + issue: 13 + issued: 2006 + page: 3027-3036 + title: Effect of immobilization on catalytic characteristics of + saturated Pd-N-heterocyclic carbenes in Mizoroki-Heck reactions + type: article-journal + volume: 691 +--- + + +``` diff --git a/test/command/biblatex-almendro.md b/test/command/biblatex-almendro.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-almendro.md @@ -0,0 +1,71 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Almendro et al. 1998) + +Almendro, José L., Jacinto Martín, Alberto Sánchez, and Fernando Nozal. +1998. “Elektromagnetisches Signalhorn.” + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Almendro, Martín, Sánchez, & Nozal, 1998) + +Almendro, J. L., Martín, J., Sánchez, A., & Nozal, F. (1998). +Elektromagnetisches Signalhorn. + + +NOTES: + +- CSL styles’ handling of patent items needs to be improved + +} + +@Patent{almendro, + author = {Almendro, Jos{\'e} L. and Mart{\'i}n, Jacinto and S{\'a}nchez, + Alberto and Nozal, Fernando}, + title = {Elektromagnetisches Signalhorn}, + number = {EU-29702195U}, + date = 1998, + location = {countryfr and countryuk and countryde}, + hyphenation = {german}, + annotation = {This is a patent entry with a location + field. The number is given in the number field. Note + the format of the location field in the database + file. Compare laufenberg, sorace, and + kowalik}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a patent entry with a location field. The number is + given in the number field. Note the format of the location field in + the database file. Compare laufenberg, sorace, and kowalik + author: + - family: Almendro + given: José L. + - family: Martín + given: Jacinto + - family: Sánchez + given: Alberto + - family: Nozal + given: Fernando + id: almendro + issued: 1998 + jurisdiction: France; United Kingdom; Germany + language: de-DE + number: EU-29702195U + title: Elektromagnetisches Signalhorn + type: patent +--- + + +``` diff --git a/test/command/biblatex-angenendt.md b/test/command/biblatex-angenendt.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-angenendt.md @@ -0,0 +1,66 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Angenendt 2002) + +Angenendt, Arnold. 2002. “In Honore Salvatoris – Vom Sinn und Unsinn der +Patrozinienkunde.” *Revue d’Histoire Ecclésiastique* 97: 431–456, +791–823. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Angenendt, 2002) + +Angenendt, A. (2002). In Honore Salvatoris – Vom Sinn und Unsinn der +Patrozinienkunde. *Revue d’Histoire Ecclésiastique*, *97*, 431–456, +791–823. + + +} + +@Article{angenendt, + author = {Angenendt, Arnold}, + title = {In Honore Salvatoris~-- Vom Sinn und Unsinn der + Patrozinienkunde}, + journaltitle = {Revue d'Histoire Eccl{\'e}siastique}, + date = 2002, + volume = 97, + pages = {431--456, 791--823}, + hyphenation = {german}, + indextitle = {In Honore Salvatoris}, + shorttitle = {In Honore Salvatoris}, + annotation = {A German article in a French journal. Apart from that, a + typical article entry. Note the indextitle + field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A German article in a French journal. Apart from that, a + typical article entry. Note the indextitle field + author: + - family: Angenendt + given: Arnold + container-title: Revue d'Histoire Eccl[é]{.nocase}siastique + id: angenendt + issued: 2002 + language: de-DE + page: 431-456, 791-823 + title: In Honore Salvatoris -- Vom Sinn und Unsinn der + Patrozinienkunde + title-short: In Honore Salvatoris + type: article-journal + volume: 97 +--- + + +``` diff --git a/test/command/biblatex-aristotle-anima.md b/test/command/biblatex-aristotle-anima.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-aristotle-anima.md @@ -0,0 +1,62 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Aristotle 1907) + +Aristotle. 1907. *De Anima*. Edited by Robert Drew Hicks. Cambridge: +Cambridge University Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Aristotle, 1907) + +Aristotle. (1907). *De anima*. (R. D. Hicks, Ed.). Cambridge: Cambridge +University Press. + + +} + +@string{ cup = {Cambridge University Press} } + +@Book{aristotle:anima, + author = {Aristotle}, + title = {De Anima}, + date = 1907, + editor = {Hicks, Robert Drew}, + publisher = cup, + location = {Cambridge}, + keywords = {primary}, + hyphenation = {british}, + annotation = {A book entry with an author and an + editor}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry with an author and an editor + author: + - family: Aristotle + editor: + - family: Hicks + given: Robert Drew + id: "aristotle:anima" + issued: 1907 + keyword: primary + language: en-GB + publisher: Cambridge University Press + publisher-place: Cambridge + title: De anima + type: book +--- + + +``` diff --git a/test/command/biblatex-aristotle-physics.md b/test/command/biblatex-aristotle-physics.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-aristotle-physics.md @@ -0,0 +1,63 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Aristotle 1929) + +Aristotle. 1929. *Physics*. Translated by P. H. Wicksteed and F. M. +Cornford. New York: G. P. Putnam. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Aristotle, 1929) + +Aristotle. (1929). *Physics*. (P. H. Wicksteed & F. M. Cornford, +Trans.). New York: G. P. Putnam. + + +} + +@Book{aristotle:physics, + author = {Aristotle}, + title = {Physics}, + date = 1929, + translator = {Wicksteed, P. H. and Cornford, F. M.}, + publisher = {G. P. Putnam}, + location = {New York}, + keywords = {primary}, + hyphenation = {american}, + shorttitle = {Physics}, + annotation = {A book entry with a translator field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry with a translator field + author: + - family: Aristotle + id: "aristotle:physics" + issued: 1929 + keyword: primary + language: en-US + publisher: G. P. Putnam + publisher-place: New York + title: Physics + title-short: Physics + translator: + - family: Wicksteed + given: P. H. + - family: Cornford + given: F. M. + type: book +--- + + +``` diff --git a/test/command/biblatex-aristotle-poetics.md b/test/command/biblatex-aristotle-poetics.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-aristotle-poetics.md @@ -0,0 +1,65 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Aristotle 1968) + +Aristotle. 1968. *Poetics*. Edited by D. W. Lucas. Clarendon Aristotle. +Oxford: Clarendon Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Aristotle, 1968) + +Aristotle. (1968). *Poetics*. (D. W. Lucas, Ed.). Oxford: Clarendon +Press. + + +} + +@Book{aristotle:poetics, + author = {Aristotle}, + title = {Poetics}, + date = 1968, + editor = {Lucas, D. W.}, + series = {Clarendon {Aristotle}}, + publisher = {Clarendon Press}, + location = {Oxford}, + keywords = {primary}, + hyphenation = {british}, + shorttitle = {Poetics}, + annotation = {A book entry with an author and an + editor as well as a series field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry with an author and an editor as well as a series + field + author: + - family: Aristotle + collection-title: Clarendon Aristotle + editor: + - family: Lucas + given: D. W. + id: "aristotle:poetics" + issued: 1968 + keyword: primary + language: en-GB + publisher: Clarendon Press + publisher-place: Oxford + title: Poetics + title-short: Poetics + type: book +--- + + +``` diff --git a/test/command/biblatex-aristotle-rhetoric.md b/test/command/biblatex-aristotle-rhetoric.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-aristotle-rhetoric.md @@ -0,0 +1,80 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Aristotle 1877) + +Aristotle. 1877. *The Rhetoric of Aristotle with a Commentary by the +Late Edward Meredith Cope*. Edited by Edward Meredith Cope. 3. Cambridge +University Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Aristotle, 1877) + +Aristotle. (1877). *The rhetoric of Aristotle with a commentary by the +late Edward Meredith Cope*. (E. M. Cope, Ed.) (1-3). Cambridge +University Press. + + +NOTES: + +- biblio2yaml + - commentator has no counterpart in CSL + +} + +@string{ cup = {Cambridge University Press} } + +@Book{aristotle:rhetoric, + author = {Aristotle}, + title = {The Rhetoric of {Aristotle} with a commentary by the late {Edward + Meredith Cope}}, + date = 1877, + editor = {Cope, Edward Meredith}, + commentator = {Cope, Edward Meredith}, + volumes = 3, + publisher = cup, + keywords = {primary}, + hyphenation = {british}, + sorttitle = {Rhetoric of Aristotle}, + indextitle = {Rhetoric of {Aristotle}, The}, + shorttitle = {Rhetoric}, + annotation = {A commented edition. Note the concatenation of the + editor and commentator fields as well as the + volumes, sorttitle, and indextitle + fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A commented edition. Note the concatenation of the editor and + commentator fields as well as the volumes, sorttitle, and indextitle + fields + author: + - family: Aristotle + editor: + - family: Cope + given: Edward Meredith + id: "aristotle:rhetoric" + issued: 1877 + keyword: primary + language: en-GB + number-of-volumes: 3 + publisher: Cambridge University Press + title: The rhetoric of Aristotle with a commentary by the late Edward + Meredith Cope + title-short: Rhetoric + type: book +--- + + +``` diff --git a/test/command/biblatex-article.md b/test/command/biblatex-article.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-article.md @@ -0,0 +1,128 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + - contains: + - an article entry with just the required fields + - an article entry with required and all optional fields + - notes: + - year, month to be ignored if date is present + - journal to be ignored if journaltitle is present + - editortype, editoratype, editorbtype, editorctype, pubstate, +series contain keys which, unless corresponding CSL terms exist, require +locale-specific expansion + - limitations: + - annotator, commentator, eid, eprint, eprintclass, eprinttype, +issuetitle, issuesubtitle, language, origlanguage have no matching +counterparts in CSL + - for editor, editora, editorb, editorc (plus editortype, +editoratype, editorbtype, editorctype) only a subset, editor and director, +has matching counterparts in CSL + - kludges: + - note + addendum -> CSL note + - number + issue -> CSL issue + - handling of titleaddon + - handling of (journal) series + - done properly, this should be mapped to some CSL variable +(version? edition? collection-number?), CSL styles would have to be adapted + - slightly better kludge would map integer to ordinal + "ser." +("3" -> "3rd ser."); localization keys "newseries" -> "new ser.", +"oldseries" -> "old ser."; and print all other values as is -- but still +wouldn't fit all styles or locales. + } + +@article{article-req, + Author = {Author, Ann}, + Date = {2013-07-29}, + Hyphenation = {english}, + Journaltitle = {The Journaltitle}, + Title = {An Article Entry with Just the Required Fields}} + +@article{article-opt, + Addendum = {The Addendum}, + Annotator = {Annotator, A.}, + Author = {Author, Jr., Ann A.}, + Commentator = {Commentator, C.}, + Date = {2008-12-31}, + Doi = {10.1086/520976}, + Editor = {Editor, Edward}, + Editora = {Editor, A.}, + Editorb = {Editor, B.}, + Editorc = {Editor, C.}, + Eid = {eid}, + Eprint = {eprint}, + Eprintclass = {eprintclass}, + Eprinttype = {eprinttype}, + Hyphenation = {english}, + Issn = {issn}, + Issue = {issue}, + Issuesubtitle = {The Issuesubtitle}, + Issuetitle = {The Issuetitle}, + Journalsubtitle = {The Journalsubtitle}, + Journaltitle = {The Journaltitle}, + Journal = {The Journal}, + Language = {language}, + Month = {08}, + Year = {2007}, + Note = {The Note}, + Number = {number}, + Origlanguage = {origlanguage}, + Pages = {pages}, + Pubstate = {inpress}, + Series = {newseries}, + Subtitle = {The Subtitle}, + Title = {An Article Entry with the Required and All Optional Fields}, + Titleaddon = {The Titleaddon}, + Translator = {Translator, Ted}, + Url = {http://foo.bar.baz/}, + Urldate = {2013-07-29}, + Version = {version}, + Volume = {volume}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Author + given: Ann + container-title: The Journaltitle + id: article-req + issued: 2013-07-29 + language: en-US + title: An article entry with just the required fields + type: article-journal +- accessed: 2013-07-29 + author: + - family: Author + given: Ann A. + suffix: Jr. + collection-title: New series + container-title: "The Journaltitle: The Journalsubtitle" + doi: 10.1086/520976 + editor: + - family: Editor + given: Edward + id: article-opt + issn: issn + issue: number, issue + issued: 2008-12-31 + language: en-US + note: The Note. The Addendum + page: pages + status: in press + title: "An article entry with the required and all optional fields: + The subtitle. The titleaddon" + title-short: An article entry with the required and all optional + fields + translator: + - family: Translator + given: Ted + type: article-journal + url: "http://foo.bar.baz/" + version: version + volume: volume +--- + + +``` diff --git a/test/command/biblatex-augustine.md b/test/command/biblatex-augustine.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-augustine.md @@ -0,0 +1,56 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Augustine 1995) + +Augustine, Robert L. 1995. *Heterogeneous Catalysis for the Synthetic +Chemist*. New York: Marcel Dekker. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Augustine, 1995) + +Augustine, R. L. (1995). *Heterogeneous catalysis for the synthetic +chemist*. New York: Marcel Dekker. + + +} + +@Book{augustine, + author = {Augustine, Robert L.}, + title = {Heterogeneous catalysis for the synthetic chemist}, + date = 1995, + publisher = {Marcel Dekker}, + location = {New York}, + hyphenation = {american}, + shorttitle = {Heterogeneous catalysis}, + annotation = {A plain book entry}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A plain book entry + author: + - family: Augustine + given: Robert L. + id: augustine + issued: 1995 + language: en-US + publisher: Marcel Dekker + publisher-place: New York + title: Heterogeneous catalysis for the synthetic chemist + title-short: Heterogeneous catalysis + type: book +--- + + +``` diff --git a/test/command/biblatex-averroes-bland.md b/test/command/biblatex-averroes-bland.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-averroes-bland.md @@ -0,0 +1,85 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Averroes 1982) + +Averroes. 1982. *The Epistle on the Possibility of Conjunction with the +Active Intellect by Ibn Rushd with the Commentary of Moses Narboni*. +Kalman P. Bland. Moreshet: Studies in Jewish History, Literature and +Thought 7. New York: Jewish Theological Seminary of America. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Averroes, 1982) + +Averroes. (1982). *The epistle on the possibility of conjunction with +the active intellect by Ibn Rushd with the commentary of Moses Narboni*. +(K. P. Bland). New York: Jewish Theological Seminary of America. + + +NOTES: + +- citeproc + - term "edited and translated by" missing + +} + +@Book{averroes-bland, + author = {Averroes}, + title = {The Epistle on the Possibility of Conjunction with the Active + Intellect by {Ibn Rushd} with the Commentary of {Moses Narboni}}, + date = 1982, + editor = {Bland, Kalman P.}, + translator = {Bland, Kalman P.}, + series = {Moreshet: {Studies} in {Jewish} History, Literature and Thought}, + number = 7, + publisher = {Jewish Theological Seminary of America}, + location = {New York}, + keywords = {primary}, + hyphenation = {american}, + indextitle = {Epistle on the Possibility of Conjunction, The}, + shorttitle = {Possibility of Conjunction}, + annotation = {A book entry with a series and a + number. Note the concatenation of the editor + and translator fields as well as the + indextitle field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry with a series and a number. Note the + concatenation of the editor and translator fields as well as the + indextitle field + author: + - family: Averroes + collection-number: 7 + collection-title: "Moreshet: Studies in Jewish history, literature and + thought" + editor: + - family: Bland + given: Kalman P. + id: averroes-bland + issued: 1982 + keyword: primary + language: en-US + publisher: Jewish Theological Seminary of America + publisher-place: New York + title: The epistle on the possibility of conjunction with the active + intellect by Ibn Rushd with the commentary of Moses Narboni + title-short: Possibility of conjunction + translator: + - family: Bland + given: Kalman P. + type: book +--- + + +``` diff --git a/test/command/biblatex-averroes-hannes.md b/test/command/biblatex-averroes-hannes.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-averroes-hannes.md @@ -0,0 +1,84 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Averroes 1892) + +Averroes. 1892. *Des Averroës Abhandlung: “Über die Möglichkeit der +Conjunktion” oder “Über den materiellen Intellekt”*. Ludwig Hannes. +Halle an der Saale: C. A. Kaemmerer. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Averroes, 1892) + +Averroes. (1892). *Des Averroës Abhandlung: “Über die Möglichkeit der +Conjunktion” oder “Über den materiellen Intellekt”*. (L. Hannes). Halle +an der Saale: C. A. Kaemmerer. + + +NOTES: + +- citeproc + - term "edited and translated by" missing + +} + +@Book{averroes-hannes, + author = {Averroes}, + title = {Des Averro{\"e}s Abhandlung: \mkbibquote{{\"U}ber die + M{\"o}glichkeit der Conjunktion} oder \mkbibquote{{\"U}ber den + materiellen Intellekt}}, + date = 1892, + editor = {Hannes, Ludwig}, + translator = {Hannes, Ludwig}, + annotator = {Hannes, Ludwig}, + publisher = {C.~A. Kaemmerer}, + location = {Halle an der Saale}, + keywords = {primary}, + hyphenation = {german}, + sorttitle = {Uber die Moglichkeit der Conjunktion}, + indexsorttitle= {Uber die Moglichkeit der Conjunktion}, + indextitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion}, + shorttitle = {{\"U}ber die M{\"o}glichkeit der Conjunktion}, + annotation = {An annotated edition. Note the concatenation of the + editor, translator, and annotator + fields. Also note the shorttitle, + indextitle, sorttitle, and + indexsorttitle fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An annotated edition. Note the concatenation of the editor, + translator, and annotator fields. Also note the shorttitle, + indextitle, sorttitle, and indexsorttitle fields + author: + - family: Averroes + editor: + - family: Hannes + given: Ludwig + id: averroes-hannes + issued: 1892 + keyword: primary + language: de-DE + publisher: C. A. Kaemmerer + publisher-place: Halle an der Saale + title: "Des Averroës Abhandlung: \"Über die Möglichkeit der + Conjunktion\" oder \"Über den materiellen Intellekt\"" + title-short: Über die Möglichkeit der Conjunktion + translator: + - family: Hannes + given: Ludwig + type: book +--- + + +``` diff --git a/test/command/biblatex-averroes-hercz.md b/test/command/biblatex-averroes-hercz.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-averroes-hercz.md @@ -0,0 +1,85 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Averroes 1869) + +Averroes. 1869. *Drei Abhandlungen über die Conjunction des separaten +Intellects mit dem Menschen: Von Averroes (Vater und Sohn), aus dem +Arabischen übersetzt von Samuel Ibn Tibbon*. J. Hercz. Berlin: +S. Hermann. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Averroes, 1869) + +Averroes. (1869). *Drei Abhandlungen über die Conjunction des separaten +Intellects mit dem Menschen: Von Averroes (Vater und Sohn), aus dem +Arabischen übersetzt von Samuel Ibn Tibbon*. (J. Hercz). Berlin: +S. Hermann. + + +NOTES: + +- citeproc + - term "edited and translated by" missing + +} + +@Book{averroes-hercz, + author = {Averroes}, + title = {Drei Abhandlungen {\"u}ber die Conjunction des separaten + Intellects mit dem Menschen}, + date = 1869, + editor = {Hercz, J.}, + translator = {Hercz, J.}, + publisher = {S.~Hermann}, + location = {Berlin}, + keywords = {primary}, + hyphenation = {german}, + indexsorttitle= {Drei Abhandlungen uber die Conjunction}, + indextitle = {Drei Abhandlungen {\"u}ber die Conjunction}, + subtitle = {Von Averroes (Vater und Sohn), aus dem Arabischen + {\"u}bersetzt von Samuel Ibn Tibbon}, + shorttitle = {Drei Abhandlungen}, + annotation = {A book entry. Note the concatenation of the + editor and translator fields as well as the + indextitle and indexsorttitle fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry. Note the concatenation of the editor and + translator fields as well as the indextitle and indexsorttitle + fields + author: + - family: Averroes + editor: + - family: Hercz + given: J. + id: averroes-hercz + issued: 1869 + keyword: primary + language: de-DE + publisher: S. Hermann + publisher-place: Berlin + title: "Drei Abhandlungen über die Conjunction des separaten + Intellects mit dem Menschen: Von Averroes (Vater und Sohn), aus dem + Arabischen übersetzt von Samuel Ibn Tibbon" + title-short: Drei Abhandlungen + translator: + - family: Hercz + given: J. + type: book +--- + + +``` diff --git a/test/command/biblatex-baez-article.md b/test/command/biblatex-baez-article.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-baez-article.md @@ -0,0 +1,76 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Baez and Lauda 2004) + +Baez, John C., and Aaron D. Lauda. 2004. “Higher-dimensional Algebra V: +2-groups” (version 3). *Theory and Applications of Categories* 12: +423–491. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Baez & Lauda, 2004) + +Baez, J. C., & Lauda, A. D. (2004). Higher-dimensional algebra V: +2-groups. *Theory and Applications of Categories*, *12*, 423–491. + + +NOTES: + +- biblio2yaml + - eprint: see baez-online + +} + +@Article{baez-article, + author = {Baez, John C. and Lauda, Aaron D.}, + title = {Higher-Dimensional Algebra {V}: 2-Groups}, + journaltitle = {Theory and Applications of Categories}, + date = 2004, + volume = 12, + pages = {423-491}, + version = 3, + eprint = {math/0307200v3}, + eprinttype = {arxiv}, + hyphenation = {american}, + annotation = {An article with eprint and + eprinttype fields. Note that the arXiv reference is + transformed into a clickable link if hyperref support + has been enabled. Compare baez\slash online, which + is the same item given as an online entry}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An article with eprint and eprinttype fields. Note that the + arXiv reference is transformed into a clickable link if hyperref + support has been enabled. Compare baez/online, which is the same + item given as an online entry + author: + - family: Baez + given: John C. + - family: Lauda + given: Aaron D. + container-title: Theory and Applications of Categories + id: baez-article + issued: 2004 + language: en-US + page: 423-491 + title: "Higher-dimensional algebra V: 2-groups" + title-short: Higher-dimensional algebra V + type: article-journal + url: "https://arxiv.org/abs/math/0307200v3" + version: 3 + volume: 12 +--- + + +``` diff --git a/test/command/biblatex-baez-online.md b/test/command/biblatex-baez-online.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-baez-online.md @@ -0,0 +1,69 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Baez and Lauda 2004) + +Baez, John C., and Aaron D. Lauda. 2004. “Higher-dimensional Algebra V: +2-groups” (version 3). October 27. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Baez & Lauda, 2004) + +Baez, J. C., & Lauda, A. D. (2004, October 27). Higher-dimensional +algebra V: 2-groups. + + +NOTES: + +- biblio2yaml: + - eprinttype = {arxiv}, eprint = {math/0307200v3}, + should be converted to a url: http://arxiv.org/abs/math/0307200v3 + (prefix http://arxiv.org/abs/ seems to work for all arxiv material) + +} + +@Online{baez-online, + author = {Baez, John C. and Lauda, Aaron D.}, + title = {Higher-Dimensional Algebra {V}: 2-Groups}, + date = {2004-10-27}, + version = 3, + hyphenation = {american}, + eprinttype = {arxiv}, + eprint = {math/0307200v3}, + annotation = {An online reference from arXiv. Note the + eprint and eprinttype fields. Compare + baez\slash article which is the same item given as an + article entry with eprint information}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An online reference from arXiv. Note the eprint and eprinttype + fields. Compare baez/article which is the same item given as an + article entry with eprint information + author: + - family: Baez + given: John C. + - family: Lauda + given: Aaron D. + id: baez-online + issued: 2004-10-27 + language: en-US + title: "Higher-dimensional algebra V: 2-groups" + title-short: Higher-dimensional algebra V + type: webpage + url: "https://arxiv.org/abs/math/0307200v3" + version: 3 +--- + + +``` diff --git a/test/command/biblatex-basic.md b/test/command/biblatex-basic.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-basic.md @@ -0,0 +1,71 @@ +``` +% pandoc -f biblatex -t markdown -s +@Book{item1, +author="John Doe", +title="First Book", +year="2005", +address="Cambridge", +publisher="Cambridge University Press" +} + +@Article{item2, +author="John Doe", +title="Article", +year="2006", +journal="Journal of Generic Studies", +volume="6", +pages="33-34" +} + +@InCollection{пункт3, +author="John Doe and Jenny Roe", +title="Why Water Is Wet", +booktitle="Third Book", +editor="Sam Smith", +publisher="Oxford University Press", +address="Oxford", +year="2007" +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Doe + given: John + id: item1 + issued: 2005 + publisher: Cambridge University Press + publisher-place: Cambridge + title: First book + type: book +- author: + - family: Doe + given: John + container-title: Journal of Generic Studies + id: item2 + issued: 2006 + page: 33-34 + title: Article + type: article-journal + volume: 6 +- author: + - family: Doe + given: John + - family: Roe + given: Jenny + container-title: Third book + editor: + - family: Smith + given: Sam + id: пункт3 + issued: 2007 + publisher: Oxford University Press + publisher-place: Oxford + title: Why water is wet + type: chapter +--- + + +``` diff --git a/test/command/biblatex-bertram.md b/test/command/biblatex-bertram.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-bertram.md @@ -0,0 +1,66 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Bertram and Wentworth 1996) + +Bertram, Aaron, and Richard Wentworth. 1996. “Gromov Invariants for +Holomorphic Maps on Riemann Surfaces.” *J. Amer. Math. Soc.* 9 (2): +529–571. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Bertram & Wentworth, 1996) + +Bertram, A., & Wentworth, R. (1996). Gromov invariants for holomorphic +maps on Riemann surfaces. *J. Amer. Math. Soc.*, *9*(2), 529–571. + + +} + +@string{ jams = {J.~Amer. Math. Soc.} } + +@Article{bertram, + author = {Bertram, Aaron and Wentworth, Richard}, + title = {Gromov invariants for holomorphic maps on {Riemann} surfaces}, + journaltitle = jams, + date = 1996, + volume = 9, + number = 2, + pages = {529-571}, + hyphenation = {american}, + shorttitle = {Gromov invariants}, + annotation = {An article entry with a volume and a + number field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An article entry with a volume and a number field + author: + - family: Bertram + given: Aaron + - family: Wentworth + given: Richard + container-title: J. Amer. Math. Soc. + id: bertram + issue: 2 + issued: 1996 + language: en-US + page: 529-571 + title: Gromov invariants for holomorphic maps on Riemann surfaces + title-short: Gromov invariants + type: article-journal + volume: 9 +--- + + +``` diff --git a/test/command/biblatex-bibstring-resolution.md b/test/command/biblatex-bibstring-resolution.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-bibstring-resolution.md @@ -0,0 +1,20 @@ +``` +% pandoc -f biblatex -t markdown -s +@book{item1, + Title = {The Title: \bibstring{newseries}}, + Hyphenation = {english} +} + +^D +--- +nocite: "[@*]" +references: +- id: item1 + language: en-US + title: "The title: New series" + title-short: The title + type: book +--- + + +``` diff --git a/test/command/biblatex-book-averroes.md b/test/command/biblatex-book-averroes.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-book-averroes.md @@ -0,0 +1,129 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ +adapted from +http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib} + +@book{averroes/bland, + Annotation = {A book entry with a series and a number. Note the concatenation of the editor and translator fields as well as the indextitle field}, + Author = {Averroes}, + Date = 1982, + Editor = {Bland, Kalman P.}, + Hyphenation = {american}, + Indextitle = {Epistle on the Possibility of Conjunction, The}, + Keywords = {primary}, + Location = {New York}, + Number = 7, + Publisher = {Jewish Theological Seminary of America}, + Series = {{Moreshet: Studies in Jewish History, Literature and Thought}}, + Shorttitle = {Possibility of Conjunction}, + Title = {The Epistle on the Possibility of Conjunction with the Active Intellect by {Ibn Rushd} with the Commentary of {Moses Narboni}}, + Translator = {Bland, Kalman P.}} + +@book{averroes/hannes, + Annotation = {An annotated edition. Note the concatenation of the editor, translator, and annotator fields. Also note the shorttitle, indextitle, sorttitle, and indexsorttitle fields}, + Annotator = {Hannes, Ludwig}, + Author = {Averroes}, + Date = 1892, + Editor = {Hannes, Ludwig}, + Hyphenation = {german}, + Indexsorttitle = {Uber die Moglichkeit der Conjunktion}, + Indextitle = {Über die Möglichkeit der Conjunktion}, + Keywords = {primary}, + Location = {Halle an der Saale}, + Publisher = {C.~A. Kaemmerer}, + Shorttitle = {Über die Möglichkeit der Conjunktion}, + Sorttitle = {Uber die Moglichkeit der Conjunktion}, + Title = {Des Averroës Abhandlung: \mkbibquote{Über die Möglichkeit der Conjunktion} oder \mkbibquote{Über den materiellen Intellekt}}, + Translator = {Hannes, Ludwig}} + +@book{averroes/hercz, + Annotation = {A book entry. Note the concatenation of the editor and translator fields as well as the indextitle and indexsorttitle fields}, + Author = {Averroes}, + Date = 1869, + Editor = {Hercz, J.}, + Hyphenation = {german}, + Indexsorttitle = {Drei Abhandlungen uber die Conjunction}, + Indextitle = {Drei Abhandlungen über die Conjunction}, + Keywords = {primary}, + Location = {Berlin}, + Publisher = {S.~Hermann}, + Shorttitle = {Drei Abhandlungen}, + Subtitle = {Von Averroes (Vater und Sohn), aus dem Arabischen übersetzt von Samuel Ibn Tibbon}, + Title = {Drei Abhandlungen über die Conjunction des separaten Intellects mit dem Menschen}, + Translator = {Hercz, J.}} +^D +--- +nocite: "[@*]" +references: +- annote: A book entry with a series and a number. Note the + concatenation of the editor and translator fields as well as the + indextitle field + author: + - family: Averroes + collection-number: 7 + collection-title: "[Moreshet: Studies in Jewish History, Literature + and Thought]{.nocase}" + editor: + - family: Bland + given: Kalman P. + id: averroes/bland + issued: 1982 + keyword: primary + language: en-US + publisher: Jewish Theological Seminary of America + publisher-place: New York + title: The epistle on the possibility of conjunction with the active + intellect by Ibn Rushd with the commentary of Moses Narboni + title-short: Possibility of conjunction + translator: + - family: Bland + given: Kalman P. + type: book +- annote: An annotated edition. Note the concatenation of the editor, + translator, and annotator fields. Also note the shorttitle, + indextitle, sorttitle, and indexsorttitle fields + author: + - family: Averroes + editor: + - family: Hannes + given: Ludwig + id: averroes/hannes + issued: 1892 + keyword: primary + language: de-DE + publisher: C. A. Kaemmerer + publisher-place: Halle an der Saale + title: "Des Averroës Abhandlung: \"Über die Möglichkeit der + Conjunktion\" oder \"Über den materiellen Intellekt\"" + title-short: Über die Möglichkeit der Conjunktion + translator: + - family: Hannes + given: Ludwig + type: book +- annote: A book entry. Note the concatenation of the editor and + translator fields as well as the indextitle and indexsorttitle + fields + author: + - family: Averroes + editor: + - family: Hercz + given: J. + id: averroes/hercz + issued: 1869 + keyword: primary + language: de-DE + publisher: S. Hermann + publisher-place: Berlin + title: "Drei Abhandlungen über die Conjunction des separaten + Intellects mit dem Menschen: Von Averroes (Vater und Sohn), aus dem + Arabischen übersetzt von Samuel Ibn Tibbon" + title-short: Drei Abhandlungen + translator: + - family: Hercz + given: J. + type: book +--- + + +``` diff --git a/test/command/biblatex-book-coleridge.md b/test/command/biblatex-book-coleridge.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-book-coleridge.md @@ -0,0 +1,59 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{adapted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib + +TODO (as a stopgap): +Combine biblatex “volume = 7” and “part = 2” to CSL “volume: 7.2” + +} + +@book{coleridge, + Annotation = {One (partial) volume of a multivolume book. This is a book entry with a volume and a part field which explicitly refers to the second (physical) part of the seventh (logical) volume. Also note the series and number fields}, + Author = {Coleridge, Samuel Taylor}, + Date = 1983, + Editor = {Coburn, Kathleen and Engell, James and Bate, W. Jackson}, + Hyphenation = {british}, + Indextitle = {Biographia literaria}, + Location = {London}, + Maintitle = {The collected works of {Samuel Taylor Coleridge}}, + Number = 75, + Part = 2, + Publisher = {Routledge {and} Kegan Paul}, + Series = {Bollingen Series}, + Shorttitle = {Biographia literaria}, + Title = {Biographia literaria, or {Biographical} sketches of my literary life and opinions}, + Volume = 7} +^D +--- +nocite: "[@*]" +references: +- annote: One (partial) volume of a multivolume book. This is a book + entry with a volume and a part field which explicitly refers to the + second (physical) part of the seventh (logical) volume. Also note + the series and number fields + author: + - family: Coleridge + given: Samuel Taylor + collection-number: 75 + collection-title: Bollingen series + editor: + - family: Coburn + given: Kathleen + - family: Engell + given: James + - family: Bate + given: W. Jackson + id: coleridge + issued: 1983 + language: en-GB + publisher: Routledge and Kegan Paul + publisher-place: London + title: The collected works of Samuel Taylor Coleridge + type: book + volume: 7.2 + volume-title: Biographia literaria, or Biographical sketches of my + literary life and opinions +--- + + +``` diff --git a/test/command/biblatex-book-title-maintitle-series.md b/test/command/biblatex-book-title-maintitle-series.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-book-title-maintitle-series.md @@ -0,0 +1,39 @@ +``` +% pandoc -f biblatex -t markdown -s +@book{item1, + Author = {Author, Al}, + Date = {2013}, + Hyphenation = {french}, + Location = {Location}, + Mainsubtitle = {Mainsubtitle}, + Maintitle = {Maintitle}, + Maintitleaddon = {Maintitleaddon}, + Number = {3}, + Publisher = {Publisher}, + Series = {Series}, + Subtitle = {Subtitle}, + Title = {Title of the Book}, + Titleaddon = {Titleaddon}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Author + given: Al + collection-number: 3 + collection-title: Series + id: item1 + issued: 2013 + language: fr-FR + publisher: Publisher + publisher-place: Location + title: "Maintitle: Mainsubtitle. Maintitleaddon" + type: book + volume-title: "Title of the Book: Subtitle. Titleaddon" +--- + + +``` diff --git a/test/command/biblatex-book-vazques-de-parga.md b/test/command/biblatex-book-vazques-de-parga.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-book-vazques-de-parga.md @@ -0,0 +1,48 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{excerpted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib + +Note handling of Author = {Vázques{ de }Parga, Luis} + +} + +@book{vazques-de-parga, + Annotation = {A multivolume book cited as a whole. This is a book entry with volumes, note, sorttitle, and indextitle fields}, + Author = {Vázques{ de }Parga, Luis and Lacarra, José María and Uría Ríu, Juan}, + Date = 1993, + Hyphenation = {spanish}, + Indextitle = {Peregrinaciones a Santiago de Compostela, Las}, + Location = {Pamplona}, + Note = {Ed. facs. de la realizada en 1948--49}, + Publisher = {Iberdrola}, + Shorttitle = {Peregrinaciones}, + Sorttitle = {Peregrinaciones a Santiago de Compostela}, + Title = {Las Peregrinaciones a Santiago de Compostela}, + Volumes = 3} +^D +--- +nocite: "[@*]" +references: +- annote: A multivolume book cited as a whole. This is a book entry with + volumes, note, sorttitle, and indextitle fields + author: + - family: Vázques de Parga + given: Luis + - family: Lacarra + given: José María + - family: Uría Ríu + given: Juan + id: vazques-de-parga + issued: 1993 + language: es-ES + note: Ed. facs. de la realizada en 1948--49 + number-of-volumes: 3 + publisher: Iberdrola + publisher-place: Pamplona + title: Las Peregrinaciones a Santiago de Compostela + title-short: Peregrinaciones + type: book +--- + + +``` diff --git a/test/command/biblatex-brandt.md b/test/command/biblatex-brandt.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-brandt.md @@ -0,0 +1,88 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Brandt and Hoffmann 1987) + +Brandt, Ahasver von, and Erich Hoffmann. 1987. “Die nordischen Länder +von der Mitte des 11. Jahrhunderts bis 1448.” In *Europa im Hoch- und +Spätmittelalter*, edited by Ferdinand Seibt, 884–917. Handbuch der +europäischen Geschichte 2. Stuttgart: Klett-Cotta. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Brandt & Hoffmann, 1987) + +Brandt, A. von, & Hoffmann, E. (1987). Die nordischen Länder von der +Mitte des 11. Jahrhunderts bis 1448. In F. Seibt (ed.), *Europa im Hoch- +und Spätmittelalter* (pp. 884–917). Stuttgart: Klett-Cotta. + + +} + +@InCollection{brandt, + author = {von Brandt, Ahasver and Erich Hoffmann}, + editor = {Ferdinand Seibt}, + title = {Die nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts + bis 1448}, + date = 1987, + booktitle = {Europa im Hoch- und Sp{\"a}tmittelalter}, + series = {Handbuch der europ{\"a}ischen Geschichte}, + number = 2, + publisher = {Klett-Cotta}, + location = {Stuttgart}, + pages = {884-917}, + options = {useprefix=false}, + hyphenation = {german}, + indexsorttitle= {Nordischen Lander von der Mitte des 11. Jahrhunderts bis + 1448}, + indextitle = {Nordischen L{\"a}nder von der Mitte des 11.~Jahrhunderts bis + 1448, Die}, + shorttitle = {Die nordischen L{\"a}nder}, + annotation = {An incollection entry with a series and a + number. Note the format of the printed name and + compare the useprefix option in the options + field as well as vangennep. Also note the + indextitle, and indexsorttitle fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An incollection entry with a series and a number. Note the + format of the printed name and compare the useprefix option in the + options field as well as vangennep. Also note the indextitle, and + indexsorttitle fields + author: + - dropping-particle: von + family: Brandt + given: Ahasver + - family: Hoffmann + given: Erich + collection-number: 2 + collection-title: Handbuch der europäischen Geschichte + container-title: Europa im Hoch- und Spätmittelalter + editor: + - family: Seibt + given: Ferdinand + id: brandt + issued: 1987 + language: de-DE + page: 884-917 + publisher: Klett-Cotta + publisher-place: Stuttgart + title: Die nordischen Länder von der Mitte des 11. Jahrhunderts bis + 1448 + title-short: Die nordischen Länder + type: chapter +--- + + +``` diff --git a/test/command/biblatex-britannica.md b/test/command/biblatex-britannica.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-britannica.md @@ -0,0 +1,85 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Preece 2003) + +Preece, Warren E., ed. 2003. *The New EncyclopæDia Britannica*. 15th ed. +32. Chicago, Ill.: Encyclopædia Britannica. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Preece, 2003) + +Preece, W. E. (Ed.). (2003). *The new encyclopædia Britannica* (15th +ed., 1-32). Chicago, Ill.: Encyclopædia Britannica. + + +NOTES: + +- biblio2yaml + - spurious in Encyclopædia + - options = {useeditor=false} has no equivalent in CSL, so citing and alphabetizing by title even though there is an editor does not seem to be possible + +- citeproc + - incorrect camel case: "EncyclopæDia" + - term "vols." missing + +} + +@Collection{britannica, + editor = {Preece, Warren E.}, + title = {The New Encyclop{\ae}dia {Britannica}}, + date = 2003, + edition = 15, + volumes = 32, + publisher = {Encyclop{\ae}dia Britannica}, + location = {Chicago, Ill.}, + options = {useeditor=false}, + label = {EB}, + hyphenation = {british}, + sorttitle = {Encyclop{\ae}dia Britannica}, + indextitle = {Encyclop{\ae}dia Britannica, The New}, + shorttitle = {Encyclop{\ae}dia {Britannica}}, + annotation = {This is a collection entry for an encyclopedia. Note + the useeditor option in the options field as + well as the sorttitle field. We want this entry to be + cited and alphabetized by title even though there is an + editor. In addition to that, we want the title to be + alphabetized under \enquote*{E} rather than \enquote*{T}. Also + note the label field which is provided for + author-year citation styles}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a collection entry for an encyclopedia. Note the + useeditor option in the options field as well as the sorttitle + field. We want this entry to be cited and alphabetized by title even + though there is an editor. In addition to that, we want the title to + be alphabetized under 'E' rather than 'T'. Also note the label field + which is provided for author-year citation styles + edition: 15 + editor: + - family: Preece + given: Warren E. + id: britannica + issued: 2003 + language: en-GB + number-of-volumes: 32 + publisher: Encyclopædia Britannica + publisher-place: Chicago, Ill. + title: The new encyclopædia Britannica + title-short: Encyclopædia Britannica + type: book +--- + + +``` diff --git a/test/command/biblatex-chiu.md b/test/command/biblatex-chiu.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-chiu.md @@ -0,0 +1,77 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Chiu and Chow 1978) + +Chiu, Willy W., and We Min Chow. 1978. “A Hybrid Hierarchical Model of a +Multiple Virtual Storage (MVS) Operating System.” Research report +RC-6947. IBM. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Chiu & Chow, 1978) + +Chiu, W. W., & Chow, W. M. (1978). *A hybrid hierarchical model of a +multiple virtual storage (MVS) operating system* (research report No. +RC-6947). IBM. + + +NOTES: + +- biblio2yaml + - "MVS", when not wrapped in {}, gives "mVS", which is probably never intended, or useful (latex converts the whole word to lowercase if unprotected ("MVS" -> "mvs")) + +} + +@Report{chiu, + author = {Chiu, Willy W. and Chow, We Min}, + title = {A Hybrid Hierarchical Model of a Multiple Virtual Storage + ({MVS}) Operating System}, + type = {resreport}, + institution = {IBM}, + date = 1978, + number = {RC-6947}, + hyphenation = {american}, + sorttitle = {Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS) + Operating System}, + indextitle = {Hybrid Hierarchical Model, A}, + annotation = {This is a report entry for a research report. Note + the format of the type field in the database file + which uses a localization key. The number of the report is + given in the number field. Also note the + sorttitle and indextitle fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a report entry for a research report. Note the format + of the type field in the database file which uses a localization + key. The number of the report is given in the number field. Also + note the sorttitle and indextitle fields + author: + - family: Chiu + given: Willy W. + - family: Chow + given: We Min + genre: research report + id: chiu + issued: 1978 + language: en-US + number: RC-6947 + publisher: IBM + title: A hybrid hierarchical model of a multiple virtual storage (MVS) + operating system + type: report +--- + + +``` diff --git a/test/command/biblatex-cicero.md b/test/command/biblatex-cicero.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-cicero.md @@ -0,0 +1,82 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Cicero 1995) + +Cicero, Marcus Tullius. 1995. *De natura deorum. Über das Wesen der +Götter*. Ursula Blank-Sangmeister. Stuttgart: Reclam. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Cicero, 1995) + +Cicero, M. T. (1995). *De natura deorum. Über das Wesen der Götter*. (U. +Blank-Sangmeister). Stuttgart: Reclam. + + +NOTES: + +- biblio2yaml + - afterword, language: no CSL variables available + +- citeproc: + - term such as "edited and translated by" should appear + +} + +@Book{cicero, + author = {Cicero, Marcus Tullius}, + title = {De natura deorum. {\"U}ber das Wesen der G{\"o}tter}, + date = 1995, + editor = {Blank-Sangmeister, Ursula}, + translator = {Blank-Sangmeister, Ursula}, + afterword = {Thraede, Klaus}, + language = {langlatin and langgerman}, + publisher = {Reclam}, + location = {Stuttgart}, + hyphenation = {german}, + indextitle = {De natura deorum}, + shorttitle = {De natura deorum}, + annotation = {A bilingual edition of Cicero's \emph{De natura deorum}, with + a German translation. Note the format of the language + field in the database file, the concatenation of the + editor and translator fields, and the + afterword field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A bilingual edition of Cicero's *De natura deorum*, with a + German translation. Note the format of the language field in the + database file, the concatenation of the editor and translator + fields, and the afterword field + author: + - family: Cicero + given: Marcus Tullius + editor: + - family: Blank-Sangmeister + given: Ursula + id: cicero + issued: 1995 + language: de-DE + publisher: Reclam + publisher-place: Stuttgart + title: De natura deorum. Über das Wesen der Götter + title-short: De natura deorum + translator: + - family: Blank-Sangmeister + given: Ursula + type: book +--- + + +``` diff --git a/test/command/biblatex-cms.md b/test/command/biblatex-cms.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-cms.md @@ -0,0 +1,81 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(*The Chicago Manual of Style: The Essential Guide for Writers, Editors, +and Publishers* 2003) + +*The Chicago Manual of Style: The Essential Guide for Writers, Editors, +and Publishers*. 2003. 15th ed. Chicago, Ill.: University of Chicago +Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(*Chicago manual of style*, 2003) + +*The Chicago manual of style: The essential guide for writers, editors, +and publishers*. (2003) (15th ed.). Chicago, Ill.: University of Chicago +Press. + + +NOTES: + +- chicago-author-date.csl should have as in-text citation: + (*Chicago Manual of Style* 2003) + Same behaviour in Zotero; most probably a style file issue. + +} + +@Manual{cms, + title = {The {Chicago} Manual of Style}, + date = 2003, + subtitle = {The Essential Guide for Writers, Editors, and Publishers}, + edition = 15, + publisher = {University of Chicago Press}, + location = {Chicago, Ill.}, + isbn = {0-226-10403-6}, + label = {CMS}, + hyphenation = {american}, + sorttitle = {Chicago Manual of Style}, + indextitle = {Chicago Manual of Style, The}, + shorttitle = {Chicago Manual of Style}, + annotation = {This is a manual entry without an author or + editor. Note the label field in the database + file which is provided for author-year citation styles. Also + note the sorttitle and indextitle fields. By + default, all entries without an author or + editor are alphabetized by title but we want + this entry to be alphabetized under \enquote*{C} rather than + \enquote*{T}. There's also an isbn field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a manual entry without an author or editor. Note the + label field in the database file which is provided for author-year + citation styles. Also note the sorttitle and indextitle fields. By + default, all entries without an author or editor are alphabetized by + title but we want this entry to be alphabetized under 'C' rather + than 'T'. There's also an isbn field + edition: 15 + id: cms + isbn: 0-226-10403-6 + issued: 2003 + language: en-US + publisher: University of Chicago Press + publisher-place: Chicago, Ill. + title: "The Chicago manual of style: The essential guide for writers, + editors, and publishers" + title-short: Chicago manual of style + type: book +--- + + +``` diff --git a/test/command/biblatex-coleridge.md b/test/command/biblatex-coleridge.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-coleridge.md @@ -0,0 +1,86 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2015-03-08: + +(Coleridge 1983) + +Coleridge, Samuel Taylor. 1983. *The Collected Works of Samuel Taylor +Coleridge*. Edited by Kathleen Coburn, James Engell, and W. Jackson +Bate. Vol. 7.2. Bollingen Series 75. London: Routledge and Kegan Paul. + +Formatted with pandoc and apa.csl, 2015-03-08: + +(Coleridge, 1983) + +Coleridge, S. T. (1983). *The collected works of Samuel Taylor +Coleridge*. (K. Coburn, J. Engell, & W. J. Bate, Eds.) (Vol. 7.2). +London: Routledge and Kegan Paul. + +NOTES: + +- volume-title currently not implemented by chicago-author-date.csl and apa.csl. + +} + +@Book{coleridge, + author = {Coleridge, Samuel Taylor}, + title = {Biographia literaria, or {Biographical} sketches of my literary + life and opinions}, + date = 1983, + editor = {Coburn, Kathleen and Engell, James and Bate, W. Jackson}, + maintitle = {The collected works of {Samuel Taylor Coleridge}}, + volume = 7, + part = 2, + series = {Bollingen Series}, + number = 75, + publisher = {Routledge {and} Kegan Paul}, + location = {London}, + hyphenation = {british}, + indextitle = {Biographia literaria}, + shorttitle = {Biographia literaria}, + annotation = {One (partial) volume of a multivolume book. This is a + book entry with a volume and a part + field which explicitly refers to the second (physical) part of + the seventh (logical) volume. Also note the series + and number fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: One (partial) volume of a multivolume book. This is a book + entry with a volume and a part field which explicitly refers to the + second (physical) part of the seventh (logical) volume. Also note + the series and number fields + author: + - family: Coleridge + given: Samuel Taylor + collection-number: 75 + collection-title: Bollingen series + editor: + - family: Coburn + given: Kathleen + - family: Engell + given: James + - family: Bate + given: W. Jackson + id: coleridge + issued: 1983 + language: en-GB + publisher: Routledge and Kegan Paul + publisher-place: London + title: The collected works of Samuel Taylor Coleridge + type: book + volume: 7.2 + volume-title: Biographia literaria, or Biographical sketches of my + literary life and opinions +--- + + +``` diff --git a/test/command/biblatex-companion.md b/test/command/biblatex-companion.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-companion.md @@ -0,0 +1,70 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Goossens, Mittelbach, and Samarin 1994) + +Goossens, Michel, Frank Mittelbach, and Alexander Samarin. 1994. *The +LaTeX Companion*. 1st ed. Reading, Mass.: Addison-Wesley. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Goossens, Mittelbach, & Samarin, 1994) + +Goossens, M., Mittelbach, F., & Samarin, A. (1994). *The LaTeX +companion* (1st ed.). Reading, Mass.: Addison-Wesley. + + +} + +@Book{companion, + author = {Goossens, Michel and Mittelbach, Frank and Samarin, Alexander}, + title = {The {LaTeX} Companion}, + date = 1994, + edition = 1, + publisher = {Addison-Wesley}, + location = {Reading, Mass.}, + pagetotal = 528, + hyphenation = {american}, + sorttitle = {LaTeX Companion}, + indextitle = {LaTeX Companion, The}, + shorttitle = {LaTeX Companion}, + annotation = {A book with three authors. Note the formatting of the author + list. By default, only the first name is reversed in the + bibliography}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book with three authors. Note the formatting of the author + list. By default, only the first name is reversed in the + bibliography + author: + - family: Goossens + given: Michel + - family: Mittelbach + given: Frank + - family: Samarin + given: Alexander + edition: 1 + id: companion + issued: 1994 + language: en-US + number-of-pages: 528 + publisher: Addison-Wesley + publisher-place: Reading, Mass. + title: The LaTeX companion + title-short: LaTeX companion + type: book +--- + + +``` diff --git a/test/command/biblatex-cotton.md b/test/command/biblatex-cotton.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-cotton.md @@ -0,0 +1,69 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Cotton et al. 1999) + +Cotton, Frank Albert, Geoffrey Wilkinson, Carlos A. Murillio, and +Manfred Bochmann. 1999. *Advanced Inorganic Chemistry*. 6th ed. +Chichester: Wiley. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Cotton, Wilkinson, Murillio, & Bochmann, 1999) + +Cotton, F. A., Wilkinson, G., Murillio, C. A., & Bochmann, M. (1999). +*Advanced inorganic chemistry* (6th ed.). Chichester: Wiley. + + +} + +@Book{cotton, + author = {Cotton, Frank Albert and Wilkinson, Geoffrey and Murillio, + Carlos A. and Bochmann, Manfred}, + title = {Advanced inorganic chemistry}, + date = 1999, + edition = 6, + publisher = {Wiley}, + location = {Chichester}, + hyphenation = {british}, + annotation = {A book entry with \arabic{author} authors and an + edition field. By default, long author and + editor lists are automatically truncated. This is + configurable}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry with `\arabic{author}`{=latex} authors and an + edition field. By default, long author and editor lists are + automatically truncated. This is configurable + author: + - family: Cotton + given: Frank Albert + - family: Wilkinson + given: Geoffrey + - family: Murillio + given: Carlos A. + - family: Bochmann + given: Manfred + edition: 6 + id: cotton + issued: 1999 + language: en-GB + publisher: Wiley + publisher-place: Chichester + title: Advanced inorganic chemistry + type: book +--- + + +``` diff --git a/test/command/biblatex-crossref-inbook-mvbook.md b/test/command/biblatex-crossref-inbook-mvbook.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-crossref-inbook-mvbook.md @@ -0,0 +1,58 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +crossref, directly from inbook to mvbook + +} + +@inbook{inbook-1, + Crossref = {mvbook-1}, + Title = {Macbeth [title field of inbook-1]}, + Date = {1975}, + Volume = {3}, + Chapter = {7}, + Pages = {100-200}, +} + +@mvbook{mvbook-1, + Author = {Shakespeare}, + Date = {1970/1980}, + Title = {Collected Works [title field of mvbook-1]}, + Location = {Location}, + Publisher = {Publisher}, + Volumes = {4}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Shakespeare + chapter-number: 7 + container-author: + - family: Shakespeare + container-title: Collected works \[title field of mvbook-1\] + id: inbook-1 + issued: 1975 + number-of-volumes: 4 + page: 100-200 + publisher: Publisher + publisher-place: Location + title: Macbeth \[title field of inbook-1\] + type: chapter + volume: 3 +- author: + - family: Shakespeare + id: mvbook-1 + issued: 1970/1980 + number-of-volumes: 4 + publisher: Publisher + publisher-place: Location + title: Collected works \[title field of mvbook-1\] + type: book +--- + + +``` diff --git a/test/command/biblatex-crossref-nested.md b/test/command/biblatex-crossref-nested.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-crossref-nested.md @@ -0,0 +1,100 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Nested cross-references (see biber manual v 1.7) + +} + +@bookinbook{bookinbook-1, + Crossref = {book-1}, + Title = {Macbeth [title field of bookinbook-1]}, + Chapter = {7}, + Pages = {100-200}, +} + +@inbook{inbook-1, + Crossref = {book-1}, + Title = {Macbeth [title field of inbook-1]}, + Chapter = {7}, + Pages = {100-200}, +} + +@book{book-1, + Crossref = {mvbook-1}, + Date = {1975}, + Title = {Tragedies [title field of book-1]}, + Volume = {3} +} + +@mvbook{mvbook-1, + Author = {Shakespeare}, + Date = {1970/1980}, + Title = {Collected Works [title field of mvbook-1]}, + Location = {Location}, + Publisher = {Publisher}, + Volumes = {4} +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Shakespeare + chapter-number: 7 + container-author: + - family: Shakespeare + container-title: Collected works \[title field of mvbook-1\] + id: bookinbook-1 + issued: 1975 + number-of-volumes: 4 + page: 100-200 + publisher: Publisher + publisher-place: Location + title: Macbeth \[title field of bookinbook-1\] + type: book + volume: 3 + volume-title: Tragedies \[title field of book-1\] +- author: + - family: Shakespeare + chapter-number: 7 + container-author: + - family: Shakespeare + container-title: Collected works \[title field of mvbook-1\] + id: inbook-1 + issued: 1975 + number-of-volumes: 4 + page: 100-200 + publisher: Publisher + publisher-place: Location + title: Macbeth \[title field of inbook-1\] + type: chapter + volume: 3 + volume-title: Tragedies \[title field of book-1\] +- author: + - family: Shakespeare + container-author: + - family: Shakespeare + id: book-1 + issued: 1975 + number-of-volumes: 4 + publisher: Publisher + publisher-place: Location + title: Collected works \[title field of mvbook-1\] + type: book + volume: 3 + volume-title: Tragedies \[title field of book-1\] +- author: + - family: Shakespeare + id: mvbook-1 + issued: 1970/1980 + number-of-volumes: 4 + publisher: Publisher + publisher-place: Location + title: Collected works \[title field of mvbook-1\] + type: book +--- + + +``` diff --git a/test/command/biblatex-ctan.md b/test/command/biblatex-ctan.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-ctan.md @@ -0,0 +1,73 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(“CTAN: The Comprehensive TeX Archive Network” 2006) + +“CTAN: The Comprehensive TeX Archive Network.” 2006. +. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(“CTAN: The Comprehensive TeX Archive Network,” 2006) + +CTAN: The Comprehensive TeX Archive Network. (2006). Retrieved October +01, 2006, from + + +NOTES: + +- biblio2yaml + - if there is no shorttitle, but title and subtitle, the title alone should also be mapped to title-short + +- citeproc + - citeproc should use title-short (if available) instead of title for in-text citations when there is no author + +} + +@Online{ctan, + title = {{CTAN}}, + date = 2006, + url = {http://www.ctan.org}, + subtitle = {{The Comprehensive TeX Archive Network}}, + urldate = {2006-10-01}, + label = {CTAN}, + hyphenation = {american}, + annotation = {This is an online entry. The \textsc{url}, which is + given in the url field, is transformed into a + clickable link if hyperref support has been + enabled. Note the format of the urldate field + (yyyy-mm-dd) in the database file. Also note the + label field which may be used as a fallback by + citation styles which need an author and\slash or a + year}, +} + +^D +--- +nocite: "[@*]" +references: +- accessed: 2006-10-01 + annote: This is an online entry. The [url]{.smallcaps}, which is given + in the url field, is transformed into a clickable link if hyperref + support has been enabled. Note the format of the urldate field + (yyyy-mm-dd) in the database file. Also note the label field which + may be used as a fallback by citation styles which need an author + and/or a year + id: ctan + issued: 2006 + language: en-US + title: "CTAN: The Comprehensive TeX Archive Network" + title-short: CTAN + type: webpage + url: "http://www.ctan.org" +--- + + +``` diff --git a/test/command/biblatex-dates.md b/test/command/biblatex-dates.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-dates.md @@ -0,0 +1,162 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + - Dates + - Not included in tests: + - malformed dates and date ranges + - literal dates ("13th century"; not supported by biblatex) + - seasons (would have to come from parsing the issue field) + - uncertain dates (use "doubtfuldate" from biblatex-apa?) + - dates with single-digit day or month (not supported by biblatex) + - negative dates (not supported by biblatex) + - Note: biblatex supports years < 1000 but only if padded with leading zeros + - TODO: + - either biblio2yaml or, probably better, citeproc should strip leading zeros + from days and months (CSL can add leading zeros to its output, but not remove + them when they are in its input data) +} + +@article{year-month-old, + Author = {Author, Al}, + Journal = {Journal}, + Month = aug, + Title = {Year and Month, bibtex style, supported by biblatex for backwards compatibility}, + Year = {1999}} + +@article{year-month-new, + Author = {Author, Al}, + Journal = {Journal}, + Month = {08}, + Title = {Year and Month, biblatex style; note that biblatex does not have a ``day'' field}, + Year = {1999}} + +@article{dates, + Author = {Author, Al}, + Date = {2012-12-13}, + Eventdate = {2011-10-03}, + Journal = {Journal}, + Month = may, + Origdate = {1888-10-01}, + Title = {Dates, default biblatex style; year, month to be ignored if date exists}, + Urldate = {1999-05-23}, + Year = {9999}} + +@article{date-ranges-different-years, + Author = {Author, Al}, + Date = {1999-10-14/2010-01-23}, + Eventdate = {1999-12/2000-01}, + Journal = {Journal}, + Origdate = {1888-01-02/1913-12-13}, + Title = {Date ranges; different years}, + Urldate = {2012-10-12/2013-01-31}} + +@article{date-ranges-same-year, + Author = {Author, Al}, + Date = {1999-10-14/1999-10-15}, + Eventdate = {1999-10/1999-11}, + Journal = {Journal}, + Origdate = {1888-01-02/1888-12-13}, + Title = {Date ranges; same year}, + Urldate = {2012-10-31/2012-11-01}} + +@article{date-ranges-open, + Author = {Author, Al}, + Date = {1999-10-14/}, + Eventdate = {1999-10/}, + Journal = {Journal}, + Origdate = {1888-01-02/}, + Title = {Date ranges, open-ended}, + Urldate = {2012-10-31/}} + +@article{dates-very-old, + Author = {Author, Al}, + Date = {0712-12-13}, + Eventdate = {0311-10-03}, + Journal = {Journal}, + Month = may, + Origdate = {0088-10-01}, + Title = {Dates, year less than 1000}, + Urldate = {0999-12-14}} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Author + given: Al + container-title: Journal + id: year-month-old + issued: 1999-08 + title: Year and month, bibtex style, supported by biblatex for + backwards compatibility + type: article-journal +- author: + - family: Author + given: Al + container-title: Journal + id: year-month-new + issued: 1999-08 + title: Year and month, biblatex style; note that biblatex does not + have a "day" field + type: article-journal +- accessed: 1999-05-23 + author: + - family: Author + given: Al + container-title: Journal + event-date: 2011-10-03 + id: dates + issued: 2012-12-13 + original-date: 1888-10-01 + title: Dates, default biblatex style; year, month to be ignored if + date exists + type: article-journal +- accessed: 2012-10-12/2013-01-31 + author: + - family: Author + given: Al + container-title: Journal + event-date: 1999-12/2000-01 + id: date-ranges-different-years + issued: 1999-10-14/2010-01-23 + original-date: 1888-01-02/1913-12-13 + title: Date ranges; different years + type: article-journal +- accessed: 2012-10-31/2012-11-01 + author: + - family: Author + given: Al + container-title: Journal + event-date: 1999-10/1999-11 + id: date-ranges-same-year + issued: 1999-10-14/1999-10-15 + original-date: 1888-01-02/1888-12-13 + title: Date ranges; same year + type: article-journal +- accessed: 2012-10-31/ + author: + - family: Author + given: Al + container-title: Journal + event-date: 1999-10/ + id: date-ranges-open + issued: 1999-10-14/ + original-date: 1888-01-02/ + title: Date ranges, open-ended + type: article-journal +- accessed: 0999-12-14 + author: + - family: Author + given: Al + container-title: Journal + event-date: 0311-10-03 + id: dates-very-old + issued: 0712-12-13 + original-date: 0088-10-01 + title: Dates, year less than 1000 + type: article-journal +--- + + +``` diff --git a/test/command/biblatex-doody.md b/test/command/biblatex-doody.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-doody.md @@ -0,0 +1,101 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Doody 1974) (Matuz 1990) + +Doody, Terrence. 1974. “Hemingway’s Style and Jake’s Narration.” *The +Journal of Narrative Technique* 4 (3): 212–225. + +Matuz, Roger, ed. 1990. *Contemporary Literary Criticism*. Vol. 61. +Detroit: Gale. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Doody, 1974) (Matuz, 1990) + +Doody, T. (1974). Hemingway’s style and Jake’s narration. *The Journal +of Narrative Technique*, *4*(3), 212–225. + +Matuz, R. (Ed.). (1990). *Contemporary literary criticism* (Vol. 61, pp. +204–208). Detroit: Gale. + + +NOTES + +- biblio2yaml + - contains fields “related” and “relatedstring”. In principle, these could be appended to CSL "note", if citeproc can handle citations in the bibliography ... + +} + +@Article{doody, + author = {Doody, Terrence}, + title = {Hemingway's Style and {Jake}'s Narration}, + year = 1974, + volume = 4, + number = 3, + pages = {212-225}, + hyphenation = {american}, + related = {matuz:doody}, + relatedstring= {\autocap{e}xcerpt in}, + journal = {The Journal of Narrative Technique}, + annotation = {An article entry cited as an excerpt from a + collection entry. Note the format of the + related and relatedstring fields}, +} + +@Collection{matuz:doody, + editor = {Matuz, Roger}, + title = {Contemporary Literary Criticism}, + year = 1990, + volume = 61, + publisher = {Gale}, + location = {Detroit}, + pages = {204-208}, + hyphenation = {american}, + annotation = {A collection entry providing the excerpt information + for the doody entry. Note the format of the + pages field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An article entry cited as an excerpt from a collection entry. + Note the format of the related and relatedstring fields + author: + - family: Doody + given: Terrence + container-title: The Journal of Narrative Technique + id: doody + issue: 3 + issued: 1974 + language: en-US + page: 212-225 + title: Hemingway's style and Jake's narration + type: article-journal + volume: 4 +- annote: A collection entry providing the excerpt information for the + doody entry. Note the format of the pages field + editor: + - family: Matuz + given: Roger + id: "matuz:doody" + issued: 1990 + language: en-US + page: 204-208 + publisher: Gale + publisher-place: Detroit + title: Contemporary literary criticism + type: book + volume: 61 +--- + + +``` diff --git a/test/command/biblatex-edtf-date.md b/test/command/biblatex-edtf-date.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-edtf-date.md @@ -0,0 +1,72 @@ +``` +% pandoc -f biblatex -t markdown -s +Note that current CSL doesn't give us a way +to distinguish between /open and /unknown, +so item3-3 and item3-4 get parsed similarly. +That should change in CSL 1.1, and then this +test should be revised. + +@article{item3-3, date={1998/unknown}} +@article{item3-4, date={1999/open}} +@article{item3-10, date={2004-04-05T14:34:00}} +@article{item5-1, date={0000}} +@article{item5-2, date={-0876}} +@article{item5-3, date={-0877/-0866}} +@article{item5-5, date={-0343-02}} +@article{item5-8, date={1723~}} +@article{item5-9, date={1723?}} +@article{item5-10, date={1723?~}} +@article{item5-11, date={2004-22}} +@article{item5-12, date={2004-24}} +@article{item5-13, date={20uu}} +@article{item5-14, date={y-123456789}} + +^D +--- +nocite: "[@*]" +references: +- id: item3-3 + issued: 1998/ + type: article-journal +- id: item3-4 + issued: 1999/ + type: article-journal +- id: item3-10 + issued: 2004-04-05 + type: article-journal +- id: item5-1 + type: article-journal +- id: item5-2 + issued: "-0876" + type: article-journal +- id: item5-3 + issued: "-0877/-0866" + type: article-journal +- id: item5-5 + issued: "-0343-02" + type: article-journal +- id: item5-8 + issued: 1723\~ + type: article-journal +- id: item5-9 + issued: 1723 + type: article-journal +- id: item5-10 + issued: 1723\~ + type: article-journal +- id: item5-11 + issued: 2004-22 + type: article-journal +- id: item5-12 + issued: 2004-24 + type: article-journal +- id: item5-13 + issued: 2000/2099 + type: article-journal +- id: item5-14 + issued: y-123456789 + type: article-journal +--- + + +``` diff --git a/test/command/biblatex-escapedquotes.md b/test/command/biblatex-escapedquotes.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-escapedquotes.md @@ -0,0 +1,51 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{From jgm/pandoc#1568. Double quotes escaped using {"}.} + +@ARTICLE{Koff2009-gn, + title = "Pan-Canadian evaluation of irreversible compression ratios + ({"}lossy{"} compression) for development of national + guidelines", + author = "Koff, David and Bak, Peter and Brownrigg, Paul and + Hosseinzadeh, Danoush and Khademi, April and Kiss, Alex and + Lepanto, Luigi and Michalak, Tracy and Shulman, Harry and + Volkening, Andrew", + affiliation = "Sunnybrook Health Sciences Centre, 2075 Bayview Ave., Toronto, + ON, M4N 3M5, Canada. dkoffmcmaster.ca", + journal = "Journal of digital imaging", +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Koff + given: David + - family: Bak + given: Peter + - family: Brownrigg + given: Paul + - family: Hosseinzadeh + given: Danoush + - family: Khademi + given: April + - family: Kiss + given: Alex + - family: Lepanto + given: Luigi + - family: Michalak + given: Tracy + - family: Shulman + given: Harry + - family: Volkening + given: Andrew + container-title: Journal of digital imaging + id: Koff2009-gn + title: Pan-canadian evaluation of irreversible compression ratios + (\"lossy\" compression) for development of national guidelines + type: article-journal +--- + + +``` diff --git a/test/command/biblatex-formatting.md b/test/command/biblatex-formatting.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-formatting.md @@ -0,0 +1,23 @@ +``` +% pandoc -f biblatex -t markdown -s +@article{item1, + Title = {The Title: + \textit{italics}, + \textbf{bold}, + \textsubscript{subscript}, + \textsuperscript{superscript}, + \textsc{small-caps}} +} +^D +--- +nocite: "[@*]" +references: +- id: item1 + title: "The title: *Italics*, **bold**, ~subscript~, ^superscript^, + [small-caps]{.smallcaps}" + title-short: The title + type: article-journal +--- + + +``` diff --git a/test/command/biblatex-gaonkar-in.md b/test/command/biblatex-gaonkar-in.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-gaonkar-in.md @@ -0,0 +1,62 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Gaonkar 2001) + +Gaonkar, Dilip Parameshwar. 2001. “On Alternative Modernities.” In +*Alternative Modernities*, edited by Dilip Parameshwar Gaonkar, 1–23. +Durham; London: Duke University Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Gaonkar, 2001) + +Gaonkar, D. P. (2001). On alternative modernities. In D. P. Gaonkar +(Ed.), *Alternative modernities* (pp. 1–23). Durham; London: Duke +University Press. + + +} + +@InCollection{gaonkar:in, + author = {Gaonkar, Dilip Parameshwar}, + editor = {Gaonkar, Dilip Parameshwar}, + title = {On Alternative Modernities}, + date = 2001, + booktitle = {Alternative Modernities}, + publisher = {Duke University Press}, + location = {Durham and London}, + isbn = {0-822-32714-7}, + pages = {1-23}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Gaonkar + given: Dilip Parameshwar + container-title: Alternative modernities + editor: + - family: Gaonkar + given: Dilip Parameshwar + id: "gaonkar:in" + isbn: 0-822-32714-7 + issued: 2001 + page: 1-23 + publisher: Duke University Press + publisher-place: Durham; London + title: On alternative modernities + type: chapter +--- + + +``` diff --git a/test/command/biblatex-gaonkar.md b/test/command/biblatex-gaonkar.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-gaonkar.md @@ -0,0 +1,59 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Gaonkar 2001) + +Gaonkar, Dilip Parameshwar, ed. 2001. *Alternative Modernities*. Durham; +London: Duke University Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Gaonkar, 2001) + +Gaonkar, D. P. (Ed.). (2001). *Alternative modernities*. Durham; London: +Duke University Press. + + +} + +@Collection{gaonkar, + editor = {Gaonkar, Dilip Parameshwar}, + title = {Alternative Modernities}, + date = 2001, + publisher = {Duke University Press}, + location = {Durham and London}, + isbn = {0-822-32714-7}, + hyphenation = {american}, + annotation = {This is a collection entry. Note the format of the + location field in the database file as well as the + isbn field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a collection entry. Note the format of the location + field in the database file as well as the isbn field + editor: + - family: Gaonkar + given: Dilip Parameshwar + id: gaonkar + isbn: 0-822-32714-7 + issued: 2001 + language: en-US + publisher: Duke University Press + publisher-place: Durham; London + title: Alternative modernities + type: book +--- + + +``` diff --git a/test/command/biblatex-geer.md b/test/command/biblatex-geer.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-geer.md @@ -0,0 +1,70 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Geer 1985) + +Geer, Ingrid de. 1985. “Earl, Saint, Bishop, Skald – and Music: The +Orkney Earldom of the Twelfth Century. A Musicological Study.” PhD +thesis, Uppsala: Uppsala Universitet. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Geer, 1985) + +Geer, I. de. (1985). *Earl, saint, bishop, skald – and music: The Orkney +earldom of the twelfth century. A musicological study* (PhD thesis). +Uppsala Universitet, Uppsala. + + +} + +@Thesis{geer, + author = {de Geer, Ingrid}, + title = {Earl, Saint, Bishop, Skald~-- and Music}, + type = {phdthesis}, + institution = {Uppsala Universitet}, + date = 1985, + subtitle = {The {Orkney} Earldom of the Twelfth Century. {A} Musicological + Study}, + location = {Uppsala}, + options = {useprefix=false}, + hyphenation = {british}, + annotation = {This is a typical thesis entry for a PhD thesis. Note + the type field in the database file which uses a + localization key. Also note the format of the printed name and + compare the useprefix option in the options + field as well as vangennep}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a typical thesis entry for a PhD thesis. Note the type + field in the database file which uses a localization key. Also note + the format of the printed name and compare the useprefix option in + the options field as well as vangennep + author: + - dropping-particle: de + family: Geer + given: Ingrid + genre: PhD thesis + id: geer + issued: 1985 + language: en-GB + publisher: Uppsala Universitet + publisher-place: Uppsala + title: "Earl, saint, bishop, skald -- and music: The Orkney earldom of + the twelfth century. A musicological study" + title-short: Earl, saint, bishop, skald -- and music + type: thesis +--- + + +``` diff --git a/test/command/biblatex-gerhardt.md b/test/command/biblatex-gerhardt.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-gerhardt.md @@ -0,0 +1,64 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Gerhardt 2000) + +Gerhardt, Michael J. 2000. *The Federal Appointments Process: A +Constitutional and Historical Analysis*. Durham; London: Duke University +Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Gerhardt, 2000) + +Gerhardt, M. J. (2000). *The federal appointments process: A +constitutional and historical analysis*. Durham; London: Duke University +Press. + + +} + +@Book{gerhardt, + author = {Gerhardt, Michael J.}, + title = {The Federal Appointments Process}, + date = 2000, + publisher = {Duke University Press}, + location = {Durham and London}, + hyphenation = {american}, + sorttitle = {Federal Appointments Process}, + indextitle = {Federal Appointments Process, The}, + subtitle = {A Constitutional and Historical Analysis}, + shorttitle = {Federal Appointments Process}, + annotation = {This is a book entry. Note the format of the + location field as well as the sorttitle and + indextitle fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a book entry. Note the format of the location field as + well as the sorttitle and indextitle fields + author: + - family: Gerhardt + given: Michael J. + id: gerhardt + issued: 2000 + language: en-US + publisher: Duke University Press + publisher-place: Durham; London + title: "The federal appointments process: A constitutional and + historical analysis" + title-short: Federal appointments process + type: book +--- + + +``` diff --git a/test/command/biblatex-gillies.md b/test/command/biblatex-gillies.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-gillies.md @@ -0,0 +1,69 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Gillies 1933) + +Gillies, Alexander. 1933. “Herder and the Preparation of Goethe’s Idea +of World Literature.” *Publications of the English Goethe Society, New +Series* 9: 46–67. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Gillies, 1933) + +Gillies, A. (1933). Herder and the preparation of Goethe’s idea of world +literature. *Publications of the English Goethe Society, new series*, +*9*, 46–67. + + +NOTES: + +- biblio2yaml + - "new series" is not pretty, but it’s the best we can do at the moment, given the limitations of CSL. + +} + +@Article{gillies, + author = {Gillies, Alexander}, + title = {Herder and the Preparation of {Goethe}'s Idea of World + Literature}, + journaltitle = {Publications of the English Goethe Society}, + date = 1933, + series = {newseries}, + volume = 9, + pages = {46-67}, + hyphenation = {british}, + annotation = {An article entry with a series and a + volume field. Note that format of the series + field in the database file}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An article entry with a series and a volume field. Note that + format of the series field in the database file + author: + - family: Gillies + given: Alexander + collection-title: New series + container-title: Publications of the English Goethe Society + id: gillies + issued: 1933 + language: en-GB + page: 46-67 + title: Herder and the preparation of Goethe's idea of world literature + type: article-journal + volume: 9 +--- + + +``` diff --git a/test/command/biblatex-glashow.md b/test/command/biblatex-glashow.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-glashow.md @@ -0,0 +1,51 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Glashow 1961) + +Glashow, Sheldon. 1961. “Partial Symmetries of Weak Interactions.” +*Nucl. Phys.* 22: 579–588. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Glashow, 1961) + +Glashow, S. (1961). Partial symmetries of weak interactions. +*Nucl. Phys.*, *22*, 579–588. + + +} + +@Article{glashow, + author = {Glashow, Sheldon}, + title = {Partial Symmetries of Weak Interactions}, + journaltitle = {Nucl.~Phys.}, + date = 1961, + volume = 22, + pages = {579-588}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Glashow + given: Sheldon + container-title: Nucl. Phys. + id: glashow + issued: 1961 + page: 579-588 + title: Partial symmetries of weak interactions + type: article-journal + volume: 22 +--- + + +``` diff --git a/test/command/biblatex-gonzalez.md b/test/command/biblatex-gonzalez.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-gonzalez.md @@ -0,0 +1,62 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Gonzalez 2001) + +Gonzalez, Ray. 2001. *The Ghost of John Wayne and Other Stories*. +Tucson: The University of Arizona Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Gonzalez, 2001) + +Gonzalez, R. (2001). *The ghost of John Wayne and other stories*. +Tucson: The University of Arizona Press. + +} + +@Book{gonzalez, + author = {Gonzalez, Ray}, + title = {The Ghost of {John Wayne} and Other Stories}, + date = 2001, + publisher = {The University of Arizona Press}, + location = {Tucson}, + isbn = {0-816-52066-6}, + hyphenation = {american}, + sorttitle = {Ghost of John Wayne and Other Stories}, + indextitle = {Ghost of {John Wayne} and Other Stories, The}, + shorttitle = {Ghost of {John Wayne}}, + annotation = {A collection of short stories. This is a book entry. + Note the sorttitle and indextitle fields in + the database file. There's also an isbn field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A collection of short stories. This is a book entry. Note the + sorttitle and indextitle fields in the database file. There's also + an isbn field + author: + - family: Gonzalez + given: Ray + id: gonzalez + isbn: 0-816-52066-6 + issued: 2001 + language: en-US + publisher: The University of Arizona Press + publisher-place: Tucson + title: The ghost of John Wayne and other stories + title-short: Ghost of John Wayne + type: book +--- + + +``` diff --git a/test/command/biblatex-hammond.md b/test/command/biblatex-hammond.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-hammond.md @@ -0,0 +1,63 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Hammond 1997) + +Hammond, Christopher. 1997. *The Basics of Crystallography and +Diffraction*. Oxford: International Union of Crystallography; Oxford +University Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Hammond, 1997) + +Hammond, C. (1997). *The basics of crystallography and diffraction*. +Oxford: International Union of Crystallography; Oxford University Press. + + +} + +@Book{hammond, + author = {Hammond, Christopher}, + title = {The basics of crystallography and diffraction}, + date = 1997, + publisher = {International Union of Crystallography and Oxford University + Press}, + location = {Oxford}, + hyphenation = {british}, + sorttitle = {Basics of crystallography and diffraction}, + indextitle = {Basics of crystallography and diffraction, The}, + shorttitle = {Crystallography and diffraction}, + annotation = {A book entry. Note the sorttitle and + indextitle fields as well as the format of the + publisher field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry. Note the sorttitle and indextitle fields as well + as the format of the publisher field + author: + - family: Hammond + given: Christopher + id: hammond + issued: 1997 + language: en-GB + publisher: International Union of Crystallography; Oxford University + Press + publisher-place: Oxford + title: The basics of crystallography and diffraction + title-short: Crystallography and diffraction + type: book +--- + + +``` diff --git a/test/command/biblatex-herrmann.md b/test/command/biblatex-herrmann.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-herrmann.md @@ -0,0 +1,70 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Herrmann et al. 2006) + +Herrmann, Wolfgang A., Karl Öfele, Sabine K. Schneider, Eberhardt +Herdtweck, and Stephan D. Hoffmann. 2006. “A Carbocyclic Carbene as an +Efficient Catalyst Ligand for C–C Coupling Reactions.” *Angew. Chem. +Int. Ed.* 45 (23): 3859–3862. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Herrmann, Öfele, Schneider, Herdtweck, & Hoffmann, 2006) + +Herrmann, W. A., Öfele, K., Schneider, S. K., Herdtweck, E., & Hoffmann, +S. D. (2006). A carbocyclic carbene as an efficient catalyst ligand for +C–C coupling reactions. *Angew. Chem. Int. Ed.*, *45*(23), 3859–3862. + + +} + +@string{ anch-ie = {Angew.~Chem. Int.~Ed.} } + +@Article{herrmann, + author = {Herrmann, Wolfgang A. and {\"O}fele, Karl and Schneider, + Sabine K. and Herdtweck, Eberhardt and Hoffmann, Stephan D.}, + title = {A carbocyclic carbene as an efficient catalyst ligand for {C--C} + coupling reactions}, + journaltitle = anch-ie, + date = 2006, + volume = 45, + number = 23, + pages = {3859-3862}, + indextitle = {Carbocyclic carbene as an efficient catalyst, A}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Herrmann + given: Wolfgang A. + - family: Öfele + given: Karl + - family: Schneider + given: Sabine K. + - family: Herdtweck + given: Eberhardt + - family: Hoffmann + given: Stephan D. + container-title: Angew. Chem. Int. Ed. + id: herrmann + issue: 23 + issued: 2006 + page: 3859-3862 + title: A carbocyclic carbene as an efficient catalyst ligand for C--C + coupling reactions + type: article-journal + volume: 45 +--- + + +``` diff --git a/test/command/biblatex-hyman.md b/test/command/biblatex-hyman.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-hyman.md @@ -0,0 +1,79 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Hyman 1981) + +Hyman, Arthur. 1981. “Aristotle’s Theory of the Intellect and Its +Interpretation by Averroes.” In *Studies in Aristotle*, edited by +Dominic J. O’Meara, 161–191. Studies in Philosophy and the History of +Philosophy 9. Washington, D.C.: The Catholic University of America +Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Hyman, 1981) + +Hyman, A. (1981). Aristotle’s theory of the intellect and its +interpretation by Averroes. In D. J. O’Meara (Ed.), *Studies in +Aristotle* (pp. 161–191). Washington, D.C.: The Catholic University of +America Press. + + +} + +@InCollection{hyman, + author = {Arthur Hyman}, + editor = {O'Meara, Dominic J.}, + title = {Aristotle's Theory of the Intellect and its Interpretation by + {Averroes}}, + date = 1981, + booktitle = {Studies in {Aristotle}}, + series = {Studies in Philosophy and the History of Philosophy}, + number = 9, + publisher = {The Catholic University of America Press}, + location = {Washington, D.C.}, + pages = {161-191}, + keywords = {secondary}, + hyphenation = {american}, + indextitle = {Aristotle's Theory of the Intellect}, + shorttitle = {Aristotle's Theory of the Intellect}, + annotation = {An incollection entry with a series and + number field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An incollection entry with a series and number field + author: + - family: Hyman + given: Arthur + collection-number: 9 + collection-title: Studies in philosophy and the history of philosophy + container-title: Studies in Aristotle + editor: + - family: O'Meara + given: Dominic J. + id: hyman + issued: 1981 + keyword: secondary + language: en-US + page: 161-191 + publisher: The Catholic University of America Press + publisher-place: Washington, D.C. + title: Aristotle's theory of the intellect and its interpretation by + Averroes + title-short: Aristotle's theory of the intellect + type: chapter +--- + + +``` diff --git a/test/command/biblatex-iliad.md b/test/command/biblatex-iliad.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-iliad.md @@ -0,0 +1,68 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Homer 2004) + +Homer. 2004. *Die Ilias*. Translated by Wolfgang Schadewaldt. 3rd ed. +Düsseldorf; Zürich: Artemis & Winkler. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Homer, 2004) + +Homer. (2004). *Die Ilias*. (W. Schadewaldt, trans.) (3rd ed.). +Düsseldorf; Zürich: Artemis & Winkler. + +} + +@Book{iliad, + author = {Homer}, + title = {Die Ilias}, + date = 2004, + translator = {Schadewaldt, Wolfgang}, + introduction = {Latacz, Joachim}, + edition = 3, + publisher = {Artemis \& Winkler}, + location = {D{\"u}sseldorf and Z{\"u}rich}, + hyphenation = {german}, + sorttitle = {Ilias}, + indextitle = {Ilias, Die}, + shorttitle = {Ilias}, + annotation = {A German translation of the \emph{Iliad}. Note the + translator and introduction fields and the + format of the location field in the database + file. Also note the sorttitle and indextitle + fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A German translation of the *Iliad*. Note the translator and + introduction fields and the format of the location field in the + database file. Also note the sorttitle and indextitle fields + author: + - family: Homer + edition: 3 + id: iliad + issued: 2004 + language: de-DE + publisher: Artemis & Winkler + publisher-place: Düsseldorf; Zürich + title: Die Ilias + title-short: Ilias + translator: + - family: Schadewaldt + given: Wolfgang + type: book +--- + + +``` diff --git a/test/command/biblatex-inbook-title-booktitle-maintitle-series-2.md b/test/command/biblatex-inbook-title-booktitle-maintitle-series-2.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-inbook-title-booktitle-maintitle-series-2.md @@ -0,0 +1,48 @@ +``` +% pandoc -f biblatex -t markdown -s +@inbook{item1, + Author = {Author, Al}, + Bookauthor = {Bookauthor, Bob}, + Booksubtitle = {Booksubtitle}, + Booktitle = {Booktitle}, + Booktitleaddon = {Booktitleaddon}, + Date = {2011}, + Hyphenation = {french}, + Location = {Location}, + Mainsubtitle = {Mainsubtitle}, + Maintitle = {Maintitle}, + Maintitleaddon = {Maintitleaddon}, + Number = {3}, + Publisher = {Publisher}, + Series = {Series}, + Subtitle = {Subtitle}, + Title = {Title of the ``inbook'' Entry}, + Titleaddon = {Titleaddon}, + Volume = {4}} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Author + given: Al + collection-number: 3 + collection-title: Series + container-author: + - family: Bookauthor + given: Bob + container-title: "Maintitle: Mainsubtitle. Maintitleaddon" + id: item1 + issued: 2011 + language: fr-FR + publisher: Publisher + publisher-place: Location + title: "Title of the \"inbook\" Entry: Subtitle. Titleaddon" + type: chapter + volume: 4 + volume-title: "Booktitle: Booksubtitle. Booktitleaddon" +--- + + +``` diff --git a/test/command/biblatex-inbook-title-booktitle-maintitle-series.md b/test/command/biblatex-inbook-title-booktitle-maintitle-series.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-inbook-title-booktitle-maintitle-series.md @@ -0,0 +1,44 @@ +``` +% pandoc -f biblatex -t markdown -s +@inbook{item1, + Author = {Author, Al}, + Booksubtitle = {Booksubtitle}, + Booktitle = {Booktitle}, + Booktitleaddon = {Booktitleaddon}, + Date = {2011}, + Hyphenation = {french}, + Location = {Location}, + Mainsubtitle = {Mainsubtitle}, + Maintitle = {Maintitle}, + Maintitleaddon = {Maintitleaddon}, + Number = {3}, + Publisher = {Publisher}, + Series = {Series}, + Subtitle = {Subtitle}, + Title = {Title of the ``inbook'' Entry}, + Titleaddon = {Titleaddon}, + Volume = {4}} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Author + given: Al + collection-number: 3 + collection-title: Series + container-title: "Maintitle: Mainsubtitle. Maintitleaddon" + id: item1 + issued: 2011 + language: fr-FR + publisher: Publisher + publisher-place: Location + title: "Title of the \"inbook\" Entry: Subtitle. Titleaddon" + type: chapter + volume: 4 + volume-title: "Booktitle: Booksubtitle. Booktitleaddon" +--- + + +``` diff --git a/test/command/biblatex-inbook.md b/test/command/biblatex-inbook.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-inbook.md @@ -0,0 +1,147 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ +adapted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib + +TODO / citeproc: in biblatex "inbook" entries, citeproc should suppress bookauthor = CSL container-author if identical with author. -- See annotation in kant:kpv. +} + +@string{dtv = {Deutscher Taschenbuch-Verlag}} + +@inbook{kant:kpv, + Annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is an inbook entry which explicitly refers to the \emph{Critique of Practical Reason} only, not to the entire fifth volume. Note the author and bookauthor fields in the database file. By default, the bookauthor is omitted if the values of the author and bookauthor fields are identical}, + Author = {Kant, Immanuel}, + Bookauthor = {Kant, Immanuel}, + Booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft}, + Date = 1968, + Hyphenation = {german}, + Location = {Berlin}, + Maintitle = {Kants Werke. Akademie Textausgabe}, + Pages = {1-163}, + Publisher = {Walter de Gruyter}, + Shorthand = {KpV}, + Shorttitle = {Kritik der praktischen Vernunft}, + Title = {Kritik der praktischen Vernunft}, + Volume = 5} + +@inbook{kant:ku, + Annotation = {An edition of Kant's \emph{Collected Works}, volume five. This is an inbook entry which explicitly refers to the \emph{Critique of Judgment} only, not to the entire fifth volume}, + Author = {Kant, Immanuel}, + Bookauthor = {Kant, Immanuel}, + Booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft}, + Date = 1968, + Hyphenation = {german}, + Location = {Berlin}, + Maintitle = {Kants Werke. Akademie Textausgabe}, + Pages = {165-485}, + Publisher = {Walter de Gruyter}, + Shorthand = {KU}, + Title = {Kritik der Urtheilskraft}, + Volume = 5} + +@inbook{nietzsche:historie, + Annotation = {A single essay from the critical edition of Nietzsche's works. This inbook entry explicitly refers to an essay found in the first volume. Note the title, booktitle, and maintitle fields. Also note the sorttitle and sortyear fields. We want this entry to be listed after the entry referring to the entire first volume}, + Author = {Nietzsche, Friedrich}, + Bookauthor = {Nietzsche, Friedrich}, + Booktitle = {Die Geburt der Tragödie. Unzeitgemäße Betrachtungen I--IV. Nachgelassene Schriften 1870--1973}, + Date = 1988, + Editor = {Colli, Giorgio and Montinari, Mazzino}, + Hyphenation = {german}, + Indexsorttitle = {Vom Nutzen und Nachtheil der Historie fur das Leben}, + Indextitle = {Vom Nutzen und Nachtheil der Historie für das Leben}, + Location = {München and Berlin and New York}, + Mainsubtitle = {Kritische Studienausgabe}, + Maintitle = {Sämtliche Werke}, + Pages = {243-334}, + Publisher = dtv # { and Walter de Gruyter}, + Shorttitle = {Vom Nutzen und Nachtheil der Historie}, + Sorttitle = {Werke-01-243}, + Sortyear = {1988-2}, + Subtitle = {Vom Nutzen und Nachtheil der Historie für das Leben}, + Title = {Unzeitgemässe Betrachtungen. Zweites Stück}, + Volume = 1} + +^D +--- +nocite: "[@*]" +references: +- annote: An edition of Kant's *Collected Works*, volume five. This is + an inbook entry which explicitly refers to the *Critique of + Practical Reason* only, not to the entire fifth volume. Note the + author and bookauthor fields in the database file. By default, the + bookauthor is omitted if the values of the author and bookauthor + fields are identical + author: + - family: Kant + given: Immanuel + container-author: + - family: Kant + given: Immanuel + container-title: Kants Werke. Akademie Textausgabe + id: "kant:kpv" + issued: 1968 + language: de-DE + page: 1-163 + publisher: Walter de Gruyter + publisher-place: Berlin + title: Kritik der praktischen Vernunft + title-short: Kritik der praktischen Vernunft + type: chapter + volume: 5 + volume-title: Kritik der praktischen Vernunft. Kritik der + Urtheilskraft +- annote: An edition of Kant's *Collected Works*, volume five. This is + an inbook entry which explicitly refers to the *Critique of + Judgment* only, not to the entire fifth volume + author: + - family: Kant + given: Immanuel + container-author: + - family: Kant + given: Immanuel + container-title: Kants Werke. Akademie Textausgabe + id: "kant:ku" + issued: 1968 + language: de-DE + page: 165-485 + publisher: Walter de Gruyter + publisher-place: Berlin + title: Kritik der Urtheilskraft + type: chapter + volume: 5 + volume-title: Kritik der praktischen Vernunft. Kritik der + Urtheilskraft +- annote: A single essay from the critical edition of Nietzsche's works. + This inbook entry explicitly refers to an essay found in the first + volume. Note the title, booktitle, and maintitle fields. Also note + the sorttitle and sortyear fields. We want this entry to be listed + after the entry referring to the entire first volume + author: + - family: Nietzsche + given: Friedrich + container-author: + - family: Nietzsche + given: Friedrich + container-title: "Sämtliche Werke: Kritische Studienausgabe" + editor: + - family: Colli + given: Giorgio + - family: Montinari + given: Mazzino + id: "nietzsche:historie" + issued: 1988 + language: de-DE + page: 243-334 + publisher: Deutscher Taschenbuch-Verlag; Walter de Gruyter + publisher-place: München; Berlin; New York + title: "Unzeitgemässe Betrachtungen. Zweites Stück: Vom Nutzen und + Nachtheil der Historie für das Leben" + title-short: Vom Nutzen und Nachtheil der Historie + type: chapter + volume: 1 + volume-title: Die Geburt der Tragödie. Unzeitgemäße Betrachtungen + I--IV. Nachgelassene Schriften 1870--1973 +--- + + +``` diff --git a/test/command/biblatex-incollection-2.md b/test/command/biblatex-incollection-2.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-incollection-2.md @@ -0,0 +1,98 @@ +``` +% pandoc -f biblatex -t markdown -s + +@comment{adapted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib} + + +@string{hup = {Harvard University Press}} + + +@incollection{westfahl:space, + Annotation = {A cross-referenced article from a collection. This is an incollection entry with a crossref field. Note the subtitle and indextitle fields}, + Author = {Westfahl, Gary}, + Crossref = {westfahl:frontier}, + Hyphenation = {american}, + Indextitle = {True Frontier, The}, + Pages = {55-65}, + Subtitle = {Confronting and Avoiding the Realities of Space in {American} Science Fiction Films}, + Title = {The True Frontier}} + +@incollection{gaonkar:in, + Author = {Gaonkar, Dilip Parameshwar}, + Booktitle = {Alternative Modernities}, + Date = 2001, + Editor = {Gaonkar, Dilip Parameshwar}, + Isbn = {0-822-32714-7}, + Location = {Durham and London}, + Pages = {1-23}, + Publisher = {Duke University Press}, + Title = {On Alternative Modernities}} + +@collection{westfahl:frontier, + Annotation = {This is a collection entry. Note the format of the location field as well as the subtitle and booksubtitle fields}, + Booksubtitle = {The Frontier Theme in Science Fiction}, + Booktitle = {Space and Beyond}, + Date = 2000, + Editor = {Westfahl, Gary}, + Hyphenation = {american}, + Location = {Westport, Conn. and London}, + Publisher = {Greenwood}, + Subtitle = {The Frontier Theme in Science Fiction}, + Title = {Space and Beyond}} +^D +--- +nocite: "[@*]" +references: +- annote: A cross-referenced article from a collection. This is an + incollection entry with a crossref field. Note the subtitle and + indextitle fields + author: + - family: Westfahl + given: Gary + container-title: "Space and beyond: The frontier theme in science + fiction" + editor: + - family: Westfahl + given: Gary + id: "westfahl:space" + issued: 2000 + language: en-US + page: 55-65 + publisher: Greenwood + publisher-place: Westport, Conn.; London + title: "The true frontier: Confronting and avoiding the realities of + space in American science fiction films" + title-short: The true frontier + type: chapter +- author: + - family: Gaonkar + given: Dilip Parameshwar + container-title: Alternative modernities + editor: + - family: Gaonkar + given: Dilip Parameshwar + id: "gaonkar:in" + isbn: 0-822-32714-7 + issued: 2001 + page: 1-23 + publisher: Duke University Press + publisher-place: Durham; London + title: On alternative modernities + type: chapter +- annote: This is a collection entry. Note the format of the location + field as well as the subtitle and booksubtitle fields + editor: + - family: Westfahl + given: Gary + id: "westfahl:frontier" + issued: 2000 + language: en-US + publisher: Greenwood + publisher-place: Westport, Conn.; London + title: "Space and beyond: The frontier theme in science fiction" + title-short: Space and beyond + type: book +--- + + +``` diff --git a/test/command/biblatex-incollection.md b/test/command/biblatex-incollection.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-incollection.md @@ -0,0 +1,130 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{adapted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib} + +@string{hup = {Harvard University Press}} + +@incollection{brandt, + Annotation = {An incollection entry with a series and a number. Note the format of the printed name and compare the useprefix option in the options field as well as vangennep. Also note the indextitle, and indexsorttitle fields}, + Author = {von Brandt, Ahasver and Hoffmann, Erich}, + Booktitle = {Europa im Hoch- und Spätmittelalter}, + Date = 1987, + Editor = {Seibt, Ferdinand}, + Hyphenation = {german}, + Indexsorttitle = {Nordischen Lander von der Mitte des 11. Jahrhunderts bis 1448}, + Indextitle = {Nordischen Länder von der Mitte des 11.~Jahrhunderts bis 1448, Die}, + Location = {Stuttgart}, + Number = 2, + Options = {useprefix=false}, + Pages = {884-917}, + Publisher = {Klett-Cotta}, + Series = {Handbuch der europäischen Geschichte}, + Shorttitle = {Die nordischen Länder}, + Title = {Die nordischen Länder von der Mitte des 11.~Jahrhunderts bis 1448}} + +@incollection{hyman, + Annotation = {An incollection entry with a series and number field}, + Author = {Hyman, Arthur}, + Booktitle = {Studies in {Aristotle}}, + Date = 1981, + Editor = {O'Meara, Dominic J.}, + Hyphenation = {american}, + Indextitle = {Aristotle's Theory of the Intellect}, + Keywords = {secondary}, + Location = {Washington, D.C.}, + Number = 9, + Pages = {161-191}, + Publisher = {The Catholic University of America Press}, + Series = {Studies in Philosophy and the History of Philosophy}, + Shorttitle = {Aristotle's Theory of the Intellect}, + Title = {Aristotle's Theory of the Intellect and its Interpretation by {Averroes}}} + +@incollection{pines, + Annotation = {A typical incollection entry. Note the indextitle field}, + Author = {Pines, Shlomo}, + Booktitle = {Studies in Medieval {Jewish} History and Literature}, + Date = 1979, + Editor = {Twersky, Isadore}, + Hyphenation = {american}, + Indextitle = {Limitations of Human Knowledge According to Al-Farabi, ibn Bajja, and Maimonides, The}, + Keywords = {secondary}, + Location = {Cambridge, Mass.}, + Pages = {82-109}, + Publisher = hup, + Shorttitle = {Limitations of Human Knowledge}, + Title = {The Limitations of Human Knowledge According to {Al-Farabi}, {ibn Bajja}, and {Maimonides}}} + +^D +--- +nocite: "[@*]" +references: +- annote: An incollection entry with a series and a number. Note the + format of the printed name and compare the useprefix option in the + options field as well as vangennep. Also note the indextitle, and + indexsorttitle fields + author: + - dropping-particle: von + family: Brandt + given: Ahasver + - family: Hoffmann + given: Erich + collection-number: 2 + collection-title: Handbuch der europäischen Geschichte + container-title: Europa im Hoch- und Spätmittelalter + editor: + - family: Seibt + given: Ferdinand + id: brandt + issued: 1987 + language: de-DE + page: 884-917 + publisher: Klett-Cotta + publisher-place: Stuttgart + title: Die nordischen Länder von der Mitte des 11. Jahrhunderts bis + 1448 + title-short: Die nordischen Länder + type: chapter +- annote: An incollection entry with a series and number field + author: + - family: Hyman + given: Arthur + collection-number: 9 + collection-title: Studies in philosophy and the history of philosophy + container-title: Studies in Aristotle + editor: + - family: O'Meara + given: Dominic J. + id: hyman + issued: 1981 + keyword: secondary + language: en-US + page: 161-191 + publisher: The Catholic University of America Press + publisher-place: Washington, D.C. + title: Aristotle's theory of the intellect and its interpretation by + Averroes + title-short: Aristotle's theory of the intellect + type: chapter +- annote: A typical incollection entry. Note the indextitle field + author: + - family: Pines + given: Shlomo + container-title: Studies in medieval Jewish history and literature + editor: + - family: Twersky + given: Isadore + id: pines + issued: 1979 + keyword: secondary + language: en-US + page: 82-109 + publisher: Harvard University Press + publisher-place: Cambridge, Mass. + title: The limitations of human knowledge according to Al-Farabi, [ibn + Bajja]{.nocase}, and Maimonides + title-short: Limitations of human knowledge + type: chapter +--- + + +``` diff --git a/test/command/biblatex-inproceedings.md b/test/command/biblatex-inproceedings.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-inproceedings.md @@ -0,0 +1,88 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{adapted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib} + +@string{cup = {Cambridge University Press}} + +@inproceedings{moraux, + Annotation = {This is a typical inproceedings entry. Note the booksubtitle, shorttitle, indextitle, and indexsorttitle fields. Also note the eventdate field.}, + Author = {Moraux, Paul}, + Booktitle = {Aristotle on Mind and the Senses}, + Booktitleaddon = {Proceedings of the Seventh Symposium Aristotelicum}, + Date = 1979, + Editor = {Lloyd, G. E. R. and Owen, G. E. L.}, + Eventdate = 1975, + Hyphenation = {french}, + Indexsorttitle = {De Anima dans la tradition grecque}, + Indextitle = {\emph{De Anima} dans la tradition grècque, Le}, + Keywords = {secondary}, + Location = {Cambridge}, + Pages = {281-324}, + Publisher = cup, + Shorttitle = {\emph{De Anima} dans la tradition grècque}, + Subtitle = {Quelques aspects de l'interpretation du traité, de Theophraste à Themistius}, + Title = {Le \emph{De Anima} dans la tradition grècque}} + +@inproceedings{salam, + Author = {Salam, Abdus}, + Booksubtitle = {Relativistic groups and analyticity}, + Booktitle = {Elementary particle theory}, + Booktitleaddon = {Proceedings of the Eighth {Nobel} Symposium}, + Date = 1968, + Editor = {Svartholm, Nils}, + Eventdate = {1968-05-19/1968-05-25}, + Location = {Stockholm}, + Pages = {367-377}, + Publisher = {Almquist \& Wiksell}, + Title = {Weak and Electromagnetic Interactions}, + Venue = {Aspenäsgarden, Lerum}} +^D +--- +nocite: "[@*]" +references: +- annote: This is a typical inproceedings entry. Note the booksubtitle, + shorttitle, indextitle, and indexsorttitle fields. Also note the + eventdate field. + author: + - family: Moraux + given: Paul + container-title: Aristotle on Mind and the Senses. Proceedings of the + Seventh Symposium Aristotelicum + editor: + - family: Lloyd + given: G. E. R. + - family: Owen + given: G. E. L. + event-date: 1975 + id: moraux + issued: 1979 + keyword: secondary + language: fr-FR + page: 281-324 + publisher: Cambridge University Press + publisher-place: Cambridge + title: "Le *De Anima* dans la tradition grècque: Quelques aspects de + l'interpretation du traité, de Theophraste à Themistius" + title-short: "*De Anima* dans la tradition grècque" + type: paper-conference +- author: + - family: Salam + given: Abdus + container-title: "Elementary particle theory: Relativistic groups and + analyticity. Proceedings of the eighth Nobel symposium" + editor: + - family: Svartholm + given: Nils + event-date: 1968-05-19/1968-05-25 + event-place: Aspenäsgarden, Lerum + id: salam + issued: 1968 + page: 367-377 + publisher: Almquist & Wiksell + publisher-place: Stockholm + title: Weak and electromagnetic interactions + type: paper-conference +--- + + +``` diff --git a/test/command/biblatex-issue288.md b/test/command/biblatex-issue288.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-issue288.md @@ -0,0 +1,35 @@ +``` +% pandoc -f biblatex -t markdown -s +@thesis{Leavitt_2016, +location = {{Los Angeles, CA}}, +title = {Upvoting the News: {{Breaking}} News Aggregation, Crowd Collaboration, +and Algorithm-Driven Attention on Reddit.Com}, +timestamp = {2017-04-06T14:13:22Z}, +langid = {english}, +institution = {{University of Southern California}}, +type = {Dissertation}, +author = {Leavitt, Alex}, +date = {2016-08}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Leavitt + given: Alex + genre: Dissertation + id: Leavitt_2016 + issued: 2016-08 + language: en-US + publisher: University of Southern California + publisher-place: Los Angeles, CA + title: "Upvoting the news: Breaking news aggregation, crowd + collaboration, and algorithm-driven attention on reddit.com" + title-short: Upvoting the news + type: thesis +--- + + +``` diff --git a/test/command/biblatex-itzhaki.md b/test/command/biblatex-itzhaki.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-itzhaki.md @@ -0,0 +1,82 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Itzhaki 1996) + +Itzhaki, Nissan. 1996. “Some Remarks on ’t Hooft’s S-matrix for Black +Holes” (version 1). March 11. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Itzhaki, 1996) + +Itzhaki, N. (1996, March 11). Some remarks on ’t Hooft’s S-matrix for +black holes. + + +NOTES: + +- biblio2yaml: + - eprinttype = {arxiv}, eprint = {hep-th/9603067}, + should be converted to a url: http://arxiv.org/abs/hep-th/9603067 + (prefix http://arxiv.org/abs/ seems to work for all arxiv material) + +- citeproc: + - obtaining correct case of "'t Hooft's" in title is possible but awkward: + '{t Hooft's} works; {'t Hooft}'s or '{t Hooft}'s do not + +} + +@Online{itzhaki, + author = {Itzhaki, Nissan}, + title = {Some remarks on '{t Hooft's} {S}-matrix for black holes}, + date = {1996-03-11}, + version = 1, + hyphenation = {american}, + eprinttype = {arxiv}, + eprint = {hep-th/9603067}, + annotation = {An online reference from arXiv. Note the + eprint and eprinttype fields. Also note that + the arXiv reference is transformed into a clickable link if + hyperref support has been enabled}, + abstract = {We discuss the limitations of 't Hooft's proposal for the + black hole S-matrix. We find that the validity of the S-matrix + implies violation of the semi-classical approximation at + scales large compared to the Planck scale. We also show that + the effect of the centrifugal barrier on the S-matrix is + crucial even for large transverse distances.}, +} + +^D +--- +nocite: "[@*]" +references: +- abstract: We discuss the limitations of 't Hooft's proposal for the + black hole S-matrix. We find that the validity of the S-matrix + implies violation of the semi-classical approximation at scales + large compared to the Planck scale. We also show that the effect of + the centrifugal barrier on the S-matrix is crucial even for large + transverse distances. + annote: An online reference from arXiv. Note the eprint and eprinttype + fields. Also note that the arXiv reference is transformed into a + clickable link if hyperref support has been enabled + author: + - family: Itzhaki + given: Nissan + id: itzhaki + issued: 1996-03-11 + language: en-US + title: Some remarks on '[t Hooft's]{.nocase} S-matrix for black holes + type: webpage + url: "https://arxiv.org/abs/hep-th/9603067" + version: 1 +--- + + +``` diff --git a/test/command/biblatex-jaffe.md b/test/command/biblatex-jaffe.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-jaffe.md @@ -0,0 +1,82 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Jaffé 1885–1888) + +Jaffé, Philipp, ed. 1885–1888. *Regesta Pontificum Romanorum ab condita +ecclesia ad annum post Christum natum \mcxcviii\*. 2nd ed. 2. +Leipzig. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Jaffé, 1885–1888) + +Jaffé, P. (Ed.). (1885–1888). *Regesta Pontificum Romanorum ab condita +ecclesia ad annum post Christum natum \mcxcviii\* (2nd ed., 1-2). +Leipzig. + + +NOTES: + +- biblatex conversion: + - hyphenation = {latin} +- citeproc: + - "vols." is missing + - works in Zotero + - This does not show up in the tests from the citeproc test suite that currently fail. + - "\ needs to be fixed. + - maybe add markdown syntax ^^small caps^^ ? + - in pandoc "plain" output, small caps could be converted to uppercase chars: "MCXCVIII" would definitely look better here. + +} + +@Collection{jaffe, + editor = {Jaff{\'e}, Philipp}, + title = {Regesta Pontificum Romanorum ab condita ecclesia ad annum post + Christum natum \textsc{mcxcviii}}, + date = {1885/1888}, + editora = {Loewenfeld, Samuel and Kaltenbrunner, Ferdinand and Ewald, + Paul}, + edition = 2, + volumes = 2, + location = {Leipzig}, + editoratype = {redactor}, + indextitle = {Regesta Pontificum Romanorum}, + shorttitle = {Regesta Pontificum Romanorum}, + annotation = {A collection entry with edition and + volumes fields. Note the editora and + editoratype fields}, + hyphenation = {latin}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A collection entry with edition and volumes fields. Note the + editora and editoratype fields + edition: 2 + editor: + - family: Jaffé + given: Philipp + id: jaffe + issued: 1885/1888 + language: la + number-of-volumes: 2 + publisher-place: Leipzig + title: Regesta Pontificum Romanorum ab condita ecclesia ad annum post + Christum natum [mcxcviii]{.smallcaps} + title-short: Regesta Pontificum Romanorum + type: book +--- + + +``` diff --git a/test/command/biblatex-jcg.md b/test/command/biblatex-jcg.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-jcg.md @@ -0,0 +1,54 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(“Semantic 3D Media and Content” 2011) + +“Semantic 3D Media and Content.” 2011. *Computers and Graphics* 35 (4). + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(“Semantic 3D media and content,” 2011) + +Semantic 3D media and content. (2011). *Computers and Graphics*, +*35*(4). + + +NOTES: + - output looks OK even if indistinguishable from article without page numbers + +} + +@Periodical{jcg, + title = {Computers and Graphics}, + year = 2011, + issuetitle = {Semantic {3D} Media and Content}, + volume = 35, + number = 4, + issn = {0097-8493}, + annotation = {This is a periodical entry with an issn + field.}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a periodical entry with an issn field. + container-title: Computers and Graphics + id: jcg + issn: 0097-8493 + issue: 4 + issued: 2011 + title: Semantic 3D media and content + type: article-journal + volume: 35 +--- + + +``` diff --git a/test/command/biblatex-kant-kpv.md b/test/command/biblatex-kant-kpv.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-kant-kpv.md @@ -0,0 +1,90 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Kant 1968) + +Kant, Immanuel. 1968. “Kritik der praktischen Vernunft.” In *Kants +Werke. Akademie Textausgabe*, by Immanuel Kant, 5:1–163. Berlin: Walter +de Gruyter. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Kant, 1968) + +Kant, I. (1968). Kritik der praktischen Vernunft. In *Kants Werke. +Akademie Textausgabe* (Vol. 5, pp. 1–163). Berlin: Walter de Gruyter. + + +NOTES: + +- citeproc + - support for the not yet official "volume-title" is missing + +- csl style file + - if author and container-author are identical, container-author should be suppressed (apparently csl style file issue; zotero shows same behaviour) + +} + +@InBook{kant:kpv, + title = {Kritik der praktischen Vernunft}, + date = 1968, + author = {Kant, Immanuel}, + booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft}, + bookauthor = {Kant, Immanuel}, + maintitle = {Kants Werke. Akademie Textausgabe}, + volume = 5, + publisher = {Walter de Gruyter}, + location = {Berlin}, + pages = {1-163}, + shorthand = {KpV}, + hyphenation = {german}, + shorttitle = {Kritik der praktischen Vernunft}, + annotation = {An edition of Kant's \emph{Collected Works}, volume five. This + is an inbook entry which explicitly refers to the + \emph{Critique of Practical Reason} only, not to the entire + fifth volume. Note the author and bookauthor + fields in the database file. By default, the + bookauthor is omitted if the values of the + author and bookauthor fields are identical}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An edition of Kant's *Collected Works*, volume five. This is + an inbook entry which explicitly refers to the *Critique of + Practical Reason* only, not to the entire fifth volume. Note the + author and bookauthor fields in the database file. By default, the + bookauthor is omitted if the values of the author and bookauthor + fields are identical + author: + - family: Kant + given: Immanuel + container-author: + - family: Kant + given: Immanuel + container-title: Kants Werke. Akademie Textausgabe + id: "kant:kpv" + issued: 1968 + language: de-DE + page: 1-163 + publisher: Walter de Gruyter + publisher-place: Berlin + title: Kritik der praktischen Vernunft + title-short: Kritik der praktischen Vernunft + type: chapter + volume: 5 + volume-title: Kritik der praktischen Vernunft. Kritik der + Urtheilskraft +--- + + +``` diff --git a/test/command/biblatex-kant-ku.md b/test/command/biblatex-kant-ku.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-kant-ku.md @@ -0,0 +1,82 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Kant 1968) + +Kant, Immanuel. 1968. “Kritik der Urtheilskraft.” In *Kants Werke. +Akademie Textausgabe*, by Immanuel Kant, 5:165–485. Berlin: Walter de +Gruyter. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Kant, 1968) + +Kant, I. (1968). Kritik der Urtheilskraft. In *Kants Werke. Akademie +Textausgabe* (Vol. 5, pp. 165–485). Berlin: Walter de Gruyter. + + +NOTES: + +- citeproc + - support for the not yet official "volume-title" is missing + +- CSL style file + - if author and container-author are identical, container-author should be suppressed (apparently csl style file issue; zotero shows same behaviour) + +} + +@InBook{kant:ku, + title = {Kritik der Urtheilskraft}, + date = 1968, + author = {Kant, Immanuel}, + booktitle = {Kritik der praktischen Vernunft. Kritik der Urtheilskraft}, + bookauthor = {Kant, Immanuel}, + maintitle = {Kants Werke. Akademie Textausgabe}, + volume = 5, + publisher = {Walter de Gruyter}, + location = {Berlin}, + pages = {165-485}, + shorthand = {KU}, + hyphenation = {german}, + annotation = {An edition of Kant's \emph{Collected Works}, volume five. This + is an inbook entry which explicitly refers to the + \emph{Critique of Judgment} only, not to the entire fifth + volume}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An edition of Kant's *Collected Works*, volume five. This is + an inbook entry which explicitly refers to the *Critique of + Judgment* only, not to the entire fifth volume + author: + - family: Kant + given: Immanuel + container-author: + - family: Kant + given: Immanuel + container-title: Kants Werke. Akademie Textausgabe + id: "kant:ku" + issued: 1968 + language: de-DE + page: 165-485 + publisher: Walter de Gruyter + publisher-place: Berlin + title: Kritik der Urtheilskraft + type: chapter + volume: 5 + volume-title: Kritik der praktischen Vernunft. Kritik der + Urtheilskraft +--- + + +``` diff --git a/test/command/biblatex-kastenholz.md b/test/command/biblatex-kastenholz.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-kastenholz.md @@ -0,0 +1,126 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Kastenholz and Hünenberger 2006) + +Kastenholz, M. A., and Philippe H. Hünenberger. 2006. “Computation of +Methodologyindependent Ionic Solvation Free Energies from Molecular +Simulations: I. the Electrostatic Potential in Molecular Liquids.” +*J. Chem. Phys.* 124. +doi:[10.1063/1.2172593](https://doi.org/10.1063/1.2172593 "10.1063/1.2172593"). + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Kastenholz & Hünenberger, 2006) + +Kastenholz, M. A., & Hünenberger, P. H. (2006). Computation of +methodologyindependent ionic solvation free energies from molecular +simulations: I. the electrostatic potential in molecular liquids. +*J. Chem. Phys.*, *124*. +doi:[10.1063/1.2172593](https://doi.org/10.1063/1.2172593 "10.1063/1.2172593") + + +NOTES: + +- biblio2xaml + - fix conversion of "\hyphen” + - the string "doi:" should not appear as part of the content of the "doi" field + +} + +@string{ jchph = {J.~Chem. Phys.} } + +@Article{kastenholz, + author = {Kastenholz, M. A. and H{\"u}nenberger, Philippe H.}, + title = {Computation of methodology\hyphen independent ionic solvation + free energies from molecular simulations}, + journaltitle = jchph, + date = 2006, + subtitle = {I. {The} electrostatic potential in molecular liquids}, + volume = 124, + eid = 124106, + doi = {10.1063/1.2172593}, + hyphenation = {american}, + indextitle = {Computation of ionic solvation free energies}, + annotation = {An article entry with an eid and a + doi field. Note that the \textsc{doi} is transformed + into a clickable link if hyperref support has been + enabled}, + abstract = {The computation of ionic solvation free energies from + atomistic simulations is a surprisingly difficult problem that + has found no satisfactory solution for more than 15 years. The + reason is that the charging free energies evaluated from such + simulations are affected by very large errors. One of these is + related to the choice of a specific convention for summing up + the contributions of solvent charges to the electrostatic + potential in the ionic cavity, namely, on the basis of point + charges within entire solvent molecules (M scheme) or on the + basis of individual point charges (P scheme). The use of an + inappropriate convention may lead to a charge-independent + offset in the calculated potential, which depends on the + details of the summation scheme, on the quadrupole-moment + trace of the solvent molecule, and on the approximate form + used to represent electrostatic interactions in the + system. However, whether the M or P scheme (if any) represents + the appropriate convention is still a matter of on-going + debate. The goal of the present article is to settle this + long-standing controversy by carefully analyzing (both + analytically and numerically) the properties of the + electrostatic potential in molecular liquids (and inside + cavities within them).}, +} + +^D +--- +nocite: "[@*]" +references: +- abstract: The computation of ionic solvation free energies from + atomistic simulations is a surprisingly difficult problem that has + found no satisfactory solution for more than 15 years. The reason is + that the charging free energies evaluated from such simulations are + affected by very large errors. One of these is related to the choice + of a specific convention for summing up the contributions of solvent + charges to the electrostatic potential in the ionic cavity, namely, + on the basis of point charges within entire solvent molecules (M + scheme) or on the basis of individual point charges (P scheme). The + use of an inappropriate convention may lead to a charge-independent + offset in the calculated potential, which depends on the details of + the summation scheme, on the quadrupole-moment trace of the solvent + molecule, and on the approximate form used to represent + electrostatic interactions in the system. However, whether the M or + P scheme (if any) represents the appropriate convention is still a + matter of on-going debate. The goal of the present article is to + settle this long-standing controversy by carefully analyzing (both + analytically and numerically) the properties of the electrostatic + potential in molecular liquids (and inside cavities within them). + annote: An article entry with an eid and a doi field. Note that the + [doi]{.smallcaps} is transformed into a clickable link if hyperref + support has been enabled + author: + - family: Kastenholz + given: M. A. + - family: Hünenberger + given: Philippe H. + container-title: J. Chem. Phys. + doi: 10.1063/1.2172593 + id: kastenholz + issued: 2006 + language: en-US + title: "Computation of methodology-independent ionic solvation free + energies from molecular simulations: I. The electrostatic potential + in molecular liquids" + title-short: Computation of methodology-independent ionic solvation + free energies from molecular simulations + type: article-journal + volume: 124 +--- + + +``` diff --git a/test/command/biblatex-knuth-ct-a.md b/test/command/biblatex-knuth-ct-a.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-knuth-ct-a.md @@ -0,0 +1,78 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Knuth 1984) + +Knuth, Donald E. 1984. *Computers & Typesetting*. Vol. A. Reading, +Mass.: Addison-Wesley. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Knuth, 1984) + +Knuth, D. E. (1984). *Computers & typesetting* (Vol. A). Reading, Mass.: +Addison-Wesley. + + +NOTES: + +- volume-title currently not implemented by chicago-author-date.csl and apa.csl. + +} + +@Book{knuth:ct:a, + author = {Knuth, Donald E.}, + title = {The {\TeX} book}, + date = 1984, + maintitle = {Computers \& Typesetting}, + volume = {A}, + publisher = {Addison-Wesley}, + location = {Reading, Mass.}, + hyphenation = {american}, + sortyear = {1984-1}, + sorttitle = {Computers & Typesetting A}, + indexsorttitle= {The TeXbook}, + indextitle = {\protect\TeX book, The}, + shorttitle = {\TeX book}, + annotation = {The first volume of a five-volume book. Note the + sorttitle and sortyear fields. We want this + volume to be listed after the entry referring to the entire + five-volume set. Also note the indextitle and + indexsorttitle fields. Indexing packages that don't + generate robust index entries require some control sequences + to be protected from expansion}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: The first volume of a five-volume book. Note the sorttitle and + sortyear fields. We want this volume to be listed after the entry + referring to the entire five-volume set. Also note the indextitle + and indexsorttitle fields. Indexing packages that don't generate + robust index entries require some control sequences to be protected + from expansion + author: + - family: Knuth + given: Donald E. + id: "knuth:ct:a" + issued: 1984 + language: en-US + publisher: Addison-Wesley + publisher-place: Reading, Mass. + title: Computers & typesetting + type: book + volume: A + volume-title: The TeX book +--- + + +``` diff --git a/test/command/biblatex-knuth-ct-b.md b/test/command/biblatex-knuth-ct-b.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-knuth-ct-b.md @@ -0,0 +1,70 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2015-03-08: + +(Knuth 1986) + +Knuth, Donald E. 1986. *Computers & Typesetting*. Vol. B. Reading, +Mass.: Addison-Wesley. + + +Formatted with pandoc and apa.csl, 2015-03-08: + +(Knuth, 1986) + +Knuth, D. E. (1986). *Computers & typesetting* (Vol. B). Reading, Mass.: +Addison-Wesley. + + +NOTES: + +- volume-title currently not implemented by chicago-author-date.csl and apa.csl. + +} + +@Book{knuth:ct:b, + author = {Knuth, Donald E.}, + title = {\TeX: {T}he Program}, + date = 1986, + maintitle = {Computers \& Typesetting}, + volume = {B}, + publisher = {Addison-Wesley}, + location = {Reading, Mass.}, + hyphenation = {american}, + sortyear = {1986-1}, + sorttitle = {Computers & Typesetting B}, + indexsorttitle= {TeX: The Program}, + shorttitle = {\TeX}, + annotation = {The second volume of a five-volume book. Note the + sorttitle and sortyear fields. Also note the + indexsorttitle field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: The second volume of a five-volume book. Note the sorttitle + and sortyear fields. Also note the indexsorttitle field + author: + - family: Knuth + given: Donald E. + id: "knuth:ct:b" + issued: 1986 + language: en-US + publisher: Addison-Wesley + publisher-place: Reading, Mass. + title: Computers & typesetting + title-short: TeX + type: book + volume: B + volume-title: "TeX: The program" +--- + + +``` diff --git a/test/command/biblatex-knuth-ct-c.md b/test/command/biblatex-knuth-ct-c.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-knuth-ct-c.md @@ -0,0 +1,69 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2015-03-08: + +(Knuth 1986) + +Knuth, Donald E. 1986. *Computers & Typesetting*. Vol. C. Reading, +Mass.: Addison-Wesley. + + +Formatted with pandoc and apa.csl, 2015-03-08: + +(Knuth, 1986) + +Knuth, D. E. (1986). *Computers & typesetting* (Vol. C). Reading, Mass.: +Addison-Wesley. + + +NOTES: + +- volume-title currently not implemented by chicago-author-date.csl and apa.csl. + +} + +@Book{knuth:ct:c, + author = {Knuth, Donald E.}, + title = {The {METAFONTbook}}, + date = 1986, + maintitle = {Computers \& Typesetting}, + volume = {C}, + publisher = {Addison-Wesley}, + location = {Reading, Mass.}, + hyphenation = {american}, + sortyear = {1986-2}, + sorttitle = {Computers & Typesetting C}, + indextitle = {METAFONTbook, The}, + shorttitle = {{METAFONTbook}}, + annotation = {The third volume of a five-volume book. Note the + sorttitle and sortyear fields as well as the + indextitle field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: The third volume of a five-volume book. Note the sorttitle and + sortyear fields as well as the indextitle field + author: + - family: Knuth + given: Donald E. + id: "knuth:ct:c" + issued: 1986 + language: en-US + publisher: Addison-Wesley + publisher-place: Reading, Mass. + title: Computers & typesetting + type: book + volume: C + volume-title: The METAFONTbook +--- + + +``` diff --git a/test/command/biblatex-knuth-ct-d.md b/test/command/biblatex-knuth-ct-d.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-knuth-ct-d.md @@ -0,0 +1,71 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2015-03-08: + +(Knuth 1986) + +Knuth, Donald E. 1986. *Computers & Typesetting*. Vol. D. Reading, +Mass.: Addison-Wesley. + + +Formatted with pandoc and apa.csl, 2015-03-08: + +(Knuth, 1986) + +Knuth, D. E. (1986). *Computers & typesetting* (Vol. D). Reading, Mass.: +Addison-Wesley. + + +NOTES: + +- biblio2yaml + - Should letters following a colon, such as the "T" in "{{METAFONT}: {T}he Program}" be protected by default? -- I'm not sure ... + +- volume-title currently not implemented by chicago-author-date.csl and apa.csl. + +} + +@Book{knuth:ct:d, + author = {Knuth, Donald E.}, + title = {{METAFONT}: {T}he Program}, + date = 1986, + maintitle = {Computers \& Typesetting}, + volume = {D}, + publisher = {Addison-Wesley}, + location = {Reading, Mass.}, + hyphenation = {american}, + sortyear = {1986-3}, + sorttitle = {Computers & Typesetting D}, + shorttitle = {{METAFONT}}, + annotation = {The fourth volume of a five-volume book. Note the + sorttitle and sortyear fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: The fourth volume of a five-volume book. Note the sorttitle + and sortyear fields + author: + - family: Knuth + given: Donald E. + id: "knuth:ct:d" + issued: 1986 + language: en-US + publisher: Addison-Wesley + publisher-place: Reading, Mass. + title: Computers & typesetting + title-short: METAFONT + type: book + volume: D + volume-title: "METAFONT: The program" +--- + + +``` diff --git a/test/command/biblatex-knuth-ct-e.md b/test/command/biblatex-knuth-ct-e.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-knuth-ct-e.md @@ -0,0 +1,66 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2015-03-08: + +(Knuth 1986) + +Knuth, Donald E. 1986. *Computers & Typesetting*. Vol. E. Reading, +Mass.: Addison-Wesley. + + +Formatted with pandoc and apa.csl, 2015-03-08: + +(Knuth, 1986) + +Knuth, D. E. (1986). *Computers & typesetting* (Vol. E). Reading, Mass.: +Addison-Wesley. + + +NOTES: + +- volume-title currently not implemented by chicago-author-date.csl and apa.csl. + +} + +@Book{knuth:ct:e, + author = {Knuth, Donald E.}, + title = {Computer Modern Typefaces}, + date = 1986, + maintitle = {Computers \& Typesetting}, + volume = {E}, + publisher = {Addison-Wesley}, + location = {Reading, Mass.}, + hyphenation = {american}, + sortyear = {1986-4}, + sorttitle = {Computers & Typesetting E}, + annotation = {The fifth volume of a five-volume book. Note the + sorttitle and sortyear fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: The fifth volume of a five-volume book. Note the sorttitle and + sortyear fields + author: + - family: Knuth + given: Donald E. + id: "knuth:ct:e" + issued: 1986 + language: en-US + publisher: Addison-Wesley + publisher-place: Reading, Mass. + title: Computers & typesetting + type: book + volume: E + volume-title: Computer modern typefaces +--- + + +``` diff --git a/test/command/biblatex-knuth-ct-related.md b/test/command/biblatex-knuth-ct-related.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-knuth-ct-related.md @@ -0,0 +1,72 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Knuth 1984–1986) + +Knuth, Donald E. 1984–1986. *Computers & Typesetting*. 5. Reading, +Mass.: Addison-Wesley. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Knuth, 1984–1986) + +Knuth, D. E. (1984–1986). *Computers & typesetting* (1-5). Reading, +Mass.: Addison-Wesley. + + +NOTES: + +- biblio2yaml + - related = {...}, relatedtype = {multivolume}, -- no counterpart in CSL + +- citeproc + - term "vols." missing + +} + +@Book{knuth:ct:related, + author = {Knuth, Donald E.}, + title = {Computers \& Typesetting}, + date = {1984/1986}, + volumes = 5, + publisher = {Addison-Wesley}, + location = {Reading, Mass.}, + hyphenation = {american}, + sortyear = {1984-0}, + sorttitle = {Computers & Typesetting}, + indexsorttitle= {Computers & Typesetting}, + related = {knuth:ct:a,knuth:ct:b,knuth:ct:c,knuth:ct:d,knuth:ct:e}, + relatedtype = {multivolume}, + annotation = {A five-volume book cited as a whole and related to its + individual volumes. Note the related and + relatedtype fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A five-volume book cited as a whole and related to its + individual volumes. Note the related and relatedtype fields + author: + - family: Knuth + given: Donald E. + id: "knuth:ct:related" + issued: 1984/1986 + language: en-US + number-of-volumes: 5 + publisher: Addison-Wesley + publisher-place: Reading, Mass. + title: Computers & typesetting + type: book +--- + + +``` diff --git a/test/command/biblatex-knuth-ct.md b/test/command/biblatex-knuth-ct.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-knuth-ct.md @@ -0,0 +1,66 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Knuth 1984–1986) + +Knuth, Donald E. 1984–1986. *Computers & Typesetting*. 5. Reading, +Mass.: Addison-Wesley. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Knuth, 1984–1986) + +Knuth, D. E. (1984–1986). *Computers & typesetting* (1-5). Reading, +Mass.: Addison-Wesley. + + +NOTES: + +- citeproc + - term "vols." is missing + +} + +@Book{knuth:ct, + author = {Knuth, Donald E.}, + title = {Computers \& Typesetting}, + date = {1984/1986}, + volumes = 5, + publisher = {Addison-Wesley}, + location = {Reading, Mass.}, + hyphenation = {american}, + sortyear = {1984-0}, + sorttitle = {Computers & Typesetting}, + indexsorttitle= {Computers & Typesetting}, + annotation = {A five-volume book cited as a whole. This is a book + entry, note the volumes field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A five-volume book cited as a whole. This is a book entry, + note the volumes field + author: + - family: Knuth + given: Donald E. + id: "knuth:ct" + issued: 1984/1986 + language: en-US + number-of-volumes: 5 + publisher: Addison-Wesley + publisher-place: Reading, Mass. + title: Computers & typesetting + type: book +--- + + +``` diff --git a/test/command/biblatex-kowalik.md b/test/command/biblatex-kowalik.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-kowalik.md @@ -0,0 +1,68 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Kowalik and Isard 1995) + +Kowalik, F., and M. Isard. 1995. “Estimateur d’un défaut de +fonctionnement d’un modulateur en quadrature et étage de modulation +l’utilisant.” French patent request. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Kowalik & Isard, 1995) + +Kowalik, F., & Isard, M. (1995, January 11). Estimateur d’un défaut de +fonctionnement d’un modulateur en quadrature et étage de modulation +l’utilisant. French patent request. + + +} + +@Patent{kowalik, + author = {Kowalik, F. and Isard, M.}, + title = {Estimateur d'un d{\'e}faut de fonctionnement d'un modulateur + en quadrature et {\'e}tage de modulation l'utilisant}, + number = 9500261, + date = {1995-01-11}, + type = {patreqfr}, + hyphenation = {french}, + indextitle = {Estimateur d'un d{\'e}faut de fonctionnement}, + annotation = {This is a patent entry for a French patent request + with a full date. The number is given in the number + field. Note the format of the type and date + fields in the database file. Compare almendro, + laufenberg, and sorace}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a patent entry for a French patent request with a full + date. The number is given in the number field. Note the format of + the type and date fields in the database file. Compare almendro, + laufenberg, and sorace + author: + - family: Kowalik + given: F. + - family: Isard + given: M. + genre: French patent request + id: kowalik + issued: 1995-01-11 + language: fr-FR + number: 9500261 + title: Estimateur d'un défaut de fonctionnement d'un modulateur en + quadrature et étage de modulation l'utilisant + type: patent +--- + + +``` diff --git a/test/command/biblatex-kullback-related.md b/test/command/biblatex-kullback-related.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-kullback-related.md @@ -0,0 +1,62 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Kullback 1997) + +Kullback, Solomon. 1997. *Information Theory and Statistics*. New York: +Dover Publications. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Kullback, 1997) + +Kullback, S. (1997). *Information theory and statistics*. New York: +Dover Publications. + + +NOTES: + +- related = {kullback}, relatedtype = {origpubin}, -- not possible in CSL + +} + +@Book{kullback:related, + author = {Kullback, Solomon}, + title = {Information Theory and Statistics}, + year = 1997, + publisher = {Dover Publications}, + location = {New York}, + hyphenation = {american}, + related = {kullback}, + relatedtype = {origpubin}, + annotation = {A reprint of the kullback entry. Note the format of + the related and relatedtype fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A reprint of the kullback entry. Note the format of the + related and relatedtype fields + author: + - family: Kullback + given: Solomon + id: "kullback:related" + issued: 1997 + language: en-US + publisher: Dover Publications + publisher-place: New York + title: Information theory and statistics + type: book +--- + + +``` diff --git a/test/command/biblatex-kullback-reprint.md b/test/command/biblatex-kullback-reprint.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-kullback-reprint.md @@ -0,0 +1,71 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Kullback 1997) + +Kullback, Solomon. 1997. *Information Theory and Statistics*. New York: +Dover Publications. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Kullback, 1997) + +Kullback, S. (1997). *Information theory and statistics*. New York: +Dover Publications. + + +NOTES: + +Formatted with chicago-author-date-TEST-20131018.csl + +(Kullback [1959] 1997) + +Kullback, Solomon. (1959) 1997. *Information Theory and Statistics*. New +York: Dover Publications. + +} + +@Book{kullback:reprint, + author = {Kullback, Solomon}, + title = {Information Theory and Statistics}, + year = 1997, + publisher = {Dover Publications}, + location = {New York}, + origyear = 1959, + origpublisher= {John Wiley \& Sons}, + hyphenation = {american}, + annotation = {A reprint of the kullback entry. Note the format of + origyear and origpublisher. These fields are + not used by the standard bibliography styles}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A reprint of the kullback entry. Note the format of origyear + and origpublisher. These fields are not used by the standard + bibliography styles + author: + - family: Kullback + given: Solomon + id: "kullback:reprint" + issued: 1997 + language: en-US + original-date: 1959 + original-publisher: John Wiley & Sons + publisher: Dover Publications + publisher-place: New York + title: Information theory and statistics + type: book +--- + + +``` diff --git a/test/command/biblatex-kullback.md b/test/command/biblatex-kullback.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-kullback.md @@ -0,0 +1,52 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Kullback 1959) + +Kullback, Solomon. 1959. *Information Theory and Statistics*. New York: +John Wiley & Sons. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Kullback, 1959) + +Kullback, S. (1959). *Information theory and statistics*. New York: John +Wiley & Sons. + + +} + +@Book{kullback, + author = {Kullback, Solomon}, + title = {Information Theory and Statistics}, + year = 1959, + publisher = {John Wiley \& Sons}, + location = {New York}, + hyphenation = {american}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Kullback + given: Solomon + id: kullback + issued: 1959 + language: en-US + publisher: John Wiley & Sons + publisher-place: New York + title: Information theory and statistics + type: book +--- + + +``` diff --git a/test/command/biblatex-laufenberg.md b/test/command/biblatex-laufenberg.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-laufenberg.md @@ -0,0 +1,109 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Laufenberg et al. 2006) + +Laufenberg, Xaver, Dominique Eynius, Helmut Suelzle, Stephan Usbeck, +Matthias Spaeth, Miriam Neuser-Hoffmann, Christian Myrzik, et al. 2006. +“Elektrische Einrichtung und Betriebsverfahren.” European patent. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Laufenberg et al., 2006) + +Laufenberg, X., Eynius, D., Suelzle, H., Usbeck, S., Spaeth, M., +Neuser-Hoffmann, M., … Ebner, N. (2006, September 13). Elektrische +Einrichtung und Betriebsverfahren. European patent. + + +NOTES: + +- biblio2yaml + - Is there any equivalent of "holder" in CSL? + +} + +@Patent{laufenberg, + author = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut + and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann, + Miriam and Myrzik, Christian and Schmid, Manfred and Nietfeld, + Franz and Thiel, Alexander and Braun, Harald and Ebner, + Norbert}, + title = {Elektrische Einrichtung und Betriebsverfahren}, + number = 1700367, + date = {2006-09-13}, + holder = {{Robert Bosch GmbH} and {Daimler Chrysler AG} and {Bayerische + Motoren Werke AG}}, + type = {patenteu}, + hyphenation = {german}, + annotation = {This is a patent entry with a holder field. + Note the format of the type and location + fields in the database file. Compare almendro, + sorace, and kowalik}, + abstract = {The invention relates to an electric device comprising a + generator, in particular for use in the vehicle electric + system of a motor vehicle and a controller for controlling the + generator voltage. The device is equipped with a control zone, + in which the voltage is controlled and zones, in which the + torque is controlled. The invention also relates to methods + for operating a device of this type.}, + file = {http://v3.espacenet.com/textdoc?IDX=EP1700367}, +} + +^D +--- +nocite: "[@*]" +references: +- abstract: The invention relates to an electric device comprising a + generator, in particular for use in the vehicle electric system of a + motor vehicle and a controller for controlling the generator + voltage. The device is equipped with a control zone, in which the + voltage is controlled and zones, in which the torque is controlled. + The invention also relates to methods for operating a device of this + type. + annote: This is a patent entry with a holder field. Note the format of + the type and location fields in the database file. Compare almendro, + sorace, and kowalik + author: + - family: Laufenberg + given: Xaver + - family: Eynius + given: Dominique + - family: Suelzle + given: Helmut + - family: Usbeck + given: Stephan + - family: Spaeth + given: Matthias + - family: Neuser-Hoffmann + given: Miriam + - family: Myrzik + given: Christian + - family: Schmid + given: Manfred + - family: Nietfeld + given: Franz + - family: Thiel + given: Alexander + - family: Braun + given: Harald + - family: Ebner + given: Norbert + genre: European patent + id: laufenberg + issued: 2006-09-13 + language: de-DE + number: 1700367 + title: Elektrische Einrichtung und Betriebsverfahren + type: patent +--- + + +``` diff --git a/test/command/biblatex-loh.md b/test/command/biblatex-loh.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-loh.md @@ -0,0 +1,65 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Loh 1992) + +Loh, Nin C. 1992. “High-resolution Micromachined Interferometric +Accelerometer.” Master’s thesis, Cambridge, Mass.: Massachusetts +Institute of Technology. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Loh, 1992) + +Loh, N. C. (1992). *High-resolution micromachined interferometric +accelerometer* (Master’s thesis). Massachusetts Institute of Technology, +Cambridge, Mass. + + +NOTES: + +- biblio2yaml + - At some point, actual localization of "localization keys" will have to be implemented + +} + +@Thesis{loh, + author = {Loh, Nin C.}, + title = {High-Resolution Micromachined Interferometric Accelerometer}, + type = {mathesis}, + institution = {Massachusetts Institute of Technology}, + date = 1992, + location = {Cambridge, Mass.}, + hyphenation = {american}, + annotation = {This is a typical thesis entry for an MA thesis. Note + the type field in the database file which uses a + localization key}, +} +^D +--- +nocite: "[@*]" +references: +- annote: This is a typical thesis entry for an MA thesis. Note the type + field in the database file which uses a localization key + author: + - family: Loh + given: Nin C. + genre: Master's thesis + id: loh + issued: 1992 + language: en-US + publisher: Massachusetts Institute of Technology + publisher-place: Cambridge, Mass. + title: High-resolution micromachined interferometric accelerometer + type: thesis +--- + + +``` diff --git a/test/command/biblatex-malinowski.md b/test/command/biblatex-malinowski.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-malinowski.md @@ -0,0 +1,67 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Malinowski 1972) + +Malinowski, Bronisław. 1972. *Argonauts of the Western Pacific: An +Account of Native Enterprise and Adventure in the Archipelagoes of +Melanesian New Guinea*. 8th ed. London: Routledge and Kegan Paul. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Malinowski, 1972) + +Malinowski, B. (1972). *Argonauts of the Western Pacific: An account of +native enterprise and adventure in the Archipelagoes of Melanesian New +Guinea* (8th ed.). London: Routledge and Kegan Paul. + + +} + +@Book{malinowski, + author = {Malinowski, Bronis{\l}aw}, + title = {Argonauts of the {Western Pacific}}, + date = 1972, + edition = 8, + publisher = {Routledge {and} Kegan Paul}, + location = {London}, + hyphenation = {british}, + subtitle = {An account of native enterprise and adventure in the + {Archipelagoes of Melanesian New Guinea}}, + shorttitle = {Argonauts}, + annotation = {This is a book entry. Note the format of the + publisher and edition fields as well as the + subtitle field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a book entry. Note the format of the publisher and + edition fields as well as the subtitle field + author: + - family: Malinowski + given: Bronisław + edition: 8 + id: malinowski + issued: 1972 + language: en-GB + publisher: Routledge and Kegan Paul + publisher-place: London + title: "Argonauts of the Western Pacific: An account of native + enterprise and adventure in the [Archipelagoes of Melanesian New + Guinea]{.nocase}" + title-short: Argonauts + type: book +--- + + +``` diff --git a/test/command/biblatex-manual.md b/test/command/biblatex-manual.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-manual.md @@ -0,0 +1,51 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{adapted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib} + +@Manual{cms, + title = {The {Chicago} Manual of Style}, + date = 2003, + subtitle = {The Essential Guide for Writers, Editors, and Publishers}, + edition = 15, + publisher = {University of Chicago Press}, + location = {Chicago, Ill.}, + isbn = {0-226-10403-6}, + label = {CMS}, + hyphenation = {american}, + sorttitle = {Chicago Manual of Style}, + indextitle = {Chicago Manual of Style, The}, + shorttitle = {Chicago Manual of Style}, + annotation = {This is a manual entry without an author or + editor. Note the label field in the database + file which is provided for author-year citation styles. Also + note the sorttitle and indextitle fields. By + default, all entries without an author or + editor are alphabetized by title but we want + this entry to be alphabetized under \enquote*{C} rather than + \enquote*{T}. There's also an isbn field}, +} +^D +--- +nocite: "[@*]" +references: +- annote: This is a manual entry without an author or editor. Note the + label field in the database file which is provided for author-year + citation styles. Also note the sorttitle and indextitle fields. By + default, all entries without an author or editor are alphabetized by + title but we want this entry to be alphabetized under 'C' rather + than 'T'. There's also an isbn field + edition: 15 + id: cms + isbn: 0-226-10403-6 + issued: 2003 + language: en-US + publisher: University of Chicago Press + publisher-place: Chicago, Ill. + title: "The Chicago manual of style: The essential guide for writers, + editors, and publishers" + title-short: Chicago manual of style + type: book +--- + + +``` diff --git a/test/command/biblatex-markey.md b/test/command/biblatex-markey.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-markey.md @@ -0,0 +1,65 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Markey 2005) + +Markey, Nicolas. 2005. “Tame the BeaST: The B to X of BibTeX” (version +1.3). October 16. +. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Markey, 2005) + +Markey, N. (2005, October 16). Tame the BeaST: The B to X of BibTeX. +Retrieved October 01, 2006, from + + + +} + +@Online{markey, + author = {Markey, Nicolas}, + title = {Tame the {BeaST}}, + date = {2005-10-16}, + url = + {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf}, + subtitle = {The {B} to {X} of {BibTeX}}, + version = {1.3}, + urldate = {2006-10-01}, + hyphenation = {american}, + sorttitle = {Tame the Beast}, + annotation = {An online entry for a tutorial. Note the format of + the date field (yyyy-mm-dd) in the database + file.}, +} + +^D +--- +nocite: "[@*]" +references: +- accessed: 2006-10-01 + annote: An online entry for a tutorial. Note the format of the date + field (yyyy-mm-dd) in the database file. + author: + - family: Markey + given: Nicolas + id: markey + issued: 2005-10-16 + language: en-US + title: "Tame the BeaST: The B to X of BibTeX" + title-short: Tame the BeaST + type: webpage + url: "http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf" + version: 1.3 +--- + + +``` diff --git a/test/command/biblatex-maron.md b/test/command/biblatex-maron.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-maron.md @@ -0,0 +1,70 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Maron 2000) + +Maron, Monika. 2000. *Animal Triste*. Translated by Brigitte Goldstein. +Lincoln: University of Nebraska Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Maron, 2000) + +Maron, M. (2000). *Animal triste*. (B. Goldstein, Trans.). Lincoln: +University of Nebraska Press. + + +NOTES: + +- origlanguage concatenated with translator, e.g. “translated from the German by …” not possible in CSL + +} + +@Book{maron, + author = {Maron, Monika}, + title = {Animal Triste}, + date = 2000, + translator = {Brigitte Goldstein}, + origlanguage = {german}, + publisher = {University of Nebraska Press}, + location = {Lincoln}, + hyphenation = {american}, + shorttitle = {Animal Triste}, + annotation = {An English translation of a German novel with a French title. + In other words: a book entry with a + translator field. Note the origlanguage + field which is concatenated with the translator}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: "An English translation of a German novel with a French title. + In other words: a book entry with a translator field. Note the + origlanguage field which is concatenated with the translator" + author: + - family: Maron + given: Monika + id: maron + issued: 2000 + language: en-US + publisher: University of Nebraska Press + publisher-place: Lincoln + title: Animal triste + title-short: Animal triste + translator: + - family: Goldstein + given: Brigitte + type: book +--- + + +``` diff --git a/test/command/biblatex-massa.md b/test/command/biblatex-massa.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-massa.md @@ -0,0 +1,56 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Massa 2004) + +Massa, Werner. 2004. *Crystal Structure Determination*. 2nd ed. Berlin: +Spinger. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Massa, 2004) + +Massa, W. (2004). *Crystal structure determination* (2nd ed.). Berlin: +Spinger. + + +} + +@Book{massa, + author = {Werner Massa}, + title = {Crystal structure determination}, + date = 2004, + edition = 2, + publisher = {Spinger}, + location = {Berlin}, + hyphenation = {british}, + annotation = {A book entry with an edition field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry with an edition field + author: + - family: Massa + given: Werner + edition: 2 + id: massa + issued: 2004 + language: en-GB + publisher: Spinger + publisher-place: Berlin + title: Crystal structure determination + type: book +--- + + +``` diff --git a/test/command/biblatex-moore-related.md b/test/command/biblatex-moore-related.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-moore-related.md @@ -0,0 +1,66 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Moore 1998) + +Moore, Gordon E. 1998. “Cramming More Components onto Integrated +Circuits.” *Proceedings of the IEEE* 86 (1): 82–85. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Moore, 1998) + +Moore, G. E. (1998). Cramming more components onto integrated circuits. +*Proceedings of the IEEE*, *86*(1), 82–85. + + +NOTES: + +- "related = {moore}, relatedtype = {reprintfrom}," – no equivalent implemented in CSL + +} + +@Article{moore:related, + author = {Moore, Gordon E.}, + title = {Cramming more components onto integrated circuits}, + journaltitle = {Proceedings of the {IEEE}}, + year = 1998, + volume = 86, + number = 1, + pages = {82-85}, + hyphenation = {american}, + related = {moore}, + relatedtype = {reprintfrom}, + annotation = {A reprint of Moore's law. Note the related and + relatedtype fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A reprint of Moore's law. Note the related and relatedtype + fields + author: + - family: Moore + given: Gordon E. + container-title: Proceedings of the IEEE + id: "moore:related" + issue: 1 + issued: 1998 + language: en-US + page: 82-85 + title: Cramming more components onto integrated circuits + type: article-journal + volume: 86 +--- + + +``` diff --git a/test/command/biblatex-moore.md b/test/command/biblatex-moore.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-moore.md @@ -0,0 +1,56 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Moore 1965) + +Moore, Gordon E. 1965. “Cramming More Components onto Integrated +Circuits.” *Electronics* 38 (8): 114–117. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Moore, 1965) + +Moore, G. E. (1965). Cramming more components onto integrated circuits. +*Electronics*, *38*(8), 114–117. + + +} + +@Article{moore, + author = {Moore, Gordon E.}, + title = {Cramming more components onto integrated circuits}, + journaltitle = {Electronics}, + year = 1965, + volume = 38, + number = 8, + pages = {114-117}, + hyphenation = {american}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Moore + given: Gordon E. + container-title: Electronics + id: moore + issue: 8 + issued: 1965 + language: en-US + page: 114-117 + title: Cramming more components onto integrated circuits + type: article-journal + volume: 38 +--- + + +``` diff --git a/test/command/biblatex-moraux.md b/test/command/biblatex-moraux.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-moraux.md @@ -0,0 +1,94 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Moraux 1979) + +Moraux, Paul. 1979. “Le *De Anima* dans la tradition grècque: Quelques +aspects de l’interpretation du traité, de Theophraste à Themistius.” In +*Aristotle on Mind and the Senses. Proceedings of the Seventh Symposium +Aristotelicum*, edited by G. E. R. Lloyd and G. E. L. Owen, 281–324. +Cambridge: Cambridge University Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Moraux, 1979) + +Moraux, P. (1979). Le *De Anima* dans la tradition grècque: Quelques +aspects de l’interpretation du traité, de Theophraste à Themistius. In +G. E. R. Lloyd & G. E. L. Owen (eds.), *Aristotle on Mind and the +Senses. Proceedings of the Seventh Symposium Aristotelicum* (pp. +281–324). Cambridge: Cambridge University Press. + + +NOTES: + +- Since case (conversion) can only be specified per entry, not per field, for apa.csl the case of container-title would have to be adjusted manually. + +} + +@string{ cup = {Cambridge University Press} } + +@InProceedings{moraux, + author = {Moraux, Paul}, + editor = {Lloyd, G. E. R. and Owen, G. E. L.}, + title = {Le \emph{De Anima} dans la tradition gr{\`e}cque}, + date = 1979, + booktitle = {Aristotle on Mind and the Senses}, + subtitle = {Quelques aspects de l'interpretation du trait{\'e}, de + Theophraste {\`a} Themistius}, + booktitleaddon= {Proceedings of the Seventh Symposium Aristotelicum}, + eventdate = 1975, + publisher = cup, + location = {Cambridge}, + pages = {281-324}, + keywords = {secondary}, + hyphenation = {french}, + indexsorttitle= {De Anima dans la tradition grecque}, + indextitle = {\emph{De Anima} dans la tradition gr{\`e}cque, Le}, + shorttitle = {\emph{De Anima} dans la tradition gr{\`e}cque}, + annotation = {This is a typical inproceedings entry. Note the + booksubtitle, shorttitle, + indextitle, and indexsorttitle fields. Also + note the eventdate field.}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a typical inproceedings entry. Note the booksubtitle, + shorttitle, indextitle, and indexsorttitle fields. Also note the + eventdate field. + author: + - family: Moraux + given: Paul + container-title: Aristotle on Mind and the Senses. Proceedings of the + Seventh Symposium Aristotelicum + editor: + - family: Lloyd + given: G. E. R. + - family: Owen + given: G. E. L. + event-date: 1975 + id: moraux + issued: 1979 + keyword: secondary + language: fr-FR + page: 281-324 + publisher: Cambridge University Press + publisher-place: Cambridge + title: "Le *De Anima* dans la tradition grècque: Quelques aspects de + l'interpretation du traité, de Theophraste à Themistius" + title-short: "*De Anima* dans la tradition grècque" + type: paper-conference +--- + + +``` diff --git a/test/command/biblatex-murray.md b/test/command/biblatex-murray.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-murray.md @@ -0,0 +1,105 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Hostetler et al. 1998) + +Hostetler, Michael J., Julia E. Wingate, Chuan-Jian Zhong, Jay E. +Harris, Richard W. Vachet, Michael R. Clark, J. David Londono, et al. +1998. “Alkanethiolate Gold Cluster Molecules with Core Diameters from +1.5 to 5.2 nm: Core and Monolayer Properties as a Function of Core +Size.” *Langmuir* 14 (1): 17–30. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Hostetler et al., 1998) + +Hostetler, M. J., Wingate, J. E., Zhong, C.-J., Harris, J. E., Vachet, +R. W., Clark, M. R., … Murray, R. W. (1998). Alkanethiolate gold cluster +molecules with core diameters from 1.5 to 5.2 nm: Core and monolayer +properties as a function of core size. *Langmuir*, *14*(1), 17–30. + + +} + +@Article{murray, + author = {Hostetler, Michael J. and Wingate, Julia E. and Zhong, + Chuan-Jian and Harris, Jay E. and Vachet, Richard W. and + Clark, Michael R. and Londono, J. David and Green, Stephen + J. and Stokes, Jennifer J. and Wignall, George D. and Glish, + Gary L. and Porter, Marc D. and Evans, Neal D. and Murray, + Royce W.}, + title = {Alkanethiolate gold cluster molecules with core diameters from + 1.5 to 5.2~{nm}}, + journaltitle = {Langmuir}, + date = 1998, + subtitle = {Core and monolayer properties as a function of core size}, + volume = 14, + number = 1, + pages = {17-30}, + hyphenation = {american}, + indextitle = {Alkanethiolate gold cluster molecules}, + shorttitle = {Alkanethiolate gold cluster molecules}, + annotation = {An article entry with \arabic{author} authors. By + default, long author and editor lists are automatically + truncated. This is configurable}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An article entry with `\arabic{author}`{=latex} authors. By + default, long author and editor lists are automatically truncated. + This is configurable + author: + - family: Hostetler + given: Michael J. + - family: Wingate + given: Julia E. + - family: Zhong + given: Chuan-Jian + - family: Harris + given: Jay E. + - family: Vachet + given: Richard W. + - family: Clark + given: Michael R. + - family: Londono + given: J. David + - family: Green + given: Stephen J. + - family: Stokes + given: Jennifer J. + - family: Wignall + given: George D. + - family: Glish + given: Gary L. + - family: Porter + given: Marc D. + - family: Evans + given: Neal D. + - family: Murray + given: Royce W. + container-title: Langmuir + id: murray + issue: 1 + issued: 1998 + language: en-US + page: 17-30 + title: "Alkanethiolate gold cluster molecules with core diameters from + 1.5 to 5.2 [nm]{.nocase}: Core and monolayer properties as a + function of core size" + title-short: Alkanethiolate gold cluster molecules + type: article-journal + volume: 14 +--- + + +``` diff --git a/test/command/biblatex-nietzsche-historie.md b/test/command/biblatex-nietzsche-historie.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-nietzsche-historie.md @@ -0,0 +1,100 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Nietzsche 1988) + +Nietzsche, Friedrich. 1988. “Unzeitgemässe Betrachtungen. Zweites Stück: +Vom Nutzen und Nachtheil der Historie für das Leben.” In *Sämtliche +Werke: Kritische Studienausgabe*, by Friedrich Nietzsche, edited by +Giorgio Colli and Mazzino Montinari, 1:243–334. München; Berlin; New +York: Deutscher Taschenbuch-Verlag; Walter de Gruyter. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Nietzsche, 1988) + +Nietzsche, F. (1988). Unzeitgemässe Betrachtungen. Zweites Stück: Vom +Nutzen und Nachtheil der Historie für das Leben. In G. Colli & M. +Montinari (eds.), *Sämtliche Werke: Kritische Studienausgabe* (Vol. 1, +pp. 243–334). München; Berlin; New York: Deutscher Taschenbuch-Verlag; +Walter de Gruyter. + + +} + +@string{ dtv = {Deutscher Taschenbuch-Verlag} } + +@InBook{nietzsche:historie, + title = {Unzeitgem{\"a}sse Betrachtungen. Zweites St{\"u}ck}, + date = 1988, + author = {Nietzsche, Friedrich}, + booktitle = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e + Betrachtungen I--IV. Nachgelassene Schriften 1870--1973}, + bookauthor = {Nietzsche, Friedrich}, + editor = {Colli, Giorgio and Montinari, Mazzino}, + subtitle = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben}, + maintitle = {S{\"a}mtliche Werke}, + mainsubtitle = {Kritische Studienausgabe}, + volume = 1, + publisher = dtv # { and Walter de Gruyter}, + location = {M{\"u}nchen and Berlin and New York}, + pages = {243-334}, + hyphenation = {german}, + sortyear = {1988-2}, + sorttitle = {Werke-01-243}, + indexsorttitle= {Vom Nutzen und Nachtheil der Historie fur das Leben}, + indextitle = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben}, + shorttitle = {Vom Nutzen und Nachtheil der Historie}, + annotation = {A single essay from the critical edition of Nietzsche's works. + This inbook entry explicitly refers to an essay found + in the first volume. Note the title, + booktitle, and maintitle fields. Also note + the sorttitle and sortyear fields. We want + this entry to be listed after the entry referring to the + entire first volume}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A single essay from the critical edition of Nietzsche's works. + This inbook entry explicitly refers to an essay found in the first + volume. Note the title, booktitle, and maintitle fields. Also note + the sorttitle and sortyear fields. We want this entry to be listed + after the entry referring to the entire first volume + author: + - family: Nietzsche + given: Friedrich + container-author: + - family: Nietzsche + given: Friedrich + container-title: "Sämtliche Werke: Kritische Studienausgabe" + editor: + - family: Colli + given: Giorgio + - family: Montinari + given: Mazzino + id: "nietzsche:historie" + issued: 1988 + language: de-DE + page: 243-334 + publisher: Deutscher Taschenbuch-Verlag; Walter de Gruyter + publisher-place: München; Berlin; New York + title: "Unzeitgemässe Betrachtungen. Zweites Stück: Vom Nutzen und + Nachtheil der Historie für das Leben" + title-short: Vom Nutzen und Nachtheil der Historie + type: chapter + volume: 1 + volume-title: Die Geburt der Tragödie. Unzeitgemäße Betrachtungen + I--IV. Nachgelassene Schriften 1870--1973 +--- + + +``` diff --git a/test/command/biblatex-nietzsche-ksa.md b/test/command/biblatex-nietzsche-ksa.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-nietzsche-ksa.md @@ -0,0 +1,89 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Nietzsche 1988) + +Nietzsche, Friedrich. 1988. *Sämtliche Werke: Kritische Studienausgabe*. +Edited by Giorgio Colli and Mazzino Montinari. 2nd ed. 15. München; +Berlin; New York: Deutscher Taschenbuch-Verlag; Walter de Gruyter. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Nietzsche, 1988) + +Nietzsche, F. (1988). *Sämtliche Werke: Kritische Studienausgabe*. (G. +Colli & M. Montinari, eds.) (2nd ed., 1-15). München; Berlin; New York: +Deutscher Taschenbuch-Verlag; Walter de Gruyter. + + +NOTES: + +- biblio2yaml + - term "vols." missing + +} + +@string{ dtv = {Deutscher Taschenbuch-Verlag} } + +@Book{nietzsche:ksa, + author = {Nietzsche, Friedrich}, + title = {S{\"a}mtliche Werke}, + date = 1988, + editor = {Colli, Giorgio and Montinari, Mazzino}, + edition = 2, + volumes = 15, + publisher = dtv # { and Walter de Gruyter}, + location = {M{\"u}nchen and Berlin and New York}, + hyphenation = {german}, + sortyear = {1988-0}, + sorttitle = {Werke-00-000}, + indexsorttitle= {Samtliche Werke}, + subtitle = {Kritische Studienausgabe}, + annotation = {The critical edition of Nietzsche's works. This is a + book entry referring to a 15-volume work as a + whole. Note the volumes field and the format of the + publisher and location fields in the + database file. Also note the sorttitle and + sortyear fields which are used to fine-tune the + sorting order of the bibliography. We want this item listed + first in the bibliography}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: The critical edition of Nietzsche's works. This is a book + entry referring to a 15-volume work as a whole. Note the volumes + field and the format of the publisher and location fields in the + database file. Also note the sorttitle and sortyear fields which are + used to fine-tune the sorting order of the bibliography. We want + this item listed first in the bibliography + author: + - family: Nietzsche + given: Friedrich + edition: 2 + editor: + - family: Colli + given: Giorgio + - family: Montinari + given: Mazzino + id: "nietzsche:ksa" + issued: 1988 + language: de-DE + number-of-volumes: 15 + publisher: Deutscher Taschenbuch-Verlag; Walter de Gruyter + publisher-place: München; Berlin; New York + title: "Sämtliche Werke: Kritische Studienausgabe" + title-short: Sämtliche Werke + type: book +--- + + +``` diff --git a/test/command/biblatex-nietzsche-ksa1.md b/test/command/biblatex-nietzsche-ksa1.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-nietzsche-ksa1.md @@ -0,0 +1,95 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2015-03-08: + +(Nietzsche 1988) + +Nietzsche, Friedrich. 1988. *Sämtliche Werke: Kritische Studienausgabe*. +Edited by Giorgio Colli and Mazzino Montinari. 2nd ed. Vol. 1. München; +Berlin; New York: Deutscher Taschenbuch-Verlag; Walter de Gruyter. + + +Formatted with pandoc and apa.csl, 2015-03-08: + +(Nietzsche, 1988) + +Nietzsche, F. (1988). *Sämtliche Werke: Kritische Studienausgabe*. (G. +Colli & M. Montinari, eds., F. Nietzsche) (2nd ed., Vol. 1). München; +Berlin; New York: Deutscher Taschenbuch-Verlag; Walter de Gruyter. + + +NOTES: + +- volume-title currently not implemented by chicago-author-date.csl and apa.csl. + +} + +@string{ dtv = {Deutscher Taschenbuch-Verlag} } + +@Book{nietzsche:ksa1, + author = {Nietzsche, Friedrich}, + title = {Die Geburt der Trag{\"o}die. Unzeitgem{\"a}{\ss}e + Betrachtungen I--IV. Nachgelassene Schriften 1870--1973}, + date = 1988, + editor = {Colli, Giorgio and Montinari, Mazzino}, + maintitle = {S{\"a}mtliche Werke}, + mainsubtitle = {Kritische Studienausgabe}, + volume = 1, + edition = 2, + publisher = dtv # { and Walter de Gruyter}, + location = {M{\"u}nchen and Berlin and New York}, + hyphenation = {german}, + sortyear = {1988-1}, + sorttitle = {Werke-01-000}, + indexsorttitle= {Samtliche Werke I}, + bookauthor = {Nietzsche, Friedrich}, + indextitle = {S{\"a}mtliche Werke I}, + shorttitle = {S{\"a}mtliche Werke I}, + annotation = {A single volume from the critical edition of Nietzsche's + works. This book entry explicitly refers to the first + volume only. Note the title and maintitle + fields. Also note the sorttitle and sortyear + fields. We want this entry to be listed after the entry + referring to the entire edition}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A single volume from the critical edition of Nietzsche's + works. This book entry explicitly refers to the first volume only. + Note the title and maintitle fields. Also note the sorttitle and + sortyear fields. We want this entry to be listed after the entry + referring to the entire edition + author: + - family: Nietzsche + given: Friedrich + container-author: + - family: Nietzsche + given: Friedrich + edition: 2 + editor: + - family: Colli + given: Giorgio + - family: Montinari + given: Mazzino + id: "nietzsche:ksa1" + issued: 1988 + language: de-DE + publisher: Deutscher Taschenbuch-Verlag; Walter de Gruyter + publisher-place: München; Berlin; New York + title: "Sämtliche Werke: Kritische Studienausgabe" + type: book + volume: 1 + volume-title: Die Geburt der Tragödie. Unzeitgemäße Betrachtungen + I--IV. Nachgelassene Schriften 1870--1973 +--- + + +``` diff --git a/test/command/biblatex-online.md b/test/command/biblatex-online.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-online.md @@ -0,0 +1,64 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{adapted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib} + +@online{markey, + Annotation = {An online entry for a tutorial. Note the format of the date field (yyyy-mm-dd) in the database file.}, + Author = {Markey, Nicolas}, + Date = {2005-10-16}, + Hyphenation = {american}, + Sorttitle = {Tame the Beast}, + Subtitle = {The {B} to {X} of {BibTeX}}, + Title = {Tame the {BeaST}}, + Url = {http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf}, + Urldate = {2006-10-01}, + Version = {1.3}, +} + +@online{CTAN, + Annotation = {This is an online entry. The \textsc{url}, which is given in the url field, is transformed into a clickable link if hyperref support has been enabled. Note the format of the urldate field (yyyy-mm-dd) in the database file. Also note the label field which may be used as a fallback by citation styles which need an author and\slash or a year}, + Date = 2006, + Hyphenation = {american}, + Label = {CTAN}, + Subtitle = {The {Comprehensive TeX Archive Network}}, + Title = {{CTAN}}, + Url = {http://www.ctan.org}, + Urldate = {2006-10-01}, +} + +^D +--- +nocite: "[@*]" +references: +- accessed: 2006-10-01 + annote: An online entry for a tutorial. Note the format of the date + field (yyyy-mm-dd) in the database file. + author: + - family: Markey + given: Nicolas + id: markey + issued: 2005-10-16 + language: en-US + title: "Tame the BeaST: The B to X of BibTeX" + title-short: Tame the BeaST + type: webpage + url: "http://tug.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf" + version: 1.3 +- accessed: 2006-10-01 + annote: This is an online entry. The [url]{.smallcaps}, which is given + in the url field, is transformed into a clickable link if hyperref + support has been enabled. Note the format of the urldate field + (yyyy-mm-dd) in the database file. Also note the label field which + may be used as a fallback by citation styles which need an author + and/or a year + id: CTAN + issued: 2006 + language: en-US + title: "CTAN: The Comprehensive TeX Archive Network" + title-short: CTAN + type: webpage + url: "http://www.ctan.org" +--- + + +``` diff --git a/test/command/biblatex-options-url-false-doi-false.md b/test/command/biblatex-options-url-false-doi-false.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-options-url-false-doi-false.md @@ -0,0 +1,57 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Entry contains url and doi fields; these should be discarded since the +options field specifies url=false, doi=false. + +Exception: As in standard biblatex, in online entries url should never be +discarded, even if options contains url=false. + +} + +@article{item1, + Author = {Author, Andy}, + Date = {2012}, + Doi = {1234/5678.90}, + Journal = {Journal}, + Options = {url=false, doi=false}, + Title = {Title, Any Entry Type Except online}, + Url = {http://foo.bar} +} + +@online{item2, + Author = {Author, Andy}, + Date = {2012}, + Doi = {1234/5678.90}, + Journal = {Journal}, + Options = {url=false, doi=false}, + Title = {Title, Entry Type online}, + Url = {http://foo.bar} +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Author + given: Andy + container-title: Journal + id: item1 + issued: 2012 + title: Title, any entry type except online + type: article-journal +- author: + - family: Author + given: Andy + container-title: Journal + id: item2 + issued: 2012 + title: Title, entry type online + type: webpage + url: "http://foo.bar" +--- + + +``` diff --git a/test/command/biblatex-padhye.md b/test/command/biblatex-padhye.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-padhye.md @@ -0,0 +1,117 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Padhye, Firoiu, and Towsley 1999) + +Padhye, Jitendra, Victor Firoiu, and Don Towsley. 1999. “A Stochastic +Model of TCP Reno Congestion Avoidance and Control.” Technical report +99-02. Amherst, Mass.: University of Massachusetts. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Padhye, Firoiu, & Towsley, 1999) + +Padhye, J., Firoiu, V., & Towsley, D. (1999). *A stochastic model of TCP +Reno congestion avoidance and control* (technical report No. 99-02). +Amherst, Mass.: University of Massachusetts. + +} + +@Report{padhye, + author = {Padhye, Jitendra and Firoiu, Victor and Towsley, Don}, + title = {A Stochastic Model of {TCP Reno} Congestion Avoidance and + Control}, + type = {techreport}, + institution = {University of Massachusetts}, + date = 1999, + number = {99-02}, + location = {Amherst, Mass.}, + hyphenation = {american}, + sorttitle = {A Stochastic Model of TCP Reno Congestion Avoidance and + Control}, + indextitle = {Stochastic Model of {TCP Reno} Congestion Avoidance and Control, + A}, + annotation = {This is a report entry for a technical report. Note + the format of the type field in the database file + which uses a localization key. The number of the report is + given in the number field. Also note the + sorttitle and indextitle fields}, + abstract = {The steady state performance of a bulk transfer TCP flow + (i.e., a flow with a large amount of data to send, such as FTP + transfers) may be characterized by three quantities. The first + is the send rate, which is the amount of data sent by the + sender in unit time. The second is the throughput, which is + the amount of data received by the receiver in unit time. Note + that the throughput will always be less than or equal to the + send rate due to losses. Finally, the number of non-duplicate + packets received by the receiver in unit time gives us the + goodput of the connection. The goodput is always less than or + equal to the throughput, since the receiver may receive two + copies of the same packet due to retransmissions by the + sender. In a previous paper, we presented a simple model for + predicting the steady state send rate of a bulk transfer TCP + flow as a function of loss rate and round trip time. In this + paper, we extend that work in two ways. First, we analyze the + performance of bulk transfer TCP flows using more precise, + stochastic analysis. Second, we build upon the previous + analysis to provide both an approximate formula as well as a + more accurate stochastic model for the steady state throughput + of a bulk transfer TCP flow.}, + file = {ftp://gaia.cs.umass.edu/pub/Padhey99-markov.ps}, +} + +^D +--- +nocite: "[@*]" +references: +- abstract: The steady state performance of a bulk transfer TCP flow + (i.e., a flow with a large amount of data to send, such as FTP + transfers) may be characterized by three quantities. The first is + the send rate, which is the amount of data sent by the sender in + unit time. The second is the throughput, which is the amount of data + received by the receiver in unit time. Note that the throughput will + always be less than or equal to the send rate due to losses. + Finally, the number of non-duplicate packets received by the + receiver in unit time gives us the goodput of the connection. The + goodput is always less than or equal to the throughput, since the + receiver may receive two copies of the same packet due to + retransmissions by the sender. In a previous paper, we presented a + simple model for predicting the steady state send rate of a bulk + transfer TCP flow as a function of loss rate and round trip time. In + this paper, we extend that work in two ways. First, we analyze the + performance of bulk transfer TCP flows using more precise, + stochastic analysis. Second, we build upon the previous analysis to + provide both an approximate formula as well as a more accurate + stochastic model for the steady state throughput of a bulk transfer + TCP flow. + annote: This is a report entry for a technical report. Note the format + of the type field in the database file which uses a localization + key. The number of the report is given in the number field. Also + note the sorttitle and indextitle fields + author: + - family: Padhye + given: Jitendra + - family: Firoiu + given: Victor + - family: Towsley + given: Don + genre: technical report + id: padhye + issued: 1999 + language: en-US + number: 99-02 + publisher: University of Massachusetts + publisher-place: Amherst, Mass. + title: A stochastic model of TCP Reno congestion avoidance and control + type: report +--- + + +``` diff --git a/test/command/biblatex-patent.md b/test/command/biblatex-patent.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-patent.md @@ -0,0 +1,158 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{adapted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib + +TODO: Is there a CSL counterpart for the biblatex field "holder"?} + + +@patent{almendro, + Annotation = {This is a patent entry with a location field. The number is given in the number field. Note the format of the location field in the database file. Compare laufenberg, sorace, and kowalik}, + Author = {Almendro, José L. and Martín, Jacinto and Sánchez, Alberto and Nozal, Fernando}, + Date = 1998, + Hyphenation = {german}, + Location = {countryfr and countryuk and countryde}, + Number = {EU-29702195U}, + Title = {Elektromagnetisches Signalhorn}} + +@patent{kowalik, + Annotation = {This is a patent entry for a French patent request with a full date. The number is given in the number field. Note the format of the type and date fields in the database file. Compare almendro, laufenberg, and sorace}, + Author = {Kowalik, F. and Isard, M.}, + Date = {1995-01-11}, + Hyphenation = {french}, + Indextitle = {Estimateur d'un défaut de fonctionnement}, + Number = 9500261, + Title = {Estimateur d'un défaut de fonctionnement d'un modulateur en quadrature et étage de modulation l'utilisant}, + Type = {patreqfr}} + +@patent{laufenberg, + Annotation = {This is a patent entry with a holder field. Note the format of the type and location fields in the database file. Compare almendro, sorace, and kowalik}, + Author = {Laufenberg, Xaver and Eynius, Dominique and Suelzle, Helmut and Usbeck, Stephan and Spaeth, Matthias and Neuser-Hoffmann, Miriam and Myrzik, Christian and Schmid, Manfred and Nietfeld, Franz and Thiel, Alexander and Braun, Harald and Ebner, Norbert}, + Date = {2006-09-13}, + File = {http://v3.espacenet.com/textdoc?IDX=EP1700367}, + Holder = {{Robert Bosch GmbH} and {Daimler Chrysler AG} and {Bayerische Motoren Werke AG}}, + Hyphenation = {german}, + Number = 1700367, + Title = {Elektrische Einrichtung und Betriebsverfahren}, + Type = {patenteu}, + Abstract = {The invention relates to an electric device comprising a + generator, in particular for use in the vehicle electric + system of a motor vehicle and a controller for controlling the + generator voltage. The device is equipped with a control zone, + in which the voltage is controlled and zones, in which the + torque is controlled. The invention also relates to methods + for operating a device of this type.}} + +@patent{sorace, + Annotation = {This is a patent entry with a holder field. Note the format of the type and date fields in the database file. Compare almendro, laufenberg, and kowalik}, + Author = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven A.}, + Date = {1997-09-16}, + Date-Modified = {2013-10-16 13:44:15 +0000}, + Holder = {{Hughes Aircraft Company}}, + Hyphenation = {american}, + Number = 5668842, + Title = {High-Speed Digital-to-{RF} Converter}, + Type = {patentus}} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a patent entry with a location field. The number is + given in the number field. Note the format of the location field in + the database file. Compare laufenberg, sorace, and kowalik + author: + - family: Almendro + given: José L. + - family: Martín + given: Jacinto + - family: Sánchez + given: Alberto + - family: Nozal + given: Fernando + id: almendro + issued: 1998 + jurisdiction: France; United Kingdom; Germany + language: de-DE + number: EU-29702195U + title: Elektromagnetisches Signalhorn + type: patent +- annote: This is a patent entry for a French patent request with a full + date. The number is given in the number field. Note the format of + the type and date fields in the database file. Compare almendro, + laufenberg, and sorace + author: + - family: Kowalik + given: F. + - family: Isard + given: M. + genre: French patent request + id: kowalik + issued: 1995-01-11 + language: fr-FR + number: 9500261 + title: Estimateur d'un défaut de fonctionnement d'un modulateur en + quadrature et étage de modulation l'utilisant + type: patent +- abstract: The invention relates to an electric device comprising a + generator, in particular for use in the vehicle electric system of a + motor vehicle and a controller for controlling the generator + voltage. The device is equipped with a control zone, in which the + voltage is controlled and zones, in which the torque is controlled. + The invention also relates to methods for operating a device of this + type. + annote: This is a patent entry with a holder field. Note the format of + the type and location fields in the database file. Compare almendro, + sorace, and kowalik + author: + - family: Laufenberg + given: Xaver + - family: Eynius + given: Dominique + - family: Suelzle + given: Helmut + - family: Usbeck + given: Stephan + - family: Spaeth + given: Matthias + - family: Neuser-Hoffmann + given: Miriam + - family: Myrzik + given: Christian + - family: Schmid + given: Manfred + - family: Nietfeld + given: Franz + - family: Thiel + given: Alexander + - family: Braun + given: Harald + - family: Ebner + given: Norbert + genre: European patent + id: laufenberg + issued: 2006-09-13 + language: de-DE + number: 1700367 + title: Elektrische Einrichtung und Betriebsverfahren + type: patent +- annote: This is a patent entry with a holder field. Note the format of + the type and date fields in the database file. Compare almendro, + laufenberg, and kowalik + author: + - family: Sorace + given: Ronald E. + - family: Reinhardt + given: Victor S. + - family: Vaughn + given: Steven A. + genre: U.S. patent + id: sorace + issued: 1997-09-16 + language: en-US + number: 5668842 + title: High-speed digital-to-RF converter + type: patent +--- + + +``` diff --git a/test/command/biblatex-periodical.md b/test/command/biblatex-periodical.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-periodical.md @@ -0,0 +1,31 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{excerpt from +http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib} + +@periodical{jcg, + Annotation = {This is a periodical entry with an issn field.}, + Issn = {0097-8493}, + Issuetitle = {Semantic {3D} Media and Content}, + Number = 4, + Title = {Computers and Graphics}, + Volume = 35, + Year = 2011} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a periodical entry with an issn field. + container-title: Computers and Graphics + id: jcg + issn: 0097-8493 + issue: 4 + issued: 2011 + title: Semantic 3D media and content + type: article-journal + volume: 35 +--- + + +``` diff --git a/test/command/biblatex-piccato.md b/test/command/biblatex-piccato.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-piccato.md @@ -0,0 +1,59 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Piccato 2001) + +Piccato, Pablo. 2001. *City of Suspects: Crime in Mexico City, +1900–1931*. Durham; London: Duke University Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Piccato, 2001) + +Piccato, P. (2001). *City of suspects: Crime in Mexico City, 1900–1931*. +Durham; London: Duke University Press. + + +} + +@Book{piccato, + author = {Piccato, Pablo}, + title = {City of Suspects}, + date = 2001, + publisher = {Duke University Press}, + location = {Durham and London}, + hyphenation = {american}, + subtitle = {Crime in {Mexico City}, 1900--1931}, + shorttitle = {City of Suspects}, + annotation = {This is a book entry. Note the format of the + location field in the database file}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a book entry. Note the format of the location field in + the database file + author: + - family: Piccato + given: Pablo + id: piccato + issued: 2001 + language: en-US + publisher: Duke University Press + publisher-place: Durham; London + title: "City of suspects: Crime in Mexico City, 1900--1931" + title-short: City of suspects + type: book +--- + + +``` diff --git a/test/command/biblatex-pines.md b/test/command/biblatex-pines.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-pines.md @@ -0,0 +1,77 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Pines 1979) + +Pines, Shlomo. 1979. “The Limitations of Human Knowledge According to +Al-Farabi, ibn Bajja, and Maimonides.” In *Studies in Medieval Jewish +History and Literature*, edited by Isadore Twersky, 82–109. Cambridge, +Mass.: Harvard University Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Pines, 1979) + +Pines, S. (1979). The limitations of human knowledge according to +Al-Farabi, ibn Bajja, and Maimonides. In I. Twersky (Ed.), *Studies in +medieval Jewish history and literature* (pp. 82–109). Cambridge, Mass.: +Harvard University Press. + + +} + +@string{ hup = {Harvard University Press} } + +@InCollection{pines, + author = {Pines, Shlomo}, + editor = {Twersky, Isadore}, + title = {The Limitations of Human Knowledge According to {Al-Farabi}, {ibn + Bajja}, and {Maimonides}}, + date = 1979, + booktitle = {Studies in Medieval {Jewish} History and Literature}, + publisher = hup, + location = {Cambridge, Mass.}, + pages = {82-109}, + keywords = {secondary}, + hyphenation = {american}, + indextitle = {Limitations of Human Knowledge According to {Al-Farabi}, {ibn + Bajja}, and {Maimonides}, The}, + shorttitle = {Limitations of Human Knowledge}, + annotation = {A typical incollection entry. Note the + indextitle field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A typical incollection entry. Note the indextitle field + author: + - family: Pines + given: Shlomo + container-title: Studies in medieval Jewish history and literature + editor: + - family: Twersky + given: Isadore + id: pines + issued: 1979 + keyword: secondary + language: en-US + page: 82-109 + publisher: Harvard University Press + publisher-place: Cambridge, Mass. + title: The limitations of human knowledge according to Al-Farabi, [ibn + Bajja]{.nocase}, and Maimonides + title-short: Limitations of human knowledge + type: chapter +--- + + +``` diff --git a/test/command/biblatex-quotes.md b/test/command/biblatex-quotes.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-quotes.md @@ -0,0 +1,44 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{excerpt from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib + +\mkbibquote{} should be replaced by a matching set of quotation marks that can be used by citeproc for quote substitution and flipflopping. English smart double quotation marks seem best, as they cannot be confused with apostrophes. + +\enquote{}, \enquote*{} should be replaced by a matching set of quotation marks, too: “foo”, ‘bar’. +} + +@string{pup = {Princeton University Press}} + +@book{nussbaum, + Annotation = {A book entry. Note the sorttitle and indexsorttitle fields and the markup of the quotes in the database file}, + Author = {Nussbaum, Martha}, + Date = 1978, + Hyphenation = {american}, + Indexsorttitle = {Aristotle's De Motu Animalium}, + Keywords = {secondary}, + Location = {Princeton}, + Publisher = pup, + Sorttitle = {Aristotle's De Motu Animalium}, + Title = {Aristotle's \mkbibquote{De Motu Animalium}}} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry. Note the sorttitle and indexsorttitle fields and + the markup of the quotes in the database file + author: + - family: Nussbaum + given: Martha + id: nussbaum + issued: 1978 + keyword: secondary + language: en-US + publisher: Princeton University Press + publisher-place: Princeton + title: Aristotle's "De Motu Animalium" + type: book +--- + + +``` diff --git a/test/command/biblatex-reese.md b/test/command/biblatex-reese.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-reese.md @@ -0,0 +1,71 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Reese 1958) + +Reese, Trevor R. 1958. “Georgia in Anglo-Spanish Diplomacy, 1736-1739.” +*William and Mary Quarterly, 3* 15: 168–190. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Reese, 1958) + +Reese, T. R. (1958). Georgia in Anglo-Spanish diplomacy, 1736-1739. +*William and Mary Quarterly, 3*, *15*, 168–190. + + +NOTES: + +- biblio2yaml + - series field: still not entirely satisfactory. + Could we map this to some existing CSL variable, and have the CSL styles handle this? "edition", maybe ?? + +} + +@Article{reese, + author = {Reese, Trevor R.}, + title = {Georgia in {Anglo-Spanish} Diplomacy, 1736-1739}, + journaltitle = {William and Mary Quarterly}, + date = 1958, + series = 3, + volume = 15, + pages = {168-190}, + hyphenation = {american}, + annotation = {An article entry with a series and a + volume field. Note the format of the series. If the + value of the series field is an integer, this number + is printed as an ordinal and the string \enquote*{series} is + appended automatically}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An article entry with a series and a volume field. Note the + format of the series. If the value of the series field is an + integer, this number is printed as an ordinal and the string + 'series' is appended automatically + author: + - family: Reese + given: Trevor R. + collection-title: 3rd series + container-title: William and Mary Quarterly + id: reese + issued: 1958 + language: en-US + page: 168-190 + title: Georgia in Anglo-Spanish diplomacy, 1736-1739 + type: article-journal + volume: 15 +--- + + +``` diff --git a/test/command/biblatex-report.md b/test/command/biblatex-report.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-report.md @@ -0,0 +1,119 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{excerpt from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib + +TODO: Where to map "file" field? +} + +@report{chiu, + Annotation = {This is a report entry for a research report. Note the format of the type field in the database file which uses a localization key. The number of the report is given in the number field. Also note the sorttitle and indextitle fields}, + Author = {Chiu, Willy W. and Chow, We Min}, + Date = 1978, + Hyphenation = {american}, + Indextitle = {Hybrid Hierarchical Model, A}, + Institution = {IBM}, + Number = {RC-6947}, + Sorttitle = {Hybrid Hierarchical Model of a Multiple Virtual Storage (MVS) Operating System}, + Title = {A Hybrid Hierarchical Model of a {Multiple Virtual Storage} ({MVS}) Operating System}, + Type = {resreport}} + +@report{padhye, + Annotation = {This is a report entry for a technical report. Note the format of the type field in the database file which uses a localization key. The number of the report is given in the number field. Also note the sorttitle and indextitle fields}, + Author = {Padhye, Jitendra and Firoiu, Victor and Towsley, Don}, + Date = 1999, + File = {ftp://gaia.cs.umass.edu/pub/Padhey99-markov.ps}, + Hyphenation = {american}, + Indextitle = {Stochastic Model of TCP Reno Congestion Avoidance and Control, A}, + Institution = {University of Massachusetts}, + Location = {Amherst, Mass.}, + Number = {99-02}, + Sorttitle = {A Stochastic Model of TCP Reno Congestion Avoidance and Control}, + Title = {A Stochastic Model of {TCP Reno} Congestion Avoidance and Control}, + Type = {techreport}, + Abstract = {The steady state performance of a bulk transfer TCP flow + (i.e., a flow with a large amount of data to send, such as FTP + transfers) may be characterized by three quantities. The first + is the send rate, which is the amount of data sent by the + sender in unit time. The second is the throughput, which is + the amount of data received by the receiver in unit time. Note + that the throughput will always be less than or equal to the + send rate due to losses. Finally, the number of non-duplicate + packets received by the receiver in unit time gives us the + goodput of the connection. The goodput is always less than or + equal to the throughput, since the receiver may receive two + copies of the same packet due to retransmissions by the + sender. In a previous paper, we presented a simple model for + predicting the steady state send rate of a bulk transfer TCP + flow as a function of loss rate and round trip time. In this + paper, we extend that work in two ways. First, we analyze the + performance of bulk transfer TCP flows using more precise, + stochastic analysis. Second, we build upon the previous + analysis to provide both an approximate formula as well as a + more accurate stochastic model for the steady state throughput + of a bulk transfer TCP flow.}} +^D +--- +nocite: "[@*]" +references: +- annote: This is a report entry for a research report. Note the format + of the type field in the database file which uses a localization + key. The number of the report is given in the number field. Also + note the sorttitle and indextitle fields + author: + - family: Chiu + given: Willy W. + - family: Chow + given: We Min + genre: research report + id: chiu + issued: 1978 + language: en-US + number: RC-6947 + publisher: IBM + title: A hybrid hierarchical model of a Multiple Virtual Storage (MVS) + operating system + type: report +- abstract: The steady state performance of a bulk transfer TCP flow + (i.e., a flow with a large amount of data to send, such as FTP + transfers) may be characterized by three quantities. The first is + the send rate, which is the amount of data sent by the sender in + unit time. The second is the throughput, which is the amount of data + received by the receiver in unit time. Note that the throughput will + always be less than or equal to the send rate due to losses. + Finally, the number of non-duplicate packets received by the + receiver in unit time gives us the goodput of the connection. The + goodput is always less than or equal to the throughput, since the + receiver may receive two copies of the same packet due to + retransmissions by the sender. In a previous paper, we presented a + simple model for predicting the steady state send rate of a bulk + transfer TCP flow as a function of loss rate and round trip time. In + this paper, we extend that work in two ways. First, we analyze the + performance of bulk transfer TCP flows using more precise, + stochastic analysis. Second, we build upon the previous analysis to + provide both an approximate formula as well as a more accurate + stochastic model for the steady state throughput of a bulk transfer + TCP flow. + annote: This is a report entry for a technical report. Note the format + of the type field in the database file which uses a localization + key. The number of the report is given in the number field. Also + note the sorttitle and indextitle fields + author: + - family: Padhye + given: Jitendra + - family: Firoiu + given: Victor + - family: Towsley + given: Don + genre: technical report + id: padhye + issued: 1999 + language: en-US + number: 99-02 + publisher: University of Massachusetts + publisher-place: Amherst, Mass. + title: A stochastic model of TCP Reno congestion avoidance and control + type: report +--- + + +``` diff --git a/test/command/biblatex-salam.md b/test/command/biblatex-salam.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-salam.md @@ -0,0 +1,69 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Salam 1968) + +Salam, Abdus. 1968. “Weak and Electromagnetic Interactions.” In +*Elementary Particle Theory: Relativistic Groups and Analyticity. +Proceedings of the Eighth Nobel Symposium*, edited by Nils Svartholm, +367–377. Stockholm: Almquist & Wiksell. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Salam, 1968) + +Salam, A. (1968). Weak and electromagnetic interactions. In N. Svartholm +(Ed.), *Elementary particle theory: Relativistic groups and analyticity. +Proceedings of the eighth Nobel symposium* (pp. 367–377). Stockholm: +Almquist & Wiksell. + + +} + +@InProceedings{salam, + author = {Salam, Abdus}, + editor = {Svartholm, Nils}, + title = {Weak and Electromagnetic Interactions}, + date = 1968, + booktitle = {Elementary particle theory}, + booksubtitle = {Relativistic groups and analyticity}, + booktitleaddon= {Proceedings of the Eighth {Nobel} Symposium}, + eventdate = {1968-05-19/1968-05-25}, + venue = {Aspen{\"a}sgarden, Lerum}, + publisher = {Almquist \& Wiksell}, + location = {Stockholm}, + pages = {367-377}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Salam + given: Abdus + container-title: "Elementary particle theory: Relativistic groups and + analyticity. Proceedings of the eighth Nobel symposium" + editor: + - family: Svartholm + given: Nils + event-date: 1968-05-19/1968-05-25 + event-place: Aspenäsgarden, Lerum + id: salam + issued: 1968 + page: 367-377 + publisher: Almquist & Wiksell + publisher-place: Stockholm + title: Weak and electromagnetic interactions + type: paper-conference +--- + + +``` diff --git a/test/command/biblatex-sarfraz.md b/test/command/biblatex-sarfraz.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-sarfraz.md @@ -0,0 +1,65 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Sarfraz and Razzak 2002) + +Sarfraz, M., and M. F. A. Razzak. 2002. “Technical Section: An Algorithm +for Automatic Capturing of the Font Outlines.” *Computers and Graphics* +26 (5): 795–804. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Sarfraz & Razzak, 2002) + +Sarfraz, M., & Razzak, M. F. A. (2002). Technical section: An algorithm +for automatic capturing of the font outlines. *Computers and Graphics*, +*26*(5), 795–804. + + +} + +@Article{sarfraz, + author = {M. Sarfraz and M. F. A. Razzak}, + title = {Technical section: {An} algorithm for automatic capturing of + the font outlines}, + year = 2002, + volume = 26, + number = 5, + pages = {795-804}, + issn = {0097-8493}, + journal = {Computers and Graphics}, + annotation = {An article entry with an issn field}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An article entry with an issn field + author: + - family: Sarfraz + given: M. + - family: Razzak + given: M. F. A. + container-title: Computers and Graphics + id: sarfraz + issn: 0097-8493 + issue: 5 + issued: 2002 + page: 795-804 + title: "Technical section: An algorithm for automatic capturing of the + font outlines" + title-short: Technical section + type: article-journal + volume: 26 +--- + + +``` diff --git a/test/command/biblatex-shore.md b/test/command/biblatex-shore.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-shore.md @@ -0,0 +1,66 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Shore 1991) + +Shore, Bradd. 1991. “Twice-born, Once Conceived: Meaning Construction +and Cultural Cognition.” *American Anthropologist, New Series* 93 (1) +(March): 9–27. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Shore, 1991) + +Shore, B. (1991). Twice-born, once conceived: Meaning construction and +cultural cognition. *American Anthropologist, new series*, *93*(1), +9–27. + + +} + +@Article{shore, + author = {Shore, Bradd}, + title = {Twice-Born, Once Conceived}, + journaltitle = {American Anthropologist}, + date = {1991-03}, + subtitle = {Meaning Construction and Cultural Cognition}, + series = {newseries}, + volume = 93, + number = 1, + pages = {9-27}, + annotation = {An article entry with series, + volume, and number fields. Note the format + of the series which is a localization key}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An article entry with series, volume, and number fields. Note + the format of the series which is a localization key + author: + - family: Shore + given: Bradd + collection-title: New series + container-title: American Anthropologist + id: shore + issue: 1 + issued: 1991-03 + page: 9-27 + title: "Twice-born, once conceived: Meaning construction and cultural + cognition" + title-short: Twice-born, once conceived + type: article-journal + volume: 93 +--- + + +``` diff --git a/test/command/biblatex-sigfridsson.md b/test/command/biblatex-sigfridsson.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-sigfridsson.md @@ -0,0 +1,106 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Sigfridsson and Ryde 1998) + +Sigfridsson, Emma, and Ulf Ryde. 1998. “Comparison of Methods for +Deriving Atomic Charges from the Electrostatic Potential and Moments.” +*Journal of Computational Chemistry* 19 (4): 377–395. +doi:[10.1002/(SICI)1096-987X(199803)19:4\<377::AID-JCC1\>3.0.CO;2-P](https://doi.org/10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P "10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P"). + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Sigfridsson & Ryde, 1998) + +Sigfridsson, E., & Ryde, U. (1998). Comparison of methods for deriving +atomic charges from the electrostatic potential and moments. *Journal of +Computational Chemistry*, *19*(4), 377–395. +doi:[10.1002/(SICI)1096-987X(199803)19:4\<377::AID-JCC1\>3.0.CO;2-P](https://doi.org/10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P "10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P") + + +NOTES: + +- biblio2xaml + - the string "doi:" should not appear as part of the content of the "doi" field + +} + +@Article{sigfridsson, + author = {Sigfridsson, Emma and Ryde, Ulf}, + title = {Comparison of methods for deriving atomic charges from the + electrostatic potential and moments}, + journaltitle = {Journal of Computational Chemistry}, + date = 1998, + volume = 19, + number = 4, + pages = {377-395}, + doi = {10.1002/(SICI)1096-987X(199803)19:4<377::AID-JCC1>3.0.CO;2-P}, + hyphenation = {american}, + indextitle = {Methods for deriving atomic charges}, + annotation = {An article entry with volume, + number, and doi fields. Note that the + \textsc{doi} is transformed into a clickable link if + hyperref support has been enabled}, + abstract = {Four methods for deriving partial atomic charges from the + quantum chemical electrostatic potential (CHELP, CHELPG, + Merz-Kollman, and RESP) have been compared and critically + evaluated. It is shown that charges strongly depend on how and + where the potential points are selected. Two alternative + methods are suggested to avoid the arbitrariness in the + point-selection schemes and van der Waals exclusion radii: + CHELP-BOW, which also estimates the charges from the + electrostatic potential, but with potential points that are + Boltzmann-weighted after their occurrence in actual + simulations using the energy function of the program in which + the charges will be used, and CHELMO, which estimates the + charges directly from the electrostatic multipole + moments. Different criteria for the quality of the charges are + discussed.}, +} + +^D +--- +nocite: "[@*]" +references: +- abstract: "Four methods for deriving partial atomic charges from the + quantum chemical electrostatic potential (CHELP, CHELPG, + Merz-Kollman, and RESP) have been compared and critically evaluated. + It is shown that charges strongly depend on how and where the + potential points are selected. Two alternative methods are suggested + to avoid the arbitrariness in the point-selection schemes and van + der Waals exclusion radii: CHELP-BOW, which also estimates the + charges from the electrostatic potential, but with potential points + that are Boltzmann-weighted after their occurrence in actual + simulations using the energy function of the program in which the + charges will be used, and CHELMO, which estimates the charges + directly from the electrostatic multipole moments. Different + criteria for the quality of the charges are discussed." + annote: An article entry with volume, number, and doi fields. Note + that the [doi]{.smallcaps} is transformed into a clickable link if + hyperref support has been enabled + author: + - family: Sigfridsson + given: Emma + - family: Ryde + given: Ulf + container-title: Journal of Computational Chemistry + doi: "10.1002/(SICI)1096-987X(199803)19:4\\<377::AID-JCC1\\>3.0.CO;2-P" + id: sigfridsson + issue: 4 + issued: 1998 + language: en-US + page: 377-395 + title: Comparison of methods for deriving atomic charges from the + electrostatic potential and moments + type: article-journal + volume: 19 +--- + + +``` diff --git a/test/command/biblatex-sorace.md b/test/command/biblatex-sorace.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-sorace.md @@ -0,0 +1,65 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Sorace, Reinhardt, and Vaughn 1997) + +Sorace, Ronald E., Victor S. Reinhardt, and Steven A. Vaughn. 1997. +“High-speed Digital-to-RF Converter.” U.S. patent. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Sorace, Reinhardt, & Vaughn, 1997) + +Sorace, R. E., Reinhardt, V. S., & Vaughn, S. A. (1997, September 16). +High-speed digital-to-RF converter. U.S. patent. + + +} + +@Patent{sorace, + author = {Sorace, Ronald E. and Reinhardt, Victor S. and Vaughn, Steven + A.}, + title = {High-Speed Digital-to-{RF} Converter}, + number = 5668842, + date = {1997-09-16}, + holder = {{Hughes Aircraft Company}}, + type = {patentus}, + hyphenation = {american}, + annotation = {This is a patent entry with a holder field. + Note the format of the type and date fields + in the database file. Compare almendro, + laufenberg, and kowalik}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a patent entry with a holder field. Note the format of + the type and date fields in the database file. Compare almendro, + laufenberg, and kowalik + author: + - family: Sorace + given: Ronald E. + - family: Reinhardt + given: Victor S. + - family: Vaughn + given: Steven A. + genre: U.S. patent + id: sorace + issued: 1997-09-16 + language: en-US + number: 5668842 + title: High-speed digital-to-RF converter + type: patent +--- + + +``` diff --git a/test/command/biblatex-spiegelberg.md b/test/command/biblatex-spiegelberg.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-spiegelberg.md @@ -0,0 +1,74 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Spiegelberg 1969) + +Spiegelberg, Herbert. 1969. ““Intention” und “Intentionalität” in der +Scholastik, bei Brentano und Husserl.” *Studia Philosophica* 29: +189–216. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Spiegelberg, 1969) + +Spiegelberg, H. (1969). “Intention” und “Intentionalität” in der +Scholastik, bei Brentano und Husserl. *Studia Philosophica*, *29*, +189–216. + + +NOTES: + +- citeproc + - flipflopping of quotes incorrect + +} + +@Article{spiegelberg, + author = {Spiegelberg, Herbert}, + title = {\mkbibquote{Intention} und \mkbibquote{Intentionalit{\"a}t} in + der Scholastik, bei Brentano und Husserl}, + journaltitle = {Studia Philosophica}, + date = 1969, + volume = 29, + pages = {189-216}, + hyphenation = {german}, + sorttitle = {Intention und Intentionalitat in der Scholastik, bei Brentano + und Husserl}, + indexsorttitle= {Intention und Intentionalitat in der Scholastik, bei Brentano + und Husserl}, + shorttitle = {Intention und Intentionalit{\"a}t}, + annotation = {An article entry. Note the sorttitle and + indexsorttitle fields and the markup of the quotes in + the database file}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: An article entry. Note the sorttitle and indexsorttitle fields + and the markup of the quotes in the database file + author: + - family: Spiegelberg + given: Herbert + container-title: Studia Philosophica + id: spiegelberg + issued: 1969 + language: de-DE + page: 189-216 + title: "\"Intention\" und \"Intentionalität\" in der Scholastik, bei + Brentano und Husserl" + title-short: Intention und Intentionalität + type: article-journal + volume: 29 +--- + + +``` diff --git a/test/command/biblatex-springer.md b/test/command/biblatex-springer.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-springer.md @@ -0,0 +1,58 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Springer 1950) + +Springer, Otto. 1950. “Mediaeval Pilgrim Routes from Scandinavia to +Rome.” *Mediaeval Studies* 12: 92–122. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Springer, 1950) + +Springer, O. (1950). Mediaeval pilgrim routes from Scandinavia to Rome. +*Mediaeval Studies*, *12*, 92–122. + + +} + +@Article{springer, + author = {Springer, Otto}, + title = {Mediaeval Pilgrim Routes from {Scandinavia} to {Rome}}, + journaltitle = {Mediaeval Studies}, + date = 1950, + volume = 12, + pages = {92-122}, + hyphenation = {british}, + shorttitle = {Mediaeval Pilgrim Routes}, + annotation = {A plain article entry}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A plain article entry + author: + - family: Springer + given: Otto + container-title: Mediaeval Studies + id: springer + issued: 1950 + language: en-GB + page: 92-122 + title: Mediaeval pilgrim routes from Scandinavia to Rome + title-short: Mediaeval pilgrim routes + type: article-journal + volume: 12 +--- + + +``` diff --git a/test/command/biblatex-strings.md b/test/command/biblatex-strings.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-strings.md @@ -0,0 +1,46 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{excerpt from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib} + +@string{anch-ie = {Angew.~Chem. Int.~Ed.}} + +@article{herrmann, + Author = {Herrmann, Wolfgang A. and Öfele, Karl and Schneider, Sabine K. and Herdtweck, Eberhardt and Hoffmann, Stephan D.}, + Date = 2006, + Hyphenation = {english}, + Indextitle = {Carbocyclic carbene as an efficient catalyst, A}, + Journaltitle = anch-ie, + Number = 23, + Pages = {3859-3862}, + Title = {A Carbocyclic Carbene as an Efficient Catalyst Ligand for {C--C} Coupling Reactions}, + Volume = 45} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Herrmann + given: Wolfgang A. + - family: Öfele + given: Karl + - family: Schneider + given: Sabine K. + - family: Herdtweck + given: Eberhardt + - family: Hoffmann + given: Stephan D. + container-title: Angew. Chem. Int. Ed. + id: herrmann + issue: 23 + issued: 2006 + language: en-US + page: 3859-3862 + title: A carbocyclic carbene as an efficient catalyst ligand for C--C + coupling reactions + type: article-journal + volume: 45 +--- + + +``` diff --git a/test/command/biblatex-test-case-conversion.md b/test/command/biblatex-test-case-conversion.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-test-case-conversion.md @@ -0,0 +1,73 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + - bibtex and biblatex + - expect titles in title case + - styles use titles as is, or convert them to sentence case + - strings wrapped {} are not converted + - all CSL styles at + and + - expect titles in sentence case + - styles use titles as is, or convert them to title case + - except for (hardcoded) list of stop words, see + + - citeproc-js (MLZ only?) also recognizes a markup syntax for + suppressing title-case changes on a range of text (see + ): + - `lowercase` + - Proposal: + - When converting to yaml, convert English titles to sentence case, + - for all strings wrapped in {} where {} is not part of a latex + command, ... + - ... when starting with an uppercase letter: suppress +conversion, remove the {} + - ... when starting with a lowercase letter ("nm", "iPod"): + suppress conversion, replace the {} with + + - Note: Camel case ("iPod") needs to be protected in + bibtex/biblatex anyway; the only "extension" (wrt bibtex/biblatex + specs) we'd be introducing is wrapping lowercase-only strings in + {}, something that is never necessary on the latex side but + won't break anything there either. + - citeproc-hs/pandoc-citeproc should be modified to honour this new + syntax and suppress conversion to title case for strings wrapped + in ``. + - Expected output, using one of the title-case CSL styles, here + chicago-author-date.csl: + + Author, Ann. 2013. “A Title, in English, with a Proper Name and +an + ACRONYM and a camelCase Word and Some Units, 400 nm, 3 cm, and +a Quote, + *Alea iacta est*.” *Journal*. + } + +@article{item1, + Author = {Author, Ann}, + Date = {2013}, + Hyphenation = {english}, + Journaltitle = {Journal}, + Title = {A Title, in {English}, with a {Proper Name} and an {ACRONYM} +and a {camelCase} Word and Some Units, 400~{nm}, 3~{cm}, and a Quote, +\textit{{Alea} {iacta est}}} +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Author + given: Ann + container-title: Journal + id: item1 + issued: 2013 + language: en-US + title: A title, in English, with a Proper Name and an ACRONYM and a + [camelCase]{.nocase} word and some units, 400 [nm]{.nocase}, + 3 [cm]{.nocase}, and a quote, *Alea [iacta est]{.nocase}* + type: article-journal +--- + + +``` diff --git a/test/command/biblatex-textnormal.md b/test/command/biblatex-textnormal.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-textnormal.md @@ -0,0 +1,17 @@ +``` +% pandoc -f biblatex -t markdown -s +@book{item1, + Title = {The Title \textnormal{of this book}}, +} + +^D +--- +nocite: "[@*]" +references: +- id: item1 + title: The title [of this book]{.nodecor} + type: book +--- + + +``` diff --git a/test/command/biblatex-thesis.md b/test/command/biblatex-thesis.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-thesis.md @@ -0,0 +1,68 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{excerpted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib + +TODO: Uppercase letters following hyphens need to be converted to lowercase, too (e.g., "r" in "High-Resolution". -- Same for citeproc when doing title-case conversion!) +} + +@thesis{geer, + Annotation = {This is a typical thesis entry for a PhD thesis. Note the type field in the database file which uses a localization key. Also note the format of the printed name and compare the useprefix option in the options field as well as vangennep}, + Author = {de Geer, Ingrid}, + Date = 1985, + Hyphenation = {british}, + Institution = {Uppsala Universitet}, + Location = {Uppsala}, + Options = {useprefix=false}, + Subtitle = {The {Orkney} Earldom of the Twelfth Century. {A} Musicological Study}, + Title = {Earl, Saint, Bishop, Skald~-- and Music}, + Type = {phdthesis}} + +@thesis{loh, + Annotation = {This is a typical thesis entry for an MA thesis. Note the type field in the database file which uses a localization key}, + Author = {Loh, Nin C.}, + Date = 1992, + Hyphenation = {american}, + Institution = {Massachusetts Institute of Technology}, + Location = {Cambridge, Mass.}, + Title = {High-Resolution Micromachined Interferometric Accelerometer}, + Type = {mathesis}} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a typical thesis entry for a PhD thesis. Note the type + field in the database file which uses a localization key. Also note + the format of the printed name and compare the useprefix option in + the options field as well as vangennep + author: + - dropping-particle: de + family: Geer + given: Ingrid + genre: PhD thesis + id: geer + issued: 1985 + language: en-GB + publisher: Uppsala Universitet + publisher-place: Uppsala + title: "Earl, saint, bishop, skald -- and music: The Orkney earldom of + the twelfth century. A musicological study" + title-short: Earl, saint, bishop, skald -- and music + type: thesis +- annote: This is a typical thesis entry for an MA thesis. Note the type + field in the database file which uses a localization key + author: + - family: Loh + given: Nin C. + genre: Master's thesis + id: loh + issued: 1992 + language: en-US + publisher: Massachusetts Institute of Technology + publisher-place: Cambridge, Mass. + title: High-resolution micromachined interferometric accelerometer + type: thesis +--- + + +``` diff --git a/test/command/biblatex-title-and-shorttitle.md b/test/command/biblatex-title-and-shorttitle.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-title-and-shorttitle.md @@ -0,0 +1,76 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +TODO: +Slight inconsistency: +When a biblatex “title” field contains a colon, the part before the colon is mapped to CSL “title-short”. +When there’s a biblatex “title” and a “subtitle” field, CSL “title-short” is not set, though it would make at least as much sense to map “title” (without “subtitle”) to CSL “title-short” in this case. + +CSL “container-title-short” could also be set +- from biblatex “shortjournal” +- for inbook, incollection etc. from the “shorttitle” field of the cross-referenced book, collection etc. entry (see item5, item6) +... but it might not really be worth it, “container-title-short” not being used once in my sample of 70+ CSL styles. + +} + +@book{item4, + Shorttitle = {The Shorttitle}, + Subtitle = {And a Subtitle, in Two Separate Fields; plus a Separate “Shorttitle” Field}, + Title = {The Title: With a Colon in the “Title” Field}} + +@book{item3, + Subtitle = {And a Subtitle, in two separate fields}, + Title = {The Title: With a Colon in the “title” field}} + +@book{item2, + Subtitle = {The Subtitle, In Two Separate fields}, + Title = {The Title}} + +@book{item1, + Title = {The Title: And the Subtitle, all in the “title” Field}} + +@inbook{item5, + Title = {The inbook Title: And the Subtitle, all in the “title” Field}, + Crossref = {item6}} + +@book{item6, + Title = {The Title: And the Subtitle, all in the “title” Field}, + Shorttitle = {The Shorttitle}, +} +^D +--- +nocite: "[@*]" +references: +- id: item4 + title: "The title: With a colon in the \"title\" field: And a subtitle, + in two separate fields; plus a separate \"shorttitle\" field" + title-short: The shorttitle + type: book +- id: item3 + title: "The title: With a colon in the \"title\" field: And a subtitle, + in two separate fields" + title-short: The title + type: book +- id: item2 + title: "The title: The subtitle, in two separate fields" + title-short: The title + type: book +- id: item1 + title: "The title: And the subtitle, all in the \"title\" field" + title-short: The title + type: book +- container-title: "The title: And the subtitle, all in the \"title\" + field" + id: item5 + title: "The inbook title: And the subtitle, all in the \"title\" field" + title-short: The inbook title + type: chapter +- id: item6 + title: "The title: And the subtitle, all in the \"title\" field" + title-short: The shorttitle + type: book +--- + + +``` diff --git a/test/command/biblatex-vangennep-related.md b/test/command/biblatex-vangennep-related.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-vangennep-related.md @@ -0,0 +1,69 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(van Gennep 1909) + +van Gennep, Arnold. 1909. *Les rites de passage*. Paris: Nourry. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(van Gennep, 1909) + +van Gennep, A. (1909). *Les rites de passage*. Paris: Nourry. + +NOTES: + +- biblio2yaml + - "related = {vizedom:related}, relatedtype = {bytranslator}": no equivalent implemented in CSL + - "options = {useprefix}," is shorthand for "options = {useprefix=true}," + + +} + +@Book{vangennep:related, + author = {van Gennep, Arnold}, + title = {Les rites de passage}, + date = 1909, + publisher = {Nourry}, + location = {Paris}, + options = {useprefix}, + hyphenation = {french}, + related = {vizedom:related}, + relatedtype = {bytranslator}, + sorttitle = {Rites de passage}, + indextitle = {Rites de passage, Les}, + shorttitle = {Rites de passage}, + annotation = {A variant of the vangennep entry related to its + translation. Note the format of the related and + relatedtype fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A variant of the vangennep entry related to its translation. + Note the format of the related and relatedtype fields + author: + - family: Gennep + given: Arnold + non-dropping-particle: van + id: "vangennep:related" + issued: 1909 + language: fr-FR + publisher: Nourry + publisher-place: Paris + title: Les rites de passage + title-short: Rites de passage + type: book +--- + + +``` diff --git a/test/command/biblatex-vangennep-trans.md b/test/command/biblatex-vangennep-trans.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-vangennep-trans.md @@ -0,0 +1,69 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(van Gennep 1960) + +van Gennep, Arnold. 1960. *The Rites of Passage*. Translated by Monika +B. Vizedom and Gabrielle L. Caffee. University of Chicago Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(van Gennep, 1960) + +van Gennep, A. (1960). *The rites of passage*. (M. B. Vizedom & G. L. +Caffee, Trans.). University of Chicago Press. + + +} + +@Book{vangennep:trans, + author = {van Gennep, Arnold}, + title = {The Rites of Passage}, + year = 1960, + translator = {Vizedom, Monika B. and Caffee, Gabrielle L.}, + language = {english}, + origlanguage = {french}, + publisher = {University of Chicago Press}, + options = {useprefix}, + indextitle = {Rites of Passage, The}, + sorttitle = {Rites of Passage}, + shorttitle = {Rites of Passage}, + hyphenation = {american}, + annotation = {A translation of the vangennep entry. Note the + translator and origlanguage fields. Compare + with the vangennep:related entry.}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: "A translation of the vangennep entry. Note the translator and + origlanguage fields. Compare with the vangennep:related entry." + author: + - family: Gennep + given: Arnold + non-dropping-particle: van + id: "vangennep:trans" + issued: 1960 + language: en-US + publisher: University of Chicago Press + title: The rites of passage + title-short: Rites of passage + translator: + - family: Vizedom + given: Monika B. + - family: Caffee + given: Gabrielle L. + type: book +--- + + +``` diff --git a/test/command/biblatex-vangennep.md b/test/command/biblatex-vangennep.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-vangennep.md @@ -0,0 +1,61 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(van Gennep 1909) + +van Gennep, Arnold. 1909. *Les rites de passage*. Paris: Nourry. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(van Gennep, 1909) + +van Gennep, A. (1909). *Les rites de passage*. Paris: Nourry. + + +} + +@Book{vangennep, + author = {van Gennep, Arnold}, + title = {Les rites de passage}, + date = 1909, + publisher = {Nourry}, + location = {Paris}, + options = {useprefix}, + hyphenation = {french}, + sorttitle = {Rites de passage}, + indextitle = {Rites de passage, Les}, + shorttitle = {Rites de passage}, + annotation = {A book entry. Note the format of the printed name and + compare the useprefix option in the options + field as well as brandt and geer}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry. Note the format of the printed name and compare + the useprefix option in the options field as well as brandt and geer + author: + - family: Gennep + given: Arnold + non-dropping-particle: van + id: vangennep + issued: 1909 + language: fr-FR + publisher: Nourry + publisher-place: Paris + title: Les rites de passage + title-short: Rites de passage + type: book +--- + + +``` diff --git a/test/command/biblatex-vazques-de-parga-mvbook.md b/test/command/biblatex-vazques-de-parga-mvbook.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-vazques-de-parga-mvbook.md @@ -0,0 +1,75 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Vázques de Parga, Lacarra, and Uría Ríu 1993) + +Vázques de Parga, Luis, José María Lacarra, and Juan Uría Ríu. 1993. +*Las Peregrinaciones a Santiago de Compostela*. 3. Pamplona: Iberdrola. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Vázques de Parga, Lacarra, & Uría Ríu, 1993) + +Vázques de Parga, L., Lacarra, J. M., & Uría Ríu, J. (1993). *Las +Peregrinaciones a Santiago de Compostela* (1-3). Pamplona: Iberdrola. + + +NOTES: + +- citeproc + - term "vols." missing + +} + +@mvbook{vazques-de-parga, + author = {V{\'a}zques{ de }Parga, Luis and Lacarra, Jos{\'e} Mar{\'i}a + and Ur{\'i}a R{\'i}u, Juan}, + title = {Las Peregrinaciones a Santiago de Compostela}, + date = 1993, + volumes = 3, + note = {Ed. facs. de la realizada en 1948--49}, + publisher = {Iberdrola}, + location = {Pamplona}, + hyphenation = {spanish}, + sorttitle = {Peregrinaciones a Santiago de Compostela}, + indextitle = {Peregrinaciones a Santiago de Compostela, Las}, + shorttitle = {Peregrinaciones}, + annotation = {A multivolume book cited as a whole. This is a book + entry with volumes, note, + sorttitle, and indextitle fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A multivolume book cited as a whole. This is a book entry with + volumes, note, sorttitle, and indextitle fields + author: + - family: Vázques de Parga + given: Luis + - family: Lacarra + given: José María + - family: Uría Ríu + given: Juan + id: vazques-de-parga + issued: 1993 + language: es-ES + note: Ed. facs. de la realizada en 1948--49 + number-of-volumes: 3 + publisher: Iberdrola + publisher-place: Pamplona + title: Las Peregrinaciones a Santiago de Compostela + title-short: Peregrinaciones + type: book +--- + + +``` diff --git a/test/command/biblatex-vazques-de-parga.md b/test/command/biblatex-vazques-de-parga.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-vazques-de-parga.md @@ -0,0 +1,74 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Vázques de Parga, Lacarra, and Uría Ríu 1993) + +Vázques de Parga, Luis, José María Lacarra, and Juan Uría Ríu. 1993. +*Las Peregrinaciones a Santiago de Compostela*. 3. Pamplona: Iberdrola. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Vázques de Parga, Lacarra, & Uría Ríu, 1993) + +Vázques de Parga, L., Lacarra, J. M., & Uría Ríu, J. (1993). *Las +Peregrinaciones a Santiago de Compostela* (1-3). Pamplona: Iberdrola. + + +NOTES: + +- citeproc + - term "vols." missing + +} + +@Book{vazques-de-parga, + author = {V{\'a}zques{ de }Parga, Luis and Lacarra, Jos{\'e} Mar{\'i}a + and Ur{\'i}a R{\'i}u, Juan}, + title = {Las Peregrinaciones a Santiago de Compostela}, + date = 1993, + volumes = 3, + note = {Ed. facs. de la realizada en 1948--49}, + publisher = {Iberdrola}, + location = {Pamplona}, + hyphenation = {spanish}, + sorttitle = {Peregrinaciones a Santiago de Compostela}, + indextitle = {Peregrinaciones a Santiago de Compostela, Las}, + shorttitle = {Peregrinaciones}, + annotation = {A multivolume book cited as a whole. This is a book + entry with volumes, note, + sorttitle, and indextitle fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A multivolume book cited as a whole. This is a book entry with + volumes, note, sorttitle, and indextitle fields + author: + - family: Vázques de Parga + given: Luis + - family: Lacarra + given: José María + - family: Uría Ríu + given: Juan + id: vazques-de-parga + issued: 1993 + language: es-ES + note: Ed. facs. de la realizada en 1948--49 + number-of-volumes: 3 + publisher: Iberdrola + publisher-place: Pamplona + title: Las Peregrinaciones a Santiago de Compostela + title-short: Peregrinaciones + type: book +--- + + +``` diff --git a/test/command/biblatex-video.md b/test/command/biblatex-video.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-video.md @@ -0,0 +1,19 @@ +``` +% pandoc -f biblatex -t markdown -s +@video{x1,title={blah}} +@movie{x2,title={blah}} + +^D +--- +nocite: "[@*]" +references: +- id: x1 + title: Blah + type: motion_picture +- id: x2 + title: Blah + type: motion_picture +--- + + +``` diff --git a/test/command/biblatex-vizedom-related.md b/test/command/biblatex-vizedom-related.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-vizedom-related.md @@ -0,0 +1,68 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Vizedom and Caffee 1960) + +Vizedom, Monika B., and Gabrielle L. Caffee, trans. 1960. *The Rites of +Passage*. University of Chicago Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Vizedom & Caffee, 1960) + +Vizedom, M. B., & Caffee, G. L. (Trans.). (1960). *The rites of +passage*. University of Chicago Press. + + +NOTES: + +- biblio2yaml + - "related = {vangennep}, relatedtype = {translationof}": no equivalent implemented in CSL + +} + +@Book{vizedom:related, + title = {The Rites of Passage}, + year = 1960, + translator = {Vizedom, Monika B. and Caffee, Gabrielle L.}, + language = {english}, + publisher = {University of Chicago Press}, + hyphenation = {american}, + options = {usetranslator}, + related = {vangennep}, + relatedtype = {translationof}, + indextitle = {Rites of Passage, The}, + sorttitle = {Rites of Passage}, + shorttitle = {Rites of Passage}, + annotation = {A translated work from vangennep. Note the format of + the related and relatedtype fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A translated work from vangennep. Note the format of the + related and relatedtype fields + id: "vizedom:related" + issued: 1960 + language: en-US + publisher: University of Chicago Press + title: The rites of passage + title-short: Rites of passage + translator: + - family: Vizedom + given: Monika B. + - family: Caffee + given: Gabrielle L. + type: book +--- + + +``` diff --git a/test/command/biblatex-wassenberg.md b/test/command/biblatex-wassenberg.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-wassenberg.md @@ -0,0 +1,83 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Wassenberg and Sanders 2010) + +Wassenberg, Jan, and Peter Sanders. 2010. “Faster Radix Sort via Virtual +Memory and Write-combining” (version 1). August 17. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Wassenberg & Sanders, 2010) + +Wassenberg, J., & Sanders, P. (2010, August 17). Faster radix sort via +virtual memory and write-combining. + + +NOTES: + +- biblio2yaml + - "eprinttype = {arxiv}, eprintclass = {cs.DS}, eprint = {1008.2849v1}" should be used to reconstruct a Url: http://arxiv.org/abs/1008.2849v1 ("cs.DS" does not seem to be essential) + +} + +@Online{wassenberg, + author = {Wassenberg, Jan and Sanders, Peter}, + title = {Faster Radix Sort via Virtual Memory and Write-Combining}, + date = {2010-08-17}, + version = 1, + hyphenation = {american}, + eprinttype = {arxiv}, + eprintclass = {cs.DS}, + eprint = {1008.2849v1}, + annotation = {A recent online reference from arXiv using the new + (April 2007 onward) identifier format. Note the + eprint, eprinttype, and eprintclass + fields. Also note that the arXiv reference is transformed into + a clickable link if hyperref support has been + enabled}, + abstract = {Sorting algorithms are the deciding factor for the performance + of common operations such as removal of duplicates or database + sort-merge joins. This work focuses on 32-bit integer keys, + optionally paired with a 32-bit value. We present a fast radix + sorting algorithm that builds upon a microarchitecture-aware + variant of counting sort}, +} + +^D +--- +nocite: "[@*]" +references: +- abstract: Sorting algorithms are the deciding factor for the + performance of common operations such as removal of duplicates or + database sort-merge joins. This work focuses on 32-bit integer keys, + optionally paired with a 32-bit value. We present a fast radix + sorting algorithm that builds upon a microarchitecture-aware variant + of counting sort + annote: A recent online reference from arXiv using the new (April 2007 + onward) identifier format. Note the eprint, eprinttype, and + eprintclass fields. Also note that the arXiv reference is + transformed into a clickable link if hyperref support has been + enabled + author: + - family: Wassenberg + given: Jan + - family: Sanders + given: Peter + id: wassenberg + issued: 2010-08-17 + language: en-US + title: Faster radix sort via virtual memory and write-combining + type: webpage + url: "https://arxiv.org/abs/1008.2849v1" + version: 1 +--- + + +``` diff --git a/test/command/biblatex-weinberg.md b/test/command/biblatex-weinberg.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-weinberg.md @@ -0,0 +1,52 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Weinberg 1967) + +Weinberg, Steven. 1967. “A Model of Leptons.” *Phys. Rev. Lett.* 19: +1264–1266. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Weinberg, 1967) + +Weinberg, S. (1967). A model of leptons. *Phys. Rev. Lett.*, *19*, +1264–1266. + + +} + +@Article{weinberg, + author = {Weinberg, Steven}, + title = {A Model of Leptons}, + journaltitle = {Phys.~Rev.~Lett.}, + date = 1967, + volume = 19, + pages = {1264-1266}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Weinberg + given: Steven + container-title: Phys. Rev. Lett. + id: weinberg + issued: 1967 + page: 1264-1266 + title: A model of leptons + type: article-journal + volume: 19 +--- + + +``` diff --git a/test/command/biblatex-westfahl-frontier.md b/test/command/biblatex-westfahl-frontier.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-westfahl-frontier.md @@ -0,0 +1,60 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Westfahl 2000) + +Westfahl, Gary, ed. 2000. *Space and Beyond: The Frontier Theme in +Science Fiction*. Westport, Conn.; London: Greenwood. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Westfahl, 2000) + +Westfahl, G. (Ed.). (2000). *Space and beyond: The frontier theme in +science fiction*. Westport, Conn.; London: Greenwood. + + +} + +@Collection{westfahl:frontier, + editor = {Westfahl, Gary}, + title = {Space and Beyond}, + date = 2000, + subtitle = {The Frontier Theme in Science Fiction}, + publisher = {Greenwood}, + location = {Westport, Conn. and London}, + hyphenation = {american}, + booktitle = {Space and Beyond}, + booksubtitle = {The Frontier Theme in Science Fiction}, + annotation = {This is a collection entry. Note the format of the + location field as well as the subtitle and + booksubtitle fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: This is a collection entry. Note the format of the location + field as well as the subtitle and booksubtitle fields + editor: + - family: Westfahl + given: Gary + id: "westfahl:frontier" + issued: 2000 + language: en-US + publisher: Greenwood + publisher-place: Westport, Conn.; London + title: "Space and beyond: The frontier theme in science fiction" + title-short: Space and beyond + type: book +--- + + +``` diff --git a/test/command/biblatex-westfahl-space.md b/test/command/biblatex-westfahl-space.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-westfahl-space.md @@ -0,0 +1,106 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Westfahl 2000a) (Westfahl 2000b) + +Westfahl, Gary. 2000a. “The True Frontier: Confronting and Avoiding the +Realities of Space in American Science Fiction Films.” In *Space and +Beyond: The Frontier Theme in Science Fiction*, edited by Gary Westfahl, +55–65. Westport, Conn.; London: Greenwood. + +———, ed. 2000b. *Space and Beyond: The Frontier Theme in Science +Fiction*. Westport, Conn.; London: Greenwood. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Westfahl, 2000) (Westfahl, 2000) + +Westfahl, G. (2000). The true frontier: Confronting and avoiding the +realities of space in American science fiction films. In G. Westfahl +(Ed.), *Space and beyond: The frontier theme in science fiction* (pp. +55–65). Westport, Conn.; London: Greenwood. + +Westfahl, G. (Ed.). (2000). *Space and beyond: The frontier theme in +science fiction*. Westport, Conn.; London: Greenwood. + + +} + +@InCollection{westfahl:space, + author = {Westfahl, Gary}, + title = {The True Frontier}, + subtitle = {Confronting and Avoiding the Realities of Space in {American} + Science Fiction Films}, + pages = {55-65}, + crossref = {westfahl:frontier}, + hyphenation = {american}, + indextitle = {True Frontier, The}, + annotation = {A cross-referenced article from a collection. This is + an incollection entry with a crossref + field. Note the subtitle and indextitle + fields}, +} + +@Collection{westfahl:frontier, + editor = {Westfahl, Gary}, + title = {Space and Beyond}, + date = 2000, + subtitle = {The Frontier Theme in Science Fiction}, + publisher = {Greenwood}, + location = {Westport, Conn. and London}, + hyphenation = {american}, + booktitle = {Space and Beyond}, + booksubtitle = {The Frontier Theme in Science Fiction}, + annotation = {This is a collection entry. Note the format of the + location field as well as the subtitle and + booksubtitle fields}, +} +^D +--- +nocite: "[@*]" +references: +- annote: A cross-referenced article from a collection. This is an + incollection entry with a crossref field. Note the subtitle and + indextitle fields + author: + - family: Westfahl + given: Gary + container-title: "Space and beyond: The frontier theme in science + fiction" + editor: + - family: Westfahl + given: Gary + id: "westfahl:space" + issued: 2000 + language: en-US + page: 55-65 + publisher: Greenwood + publisher-place: Westport, Conn.; London + title: "The true frontier: Confronting and avoiding the realities of + space in American science fiction films" + title-short: The true frontier + type: chapter +- annote: This is a collection entry. Note the format of the location + field as well as the subtitle and booksubtitle fields + editor: + - family: Westfahl + given: Gary + id: "westfahl:frontier" + issued: 2000 + language: en-US + publisher: Greenwood + publisher-place: Westport, Conn.; London + title: "Space and beyond: The frontier theme in science fiction" + title-short: Space and beyond + type: book +--- + + +``` diff --git a/test/command/biblatex-wilde.md b/test/command/biblatex-wilde.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-wilde.md @@ -0,0 +1,65 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Wilde 1899) + +Wilde, Oscar. 1899. *The Importance of Being Earnest: A Trivial Comedy +for Serious People*. English and American Drama of the Nineteenth +Century. Leonard Smithers and Company. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Wilde, 1899) + +Wilde, O. (1899). *The importance of being earnest: A trivial comedy for +serious people*. Leonard Smithers and Company. + + +NOTES: + +- biblio2yaml + - From "eprint = {4HIWAAAAYAAJ}, eprinttype = {googlebooks}", a url could be reconstructed, shortest form: http://books.google.com?id=4HIWAAAAYAAJ + +} + +@Book{wilde, + author = {Wilde, Oscar}, + title = {The Importance of Being Earnest: {A} Trivial Comedy for Serious + People}, + year = 1899, + series = {English and American drama of the Nineteenth Century}, + publisher = {Leonard Smithers {and} Company}, + eprint = {4HIWAAAAYAAJ}, + eprinttype = {googlebooks}, + annotation = {A book with eprint and eprinttype + fields.}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book with eprint and eprinttype fields. + author: + - family: Wilde + given: Oscar + collection-title: English and american drama of the nineteenth century + id: wilde + issued: 1899 + publisher: Leonard Smithers and Company + title: "The importance of being earnest: A trivial comedy for serious + people" + title-short: The importance of being earnest + type: book + url: "https://books.google.com?id=4HIWAAAAYAAJ" +--- + + +``` diff --git a/test/command/biblatex-worman.md b/test/command/biblatex-worman.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-worman.md @@ -0,0 +1,60 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Worman 2002) + +Worman, Nancy. 2002. *The Cast of Character: Style in Greek Literature*. +Austin: University of Texas Press. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Worman, 2002) + +Worman, N. (2002). *The cast of character: Style in Greek literature*. +Austin: University of Texas Press. + + +} + +@Book{worman, + author = {Worman, Nancy}, + title = {The Cast of Character}, + date = 2002, + publisher = {University of Texas Press}, + location = {Austin}, + hyphenation = {american}, + sorttitle = {Cast of Character}, + indextitle = {Cast of Character, The}, + subtitle = {Style in {Greek} Literature}, + shorttitle = {Cast of Character}, + annotation = {A book entry. Note the sorttitle and + indextitle fields}, +} + +^D +--- +nocite: "[@*]" +references: +- annote: A book entry. Note the sorttitle and indextitle fields + author: + - family: Worman + given: Nancy + id: worman + issued: 2002 + language: en-US + publisher: University of Texas Press + publisher-place: Austin + title: "The cast of character: Style in Greek literature" + title-short: Cast of character + type: book +--- + + +``` diff --git a/test/command/biblatex-yoon.md b/test/command/biblatex-yoon.md new file mode 100644 --- /dev/null +++ b/test/command/biblatex-yoon.md @@ -0,0 +1,67 @@ +``` +% pandoc -f biblatex -t markdown -s +@comment{ + +Adapted from biblatex-example.bib + + +Formatted with pandoc and chicago-author-date.csl, 2013-10-23: + +(Yoon et al. 2006) + +Yoon, Myeong S., Dowook Ryu, Jeongryul Kim, and Kyo Han Ahn. 2006. +“Palladium Pincer Complexes with Reduced Bond Angle Strain: Efficient +Catalysts for the Heck Reaction.” *Organometallics* 25 (10): 2409–2411. + + +Formatted with pandoc and apa.csl, 2013-10-23: + +(Yoon, Ryu, Kim, & Ahn, 2006) + +Yoon, M. S., Ryu, D., Kim, J., & Ahn, K. H. (2006). Palladium pincer +complexes with reduced bond angle strain: Efficient catalysts for the +Heck reaction. *Organometallics*, *25*(10), 2409–2411. + + +} + +@Article{yoon, + author = {Yoon, Myeong S. and Ryu, Dowook and Kim, Jeongryul and Ahn, + Kyo Han}, + title = {Palladium pincer complexes with reduced bond angle strain: + efficient catalysts for the {Heck} reaction}, + journaltitle = {Organometallics}, + date = 2006, + volume = 25, + number = 10, + pages = {2409-2411}, + indextitle = {Palladium pincer complexes}, +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Yoon + given: Myeong S. + - family: Ryu + given: Dowook + - family: Kim + given: Jeongryul + - family: Ahn + given: Kyo Han + container-title: Organometallics + id: yoon + issue: 10 + issued: 2006 + page: 2409-2411 + title: "Palladium pincer complexes with reduced bond angle strain: + Efficient catalysts for the Heck reaction" + title-short: Palladium pincer complexes with reduced bond angle strain + type: article-journal + volume: 25 +--- + + +``` diff --git a/test/command/biblio.bib b/test/command/biblio.bib new file mode 100644 --- /dev/null +++ b/test/command/biblio.bib @@ -0,0 +1,26 @@ +@Book{item1, +author="John Doe", +title="First Book", +year="2005", +address="Cambridge", +publisher="Cambridge University Press" +} + +@Article{item2, +author="John Doe", +title="Article", +year="2006", +journal="Journal of Generic Studies", +volume="6", +pages="33-34" +} + +@InCollection{пункт3, +author="John Doe and Jenny Roe", +title="Why Water Is Wet", +booktitle="Third Book", +editor="Sam Smith", +publisher="Oxford University Press", +address="Oxford", +year="2007" +} diff --git a/test/command/bibtex-basic.md b/test/command/bibtex-basic.md new file mode 100644 --- /dev/null +++ b/test/command/bibtex-basic.md @@ -0,0 +1,71 @@ +``` +% pandoc -f biblatex -t markdown -s +@Book{item1, +author="John Doe", +title="First Book", +year="2005", +address="Cambridge", +publisher="Cambridge University Press" +} + +@Article{item2, +author="John Doe", +title="Article", +year="2006", +journal="Journal of Generic Studies", +volume="6", +pages="33-34" +} + +@InCollection{пункт3, +author="John Doe and Jenny Roe", +title="Why Water Is Wet", +booktitle="Third Book", +editor="Sam Smith", +publisher="Oxford University Press", +address="Oxford", +year="2007" +} + +^D +--- +nocite: "[@*]" +references: +- author: + - family: Doe + given: John + id: item1 + issued: 2005 + publisher: Cambridge University Press + publisher-place: Cambridge + title: First book + type: book +- author: + - family: Doe + given: John + container-title: Journal of Generic Studies + id: item2 + issued: 2006 + page: 33-34 + title: Article + type: article-journal + volume: 6 +- author: + - family: Doe + given: John + - family: Roe + given: Jenny + container-title: Third book + editor: + - family: Smith + given: Sam + id: пункт3 + issued: 2007 + publisher: Oxford University Press + publisher-place: Oxford + title: Why water is wet + type: chapter +--- + + +``` diff --git a/test/command/bioethics.csl b/test/command/bioethics.csl new file mode 100644 --- /dev/null +++ b/test/command/bioethics.csl @@ -0,0 +1,226 @@ + + diff --git a/test/command/bits-book-meta.md b/test/command/bits-book-meta.md new file mode 100644 --- /dev/null +++ b/test/command/bits-book-meta.md @@ -0,0 +1,104 @@ +``` +% pandoc -f jats -t native -s + + + handbook-648 + + The NCBI Handbook + + + + McEntyre + Jo + + + + Ostell + Jim + + + + + National Center for Biotechnology Information (NCBI), National Library of Medicine, National Institutes of Health, Bethesda, MD 20892-6510 + + + 11 + 2002 + + + National Center for Biotechnology Information (NCBI), National Library of Medicine, National Institutes of Health + Bethesda, MD + + 1 + + + + + + + + + + +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "author" + , MetaList + [ MetaInlines [ Str "Jo" , Space , Str "McEntyre" ] ] + ) + , ( "date" , MetaInlines [ Str "2002-11" ] ) + , ( "institute" + , MetaList + [ MetaInlines + [ Str "National" + , Space + , Str "Center" + , Space + , Str "for" + , Space + , Str "Biotechnology" + , Space + , Str "Information" + , Space + , Str "(NCBI)," + , Space + , Str "National" + , Space + , Str "Library" + , Space + , Str "of" + , Space + , Str "Medicine," + , Space + , Str "National" + , Space + , Str "Institutes" + , Space + , Str "of" + , Space + , Str "Health," + , Space + , Str "Bethesda," + , Space + , Str "MD" + , Space + , Str "20892-6510" + ] + ] + ) + , ( "title" + , MetaInlines + [ Str "The" + , Space + , Str "NCBI" + , Space + , Str "Handbook" + ] + ) + ] + } + [] +``` diff --git a/test/command/bits-book-part-wrapper-meta.md b/test/command/bits-book-part-wrapper-meta.md new file mode 100644 --- /dev/null +++ b/test/command/bits-book-part-wrapper-meta.md @@ -0,0 +1,95 @@ +``` +% pandoc -f jats -t native -s + + + + + Balisage Series on Markup Technologies + + + +

    The Balisage Series on Markup Technologies + is an occasional series...

    +     +     + + + + Proceedings of Balisage: The Markup Conference + 2013 + + + +

    Balisage is a peer-reviewed conference...

     + +     +     +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "abstract" + , MetaBlocks + [ Para + [ Str "Balisage" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "peer-reviewed" + , Space + , Str "conference..." + ] + ] + ) + , ( "title" + , MetaInlines + [ Str "Proceedings" + , Space + , Str "of" + , Space + , Str "Balisage:" + , Space + , Str "The" + , Space + , Str "Markup" + , Space + , Str "Conference" + , SoftBreak + , Str "2013" + ] + ) + ] + } + [ Para + [ Str "The" + , Space + , Emph + [ Str "Balisage" + , Space + , Str "Series" + , Space + , Str "on" + , Space + , Str "Markup" + , Space + , Str "Technologies" + ] + , SoftBreak + , Str "is" + , Space + , Str "an" + , Space + , Str "occasional" + , Space + , Str "series..." + ] + ] +``` diff --git a/test/command/bits-book-part-wrapper.md b/test/command/bits-book-part-wrapper.md new file mode 100644 --- /dev/null +++ b/test/command/bits-book-part-wrapper.md @@ -0,0 +1,149 @@ +``` +% pandoc -f jats -t native + + + + + Balisage Series on Markup Technologies + + + +

    The Balisage Series on Markup Technologies + is an occasional series...

    +     +     + + + + Proceedings of Balisage: The Markup Conference + 2013 + + + +

    Balisage is a peer-reviewed conference...

     + +     + + + + + + The Databases + + + + + History +

    Initially, GenBank was built and maintained at Los Alamos + National Laboratory.

    +     + + + Back matter of book part + + References + + + + + + Olson + M + + + Hood + L + + + Cantor + C + + + Botstein + D + + + A common language for physical mapping of the human genome + Science + 1989 + 245 + 4925 + 1434 + 1435 + 2781285 + + + + +     +     +^D +[ Para + [ Str "The" + , Space + , Emph + [ Str "Balisage" + , Space + , Str "Series" + , Space + , Str "on" + , Space + , Str "Markup" + , Space + , Str "Technologies" + ] + , SoftBreak + , Str "is" + , Space + , Str "an" + , Space + , Str "occasional" + , Space + , Str "series..." + ] +, Header 2 ( "bid.3" , [] , [] ) [ Str "History" ] +, Para + [ Str "Initially," + , Space + , Str "GenBank" + , Space + , Str "was" + , Space + , Str "built" + , Space + , Str "and" + , Space + , Str "maintained" + , Space + , Str "at" + , Space + , Str "Los" + , Space + , Str "Alamos" + , SoftBreak + , Str "National" + , Space + , Str "Laboratory." + ] +, Header + 2 + ( "" , [] , [] ) + [ Str "Back" + , Space + , Str "matter" + , Space + , Str "of" + , Space + , Str "book" + , Space + , Str "part" + ] +, Header 1 ( "" , [] , [] ) [ Str "References" ] +, Div ( "refs" , [] , [] ) [] +] +``` diff --git a/test/command/bits-book.md b/test/command/bits-book.md new file mode 100644 --- /dev/null +++ b/test/command/bits-book.md @@ -0,0 +1,186 @@ +``` +% pandoc -f jats -t native + + + + + + About this book + + + + + The NCBI Handbook +

    Bioinformatics consists of a computational approach + to biomedical information management and analysis.

    +     +     +     +     + + + + + + The Databases + + + + + History +

    Initially, GenBank was built and maintained at Los Alamos + National Laboratory.

    +     + + + Back matter of book part + + References + + + + + + Olson + M + + + Hood + L + + + Cantor + C + + + Botstein + D + + + A common language for physical mapping of the human genome + Science + 1989 + 245 + 4925 + 1434 + 1435 + 2781285 + + + + +     +     + + + Acknowledgments +

    We gratefully acknowledge the work of Vladimir Soussov, + as well as the entire NCBI Entrez team...

    +     +     +     +^D +[ Header + 2 + ( "" , [] , [] ) + [ Str "The" , Space , Str "NCBI" , Space , Str "Handbook" ] +, Para + [ Str "Bioinformatics" + , Space + , Str "consists" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "computational" + , Space + , Str "approach" + , SoftBreak + , Str "to" + , Space + , Str "biomedical" + , Space + , Str "information" + , Space + , Str "management" + , Space + , Str "and" + , Space + , Str "analysis." + ] +, Header 2 ( "bid.3" , [] , [] ) [ Str "History" ] +, Para + [ Str "Initially," + , Space + , Str "GenBank" + , Space + , Str "was" + , Space + , Str "built" + , Space + , Str "and" + , Space + , Str "maintained" + , Space + , Str "at" + , Space + , Str "Los" + , Space + , Str "Alamos" + , SoftBreak + , Str "National" + , Space + , Str "Laboratory." + ] +, Header + 2 + ( "" , [] , [] ) + [ Str "Back" + , Space + , Str "matter" + , Space + , Str "of" + , Space + , Str "book" + , Space + , Str "part" + ] +, Header 1 ( "" , [] , [] ) [ Str "References" ] +, Div ( "refs" , [] , [] ) [] +, Header 2 ( "bid.394" , [] , [] ) [ Str "Acknowledgments" ] +, Para + [ Str "We" + , Space + , Str "gratefully" + , Space + , Str "acknowledge" + , Space + , Str "the" + , Space + , Str "work" + , Space + , Str "of" + , Space + , Str "Vladimir" + , Space + , Str "Soussov," + , SoftBreak + , Str "as" + , Space + , Str "well" + , Space + , Str "as" + , Space + , Str "the" + , Space + , Str "entire" + , Space + , Str "NCBI" + , Space + , Str "Entrez" + , Space + , Str "team..." + ] +] +``` diff --git a/test/command/bits-index-elements.md b/test/command/bits-index-elements.md new file mode 100644 --- /dev/null +++ b/test/command/bits-index-elements.md @@ -0,0 +1,83 @@ +``` +% pandoc -f jats -t native + + + Index group + +

    Content of index group

    + + + Index + +

    Content of index

    + + + N + +

    Content of index div

    + + Navy + . + Armed forces + . + + + Necessary and proper clause, congressional power + + + Newsgathering as commerce + +     +     +     +^D +[ Header + 1 ( "" , [] , [] ) [ Str "Index" , Space , Str "group" ] +, Para + [ Str "Content" + , Space + , Str "of" + , Space + , Str "index" + , Space + , Str "group" + ] +, Header 2 ( "" , [] , [] ) [ Str "Index" ] +, Para + [ Str "Content" , Space , Str "of" , Space , Str "index" ] +, Header 3 ( "" , [] , [] ) [ Str "N" ] +, Para + [ Str "Content" + , Space + , Str "of" + , Space + , Str "index" + , Space + , Str "div" + ] +, Plain [ Str "Navy" ] +, Plain [ Str "." ] +, Plain [ Str "Armed" , Space , Str "forces" ] +, Plain [ Str "." ] +, Plain + [ Str "Necessary" + , Space + , Str "and" + , Space + , Str "proper" + , Space + , Str "clause," + , Space + , Str "congressional" + , Space + , Str "power" + ] +, Plain + [ Str "Newsgathering" + , Space + , Str "as" + , Space + , Str "commerce" + ] +] +``` diff --git a/test/command/bits-legend.md b/test/command/bits-legend.md new file mode 100644 --- /dev/null +++ b/test/command/bits-legend.md @@ -0,0 +1,45 @@ +``` +% pandoc -f jats -t native + + + + Field of Application + + + Key + + + I +

    input

     +     + + O +

    output

     +     + ... +     +     + +     +^D +[ Figure + ( "fig_A.1" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Field" + , Space + , Str "of" + , Space + , Str "Application" + ] + ]) + [ Header 1 ( "" , [] , [] ) [ Str "Key" ] + , DefinitionList + [ ( [ Str "I" ] , [ [ Para [ Str "input" ] ] ] ) + , ( [ Str "O" ] , [ [ Para [ Str "output" ] ] ] ) + ] + , Para [ Image ( "" , [] , [] ) [] ( "1234" , "" ) ] + ] +] +``` diff --git a/test/command/bits-named-boook-parts.md b/test/command/bits-named-boook-parts.md new file mode 100644 --- /dev/null +++ b/test/command/bits-named-boook-parts.md @@ -0,0 +1,68 @@ +``` +% pandoc -f jats -t native + + +

    This is the dedication text.

    +     +     +^D +[ Header 1 ( "" , [] , [] ) [ Str "Dedication" ] +, Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "dedication" + , Space + , Str "text." + ] +] +``` + +``` +% pandoc -f jats -t native + + +

    This is the foreword text.

    +     +     +^D +[ Header 1 ( "" , [] , [] ) [ Str "Foreword" ] +, Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "foreword" + , Space + , Str "text." + ] +] +``` + +``` +% pandoc -f jats -t native + + +

    This is the preface text.

    +     +     +^D +[ Header 1 ( "" , [] , [] ) [ Str "Preface" ] +, Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "preface" + , Space + , Str "text." + ] +] +``` diff --git a/test/command/bits-title-display-as.md b/test/command/bits-title-display-as.md new file mode 100644 --- /dev/null +++ b/test/command/bits-title-display-as.md @@ -0,0 +1,175 @@ +``` +% pandoc -f jats -t native + + THE EUROPEAN UNION EXPLAINED + +^D +[ Header + 1 + ( "" , [] , [] ) + [ Str "THE" + , Space + , Str "EUROPEAN" + , Space + , Str "UNION" + , Space + , Str "EXPLAINED" + ] +] +``` + +``` +% pandoc -f jats -t native + + THE EUROPEAN UNION EXPLAINED + +^D +[ Header + 3 + ( "" , [] , [] ) + [ Str "THE" + , Space + , Str "EUROPEAN" + , Space + , Str "UNION" + , Space + , Str "EXPLAINED" + ] +] +``` + +``` +% pandoc -f jats -t native + + + The European Parliament +

    Members of the European Parliament (MEPs) are directly elected by EU citizens.

    + + Composition of the European Parliament +

    The seats in the European Parliament are allocated among the Member States.

    +     + + Composition of the European Parliament - II +

    Most MEPs are associated with a national political party in their home country.

    +     +     + +^D +[ Header + 1 + ( "" , [] , [] ) + [ Str "The" + , Space + , Str "European" + , Space + , Str "Parliament" + ] +, Para + [ Str "Members" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "European" + , Space + , Str "Parliament" + , Space + , Str "(MEPs)" + , Space + , Str "are" + , Space + , Str "directly" + , Space + , Str "elected" + , Space + , Str "by" + , Space + , Str "EU" + , Space + , Str "citizens." + ] +, Header + 3 + ( "" , [] , [] ) + [ Str "Composition" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "European" + , Space + , Str "Parliament" + ] +, Para + [ Str "The" + , Space + , Str "seats" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "European" + , Space + , Str "Parliament" + , Space + , Str "are" + , Space + , Str "allocated" + , Space + , Str "among" + , Space + , Str "the" + , Space + , Str "Member" + , Space + , Str "States." + ] +, Header + 2 + ( "" , [] , [] ) + [ Str "Composition" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "European" + , Space + , Str "Parliament" + , Space + , Str "-" + , Space + , Str "II" + ] +, Para + [ Str "Most" + , Space + , Str "MEPs" + , Space + , Str "are" + , Space + , Str "associated" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "national" + , Space + , Str "political" + , Space + , Str "party" + , Space + , Str "in" + , Space + , Str "their" + , Space + , Str "home" + , Space + , Str "country." + ] +] +``` diff --git a/test/command/bits-title-supress.md b/test/command/bits-title-supress.md new file mode 100644 --- /dev/null +++ b/test/command/bits-title-supress.md @@ -0,0 +1,122 @@ +``` +% pandoc -f jats -t native + + The European Parliament +

    Members of the European Parliament (MEPs) are directly elected by EU citizens.

    +     +^D +[ Header + 1 + ( "" , [] , [] ) + [ Str "The" + , Space + , Str "European" + , Space + , Str "Parliament" + ] +, Para + [ Str "Members" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "European" + , Space + , Str "Parliament" + , Space + , Str "(MEPs)" + , Space + , Str "are" + , Space + , Str "directly" + , Space + , Str "elected" + , Space + , Str "by" + , Space + , Str "EU" + , Space + , Str "citizens." + ] +] +``` + +``` +% pandoc -f jats -t native + + The European Parliament +

    Members of the European Parliament (MEPs) are directly elected by EU citizens.

    +     +^D +[ Header + 1 + ( "" , [] , [] ) + [ Str "The" + , Space + , Str "European" + , Space + , Str "Parliament" + ] +, Para + [ Str "Members" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "European" + , Space + , Str "Parliament" + , Space + , Str "(MEPs)" + , Space + , Str "are" + , Space + , Str "directly" + , Space + , Str "elected" + , Space + , Str "by" + , Space + , Str "EU" + , Space + , Str "citizens." + ] +] +``` + +``` +% pandoc -f jats -t native + + The European Parliament +

    Members of the European Parliament (MEPs) are directly elected by EU citizens.

    +     +^D +[ Para + [ Str "Members" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "European" + , Space + , Str "Parliament" + , Space + , Str "(MEPs)" + , Space + , Str "are" + , Space + , Str "directly" + , Space + , Str "elected" + , Space + , Str "by" + , Space + , Str "EU" + , Space + , Str "citizens." + ] +] +``` diff --git a/test/command/bits-toc-elements.md b/test/command/bits-toc-elements.md new file mode 100644 --- /dev/null +++ b/test/command/bits-toc-elements.md @@ -0,0 +1,69 @@ +``` +% pandoc -f jats -t native + + + TOC group + +

    Content of toc group

    + + + TOC + +

    Content of TOC

    + + + Mental Health Services + + + + Introduction + + + + + Mental Health of the Population + + + +     +     +^D +[ Header + 1 ( "" , [] , [] ) [ Str "TOC" , Space , Str "group" ] +, Para + [ Str "Content" + , Space + , Str "of" + , Space + , Str "toc" + , Space + , Str "group" + ] +, Header 2 ( "" , [] , [] ) [ Str "TOC" ] +, Para + [ Str "Content" , Space , Str "of" , Space , Str "TOC" ] +, Header + 3 + ( "" , [] , [] ) + [ Str "Mental" + , Space + , Str "Health" + , Space + , Str "Services" + ] +, Header 4 ( "" , [] , [] ) [ Str "Introduction" ] +, Header + 4 + ( "" , [] , [] ) + [ Str "Mental" + , Space + , Str "Health" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "Population" + ] +] +``` diff --git a/test/command/chap1/spider.png b/test/command/chap1/spider.png new file mode 100644 Binary files /dev/null and b/test/command/chap1/spider.png differ diff --git a/test/command/chap1/text.md b/test/command/chap1/text.md new file mode 100644 --- /dev/null +++ b/test/command/chap1/text.md @@ -0,0 +1,17 @@ +# Chapter one + +A spider: ![spider](spider.png) + +Another spider: ![another spider][refspider] + +The moon: ![moon](../../lalune.jpg) + +Link to [spider picture](spider.png). + +URL left alone: [manual](https://pandoc.org/MANUAL.html). + +Absolute path left alone: [absolute](/foo/bar/baz.png). + +Link to fragment: [chapter two](#chapter-two). + +Empty path: [empty](). diff --git a/test/command/chap2/spider.png b/test/command/chap2/spider.png new file mode 100644 Binary files /dev/null and b/test/command/chap2/spider.png differ diff --git a/test/command/chap2/text.md b/test/command/chap2/text.md new file mode 100644 --- /dev/null +++ b/test/command/chap2/text.md @@ -0,0 +1,5 @@ +# Chapter two + +A spider: ![spider](spider.png) + +[refspider]: spider.png diff --git a/test/command/chicago-annotated-bibliography.csl b/test/command/chicago-annotated-bibliography.csl new file mode 100644 --- /dev/null +++ b/test/command/chicago-annotated-bibliography.csl @@ -0,0 +1,1207 @@ + + diff --git a/test/command/chicago-author-date-with-original-date-and-status.csl b/test/command/chicago-author-date-with-original-date-and-status.csl new file mode 100644 --- /dev/null +++ b/test/command/chicago-author-date-with-original-date-and-status.csl @@ -0,0 +1,575 @@ + + diff --git a/test/command/chicago-fullnote-bibliography.csl b/test/command/chicago-fullnote-bibliography.csl new file mode 100644 --- /dev/null +++ b/test/command/chicago-fullnote-bibliography.csl @@ -0,0 +1,1430 @@ + + diff --git a/test/command/chicago-note-bibliography.csl b/test/command/chicago-note-bibliography.csl new file mode 100644 --- /dev/null +++ b/test/command/chicago-note-bibliography.csl @@ -0,0 +1,1005 @@ + + diff --git a/test/command/chinese-gb7714-2005-numeric.csl b/test/command/chinese-gb7714-2005-numeric.csl new file mode 100644 --- /dev/null +++ b/test/command/chinese-gb7714-2005-numeric.csl @@ -0,0 +1,213 @@ + + diff --git a/test/command/cite-in-inline-note.md b/test/command/cite-in-inline-note.md new file mode 100644 --- /dev/null +++ b/test/command/cite-in-inline-note.md @@ -0,0 +1,26 @@ +``` +% pandoc -t native +foo^[bar [@doe]] +^D +[ Para + [ Str "foo" + , Note + [ Para + [ Str "bar" + , Space + , Cite + [ Citation + { citationId = "doe" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "[@doe]" ] + ] + ] + ] +] +``` diff --git a/test/command/citeproc-17.md b/test/command/citeproc-17.md new file mode 100644 --- /dev/null +++ b/test/command/citeproc-17.md @@ -0,0 +1,17 @@ +``` +% pandoc -t csljson +--- +references: +- id: foo + type: book + title: "Hi & Low" +... +^D +[ + { + "id": "foo", + "title": "Hi & Low", + "type": "book" + } +] +``` diff --git a/test/command/citeproc-20.md b/test/command/citeproc-20.md new file mode 100644 --- /dev/null +++ b/test/command/citeproc-20.md @@ -0,0 +1,25 @@ +``` +% pandoc --citeproc -t plain +Lorem ipsum dolor sit amet^[Consectetur adipisicing elit: «sed do eiusmod tempor incididunt» [@doe_1989, 15].]. + +--- +csl: command/chicago-fullnote-bibliography.csl +suppress-bibliography: true +references: +- id: doe_1989 + author: + - family: Doe + given: John + issued: + - year: 1989 + publisher: ABC + publisher-place: New York + title: Tempor + type: book +... +^D +Lorem ipsum dolor sit amet[1]. + +[1] Consectetur adipisicing elit: «sed do eiusmod tempor incididunt» +(John Doe, Tempor (New York: ABC, 1989), 15). +``` diff --git a/test/command/citeproc-7a.md b/test/command/citeproc-7a.md new file mode 100644 --- /dev/null +++ b/test/command/citeproc-7a.md @@ -0,0 +1,42 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/chicago-fullnote-bibliography.csl +references: + - id: test + title: Test + author: + family: Doe + given: John +--- + +Test [@test, 12]. + +Test [@test, 12]. + +Test.^[asdfasdf] + +Test [@test, 12]. +^D +Test.[^1] + +Test.[^2] + +Test.[^3] + +Test.[^4] + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-test .csl-entry} +Doe, John. "Test," n.d. +::: +:::: + +[^1]: John Doe, "Test," n.d., 12. + +[^2]: Doe, 12. + +[^3]: asdfasdf + +[^4]: Doe, "Test," 12. +``` diff --git a/test/command/citeproc-7b.md b/test/command/citeproc-7b.md new file mode 100644 --- /dev/null +++ b/test/command/citeproc-7b.md @@ -0,0 +1,36 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/bioethics.csl +references: + - id: test + title: Test + author: + family: Doe + given: John +--- + +Irrelevant.^[note] + +Test [@test, 12]. + +Test.^[asdfasdf] + +Test [@test, 12]. +^D +Irrelevant.[^1] + +Test.[^2] + +Test.[^3] + +Test.[^4] + +[^1]: note + +[^2]: J. Doe. ***Test***: 12. + +[^3]: asdfasdf + +[^4]: Doe (cited n. 2) : 12. +``` diff --git a/test/command/citeproc-87.md b/test/command/citeproc-87.md new file mode 100644 --- /dev/null +++ b/test/command/citeproc-87.md @@ -0,0 +1,59 @@ +``` +% pandoc --citeproc -Mlang=it-IT -t markdown-citations +Foo [@a 50: «Disse: "bar"»]. «Disse: "baz"» + +--- +suppress-bibliography: true +references: +- id: a + author: + - literal: Aristotele + title: Metafisica + type: book +... +^D +Foo (Aristotele, s.d., 50: «Disse: "bar"»). «Disse: "baz"» +``` + +The Quoted is passed to citeproc as a Span ("",["csl-quoted"],[]) +so that flipflopping and localization occur. +``` +% pandoc -C -t plain -Mlang=en --csl command/le-tapuscrit-note.csl +--- +references: +- id: a + author: + - literal: Aristotele + title: Metafisica et "Physica" + type: article-journal +... + +Foo [@a 50]. +^D +Foo.[1] + +ARISTOTELE, “Metafisica et ‘Physica’.” + +[1] Aristotele, “Metafisica et ‘Physica’,” p. 50. +``` + +``` +% pandoc -C -t plain -Mlang=it --csl command/le-tapuscrit-note.csl +--- +references: +- id: a + author: + - literal: Aristotele + title: Metafisica et "Physica" + type: article-journal +... + +Foo [@a 50]. +^D +Foo.[1] + +ARISTOTELE, «Metafisica et “Physica”». + +[1] Aristotele, «Metafisica et “Physica”», p. 50. +``` + diff --git a/test/command/citeproc-author-in-text-suffix.md b/test/command/citeproc-author-in-text-suffix.md new file mode 100644 --- /dev/null +++ b/test/command/citeproc-author-in-text-suffix.md @@ -0,0 +1,34 @@ +``` +% pandoc -t native +@a [p. 33; @b] +^D +[ Para + [ Cite + [ Citation + { citationId = "a" + , citationPrefix = [] + , citationSuffix = [ Str "p.\160\&33" ] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + , Citation + { citationId = "b" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "@a" + , Space + , Str "[p." + , Space + , Str "33;" + , Space + , Str "@b]" + ] + ] +] +``` diff --git a/test/command/csv.md b/test/command/csv.md new file mode 100644 --- /dev/null +++ b/test/command/csv.md @@ -0,0 +1,102 @@ +``` +% pandoc -f csv -t native +Fruit,Price,Quantity +Apple,25 cents,33 +"""Navel"" Orange","35 cents",22 +,,45 +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Fruit" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Price" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Quantity" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Apple" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "25" , Space , Str "cents" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "33" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "\"Navel\"" , Space , Str "Orange" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "35" , Space , Str "cents" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "22" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "45" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/defaults-inheritance-1.md b/test/command/defaults-inheritance-1.md new file mode 100644 --- /dev/null +++ b/test/command/defaults-inheritance-1.md @@ -0,0 +1,6 @@ +``` +% pandoc -d command/defaults3 +# Header +^D +# Header +``` diff --git a/test/command/defaults-inheritance-2.md b/test/command/defaults-inheritance-2.md new file mode 100644 --- /dev/null +++ b/test/command/defaults-inheritance-2.md @@ -0,0 +1,6 @@ +``` +% pandoc -d command/defaults6 2>&1 +^D +Error: Circular defaults file reference in 'command/defaults7.yaml' +=> 63 +``` diff --git a/test/command/defaults-inheritance-3.md b/test/command/defaults-inheritance-3.md new file mode 100644 --- /dev/null +++ b/test/command/defaults-inheritance-3.md @@ -0,0 +1,6 @@ +``` +% pandoc -d command/defaults8 +

    Header

    +^D +# Header +``` diff --git a/test/command/defaults1.yaml b/test/command/defaults1.yaml new file mode 100644 --- /dev/null +++ b/test/command/defaults1.yaml @@ -0,0 +1,1 @@ +include-in-header: command/A.txt diff --git a/test/command/defaults2.yaml b/test/command/defaults2.yaml new file mode 100644 --- /dev/null +++ b/test/command/defaults2.yaml @@ -0,0 +1,4 @@ +include-in-header: +- command/B.txt +- command/C.txt + diff --git a/test/command/defaults3.yaml b/test/command/defaults3.yaml new file mode 100644 --- /dev/null +++ b/test/command/defaults3.yaml @@ -0,0 +1,4 @@ +defaults: + - command/defaults4 + - command/defaults5 +to: markdown diff --git a/test/command/defaults4.yaml b/test/command/defaults4.yaml new file mode 100644 --- /dev/null +++ b/test/command/defaults4.yaml @@ -0,0 +1,3 @@ +from: html +defaults: + - command/defaults5 diff --git a/test/command/defaults5.yaml b/test/command/defaults5.yaml new file mode 100644 --- /dev/null +++ b/test/command/defaults5.yaml @@ -0,0 +1,2 @@ +from: markdown +to: html diff --git a/test/command/defaults6.yaml b/test/command/defaults6.yaml new file mode 100644 --- /dev/null +++ b/test/command/defaults6.yaml @@ -0,0 +1,2 @@ +defaults: + - command/defaults7 diff --git a/test/command/defaults7.yaml b/test/command/defaults7.yaml new file mode 100644 --- /dev/null +++ b/test/command/defaults7.yaml @@ -0,0 +1,2 @@ +defaults: + - command/defaults6 diff --git a/test/command/defaults8.yaml b/test/command/defaults8.yaml new file mode 100644 --- /dev/null +++ b/test/command/defaults8.yaml @@ -0,0 +1,2 @@ +from: html +defaults: command/defaults9 diff --git a/test/command/defaults9.yaml b/test/command/defaults9.yaml new file mode 100644 --- /dev/null +++ b/test/command/defaults9.yaml @@ -0,0 +1,1 @@ +to: markdown diff --git a/test/command/din-1505-2.csl b/test/command/din-1505-2.csl new file mode 100644 --- /dev/null +++ b/test/command/din-1505-2.csl @@ -0,0 +1,406 @@ + + diff --git a/test/command/docbook-bibliography.md b/test/command/docbook-bibliography.md new file mode 100644 --- /dev/null +++ b/test/command/docbook-bibliography.md @@ -0,0 +1,45 @@ +``` +% pandoc -f docbook -t native --quiet + +Document References + +[1] First reference + + +[2] Second reference + + +[3] Third reference + + +^D +[ Header + 1 + ( "" , [] , [] ) + [ Str "Document" , Space , Str "References" ] +, Para + [ Span ( "refTheFirst" , [] , [] ) [] + , Str "[1]" + , Space + , Str "First" + , Space + , Str "reference" + ] +, Para + [ Span ( "refTheSecond" , [] , [] ) [] + , Str "[2]" + , Space + , Str "Second" + , Space + , Str "reference" + ] +, Para + [ Span ( "refTheThird" , [] , [] ) [] + , Str "[3]" + , Space + , Str "Third" + , Space + , Str "reference" + ] +] +``` diff --git a/test/command/dokuwiki-quote.md b/test/command/dokuwiki-quote.md new file mode 100644 --- /dev/null +++ b/test/command/dokuwiki-quote.md @@ -0,0 +1,16 @@ +``` +% pandoc -f dokuwiki -t native +> some +code + +>> ok +> then +> more +^D +[ BlockQuote + [ CodeBlock ( "" , [] , [] ) "some\ncode\n" + , BlockQuote [ Plain [ Str "ok" ] ] + , Plain [ Str "then" , LineBreak , Str "more" ] + ] +] +``` diff --git a/test/command/dots.md b/test/command/dots.md --- a/test/command/dots.md +++ b/test/command/dots.md @@ -6,7 +6,8 @@ \vdots ^D -[Para [Str "\8230"] -,Para [Str "\8230"] -,Para [Str "\8942"]] +[ Para [ Str "\8230" ] +, Para [ Str "\8230" ] +, Para [ Str "\8942" ] +] ``` diff --git a/test/command/duplicate_attributes.md b/test/command/duplicate_attributes.md new file mode 100644 --- /dev/null +++ b/test/command/duplicate_attributes.md @@ -0,0 +1,7 @@ +``` +% pandoc +[span]{.foobar style="color:blue" class="zip" style="color:red"} +^D +2> [WARNING] Ignoring duplicate attribute style="color:red". +

    span

    +``` diff --git a/test/command/emoji.md b/test/command/emoji.md new file mode 100644 --- /dev/null +++ b/test/command/emoji.md @@ -0,0 +1,27 @@ +``` +% pandoc -t markdown+emoji -f markdown+emoji +:smile: +^D +:smile: +``` + +``` +% pandoc -t markdown-emoji -f markdown+emoji +:smile: +^D +😄 +``` + +``` +% pandoc -t gfm -f markdown+emoji +:smile: +^D +:smile: +``` + +``` +% pandoc -t gfm-emoji -f markdown+emoji +:smile: +^D +😄 +``` diff --git a/test/command/empty_paragraphs.md b/test/command/empty_paragraphs.md --- a/test/command/empty_paragraphs.md +++ b/test/command/empty_paragraphs.md @@ -2,34 +2,32 @@ % pandoc -f native -t docx -o - | pandoc -f docx -t native [Para [Str "hi"], Para [], Para [], Para [Str "lo"]] ^D -[Para [Str "hi"] -,Para [Str "lo"]] +[ Para [ Str "hi" ] , Para [ Str "lo" ] ] ``` ``` % pandoc -f native -t docx+empty_paragraphs -o - | pandoc -f docx -t native [Para [Str "hi"], Para [], Para [], Para [Str "lo"]] ^D -[Para [Str "hi"] -,Para [Str "lo"]] +[ Para [ Str "hi" ] , Para [ Str "lo" ] ] ``` ``` % pandoc -f native -t docx -o - | pandoc -f docx+empty_paragraphs -t native [Para [Str "hi"], Para [], Para [], Para [Str "lo"]] ^D -[Para [Str "hi"] -,Para [Str "lo"]] +[ Para [ Str "hi" ] , Para [ Str "lo" ] ] ``` ``` % pandoc -f native -t docx+empty_paragraphs -o - | pandoc -f docx+empty_paragraphs -t native [Para [Str "hi"], Para [], Para [], Para [Str "lo"]] ^D -[Para [Str "hi"] -,Para [] -,Para [] -,Para [Str "lo"]] +[ Para [ Str "hi" ] +, Para [] +, Para [] +, Para [ Str "lo" ] +] ``` ``` @@ -37,8 +35,6 @@ [Para [Str "hi"], Para [], Para [], Para [Str "lo"]] ^D

    hi

    - -

    lo

    ``` @@ -59,10 +55,11 @@

    lo

    ^D -[Para [Str "hi"] -,Para [] -,Para [] -,Para [Str "lo"]] +[ Para [ Str "hi" ] +, Para [] +, Para [] +, Para [ Str "lo" ] +] ``` ``` @@ -72,8 +69,7 @@

    lo

    ^D -[Para [Str "hi"] -,Para [Str "lo"]] +[ Para [ Str "hi" ] , Para [ Str "lo" ] ] ``` ``` diff --git a/test/command/figures-context.md b/test/command/figures-context.md new file mode 100644 --- /dev/null +++ b/test/command/figures-context.md @@ -0,0 +1,48 @@ +# Figure with one image, caption and label + +``` +% pandoc -t context -f html +
    + +
    The Mandrill, a photo used in + image processing tests.
    +
    +^D +\startplacefigure[title={\quotation{The Mandrill}, a photo used in image +processing tests.}] +{\externalfigure[mandrill.jpg]} +\stopplacefigure +``` + +# Nested figures + +``` +% pandoc -t context -f html +
    +
    + +
    The Mandrill is a commonly used test image.
    +
    +
    + +
    Another test image. This one is called peppers.
    +
    +
    Signal processing test images.
    +
    +^D +\startplacefigure[reference=test-images,title={Signal processing test +images.}] +\startfloatcombination +\startplacefigure[reference=mandrill,title={\quotation{The Mandrill} is +a commonly used test image.}] +{\externalfigure[../testing/mandrill.jpg]} +\stopplacefigure + +\startplacefigure[reference=peppers,title={Another test image. This one +is called \quotation{peppers}.}] +{\externalfigure[../testing/peppers.webp]} +\stopplacefigure + +\stopfloatcombination +\stopplacefigure +``` diff --git a/test/command/figures-fb2.md b/test/command/figures-fb2.md new file mode 100644 --- /dev/null +++ b/test/command/figures-fb2.md @@ -0,0 +1,8 @@ +``` +% pandoc -f native -t fb2 +[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Str "content"]]] + +^D + +unrecognisedpandoc<p />

    content

     +``` diff --git a/test/command/figures-haddock.md b/test/command/figures-haddock.md new file mode 100644 --- /dev/null +++ b/test/command/figures-haddock.md @@ -0,0 +1,7 @@ +``` +% pandoc -f native -t haddock +[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Str "content"]]] + +^D +content +``` diff --git a/test/command/figures-html.md b/test/command/figures-html.md new file mode 100644 --- /dev/null +++ b/test/command/figures-html.md @@ -0,0 +1,92 @@ +# Writer + +HTML5 figure with caption and content. + +``` +% pandoc -f native -t html5 +[Figure ("fig-id",[],[]) (Caption Nothing [Plain [Str "caption"]]) [Para [Str "content"]]] + +^D +
    +

    content

    +
    caption
    +
    +``` + +HTML5 figure with NO caption and content. + +``` +% pandoc -f native -t html5 +[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Str "content"]]] + +^D +
    +

    content

    +
    +``` + +HTML4 figure with caption and content. + +``` +% pandoc -f native -t html4 +[Figure ("fig-id",[],[]) (Caption Nothing [Plain [Str "caption"]]) [Para [Str "content"]]] + +^D +
    +

    content

    +
    caption
    +
    +``` + +HTML4 figure with NO caption and content. + +``` +% pandoc -f native -t html4 +[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Str "content"]]] + +^D +
    +

    content

    +
    +``` + +# Reader + +Figure with caption and multiple elements. + +``` +% pandoc -f html -t native +
    + +
    • ITEM
    +
    CAP2
    +
    +^D +[ Figure + ( "" , [ "important" ] , [] ) + (Caption Nothing [ Plain [ Str "CAP2" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [] ( "../media/rId25.jpg" , "" ) ] + , BulletList [ [ Plain [ Str "ITEM" ] ] ] + ] +] +``` + +Figure without caption. + +``` +% pandoc -f html -t native +
    + +
    • ITEM
    +
    +^D +[ Figure + ( "" , [ "important" ] , [] ) + (Caption Nothing []) + [ Plain + [ Image ( "" , [] , [] ) [] ( "../media/rId25.jpg" , "" ) ] + , BulletList [ [ Plain [ Str "ITEM" ] ] ] + ] +] +``` diff --git a/test/command/figures-jats.md b/test/command/figures-jats.md new file mode 100644 --- /dev/null +++ b/test/command/figures-jats.md @@ -0,0 +1,31 @@ +Figure float with caption at the figure level. + +``` +% pandoc -f native -t jats +[Figure ("fig-id",[],[]) (Caption Nothing [Para [Str "Caption"]]) [Para [Str "Text"], +Para [Image ("fig-id-2",[],[]) [] ("foo.png", "fig:")]]] + +^D + +

    Caption

    +

    Text

    + +     +``` + +Figure float with caption and alt text. + +``` +% pandoc -f native -t jats +[Figure ("fig-id",[],[]) (Caption Nothing [Para [Str "Caption"]]) [Para [Str "Text"], +Para [Image ("fig-id-2",[],[]) [Str "alt"] ("foo.png", "fig:")]]] + +^D + +

    Caption

    +

    Text

    + + alt + +     +``` diff --git a/test/command/figures-jira.md b/test/command/figures-jira.md new file mode 100644 --- /dev/null +++ b/test/command/figures-jira.md @@ -0,0 +1,9 @@ +A figure with title +``` +% pandoc -f native -t jira +[Figure ("fig-id",[],[("title","This is the title")]) (Caption Nothing []) []] +^D +{panel:title=This is the title} +{anchor:fig-id} +{panel} +``` diff --git a/test/command/figures-latex.md b/test/command/figures-latex.md new file mode 100644 --- /dev/null +++ b/test/command/figures-latex.md @@ -0,0 +1,83 @@ +# Figure with one image, caption and label + +``` +% pandoc -f latex -t native +\begin{document} + \begin{figure} + \includegraphics{../../media/rId25.jpg} + \caption{CAP} + \label{LAB} + \end{figure} +\end{document} +^D +[ Figure + ( "LAB" , [] , [] ) + (Caption Nothing [ Plain [ Str "CAP" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [] ( "../../media/rId25.jpg" , "" ) + ] + ] +] +``` + +# Nested figures + +``` +% pandoc -f latex -t native +\begin{figure} + \begin{subfigure}[b]{0.5\textwidth} + \begin{subfigure}[b]{0.5\textwidth} + \centering + \includegraphics{test/media/rId25.jpg} + \caption{CAP1.1} + \end{subfigure} + \begin{subfigure}[b]{0.5\textwidth} + \centering + \includegraphics{test/media/rId25.jpg} + \caption{CAP1.2} + \end{subfigure} + \caption{CAP1} + \label{fig:inner1} + \end{subfigure} + \begin{subfigure}[b]{0.5\textwidth} + \includegraphics{test/media/rId25.jpg} + \caption{CAP2} + \label{fig:inner2} + \end{subfigure} + \caption{CAP} + \label{fig:outer} +\end{figure} +^D +[ Figure + ( "fig:outer" , [] , [] ) + (Caption Nothing [ Plain [ Str "CAP" ] ]) + [ Figure + ( "fig:inner1" , [] , [] ) + (Caption Nothing [ Plain [ Str "CAP1" ] ]) + [ Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "CAP1.1" ] ]) + [ Plain + [ Image + ( "" , [] , [] ) [] ( "test/media/rId25.jpg" , "" ) + ] + ] + , Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "CAP1.2" ] ]) + [ Plain + [ Image + ( "" , [] , [] ) [] ( "test/media/rId25.jpg" , "" ) + ] + ] + ] + , Figure + ( "fig:inner2" , [] , [] ) + (Caption Nothing [ Plain [ Str "CAP2" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [] ( "test/media/rId25.jpg" , "" ) + ] + ] + ] +] +``` diff --git a/test/command/figures-markdown.md b/test/command/figures-markdown.md new file mode 100644 --- /dev/null +++ b/test/command/figures-markdown.md @@ -0,0 +1,12 @@ +Figure float with caption at the figure level. + +``` +% pandoc -f native -t markdown +[Figure ("fig-id",[],[]) (Caption Nothing [Para [Str "Caption"]]) [Para [Image ("",[],[]) [] ("foo.png", "fig:")]]] + +^D +
    +

    +

    Caption

    +
    +``` diff --git a/test/command/figures-mediawiki.md b/test/command/figures-mediawiki.md new file mode 100644 --- /dev/null +++ b/test/command/figures-mediawiki.md @@ -0,0 +1,11 @@ +Figure float with caption at the figure level. + +``` +% pandoc -f native -t mediawiki +[Figure ("fig-id",[],[]) (Caption Nothing [Para [Str "Caption"]]) [Para [Image ("",[],[]) [] ("foo.png", "fig:")]]] + +^D +
    +[[File:foo.png|thumb|none]] +
    +``` diff --git a/test/command/figures-org.md b/test/command/figures-org.md new file mode 100644 --- /dev/null +++ b/test/command/figures-org.md @@ -0,0 +1,16 @@ +``` +% pandoc -f native -t org +[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Str "content"]]] + +^D +<> +content +``` + +``` +% pandoc -f native -t org +[Figure ("",[],[]) (Caption Nothing []) [Para [Str "content"]]] + +^D +content +``` diff --git a/test/command/figures-rst.md b/test/command/figures-rst.md new file mode 100644 --- /dev/null +++ b/test/command/figures-rst.md @@ -0,0 +1,13 @@ +Figure float with caption at the figure level. + +``` +% pandoc -f native -t rst +[Figure ("fig-id",[],[]) (Caption Nothing [Para [Str "Caption"]]) [Para [Image ("",[],[]) [] ("foo.png", "fig:")]]] + +^D +.. figure:: foo.png + name: fig-id + :alt: fig: + + Caption +``` diff --git a/test/command/figures-texinfo.md b/test/command/figures-texinfo.md new file mode 100644 --- /dev/null +++ b/test/command/figures-texinfo.md @@ -0,0 +1,115 @@ +Figure float with caption at the figure level. + +``` +% pandoc -f native -t texinfo +[Figure ("fig-id",[],[]) (Caption Nothing [Para [Str "Caption"]]) [Para [Image ("",[],[]) [] ("foo.png", "fig:")]]] + +^D +@node Top +@top Top + +@float Figure +@image{foo,,,,png} +@caption{Caption} +@end float +``` + +Float that has no caption and doesn't contain a `SimpleFigure` + +``` +% pandoc -f native -t texinfo +[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Image ("",[],[]) [] ("foo.png", "")]]] + +^D +@node Top +@top Top + +@float +@image{foo,,,,png} +@end float +``` + +Table float with caption at the figure level. + +``` +% pandoc -f native -t texinfo +[Figure ("fig-id",[],[]) (Caption Nothing [Para [Str "Caption"]]) +[Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Fruit"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Price"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Quantity"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "25",Space,Str "cents"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "33"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "\"Navel\"",Space,Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "35",Space,Str "cents"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "22"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "45"]]]])] + (TableFoot ("",[],[]) + [])]] + +^D +@node Top +@top Top + +@float Table +@multitable {"Navel" Orange} {35 cents} {Quantity} +@headitem +Fruit + @tab Price + @tab Quantity +@item +Apple + @tab 25 cents + @tab 33 +@item +"Navel" Orange + @tab 35 cents + @tab 22 +@item +45 +@end multitable +@caption{Caption} +@end float +``` + +Float the isn't a table nor a figure. + +``` +% pandoc -f native -t texinfo +[Figure ("fig-id",[],[]) (Caption Nothing [Para[ Str "Caption"]]) [Para [Str "Content"]]] + +^D +@node Top +@top Top + +@float +Content +@caption{Caption} +@end float +``` diff --git a/test/command/figures-textile.md b/test/command/figures-textile.md new file mode 100644 --- /dev/null +++ b/test/command/figures-textile.md @@ -0,0 +1,31 @@ +``` +% pandoc -f native -t textile +[Figure ("fig-id",[],[]) (Caption Nothing [Para [Str "Caption"]]) [Para [Image ("",[],[]) [] ("foo.png", "")]]] + +^D +
    + +
    + +Caption + +
    + +!foo.png! + + +
    +``` + +``` +% pandoc -f native -t textile +[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Image ("",[],[]) [] ("foo.png", "")]]] + +^D +
    + +!foo.png! + + +
    +``` diff --git a/test/command/figures-xwiki.md b/test/command/figures-xwiki.md new file mode 100644 --- /dev/null +++ b/test/command/figures-xwiki.md @@ -0,0 +1,10 @@ +``` +% pandoc -f native -t xwiki +[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Str "content"]]] + +^D +((( +{{id name="fig-id" /}}content + +))) +``` diff --git a/test/command/figures-zimwiki.md b/test/command/figures-zimwiki.md new file mode 100644 --- /dev/null +++ b/test/command/figures-zimwiki.md @@ -0,0 +1,9 @@ +``` +% pandoc -f native -t zimwiki +[Figure ("fig-id",[],[]) (Caption Nothing []) [Para [Str "content"]]] + +^D +content + + +``` diff --git a/test/command/file1.txt b/test/command/file1.txt new file mode 100644 --- /dev/null +++ b/test/command/file1.txt @@ -0,0 +1,9 @@ +# Zed + +[foo]: bar + +[foo] +and [Zed](#zed) +and [other Zed](command/file2.txt#zed) +and [other file](command/file2.txt) +and [foreign Zed](c.md#zed) diff --git a/test/command/file2.txt b/test/command/file2.txt new file mode 100644 --- /dev/null +++ b/test/command/file2.txt @@ -0,0 +1,5 @@ +## Zed + +[foo]: baz + +[foo] diff --git a/test/command/gfm.md b/test/command/gfm.md --- a/test/command/gfm.md +++ b/test/command/gfm.md @@ -7,20 +7,76 @@ | apple | 0.13 | | orange|1.12| ^D -[Table [] [AlignDefault,AlignRight] [0.0,0.0] - [[Plain [Str "Fruit"]] - ,[Plain [Str "Price"]]] - [[[Plain [Str "apple"]] - ,[Plain [Str "0.13"]]] - ,[[Plain [Str "orange"]] - ,[Plain [Str "1.12"]]]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignRight , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Fruit" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Price" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "apple" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0.13" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "orange" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1.12" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] ``` ``` % pandoc -f gfm -t native ~~stricken out~~ ^D -[Para [Strikeout [Str "stricken",Space,Str "out"]]] +[ Para [ Strikeout [ Str "stricken" , Space , Str "out" ] ] +] ``` ``` @@ -29,44 +85,73 @@ ## Header # -foo-bar_baz ^D -[Header 1 ("header",[],[]) [Str "Header"] -,Header 2 ("header-1",[],[]) [Str "Header"] -,Header 1 ("-foo-bar_baz",[],[]) [Str "-foo-bar_baz"]] +[ Header 1 ( "header" , [] , [] ) [ Str "Header" ] +, Header 2 ( "header-1" , [] , [] ) [ Str "Header" ] +, Header + 1 ( "-foo-bar_baz" , [] , [] ) [ Str "-foo-bar_baz" ] +] ``` ``` % pandoc -f gfm -t native My:thumbsup:emoji:heart: ^D -[Para [Str "My\128077emoji\10084\65039"]] +[ Para + [ Str "My" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "thumbsup" ) ] ) + [ Str "\128077" ] + , Str "emoji" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "heart" ) ] ) + [ Str "\10084\65039" ] + ] +] ``` ``` % pandoc -f gfm -t native "hi" ^D -[Para [Str "\"hi\""]] +[ Para [ Str "\"hi\"" ] ] ``` ``` % pandoc -f gfm+smart -t native "hi" ^D -[Para [Str "\8220hi\8221"]] +[ Para [ Quoted DoubleQuote [ Str "hi" ] ] ] ``` ``` % pandoc -t gfm -f native -[Table [Str "The",Space,Str "caption."] [AlignDefault,AlignRight] [0.0,0.0] - [[Plain [Str "Fruit"]] - ,[Plain [Str "Price"]]] - [[[Plain [Str "apple"]] - ,[Plain [Str "0.13"]]] - ,[[Plain [Str "orange"]] - ,[Plain [Str "1.12"]]]]] +[Table ("",[],[]) (Caption Nothing + [Plain [Str "The",Space,Str "caption."]]) + [(AlignDefault,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Fruit"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Price"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "0.13"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1.12"]]]])] + (TableFoot ("",[],[]) + [])] ^D | Fruit | Price | -| ------ | ----: | +|--------|------:| | apple | 0.13 | | orange | 1.12 | @@ -99,5 +184,39 @@ hi hi ^D -[Para [Str "hi",LineBreak,Str "hi"]] +[ Para [ Str "hi" , LineBreak , Str "hi" ] ] +``` + +``` +% pandoc -f gfm -t native +- [ ] foo +- [x] bar +^D +[ BulletList + [ [ Plain [ Str "\9744" , Space , Str "foo" ] ] + , [ Plain [ Str "\9746" , Space , Str "bar" ] ] + ] +] +``` + +``` +% pandoc -f gfm-task_lists -t native +- [ ] foo +- [x] bar +^D +[ BulletList + [ [ Plain [ Str "[" , Space , Str "]" , Space , Str "foo" ] + ] + , [ Plain [ Str "[x]" , Space , Str "bar" ] ] + ] +] +``` + +``` +% pandoc -f gfm -t gfm +- [ ] foo +- [x] bar +^D +- [ ] foo +- [x] bar ``` diff --git a/test/command/grid-table-indented.md b/test/command/grid-table-indented.md new file mode 100644 --- /dev/null +++ b/test/command/grid-table-indented.md @@ -0,0 +1,65 @@ +Like other block-level constructs, grid tables may be indented by up to +three spaces and are still recognized as tables. + +``` +% pandoc -f markdown -t html + +---+---+ + | a | b | + +===+===+ + | 1 | 2 | + +---+---+ +^D + ++++ + + + + + + + + + + + + +
    ab
    12
    +``` + +A headerless indented grid table is recognized too. + +``` +% pandoc -f markdown -t html + +------+------+ + | foo | bar | + +------+------+ +^D + ++++ + + + + + + +
    foobar
    +``` + +A grid table indented four spaces is a code block, not a table. + +``` +% pandoc -f markdown -t html + +---+---+ + | a | b | + +---+---+ +^D +
    +---+---+
+| a | b |
++---+---+
    +``` diff --git a/test/command/harvard-university-of-kent.csl b/test/command/harvard-university-of-kent.csl new file mode 100644 --- /dev/null +++ b/test/command/harvard-university-of-kent.csl @@ -0,0 +1,253 @@ + + diff --git a/test/command/hspace.md b/test/command/hspace.md --- a/test/command/hspace.md +++ b/test/command/hspace.md @@ -8,7 +8,10 @@ \caption{lalune \hspace{2em} \vspace{1em} bloo} \end{figure} ^D -[RawBlock (Format "latex") "\\begin{figure}\n\\includegraphics{lalune.jpg}\n\\caption{lalune \\hspace{2em} \\vspace{1em} bloo}\n\\end{figure}"] +[ RawBlock + (Format "tex") + "\\begin{figure}\n\\includegraphics{lalune.jpg}\n\\caption{lalune \\hspace{2em} \\vspace{1em} bloo}\n\\end{figure}" +] ``` Here block: @@ -32,14 +35,22 @@ F & F &\\ \end{tabular} ^D -[RawBlock (Format "latex") "\\begin{tabular}[t]{cc|c}\n\\(P\\) & \\(Q\\) & \\(P\\wedge Q\\)\\\\\n\\hline\nT & T &\\\\\nT & F &\\\\\nF & T &\\\\\nF & F &\\\\\n\\end{tabular}\n\\hspace{1em}\n\\begin{tabular}[t]{cc|c}\n\\(P\\) & \\(Q\\) & \\(P\\vee Q\\)\\\\\n\\hline\nT & T &\\\\\nT & F &\\\\\nF & T &\\\\\nF & F &\\\\\n\\end{tabular}"] +[ RawBlock + (Format "tex") + "\\begin{tabular}[t]{cc|c}\n\\(P\\) & \\(Q\\) & \\(P\\wedge Q\\)\\\\\n\\hline\nT & T &\\\\\nT & F &\\\\\nF & T &\\\\\nF & F &\\\\\n\\end{tabular}\n\\hspace{1em}\n\\begin{tabular}[t]{cc|c}\n\\(P\\) & \\(Q\\) & \\(P\\vee Q\\)\\\\\n\\hline\nT & T &\\\\\nT & F &\\\\\nF & T &\\\\\nF & F &\\\\\n\\end{tabular}" +] ``` ``` % pandoc -f markdown+raw_tex -t native hi\hspace{1em}there ^D -[Para [Str "hi",RawInline (Format "tex") "\\hspace{1em}",Str "there"]] +[ Para + [ Str "hi" + , RawInline (Format "tex") "\\hspace{1em}" + , Str "there" + ] +] ``` ``` @@ -50,7 +61,8 @@ there ^D -[Para [Str "hi"] -,RawBlock (Format "latex") "\\hspace{1em}" -,Para [Str "there"]] +[ Para [ Str "hi" ] +, RawBlock (Format "tex") "\\hspace{1em}" +, Para [ Str "there" ] +] ``` diff --git a/test/command/html-read-figure.md b/test/command/html-read-figure.md --- a/test/command/html-read-figure.md +++ b/test/command/html-read-figure.md @@ -5,7 +5,13 @@
    bar
    ^D -[Para [Image ("",[],[]) [Str "bar"] ("foo.png","fig:voyage")]] +[ Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "bar" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [] ( "foo.png" , "voyage" ) ] + ] +] ``` ``` @@ -15,7 +21,13 @@ ^D -[Para [Image ("",[],[]) [Str "bar"] ("foo.png","fig:voyage")]] +[ Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "bar" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [] ( "foo.png" , "voyage" ) ] + ] +] ``` ``` @@ -24,7 +36,13 @@ ^D -[Para [Image ("",[],[]) [] ("foo.png","fig:voyage")]] +[ Figure + ( "" , [] , [] ) + (Caption Nothing []) + [ Plain + [ Image ( "" , [] , [] ) [] ( "foo.png" , "voyage" ) ] + ] +] ``` ``` @@ -34,12 +52,30 @@
    bar
    ^D -[Para [Image ("",[],[]) [Str "bar"] ("foo.png","fig:voyage")]] +[ Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "bar" ] ]) + [ Para + [ Image ( "" , [] , [] ) [] ( "foo.png" , "voyage" ) ] + ] +] ``` ``` % pandoc -f html -t native
    this is ignored
    bar baz
    ^D -[Para [Image ("",[],[]) [Str "bar",Space,Strong [Str "baz"]] ("foo.png","fig:voyage")]] +[ Figure + ( "" , [] , [] ) + (Caption + Nothing + [ Plain [ Str "bar" , Space , Strong [ Str "baz" ] ] ]) + [ Plain + [ Image + ( "" , [] , [] ) + [ Str "this" , Space , Str "is" , Space , Str "ignored" ] + ( "foo.png" , "voyage" ) + ] + ] +] ``` diff --git a/test/command/html-trim-definition-list-terms.md b/test/command/html-trim-definition-list-terms.md new file mode 100644 --- /dev/null +++ b/test/command/html-trim-definition-list-terms.md @@ -0,0 +1,25 @@ +``` +% pandoc -f html -t native +
    +
    + foo + bar +
    +
    + baz +
    +
    test
    +
    +^D +[ DefinitionList + [ ( [ Str "foo" + , SoftBreak + , Str "bar" + , LineBreak + , Str "baz" + ] + , [ [ Plain [ Str "test" ] ] ] + ) + ] +] +``` diff --git a/test/command/html-writer-a-in-a.md b/test/command/html-writer-a-in-a.md new file mode 100644 --- /dev/null +++ b/test/command/html-writer-a-in-a.md @@ -0,0 +1,7 @@ +a is not allowed inside a in HTML, so we remove links in link text: +``` +% pandoc -f native -t html +[ Link ("",[],[]) [Link ("",[],[]) [Str "Lo"] ("url2","") ] ("url","") ] +^D +Lo +``` diff --git a/test/command/hyphenat.md b/test/command/hyphenat.md --- a/test/command/hyphenat.md +++ b/test/command/hyphenat.md @@ -2,48 +2,60 @@ % pandoc -f latex -t native electromagnetic\hyp{}endioscopy ^D -[Para [Str "electromagnetic-endioscopy"]] +[ Para [ Str "electromagnetic-endioscopy" ] ] ``` ``` % pandoc -f latex -t native C\colonhyp\bshyp{}Windows\bshyp ^D -[Para [Str "C:\173\\\173Windows\\\173"]] +[ Para [ Str "C:\173\\\173Windows\\\173" ] ] ``` ``` % pandoc -f latex -t native \fshyp{}usr\fshyp{}share\fshyp ^D -[Para [Str "/\173usr/\173share/\173"]] +[ Para [ Str "/\173usr/\173share/\173" ] ] ``` ``` % pandoc -f latex -t native \fshyp{}home\fshyp{}schrieveslaach\fshyp\dothyp{}m2 ^D -[Para [Str "/\173home/\173schrieveslaach/\173.\173m2"]] +[ Para [ Str "/\173home/\173schrieveslaach/\173.\173m2" ] ] ``` ``` % pandoc -f latex -t native \nohyphens{Pneumonoultramicroscopicsilicovolcanoconiosis} ^D -[Para [Str "Pneumonoultramicroscopicsilicovolcanoconiosis"]] +[ Para + [ Str "Pneumonoultramicroscopicsilicovolcanoconiosis" ] +] ``` ``` % pandoc -f latex -t native \textnhtt{Pneumonoultramicroscopicsilicovolcanoconiosis} ^D -[Para [Code ("",[],[]) "Pneumonoultramicroscopicsilicovolcanoconiosis"]] +[ Para + [ Code + ( "" , [] , [] ) + "Pneumonoultramicroscopicsilicovolcanoconiosis" + ] +] ``` ``` % pandoc -f latex -t native \nhttfamily{Pneumonoultramicroscopicsilicovolcanoconiosis} ^D -[Para [Code ("",[],[]) "Pneumonoultramicroscopicsilicovolcanoconiosis"]] +[ Para + [ Code + ( "" , [] , [] ) + "Pneumonoultramicroscopicsilicovolcanoconiosis" + ] +] ``` diff --git a/test/command/ieee.csl b/test/command/ieee.csl new file mode 100644 --- /dev/null +++ b/test/command/ieee.csl @@ -0,0 +1,339 @@ + + diff --git a/test/command/ifstrequal.md b/test/command/ifstrequal.md --- a/test/command/ifstrequal.md +++ b/test/command/ifstrequal.md @@ -5,6 +5,12 @@ \h{a} \h{b} ^D -[Para [Emph [Str "no"]] -,Para [Str "\225",SoftBreak,Str "b"]] +[ Para + [ Emph [ Str "no" ] + , SoftBreak + , Str "\225" + , SoftBreak + , Str "b" + ] +] ``` diff --git a/test/command/indented-fences.md b/test/command/indented-fences.md --- a/test/command/indented-fences.md +++ b/test/command/indented-fences.md @@ -5,7 +5,7 @@ in y ``` ^D -[CodeBlock ("",["haskell"],[]) "let x = y\nin y"] +[ CodeBlock ( "" , [ "haskell" ] , [] ) "let x = y\nin y" ] ````` ````` % pandoc -t native @@ -16,5 +16,7 @@ y ~~~ ^D -[CodeBlock ("",["haskell"],[]) " let x = y\nin y +\ny +\ny"] +[ CodeBlock + ( "" , [ "haskell" ] , [] ) " let x = y\nin y +\ny +\ny" +] ````` diff --git a/test/command/input-with-endinput.md b/test/command/input-with-endinput.md new file mode 100644 --- /dev/null +++ b/test/command/input-with-endinput.md @@ -0,0 +1,15 @@ +``` +% pandoc --from=latex -t native +\begin{document} +Visible + +\include{command/bar-endinput} + +Visible +\end{document} +^D +[ Para [ Str "Visible" ] +, Para [ Emph [ Str "hi" , Space , Str "there" ] ] +, Para [ Str "Visible" ] +] +``` diff --git a/test/command/issue160.csl b/test/command/issue160.csl new file mode 100644 --- /dev/null +++ b/test/command/issue160.csl @@ -0,0 +1,28 @@ + + diff --git a/test/command/issue437.csl b/test/command/issue437.csl new file mode 100644 --- /dev/null +++ b/test/command/issue437.csl @@ -0,0 +1,26 @@ + + diff --git a/test/command/issue58.csl b/test/command/issue58.csl new file mode 100644 --- /dev/null +++ b/test/command/issue58.csl @@ -0,0 +1,553 @@ + + diff --git a/test/command/jabberwocky.md b/test/command/jabberwocky.md new file mode 100644 --- /dev/null +++ b/test/command/jabberwocky.md @@ -0,0 +1,22 @@ +``` +% pandoc -t plain -f markdown +| 'Twas brillig, and the slithy toves +| Did gyre and gimble in the wabe: +| All mimsy were the borogoves, +| And the mome raths outgrabe. +| +| "Beware the Jabberwock, my son! +| The jaws that bite, the claws that catch! +| Beware the Jubjub bird, and shun +| The frumious Bandersnatch!" +^D +’Twas brillig, and the slithy toves +      Did gyre and gimble in the wabe: +All mimsy were the borogoves, +      And the mome raths outgrabe. + +“Beware the Jabberwock, my son! +      The jaws that bite, the claws that catch! +Beware the Jubjub bird, and shun +      The frumious Bandersnatch!” +``` diff --git a/test/command/jats-figure-alt-text.md b/test/command/jats-figure-alt-text.md new file mode 100644 --- /dev/null +++ b/test/command/jats-figure-alt-text.md @@ -0,0 +1,22 @@ +``` +% pandoc -f jats -t native + + +

    bar

    + + alternative-decription + + baz + +     + +^D +[ Figure + ( "fig-1" , [] , [] ) + (Caption Nothing [ Plain [ Str "bar" ] ]) + [ Plain [ Str "alternative-decription" ] + , Para + [ Image ( "" , [] , [] ) [ Str "baz" ] ( "foo.png" , "" ) ] + ] +] +``` diff --git a/test/command/latex-center.md b/test/command/latex-center.md new file mode 100644 --- /dev/null +++ b/test/command/latex-center.md @@ -0,0 +1,12 @@ +# `\begin{center}` + +``` +% pandoc -f latex -t native +\begin{center} +Hello +\end{center} + +^D +[ Div ( "" , [ "center" ] , [] ) [ Para [ Str "Hello" ] ] ] +``` + diff --git a/test/command/latex-color.md b/test/command/latex-color.md --- a/test/command/latex-color.md +++ b/test/command/latex-color.md @@ -4,21 +4,40 @@ % pandoc -f latex -t native Hello \textcolor{red}{World} ^D -[Para [Str "Hello",Space,Span ("",[],[("style","color: red")]) [Str "World"]]] +[ Para + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "color: red" ) ] ) [ Str "World" ] + ] +] ``` ``` % pandoc -f latex -t native \textcolor{red}{Hello} World ^D -[Para [Span ("",[],[("style","color: red")]) [Str "Hello"],Space,Str "World"]] +[ Para + [ Span + ( "" , [] , [ ( "style" , "color: red" ) ] ) [ Str "Hello" ] + , Space + , Str "World" + ] +] ``` ``` % pandoc -f latex -t native Hello \textcolor{blue}{\textbf{World}} ^D -[Para [Str "Hello",Space,Span ("",[],[("style","color: blue")]) [Strong [Str "World"]]]] +[ Para + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "color: blue" ) ] ) + [ Strong [ Str "World" ] ] + ] +] ``` @@ -26,7 +45,15 @@ % pandoc -f latex -t native Hello \textcolor{blue}{\textbf{World}}. ^D -[Para [Str "Hello",Space,Span ("",[],[("style","color: blue")]) [Strong [Str "World"]],Str "."]] +[ Para + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "color: blue" ) ] ) + [ Strong [ Str "World" ] ] + , Str "." + ] +] ``` ``` @@ -38,10 +65,14 @@ \end{itemize} } ^D -[Div ("",[],[("style","color: orange")]) - [BulletList - [[Para [Str "Item",Space,Str "1"]] - ,[Para [Str "Item",Space,Str "2"]]]]] +[ Div + ( "" , [] , [ ( "style" , "color: orange" ) ] ) + [ BulletList + [ [ Para [ Str "Item" , Space , Str "1" ] ] + , [ Para [ Str "Item" , Space , Str "2" ] ] + ] + ] +] ``` ``` @@ -53,11 +84,16 @@ \end{itemize} } some more text ^D -[Div ("",[],[("style","color: blue")]) - [BulletList - [[Para [Str "Item",Space,Str "1"]] - ,[Para [Str "Item",Space,Str "2"]]]] -,Para [Str "some",Space,Str "more",Space,Str "text"]] +[ Div + ( "" , [] , [ ( "style" , "color: blue" ) ] ) + [ BulletList + [ [ Para [ Str "Item" , Space , Str "1" ] ] + , [ Para [ Str "Item" , Space , Str "2" ] ] + ] + ] +, Para + [ Str "some" , Space , Str "more" , Space , Str "text" ] +] ``` # `\colorbox{}{}` @@ -67,28 +103,57 @@ % pandoc -f latex -t native Hello \colorbox{red}{World} ^D -[Para [Str "Hello",Space,Span ("",[],[("style","background-color: red")]) [Str "World"]]] +[ Para + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "background-color: red" ) ] ) + [ Str "World" ] + ] +] ``` ``` % pandoc -f latex -t native \colorbox{red}{Hello} World ^D -[Para [Span ("",[],[("style","background-color: red")]) [Str "Hello"],Space,Str "World"]] +[ Para + [ Span + ( "" , [] , [ ( "style" , "background-color: red" ) ] ) + [ Str "Hello" ] + , Space + , Str "World" + ] +] ``` ``` % pandoc -f latex -t native Hello \colorbox{blue}{\textbf{World}} ^D -[Para [Str "Hello",Space,Span ("",[],[("style","background-color: blue")]) [Strong [Str "World"]]]] +[ Para + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "background-color: blue" ) ] ) + [ Strong [ Str "World" ] ] + ] +] ``` ``` % pandoc -f latex -t native Hello \colorbox{blue}{\textbf{World}}. ^D -[Para [Str "Hello",Space,Span ("",[],[("style","background-color: blue")]) [Strong [Str "World"]],Str "."]] +[ Para + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "background-color: blue" ) ] ) + [ Strong [ Str "World" ] ] + , Str "." + ] +] ``` ``` @@ -102,10 +167,17 @@ \end{minipage} } ^D -[Div ("",[],[("style","background-color: orange")]) - [BulletList - [[Para [Str "Item",Space,Str "1"]] - ,[Para [Str "Item",Space,Str "2"]]]]] +[ Div + ( "" , [] , [ ( "style" , "background-color: orange" ) ] ) + [ Div + ( "" , [ "minipage" ] , [] ) + [ BulletList + [ [ Para [ Str "Item" , Space , Str "1" ] ] + , [ Para [ Str "Item" , Space , Str "2" ] ] + ] + ] + ] +] ``` ``` @@ -119,9 +191,17 @@ \end{minipage} } some more text ^D -[Div ("",[],[("style","background-color: blue")]) - [BulletList - [[Para [Str "Item",Space,Str "1"]] - ,[Para [Str "Item",Space,Str "2"]]]] -,Para [Str "some",Space,Str "more",Space,Str "text"]] +[ Div + ( "" , [] , [ ( "style" , "background-color: blue" ) ] ) + [ Div + ( "" , [ "minipage" ] , [] ) + [ BulletList + [ [ Para [ Str "Item" , Space , Str "1" ] ] + , [ Para [ Str "Item" , Space , Str "2" ] ] + ] + ] + ] +, Para + [ Str "some" , Space , Str "more" , Space , Str "text" ] +] ``` diff --git a/test/command/latex-command-comment.md b/test/command/latex-command-comment.md --- a/test/command/latex-command-comment.md +++ b/test/command/latex-command-comment.md @@ -1,7 +1,7 @@ ``` -pandoc -f latex -t native +% pandoc -f latex -t native \emph% {hi} ^D -[Para [Emph [Str "hi"]]] +[ Para [ Emph [ Str "hi" ] ] ] ``` diff --git a/test/command/latex-fontawesome.md b/test/command/latex-fontawesome.md --- a/test/command/latex-fontawesome.md +++ b/test/command/latex-fontawesome.md @@ -2,12 +2,12 @@ % pandoc -f latex -t native Check: \faCheck ^D -[Para [Str "Check:",Space,Str "\10003"]] +[ Para [ Str "Check:" , Space , Str "\10003" ] ] ``` ``` % pandoc -f latex -t native Close: \faClose ^D -[Para [Str "Close:",Space,Str "\10007"]] +[ Para [ Str "Close:" , Space , Str "\10007" ] ] ``` diff --git a/test/command/latex-math-trailing-space.md b/test/command/latex-math-trailing-space.md new file mode 100644 --- /dev/null +++ b/test/command/latex-math-trailing-space.md @@ -0,0 +1,38 @@ +Test that trailing spaces before \end{equation} don't create spurious paragraph breaks: + +``` +% pandoc -f latex -t latex +\begin{equation} + a + \end{equation} +^D +\begin{equation} + a +\end{equation} +``` + +Same for align environment: + +``` +% pandoc -f latex -t latex +\begin{align} + x &= y \\ + \end{align} +^D +\begin{align} + x &= y \\ +\end{align} +``` + +Test with multiple trailing spaces: + +``` +% pandoc -f latex -t latex +\begin{equation} + a + b + \end{equation} +^D +\begin{equation} + a + b +\end{equation} +``` diff --git a/test/command/latex-tabular-column-specs.md b/test/command/latex-tabular-column-specs.md --- a/test/command/latex-tabular-column-specs.md +++ b/test/command/latex-tabular-column-specs.md @@ -11,14 +11,85 @@ \bottomrule \end{tabular} ^D -[Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0] - [[Plain [Math InlineMath ""]] - ,[Plain [Math InlineMath "f1"]] - ,[Plain [Math InlineMath "f2"]]] - [[[Plain [Math InlineMath "e"]] - ,[Plain [Math InlineMath "0.5"]] - ,[Plain [Math InlineMath "4"]]] - ,[[Plain [Math InlineMath "f"]] - ,[Plain [Math InlineMath "0.5"]] - ,[Plain [Math InlineMath "5,5"]]]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "f1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "f2" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "e" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "0.5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "4" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "f" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "0.5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Math InlineMath "5,5" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] ``` diff --git a/test/command/le-tapuscrit-note.csl b/test/command/le-tapuscrit-note.csl new file mode 100644 --- /dev/null +++ b/test/command/le-tapuscrit-note.csl @@ -0,0 +1,496 @@ + + diff --git a/test/command/lettrine.md b/test/command/lettrine.md --- a/test/command/lettrine.md +++ b/test/command/lettrine.md @@ -4,6 +4,17 @@ \lettrine[lhang=0.17]{A}{category} is ^D -[Para [Span ("",["lettrine"],[]) [Str "A"],Span ("",[],[]) [Str "category"],Space,Str "is"] -,Para [Span ("",["lettrine"],[]) [Str "A"],Span ("",[],[]) [Str "category"],Space,Str "is"]] +[ Para + [ Span ( "" , [ "lettrine" ] , [] ) [ Str "A" ] + , SmallCaps [ Str "category" ] + , Space + , Str "is" + ] +, Para + [ Span ( "" , [ "lettrine" ] , [] ) [ Str "A" ] + , SmallCaps [ Str "category" ] + , Space + , Str "is" + ] +] ``` diff --git a/test/command/lists-inside-definition.md b/test/command/lists-inside-definition.md new file mode 100644 --- /dev/null +++ b/test/command/lists-inside-definition.md @@ -0,0 +1,70 @@ +This inserts an empty `\item[]` when a list occurs at the +beginning of a definition list definition; otherwise the list +may start on the line with the label, which looks terrible. +See https://tex.stackexchange.com/questions/192480/force-itemize-inside-description-onto-a-new-line + +``` +% pandoc -t latex +Definition +: 1. list + 2. list +^D +\begin{description} +\tightlist +\item[Definition] +\hfill +\begin{enumerate} +\def\labelenumi{\arabic{enumi}.} +\tightlist +\item + list +\item + list +\end{enumerate} +\end{description} +``` + +``` +% pandoc -t latex +Definition +: Foo + + 1. list + 2. list +^D +\begin{description} +\tightlist +\item[Definition] +Foo + +\begin{enumerate} +\def\labelenumi{\arabic{enumi}.} +\tightlist +\item + list +\item + list +\end{enumerate} +\end{description} +``` + +``` +% pandoc -t latex +Definition +: - list + - list +^D +\begin{description} +\tightlist +\item[Definition] +\hfill +\begin{itemize} +\tightlist +\item + list +\item + list +\end{itemize} +\end{description} +``` + diff --git a/test/command/locators.csl b/test/command/locators.csl new file mode 100644 --- /dev/null +++ b/test/command/locators.csl @@ -0,0 +1,68 @@ + + diff --git a/test/command/lstlisting.md b/test/command/lstlisting.md --- a/test/command/lstlisting.md +++ b/test/command/lstlisting.md @@ -8,7 +8,16 @@ } \end{lstlisting} ^D -[CodeBlock ("lst:Hello-World",["java"],[("language","Java"),("caption","Java Example"),("label","lst:Hello-World")]) "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}"] +[ CodeBlock + ( "lst:Hello-World" + , [ "java" ] + , [ ( "language" , "Java" ) + , ( "caption" , "Java Example" ) + , ( "label" , "lst:Hello-World" ) + ] + ) + "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}" +] ``` ``` @@ -21,5 +30,15 @@ } \end{lstlisting} ^D -[CodeBlock ("lst:Hello-World",["java"],[("language","Java"),("escapechar","|"),("caption","Java Example"),("label","lst:Hello-World")]) "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}"] +[ CodeBlock + ( "lst:Hello-World" + , [ "java" ] + , [ ( "language" , "Java" ) + , ( "escapechar" , "|" ) + , ( "caption" , "Java Example" ) + , ( "label" , "lst:Hello-World" ) + ] + ) + "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}" +] ``` diff --git a/test/command/macro-defs-in-preamble.md b/test/command/macro-defs-in-preamble.md new file mode 100644 --- /dev/null +++ b/test/command/macro-defs-in-preamble.md @@ -0,0 +1,18 @@ +``` +% pandoc -s -f latex-latex_macros -t native +\documentclass[11pt]{article} + +\newcommand{\vara}{\alpha} +\newcommand{\varb}{b} + +\begin{document} +$\vara \varb$ +\end{document} +^D +Pandoc + Meta { unMeta = fromList [] } + [ RawBlock (Format "latex") "\\newcommand{\\vara}{\\alpha}" + , RawBlock (Format "latex") "\\newcommand{\\varb}{b}" + , Para [ Math InlineMath "\\vara \\varb" ] + ] +``` diff --git a/test/command/macros.md b/test/command/macros.md --- a/test/command/macros.md +++ b/test/command/macros.md @@ -1,17 +1,20 @@ ``` -% pandoc -f markdown+latex_macros -t markdown +% pandoc -f markdown+latex_macros -t markdown+raw_tex-raw_attribute \newcommand{\my}{\phi} $\my+\my$ ^D +\newcommand{\my}{\phi} + $\phi+\phi$ ``` ``` -% pandoc -f markdown-latex_macros -t markdown +% pandoc -f markdown-latex_macros -t markdown+raw_tex-raw_attribute \newcommand{\my}{\phi} $\my+\my$ ^D \newcommand{\my}{\phi} + $\my+\my$ ``` @@ -22,19 +25,19 @@ ``` % pandoc -f latex -t latex \let\a\b -\newcommand{\b}{\emph{ouk}} -\a +\def\b{\emph{ouk}} +\a a ^D -\b +a̱ ``` ``` % pandoc -f latex -t latex \newcommand{\a}{\b} \newcommand{\b}{\emph{ouk}} -\a +\a a ^D -\emph{ouk} +\emph{ouk}a ``` ``` @@ -58,8 +61,9 @@ ^D \(5-67\) -\[\begin{aligned} -x &= y\\\end{aligned}\] +\begin{align} +x &= y\\ +\end{align} \emph{hi} @@ -67,34 +71,92 @@ ``` ``` -% pandoc -f markdown+latex_macros -t markdown +% pandoc -f markdown+latex_macros -t markdown+raw_tex-raw_attribute \newcommand{\my}{\phi} \begin{equation} \my+\my \end{equation} ^D +\newcommand{\my}{\phi} + \begin{equation} \phi+\phi \end{equation} ``` ``` -% pandoc -f markdown-latex_macros -t markdown +% pandoc -f markdown-latex_macros -t markdown+raw_tex-raw_attribute \newcommand{\my}{\phi} \begin{equation} \my+\my \end{equation} ^D \newcommand{\my}{\phi} + \begin{equation} \my+\my \end{equation} ``` ``` -% pandoc -f markdown+latex_macros -t markdown +% pandoc -f markdown+latex_macros -t markdown+raw_tex-raw_attribute \newcommand{\my}{\emph{a}} \my ^D +\newcommand{\my}{\emph{a}} \emph{a} ``` + + + +``` +% pandoc -f latex -t plain +\def\bar{hello} +\let\fooi\bar +\def\fooii{\bar} +\fooi +\fooii + +\def\bar{goodbye} +\fooi +\fooii +^D +hello+hello + +hello+goodbye +``` + +``` +% pandoc -f latex -t plain +\def\txt{a} +\def\foo{\txt} +\let\bar\foo +\bar % -> a +\def\txt{b} +\bar % -> b +\def\foo{OH} +\bar % -> b +^D +a b b +``` + +``` +% pandoc -f latex -t plain +\def\aaa{aaa} +\def\bbb{x\aaa} +\edef\ccc{y\aaa} +\def\aaa{AAA} +\bbb \ccc +^D +xAAAyaaa +``` + +``` +% pandoc -f latex -t plain +\gdef\aaa{aaa} +\gdef\bbb{x\aaa} +\xdef\ccc{y\aaa} +\gdef\aaa{AAA} +\bbb \ccc +^D +xAAAyaaa +``` + diff --git a/test/command/make-section-column-divs.md b/test/command/make-section-column-divs.md new file mode 100644 --- /dev/null +++ b/test/command/make-section-column-divs.md @@ -0,0 +1,28 @@ +For reference see +https://groups.google.com/d/msgid/pandoc-discuss/cef24253-7731-417c-a1ee-48153c4344bf%40googlegroups.com + +``` +% pandoc +::: columns +::: column +# A + +a +::: +::: column +# B + +b +::: +::: +^D +
    +
    +

    A

    +

    a

    +
    +

    B

    +

    b

    +
    +
    +``` diff --git a/test/command/man-defines.md b/test/command/man-defines.md new file mode 100644 --- /dev/null +++ b/test/command/man-defines.md @@ -0,0 +1,15 @@ +``` +% pandoc -f man -t plain +.de test +ok +.. +.test +.br +\A'test' +.br +\A'xyz' +^D +ok +1 +0 +``` diff --git a/test/command/md-abbrevs.md b/test/command/md-abbrevs.md --- a/test/command/md-abbrevs.md +++ b/test/command/md-abbrevs.md @@ -6,18 +6,7 @@ % pandoc -t native Mr. Bob ^D -[Para [Str "Mr.\160Bob"]] -``` - -Here pandoc readjusts the softbreak so that the nonbreaking -space can be inserted: - -``` -% pandoc -t native -Hi Mr. -Bob -^D -[Para [Str "Hi",SoftBreak,Str "Mr.\160Bob"]] +[ Para [ Str "Mr.\160Bob" ] ] ``` If you don't want this to happen you can escape the period: @@ -26,6 +15,7 @@ % pandoc -t native Hi Mr\. Bob ^D -[Para [Str "Hi",Space,Str "Mr.",Space,Str "Bob"]] +[ Para [ Str "Hi" , Space , Str "Mr." , Space , Str "Bob" ] +] ``` diff --git a/test/command/mdoc-An.md b/test/command/mdoc-An.md new file mode 100644 --- /dev/null +++ b/test/command/mdoc-An.md @@ -0,0 +1,17 @@ +``` +% pandoc -f mdoc -t plain +.Sh DESCRIPTION +.An Emily Brontë , +.An Anne Brontë +.Pp +.An -split +.An Charlotte Brontë +.An Bramwell Brontë +^D +DESCRIPTION + +Emily Brontë, Anne Brontë + +Charlotte Brontë +Bramwell Brontë +``` diff --git a/test/command/mdoc-Bd-unfilled.md b/test/command/mdoc-Bd-unfilled.md new file mode 100644 --- /dev/null +++ b/test/command/mdoc-Bd-unfilled.md @@ -0,0 +1,24 @@ +``` +% pandoc -f mdoc -t plain +.Bd -unfilled +’Twas brillig, and the slithy toves + Did gyre and gimble in the wabe: +All mimsy were the borogoves, + And the mome raths outgrabe. + +“Beware the Jabberwock, my son! + The jaws that bite, the claws that catch! +Beware the Jubjub bird, and shun + The frumious Bandersnatch!” +.Ed +^D +’Twas brillig, and the slithy toves + Did gyre and gimble in the wabe: +All mimsy were the borogoves, + And the mome raths outgrabe. + +“Beware the Jabberwock, my son! + The jaws that bite, the claws that catch! +Beware the Jubjub bird, and shun + The frumious Bandersnatch!” +``` diff --git a/test/command/mdoc-Bl-column.md b/test/command/mdoc-Bl-column.md new file mode 100644 --- /dev/null +++ b/test/command/mdoc-Bl-column.md @@ -0,0 +1,22 @@ +``` +% pandoc -f mdoc -t djot +.Bl -column a b +.It a Ta +.Sy b +b +.Ta c +.Pp +.It c Ta d Ta \& +.It Em e +.Ta f +.Ta g +.It h Ta Ta j +.It Pq a Ta b Ta c +.El +^D +| a | *b* b | c | +| c | d | | +| _e_ | f | g | +| h | | j | +| (a) | b | c | +``` diff --git a/test/command/mdoc-Bl-tag.md b/test/command/mdoc-Bl-tag.md new file mode 100644 --- /dev/null +++ b/test/command/mdoc-Bl-tag.md @@ -0,0 +1,36 @@ +``` +% pandoc -f mdoc -t native +.Bl -tag +.It one +one +.It Xo +two +.Xc +two +.It Em three Xo +three +.Xc +three +.It Po one two +.Bq three +.Pc +four +.El +^D +[ DefinitionList + [ ( [ Str "one" ] , [ [ Para [ Str "one" ] ] ] ) + , ( [ Str "two" ] , [ [ Para [ Str "two" ] ] ] ) + , ( [ Emph [ Str "three" ] , Space , Str "three" ] + , [ [ Para [ Str "three" ] ] ] + ) + , ( [ Str "(one" + , Space + , Str "two" + , Space + , Str "[three])" + ] + , [ [ Para [ Str "four" ] ] ] + ) + ] +] +``` diff --git a/test/command/mediawiki_behavior_switches.md b/test/command/mediawiki_behavior_switches.md new file mode 100644 --- /dev/null +++ b/test/command/mediawiki_behavior_switches.md @@ -0,0 +1,16 @@ +``` +% pandoc -f mediawiki -t native +____INDEX____ +__NOINDEX__ +__noindex__ +__FOOBAR__ +^D +[ Para + [ Str "____" + , SoftBreak + , Str "__noindex__" + , SoftBreak + , Str "__FOOBAR__" + ] +] +``` diff --git a/test/command/minimal.svg b/test/command/minimal.svg new file mode 100644 --- /dev/null +++ b/test/command/minimal.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/test/command/mmd-metadata.md b/test/command/mmd-metadata.md new file mode 100644 --- /dev/null +++ b/test/command/mmd-metadata.md @@ -0,0 +1,20 @@ +``` +% pandoc -f markdown_mmd -t markdown -s +Title: Blah blah blah +Author: Doo de Doo +Base Header Level: 1 +Bibliography: Pubs.bib +Lang: en-GB + +body +^D +--- +author: Doo de Doo +baseheaderlevel: 1 +bibliography: Pubs.bib +lang: en-GB +title: Blah blah blah +--- + +body +``` diff --git a/test/command/modern-humanities-research-association.csl b/test/command/modern-humanities-research-association.csl new file mode 100644 --- /dev/null +++ b/test/command/modern-humanities-research-association.csl @@ -0,0 +1,445 @@ + + diff --git a/test/command/multiple-metadata-blocks.md b/test/command/multiple-metadata-blocks.md --- a/test/command/multiple-metadata-blocks.md +++ b/test/command/multiple-metadata-blocks.md @@ -10,6 +10,10 @@ foo: bim ... ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaInlines [Str "bar"])]}) -[] +Pandoc + Meta + { unMeta = + fromList [ ( "foo" , MetaInlines [ Str "bim" ] ) ] + } + [] ``` diff --git a/test/command/nested-spanlike.md b/test/command/nested-spanlike.md new file mode 100644 --- /dev/null +++ b/test/command/nested-spanlike.md @@ -0,0 +1,6 @@ +``` +% pandoc -f markdown -t html +[test]{.foo .underline #bar .smallcaps .kbd} +^D +

    test

    +``` diff --git a/test/command/nested-table-to-asciidoc-6942.md b/test/command/nested-table-to-asciidoc-6942.md new file mode 100644 --- /dev/null +++ b/test/command/nested-table-to-asciidoc-6942.md @@ -0,0 +1,82 @@ +A table within a table should be converted into a table within table + +``` +% pandoc -f html -t asciidoc + + + + + NestedTables + + + + + + + + + + +
    +
    a1 a2
    +     		b
    c d
    + + +^D +[width="100%",cols="50%,50%",] +|=== +a| +[cols=",",] +!=== +!a1 !a2 +!=== + +|b +|c |d +|=== +``` + +A table within a table within a table cannot be converted because asciidoc only +supports two levels of tables. +The table on level 3 is thus converted to level 2 and a warning is produced +``` +% pandoc -f html -t asciidoc --verbose + + + + + NestedTables + + + + + + + + + + +
    + + + +
    a1 +
    1 2
    +
    +     		b
    c d
    + + +^D +2> [INFO] Not rendering Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidth 0.5),(AlignDefault,ColWidth 0.5)] (TableHead ("",[],[]) []) [TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "a1"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) []) [TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "1"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "2"]]]]] (TableFoot ("",[],[]) [])]]]] (TableFoot ("",[],[]) []) +[width="100%",cols="50%,50%",] +|=== +a| +[width="100%",cols="50%,50%",] +!=== +!a1 ! +!=== + +|b +|c |d +|=== +``` diff --git a/test/command/newif.md b/test/command/newif.md new file mode 100644 --- /dev/null +++ b/test/command/newif.md @@ -0,0 +1,55 @@ +``` +% pandoc -f latex -t plain +\iftrue +should print +\iftrue +should print +\else +should not print A +\fi +\else +should not print B +\fi + +\iffalse +should not print C +\else +\iftrue +should print +\else +should not print D +\fi +\fi + +\newif\ifepub + +\ifepub +should not print E +\fi + +\epubtrue + +\ifepub +should print +\else +should not print F +\fi + +\epubfalse + +\ifepub +should not print G +\else +should print +\fi +^D +should print + +should print + +should print + +should print + +should print +``` diff --git a/test/command/oscola.csl b/test/command/oscola.csl new file mode 100644 --- /dev/null +++ b/test/command/oscola.csl @@ -0,0 +1,680 @@ + + diff --git a/test/command/pandoc-citeproc-118.md b/test/command/pandoc-citeproc-118.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-118.md @@ -0,0 +1,27 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- director: + family: Hitchcock + given: Alfred + id: nbn + issued: + year: 1959 + language: 'en-US' + publisher: 'Metro-Goldwyn-Mayer' + publisher-place: USA + title: North by Northwest + type: motion_picture +--- + +[@nbn] is a spy thriller film. +^D +(Hitchcock 1959) is a spy thriller film. + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-nbn .csl-entry} +Hitchcock, Alfred, dir. 1959. *North by Northwest*. Metro-Goldwyn-Mayer. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-119.md b/test/command/pandoc-citeproc-119.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-119.md @@ -0,0 +1,38 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +bibliography: 'command/averroes.bib' +csl: command/apa.csl +--- + +@averroes/bland; @averroes/hannes; @averroes/hercz + +References {#references .unnumbered} +========== +^D +Averroes (1982); Averroes (1892); Averroes (1869) + +# References {#references .unnumbered} + +:::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +::: {#ref-averroes/hercz .csl-entry} +Averroes. (1869). *Drei Abhandlungen über die Conjunction des separaten +Intellects mit dem Menschen: Von Averroes (Vater und Sohn), aus dem +Arabischen übersetzt von Samuel Ibn Tibbon*. (J. Hercz, Ed. & Trans.). +Berlin: S. Hermann. +::: + +::: {#ref-averroes/hannes .csl-entry} +Averroes. (1892). *Des Averroës Abhandlung: "Über die Möglichkeit der +Conjunktion" oder "Über den materiellen Intellekt"*. (L. Hannes, Ed. & +Trans.). Halle an der Saale: C. A. Kaemmerer. +::: + +::: {#ref-averroes/bland .csl-entry} +Averroes. (1982). *The epistle on the possibility of conjunction with +the active intellect by Ibn Rushd with the commentary of Moses Narboni*. +(K. P. Bland, Ed. & Trans.). New York: Jewish Theological Seminary of +America. +::: +:::::: +``` diff --git a/test/command/pandoc-citeproc-13.md b/test/command/pandoc-citeproc-13.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-13.md @@ -0,0 +1,29 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chicago-note-bibliography.csl' +references: +- author: + family: Author + given: + - Ann + container-title: Journal + id: item1 + issued: + - year: 2011 + title: Title + type: 'article-newspaper' +--- + +Foo [@item1]. +^D +Foo.[^1] + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-item1 .csl-entry} +Author, Ann. "Title." *Journal*, 2011. +::: +:::: + +[^1]: Author, "Title." +``` diff --git a/test/command/pandoc-citeproc-136.md b/test/command/pandoc-citeproc-136.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-136.md @@ -0,0 +1,23 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- id: stanze + type: book + issued: + - year: 1547 + title: Stanze in lode della donna brutta + publisher-place: Florence + language: it-IT +... + +@stanze is an anoynymous work. +^D +*Stanze in lode della donna brutta* (1547) is an anoynymous work. + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-stanze .csl-entry} +*Stanze in lode della donna brutta*. 1547. Florence. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-14.md b/test/command/pandoc-citeproc-14.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-14.md @@ -0,0 +1,77 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + family: Pelikan + given: Jaroslav + container-title: 'The Christian tradition: A history of the + development of doctrine' + id: CTv1c2 + issued: + - year: 1971 + language: 'en-US' + page: '34-56' + publisher: University of Chicago Press + publisher-place: Chicago + title: Chapter two + type: chapter + volume: 1 + volume-title: 'The emergence of the Catholic tradition (100--600)' +- author: + family: Pelikan + given: Jaroslav + container-title: 'The Christian tradition: A history of the + development of doctrine' + id: CTv1 + issued: + - year: 1971 + language: 'en-US' + publisher: University of Chicago Press + publisher-place: Chicago + title: 'The emergence of the Catholic tradition (100--600)' + type: book + volume: 1 +- author: + family: Pelikan + given: Jaroslav + id: CT + issued: + - year: 1971 + language: 'en-US' + publisher: University of Chicago Press + publisher-place: Chicago + title: 'The Christian tradition: A history of the development of + doctrine' + type: book +--- + +Foo [@CT, 1:12]. Bar [@CTv1, 12]. Baz [@CTv1c2, 12]. + +References {#references .unnumbered} +========== +^D +Foo (Pelikan 1971b, 1:12). Bar (Pelikan 1971c, 12). Baz (Pelikan 1971a, +12). + +# References {#references .unnumbered} + +:::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-CTv1c2 .csl-entry} +Pelikan, Jaroslav. 1971a. "Chapter Two." In *The Emergence of the +Catholic Tradition (100--600)*, vol. 1 of *The Christian Tradition: A +History of the Development of Doctrine*. University of Chicago Press. +::: + +::: {#ref-CT .csl-entry} +Pelikan, Jaroslav. 1971b. *The Christian Tradition: A History of the +Development of Doctrine*. University of Chicago Press. +::: + +::: {#ref-CTv1 .csl-entry} +Pelikan, Jaroslav. 1971c. *The Emergence of the Catholic Tradition +(100--600)*. In *The Christian Tradition: A History of the Development +of Doctrine*, vol. 1. University of Chicago Press. +::: +:::::: +``` diff --git a/test/command/pandoc-citeproc-152.md b/test/command/pandoc-citeproc-152.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-152.md @@ -0,0 +1,63 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/apa.csl +references: +- URL: 'http://geekfeminism.wikia.com/wiki/Geek_Feminism' + accessed: + day: 10 + month: 4 + year: 2013 + container-title: Geek Feminism + custom2: ok.mm + id: Feminism2013gf + issued: + day: 10 + month: 4 + year: 2013 + keyword: gender + title: Geek Feminism + type: webpage +- URL: 'http://geekfeminism.wikia.com/wiki/Category:Communities' + accessed: + day: 19 + month: 10 + year: 2011 + container-title: Geek Feminism + custom2: gender.mm + id: Feminism2011ces + issued: + day: 14 + month: 8 + year: 2011 + keyword: gender + title: Communities + type: 'entry-encyclopedia' +--- + +Test +==== + +I have two citations [@Feminism2013gf; @Feminism2011ces]. + +References +========== +^D +# Test + +I have two citations ("Communities," 2011; "Geek Feminism," 2013). + +# References {#references .unnumbered} + +::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +::: {#ref-Feminism2011ces .csl-entry} +Communities. (2011, August 14). In *Geek Feminism*. Retrieved from + +::: + +::: {#ref-Feminism2013gf .csl-entry} +Geek Feminism. (2013, April 10). *Geek Feminism*. Retrieved April 10, +2013, from +::: +::::: +``` diff --git a/test/command/pandoc-citeproc-160.md b/test/command/pandoc-citeproc-160.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-160.md @@ -0,0 +1,44 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/issue160.csl +references: +- author: + - family: Doe + given: Jane + citation-label: Jane11 + id: item1 + issued: + year: 2011 + title: A book + type: book +--- + +No citation-label +----------------- + +Foo [@item1]. + +Expected +-------- + +> Foo \[Jane11\]. +> +> \[Jane11\] Jane Doe. A book. 2011. +^D +## No citation-label + +Foo \[Jane11\]. + +## Expected + +> Foo \[Jane11\]. +> +> \[Jane11\] Jane Doe. A book. 2011. + +:::: {#refs .references .csl-bib-body} +::: {#ref-item1 .csl-entry} +\[Jane11\] Jane Doe. A book. 2011. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-175.md b/test/command/pandoc-citeproc-175.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-175.md @@ -0,0 +1,43 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + - family: Doe + given: Jane + container-title: A magazine + id: item1 + issued: + - month: 1 + year: 2011 + - month: 2 + year: 2011 + page: '33-44' + title: A title + type: 'article-magazine' +--- + +Missing en-dash between months +------------------------------ + +Foo [@item1]. + +Expected +-------- + +> Doe, Jane. 2011. "A Title." *A Magazine*, January--February. +^D +## Missing en-dash between months + +Foo (Doe 2011). + +## Expected + +> Doe, Jane. 2011. "A Title." *A Magazine*, January--February. + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item1 .csl-entry} +Doe, Jane. 2011. "A Title." *A Magazine*, January--February, 33--44. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-197.md b/test/command/pandoc-citeproc-197.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-197.md @@ -0,0 +1,31 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chicago-fullnote-bibliography.csl' +nocite: '@test' +references: +- editor: + - family: Abelard + given: Peter + id: test + issued: + date-parts: + - - 1989 + publisher: Clarendon Press + publisher-place: Oxford + title: Test + type: book +--- + +This is a test [@test]. +^D +This is a test.[^1] + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-test .csl-entry} +Abelard, Peter, ed. *Test*. Oxford: Clarendon Press, 1989. +::: +:::: + +[^1]: Peter Abelard, ed., *Test* (Oxford: Clarendon Press, 1989). +``` diff --git a/test/command/pandoc-citeproc-213.md b/test/command/pandoc-citeproc-213.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-213.md @@ -0,0 +1,33 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/harvard-university-of-kent.csl' +references: +- author: + - family: Doe + given: Ann + collection-title: The collection title + dimensions: 789 pp. + id: doe1 + issued: + - year: 1999 + publisher: The publisher + title: Title + type: book +--- + +Foo [@doe1]. + +References {#references .unnumbered} +========== +^D +Foo (Doe 1999). + +# References {#references .unnumbered} + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-doe1 .csl-entry} +Doe, A. (1999). *Title*. The collection title. The publisher. 789 pp. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-25.md b/test/command/pandoc-citeproc-25.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-25.md @@ -0,0 +1,30 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + - family: Author + given: Al + id: item1 + issued: + date-parts: + - - 1998 + title: 'foo bar baz: bazbaz foo' + type: 'article-journal' +--- + +Foo [@item1]. + +References {#references .unnumbered} +========== +^D +Foo (Author 1998). + +# References {#references .unnumbered} + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item1 .csl-entry} +Author, Al. 1998. *Foo Bar Baz: Bazbaz Foo*. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-250.md b/test/command/pandoc-citeproc-250.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-250.md @@ -0,0 +1,21 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +link-citations: true +references: +- author: + family: Doe + id: doe + title: Title +--- + +[@doe] +^D +([Doe, n.d.](#ref-doe)) + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-doe .csl-entry} +Doe. n.d. *Title*. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-27.md b/test/command/pandoc-citeproc-27.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-27.md @@ -0,0 +1,38 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/science.csl +references: +- author: + - family: AuthorOne + given: Joe + - family: AuthorTwo + given: Jill + container-title: Some Journal + id: AuthorOne2014 + issue: X + issued: + date-parts: + - - 2014 + page: 'XXXX-YYYY' + title: Sample Title + type: 'article-journal' + volume: XX +--- + +Minimal example +=============== + +Here is some text that needs a citation [@AuthorOne2014]. +^D +# Minimal example + +Here is some text that needs a citation (*1*). + +:::: {#refs .references .csl-bib-body} +::: {#ref-AuthorOne2014 .csl-entry} +[1. ]{.csl-left-margin}[J. AuthorOne, J. AuthorTwo, *Some Journal*, in +press.]{.csl-right-inline} +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-292.md b/test/command/pandoc-citeproc-292.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-292.md @@ -0,0 +1,43 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/sage-harvard.csl' +references: +- author: + family: Doe + id: doe + issued: + year: 2007 + type: article +- author: + family: Zoe + id: zoe + issued: + - year: 2009 + type: article +- author: + family: Roe + id: roe + issued: + - year: 2007 + type: article +--- + +[@zoe; @roe; see for comparison @doe, p. 3] +^D +(Roe, 2007; Zoe, 2009; see for comparison Doe, 2007: 3) + +:::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-doe .csl-entry} +Doe (2007). +::: + +::: {#ref-roe .csl-entry} +Roe (2007). +::: + +::: {#ref-zoe .csl-entry} +Zoe (2009). +::: +:::::: +``` diff --git a/test/command/pandoc-citeproc-301.md b/test/command/pandoc-citeproc-301.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-301.md @@ -0,0 +1,25 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- id: test + title: Essays presented to N.R. Ker (On Art) +- id: test2 + title: '*Test:* An experiment: An abridgement' +--- + +@test; @test2 +^D +*Essays Presented to N.R. Ker (On Art)* (n.d.); **Test:* An Experiment: +An Abridgement* (n.d.) + +::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-test .csl-entry} +*Essays Presented to N.R. Ker (On Art)*. n.d. +::: + +::: {#ref-test2 .csl-entry} +**Test:* An Experiment: An Abridgement*. n.d. +::: +::::: +``` diff --git a/test/command/pandoc-citeproc-307.md b/test/command/pandoc-citeproc-307.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-307.md @@ -0,0 +1,31 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +lang: 'fr-FR' +references: +- author: + - family: Bazin + given: André + container-title: Cahiers du cinéma + id: bazin_cybernetique_1954 + issue: 36 + issued: + date-parts: + - - 1954 + - 6 + page: '22-27' + title: 'La Cybernétique d''André Cayatte' + type: 'article-journal' +--- + +Bonjour[@bazin_cybernetique_1954] ! +^D +Bonjour(Bazin 1954) ! + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-bazin_cybernetique_1954 .csl-entry} +Bazin, André. 1954. « La Cybernétique d'André Cayatte ». *Cahiers du +cinéma*, nᵒ 36 (juin): 22‑27. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-31.md b/test/command/pandoc-citeproc-31.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-31.md @@ -0,0 +1,49 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/oscola.csl +references: +- DOI: 10.1086/504343 + author: + - family: Olson + given: Hope A. + container-title: Library Quarterly + id: item1 + issue: 1 + issued: + date-parts: + - - 2006 + page: '19-35' + title: 'Codes, costs, and critiques: The organization of information + in *Library Quarterly*, 1931--2004' + title-short: 'Codes, costs, and critiques' + type: 'article-magazine' + volume: 76 +- id: item2 + title: Second title +--- + +Foo [@item1]. Bar [@item2]. Baz [@item1]. +^D +Foo.[^1] Bar.[^2] Baz.[^3] + +::::: {#refs .references .csl-bib-body} +::: {#ref-item1 .csl-entry} +Olson HA, '[Codes, Costs, and Critiques: The Organization of Information +in *Library Quarterly*, 1931--2004](https://doi.org/10.1086/504343)' +(2006) 76 *Library Quarterly* 19 +::: + +::: {#ref-item2 .csl-entry} +'Second Title' +::: +::::: + +[^1]: Hope A Olson, 'Codes, Costs, and Critiques: The Organization of + Information in *Library Quarterly*, 1931--2004' (2006) 76 *Library + Quarterly* 19. + +[^2]: 'Second Title'. + +[^3]: Olson (n 1). +``` diff --git a/test/command/pandoc-citeproc-312.md b/test/command/pandoc-citeproc-312.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-312.md @@ -0,0 +1,171 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/apa.csl +nocite: '@*' +references: +- author: + - literal: NN + id: 'Y' + issued: + - year: 1950 + title: 'Date: Year' + title-short: Date + type: webpage +- author: + - literal: NN + id: Y/Y + issued: + - year: 1951 + - year: 1952 + title: 'Date range: Year' + title-short: Date range + type: webpage +- author: + - literal: NN + id: YM + issued: + - month: 1 + year: 1953 + title: 'Date: Year+month' + title-short: Date + type: webpage +- author: + - literal: NN + id: YM/YM + issued: + - month: 1 + year: 1954 + - month: 2 + year: 1955 + title: 'Date range: Year+month' + title-short: Date range + type: webpage +- author: + - literal: NN + id: YM/YM_same + issued: + - month: 1 + year: 1956 + - month: 2 + year: 1956 + title: 'Date range: Year+month, same year' + title-short: Date range + type: webpage +- author: + - literal: NN + id: YMD + issued: + - day: 15 + month: 1 + year: 1958 + title: 'Date: Year+month+day' + title-short: Date + type: webpage +- author: + - literal: NN + id: YMD/YMD + issued: + - day: 15 + month: 1 + year: 1959 + - day: 16 + month: 2 + year: 1960 + title: 'Date range: Year+month+day' + title-short: Date range + type: webpage +- author: + - literal: NN + id: YMD/YMD_same + issued: + - day: 15 + month: 1 + year: 1961 + - day: 16 + month: 1 + year: 1962 + title: 'Date range: Year+month+day, same month' + title-short: Date range + type: webpage +- author: + - literal: NN + id: YS + issued: + - season: 3 + year: 1963 + title: 'Date: Year+season' + title-short: Date + type: webpage +- author: + - literal: NN + id: YS/YS + issued: + - season: 1 + year: 1964 + - season: 4 + year: 1965 + title: 'Date range: Year+season' + title-short: Date range + type: webpage +- author: + - literal: NN + id: YS/YS_same + issued: + - season: 2 + year: 1966 + - season: 4 + year: 1966 + title: 'Date range: Year+season, same year' + title-short: Date range + type: webpage +--- + +^D +:::::::::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +::: {#ref-Y .csl-entry} +NN. (1950). Date: Year. +::: + +::: {#ref-Y/Y .csl-entry} +NN. (1951--1952). Date range: Year. +::: + +::: {#ref-YM .csl-entry} +NN. (1953, January). Date: Year+month. +::: + +::: {#ref-YM/YM .csl-entry} +NN. (1954--1955, January--February). Date range: Year+month. +::: + +::: {#ref-YM/YM_same .csl-entry} +NN. (1956, January--February). Date range: Year+month, same year. +::: + +::: {#ref-YMD .csl-entry} +NN. (1958, January 15). Date: Year+month+day. +::: + +::: {#ref-YMD/YMD .csl-entry} +NN. (1959--1960, January 15--February 16). Date range: Year+month+day. +::: + +::: {#ref-YMD/YMD_same .csl-entry} +NN. (1961--1962, January 15--16). Date range: Year+month+day, same +month. +::: + +::: {#ref-YS .csl-entry} +NN. (1963, Autumn). Date: Year+season. +::: + +::: {#ref-YS/YS .csl-entry} +NN. (1964--1965, Spring--Winter). Date range: Year+season. +::: + +::: {#ref-YS/YS_same .csl-entry} +NN. (1966, Summer--Winter). Date range: Year+season, same year. +::: +:::::::::::::: +``` diff --git a/test/command/pandoc-citeproc-320.md b/test/command/pandoc-citeproc-320.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-320.md @@ -0,0 +1,254 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/apa.csl +references: +- author: + - family: Benjamin + given: A. S. + id: itemA1 +- author: + - family: Yaakov + given: D. + non-dropping-particle: ben + id: itemA2 +- author: + - family: Brown + given: J. R. + id: itemA3 +- author: + - family: Browning + given: A. R. + id: itemA4 +- author: + - family: Girard + given: 'J.-B.' + id: itemA5 +- author: + - family: 'Girard-Perregaux' + given: A. S. + id: itemA6 +- author: + - family: Ibn Abdulaziz + given: T. + id: itemA7 +- author: + - family: Ibn Nidal + given: A. K. M. + id: itemA8 +- author: + - family: López + given: M. E. + id: itemA9 +- author: + - family: López de Molina + given: G. + id: itemA10 +- author: + - family: Singh + given: Y. + id: itemA11 +- author: + - family: Singh Siddhu + given: N. + id: itemA12 +- author: + - family: Villafuerte + given: S. A. + id: itemA13 +- author: + - family: 'Villa-Lobos' + given: J. + id: itemA14 +- author: + - family: Macalister + given: Donald + id: itemB1 +- author: + - family: MacAlister + given: Paul + id: itemB2 +- author: + - family: Macauley + given: Catharine + id: itemB3 +- author: + - family: Macmillan + given: Harold + id: itemB4 +- author: + - family: Madison + given: James + id: itemB5 +- author: + - family: McAllister + given: Ward + id: itemB6 +- author: + - family: McAuley + given: Catherine + id: itemB7 +- author: + - family: McMillan + given: Edwin M. + id: itemB8 +- author: + - family: 'Sainte-Beuve' + given: 'Charles-Augustin' + id: itemC1 +- author: + - family: 'Saint-Gaudens' + given: Augustus + id: itemC2 +- author: + - family: 'Saint-Saëns' + given: Camille + id: itemC3 +- author: + - dropping-particle: de + family: San Martin + given: José + id: itemC4 +- author: + - family: St. Denis + given: Ruth + id: itemC5 +- author: + - family: St. Laurent + given: Louis Stephen + id: itemC6 +--- + +Foo +[@itemA1; @itemA2; @itemA3; @itemA4; @itemA5; @itemA6; @itemA7; @itemA8; @itemA9; @itemA10; @itemA11; @itemA12; @itemA13; @itemA14]. + +Foo +[@itemB1; @itemB2; @itemB3; @itemB4; @itemB5; @itemB6; @itemB7; @itemB8]. + +Foo [@itemC1; @itemC2; @itemC3; @itemC4; @itemC5; @itemC6]. +^D +Foo (ben Yaakov, n.d.; Benjamin, n.d.; Brown, n.d.; Browning, n.d.; +Girard, n.d.; Girard-Perregaux, n.d.; Ibn Abdulaziz, n.d.; Ibn Nidal, +n.d.; López de Molina, n.d.; López, n.d.; Singh Siddhu, n.d.; Singh, +n.d.; Villafuerte, n.d.; Villa-Lobos, n.d.). + +Foo (Macalister, n.d.; MacAlister, n.d.; Macauley, n.d.; Macmillan, +n.d.; Madison, n.d.; McAllister, n.d.; McAuley, n.d.; McMillan, n.d.). + +Foo (Sainte-Beuve, n.d.; Saint-Gaudens, n.d.; Saint-Saëns, n.d.; San +Martin, n.d.; St. Denis, n.d.; St. Laurent, n.d.). + +::::::::::::::::::::::::::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +::: {#ref-itemA2 .csl-entry} +ben Yaakov, D. (n.d.). +::: + +::: {#ref-itemA1 .csl-entry} +Benjamin, A. S. (n.d.). +::: + +::: {#ref-itemA3 .csl-entry} +Brown, J. R. (n.d.). +::: + +::: {#ref-itemA4 .csl-entry} +Browning, A. R. (n.d.). +::: + +::: {#ref-itemA5 .csl-entry} +Girard, J.-B. (n.d.). +::: + +::: {#ref-itemA6 .csl-entry} +Girard-Perregaux, A. S. (n.d.). +::: + +::: {#ref-itemA7 .csl-entry} +Ibn Abdulaziz, T. (n.d.). +::: + +::: {#ref-itemA8 .csl-entry} +Ibn Nidal, A. K. M. (n.d.). +::: + +::: {#ref-itemA10 .csl-entry} +López de Molina, G. (n.d.). +::: + +::: {#ref-itemA9 .csl-entry} +López, M. E. (n.d.). +::: + +::: {#ref-itemB1 .csl-entry} +Macalister, D. (n.d.). +::: + +::: {#ref-itemB2 .csl-entry} +MacAlister, P. (n.d.). +::: + +::: {#ref-itemB3 .csl-entry} +Macauley, C. (n.d.). +::: + +::: {#ref-itemB4 .csl-entry} +Macmillan, H. (n.d.). +::: + +::: {#ref-itemB5 .csl-entry} +Madison, J. (n.d.). +::: + +::: {#ref-itemB6 .csl-entry} +McAllister, W. (n.d.). +::: + +::: {#ref-itemB7 .csl-entry} +McAuley, C. (n.d.). +::: + +::: {#ref-itemB8 .csl-entry} +McMillan, E. M. (n.d.). +::: + +::: {#ref-itemC1 .csl-entry} +Sainte-Beuve, C.-A. (n.d.). +::: + +::: {#ref-itemC2 .csl-entry} +Saint-Gaudens, A. (n.d.). +::: + +::: {#ref-itemC3 .csl-entry} +Saint-Saëns, C. (n.d.). +::: + +::: {#ref-itemC4 .csl-entry} +San Martin, J. de. (n.d.). +::: + +::: {#ref-itemA12 .csl-entry} +Singh Siddhu, N. (n.d.). +::: + +::: {#ref-itemA11 .csl-entry} +Singh, Y. (n.d.). +::: + +::: {#ref-itemC5 .csl-entry} +St. Denis, R. (n.d.). +::: + +::: {#ref-itemC6 .csl-entry} +St. Laurent, L. S. (n.d.). +::: + +::: {#ref-itemA13 .csl-entry} +Villafuerte, S. A. (n.d.). +::: + +::: {#ref-itemA14 .csl-entry} +Villa-Lobos, J. (n.d.). +::: +::::::::::::::::::::::::::::::: +``` diff --git a/test/command/pandoc-citeproc-320a.md b/test/command/pandoc-citeproc-320a.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-320a.md @@ -0,0 +1,80 @@ +``` +% pandoc --citeproc -t plain +--- +references: +- author: + - family: ʾUdhrī + given: Jamīl + non-dropping-particle: 'al-' + issued: 2000 + title: hamza + id: item1 +- author: + - family: ʿUdhrī + given: Jamīl + non-dropping-particle: 'al-' + issued: 2000 + title: ayn + id: item2 +- author: + - family: "'Udhrī" + given: Jamīl + non-dropping-particle: 'al-' + issued: 2000 + title: straight apostrophe + id: item3 +- author: + - family: '‘Udhrī' + given: Jamīl + non-dropping-particle: 'al-' + issued: 2000 + title: inverted curly apostrophe = opening single curly quote (for ayn) + id: item4 +- author: + - family: '’Udhrī' + given: Jamīl + non-dropping-particle: 'al-' + issued: 2000 + title: curly apostrophe = closing single curly quote (for hamza) + id: item5 +- author: + - family: Uch + given: Ann + id: item6 + issued: 2000 +- author: + - family: Uebel + given: Joe + id: item7 + issued: 2000 +- author: + - family: Zzz + given: Zoe + id: item8 + issued: 2000 +--- + +Foo [@item1; @item2; @item3; @item4; @item5; @item6; @item7; @item8]. +^D +Foo (al-ʾUdhrī 2000; al-ʿUdhrī 2000; al-’Udhrī 2000b, 2000a; al-‘Udhrī +2000; Uch 2000; Uebel 2000; Zzz 2000). + +Uch, Ann. 2000. + +‘Udhrī, Jamīl al-. 2000. Inverted Curly Apostrophe = Opening Single +Curly Quote (for Ayn). + +ʿUdhrī, Jamīl al-. 2000. Ayn. + +’Udhrī, Jamīl al-. 2000a. Curly Apostrophe = Closing Single Curly Quote +(for Hamza). + +ʾUdhrī, Jamīl al-. 2000. Hamza. + +’Udhrī, Jamīl al-. 2000b. Straight Apostrophe. + +Uebel, Joe. 2000. + +Zzz, Zoe. 2000. + +``` diff --git a/test/command/pandoc-citeproc-322.md b/test/command/pandoc-citeproc-322.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-322.md @@ -0,0 +1,35 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/annales.csl +references: +- author: + - family: Timmory + given: François + container-title: 'L''Écran français' + id: timmory\_\_justice_1950 + issue: 272 + issued: + - day: 25 + month: 9 + year: 1950 + language: 'fr-FR' + page: 12 + title: '*Justice est faite* : soyons justes' + type: 'article-journal' +--- + +Foo [@timmory__justice_1950]. +^D +Foo.[^1] + +:::: {#refs .references .csl-bib-body} +::: {#ref-timmory__justice_1950 .csl-entry} +François [Timmory]{.smallcaps}, « *Justice est faite* : soyons justes », +*L'Écran français*, 1950, nᵒ 272, p. 12. +::: +:::: + +[^1]: François [Timmory]{.smallcaps}, « *Justice est faite* : soyons + justes », *L'Écran français*, 1950, nᵒ 272, p. 12. +``` diff --git a/test/command/pandoc-citeproc-325.md b/test/command/pandoc-citeproc-325.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-325.md @@ -0,0 +1,30 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + - family: Smith + given: John + id: item1 + type: book +- author: + - family: Smith + given: John + id: item2 + type: book +--- + +[@item1; @item2] +^D +(Smith, n.d.-a, n.d.-b) + +::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item1 .csl-entry} +Smith, John. n.d.-a. +::: + +::: {#ref-item2 .csl-entry} +Smith, John. n.d.-b. +::: +::::: +``` diff --git a/test/command/pandoc-citeproc-327.md b/test/command/pandoc-citeproc-327.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-327.md @@ -0,0 +1,51 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chinese-gb7714-2005-numeric.csl' +references: +- ISSN: '1003-1111' + URL: 'http://kns.cnki.net/kns/detail/detail.aspx?QueryID=4&CurRec=4&recid=&FileName=CHAN201706006&DbName=CJFDLAST2018&DbCode=CJFQ&yx=Y&pr=&URLID=21.1110.S.20171129.1725.006' + abstract: '为了解辽东湾海域底栖动物次级生产力水平和时空分布特点,根据2007年的4月和10月辽东湾海域大型底栖动物调查数据,运用Brey经验公式计算大型底栖动物次级生产力和P/B值,并结合海洋生物指数方法对辽东湾海域进行生境适宜性评价。分析结果表明,该海域大型底栖动物年平均次级生产力为5.59g/(m\~2·年),年平均P/B值为3.16,辽东湾大型底栖动物次级生产力空间分布呈现出自沿岸向中部递增的趋势,P/B值空间分布与底栖动物次级生产力相反,呈现出自沿岸向中部递减的趋势,群落组成中以个体小、生活史短、代谢快的底栖动物为主。' + accessed: + - day: 27 + month: 3 + year: 2018 + author: + - family: 李 + given: 轶平 + - family: 于 + given: 旭光 + - family: 孙 + given: 明 + - family: 郭 + given: 栋 + - family: 段 + given: 妍 + - family: 董 + given: 婧 + container-title: 水产科学 + id: LiLiaoDongWanHaiYuDiQiDongWuCiJiShengChanLiYanJiuJiShengJingGuaYiXingPingJie2017 + issue: 06 + issued: + - year: 2017 + keyword: '次级生产力,大型底栖动物,海洋生物指数方法,AMBI,macrozoobenthos,P/B + value,P/B值,secondary productivity' + language: 中文; + page: '728-734' + title: 辽东湾海域底栖动物次级生产力研究及生境适宜性评价 + type: 'article-journal' +--- + +I referenced something here +[@LiLiaoDongWanHaiYuDiQiDongWuCiJiShengChanLiYanJiuJiShengJingGuaYiXingPingJie2017] +^D +I referenced something here^\[1\]^ + +:::: {#refs .references .csl-bib-body entry-spacing="0"} +::: {#ref-LiLiaoDongWanHaiYuDiQiDongWuCiJiShengChanLiYanJiuJiShengJingGuaYiXingPingJie2017 .csl-entry} +[\[1\] ]{.csl-left-margin}[李轶平, 于旭光, 孙明, 等. +[辽东湾海域底栖动物次级生产力研究及生境适宜性评价](http://kns.cnki.net/kns/detail/detail.aspx?QueryID=4&CurRec=4&recid=&FileName=CHAN201706006&DbName=CJFDLAST2018&DbCode=CJFQ&yx=Y&pr=&URLID=21.1110.S.20171129.1725.006)\[J\]. +水产科学, 2017(6): 728～734.]{.csl-right-inline} +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-338.md b/test/command/pandoc-citeproc-338.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-338.md @@ -0,0 +1,34 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/din-1505-2.csl' +lang: de +nocite: '@*' +pagetitle: Citation +references: +- ISBN: '978-3-642-32078-1' + author: + - family: Wolfinger + given: Christine + edition: '11., vollst. überarb. Aufl.' + id: 'item-1' + issued: + - year: 2013 + keyword: UNIX; LINUX + number-of-pages: 'XVIII, 529 S. : Ill., graph. Darst.' + publisher: Springer Vieweg + publisher-place: 'Berlin \[u.a.\]' + title: 'Keine Angst vor Linux, Unix: ein Lehrbuch für Linux- und + Unix-Anwender' + type: book +--- + +^D +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item-1 .csl-entry} +[Wolfinger, Christine]{.smallcaps}: *Keine Angst vor Linux, Unix: ein +Lehrbuch für Linux- und Unix-Anwender*. 11., vollst. überarb. Aufl. +Aufl. Berlin \[u.a.\] : Springer Vieweg, 2013 --- ISBN 978-3-642-32078-1 +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-351.md b/test/command/pandoc-citeproc-351.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-351.md @@ -0,0 +1,27 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/zeitschrift-fur-kunstgeschichte.csl' +references: +- editor: + - family: Nietzsche + given: Friedrich + id: Nie72 + issued: + - year: 1872 + title: Die geburt + type: book +--- + +@Nie72 +^D +Friedrich Nietzsche (ed.)[^1] + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-Nie72 .csl-entry} +Nietzsche, Friedrich (ed.), *Die geburt*, 1872. +::: +:::: + +[^1]: *Die geburt*, 1872. +``` diff --git a/test/command/pandoc-citeproc-356.md b/test/command/pandoc-citeproc-356.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-356.md @@ -0,0 +1,20 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + - family: Alice + id: foo + issued: + - year: 2042 + other-ids: + - bar + - doz + type: book +--- + +[@bar] +^D +2> [WARNING] Citeproc: citation bar not found +(**bar?**) +``` diff --git a/test/command/pandoc-citeproc-360.md b/test/command/pandoc-citeproc-360.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-360.md @@ -0,0 +1,35 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chicago-fullnote-bibliography.csl' +references: +- author: + - family: 'L''Estrange' + given: Michael + - family: Merchant + given: Stephen + id: lestrange2017 + issued: + - day: 18 + month: 7 + year: 2017 + language: 'en-US' + title: 2017 Independent Intelligence Review + title-short: Independent Intelligence Review + type: report +--- + +[@lestrange2017] +^D +[^1] + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-lestrange2017 .csl-entry} +L'Estrange, Michael, and Stephen Merchant. "2017 Independent +Intelligence Review," July 18, 2017. +::: +:::: + +[^1]: Michael L'Estrange and Stephen Merchant, "2017 Independent + Intelligence Review," July 18, 2017. +``` diff --git a/test/command/pandoc-citeproc-361.md b/test/command/pandoc-citeproc-361.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-361.md @@ -0,0 +1,80 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/locators.csl +references: +- id: citekey + title: Title + type: 'article-journal' +- id: other + title: Other + type: 'article-journal' +suppress-bibliography: true +--- + +Content[@citekey] + +Content[@citekey, 1] + +Content[@citekey, 2] + +Content[@citekey, 2] + +Content[@citekey 2] + +Content[@citekey, p. 2] + +Content[@citekey p. 2] + +Content[@citekey] + +Content[@other] + +Content[@citekey, 3] + +Content[@citekey, 3] +^D +Content[^1] + +Content[^2] + +Content[^3] + +Content[^4] + +Content[^5] + +Content[^6] + +Content[^7] + +Content[^8] + +Content[^9] + +Content[^10] + +Content[^11] + +[^1]: Title. + +[^2]: Ibid-with-locator {1}. + +[^3]: Ibid-with-locator {2}. + +[^4]: Ibid. + +[^5]: Ibid. + +[^6]: Ibid. + +[^7]: Ibid. + +[^8]: Subsequent. + +[^9]: Other. + +[^10]: Subsequent {3}. + +[^11]: Ibid. +``` diff --git a/test/command/pandoc-citeproc-365.md b/test/command/pandoc-citeproc-365.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-365.md @@ -0,0 +1,39 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/le-tapuscrit-note.csl' +references: +- ISBN: '978-2-912573-52-0' + author: + - family: Le Gras + given: Gwénaëlle + call-number: 'Tolbiac - Rez de Jardin - Littérature et art - Magasin - + 2010-82178' + collection-title: 'Jeux d''acteurs' + id: legras_michel_2010 + issued: + - year: 2010 + language: fre + number-of-pages: 128 + publisher: Scope + publisher-place: Paris + source: 'BnF Catalogue général (http://catalogue.bnf.fr)' + title: 'Michel Simon : l''art de la disgrâce' + title-short: Michel Simon + type: book +--- + +Foo [@legras_michel_2010]. +^D +Foo.[^1] + +:::: {#refs .references .csl-bib-body} +::: {#ref-legras_michel_2010 .csl-entry} +[Le Gras]{.smallcaps} Gwénaëlle, *Michel Simon : l'art de la disgrâce*, +Paris, Scope (coll. « Jeux d'acteurs »), 2010, 128 p. +::: +:::: + +[^1]: Gwénaëlle Le Gras, *Michel Simon : l'art de la disgrâce*, Paris, + Scope, 2010, 128 p. +``` diff --git a/test/command/pandoc-citeproc-371.md b/test/command/pandoc-citeproc-371.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-371.md @@ -0,0 +1,40 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + - family: Doe + given: Jane + id: item1 + status: in press + title: Title one + type: book +- author: + - family: Doe + given: Jane + id: item2 + issued: + - year: 2018 + title: Title two + type: book +--- + +Foo [@item2; @item1]. + +References {#references .unnumbered} +========== +^D +Foo (Doe 2018, in press). + +# References {#references .unnumbered} + +::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item2 .csl-entry} +Doe, Jane. 2018. *Title Two*. +::: + +::: {#ref-item1 .csl-entry} +Doe, Jane. In press. *Title One*. +::: +::::: +``` diff --git a/test/command/pandoc-citeproc-38.md b/test/command/pandoc-citeproc-38.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-38.md @@ -0,0 +1,29 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + - family: Doe + given: Ann + - family: Doe + given: Ben + - family: Roe + given: Ron + id: a + issued: + date-parts: + - - 2007 + title: Title + type: 'article-journal' +--- + +@a +^D +Doe et al. (2007) + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-a .csl-entry} +Doe, Ann, Ben Doe, and Ron Roe. 2007. *Title*. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-386.md b/test/command/pandoc-citeproc-386.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-386.md @@ -0,0 +1,36 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/advanced-optical-materials.csl' +references: +- DOI: 10.1038/lsa.2012.20 + ISSN: '2047-7538' + author: + - family: Ding + given: K. + - family: Ning + given: C. Z. + container-title: Light Sci. Appl. + id: ding_metallic_2012 + issue: 7 + issued: + - month: 7 + year: 2012 + page: 'e20-e20' + title: 'Metallic subwavelength-cavity semiconductor nanolasers' + type: 'article-journal' + volume: 1 +--- + +@ding_metallic_2012 +^D +^\[1\]^ + +:::: {#refs .references .csl-bib-body entry-spacing="0" line-spacing="2"} +::: {#ref-ding_metallic_2012 .csl-entry} +[\[1\] ]{.csl-left-margin}[[K. Ding, C. Z. Ning, *Light Sci. Appl.* +**2012**, *1*, +e20](https://doi.org/10.1038/lsa.2012.20).]{.csl-right-inline} +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-392.md b/test/command/pandoc-citeproc-392.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-392.md @@ -0,0 +1,29 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/vancouver.csl +references: +- author: + - family: James + given: M.R.C.E.L. + id: james +- author: + - family: MacFarlane + given: J. G. + id: macfarlane +--- + +@james; @macfarlane +^D +(1); (2) + +::::: {#refs .references .csl-bib-body} +::: {#ref-james .csl-entry} +[1. ]{.csl-left-margin}[James MRCEL. ]{.csl-right-inline} +::: + +::: {#ref-macfarlane .csl-entry} +[2. ]{.csl-left-margin}[MacFarlane JG. ]{.csl-right-inline} +::: +::::: +``` diff --git a/test/command/pandoc-citeproc-399.md b/test/command/pandoc-citeproc-399.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-399.md @@ -0,0 +1,45 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/style399.csl +references: +- author: + - family: One + id: one +- author: + - family: Two + id: two +- author: + - family: Three + id: three +- author: + - family: Four + id: four +- author: + - family: Five + id: five +- author: + - family: Six + id: six +- author: + - family: Seven + id: seven +- author: + - family: Eight + id: eight +- author: + - family: Nine + id: nine +- author: + - family: Ten + id: ten +- author: + - family: Eleven + id: eleven +--- + +Inline citation +[@one; @two; @three; @four; @five; @six; @seven; @eight; @nine; @ten; @eleven]. +^D +Inline citation \[1,2,3,4,5,6,7,8,9,10,11\]. +``` diff --git a/test/command/pandoc-citeproc-401.md b/test/command/pandoc-citeproc-401.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-401.md @@ -0,0 +1,59 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- id: haslanger2012SocialConstructionDebunking + type: chapter + author: + - family: Haslanger + given: Sally + issued: + - year: 2012 + original-date: + - year: 2003 + title: 'Social Construction: The ‘Debunking’ Project' + title-short: Social Construction + container-title: 'Resisting Reality: Social Construction and Social Critique' + publisher: Oxford University Press + publisher-place: Oxford + event-place: Oxford + page: 113–138 + ISBN: 978-0-19-989262-4 + +- id: haslanger2012FeminismMetaphysicsNegotiating + type: chapter + author: + - family: Haslanger + given: Sally + issued: + - year: 2012 + original-date: + - year: 2000 + title: 'Feminism in Metaphysics: Negotiating the Natural' + container-title: 'Resisting Reality: Social Construction and Social Critique' + publisher: Oxford University Press + publisher-place: Oxford + event-place: Oxford + page: 139–157 + ISBN: 978-0-19-989262-4 + language: en +... + +Haslanger [-@haslanger2012SocialConstructionDebunking; @haslanger2012FeminismMetaphysicsNegotiating] says... +^D +Haslanger (\[2003\] 2012, \[2000\] 2012) says... + +::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-haslanger2012FeminismMetaphysicsNegotiating .csl-entry} +Haslanger, Sally. (2000) 2012. "Feminism in Metaphysics: Negotiating the +Natural." In *Resisting Reality: Social Construction and Social +Critique*. Oxford University Press. +::: + +::: {#ref-haslanger2012SocialConstructionDebunking .csl-entry} +Haslanger, Sally. (2003) 2012. "Social Construction: The 'Debunking' +Project." In *Resisting Reality: Social Construction and Social +Critique*. Oxford University Press. +::: +::::: +``` diff --git a/test/command/pandoc-citeproc-408.md b/test/command/pandoc-citeproc-408.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-408.md @@ -0,0 +1,39 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- id: smith1 + type: article-journal + author: + - family: Smith + given: Mary + issued: + - year: 2019 + title: Foo + +- id: smithsmith + type: article-journal + author: + - family: Smith + given: Mary + - family: Smith + given: John + issued: + - year: 2019 + title: Foo bar +... + +[@smithsmith; @smith1] +^D +(Smith and Smith 2019; Smith 2019) + +::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-smith1 .csl-entry} +Smith, Mary. 2019. *Foo*. +::: + +::: {#ref-smithsmith .csl-entry} +Smith, Mary, and John Smith. 2019. *Foo Bar*. +::: +::::: +``` diff --git a/test/command/pandoc-citeproc-416.md b/test/command/pandoc-citeproc-416.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-416.md @@ -0,0 +1,60 @@ +``` +% pandoc --citeproc -t markdown-citations +Blah blah [@item1; @item2; @item3]. + +# References {-} + +--- +title: The Title +references: +- id: item1 + type: article-newspaper + author: + - family: Doe + given: J. + issued: + - year: 2010 + month: 12 + day: 13 + title: The title +- id: item2 + type: article-newspaper + author: + - family: Doe + given: J. + issued: + - year: 2007 + month: 12 + day: 12 + - year: 2007 + month: 12 + day: 13 + title: The title +- id: item3 + type: article-newspaper + author: + - family: Doe + given: J. + issued: + - year: 2008 + title: The title +... +^D +Blah blah (Doe 2010, 2007, 2008). + +# References {#references .unnumbered} + +:::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item2 .csl-entry} +Doe, J. 2007. *The Title*. December 12--13. +::: + +::: {#ref-item3 .csl-entry} +Doe, J. 2008. *The Title*. +::: + +::: {#ref-item1 .csl-entry} +Doe, J. 2010. *The Title*. December 13. +::: +:::::: +``` diff --git a/test/command/pandoc-citeproc-437.md b/test/command/pandoc-citeproc-437.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-437.md @@ -0,0 +1,23 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/issue437.csl +references: +- author: + - family: Smith + given: John + id: hirt2009 + issued: + - year: 2009 + publisher: Publishing House + publisher-place: Lausanne + title: Some Book + type: book +--- + +> Here is a quote. [@hirt2009] +^D +> Here is a quote.[^1] + +[^1]: John Smith, Some Book, Lausanne, 2009 +``` diff --git a/test/command/pandoc-citeproc-47.md b/test/command/pandoc-citeproc-47.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-47.md @@ -0,0 +1,112 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + - family: Doe + given: A. + id: doe + issued: + date-parts: + - - 2000 + title: Title + type: book +- author: + - family: Doe + given: A. + - family: Poe + given: A. + id: doepoe + issued: + date-parts: + - - 2000 + title: Title + type: book +- editor: + - family: Doe + given: A. + id: 'doe-ed' + issued: + date-parts: + - - 2000 + title: Title + type: book +- author: + - family: Doe + given: A. + - family: Loe + given: A. + - family: Toe + given: A. + id: doeloetoe + issued: + date-parts: + - - 2000 + title: Title + type: book +--- + +Foo [@doe]. Bar [@doepoe]. Foo [@doe-ed]. Bar [@doeloetoe]. + +Expected output: + +> Doe, A. 2000a. Title. +> +> ---------, ed. 2000b. Title. +> +> Doe, A., A. Loe, and A. Toe. 2000. Title. +> +> Doe, A., and A. Poe. 2000. Title. + +(See CMoS, 16e, 15.16, "Single author versus several authors---reference +list order": "Successive entries by two or more authors in which only +the first author's name is the same are alphabetized according to the +coauthors' last names (regardless of how many coauthors there are)." and +15.18, "The 3-em dash with edited, translated, or compiled works": "The +chronological order is maintained, regardless of the added abbreviation. +\[ed., trans., comp., or whatever\]" + +References {#references .unnumbered} +========== +^D +Foo (Doe 2000a). Bar (Doe and Poe 2000). Foo (Doe 2000b). Bar (Doe et +al. 2000). + +Expected output: + +> Doe, A. 2000a. Title. +> +> ---------, ed. 2000b. Title. +> +> Doe, A., A. Loe, and A. Toe. 2000. Title. +> +> Doe, A., and A. Poe. 2000. Title. + +(See CMoS, 16e, 15.16, "Single author versus several authors---reference +list order": "Successive entries by two or more authors in which only +the first author's name is the same are alphabetized according to the +coauthors' last names (regardless of how many coauthors there are)." and +15.18, "The 3-em dash with edited, translated, or compiled works": "The +chronological order is maintained, regardless of the added abbreviation. +\[ed., trans., comp., or whatever\]" + +# References {#references .unnumbered} + +::::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-doe .csl-entry} +Doe, A. 2000a. *Title*. +::: + +::: {#ref-doe-ed .csl-entry} +Doe, A., ed. 2000b. *Title*. +::: + +::: {#ref-doeloetoe .csl-entry} +Doe, A., A. Loe, and A. Toe. 2000. *Title*. +::: + +::: {#ref-doepoe .csl-entry} +Doe, A., and A. Poe. 2000. *Title*. +::: +::::::: +``` diff --git a/test/command/pandoc-citeproc-51.md b/test/command/pandoc-citeproc-51.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-51.md @@ -0,0 +1,45 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + - family: Doe + given: John + container-title: Journal of Something + id: item1 + issued: + date-parts: + - - 1987 + - - 1988 + page: '12-34' + title: The title + type: 'article-journal' + volume: 3 +- author: + - family: Roe + given: Ron + container-title: Journal of Something + id: item2 + issued: + date-parts: + - - 1987 + page: '12-34' + title: The title + type: 'article-journal' + volume: 4 +--- + +@item1; @item2 +^D +Doe (1987--1988); Roe (1987) + +::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item1 .csl-entry} +Doe, John. 1987--1988. "The Title." *Journal of Something* 3: 12--34. +::: + +::: {#ref-item2 .csl-entry} +Roe, Ron. 1987. "The Title." *Journal of Something* 4: 12--34. +::: +::::: +``` diff --git a/test/command/pandoc-citeproc-53.md b/test/command/pandoc-citeproc-53.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-53.md @@ -0,0 +1,56 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/archeologie-medievale.csl +references: +- title: Work A + id: a + issued: + date-parts: + - - 2000 + author: + - given: John + family: Doe + type: book +- title: Work B + id: b + issued: + date-parts: + - - 1990 + author: + - given: Jane + family: Roe + type: book +--- +@a @a @b @b @a @a @b @b +^D +Doe[^1] Doe[^2] Roe[^3] Roe[^4] Doe[^5] Doe[^6] Roe[^7] Roe[^8] + +::::: {#refs .references .csl-bib-body} +::: {#ref-a .csl-entry} +[[Doe J.]{.smallcaps} ]{.csl-block} +[2000, *Work A*,.]{.csl-left-margin} +::: + +::: {#ref-b .csl-entry} +[[Roe J.]{.smallcaps} ]{.csl-block} +[1990, *Work B*,.]{.csl-left-margin} +::: +::::: + +[^1]: 2000 + +[^2]: *Ibid.* + +[^3]: 1990 + +[^4]: *Ibid.* + +[^5]: 2000 + +[^6]: *Ibid.* + +[^7]: 1990 + +[^8]: *Ibid.* +``` diff --git a/test/command/pandoc-citeproc-57.md b/test/command/pandoc-citeproc-57.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-57.md @@ -0,0 +1,37 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chicago-author-date-with-original-date-and-status.csl' +references: +- author: + - family: Faraday + given: Carry + container-title: Seven Trips beyond the Asteroid Belt + editor: + - family: Oring + given: James + id: 'Faraday-forthcoming' + publisher: Launch Press + publisher-place: 'Cape Canaveral, FL' + status: forthcoming + title: Protean photography + type: chapter +--- + +[@Faraday-forthcoming] + +References +========== +^D +(Faraday, forthcoming) + +# References {#references .unnumbered} + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-Faraday-forthcoming .csl-entry} +Faraday, Carry. Forthcoming. "Protean Photography." In *Seven Trips +Beyond the Asteroid Belt*, edited by James Oring. Cape Canaveral, FL: +Launch Press. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-58.md b/test/command/pandoc-citeproc-58.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-58.md @@ -0,0 +1,32 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/issue58.csl +references: +- id: stanze + issued: + date-parts: + - - 1547 + language: 'it-IT' + publisher-place: Florence + title: Stanze in lode della donna brutta + type: book +--- + +In this item, the title replaces the (unknown) author (see 14.79) +[@stanze, p. 12]. + +References +========== +^D +In this item, the title replaces the (unknown) author (see 14.79) +(*Stanze in lode della donna brutta* 1547, 12). + +# References {#references .unnumbered} + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-stanze .csl-entry} +*Stanze in lode della donna brutta*. 1547. Florence. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-61.md b/test/command/pandoc-citeproc-61.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-61.md @@ -0,0 +1,77 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/modern-humanities-research-association.csl' +references: +- author: + - family: Doe + given: John + id: doe + issued: + date-parts: + - - 1985 + publisher: Publisher + title: Title + type: book +- author: + - family: Roe + given: Rob + id: roe + issued: + date-parts: + - - 1985 + publisher: Publisher + title: Title + type: book +--- + +Text +==== + +Foo [@doe, VIII, 89] + +Foo [@roe, III, 89] + +Foo [@doe, LVIII, 89] + +Foo [@roe, MVIII, 89] + +Foo [@doe, CL, 89] + +References +========== +^D +# Text + +Foo[^1] + +Foo[^2] + +Foo[^3] + +Foo[^4] + +Foo[^5] + +# References {#references .unnumbered} + +::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-doe .csl-entry} +Doe, John, *Title* (Publisher, 1985) +::: + +::: {#ref-roe .csl-entry} +Roe, Rob, *Title* (Publisher, 1985) +::: +::::: + +[^1]: John Doe, *Title* (Publisher, 1985), VIII, 89. + +[^2]: Rob Roe, *Title* (Publisher, 1985), III, 89. + +[^3]: Doe, LVIII, 89. + +[^4]: Roe, MVIII, 89. + +[^5]: Doe, CL, 89. +``` diff --git a/test/command/pandoc-citeproc-64.md b/test/command/pandoc-citeproc-64.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-64.md @@ -0,0 +1,24 @@ +``` +% pandoc --citeproc -t markdown-citations --csl command/chicago-fullnote-bibliography.csl +--- +bibliography: +- command/biblio.bib +nocite: '[@*]' +--- + +^D +:::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-item2 .csl-entry} +Doe, John. "Article." *Journal of Generic Studies* 6 (2006): 33--34. +::: + +::: {#ref-item1 .csl-entry} +---------. *First Book*. Cambridge: Cambridge University Press, 2005. +::: + +::: {#ref-пункт3 .csl-entry} +Doe, John, and Jenny Roe. "Why Water Is Wet." In *Third Book*, edited by +Sam Smith. Oxford: Oxford University Press, 2007. +::: +:::::: +``` diff --git a/test/command/pandoc-citeproc-65.md b/test/command/pandoc-citeproc-65.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-65.md @@ -0,0 +1,37 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- ISBN: 3406493556 + author: + - family: Stotz + given: Peter + call-number: 'PA25 PA2616 .H24 Abt. 2, T. 5, Bd. 2, etc' + collection-number: 2.5 + collection-title: Handbuch der Altertumswissenschaft + event-place: Munich + first-reference-note-number: 1 + id: 'stotz:1996handbuch' + issued: + literal: 1996_2004 + language: de + number-of-volumes: 5 + publisher: Beck + publisher-place: Munich + source: Library of Congress ISBN + title: Handbuch zur lateinischen Sprache des Mittelalters + title-short: Handbuch + type: book +--- + +[@stotz:1996handbuch] +^D +(Stotz 1996--2004) + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-stotz:1996handbuch .csl-entry} +Stotz, Peter. 1996--2004. *Handbuch zur lateinischen Sprache des +Mittelalters*. 5 vols. Handbuch der Altertumswissenschaft, 2.5. Beck. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-68.md b/test/command/pandoc-citeproc-68.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-68.md @@ -0,0 +1,56 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chicago-fullnote-bibliography.csl' +references: +- ISBN: 0888441088 + author: + - family: Goering + given: Joseph + call-number: BV4009 .W55 1992 + collection-number: 108 + collection-title: Studies and Texts + event-place: Toronto + first-reference-note-number: 1 + id: 'goering:1992william' + issued: + date-parts: + - - 1992 + publisher: Pontifical Institute of Mediaeval Studies + publisher-place: Toronto + source: toroprod.library.utoronto.ca Library Catalog + title: 'William de Montibus (c. 1140--1213): The Schools and the + Literature of Pastoral Care' + title-short: William de Montibus + type: book +--- + +\... a prose commentary [the text of fol. 9r is printed in +@goering:1992william, pp. 501--3]. \... a collection of verses with a +formal prose commentary [excerpts from this text were previously printed +in @goering:1992william, p. 508--14; it was also briefly described in +@goering:1992william, pp. 141--42] \... and finally a note starting with +a citation [@goering:1992william, pp. 141-42]. +^D +\... a prose commentary.[^1] \... a collection of verses with a formal +prose commentary[^2] \... and finally a note starting with a +citation.[^3] + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-goering:1992william .csl-entry} +Goering, Joseph. *William de Montibus (c. 1140--1213): The Schools and +the Literature of Pastoral Care*. Studies and Texts 108. Toronto: +Pontifical Institute of Mediaeval Studies, 1992. +::: +:::: + +[^1]: The text of fol. 9r is printed in Joseph Goering, *William de + Montibus (c. 1140--1213): The Schools and the Literature of Pastoral + Care*, Studies and Texts 108 (Toronto: Pontifical Institute of + Mediaeval Studies, 1992), 501--3. + +[^2]: Excerpts from this text were previously printed in Goering, + 508--14; it was also briefly described in Goering, 141--42. + +[^3]: Goering, *William de Montibus*, 141--42. +``` diff --git a/test/command/pandoc-citeproc-7.md b/test/command/pandoc-citeproc-7.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-7.md @@ -0,0 +1,31 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + family: Author + given: + - Ann + container-title: Journal + id: item1 + issued: + - day: 24 + month: 9 + year: 2011 + - day: 26 + month: 9 + year: 2011 + title: Title + type: 'article-magazine' +--- + +@item1 +^D +Author (2011) + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item1 .csl-entry} +Author, Ann. 2011. "Title." *Journal*, September 24--26. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-70.md b/test/command/pandoc-citeproc-70.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-70.md @@ -0,0 +1,73 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- ISBN: 9782503531465 + author: + - family: 'Dinkova-Bruun' + given: Greti + call-number: CB351 .F564 2009 + collection-number: 50 + collection-title: Textes et études du moyen âge + container-title: 'Florilegium mediaevale: Études offertes à Jacqueline + Hamesse à l''occasion de son éméritat' + editor: + - family: Meirinhos + given: José Francisco + - family: Weijers + given: Olga + event-place: 'Louvain-la-Neuve' + first-reference-note-number: 1 + id: 'bruun:2009samuel' + issued: + date-parts: + - - 2009 + language: fr + page: '155--174' + publisher: 'Fédération Internationale des Instituts d''Études + Médiévales' + publisher-place: 'Louvain-la-Neuve' + source: Library of Congress ISBN + title: 'Samuel Presbyter and the Glosses to His Versification of Psalm + 1: An Anti-Church Invective?' + title-short: Samuel Presbyter + type: chapter +- ISSN: '0362-1529' + author: + - family: Thorndike + given: Lynn + container-title: Traditio + first-reference-note-number: 1 + id: 'thorndike:1955unde' + issued: + date-parts: + - - 1955 + language: la + note: 'ArticleType: research-article / Full publication date: 1955 / + Copyright © 1955 Fordham University' + page: '163--193' + source: JSTOR + title: Unde versus + type: 'article-journal' + volume: 11 +--- + +[@thorndike:1955unde; @bruun:2009samuel] +^D +(Thorndike 1955; Dinkova-Bruun 2009) + +::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-bruun:2009samuel .csl-entry} +Dinkova-Bruun, Greti. 2009. "Samuel Presbyter and the Glosses to His +Versification of Psalm 1: An Anti-Church Invective?" In *Florilegium +mediaevale: Études offertes à Jacqueline Hamesse à l'occasion de son +éméritat*, edited by José Francisco Meirinhos and Olga Weijers. Textes +et études du moyen âge 50. Fédération Internationale des Instituts +d'Études Médiévales. +::: + +::: {#ref-thorndike:1955unde .csl-entry} +Thorndike, Lynn. 1955. "Unde versus." *Traditio* 11: 163--93. +::: +::::: +``` diff --git a/test/command/pandoc-citeproc-75.md b/test/command/pandoc-citeproc-75.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-75.md @@ -0,0 +1,67 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/apa.csl +references: +- author: + - family: Doe + given: John + id: test + issued: + date-parts: + - - 2006 + title: Test + type: 'article-journal' + volume: 81 +--- + +[@test, p. 6] + +[@test, chap. 6] + +[@test, n. 6] + +[@test, pp. 34-36, 38-39] + +[@test, sec. 3] + +[@test, p.3] + +[@test, 33-35, 38-39] + +[@test, 14] + +[@test bk. VI] + +[@test, no. 6] + +[@test, nos. 6 and 7] +^D +(Doe, 2006, p. 6) + +(Doe, 2006, Chapter 6) + +(Doe, 2006, n. 6) + +(Doe, 2006, pp. 34--36, 38--39) + +(Doe, 2006, sec. 3) + +(Doe, 2006, p. 3) + +(Doe, 2006, pp. 33--35, 38--39) + +(Doe, 2006, p. 14) + +(Doe, 2006, bk. VI) + +(Doe, 2006, no. 6) + +(Doe, 2006, no. 6 and 7) + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +::: {#ref-test .csl-entry} +Doe, J. (2006). Test, *81*. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-76.md b/test/command/pandoc-citeproc-76.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-76.md @@ -0,0 +1,64 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + - family: Author + given: Al + id: item1 + issued: + date-parts: + - - 1998 + title: 'foo bar baz: bazbaz bar foo' + type: 'article-journal' +- author: + - family: Author + given: Al + id: item2 + issued: + date-parts: + - - 1998 + title: 'foo bar baz: the bazbaz bar foo' + type: 'article-journal' +- author: + - family: Author + given: Al + id: item3 + issued: + date-parts: + - - 1998 + title: 'foo bar baz: a bazbaz bar foo' + type: 'article-journal' +- author: + - family: Author + given: Al + id: item4 + issued: + date-parts: + - - 1998 + title: 'foo bar baz: an abazbaz bar foo' + type: 'article-journal' +--- + +@item1, @item2, @item3, @item4 +^D +Author (1998c), Author (1998d), Author (1998a), Author (1998b) + +::::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item3 .csl-entry} +Author, Al. 1998a. *Foo Bar Baz: A Bazbaz Bar Foo*. +::: + +::: {#ref-item4 .csl-entry} +Author, Al. 1998b. *Foo Bar Baz: An Abazbaz Bar Foo*. +::: + +::: {#ref-item1 .csl-entry} +Author, Al. 1998c. *Foo Bar Baz: Bazbaz Bar Foo*. +::: + +::: {#ref-item2 .csl-entry} +Author, Al. 1998d. *Foo Bar Baz: The Bazbaz Bar Foo*. +::: +::::::: +``` diff --git a/test/command/pandoc-citeproc-77.md b/test/command/pandoc-citeproc-77.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-77.md @@ -0,0 +1,67 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chicago-fullnote-bibliography.csl' +references: +- author: + - family: Doe + given: 'John, III' + parse-names: true + id: item1 + type: book +- author: + - family: van Gogh + given: Vincent + parse-names: true + id: item2 + type: book +- author: + - family: Humboldt + given: Alexander von + parse-names: true + id: item3 + type: book +- author: + - family: Bennett + given: 'Frank G.,! Jr.' + parse-names: true + id: item4 + type: book +- author: + - family: Dumboldt + given: 'Ezekiel, III' + parse-names: true + id: item5 + type: book +--- + +[@item1; @item2; @item3; @item4; @item5] +^D +[^1] + +:::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-item4 .csl-entry} +Bennett, Frank G., Jr., n.d. +::: + +::: {#ref-item1 .csl-entry} +Doe, John, III, n.d. +::: + +::: {#ref-item5 .csl-entry} +Dumboldt, Ezekiel, III, n.d. +::: + +::: {#ref-item2 .csl-entry} +Gogh, Vincent van, n.d. +::: + +::: {#ref-item3 .csl-entry} +Humboldt, Alexander von, n.d. +::: +:::::::: + +[^1]: John Doe III, n.d.; Vincent van Gogh, n.d.; Alexander von + Humboldt, n.d.; Frank G. Bennett, Jr., n.d.; Ezekiel Dumboldt III, + n.d. +``` diff --git a/test/command/pandoc-citeproc-82.md b/test/command/pandoc-citeproc-82.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-82.md @@ -0,0 +1,39 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chicago-annotated-bibliography.csl' +references: +- URL: 'https://www.worldcat.org/' + accessed: + date-parts: + - - 2014 + - 9 + - 19 + author: + - literal: OCLC + first-reference-note-number: 1 + id: OCLC_i1099 + title: WorldCat + type: webpage +--- + +Title +===== + +Some text.[^1] + +[^1]: Comment regarding text, supported by citation [@OCLC_i1099]. +^D +# Title + +Some text.[^1] + +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-OCLC_i1099 .csl-entry} +OCLC. "WorldCat." Accessed September 19, 2014. +. +::: +:::: + +[^1]: Comment regarding text, supported by citation (OCLC, "WorldCat"). +``` diff --git a/test/command/pandoc-citeproc-87.md b/test/command/pandoc-citeproc-87.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-87.md @@ -0,0 +1,156 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- URL: 'http://www.example.com' + author: + - family: Doe + given: John + container-title: The Web Site + id: item1 + issued: + date-parts: + - - 2006 + - 10 + - 26 + title: Title + type: webpage +- URL: 'http://www.example.com' + author: + - family: Doe + given: John + container-title: The Web Site + id: item2 + issued: + date-parts: + - - 2006 + - 10 + - 26 + - - 2006 + - 11 + - 27 + title: Title + type: webpage +- URL: 'http://www.example.com' + author: + - family: Doe + given: John + container-title: The Web Site + id: item2a + issued: + date-parts: + - - 2006 + - 10 + - - 2006 + - 11 + title: Title + type: webpage +- URL: 'http://www.example.com' + author: + - family: Doe + given: John + container-title: The Web Site + id: item2b + issued: + date-parts: + - - 2006 + - 12 + - 31 + - - 2007 + - 1 + - 1 + title: Title + type: webpage +- URL: 'http://www.example.com' + author: + - family: Doe + given: John + container-title: The Newspaper + id: item3 + issued: + date-parts: + - - 2006 + - 10 + - 26 + - - 2006 + - 11 + - 27 + title: Title + type: 'article-newspaper' +- URL: 'http://www.example.com' + author: + - family: Doe + given: John + container-title: The Newspaper + id: item3b + issued: + date-parts: + - - 2006 + - 10 + - - 2006 + - 11 + title: Title + type: 'article-newspaper' +--- + +@item1 -- webpage, date + +@item2 -- webpage, date range + +@item2a -- webpage, date range YM + +@item2b -- webpage, date range across years + +@item3 -- article-newspaper + +@item3b -- article-newspaper YM + +References +========== +^D +Doe (2006a) -- webpage, date + +Doe (2006c) -- webpage, date range + +Doe (2006b) -- webpage, date range YM + +Doe (2006--2007) -- webpage, date range across years + +Doe (2006e) -- article-newspaper + +Doe (2006d) -- article-newspaper YM + +# References {#references .unnumbered} + +::::::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item1 .csl-entry} +Doe, John. 2006a. "Title." The Web Site, October 26. +. +::: + +::: {#ref-item2a .csl-entry} +Doe, John. 2006b. "Title." The Web Site, October--November. +. +::: + +::: {#ref-item2 .csl-entry} +Doe, John. 2006c. "Title." The Web Site, October 26--November 27. +. +::: + +::: {#ref-item3b .csl-entry} +Doe, John. 2006d. "Title." *The Newspaper*, October--November. +. +::: + +::: {#ref-item3 .csl-entry} +Doe, John. 2006e. "Title." *The Newspaper*, October 26--November 27. +. +::: + +::: {#ref-item2b .csl-entry} +Doe, John. 2006--2007. "Title." The Web Site, December 31--January 1. +. +::: +::::::::: +``` diff --git a/test/command/pandoc-citeproc-chicago-author-date.md b/test/command/pandoc-citeproc-chicago-author-date.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-chicago-author-date.md @@ -0,0 +1,109 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +bibliography: command/biblio.bib +link-citations: true +--- + +Pandoc with citeproc-hs +======================= + +[@nonexistent] + +@nonexistent + +@item1 says blah. + +@item1 [p. 30] says blah. + +@item1 [p. 30, with suffix] says blah. + +@item1 [-@item2 p. 30; see also @пункт3] says blah. + +In a note.[^1] + +A citation group [see @item1 chap. 3; also @пункт3 p. 34-35]. + +Another one [see @item1 p. 34-35]. + +And another one in a note.[^2] + +Citation with a suffix and locator [@item1 pp. 33, 35-37, and nowhere +else]. + +Citation with suffix only [@item1 and nowhere else]. + +Now some modifiers.[^3] + +With some markup [*see* @item1 p. **32**]. + +References {#references .unnumbered} +========== + +[^1]: @пункт3 [p. 12] and a citation without locators [@пункт3]. + +[^2]: Some citations [see @item1 chap. 3; @пункт3; @item2]. + +[^3]: Like a citation without author: [-@item1], and now Doe with a + locator [-@item2 p. 44]. +^D +2> [WARNING] Citeproc: citation nonexistent not found +# Pandoc with citeproc-hs + +([**nonexistent?**](#ref-nonexistent)) + +([**nonexistent?**](#ref-nonexistent)) + +Doe ([2005](#ref-item1)) says blah. + +Doe ([2005, 30](#ref-item1)) says blah. + +Doe ([2005, 30](#ref-item1), with suffix) says blah. + +Doe ([2005](#ref-item1); [2006, 30](#ref-item2); see also [Doe and Roe +2007](#ref-пункт3)) says blah. + +In a note.[^1] + +A citation group (see [Doe 2005, chap. 3](#ref-item1); also [Doe and Roe +2007, 34--35](#ref-пункт3)). + +Another one (see [Doe 2005, 34--35](#ref-item1)). + +And another one in a note.[^2] + +Citation with a suffix and locator ([Doe 2005, 33, 35--37](#ref-item1), +and nowhere else). + +Citation with suffix only ([Doe 2005](#ref-item1) and nowhere else). + +Now some modifiers.[^3] + +With some markup (*see* [Doe 2005, 32](#ref-item1)). + +# References {#references .unnumbered} + +:::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item1 .csl-entry} +Doe, John. 2005. *First Book*. Cambridge University Press. +::: + +::: {#ref-item2 .csl-entry} +Doe, John. 2006. "Article." *Journal of Generic Studies* 6: 33--34. +::: + +::: {#ref-пункт3 .csl-entry} +Doe, John, and Jenny Roe. 2007. "Why Water Is Wet." In *Third Book*, +edited by Sam Smith. Oxford University Press. +::: +:::::: + +[^1]: Doe and Roe ([2007, 12](#ref-пункт3)) and a citation without + locators ([Doe and Roe 2007](#ref-пункт3)). + +[^2]: Some citations (see [Doe 2005, chap. 3](#ref-item1); + [2006](#ref-item2); [Doe and Roe 2007](#ref-пункт3)). + +[^3]: Like a citation without author: ([2005](#ref-item1)), and now Doe + with a locator ([2006, 44](#ref-item2)). +``` diff --git a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md @@ -0,0 +1,134 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +bibliography: command/biblio.bib +csl: 'command/chicago-fullnote-bibliography.csl' +link-citations: true +--- + +Pandoc with citeproc-hs +======================= + +[@nonexistent] + +@nonexistent + +@item1 says blah. + +@item1 [p. 30] says blah. + +@item1 [p. 30, with suffix] says blah. + +@item1 [-@item2 p. 30; see also @пункт3] says blah. + +In a note.[^1] + +A citation group [see @item1 chap. 3; also @пункт3 p. 34-35]. + +Another one [see @item1 p. 34-35]. + +And another one in a note.[^2] + +Citation with a suffix and locator [@item1 pp. 33, 35-37, and nowhere +else]. + +Citation with suffix only [@item1 and nowhere else]. + +Now some modifiers.[^3] + +With some markup [*see* @item1 p. **32**]. + +References {#references .unnumbered} +========== + +[^1]: @пункт3 [p. 12] and a citation without locators [@пункт3]. + +[^2]: Some citations [see @item1 chap. 3; @пункт3; @item2]. + +[^3]: Like a citation without author: [-@item1], and again + [-@item1], and now Doe with a locator [-@item2 p. 44]. +^D +2> [WARNING] Citeproc: citation nonexistent not found +# Pandoc with citeproc-hs + +[^1] + +[^2] + +John Doe[^3] says blah. + +Doe[^4] says blah. + +Doe[^5] says blah. + +Doe[^6] says blah. + +In a note.[^7] + +A citation group.[^8] + +Another one.[^9] + +And another one in a note.[^10] + +Citation with a suffix and locator.[^11] + +Citation with suffix only.[^12] + +Now some modifiers.[^13] + +With some markup.[^14] + +# References {#references .unnumbered} + +:::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::: {#ref-item2 .csl-entry} +Doe, John. "Article." *Journal of Generic Studies* 6 (2006): 33--34. +::: + +::: {#ref-item1 .csl-entry} +---------. *First Book*. Cambridge: Cambridge University Press, 2005. +::: + +::: {#ref-пункт3 .csl-entry} +Doe, John, and Jenny Roe. "Why Water Is Wet." In *Third Book*, edited by +Sam Smith. Oxford: Oxford University Press, 2007. +::: +:::::: + +[^1]: [**Nonexistent?**](#ref-nonexistent) + +[^2]: [**Nonexistent?**](#ref-nonexistent) + +[^3]: [*First Book* (Cambridge: Cambridge University Press, + 2005)](#ref-item1). + +[^4]: [30](#ref-item1). + +[^5]: [30](#ref-item1), with suffix. + +[^6]: [*First Book*](#ref-item1); ["Article," *Journal of Generic + Studies* 6 (2006): 30](#ref-item2); see also [John Doe and Jenny + Roe, "Why Water Is Wet," in *Third Book*, ed. Sam Smith (Oxford: + Oxford University Press, 2007)](#ref-пункт3). + +[^7]: Doe and Roe, ["Why Water Is Wet," 12](#ref-пункт3) and a citation + without locators ([Doe and Roe, "Why Water Is Wet"](#ref-пункт3)). + +[^8]: See [Doe, *First Book*, chap. 3](#ref-item1); also [Doe and Roe, + "Why Water Is Wet," 34--35](#ref-пункт3). + +[^9]: See [Doe, *First Book*, 34--35](#ref-item1). + +[^10]: Some citations (see [Doe, chap. 3](#ref-item1); [Doe and Roe, + "Why Water Is Wet"](#ref-пункт3); [Doe, "Article"](#ref-item2)). + +[^11]: [Doe, *First Book*, 33, 35--37](#ref-item1), and nowhere else. + +[^12]: [Doe, *First Book*](#ref-item1) and nowhere else. + +[^13]: Like a citation without author: (), and again (), and now Doe + with a locator (["Article," 44](#ref-item2)). + +[^14]: *See* [Doe, *First Book*, 32](#ref-item1). +``` diff --git a/test/command/pandoc-citeproc-ieee.md b/test/command/pandoc-citeproc-ieee.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-ieee.md @@ -0,0 +1,113 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +bibliography: command/biblio.bib +csl: command/ieee.csl +link-citations: true +--- + +Pandoc with citeproc-hs +======================= + +[@nonexistent] + +@nonexistent + +@item1 says blah. + +@item1 [p. 30] says blah. + +@item1 [p. 30, with suffix] says blah. + +@item1 [-@item2 p. 30; see also @пункт3] says blah. + +In a note.[^1] + +A citation group [see @item1 chap. 3; also @пункт3 p. 34-35]. + +Another one [see @item1 p. 34-35]. + +And another one in a note.[^2] + +Citation with a suffix and locator [@item1 pp. 33, 35-37, and nowhere +else]. + +Citation with suffix only [@item1 and nowhere else]. + +Now some modifiers.[^3] + +With some markup [*see* @item1 p. **32**]. + +References {#references .unnumbered} +========== + +[^1]: @пункт3 [p. 12] and a citation without locators [@пункт3]. + +[^2]: Some citations [see @item1 chap. 3; @пункт3; @item2]. + +[^3]: Like a citation without author: [-@item1], and now Doe with a + locator [-@item2 p. 44]. +^D +2> [WARNING] Citeproc: citation nonexistent not found +# Pandoc with citeproc-hs + +[**nonexistent?**](#ref-nonexistent) + +[**nonexistent?**](#ref-nonexistent) + +[\[1\]](#ref-item1) says blah. + +[\[1, p. 30\]](#ref-item1) says blah. + +[\[1, p. 30\]](#ref-item1), with suffix says blah. + +[\[1\]](#ref-item1), [\[2, p. 30\]](#ref-item2), see also +[\[3\]](#ref-пункт3) says blah. + +In a note.[^1] + +A citation group see [\[1, Ch. 3\]](#ref-item1), also [\[3, pp. +34--35\]](#ref-пункт3). + +Another one see [\[1, pp. 34--35\]](#ref-item1). + +And another one in a note.[^2] + +Citation with a suffix and locator [\[1, pp. 33, 35--37\]](#ref-item1), +and nowhere else. + +Citation with suffix only [\[1\]](#ref-item1) and nowhere else. + +Now some modifiers.[^3] + +With some markup *see* [\[1, p. 32\]](#ref-item1). + +# References {#references .unnumbered} + +:::::: {#refs .references .csl-bib-body entry-spacing="0"} +::: {#ref-item1 .csl-entry} +[\[1\] ]{.csl-left-margin}[J. Doe, *First book*. Cambridge: Cambridge +University Press, 2005.]{.csl-right-inline} +::: + +::: {#ref-item2 .csl-entry} +[\[2\] ]{.csl-left-margin}[J. Doe, "Article," *Journal of Generic +Studies*, vol. 6, pp. 33--34, 2006.]{.csl-right-inline} +::: + +::: {#ref-пункт3 .csl-entry} +[\[3\] ]{.csl-left-margin}[J. Doe and J. Roe, "Why water is wet," in +*Third book*, S. Smith, Ed. Oxford: Oxford University Press, +2007.]{.csl-right-inline} +::: +:::::: + +[^1]: [\[3, p. 12\]](#ref-пункт3) and a citation without locators + [\[3\]](#ref-пункт3). + +[^2]: Some citations see [\[1, Ch. 3\]](#ref-item1), + [\[2\]](#ref-item2), [\[3\]](#ref-пункт3). + +[^3]: Like a citation without author: [\[1\]](#ref-item1), and now Doe + with a locator [\[2, p. 44\]](#ref-item2). +``` diff --git a/test/command/pandoc-citeproc-locators-delimited.md b/test/command/pandoc-citeproc-locators-delimited.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-locators-delimited.md @@ -0,0 +1,127 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/locators.csl +references: +- id: citekey + title: Title + type: 'article-journal' +suppress-bibliography: true +--- + +See . + +Standard page range[@citekey {35-89, 102}] + +Alphanumeric[@citekey {abcdefg1234}] + +Kitchen sink[@citekey, {123(4)a-8(\[a\]12.398{8})}] + +Empty braces inside[@citekey, {{}}] + +Label specified[@citekey {p. a}] + +Should it work outside? No. [@citekey, p. {(a)}] + +Empty locator [@citekey, {}] + +Empty locator to force suffix[@citekey {} 123-35 numbers are suffix] + +Suffix generally [@citekey {123-35} numbers not, but text is suffix] + +With preceding comma[@citekey, {p. VI}] + +No commas before label[@citekey, {, p. (p. is not recognised)}] + +Trim white space[@citekey, { p. 9 }] + +Without delimiters[@citekey, suffix] + +With rendering label[@citekey {ss IV div 4 s 128L(7)(a)(i)-(iv), 129(5), +130(b)}] + +The text is apparently NOT verbatim; it is lightly processed as page +numbers. [@citekey {no comma, no label, no nothing}] + +AGLC-style page \[para\] [@citekey {584 \[78\]}] + +Unbalanced curly { breaks the parse[@citekey {p. suffix{suffix}suffix] + +Unbalanced curly } ends early[@citekey {green}suffix}suffix] +^D +See . + +Standard page range[^1] + +Alphanumeric[^2] + +Kitchen sink[^3] + +Empty braces inside[^4] + +Label specified[^5] + +Should it work outside? No.[^6] + +Empty locator[^7] + +Empty locator to force suffix[^8] + +Suffix generally[^9] + +With preceding comma[^10] + +No commas before label[^11] + +Trim white space[^12] + +Without delimiters[^13] + +With rendering label[^14] + +The text is apparently NOT verbatim; it is lightly processed as page +numbers.[^15] + +AGLC-style page \[para\][^16] + +Unbalanced curly { breaks the parse[^17] + +Unbalanced curly } ends early[^18] + +[^1]: Title {35--89, 102}. + +[^2]: Ibid-with-locator {abcdefg1234}. + +[^3]: Ibid-with-locator {123(4)a--8(\[a\]12.398{8})}. + +[^4]: Ibid-with-locator {{}}. + +[^5]: Ibid-with-locator {a}. + +[^6]: Subsequent, p. {(a)}. + +[^7]: Ibid. + +[^8]: Ibid 123-35 numbers are suffix. + +[^9]: Ibid-with-locator {123--35} numbers not, but text is suffix. + +[^10]: Ibid-with-locator {VI}. + +[^11]: Ibid-with-locator {, p. (p. is not recognised)}. + +[^12]: Ibid-with-locator {9}. + +[^13]: Subsequent, suffix. + +[^14]: Ibid-with-locator ss {IV div 4 s 128L(7)(a)(i)--(iv), 129(5), + 130(b)}. + +[^15]: Ibid-with-locator {no comma, no label, no nothing}. + +[^16]: Ibid-with-locator {584 \[78\]}. + +[^17]: Subsequent {p. suffix{suffix}suffix. + +[^18]: Ibid-with-locator {green}suffix}suffix. +``` diff --git a/test/command/pandoc-citeproc-locators-integrated.md b/test/command/pandoc-citeproc-locators-integrated.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-locators-integrated.md @@ -0,0 +1,159 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: command/locators.csl +references: +- id: citekey + title: Title + type: 'article-journal' +suppress-bibliography: true +--- + +See . + +[@citekey, 89, and suffix] + +[@citekey, 89, perfect Ibid with suffix] + +[@citekey, 123-79, and suffix] + +[@citekey, xi, will be entirely suffix] + +[@citekey, p. xi, gives you a (page) locator xi] + +[@citekey, pp. VII, 89, gives you a (pages) locator VII, 89] + +[@citekey, p. VI, VII, VIII-IX, explicit romans] + +[@citekey \[89\]] + +[@citekey, p. \[89\]] + +[@citekey and nothing else] + +[@citekey, 123(4)\[5\]6, and suffix] + +[@citekey, 3(a), 4.4.8, \[7.6\], 7A(2)(a)(i)-(iv)] + +[@citekey, 4B.2a.i(3.4), and suffix] + +[@citekey, IV.2A, and suffix] + +[@citekey, \[28\], and suffix] + +[@citekey, \[39-52\], and suffix] + +[@citekey, \[39\]-\[52\], and suffix] + +[@citekey, s 123(4)(a)(iv), and suffix] + +[@citekey, ss 123(4)-(6), and suffix] + +[@citekey, \[13\], and suffix] + +[@citekey, p.3, and suffix] + +[@citekey, (13 entirely suffix] + +[@citekey, p.a entirely suffix] + +[@citekey, s (a) entirely suffix] +^D +See . + +[^1] + +[^2] + +[^3] + +[^4] + +[^5] + +[^6] + +[^7] + +[^8] + +[^9] + +[^10] + +[^11] + +[^12] + +[^13] + +[^14] + +[^15] + +[^16] + +[^17] + +[^18] + +[^19] + +[^20] + +[^21] + +[^22] + +[^23] + +[^24] + +[^1]: Title {89}, and suffix. + +[^2]: Ibid, perfect Ibid with suffix. + +[^3]: Ibid-with-locator {123--79}, and suffix. + +[^4]: Subsequent, xi, will be entirely suffix. + +[^5]: Ibid-with-locator {xi}, gives you a (page) locator xi. + +[^6]: Ibid-with-locator {VII, 89}, gives you a (pages) locator VII, 89. + +[^7]: Ibid-with-locator {VI, VII, VIII--IX}, explicit romans. + +[^8]: Ibid-with-locator {\[89\]}. + +[^9]: Ibid. + +[^10]: Subsequent and nothing else. + +[^11]: Ibid-with-locator {123(4)\[5\]6}, and suffix. + +[^12]: Ibid-with-locator {3(a), 4.4.8, \[7.6\], 7A(2)(a)(i)--(iv)}. + +[^13]: Ibid-with-locator {4B.2a.i(3.4)}, and suffix. + +[^14]: Ibid-with-locator {IV.2A}, and suffix. + +[^15]: Ibid-with-locator {\[28\]}, and suffix. + +[^16]: Ibid-with-locator {\[39--52\]}, and suffix. + +[^17]: Ibid-with-locator {\[39\]--\[52\]}, and suffix. + +[^18]: Ibid-with-locator s {123(4)(a)(iv)}, and suffix. + +[^19]: Ibid-with-locator ss {123(4)--(6)}, and suffix. + +[^20]: Ibid-with-locator {\[13\]}, and suffix. + +[^21]: Ibid-with-locator {3}, and suffix. + +[^22]: Subsequent, (13 entirely suffix. + +[^23]: Ibid, p.a entirely suffix. + +[^24]: Ibid, s (a) entirely suffix. +``` diff --git a/test/command/pandoc-citeproc-move-period-inside-quote.md b/test/command/pandoc-citeproc-move-period-inside-quote.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-move-period-inside-quote.md @@ -0,0 +1,52 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chicago-fullnote-bibliography.csl' +references: +- DOI: 10.1038/171737a0 + URL: 'http://www.nature.com/nature/journal/v171/n4356/abs/171737a0.html' + accessed: + day: 17 + month: 6 + year: 2008 + author: + - family: Watson + given: J. D. + - family: Crick + given: F. H. C. + container-title: Nature + custom4: custom4 + id: WatsonCrick1953 + issue: 4356 + issued: + date-parts: + - - 1953 + - 4 + - 25 + language: 'en-US' + note: this is a note + original-date: + year: 1951 + page: '737-738' + title: 'Molecular structure of nucleic acids: a structure for + deoxyribose nucleic acid' + title-short: Molecular structure of nucleic acids + type: 'article-journal' + volume: 171 +suppress-bibliography: true +--- + +Here is a "test citation" [@WatsonCrick1953]. + +Here is a test citation [@WatsonCrick1953]. +^D +Here is a "test citation."[^1] + +Here is a test citation.[^2] + +[^1]: J. D. Watson and F. H. C. Crick, "Molecular Structure of Nucleic + Acids: A Structure for Deoxyribose Nucleic Acid," *Nature* 171, no. + 4356 (April 25, 1953): 737--38, . + +[^2]: Watson and Crick. +``` diff --git a/test/command/pandoc-citeproc-no-author.md b/test/command/pandoc-citeproc-no-author.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-no-author.md @@ -0,0 +1,73 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- container-title: Magazine + id: item1 + issued: + year: 2012 + title: Title A + type: 'article-magazine' +- container-title: Magazine + id: item2 + issued: + year: 2012 + title: Title B + type: 'article-magazine' +- container-title: Magazine + id: item3 + issued: + year: 2012 + title: Title C + type: 'article-magazine' +- container-title: Magazine + id: item4 + issued: + year: 2012 + title: Title D + type: 'article-magazine' +- container-title: Newspaper + id: item5 + issued: + year: 2012 + title: Title E + type: 'article-magazine' +- container-title: Newspaper + id: item6 + issued: + year: 2012 + title: Title F + type: 'article-magazine' +--- + +@item1 [p. 3], @item2, @item3, @item4, @item5, @item6 +^D +*Magazine* (2012a, 3), *Magazine* (2012b), *Magazine* (2012c), +*Magazine* (2012d), *Newspaper* (2012a), *Newspaper* (2012b) + +::::::::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item1 .csl-entry} +*Magazine*. 2012a. "Title A." +::: + +::: {#ref-item2 .csl-entry} +*Magazine*. 2012b. "Title B." +::: + +::: {#ref-item3 .csl-entry} +*Magazine*. 2012c. "Title C." +::: + +::: {#ref-item4 .csl-entry} +*Magazine*. 2012d. "Title D." +::: + +::: {#ref-item5 .csl-entry} +*Newspaper*. 2012a. "Title E." +::: + +::: {#ref-item6 .csl-entry} +*Newspaper*. 2012b. "Title F." +::: +::::::::: +``` diff --git a/test/command/pandoc-citeproc-number-of-volumes.md b/test/command/pandoc-citeproc-number-of-volumes.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-number-of-volumes.md @@ -0,0 +1,29 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +references: +- author: + family: Author + given: + - Al + id: item1 + issued: + year: 2013 + language: 'en-US' + number-of-volumes: 2 + publisher: Publisher + publisher-place: Location + title: Title + type: book +--- + +@item1 +^D +Author (2013) + +:::: {#refs .references .csl-bib-body .hanging-indent} +::: {#ref-item1 .csl-entry} +Author, Al. 2013. *Title*. 2 vols. Publisher. +::: +:::: +``` diff --git a/test/command/pandoc-citeproc-page-range.md b/test/command/pandoc-citeproc-page-range.md new file mode 100644 --- /dev/null +++ b/test/command/pandoc-citeproc-page-range.md @@ -0,0 +1,32 @@ +``` +% pandoc --citeproc -t markdown-citations +--- +csl: 'command/chicago-fullnote-bibliography.csl' +references: +- URL: 'https://johnmacfarlane.net/vagueness.pdf' + id: test1 +- URL: 'https://pandoc.org' + id: test2 +- URL: 'https://johnmacfarlane.net' + id: test3 +suppress-bibliography: true +--- + +Test 1 [@test1, pp. 93--101]. + +Test 2 [@test2, pp. 93--101]. + +Test 3 [@test3, pp. 93-101]. +^D +Test 1.[^1] + +Test 2.[^2] + +Test 3.[^3] + +[^1]: N.d., 93--101, . + +[^2]: N.d., 93--101, . + +[^3]: N.d., 93--101, . +``` diff --git a/test/command/parse-raw.md b/test/command/parse-raw.md --- a/test/command/parse-raw.md +++ b/test/command/parse-raw.md @@ -2,7 +2,7 @@ % pandoc -f latex+raw_tex -t markdown \emph{Hi \foo{there}} ^D -*Hi \foo{there}* +*Hi `\foo{there}`{=latex}* ``` ``` @@ -16,7 +16,7 @@ % pandoc -f html+raw_html -t markdown Hi there ^D -*Hi there* +*Hi ``{=html}there``{=html}* ``` ``` diff --git a/test/command/pdfstandard.md b/test/command/pdfstandard.md new file mode 100644 --- /dev/null +++ b/test/command/pdfstandard.md @@ -0,0 +1,616 @@ +PDF standard support: basic PDF/A-2b test (infers version 1.7) +``` +% pandoc -t latex -s +--- +pdfstandard: a-2b +lang: en-US +--- + +Test document. +^D +\DocumentMetadata{ + pdfversion=1.7, + pdfstandard={a-2b}, + lang=en-US, + xmp=true} +% Options for packages loaded elsewhere +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{hyphens}{url} +\documentclass[ + american, +]{article} +\usepackage{xcolor} +\usepackage{amsmath,amssymb} +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering +\usepackage{iftex} +\ifPDFTeX + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provide euro and other symbols +\else % if luatex or xetex + \usepackage{unicode-math} % this also loads fontspec + \defaultfontfeatures{Scale=MatchLowercase} + \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} +\fi +\usepackage{lmodern} +\ifPDFTeX\else + % xetex/luatex font selection +\fi +% Use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +\IfFileExists{microtype.sty}{% use microtype if available + \usepackage[]{microtype} + \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +\ifLuaTeX +\usepackage[bidi=basic,shorthands=off]{babel} +\else +\usepackage[bidi=default,shorthands=off]{babel} +\fi +\ifLuaTeX + \usepackage{selnolig} % disable illegal ligatures +\fi +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{same} +% fallback for those not using the hyperref driver hyperxmp: +\makeatletter +\@ifundefined{xmpquote}{\newcommand{\xmpquote}[1]{#1}}{} +\makeatother +\hypersetup{ + pdflang={en-US}, + hidelinks, + pdfcreator={LaTeX via pandoc}} + +\author{} +\date{} + +\begin{document} + +Test document. + +\end{document} +``` + +PDF standard support: PDF/UA-1 with tagging +``` +% pandoc -t latex -s +--- +pdfstandard: ua-1 +lang: en-US +--- + +Accessible document. +^D +\DocumentMetadata{ + pdfstandard={ua-1}, + tagging=on, + lang=en-US, + xmp=true} +% Options for packages loaded elsewhere +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{hyphens}{url} +\documentclass[ + american, +]{article} +\usepackage{xcolor} +\usepackage{amsmath,amssymb} +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering +\usepackage{iftex} +\ifPDFTeX + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provide euro and other symbols +\else % if luatex or xetex + \usepackage{unicode-math} % this also loads fontspec + \defaultfontfeatures{Scale=MatchLowercase} + \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} +\fi +\usepackage{lmodern} +\ifPDFTeX\else + % xetex/luatex font selection +\fi +% Use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +\IfFileExists{microtype.sty}{% use microtype if available + \usepackage[]{microtype} + \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +\ifLuaTeX +\usepackage[bidi=basic,shorthands=off]{babel} +\else +\usepackage[bidi=default,shorthands=off]{babel} +\fi +\ifLuaTeX + \usepackage{selnolig} % disable illegal ligatures +\fi +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{same} +% fallback for those not using the hyperref driver hyperxmp: +\makeatletter +\@ifundefined{xmpquote}{\newcommand{\xmpquote}[1]{#1}}{} +\makeatother +\hypersetup{ + pdflang={en-US}, + hidelinks, + pdfcreator={LaTeX via pandoc}} + +\author{} +\date{} + +\begin{document} + +Accessible document. + +\end{document} +``` + +PDF standard support: multiple standards with version +``` +% pandoc -t latex -s +--- +pdfstandard: + - a-2b + - ua-1 + - "1.7" +lang: de-DE +--- + +Multi-standard document. +^D +\DocumentMetadata{ + pdfversion=1.7, + pdfstandard={a-2b,ua-1}, + tagging=on, + lang=de-DE, + xmp=true} +% Options for packages loaded elsewhere +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{hyphens}{url} +\documentclass[ + ngerman, +]{article} +\usepackage{xcolor} +\usepackage{amsmath,amssymb} +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering +\usepackage{iftex} +\ifPDFTeX + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provide euro and other symbols +\else % if luatex or xetex + \usepackage{unicode-math} % this also loads fontspec + \defaultfontfeatures{Scale=MatchLowercase} + \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} +\fi +\usepackage{lmodern} +\ifPDFTeX\else + % xetex/luatex font selection +\fi +% Use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +\IfFileExists{microtype.sty}{% use microtype if available + \usepackage[]{microtype} + \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +\ifLuaTeX +\usepackage[bidi=basic,shorthands=off]{babel} +\else +\usepackage[bidi=default,shorthands=off]{babel} +\fi +\ifLuaTeX + \usepackage{selnolig} % disable illegal ligatures +\fi +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{same} +% fallback for those not using the hyperref driver hyperxmp: +\makeatletter +\@ifundefined{xmpquote}{\newcommand{\xmpquote}[1]{#1}}{} +\makeatother +\hypersetup{ + pdflang={de-DE}, + hidelinks, + pdfcreator={LaTeX via pandoc}} + +\author{} +\date{} + +\begin{document} + +Multi-standard document. + +\end{document} +``` + +PDF standard support: PDF/A-1b infers version 1.4 +``` +% pandoc -t latex -s +--- +pdfstandard: a-1b +lang: en-US +--- + +PDF/A-1 document. +^D +\DocumentMetadata{ + pdfversion=1.4, + pdfstandard={a-1b}, + lang=en-US, + xmp=true} +% Options for packages loaded elsewhere +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{hyphens}{url} +\documentclass[ + american, +]{article} +\usepackage{xcolor} +\usepackage{amsmath,amssymb} +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering +\usepackage{iftex} +\ifPDFTeX + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provide euro and other symbols +\else % if luatex or xetex + \usepackage{unicode-math} % this also loads fontspec + \defaultfontfeatures{Scale=MatchLowercase} + \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} +\fi +\usepackage{lmodern} +\ifPDFTeX\else + % xetex/luatex font selection +\fi +% Use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +\IfFileExists{microtype.sty}{% use microtype if available + \usepackage[]{microtype} + \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +\ifLuaTeX +\usepackage[bidi=basic,shorthands=off]{babel} +\else +\usepackage[bidi=default,shorthands=off]{babel} +\fi +\ifLuaTeX + \usepackage{selnolig} % disable illegal ligatures +\fi +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{same} +% fallback for those not using the hyperref driver hyperxmp: +\makeatletter +\@ifundefined{xmpquote}{\newcommand{\xmpquote}[1]{#1}}{} +\makeatother +\hypersetup{ + pdflang={en-US}, + hidelinks, + pdfcreator={LaTeX via pandoc}} + +\author{} +\date{} + +\begin{document} + +PDF/A-1 document. + +\end{document} +``` + +PDF standard support: PDF/A-4 with no version inference (uses default 2.0) +``` +% pandoc -t latex -s +--- +pdfstandard: a-4 +lang: en-US +--- + +PDF/A-4 document. +^D +\DocumentMetadata{ + pdfstandard={a-4}, + lang=en-US, + xmp=true} +% Options for packages loaded elsewhere +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{hyphens}{url} +\documentclass[ + american, +]{article} +\usepackage{xcolor} +\usepackage{amsmath,amssymb} +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering +\usepackage{iftex} +\ifPDFTeX + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provide euro and other symbols +\else % if luatex or xetex + \usepackage{unicode-math} % this also loads fontspec + \defaultfontfeatures{Scale=MatchLowercase} + \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} +\fi +\usepackage{lmodern} +\ifPDFTeX\else + % xetex/luatex font selection +\fi +% Use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +\IfFileExists{microtype.sty}{% use microtype if available + \usepackage[]{microtype} + \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +\ifLuaTeX +\usepackage[bidi=basic,shorthands=off]{babel} +\else +\usepackage[bidi=default,shorthands=off]{babel} +\fi +\ifLuaTeX + \usepackage{selnolig} % disable illegal ligatures +\fi +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{same} +% fallback for those not using the hyperref driver hyperxmp: +\makeatletter +\@ifundefined{xmpquote}{\newcommand{\xmpquote}[1]{#1}}{} +\makeatother +\hypersetup{ + pdflang={en-US}, + hidelinks, + pdfcreator={LaTeX via pandoc}} + +\author{} +\date{} + +\begin{document} + +PDF/A-4 document. + +\end{document} +``` + +PDF standard support: numeric YAML version (2 becomes 2.0) +``` +% pandoc -t latex -s +--- +pdfstandard: + - ua-1 + - 2 +lang: en-US +--- + +PDF 2.0 document. +^D +\DocumentMetadata{ + pdfversion=2.0, + pdfstandard={ua-1}, + tagging=on, + lang=en-US, + xmp=true} +% Options for packages loaded elsewhere +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{hyphens}{url} +\documentclass[ + american, +]{article} +\usepackage{xcolor} +\usepackage{amsmath,amssymb} +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering +\usepackage{iftex} +\ifPDFTeX + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provide euro and other symbols +\else % if luatex or xetex + \usepackage{unicode-math} % this also loads fontspec + \defaultfontfeatures{Scale=MatchLowercase} + \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} +\fi +\usepackage{lmodern} +\ifPDFTeX\else + % xetex/luatex font selection +\fi +% Use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +\IfFileExists{microtype.sty}{% use microtype if available + \usepackage[]{microtype} + \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +\ifLuaTeX +\usepackage[bidi=basic,shorthands=off]{babel} +\else +\usepackage[bidi=default,shorthands=off]{babel} +\fi +\ifLuaTeX + \usepackage{selnolig} % disable illegal ligatures +\fi +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{same} +% fallback for those not using the hyperref driver hyperxmp: +\makeatletter +\@ifundefined{xmpquote}{\newcommand{\xmpquote}[1]{#1}}{} +\makeatother +\hypersetup{ + pdflang={en-US}, + hidelinks, + pdfcreator={LaTeX via pandoc}} + +\author{} +\date{} + +\begin{document} + +PDF 2.0 document. + +\end{document} +``` + +PDF standard support: explicit version overrides inferred version +``` +% pandoc -t latex -s +--- +pdfstandard: + - a-2b + - "1.5" +lang: en-US +--- + +Explicit version document. +^D +\DocumentMetadata{ + pdfversion=1.5, + pdfstandard={a-2b}, + lang=en-US, + xmp=true} +% Options for packages loaded elsewhere +\PassOptionsToPackage{unicode}{hyperref} +\PassOptionsToPackage{hyphens}{url} +\documentclass[ + american, +]{article} +\usepackage{xcolor} +\usepackage{amsmath,amssymb} +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering +\usepackage{iftex} +\ifPDFTeX + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provide euro and other symbols +\else % if luatex or xetex + \usepackage{unicode-math} % this also loads fontspec + \defaultfontfeatures{Scale=MatchLowercase} + \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} +\fi +\usepackage{lmodern} +\ifPDFTeX\else + % xetex/luatex font selection +\fi +% Use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +\IfFileExists{microtype.sty}{% use microtype if available + \usepackage[]{microtype} + \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +\ifLuaTeX +\usepackage[bidi=basic,shorthands=off]{babel} +\else +\usepackage[bidi=default,shorthands=off]{babel} +\fi +\ifLuaTeX + \usepackage{selnolig} % disable illegal ligatures +\fi +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{same} +% fallback for those not using the hyperref driver hyperxmp: +\makeatletter +\@ifundefined{xmpquote}{\newcommand{\xmpquote}[1]{#1}}{} +\makeatother +\hypersetup{ + pdflang={en-US}, + hidelinks, + pdfcreator={LaTeX via pandoc}} + +\author{} +\date{} + +\begin{document} + +Explicit version document. + +\end{document} +``` diff --git a/test/command/refs.md b/test/command/refs.md --- a/test/command/refs.md +++ b/test/command/refs.md @@ -2,25 +2,82 @@ % pandoc -f latex -t native Figure \ref{fig:1} ^D -[Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:1")]) [Str "[fig:1]"] ("#fig:1","")]] +[ Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:1" ) + ] + ) + [ Str "[fig:1]" ] + ( "#fig:1" , "" ) + ] +] ``` ``` % pandoc -f latex -t native Figure \cref{fig:1} ^D -[Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:1")]) [Str "[fig:1]"] ("#fig:1","")]] +[ Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref+label" ) + , ( "reference" , "fig:1" ) + ] + ) + [ Str "[fig:1]" ] + ( "#fig:1" , "" ) + ] +] ``` ``` % pandoc -f latex -t native Figure \vref{fig:1} ^D -[Para [Str "Figure",Space,Link ("",[],[("reference-type","ref+page"),("reference","fig:1")]) [Str "[fig:1]"] ("#fig:1","")]] +[ Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:1" ) + ] + ) + [ Str "[fig:1]" ] + ( "#fig:1" , "" ) + ] +] ``` ``` % pandoc -f latex -t native +\autoref{fig:flowchart} +^D +[ Para + [ Link + ( "" + , [] + , [ ( "reference-type" , "ref+label" ) + , ( "reference" , "fig:flowchart" ) + ] + ) + [ Str "[fig:flowchart]" ] + ( "#fig:flowchart" , "" ) + ] +] +``` + +``` +% pandoc -f latex -t native Accuracy~\eqref{eq:Accuracy} is the proportion, measuring true results among all results. \begin{equation} @@ -28,8 +85,42 @@ Accuracy = \frac{t_p + t_n}{t_p + f_p + f_n + t_n} \end{equation} ^D -[Para [Str "Accuracy\160",Link ("",[],[("reference-type","eqref"),("reference","eq:Accuracy")]) [Str "[eq:Accuracy]"] ("#eq:Accuracy",""),Space,Str "is",Space,Str "the",Space,Str "proportion,",Space,Str "measuring",Space,Str "true",Space,Str "results",Space,Str "among",Space,Str "all",Space,Str "results."] -,Para [Math DisplayMath "\\label{eq:Accuracy}\n Accuracy = \\frac{t_p + t_n}{t_p + f_p + f_n + t_n}"]] +[ Para + [ Str "Accuracy\160" + , Link + ( "" + , [] + , [ ( "reference-type" , "eqref" ) + , ( "reference" , "eq:Accuracy" ) + ] + ) + [ Str "[eq:Accuracy]" ] + ( "#eq:Accuracy" , "" ) + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "proportion," + , Space + , Str "measuring" + , Space + , Str "true" + , Space + , Str "results" + , Space + , Str "among" + , Space + , Str "all" + , Space + , Str "results." + ] +, Para + [ Math + DisplayMath + "\\begin{equation}\n \\label{eq:Accuracy}\n Accuracy = \\frac{t_p + t_n}{t_p + f_p + f_n + t_n}\n\\end{equation}" + ] +] ``` ``` @@ -42,13 +133,177 @@ Figure \ref{fig:Logo} illustrated the SVG logo ^D -[Para [Image ("",[],[]) [Str "Logo",Span ("",[],[("label","fig:Logo")]) []] ("command/SVG_logo.svg","fig:")] -,Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:Logo")]) [Str "[fig:Logo]"] ("#fig:Logo",""),Space,Str "illustrated",Space,Str "the",Space,Str "SVG",Space,Str "logo"]] +[ Figure + ( "fig:Logo" , [] , [] ) + (Caption Nothing [ Plain [ Str "Logo" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [] ( "command/SVG_logo.svg" , "" ) + ] + ] +, Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:Logo" ) + ] + ) + [ Str "1" ] + ( "#fig:Logo" , "" ) + , Space + , Str "illustrated" + , Space + , Str "the" + , Space + , Str "SVG" + , Space + , Str "logo" + ] +] ``` ``` % pandoc -f latex -t native +\chapter{One} +\begin{figure} + \includegraphics{command/SVG_logo.svg} + \caption{Logo} + \label{fig:Logo} +\end{figure} + +\begin{figure} + \includegraphics{command/SVG_logo2.svg} + \caption{Logo2} + \label{fig:Logo2} +\end{figure} + +\chapter{Two} + +\section{Subone} + +\begin{figure} + \includegraphics{command/SVG_logo3.svg} + \caption{Logo3} + \label{fig:Logo3} +\end{figure} + +Figure \ref{fig:Logo} illustrated the SVG logo + +Figure \ref{fig:Logo2} illustrated the SVG logo + +Figure \ref{fig:Logo3} illustrated the SVG logo +^D +[ Header 1 ( "one" , [] , [] ) [ Str "One" ] +, Figure + ( "fig:Logo" , [] , [] ) + (Caption Nothing [ Plain [ Str "Logo" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [] ( "command/SVG_logo.svg" , "" ) + ] + ] +, Figure + ( "fig:Logo2" , [] , [] ) + (Caption Nothing [ Plain [ Str "Logo2" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [] ( "command/SVG_logo2.svg" , "" ) + ] + ] +, Header 1 ( "two" , [] , [] ) [ Str "Two" ] +, Header 2 ( "subone" , [] , [] ) [ Str "Subone" ] +, Figure + ( "fig:Logo3" , [] , [] ) + (Caption Nothing [ Plain [ Str "Logo3" ] ]) + [ Plain + [ Image ( "" , [] , [] ) [] ( "command/SVG_logo3.svg" , "" ) + ] + ] +, Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:Logo" ) + ] + ) + [ Str "1.1" ] + ( "#fig:Logo" , "" ) + , Space + , Str "illustrated" + , Space + , Str "the" + , Space + , Str "SVG" + , Space + , Str "logo" + ] +, Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:Logo2" ) + ] + ) + [ Str "1.2" ] + ( "#fig:Logo2" , "" ) + , Space + , Str "illustrated" + , Space + , Str "the" + , Space + , Str "SVG" + , Space + , Str "logo" + ] +, Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:Logo3" ) + ] + ) + [ Str "2.1" ] + ( "#fig:Logo3" , "" ) + , Space + , Str "illustrated" + , Space + , Str "the" + , Space + , Str "SVG" + , Space + , Str "logo" + ] +] +``` + + +``` +% pandoc -f latex -t native \label{section} Section \ref{section} ^D -[Para [Span ("section",[],[("label","section")]) [Str "[section]"],Space,Str "Section",Space,Link ("",[],[("reference-type","ref"),("reference","section")]) [Str "[section]"] ("#section","")]] +[ Para + [ Span ( "section" , [] , [ ( "label" , "section" ) ] ) [] + , Space + , Str "Section" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "section" ) + ] + ) + [ Str "[section]" ] + ( "#section" , "" ) + ] +] ``` diff --git a/test/command/reset-citation-positions.md b/test/command/reset-citation-positions.md new file mode 100644 --- /dev/null +++ b/test/command/reset-citation-positions.md @@ -0,0 +1,41 @@ +``` +% pandoc --citeproc -t plain --csl command/chicago-fullnote-bibliography.csl +--- +suppress-bibliography: true +references: +- id: foo + name: John doe + title: A Book + type: book + publisher: Oxford University Press + issued: 2010 +... + +# Chapter one + +Blah [@foo, p. 7]. + +Blah [@foo, p. 8]. + +# Chapter two {.reset-citation-positions} + +Blah [@foo, p. 57]. +^D +Chapter one + +Blah.[1] + +Blah.[2] + +Chapter two + +Blah.[3] + +[1] A Book (Oxford University Press, 2010), 7. + +[2] A Book, 8. + +[3] A Book (Oxford University Press, 2010), 57. + +``` + diff --git a/test/command/rst-writer-gridtable-if-rowspans.md b/test/command/rst-writer-gridtable-if-rowspans.md new file mode 100644 --- /dev/null +++ b/test/command/rst-writer-gridtable-if-rowspans.md @@ -0,0 +1,246 @@ +``` +% pandoc -f native -t rst +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] [] + ] + (TableFoot ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + ] + ]) +] +^D ++---+---+---+ +| 1 | 2 | 3 | ++---+ +---+ +| 1 | | 3 | ++---+---+---+ +| 1 | 2 | 3 | ++---+---+---+ + ++---+---+---+ +| 1 | 2 | 3 | ++---+ +---+ +| 1 | | 3 | ++===+===+===+ +| 1 | 2 | 3 | ++---+---+---+ + ++===+===+===+ +| 1 | 2 | 3 | ++---+ +---+ +| 1 | | 3 | ++---+---+---+ +| 1 | 2 | 3 | ++===+===+===+ +``` diff --git a/test/command/rst_block_subst.md b/test/command/rst_block_subst.md new file mode 100644 --- /dev/null +++ b/test/command/rst_block_subst.md @@ -0,0 +1,18 @@ +``` +% pandoc -f rst -t native +|figure05| + +.. |figure05| figure:: img/dummy.png + + capt +^D +[ Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "capt" ] ]) + [ Plain + [ Image + ( "" , [] , [] ) [ Str "capt" ] ( "img/dummy.png" , "" ) + ] + ] +] +``` diff --git a/test/command/sage-harvard.csl b/test/command/sage-harvard.csl new file mode 100644 --- /dev/null +++ b/test/command/sage-harvard.csl @@ -0,0 +1,202 @@ + + diff --git a/test/command/science.csl b/test/command/science.csl new file mode 100644 --- /dev/null +++ b/test/command/science.csl @@ -0,0 +1,245 @@ + + diff --git a/test/command/section-divs.md b/test/command/section-divs.md new file mode 100644 --- /dev/null +++ b/test/command/section-divs.md @@ -0,0 +1,25 @@ +``` +% pandoc --section-divs +::: {#hi .section .level1} +# Hi + +::: {#there .section .level2} +## there +::: +::: + +::: {#ok .section .level1} +Ok +== +::: +^D +
    +

    Hi

    +
    +

    there

    +
    +
    +
    +

    Ok

    +
    +``` diff --git a/test/command/setext-fenced-div.md b/test/command/setext-fenced-div.md new file mode 100644 --- /dev/null +++ b/test/command/setext-fenced-div.md @@ -0,0 +1,8 @@ +``` +% pandoc -t native +::: {.cell} +--- +::: +^D +[ Div ( "" , [ "cell" ] , [] ) [ HorizontalRule ] ] +``` diff --git a/test/command/shift-heading-level-by.md b/test/command/shift-heading-level-by.md new file mode 100644 --- /dev/null +++ b/test/command/shift-heading-level-by.md @@ -0,0 +1,59 @@ +``` +% pandoc --shift-heading-level-by 1 -t native -s +--- +title: My title +... + +# First heading + +## Second +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "title" + , MetaInlines [ Str "My" , Space , Str "title" ] + ) + ] + } + [ Header + 2 + ( "first-heading" , [] , [] ) + [ Str "First" , Space , Str "heading" ] + , Header 3 ( "second" , [] , [] ) [ Str "Second" ] + ] +``` + +``` +% pandoc --shift-heading-level-by -1 -t native -s +--- +title: Old title +... + +# First heading + +## Second + +# Another top-level heading +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "title" + , MetaInlines [ Str "First" , Space , Str "heading" ] + ) + ] + } + [ Header 1 ( "second" , [] , [] ) [ Str "Second" ] + , Para + [ Str "Another" + , Space + , Str "top-level" + , Space + , Str "heading" + ] + ] +``` + diff --git a/test/command/short-caption.md b/test/command/short-caption.md new file mode 100644 --- /dev/null +++ b/test/command/short-caption.md @@ -0,0 +1,42 @@ +``` +% pandoc -f latex -t native +\begin{table} +\caption[short caption]{long caption} +\begin{tabular}{ll} +hi & hi \\ +\end{tabular} +\end{table} +^D +[ Table + ( "" , [] , [] ) + (Caption + (Just [ Str "short" , Space , Str "caption" ]) + [ Plain [ Str "long" , Space , Str "caption" ] ]) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "hi" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "hi" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` diff --git a/test/command/sloppypar.md b/test/command/sloppypar.md new file mode 100644 --- /dev/null +++ b/test/command/sloppypar.md @@ -0,0 +1,229 @@ +``` +% pandoc -f latex+raw_tex -t native +\begin{sloppypar} +Sequi id qui facere et incidunt ut. Et fuga ut voluptate enim qui. Odit unde magni ipsam dicta modi. Modi soluta velit est aut aut possimus. + +Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio consectetur alias non sed. Quo consectetur libero omnis quos eius ad vel. +\end{sloppypar} +^D +[ Para + [ Str "Sequi" + , Space + , Str "id" + , Space + , Str "qui" + , Space + , Str "facere" + , Space + , Str "et" + , Space + , Str "incidunt" + , Space + , Str "ut." + , Space + , Str "Et" + , Space + , Str "fuga" + , Space + , Str "ut" + , Space + , Str "voluptate" + , Space + , Str "enim" + , Space + , Str "qui." + , Space + , Str "Odit" + , Space + , Str "unde" + , Space + , Str "magni" + , Space + , Str "ipsam" + , Space + , Str "dicta" + , Space + , Str "modi." + , Space + , Str "Modi" + , Space + , Str "soluta" + , Space + , Str "velit" + , Space + , Str "est" + , Space + , Str "aut" + , Space + , Str "aut" + , Space + , Str "possimus." + ] +, Para + [ Str "Qui" + , Space + , Str "et" + , Space + , Str "temporibus" + , Space + , Str "explicabo." + , Space + , Str "Esse" + , Space + , Str "ab" + , Space + , Str "ut" + , Space + , Str "quidem." + , Space + , Str "Vel" + , Space + , Str "qui" + , Space + , Str "perspiciatis" + , Space + , Str "quae" + , Space + , Str "odio" + , Space + , Str "consectetur" + , Space + , Str "alias" + , Space + , Str "non" + , Space + , Str "sed." + , Space + , Str "Quo" + , Space + , Str "consectetur" + , Space + , Str "libero" + , Space + , Str "omnis" + , Space + , Str "quos" + , Space + , Str "eius" + , Space + , Str "ad" + , Space + , Str "vel." + ] +] +``` + +``` +% pandoc -f latex -t native +\begin{sloppypar} +Sequi id qui facere et incidunt ut. Et fuga ut voluptate enim qui. Odit unde magni ipsam dicta modi. Modi soluta velit est aut aut possimus. + +Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio consectetur alias non sed. Quo consectetur libero omnis quos eius ad vel. +\end{sloppypar} +^D +[ Para + [ Str "Sequi" + , Space + , Str "id" + , Space + , Str "qui" + , Space + , Str "facere" + , Space + , Str "et" + , Space + , Str "incidunt" + , Space + , Str "ut." + , Space + , Str "Et" + , Space + , Str "fuga" + , Space + , Str "ut" + , Space + , Str "voluptate" + , Space + , Str "enim" + , Space + , Str "qui." + , Space + , Str "Odit" + , Space + , Str "unde" + , Space + , Str "magni" + , Space + , Str "ipsam" + , Space + , Str "dicta" + , Space + , Str "modi." + , Space + , Str "Modi" + , Space + , Str "soluta" + , Space + , Str "velit" + , Space + , Str "est" + , Space + , Str "aut" + , Space + , Str "aut" + , Space + , Str "possimus." + ] +, Para + [ Str "Qui" + , Space + , Str "et" + , Space + , Str "temporibus" + , Space + , Str "explicabo." + , Space + , Str "Esse" + , Space + , Str "ab" + , Space + , Str "ut" + , Space + , Str "quidem." + , Space + , Str "Vel" + , Space + , Str "qui" + , Space + , Str "perspiciatis" + , Space + , Str "quae" + , Space + , Str "odio" + , Space + , Str "consectetur" + , Space + , Str "alias" + , Space + , Str "non" + , Space + , Str "sed." + , Space + , Str "Quo" + , Space + , Str "consectetur" + , Space + , Str "libero" + , Space + , Str "omnis" + , Space + , Str "quos" + , Space + , Str "eius" + , Space + , Str "ad" + , Space + , Str "vel." + ] +] +``` diff --git a/test/command/style399.csl b/test/command/style399.csl new file mode 100644 --- /dev/null +++ b/test/command/style399.csl @@ -0,0 +1,12 @@ + + + diff --git a/test/command/svg.md b/test/command/svg.md --- a/test/command/svg.md +++ b/test/command/svg.md @@ -2,7 +2,7 @@ % pandoc -f latex -t icml \includegraphics{command/corrupt.svg} ^D -[WARNING] Could not determine image size for 'command/corrupt.svg': could not determine image type +2> [WARNING] Could not determine image size for command/corrupt.svg: could not determine image type @@ -23,6 +23,7 @@ $ID/Embedded + @@ -35,27 +36,27 @@ % pandoc -f latex -t icml \includegraphics{command/SVG_logo.svg} ^D -[WARNING] Could not determine image size for 'command/SVG_logo.svg': could not determine SVG size - + - - - - + + + + - + $ID/Embedded + @@ -68,27 +69,27 @@ % pandoc -f latex -t icml \includegraphics{command/SVG_logo-without-xml-declaration.svg} ^D -[WARNING] Could not determine image size for 'command/SVG_logo-without-xml-declaration.svg': could not determine SVG size - + - - - - + + + + - + $ID/Embedded + @@ -122,6 +123,7 @@ $ID/Embedded + diff --git a/test/command/table-with-cell-align.md b/test/command/table-with-cell-align.md new file mode 100644 --- /dev/null +++ b/test/command/table-with-cell-align.md @@ -0,0 +1,105 @@ +``` +% pandoc -f docbook -t native --quiet + + + + +1 +2 +3 +4 + + + + +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignRight + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "4" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` +``` +% pandoc -f native -t opendocument --quiet +[Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1) + [Para [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "4"]]]])] + (TableFoot ("",[],[]) + [])] +^D + + + + + + + + 1 + + + 2 + + + 3 + + + 4 + + + +``` diff --git a/test/command/table-with-column-span.md b/test/command/table-with-column-span.md new file mode 100644 --- /dev/null +++ b/test/command/table-with-column-span.md @@ -0,0 +1,385 @@ +``` +% pandoc -f docbook -t native --quiet + + + + + + + + + + + + + + + + + + + + +Octet no. 1 +Octet no. 2 + + +16 +15 +14 +13 +12 +11 +10 +9 +8 +7 +6 +5 +4 +3 +2 +1 + + +Code A +Code B + + + + +^D +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + , ( AlignDefault , ColWidth 6.25e-2 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 8) + [ Para + [ Strong + [ Str "Octet" + , Space + , Str "no." + , Space + , Str "1" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 8) + [ Para + [ Strong + [ Str "Octet" + , Space + , Str "no." + , Space + , Str "2" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "16" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "15" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "14" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "13" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "11" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "10" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "9" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "8" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "1" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 8) + [ Para [ Str "Code" , Space , Str "A" ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 8) + [ Para [ Str "Code" , Space , Str "B" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` +``` +% pandoc -f native -t opendocument --quiet +[Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2) + ,(AlignDefault,ColWidth 6.25e-2)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8) + [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "1"]]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8) + [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "2"]]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "16"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "15"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "14"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "13"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "11"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "10"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "9"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "8"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "7"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "6"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "1"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8) + [Para [Str "Code",Space,Str "A"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8) + [Para [Str "Code",Space,Str "B"]]]])] + (TableFoot ("",[],[]) + [])] +^D + + + + + + + + + + + + + + + + + + + + Octet + no. 1 + + + Octet + no. 2 + + + + + 16 + + + 15 + + + 14 + + + 13 + + + 12 + + + 11 + + + 10 + + + 9 + + + 8 + + + 7 + + + 6 + + + 5 + + + 4 + + + 3 + + + 2 + + + 1 + + + + + Code A + + + Code B + + + +``` diff --git a/test/command/tabularx.md b/test/command/tabularx.md --- a/test/command/tabularx.md +++ b/test/command/tabularx.md @@ -6,33 +6,143 @@ & Column Heading 2 & Column Heading 3 \\ \hline - Cell 1.1 + Cell 1.1 & Cell 1.2 & Cell 1.3 \\ \hline - Cell 2.1 + Cell 2.1 & Cell 2.2 & Cell 2.3 \\ \hline - Cell 3.1 + Cell 3.1 & Cell 3.2 & Cell 3.3 \\ \hline \end{tabularx} ^D -[Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0] - [[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]] - ,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]] - [[[Plain [Str "Cell",Space,Str "1.1"]] - ,[Plain [Str "Cell",Space,Str "1.2"]] - ,[Plain [Str "Cell",Space,Str "1.3"]]] - ,[[Plain [Str "Cell",Space,Str "2.1"]] - ,[Plain [Str "Cell",Space,Str "2.2"]] - ,[Plain [Str "Cell",Space,Str "2.3"]]] - ,[[Plain [Str "Cell",Space,Str "3.1"]] - ,[Plain [Str "Cell",Space,Str "3.2"]] - ,[Plain [Str "Cell",Space,Str "3.3"]]]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Column" + , Space + , Str "Heading" + , Space + , Str "1" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Column" + , Space + , Str "Heading" + , Space + , Str "2" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Column" + , Space + , Str "Heading" + , Space + , Str "3" + ] + ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1.1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1.2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1.3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2.1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2.2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2.3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3.1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3.2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3.3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] ``` ``` @@ -43,33 +153,143 @@ & Column Heading 2 & Column Heading 3 \\ \hline - Cell 1.1 + Cell 1.1 & Cell 1.2 & Cell 1.3 \\ \hline - Cell 2.1 + Cell 2.1 & Cell 2.2 & Cell 2.3 \\ \hline - Cell 3.1 + Cell 3.1 & Cell 3.2 & Cell 3.3 \\ \hline \end{tabularx} ^D -[Table [] [AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.25] - [[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]] - ,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]] - [[[Plain [Str "Cell",Space,Str "1.1"]] - ,[Plain [Str "Cell",Space,Str "1.2"]] - ,[Plain [Str "Cell",Space,Str "1.3"]]] - ,[[Plain [Str "Cell",Space,Str "2.1"]] - ,[Plain [Str "Cell",Space,Str "2.2"]] - ,[Plain [Str "Cell",Space,Str "2.3"]]] - ,[[Plain [Str "Cell",Space,Str "3.1"]] - ,[Plain [Str "Cell",Space,Str "3.2"]] - ,[Plain [Str "Cell",Space,Str "3.3"]]]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignLeft , ColWidth 0.25 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Column" + , Space + , Str "Heading" + , Space + , Str "1" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Column" + , Space + , Str "Heading" + , Space + , Str "2" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Column" + , Space + , Str "Heading" + , Space + , Str "3" + ] + ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1.1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1.2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1.3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2.1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2.2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2.3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3.1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3.2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3.3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] ``` ``` @@ -80,31 +300,141 @@ & Column Heading 2 & Column Heading 3 \\ \hline - Cell 1.1 + Cell 1.1 & Cell 1.2 & Cell 1.3 \\ \hline - Cell 2.1 + Cell 2.1 & Cell 2.2 & Cell 2.3 \\ \hline - Cell 3.1 + Cell 3.1 & Cell 3.2 & Cell 3.3 \\ \hline \end{tabularx} ^D -[Table [] [AlignLeft,AlignCenter,AlignLeft] [0.25,0.0,0.25] - [[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]] - ,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]] - [[[Plain [Str "Cell",Space,Str "1.1"]] - ,[Plain [Str "Cell",Space,Str "1.2"]] - ,[Plain [Str "Cell",Space,Str "1.3"]]] - ,[[Plain [Str "Cell",Space,Str "2.1"]] - ,[Plain [Str "Cell",Space,Str "2.2"]] - ,[Plain [Str "Cell",Space,Str "2.3"]]] - ,[[Plain [Str "Cell",Space,Str "3.1"]] - ,[Plain [Str "Cell",Space,Str "3.2"]] - ,[Plain [Str "Cell",Space,Str "3.3"]]]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidth 0.25 ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignLeft , ColWidth 0.25 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Column" + , Space + , Str "Heading" + , Space + , Str "1" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Column" + , Space + , Str "Heading" + , Space + , Str "2" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Column" + , Space + , Str "Heading" + , Space + , Str "3" + ] + ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1.1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1.2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1.3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2.1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2.2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2.3" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3.1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3.2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3.3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] ``` diff --git a/test/command/tasklist.md b/test/command/tasklist.md new file mode 100644 --- /dev/null +++ b/test/command/tasklist.md @@ -0,0 +1,105 @@ +tests adapted from + +``` +% pandoc +- [ ] foo +- [x] bar +^D +
      +
      • +
      • +
    +``` + + +``` +% pandoc +- [x] foo + - [ ] bar + - [x] baz +- [ ] bim +^D +
      +
    • +
        +
        • +
        • +
      • +
      • +
    +``` + + +custom html task list test: + +``` +% pandoc +- [ ] unchecked +- plain item +- [x] checked + +paragraph + +1. [ ] ordered unchecked +2. [] plain item +3. [x] ordered checked + +paragraph + +- [ ] list item with a + + second paragraph + +- [x] checked +^D +
      +
      • +
    • plain item
      • +
      • +
    +

    paragraph

    +
      +
      2. +
    2. [] plain item
      3. +
      4. +
    +

    paragraph

    +
      +

    • +

      second paragraph

      • +

      • +
    +``` + +latex task list test: + +``` +% pandoc -t latex +- [ ] foo bar + + baz + +- [x] ok +^D +\begin{itemize} +\item[$\square$] + foo bar + + baz +\item[$\boxtimes$] + ok +\end{itemize} +``` + +round trip: + +``` +% pandoc -f markdown -t markdown +- [ ] foo +- [x] bar +^D +- [ ] foo +- [x] bar +``` diff --git a/test/command/tex-group.md b/test/command/tex-group.md new file mode 100644 --- /dev/null +++ b/test/command/tex-group.md @@ -0,0 +1,12 @@ +``` +% pandoc -f latex -t html +\newenvironment{foo}% +{\emph\bgroup}% +{\egroup} + +\begin{foo} +hi +\end{foo} +^D +

    hi

    +``` diff --git a/test/command/three.txt b/test/command/three.txt new file mode 100644 --- /dev/null +++ b/test/command/three.txt @@ -0,0 +1,3 @@ +1st line. +2nd line. +3rd line. diff --git a/test/command/toc.md b/test/command/toc.md new file mode 100644 --- /dev/null +++ b/test/command/toc.md @@ -0,0 +1,47 @@ +``` +% pandoc -s --toc -t markdown +# A +## b +# B +## b + +::: interior +# C +## cc +# D +::: + +::: blue +# E +## e +::: +^D +- [A](#a){#toc-a} + - [b](#b){#toc-b} +- [B](#b-1){#toc-b-1} + - [b](#b-2){#toc-b-2} +- [E](#e){#toc-e} + - [e](#e-1){#toc-e-1} + +# A + +## b + +# B + +## b + +::: interior +# C + +## cc + +# D +::: + +::: blue +# E + +## e +::: +``` diff --git a/test/command/translations.md b/test/command/translations.md --- a/test/command/translations.md +++ b/test/command/translations.md @@ -2,14 +2,14 @@ % pandoc -f latex -t native -M lang=en \figurename\ 2 ^D -[Para [Str "Figure\160\&2"]] +[ Para [ Str "Figure\160\&2" ] ] ``` ``` % pandoc -f latex -t native -M lang=de-DE \figurename\ 2 ^D -[Para [Str "Abbildung\160\&2"]] +[ Para [ Str "Abbildung\160\&2" ] ] ``` ``` @@ -17,13 +17,13 @@ \setmainlanguage{german} \figurename 2 ^D -[Para [Str "Abbildung2"]] +[ Para [ Str "Abbildung2" ] ] ``` ``` -% pandoc -f latex -t native -M lang=sr +% pandoc -f latex -t native -M lang=sr-Latn \figurename~2 \figurename. ^D -[Para [Str "Slika\160\&2",SoftBreak,Str "Slika."]] +[ Para [ Str "Slika\160\&2" , SoftBreak , Str "Slika." ] ] ``` diff --git a/test/command/typst-hs-80.md b/test/command/typst-hs-80.md new file mode 100644 --- /dev/null +++ b/test/command/typst-hs-80.md @@ -0,0 +1,55 @@ +``` +% pandoc -f typst -t native -s +#set document( + title: [My Title], +) + +#title() +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "title" + , MetaInlines [ Str "My" , Space , Str "Title" ] + ) + ] + } + [] +``` + +``` +% pandoc -f typst -t native -s +#set document( + title: [ignored], +) + +#title[My Title] +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "title" + , MetaInlines [ Str "My" , Space , Str "Title" ] + ) + ] + } + [] +``` + +``` +% pandoc -f typst -t native -s +#title[My Title] +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "title" + , MetaInlines [ Str "My" , Space , Str "Title" ] + ) + ] + } + [] +``` diff --git a/test/command/typst-image-alt.md b/test/command/typst-image-alt.md new file mode 100644 --- /dev/null +++ b/test/command/typst-image-alt.md @@ -0,0 +1,78 @@ +``` +% pandoc -f markdown-implicit_figures -t typst +![Alt text from inlines](image.png) +^D +#box(image("image.png", alt: "Alt text from inlines")) +``` + +``` +% pandoc -f markdown-implicit_figures -t typst +![](image.png){alt="Explicit alt attribute"} +^D +#box(image("image.png", alt: "Explicit alt attribute")) +``` + +``` +% pandoc -f markdown-implicit_figures -t typst +![Inlines ignored](image.png){alt="Explicit wins"} +^D +#box(image("image.png", alt: "Explicit wins")) +``` + +``` +% pandoc -f markdown-implicit_figures -t typst +![](image.png) +^D +#box(image("image.png")) +``` + +``` +% pandoc -f markdown-implicit_figures -t typst +![Inlines ignored for decorative](image.png){alt=""} +^D +#box(image("image.png")) +``` + +``` +% pandoc -t typst +![Caption text](image.png){alt="Alt text describing the image"} + +^D +#figure(image("image.png", alt: "Alt text describing the image"), + caption: [ + Caption text + ] +) +``` + +``` +% pandoc -t typst +![Caption only](image.png) + +^D +#figure(image("image.png", alt: "Caption only"), + caption: [ + Caption only + ] +) +``` + +``` +% pandoc -f markdown -t typst +![Caption](test.png){alt="A \"quoted\" phrase and C:\\path\\file"} +^D +#figure(image("test.png", alt: "A \"quoted\" phrase and C:\\path\\file"), + caption: [ + Caption + ] +) + +``` + +``` +% pandoc -f html -t typst +A small red dot +^D +#box(image(bytes((137,80,78,71,13,10,26,10)), alt: "A small red dot")) + +``` diff --git a/test/command/typst-images.md b/test/command/typst-images.md new file mode 100644 --- /dev/null +++ b/test/command/typst-images.md @@ -0,0 +1,32 @@ +``` +% pandoc -t typst +![dot](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAC4jAAAuIwF4pT92AAAASUlEQVQYGa3OWwoAIAgEQNf739k0EjVCfxKCHtMqiEh0jcWjOKBAkQjPe7MFdun/IbRdDNb05nvolzWzEx0DdozK96W1PzjNHxcgphkBs9CoHwAAAABJRU5ErkJggg==){width=1in} +^D +#figure(image(bytes((137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,10,0,0,0,10,8,6,0,0,0,141,50,207,189,0,0,0,9,112,72,89,115,0,0,46,35,0,0,46,35,1,120,165,63,118,0,0,0,73,73,68,65,84,24,25,173,206,91,10,0,32,8,4,64,215,251,223,217,52,18,53,66,127,18,130,30,211,42,136,72,116,141,197,163,56,160,64,145,8,207,123,179,5,118,233,255,33,180,93,12,214,244,230,123,232,151,53,179,19,29,3,118,140,202,247,165,181,63,56,205,31,23,32,166,25,1,179,208,168,31,0,0,0,0,73,69,78,68,174,66,96,130)), width: 1in, alt: "dot"), + caption: [ + dot + ] +) +``` + +``` +% pandoc -t typst +![dot](dot.png){width="1in"} +^D +#figure(image("dot.png", width: 1in, alt: "dot"), + caption: [ + dot + ] +) +``` + +``` +% pandoc -t typst +![chicken](data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20100%20100%22%20aria-label%3D%22Chicken%22%3E%20%3Cpath%20d%3D%22M76.5%2033.3l-8.3-6.6%204-5c-1.3-2-1.3-4.7.1-6.6%203.4-3.8%208.7-2%2010.2%202.2%204.5.7%207.5%205.4%204.4%209.4a5.7%205.7%200%2001-6.4%201.6zM73%2026.2l3%202.4%203.8-4.7c1.3%201%203.5%202%204.5.7%202.1-2.9-1.5-5.4-4.7-3.5%201.2-4.6-2.7-6.2-4.5-3.9-.7%202.2.2%203%201.7%204.2z%22%2F%3E%20%3Cpath%20d%3D%22M54%2072.3a19.1%2019.1%200%2001-19.2-17.8%2021.4%2021.4%200%20014.7-15.2c3.5-4.3%208.4-7.1%2013.7-8l3.1-.1c8.2-.9%2012.9-5.5%2013-5.6l1-1%208.2%206.5-1%201.3c-3.3%204-2.8%2011.3-2.5%2014.2a21.5%2021.5%200%2001-4.4%2017.5%2021.2%2021.2%200%2001-16.5%208.2zM70.6%2029a27%2027%200%2001-14%205.5l-3%20.2a18%2018%200%2000-11.3%206.7%2018%2018%200%2000-4%2012.8%2016%2016%200%200015.9%2014.7c5.4%200%2010.4-2.5%2014-6.9A18%2018%200%200072%2049.4c0-.8-.2-1.6-.3-2.2-.5-4-.7-10.7%202.1-15.5z%22%2F%3E%20%3Cpath%20d%3D%22M46%2087C22.6%2087%20.5%2087%20.5%2066.8c0-19%2020.4-34.6%2045.5-34.6%201.2%200%202.5%200%203.7.2%2010.1.6%209.7-.1.5%203.2a18.3%2018.3%200%2000-12%2018.6%2016%2016%200%200015.9%2014.7c5.4%200%2010.4-2.5%2014-6.9A18%2018%200%200072%2049.4c-.6-4-.4-7.4-.2-11.3a35.8%2035.8%200%200119.5%2026A11.7%2011.7%200%200187.8%2087H46zm-2.8-51.3c-22%201-39.4%2014.6-39.4%2031%200%2015.8%2016%2016.9%2042.2%2016.9h41.8c4.6%200%208.4-3.8%208.4-8.4-.4-4.8-3.2-7.7-8.1-8.4-.3-10.4-7.4-18.4-13.3-22.7.1%202%20.5%204.3.7%206.1%200%205-1.6%2010-4.8%2014A21.2%2021.2%200%200154%2072.3a19.1%2019.1%200%2001-19.3-17.8%2021.4%2021.4%200%20018.4-18.8z%22%2F%3E%20%3C%2Fsvg%3E) +^D +#figure(image(bytes(" "), alt: "chicken"), + caption: [ + chicken + ] +) +``` diff --git a/test/command/typst-property-output.md b/test/command/typst-property-output.md new file mode 100644 --- /dev/null +++ b/test/command/typst-property-output.md @@ -0,0 +1,235 @@ +``` +% pandoc -f html -t typst +foo +^D +#text(fill: orange)[foo] +``` + +``` +% pandoc -f html -t typst +foo +^D +foo +``` + +``` +% pandoc -f html -t typst +
    foo
    +^D +#block(inset: 10pt)[ +foo +] +``` + +``` +% pandoc -f html -t typst +
    foo
    +^D +#block[ +#set text(fill: purple); +foo +] +``` + +``` +% pandoc -f html -t typst +
    foo
    +^D +#block[ +foo +] +``` + +``` +% pandoc -f html -t typst + + +
    AB
    +^D +#figure( + align(center)[#table( + columns: 2, + align: (auto,auto,), + fill: blue, + [A], [B], + )] + , kind: table + ) +``` + +``` +% pandoc -f html -t typst + + +
    AB
    +^D +#figure( + align(center)[#set text(fill: orange);#table( + columns: 2, + align: (auto,auto,), + [A], [B], + )] + , kind: table + ) +``` + +``` +% pandoc -f html -t typst + + +
    AB
    +^D +#figure( + align(center)[#table( + columns: 2, + align: (auto,auto,), + [A], table.cell(fill: green)[B], + )] + , kind: table + ) +``` + +``` +% pandoc -f html -t typst + + +
    AB
    +^D +#figure( + align(center)[#table( + columns: 2, + align: (auto,auto,), + [A], [#set text(fill: fuchsia); + B], + )] + , kind: table + ) +``` + +``` +% pandoc -f html -t typst + + +
    AB
    +^D +#figure( + align(center)[#table( + columns: 2, + align: (auto,center,), + [A], table.cell(align: center)[#set text(fill: maroon); + B], + )] + , kind: table + ) +``` + +``` +% pandoc -f html -t typst + + +
    AB
    +^D +#figure( + align(center)[#table( + columns: 2, + align: (auto,center,), + [A], table.cell(align: horizon + center)[B], + )] + , kind: table + ) +``` + + +``` +% pandoc -f html -t typst + + +
    AB
    +^D +#figure( + align(center)[#table( + columns: 2, + align: (auto,auto,), + [A], [B], + )] + , kind: table + ) +``` + +``` +% pandoc -f html -t typst +

    Paragraph before.

    + + + + + + + +
    ABC
    + +

    Paragraph after.

    +^D +Paragraph before. + +#{set text(size: 3em);table( + columns: 3, + align: (auto,auto,auto,), + [A], [B], [C], +)} +Paragraph after. +``` + + +``` +% pandoc -f html -t typst +

    Paragraph before.

    + + + + + + + +
    ABC
    + +

    Paragraph after.

    +^D +Paragraph before. + +#figure( + align(center)[#set text(size: 3em);#table( + columns: 3, + align: (auto,auto,auto,), + [A], [B], [C], + )] + , kind: table + ) + +Paragraph after. +``` + + +``` +% pandoc -f html -t typst +

    Paragraph before.

    + + + + + + + +
    ABC
    + +

    Paragraph after.

    +^D +Paragraph before. + +#table( + columns: 3, + align: (auto,auto,auto,), + [A], [B], [C], +) +Paragraph after. +``` diff --git a/test/command/unicode-collation.md b/test/command/unicode-collation.md new file mode 100644 --- /dev/null +++ b/test/command/unicode-collation.md @@ -0,0 +1,130 @@ +``` +% pandoc --citeproc -t plain +--- +lang: en-US +csl: command/apa.csl +references: +- id: a1 + type: book + author: + - family: Ubina + given: A. John + issued: 1985 +- id: a2 + type: book + author: + - family: Über + given: Aglaia + issued: 1996 +- id: a3 + type: book + author: + - family: Oñate + given: José + issued: 1985 +- id: a4 + type: book + author: + - family: Onush + given: Frank + issued: 2002 +- id: a5 + type: book + author: + - family: O'Neil + given: Timothy + issued: 2010 +--- + +[@a1;@a2;@a3;@a4;@a5] +^D +(O’Neil, 2010; Oñate, 1985; Onush, 2002; Über, 1996; Ubina, 1985) + +O’Neil, T. (2010). + +Oñate, J. (1985). + +Onush, F. (2002). + +Über, A. (1996). + +Ubina, A. J. (1985). +``` + +``` +% pandoc --citeproc -t plain +--- +lang: es +csl: command/apa.csl +references: +- id: a1 + type: book + author: + - family: Ubina + given: A. John + issued: 1985 +- id: a2 + type: book + author: + - family: Über + given: Aglaia + issued: 1996 +- id: a3 + type: book + author: + - family: Oñate + given: José + issued: 1985 +- id: a4 + type: book + author: + - family: Onush + given: Frank + issued: 2002 +- id: a5 + type: book + author: + - family: O'Neil + given: Timothy + issued: 2010 +--- + +[@a1;@a2;@a3;@a4;@a5] +^D +(O’Neil, 2010; Onush, 2002; Oñate, 1985; Über, 1996; Ubina, 1985) + +O’Neil, T. (2010). + +Onush, F. (2002). + +Oñate, J. (1985). + +Über, A. (1996). + +Ubina, A. J. (1985). +``` + +``` +% pandoc -C -t plain +--- +nocite: '@*' +lang: fr-FR-u-kb-true +references: +- id: cote + author: cote +- id: côte + author: côte +- id: coté + author: coté +- id: côté + author: côté +... +^D +cote. s. d. + +côte. s. d. + +coté. s. d. + +côté. s. d. +``` diff --git a/test/command/vancouver.csl b/test/command/vancouver.csl new file mode 100644 --- /dev/null +++ b/test/command/vancouver.csl @@ -0,0 +1,351 @@ + + diff --git a/test/command/video-audio.md b/test/command/video-audio.md new file mode 100644 --- /dev/null +++ b/test/command/video-audio.md @@ -0,0 +1,23 @@ +``` +% pandoc -f markdown-implicit_figures -t html +![](./test.mp4) + +![Your browser does not support video.](foo/test.webm){width=300} + +![](test.mp3) + +![](./test.pdf) + +![](./test.jpg) +^D +

    +

    +

    +

    +

    +``` + diff --git a/test/command/wikilinks_title_after_pipe.md b/test/command/wikilinks_title_after_pipe.md new file mode 100644 --- /dev/null +++ b/test/command/wikilinks_title_after_pipe.md @@ -0,0 +1,73 @@ +# CommonMark + +## Reader +``` +% pandoc --from commonmark_x+wikilinks_title_after_pipe -t html --columns 90 +[[https://example.org]] + +[[https://example.org|title]] + +[[name of page]] + +[[name of page|title]] +^D +

    https://example.org

    +

    title

    +

    name of page

    +

    title

    +``` + +## Writer + +``` +% pandoc -t commonmark_x+wikilinks_title_after_pipe -f html +

    https://example.org

    +

    title

    +

    Home

    +

    Title

    +^D +[[https://example.org]] + +[[https://example.org|title]] + +[[Home]] + +[[Name%20of%20page|Title]] +``` + +# Markdown +## Reader + +``` +% pandoc --from markdown+wikilinks_title_after_pipe -t html --columns 90 +[[https://example.org]] + +[[https://example.org|title]] + +[[name of page]] + +[[name of page|title]] +^D +

    https://example.org

    +

    title

    +

    name of page

    +

    title

    +``` + +## Writer + +``` +% pandoc -t markdown+wikilinks_title_after_pipe -f html +

    https://example.org

    +

    title

    +

    Home

    +

    Title

    +^D +[[https://example.org]] + +[[https://example.org|title]] + +[[Home]] + +[[Name%20of%20page|Title]] +``` diff --git a/test/command/wikilinks_title_before_pipe.md b/test/command/wikilinks_title_before_pipe.md new file mode 100644 --- /dev/null +++ b/test/command/wikilinks_title_before_pipe.md @@ -0,0 +1,84 @@ +# CommonMark + +## Reader + +``` +% pandoc -f commonmark+wikilinks_title_before_pipe -t html --columns 90 +[[https://example.org]] + +[[title|https://example.org]] + +[[Name of page]] + +[[Title|Name of page]] +^D +

    https://example.org

    +

    title

    +

    Name of page

    +

    Title

    +``` + +## Writer + +``` +% pandoc -t commonmark_x+wikilinks_title_before_pipe -f html +

    https://example.org

    +

    title

    +

    Home

    +

    Title

    +^D +[[https://example.org]] + +[[title|https://example.org]] + +[[Home]] + +[[Title|Name%20of%20page]] +``` + +## Regular links should still work + +``` +% pandoc -f commonmark+wikilinks_title_before_pipe -t html +[Title](Name%20of%20page) +^D +

    Title

    +``` + +# Markdown + +## Reader + +``` +% pandoc -f markdown+wikilinks_title_before_pipe -t html --columns 90 +[[https://example.org]] + +[[title|https://example.org]] + +[[Name of page]] + +[[Title|Name of page]] +^D +

    https://example.org

    +

    title

    +

    Name of page

    +

    Title

    +``` + +## Writer + +``` +% pandoc -t markdown+wikilinks_title_before_pipe -f html +

    https://example.org

    +

    title

    +

    Home

    +

    Title

    +^D +[[https://example.org]] + +[[title|https://example.org]] + +[[Home]] + +[[Title|Name%20of%20page]] +``` diff --git a/test/command/write18.md b/test/command/write18.md --- a/test/command/write18.md +++ b/test/command/write18.md @@ -3,12 +3,12 @@ % pandoc -t native \write18{git --version} ^D -[RawBlock (Format "latex") "\\write18{git --version}"] +[ RawBlock (Format "tex") "\\write18{git --version}" ] ``` ``` % pandoc -f latex+raw_tex -t native \write18{git --version} ^D -[RawBlock (Format "latex") "\\write18{git --version}"] +[ RawBlock (Format "latex") "\\write18{git --version}" ] ``` diff --git a/test/command/yaml-metadata-blocks.md b/test/command/yaml-metadata-blocks.md new file mode 100644 --- /dev/null +++ b/test/command/yaml-metadata-blocks.md @@ -0,0 +1,121 @@ +``` +% pandoc -s -t native +--- +foobar_: this should be ignored +foo: + bar_: as should this +--- +^D +Pandoc + Meta + { unMeta = fromList [ ( "foo" , MetaMap (fromList []) ) ] } + [] +``` +``` +% pandoc -s -t native +--- +# For precedence, see multiple-metadata-blocks.md and vars-and-metadata.md +# For Bools, see also 4819.md +# For Multiline strings, see yaml-with-chomp.md +int: 7 +float: 1.5 +scientific: 3.7e-5 +bool: true +more: False +nothing: null +empty: [] +nested: + int: 8 + float: 2.5 + bool: true + more: False + nothing: null + empty: [] + scientific: 3.7e-5 +--- +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "bool" , MetaBool True ) + , ( "empty" , MetaList [] ) + , ( "float" , MetaInlines [ Str "1.5" ] ) + , ( "int" , MetaInlines [ Str "7" ] ) + , ( "more" , MetaBool False ) + , ( "nested" + , MetaMap + (fromList + [ ( "bool" , MetaBool True ) + , ( "empty" , MetaList [] ) + , ( "float" , MetaInlines [ Str "2.5" ] ) + , ( "int" , MetaInlines [ Str "8" ] ) + , ( "more" , MetaBool False ) + , ( "nothing" , MetaString "" ) + , ( "scientific" , MetaInlines [ Str "3.7e-5" ] ) + ]) + ) + , ( "nothing" , MetaString "" ) + , ( "scientific" , MetaInlines [ Str "3.7e-5" ] ) + ] + } + [] +``` +``` +% pandoc -s -t native +--- +array: + - foo: bar + - bool: True +--- +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "array" + , MetaList + [ MetaMap + (fromList [ ( "foo" , MetaInlines [ Str "bar" ] ) ]) + , MetaMap (fromList [ ( "bool" , MetaBool True ) ]) + ] + ) + ] + } + [] +``` +``` +% pandoc -s -t native --metadata-file command/yaml-metadata.yaml +--- +title: document +--- +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "other" + , MetaInlines + [ Emph [ Str "markdown" ] , Space , Str "value" ] + ) + , ( "title" , MetaInlines [ Str "document" ] ) + ] + } + [] +``` +``` +% pandoc -s -t native --metadata-file command/yaml-metadata.yaml -M title=cmdline +^D +Pandoc + Meta + { unMeta = + fromList + [ ( "other" + , MetaInlines + [ Emph [ Str "markdown" ] , Space , Str "value" ] + ) + , ( "title" , MetaString "cmdline" ) + ] + } + [] +``` diff --git a/test/command/yaml-metadata.yaml b/test/command/yaml-metadata.yaml new file mode 100644 --- /dev/null +++ b/test/command/yaml-metadata.yaml @@ -0,0 +1,4 @@ +--- +title: file +other: _markdown_ value +--- diff --git a/test/command/yaml-with-chomp.md b/test/command/yaml-with-chomp.md --- a/test/command/yaml-with-chomp.md +++ b/test/command/yaml-with-chomp.md @@ -7,6 +7,14 @@ BLOCK ... ^D -Pandoc (Meta {unMeta = fromList [("ml",MetaBlocks [Para [Str "TEST"],Plain [Str "BLOCK"]])]}) -[] +Pandoc + Meta + { unMeta = + fromList + [ ( "ml" + , MetaInlines [ Str "TEST" , LineBreak , Str "BLOCK" ] + ) + ] + } + [] ``` diff --git a/test/command/zeitschrift-fur-kunstgeschichte.csl b/test/command/zeitschrift-fur-kunstgeschichte.csl new file mode 100644 --- /dev/null +++ b/test/command/zeitschrift-fur-kunstgeschichte.csl @@ -0,0 +1,346 @@ + + diff --git a/test/creole-reader.native b/test/creole-reader.native --- a/test/creole-reader.native +++ b/test/creole-reader.native @@ -1,95 +1,970 @@ -Pandoc (Meta {unMeta = fromList []}) -[Header 1 ("",[],[]) [Str "Top-level heading (1)"] -,Header 2 ("",[],[]) [Str "This a test for creole 0.1 (2)"] -,Header 3 ("",[],[]) [Str "This is a Subheading (3)"] -,Header 4 ("",[],[]) [Str "Subsub (4)"] -,Header 5 ("",[],[]) [Str "Subsubsub (5)"] -,Para [Str "The",Space,Str "ending",Space,Str "equal",Space,Str "signs",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "displayed:"] -,Header 1 ("",[],[]) [Str "Top-level heading (1)"] -,Header 2 ("",[],[]) [Str "This a test for creole 0.1 (2)"] -,Header 3 ("",[],[]) [Str "This is a Subheading (3)"] -,Header 4 ("",[],[]) [Str "Subsub (4)"] -,Header 5 ("",[],[]) [Str "Subsubsub (5)"] -,Para [Str "You",Space,Str "can",Space,Str "make",Space,Str "things",Space,Strong [Str "bold"],Space,Str "or",Space,Emph [Str "italic"],Space,Str "or",Space,Strong [Emph [Str "both"]],Space,Str "or",Space,Emph [Strong [Str "both"]],Str "."] -,Para [Str "Character",Space,Str "formatting",Space,Str "extends",Space,Str "across",Space,Str "line",Space,Str "breaks:",Space,Strong [Str "bold,",Space,Str "this",Space,Str "is",Space,Str "still",Space,Str "bold.",Space,Str "This",Space,Str "line",Space,Str "deliberately",Space,Str "does",Space,Str "not",Space,Str "end",Space,Str "in",Space,Str "star-star."]] -,Para [Str "Not",Space,Str "bold.",Space,Str "Character",Space,Str "formatting",Space,Str "does",Space,Str "not",Space,Str "cross",Space,Str "paragraph",Space,Str "boundaries."] -,Para [Str "You",Space,Str "can",Space,Str "use",Space,Link ("",[],[]) [Str "internal links"] ("internal links",""),Space,Str "or",Space,Link ("",[],[]) [Str "external links"] ("http://www.wikicreole.org",""),Str ",",Space,Str "give",Space,Str "the",Space,Str "link",Space,Str "a",Space,Link ("",[],[]) [Str "different"] ("internal links",""),Space,Str "name."] -,Para [Str "Here's",Space,Str "another",Space,Str "sentence:",Space,Str "This",Space,Str "wisdom",Space,Str "is",Space,Str "taken",Space,Str "from",Space,Link ("",[],[]) [Str "Ward Cunningham's"] ("Ward Cunningham's",""),Space,Link ("",[],[]) [Str "Presentation at the Wikisym 06"] ("http://www.c2.com/doc/wikisym/WikiSym2006.pdf",""),Str "."] -,Para [Str "Here's",Space,Str "a",Space,Str "external",Space,Str "link",Space,Str "without",Space,Str "a",Space,Str "description:",Space,Link ("",[],[]) [Str "http://www.wikicreole.org"] ("http://www.wikicreole.org","")] -,Para [Str "Be",Space,Str "careful",Space,Str "that",Space,Str "italic",Space,Str "links",Space,Str "are",Space,Str "rendered",Space,Str "properly:",Space,Emph [Link ("",[],[]) [Str "My Book Title"] ("http://my.book.example/","")]] -,Para [Str "Free",Space,Str "links",Space,Str "without",Space,Str "braces",Space,Str "should",Space,Str "be",Space,Str "rendered",Space,Str "as",Space,Str "well,",Space,Str "like",Space,Link ("",[],[]) [Str "http://www.wikicreole.org/"] ("http://www.wikicreole.org/",""),Space,Str "and",Space,Link ("",[],[]) [Str "http://www.wikicreole.org/users/~example"] ("http://www.wikicreole.org/users/~example",""),Str "."] -,Para [Str "Creole1.0",Space,Str "specifies",Space,Str "that",Space,Link ("",[],[]) [Str "http://bar"] ("http://bar",""),Space,Str "and",Space,Link ("",[],[]) [Str "ftp://bar"] ("ftp://bar",""),Space,Str "should",Space,Str "not",Space,Str "render",Space,Str "italic,",Space,Str "something",Space,Str "like",Space,Str "foo:",Emph [Str "bar",Space,Str "should",Space,Str "render",Space,Str "as",Space,Str "italic."]] -,Para [Str "You",Space,Str "can",Space,Str "use",Space,Str "this",Space,Str "to",Space,Str "draw",Space,Str "a",Space,Str "line",Space,Str "to",Space,Str "separate",Space,Str "the",Space,Str "page:"] -,HorizontalRule -,Para [Str "You",Space,Str "can",Space,Str "use",Space,Str "lists,",Space,Str "start",Space,Str "it",Space,Str "at",Space,Str "the",Space,Str "first",Space,Str "column",Space,Str "for",Space,Str "now,",Space,Str "please..."] -,Para [Str "unnumbered",Space,Str "lists",Space,Str "are",Space,Str "like"] -,BulletList - [[Plain [Str "item",Space,Str "a"]] - ,[Plain [Str "item",Space,Str "b"]] - ,[Plain [Strong [Str "bold",Space,Str "item",Space,Str "c"]]]] -,Para [Str "blank",Space,Str "space",Space,Str "is",Space,Str "also",Space,Str "permitted",Space,Str "before",Space,Str "lists",Space,Str "like:"] -,BulletList - [[Plain [Str "item",Space,Str "a"]] - ,[Plain [Str "item",Space,Str "b"]] - ,[Plain [Str "item",Space,Str "c"] - ,BulletList - [[Plain [Str "item",Space,Str "c.a"]]]]] -,Para [Str "or",Space,Str "you",Space,Str "can",Space,Str "number",Space,Str "them"] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Link ("",[],[]) [Str "item 1"] ("item 1","")]] - ,[Plain [Str "item",Space,Str "2"]] - ,[Plain [Emph [Space,Str "italic",Space,Str "item",Space,Str "3",Space]] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "item",Space,Str "3.1"]] - ,[Plain [Str "item",Space,Str "3.2"]]]]] -,Para [Str "up",Space,Str "to",Space,Str "five",Space,Str "levels"] -,BulletList - [[Plain [Str "1"] - ,BulletList - [[Plain [Str "2"] - ,BulletList - [[Plain [Str "3"] - ,BulletList - [[Plain [Str "4"] - ,BulletList - [[Plain [Str "5"]]]]]]]]]]] -,BulletList - [[Plain [Str "You",Space,Str "can",Space,Str "have",Space,Str "multiline",Space,Str "list",Space,Str "items"]] - ,[Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "second",Space,Str "multiline",Space,Str "list",Space,Str "item"]]] -,Para [Str "You",Space,Str "can",Space,Str "use",Space,Str "nowiki",Space,Str "syntax",Space,Str "if",Space,Str "you",Space,Str "would",Space,Str "like",Space,Str "do",Space,Str "stuff",Space,Str "like",Space,Str "this:"] -,CodeBlock ("",[],[]) "Guitar Chord C:\n\n||---|---|---|\n||-0-|---|---|\n||---|---|---|\n||---|-0-|---|\n||---|---|-0-|\n||---|---|---|" -,Para [Str "You",Space,Str "can",Space,Str "also",Space,Str "use",Space,Str "it",Space,Str "inline",Space,Str "nowiki",Space,Code ("",[],[]) " in a sentence ",Space,Str "like",Space,Str "this."] -,Header 1 ("",[],[]) [Str "Escapes"] -,Para [Str "Normal",Space,Str "Link:",Space,Link ("",[],[]) [Str "http://wikicreole.org/"] ("http://wikicreole.org/",""),Space,Str "-",Space,Str "now",Space,Str "same",Space,Str "link,",Space,Str "but",Space,Str "escaped:",Space,Str "http://wikicreole.org/"] -,Para [Str "Normal",Space,Str "asterisks:",Space,Str "**not",Space,Str "bold**"] -,Para [Str "a",Space,Str "tilde",Space,Str "alone:",Space,Str "~"] -,Para [Str "a",Space,Str "tilde",Space,Str "escapes",Space,Str "itself:",Space,Str "~xxx"] -,Header 3 ("",[],[]) [Str "Creole 0.2"] -,Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "flower",Space,Str "with",Space,Str "the",Space,Str "ALT",Space,Str "text",Space,Str "\"this",Space,Str "is",Space,Str "a",Space,Str "flower\"",Space,Str "if",Space,Str "your",Space,Str "wiki",Space,Str "supports",Space,Str "ALT",Space,Str "text",Space,Str "on",Space,Str "images:"] -,Para [Image ("",[],[]) [Str "here is a red flower"] ("Red-Flower.jpg","")] -,Header 3 ("",[],[]) [Str "Creole 0.4"] -,Para [Str "Tables",Space,Str "are",Space,Str "done",Space,Str "like",Space,Str "this:"] -,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[Plain [Str "header",Space,Str "col1"]] - ,[Plain [Str "header",Space,Str "col2"]]] - [[[Plain [Str "col1"]] - ,[Plain [Str "col2"]]] - ,[[Plain [Str "you"]] - ,[Plain [Str "can"]]] - ,[[Plain [Str "also"]] - ,[Plain [Str "align",LineBreak,Str "it."]]]] -,Para [Str "You",Space,Str "can",Space,Str "format",Space,Str "an",Space,Str "address",Space,Str "by",Space,Str "simply",Space,Str "forcing",Space,Str "linebreaks:"] -,Para [Str "My",Space,Str "contact",Space,Str "dates:",LineBreak,Str "Pone:",Space,Str "xyz",LineBreak,Str "Fax:",Space,Str "+45",LineBreak,Str "Mobile:",Space,Str "abc"] -,Header 3 ("",[],[]) [Str "Creole 0.5"] -,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[Plain [Str "Header",Space,Str "title"]] - ,[Plain [Str "Another",Space,Str "header",Space,Str "title"]]] - [[[Plain [Code ("",[],[]) " //not italic text// "]] - ,[Plain [Code ("",[],[]) " **not bold text** "]]] - ,[[Plain [Emph [Str "italic",Space,Str "text"]]] - ,[Plain [Strong [Space,Str "bold",Space,Str "text",Space]]]]] -,Header 3 ("",[],[]) [Str "Creole 1.0"] -,Para [Str "If",Space,Str "interwiki",Space,Str "links",Space,Str "are",Space,Str "setup",Space,Str "in",Space,Str "your",Space,Str "wiki,",Space,Str "this",Space,Str "links",Space,Str "to",Space,Str "the",Space,Str "WikiCreole",Space,Str "page",Space,Str "about",Space,Str "Creole",Space,Str "1.0",Space,Str "test",Space,Str "cases:",Space,Link ("",[],[]) [Str "WikiCreole:Creole1.0TestCases"] ("WikiCreole:Creole1.0TestCases",""),Str "."] -,HorizontalRule -,Para [Str "The",Space,Str "above",Space,Str "test",Space,Str "document",Space,Str "was",Space,Str "found",Space,Str "on",Space,Link ("",[],[]) [Str "http://www.wikicreole.org/wiki/Creole1.0TestCases"] ("http://www.wikicreole.org/wiki/Creole1.0TestCases",""),Space,Str "and",Space,Str "downloaded",Space,Str "from",Space,Link ("",[],[]) [Str "http://www.wikicreole.org/attach/Creole1.0TestCases/creole1.0test.txt"] ("http://www.wikicreole.org/attach/Creole1.0TestCases/creole1.0test.txt",""),Str "."] -,Para [Str "The",Space,Str "Creole",Space,Str "Wiki",Space,Str "is",Space,Str "licensed:",Space,Str "Copyright",Space,Str "(C)",Space,Str "by",Space,Str "the",Space,Str "contributors.",Space,Str "Some",Space,Str "rights",Space,Str "reserved,",Space,Str "license",Space,Link ("",[],[]) [Str "https://creativecommons.org/licenses/by-sa/1.0/"] ("BY-SA",""),Str "."]] +Pandoc + Meta { unMeta = fromList [] } + [ Header 1 ( "" , [] , [] ) [ Str "Top-level heading (1)" ] + , Header + 2 ( "" , [] , [] ) [ Str "This a test for creole 0.1 (2)" ] + , Header + 3 ( "" , [] , [] ) [ Str "This is a Subheading (3)" ] + , Header 4 ( "" , [] , [] ) [ Str "Subsub (4)" ] + , Header 5 ( "" , [] , [] ) [ Str "Subsubsub (5)" ] + , Para + [ Str "The" + , Space + , Str "ending" + , Space + , Str "equal" + , Space + , Str "signs" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "displayed:" + ] + , Header 1 ( "" , [] , [] ) [ Str "Top-level heading (1)" ] + , Header + 2 ( "" , [] , [] ) [ Str "This a test for creole 0.1 (2)" ] + , Header + 3 ( "" , [] , [] ) [ Str "This is a Subheading (3)" ] + , Header 4 ( "" , [] , [] ) [ Str "Subsub (4)" ] + , Header 5 ( "" , [] , [] ) [ Str "Subsubsub (5)" ] + , Para + [ Str "You" + , Space + , Str "can" + , Space + , Str "make" + , Space + , Str "things" + , Space + , Strong [ Str "bold" ] + , Space + , Str "or" + , Space + , Emph [ Str "italic" ] + , Space + , Str "or" + , Space + , Strong [ Emph [ Str "both" ] ] + , Space + , Str "or" + , Space + , Emph [ Strong [ Str "both" ] ] + , Str "." + ] + , Para + [ Str "Character" + , Space + , Str "formatting" + , Space + , Str "extends" + , Space + , Str "across" + , Space + , Str "line" + , Space + , Str "breaks:" + , Space + , Strong + [ Str "bold," + , Space + , Str "this" + , Space + , Str "is" + , Space + , Str "still" + , Space + , Str "bold." + , Space + , Str "This" + , Space + , Str "line" + , Space + , Str "deliberately" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "end" + , Space + , Str "in" + , Space + , Str "star-star." + ] + ] + , Para + [ Str "Not" + , Space + , Str "bold." + , Space + , Str "Character" + , Space + , Str "formatting" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "cross" + , Space + , Str "paragraph" + , Space + , Str "boundaries." + ] + , Para + [ Str "You" + , Space + , Str "can" + , Space + , Str "use" + , Space + , Link + ( "" , [] , [] ) + [ Str "internal links" ] + ( "internal links" , "" ) + , Space + , Str "or" + , Space + , Link + ( "" , [] , [] ) + [ Str "external links" ] + ( "http://www.wikicreole.org" , "" ) + , Str "," + , Space + , Str "give" + , Space + , Str "the" + , Space + , Str "link" + , Space + , Str "a" + , Space + , Link + ( "" , [] , [] ) + [ Str "different" ] + ( "internal links" , "" ) + , Space + , Str "name." + ] + , Para + [ Str "Here's" + , Space + , Str "another" + , Space + , Str "sentence:" + , Space + , Str "This" + , Space + , Str "wisdom" + , Space + , Str "is" + , Space + , Str "taken" + , Space + , Str "from" + , Space + , Link + ( "" , [] , [] ) + [ Str "Ward Cunningham's" ] + ( "Ward Cunningham's" , "" ) + , Space + , Link + ( "" , [] , [] ) + [ Str "Presentation at the Wikisym 06" ] + ( "http://www.c2.com/doc/wikisym/WikiSym2006.pdf" , "" ) + , Str "." + ] + , Para + [ Str "Here's" + , Space + , Str "a" + , Space + , Str "external" + , Space + , Str "link" + , Space + , Str "without" + , Space + , Str "a" + , Space + , Str "description:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.wikicreole.org" ] + ( "http://www.wikicreole.org" , "" ) + ] + , Para + [ Str "Be" + , Space + , Str "careful" + , Space + , Str "that" + , Space + , Str "italic" + , Space + , Str "links" + , Space + , Str "are" + , Space + , Str "rendered" + , Space + , Str "properly:" + , Space + , Emph + [ Link + ( "" , [] , [] ) + [ Str "My Book Title" ] + ( "http://my.book.example/" , "" ) + ] + ] + , Para + [ Str "Free" + , Space + , Str "links" + , Space + , Str "without" + , Space + , Str "braces" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "rendered" + , Space + , Str "as" + , Space + , Str "well," + , Space + , Str "like" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.wikicreole.org/" ] + ( "http://www.wikicreole.org/" , "" ) + , Space + , Str "and" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.wikicreole.org/users/~example" ] + ( "http://www.wikicreole.org/users/~example" , "" ) + , Str "." + ] + , Para + [ Str "Creole1.0" + , Space + , Str "specifies" + , Space + , Str "that" + , Space + , Link + ( "" , [] , [] ) [ Str "http://bar" ] ( "http://bar" , "" ) + , Space + , Str "and" + , Space + , Link + ( "" , [] , [] ) [ Str "ftp://bar" ] ( "ftp://bar" , "" ) + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "render" + , Space + , Str "italic," + , Space + , Str "something" + , Space + , Str "like" + , Space + , Str "foo:" + , Emph + [ Str "bar" + , Space + , Str "should" + , Space + , Str "render" + , Space + , Str "as" + , Space + , Str "italic." + ] + ] + , Para + [ Str "You" + , Space + , Str "can" + , Space + , Str "use" + , Space + , Str "this" + , Space + , Str "to" + , Space + , Str "draw" + , Space + , Str "a" + , Space + , Str "line" + , Space + , Str "to" + , Space + , Str "separate" + , Space + , Str "the" + , Space + , Str "page:" + ] + , HorizontalRule + , Para + [ Str "You" + , Space + , Str "can" + , Space + , Str "use" + , Space + , Str "lists," + , Space + , Str "start" + , Space + , Str "it" + , Space + , Str "at" + , Space + , Str "the" + , Space + , Str "first" + , Space + , Str "column" + , Space + , Str "for" + , Space + , Str "now," + , Space + , Str "please..." + ] + , Para + [ Str "unnumbered" + , Space + , Str "lists" + , Space + , Str "are" + , Space + , Str "like" + ] + , BulletList + [ [ Plain [ Str "item" , Space , Str "a" ] ] + , [ Plain [ Str "item" , Space , Str "b" ] ] + , [ Plain + [ Strong + [ Str "bold" , Space , Str "item" , Space , Str "c" ] + ] + ] + ] + , Para + [ Str "blank" + , Space + , Str "space" + , Space + , Str "is" + , Space + , Str "also" + , Space + , Str "permitted" + , Space + , Str "before" + , Space + , Str "lists" + , Space + , Str "like:" + ] + , BulletList + [ [ Plain [ Str "item" , Space , Str "a" ] ] + , [ Plain [ Str "item" , Space , Str "b" ] ] + , [ Plain [ Str "item" , Space , Str "c" ] + , BulletList + [ [ Plain [ Str "item" , Space , Str "c.a" ] ] ] + ] + ] + , Para + [ Str "or" + , Space + , Str "you" + , Space + , Str "can" + , Space + , Str "number" + , Space + , Str "them" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Link ( "" , [] , [] ) [ Str "item 1" ] ( "item 1" , "" ) ] + ] + , [ Plain [ Str "item" , Space , Str "2" ] ] + , [ Plain + [ Emph + [ Space + , Str "italic" + , Space + , Str "item" + , Space + , Str "3" + , Space + ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "item" , Space , Str "3.1" ] ] + , [ Plain [ Str "item" , Space , Str "3.2" ] ] + ] + ] + ] + , Para + [ Str "up" + , Space + , Str "to" + , Space + , Str "five" + , Space + , Str "levels" + ] + , BulletList + [ [ Plain [ Str "1" ] + , BulletList + [ [ Plain [ Str "2" ] + , BulletList + [ [ Plain [ Str "3" ] + , BulletList + [ [ Plain [ Str "4" ] + , BulletList [ [ Plain [ Str "5" ] ] ] + ] + ] + ] + ] + ] + ] + ] + ] + , BulletList + [ [ Plain + [ Str "You" + , Space + , Str "can" + , Space + , Str "have" + , Space + , Str "multiline" + , Space + , Str "list" + , Space + , Str "items" + ] + ] + , [ Plain + [ Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "second" + , Space + , Str "multiline" + , Space + , Str "list" + , Space + , Str "item" + ] + ] + ] + , Para + [ Str "You" + , Space + , Str "can" + , Space + , Str "use" + , Space + , Str "nowiki" + , Space + , Str "syntax" + , Space + , Str "if" + , Space + , Str "you" + , Space + , Str "would" + , Space + , Str "like" + , Space + , Str "do" + , Space + , Str "stuff" + , Space + , Str "like" + , Space + , Str "this:" + ] + , CodeBlock + ( "" , [] , [] ) + "Guitar Chord C:\n\n||---|---|---|\n||-0-|---|---|\n||---|---|---|\n||---|-0-|---|\n||---|---|-0-|\n||---|---|---|" + , Para + [ Str "You" + , Space + , Str "can" + , Space + , Str "also" + , Space + , Str "use" + , Space + , Str "it" + , Space + , Str "inline" + , Space + , Str "nowiki" + , Space + , Code ( "" , [] , [] ) " in a sentence " + , Space + , Str "like" + , Space + , Str "this." + ] + , Header 1 ( "" , [] , [] ) [ Str "Escapes" ] + , Para + [ Str "Normal" + , Space + , Str "Link:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://wikicreole.org/" ] + ( "http://wikicreole.org/" , "" ) + , Space + , Str "-" + , Space + , Str "now" + , Space + , Str "same" + , Space + , Str "link," + , Space + , Str "but" + , Space + , Str "escaped:" + , Space + , Str "http://wikicreole.org/" + ] + , Para + [ Str "Normal" + , Space + , Str "asterisks:" + , Space + , Str "**not" + , Space + , Str "bold**" + ] + , Para + [ Str "a" + , Space + , Str "tilde" + , Space + , Str "alone:" + , Space + , Str "~" + ] + , Para + [ Str "a" + , Space + , Str "tilde" + , Space + , Str "escapes" + , Space + , Str "itself:" + , Space + , Str "~xxx" + ] + , Header 3 ( "" , [] , [] ) [ Str "Creole 0.2" ] + , Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "flower" + , Space + , Str "with" + , Space + , Str "the" + , Space + , Str "ALT" + , Space + , Str "text" + , Space + , Str "\"this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "flower\"" + , Space + , Str "if" + , Space + , Str "your" + , Space + , Str "wiki" + , Space + , Str "supports" + , Space + , Str "ALT" + , Space + , Str "text" + , Space + , Str "on" + , Space + , Str "images:" + ] + , Para + [ Image + ( "" , [] , [] ) + [ Str "here is a red flower" ] + ( "Red-Flower.jpg" , "" ) + ] + , Header 3 ( "" , [] , [] ) [ Str "Creole 0.4" ] + , Para + [ Str "Tables" + , Space + , Str "are" + , Space + , Str "done" + , Space + , Str "like" + , Space + , Str "this:" + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "header" , Space , Str "col1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "header" , Space , Str "col2" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "col1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "col2" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "you" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "can" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "also" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "align" , LineBreak , Str "it." ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "You" + , Space + , Str "can" + , Space + , Str "format" + , Space + , Str "an" + , Space + , Str "address" + , Space + , Str "by" + , Space + , Str "simply" + , Space + , Str "forcing" + , Space + , Str "linebreaks:" + ] + , Para + [ Str "My" + , Space + , Str "contact" + , Space + , Str "dates:" + , LineBreak + , Str "Pone:" + , Space + , Str "xyz" + , LineBreak + , Str "Fax:" + , Space + , Str "+45" + , LineBreak + , Str "Mobile:" + , Space + , Str "abc" + ] + , Header 3 ( "" , [] , [] ) [ Str "Creole 0.5" ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Header" , Space , Str "title" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Another" + , Space + , Str "header" + , Space + , Str "title" + ] + ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Code ( "" , [] , [] ) " //not italic text// " ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Code ( "" , [] , [] ) " **not bold text** " ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Emph [ Str "italic" , Space , Str "text" ] ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Strong + [ Space + , Str "bold" + , Space + , Str "text" + , Space + ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Header 3 ( "" , [] , [] ) [ Str "Creole 1.0" ] + , Para + [ Str "If" + , Space + , Str "interwiki" + , Space + , Str "links" + , Space + , Str "are" + , Space + , Str "setup" + , Space + , Str "in" + , Space + , Str "your" + , Space + , Str "wiki," + , Space + , Str "this" + , Space + , Str "links" + , Space + , Str "to" + , Space + , Str "the" + , Space + , Str "WikiCreole" + , Space + , Str "page" + , Space + , Str "about" + , Space + , Str "Creole" + , Space + , Str "1.0" + , Space + , Str "test" + , Space + , Str "cases:" + , Space + , Link + ( "" , [] , [] ) + [ Str "WikiCreole:Creole1.0TestCases" ] + ( "WikiCreole:Creole1.0TestCases" , "" ) + , Str "." + ] + , HorizontalRule + , Para + [ Str "The" + , Space + , Str "above" + , Space + , Str "test" + , Space + , Str "document" + , Space + , Str "was" + , Space + , Str "found" + , Space + , Str "on" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.wikicreole.org/wiki/Creole1.0TestCases" ] + ( "http://www.wikicreole.org/wiki/Creole1.0TestCases" , "" ) + , Space + , Str "and" + , Space + , Str "downloaded" + , Space + , Str "from" + , Space + , Link + ( "" , [] , [] ) + [ Str + "http://www.wikicreole.org/attach/Creole1.0TestCases/creole1.0test.txt" + ] + ( "http://www.wikicreole.org/attach/Creole1.0TestCases/creole1.0test.txt" + , "" + ) + , Str "." + ] + , Para + [ Str "The" + , Space + , Str "Creole" + , Space + , Str "Wiki" + , Space + , Str "is" + , Space + , Str "licensed:" + , Space + , Str "Copyright" + , Space + , Str "(C)" + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "contributors." + , Space + , Str "Some" + , Space + , Str "rights" + , Space + , Str "reserved," + , Space + , Str "license" + , Space + , Link + ( "" , [] , [] ) + [ Str "https://creativecommons.org/licenses/by-sa/1.0/" ] + ( "BY-SA" , "" ) + , Str "." + ] + ] diff --git a/test/djot-reader.djot b/test/djot-reader.djot new file mode 100644 --- /dev/null +++ b/test/djot-reader.djot @@ -0,0 +1,749 @@ +# Pandoc Test Suite + +John MacFarlane +Anonymous + +July 17, 2006 + +This is a set of tests for pandoc. Most of them are adapted from John Gruber's +markdown test suite. + +* * * * + +{#headers} +# Headers + +{#level-2-with-an-embedded-link} +## Level 2 with an [embedded link](/url) + +{#level-3-with-emphasis} +### Level 3 with _emphasis_ + +{#level-4} +#### Level 4 + +{#level-5} +##### Level 5 + +{#level-1} +# Level 1 + +{#level-2-with-emphasis} +## Level 2 with _emphasis_ + +{#level-3} +### Level 3 + +with no blank line + +{#level-2} +## Level 2 + +with no blank line + +* * * * + +{#paragraphs} +# Paragraphs + +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 of a paragraph looked like a list +item. + +Here's one with a bullet. \* criminey. + +There should be a hard line break\ +here. + +* * * * + +{#block-quotes} +# Block Quotes + +E-mail style: + +> This is a block quote. It is pretty short. + +> Code in a block quote: +> +> ``` +> sub status { +> print "working"; +> } +> ``` +> +> A list: +> +> 1. item one +> 2. item two +> +> Nested block quotes: +> +> > nested +> +> > nested + +This should not be a block quote: 2 \> 1. + +And a following paragraph. + +* * * * + +{#code-blocks} +# Code Blocks + +Code: + +``` +---- (should be four hyphens) + +sub status { + print "working"; +} + +this code block is indented by one tab +``` + +And: + +``` + this code block is indented by two tabs + +These should not be escaped: \$ \\ \> \[ \{ +``` + +* * * * + +{#lists} +# Lists + +{#unordered} +## Unordered + +Asterisks tight: + +- asterisk 1 +- asterisk 2 +- asterisk 3 + +Asterisks loose: + +- asterisk 1 + +- asterisk 2 + +- asterisk 3 + +Pluses tight: + +- Plus 1 +- Plus 2 +- Plus 3 + +Pluses loose: + +- Plus 1 + +- Plus 2 + +- Plus 3 + +Minuses tight: + +- Minus 1 +- Minus 2 +- Minus 3 + +Minuses loose: + +- Minus 1 + +- Minus 2 + +- Minus 3 + +{#ordered} +## Ordered + +Tight: + +1. First +2. Second +3. Third + +and: + +1. One +2. Two +3. Three + +Loose using tabs: + +1. First + +2. Second + +3. Third + +and using spaces: + +1. One + +2. Two + +3. Three + +Multiple paragraphs: + +1. Item 1, graf one. + + Item 1. graf two. The quick brown fox jumped over the lazy dog's back. + +2. Item 2. + +3. Item 3. + +{#nested} +## Nested + +- Tab + + - Tab + + - Tab + +Here's another: + +1. First +2. Second: + + - Fee + - Fie + - Foe +3. Third + +Same thing but with paragraphs: + +1. First + +2. Second: + + - Fee + - Fie + - Foe + +3. Third + +{#tabs-and-spaces} +## Tabs and spaces + +- this is a list item indented with tabs + +- this is a list item indented with spaces + + - this is an example list item indented with tabs + + - this is an example list item indented with spaces + +{#fancy-list-markers} +## Fancy list markers + +(2) begins with 2 + +(3) and now 3 + + with a continuation + + iv. sublist with roman numerals, starting with 4 + v. more items + + (A) a subsublist + (B) a subsublist + +Nesting: + +A. Upper Alpha + + I. Upper Roman. + + (6) Decimal start with 6 + + c) Lower alpha with paren + +Autonumbering: + +1. Autonumber. +2. More. + + 1. Nested. + +Should not be a list item: + +M.A. 2007 + +B. Williams + +* * * * + +{#definition-lists} +# Definition Lists + +Tight using spaces: + +: apple + + red fruit +: orange + + orange fruit +: banana + + yellow fruit + +Tight using tabs: + +: apple + + red fruit +: orange + + orange fruit +: banana + + yellow fruit + +Loose: + +: apple + + red fruit + +: orange + + orange fruit + +: banana + + yellow fruit + +Multiple blocks with italics: + +: _apple_ + + red fruit + + contains seeds, crisp, pleasant to taste + +: _orange_ + + orange fruit + + ``` + { orange code block } + ``` + + > orange block quote + +Multiple definitions, tight: + +: apple + + red fruit + + computer +: orange + + orange fruit + + bank + +Multiple definitions, loose: + +: apple + + red fruit + + computer + +: orange + + orange fruit + + bank + +Blank line after term, indented marker, alternate markers: + +: apple + + red fruit + + computer + +: orange + + orange fruit + + 1. sublist + 2. sublist + +{#html-blocks} +# HTML Blocks + +Simple block on one line: + +::: +foo + +::: + +And nested without indentation: + +:::::: +:::: +::: +foo + +::: + +:::: + +::: +bar + +::: + +:::::: + +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: + +``` +
    + foo +
    +``` + +As should this: + +``` +
    foo
    +``` + +Now, nested: + +::::: +:::: +::: +foo + +::: + +:::: + +::::: + +This should just be an HTML comment: + +Multiline: + +Code block: + +``` + +``` + +Just plain comment, with trailing spaces on the line: + +Code: + +``` +
    +``` + +Hr's: + +* * * * + +{#inline-markup} +# Inline Markup + +This is _emphasized_, and so _is this_. + +This is *strong*, and so *is this*. + +An _[emphasized link](/url)_. + +*_This is strong and em._* + +So is *_this_* word. + +*_This is strong and em._* + +So is *_this_* word. + +This is code: `>`, `$`, `\`, `\$`, ``. + +{-This is _strikeout_.-} + +Superscripts: a^bc^d a^_hello_^ a^hello there^. + +Subscripts: H~2~O, H~23~O, H~many of them~O. + +These should not be superscripts or subscripts, because of the unescaped spaces: +a\^b c\^d, a\~b c\~d. + +* * * * + +{#smart-quotes-ellipses-dashes} +# Smart quotes, ellipses, dashes + +"Hello," said the spider. "'Shelob' is my name." + +'A', 'B', and 'C' are letters. + +'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.' + +'He said, "I want to go."' Were you alive in the 70's? + +Here is some quoted '`code`' and a "[quoted +link](http://example.com/?foo=1&bar=2)". + +Some dashes: one---two --- three---four --- five. + +Dashes between numbers: 5--7, 255--66, 1987--1999. + +Ellipses...and...and.... + +* * * * + +{#latex} +# LaTeX + +- +- $`2+2=4` +- $`x \in y` +- $`\alpha \wedge \omega` +- $`223` +- $`p`-Tree +- Here's some display math: + $$`\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}` +- Here's one that has a line break in it: $`\alpha + \omega \times x^2`. + +These shouldn't be math: + +- To get the famous equation, write `$e = mc^2$`. +- $22,000 is a _lot_ of money. So is $34,000. (It worked if "lot" is + emphasized.) +- Shoes ($20) and socks ($5). +- Escaped `$`\: $73 _this should be emphasized_ 23$. + +Here's a LaTeX table: + +* * * * + +{#special-characters} +# Special Characters + +Here is some unicode: + +- I hat: Î +- o umlaut: ö +- section: § +- set membership: ∈ +- copyright: © + +AT&T has an ampersand in their name. + +AT&T is another way to write it. + +This & that. + +4 \< 5. + +6 \> 5. + +Backslash: \\ + +Backtick: \` + +Asterisk: \* + +Underscore: \_ + +Left brace: \{ + +Right brace: \} + +Left bracket: \[ + +Right bracket: \] + +Left paren: ( + +Right paren: ) + +Greater-than: \> + +Hash: # + +Period: . + +Bang: \! + +Plus: + + +Minus: - + +* * * * + +{#links} +# Links + +{#explicit} +## Explicit + +Just a [URL](/url/). + +[URL and title](/url/){title="title"}. + +[URL and title](/url/){title="title preceded by two spaces"}. + +[URL and title](/url/){title="title preceded by a tab"}. + +[URL and title](/url/){title="title with \"quotes\" in it"} + +[URL and title](/url/){title="title with single quotes"} + +[with\_underscore](/url/with_underscore) + +[Email link](mailto:nobody@nowhere.net) + +[Empty](). + +{#reference} +## Reference + +Foo [bar](/url/). + +With [embedded \[brackets\]](/url/). + +[b](/url/) by itself should be a link. + +Indented [once](/url). + +Indented [twice](/url). + +Indented [thrice](/url). + +This should \[not\]\[\] be a link. + +``` +[not]: /url +``` + +Foo [bar](/url/){title="Title with \"quotes\" inside"}. + +Foo [biz](/url/){title="Title with \"quote\" inside"}. + +{#with-ampersands} +## With ampersands + +Here's a [link with an ampersand in the URL](http://example.com/?foo=1&bar=2). + +Here's a link with an amersand in the link text: +[AT&T](http://att.com/){title="AT&T"}. + +Here's an [inline link](/script?foo=1&bar=2). + +Here's an [inline link in pointy braces](/script?foo=1&bar=2). + +{#autolinks} +## Autolinks + +With an ampersand: + +- In a list? +- +- It should. + +An e-mail address: + +> Blockquoted: + +Auto-links should not occur here: `` + +``` +or here: +``` + +* * * * + +{#images} +# Images + +From "Voyage dans la Lune" by Georges Melies (1902): + +:::: +![lalune](lalune.jpg){title="Voyage dans la Lune"} + +{.caption} +::: +lalune + +::: + +:::: + +Here is a movie ![movie](movie.jpg) icon. + +* * * * + +{#footnotes} +# Footnotes + +Here is a footnote reference,[^1] and another.[^2] This should _not_ be a +footnote reference, because it contains a space.\[\^my note\] Here is an inline +note.[^3] + +> Notes can go in quotes.[^4] + +1. And in list items.[^5] + +This paragraph should not be part of the note, as it is not indented. + +[^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]: 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). + + ``` + { } + ``` + + If you want, you can indent every line, but you can also be lazy and just + indent the first line of each block. + +[^3]: This is _easier_ to type. Inline notes may contain + [links](http://google.com) and `]` verbatim characters, as well as + \[bracketed text\]. + +[^4]: In quote. + +[^5]: In list. diff --git a/test/djot-reader.native b/test/djot-reader.native new file mode 100644 --- /dev/null +++ b/test/djot-reader.native @@ -0,0 +1,2365 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Div + ( "Pandoc-Test-Suite" , [ "section" ] , [] ) + [ Header + 1 + ( "" , [] , [] ) + [ Str "Pandoc" , Space , Str "Test" , Space , Str "Suite" ] + , Para + [ Str "John" + , Space + , Str "MacFarlane" + , SoftBreak + , Str "Anonymous" + ] + , Para + [ Str "July" , Space , Str "17," , Space , Str "2006" ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "set" + , Space + , Str "of" + , Space + , Str "tests" + , Space + , Str "for" + , Space + , Str "pandoc." + , Space + , Str "Most" + , Space + , Str "of" + , Space + , Str "them" + , Space + , Str "are" + , Space + , Str "adapted" + , Space + , Str "from" + , Space + , Str "John" + , Space + , Str "Gruber\8217s" + , SoftBreak + , Str "markdown" + , Space + , Str "test" + , Space + , Str "suite." + ] + , HorizontalRule + ] + , Div + ( "headers" , [ "section" ] , [] ) + [ Header 1 ( "" , [] , [] ) [ Str "Headers" ] + , Div + ( "level-2-with-an-embedded-link" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "Level" + , Space + , Str "2" + , Space + , Str "with" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "embedded" , Space , Str "link" ] + ( "/url" , "" ) + ] + , Div + ( "level-3-with-emphasis" , [ "section" ] , [] ) + [ Header + 3 + ( "" , [] , [] ) + [ Str "Level" + , Space + , Str "3" + , Space + , Str "with" + , Space + , Emph [ Str "emphasis" ] + ] + , Div + ( "level-4" , [ "section" ] , [] ) + [ Header + 4 + ( "" , [] , [] ) + [ Str "Level" , Space , Str "4" ] + , Div + ( "level-5" , [ "section" ] , [] ) + [ Header + 5 + ( "" , [] , [] ) + [ Str "Level" , Space , Str "5" ] + ] + ] + ] + ] + ] + , Div + ( "level-1" , [ "section" ] , [] ) + [ Header + 1 ( "" , [] , [] ) [ Str "Level" , Space , Str "1" ] + , Div + ( "level-2-with-emphasis" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "Level" + , Space + , Str "2" + , Space + , Str "with" + , Space + , Emph [ Str "emphasis" ] + ] + , Div + ( "level-3" , [ "section" ] , [] ) + [ Header + 3 ( "" , [] , [] ) [ Str "Level" , Space , Str "3" ] + , Para + [ Str "with" + , Space + , Str "no" + , Space + , Str "blank" + , Space + , Str "line" + ] + ] + ] + , Div + ( "level-2" , [ "section" ] , [] ) + [ Header + 2 ( "" , [] , [] ) [ Str "Level" , Space , Str "2" ] + , Para + [ Str "with" + , Space + , Str "no" + , Space + , Str "blank" + , Space + , Str "line" + ] + , HorizontalRule + ] + ] + , Div + ( "paragraphs" , [ "section" ] , [] ) + [ Header 1 ( "" , [] , [] ) [ Str "Paragraphs" ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "regular" + , Space + , Str "paragraph." + ] + , Para + [ Str "In" + , Space + , Str "Markdown" + , Space + , Str "1.0.0" + , Space + , Str "and" + , Space + , Str "earlier." + , Space + , Str "Version" + , Space + , Str "8." + , Space + , Str "This" + , Space + , Str "line" + , Space + , Str "turns" + , Space + , Str "into" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item." + , SoftBreak + , Str "Because" + , Space + , Str "a" + , Space + , Str "hard-wrapped" + , Space + , Str "line" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "middle" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "paragraph" + , Space + , Str "looked" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "list" + , SoftBreak + , Str "item." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "one" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "bullet." + , Space + , Str "*" + , Space + , Str "criminey." + ] + , Para + [ Str "There" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "hard" + , Space + , Str "line" + , Space + , Str "break" + , LineBreak + , Str "here." + ] + , HorizontalRule + ] + , Div + ( "block-quotes" , [ "section" ] , [] ) + [ Header + 1 ( "" , [] , [] ) [ Str "Block" , Space , Str "Quotes" ] + , Para [ Str "E-mail" , Space , Str "style:" ] + , BlockQuote + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote." + , Space + , Str "It" + , Space + , Str "is" + , Space + , Str "pretty" + , Space + , Str "short." + ] + ] + , BlockQuote + [ Para + [ Str "Code" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote:" + ] + , CodeBlock + ( "" , [ "" ] , [] ) + "sub status {\n print \"working\";\n}\n" + , Para [ Str "A" , Space , Str "list:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "item" , Space , Str "one" ] ] + , [ Plain [ Str "item" , Space , Str "two" ] ] + ] + , Para + [ Str "Nested" + , Space + , Str "block" + , Space + , Str "quotes:" + ] + , BlockQuote [ Para [ Str "nested" ] ] + , BlockQuote [ Para [ Str "nested" ] ] + ] + , Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote:" + , Space + , Str "2" + , Space + , Str ">" + , Space + , Str "1." + ] + , Para + [ Str "And" + , Space + , Str "a" + , Space + , Str "following" + , Space + , Str "paragraph." + ] + , HorizontalRule + ] + , Div + ( "code-blocks" , [ "section" ] , [] ) + [ Header + 1 ( "" , [] , [] ) [ Str "Code" , Space , Str "Blocks" ] + , Para [ Str "Code:" ] + , CodeBlock + ( "" , [ "" ] , [] ) + "---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n\nthis code block is indented by one tab\n" + , Para [ Str "And:" ] + , CodeBlock + ( "" , [ "" ] , [] ) + " this code block is indented by two tabs\n\nThese should not be escaped: \\$ \\\\ \\> \\[ \\{\n" + , HorizontalRule + ] + , Div + ( "lists" , [ "section" ] , [] ) + [ Header 1 ( "" , [] , [] ) [ Str "Lists" ] + , Div + ( "unordered" , [ "section" ] , [] ) + [ Header 2 ( "" , [] , [] ) [ Str "Unordered" ] + , Para [ Str "Asterisks" , Space , Str "tight:" ] + , BulletList + [ [ Plain [ Str "asterisk" , Space , Str "1" ] ] + , [ Plain [ Str "asterisk" , Space , Str "2" ] ] + , [ Plain [ Str "asterisk" , Space , Str "3" ] ] + ] + , Para [ Str "Asterisks" , Space , Str "loose:" ] + , BulletList + [ [ Para [ Str "asterisk" , Space , Str "1" ] ] + , [ Para [ Str "asterisk" , Space , Str "2" ] ] + , [ Para [ Str "asterisk" , Space , Str "3" ] ] + ] + , Para [ Str "Pluses" , Space , Str "tight:" ] + , BulletList + [ [ Plain [ Str "Plus" , Space , Str "1" ] ] + , [ Plain [ Str "Plus" , Space , Str "2" ] ] + , [ Plain [ Str "Plus" , Space , Str "3" ] ] + ] + , Para [ Str "Pluses" , Space , Str "loose:" ] + , BulletList + [ [ Para [ Str "Plus" , Space , Str "1" ] ] + , [ Para [ Str "Plus" , Space , Str "2" ] ] + , [ Para [ Str "Plus" , Space , Str "3" ] ] + ] + , Para [ Str "Minuses" , Space , Str "tight:" ] + , BulletList + [ [ Plain [ Str "Minus" , Space , Str "1" ] ] + , [ Plain [ Str "Minus" , Space , Str "2" ] ] + , [ Plain [ Str "Minus" , Space , Str "3" ] ] + ] + , Para [ Str "Minuses" , Space , Str "loose:" ] + , BulletList + [ [ Para [ Str "Minus" , Space , Str "1" ] ] + , [ Para [ Str "Minus" , Space , Str "2" ] ] + , [ Para [ Str "Minus" , Space , Str "3" ] ] + ] + ] + , Div + ( "ordered" , [ "section" ] , [] ) + [ Header 2 ( "" , [] , [] ) [ Str "Ordered" ] + , Para [ Str "Tight:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "First" ] ] + , [ Plain [ Str "Second" ] ] + , [ Plain [ Str "Third" ] ] + ] + , Para [ Str "and:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "One" ] ] + , [ Plain [ Str "Two" ] ] + , [ Plain [ Str "Three" ] ] + ] + , Para + [ Str "Loose" + , Space + , Str "using" + , Space + , Str "tabs:" + ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Para [ Str "First" ] ] + , [ Para [ Str "Second" ] ] + , [ Para [ Str "Third" ] ] + ] + , Para + [ Str "and" + , Space + , Str "using" + , Space + , Str "spaces:" + ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Para [ Str "One" ] ] + , [ Para [ Str "Two" ] ] + , [ Para [ Str "Three" ] ] + ] + , Para [ Str "Multiple" , Space , Str "paragraphs:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Para + [ Str "Item" + , Space + , Str "1," + , Space + , Str "graf" + , Space + , Str "one." + ] + , Para + [ Str "Item" + , Space + , Str "1." + , Space + , Str "graf" + , Space + , Str "two." + , Space + , Str "The" + , Space + , Str "quick" + , Space + , Str "brown" + , Space + , Str "fox" + , Space + , Str "jumped" + , Space + , Str "over" + , Space + , Str "the" + , Space + , Str "lazy" + , Space + , Str "dog\8217s" + , Space + , Str "back." + ] + ] + , [ Para [ Str "Item" , Space , Str "2." ] ] + , [ Para [ Str "Item" , Space , Str "3." ] ] + ] + ] + , Div + ( "nested" , [ "section" ] , [] ) + [ Header 2 ( "" , [] , [] ) [ Str "Nested" ] + , BulletList + [ [ Plain [ Str "Tab" ] + , BulletList + [ [ Plain [ Str "Tab" ] + , BulletList [ [ Plain [ Str "Tab" ] ] ] + ] + ] + ] + ] + , Para [ Str "Here\8217s" , Space , Str "another:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "First" ] ] + , [ Plain [ Str "Second:" ] + , BulletList + [ [ Plain [ Str "Fee" ] ] + , [ Plain [ Str "Fie" ] ] + , [ Plain [ Str "Foe" ] ] + ] + ] + , [ Plain [ Str "Third" ] ] + ] + , Para + [ Str "Same" + , Space + , Str "thing" + , Space + , Str "but" + , Space + , Str "with" + , Space + , Str "paragraphs:" + ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Para [ Str "First" ] ] + , [ Para [ Str "Second:" ] + , BulletList + [ [ Plain [ Str "Fee" ] ] + , [ Plain [ Str "Fie" ] ] + , [ Plain [ Str "Foe" ] ] + ] + ] + , [ Para [ Str "Third" ] ] + ] + ] + , Div + ( "tabs-and-spaces" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "Tabs" , Space , Str "and" , Space , Str "spaces" ] + , BulletList + [ [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "indented" + , Space + , Str "with" + , Space + , Str "tabs" + ] + ] + , [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "indented" + , Space + , Str "with" + , Space + , Str "spaces" + ] + , BulletList + [ [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "example" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "indented" + , Space + , Str "with" + , Space + , Str "tabs" + ] + ] + , [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "example" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "indented" + , Space + , Str "with" + , Space + , Str "spaces" + ] + ] + ] + ] + ] + ] + , Div + ( "fancy-list-markers" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "Fancy" + , Space + , Str "list" + , Space + , Str "markers" + ] + , OrderedList + ( 2 , Decimal , TwoParens ) + [ [ Para + [ Str "begins" + , Space + , Str "with" + , Space + , Str "2" + ] + ] + , [ Para + [ Str "and" , Space , Str "now" , Space , Str "3" ] + , Para + [ Str "with" + , Space + , Str "a" + , Space + , Str "continuation" + ] + , OrderedList + ( 4 , LowerRoman , Period ) + [ [ Plain + [ Str "sublist" + , Space + , Str "with" + , Space + , Str "roman" + , Space + , Str "numerals," + , Space + , Str "starting" + , Space + , Str "with" + , Space + , Str "4" + ] + ] + , [ Plain [ Str "more" , Space , Str "items" ] + , OrderedList + ( 1 , UpperAlpha , TwoParens ) + [ [ Plain + [ Str "a" , Space , Str "subsublist" ] + ] + , [ Plain + [ Str "a" , Space , Str "subsublist" ] + ] + ] + ] + ] + ] + ] + , Para [ Str "Nesting:" ] + , OrderedList + ( 1 , UpperAlpha , Period ) + [ [ Plain [ Str "Upper" , Space , Str "Alpha" ] + , OrderedList + ( 1 , UpperRoman , Period ) + [ [ Plain [ Str "Upper" , Space , Str "Roman." ] + , OrderedList + ( 6 , Decimal , TwoParens ) + [ [ Plain + [ Str "Decimal" + , Space + , Str "start" + , Space + , Str "with" + , Space + , Str "6" + ] + , OrderedList + ( 3 , LowerAlpha , OneParen ) + [ [ Plain + [ Str "Lower" + , Space + , Str "alpha" + , Space + , Str "with" + , Space + , Str "paren" + ] + ] + ] + ] + ] + ] + ] + ] + ] + , Para [ Str "Autonumbering:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "Autonumber." ] ] + , [ Plain [ Str "More." ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "Nested." ] ] ] + ] + ] + , Para + [ Str "Should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item:" + ] + , Para [ Str "M.A.\160\&2007" ] + , OrderedList + ( 2 , UpperAlpha , Period ) + [ [ Plain [ Str "Williams" ] ] ] + , HorizontalRule + ] + ] + , Div + ( "definition-lists" , [ "section" ] , [] ) + [ Header + 1 + ( "" , [] , [] ) + [ Str "Definition" , Space , Str "Lists" ] + , Para + [ Str "Tight" + , Space + , Str "using" + , Space + , Str "spaces:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Plain [ Str "red" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "orange" ] + , [ [ Plain [ Str "orange" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "banana" ] + , [ [ Plain [ Str "yellow" , Space , Str "fruit" ] ] ] + ) + ] + , Para + [ Str "Tight" , Space , Str "using" , Space , Str "tabs:" ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Plain [ Str "red" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "orange" ] + , [ [ Plain [ Str "orange" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "banana" ] + , [ [ Plain [ Str "yellow" , Space , Str "fruit" ] ] ] + ) + ] + , Para [ Str "Loose:" ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "banana" ] + , [ [ Para [ Str "yellow" , Space , Str "fruit" ] ] ] + ) + ] + , Para + [ Str "Multiple" + , Space + , Str "blocks" + , Space + , Str "with" + , Space + , Str "italics:" + ] + , DefinitionList + [ ( [ Emph [ Str "apple" ] ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] + , Para + [ Str "contains" + , Space + , Str "seeds," + , Space + , Str "crisp," + , Space + , Str "pleasant" + , Space + , Str "to" + , Space + , Str "taste" + ] + ] + ] + ) + , ( [ Emph [ Str "orange" ] ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] + , CodeBlock + ( "" , [ "" ] , [] ) "{ orange code block }\n" + , BlockQuote + [ Para + [ Str "orange" + , Space + , Str "block" + , Space + , Str "quote" + ] + ] + ] + ] + ) + ] + , Para + [ Str "Multiple" + , Space + , Str "definitions," + , Space + , Str "tight:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] + , Para [ Str "computer" ] + ] + ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] + , Para [ Str "bank" ] + ] + ] + ) + ] + , Para + [ Str "Multiple" + , Space + , Str "definitions," + , Space + , Str "loose:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] + , Para [ Str "computer" ] + ] + ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] + , Para [ Str "bank" ] + ] + ] + ) + ] + , Para + [ Str "Blank" + , Space + , Str "line" + , Space + , Str "after" + , Space + , Str "term," + , Space + , Str "indented" + , Space + , Str "marker," + , Space + , Str "alternate" + , Space + , Str "markers:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] + , Para [ Str "computer" ] + ] + ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "sublist" ] ] + , [ Plain [ Str "sublist" ] ] + ] + ] + ] + ) + ] + ] + , Div + ( "html-blocks" , [ "section" ] , [] ) + [ Header + 1 ( "" , [] , [] ) [ Str "HTML" , Space , Str "Blocks" ] + , Para + [ Str "Simple" + , Space + , Str "block" + , Space + , Str "on" + , Space + , Str "one" + , Space + , Str "line:" + ] + , Div ( "" , [] , [] ) [ Para [ Str "foo" ] ] + , Para + [ Str "And" + , Space + , Str "nested" + , Space + , Str "without" + , Space + , Str "indentation:" + ] + , Div + ( "" , [] , [] ) + [ Div + ( "" , [] , [] ) + [ Div ( "" , [] , [] ) [ Para [ Str "foo" ] ] ] + , Div ( "" , [] , [] ) [ Para [ Str "bar" ] ] + ] + , Para + [ Str "Interpreted" + , Space + , Str "markdown" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "table:" + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Emph [ Str "emphasized" ] + ] + , Para + [ Str "And" + , Space + , Str "this" + , Space + , Str "is" + , Space + , Strong [ Str "strong" ] + ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "simple" + , Space + , Str "block:" + ] + , Div ( "" , [] , [] ) [ Para [ 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
    \n" + , Para + [ Str "As" , Space , Str "should" , Space , Str "this:" ] + , CodeBlock ( "" , [ "" ] , [] ) "
    foo
    \n" + , Para [ Str "Now," , Space , Str "nested:" ] + , Div + ( "" , [] , [] ) + [ Div + ( "" , [] , [] ) + [ Div ( "" , [] , [] ) [ Para [ 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 ( "" , [ "" ] , [] ) "\n" + , 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 ( "" , [ "" ] , [] ) "
    \n" + , Para [ Str "Hr\8217s:" ] + , HorizontalRule + ] + , Div + ( "inline-markup" , [ "section" ] , [] ) + [ 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 "." + ] + , Para + [ Str "An" + , Space + , Emph + [ Link + ( "" , [] , [] ) + [ Str "emphasized" , Space , Str "link" ] + ( "/url" , "" ) + ] + , Str "." + ] + , Para + [ Strong + [ Emph + [ Str "This" + , Space + , Str "is" + , Space + , Str "strong" + , Space + , Str "and" + , Space + , Str "em." + ] + ] + ] + , Para + [ Str "So" + , Space + , Str "is" + , Space + , Strong [ Emph [ Str "this" ] ] + , Space + , Str "word." + ] + , Para + [ Strong + [ Emph + [ Str "This" + , Space + , Str "is" + , Space + , Str "strong" + , Space + , Str "and" + , Space + , Str "em." + ] + ] + ] + , Para + [ Str "So" + , Space + , Str "is" + , Space + , Strong [ Emph [ Str "this" ] ] + , Space + , Str "word." + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "code:" + , Space + , Code ( "" , [] , [] ) ">" + , Str "," + , Space + , Code ( "" , [] , [] ) "$" + , Str "," + , Space + , Code ( "" , [] , [] ) "\\`, " + , Str "$" + , Code ( "" , [] , [] ) ", " + , Str "" + , Code ( "" , [] , [] ) "." + ] + , Para + [ Span + ( "" , [ "deleted" ] , [] ) + [ Str "This" + , Space + , Str "is" + , Space + , Emph [ Str "strikeout" ] + , Str "." + ] + ] + , Para + [ Str "Superscripts:" + , Space + , Str "a" + , Superscript [ Str "bc" ] + , Str "d" + , Space + , Str "a" + , Superscript [ Emph [ Str "hello" ] ] + , Space + , Str "a" + , Superscript [ Str "hello\160there" ] + , Str "." + ] + , Para + [ Str "Subscripts:" + , Space + , Str "H" + , Subscript [ Str "2" ] + , Str "O," + , Space + , Str "H" + , Subscript [ Str "23" ] + , Str "O," + , Space + , Str "H" + , Subscript [ Str "many\160of\160them" ] + , Str "O." + ] + , Para + [ Str "These" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "superscripts" + , Space + , Str "or" + , Space + , Str "subscripts," + , Space + , Str "because" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "unescaped" + , Space + , Str "spaces:" + , SoftBreak + , Str "a^b" + , Space + , Str "c^d," + , Space + , Str "a~b" + , Space + , Str "c~d." + ] + , HorizontalRule + ] + , Div + ( "smart-quotes-ellipses-dashes" , [ "section" ] , [] ) + [ Header + 1 + ( "" , [] , [] ) + [ Str "Smart" + , Space + , Str "quotes," + , Space + , Str "ellipses," + , Space + , Str "dashes" + ] + , Para + [ Quoted DoubleQuote [ Str "Hello," ] + , Space + , Str "said" + , Space + , Str "the" + , Space + , Str "spider." + , Space + , Quoted + DoubleQuote + [ Quoted SingleQuote [ Str "Shelob" ] + , Space + , Str "is" + , Space + , Str "my" + , Space + , Str "name." + ] + ] + , Para + [ Quoted SingleQuote [ Str "A" ] + , Str "," + , Space + , Quoted SingleQuote [ Str "B" ] + , Str "," + , Space + , Str "and" + , Space + , Quoted SingleQuote [ Str "C" ] + , Space + , Str "are" + , Space + , Str "letters." + ] + , Para + [ Quoted SingleQuote [ Str "Oak," ] + , Space + , Quoted SingleQuote [ Str "elm," ] + , Space + , Str "and" + , Space + , Quoted SingleQuote [ Str "beech" ] + , Space + , Str "are" + , Space + , Str "names" + , Space + , Str "of" + , Space + , Str "trees." + , Space + , Str "So" + , Space + , Str "is" + , Space + , Quoted SingleQuote [ Str "pine." ] + ] + , Para + [ Quoted + SingleQuote + [ Str "He" + , Space + , Str "said," + , Space + , Quoted + DoubleQuote + [ Str "I" + , Space + , Str "want" + , Space + , Str "to" + , Space + , Str "go." + ] + ] + , Space + , Str "Were" + , Space + , Str "you" + , Space + , Str "alive" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "70\8217s?" + ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "some" + , Space + , Str "quoted" + , Space + , Quoted SingleQuote [ Code ( "" , [] , [] ) "code" ] + , Space + , Str "and" + , Space + , Str "a" + , Space + , Quoted + DoubleQuote + [ Link + ( "" , [] , [] ) + [ Str "quoted" , SoftBreak , Str "link" ] + ( "http://example.com/?foo=1&bar=2" , "" ) + ] + , Str "." + ] + , Para + [ Str "Some" + , Space + , Str "dashes:" + , Space + , Str "one\8212two" + , Space + , Str "\8212" + , Space + , Str "three\8212four" + , Space + , Str "\8212" + , Space + , Str "five." + ] + , Para + [ Str "Dashes" + , Space + , Str "between" + , Space + , Str "numbers:" + , Space + , Str "5\8211\&7," + , Space + , Str "255\8211\&66," + , Space + , Str "1987\8211\&1999." + ] + , Para [ Str "Ellipses\8230and\8230and\8230." ] + , HorizontalRule + ] + , Div + ( "latex" , [ "section" ] , [] ) + [ Header 1 ( "" , [] , [] ) [ Str "LaTeX" ] + , BulletList + [ [] + , [ Plain [ Math InlineMath "2+2=4" ] ] + , [ Plain [ Math InlineMath "x \\in y" ] ] + , [ Plain [ Math InlineMath "\\alpha \\wedge \\omega" ] ] + , [ Plain [ Math InlineMath "223" ] ] + , [ Plain [ Math InlineMath "p" , Str "-Tree" ] ] + , [ Plain + [ Str "Here\8217s" + , Space + , Str "some" + , Space + , Str "display" + , Space + , Str "math:" + , SoftBreak + , Math + DisplayMath + "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}" + ] + ] + , [ Plain + [ Str "Here\8217s" + , Space + , Str "one" + , Space + , Str "that" + , Space + , Str "has" + , Space + , Str "a" + , Space + , Str "line" + , Space + , Str "break" + , Space + , Str "in" + , Space + , Str "it:" + , Space + , Math InlineMath "\\alpha + \\omega \\times x^2" + , Str "." + ] + ] + ] + , Para + [ Str "These" + , Space + , Str "shouldn\8217t" + , Space + , Str "be" + , Space + , Str "math:" + ] + , BulletList + [ [ Plain + [ Str "To" + , Space + , Str "get" + , Space + , Str "the" + , Space + , Str "famous" + , Space + , Str "equation," + , Space + , Str "write" + , Space + , Code ( "" , [] , [] ) "$e = mc^2$" + , Str "." + ] + ] + , [ Plain + [ Str "$22,000" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Emph [ Str "lot" ] + , Space + , Str "of" + , Space + , Str "money." + , Space + , Str "So" + , Space + , Str "is" + , Space + , Str "$34,000." + , Space + , Str "(It" + , Space + , Str "worked" + , Space + , Str "if" + , Space + , Quoted DoubleQuote [ Str "lot" ] + , Space + , Str "is" + , SoftBreak + , Str "emphasized.)" + ] + ] + , [ Plain + [ Str "Shoes" + , Space + , Str "($20)" + , Space + , Str "and" + , Space + , Str "socks" + , Space + , Str "($5)." + ] + ] + , [ Plain + [ Str "Escaped" + , Space + , Code ( "" , [] , [] ) "$" + , Str ":" + , Space + , Str "$73" + , Space + , Emph + [ Str "this" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "emphasized" + ] + , Space + , Str "23$." + ] + ] + ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "LaTeX" + , Space + , Str "table:" + ] + , HorizontalRule + ] + , Div + ( "special-characters" , [ "section" ] , [] ) + [ Header + 1 + ( "" , [] , [] ) + [ Str "Special" , Space , Str "Characters" ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "some" + , Space + , Str "unicode:" + ] + , BulletList + [ [ Plain + [ Str "I" , Space , Str "hat:" , Space , Str "\206" ] + ] + , [ Plain + [ Str "o" , Space , Str "umlaut:" , Space , Str "\246" ] + ] + , [ Plain [ Str "section:" , Space , Str "\167" ] ] + , [ Plain + [ Str "set" + , Space + , Str "membership:" + , Space + , Str "\8712" + ] + ] + , [ Plain [ Str "copyright:" , Space , Str "\169" ] ] + ] + , Para + [ Str "AT&T" + , Space + , Str "has" + , Space + , Str "an" + , Space + , Str "ampersand" + , Space + , Str "in" + , Space + , Str "their" + , Space + , Str "name." + ] + , Para + [ Str "AT&T" + , Space + , Str "is" + , Space + , Str "another" + , Space + , Str "way" + , Space + , Str "to" + , Space + , Str "write" + , Space + , Str "it." + ] + , Para + [ Str "This" , Space , Str "&" , Space , Str "that." ] + , Para [ Str "4" , Space , Str "<" , Space , Str "5." ] + , Para [ Str "6" , Space , Str ">" , Space , Str "5." ] + , Para [ Str "Backslash:" , Space , Str "\\" ] + , Para [ Str "Backtick:" , Space , Str "`" ] + , Para [ Str "Asterisk:" , Space , Str "*" ] + , Para [ Str "Underscore:" , Space , Str "_" ] + , Para + [ Str "Left" , Space , Str "brace:" , Space , Str "{" ] + , Para + [ Str "Right" , Space , Str "brace:" , Space , Str "}" ] + , Para + [ Str "Left" , Space , Str "bracket:" , Space , Str "[" ] + , Para + [ Str "Right" , Space , Str "bracket:" , Space , Str "]" ] + , Para + [ Str "Left" , Space , Str "paren:" , Space , Str "(" ] + , Para + [ Str "Right" , Space , Str "paren:" , Space , Str ")" ] + , Para [ Str "Greater-than:" , Space , Str ">" ] + , Para [ Str "Hash:" , Space , Str "#" ] + , Para [ Str "Period:" , Space , Str "." ] + , Para [ Str "Bang:" , Space , Str "!" ] + , Para [ Str "Plus:" , Space , Str "+" ] + , Para [ Str "Minus:" , Space , Str "-" ] + , HorizontalRule + ] + , Div + ( "links" , [ "section" ] , [] ) + [ Header 1 ( "" , [] , [] ) [ Str "Links" ] + , Div + ( "explicit" , [ "section" ] , [] ) + [ Header 2 ( "" , [] , [] ) [ Str "Explicit" ] + , Para + [ Str "Just" + , Space + , Str "a" + , Space + , Link ( "" , [] , [] ) [ Str "URL" ] ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link + ( "" , [] , [ ( "title" , "title" ) ] ) + [ Str "URL" + , Space + , Str "and" + , Space + , Str "title" + ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link + ( "" + , [] + , [ ( "title" , "title preceded by two spaces" ) ] + ) + [ Str "URL" + , Space + , Str "and" + , Space + , Str "title" + ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link + ( "" + , [] + , [ ( "title" , "title preceded by a tab" ) ] + ) + [ Str "URL" + , Space + , Str "and" + , Space + , Str "title" + ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link + ( "" + , [] + , [ ( "title" , "title with \"quotes\" in it" ) ] + ) + [ Str "URL" + , Space + , Str "and" + , Space + , Str "title" + ] + ( "/url/" , "" ) + ] + , Para + [ Link + ( "" + , [] + , [ ( "title" , "title with single quotes" ) ] + ) + [ Str "URL" + , Space + , Str "and" + , Space + , Str "title" + ] + ( "/url/" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "with_underscore" ] + ( "/url/with_underscore" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "Email" , Space , Str "link" ] + ( "mailto:nobody@nowhere.net" , "" ) + ] + , Para + [ Link ( "" , [] , [] ) [ Str "Empty" ] ( "" , "" ) + , Str "." + ] + ] + , Div + ( "reference" , [ "section" ] , [] ) + [ Header 2 ( "" , [] , [] ) [ Str "Reference" ] + , Para + [ Str "Foo" + , Space + , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" ) + , Str "." + ] + , Para + [ Str "With" + , Space + , Link + ( "" , [] , [] ) + [ Str "embedded" , Space , Str "[brackets]" ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link ( "" , [] , [] ) [ Str "b" ] ( "/url/" , "" ) + , Space + , Str "by" + , Space + , Str "itself" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "link." + ] + , Para + [ Str "Indented" + , Space + , Link ( "" , [] , [] ) [ Str "once" ] ( "/url" , "" ) + , Str "." + ] + , Para + [ Str "Indented" + , Space + , Link ( "" , [] , [] ) [ Str "twice" ] ( "/url" , "" ) + , Str "." + ] + , Para + [ Str "Indented" + , Space + , Link ( "" , [] , [] ) [ Str "thrice" ] ( "/url" , "" ) + , Str "." + ] + , Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "[not][]" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "link." + ] + , CodeBlock ( "" , [ "" ] , [] ) "[not]: /url\n" + , Para + [ Str "Foo" + , Space + , Link + ( "" + , [] + , [ ( "title" , "Title with \"quotes\" inside" ) ] + ) + [ Str "bar" ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Str "Foo" + , Space + , Link + ( "" + , [] + , [ ( "title" , "Title with \"quote\" inside" ) ] + ) + [ Str "biz" ] + ( "/url/" , "" ) + , Str "." + ] + ] + , Div + ( "with-ampersands" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "With" , Space , Str "ampersands" ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Link + ( "" , [] , [] ) + [ Str "link" + , Space + , Str "with" + , Space + , Str "an" + , Space + , Str "ampersand" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "URL" + ] + ( "http://example.com/?foo=1&bar=2" , "" ) + , Str "." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "link" + , Space + , Str "with" + , Space + , Str "an" + , Space + , Str "amersand" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "link" + , Space + , Str "text:" + , SoftBreak + , Link + ( "" , [] , [ ( "title" , "AT&T" ) ] ) + [ Str "AT&T" ] + ( "http://att.com/" , "" ) + , Str "." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "inline" , Space , Str "link" ] + ( "/script?foo=1&bar=2" , "" ) + , Str "." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "inline" + , Space + , Str "link" + , Space + , Str "in" + , Space + , Str "pointy" + , Space + , Str "braces" + ] + ( "/script?foo=1&bar=2" , "" ) + , Str "." + ] + ] + , Div + ( "autolinks" , [ "section" ] , [] ) + [ Header 2 ( "" , [] , [] ) [ Str "Autolinks" ] + , Para + [ Str "With" + , Space + , Str "an" + , Space + , Str "ampersand:" + , Space + , Link + ( "" , [ "uri" ] , [] ) + [ Str "http://example.com/?foo=1&bar=2" ] + ( "http://example.com/?foo=1&bar=2" , "" ) + ] + , BulletList + [ [ Plain + [ Str "In" , Space , Str "a" , Space , Str "list?" ] + ] + , [ Plain + [ Link + ( "" , [ "uri" ] , [] ) + [ Str "http://example.com/" ] + ( "http://example.com/" , "" ) + ] + ] + , [ Plain [ Str "It" , Space , Str "should." ] ] + ] + , Para + [ Str "An" + , Space + , Str "e-mail" + , Space + , Str "address:" + , Space + , Link + ( "" , [ "email" ] , [] ) + [ Str "nobody@nowhere.net" ] + ( "mailto:nobody@nowhere.net" , "" ) + ] + , BlockQuote + [ Para + [ Str "Blockquoted:" + , Space + , Link + ( "" , [ "uri" ] , [] ) + [ Str "http://example.com/" ] + ( "http://example.com/" , "" ) + ] + ] + , Para + [ Str "Auto-links" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "occur" + , Space + , Str "here:" + , Space + , Code ( "" , [] , [] ) "" + ] + , CodeBlock + ( "" , [ "" ] , [] ) "or here: \n" + , HorizontalRule + ] + ] + , Div + ( "images" , [ "section" ] , [] ) + [ 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):" + ] + , Div + ( "" , [] , [] ) + [ Para + [ Image + ( "" , [] , [ ( "title" , "Voyage dans la Lune" ) ] ) + [ Str "lalune" ] + ( "lalune.jpg" , "" ) + ] + , Div ( "" , [ "caption" ] , [] ) [ Para [ Str "lalune" ] ] + ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "movie" + , Space + , Image + ( "" , [] , [] ) [ Str "movie" ] ( "movie.jpg" , "" ) + , Space + , Str "icon." + ] + , HorizontalRule + ] + , Div + ( "footnotes" , [ "section" ] , [] ) + [ Header 1 ( "" , [] , [] ) [ Str "Footnotes" ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "footnote" + , Space + , Str "reference," + , Note + [ Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "footnote." + , Space + , Str "It" + , Space + , Str "can" + , Space + , Str "go" + , Space + , Str "anywhere" + , Space + , Str "after" + , Space + , Str "the" + , Space + , Str "footnote" + , Space + , Str "reference." + , Space + , Str "It" + , SoftBreak + , Str "need" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "placed" + , Space + , Str "at" + , Space + , Str "the" + , Space + , Str "end" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "document." + ] + ] + , Space + , Str "and" + , Space + , Str "another." + , Note + [ Para + [ Str "Here\8217s" + , Space + , Str "the" + , Space + , Str "long" + , Space + , Str "note." + , Space + , Str "This" + , Space + , Str "one" + , Space + , Str "contains" + , Space + , Str "multiple" + , Space + , Str "blocks." + ] + , Para + [ Str "Subsequent" + , Space + , Str "blocks" + , Space + , Str "are" + , Space + , Str "indented" + , Space + , Str "to" + , Space + , Str "show" + , Space + , Str "that" + , Space + , Str "they" + , Space + , Str "belong" + , Space + , Str "to" + , Space + , Str "the" + , Space + , Str "footnote" + , Space + , Str "(as" + , SoftBreak + , Str "with" + , Space + , Str "list" + , Space + , Str "items)." + ] + , CodeBlock ( "" , [ "" ] , [] ) "{ }\n" + , Para + [ Str "If" + , Space + , Str "you" + , Space + , Str "want," + , Space + , Str "you" + , Space + , Str "can" + , Space + , Str "indent" + , Space + , Str "every" + , Space + , Str "line," + , Space + , Str "but" + , Space + , Str "you" + , Space + , Str "can" + , Space + , Str "also" + , Space + , Str "be" + , Space + , Str "lazy" + , Space + , Str "and" + , Space + , Str "just" + , SoftBreak + , Str "indent" + , Space + , Str "the" + , Space + , Str "first" + , Space + , Str "line" + , Space + , Str "of" + , Space + , Str "each" + , Space + , Str "block." + ] + ] + , Space + , Str "This" + , Space + , Str "should" + , Space + , Emph [ Str "not" ] + , Space + , Str "be" + , Space + , Str "a" + , SoftBreak + , Str "footnote" + , Space + , Str "reference," + , Space + , Str "because" + , Space + , Str "it" + , Space + , Str "contains" + , Space + , Str "a" + , Space + , Str "space.[^my" + , Space + , Str "note]" + , Space + , Str "Here" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "inline" + , SoftBreak + , Str "note." + , Note + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Emph [ Str "easier" ] + , Space + , Str "to" + , Space + , Str "type." + , Space + , Str "Inline" + , Space + , Str "notes" + , Space + , Str "may" + , Space + , Str "contain" + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "links" ] + ( "http://google.com" , "" ) + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "]" + , Space + , Str "verbatim" + , Space + , Str "characters," + , Space + , Str "as" + , Space + , Str "well" + , Space + , Str "as" + , SoftBreak + , Str "[bracketed" + , Space + , Str "text]." + ] + ] + ] + , BlockQuote + [ Para + [ Str "Notes" + , Space + , Str "can" + , Space + , Str "go" + , Space + , Str "in" + , Space + , Str "quotes." + , Note [ Para [ Str "In" , Space , Str "quote." ] ] + ] + ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain + [ Str "And" + , Space + , Str "in" + , Space + , Str "list" + , Space + , Str "items." + , Note [ Para [ Str "In" , Space , Str "list." ] ] + ] + ] + ] + , Para + [ Str "This" + , Space + , Str "paragraph" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "part" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "note," + , Space + , Str "as" + , Space + , Str "it" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "indented." + ] + ] + ] diff --git a/test/docbook-chapter.docbook b/test/docbook-chapter.docbook new file mode 100644 --- /dev/null +++ b/test/docbook-chapter.docbook @@ -0,0 +1,30 @@ + + +Test Chapter +This chapter uses recursive sections. +
    +Like a Sect1 +This section is like a Sect1. +
    Like a Sect2 +This section is like a Sect2. +
    Like a Sect3 +This section is like a Sect3. +
    Like a Sect4 +This section is like a Sect4. +
    Like a Sect5 +This section is like a Sect5. +
    Would be like a Sect6 +This section would be like a Sect6, if there was one. +
    Would be like a Sect7 +This section would be like a Sect7, if there was one. +
    +
    +
    +
    +
    +
    +
    +     diff --git a/test/docbook-chapter.native b/test/docbook-chapter.native new file mode 100644 --- /dev/null +++ b/test/docbook-chapter.native @@ -0,0 +1,173 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Header + 1 ( "" , [] , [] ) [ Str "Test" , Space , Str "Chapter" ] + , Para + [ Str "This" + , Space + , Str "chapter" + , Space + , Str "uses" + , Space + , Str "recursive" + , Space + , Str "sections." + ] + , Header + 2 + ( "" , [] , [] ) + [ Str "Like" , Space , Str "a" , Space , Str "Sect1" ] + , Para + [ Str "This" + , Space + , Str "section" + , Space + , Str "is" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "Sect1." + ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Like" , Space , Str "a" , Space , Str "Sect2" ] + , Para + [ Str "This" + , Space + , Str "section" + , Space + , Str "is" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "Sect2." + ] + , Header + 4 + ( "" , [] , [] ) + [ Str "Like" , Space , Str "a" , Space , Str "Sect3" ] + , Para + [ Str "This" + , Space + , Str "section" + , Space + , Str "is" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "Sect3." + ] + , Header + 5 + ( "" , [] , [] ) + [ Str "Like" , Space , Str "a" , Space , Str "Sect4" ] + , Para + [ Str "This" + , Space + , Str "section" + , Space + , Str "is" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "Sect4." + ] + , Header + 6 + ( "" , [] , [] ) + [ Str "Like" , Space , Str "a" , Space , Str "Sect5" ] + , Para + [ Str "This" + , Space + , Str "section" + , Space + , Str "is" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "Sect5." + ] + , Header + 7 + ( "" , [] , [] ) + [ Str "Would" + , Space + , Str "be" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "Sect6" + ] + , Para + [ Str "This" + , Space + , Str "section" + , Space + , Str "would" + , Space + , Str "be" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "Sect6," + , Space + , Str "if" + , Space + , Str "there" + , Space + , Str "was" + , Space + , Str "one." + ] + , Header + 8 + ( "" , [] , [] ) + [ Str "Would" + , Space + , Str "be" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "Sect7" + ] + , Para + [ Str "This" + , Space + , Str "section" + , Space + , Str "would" + , Space + , Str "be" + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "Sect7," + , Space + , Str "if" + , Space + , Str "there" + , Space + , Str "was" + , Space + , Str "one." + ] + ] diff --git a/test/docbook-reader.docbook b/test/docbook-reader.docbook --- a/test/docbook-reader.docbook +++ b/test/docbook-reader.docbook @@ -1,7 +1,14 @@ -
    +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" +[ + + + +]> +
    Pandoc Test Suite @@ -20,9 +27,9 @@ This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite. - + Headers - + Level 2 with an <ulink url="/url">embedded link</ulink> Level 3 with <emphasis>emphasis</emphasis> @@ -47,6 +54,12 @@ with no blank line + + Level 4 + + An unnumbered section. + + @@ -61,6 +74,9 @@ Here’s a regular paragraph. + + And here’s a regular paragraph with a role. + In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. Because a hard-wrapped line in the middle of a paragraph looked like @@ -80,6 +96,11 @@ This is a block quote. It is pretty short. +
    + + This is a block quote with a role. + +
    Code in a block quote: @@ -89,6 +110,11 @@ print "working"; } + +sub status { + print "working with line numbers"; +} + % ls @@ -176,9 +202,9 @@ - Pluses loose: + Asterisks tight: - + Plus 1 @@ -195,30 +221,30 @@ - - Minuses loose: - - + + + Ordered + - Minus 1 + First - Minus 2 + Second - Minus 3 + Third - - - - Ordered - + + + with role: + + First @@ -236,9 +262,9 @@ - and using spaces: + and tight: - + One @@ -407,8 +433,8 @@ Fancy list markers - - + + begins with 2 @@ -420,8 +446,8 @@ with a continuation - - + + sublist with roman numerals, starting with 4 @@ -459,13 +485,13 @@ Upper Roman. - - + + Decimal start with 6 - - + + Lower alpha with paren @@ -705,6 +731,12 @@ So is this word. + So is this word with a role. + + + So is this phrase with a role. + + This is code: >, $, \, \$, <html>. @@ -713,6 +745,9 @@ More code: Class and Type + Referencing a man page: nix.conf5 + + This is strikeout. @@ -1405,6 +1440,75 @@ + Table with attributes + + + + Attribute table caption + + + + + + + + + + + + + +
    + + header cell 1 + + + + header cell 2 + +
    + + body cell 1 + + + + body cell 2 + +
    + + Table with attributes, without caption + + + + + + + header cell 1 + + + + + header cell 2 + + + + + + + + body cell 1 + + + + + body cell 2 + + + + + + + Multiline table without caption: @@ -1557,5 +1661,78 @@ + + Multiline table with cells spanning multiple columns and rows without caption. + + + + + + + + + + Columns + + + A + B + C + + + + + A1 + B1 + C1 + C2 + + + A2 + B2 + A3 + B3 + + + C3 + + + + + An Example Procedure + + + A Step + + + + + Another Step + + + + + Substeps can be nested indefinitely deep. + + + + + + + A Final Step + + + + + + Index terms + + In the simplest case, index termsindex term consists of just a <primary> element, but index termmulti-level they can also consist of a <primary> and <secondary> element, and index termmulti-level3-level can even include a <tertiary> term. + + + Index terms can also refer to other index terms: index cross referencingindex termcross referencesindex cross referencingexclusively, using the <see> tag; or index cross referencingcross referencing as a reference to related terms, using the <seealso> tag. + + + foodbig baguette supremeNested content in index term elements is flattened. + + + + Abbreviated title + Abbr. title
    diff --git a/test/docbook-reader.native b/test/docbook-reader.native --- a/test/docbook-reader.native +++ b/test/docbook-reader.native @@ -1,397 +1,3494 @@ -Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",SoftBreak,Str "MacFarlane"],MetaInlines [Str "Anonymous"]]),("date",MetaInlines [Str "July",Space,Str "17,",Space,Str "2006"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]}) -[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",SoftBreak,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."] -,Header 1 ("headers",[],[]) [Str "Headers"] -,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embedded",Space,Str "link"] ("/url","")] -,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Emph [Str "emphasis"]] -,Header 4 ("level-4",[],[]) [Str "Level",Space,Str "4"] -,Header 5 ("level-5",[],[]) [Str "Level",Space,Str "5"] -,Para [Str "Hi."] -,Header 1 ("level-1",[],[]) [Str "Level",Space,Str "1"] -,Header 2 ("level-2-with-emphasis",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Emph [Str "emphasis"]] -,Header 3 ("level-3",[],[]) [Str "Level",Space,Str "3"] -,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"] -,Header 2 ("level-2",[],[]) [Str "Level",Space,Str "2"] -,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"] -,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"] -,Para [Str "Here\8217s",Space,Str "a",Space,Str "regular",Space,Str "paragraph."] -,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",Space,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",SoftBreak,Str "item.",Space,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",SoftBreak,Str "a",Space,Str "list",Space,Str "item."] -,Para [Str "Here\8217s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",Space,Str "*",Space,Str "criminey."] -,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"] -,Para [Str "E-mail",Space,Str "style:"] -,BlockQuote - [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",Space,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."]] -,BlockQuote - [Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"] - ,CodeBlock ("",[],[]) "sub status {\n print \"working\";\n}" - ,CodeBlock ("",[],[]) "% ls" - ,Para [Str "A",Space,Str "list:"] - ,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "item",Space,Str "one"]] - ,[Para [Str "item",Space,Str "two"]]] - ,Para [Str "Nested",Space,Str "block",Space,Str "quotes:"] - ,BlockQuote - [Para [Str "nested"]] - ,BlockQuote - [Para [Str "nested"]]] -,Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",Space,Str ">",Space,Str "1."] -,Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."] -,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"] -,Para [Str "Code:"] -,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n\nthis code block is indented by one tab" -,Para [Str "And:"] -,CodeBlock ("",[],[]) " this code block is indented by two tabs\n\nThese should not be escaped: \\$ \\\\ \\> \\[ \\{" -,Header 1 ("lists",[],[]) [Str "Lists"] -,Header 2 ("unordered",[],[]) [Str "Unordered"] -,Para [Str "Asterisks",Space,Str "loose:"] -,BulletList - [[Para [Str "asterisk",Space,Str "1"]] - ,[Para [Str "asterisk",Space,Str "2"]] - ,[Para [Str "asterisk",Space,Str "3"]]] -,Para [Str "Pluses",Space,Str "loose:"] -,BulletList - [[Para [Str "Plus",Space,Str "1"]] - ,[Para [Str "Plus",Space,Str "2"]] - ,[Para [Str "Plus",Space,Str "3"]]] -,Para [Str "Minuses",Space,Str "loose:"] -,BulletList - [[Para [Str "Minus",Space,Str "1"]] - ,[Para [Str "Minus",Space,Str "2"]] - ,[Para [Str "Minus",Space,Str "3"]]] -,Header 2 ("ordered",[],[]) [Str "Ordered"] -,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "First"]] - ,[Para [Str "Second"]] - ,[Para [Str "Third"]]] -,Para [Str "and",Space,Str "using",Space,Str "spaces:"] -,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "One"]] - ,[Para [Str "Two"]] - ,[Para [Str "Three"]]] -,Para [Str "Multiple",Space,Str "paragraphs:"] -,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."] - ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog\8217s",SoftBreak,Str "back."]] - ,[Para [Str "Item",Space,Str "2."]] - ,[Para [Str "Item",Space,Str "3."]]] -,Header 2 ("nested",[],[]) [Str "Nested"] -,BulletList - [[Para [Str "Tab"] - ,BulletList - [[Para [Str "Tab"] - ,BulletList - [[Para [Str "Tab"]]]]]]] -,Para [Str "Here\8217s",Space,Str "another:"] -,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "First"]] - ,[Para [Str "Second:"] - ,BulletList - [[Para [Str "Fee"]] - ,[Para [Str "Fie"]] - ,[Para [Str "Foe"]]]] - ,[Para [Str "Third"]]] -,Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs:"] -,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "First"]] - ,[Para [Str "Second:"] - ,BulletList - [[Para [Str "Fee"]] - ,[Para [Str "Fie"]] - ,[Para [Str "Foe"]]]] - ,[Para [Str "Third"]]] -,Header 2 ("tabs-and-spaces",[],[]) [Str "Tabs",Space,Str "and",Space,Str "spaces"] -,BulletList - [[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"]] - ,[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"] - ,BulletList - [[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"]] - ,[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"]]]]] -,Header 2 ("fancy-list-markers",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"] -,OrderedList (2,Decimal,DefaultDelim) - [[Para [Str "begins",Space,Str "with",Space,Str "2"]] - ,[Para [Str "and",Space,Str "now",Space,Str "3"] - ,Para [Str "with",Space,Str "a",Space,Str "continuation"] - ,OrderedList (4,LowerRoman,DefaultDelim) - [[Para [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",Space,Str "starting",Space,Str "with",Space,Str "4"]] - ,[Para [Str "more",Space,Str "items"] - ,OrderedList (1,UpperAlpha,DefaultDelim) - [[Para [Str "a",Space,Str "subsublist"]] - ,[Para [Str "a",Space,Str "subsublist"]]]]]]] -,Para [Str "Nesting:"] -,OrderedList (1,UpperAlpha,DefaultDelim) - [[Para [Str "Upper",Space,Str "Alpha"] - ,OrderedList (1,UpperRoman,DefaultDelim) - [[Para [Str "Upper",Space,Str "Roman."] - ,OrderedList (6,Decimal,DefaultDelim) - [[Para [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"] - ,OrderedList (3,LowerAlpha,DefaultDelim) - [[Para [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]] -,Para [Str "Autonumbering:"] -,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "Autonumber."]] - ,[Para [Str "More."] - ,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "Nested."]]]]] -,Para [Str "Should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "list",Space,Str "item:"] -,Para [Str "M.A.\160\&2007"] -,Para [Str "B.",Space,Str "Williams"] -,Header 2 ("callout",[],[]) [Str "Callout"] -,Para [Str "Simple."] -,BulletList - [[Para [Str "A",Space,Code ("",[],[]) "__letrec",Space,Str "is",Space,Str "equivalent",Space,Str "to",Space,Str "a",Space,Str "normal",SoftBreak,Str "Haskell",Space,Str "LET."]] - ,[Para [Str "GHC",Space,Str "compiled",Space,Str "the",Space,Str "body",Space,Str "of",Space,Str "our",Space,Str "list",Space,Str "comprehension",Space,Str "into",SoftBreak,Str "a",Space,Str "loop",Space,Str "named",Space,Code ("",[],[]) "go_s1YC",Str "."]] - ,[Para [Str "If",Space,Str "our",Space,Str "CASE",Space,Str "expression",Space,Str "matches",Space,Str "the",Space,Str "empty",Space,Str "list,",Space,Str "we",SoftBreak,Str "return",Space,Str "the",Space,Str "empty",Space,Str "list.",Space,Str "This",Space,Str "is",Space,Str "reassuringly",SoftBreak,Str "familiar."]]] -,Header 1 ("definition-lists",[],[]) [Str "Definition",Space,Str "Lists"] -,DefinitionList - [([Str "apple"], - [[Para [Str "red",Space,Str "fruit"]]]) - ,([Str "orange"], - [[Para [Str "orange",Space,Str "fruit"]]]) - ,([Str "banana"], - [[Para [Str "yellow",Space,Str "fruit"]]])] -,Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics:"] -,DefinitionList - [([Emph [Str "apple"]], - [[Para [Str "red",Space,Str "fruit"] - ,Para [Str "contains",Space,Str "seeds,",Space,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"]]]) - ,([Emph [Str "orange"]], - [[Para [Str "orange",Space,Str "fruit"] - ,CodeBlock ("",[],[]) "{ orange code block }" - ,BlockQuote - [Para [Str "orange",Space,Str "block",Space,Str "quote"]]]])] -,Para [Str "Multiple",Space,Str "definitions,",Space,Str "loose:"] -,DefinitionList - [([Str "apple"], - [[Para [Str "red",Space,Str "fruit"]] - ,[Para [Str "computer"]]]) - ,([Str "orange"], - [[Para [Str "orange",Space,Str "fruit"]] - ,[Para [Str "bank"]]])] -,Para [Str "Blank",Space,Str "line",Space,Str "after",Space,Str "term,",Space,Str "indented",Space,Str "marker,",Space,Str "alternate",Space,Str "markers:"] -,DefinitionList - [([Str "apple"], - [[Para [Str "red",Space,Str "fruit"]] - ,[Para [Str "computer"]]]) - ,([Str "orange"], - [[Para [Str "orange",Space,Str "fruit"] - ,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "sublist"]] - ,[Para [Str "sublist"]]]]])] -,Header 1 ("inline-markup",[],[]) [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",SoftBreak,Str "this"],Str "."] -,Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",SoftBreak,Strong [Str "is",Space,Str "this"],Str "."] -,Para [Str "An",Space,Emph [Link ("",[],[]) [Str "emphasized",Space,Str "link"] ("/url","")],Str "."] -,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",SoftBreak,Str "em."]]] -,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."] -,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",SoftBreak,Str "em."]]] -,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."] -,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",SoftBreak,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",SoftBreak,Code ("",[],[]) "",Str "."] -,Para [Str "More",Space,Str "code:",Space,Code ("",[],[]) "Class",Space,Str "and",Space,Code ("",[],[]) "Type"] -,Para [Strikeout [Str "This",Space,Str "is",SoftBreak,Emph [Str "strikeout"],Str "."]] -,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",SoftBreak,Str "a",Superscript [Emph [Str "hello"]],SoftBreak,Str "a",Superscript [Str "hello\160there"],Str "."] -,Para [Str "Subscripts:",Space,Str "H",Subscript [Str "2"],Str "O,",Space,Str "H",Subscript [Str "23"],Str "O,",SoftBreak,Str "H",Subscript [Str "many\160of\160them"],Str "O."] -,Para [Str "These",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "superscripts",Space,Str "or",Space,Str "subscripts,",Space,Str "because",Space,Str "of",Space,Str "the",Space,Str "unescaped",SoftBreak,Str "spaces:",Space,Str "a^b",Space,Str "c^d,",Space,Str "a~b",Space,Str "c~d."] -,Header 1 ("smart-quotes-ellipses-dashes",[],[]) [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"] -,Para [Quoted DoubleQuote [Str "Hello,"],Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Quoted DoubleQuote [Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",SoftBreak,Str "name."]] -,Para [Quoted DoubleQuote [Str "A"],Str ",",Space,Quoted DoubleQuote [Str "B"],Str ",",Space,Str "and",Space,Quoted DoubleQuote [Str "C"],Space,Str "are",Space,Str "letters."] -,Para [Quoted DoubleQuote [Str "He",Space,Str "said,",Space,Quoted SingleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go."]],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",SoftBreak,Str "70\8217s?"] -,Para [Str "Some",Space,Str "dashes:",Space,Str "one\8212two",Space,Str "\8212",Space,Str "three\8212four",Space,Str "\8212",Space,Str "five."] -,Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5\8211\&7,",Space,Str "255\8211\&66,",Space,Str "1987\8211\&1999."] -,Para [Str "Ellipses\8230and\8230and\8230."] -,Header 1 ("math",[],[]) [] -,Para [Math DisplayMath "e = mc^{2}",Math DisplayMath "1",SoftBreak,Math InlineMath "e = mc^{2}",SoftBreak,Math DisplayMath "e = mc^{2}"] -,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"] -,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"] -,BulletList - [[Para [Str "I",Space,Str "hat:",Space,Str "\206"]] - ,[Para [Str "o",Space,Str "umlaut:",Space,Str "\246"]] - ,[Para [Str "section:",Space,Str "\167"]] - ,[Para [Str "set",Space,Str "membership:",Space,Str "\8712"]] - ,[Para [Str "copyright:",Space,Str "\169"]]] -,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."] -,Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."] -,Para [Str "This",Space,Str "&",Space,Str "that."] -,Para [Str "4",Space,Str "<",Space,Str "5."] -,Para [Str "6",Space,Str ">",Space,Str "5."] -,Para [Str "Backslash:",Space,Str "\\"] -,Para [Str "Backtick:",Space,Str "`"] -,Para [Str "Asterisk:",Space,Str "*"] -,Para [Str "Underscore:",Space,Str "_"] -,Para [Str "Left",Space,Str "brace:",Space,Str "{"] -,Para [Str "Right",Space,Str "brace:",Space,Str "}"] -,Para [Str "Left",Space,Str "bracket:",Space,Str "["] -,Para [Str "Right",Space,Str "bracket:",Space,Str "]"] -,Para [Str "Left",Space,Str "paren:",Space,Str "("] -,Para [Str "Right",Space,Str "paren:",Space,Str ")"] -,Para [Str "Greater-than:",Space,Str ">"] -,Para [Str "Hash:",Space,Str "#"] -,Para [Str "Period:",Space,Str "."] -,Para [Str "Bang:",Space,Str "!"] -,Para [Str "Plus:",Space,Str "+"] -,Para [Str "Minus:",Space,Str "-"] -,Header 1 ("links",[],[]) [Str "Links"] -,Header 2 ("explicit",[],[]) [Str "Explicit"] -,Para [Str "Just",Space,Str "a",Space,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","")] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","")] -,Para [Link ("",[],[]) [Str "with_underscore"] ("/url/with_underscore","")] -,Para [Link ("",[],[]) [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")] -,Para [Link ("",[],[]) [Str "Empty"] ("",""),Str "."] -,Header 2 ("reference",[],[]) [Str "Reference"] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."] -,Para [Str "With",Space,Link ("",[],[]) [Str "embedded",Space,Str "[brackets]"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "b"] ("/url/",""),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."] -,Para [Str "Indented",Space,Link ("",[],[]) [Str "once"] ("/url",""),Str "."] -,Para [Str "Indented",Space,Link ("",[],[]) [Str "twice"] ("/url",""),Str "."] -,Para [Str "Indented",Space,Link ("",[],[]) [Str "thrice"] ("/url",""),Str "."] -,Para [Str "This",Space,Str "should",Space,Str "[not][]",Space,Str "be",Space,Str "a",Space,Str "link."] -,CodeBlock ("",[],[]) "[not]: /url" -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "biz"] ("/url/",""),Str "."] -,Header 2 ("with-ampersands",[],[]) [Str "With",Space,Str "ampersands"] -,Para [Str "Here\8217s",Space,Str "a",Space,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",SoftBreak,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."] -,Para [Str "Here\8217s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",SoftBreak,Link ("",[],[]) [Str "AT&T"] ("http://att.com/",""),Str "."] -,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."] -,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",SoftBreak,Str "braces"] ("/script?foo=1&bar=2",""),Str "."] -,Header 2 ("autolinks",[],[]) [Str "Autolinks"] -,Para [Str "With",Space,Str "an",Space,Str "ampersand:",SoftBreak,Link ("",[],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")] -,BulletList - [[Para [Str "In",Space,Str "a",Space,Str "list?"]] - ,[Para [Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]] - ,[Para [Str "It",Space,Str "should."]]] -,Para [Str "An",Space,Str "e-mail",Space,Str "address:",Space,Link ("",[],[]) [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")] -,BlockQuote - [Para [Str "Blockquoted:",SoftBreak,Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]] -,Para [Str "Auto-links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",SoftBreak,Code ("",[],[]) ""] -,CodeBlock ("",[],[]) "or here: " -,Header 1 ("images",[],[]) [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):"] -,Para [Image ("",[],[]) [Str "lalune",Space,Str "fig",Space,Str "caption"] ("lalune.jpg","fig:")] -,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image ("",[],[]) [] ("movie.jpg",""),Space,Str "icon.",SoftBreak,Str "And",Space,Str "here",Space,Str "a",Space,Str "second",Space,Str "movie",Space,Image ("",[],[]) [Str "alt",Space,Str "text"] ("movie.jpg",""),Space,Str "icon.",SoftBreak,Str "And",Space,Str "here",Space,Str "a",Space,Str "third",Space,Str "movie",Space,Image ("",[],[]) [Str "alt",Space,Str "text"] ("movie.jpg",""),Space,Str "icon."] -,Para [Image ("",[],[]) [Str "lalune",Space,Str "no",Space,Str "figure",Space,Str "alt",Space,Str "text"] ("lalune.jpg","")] -,Header 1 ("footnotes",[],[]) [Str "Footnotes"] -,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Note [Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",Space,Str "reference.",SoftBreak,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document."]],Space,Str "and",Space,Str "another.",Note [Para [Str "Here\8217s",Space,Str "the",Space,Str "long",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."],Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",SoftBreak,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)."],CodeBlock ("",[],[]) " { }",Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",SoftBreak,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block."]],Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",SoftBreak,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space.[^my",Space,Str "note]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note.",Note [Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type.",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",SoftBreak,Link ("",[],[]) [Str "links"] ("http://google.com",""),Space,Str "and",Space,Code ("",[],[]) "]",SoftBreak,Str "verbatim",Space,Str "characters,",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str "[bracketed",Space,Str "text]."]]] -,BlockQuote - [Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes.",Note [Para [Str "In",Space,Str "quote."]]]] -,OrderedList (1,Decimal,DefaultDelim) - [[Para [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",Note [Para [Str "In",Space,Str "list."]]]]] -,Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."] -,Header 1 ("tables",[],[]) [Str "Tables"] -,Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"] -,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0,0.0] - [[Plain [Str "Right"]] - ,[Plain [Str "Left"]] - ,[Plain [Str "Center"]] - ,[Plain [Str "Default"]]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"] -,Table [] [AlignRight,AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0,0.0] - [[Plain [Str "Right"]] - ,[Plain [Str "Left"]] - ,[Plain [Str "Center"]] - ,[Plain [Str "Default"]]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"] -,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0,0.0] - [[Plain [Str "Right"]] - ,[Plain [Str "Left"]] - ,[Plain [Str "Center"]] - ,[Plain [Str "Default"]]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"] -,Table [Str "Here's",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.2,0.2,0.3,0.3] - [[Plain [Str "Centered",Space,Str "Header"]] - ,[Plain [Str "Left",Space,Str "Aligned"]] - ,[Plain [Str "Right",Space,Str "Aligned"]] - ,[Plain [Str "Default",Space,Str "aligned"]]] - [[[Plain [Str "First"]] - ,[Plain [Str "row"]] - ,[Plain [Str "12.0"]] - ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,[[Plain [Str "Second"]] - ,[Plain [Str "row"]] - ,[Plain [Str "5.0"]] - ,[Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]] -,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"] -,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.1,0.2,0.3,0.4] - [[Plain [Str "Centered",Space,Str "Header"]] - ,[Plain [Str "Left",Space,Str "Aligned"]] - ,[Plain [Str "Right",Space,Str "Aligned"]] - ,[Plain [Str "Default",Space,Str "aligned"]]] - [[[Plain [Str "First"]] - ,[Plain [Str "row"]] - ,[Plain [Str "12.0"]] - ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,[[Plain [Str "Second"]] - ,[Plain [Str "row"]] - ,[Plain [Str "5.0"]] - ,[Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]] -,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"] -,Table [] [AlignRight,AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0,0.0] - [[] - ,[] - ,[] - ,[]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"] -,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.25,0.25,0.25,0.25] - [[] - ,[] - ,[] - ,[]] - [[[Plain [Str "First"]] - ,[Plain [Str "row"]] - ,[Plain [Str "12.0"]] - ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,[[Plain [Str "Second"]] - ,[Plain [Str "row"]] - ,[Plain [Str "5.0"]] - ,[Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]] +Pandoc + Meta + { unMeta = + fromList + [ ( "author" + , MetaList + [ MetaInlines [ Str "John" , Space , Str "MacFarlane" ] + , MetaInlines [ Str "Anonymous" ] + ] + ) + , ( "date" + , MetaInlines + [ Str "July" , Space , Str "17," , Space , Str "2006" ] + ) + , ( "title" + , MetaInlines + [ Str "Pandoc" + , Space + , Str "Test" + , Space + , Str "Suite" + ] + ) + ] + } + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "set" + , Space + , Str "of" + , Space + , Str "tests" + , Space + , Str "for" + , Space + , Str "pandoc." + , Space + , Str "Most" + , Space + , Str "of" + , Space + , Str "them" + , Space + , Str "are" + , Space + , Str "adapted" + , Space + , Str "from" + , Space + , Str "John" + , SoftBreak + , Str "Gruber\8217s" + , Space + , Str "markdown" + , Space + , Str "test" + , Space + , Str "suite." + ] + , Header + 1 + ( "headers" , [] , [ ( "role" , "sect1role" ) ] ) + [ Str "Headers" ] + , Header + 2 + ( "level-2-with-an-embedded-link" + , [] + , [ ( "role" , "sect2role" ) ] + ) + [ Str "Level" + , Space + , Str "2" + , Space + , Str "with" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "embedded" , Space , Str "link" ] + ( "/url" , "" ) + ] + , Header + 3 + ( "level-3-with-emphasis" , [] , [] ) + [ Str "Level" + , Space + , Str "3" + , Space + , Str "with" + , Space + , Emph [ Str "emphasis" ] + ] + , Header + 4 ( "level-4" , [] , [] ) [ Str "Level" , Space , Str "4" ] + , Header + 5 ( "level-5" , [] , [] ) [ Str "Level" , Space , Str "5" ] + , Para [ Str "Hi." ] + , Header + 1 ( "level-1" , [] , [] ) [ Str "Level" , Space , Str "1" ] + , Header + 2 + ( "level-2-with-emphasis" , [] , [] ) + [ Str "Level" + , Space + , Str "2" + , Space + , Str "with" + , Space + , Emph [ Str "emphasis" ] + ] + , Header + 3 ( "level-3" , [] , [] ) [ Str "Level" , Space , Str "3" ] + , Para + [ Str "with" + , Space + , Str "no" + , Space + , Str "blank" + , Space + , Str "line" + ] + , Header + 4 + ( "" , [ "unnumbered" ] , [] ) + [ Str "Level" , Space , Str "4" ] + , Para + [ Str "An" + , Space + , Str "unnumbered" + , Space + , Str "section." + ] + , Header + 2 ( "level-2" , [] , [] ) [ Str "Level" , Space , Str "2" ] + , Para + [ Str "with" + , Space + , Str "no" + , Space + , Str "blank" + , Space + , Str "line" + ] + , Header 1 ( "paragraphs" , [] , [] ) [ Str "Paragraphs" ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "regular" + , Space + , Str "paragraph." + ] + , Div + ( "" + , [] + , [ ( "wrapper" , "1" ) , ( "role" , "pararole" ) ] + ) + [ Para + [ Str "And" + , Space + , Str "here\8217s" + , Space + , Str "a" + , Space + , Str "regular" + , Space + , Str "paragraph" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "role." + ] + ] + , Para + [ Str "In" + , Space + , Str "Markdown" + , Space + , Str "1.0.0" + , Space + , Str "and" + , Space + , Str "earlier." + , Space + , Str "Version" + , Space + , Str "8." + , Space + , Str "This" + , Space + , Str "line" + , Space + , Str "turns" + , Space + , Str "into" + , Space + , Str "a" + , Space + , Str "list" + , SoftBreak + , Str "item." + , Space + , Str "Because" + , Space + , Str "a" + , Space + , Str "hard-wrapped" + , Space + , Str "line" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "middle" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "paragraph" + , Space + , Str "looked" + , Space + , Str "like" + , SoftBreak + , Str "a" + , Space + , Str "list" + , Space + , Str "item." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "one" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "bullet." + , Space + , Str "*" + , Space + , Str "criminey." + ] + , Header + 1 + ( "block-quotes" , [] , [] ) + [ Str "Block" , Space , Str "Quotes" ] + , Para [ Str "E-mail" , Space , Str "style:" ] + , BlockQuote + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote." + , Space + , Str "It" + , Space + , Str "is" + , Space + , Str "pretty" + , Space + , Str "short." + ] + ] + , Div + ( "" + , [] + , [ ( "wrapper" , "1" ) , ( "role" , "roleblockquote" ) ] + ) + [ BlockQuote + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "role." + ] + ] + ] + , BlockQuote + [ Para + [ Str "Code" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote:" + ] + , CodeBlock + ( "" , [] , [] ) "sub status {\n print \"working\";\n}" + , CodeBlock + ( "" , [ "numberLines" ] , [] ) + "sub status {\n print \"working with line numbers\";\n}" + , CodeBlock ( "" , [] , [] ) "% ls" + , Para [ Str "A" , Space , Str "list:" ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para [ Str "item" , Space , Str "one" ] ] + , [ Para [ Str "item" , Space , Str "two" ] ] + ] + , Para + [ Str "Nested" + , Space + , Str "block" + , Space + , Str "quotes:" + ] + , BlockQuote [ Para [ Str "nested" ] ] + , BlockQuote [ Para [ Str "nested" ] ] + ] + , Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote:" + , Space + , Str "2" + , Space + , Str ">" + , Space + , Str "1." + ] + , Para + [ Str "And" + , Space + , Str "a" + , Space + , Str "following" + , Space + , Str "paragraph." + ] + , Header + 1 + ( "code-blocks" , [] , [] ) + [ Str "Code" , Space , Str "Blocks" ] + , Para [ Str "Code:" ] + , CodeBlock + ( "" , [] , [] ) + "---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n\nthis code block is indented by one tab" + , Para [ Str "And:" ] + , CodeBlock + ( "" , [] , [] ) + " this code block is indented by two tabs\n\nThese should not be escaped: \\$ \\\\ \\> \\[ \\{" + , Header 1 ( "lists" , [] , [] ) [ Str "Lists" ] + , Header 2 ( "unordered" , [] , [] ) [ Str "Unordered" ] + , Para [ Str "Asterisks" , Space , Str "loose:" ] + , BulletList + [ [ Para [ Str "asterisk" , Space , Str "1" ] ] + , [ Para [ Str "asterisk" , Space , Str "2" ] ] + , [ Para [ Str "asterisk" , Space , Str "3" ] ] + ] + , Para [ Str "Asterisks" , Space , Str "tight:" ] + , BulletList + [ [ Plain [ Str "Plus" , Space , Str "1" ] ] + , [ Plain [ Str "Plus" , Space , Str "2" ] ] + , [ Plain [ Str "Plus" , Space , Str "3" ] ] + ] + , Header 2 ( "ordered" , [] , [] ) [ Str "Ordered" ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para [ Str "First" ] ] + , [ Para [ Str "Second" ] ] + , [ Para [ Str "Third" ] ] + ] + , Para [ Str "with" , Space , Str "role:" ] + , Div + ( "" + , [] + , [ ( "wrapper" , "1" ) , ( "role" , "listrole" ) ] + ) + [ OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para [ Str "First" ] ] + , [ Para [ Str "Second" ] ] + , [ Para [ Str "Third" ] ] + ] + ] + , Para [ Str "and" , Space , Str "tight:" ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Plain [ Str "One" ] ] + , [ Plain [ Str "Two" ] ] + , [ Plain [ Str "Three" ] ] + ] + , Para [ Str "Multiple" , Space , Str "paragraphs:" ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para + [ Str "Item" + , Space + , Str "1," + , Space + , Str "graf" + , Space + , Str "one." + ] + , Para + [ Str "Item" + , Space + , Str "1." + , Space + , Str "graf" + , Space + , Str "two." + , Space + , Str "The" + , Space + , Str "quick" + , Space + , Str "brown" + , Space + , Str "fox" + , Space + , Str "jumped" + , Space + , Str "over" + , Space + , Str "the" + , Space + , Str "lazy" + , Space + , Str "dog\8217s" + , SoftBreak + , Str "back." + ] + ] + , [ Para [ Str "Item" , Space , Str "2." ] ] + , [ Para [ Str "Item" , Space , Str "3." ] ] + ] + , Header 2 ( "nested" , [] , [] ) [ Str "Nested" ] + , BulletList + [ [ Para [ Str "Tab" ] + , BulletList + [ [ Para [ Str "Tab" ] + , BulletList [ [ Para [ Str "Tab" ] ] ] + ] + ] + ] + ] + , Para [ Str "Here\8217s" , Space , Str "another:" ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para [ Str "First" ] ] + , [ Para [ Str "Second:" ] + , BulletList + [ [ Para [ Str "Fee" ] ] + , [ Para [ Str "Fie" ] ] + , [ Para [ Str "Foe" ] ] + ] + ] + , [ Para [ Str "Third" ] ] + ] + , Para + [ Str "Same" + , Space + , Str "thing" + , Space + , Str "but" + , Space + , Str "with" + , Space + , Str "paragraphs:" + ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para [ Str "First" ] ] + , [ Para [ Str "Second:" ] + , BulletList + [ [ Para [ Str "Fee" ] ] + , [ Para [ Str "Fie" ] ] + , [ Para [ Str "Foe" ] ] + ] + ] + , [ Para [ Str "Third" ] ] + ] + , Header + 2 + ( "tabs-and-spaces" , [] , [] ) + [ Str "Tabs" , Space , Str "and" , Space , Str "spaces" ] + , BulletList + [ [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "indented" + , Space + , Str "with" + , Space + , Str "tabs" + ] + ] + , [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "indented" + , Space + , Str "with" + , Space + , Str "spaces" + ] + , BulletList + [ [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "example" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "indented" + , Space + , Str "with" + , Space + , Str "tabs" + ] + ] + , [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "example" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "indented" + , Space + , Str "with" + , Space + , Str "spaces" + ] + ] + ] + ] + ] + , Header + 2 + ( "fancy-list-markers" , [] , [] ) + [ Str "Fancy" , Space , Str "list" , Space , Str "markers" ] + , OrderedList + ( 2 , Decimal , DefaultDelim ) + [ [ Para + [ Str "begins" , Space , Str "with" , Space , Str "2" ] + ] + , [ Para [ Str "and" , Space , Str "now" , Space , Str "3" ] + , Para + [ Str "with" + , Space + , Str "a" + , Space + , Str "continuation" + ] + , OrderedList + ( 4 , LowerRoman , DefaultDelim ) + [ [ Para + [ Str "sublist" + , Space + , Str "with" + , Space + , Str "roman" + , Space + , Str "numerals," + , Space + , Str "starting" + , Space + , Str "with" + , Space + , Str "4" + ] + ] + , [ Para [ Str "more" , Space , Str "items" ] + , OrderedList + ( 1 , UpperAlpha , DefaultDelim ) + [ [ Para [ Str "a" , Space , Str "subsublist" ] ] + , [ Para [ Str "a" , Space , Str "subsublist" ] ] + ] + ] + ] + ] + ] + , Para [ Str "Nesting:" ] + , OrderedList + ( 1 , UpperAlpha , DefaultDelim ) + [ [ Para [ Str "Upper" , Space , Str "Alpha" ] + , OrderedList + ( 1 , UpperRoman , DefaultDelim ) + [ [ Para [ Str "Upper" , Space , Str "Roman." ] + , OrderedList + ( 6 , Decimal , DefaultDelim ) + [ [ Para + [ Str "Decimal" + , Space + , Str "start" + , Space + , Str "with" + , Space + , Str "6" + ] + , OrderedList + ( 3 , LowerAlpha , DefaultDelim ) + [ [ Para + [ Str "Lower" + , Space + , Str "alpha" + , Space + , Str "with" + , Space + , Str "paren" + ] + ] + ] + ] + ] + ] + ] + ] + ] + , Para [ Str "Autonumbering:" ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para [ Str "Autonumber." ] ] + , [ Para [ Str "More." ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para [ Str "Nested." ] ] ] + ] + ] + , Para + [ Str "Should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item:" + ] + , Para [ Str "M.A.\160\&2007" ] + , Para [ Str "B." , Space , Str "Williams" ] + , Header 2 ( "callout" , [] , [] ) [ Str "Callout" ] + , Para [ Str "Simple." ] + , BulletList + [ [ Para + [ Str "A" + , Space + , Code ( "" , [] , [] ) "__letrec" + , Space + , Str "is" + , Space + , Str "equivalent" + , Space + , Str "to" + , Space + , Str "a" + , Space + , Str "normal" + , SoftBreak + , Str "Haskell" + , Space + , Str "LET." + ] + ] + , [ Para + [ Str "GHC" + , Space + , Str "compiled" + , Space + , Str "the" + , Space + , Str "body" + , Space + , Str "of" + , Space + , Str "our" + , Space + , Str "list" + , Space + , Str "comprehension" + , Space + , Str "into" + , SoftBreak + , Str "a" + , Space + , Str "loop" + , Space + , Str "named" + , Space + , Code ( "" , [] , [] ) "go_s1YC" + , Str "." + ] + ] + , [ Para + [ Str "If" + , Space + , Str "our" + , Space + , Str "CASE" + , Space + , Str "expression" + , Space + , Str "matches" + , Space + , Str "the" + , Space + , Str "empty" + , Space + , Str "list," + , Space + , Str "we" + , SoftBreak + , Str "return" + , Space + , Str "the" + , Space + , Str "empty" + , Space + , Str "list." + , Space + , Str "This" + , Space + , Str "is" + , Space + , Str "reassuringly" + , SoftBreak + , Str "familiar." + ] + ] + ] + , Header + 1 + ( "definition-lists" , [] , [] ) + [ Str "Definition" , Space , Str "Lists" ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "banana" ] + , [ [ Para [ Str "yellow" , Space , Str "fruit" ] ] ] + ) + ] + , Para + [ Str "Multiple" + , Space + , Str "blocks" + , Space + , Str "with" + , Space + , Str "italics:" + ] + , DefinitionList + [ ( [ Emph [ Str "apple" ] ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] + , Para + [ Str "contains" + , Space + , Str "seeds," + , Space + , Str "crisp," + , Space + , Str "pleasant" + , Space + , Str "to" + , Space + , Str "taste" + ] + ] + ] + ) + , ( [ Emph [ Str "orange" ] ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] + , CodeBlock ( "" , [] , [] ) "{ orange code block }" + , BlockQuote + [ Para + [ Str "orange" + , Space + , Str "block" + , Space + , Str "quote" + ] + ] + ] + ] + ) + ] + , Para + [ Str "Multiple" + , Space + , Str "definitions," + , Space + , Str "loose:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] ] + , [ Para [ Str "computer" ] ] + ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] ] + , [ Para [ Str "bank" ] ] + ] + ) + ] + , Para + [ Str "Blank" + , Space + , Str "line" + , Space + , Str "after" + , Space + , Str "term," + , Space + , Str "indented" + , Space + , Str "marker," + , Space + , Str "alternate" + , Space + , Str "markers:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] ] + , [ Para [ Str "computer" ] ] + ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para [ Str "sublist" ] ] + , [ Para [ Str "sublist" ] ] + ] + ] + ] + ) + ] + , Header + 1 + ( "inline-markup" , [] , [] ) + [ 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" , SoftBreak , Str "this" ] + , Str "." + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Strong [ Str "strong" ] + , Str "," + , Space + , Str "and" + , Space + , Str "so" + , SoftBreak + , Strong [ Str "is" , Space , Str "this" ] + , Str "." + ] + , Para + [ Str "An" + , Space + , Emph + [ Link + ( "" , [] , [] ) + [ Str "emphasized" , Space , Str "link" ] + ( "/url" , "" ) + ] + , Str "." + ] + , Para + [ Strong + [ Emph + [ Str "This" + , Space + , Str "is" + , Space + , Str "strong" + , Space + , Str "and" + , SoftBreak + , Str "em." + ] + ] + ] + , Para + [ Str "So" + , Space + , Str "is" + , Space + , Strong [ Emph [ Str "this" ] ] + , Space + , Str "word." + ] + , Para + [ Strong + [ Emph + [ Str "This" + , Space + , Str "is" + , Space + , Str "strong" + , Space + , Str "and" + , SoftBreak + , Str "em." + ] + ] + ] + , Para + [ Str "So" + , Space + , Str "is" + , Space + , Strong [ Emph [ Str "this" ] ] + , Space + , Str "word." + ] + , Para + [ Str "So" + , Space + , Str "is" + , Space + , Emph [ Emph [ Str "this" ] ] + , Space + , Str "word" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "role." + ] + , Para + [ Str "So" + , Space + , Str "is" + , Space + , Span + ( "" , [ "phraserole" ] , [ ( "role" , "phraserole" ) ] ) + [ Str "this" ] + , Space + , Str "phrase" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "role." + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "code:" + , Space + , Code ( "" , [] , [] ) ">" + , Str "," + , Space + , Code ( "" , [] , [] ) "$" + , Str "," + , SoftBreak + , Code ( "" , [] , [] ) "\\" + , Str "," + , Space + , Code ( "" , [] , [] ) "\\$" + , Str "," + , SoftBreak + , Code ( "" , [] , [] ) "" + , Str "." + ] + , Para + [ Str "More" + , Space + , Str "code:" + , Space + , Code ( "" , [] , [] ) "Class" + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "Type" + ] + , Para + [ Str "Referencing" + , Space + , Str "a" + , Space + , Str "man" + , Space + , Str "page:" + , Space + , Code ( "" , [ "citerefentry" ] , [] ) "nix.conf(5)" + ] + , Para + [ Strikeout + [ Str "This" + , Space + , Str "is" + , SoftBreak + , Emph [ Str "strikeout" ] + , Str "." + ] + ] + , Para + [ Str "Superscripts:" + , Space + , Str "a" + , Superscript [ Str "bc" ] + , Str "d" + , SoftBreak + , Str "a" + , Superscript [ Emph [ Str "hello" ] ] + , SoftBreak + , Str "a" + , Superscript [ Str "hello\160there" ] + , Str "." + ] + , Para + [ Str "Subscripts:" + , Space + , Str "H" + , Subscript [ Str "2" ] + , Str "O," + , Space + , Str "H" + , Subscript [ Str "23" ] + , Str "O," + , SoftBreak + , Str "H" + , Subscript [ Str "many\160of\160them" ] + , Str "O." + ] + , Para + [ Str "These" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "superscripts" + , Space + , Str "or" + , Space + , Str "subscripts," + , Space + , Str "because" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "unescaped" + , SoftBreak + , Str "spaces:" + , Space + , Str "a^b" + , Space + , Str "c^d," + , Space + , Str "a~b" + , Space + , Str "c~d." + ] + , Header + 1 + ( "smart-quotes-ellipses-dashes" , [] , [] ) + [ Str "Smart" + , Space + , Str "quotes," + , Space + , Str "ellipses," + , Space + , Str "dashes" + ] + , Para + [ Quoted DoubleQuote [ Str "Hello," ] + , Space + , Str "said" + , Space + , Str "the" + , Space + , Str "spider." + , Space + , Quoted + DoubleQuote + [ Quoted SingleQuote [ Str "Shelob" ] + , Space + , Str "is" + , Space + , Str "my" + , SoftBreak + , Str "name." + ] + ] + , Para + [ Quoted DoubleQuote [ Str "A" ] + , Str "," + , Space + , Quoted DoubleQuote [ Str "B" ] + , Str "," + , Space + , Str "and" + , Space + , Quoted DoubleQuote [ Str "C" ] + , Space + , Str "are" + , Space + , Str "letters." + ] + , Para + [ Quoted + DoubleQuote + [ Str "He" + , Space + , Str "said," + , Space + , Quoted + SingleQuote + [ Str "I" + , Space + , Str "want" + , Space + , Str "to" + , Space + , Str "go." + ] + ] + , Space + , Str "Were" + , Space + , Str "you" + , Space + , Str "alive" + , Space + , Str "in" + , Space + , Str "the" + , SoftBreak + , Str "70\8217s?" + ] + , Para + [ Str "Some" + , Space + , Str "dashes:" + , Space + , Str "one\8212two" + , Space + , Str "\8212" + , Space + , Str "three\8212four" + , Space + , Str "\8212" + , Space + , Str "five." + ] + , Para + [ Str "Dashes" + , Space + , Str "between" + , Space + , Str "numbers:" + , Space + , Str "5\8211\&7," + , Space + , Str "255\8211\&66," + , Space + , Str "1987\8211\&1999." + ] + , Para [ Str "Ellipses\8230and\8230and\8230." ] + , Header 1 ( "math" , [] , [] ) [] + , Para + [ Math DisplayMath "e = mc^{2}" + , Math DisplayMath "1" + , SoftBreak + , Math InlineMath "e = mc^{2}" + , SoftBreak + , Math DisplayMath "e = mc^{2}" + ] + , Header + 1 + ( "special-characters" , [] , [] ) + [ Str "Special" , Space , Str "Characters" ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "some" + , Space + , Str "unicode:" + ] + , BulletList + [ [ Para + [ Str "I" , Space , Str "hat:" , Space , Str "\206" ] + ] + , [ Para + [ Str "o" , Space , Str "umlaut:" , Space , Str "\246" ] + ] + , [ Para [ Str "section:" , Space , Str "\167" ] ] + , [ Para + [ Str "set" + , Space + , Str "membership:" + , Space + , Str "\8712" + ] + ] + , [ Para [ Str "copyright:" , Space , Str "\169" ] ] + ] + , Para + [ Str "AT&T" + , Space + , Str "has" + , Space + , Str "an" + , Space + , Str "ampersand" + , Space + , Str "in" + , Space + , Str "their" + , Space + , Str "name." + ] + , Para + [ Str "AT&T" + , Space + , Str "is" + , Space + , Str "another" + , Space + , Str "way" + , Space + , Str "to" + , Space + , Str "write" + , Space + , Str "it." + ] + , Para + [ Str "This" , Space , Str "&" , Space , Str "that." ] + , Para [ Str "4" , Space , Str "<" , Space , Str "5." ] + , Para [ Str "6" , Space , Str ">" , Space , Str "5." ] + , Para [ Str "Backslash:" , Space , Str "\\" ] + , Para [ Str "Backtick:" , Space , Str "`" ] + , Para [ Str "Asterisk:" , Space , Str "*" ] + , Para [ Str "Underscore:" , Space , Str "_" ] + , Para + [ Str "Left" , Space , Str "brace:" , Space , Str "{" ] + , Para + [ Str "Right" , Space , Str "brace:" , Space , Str "}" ] + , Para + [ Str "Left" , Space , Str "bracket:" , Space , Str "[" ] + , Para + [ Str "Right" , Space , Str "bracket:" , Space , Str "]" ] + , Para + [ Str "Left" , Space , Str "paren:" , Space , Str "(" ] + , Para + [ Str "Right" , Space , Str "paren:" , Space , Str ")" ] + , Para [ Str "Greater-than:" , Space , Str ">" ] + , Para [ Str "Hash:" , Space , Str "#" ] + , Para [ Str "Period:" , Space , Str "." ] + , Para [ Str "Bang:" , Space , Str "!" ] + , Para [ Str "Plus:" , Space , Str "+" ] + , Para [ Str "Minus:" , Space , Str "-" ] + , Header 1 ( "links" , [] , [] ) [ Str "Links" ] + , Header 2 ( "explicit" , [] , [] ) [ Str "Explicit" ] + , Para + [ Str "Just" + , Space + , Str "a" + , Space + , Link ( "" , [] , [] ) [ Str "URL" ] ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "URL" , Space , Str "and" , Space , Str "title" ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "URL" , Space , Str "and" , Space , Str "title" ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "URL" , Space , Str "and" , Space , Str "title" ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "URL" , Space , Str "and" , Space , Str "title" ] + ( "/url/" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "URL" , Space , Str "and" , Space , Str "title" ] + ( "/url/" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "with_underscore" ] + ( "/url/with_underscore" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "nobody@nowhere.net" ] + ( "mailto:nobody@nowhere.net" , "" ) + ] + , Para + [ Link ( "" , [] , [] ) [ Str "Empty" ] ( "" , "" ) + , Str "." + ] + , Header 2 ( "reference" , [] , [] ) [ Str "Reference" ] + , Para + [ Str "Foo" + , Space + , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" ) + , Str "." + ] + , Para + [ Str "Foo" + , Space + , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" ) + , Str "." + ] + , Para + [ Str "Foo" + , Space + , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" ) + , Str "." + ] + , Para + [ Str "With" + , Space + , Link + ( "" , [] , [] ) + [ Str "embedded" , Space , Str "[brackets]" ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link ( "" , [] , [] ) [ Str "b" ] ( "/url/" , "" ) + , Space + , Str "by" + , Space + , Str "itself" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "link." + ] + , Para + [ Str "Indented" + , Space + , Link ( "" , [] , [] ) [ Str "once" ] ( "/url" , "" ) + , Str "." + ] + , Para + [ Str "Indented" + , Space + , Link ( "" , [] , [] ) [ Str "twice" ] ( "/url" , "" ) + , Str "." + ] + , Para + [ Str "Indented" + , Space + , Link ( "" , [] , [] ) [ Str "thrice" ] ( "/url" , "" ) + , Str "." + ] + , Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "[not][]" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "link." + ] + , CodeBlock ( "" , [] , [] ) "[not]: /url" + , Para + [ Str "Foo" + , Space + , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" ) + , Str "." + ] + , Para + [ Str "Foo" + , Space + , Link ( "" , [] , [] ) [ Str "biz" ] ( "/url/" , "" ) + , Str "." + ] + , Header + 2 + ( "with-ampersands" , [] , [] ) + [ Str "With" , Space , Str "ampersands" ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Link + ( "" , [] , [] ) + [ Str "link" + , Space + , Str "with" + , Space + , Str "an" + , SoftBreak + , Str "ampersand" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "URL" + ] + ( "http://example.com/?foo=1&bar=2" , "" ) + , Str "." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "link" + , Space + , Str "with" + , Space + , Str "an" + , Space + , Str "amersand" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "link" + , Space + , Str "text:" + , SoftBreak + , Link + ( "" , [] , [] ) [ Str "AT&T" ] ( "http://att.com/" , "" ) + , Str "." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "inline" , Space , Str "link" ] + ( "/script?foo=1&bar=2" , "" ) + , Str "." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "inline" + , Space + , Str "link" + , Space + , Str "in" + , Space + , Str "pointy" + , SoftBreak + , Str "braces" + ] + ( "/script?foo=1&bar=2" , "" ) + , Str "." + ] + , Header 2 ( "autolinks" , [] , [] ) [ Str "Autolinks" ] + , Para + [ Str "With" + , Space + , Str "an" + , Space + , Str "ampersand:" + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://example.com/?foo=1&bar=2" ] + ( "http://example.com/?foo=1&bar=2" , "" ) + ] + , BulletList + [ [ Para + [ Str "In" , Space , Str "a" , Space , Str "list?" ] + ] + , [ Para + [ Link + ( "" , [] , [] ) + [ Str "http://example.com/" ] + ( "http://example.com/" , "" ) + ] + ] + , [ Para [ Str "It" , Space , Str "should." ] ] + ] + , Para + [ Str "An" + , Space + , Str "e-mail" + , Space + , Str "address:" + , Space + , Link + ( "" , [] , [] ) + [ Str "nobody@nowhere.net" ] + ( "mailto:nobody@nowhere.net" , "" ) + ] + , BlockQuote + [ Para + [ Str "Blockquoted:" + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://example.com/" ] + ( "http://example.com/" , "" ) + ] + ] + , Para + [ Str "Auto-links" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "occur" + , Space + , Str "here:" + , SoftBreak + , Code ( "" , [] , [] ) "" + ] + , CodeBlock + ( "" , [] , [] ) "or here: " + , Header 1 ( "images" , [] , [] ) [ 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):" + ] + , Figure + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "lalune" + , Space + , Str "fig" + , Space + , Str "caption" + ] + ]) + [ Plain + [ Image + ( "" , [] , [] ) + [ Str "lalune" + , Space + , Str "alt" + , Space + , Str "text" + , Space + , Str "shadowed" + , Space + , Str "by" + , Space + , Str "fig" + , Space + , Str "caption" + ] + ( "lalune.jpg" , "" ) + ] + ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "movie" + , Space + , Image ( "" , [] , [] ) [] ( "movie.jpg" , "" ) + , Space + , Str "icon." + , SoftBreak + , Str "And" + , Space + , Str "here" + , Space + , Str "a" + , Space + , Str "second" + , Space + , Str "movie" + , Space + , Image + ( "" , [] , [] ) + [ Str "alt" , Space , Str "text" ] + ( "movie.jpg" , "" ) + , Space + , Str "icon." + , SoftBreak + , Str "And" + , Space + , Str "here" + , Space + , Str "a" + , Space + , Str "third" + , Space + , Str "movie" + , Space + , Image + ( "" , [] , [] ) + [ Str "alt" , Space , Str "text" ] + ( "movie.jpg" , "" ) + , Space + , Str "icon." + ] + , Para + [ Image + ( "" , [] , [] ) + [ Str "lalune" + , Space + , Str "no" + , Space + , Str "figure" + , Space + , Str "alt" + , Space + , Str "text" + ] + ( "lalune.jpg" , "" ) + ] + , Header 1 ( "footnotes" , [] , [] ) [ Str "Footnotes" ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "footnote" + , Space + , Str "reference," + , Note + [ Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "footnote." + , Space + , Str "It" + , Space + , Str "can" + , Space + , Str "go" + , Space + , Str "anywhere" + , Space + , Str "after" + , Space + , Str "the" + , Space + , Str "footnote" + , Space + , Str "reference." + , SoftBreak + , Str "It" + , Space + , Str "need" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "placed" + , Space + , Str "at" + , Space + , Str "the" + , Space + , Str "end" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "document." + ] + ] + , Space + , Str "and" + , Space + , Str "another." + , Note + [ Para + [ Str "Here\8217s" + , Space + , Str "the" + , Space + , Str "long" + , Space + , Str "note." + , Space + , Str "This" + , Space + , Str "one" + , Space + , Str "contains" + , Space + , Str "multiple" + , Space + , Str "blocks." + ] + , Para + [ Str "Subsequent" + , Space + , Str "blocks" + , Space + , Str "are" + , Space + , Str "indented" + , Space + , Str "to" + , Space + , Str "show" + , Space + , Str "that" + , Space + , Str "they" + , Space + , Str "belong" + , Space + , Str "to" + , Space + , Str "the" + , SoftBreak + , Str "footnote" + , Space + , Str "(as" + , Space + , Str "with" + , Space + , Str "list" + , Space + , Str "items)." + ] + , CodeBlock ( "" , [] , [] ) " { }" + , Para + [ Str "If" + , Space + , Str "you" + , Space + , Str "want," + , Space + , Str "you" + , Space + , Str "can" + , Space + , Str "indent" + , Space + , Str "every" + , Space + , Str "line," + , Space + , Str "but" + , Space + , Str "you" + , Space + , Str "can" + , Space + , Str "also" + , Space + , Str "be" + , Space + , Str "lazy" + , Space + , Str "and" + , SoftBreak + , Str "just" + , Space + , Str "indent" + , Space + , Str "the" + , Space + , Str "first" + , Space + , Str "line" + , Space + , Str "of" + , Space + , Str "each" + , Space + , Str "block." + ] + ] + , Space + , Str "This" + , Space + , Str "should" + , Space + , Emph [ Str "not" ] + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "footnote" + , Space + , Str "reference," + , SoftBreak + , Str "because" + , Space + , Str "it" + , Space + , Str "contains" + , Space + , Str "a" + , Space + , Str "space.[^my" + , Space + , Str "note]" + , Space + , Str "Here" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "inline" + , Space + , Str "note." + , Note + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Emph [ Str "easier" ] + , Space + , Str "to" + , Space + , Str "type." + , Space + , Str "Inline" + , Space + , Str "notes" + , Space + , Str "may" + , Space + , Str "contain" + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "links" ] + ( "http://google.com" , "" ) + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "]" + , SoftBreak + , Str "verbatim" + , Space + , Str "characters," + , Space + , Str "as" + , Space + , Str "well" + , Space + , Str "as" + , Space + , Str "[bracketed" + , Space + , Str "text]." + ] + ] + ] + , BlockQuote + [ Para + [ Str "Notes" + , Space + , Str "can" + , Space + , Str "go" + , Space + , Str "in" + , Space + , Str "quotes." + , Note [ Para [ Str "In" , Space , Str "quote." ] ] + ] + ] + , OrderedList + ( 1 , Decimal , DefaultDelim ) + [ [ Para + [ Str "And" + , Space + , Str "in" + , Space + , Str "list" + , Space + , Str "items." + , Note [ Para [ Str "In" , Space , Str "list." ] ] + ] + ] + ] + , Para + [ Str "This" + , Space + , Str "paragraph" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "part" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "note," + , Space + , Str "as" + , Space + , Str "it" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "indented." + ] + , Header 1 ( "tables" , [] , [] ) [ Str "Tables" ] + , Para + [ Str "Simple" + , Space + , Str "table" + , Space + , Str "with" + , Space + , Str "caption:" + ] + , Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Demonstration" + , Space + , Str "of" + , Space + , Str "simple" + , Space + , Str "table" + , Space + , Str "syntax." + ] + ]) + [ ( AlignRight , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "Simple" + , Space + , Str "table" + , Space + , Str "without" + , Space + , Str "caption:" + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignRight , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "Simple" + , Space + , Str "table" + , Space + , Str "indented" + , Space + , Str "two" + , Space + , Str "spaces:" + ] + , Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Demonstration" + , Space + , Str "of" + , Space + , Str "simple" + , Space + , Str "table" + , Space + , Str "syntax." + ] + ]) + [ ( AlignRight , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "with" + , Space + , Str "caption:" + ] + , Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Here's" + , Space + , Str "the" + , Space + , Str "caption." + , Space + , Str "It" + , Space + , Str "may" + , Space + , Str "span" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ]) + [ ( AlignCenter , ColWidth 0.2 ) + , ( AlignLeft , ColWidth 0.2 ) + , ( AlignRight , ColWidth 0.3 ) + , ( AlignLeft , ColWidth 0.3 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Centered" , Space , Str "Header" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" , Space , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" , Space , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" , Space , Str "aligned" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Example" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "row" + , Space + , Str "that" + , Space + , Str "spans" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Here's" + , Space + , Str "another" + , Space + , Str "one." + , Space + , Str "Note" + , Space + , Str "the" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , Space + , Str "rows." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "Table" + , Space + , Str "with" + , Space + , Str "attributes" + ] + , Table + ( "mytableid1" + , [ "mytableclass1" , "mytableclass2" ] + , [ ( "role" , "tablerole1" ) + , ( "custom-style" , "mytabstyle1" ) + ] + ) + (Caption + Nothing + [ Plain + [ Str "Attribute" + , Space + , Str "table" + , Space + , Str "caption" + ] + ]) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Str "body" + , Space + , Str "cell" + , Space + , Str "1" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Str "body" + , Space + , Str "cell" + , Space + , Str "2" + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "Table" + , Space + , Str "with" + , Space + , Str "attributes," + , Space + , Str "without" + , Space + , Str "caption" + ] + , Table + ( "mytableid2" + , [ "mytableclass3" , "mytableclass4" ] + , [ ( "role" , "tablerole2" ) + , ( "custom-style" , "mytabstyle2" ) + ] + ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Str "body" + , Space + , Str "cell" + , Space + , Str "1" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Str "body" + , Space + , Str "cell" + , Space + , Str "2" + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "without" + , Space + , Str "caption:" + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidth 0.1 ) + , ( AlignLeft , ColWidth 0.2 ) + , ( AlignRight , ColWidth 0.3 ) + , ( AlignLeft , ColWidth 0.4 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Centered" , Space , Str "Header" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" , Space , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" , Space , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" , Space , Str "aligned" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Example" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "row" + , Space + , Str "that" + , Space + , Str "spans" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Here's" + , Space + , Str "another" + , Space + , Str "one." + , Space + , Str "Note" + , Space + , Str "the" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , Space + , Str "rows." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "Table" + , Space + , Str "without" + , Space + , Str "column" + , Space + , Str "headers:" + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignRight , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignRight , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "without" + , Space + , Str "column" + , Space + , Str "headers:" + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidth 0.25 ) + , ( AlignLeft , ColWidth 0.25 ) + , ( AlignRight , ColWidth 0.25 ) + , ( AlignLeft , ColWidth 0.25 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Example" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "row" + , Space + , Str "that" + , Space + , Str "spans" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Here's" + , Space + , Str "another" + , Space + , Str "one." + , Space + , Str "Note" + , Space + , Str "the" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , Space + , Str "rows." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "with" + , Space + , Str "cells" + , Space + , Str "spanning" + , Space + , Str "multiple" + , Space + , Str "columns" + , Space + , Str "and" + , Space + , Str "rows" + , Space + , Str "without" + , Space + , Str "caption." + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 3) + [ Plain [ Str "Columns" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "A" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "B" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "C" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 2) + [ Plain + [ Str "A1" , Space , Str "+" , Space , Str "B1" ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain + [ Str "C1" , Space , Str "+" , Space , Str "C2" ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 2) + [ Plain + [ Str "A2" + , Space + , Str "+" + , Space + , Str "B2" + , Space + , Str "+" + , Space + , Str "A3" + , Space + , Str "+" + , Space + , Str "B3" + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "C3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Para [ Str "A" , Space , Str "Step" ] ] + , [ Para [ Str "Another" , Space , Str "Step" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Para + [ Str "Substeps" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "nested" + , Space + , Str "indefinitely" + , Space + , Str "deep." + ] + ] + ] + ] + , [ Para + [ Str "A" , Space , Str "Final" , Space , Str "Step" ] + ] + ] + , Header + 1 + ( "indexterms" , [] , [] ) + [ Str "Index" , Space , Str "terms" ] + , Para + [ Str "In" + , Space + , Str "the" + , Space + , Str "simplest" + , Space + , Str "case," + , Space + , Str "index" + , Space + , Str "terms" + , Span + ( "" , [ "indexterm" ] , [ ( "primary" , "index term" ) ] ) + [] + , Space + , Str "consists" + , Space + , Str "of" + , Space + , Str "just" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "" + , Space + , Str "element," + , Space + , Str "but" + , Space + , Span + ( "" + , [ "indexterm" ] + , [ ( "primary" , "index term" ) + , ( "secondary" , "multi-level" ) + ] + ) + [] + , Space + , Str "they" + , Space + , Str "can" + , Space + , Str "also" + , Space + , Str "consist" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "" + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "" + , Space + , Str "element," + , Space + , Str "and" + , Space + , Span + ( "" + , [ "indexterm" ] + , [ ( "primary" , "index term" ) + , ( "secondary" , "multi-level" ) + , ( "tertiary" , "3-level" ) + ] + ) + [] + , Space + , Str "can" + , Space + , Str "even" + , Space + , Str "include" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "" + , Space + , Str "term." + ] + , Para + [ Str "Index" + , Space + , Str "terms" + , Space + , Str "can" + , Space + , Str "also" + , Space + , Str "refer" + , Space + , Str "to" + , Space + , Str "other" + , Space + , Str "index" + , Space + , Str "terms:" + , Space + , Span + ( "" + , [ "indexterm" ] + , [ ( "primary" , "index cross referencing" ) ] + ) + [] + , Span + ( "" + , [ "indexterm" ] + , [ ( "primary" , "index term" ) + , ( "secondary" , "cross references" ) + , ( "see" , "index cross referencing" ) + ] + ) + [] + , Str "exclusively," + , Space + , Str "using" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "" + , Space + , Str "tag;" + , Space + , Str "or" + , Space + , Span + ( "" + , [ "indexterm" ] + , [ ( "primary" , "index cross referencing" ) + , ( "seealso" , "cross referencing" ) + ] + ) + [] + , Space + , Str "as" + , Space + , Str "a" + , Space + , Str "reference" + , Space + , Str "to" + , Space + , Str "related" + , Space + , Str "terms," + , Space + , Str "using" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "" + , Space + , Str "tag." + ] + , Para + [ Span + ( "" + , [ "indexterm" ] + , [ ( "primary" , "food" ) + , ( "secondary" , "big baguette supreme" ) + ] + ) + [] + , Str "Nested" + , Space + , Str "content" + , Space + , Str "in" + , Space + , Str "index" + , Space + , Str "term" + , Space + , Str "elements" + , Space + , Str "is" + , Space + , Str "flattened." + ] + , Header + 1 + ( "titleabbrev" + , [] + , [ ( "titleabbrev" , "Abbr. title" ) ] + ) + [ Str "Abbreviated" , Space , Str "title" ] + ] diff --git a/test/docbook-xref.docbook b/test/docbook-xref.docbook --- a/test/docbook-xref.docbook +++ b/test/docbook-xref.docbook @@ -1,6 +1,6 @@ -An Example Book +An Example Book XRef Samples This paragraph demonstrates several features of @@ -24,6 +24,18 @@ A link to an funcsynopsis element: . +A link to a +figure element: . + +A link to a +table element: . + +A link to a +part element: . + +A link to a +book element: . + @@ -32,6 +44,9 @@ Some content here + + Later Part + The Third Chapter Some content here @@ -65,6 +80,35 @@ +
    The Pythagorean Theorem Illustrated + + + + + An illustration of the Pythagorean Theorem + +
    + + + Supported features by version + + + + + + Version + Feat + + + + + Free + no + + + +
    +     +         - diff --git a/test/docbook-xref.native b/test/docbook-xref.native --- a/test/docbook-xref.native +++ b/test/docbook-xref.native @@ -1,29 +1,369 @@ -Pandoc (Meta {unMeta = fromList []}) -[Header 1 ("ch01",[],[]) [Str "XRef",Space,Str "Samples"] -,Para [Str "This",Space,Str "paragraph",Space,Str "demonstrates",Space,Str "several",Space,Str "features",Space,Str "of",SoftBreak,Str "XRef."] -,BulletList - [[Para [Str "A",Space,Str "straight",Space,Str "link",Space,Str "generates",Space,Str "the",SoftBreak,Str "cross-reference",Space,Str "text:",Space,Link ("",[],[]) [Str "The",Space,Str "Second",Space,Str "Chapter"] ("#ch02",""),Str "."]] - ,[Para [Str "A",Space,Str "link",Space,Str "to",Space,Str "an",Space,Str "element",Space,Str "with",Space,Str "an",SoftBreak,Str "XRefLabel:",SoftBreak,Link ("",[],[]) [Str "Chapter",Space,Str "the",Space,Str "Third"] ("#ch03",""),Str "."]] - ,[Para [Str "A",Space,Str "link",Space,Str "with",Space,Str "an",SoftBreak,Str "EndTerm:",SoftBreak,Link ("",[],[]) [Str "Chapter",Space,Str "4"] ("#ch04",""),Str "."]] - ,[Para [Str "A",Space,Str "link",Space,Str "to",Space,Str "an",SoftBreak,Str "cmdsynopsis",Space,Str "element:",Space,Link ("",[],[]) [Str "chgrp"] ("#cmd01",""),Str "."]] - ,[Para [Str "A",Space,Str "link",Space,Str "to",Space,Str "an",SoftBreak,Str "funcsynopsis",Space,Str "element:",Space,Link ("",[],[]) [Str "max"] ("#func01",""),Str "."]]] -,Header 1 ("ch02",[],[]) [Str "The",Space,Str "Second",Space,Str "Chapter"] -,Para [Str "Some",Space,Str "content",Space,Str "here"] -,Header 1 ("ch03",[],[]) [Str "The",Space,Str "Third",Space,Str "Chapter"] -,Para [Str "Some",Space,Str "content",Space,Str "here"] -,Header 1 ("ch04",[],[]) [Str "The",Space,Str "Fourth",Space,Str "Chapter"] -,Para [Str "Some",Space,Str "content",Space,Str "here"] -,Plain [Str "chgrp"] -,Plain [Str "-R"] -,Plain [Str "-H"] -,Plain [Str "-L"] -,Plain [Str "-P"] -,Plain [Str "-f"] -,Plain [Str "group"] -,Plain [Str "file"] -,Plain [Str "int"] -,Plain [Str "max"] -,Plain [Str "int"] -,Plain [Str "int1"] -,Plain [Str "int"] -,Plain [Str "int2"]] +Pandoc + Meta + { unMeta = + fromList + [ ( "title" + , MetaInlines + [ Str "An" + , Space + , Str "Example" + , Space + , Str "Book" + ] + ) + ] + } + [ Header + 2 + ( "ch01" , [] , [] ) + [ Str "XRef" , Space , Str "Samples" ] + , Para + [ Str "This" + , Space + , Str "paragraph" + , Space + , Str "demonstrates" + , Space + , Str "several" + , Space + , Str "features" + , Space + , Str "of" + , SoftBreak + , Str "XRef." + ] + , BulletList + [ [ Para + [ Str "A" + , Space + , Str "straight" + , Space + , Str "link" + , Space + , Str "generates" + , Space + , Str "the" + , SoftBreak + , Str "cross-reference" + , Space + , Str "text:" + , Space + , Link + ( "" , [] , [] ) + [ Str "The" + , Space + , Str "Second" + , Space + , Str "Chapter" + ] + ( "#ch02" , "" ) + , Str "." + ] + ] + , [ Para + [ Str "A" + , Space + , Str "link" + , Space + , Str "to" + , Space + , Str "an" + , Space + , Str "element" + , Space + , Str "with" + , Space + , Str "an" + , SoftBreak + , Str "XRefLabel:" + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "Chapter" + , Space + , Str "the" + , Space + , Str "Third" + ] + ( "#ch03" , "" ) + , Str "." + ] + ] + , [ Para + [ Str "A" + , Space + , Str "link" + , Space + , Str "with" + , Space + , Str "an" + , SoftBreak + , Str "EndTerm:" + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "Chapter" , Space , Str "4" ] + ( "#ch04" , "" ) + , Str "." + ] + ] + , [ Para + [ Str "A" + , Space + , Str "link" + , Space + , Str "to" + , Space + , Str "an" + , SoftBreak + , Str "cmdsynopsis" + , Space + , Str "element:" + , Space + , Link ( "" , [] , [] ) [ Str "chgrp" ] ( "#cmd01" , "" ) + , Str "." + ] + ] + , [ Para + [ Str "A" + , Space + , Str "link" + , Space + , Str "to" + , Space + , Str "an" + , SoftBreak + , Str "funcsynopsis" + , Space + , Str "element:" + , Space + , Link ( "" , [] , [] ) [ Str "max" ] ( "#func01" , "" ) + , Str "." + ] + ] + , [ Para + [ Str "A" + , Space + , Str "link" + , Space + , Str "to" + , Space + , Str "a" + , SoftBreak + , Str "figure" + , Space + , Str "element:" + , Space + , Link + ( "" , [] , [] ) + [ Str "The" + , Space + , Str "Pythagorean" + , Space + , Str "Theorem" + , Space + , Str "Illustrated" + ] + ( "#fig01" , "" ) + , Str "." + ] + ] + , [ Para + [ Str "A" + , Space + , Str "link" + , Space + , Str "to" + , Space + , Str "a" + , SoftBreak + , Str "table" + , Space + , Str "element:" + , Space + , Link + ( "" , [] , [] ) + [ Str "Supported" + , Space + , Str "features" + , Space + , Str "by" + , Space + , Str "version" + ] + ( "#table01" , "" ) + , Str "." + ] + ] + , [ Para + [ Str "A" + , Space + , Str "link" + , Space + , Str "to" + , Space + , Str "a" + , SoftBreak + , Str "part" + , Space + , Str "element:" + , Space + , Link + ( "" , [] , [] ) + [ Str "Later" , Space , Str "Part" ] + ( "#part01" , "" ) + , Str "." + ] + ] + , [ Para + [ Str "A" + , Space + , Str "link" + , Space + , Str "to" + , Space + , Str "a" + , SoftBreak + , Str "book" + , Space + , Str "element:" + , Space + , Link + ( "" , [] , [] ) + [ Str "An" + , Space + , Str "Example" + , Space + , Str "Book" + ] + ( "#book01" , "" ) + , Str "." + ] + ] + ] + , Header + 2 + ( "ch02" , [] , [] ) + [ Str "The" , Space , Str "Second" , Space , Str "Chapter" ] + , Para + [ Str "Some" , Space , Str "content" , Space , Str "here" ] + , Header + 1 + ( "part01" , [] , [] ) + [ Str "Later" , Space , Str "Part" ] + , Header + 2 + ( "ch03" , [] , [] ) + [ Str "The" , Space , Str "Third" , Space , Str "Chapter" ] + , Para + [ Str "Some" , Space , Str "content" , Space , Str "here" ] + , Header + 2 + ( "ch04" , [] , [ ( "titleabbrev" , "Chapter 4" ) ] ) + [ Str "The" , Space , Str "Fourth" , Space , Str "Chapter" ] + , Para + [ Str "Some" , Space , Str "content" , Space , Str "here" ] + , Plain [ Str "chgrp" ] + , Plain [ Str "-R" ] + , Plain [ Str "-H" ] + , Plain [ Str "-L" ] + , Plain [ Str "-P" ] + , Plain [ Str "-f" ] + , Plain [ Str "group" ] + , Plain [ Str "file" ] + , Plain [ Str "int" ] + , Plain [ Str "max" ] + , Plain [ Str "int" ] + , Plain [ Str "int1" ] + , Plain [ Str "int" ] + , Plain [ Str "int2" ] + , Figure + ( "fig01" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "The" + , Space + , Str "Pythagorean" + , Space + , Str "Theorem" + , Space + , Str "Illustrated" + ] + ]) + [ Plain + [ Image + ( "" , [] , [] ) + [ Str "An" + , Space + , Str "illustration" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "Pythagorean" + , Space + , Str "Theorem" + ] + ( "figures/pythag.png" , "" ) + ] + ] + , Table + ( "table01" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Supported" + , Space + , Str "features" + , Space + , Str "by" + , Space + , Str "version" + ] + ]) + [ ( AlignDefault , ColWidth 0.5 ) + , ( AlignDefault , ColWidth 0.5 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Version" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Feat" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Free" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "no" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] diff --git a/test/docx/0_level_headers.native b/test/docx/0_level_headers.native --- a/test/docx/0_level_headers.native +++ b/test/docx/0_level_headers.native @@ -1,25 +1,146 @@ -[Table [] [AlignDefault] [0.0] - [[]] - [[[]] - ,[[Plain [Str "User\8217s",Space,Str "Guide"]]] - ,[[]] - ,[[]] - ,[[]] - ,[[Plain [Str "11",Space,Str "August",Space,Str "2017"]]] - ,[[]] - ,[[]] - ,[[]] - ,[[]]] -,Para [Str "CONTENTS"] -,Para [Strong [Str "Section",Space,Str "Page"]] -,Para [Str "FIGURES",Space,Str "iv"] -,Para [Str "TABLES",Space,Str "v"] -,Para [Str "SECTION",Space,Str "1",Space,Str "Introduction",Space,Str "2"] -,Header 1 ("figures",["Heading0"],[]) [Str "FIGURES"] -,Para [Strong [Str "Figure",Space,Str "Page"]] -,Para [Strong [Str "No",Space,Str "table",Space,Str "of",Space,Str "figures",Space,Str "entries",Space,Str "found."]] -,Header 1 ("tables",["Heading0"],[]) [Str "TABLES"] -,Para [Strong [Str "Table",Space,Str "Page"]] -,Para [Strong [Str "No",Space,Str "table",Space,Str "of",Space,Str "figures",Space,Str "entries",Space,Str "found."]] -,Header 1 ("introduction",[],[]) [Str "Introduction"] -,Para [Str "Nothing",Space,Str "to",Space,Str "introduce,",Space,Str "yet."]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.8615384615384616 ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "User\8217s" , Space , Str "Guide" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "11" + , Space + , Str "August" + , Space + , Str "2017" + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para [ Str "CONTENTS" ] +, Para [ Strong [ Str "Section" , Space , Str "Page" ] ] +, Para + [ Str "FIGURES" + , Space + , Link ( "" , [] , [] ) [ Str "iv" ] ( "#figures" , "" ) + ] +, Para + [ Str "TABLES" + , Space + , Link ( "" , [] , [] ) [ Str "v" ] ( "#tables" , "" ) + ] +, Para + [ Str "SECTION" + , Space + , Str "1" + , Space + , Str "Introduction" + , Space + , Link ( "" , [] , [] ) [ Str "2" ] ( "#introduction" , "" ) + ] +, Header + 1 ( "figures" , [ "Heading-0" ] , [] ) [ Str "FIGURES" ] +, Para [ Strong [ Str "Figure" , Space , Str "Page" ] ] +, Para + [ Strong + [ Str "No" + , Space + , Str "table" + , Space + , Str "of" + , Space + , Str "figures" + , Space + , Str "entries" + , Space + , Str "found." + ] + ] +, Header + 1 ( "tables" , [ "Heading-0" ] , [] ) [ Str "TABLES" ] +, Para [ Strong [ Str "Table" , Space , Str "Page" ] ] +, Para + [ Strong + [ Str "No" + , Space + , Str "table" + , Space + , Str "of" + , Space + , Str "figures" + , Space + , Str "entries" + , Space + , Str "found." + ] + ] +, Header + 1 ( "introduction" , [] , [] ) [ Str "Introduction" ] +, Para + [ Str "Nothing" + , Space + , Str "to" + , Space + , Str "introduce," + , Space + , Str "yet." + ] +] diff --git a/test/docx/adjacent_codeblocks.docx b/test/docx/adjacent_codeblocks.docx new file mode 100644 Binary files /dev/null and b/test/docx/adjacent_codeblocks.docx differ diff --git a/test/docx/adjacent_codeblocks.native b/test/docx/adjacent_codeblocks.native new file mode 100644 --- /dev/null +++ b/test/docx/adjacent_codeblocks.native @@ -0,0 +1,6 @@ +[Para [Str "Next,",Space,Str "open",Space,Str "the",Space,Str "terminal",Space,Str "window.",Space,Str "Using",Space,Str "the",Space,Str "terminal",Space,Str "window,",Space,Str "run",Space,Str "the",Space,Str "\"ifconfig",Space,Str "-a\"",Space,Str "command",Space,Str "to",Space,Str "list",Space,Str "all",Space,Str "the",Space,Str "interfaces",Space,Str "on",Space,Str "your",Space,Str "system,",Space,Str "as",Space,Str "shown",Space,Str "here."] +,CodeBlock ("",[],[]) "# ifconfig -a\neth0 Link encap:Ethernet HWaddr 00:0c:29:69:12:7c \n inet addr:172.16.0.108 Bcast:172.16.0.255 Mask:255.255.255.0\n inet6 addr: fc00:660:0:1:20c:29ff:fe69:127c/64 Scope:Global\n inet6 addr: fe80::20c:29ff:fe69:127c/64 Scope:Link\n UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1\n RX packets:9859 errors:0 dropped:0 overruns:0 frame:0\n TX packets:1399 errors:0 dropped:0 overruns:0 carrier:0\n collisions:0 txqueuelen:1000 \n RX bytes:1920894 (1.8 MiB) TX bytes:233088 (227.6 KiB)\n Interrupt:19 Base address:0x2000 \n\nlo Link encap:Local Loopback \n inet addr:127.0.0.1 Mask:255.0.0.0\n inet6 addr: ::1/128 Scope:Host\n UP LOOPBACK RUNNING MTU:65536 Metric:1\n RX packets:372 errors:0 dropped:0 overruns:0 frame:0\n TX packets:372 errors:0 dropped:0 overruns:0 carrier:0\n collisions:0 txqueuelen:0 \n RX bytes:22320 (21.7 KiB) TX bytes:22320 (21.7 KiB)\n\nwlan0 Link encap:Ethernet HWaddr 00:c0:ca:85:00:ba \n UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1\n RX packets:0 errors:0 dropped:0 overruns:0 frame:0\n TX packets:0 errors:0 dropped:0 overruns:0 carrier:0\n collisions:0 txqueuelen:1000 \n RX bytes:0 (0.0 B) TX bytes:0 (0.0 B)" +,Para [Str "The",Space,Str "ALFA",Space,Str "wireless",Space,Str "card",Space,Str "is",Space,Str "represented",Space,Str "by",Space,Str "the",Space,Str "\"wlan0\"",Space,Str "interface."] +,Para [Str "In",Space,Str "addition",Space,Str "to",Space,Str "the",Space,Str "interfaces",Space,Str "shown",Space,Str "in",Space,Str "the",Space,Str "ifconfig",Space,Str "output,",Space,Str "there",Space,Str "is",Space,Str "another",Space,Str "interface",Space,Str "known",Space,Str "as",Space,Str "the",Space,Emph [Str "wireless",Space,Str "physical",Space,Str "interface"],Str ".",Space,Str "We",Space,Str "can",Space,Str "identify",Space,Str "this",Space,Str "interface",Space,Str "by",Space,Str "listing",Space,Str "the",Space,Str "contents",Space,Str "of",Space,Str "the",Space,Str "/sys/class/ieee80211",Space,Str "directory,",Space,Str "as",Space,Str "shown."] +,CodeBlock ("",[],[]) "# ls /sys/class/ieee80211/\nphy0" +,Para [Str "The",Space,Str "\"phy0\"",Space,Str "interface",Space,Str "is",Space,Str "the",Space,Str "parent",Space,Str "interface",Space,Str "used",Space,Str "to",Space,Str "create",Space,Str "child",Space,Str "interfaces.",Space,Str "Note",Space,Str "that",Space,Str "if",Space,Str "you",Space,Str "unplug",Space,Str "and",Space,Str "replug",Space,Str "the",Space,Str "USB",Space,Str "interface,",Space,Str "the",Space,Str "\"phy\"",Space,Str "interface",Space,Str "number",Space,Str "will",Space,Str "increment",Space,Str "by",Space,Str "one",Space,Str "until",Space,Str "you",Space,Str "reboot",Space,Str "your",Space,Str "system."]] diff --git a/test/docx/alternate_document_path.docx b/test/docx/alternate_document_path.docx new file mode 100644 Binary files /dev/null and b/test/docx/alternate_document_path.docx differ diff --git a/test/docx/alternate_document_path.native b/test/docx/alternate_document_path.native new file mode 100644 --- /dev/null +++ b/test/docx/alternate_document_path.native @@ -0,0 +1,3 @@ +Pandoc (Meta {unMeta = fromList []}) +[Header 1 ("test",[],[]) [Str "Test"] +,Para [Str "This",Space,Str "is",Space,Emph [Str "italic"],Str ",",Space,Strong [Str "bold"],Str ",",Space,Underline [Str "underlined"],Str ",",Space,Emph [Underline [Str "italic",Space,Str "underlined"]],Str ",",Space,Strong [Underline [Str "bold",Space,Str "underlined"]],Str ",",Space,Emph [Strong [Underline [Str "bold",Space,Str "italic",Space,Str "underlined"]]],Str "."]] diff --git a/test/docx/anchor_header_after_anchor.docx b/test/docx/anchor_header_after_anchor.docx new file mode 100644 Binary files /dev/null and b/test/docx/anchor_header_after_anchor.docx differ diff --git a/test/docx/anchor_header_after_anchor.native b/test/docx/anchor_header_after_anchor.native new file mode 100644 --- /dev/null +++ b/test/docx/anchor_header_after_anchor.native @@ -0,0 +1,6 @@ +[Para [Link ("",[],[]) [Str "A",Space,Str "link",Space,Str "to",Space,Str "the",Space,Str "bookmark"] ("#referenced-title" , "")] +,Para [Strong [Str "Accomplices:"]] +,Para [Str "There",Space,Str "are",Space,Str "bookmarks",Space,Str "around",Space,Str "here."] +,Para [] +,Header 1 ("referenced-title",[],[]) [Str "Referenced" ,Space ,Str "title"] +,Para [Str "Content"]] diff --git a/test/docx/block_quotes.docx b/test/docx/block_quotes.docx Binary files a/test/docx/block_quotes.docx and b/test/docx/block_quotes.docx differ diff --git a/test/docx/block_quotes.native b/test/docx/block_quotes.native new file mode 100644 --- /dev/null +++ b/test/docx/block_quotes.native @@ -0,0 +1,11 @@ +[Header 2 ("some-block-quotes-in-different-ways",[],[]) [Str "Some",Space,Str "block",Space,Str "quotes,",Space,Str "in",Space,Str "different",Space,Str "ways"] +,Para [Str "This",Space,Str "is",Space,Str "the",Space,Str "proper",Space,Str "way,",Space,Str "with",Space,Str "a",Space,Str "style"] +,BlockQuote + [Para [Str "I",Space,Str "don\8217t",Space,Str "know",Space,Str "why",Space,Str "this",Space,Str "would",Space,Str "be",Space,Str "in",Space,Str "italics,",Space,Str "but",Space,Str "so",Space,Str "it",Space,Str "appears",Space,Str "to",Space,Str "be",Space,Str "on",Space,Str "my",Space,Str "screen."]] +,Para [Str "And",Space,Str "this",Space,Str "is",Space,Str "also",Space,Str "a",Space,Str "proper",Space,Str "way,",Space,Str "with",Space,Str "a",Space,Str "different", Space, Str "style"] +,BlockQuote + [Para [Str "This",Space,Str "is",Space,Str "called",Space,Str "the",Space,Str "Intense",Space,Str "Quote",Space,Str "style."]] +,Para [Str "And",Space,Str "this",Space,Str "is",Space,Str "the",Space,Str "way",Space,Str "that",Space,Str "most",Space,Str "people",Space,Str "do",Space,Str "it:"] +,BlockQuote + [Para [Str "I",Space,Str "just",Space,Str "indented",Space,Str "this,",Space,Str "so",Space,Str "it",Space,Str "looks",Space,Str "like",Space,Str "a",Space,Str "block",Space,Str "quote.",Space,Str "I",Space,Str "think",Space,Str "this",Space,Str "is",Space,Str "how",Space,Str "most",Space,Str "people",Space,Str "do",Space,Str "block",Space,Str "quotes",Space,Str "in",Space,Str "their",Space,Str "documents."]] +,Para [Str "And",Space,Str "back",Space,Str "to",Space,Str "the",Space,Str "normal",Space,Str "style."]] diff --git a/test/docx/block_quotes_parse_indent.native b/test/docx/block_quotes_parse_indent.native deleted file mode 100644 --- a/test/docx/block_quotes_parse_indent.native +++ /dev/null @@ -1,8 +0,0 @@ -[Header 2 ("some-block-quotes-in-different-ways",[],[]) [Str "Some",Space,Str "block",Space,Str "quotes,",Space,Str "in",Space,Str "different",Space,Str "ways"] -,Para [Str "This",Space,Str "is",Space,Str "the",Space,Str "proper",Space,Str "way,",Space,Str "with",Space,Str "a",Space,Str "style"] -,BlockQuote - [Para [Str "I",Space,Str "don\8217t",Space,Str "know",Space,Str "why",Space,Str "this",Space,Str "would",Space,Str "be",Space,Str "in",Space,Str "italics,",Space,Str "but",Space,Str "so",Space,Str "it",Space,Str "appears",Space,Str "to",Space,Str "be",Space,Str "on",Space,Str "my",Space,Str "screen."]] -,Para [Str "And",Space,Str "this",Space,Str "is",Space,Str "the",Space,Str "way",Space,Str "that",Space,Str "most",Space,Str "people",Space,Str "do",Space,Str "it:"] -,BlockQuote - [Para [Str "I",Space,Str "just",Space,Str "indented",Space,Str "this,",Space,Str "so",Space,Str "it",Space,Str "looks",Space,Str "like",Space,Str "a",Space,Str "block",Space,Str "quote.",Space,Str "I",Space,Str "think",Space,Str "this",Space,Str "is",Space,Str "how",Space,Str "most",Space,Str "people",Space,Str "do",Space,Str "block",Space,Str "quotes",Space,Str "in",Space,Str "their",Space,Str "documents."]] -,Para [Str "And",Space,Str "back",Space,Str "to",Space,Str "the",Space,Str "normal",Space,Str "style."]] diff --git a/test/docx/char_styles.docx b/test/docx/char_styles.docx Binary files a/test/docx/char_styles.docx and b/test/docx/char_styles.docx differ diff --git a/test/docx/comments.native b/test/docx/comments.native --- a/test/docx/comments.native +++ b/test/docx/comments.native @@ -1,4 +1,4 @@ [Para [Str "I",Space,Str "want",Space,Span ("",["comment-start"],[("id","0"),("author","Jesse Rosenthal"),("date","2016-05-09T16:13:00Z")]) [Str "I",Space,Str "left",Space,Str "a",Space,Str "comment."],Str "some",Space,Str "text",Space,Str "to",Space,Str "have",Space,Str "a",Space,Str "comment",Space,Span ("",["comment-end"],[("id","0")]) [],Str "on",Space,Str "it."] ,Para [Str "This",Space,Str "is",Space,Span ("",["comment-start"],[("id","1"),("author","Jesse Rosenthal"),("date","2016-05-09T16:13:00Z")]) [Str "A",Space,Str "comment",Space,Str "across",Space,Str "paragraphs."],Str "a",Space,Str "new",Space,Str "paragraph."] ,Para [Str "And",Space,Str "so",Span ("",["comment-end"],[("id","1")]) [],Space,Str "is",Space,Str "this."] -,Para [Str "One",Space,Span ("",["comment-start"],[("id","2"),("author","Jesse Rosenthal"),("date","2016-05-09T16:14:00Z")]) [Str "This",Space,Str "one",Space,Str "has",Space,Str "multiple",Space,Str "paragraphs.",Space,Str "\182",Space,Str "See?"],Str "more",Span ("",["comment-end"],[("id","2")]) [],Str ".",Space,Str "And",Space,Str "this",Space,Str "is",Space,Str "one",Space,Str "with",Space,Str "a",Space,Span ("",["comment-start"],[("id","3"),("author","Jesse Rosenthal"),("date","2016-06-22T14:35:00Z")]) [Str "Do",Space,Str "something."],Span ("",["comment-start"],[("id","4"),("author","Jesse Rosenthal"),("date","2016-06-22T14:36:00Z")]) [Str "Do",Space,Str "something",Space,Str "else."],Str "comment",Space,Str "in",Space,Str "a",Space,Str "comment",Span ("",["comment-end"],[("id","3")]) [Span ("",["comment-end"],[("id","4")]) []],Str "."]] +,Para [Str "One",Space,Span ("",["comment-start"],[("id","2"),("author","Jesse Rosenthal"),("date","2016-05-09T16:14:00Z")]) [Str "This",Space,Str "one",Space,Str "has",Space,Str "multiple",Space,Str "paragraphs.",LineBreak, Str "See?"],Str "more",Span ("",["comment-end"],[("id","2")]) [],Str ".",Space,Str "And",Space,Str "this",Space,Str "is",Space,Str "one",Space,Str "with",Space,Str "a",Space,Span ("",["comment-start"],[("id","3"),("author","Jesse Rosenthal"),("date","2016-06-22T14:35:00Z")]) [Str "Do",Space,Str "something."],Span ("",["comment-start"],[("id","4"),("author","Jesse Rosenthal"),("date","2016-06-22T14:36:00Z")]) [Str "Do",Space,Str "something",Space,Str "else."],Str "comment",Space,Str "in",Space,Str "a",Space,Str "comment",Span ("",["comment-end"],[("id","3")]) [Span ("",["comment-end"],[("id","4")]) []],Str "."]] diff --git a/test/docx/compact-style-removal.docx b/test/docx/compact-style-removal.docx new file mode 100644 Binary files /dev/null and b/test/docx/compact-style-removal.docx differ diff --git a/test/docx/compact-style-removal.native b/test/docx/compact-style-removal.native new file mode 100644 --- /dev/null +++ b/test/docx/compact-style-removal.native @@ -0,0 +1,5 @@ +[OrderedList (1,Decimal,Period) + [[Plain [Str "One"]] + ,[Plain [Str "Two"]] + ,[Plain [Str "Three"]] + ,[Plain [Str "Four"]]]] diff --git a/test/docx/cross_reference.docx b/test/docx/cross_reference.docx new file mode 100644 Binary files /dev/null and b/test/docx/cross_reference.docx differ diff --git a/test/docx/cross_reference.native b/test/docx/cross_reference.native new file mode 100644 --- /dev/null +++ b/test/docx/cross_reference.native @@ -0,0 +1,7 @@ +[ Header 1 ( "title" , [] , [] ) [ Str "TITLE" ] +, Para + [ Str "Cross-reference:" + , Space + , Link ( "" , [] , [] ) [ Str "TITLE" ] ( "#title" , "" ) + ] +] diff --git a/test/docx/custom-style-no-styles.native b/test/docx/custom-style-no-styles.native new file mode 100644 --- /dev/null +++ b/test/docx/custom-style-no-styles.native @@ -0,0 +1,4 @@ +[Para [Str "This",Space,Str "is",Space,Str "some",Space,Str "text."] +,Para [Str "This",Space,Str "is",Space,Str "text",Space,Str "with",Space,Str "an",Space,Emph [Str "emphasized"],Space,Str "text",Space,Str "style.",Space,Str "And",Space,Str "this",Space,Str "is",Space,Str "text",Space,Str "with",Space,Str "a",Space,Strong [Str "strengthened"],Space,Str "text",Space,Str "style."] +,BlockQuote + [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "styled",Space,Str "paragraph",Space,Str "that",Space,Str "inherits",Space,Str "from",Space,Str "Block",Space,Str "Text."]]] diff --git a/test/docx/custom-style-preserve.native b/test/docx/custom-style-preserve.native new file mode 100644 --- /dev/null +++ b/test/docx/custom-style-preserve.native @@ -0,0 +1,15 @@ +[Para [Span ("",[],[("custom-style","MyStyle")]) [Str "This",Space,Str "span",Note [Para [Str "Neither",Space,Str "footnote",Space,Str "nor",Space,Str "footnote",Space,Str "reference",Space,Str "should",Space,Str "get",Space,Str "a",Space,Str "custom",Space,Str "style",Space,Str "from",Space,Str "its",Space,Str "span."]],Space,Str "should",Space,Str "have",Space,Str "a",Space,Str "custom",Space,Str "style",Space,Str "(",Link ("",[],[]) [Str "link"] ("http://example.com/",""),Str "),"],Space,Str "but",Space,Str "the",Space,Str "text",Space,Str "after",Space,Str "the",Space,Str "comma",Space,Str "shouldn\8217t,",Space,Str "nor",Space,Str "should",Space,Str "the",Space,Str "link."] +,Div ("",[],[("custom-style","MyOtherStyle")]) + [Para [Str "The",Space,Str "contents",Space,Str "of",Space,Str "this",Space,Str "div",Space,Str "should",Space,Str "have",Space,Str "a",Space,Str "custom",Space,Str "style,",Space,Str "but",Space,Link ("",[],[]) [Str "this",Space,Str "link",Space,Str "should",Space,Str "not"] ("http://example.com/",""),Str "."] + ,Header 2 ("this-header-should-not-have-the-divs-custom-style",[],[]) [Str "This",Space,Str "header",Space,Str "should",Space,Str "not",Space,Str "have",Space,Str "the",Space,Str "div\8217s",Space,Str "custom",Space,Str "style"] + ,BlockQuote + [Para [Str "This",Space,Str "blockquote",Space,Str "should",Space,Str "not."]] + ,CodeBlock ("",[],[]) "# This code block should not." + ,Para [Str "But",Space,Str "this",Space,Str "paragraph",Space,Str "should.",Note [Para [Str "Neither",Space,Str "footnote",Space,Str "nor",Space,Str "footnote",Space,Str "reference",Space,Str "should",Space,Str "get",Space,Str "a",Space,Str "custom",Space,Str "style",Space,Str "from",Space,Str "its",Space,Str "div."]]]] +,Div ("",[],[("custom-style","MyOuterStyle")]) + [Div ("",[],[("custom-style","MyInnerStyle")]) + [Para [Str "This",Space,Str "should",Space,Str "have",Space,Str "MyInnerStyle."] + ,Header 3 ("this-heading-should-not",[],[]) [Str "This",Space,Str "heading",Space,Str "should",Space,Str "not"]] + ,Para [Str "This",Space,Str "should",Space,Str "have",Space,Str "MyOuterStyle,",Space,Str "but",Space,Str "the",Space,Str "following",Space,Str "elision",Space,Str "should",Space,Str "have",Space,Str "its",SoftBreak,Str "own",Space,Str "style.",Space,Span ("",[],[("custom-style","Elision")]) [Str "..."]] + ,BlockQuote + [Para [Str "This",Space,Str "blockquote",Space,Str "should",Space,Str "include",Space,Strong [Str "bold",Space,Str "text",Space,Str "with",Space,Str "an",Space,Str "elision:",SoftBreak,Span ("",[],[("custom-style","Elision")]) [Str "..."]]]]]] diff --git a/test/docx/custom-style-reference.docx b/test/docx/custom-style-reference.docx Binary files a/test/docx/custom-style-reference.docx and b/test/docx/custom-style-reference.docx differ diff --git a/test/docx/custom-style-roundtrip-start.native b/test/docx/custom-style-roundtrip-start.native deleted file mode 100644 --- a/test/docx/custom-style-roundtrip-start.native +++ /dev/null @@ -1,5 +0,0 @@ -[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "test",Space,Str "of",Space,Str "custom-styles."] -,Para [Str "Here",Space,Str "is",Space,Str "something",Space,Span ("",[],[("custom-style","Emphatic")]) [Str "emphasized"],Str ".",Space,Str "And",SoftBreak,Str "here",Space,Str "is",Space,Str "something",Space,Span ("",[],[("custom-style","Strengthened")]) [Str "strong"],Str "."] -,Div ("",[],[("custom-style","My Block Style")]) - [Para [Str "One",Space,Str "paragraph",Space,Str "of",Space,Str "text."] - ,Para [Str "And",Space,Str "another",Space,Str "paragraph",Space,Str "of",Space,Span ("",[],[("custom-style","Emphatic")]) [Str "really",SoftBreak,Str "cool"],Space,Str "text."]]] diff --git a/test/docx/custom-style-with-styles.native b/test/docx/custom-style-with-styles.native new file mode 100644 --- /dev/null +++ b/test/docx/custom-style-with-styles.native @@ -0,0 +1,7 @@ +[Div ("",[],[("custom-style","First Paragraph")]) + [Para [Str "This",Space,Str "is",Space,Str "some",Space,Str "text."]] +,Div ("",[],[("custom-style","Body Text")]) + [Para [Str "This",Space,Str "is",Space,Str "text",Space,Str "with",Space,Str "an",Space,Span ("",[],[("custom-style","Emphatic")]) [Str "emphasized"],Space,Str "text",Space,Str "style.",Space,Str "And",Space,Str "this",Space,Str "is",Space,Str "text",Space,Str "with",Space,Str "a",Space,Span ("",[],[("custom-style","Strengthened")]) [Str "strengthened"],Space,Str "text",Space,Str "style."]] +,Div ("",[],[("custom-style","My Block Style")]) + [BlockQuote + [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "styled",Space,Str "paragraph",Space,Str "that",Space,Str "inherits",Space,Str "from",Space,Str "Block",Space,Str "Text."]]]] diff --git a/test/docx/custom_style.native b/test/docx/custom_style.native new file mode 100644 --- /dev/null +++ b/test/docx/custom_style.native @@ -0,0 +1,5 @@ +[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "test",Space,Str "of",Space,Str "custom-styles."] +,Para [Str "Here",Space,Str "is",Space,Str "something",Space,Span ("",[],[("custom-style","Emphatic")]) [Str "emphasized"],Str ".",Space,Str "And",SoftBreak,Str "here",Space,Str "is",Space,Str "something",Space,Span ("",[],[("custom-style","Strengthened")]) [Str "strong"],Str "."] +,Div ("",[],[("custom-style","My Block Style")]) + [Para [Str "One",Space,Str "paragraph",Space,Str "of",Space,Str "text."] + ,Para [Str "And",Space,Str "another",Space,Str "paragraph",Space,Str "of",Space,Span ("",[],[("custom-style","Emphatic")]) [Str "really",SoftBreak,Str "cool"],Space,Str "text."]]] diff --git a/test/docx/deep_normalize.docx b/test/docx/deep_normalize.docx Binary files a/test/docx/deep_normalize.docx and b/test/docx/deep_normalize.docx differ diff --git a/test/docx/deep_normalize.native b/test/docx/deep_normalize.native --- a/test/docx/deep_normalize.native +++ b/test/docx/deep_normalize.native @@ -1,6 +1,6 @@ [OrderedList (1,Decimal,OneParen) [[Para [Str "This",Space,Str "is",Space,Str "at",Space,Str "the",Space,Str "first",Space,Str "level"] - ,OrderedList (1,LowerAlpha,DefaultDelim) + ,OrderedList (1,LowerAlpha,OneParen) [[Para [Str "This",Space,Str "is",Space,Str "at",Space,Str "the",Space,Str "second",Space,Str "level"] - ,OrderedList (1,LowerRoman,DefaultDelim) - [[Para [Str "This",Space,Str "is",Space,Emph [Str "at",Space,Strong [Str "the",Space,Str "third",Space,Str "level"],Str ",",Space,Str "and",Space,Str "I",Space,Str "want",Space,Str "to"],Space,Str "test",Space,Str "normalization",Space,Str "here."]]]]]]]] + ,OrderedList (1,LowerRoman,OneParen) + [[Para [Str "This",Space,Str "is",Space,Emph [Str "at",Space,Strong [Str "the",Space,Span ("",["mark"],[]) [Str "th"],Str "i",Span ("",["mark"],[]) [Str "rd"],Space,Str "level"],Str ",",Space,Str "and",Space,Str "I",Space,Str "want",Space,Str "to"],Space,Str "test",Space,Str "normalization",Space,Str "here."]]]]]]]] diff --git a/test/docx/definition_list.docx b/test/docx/definition_list.docx Binary files a/test/docx/definition_list.docx and b/test/docx/definition_list.docx differ diff --git a/test/docx/definition_list.native b/test/docx/definition_list.native --- a/test/docx/definition_list.native +++ b/test/docx/definition_list.native @@ -1,7 +1,33 @@ -[DefinitionList - [([Str "Term",Space,Str "1"], - [[Para [Str "Definition",Space,Str "1"]]]) - ,([Str "Term",Space,Str "2",Space,Str "with",Space,Emph [Str "inline",Space,Str "markup"]], - [[Para [Str "Definition",Space,Str "2"] - ,CodeBlock ("",[],[]) "{ some code, part of Definition 2 }" - ,Para [Str "Third",Space,Str "paragraph",Space,Str "of",Space,Str "definition",Space,Str "2."]]])]] +[ DefinitionList + [ ( [ Str "Term" , Space , Str "1" ] + , [ [ Para [ Str "Definition" , Space , Str "1" ] ] ] + ) + , ( [ Str "Term" + , Space + , Str "2" + , Space + , Str "with" + , Space + , Emph [ Str "inline" , Space , Str "markup" ] + ] + , [ [ Para [ Str "Definition" , Space , Str "2" ] + , Para + [ Code + ( "" , [] , [] ) "{ some code, part of Definition 2 }" + ] + , Para + [ Str "Third" + , Space + , Str "paragraph" + , Space + , Str "of" + , Space + , Str "definition" + , Space + , Str "2." + ] + ] + ] + ) + ] +] diff --git a/test/docx/diagram.docx b/test/docx/diagram.docx new file mode 100644 Binary files /dev/null and b/test/docx/diagram.docx differ diff --git a/test/docx/diagram.native b/test/docx/diagram.native new file mode 100644 --- /dev/null +++ b/test/docx/diagram.native @@ -0,0 +1,2 @@ +[Header 1 ("diagram-after",[],[]) [Str "Diagram",Space,Str "after:"] +,Para [Span ("",["diagram"],[]) [Str "[DIAGRAM]"]]] diff --git a/test/docx/document-properties-short-desc.native b/test/docx/document-properties-short-desc.native new file mode 100644 --- /dev/null +++ b/test/docx/document-properties-short-desc.native @@ -0,0 +1,2 @@ +Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "A.",Space,Str "M."]]),("description",MetaInlines [Str "Short",Space,RawInline (Format "html") "",Str "description",RawInline (Format "html") "",Space,Str "&."]),("keywords",MetaList [MetaInlines [Str "keyword",Space,Str "1"],MetaInlines [Str "keyword",Space,Str "2"]]),("subject",MetaInlines [Str "This",Space,Str "is",Space,Str "the",Space,Str "subject"]),("title",MetaInlines [Str "Testing",Space,Str "custom",Space,Str "properties"])]}) +[Para [Str "Testing",Space,Str "document",Space,Str "properties"]] diff --git a/test/docx/document-properties.native b/test/docx/document-properties.native new file mode 100644 --- /dev/null +++ b/test/docx/document-properties.native @@ -0,0 +1,2 @@ +Pandoc (Meta {unMeta = fromList [("Company",MetaInlines [Str "My",Space,Str "Company"]),("Second Custom Property",MetaInlines [Str "Second",Space,Str "custom",Space,Str "property",Space,Str "value"]),("abstract",MetaBlocks [Plain [Str "Quite",Space,Str "a",Space,Str "long",Space,Str "description",SoftBreak,Str "spanning",Space,Str "several",Space,Str "lines"]]),("author",MetaList [MetaInlines [Str "A.",Space,Str "M."]]),("category",MetaInlines [Str "My",Space,Str "Category"]),("custom1",MetaInlines [Str "First",Space,Str "custom",Space,Str "property",Space,Str "value"]),("custom3",MetaInlines [Str "Escaping",Space,Str "amp",Space,Str "&",Space,Str "."]),("custom4",MetaInlines [Str "Escaping",Space,Str "LT,GT",Space,Str "<",Space,Str "asdf",Space,Str ">",Space,Str "<"]),("custom5",MetaInlines [Str "Escaping",Space,Str "html",Space,RawInline (Format "html") "",Str "asdf",RawInline (Format "html") ""]),("custom6",MetaInlines [Str "Escaping",Space,Emph [Str "MD"],Space,Str "\225",Space,Str "a"]),("custom9",MetaInlines [Str "Extended",Space,Str "chars:",Space,Str "\8364",Space,Str "\225",Space,Str "\233",Space,Str "\237",Space,Str "\243",Space,Str "\250",Space,Str "$"]),("description",MetaBlocks [Para [Str "Long",Space,Str "description",Space,Str "spanning",SoftBreak,Str "several",Space,Str "lines."],Plain [Str "This",Space,Str "is",Space,Str "\225",Space,Str "second",Space,RawInline (Format "html") "",Str "line",RawInline (Format "html") "",Str "."]]),("keywords",MetaList [MetaInlines [Str "keyword",Space,Str "1"],MetaInlines [Str "keyword",Space,Str "2"]]),("lang",MetaInlines [Str "en-US"]),("nested-custom",MetaList [MetaMap (fromList [("custom 7",MetaInlines [Str "Nested",Space,Str "Custom",Space,Str "value",Space,Str "7"])]),MetaMap (fromList [("custom 8",MetaInlines [Str "Nested",Space,Str "Custom",Space,Str "value",Space,Str "8"])])]),("subject",MetaInlines [Str "This",Space,Str "is",Space,Str "the",Space,Str "subject"]),("subtitle",MetaInlines [Str "This",Space,Str "is",Space,Str "a",Space,Str "subtitle"]),("title",MetaInlines [Str "Testing",Space,Str "custom",Space,Str "properties"])]}) +[Para [Str "Testing",Space,Str "document",Space,Str "properties"]] diff --git a/test/docx/drop_cap.docx b/test/docx/drop_cap.docx Binary files a/test/docx/drop_cap.docx and b/test/docx/drop_cap.docx differ diff --git a/test/docx/empty_field.docx b/test/docx/empty_field.docx new file mode 100644 Binary files /dev/null and b/test/docx/empty_field.docx differ diff --git a/test/docx/empty_field.native b/test/docx/empty_field.native new file mode 100644 --- /dev/null +++ b/test/docx/empty_field.native @@ -0,0 +1,7 @@ +[Para + [Str "\24076\26395\28145\20837\20102\35299\30340\35835\32773\21487\20197\21435\30475David",Space,Str "French",Span ( "" , [ "indexref" ] , [ ( "entry" , "French" ) ] ) [],Space,Str "Belding\21644Kevin",Space,Str "J.",Space,Str "Mitchell\30340" + ,Link ("",[],[]) [Str "Foundations",Space,Str "of",Space,Str "Analysis,",Space,Str "2nd",Space,Str "Edition"] ("https://books.google.com/books?id=sp_Zcb9ot90C&lpg=PR4&hl=zh-CN&pg=PA19#v=onepage&q&f=true",""),Str ",\21487\20174\&19\39029\30475\36215\65292\25110D.C.",Space,Str "Goldrei\30340",Space + ,Link ("",[],[]) [Str "Classic",Space,Str "Set",Space,Str "Theory:",Space,Str "For",Space,Str "Guided",Space,Str "Independent",Space,Str "Study"] ("https://books.google.ae/books?id=dlc0DwAAQBAJ&lpg=PT29&hl=zh-CN&pg=PT26#v=onepage&q&f=true","") + ,Str "\65292\20174\31532\20108\31456\30475\36215\65292\38405\35835\26102\35201\27880\24847\26412\25991\19982\36825\20123\20070\25152\19981\21516\30340\26159\24182\27809\26377\25226\23454\25968\30475\20316\26159\26377\29702\25968\38598\30340\20998\21106\12290"] +,Para [Str "Index:"] +,Para [Str "French,",Space,Str "1"]] diff --git a/test/docx/german-reference.docx b/test/docx/german-reference.docx new file mode 100644 Binary files /dev/null and b/test/docx/german-reference.docx differ diff --git a/test/docx/golden/block_quotes.docx b/test/docx/golden/block_quotes.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/block_quotes.docx differ diff --git a/test/docx/golden/codeblock.docx b/test/docx/golden/codeblock.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/codeblock.docx differ diff --git a/test/docx/golden/comments.docx b/test/docx/golden/comments.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/comments.docx differ diff --git a/test/docx/golden/custom_style_no_reference.docx b/test/docx/golden/custom_style_no_reference.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/custom_style_no_reference.docx differ diff --git a/test/docx/golden/custom_style_preserve.docx b/test/docx/golden/custom_style_preserve.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/custom_style_preserve.docx differ diff --git a/test/docx/golden/custom_style_reference.docx b/test/docx/golden/custom_style_reference.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/custom_style_reference.docx differ diff --git a/test/docx/golden/definition_list.docx b/test/docx/golden/definition_list.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/definition_list.docx differ diff --git a/test/docx/golden/document-properties-short-desc.docx b/test/docx/golden/document-properties-short-desc.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/document-properties-short-desc.docx differ diff --git a/test/docx/golden/document-properties.docx b/test/docx/golden/document-properties.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/document-properties.docx differ diff --git a/test/docx/golden/headers.docx b/test/docx/golden/headers.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/headers.docx differ diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/image.docx differ diff --git a/test/docx/golden/inline_code.docx b/test/docx/golden/inline_code.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/inline_code.docx differ diff --git a/test/docx/golden/inline_formatting.docx b/test/docx/golden/inline_formatting.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/inline_formatting.docx differ diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/inline_images.docx differ diff --git a/test/docx/golden/link_in_notes.docx b/test/docx/golden/link_in_notes.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/link_in_notes.docx differ diff --git a/test/docx/golden/links.docx b/test/docx/golden/links.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/links.docx differ diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/lists.docx differ diff --git a/test/docx/golden/lists_9994.docx b/test/docx/golden/lists_9994.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/lists_9994.docx differ diff --git a/test/docx/golden/lists_continuing.docx b/test/docx/golden/lists_continuing.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/lists_continuing.docx differ diff --git a/test/docx/golden/lists_div_bullets.docx b/test/docx/golden/lists_div_bullets.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/lists_div_bullets.docx differ diff --git a/test/docx/golden/lists_multiple_initial.docx b/test/docx/golden/lists_multiple_initial.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/lists_multiple_initial.docx differ diff --git a/test/docx/golden/lists_restarting.docx b/test/docx/golden/lists_restarting.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/lists_restarting.docx differ diff --git a/test/docx/golden/nested_anchors_in_header.docx b/test/docx/golden/nested_anchors_in_header.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/nested_anchors_in_header.docx differ diff --git a/test/docx/golden/notes.docx b/test/docx/golden/notes.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/notes.docx differ diff --git a/test/docx/golden/raw-blocks.docx b/test/docx/golden/raw-blocks.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/raw-blocks.docx differ diff --git a/test/docx/golden/raw-bookmarks.docx b/test/docx/golden/raw-bookmarks.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/raw-bookmarks.docx differ diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/table_one_row.docx differ diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/table_with_list_cell.docx differ diff --git a/test/docx/golden/tables-default-widths.docx b/test/docx/golden/tables-default-widths.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/tables-default-widths.docx differ diff --git a/test/docx/golden/tables.docx b/test/docx/golden/tables.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/tables.docx differ diff --git a/test/docx/golden/tables_separated_with_rawblock.docx b/test/docx/golden/tables_separated_with_rawblock.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/tables_separated_with_rawblock.docx differ diff --git a/test/docx/golden/task_list.docx b/test/docx/golden/task_list.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/task_list.docx differ diff --git a/test/docx/golden/track_changes_deletion.docx b/test/docx/golden/track_changes_deletion.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/track_changes_deletion.docx differ diff --git a/test/docx/golden/track_changes_insertion.docx b/test/docx/golden/track_changes_insertion.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/track_changes_insertion.docx differ diff --git a/test/docx/golden/track_changes_move.docx b/test/docx/golden/track_changes_move.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/track_changes_move.docx differ diff --git a/test/docx/golden/track_changes_scrubbed_metadata.docx b/test/docx/golden/track_changes_scrubbed_metadata.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/track_changes_scrubbed_metadata.docx differ diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/unicode.docx differ diff --git a/test/docx/golden/verbatim_subsuper.docx b/test/docx/golden/verbatim_subsuper.docx new file mode 100644 Binary files /dev/null and b/test/docx/golden/verbatim_subsuper.docx differ diff --git a/test/docx/hanging_indent.docx b/test/docx/hanging_indent.docx Binary files a/test/docx/hanging_indent.docx and b/test/docx/hanging_indent.docx differ diff --git a/test/docx/headers.docx b/test/docx/headers.docx Binary files a/test/docx/headers.docx and b/test/docx/headers.docx differ diff --git a/test/docx/image_vml.native b/test/docx/image_vml.native --- a/test/docx/image_vml.native +++ b/test/docx/image_vml.native @@ -1,4 +1,3 @@ [Header 1 ("vml-image",[],[]) [Strong [Str "VML",Space,Str "Image"]] -,BlockQuote - [Para [Str "It",Space,Str "should",Space,Str "follow",Space,Str "below:"] - ,Para [Image ("",[],[]) [] ("media/image4.jpeg","")]]] +,Para [Str "It",Space,Str "should",Space,Str "follow",Space,Str "below:"] +,Para [Image ("",[],[]) [] ("media/image4.jpeg","")]] diff --git a/test/docx/image_vml_as_object.docx b/test/docx/image_vml_as_object.docx new file mode 100644 Binary files /dev/null and b/test/docx/image_vml_as_object.docx differ diff --git a/test/docx/image_vml_as_object.native b/test/docx/image_vml_as_object.native new file mode 100644 --- /dev/null +++ b/test/docx/image_vml_as_object.native @@ -0,0 +1,2 @@ +[Para [Str "Test",Space,Str "with",Space,Str "object",Space,Str "as",Space,Str "image:"] +,Para [Image ("",[],[]) [] ("media/image1.emf","")]] diff --git a/test/docx/image_with_textbox_caption.docx b/test/docx/image_with_textbox_caption.docx new file mode 100644 Binary files /dev/null and b/test/docx/image_with_textbox_caption.docx differ diff --git a/test/docx/image_with_textbox_caption.native b/test/docx/image_with_textbox_caption.native new file mode 100644 --- /dev/null +++ b/test/docx/image_with_textbox_caption.native @@ -0,0 +1,44 @@ +[ Figure + ( "" , [] , [] ) + (Caption + Nothing + [ Para + [ Str "1" + , Space + , Str "Daniel" + , Space + , Str "Schliebner:" + , Space + , Str "Cantor'sches" + , Space + , Str "Diagonalverfahren." + , Space + , Str "Von" + , Space + , Str "Mengen," + , Space + , Str "Unendlichkeiten" + , Space + , Str "und" + , Space + , Str "Wahnsinn," + , Space + , Str "Pdf:" + , Space + , Str + "https://www2.informatik.hu-berlin.de/~kossahl/Uni/Ma1/Cantor.pdf" + ] + ]) + [ Plain + [ Image + ( "" + , [] + , [ ( "width" , "2.3680555555555554in" ) + , ( "height" , "0.9340277777777778in" ) + ] + ) + [] + ( "media/image1.emf" , "" ) + ] + ] +] diff --git a/test/docx/image_writer_test.native b/test/docx/image_writer_test.native new file mode 100644 --- /dev/null +++ b/test/docx/image_writer_test.native @@ -0,0 +1,10 @@ +[Para [Str "No",Space,Str "width",Space,Str "given:"] +,Para [Image ("fig:testimg",[],[]) [Str "testimg"] ("lalune.jpg","fig:")] +,Para [Str "With",Space,Str "height",Space,Str "10cm:"] +,Para [Image ("fig:2testimg",[],[("height","10cm")]) [Str "2testimg"] ("lalune.jpg","fig:")] +,Para [Str "With",Space,Str "width",Space,Str "6cm:"] +,Para [Image ("",[],[("width","6cm")]) [Str "3testimg"] ("lalune.jpg","fig:")] +,Header 1 ("with-height-3in-and-width-6in",[],[]) [Str "With",Space,Str "height",Space,Str "3in",Space,Str "and",Space,Str "width",Space,Str "6in:"] +,Para [Image ("",[],[("width","6in"),("height","3in")]) [Str "4testimg"] ("lalune.jpg","fig:")] +,Para [RawInline (Format "openxml") ""] +,Para [RawInline (Format "openxml") ""]] diff --git a/test/docx/inline_formatting.docx b/test/docx/inline_formatting.docx Binary files a/test/docx/inline_formatting.docx and b/test/docx/inline_formatting.docx differ diff --git a/test/docx/inline_formatting.native b/test/docx/inline_formatting.native --- a/test/docx/inline_formatting.native +++ b/test/docx/inline_formatting.native @@ -1,5 +1,6 @@ +Pandoc (Meta {unMeta = fromList []}) [Para [Str "Regular",Space,Str "text",Space,Emph [Str "italics"],Space,Strong [Str "bold",Space,Emph [Str "bold",Space,Str "italics"]],Str "."] ,Para [Str "This",Space,Str "is",Space,SmallCaps [Str "Small",Space,Str "Caps"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "strikethrough"],Str "."] -,Para [Str "Some",Space,Str "people",Space,Str "use",Space,Span ("",["underline"],[]) [Str "single",Space,Str "underlines",Space,Str "for",Space,Emph [Str "emphasis"]],Str "."] +,Para [Str "Some",Space,Str "people",Space,Str "use",Space,Underline [Str "single",Space,Str "underlines",Space,Str "for",Space,Emph [Str "emphasis"]],Str "."] ,Para [Str "Above",Space,Str "the",Space,Str "line",Space,Str "is",Space,Superscript [Str "superscript"],Space,Str "and",Space,Str "below",Space,Str "the",Space,Str "line",Space,Str "is",Space,Subscript [Str "subscript"],Str "."] ,Para [Str "A",Space,Str "line",LineBreak,Str "break."]] diff --git a/test/docx/inline_images.docx b/test/docx/inline_images.docx Binary files a/test/docx/inline_images.docx and b/test/docx/inline_images.docx differ diff --git a/test/docx/inline_images_writer_test.native b/test/docx/inline_images_writer_test.native new file mode 100644 --- /dev/null +++ b/test/docx/inline_images_writer_test.native @@ -0,0 +1,2 @@ +[Para [Str "This",Space,Str "picture",Space,Image ("",[],[("width","0.8888888888888888in"),("height","0.8888888888888888in")]) [Str "This",Space,Str "one",Space,Str "is",Space,Str "green",Space,Str "and",Space,Str "looks",Space,Str "like",Space,Str "Sideshow",Space,Str "Bob."] ("lalune.jpg","First identicon"),Space,Str "is",Space,Str "an",Space,Str "identicon."] +,Para [Str "Here",Space,Str "is",Space,Link ("",[],[]) [Str "one",Space,Image ("",[],[("width","0.8888888888888888in"),("height","0.8888888888888888in")]) [Str "This",Space,Str "one",Space,Str "is",Space,Str "reddish,",Space,Str "and",Space,Str "looks",Space,Str "like",Space,Str "a",Space,Str "heart",Space,Str "that",Space,Str "has",Space,Str "leaked",Space,Str "out."] ("lalune.jpg","Second identicon"),Space,Str "that"] ("http://www.google.com",""),Space,Str "links."]] diff --git a/test/docx/instrText_hyperlink.docx b/test/docx/instrText_hyperlink.docx new file mode 100644 Binary files /dev/null and b/test/docx/instrText_hyperlink.docx differ diff --git a/test/docx/instrText_hyperlink.native b/test/docx/instrText_hyperlink.native new file mode 100644 --- /dev/null +++ b/test/docx/instrText_hyperlink.native @@ -0,0 +1,1 @@ +[Para [Str "\24076\26395\28145\20837\20102\35299\30340\35835\32773\21487\20197\21435\30475David",Space,Str "French",Space,Str "Belding\21644Kevin",Space,Str "J.",Space,Str "Mitchell\30340",Link ("",[],[]) [Str "Foundations",Space,Str "of",Space,Str "Analysis,",Space,Str "2nd",Space,Str "Edition"] ("https://books.google.com/books?id=sp_Zcb9ot90C&lpg=PR4&hl=zh-CN&pg=PA19#v=onepage&q&f=true",""),Str ",\21487\20174\&19\39029\30475\36215\65292\25110D.C.",Space,Str "Goldrei\30340",Space,Link ("",[],[]) [Str "Classic",Space,Str "Set",Space,Str "Theory:",Space,Str "For",Space,Str "Guided",Space,Str "Independent",Space,Str "Study"] ("https://books.google.ae/books?id=dlc0DwAAQBAJ&lpg=PT29&hl=zh-CN&pg=PT26#v=onepage&q&f=true",""),Str "\65292\20174\31532\20108\31456\30475\36215\65292\38405\35835\26102\35201\27880\24847\26412\25991\19982\36825\20123\20070\25152\19981\21516\30340\26159\24182\27809\26377\25226\23454\25968\30475\20316\26159\26377\29702\25968\38598\30340\20998\21106\12290"]] diff --git a/test/docx/link_in_notes.docx b/test/docx/link_in_notes.docx Binary files a/test/docx/link_in_notes.docx and b/test/docx/link_in_notes.docx differ diff --git a/test/docx/links.docx b/test/docx/links.docx Binary files a/test/docx/links.docx and b/test/docx/links.docx differ diff --git a/test/docx/lists-compact.docx b/test/docx/lists-compact.docx new file mode 100644 Binary files /dev/null and b/test/docx/lists-compact.docx differ diff --git a/test/docx/lists-compact.native b/test/docx/lists-compact.native new file mode 100644 --- /dev/null +++ b/test/docx/lists-compact.native @@ -0,0 +1,5 @@ +[OrderedList (1,Decimal,Period) + [[Plain [Str "One"]] + ,[Plain [Str "Two"]] + ,[Plain [Str "Three"]] + ,[Plain [Str "Four"]]]] diff --git a/test/docx/lists.docx b/test/docx/lists.docx Binary files a/test/docx/lists.docx and b/test/docx/lists.docx differ diff --git a/test/docx/lists.native b/test/docx/lists.native --- a/test/docx/lists.native +++ b/test/docx/lists.native @@ -2,7 +2,7 @@ ,OrderedList (1,Decimal,Period) [[Para [Str "one"]] ,[Para [Str "two"] - ,OrderedList (1,LowerAlpha,DefaultDelim) + ,OrderedList (1,LowerAlpha,Period) [[Para [Str "a"]] ,[Para [Str "b"]]]]] ,BulletList @@ -15,4 +15,4 @@ ,Para [Str "Sub",Space,Str "paragraph"]]]]]] ,[Para [Str "Same",Space,Str "list"]]] ,BulletList - [[Para [Str "Different",Space,Str "list",Space,Str "adjacent",Space,Str "to",Space,Str "the",Space,Str "one",Space,Str "above."]]]] + [[Plain [Str "Different",Space,Str "list",Space,Str "adjacent",Space,Str "to",Space,Str "the",Space,Str "one",Space,Str "above."]]]] diff --git a/test/docx/lists_9994.native b/test/docx/lists_9994.native new file mode 100644 --- /dev/null +++ b/test/docx/lists_9994.native @@ -0,0 +1,8 @@ +[ OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "one" ] + , BulletList [ [ Plain [ Str "bul" ] ] ] + ] + , [ Plain [ Str "two" ] ] + ] +] diff --git a/test/docx/lists_div_bullets.native b/test/docx/lists_div_bullets.native new file mode 100644 --- /dev/null +++ b/test/docx/lists_div_bullets.native @@ -0,0 +1,5 @@ +[ BulletList + [ [ Div ( "", [], []) [ Para [ Str "one" ], Para [ Str "two" ] ] ] + , [ Div ( "refs", [], []) [ Header 1 ( "" , [] , [] ) [ Str "three" ], Para [ Str "four" ] ] ] + ] +] diff --git a/test/docx/lists_level_override.docx b/test/docx/lists_level_override.docx new file mode 100644 Binary files /dev/null and b/test/docx/lists_level_override.docx differ diff --git a/test/docx/lists_level_override.native b/test/docx/lists_level_override.native new file mode 100644 --- /dev/null +++ b/test/docx/lists_level_override.native @@ -0,0 +1,266 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Para + [ Str "For" + , Space + , Str "each" + , Space + , Str "initiative" + , Space + , Str "below" + , Space + , Str "is" + , Space + , Str "outlined" + , Space + , Str "the" + , Space + , Str "goals," + , Space + , Str "an" + , Space + , Str "approximate" + , Space + , Str "roadmap" + , Space + , Str "which" + , Space + , Str "will" + , Space + , Str "likely" + , Space + , Str "change" + , Space + , Str "as" + , Space + , Str "we" + , Space + , Str "iterate," + , Space + , Str "signals/metrics" + , Space + , Str "to" + , Space + , Str "measure" + , Space + , Str "success," + , Space + , Str "and" + , Space + , Str "initial" + , Space + , Str "workitems" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "rough" + , Space + , Strong [ Str "schedule" ] + , Space + , Str "and" + , Space + , Str "contacts" + , Space + , Str "where" + , Space + , Str "available:" + ] + , Para [ Str "\160" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Para + [ Str "State" + , Space + , Str "of" + , Space + , Str "Documentation" + ] + ] + ] + , BlockQuote + [ Para + [ Strong + [ Str "Goal:" + , Space + , Str "Baseline" + , Space + , Str "and" + , Space + , Str "ongoing" + , Space + , Str "metrics" + , Space + , Str "tracking" + , Space + , Str "doc" + , Space + , Str "usefulness" + , Space + , Str "and" + , Space + , Str "completeness." + ] + ] + , Para [ Str "\160" ] + ] + , OrderedList + ( 2 , Decimal , Period ) + [ [ Para [ Str "Content" , Space , Str "Migration" ] ] ] + , BlockQuote + [ Para + [ Str "Goal:" + , Space + , Str "Content" + , Space + , Str "is" + , Space + , Str "accessible" + , Space + , Str "to" + , Space + , Str "new" + , Space + , Str "employees" + , Space + , Str "and" + , Space + , Str "is" + , Space + , Str "better" + , Space + , Str "organized/archived." + ] + , Para [ Str "\160" ] + ] + , OrderedList + ( 3 , Decimal , Period ) + [ [ Para [ Str "Wiki" , Space , Str "(xl)" ] ] ] + , BlockQuote + [ Para + [ Strong + [ Str "Goal:" + , Space + , Str "Useful" + , Space + , Str "documentation" + , Space + , Str "that" + , Space + , Str "is" + , Space + , Str "archived," + , Space + , Str "searchable" + , Space + , Str "and" + , Space + , Str "easy" + , Space + , Str "to" + , Space + , Str "create" + ] + ] + , Para [ Str "\160\160" ] + ] + , OrderedList + ( 4 , Decimal , Period ) + [ [ Para + [ Str "XL" + , Space + , Str "Code" + , Space + , Str "Autoreview" + , Space + , Str "Bot" + , Space + , Str "(XLCRBot)." + ] + ] + ] + , BlockQuote + [ Para + [ Strong + [ Str "Goal:" + , Space + , Str "Feedback" + , Space + , Str "on" + , Space + , Str "basic" + , Space + , Str "violations" + , Space + , Str "in" + , Space + , Str "seconds" + , Space + , Str "or" + , Space + , Str "minutes" + , Space + , Str "at" + , Space + , Str "most" + , Space + , Str "in" + , Space + , Str "either" + , Space + , Str "VS" + , Space + , Str "or" + , Space + , Str "Codeflow." + ] + ] + ] + , OrderedList + ( 5 , Decimal , Period ) + [ [ Para [ Str "Code" , Space , Str "documentation" ] ] ] + , BlockQuote + [ Para + [ Strong + [ Str "Goal:" + , Space + , Str "Useful," + , Space + , Str "consistent," + , Space + , Str "tool" + , Space + , Str "supported" + , Space + , Str "comments" + ] + ] + ] + , Para [ Strong [ Str "\160" ] , Str "\160" ] + , OrderedList + ( 6 , Decimal , Period ) + [ [ Para [ Str "Education" , Space , Str "efforts" ] ] ] + , BlockQuote + [ Para + [ Strong + [ Str "Goal:" + , Space + , Str "Broad," + , Space + , Str "discoverable" + , Space + , Str "channels" + , Space + , Str "for" + , Space + , Str "updates" + , Space + , Str "and" + , Space + , Str "news" + ] + ] + ] + , Para [ Strong [ Str "\160" ] ] + ] diff --git a/test/docx/lists_multiple_initial.native b/test/docx/lists_multiple_initial.native new file mode 100644 --- /dev/null +++ b/test/docx/lists_multiple_initial.native @@ -0,0 +1,8 @@ +[OrderedList (1,Decimal,Period) + [[OrderedList (1,LowerAlpha,TwoParens) + [[Para [Str "foo"]] + ,[Para [Str "bar"]]]]] +,BulletList + [[BulletList + [[Para [Str "foo"]] + ,[Para [Str "bar"]]]]]] diff --git a/test/docx/lists_sublist_reset.docx b/test/docx/lists_sublist_reset.docx new file mode 100644 Binary files /dev/null and b/test/docx/lists_sublist_reset.docx differ diff --git a/test/docx/lists_sublist_reset.native b/test/docx/lists_sublist_reset.native new file mode 100644 --- /dev/null +++ b/test/docx/lists_sublist_reset.native @@ -0,0 +1,8 @@ +[OrderedList (1,Decimal,Period) + [[Para [Str "Head",Space,Str "1"] + ,OrderedList (1,Decimal,DefaultDelim) + [[Para [Str "Head",Space,Str "1.1"]] + ,[Para [Str "Head",Space,Str "1.2"]]]] + ,[Para [Str "Head",Space,Str "2"] + ,OrderedList (1,Decimal,DefaultDelim) + [[Para [Str "Head",Space,Str "2.1"]]]]]] diff --git a/test/docx/mendeley_citations.docx b/test/docx/mendeley_citations.docx new file mode 100644 Binary files /dev/null and b/test/docx/mendeley_citations.docx differ diff --git a/test/docx/mendeley_citations_minus.native b/test/docx/mendeley_citations_minus.native new file mode 100644 --- /dev/null +++ b/test/docx/mendeley_citations_minus.native @@ -0,0 +1,318 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "Mendeley" + , Space + , Str "test" + , Space + , Str "(prefix" + , Space + , Str "Hadwen-Bennett" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2018," + , Space + , Str "p." + , Space + , Str "123" + , Space + , Str "suffix)." + ] + , Para + [ Str "Another" + , Space + , Str "test" + , Space + , Str "(prefix" + , Space + , Str "Seo," + , Space + , Str "2019," + , Space + , Str "pp." + , Space + , Str "10\8211\&20" + , Space + , Str "suffix)." + ] + , Para + [ Str "The" + , Space + , Str "last" + , Space + , Str "test" + , Space + , Str "(Koh" + , Space + , Str "&" + , Space + , Str "Abbas," + , Space + , Str "2015;" + , Space + , Str "Lee" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2011)." + ] + , Header 1 ( "references" , [] , [] ) [ Str "References" ] + , Para + [ Str "Hadwen-Bennett," + , Space + , Str "A.," + , Space + , Str "Sentance," + , Space + , Str "S.," + , Space + , Str "&" + , Space + , Str "Morrison," + , Space + , Str "C." + , Space + , Str "(2018)." + , Space + , Str "Making" + , Space + , Str "Programming" + , Space + , Str "Accessible" + , Space + , Str "to" + , Space + , Str "Learners" + , Space + , Str "with" + , Space + , Str "Visual" + , Space + , Str "Impairments:" + , Space + , Str "A" + , Space + , Str "Literature" + , Space + , Str "Review." + , Space + , Emph + [ Str "International" + , Space + , Str "Journal" + , Space + , Str "of" + , Space + , Str "Computer" + , Space + , Str "Science" + , Space + , Str "Education" + , Space + , Str "in" + , Space + , Str "Schools" + ] + , Str "," + , Space + , Emph [ Str "2" ] + , Str "(2)," + , Space + , Str "3\8211\&13." + , Space + , Str + "https://www.microsoft.com/en-us/research/publication/making-programming-accessible-to-learners-with-visual-impairments-a-literature-review/" + ] + , Para + [ Str "Koh," + , Space + , Str "K.," + , Space + , Str "&" + , Space + , Str "Abbas," + , Space + , Str "J." + , Space + , Str "(2015)." + , Space + , Str "Future" + , Space + , Str "of" + , Space + , Str "library" + , Space + , Str "and" + , Space + , Str "museum" + , Space + , Str "services" + , Space + , Str "supporting" + , Space + , Str "teen" + , Space + , Str "learning:" + , Space + , Str "Perceptions" + , Space + , Str "of" + , Space + , Str "professionals" + , Space + , Str "in" + , Space + , Str "learning" + , Space + , Str "labs" + , Space + , Str "and" + , Space + , Str "makerspaces." + , Space + , Emph + [ Str "Journal" + , Space + , Str "of" + , Space + , Str "Research" + , Space + , Str "on" + , Space + , Str "Libraries" + , Space + , Str "\\&" + , Space + , Str "Young" + , Space + , Str "Adults" + ] + , Str "," + , Space + , Emph [ Str "6" ] + , Str "(4)." + ] + , Para + [ Str "Lee," + , Space + , Str "I.," + , Space + , Str "Martin," + , Space + , Str "F.," + , Space + , Str "Denner," + , Space + , Str "J.," + , Space + , Str "Coulter," + , Space + , Str "B.," + , Space + , Str "Allan," + , Space + , Str "W.," + , Space + , Str "Erickson," + , Space + , Str "J.," + , Space + , Str "Malyn-Smith," + , Space + , Str "J.," + , Space + , Str "&" + , Space + , Str "Werner," + , Space + , Str "L." + , Space + , Str "(2011)." + , Space + , Str "Computational" + , Space + , Str "Thinking" + , Space + , Str "for" + , Space + , Str "Youth" + , Space + , Str "in" + , Space + , Str "Practice." + , Space + , Emph [ Str "ACM" , Space , Str "Inroads" ] + , Str "," + , Space + , Emph [ Str "2" ] + , Str "(1)," + , Space + , Str "32\8211\&37." + , Space + , Str "https://doi.org/10.1145/1929887.1929902" + ] + , Para + [ Str "Seo," + , Space + , Str "J." + , Space + , Str "(2019)." + , Space + , Str "Is" + , Space + , Str "the" + , Space + , Str "Maker" + , Space + , Str "Movement" + , Space + , Str "Inclusive" + , Space + , Str "of" + , Space + , Str "{ANYONE}?:" + , Space + , Str "Three" + , Space + , Str "Accessibility" + , Space + , Str "Considerations" + , Space + , Str "to" + , Space + , Str "Invite" + , Space + , Str "Blind" + , Space + , Str "Makers" + , Space + , Str "to" + , Space + , Str "the" + , Space + , Str "Making" + , Space + , Str "World." + , Space + , Emph [ Str "TechTrends" ] + , Str "," + , Space + , Emph [ Str "63" ] + , Str "(5)," + , Space + , Str "514\8211\&520." + , Space + , Str "https://doi.org/10.1007/s11528-019-00377-3" + ] + ] diff --git a/test/docx/mendeley_citations_plus.native b/test/docx/mendeley_citations_plus.native new file mode 100644 --- /dev/null +++ b/test/docx/mendeley_citations_plus.native @@ -0,0 +1,374 @@ +Pandoc + Meta + { unMeta = + fromList + [ ( "references" + , MetaList + [ MetaMap + (fromList + [ ( "DOI" + , MetaString "10.1145/1929887.1929902" + ) + , ( "ISSN" , MetaString "2153-2184" ) + , ( "author" + , MetaList + [ MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" , MetaString "Lee" ) + , ( "given" , MetaString "Irene" ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + , MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" , MetaString "Martin" ) + , ( "given" , MetaString "Fred" ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + , MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" , MetaString "Denner" ) + , ( "given" , MetaString "Jill" ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + , MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" + , MetaString "Coulter" + ) + , ( "given" , MetaString "Bob" ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + , MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" , MetaString "Allan" ) + , ( "given" , MetaString "Walter" ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + , MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" + , MetaString "Erickson" + ) + , ( "given" , MetaString "Jeri" ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + , MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" + , MetaString "Malyn-Smith" + ) + , ( "given" , MetaString "Joyce" ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + , MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" , MetaString "Werner" ) + , ( "given" , MetaString "Linda" ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + ] + ) + , ( "container-title" + , MetaInlines + [ Str "ACM" , Space , Str "Inroads" ] + ) + , ( "id" , MetaString "ITEM-1" ) + , ( "issue" , MetaInlines [ Str "1" ] ) + , ( "issued" , MetaString "2011-02" ) + , ( "page" , MetaInlines [ Str "32-37" ] ) + , ( "publisher" , MetaInlines [ Str "ACM" ] ) + , ( "publisher-place" + , MetaInlines + [ Str "New" + , Space + , Str "York," + , Space + , Str "NY," + , Space + , Str "USA" + ] + ) + , ( "title" + , MetaInlines + [ Str "Computational" + , Space + , Str "Thinking" + , Space + , Str "for" + , Space + , Str "Youth" + , Space + , Str "in" + , Space + , Str "Practice" + ] + ) + , ( "type" , MetaString "article-journal" ) + , ( "volume" , MetaInlines [ Str "2" ] ) + ]) + , MetaMap + (fromList + [ ( "author" + , MetaList + [ MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" , MetaString "Koh" ) + , ( "given" + , MetaString "Kyungwon" + ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + , MetaMap + (fromList + [ ( "dropping-particle" + , MetaString "" + ) + , ( "family" , MetaString "Abbas" ) + , ( "given" , MetaString "June" ) + , ( "non-dropping-particle" + , MetaString "" + ) + , ( "suffix" , MetaString "" ) + ]) + ] + ) + , ( "container-title" + , MetaInlines + [ Str "Journal" + , Space + , Str "of" + , Space + , Str "Research" + , Space + , Str "on" + , Space + , Str "Libraries" + , Space + , Str "\\&" + , Space + , Str "Young" + , Space + , Str "Adults" + ] + ) + , ( "id" , MetaString "ITEM-2" ) + , ( "issue" , MetaInlines [ Str "4" ] ) + , ( "issued" , MetaString "2015" ) + , ( "title" + , MetaInlines + [ Str "Future" + , Space + , Str "of" + , Space + , Str "library" + , Space + , Str "and" + , Space + , Str "museum" + , Space + , Str "services" + , Space + , Str "supporting" + , Space + , Str "teen" + , Space + , Str "learning:" + , Space + , Str "Perceptions" + , Space + , Str "of" + , Space + , Str "professionals" + , Space + , Str "in" + , Space + , Str "learning" + , Space + , Str "labs" + , Space + , Str "and" + , Space + , Str "makerspaces" + ] + ) + , ( "type" , MetaString "article-journal" ) + , ( "volume" , MetaInlines [ Str "6" ] ) + ]) + ] + ) + ] + } + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "Mendeley" + , Space + , Str "test" + , Space + , Cite + [ Citation + { citationId = "ITEM-1" + , citationPrefix = [ Str "prefix" ] + , citationSuffix = + [ Str "," , Space , Str "123" , Space , Str "suffix" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(prefix" + , Space + , Str "Hadwen-Bennett" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2018," + , Space + , Str "p." + , Space + , Str "123" + , Space + , Str "suffix)" + ] + , Str "." + ] + , Para + [ Str "Another" + , Space + , Str "test" + , Space + , Cite + [ Citation + { citationId = "ITEM-1" + , citationPrefix = [ Str "prefix" ] + , citationSuffix = + [ Str "," + , Space + , Str "10-20" + , Space + , Str "suffix" + ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(prefix" + , Space + , Str "Seo," + , Space + , Str "2019," + , Space + , Str "pp." + , Space + , Str "10\8211\&20" + , Space + , Str "suffix)" + ] + , Str "." + ] + , Para + [ Str "The" + , Space + , Str "last" + , Space + , Str "test" + , Space + , Cite + [ Citation + { citationId = "ITEM-1" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "ITEM-2" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(Koh" + , Space + , Str "&" + , Space + , Str "Abbas," + , Space + , Str "2015;" + , Space + , Str "Lee" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2011)" + ] + , Str "." + ] + , Header 1 ( "references" , [] , [] ) [ Str "References" ] + ] diff --git a/test/docx/metadata.docx b/test/docx/metadata.docx Binary files a/test/docx/metadata.docx and b/test/docx/metadata.docx differ diff --git a/test/docx/metadata_after_normal.docx b/test/docx/metadata_after_normal.docx Binary files a/test/docx/metadata_after_normal.docx and b/test/docx/metadata_after_normal.docx differ diff --git a/test/docx/nested_anchors_in_header.native b/test/docx/nested_anchors_in_header.native --- a/test/docx/nested_anchors_in_header.native +++ b/test/docx/nested_anchors_in_header.native @@ -1,4 +1,9 @@ -[Header 1 ("short-instructions",[],[]) [Str "Short",Space,Str "instructions"] +[Header 1 ("\1086\1075\1083\1072\1074\1083\1077\1085\1080\1077",["TOC-Heading"],[]) [Str "\1054\1075\1083\1072\1074\1083\1077\1085\1080\1077"] +,Para [Link ("",[],[]) [Str "Short",Space,Str "instructions",Space,Link ("",[],[]) [Str "1"] ("#short-instructions","")] ("#short-instructions","")] +,Para [Link ("",[],[]) [Str "Some",Space,Str "instructions",Space,Link ("",[],[]) [Str "1"] ("#some-instructions","")] ("#some-instructions","")] +,Para [Link ("",[],[]) [Str "Remote",Space,Str "folder",Space,Str "or",Space,Str "longlonglonglonglong",Space,Str "file",Space,Str "with",Space,Str "manymanymanymany",Space,Str "letters",Space,Str "inside",Space,Str "opening",Space,Link ("",[],[]) [Str "2"] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-opening","")] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-opening","")] +,Para [Link ("",[],[]) [Str "Remote",Space,Str "folder",Space,Str "or",Space,Str "longlonglonglonglong",Space,Str "file",Space,Str "with",Space,Str "manymanymanymany",Space,Str "letters",Space,Str "inside",Space,Str "closing",Space,Link ("",[],[]) [Str "2"] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-closing","")] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-closing","")] +,Header 1 ("short-instructions",[],[]) [Str "Short",Space,Str "instructions"] ,Para [Link ("",[],[]) [Str "Open",Space,Str "remote",Space,Str "folder"] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-opening","")] ,Para [Str "Do",Space,Str "staff"] ,Para [Link ("",[],[]) [Str "Close",Space,Str "remote",Space,Str "folder"] ("#remote-folder-or-longlonglonglonglong-file-with-manymanymanymany-letters-inside-closing","")] diff --git a/test/docx/nested_instrText.docx b/test/docx/nested_instrText.docx new file mode 100644 Binary files /dev/null and b/test/docx/nested_instrText.docx differ diff --git a/test/docx/nested_instrText.native b/test/docx/nested_instrText.native new file mode 100644 --- /dev/null +++ b/test/docx/nested_instrText.native @@ -0,0 +1,5 @@ +[Para [Str "\24076\26395\28145\20837\20102\35299\30340\35835\32773\21487\20197\21435\30475David",Space,Str "French",Space,Str "Belding\21644Kevin",Space,Str "J.",Space,Str "Mitchell\30340" + ,Link ("",[],[]) [Str "Foundations",Space,Str "of",Space,Str "Analysis,",Space,Str "1/16/18",Space,Str "8:40:00",Space,Str "AM,",Space,Str "2nd",Space,Str "Edition"] ("https://books.google.com/books?id=sp_Zcb9ot90C&lpg=PR4&hl=zh-CN&pg=PA19#v=onepage&q&f=true","") + ,Str ",\21487\20174\&19\39029\30475\36215\65292\25110D.C.",Space,Str "Goldrei\30340",Space + ,Link ("",[],[]) [Str "Classic",Space,Str "Set",Space,Str "Theory:",Space,Str "For",Space,Str "Guided",Space,Str "Independent",Space,Str "Study"] ("https://books.google.ae/books?id=dlc0DwAAQBAJ&lpg=PT29&hl=zh-CN&pg=PT26#v=onepage&q&f=true","") + ,Str "\65292\20174\31532\20108\31456\30475\36215\65292\38405\35835\26102\35201\27880\24847\26412\25991\19982\36825\20123\20070\25152\19981\21516\30340\26159\24182\27809\26377\25226\23454\25968\30475\20316\26159\26377\29702\25968\38598\30340\20998\21106\12290"]] diff --git a/test/docx/nested_sdt.docx b/test/docx/nested_sdt.docx new file mode 100644 Binary files /dev/null and b/test/docx/nested_sdt.docx differ diff --git a/test/docx/nested_sdt.native b/test/docx/nested_sdt.native new file mode 100644 --- /dev/null +++ b/test/docx/nested_sdt.native @@ -0,0 +1,3 @@ +[Para [Str "Test",Space,Str "Paragraph1"] +,Para [Str "Test",Space,Str "Paragraph2"] +,Para [Str "Test",Space,Str "Paragraph3"]] diff --git a/test/docx/nested_smart_tags.docx b/test/docx/nested_smart_tags.docx new file mode 100644 Binary files /dev/null and b/test/docx/nested_smart_tags.docx differ diff --git a/test/docx/nested_smart_tags.native b/test/docx/nested_smart_tags.native new file mode 100644 --- /dev/null +++ b/test/docx/nested_smart_tags.native @@ -0,0 +1,7 @@ +[Header 2 ("and-it-came-to-pass-in-the-course-of-those-many-days",["Myheading2"],[]) [Str "159.",Space,Str "And",Space,Str "It",Space,Str "Came",Space,Str "to",Space,Str "Pass",Space,Str "in",Space,Str "the",Space,Str "Course",Space,Str "of",Space,Str "Those",Space,Str "Many",Space,Str "Days"] +,Para [Str "I",Space,Str "heard"] +,Para [Str "\8220And",Space,Str "it",Space,Str "came",Space,Str "to",Space,Str "pass",Space,Str "in",Space,Str "the",Space,Str "course",Space,Str "of",Space,Str "those",Space,Str "many",Space,Str "days",Space,Str "that",Space,Str "the",Space,Str "king",Space,Str "of",Space,Str "Egypt",Space,Str "died;",Space,Str "and",Space,Str "the",Space,Str "children",Space,Str "of",Space,Str "Israel",Space,Str "sighed",Space,Str "by",Space,Str "reason",Space,Str "of",Space,Str "the",Space,Str "bondage,",Space,Str "and",Space,Str "they",Space,Str "cried,",Space,Str "and",Space,Str "their",Space,Str "cry",Space,Str "came",Space,Str "up",Space,Str "unto",Space,Str "God",Space,Str "by",Space,Str "reason",Space,Str "of",Space,Str "the",Space,Str "bondage.",Space,Str "And",Space,Str "God",Space,Str "heard",Space,Str "their",Space,Str "groaning\8221",Space,Str "(Exodus",Space,Str "2:23-4).",Space,Str "This",Space,Str "means",Space,Str "that",Space,Str "they",Space,Str "suffered",Space,Str "so",Space,Str "much",Space,Str "that",Space,Str "they",Space,Str "could",Space,Str "not",Space,Str "bear",Space,Str "it",Space,Str "any",Space,Str "longer.",Space,Str "And",Space,Str "they",Space,Str "so",Space,Str "pleaded",Space,Str "with",Space,Str "prayer,",Space,Str "that",Space,Str "\8220their",Space,Str "cry",Space,Str "came",Space,Str "up",Space,Str "unto",Space,Str "God.\8221"] +,Para [Str "But",Space,Str "we",Space,Str "can",Space,Str "see",Space,Str "that",Space,Str "they",Space,Str "were",Space,Str "saying,",Space,Str "\8220Would",Space,Str "that",Space,Str "we",Space,Str "had\8230",Space,Str "when",Space,Str "we",Space,Str "sat",Space,Str "by",Space,Str "the",Space,Str "flesh-pots,",Space,Str "when",Space,Str "we",Space,Str "did",Space,Str "eat",Space,Str "bread",Space,Str "to",Space,Str "the",Space,Str "full.\8221",Space,Str "And",Space,Str "they",Space,Str "also",Space,Str "said,",Space,Str "\8220We",Space,Str "remember",Space,Str "the",Space,Str "fish,",Space,Str "which",Space,Str "we",Space,Str "would",Space,Str "eat",Space,Str "in",Space,Str "Egypt",Space,Str "for",Space,Str "naught;",Space,Str "the",Space,Str "cucumbers,",Space,Str "and",Space,Str "the",Space,Str "melons,",Space,Str "and",Space,Str "the",Space,Str "leeks,",Space,Str "and",Space,Str "the",Space,Str "onions,",Space,Str "and",Space,Str "the",Space,Str "garlic.\8221"] +,Para [Str "The",Space,Str "thing",Space,Str "is",Space,Str "that,",Space,Str "indeed,",Space,Str "they",Space,Str "were",Space,Str "very",Space,Str "fond",Space,Str "of",Space,Str "the",Space,Str "work",Space,Str "in",Space,Str "Egypt.",Space,Str "This",Space,Str "is",Space,Str "the",Space,Str "meaning",Space,Str "of",Space,Str "\8220But",Space,Str "mingled",Space,Str "themselves",Space,Str "with",Space,Str "the",Space,Str "nations,",Space,Str "and",Space,Str "learned",Space,Str "their",Space,Str "works.\8221",Space,Str "It",Space,Str "means",Space,Str "that",Space,Str "if",Space,Str "Israel",Space,Str "are",Space,Str "under",Space,Str "the",Space,Str "dominion",Space,Str "of",Space,Str "a",Space,Str "certain",Space,Str "nation,",Space,Str "that",Space,Str "nation",Space,Str "controls",Space,Str "them",Space,Str "and",Space,Str "they",Space,Str "cannot",Space,Str "retire",Space,Str "from",Space,Str "their",Space,Str "dominion.",Space,Str "Thus,",Space,Str "they",Space,Str "tasted",Space,Str "sufficient",Space,Str "flavor",Space,Str "in",Space,Str "that",Space,Str "work",Space,Str "and",Space,Str "could",Space,Str "not",Space,Str "be",Space,Str "redeemed."] +,Para [Str "So",Space,Str "what",Space,Str "did",Space,Str "the",Space,Str "Creator",Space,Str "do?",Space,Str "\8220The",Space,Str "king",Space,Str "of",Space,Str "Egypt",Space,Str "died,\8221",Space,Str "meaning",Space,Str "they",Space,Str "had",Space,Str "lost",Space,Str "this",Space,Str "servitude.",Space,Str "Thus",Space,Str "they",Space,Str "could",Space,Str "no",Space,Str "longer",Space,Str "work;",Space,Str "they",Space,Str "understood",Space,Str "that",Space,Str "if",Space,Str "there",Space,Str "is",Space,Str "no",Space,Str "perfection",Space,Str "of",Space,Str "the",Space,Emph [Str "Mochin"],Str ",",Space,Str "the",Space,Str "servitude",Space,Str "is",Space,Str "also",Space,Str "incomplete.",Space,Str "Hence,",Space,Str "\8220and",Space,Str "the",Space,Str "children",Space,Str "of",Space,Str "Israel",Space,Str "sighed",Space,Str "by",Space,Str "reason",Space,Str "of",Space,Str "the",Space,Str "bondage.\8221",Space,Str "The",Space,Str "work",Space,Str "means",Space,Str "that",Space,Str "they",Space,Str "did",Space,Str "not",Space,Str "suffice",Space,Str "for",Space,Str "the",Space,Str "work,",Space,Str "that",Space,Str "they",Space,Str "had",Space,Str "no",Space,Str "liveliness",Space,Str "in",Space,Str "the",Space,Str "servitude."] +,Para [Str "This",Space,Str "is",Space,Str "the",Space,Str "meaning",Space,Str "of",Space,Str "\8220the",Space,Str "king",Space,Str "of",Space,Str "Egypt",Space,Str "died,\8221",Space,Str "that",Space,Str "all",Space,Str "the",Space,Str "dominations",Space,Str "of",Space,Str "the",Space,Str "king",Space,Str "of",Space,Str "Egypt,",Space,Str "which",Space,Str "he",Space,Str "was",Space,Str "providing",Space,Str "for",Space,Str "and",Space,Str "nourishing,",Space,Str "had",Space,Str "died.",Space,Str "This",Space,Str "is",Space,Str "why",Space,Str "they",Space,Str "had",Space,Str "room",Space,Str "for",Space,Str "prayer.",Space,Str "And",Space,Str "they",Space,Str "were",Space,Str "immediately",Space,Str "salvaged.",Space,Str "And",Space,Str "afterwards,",Space,Str "when",Space,Str "they",Space,Str "walked",Space,Str "in",Space,Str "the",Space,Str "desert",Space,Str "and",Space,Str "came",Space,Str "to",Space,Str "a",Space,Str "state",Space,Str "of",Space,Emph [Str "Katnut"],Space,Str "(smallness),",Space,Str "they",Space,Str "craved",Space,Str "the",Space,Str "servitude",Space,Str "that",Space,Str "they",Space,Str "had",Space,Str "had",Space,Str "prior",Space,Str "to",Space,Str "the",Space,Str "death",Space,Str "of",Space,Str "the",Space,Str "king",Space,Str "of",Space,Str "Egypt."]] diff --git a/test/docx/normalize.docx b/test/docx/normalize.docx Binary files a/test/docx/normalize.docx and b/test/docx/normalize.docx differ diff --git a/test/docx/notes.docx b/test/docx/notes.docx Binary files a/test/docx/notes.docx and b/test/docx/notes.docx differ diff --git a/test/docx/numbered_header.docx b/test/docx/numbered_header.docx Binary files a/test/docx/numbered_header.docx and b/test/docx/numbered_header.docx differ diff --git a/test/docx/overlapping_targets.docx b/test/docx/overlapping_targets.docx new file mode 100644 Binary files /dev/null and b/test/docx/overlapping_targets.docx differ diff --git a/test/docx/overlapping_targets.native b/test/docx/overlapping_targets.native new file mode 100644 --- /dev/null +++ b/test/docx/overlapping_targets.native @@ -0,0 +1,3 @@ +[Para [Link ("",[],[]) [Str "One",Space,Str "link",Space,Str "to",Space,Str "one",Space,Str "target."] ("#Fizz","")] +,Para [Span ("Fizz",["anchor"],[]) [],Str "This",Space,Str "is",Space,Str "a",Space,Str "target",Space,Str "with",Space,Str "two",Space,Str "names."] +,Para [Link ("",[],[]) [Str "Another",Space,Str "link",Space,Str "to",Space,Str "the",Space,Str "same",Space,Str "target."] ("#Fizz","")]] diff --git a/test/docx/pageref.docx b/test/docx/pageref.docx new file mode 100644 Binary files /dev/null and b/test/docx/pageref.docx differ diff --git a/test/docx/pageref.native b/test/docx/pageref.native new file mode 100644 --- /dev/null +++ b/test/docx/pageref.native @@ -0,0 +1,4 @@ +[Para [Str "Title",Space,Link ("",[],[]) [Str "2"] ("#title","")] +,Para [Str "Title2",Space,Link ("",[],[]) [Str "2"] ("#title2","")] +,Header 1 ("title", [],[]) [Str "Title"] +,Header 1 ("title2",[],[]) [Str "Title2"]] diff --git a/test/docx/paragraph_insertion_deletion.docx b/test/docx/paragraph_insertion_deletion.docx new file mode 100644 Binary files /dev/null and b/test/docx/paragraph_insertion_deletion.docx differ diff --git a/test/docx/paragraph_insertion_deletion_accept.native b/test/docx/paragraph_insertion_deletion_accept.native new file mode 100644 --- /dev/null +++ b/test/docx/paragraph_insertion_deletion_accept.native @@ -0,0 +1,2 @@ +[Para [Str "This",Space,Str "is",Space,Str "a"] +,Para [Str "split",Space,Str "Paragraph."]] diff --git a/test/docx/paragraph_insertion_deletion_all.native b/test/docx/paragraph_insertion_deletion_all.native new file mode 100644 --- /dev/null +++ b/test/docx/paragraph_insertion_deletion_all.native @@ -0,0 +1,3 @@ +[Para [Str "This",Space,Str "is",Space,Str "a",Span ("",["paragraph-insertion"],[("author","Seeley, Jason"),("date","2017-09-17T16:39:00Z")]) []] +,Para [Str "split",Span ("",["paragraph-deletion"],[("author","Seeley, Jason"),("date","2017-09-17T16:39:00Z")]) []] +,Para [Str "Paragraph."]] diff --git a/test/docx/paragraph_insertion_deletion_reject.native b/test/docx/paragraph_insertion_deletion_reject.native new file mode 100644 --- /dev/null +++ b/test/docx/paragraph_insertion_deletion_reject.native @@ -0,0 +1,2 @@ +[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "split"] +,Para [Str "Paragraph."]] diff --git a/test/docx/raw-blocks.native b/test/docx/raw-blocks.native new file mode 100644 --- /dev/null +++ b/test/docx/raw-blocks.native @@ -0,0 +1,6 @@ +[Para [Str "Cell",Space,Str "compartments"] +,RawBlock (Format "openxml") "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" +,Para [Str "Ribosome"] +,RawBlock (Format "openxml") "\n" +,Para [Str "Lysosome"] +,RawBlock (Format "openxml") "\n\n"] diff --git a/test/docx/raw-bookmarks.native b/test/docx/raw-bookmarks.native new file mode 100644 --- /dev/null +++ b/test/docx/raw-bookmarks.native @@ -0,0 +1,3 @@ +[Para [Str "Manual",Space,Str "endnotes."] +,Para [Str "Nullam",Space,Str "eu",Space,Str "ante",Space,Str "vel",Space,Str "est",Space,Str "convallis",Space,Str "dignissim.",Space,Str "Nunc",Space,Str "porta",Space,Str "vulputate",Space,Str "tellus.",Space,Str "Nunc",Space,Str "rutrum",Space,Str "turpis",Space,Str "sed",Space,Str "pede.",Space,Str "Sed",Space,Str "bibendum.",RawInline (Format "openxml") "",Str "Aliquam",Space,Str "posuere."] +,Para [Str "Nunc",Space,Str "aliquet,",Space,Str "augue",Space,Str "nec",Space,Str "adipiscing",Space,Str "interdum,",Space,Str "lacus",Space,Str "tellus",Space,Str "malesuada",Space,Str "massa,",Space,Str "quis",Space,Str "varius",Space,Str "mi",Space,Str "purus",Space,Str "non",Space,Str "odio.",RawInline (Format "openxml") "",Str "Pellentesque",Space,Str "condimentum,",Space,Str "magna",Space,Str "ut",Space,Str "suscipit",Space,Str "hendrerit,",Space,Str "ipsum",Space,Str "augue",Space,Str "ornare",Space,Str "nulla,",Space,Str "non",Space,Str "luctus",Space,Str "diam",Space,Str "neque",Space,Str "sit",Space,Str "amet",Space,Str "urna.",Space,Str "Curabitur",Space,Str "vulputate",Space,Str "vestibulum",Space,Str "lorem."]] diff --git a/test/docx/relative_indentation_blockquotes.docx b/test/docx/relative_indentation_blockquotes.docx new file mode 100644 Binary files /dev/null and b/test/docx/relative_indentation_blockquotes.docx differ diff --git a/test/docx/relative_indentation_blockquotes.native b/test/docx/relative_indentation_blockquotes.native new file mode 100644 --- /dev/null +++ b/test/docx/relative_indentation_blockquotes.native @@ -0,0 +1,6 @@ +[Header 1 ("indentation-blockquotes",[],[]) [Str "Indentation",Space,Str "blockquotes"] +,Para [Str "Foobar"] +,Para [Str "First",Space,Str "line",Space,Str "indented."] +,Para [Str "Normal",Space,Str "list",Space,Str "paragraph"] +,Para [Str "List",Space,Str "paragraph",Space,Str "with",Space,Str "less",Space,Str "indent"] +,BlockQuote [Para [Str "List",Space,Str "paragraph",Space,Str "with",Space,Str "more",Space,Str "indent"]]] diff --git a/test/docx/sdt_elements.native b/test/docx/sdt_elements.native --- a/test/docx/sdt_elements.native +++ b/test/docx/sdt_elements.native @@ -1,10 +1,60 @@ -[Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Strong [Str "col1Header"]]] - ,[Plain [Strong [Str "col2Header"]]] - ,[Plain [Strong [Str "col3Header"]]]] - ,[[Plain [Str "col1",Space,Str "content"]] - ,[Plain [Str "Body",Space,Str "copy"]] - ,[Plain [Str "col3",Space,Str "content"]]]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.16167023554603854 ) + , ( AlignDefault , ColWidth 0.16167023554603854 ) + , ( AlignDefault , ColWidth 0.40920770877944324 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Plain [ Strong [ Str "col1Header" ] ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Plain [ Strong [ Str "col2Header" ] ] ] + , Cell + ( "" , [] , [] ) + AlignCenter + (RowSpan 1) + (ColSpan 1) + [ Plain [ Strong [ Str "col3Header" ] ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "col1" , Space , Str "content" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Body" , Space , Str "copy" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "col3" , Space , Str "content" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/docx/sdt_in_footnote.docx b/test/docx/sdt_in_footnote.docx new file mode 100644 Binary files /dev/null and b/test/docx/sdt_in_footnote.docx differ diff --git a/test/docx/sdt_in_footnote.native b/test/docx/sdt_in_footnote.native new file mode 100644 --- /dev/null +++ b/test/docx/sdt_in_footnote.native @@ -0,0 +1,1 @@ +[Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet.",Note [Para [Str "Vgl.",Space,Emph [Str "Bitzios"],Space,Str "u.",Space,Str "a.:",Space,Str "Dissonance",Space,Str "in",Space,Str "the",Space,Str "food",Space,Str "traceability",Space,Str "regulatory",Space,Str "environment",Space,Str "and",Space,Str "food",Space,Str "fraud,",Space,Str "in:",Space,Str "Dries",Space,Str "u.",Space,Str "a.",Space,Str "(Hrsg.):",Space,Str "It\8217s",Space,Str "a",Space,Str "jungle",Space,Str "out",Space,Str "there",Space,Str "-",Space,Str "the",Space,Str "strange",Space,Str "animals",Space,Str "of",Space,Str "economic",Space,Str "organization",Space,Str "in",Space,Str "agri-food",Space,Str "value",Space,Str "chains,",Space,Str "Wageningen",Space,Str "im",Space,Str "Druck,",Space,Str "hier",Space,Str "S.\160\&100-105."]]]] diff --git a/test/docx/table_captions_no_field.docx b/test/docx/table_captions_no_field.docx new file mode 100644 Binary files /dev/null and b/test/docx/table_captions_no_field.docx differ diff --git a/test/docx/table_captions_no_field.native b/test/docx/table_captions_no_field.native new file mode 100644 --- /dev/null +++ b/test/docx/table_captions_no_field.native @@ -0,0 +1,81 @@ +[ Para + [ Str "See" , Space , Str "Table" , Space , Str "5.1." ] +, Table + ( "" , [] , [] ) + (Caption + Nothing [ Para [ Str "Table" , Space , Str "5.1" ] ]) + [ ( AlignDefault , ColWidth 0.7605739372523824 ) + , ( AlignDefault , ColWidth 0.11971303137380876 ) + , ( AlignDefault , ColWidth 0.11971303137380876 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Count" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "%" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" , Space , Str "option" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "242" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "45" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" , Space , Str "option" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "99" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "18" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Header 2 ( "section" , [] , [] ) [] +] diff --git a/test/docx/table_captions_with_field.docx b/test/docx/table_captions_with_field.docx new file mode 100644 Binary files /dev/null and b/test/docx/table_captions_with_field.docx differ diff --git a/test/docx/table_captions_with_field.native b/test/docx/table_captions_with_field.native new file mode 100644 --- /dev/null +++ b/test/docx/table_captions_with_field.native @@ -0,0 +1,145 @@ +[ Para + [ Str "See" + , Space + , Link + ( "" , [] , [] ) + [ Str "Table" , Space , Str "1" ] + ( "#_Ref71265628" , "" ) + , Str "." + ] +, Table + ( "" , [] , [] ) + (Caption + Nothing + [ Para + [ Span ( "_Ref71265628" , [ "anchor" ] , [] ) [] + , Str "Table" + , Space + , Str "1" + ] + ]) + [ ( AlignDefault , ColWidth 0.7605739372523824 ) + , ( AlignDefault , ColWidth 0.11971303137380876 ) + , ( AlignDefault , ColWidth 0.11971303137380876 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Count" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "%" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" , Space , Str "option" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "242" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "45" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" , Space , Str "option" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "99" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "18" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Header 2 ( "section" , [] , [] ) [] +, Table + ( "" , [] , [] ) + (Caption + Nothing + [ Para + [ Span ( "_Ref71265695" , [ "anchor" ] , [] ) [] + , Str "Table" + , Space + , Str "2" + ] + ]) + [ ( AlignDefault , ColWidth 0.33329636202307006 ) + , ( AlignDefault , ColWidth 0.33329636202307006 ) + , ( AlignDefault , ColWidth 0.33340727595385977 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "One" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Two" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Three" ] ] + ] + ]) + [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "See" + , Space + , Link + ( "" , [] , [] ) + [ Str "Table" , Space , Str "2" ] + ( "#_Ref71265695" , "" ) + , Str "." + ] +] diff --git a/test/docx/table_gridbefore.docx b/test/docx/table_gridbefore.docx new file mode 100644 Binary files /dev/null and b/test/docx/table_gridbefore.docx differ diff --git a/test/docx/table_gridbefore.native b/test/docx/table_gridbefore.native new file mode 100644 --- /dev/null +++ b/test/docx/table_gridbefore.native @@ -0,0 +1,823 @@ +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 7.883369330453563e-3 ) + , ( AlignDefault , ColWidth 3.0669546436285097e-2 ) + , ( AlignDefault , ColWidth 3.0669546436285097e-2 ) + , ( AlignDefault , ColWidth 3.0669546436285097e-2 ) + , ( AlignDefault , ColWidth 3.0669546436285097e-2 ) + , ( AlignDefault , ColWidth 3.0669546436285097e-2 ) + , ( AlignDefault , ColWidth 3.0669546436285097e-2 ) + , ( AlignDefault , ColWidth 3.0669546436285097e-2 ) + , ( AlignDefault , ColWidth 3.0669546436285097e-2 ) + , ( AlignDefault , ColWidth 3.0669546436285097e-2 ) + , ( AlignDefault , ColWidth 0.42861771058315334 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 8) + [ Plain [ Str "Bits" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "TEXT" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "BINARY" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "HYPERLINKS" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "FILEURL" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "LOCATION" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "ENHANCED" , Space , Str "STATUS" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Value" + , Space + , Str "allocated" + , Space + , Str "for" + , Space + , Str "use" + , Space + , Str "in" + , Space + , Str "interworking" + , Space + , Str "(NOTE)" + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "LOCATION" , Space , Str "ALTITUDE" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "LOCATION" , Space , Str "TIMESTAMP" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "CODED" , Space , Str "TEXT" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 10) + [ Plain + [ Str "All" + , Space + , Str "other" + , Space + , Str "values" + , Space + , Str "are" + , Space + , Str "reserved." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 10) + [ Plain + [ Str "NOTE:" + , Space + , Str "Usage" + , Space + , Str "of" + , Space + , Str "this" + , Space + , Str "value" + , Space + , Str "is" + , Space + , Str "described" + , Space + , Str "in" + , Space + , Str "3GPP\160TS\160\&29.582\160[48]." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/docx/table_header_rowspan.docx b/test/docx/table_header_rowspan.docx new file mode 100644 Binary files /dev/null and b/test/docx/table_header_rowspan.docx differ diff --git a/test/docx/table_header_rowspan.native b/test/docx/table_header_rowspan.native new file mode 100644 --- /dev/null +++ b/test/docx/table_header_rowspan.native @@ -0,0 +1,542 @@ +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidth 0.30701754385964913 ) + , ( AlignDefault , ColWidth 0.13645224171539963 ) + , ( AlignDefault , ColWidth 0.10009746588693959 ) + , ( AlignDefault , ColWidth 9.707602339181289e-2 ) + , ( AlignDefault , ColWidth 7.719298245614035e-2 ) + , ( AlignDefault , ColWidth 7.085769980506823e-2 ) + , ( AlignDefault , ColWidth 7.09551656920078e-2 ) + , ( AlignDefault , ColWidth 0.14035087719298248 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "A" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Strong [ Str "B" ] ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Strong [ Str "C" ] ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Strong [ Str "D" ] ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 3) + [ Plain [ Str "E" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 2) + (ColSpan 1) + [ Plain [ Str "F" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Strong [ Str "G" ] ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Strong [ Str "H" ] ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Strong [ Str "I" ] ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignLeft + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/docx/table_one_header_row.docx b/test/docx/table_one_header_row.docx new file mode 100644 Binary files /dev/null and b/test/docx/table_one_header_row.docx differ diff --git a/test/docx/table_one_header_row.native b/test/docx/table_one_header_row.native new file mode 100644 --- /dev/null +++ b/test/docx/table_one_header_row.native @@ -0,0 +1,34 @@ +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.3330243337195829 ) + , ( AlignDefault , ColWidth 0.33325608342989577 ) + , ( AlignDefault , ColWidth 0.33371958285052145 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "One" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Table" ] ] + ] + ]) + [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/docx/table_one_row.docx b/test/docx/table_one_row.docx Binary files a/test/docx/table_one_row.docx and b/test/docx/table_one_row.docx differ diff --git a/test/docx/table_one_row.native b/test/docx/table_one_row.native --- a/test/docx/table_one_row.native +++ b/test/docx/table_one_row.native @@ -1,7 +1,37 @@ -[Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Str "One"]] - ,[Plain [Str "Row"]] - ,[Plain [Str "Table"]]]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.33333333333333337 ) + , ( AlignDefault , ColWidth 0.33333333333333337 ) + , ( AlignDefault , ColWidth 0.33333333333333337 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "One" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Table" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/docx/table_variable_width.docx b/test/docx/table_variable_width.docx new file mode 100644 Binary files /dev/null and b/test/docx/table_variable_width.docx differ diff --git a/test/docx/table_variable_width.native b/test/docx/table_variable_width.native new file mode 100644 --- /dev/null +++ b/test/docx/table_variable_width.native @@ -0,0 +1,78 @@ +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 1.9673503557974047e-2 ) + , ( AlignDefault , ColWidth 1.946421096693177e-2 ) + , ( AlignDefault , ColWidth 0.21735035579740478 ) + , ( AlignDefault , ColWidth 0.4660946002511511 ) + , ( AlignDefault , ColWidth 1.0464629552113855e-4 ) + , ( AlignDefault , ColWidth 0.25627877773126834 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "h3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "h4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "h5" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 3) + [ Plain [ Str "c11" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 2) [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 2) + [ Plain [ Str "c22" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "c23" ] ] + , Cell + ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 2) [] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/docx/table_with_list_cell.docx b/test/docx/table_with_list_cell.docx Binary files a/test/docx/table_with_list_cell.docx and b/test/docx/table_with_list_cell.docx differ diff --git a/test/docx/table_with_list_cell.native b/test/docx/table_with_list_cell.native --- a/test/docx/table_with_list_cell.native +++ b/test/docx/table_with_list_cell.native @@ -1,11 +1,72 @@ -[Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[Plain [Str "Cell",Space,Str "with",Space,Str "text"]] - ,[Plain [Str "Cell",Space,Str "with",Space,Str "text"]]] - [[[BulletList - [[Para [Str "Cell",Space,Str "with"]] - ,[Para [Str "A"]] - ,[Para [Str "Bullet",Space,Str "list"]]]] - ,[OrderedList (1,Decimal,Period) - [[Para [Str "Cell",Space,Str "with"]] - ,[Para [Str "A"]] - ,[Para [Str "Numbered",Space,Str "list."]]]]]]] +[ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.5 ) + , ( AlignDefault , ColWidth 0.5 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Cell" + , Space + , Str "with" + , Space + , Str "text" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Cell" + , Space + , Str "with" + , Space + , Str "text" + ] + ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ BulletList + [ [ Para [ Str "Cell" , Space , Str "with" ] ] + , [ Para [ Str "A" ] ] + , [ Para [ Str "Bullet" , Space , Str "list" ] ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ OrderedList + ( 1 , Decimal , Period ) + [ [ Para [ Str "Cell" , Space , Str "with" ] ] + , [ Para [ Str "A" ] ] + , [ Para [ Str "Numbered" , Space , Str "list." ] ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/docx/tables-default-widths.native b/test/docx/tables-default-widths.native new file mode 100644 --- /dev/null +++ b/test/docx/tables-default-widths.native @@ -0,0 +1,92 @@ +[Header 2 ("a-table-with-and-without-a-header-row",[],[]) [Str "A",Space,Str "table,",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "a",Space,Str "header",Space,Str "row"] +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Name"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Game"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Fame"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Blame"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Lebron",Space,Str "James"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Basketball"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Very",Space,Str "High"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Leaving",Space,Str "Cleveland"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Ryan",Space,Str "Braun"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Baseball"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Moderate"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Steroids"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Russell",Space,Str "Wilson"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Football"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "High"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Tacky",Space,Str "uniform"]]]])] + (TableFoot ("",[],[]) + []) +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Sinple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Table"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Without"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Header"]]]])] + (TableFoot ("",[],[]) + []) +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "Simple"] + ,Para [Str "Multiparagraph"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "Table"] + ,Para [Str "Full"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "Of"] + ,Para [Str "Paragraphs"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "In",Space,Str "each"] + ,Para [Str "Cell."]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/docx/tables.docx b/test/docx/tables.docx Binary files a/test/docx/tables.docx and b/test/docx/tables.docx differ diff --git a/test/docx/tables.native b/test/docx/tables.native --- a/test/docx/tables.native +++ b/test/docx/tables.native @@ -1,36 +1,238 @@ -[Header 2 ("a-table-with-and-without-a-header-row",[],[]) [Str "A",Space,Str "table,",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "a",Space,Str "header",Space,Str "row"] -,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0] - [[Plain [Str "Name"]] - ,[Plain [Str "Game"]] - ,[Plain [Str "Fame"]] - ,[Plain [Str "Blame"]]] - [[[Plain [Str "Lebron",Space,Str "James"]] - ,[Plain [Str "Basketball"]] - ,[Plain [Str "Very",Space,Str "High"]] - ,[Plain [Str "Leaving",Space,Str "Cleveland"]]] - ,[[Plain [Str "Ryan",Space,Str "Braun"]] - ,[Plain [Str "Baseball"]] - ,[Plain [Str "Moderate"]] - ,[Plain [Str "Steroids"]]] - ,[[Plain [Str "Russell",Space,Str "Wilson"]] - ,[Plain [Str "Football"]] - ,[Plain [Str "High"]] - ,[Plain [Str "Tacky",Space,Str "uniform"]]]] -,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[] - ,[]] - [[[Plain [Str "Sinple"]] - ,[Plain [Str "Table"]]] - ,[[Plain [Str "Without"]] - ,[Plain [Str "Header"]]]] -,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[] - ,[]] - [[[Para [Str "Simple"] - ,Para [Str "Multiparagraph"]] - ,[Para [Str "Table"] - ,Para [Str "Full"]]] - ,[[Para [Str "Of"] - ,Para [Str "Paragraphs"]] - ,[Para [Str "In",Space,Str "each"] - ,Para [Str "Cell."]]]]] +[ Header + 2 + ( "a-table-with-and-without-a-header-row" , [] , [] ) + [ Str "A" + , Space + , Str "table," + , Space + , Str "with" + , Space + , Str "and" + , Space + , Str "without" + , Space + , Str "a" + , Space + , Str "header" + , Space + , Str "row" + ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.25 ) + , ( AlignDefault , ColWidth 0.25 ) + , ( AlignDefault , ColWidth 0.25 ) + , ( AlignDefault , ColWidth 0.25 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Name" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Game" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Fame" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Blame" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Lebron" , Space , Str "James" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Basketball" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Very" , Space , Str "High" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Leaving" , Space , Str "Cleveland" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Ryan" , Space , Str "Braun" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Baseball" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Moderate" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Steroids" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Russell" , Space , Str "Wilson" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Football" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "High" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Tacky" , Space , Str "uniform" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.5 ) + , ( AlignDefault , ColWidth 0.5 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Sinple" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Table" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Without" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Header" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.5 ) + , ( AlignDefault , ColWidth 0.5 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "Simple" ] + , Para [ Str "Multiparagraph" ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "Table" ] , Para [ Str "Full" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "Of" ] , Para [ Str "Paragraphs" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "In" , Space , Str "each" ] + , Para [ Str "Cell." ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/docx/tables_separated_with_rawblock.native b/test/docx/tables_separated_with_rawblock.native new file mode 100644 --- /dev/null +++ b/test/docx/tables_separated_with_rawblock.native @@ -0,0 +1,27 @@ +[Table ("", [], []) (Caption Nothing + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) []) + [TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "b"]]]]] + (TableFoot ("",[],[]) []) +,RawBlock (Format "latex") "" +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) []) + [TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "c"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "d"]]]]] + (TableFoot ("",[],[]) [])] diff --git a/test/docx/task_list.docx b/test/docx/task_list.docx new file mode 100644 Binary files /dev/null and b/test/docx/task_list.docx differ diff --git a/test/docx/task_list.native b/test/docx/task_list.native new file mode 100644 --- /dev/null +++ b/test/docx/task_list.native @@ -0,0 +1,40 @@ +[ BulletList + [ [ Para [ Str "\9744" , Space , Str "Unchecked" ] ] + , [ Para [ Str "\9746" , Space , Str "Checked" ] + , Para + [ Str "with" + , Space + , Str "continuation" + , Space + , Str "paragraph" + ] + ] + , [ Para [ Str "\9744" , Space , Str "Unchecked" ] + , BulletList + [ [ Plain + [ Str "\9746" + , Space + , Str "Checked" + , Space + , Str "sublist" + ] + , BulletList + [ [ Plain + [ Str "\9744" + , Space + , Str "Unchecked" + , Space + , Str "subsublist" + ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "Numbered" , Space , Str "child" ] + ] + ] + ] + ] + ] + ] + ] + ] +] diff --git a/test/docx/text_in_shape_format.docx b/test/docx/text_in_shape_format.docx new file mode 100644 Binary files /dev/null and b/test/docx/text_in_shape_format.docx differ diff --git a/test/docx/text_in_shape_format.native b/test/docx/text_in_shape_format.native new file mode 100644 --- /dev/null +++ b/test/docx/text_in_shape_format.native @@ -0,0 +1,33 @@ +[ Para + [ Str "Last" + , Space + , Str "update:" + , Space + , Str "May" + , Space + , Str "1," + , Space + , Str "2017" + ] +, Para + [ Str "U" + , Str "sing" + , Space + , Str "Microsoft" + , Space + , Str "Word" + , Space + , Str "2007/2010" + , LineBreak + , Str "for" + , Space + , Str "Writing" + , Space + , Str "Technical" + , Space + , Str "Documents" + ] +, Para [ Str "Valter" , Space , Str "Kiisk" ] +, Para [ Str "Institute" , Space , Str "of" , Space , Str "Physics," , Space , Str "University" , Space , Str "of" , Space , Str "Tartu" ] +, Para [] +] diff --git a/test/docx/textbox_image.docx b/test/docx/textbox_image.docx new file mode 100644 Binary files /dev/null and b/test/docx/textbox_image.docx differ diff --git a/test/docx/textbox_image.native b/test/docx/textbox_image.native new file mode 100644 --- /dev/null +++ b/test/docx/textbox_image.native @@ -0,0 +1,30 @@ +[ Para + [ Str "The" + , Space + , Str "image" + , Space + , Str "is" + , Space + , Str "below." + ] +, Para + [ Image + ( "" + , [] + , [ ( "width" , "4.543038057742782in" ) + , ( "height" , "2.9166666666666665in" ) + ] + ) + [] + ( "media/image1.png" , "" ) + ] +, Para + [ Str "The" + , Space + , Str "image" + , Space + , Str "is" + , Space + , Str "above." + ] +] diff --git a/test/docx/textbox_image_duplicate_encoding.docx b/test/docx/textbox_image_duplicate_encoding.docx new file mode 100644 Binary files /dev/null and b/test/docx/textbox_image_duplicate_encoding.docx differ diff --git a/test/docx/textbox_image_duplicate_encoding.native b/test/docx/textbox_image_duplicate_encoding.native new file mode 100644 --- /dev/null +++ b/test/docx/textbox_image_duplicate_encoding.native @@ -0,0 +1,30 @@ +[ Para + [ Str "The" + , Space + , Str "image" + , Space + , Str "is" + , Space + , Str "below." + ] +, Para + [ Image + ( "" + , [] + , [ ( "width" , "4.543038057742782in" ) + , ( "height" , "2.9166666666666665in" ) + ] + ) + [] + ( "media/image1.png" , "" ) + ] +, Para + [ Str "The" + , Space + , Str "image" + , Space + , Str "is" + , Space + , Str "above." + ] +] diff --git a/test/docx/track_changes_scrubbed_metadata.docx b/test/docx/track_changes_scrubbed_metadata.docx new file mode 100644 Binary files /dev/null and b/test/docx/track_changes_scrubbed_metadata.docx differ diff --git a/test/docx/track_changes_scrubbed_metadata.native b/test/docx/track_changes_scrubbed_metadata.native new file mode 100644 --- /dev/null +++ b/test/docx/track_changes_scrubbed_metadata.native @@ -0,0 +1,9 @@ +[Para [ Str "Here", Space, Str "is", Space, Str "a", Space + , Span ("",["deletion"],[("author","Author")]) [Str "dummy"] + , Span ("",["insertion"],[("author","Author")]) [Str "test"] + , Space + , Span ("",["comment-start"],[("id","3"),("author","Author")]) + [Str "With",Space,Str "a",Space,Str "comment!"] + , Str "document",Span ("",["comment-end"],[("id","3")]) [],Str "." + ] +] diff --git a/test/docx/trim_last_inline.docx b/test/docx/trim_last_inline.docx new file mode 100644 Binary files /dev/null and b/test/docx/trim_last_inline.docx differ diff --git a/test/docx/trim_last_inline.native b/test/docx/trim_last_inline.native new file mode 100644 --- /dev/null +++ b/test/docx/trim_last_inline.native @@ -0,0 +1,2 @@ +[Para [Strong [Str "Foo",Space,Str "bar."]] +,Para [Str "Fizz",Space,Str "pop."]] diff --git a/test/docx/unused_anchors.docx b/test/docx/unused_anchors.docx new file mode 100644 Binary files /dev/null and b/test/docx/unused_anchors.docx differ diff --git a/test/docx/unused_anchors.native b/test/docx/unused_anchors.native new file mode 100644 --- /dev/null +++ b/test/docx/unused_anchors.native @@ -0,0 +1,3 @@ +[Header 1 ("my-section",[],[]) [Str "My",Space,Str "Section"] +,Para [Link ("",[],[]) [Str "Here",Space,Str "is",Space,Str "a",Space,Str "link."] ("#Foo","")] +,Para [Span ("Foo",["anchor"],[]) [],Str "Here",Space,Str "is",Space,Str "the",Space,Str "target."]] diff --git a/test/docx/zotero_citations.docx b/test/docx/zotero_citations.docx new file mode 100644 Binary files /dev/null and b/test/docx/zotero_citations.docx differ diff --git a/test/docx/zotero_citations_minus.native b/test/docx/zotero_citations_minus.native new file mode 100644 --- /dev/null +++ b/test/docx/zotero_citations_minus.native @@ -0,0 +1,335 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "citation" + , Space + , Str "(Smith" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2013)" + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "citation" + , Space + , Str "with" + , Space + , Str "two" + , Space + , Str "sources" + , Space + , Str "(Boer" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2016;" + , Space + , Str "Smith" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2013)." + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "citation" + , Space + , Str "with" + , Space + , Str "additional" + , Space + , Str "prefix," + , Space + , Str "suffix" + , Space + , Str "and" + , Space + , Str "a" + , Space + , Str "page" + , Space + , Str "number" + , Space + , Str "(prefix" + , Space + , Str "Bellomo" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2016," + , Space + , Str "p." + , Space + , Str "2" + , Space + , Str "suffix)." + ] + , Header + 1 + ( "reference-list" , [] , [] ) + [ Str "Reference" , Space , Str "list" ] + , Para + [ Str "Bellomo," + , Space + , Str "K.," + , Space + , Str "Clement," + , Space + , Str "A." + , Space + , Str "C.," + , Space + , Str "Murphy," + , Space + , Str "L." + , Space + , Str "N.," + , Space + , Str "Polvani," + , Space + , Str "L." + , Space + , Str "M.," + , Space + , Str "&" + , Space + , Str "Cane," + , Space + , Str "M." + , Space + , Str "A." + , Space + , Str "(2016)." + , Space + , Str "New" + , Space + , Str "observational" + , Space + , Str "evidence" + , Space + , Str "for" + , Space + , Str "a" + , Space + , Str "positive" + , Space + , Str "cloud" + , Space + , Str "feedback" + , Space + , Str "that" + , Space + , Str "amplifies" + , Space + , Str "the" + , Space + , Str "Atlantic" + , Space + , Str "Multidecadal" + , Space + , Str "Oscillation." + , Space + , Emph + [ Str "Geophys." + , Space + , Str "Res." + , Space + , Str "Lett." + ] + , Str "," + , Space + , Emph [ Str "43" ] + , Str "(18)," + , Space + , Str "9852\8211\&9859." + , Space + , Str "https://doi.org/10.1002/2016GL069961" + ] + , Para + [ Str "Boer," + , Space + , Str "G." + , Space + , Str "J.," + , Space + , Str "Smith," + , Space + , Str "D." + , Space + , Str "M.," + , Space + , Str "Cassou," + , Space + , Str "C.," + , Space + , Str "Doblas-Reyes," + , Space + , Str "F.," + , Space + , Str "Danabasoglu," + , Space + , Str "G.," + , Space + , Str "Kirtman," + , Space + , Str "B.," + , Space + , Str "Kushnir," + , Space + , Str "Y.," + , Space + , Str "Kimoto," + , Space + , Str "M.," + , Space + , Str "Meehl," + , Space + , Str "G." + , Space + , Str "A.," + , Space + , Str "Msadek," + , Space + , Str "R.," + , Space + , Str "M\252ller," + , Space + , Str "W." + , Space + , Str "A.," + , Space + , Str "Taylor," + , Space + , Str "K." + , Space + , Str "E.," + , Space + , Str "Zwiers," + , Space + , Str "F.," + , Space + , Str "Rixen," + , Space + , Str "M.," + , Space + , Str "Ruprich-Robert," + , Space + , Str "Y.," + , Space + , Str "&" + , Space + , Str "Eade," + , Space + , Str "R." + , Space + , Str "(2016)." + , Space + , Str "The" + , Space + , Str "Decadal" + , Space + , Str "Climate" + , Space + , Str "Prediction" + , Space + , Str "Project" + , Space + , Str "(DCPP)." + , Space + , Emph + [ Str "Geoscientific" + , Space + , Str "Model" + , Space + , Str "Development" + ] + , Str "," + , Space + , Emph [ Str "9" ] + , Str "," + , Space + , Str "3751\8211\&3777." + , Space + , Str "https://doi.org/10.5194/gmd-9-3751-2016" + ] + , Para + [ Str "Smith," + , Space + , Str "D." + , Space + , Str "M.," + , Space + , Str "Eade," + , Space + , Str "R.," + , Space + , Str "&" + , Space + , Str "Pohlmann," + , Space + , Str "H." + , Space + , Str "(2013)." + , Space + , Str "A" + , Space + , Str "comparison" + , Space + , Str "of" + , Space + , Str "full-field" + , Space + , Str "and" + , Space + , Str "anomaly" + , Space + , Str "initialization" + , Space + , Str "for" + , Space + , Str "seasonal" + , Space + , Str "to" + , Space + , Str "decadal" + , Space + , Str "climate" + , Space + , Str "prediction." + , Space + , Emph [ Str "Climate" , Space , Str "Dynamics" ] + , Str "," + , Space + , Emph [ Str "41" ] + , Str "(11\8211\&12)," + , Space + , Str "3325\8211\&3338." + , Space + , Str "https://doi.org/10.1007/s00382-013-1683-2" + ] + ] diff --git a/test/docx/zotero_citations_plus.native b/test/docx/zotero_citations_plus.native new file mode 100644 --- /dev/null +++ b/test/docx/zotero_citations_plus.native @@ -0,0 +1,440 @@ +Pandoc + Meta + { unMeta = + fromList + [ ( "references" + , MetaList + [ MetaMap + (fromList + [ ( "DOI" , MetaString "10.1002/2016GL069961" ) + , ( "author" + , MetaList + [ MetaMap + (fromList + [ ( "family" + , MetaString "Bellomo" + ) + , ( "given" , MetaString "K." ) + ]) + , MetaMap + (fromList + [ ( "family" + , MetaString "Clement" + ) + , ( "given" , MetaString "A.C." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Murphy" ) + , ( "given" , MetaString "L.N." ) + ]) + , MetaMap + (fromList + [ ( "family" + , MetaString "Polvani" + ) + , ( "given" , MetaString "L.M." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Cane" ) + , ( "given" , MetaString "M.A." ) + ]) + ] + ) + , ( "container-title" + , MetaInlines + [ Str "Geophys." + , Space + , Str "Res." + , Space + , Str "Lett." + ] + ) + , ( "id" , MetaString "10" ) + , ( "issue" , MetaInlines [ Str "18" ] ) + , ( "issued" , MetaString "2016" ) + , ( "language" , MetaInlines [ Str "en" ] ) + , ( "page" + , MetaInlines [ Str "9852\8211\&9859" ] + ) + , ( "title" + , MetaInlines + [ Str "New" + , Space + , Str "observational" + , Space + , Str "evidence" + , Space + , Str "for" + , Space + , Str "a" + , Space + , Str "positive" + , Space + , Str "cloud" + , Space + , Str "feedback" + , Space + , Str "that" + , Space + , Str "amplifies" + , Space + , Str "the" + , Space + , Str "Atlantic" + , Space + , Str "Multidecadal" + , Space + , Str "Oscillation" + ] + ) + , ( "type" , MetaString "article-journal" ) + , ( "volume" , MetaInlines [ Str "43" ] ) + ]) + , MetaMap + (fromList + [ ( "DOI" + , MetaString "10.1007/s00382-013-1683-2" + ) + , ( "ISSN" , MetaString "0930-7575, 1432-0894" ) + , ( "author" + , MetaList + [ MetaMap + (fromList + [ ( "family" , MetaString "Smith" ) + , ( "given" , MetaString "Doug M." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Eade" ) + , ( "given" , MetaString "Rosie" ) + ]) + , MetaMap + (fromList + [ ( "family" + , MetaString "Pohlmann" + ) + , ( "given" , MetaString "Holger" ) + ]) + ] + ) + , ( "container-title" + , MetaInlines + [ Str "Climate" , Space , Str "Dynamics" ] + ) + , ( "id" , MetaString "109" ) + , ( "issue" , MetaInlines [ Str "11-12" ] ) + , ( "issued" , MetaString "2013-12" ) + , ( "language" , MetaInlines [ Str "en" ] ) + , ( "page" + , MetaInlines [ Str "3325\8211\&3338" ] + ) + , ( "title" + , MetaInlines + [ Str "A" + , Space + , Str "comparison" + , Space + , Str "of" + , Space + , Str "full-field" + , Space + , Str "and" + , Space + , Str "anomaly" + , Space + , Str "initialization" + , Space + , Str "for" + , Space + , Str "seasonal" + , Space + , Str "to" + , Space + , Str "decadal" + , Space + , Str "climate" + , Space + , Str "prediction" + ] + ) + , ( "type" , MetaString "article-journal" ) + , ( "volume" , MetaInlines [ Str "41" ] ) + ]) + , MetaMap + (fromList + [ ( "DOI" + , MetaString "10.5194/gmd-9-3751-2016" + ) + , ( "author" + , MetaList + [ MetaMap + (fromList + [ ( "family" , MetaString "Boer" ) + , ( "given" , MetaString "G.J." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Smith" ) + , ( "given" , MetaString "D.M." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Cassou" ) + , ( "given" , MetaString "C." ) + ]) + , MetaMap + (fromList + [ ( "family" + , MetaString "Doblas-Reyes" + ) + , ( "given" , MetaString "F." ) + ]) + , MetaMap + (fromList + [ ( "family" + , MetaString "Danabasoglu" + ) + , ( "given" , MetaString "G." ) + ]) + , MetaMap + (fromList + [ ( "family" + , MetaString "Kirtman" + ) + , ( "given" , MetaString "B." ) + ]) + , MetaMap + (fromList + [ ( "family" + , MetaString "Kushnir" + ) + , ( "given" , MetaString "Y." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Kimoto" ) + , ( "given" , MetaString "M." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Meehl" ) + , ( "given" , MetaString "G.A." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Msadek" ) + , ( "given" , MetaString "R." ) + ]) + , MetaMap + (fromList + [ ( "family" + , MetaString "M\252ller" + ) + , ( "given" , MetaString "W.A." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Taylor" ) + , ( "given" , MetaString "K.E." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Zwiers" ) + , ( "given" , MetaString "F." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Rixen" ) + , ( "given" , MetaString "M." ) + ]) + , MetaMap + (fromList + [ ( "family" + , MetaString "Ruprich-Robert" + ) + , ( "given" , MetaString "Y." ) + ]) + , MetaMap + (fromList + [ ( "family" , MetaString "Eade" ) + , ( "given" , MetaString "R." ) + ]) + ] + ) + , ( "container-title" + , MetaInlines + [ Str "Geoscientific" + , Space + , Str "Model" + , Space + , Str "Development" + ] + ) + , ( "id" , MetaString "6" ) + , ( "issued" , MetaString "2016" ) + , ( "language" , MetaInlines [ Str "en" ] ) + , ( "page" + , MetaInlines [ Str "3751\8211\&3777" ] + ) + , ( "title" + , MetaInlines + [ Str "The" + , Space + , Str "Decadal" + , Space + , Str "Climate" + , Space + , Str "Prediction" + , Space + , Str "Project" + , Space + , Str "(DCPP)" + ] + ) + , ( "type" , MetaString "article-journal" ) + , ( "volume" , MetaInlines [ Str "9" ] ) + ]) + ] + ) + ] + } + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "citation" + , Space + , Cite + [ Citation + { citationId = "109" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(Smith" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2013)" + ] + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "citation" + , Space + , Str "with" + , Space + , Str "two" + , Space + , Str "sources" + , Space + , Cite + [ Citation + { citationId = "6" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "109" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(Boer" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2016;" + , Space + , Str "Smith" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2013)" + ] + , Str "." + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "citation" + , Space + , Str "with" + , Space + , Str "additional" + , Space + , Str "prefix," + , Space + , Str "suffix" + , Space + , Str "and" + , Space + , Str "a" + , Space + , Str "page" + , Space + , Str "number" + , Space + , Cite + [ Citation + { citationId = "10" + , citationPrefix = [ Str "prefix" ] + , citationSuffix = + [ Str "," , Space , Str "2" , Space , Str "suffix" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(prefix" + , Space + , Str "Bellomo" + , Space + , Str "et" + , Space + , Str "al.," + , Space + , Str "2016," + , Space + , Str "p." + , Space + , Str "2" + , Space + , Str "suffix)" + ] + , Str "." + ] + , Header + 1 + ( "reference-list" , [] , [] ) + [ Str "Reference" , Space , Str "list" ] + ] diff --git a/test/dokuwiki_external_images.dokuwiki b/test/dokuwiki_external_images.dokuwiki --- a/test/dokuwiki_external_images.dokuwiki +++ b/test/dokuwiki_external_images.dokuwiki @@ -1,1 +1,1 @@ -{{https://cooluri.com/image.png|HTTPS image}} {{http://cooluri.com/image.png|HTTP image}} {{ftp://ftp.cooluri.com/image.png|FTP image}} {{file:///tmp/coolimage.png|Filesystem image}} {{:/image.jpg|Relative image 1}} {{:image.jpg|Relative image 2}} +{{https://cooluri.com/image.png|HTTPS image}} {{http://cooluri.com/image.png|HTTP image}} {{ftp://ftp.cooluri.com/image.png|FTP image}} {{file:///tmp/coolimage.png|Filesystem image}} {{/image.jpg|Relative image 1}} {{image.jpg|Relative image 2}} diff --git a/test/dokuwiki_multiblock_table.dokuwiki b/test/dokuwiki_multiblock_table.dokuwiki --- a/test/dokuwiki_multiblock_table.dokuwiki +++ b/test/dokuwiki_multiblock_table.dokuwiki @@ -1,4 +1,5 @@ Sample grid table. -^Fruit ^Price^Advantages ^ -|Bananas|$1.34|built-in wrapper\\ \\ potassium| -|Oranges|$2.10|* cures scurvy\\ * tasty | +^Fruit ^Price^Advantages ^ +|Bananas|$1.34|built-in wrapper\\ \\ potassium | +|Oranges|$2.10|* cures scurvy\\ * tasty | +|Apples |$1.10|Some text\\ \\ after two linebreaks| diff --git a/test/dokuwiki_multiblock_table.native b/test/dokuwiki_multiblock_table.native --- a/test/dokuwiki_multiblock_table.native +++ b/test/dokuwiki_multiblock_table.native @@ -1,13 +1,41 @@ -[Table [Str "Sample",Space,Str "grid",Space,Str "table."] [AlignDefault,AlignDefault,AlignDefault] [0.2222222222222222,0.2222222222222222,0.2916666666666667] - [[Plain [Str "Fruit"]] - ,[Plain [Str "Price"]] - ,[Plain [Str "Advantages"]]] - [[[Para [Str "Bananas"]] - ,[Para [Str "$1.34"]] - ,[Para [Str "built-in",Space,Str "wrapper"] - ,Para [Str "potassium"]]] - ,[[Para [Str "Oranges"]] - ,[Para [Str "$2.10"]] - ,[BulletList - [[Plain [Str "cures",Space,Str "scurvy"]] - ,[Plain [Str "tasty"]]]]]]] +[Table ("",[],[]) (Caption Nothing + [Para [Str "Sample",Space,Str "grid",Space,Str "table."]]) + [(AlignDefault,ColWidth 0.2222222222222222) + ,(AlignDefault,ColWidth 0.2222222222222222) + ,(AlignDefault,ColWidth 0.2916666666666667)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Fruit"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Price"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Advantages"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "Bananas"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "$1.34"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "built-in",Space,Str "wrapper"] + ,Para [Str "potassium"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "Oranges"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "$2.10"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [BulletList + [[Plain [Str "cures",Space,Str "scurvy"]] + ,[Plain [Str "tasty"]]]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "Apples"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "$1.10"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Para [Str "Some",Space,Str "text",LineBreak,LineBreak,Str "after",Space,Str "two",Space,Str "linebreaks"]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/endnotexml-reader.native b/test/endnotexml-reader.native new file mode 100644 --- /dev/null +++ b/test/endnotexml-reader.native @@ -0,0 +1,124 @@ +Pandoc + Meta + { unMeta = + fromList + [ ( "nocite" + , MetaInlines + [ Cite + [ Citation + { citationId = "*" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "[@*]" ] + ] + ) + , ( "references" + , MetaList + [ MetaMap + (fromList + [ ( "author" + , MetaList + [ MetaMap + (fromList + [ ( "family" + , MetaString "Chapman" + ) + , ( "given" , MetaString "A. G." ) + ]) + ] + ) + , ( "container-title" + , MetaInlines [ Str "Ecology" ] + ) + , ( "id" , MetaString "13264" ) + , ( "isbn" , MetaInlines [ Str "0012-9658" ] ) + , ( "issued" , MetaString "1937" ) + , ( "number" , MetaInlines [ Str "1" ] ) + , ( "pages" , MetaInlines [ Str "93-105" ] ) + , ( "title" + , MetaInlines + [ Str "An" + , SoftBreak + , Str "ecological" + , Space + , Str "basis" + , Space + , Str "for" + , Space + , Str "reforestation" + , Space + , Str "of" + , Space + , Str "submariginal" + , Space + , Str "lands" + , SoftBreak + , Str "in" + , Space + , Str "the" + , Space + , Str "Central" + , Space + , Str "Hardwood" + , Space + , Str "Region" + ] + ) + , ( "type" , MetaString "article-journal" ) + , ( "volume" , MetaInlines [ Str "18" ] ) + ]) + , MetaMap + (fromList + [ ( "author" + , MetaList + [ MetaMap + (fromList + [ ( "family" + , MetaString "Strohecker" + ) + , ( "given" , MetaString "H. F." ) + ]) + ] + ) + , ( "container-title" + , MetaInlines [ Str "Ecology" ] + ) + , ( "id" , MetaString "13265" ) + , ( "isbn" , MetaInlines [ Str "0012-9658" ] ) + , ( "issued" , MetaString "1937" ) + , ( "number" , MetaInlines [ Str "1" ] ) + , ( "pages" , MetaInlines [ Str "162-168" ] ) + , ( "title" + , MetaInlines + [ Str "A" + , Space + , Str "survey" + , SoftBreak + , Str "of" + , Space + , Str "soil" + , Space + , Str "temperatures" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "Chicago" + , Space + , Str "area" + ] + ) + , ( "type" , MetaString "article-journal" ) + , ( "volume" , MetaInlines [ Str "18" ] ) + ]) + ] + ) + ] + } + [] diff --git a/test/endnotexml-reader.xml b/test/endnotexml-reader.xml new file mode 100644 --- /dev/null +++ b/test/endnotexml-reader.xml @@ -0,0 +1,216 @@ + + + + + + EndNote Ecology.enl + + EndNote + 13264 + + + 13264 + + 17 + + + + + + + + + + + + + <style face="normal" font="default" size="100%">An + ecological basis for reforestation of submariginal lands + in the Central Hardwood Region</style> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EndNote Ecology.enl + + EndNote + 13265 + + + 13265 + + 17 + + + + + + + + + + + + + <style face="normal" font="default" size="100%">A survey + of soil temperatures in the Chicago area</style> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/epub/epub2_cover.epub b/test/epub/epub2_cover.epub new file mode 100644 Binary files /dev/null and b/test/epub/epub2_cover.epub differ diff --git a/test/epub/epub2_no_cover.epub b/test/epub/epub2_no_cover.epub new file mode 100644 Binary files /dev/null and b/test/epub/epub2_no_cover.epub differ diff --git a/test/epub/epub2_picture.epub b/test/epub/epub2_picture.epub new file mode 100644 Binary files /dev/null and b/test/epub/epub2_picture.epub differ diff --git a/test/epub/features.epub b/test/epub/features.epub Binary files a/test/epub/features.epub and b/test/epub/features.epub differ diff --git a/test/epub/features.native b/test/epub/features.native --- a/test/epub/features.native +++ b/test/epub/features.native @@ -1,93 +1,1721 @@ -[Para [Span ("front.xhtml",[],[]) []] -,Div ("",["section"],[]) - [Header 1 ("",[],[]) [Str "Reflowable",Space,Str "EPUB",Space,Str "3",Space,Str "Conformance",Space,Str "Test",Space,Str "Document:",Space,Str "0100"] - ,Div ("",["section"],[]) - [Header 2 ("",[],[]) [Str "Status",Space,Str "of",Space,Str "this",Space,Str "Document"] - ,Para [Str "This",Space,Str "publication",Space,Str "is",Space,Str "currently",Space,Str "considered",Space,Span ("",["status"],[]) [Str "[UNDER",Space,Str "DEVELOPMENT]"],Space,Str "by",Space,Str "the",Space,Str "IDPF."] - ,Para [Str "This",Space,Str "publication",Space,Str "is",Space,Str "part",Space,Str "of",Space,Str "version",Space,Span ("",["version"],[]) [Str "X.X"],Space,Str "of",Space,Str "the",Space,Str "EPUB",Space,Str "3.0",Space,Str "Compliance",Space,Str "Test",Space,Str "Suite",Space,Str "released",SoftBreak,Str "on",Space,RawInline (Format "html") "",Str "."] - ,Para [Str "Before",Space,Str "using",Space,Str "this",Space,Str "publication",Space,Str "to",Space,Str "evaluate",Space,Str "reading",Space,Str "systems,",Space,Str "testers",Space,Str "are",Space,Str "strongly",Space,Str "encouraged",Space,Str "to",SoftBreak,Str "verify",Space,Str "that",Space,Str "they",Space,Str "have",Space,Str "the",Space,Str "latest",Space,Str "release",Space,Str "by",Space,Str "checking",Space,Str "the",Space,Str "current",Space,Str "release",Space,Str "version",Space,Str "and",Space,Str "date",Space,Str "of",SoftBreak,Str "the",Space,Str "test",Space,Str "suite",Space,Str "at",Space,Link ("",[],[]) [Str "TBD"] ("http://idpf.org/","")] - ,Para [Str "This",Space,Str "publication",Space,Str "is",Space,Str "one",Space,Str "of",Space,Str "several",Space,Str "that",Space,Str "currently",Space,Str "comprise",Space,Str "the",Space,Str "EPUB",Space,Str "3",Space,Str "conformance",Space,Str "test",Space,Str "suite",SoftBreak,Str "for",Space,Str "reflowable",Space,Str "content.",Space,Str "The",Space,Str "complete",Space,Str "test",Space,Str "suite",Space,Str "includes",Space,Str "all",Space,Str "of",Space,Str "the",Space,Str "following",Space,Str "publications:"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "."]]]] - ,Div ("",["section"],[]) - [Header 2 ("",[],[]) [Str "About",Space,Str "this",Space,Str "Document"] - ,Para [Str "This",Space,Str "document",Space,Str "focuses",Space,Str "on",Space,Str "human-evaluated",Space,Str "binary",Space,Str "(pass/fail)",Space,Str "tests",Space,Str "in",Space,Str "a",SoftBreak,Str "reflowable",Space,Str "context.",Space,Str "Tests",Space,Str "for",Space,Str "fixed-layout",Space,Str "content",Space,Str "and",Space,Str "other",Space,Str "individual",Space,Str "tests",Space,Str "that",SoftBreak,Str "require",Space,Str "a",Space,Str "dedicated",Space,Str "epub",Space,Str "file",Space,Str "are",Space,Str "available",Space,Str "in",Space,Str "additional",Space,Str "sibling",Space,Str "documents;",Space,Str "refer",Space,Str "to",SoftBreak,Str "the",Space,Link ("",[],[]) [Str "test",Space,Str "suite",SoftBreak,Str "wiki"] ("https://github.com/mgylling/epub-testsuite/wiki/Overview",""),Space,Str "(",Code ("",[],[]) "https://github.com/mgylling/epub-testsuite/wiki/Overview",Str ")",Space,Str "for",Space,Str "additional",SoftBreak,Str "information."]] - ,Div ("",["section"],[]) - [Header 2 ("",[],[]) [Str "Conventions"] - ,Para [Str "The",Space,Str "following",Space,Str "conventions",Space,Str "are",Space,Str "used",Space,Str "throughout",Space,Str "the",Space,Str "document:"] - ,DefinitionList - [([Str "1.",Space,Str "Locating",Space,Str "a",Space,Str "test"], - [[Div ("",["ctest"],[]) - [Para [Str "Tests",Space,Str "for",Space,Emph [Str "required"],Space,Str "Reading",Space,Str "System",Space,Str "functionality",Space,Str "are",SoftBreak,Str "preceded",Space,Str "by",Space,Str "the",Space,Str "label:",Space,Span ("",["nature"],[("style","display: inline; font-size: 100%")]) [Str "[REQUIRED]"]]] - ,Div ("",["otest"],[]) - [Para [Str "Tests",Space,Str "for",Space,Emph [Str "optional"],Space,Str "Reading",Space,Str "System",Space,Str "functionality",Space,Str "are",SoftBreak,Str "preceded",Space,Str "by",Space,Str "the",Space,Str "label:",Space,Span ("",["nature"],[("style","display: inline; font-size: 100%")]) [Str "[OPTIONAL]"]]]]]) - ,([Str "2.",Space,Str "Performing",Space,Str "the",Space,Str "test"], - [[Plain [Str "Each",Space,Str "test",Space,Str "includes",Space,Str "a",Space,Str "description",Space,Str "of",Space,Str "its",Space,Str "purpose",Space,Str "followed",Space,Str "by",Space,Str "the",Space,Str "actual",Space,Strong [Str "test",Space,Str "statement,",SoftBreak,Str "which",Space,Str "can",Space,Str "always",Space,Str "be",Space,Str "evaluated",Space,Str "to",Space,Str "true",Space,Str "or",Space,Str "false"],Str ".",Space,Str "These",Space,Str "statements",Space,Str "typically",Space,Str "have",Space,Str "the",Space,Str "form:",SoftBreak,Str "\"If",Space,Str "[some",Space,Str "condition],",Space,Str "the",Space,Str "test",Space,Str "passes\"."]]]) - ,([Str "3.",Space,Str "Scoring",Space,Str "in",Space,Str "the",Space,Str "results",Space,Str "form"], - [[Plain [Str "@@@TODO",Space,Str "provide",Space,Str "info",Space,Str "on",Space,Str "where",Space,Str "to",Space,Str "get",Space,Str "the",Space,Str "results",Space,Str "form"]]])]]] -,Para [Span ("content-mathml-001.xhtml",[],[]) []] -,Div ("",["section"],[]) - [Header 2 ("content-mathml-001.xhtml#mathml",[],[]) [Str "MathML"] - ,Div ("content-mathml-001.xhtml#mathml-010",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-010"],Space,Str "Rendering"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "MathML",Space,Str "equation",Space,Str "rendering",Space,Str "is",Space,Str "supported."] - ,Plain [Math DisplayMath "\\int_{- \\infty}^{\\infty}e^{- x^{2}}\\, dx = \\sqrt{\\pi}",SoftBreak,Math DisplayMath "\\sum\\limits_{n = 1}^{\\infty}\\frac{1}{n^{2}} = \\frac{\\pi^{2}}{6}",SoftBreak,Math DisplayMath "x = \\frac{- b \\pm \\sqrt{b^{2} - 4ac}}{2a}"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "equations",Space,Str "are",Space,Str "not",Space,Str "presented",Space,Str "as",Space,Str "linear",Space,Str "text",Space,Str "(e.g.,",Space,Str "x=-b\177b2-4ac2a),",SoftBreak,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("content-mathml-001.xhtml#mathml-020",["section","otest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[OPTIONAL]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-020"],Space,Str "CSS",Space,Str "Styling",Space,Str "of",Space,Str "the",Space,Code ("",[],[]) "math",Space,Str "element"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "basic",Space,Str "CSS",Space,Str "styling",Space,Str "of",Space,Str "MathML",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "the",Space,Code ("",[],[]) "math",Space,Str "element."] - ,Plain [Math InlineMath "{2x}{+ y - z}"] - ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "equation",Space,Str "has",Space,Str "a",Space,Str "yellow",Space,Str "background",Space,Str "and",Space,Str "a",Space,Str "dashed",Space,Str "border."] - ,Para [Str "If",Space,Str "the",Space,Str "reading",Space,Str "system",Space,Str "does",Space,Str "not",Space,Str "have",Space,Str "a",Space,Str "viewport,",Space,Str "or",Space,Str "does",Space,Str "not",Space,Str "support",SoftBreak,Str "CSS",Space,Str "styles,",Space,Str "this",Space,Str "test",Space,Str "should",Space,Str "be",Space,Str "marked",Space,Code ("",[],[]) "Not Supported",Str "."]] - ,Div ("content-mathml-001.xhtml#mathml-021",["section","otest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[OPTIONAL]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-021"],Space,Str "CSS",Space,Str "Styling",Space,Str "of",Space,Str "the",Space,Code ("",[],[]) "mo",Space,Str "element"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "basic",Space,Str "CSS",Space,Str "styling",Space,Str "of",Space,Str "MathML",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "the",Space,Code ("",[],[]) "mo",Space,Str "element."] - ,Plain [Math InlineMath "{2x}{+ y - z}"] - ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "operators",Space,Str "are",Space,Str "enlarged",Space,Str "relative",Space,Str "to",Space,Str "the",Space,Str "other",Space,Str "symbols",Space,Str "and",Space,Str "numbers."] - ,Para [Str "If",Space,Str "the",Space,Str "reading",Space,Str "system",Space,Str "does",Space,Str "not",Space,Str "have",Space,Str "a",Space,Str "viewport,",Space,Str "or",Space,Str "does",Space,Str "not",Space,Str "support",SoftBreak,Str "CSS",Space,Str "styles,",Space,Str "this",Space,Str "test",Space,Str "should",Space,Str "be",Space,Str "marked",Space,Code ("",[],[]) "Not Supported",Str "."]] - ,Div ("content-mathml-001.xhtml#mathml-022",["section","otest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[OPTIONAL]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-022"],Space,Str "CSS",Space,Str "Styling",Space,Str "of",Space,Str "the",Space,Code ("",[],[]) "mi",Space,Str "element"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "basic",Space,Str "CSS",Space,Str "styling",Space,Str "of",Space,Str "MathML",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "the",Space,Code ("",[],[]) "mi",Space,Str "element."] - ,Plain [Math InlineMath "{2x}{+ y - z}"] - ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "identifiers",Space,Str "are",Space,Str "bolded",Space,Str "and",Space,Str "blue."] - ,Para [Str "If",Space,Str "the",Space,Str "reading",Space,Str "system",Space,Str "does",Space,Str "not",Space,Str "have",Space,Str "a",Space,Str "viewport,",Space,Str "or",Space,Str "does",Space,Str "not",Space,Str "support",SoftBreak,Str "CSS",Space,Str "styles,",Space,Str "this",Space,Str "test",Space,Str "should",Space,Str "be",Space,Str "marked",Space,Code ("",[],[]) "Not Supported",Str "."]] - ,Div ("content-mathml-001.xhtml#mathml-023",["section","otest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[OPTIONAL]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-023"],Space,Str "CSS",Space,Str "Styling",Space,Str "of",Space,Str "the",Space,Code ("",[],[]) "mn",Space,Str "element"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "basic",Space,Str "CSS",Space,Str "styling",Space,Str "of",Space,Str "MathML",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "the",Space,Code ("",[],[]) "mn",Space,Str "element."] - ,Plain [Math InlineMath "{2x}{+ y - z}"] - ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "number",Space,Str "2",Space,Str "is",Space,Str "italicized",Space,Str "and",Space,Str "blue."] - ,Para [Str "If",Space,Str "the",Space,Str "reading",Space,Str "system",Space,Str "does",Space,Str "not",Space,Str "have",Space,Str "a",Space,Str "viewport,",Space,Str "or",Space,Str "does",Space,Str "not",Space,Str "support",SoftBreak,Str "CSS",Space,Str "styles,",Space,Str "this",Space,Str "test",Space,Str "should",Space,Str "be",Space,Str "marked",Space,Code ("",[],[]) "Not Supported",Str "."]] - ,Div ("content-mathml-001.xhtml#mathml-024",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-024"],Str "Horizontal",Space,Str "stretch,",Space,Code ("",[],[]) "mover",Str ",",Space,Code ("",[],[]) "munder",Str ",",Space,Str "and",Space,Code ("",[],[]) "mspace",Space,Str "elements"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "horizontal",Space,Str "stretch,",Space,Code ("",[],[]) "mover",Str ",",Space,Code ("",[],[]) "munder",Str ",",Space,Code ("",[],[]) "mspace",Space,Str "elements",Space,Str "are",Space,Str "supported."] - ,Plain [Math DisplayMath "c = \\overset{\\text{complex\\ number}}{\\overbrace{\\underset{\\text{real}}{\\underbrace{\\mspace{20mu} a\\mspace{20mu}}} + \\underset{\\text{imaginary}}{\\underbrace{\\quad b{\\mathbb{i}}\\quad}}}}"] - ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Str "."]] - ,Div ("content-mathml-001.xhtml#mathml-025",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-025"],Str "Testing",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "rowspan",Space,Str "attributes,",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "fonts"] - ,Para [Str "Tests",Space,Str "whether",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "mspace",Space,Str "attributes",Space,Str "(colum",Space,Str "and",Space,Str "row",Space,Str "spanning)",Space,Str "are",Space,Str "supported;",Space,Str "uses",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "alphabets."] - ,Plain [Math DisplayMath "\\begin{matrix}\n & {\\operatorname{cov}\\left( \\mathcal{L} \\right)} & \\longrightarrow & {\\operatorname{non}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cof}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cof}\\left( \\mathcal{L} \\right)} & \\longrightarrow & 2^{\\aleph_{0}} \\\\\n & \\uparrow & & \\uparrow & & \\uparrow & & \\uparrow & & \\\\\n & {\\mathfrak{b}} & \\longrightarrow & {\\mathfrak{d}} & & & & & & \\\\\n & \\uparrow & & \\uparrow & & & & & & \\\\\n\\aleph_{1} & \\longrightarrow & {\\operatorname{add}\\left( \\mathcal{L} \\right)} & \\longrightarrow & {\\operatorname{add}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cov}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{non}\\left( \\mathcal{L} \\right)} & \\\\\n\\end{matrix}"] - ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Link ("",[],[]) [Str "Cicho\324's",Space,Str "Diagram"] ("http://en.wikipedia.org/wiki/Cicho%C5%84's_diagram",""),Str ":",Space,Str "."]] - ,Div ("content-mathml-001.xhtml#mathml-026",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-026"],Str "BiDi,",Space,Str "RTL",Space,Str "and",Space,Str "Arabic",Space,Str "alphabets"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "right-to-left",Space,Str "and",Space,Str "Arabic",Space,Str "alphabets",Space,Str "are",Space,Str "supported."] - ,Plain [Math DisplayMath "{d\\left( s \\right)} = \\left\\{ \\begin{matrix}\n{\\sum\\limits_{{\\lbrack?\\rbrack} = 1}^{S}s^{\\lbrack?\\rbrack}} & {\\text{\1573\1584\1575\1603\1575\1606}s > 0} \\\\\n{\\int_{1}^{S}{s^{\\lbrack?\\rbrack}s}} & {\\text{\1573\1584\1575\1603\1575\1606}s \\in m} \\\\\n{T\\pi} & {\\text{\1594\1610\1585\1584\1604\1603}\\left( \\text{\1605\1593}\\pi \\simeq 3,141 \\right)} \\\\\n\\end{matrix} \\right."] - ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Str "the",Space,Str "following",Space,Str "image:"]] - ,Div ("content-mathml-001.xhtml#mathml-027",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-027"],Str "Elementary",Space,Str "math:",Space,Str "long",Space,Str "division",Space,Str "notation"] - ,Para [Str "Tests",Space,Str "whether",Space,Code ("",[],[]) "mlongdiv",Space,Str "elements",Space,Str "(from",Space,Str "elementary",Space,Str "math)",Space,Str "are",Space,Str "supported."] - ,Plain [Span ("",["math"],[("xmlns","http://www.w3.org/1998/Math/MathML")]) [SoftBreak,Str "3",SoftBreak,Str "435.3",SoftBreak,Str "1306",SoftBreak,Str "12",SoftBreak,Str "10",SoftBreak,Str "9",SoftBreak,Str "16",SoftBreak,Str "15",SoftBreak,Str "1.0",SoftBreak,Str "9",SoftBreak,Str "1",SoftBreak]] - ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Str "the",Space,Str "following",Space,Str "image:",Space,Str "."]]] -,Para [Span ("content-switch-001.xhtml",[],[]) []] -,Div ("content-switch-001.xhtml#epub-switch",["section"],[]) - [Header 3 ("",[],[]) [Code ("",[],[]) "epub:switch"] - ,Div ("content-switch-001.xhtml#switch-010",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "switch-010"],Space,Str "Support"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "epub:switch",Space,Str "element",Space,Str "is",Space,Str "supported."] - ,Para [Str "PASS"] - ,Para [Str "If",Space,Str "only",Space,Str "the",Space,Str "word",Space,Str "\"PASS\"",Space,Str "is",Space,Str "rendered",Space,Str "before",Space,Str "this",Space,Str "paragraph,",Space,Str "the",Space,Str "test",Space,Str "passes.",Space,Str "If",Space,Str "both",Space,Str "\"PASS\"",Space,Str "and",Space,Str "\"FAIL\"",Space,Str "are",Space,Str "rendered,",Space,Str "or",Space,Str "neither",SoftBreak,Str "\"PASS\"",Space,Str "nor",Space,Str "\"FAIL\"",Space,Str "is",Space,Str "rendered,",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("content-switch-001.xhtml#switch-020",["section","otest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[OPTIONAL]"],SoftBreak,Span ("",["test-id"],[]) [Str "switch-020"],SoftBreak,Str "MathML",Space,Str "Embedding"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Str "MathML",Space,Str "namespace",Space,Str "is",Space,Str "recognized",Space,Str "when",Space,Str "used",Space,Str "in",Space,Str "an",Space,Code ("",[],[]) "epub:case",Space,Str "element."] - ,Para [Math InlineMath "{2x}{+ y - z}"] - ,Para [Str "If",Space,Str "a",Space,Str "MathML",Space,Str "equation",Space,Str "is",Space,Str "rendered",Space,Str "before",Space,Str "this",Space,Str "paragraph,",Space,Str "the",Space,Str "test",Space,Str "passes."] - ,Para [Str "If",Space,Str "test",Space,Code ("",[],[]) "switch-010",Space,Str "did",Space,Str "not",Space,Str "pass,",Space,Str "this",Space,Str "test",Space,Str "should",Space,Str "be",Space,Str "marked",Space,Code ("",[],[]) "Not Supported",Str "."]]]] +Pandoc + Meta + { unMeta = + fromList + [ ( "author" + , MetaList + [ MetaInlines [ Str "Ori Idan" ] + , MetaInlines [ Str "Matt Garrish" ] + , MetaInlines [ Str "Marisa DeMeglio" ] + , MetaInlines [ Str "Toshiaki Koike" ] + , MetaInlines [ Str "Vincent Gros" ] + , MetaInlines [ Str "Markus Gylling" ] + ] + ) + , ( "description" + , MetaInlines + [ Str + "Tests for Content Documents in a reflowable context [UNDER CONSTRUCTION]" + ] + ) + , ( "identifier" + , MetaInlines + [ Str "com.github.epub-testsuite.epub30-test-0100" ] + ) + , ( "language" + , MetaList + [ MetaInlines [ Str "jp" ] , MetaInlines [ Str "en" ] ] + ) + , ( "title" + , MetaInlines + [ Str "EPUBTEST 0100 - Reflowable Content Tests" ] + ) + ] + } + [ Para [ Span ( "front.xhtml" , [] , [] ) [] ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 1 + ( "" , [] , [] ) + [ Str "Reflowable" + , Space + , Str "EPUB" + , Space + , Str "3" + , Space + , Str "Conformance" + , Space + , Str "Test" + , Space + , Str "Document:" + , Space + , Str "0100" + ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "Status" + , Space + , Str "of" + , Space + , Str "this" + , Space + , Str "Document" + ] + , Para + [ Str "This" + , Space + , Str "publication" + , Space + , Str "is" + , Space + , Str "currently" + , Space + , Str "considered" + , Space + , Span + ( "" , [ "status" ] , [] ) + [ Str "[UNDER" , Space , Str "DEVELOPMENT]" ] + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "IDPF." + ] + , Para + [ Str "This" + , Space + , Str "publication" + , Space + , Str "is" + , Space + , Str "part" + , Space + , Str "of" + , Space + , Str "version" + , Space + , Span ( "" , [ "version" ] , [] ) [ Str "X.X" ] + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "EPUB" + , Space + , Str "3.0" + , Space + , Str "Compliance" + , Space + , Str "Test" + , Space + , Str "Suite" + , Space + , Str "released" + , SoftBreak + , Str "on" + , Space + , RawInline (Format "html") "" + , Str "." + ] + , Para + [ Str "Before" + , Space + , Str "using" + , Space + , Str "this" + , Space + , Str "publication" + , Space + , Str "to" + , Space + , Str "evaluate" + , Space + , Str "reading" + , Space + , Str "systems," + , Space + , Str "testers" + , Space + , Str "are" + , Space + , Str "strongly" + , Space + , Str "encouraged" + , Space + , Str "to" + , SoftBreak + , Str "verify" + , Space + , Str "that" + , Space + , Str "they" + , Space + , Str "have" + , Space + , Str "the" + , Space + , Str "latest" + , Space + , Str "release" + , Space + , Str "by" + , Space + , Str "checking" + , Space + , Str "the" + , Space + , Str "current" + , Space + , Str "release" + , Space + , Str "version" + , Space + , Str "and" + , Space + , Str "date" + , Space + , Str "of" + , SoftBreak + , Str "the" + , Space + , Str "test" + , Space + , Str "suite" + , Space + , Str "at" + , Space + , Link + ( "" , [] , [] ) + [ Str "TBD" ] + ( "http://idpf.org/" , "" ) + ] + , Para + [ Str "This" + , Space + , Str "publication" + , Space + , Str "is" + , Space + , Str "one" + , Space + , Str "of" + , Space + , Str "several" + , Space + , Str "that" + , Space + , Str "currently" + , Space + , Str "comprise" + , Space + , Str "the" + , Space + , Str "EPUB" + , Space + , Str "3" + , Space + , Str "conformance" + , Space + , Str "test" + , Space + , Str "suite" + , SoftBreak + , Str "for" + , Space + , Str "reflowable" + , Space + , Str "content." + , Space + , Str "The" + , Space + , Str "complete" + , Space + , Str "test" + , Space + , Str "suite" + , Space + , Str "includes" + , Space + , Str "all" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "following" + , Space + , Str "publications:" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "." ] ] ] + ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "About" + , Space + , Str "this" + , Space + , Str "Document" + ] + , Para + [ Str "This" + , Space + , Str "document" + , Space + , Str "focuses" + , Space + , Str "on" + , Space + , Str "human-evaluated" + , Space + , Str "binary" + , Space + , Str "(pass/fail)" + , Space + , Str "tests" + , Space + , Str "in" + , Space + , Str "a" + , SoftBreak + , Str "reflowable" + , Space + , Str "context." + , Space + , Str "Tests" + , Space + , Str "for" + , Space + , Str "fixed-layout" + , Space + , Str "content" + , Space + , Str "and" + , Space + , Str "other" + , Space + , Str "individual" + , Space + , Str "tests" + , Space + , Str "that" + , SoftBreak + , Str "require" + , Space + , Str "a" + , Space + , Str "dedicated" + , Space + , Str "epub" + , Space + , Str "file" + , Space + , Str "are" + , Space + , Str "available" + , Space + , Str "in" + , Space + , Str "additional" + , Space + , Str "sibling" + , Space + , Str "documents;" + , Space + , Str "refer" + , Space + , Str "to" + , SoftBreak + , Str "the" + , Space + , Link + ( "" , [] , [] ) + [ Str "test" + , Space + , Str "suite" + , SoftBreak + , Str "wiki" + ] + ( "https://github.com/mgylling/epub-testsuite/wiki/Overview" + , "" + ) + , Space + , Str "(" + , Code + ( "" , [] , [] ) + "https://github.com/mgylling/epub-testsuite/wiki/Overview" + , Str ")" + , Space + , Str "for" + , Space + , Str "additional" + , SoftBreak + , Str "information." + ] + ] + , Div + ( "" , [ "section" ] , [] ) + [ Header 2 ( "" , [] , [] ) [ Str "Conventions" ] + , Para + [ Str "The" + , Space + , Str "following" + , Space + , Str "conventions" + , Space + , Str "are" + , Space + , Str "used" + , Space + , Str "throughout" + , Space + , Str "the" + , Space + , Str "document:" + ] + , DefinitionList + [ ( [ Str "1." + , Space + , Str "Locating" + , Space + , Str "a" + , Space + , Str "test" + ] + , [ [ Div + ( "" , [ "ctest" ] , [] ) + [ Para + [ Str "Tests" + , Space + , Str "for" + , Space + , Emph [ Str "required" ] + , Space + , Str "Reading" + , Space + , Str "System" + , Space + , Str "functionality" + , Space + , Str "are" + , SoftBreak + , Str "preceded" + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "label:" + , Space + , Span + ( "" + , [ "nature" ] + , [ ( "style" + , "display: inline; font-size: 100%" + ) + ] + ) + [ Str "[REQUIRED]" ] + ] + ] + , Div + ( "" , [ "otest" ] , [] ) + [ Para + [ Str "Tests" + , Space + , Str "for" + , Space + , Emph [ Str "optional" ] + , Space + , Str "Reading" + , Space + , Str "System" + , Space + , Str "functionality" + , Space + , Str "are" + , SoftBreak + , Str "preceded" + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "label:" + , Space + , Span + ( "" + , [ "nature" ] + , [ ( "style" + , "display: inline; font-size: 100%" + ) + ] + ) + [ Str "[OPTIONAL]" ] + ] + ] + ] + ] + ) + , ( [ Str "2." + , Space + , Str "Performing" + , Space + , Str "the" + , Space + , Str "test" + ] + , [ [ Plain + [ Str "Each" + , Space + , Str "test" + , Space + , Str "includes" + , Space + , Str "a" + , Space + , Str "description" + , Space + , Str "of" + , Space + , Str "its" + , Space + , Str "purpose" + , Space + , Str "followed" + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "actual" + , Space + , Strong + [ Str "test" + , Space + , Str "statement," + , SoftBreak + , Str "which" + , Space + , Str "can" + , Space + , Str "always" + , Space + , Str "be" + , Space + , Str "evaluated" + , Space + , Str "to" + , Space + , Str "true" + , Space + , Str "or" + , Space + , Str "false" + ] + , Str "." + , Space + , Str "These" + , Space + , Str "statements" + , Space + , Str "typically" + , Space + , Str "have" + , Space + , Str "the" + , Space + , Str "form:" + , SoftBreak + , Str "\"If" + , Space + , Str "[some" + , Space + , Str "condition]," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes\"." + ] + ] + ] + ) + , ( [ Str "3." + , Space + , Str "Scoring" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "results" + , Space + , Str "form" + ] + , [ [ Plain + [ Str "@@@TODO" + , Space + , Str "provide" + , Space + , Str "info" + , Space + , Str "on" + , Space + , Str "where" + , Space + , Str "to" + , Space + , Str "get" + , Space + , Str "the" + , Space + , Str "results" + , Space + , Str "form" + ] + ] + ] + ) + ] + ] + ] + , Para [ Span ( "content-mathml-001.xhtml" , [] , [] ) [] ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 2 + ( "content-mathml-001.xhtml_mathml" , [] , [] ) + [ Str "MathML" ] + , Div + ( "content-mathml-001.xhtml_mathml-010" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "mathml-010" ] + , Space + , Str "Rendering" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "MathML" + , Space + , Str "equation" + , Space + , Str "rendering" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Plain + [ Math + DisplayMath + "\\int_{- \\infty}^{\\infty}e^{- x^{2}}\\, dx = \\sqrt{\\pi}" + , SoftBreak + , Math + DisplayMath + "\\sum\\limits_{n = 1}^{\\infty}\\frac{1}{n^{2}} = \\frac{\\pi^{2}}{6}" + , SoftBreak + , Math + DisplayMath + "x = \\frac{- b \\pm \\sqrt{b^{2} - 4ac}}{2a}" + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "equations" + , Space + , Str "are" + , Space + , Str "not" + , Space + , Str "presented" + , Space + , Str "as" + , Space + , Str "linear" + , Space + , Str "text" + , Space + , Str "(e.g.," + , Space + , Str "x=-b\177b2-4ac2a)," + , SoftBreak + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "content-mathml-001.xhtml_mathml-020" + , [ "section" , "otest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[OPTIONAL]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "mathml-020" ] + , Space + , Str "CSS" + , Space + , Str "Styling" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "math" + , Space + , Str "element" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "basic" + , Space + , Str "CSS" + , Space + , Str "styling" + , Space + , Str "of" + , Space + , Str "MathML" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "math" + , Space + , Str "element." + ] + , Plain [ Math InlineMath "{2x}{+ y - z}" ] + , Para + [ Str "The" + , Space + , Str "test" + , Space + , Str "passes" + , Space + , Str "if" + , Space + , Str "the" + , Space + , Str "equation" + , Space + , Str "has" + , Space + , Str "a" + , Space + , Str "yellow" + , Space + , Str "background" + , Space + , Str "and" + , Space + , Str "a" + , Space + , Str "dashed" + , Space + , Str "border." + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "reading" + , Space + , Str "system" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "have" + , Space + , Str "a" + , Space + , Str "viewport," + , Space + , Str "or" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "support" + , SoftBreak + , Str "CSS" + , Space + , Str "styles," + , Space + , Str "this" + , Space + , Str "test" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "marked" + , Space + , Code ( "" , [] , [] ) "Not Supported" + , Str "." + ] + ] + , Div + ( "content-mathml-001.xhtml_mathml-021" + , [ "section" , "otest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[OPTIONAL]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "mathml-021" ] + , Space + , Str "CSS" + , Space + , Str "Styling" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "mo" + , Space + , Str "element" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "basic" + , Space + , Str "CSS" + , Space + , Str "styling" + , Space + , Str "of" + , Space + , Str "MathML" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "mo" + , Space + , Str "element." + ] + , Plain [ Math InlineMath "{2x}{+ y - z}" ] + , Para + [ Str "The" + , Space + , Str "test" + , Space + , Str "passes" + , Space + , Str "if" + , Space + , Str "the" + , Space + , Str "operators" + , Space + , Str "are" + , Space + , Str "enlarged" + , Space + , Str "relative" + , Space + , Str "to" + , Space + , Str "the" + , Space + , Str "other" + , Space + , Str "symbols" + , Space + , Str "and" + , Space + , Str "numbers." + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "reading" + , Space + , Str "system" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "have" + , Space + , Str "a" + , Space + , Str "viewport," + , Space + , Str "or" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "support" + , SoftBreak + , Str "CSS" + , Space + , Str "styles," + , Space + , Str "this" + , Space + , Str "test" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "marked" + , Space + , Code ( "" , [] , [] ) "Not Supported" + , Str "." + ] + ] + , Div + ( "content-mathml-001.xhtml_mathml-022" + , [ "section" , "otest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[OPTIONAL]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "mathml-022" ] + , Space + , Str "CSS" + , Space + , Str "Styling" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "mi" + , Space + , Str "element" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "basic" + , Space + , Str "CSS" + , Space + , Str "styling" + , Space + , Str "of" + , Space + , Str "MathML" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "mi" + , Space + , Str "element." + ] + , Plain [ Math InlineMath "{2x}{+ y - z}" ] + , Para + [ Str "The" + , Space + , Str "test" + , Space + , Str "passes" + , Space + , Str "if" + , Space + , Str "the" + , Space + , Str "identifiers" + , Space + , Str "are" + , Space + , Str "bolded" + , Space + , Str "and" + , Space + , Str "blue." + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "reading" + , Space + , Str "system" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "have" + , Space + , Str "a" + , Space + , Str "viewport," + , Space + , Str "or" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "support" + , SoftBreak + , Str "CSS" + , Space + , Str "styles," + , Space + , Str "this" + , Space + , Str "test" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "marked" + , Space + , Code ( "" , [] , [] ) "Not Supported" + , Str "." + ] + ] + , Div + ( "content-mathml-001.xhtml_mathml-023" + , [ "section" , "otest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[OPTIONAL]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "mathml-023" ] + , Space + , Str "CSS" + , Space + , Str "Styling" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "mn" + , Space + , Str "element" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "basic" + , Space + , Str "CSS" + , Space + , Str "styling" + , Space + , Str "of" + , Space + , Str "MathML" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "mn" + , Space + , Str "element." + ] + , Plain [ Math InlineMath "{2x}{+ y - z}" ] + , Para + [ Str "The" + , Space + , Str "test" + , Space + , Str "passes" + , Space + , Str "if" + , Space + , Str "the" + , Space + , Str "number" + , Space + , Str "2" + , Space + , Str "is" + , Space + , Str "italicized" + , Space + , Str "and" + , Space + , Str "blue." + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "reading" + , Space + , Str "system" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "have" + , Space + , Str "a" + , Space + , Str "viewport," + , Space + , Str "or" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "support" + , SoftBreak + , Str "CSS" + , Space + , Str "styles," + , Space + , Str "this" + , Space + , Str "test" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "marked" + , Space + , Code ( "" , [] , [] ) "Not Supported" + , Str "." + ] + ] + , Div + ( "content-mathml-001.xhtml_mathml-024" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "mathml-024" ] + , Str "Horizontal" + , Space + , Str "stretch," + , Space + , Code ( "" , [] , [] ) "mover" + , Str "," + , Space + , Code ( "" , [] , [] ) "munder" + , Str "," + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "mspace" + , Space + , Str "elements" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "horizontal" + , Space + , Str "stretch," + , Space + , Code ( "" , [] , [] ) "mover" + , Str "," + , Space + , Code ( "" , [] , [] ) "munder" + , Str "," + , Space + , Code ( "" , [] , [] ) "mspace" + , Space + , Str "elements" + , Space + , Str "are" + , Space + , Str "supported." + ] + , Plain + [ Math + DisplayMath + "c = \\overset{\\text{complex number}}{\\overbrace{\\underset{\\text{real}}{\\underbrace{\\mspace{20mu} a\\mspace{20mu}}} + \\underset{\\text{imaginary}}{\\underbrace{\\quad b{\\mathbb{i}}\\quad}}}}" + ] + , Para + [ Str "The" + , Space + , Str "test" + , Space + , Str "passes" + , Space + , Str "if" + , Space + , Str "the" + , Space + , Str "rendering" + , Space + , Str "looks" + , Space + , Str "like" + , Space + , Str "." + ] + ] + , Div + ( "content-mathml-001.xhtml_mathml-025" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "mathml-025" ] + , Str "Testing" + , Space + , Code ( "" , [] , [] ) "mtable" + , Space + , Str "with" + , Space + , Code ( "" , [] , [] ) "colspan" + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "rowspan" + , Space + , Str "attributes," + , Space + , Str "Hebrew" + , Space + , Str "and" + , Space + , Str "Script" + , Space + , Str "fonts" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Code ( "" , [] , [] ) "mtable" + , Space + , Str "with" + , Space + , Code ( "" , [] , [] ) "colspan" + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "mspace" + , Space + , Str "attributes" + , Space + , Str "(column" + , Space + , Str "and" + , Space + , Str "row" + , Space + , Str "spanning)" + , Space + , Str "are" + , Space + , Str "supported;" + , Space + , Str "uses" + , Space + , Str "Hebrew" + , Space + , Str "and" + , Space + , Str "Script" + , Space + , Str "alphabets." + ] + , Plain + [ Math + DisplayMath + "\\begin{matrix}\n & {\\operatorname{cov}(\\mathcal{L})} & \\longrightarrow & {\\operatorname{non}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{cof}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{cof}(\\mathcal{L})} & \\longrightarrow & 2^{\\aleph_{0}} \\\\\n & \\uparrow & & \\uparrow & & \\uparrow & & \\uparrow & & \\\\\n & {\\mathfrak{b}} & \\longrightarrow & {\\mathfrak{d}} & & & & & & \\\\\n & \\uparrow & & \\uparrow & & & & & & \\\\\n\\aleph_{1} & \\longrightarrow & {\\operatorname{add}(\\mathcal{L})} & \\longrightarrow & {\\operatorname{add}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{cov}(\\mathcal{K})} & \\longrightarrow & {\\operatorname{non}(\\mathcal{L})} & \n\\end{matrix}" + ] + , Para + [ Str "The" + , Space + , Str "test" + , Space + , Str "passes" + , Space + , Str "if" + , Space + , Str "the" + , Space + , Str "rendering" + , Space + , Str "looks" + , Space + , Str "like" + , Space + , Link + ( "" , [] , [] ) + [ Str "Cicho\324's" , Space , Str "Diagram" ] + ( "http://en.wikipedia.org/wiki/Cicho%C5%84's_diagram" + , "" + ) + , Str ":" + , Space + , Str "." + ] + ] + , Div + ( "content-mathml-001.xhtml_mathml-026" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "mathml-026" ] + , Str "BiDi," + , Space + , Str "RTL" + , Space + , Str "and" + , Space + , Str "Arabic" + , Space + , Str "alphabets" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "right-to-left" + , Space + , Str "and" + , Space + , Str "Arabic" + , Space + , Str "alphabets" + , Space + , Str "are" + , Space + , Str "supported." + ] + , Plain + [ Math + DisplayMath + "{\1583(\1587)} = \\left\\{ \\begin{matrix}\n{\\sum\\limits_{\1646 = 1}^{\1589}\1587^{\1646}} & {\\text{\1573\1584\1575\1603\1575\1606}\1587 > 0} \\\\\n{\\int_{1}^{\1589}{\1587^{\1646}\1569\1587}} & {\\text{\1573\1584\1575\1603\1575\1606}\1587 \\in \1605} \\\\\n{{\1591\1575}\\pi} & {\\text{\1594\1610\1585\1584\1604\1603}\\left( \\text{\1605\1593}\\pi \\simeq 3,141 \\right)}\n\\end{matrix} \\right." + ] + , Para + [ Str "The" + , Space + , Str "test" + , Space + , Str "passes" + , Space + , Str "if" + , Space + , Str "the" + , Space + , Str "rendering" + , Space + , Str "looks" + , Space + , Str "like" + , Space + , Str "the" + , Space + , Str "following" + , Space + , Str "image:" + ] + ] + , Div + ( "content-mathml-001.xhtml_mathml-027" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "mathml-027" ] + , Str "Elementary" + , Space + , Str "math:" + , Space + , Str "long" + , Space + , Str "division" + , Space + , Str "notation" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Code ( "" , [] , [] ) "mlongdiv" + , Space + , Str "elements" + , Space + , Str "(from" + , Space + , Str "elementary" + , Space + , Str "math)" + , Space + , Str "are" + , Space + , Str "supported." + ] + , Plain + [ Span + ( "" + , [ "math" ] + , [ ( "xmlns" , "http://www.w3.org/1998/Math/MathML" ) + ] + ) + [ SoftBreak + , Str "3" + , SoftBreak + , Str "435.3" + , SoftBreak + , Str "1306" + , SoftBreak + , Str "12" + , SoftBreak + , Str "10" + , SoftBreak + , Str "9" + , SoftBreak + , Str "16" + , SoftBreak + , Str "15" + , SoftBreak + , Str "1.0" + , SoftBreak + , Str "9" + , SoftBreak + , Str "1" + , SoftBreak + ] + ] + , Para + [ Str "The" + , Space + , Str "test" + , Space + , Str "passes" + , Space + , Str "if" + , Space + , Str "the" + , Space + , Str "rendering" + , Space + , Str "looks" + , Space + , Str "like" + , Space + , Str "the" + , Space + , Str "following" + , Space + , Str "image:" + , Space + , Str "." + ] + ] + ] + , Para [ Span ( "content-switch-001.xhtml" , [] , [] ) [] ] + , Div + ( "content-switch-001.xhtml_epub-switch" + , [ "section" ] + , [] + ) + [ Header + 3 ( "" , [] , [] ) [ Code ( "" , [] , [] ) "epub:switch" ] + , Div + ( "content-switch-001.xhtml_switch-010" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "switch-010" ] + , Space + , Str "Support" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Link + ( "" , [] , [] ) + [ Code ( "" , [] , [] ) "epub:switch" ] + ( "http://idpf.org/epub/30/spec/epub30-contentdocs.html#sec-xhtml-content-switch" + , "" + ) + , Space + , Str "element" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "PASS" ] + , Para + [ Str "If" + , Space + , Str "only" + , Space + , Str "the" + , Space + , Str "word" + , Space + , Str "\"PASS\"" + , Space + , Str "is" + , Space + , Str "rendered" + , Space + , Str "before" + , Space + , Str "this" + , Space + , Str "paragraph," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + , Space + , Str "If" + , Space + , Str "both" + , Space + , Str "\"PASS\"" + , Space + , Str "and" + , Space + , Str "\"FAIL\"" + , Space + , Str "are" + , Space + , Str "rendered," + , Space + , Str "or" + , Space + , Str "neither" + , SoftBreak + , Str "\"PASS\"" + , Space + , Str "nor" + , Space + , Str "\"FAIL\"" + , Space + , Str "is" + , Space + , Str "rendered," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "content-switch-001.xhtml_switch-020" + , [ "section" , "otest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[OPTIONAL]" ] + , SoftBreak + , Span ( "" , [ "test-id" ] , [] ) [ Str "switch-020" ] + , SoftBreak + , Str "MathML" + , Space + , Str "Embedding" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Str "MathML" + , Space + , Str "namespace" + , Space + , Str "is" + , Space + , Str "recognized" + , Space + , Str "when" + , Space + , Str "used" + , Space + , Str "in" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Code ( "" , [] , [] ) "epub:case" ] + ( "http://idpf.org/epub/30/spec/epub30-contentdocs.html#sec-xhtml-epub-case" + , "" + ) + , Space + , Str "element." + ] + , Para [ Math InlineMath "{2x}{+ y - z}" ] + , Para + [ Str "If" + , Space + , Str "a" + , Space + , Str "MathML" + , Space + , Str "equation" + , Space + , Str "is" + , Space + , Str "rendered" + , Space + , Str "before" + , Space + , Str "this" + , Space + , Str "paragraph," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + , Para + [ Str "If" + , Space + , Str "test" + , Space + , Code ( "" , [] , [] ) "switch-010" + , Space + , Str "did" + , Space + , Str "not" + , Space + , Str "pass," + , Space + , Str "this" + , Space + , Str "test" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "marked" + , Space + , Code ( "" , [] , [] ) "Not Supported" + , Str "." + ] + ] + ] + ] diff --git a/test/epub/formatting.epub b/test/epub/formatting.epub Binary files a/test/epub/formatting.epub and b/test/epub/formatting.epub differ diff --git a/test/epub/formatting.native b/test/epub/formatting.native --- a/test/epub/formatting.native +++ b/test/epub/formatting.native @@ -1,402 +1,6020 @@ -[Para [Span ("front.xhtml",[],[]) []] -,Div ("",["section"],[]) - [Header 1 ("",[],[]) [Str "EPUB",Space,Str "3",Space,Str "Styling",Space,Str "Test",Space,Str "Document:",Space,Str "0101"] - ,Div ("",["section"],[]) - [Header 2 ("",[],[]) [Str "Status",Space,Str "of",Space,Str "this",Space,Str "Document"] - ,Para [Str "This",Space,Str "publication",Space,Str "is",Space,Str "currently",Space,Str "considered",Space,Span ("",["status"],[]) [Str "[UNDER",Space,Str "DEVELOPMENT]"],Space,Str "by",Space,Str "the",Space,Str "IDPF."] - ,Para [Str "This",Space,Str "publication",Space,Str "is",Space,Str "part",Space,Str "of",Space,Str "version",Space,Span ("",["version"],[]) [Str "X.X"],Space,Str "of",Space,Str "the",Space,Str "EPUB",Space,Str "3.0",Space,Str "Compliance",Space,Str "Test",Space,Str "Suite",Space,Str "released",SoftBreak,Str "on",Space,RawInline (Format "html") "",Str "."] - ,Para [Str "Before",Space,Str "using",Space,Str "this",Space,Str "publication",Space,Str "to",Space,Str "evaluate",Space,Str "reading",Space,Str "systems,",Space,Str "testers",Space,Str "are",Space,Str "strongly",Space,Str "encouraged",Space,Str "to",SoftBreak,Str "verify",Space,Str "that",Space,Str "they",Space,Str "have",Space,Str "the",Space,Str "latest",Space,Str "release",Space,Str "by",Space,Str "checking",Space,Str "the",Space,Str "current",Space,Str "release",Space,Str "version",Space,Str "and",Space,Str "date",Space,Str "of",SoftBreak,Str "the",Space,Str "test",Space,Str "suite",Space,Str "at",Space,Link ("",[],[]) [Str "TBD"] ("http://idpf.org/","")] - ,Para [Str "This",Space,Str "publication",Space,Str "is",Space,Str "one",Space,Str "of",Space,Str "several",Space,Str "that",Space,Str "currently",Space,Str "comprise",Space,Str "the",Space,Str "EPUB",Space,Str "3",Space,Str "conformance",Space,Str "test",Space,Str "suite",SoftBreak,Str "for",Space,Str "reflowable",Space,Str "content.",Space,Str "The",Space,Str "complete",Space,Str "test",Space,Str "suite",Space,Str "includes",Space,Str "all",Space,Str "of",Space,Str "the",Space,Str "following",Space,Str "publications:"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "."]]]] - ,Div ("",["section"],[]) - [Header 2 ("",[],[]) [Str "About",Space,Str "this",Space,Str "Document"] - ,Para [Str "This",Space,Str "document",Space,Str "focuses",Space,Str "on",Space,Str "human-evaluated",Space,Str "binary",Space,Str "(pass/fail)",Space,Str "tests",Space,Str "in",Space,Str "a",SoftBreak,Str "reflowable",Space,Str "context.",Space,Str "Tests",Space,Str "for",Space,Str "fixed-layout",Space,Str "content",Space,Str "and",Space,Str "other",Space,Str "individual",Space,Str "tests",Space,Str "that",SoftBreak,Str "require",Space,Str "a",Space,Str "dedicated",Space,Str "epub",Space,Str "file",Space,Str "are",Space,Str "available",Space,Str "in",Space,Str "additional",Space,Str "sibling",Space,Str "documents;",Space,Str "refer",Space,Str "to",SoftBreak,Str "the",Space,Link ("",[],[]) [Str "test",Space,Str "suite",SoftBreak,Str "wiki"] ("https://github.com/mgylling/epub-testsuite/wiki/Overview",""),Space,Str "(",Code ("",[],[]) "https://github.com/mgylling/epub-testsuite/wiki/Overview",Str ")",Space,Str "for",Space,Str "additional",SoftBreak,Str "information."]] - ,Div ("",["section"],[]) - [Header 2 ("",[],[]) [Str "Conventions"] - ,Para [Str "The",Space,Str "following",Space,Str "conventions",Space,Str "are",Space,Str "used",Space,Str "throughout",Space,Str "the",Space,Str "document:"] - ,DefinitionList - [([Str "1.",Space,Str "Locating",Space,Str "a",Space,Str "test"], - [[Div ("",["ctest"],[]) - [Para [Str "Tests",Space,Str "for",Space,Emph [Str "required"],Space,Str "Reading",Space,Str "System",Space,Str "functionality",Space,Str "are",SoftBreak,Str "preceded",Space,Str "by",Space,Str "the",Space,Str "label:",Space,Span ("",["nature"],[("style","display: inline; font-size: 100%")]) [Str "[REQUIRED]"]]] - ,Div ("",["otest"],[]) - [Para [Str "Tests",Space,Str "for",Space,Emph [Str "optional"],Space,Str "Reading",Space,Str "System",Space,Str "functionality",Space,Str "are",SoftBreak,Str "preceded",Space,Str "by",Space,Str "the",Space,Str "label:",Space,Span ("",["nature"],[("style","display: inline; font-size: 100%")]) [Str "[OPTIONAL]"]]]]]) - ,([Str "2.",Space,Str "Performing",Space,Str "the",Space,Str "test"], - [[Plain [Str "Each",Space,Str "test",Space,Str "includes",Space,Str "a",Space,Str "description",Space,Str "of",Space,Str "its",Space,Str "purpose",Space,Str "followed",Space,Str "by",Space,Str "the",Space,Str "actual",Space,Strong [Str "test",Space,Str "statement,",SoftBreak,Str "which",Space,Str "can",Space,Str "always",Space,Str "be",Space,Str "evaluated",Space,Str "to",Space,Str "true",Space,Str "or",Space,Str "false"],Str ".",Space,Str "These",Space,Str "statements",Space,Str "typically",Space,Str "have",Space,Str "the",Space,Str "form:",SoftBreak,Str "\"If",Space,Str "[some",Space,Str "condition],",Space,Str "the",Space,Str "test",Space,Str "passes\"."]]]) - ,([Str "3.",Space,Str "Scoring",Space,Str "in",Space,Str "the",Space,Str "results",Space,Str "form"], - [[Plain [Str "@@@TODO",Space,Str "provide",Space,Str "info",Space,Str "on",Space,Str "where",Space,Str "to",Space,Str "get",Space,Str "the",Space,Str "results",Space,Str "form"]]])]]] -,Para [Span ("styling-xhtml-001.xhtml",[],[]) []] -,Div ("styling-xhtml-001.xhtml#epub-css",["section"],[]) - [Header 1 ("",[],[]) [Str "EPUB",Space,Str "Style",Space,Str "Sheets"] - ,Para [Str "This",Space,Str "section",Space,Str "contains",Space,Str "tests",Space,Str "for",Space,Str "styling",Space,Str "and",Space,Str "layout."]] -,Para [Span ("styling-xhtml-003.xhtml",[],[]) []] -,Div ("styling-xhtml-003.xhtml#style-110",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-110"],Space,Str "Multi-Column",Space,Str "Layouts"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "CSS Multi-Column Layout",Space,Str "properties",Space,Str "are",Space,Str "supported."] - ,Div ("",["multicol"],[]) - [Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "text",Space,Str "is",Space,Str "rendered",Space,Str "in",Space,Str "three",Space,Str "columns,",Space,Str "the",Space,Str "test",Space,Str "passes."]] -,Para [Span ("styling-xhtml-002.xhtml",[],[]) []] -,Div ("styling-xhtml-002.xhtml#style-lists",["section"],[]) - [Header 2 ("",[],[]) [Str "Lists"] - ,Div ("styling-xhtml-002.xhtml#style-list-style-type",["section"],[]) - [Header 3 ("",[],[]) [Str "The",Space,Code ("",[],[]) "list-style-type",Space,Str "property"] - ,Div ("styling-xhtml-002.xhtml#style-009",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-009"],Space,Code ("",[],[]) "decimal"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "decimal",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "decimal",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-010",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-010"],Space,Code ("",[],[]) "circle"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "circle",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ul",Space,Str "element."] - ,BulletList - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "circle",Space,Str "markers,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-011",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-011"],Space,Code ("",[],[]) "square"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "square",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ul",Space,Str "element."] - ,BulletList - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "square",Space,Str "markers,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-012",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-012"],Space,Code ("",[],[]) "disc"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "disc",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ul",Space,Str "element."] - ,BulletList - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "disc",Space,Str "markers,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-013",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-013"],Space,Code ("",[],[]) "lower-latin"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "lower-latin",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "lower-latin",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-014",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-014"],Space,Code ("",[],[]) "lower-roman"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "lower-roman",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "lower-roman",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-015",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-015"],Space,Code ("",[],[]) "upper-alpha"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "upper-alpha",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "upper-alpha",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-016",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-016"],Space,Code ("",[],[]) "hiragana"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "hiragana",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "hiragana",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-017",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-017"],Space,Code ("",[],[]) "hiragana-iroha"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "hiragana-iroha",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "hiragana-iroha",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-018",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-018"],Space,Code ("",[],[]) "katakana"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "katakana",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "katakana",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-019",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-019"],Space,Code ("",[],[]) "katakana-iroha"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "katakana-iroha",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "katakana-iroha",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-020",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-020"],Space,Code ("",[],[]) "upper-roman"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "upper-roman",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "upper-roman",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-021",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-021"],Space,Code ("",[],[]) "upper-latin"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "upper-latin",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "upper-latin",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-022",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-022"],Space,Code ("",[],[]) "lower-alpha"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "lower-alpha",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "lower-alpha",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-023",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-023"],Space,Code ("",[],[]) "lower-greek"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "lower-greek",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "lower-greek",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-024",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-024"],Space,Code ("",[],[]) "armenian"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "armenian",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "armenian",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-025",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-025"],Space,Code ("",[],[]) "cjk-ideographic"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "cjk-ideographic",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "cjk-ideographic",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-026",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-026"],Space,Code ("",[],[]) "decimal-leading-zero"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "decimal-leading-zero",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "decimal-leading-zero",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-027",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-027"],Space,Code ("",[],[]) "georgian"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "georgian",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "georgian",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-028",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-028"],Space,Code ("",[],[]) "hebrew"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "hebrew",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "hebrew",Space,Str "markers",Space,Str "in",Space,Str "ascending",Space,Str "order,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-029",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-029"],Space,Code ("",[],[]) "none"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-type",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "none",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "no",Space,Str "markers,",Space,Str "the",Space,Str "test",Space,Str "passes."]]] - ,Div ("styling-xhtml-002.xhtml#style-list-style",["section"],[]) - [Header 3 ("",[],[]) [Str "The",Space,Code ("",[],[]) "list-style",Space,Str "property"] - ,Div ("styling-xhtml-002.xhtml#style-030",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-030"],Space,Str "images"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style",Space,Str "shorthand",Space,Str "property",Space,Str "is",Space,Str "supported",Space,Str "using",Space,Str "a",Space,Str "gif",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ul",Space,Str "element."] - ,BulletList - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "the",Space,Str "purple",Space,Str "and",Space,Str "aqua",Space,Str "square",Space,Str "bullet",Space,Str "the",Space,Str "test",Space,Str "passes."]]] - ,Div ("styling-xhtml-002.xhtml#style-list-style-position",["section"],[]) - [Header 3 ("",[],[]) [Str "The",Space,Code ("",[],[]) "list-style-position",Space,Str "property"] - ,Div ("styling-xhtml-002.xhtml#style-040",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-040"],Space,Str "The",Space,Code ("",[],[]) "list-style-position",Space,Str "property:",Space,Code ("",[],[]) "inside"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-position",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "inside",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ul",Space,Str "element."] - ,BulletList - [[Plain [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat."]] - ,[Plain [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat."]] - ,[Plain [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat."]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "markers",Space,Str "inside",Space,Str "the",Space,Str "indentation,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-041",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-041"],Space,Str "The",Space,Code ("",[],[]) "list-style-position",Space,Str "property:",Space,Code ("",[],[]) "outside"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "list-style-position",Space,Str "property",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "outside",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ul",Space,Str "element."] - ,BulletList - [[Plain [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat."]] - ,[Plain [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat."]] - ,[Plain [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat."]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "has",Space,Str "the",Space,Str "default",Space,Str "setting",Space,Str "(marker",Space,Str "outside",Space,Str "the",Space,Str "indentation),",Space,Str "the",Space,Str "test",Space,Str "passes."]]] - ,Div ("styling-xhtml-002.xhtml#style-list-start",["section"],[]) - [Header 3 ("",[],[]) [Str "The",Space,Str "HTML",Space,Code ("",[],[]) "start",Space,Str "attribute"] - ,Div ("styling-xhtml-002.xhtml#style-050",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-050"],Space,Str "Without",Space,Code ("",[],[]) "list-style-type",Space,Str "set"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "start",Space,Str "attribute",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element",Space,Str "with",Space,Str "no",Space,Code ("",[],[]) "list-style-type",Space,Str "property."] - ,OrderedList (25,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "starts",Space,Str "at",Space,Str "25,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-002.xhtml#style-051",["section","ctest"],[]) - [Header 4 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-051"],Space,Str "With",Space,Code ("",[],[]) "list-style-type",Space,Str "set"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "start",Space,Str "attribute",Space,Str "is",Space,Str "supported",Space,Str "on",Space,Str "a",Space,Code ("",[],[]) "ol",Space,Str "element",Space,Str "with",Space,Str "a",Space,Code ("",[],[]) "list-style-type",Space,Str "property."] - ,OrderedList (50,DefaultStyle,DefaultDelim) - [[Plain [Str "Lorem"]] - ,[Plain [Str "Ipsum"]] - ,[Plain [Str "Dolor"]] - ,[Plain [Str "Sit"]] - ,[Plain [Str "Amet"]]] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "list",Space,Str "starts",Space,Str "at",Space,Str "'L'",Space,Str "(50),",Space,Str "the",Space,Str "test",Space,Str "passes."]]]] -,Para [Span ("styling-xhtml-004.xhtml",[],[]) []] -,Div ("styling-xhtml-004.xhtml#style-media-rules",["section"],[]) - [Header 2 ("",[],[]) [Code ("",[],[]) "@media",Space,Str "Rules"] - ,Div ("styling-xhtml-004.xhtml#style-210",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-210"],Space,Code ("",[],[]) "all"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "all",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\",",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("styling-xhtml-004.xhtml#style-211",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-211"],Space,Code ("",[],[]) "screen"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "screen",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\",",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("styling-xhtml-004.xhtml#style-212",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-212"],Space,Code ("",[],[]) "handheld"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "handheld",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\",",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("styling-xhtml-004.xhtml#style-213",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-213"],Space,Code ("",[],[]) "tv"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "tv",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\",",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("styling-xhtml-004.xhtml#style-220",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-220"],Space,Code ("",[],[]) "orientation:landscape"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "orientation:landscape",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\"",Space,Str "when",Space,Str "the",Space,Str "device",Space,Str "is",Space,Str "held",Space,Str "in",Space,Str "landscape",Space,Str "mode,",Space,Str "and",Space,Str "the",Space,Str "device",Space,Str "supports",Space,Str "multiple",Space,Str "orientations,",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("styling-xhtml-004.xhtml#style-221",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-221"],Space,Code ("",[],[]) "orientation:portrait"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "orientation:portrait",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\"",Space,Str "when",Space,Str "the",Space,Str "device",Space,Str "is",Space,Str "held",Space,Str "in",Space,Str "portrait",Space,Str "mode,",Space,Str "and",Space,Str "the",Space,Str "device",Space,Str "supports",Space,Str "multiple",Space,Str "orientations,",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("styling-xhtml-004.xhtml#style-230",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-230"],Space,Code ("",[],[]) "min-width"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "min-width:200px",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\",",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("styling-xhtml-004.xhtml#style-231",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-231"],Space,Code ("",[],[]) "max-width"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "max-width:2000px",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\",",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("styling-xhtml-004.xhtml#style-240",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-240"],Space,Code ("",[],[]) "min-device-width"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "min-device-width:200px",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\",",Space,Str "the",Space,Str "test",Space,Str "fails."]] - ,Div ("styling-xhtml-004.xhtml#style-241",["section","ctest"],[]) - [Header 3 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-241"],Space,Code ("",[],[]) "max-device-width"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "@media",Space,Str "rule",Space,Str "set",Space,Str "to",Space,Code ("",[],[]) "max-device-width:2000px",Space,Str "is",Space,Str "supported."] - ,Para [Str "FAIL"] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "reads",Space,Str "\"FAIL\",",Space,Str "the",Space,Str "test",Space,Str "fails."]]] -,Para [Span ("styling-xhtml-005.xhtml",[],[]) []] -,Div ("styling-xhtml-005.xhtml#style-text-xform",["section"],[]) - [Header 2 ("",[],[]) [Str "The",Space,Code ("",[],[]) "text-transform",Space,Str "property"] - ,Div ("styling-xhtml-005.xhtml#style-310",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-310"],Space,Code ("",[],[]) "uppercase"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "text-transform",Space,Str "property",Space,Str "set",Space,Str "to",Space,Str "uppercase",Space,Str "is",Space,Str "supported."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "is",Space,Str "in",Space,Str "upper",Space,Str "case,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-005.xhtml#style-311",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-311"],Space,Code ("",[],[]) "capitalize"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "text-transform",Space,Str "property",Space,Str "set",Space,Str "to",Space,Str "capitalize",Space,Str "is",Space,Str "supported."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "If",Space,Str "each",Space,Str "first",Space,Str "letter",Space,Str "of",Space,Str "each",Space,Str "word",Space,Str "in",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "is",Space,Str "in",Space,Str "upper",Space,Str "case,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-005.xhtml#style-312",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-312"],Space,Code ("",[],[]) "lowercase"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "text-transform",Space,Str "property",Space,Str "set",Space,Str "to",Space,Str "lowercase",Space,Str "is",Space,Str "supported."] - ,Para [Str "Lorem",Space,Str "ipsum",Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipisicing",Space,Str "elit,",Space,Str "sed",Space,Str "do",Space,Str "eiusmod",Space,Str "tempor",Space,Str "incididunt",Space,Str "ut",Space,Str "labore",Space,Str "et",Space,Str "dolore",Space,Str "magna",Space,Str "aliqua.",Space,Str "Ut",Space,Str "enim",Space,Str "ad",Space,Str "minim",Space,Str "veniam,",Space,Str "quis",Space,Str "nostrud",Space,Str "exercitation",Space,Str "ullamco",Space,Str "laboris",Space,Str "nisi",Space,Str "ut",Space,Str "aliquip",Space,Str "ex",Space,Str "ea",Space,Str "commodo",Space,Str "consequat.",Space,Str "Duis",Space,Str "aute",Space,Str "irure",Space,Str "dolor",Space,Str "in",Space,Str "reprehenderit",Space,Str "in",Space,Str "voluptate",Space,Str "velit",Space,Str "esse",Space,Str "cillum",Space,Str "dolore",Space,Str "eu",Space,Str "fugiat",Space,Str "nulla",Space,Str "pariatur.",Space,Str "Excepteur",Space,Str "sint",Space,Str "occaecat",Space,Str "cupidatat",Space,Str "non",Space,Str "proident,",Space,Str "sunt",Space,Str "in",Space,Str "culpa",Space,Str "qui",Space,Str "officia",Space,Str "deserunt",Space,Str "mollit",Space,Str "anim",Space,Str "id",Space,Str "est",Space,Str "laborum."] - ,Para [Str "If",Space,Str "the",Space,Str "preceding",Space,Str "paragraph",Space,Str "is",Space,Str "in",Space,Str "lower",Space,Str "case,",Space,Str "the",Space,Str "test",Space,Str "passes."]]] -,Para [Span ("styling-xhtml-006.xhtml",[],[]) []] -,Div ("styling-xhtml-006.xhtml#style-ruby",["section"],[]) - [Header 2 ("",[],[]) [Str "The",Space,Code ("",[],[]) "epub-ruby-position",Space,Str "property"] - ,Div ("styling-xhtml-006.xhtml#style-410",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-410"],Space,Code ("",[],[]) "over"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "-epub-ruby-position",Space,Str "property",Space,Str "set",Space,Str "to",Space,Str "over",Space,Str "is",Space,Str "supported."] - ,Plain [RawInline (Format "html") "",Strong [Str "Lorem",Space,Str "Ipsum"],Space,RawInline (Format "html") "",Str "(",RawInline (Format "html") "",RawInline (Format "html") "",Str "Lorem",Space,Str "Ipsum",RawInline (Format "html") "",RawInline (Format "html") "",Str ")",RawInline (Format "html") "",RawInline (Format "html") ""] - ,Para [Str "If",Space,Str "the",Space,Str "Ruby",Space,Str "text",Space,Str "is",Space,Str "positioned",Space,Str "on",Space,Str "the",Space,Link ("",[],[]) [Str "over"] ("http://www.w3.org/TR/css3-writing-modes/#over",""),Space,Str "side",Space,Str "of",Space,Str "the",Space,Str "ruby",Space,Str "base,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-006.xhtml#style-411",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-411"],Space,Code ("",[],[]) "under"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "-epub-ruby-position",Space,Str "property",Space,Str "set",Space,Str "to",Space,Str "under",Space,Str "is",Space,Str "supported."] - ,Plain [RawInline (Format "html") "",Strong [Str "Lorem",Space,Str "Ipsum"],Space,RawInline (Format "html") "",Str "(",RawInline (Format "html") "",RawInline (Format "html") "",Str "Lorem",Space,Str "Ipsum",RawInline (Format "html") "",RawInline (Format "html") "",Str ")",RawInline (Format "html") "",RawInline (Format "html") ""] - ,Para [Str "If",Space,Str "the",Space,Str "Ruby",Space,Str "text",Space,Str "is",Space,Str "positioned",Space,Str "on",Space,Str "the",Space,Link ("",[],[]) [Str "under"] ("http://www.w3.org/TR/css3-writing-modes/#under",""),Space,Str "side",Space,Str "of",Space,Str "the",Space,Str "ruby",Space,Str "base,",Space,Str "the",Space,Str "test",Space,Str "passes."]] - ,Div ("styling-xhtml-006.xhtml#style-412",["section","ctest"],[]) - [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],Space,Span ("",["test-id"],[]) [Str "style-412"],Space,Code ("",[],[]) "inter-character"] - ,Para [Str "Tests",Space,Str "whether",Space,Str "the",Space,Code ("",[],[]) "-epub-ruby-position",Space,Str "property",Space,Str "set",Space,Str "to",Space,Str "inter-caracter",Space,Str "is",Space,Str "supported."] - ,Plain [RawInline (Format "html") "",Strong [Str "Lorem",Space,Str "Ipsum"],Space,RawInline (Format "html") "",Str "(",RawInline (Format "html") "",RawInline (Format "html") "",Str "Lorem",Space,Str "Ipsum",RawInline (Format "html") "",RawInline (Format "html") "",Str ")",RawInline (Format "html") "",RawInline (Format "html") ""] - ,Para [Str "If",Space,Str "the",Space,Str "Ruby",Space,Str "text",Space,Str "is",Space,Str "positioned",Space,Str "on",Space,Str "the",Space,Str "right",Space,Str "side",Space,Str "of",Space,Str "the",Space,Str "base",Space,Str "text,",Space,Str "the",Space,Str "test",Space,Str "passes."]]]] +Pandoc + Meta + { unMeta = + fromList + [ ( "author" + , MetaList + [ MetaInlines [ Str "Ori Idan" ] + , MetaInlines [ Str "Matt Garrish" ] + , MetaInlines [ Str "Marisa DeMeglio" ] + , MetaInlines [ Str "Toshiaki Koike" ] + , MetaInlines [ Str "Vincent Gros" ] + , MetaInlines [ Str "Markus Gylling" ] + ] + ) + , ( "description" + , MetaInlines + [ Str "Tests for Styling [UNDER CONSTRUCTION]" ] + ) + , ( "identifier" + , MetaInlines + [ Str "com.github.epub-testsuite.epub30-test-0101" ] + ) + , ( "language" , MetaInlines [ Str "en" ] ) + , ( "title" + , MetaInlines [ Str "EPUBTEST 0101 - Styling Tests" ] + ) + ] + } + [ Para [ Span ( "front.xhtml" , [] , [] ) [] ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 1 + ( "" , [] , [] ) + [ Str "EPUB" + , Space + , Str "3" + , Space + , Str "Styling" + , Space + , Str "Test" + , Space + , Str "Document:" + , Space + , Str "0101" + ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "Status" + , Space + , Str "of" + , Space + , Str "this" + , Space + , Str "Document" + ] + , Para + [ Str "This" + , Space + , Str "publication" + , Space + , Str "is" + , Space + , Str "currently" + , Space + , Str "considered" + , Space + , Span + ( "" , [ "status" ] , [] ) + [ Str "[UNDER" , Space , Str "DEVELOPMENT]" ] + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "IDPF." + ] + , Para + [ Str "This" + , Space + , Str "publication" + , Space + , Str "is" + , Space + , Str "part" + , Space + , Str "of" + , Space + , Str "version" + , Space + , Span ( "" , [ "version" ] , [] ) [ Str "X.X" ] + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "EPUB" + , Space + , Str "3.0" + , Space + , Str "Compliance" + , Space + , Str "Test" + , Space + , Str "Suite" + , Space + , Str "released" + , SoftBreak + , Str "on" + , Space + , RawInline (Format "html") "" + , Str "." + ] + , Para + [ Str "Before" + , Space + , Str "using" + , Space + , Str "this" + , Space + , Str "publication" + , Space + , Str "to" + , Space + , Str "evaluate" + , Space + , Str "reading" + , Space + , Str "systems," + , Space + , Str "testers" + , Space + , Str "are" + , Space + , Str "strongly" + , Space + , Str "encouraged" + , Space + , Str "to" + , SoftBreak + , Str "verify" + , Space + , Str "that" + , Space + , Str "they" + , Space + , Str "have" + , Space + , Str "the" + , Space + , Str "latest" + , Space + , Str "release" + , Space + , Str "by" + , Space + , Str "checking" + , Space + , Str "the" + , Space + , Str "current" + , Space + , Str "release" + , Space + , Str "version" + , Space + , Str "and" + , Space + , Str "date" + , Space + , Str "of" + , SoftBreak + , Str "the" + , Space + , Str "test" + , Space + , Str "suite" + , Space + , Str "at" + , Space + , Link + ( "" , [] , [] ) + [ Str "TBD" ] + ( "http://idpf.org/" , "" ) + ] + , Para + [ Str "This" + , Space + , Str "publication" + , Space + , Str "is" + , Space + , Str "one" + , Space + , Str "of" + , Space + , Str "several" + , Space + , Str "that" + , Space + , Str "currently" + , Space + , Str "comprise" + , Space + , Str "the" + , Space + , Str "EPUB" + , Space + , Str "3" + , Space + , Str "conformance" + , Space + , Str "test" + , Space + , Str "suite" + , SoftBreak + , Str "for" + , Space + , Str "reflowable" + , Space + , Str "content." + , Space + , Str "The" + , Space + , Str "complete" + , Space + , Str "test" + , Space + , Str "suite" + , Space + , Str "includes" + , Space + , Str "all" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "following" + , Space + , Str "publications:" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "." ] ] ] + ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "About" + , Space + , Str "this" + , Space + , Str "Document" + ] + , Para + [ Str "This" + , Space + , Str "document" + , Space + , Str "focuses" + , Space + , Str "on" + , Space + , Str "human-evaluated" + , Space + , Str "binary" + , Space + , Str "(pass/fail)" + , Space + , Str "tests" + , Space + , Str "in" + , Space + , Str "a" + , SoftBreak + , Str "reflowable" + , Space + , Str "context." + , Space + , Str "Tests" + , Space + , Str "for" + , Space + , Str "fixed-layout" + , Space + , Str "content" + , Space + , Str "and" + , Space + , Str "other" + , Space + , Str "individual" + , Space + , Str "tests" + , Space + , Str "that" + , SoftBreak + , Str "require" + , Space + , Str "a" + , Space + , Str "dedicated" + , Space + , Str "epub" + , Space + , Str "file" + , Space + , Str "are" + , Space + , Str "available" + , Space + , Str "in" + , Space + , Str "additional" + , Space + , Str "sibling" + , Space + , Str "documents;" + , Space + , Str "refer" + , Space + , Str "to" + , SoftBreak + , Str "the" + , Space + , Link + ( "" , [] , [] ) + [ Str "test" + , Space + , Str "suite" + , SoftBreak + , Str "wiki" + ] + ( "https://github.com/mgylling/epub-testsuite/wiki/Overview" + , "" + ) + , Space + , Str "(" + , Code + ( "" , [] , [] ) + "https://github.com/mgylling/epub-testsuite/wiki/Overview" + , Str ")" + , Space + , Str "for" + , Space + , Str "additional" + , SoftBreak + , Str "information." + ] + ] + , Div + ( "" , [ "section" ] , [] ) + [ Header 2 ( "" , [] , [] ) [ Str "Conventions" ] + , Para + [ Str "The" + , Space + , Str "following" + , Space + , Str "conventions" + , Space + , Str "are" + , Space + , Str "used" + , Space + , Str "throughout" + , Space + , Str "the" + , Space + , Str "document:" + ] + , DefinitionList + [ ( [ Str "1." + , Space + , Str "Locating" + , Space + , Str "a" + , Space + , Str "test" + ] + , [ [ Div + ( "" , [ "ctest" ] , [] ) + [ Para + [ Str "Tests" + , Space + , Str "for" + , Space + , Emph [ Str "required" ] + , Space + , Str "Reading" + , Space + , Str "System" + , Space + , Str "functionality" + , Space + , Str "are" + , SoftBreak + , Str "preceded" + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "label:" + , Space + , Span + ( "" + , [ "nature" ] + , [ ( "style" + , "display: inline; font-size: 100%" + ) + ] + ) + [ Str "[REQUIRED]" ] + ] + ] + , Div + ( "" , [ "otest" ] , [] ) + [ Para + [ Str "Tests" + , Space + , Str "for" + , Space + , Emph [ Str "optional" ] + , Space + , Str "Reading" + , Space + , Str "System" + , Space + , Str "functionality" + , Space + , Str "are" + , SoftBreak + , Str "preceded" + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "label:" + , Space + , Span + ( "" + , [ "nature" ] + , [ ( "style" + , "display: inline; font-size: 100%" + ) + ] + ) + [ Str "[OPTIONAL]" ] + ] + ] + ] + ] + ) + , ( [ Str "2." + , Space + , Str "Performing" + , Space + , Str "the" + , Space + , Str "test" + ] + , [ [ Plain + [ Str "Each" + , Space + , Str "test" + , Space + , Str "includes" + , Space + , Str "a" + , Space + , Str "description" + , Space + , Str "of" + , Space + , Str "its" + , Space + , Str "purpose" + , Space + , Str "followed" + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "actual" + , Space + , Strong + [ Str "test" + , Space + , Str "statement," + , SoftBreak + , Str "which" + , Space + , Str "can" + , Space + , Str "always" + , Space + , Str "be" + , Space + , Str "evaluated" + , Space + , Str "to" + , Space + , Str "true" + , Space + , Str "or" + , Space + , Str "false" + ] + , Str "." + , Space + , Str "These" + , Space + , Str "statements" + , Space + , Str "typically" + , Space + , Str "have" + , Space + , Str "the" + , Space + , Str "form:" + , SoftBreak + , Str "\"If" + , Space + , Str "[some" + , Space + , Str "condition]," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes\"." + ] + ] + ] + ) + , ( [ Str "3." + , Space + , Str "Scoring" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "results" + , Space + , Str "form" + ] + , [ [ Plain + [ Str "@@@TODO" + , Space + , Str "provide" + , Space + , Str "info" + , Space + , Str "on" + , Space + , Str "where" + , Space + , Str "to" + , Space + , Str "get" + , Space + , Str "the" + , Space + , Str "results" + , Space + , Str "form" + ] + ] + ] + ) + ] + ] + ] + , Para [ Span ( "styling-xhtml-001.xhtml" , [] , [] ) [] ] + , Div + ( "styling-xhtml-001.xhtml_epub-css" , [ "section" ] , [] ) + [ Header + 1 + ( "" , [] , [] ) + [ Str "EPUB" , Space , Str "Style" , Space , Str "Sheets" ] + , Para + [ Str "This" + , Space + , Str "section" + , Space + , Str "contains" + , Space + , Str "tests" + , Space + , Str "for" + , Space + , Str "styling" + , Space + , Str "and" + , Space + , Str "layout." + ] + ] + , Para [ Span ( "styling-xhtml-003.xhtml" , [] , [] ) [] ] + , Div + ( "styling-xhtml-003.xhtml_style-110" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-110" ] + , Space + , Str "Multi-Column" + , Space + , Str "Layouts" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Link + ( "" , [] , [] ) + [ Code ( "" , [] , [] ) "CSS Multi-Column Layout" ] + ( "http://idpf.org/epub/30/spec/epub30-contentdocs.html#sec-css-multi-column" + , "" + ) + , Space + , Str "properties" + , Space + , Str "are" + , Space + , Str "supported." + ] + , Div + ( "" , [ "multicol" ] , [] ) + [ Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "text" + , Space + , Str "is" + , Space + , Str "rendered" + , Space + , Str "in" + , Space + , Str "three" + , Space + , Str "columns," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Para [ Span ( "styling-xhtml-002.xhtml" , [] , [] ) [] ] + , Div + ( "styling-xhtml-002.xhtml_style-lists" + , [ "section" ] + , [] + ) + [ Header 2 ( "" , [] , [] ) [ Str "Lists" ] + , Div + ( "styling-xhtml-002.xhtml_style-list-style-type" + , [ "section" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Str "The" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + ] + , Div + ( "styling-xhtml-002.xhtml_style-009" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-009" ] + , Space + , Code ( "" , [] , [] ) "decimal" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "decimal" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "decimal" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-010" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-010" ] + , Space + , Code ( "" , [] , [] ) "circle" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "circle" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ul" + , Space + , Str "element." + ] + , BulletList + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "circle" + , Space + , Str "markers," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-011" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-011" ] + , Space + , Code ( "" , [] , [] ) "square" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "square" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ul" + , Space + , Str "element." + ] + , BulletList + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "square" + , Space + , Str "markers," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-012" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-012" ] + , Space + , Code ( "" , [] , [] ) "disc" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "disc" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ul" + , Space + , Str "element." + ] + , BulletList + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "disc" + , Space + , Str "markers," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-013" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-013" ] + , Space + , Code ( "" , [] , [] ) "lower-latin" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "lower-latin" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "lower-latin" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-014" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-014" ] + , Space + , Code ( "" , [] , [] ) "lower-roman" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "lower-roman" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "lower-roman" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-015" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-015" ] + , Space + , Code ( "" , [] , [] ) "upper-alpha" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "upper-alpha" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "upper-alpha" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-016" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-016" ] + , Space + , Code ( "" , [] , [] ) "hiragana" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "hiragana" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "hiragana" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-017" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-017" ] + , Space + , Code ( "" , [] , [] ) "hiragana-iroha" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "hiragana-iroha" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "hiragana-iroha" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-018" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-018" ] + , Space + , Code ( "" , [] , [] ) "katakana" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "katakana" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "katakana" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-019" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-019" ] + , Space + , Code ( "" , [] , [] ) "katakana-iroha" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "katakana-iroha" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "katakana-iroha" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-020" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-020" ] + , Space + , Code ( "" , [] , [] ) "upper-roman" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "upper-roman" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "upper-roman" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-021" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-021" ] + , Space + , Code ( "" , [] , [] ) "upper-latin" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "upper-latin" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "upper-latin" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-022" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-022" ] + , Space + , Code ( "" , [] , [] ) "lower-alpha" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "lower-alpha" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "lower-alpha" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-023" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-023" ] + , Space + , Code ( "" , [] , [] ) "lower-greek" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "lower-greek" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "lower-greek" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-024" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-024" ] + , Space + , Code ( "" , [] , [] ) "armenian" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "armenian" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "armenian" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-025" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-025" ] + , Space + , Code ( "" , [] , [] ) "cjk-ideographic" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "cjk-ideographic" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "cjk-ideographic" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-026" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-026" ] + , Space + , Code ( "" , [] , [] ) "decimal-leading-zero" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "decimal-leading-zero" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "decimal-leading-zero" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-027" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-027" ] + , Space + , Code ( "" , [] , [] ) "georgian" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "georgian" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "georgian" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-028" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-028" ] + , Space + , Code ( "" , [] , [] ) "hebrew" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "hebrew" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "hebrew" + , Space + , Str "markers" + , Space + , Str "in" + , Space + , Str "ascending" + , Space + , Str "order," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-029" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-029" ] + , Space + , Code ( "" , [] , [] ) "none" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "none" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "no" + , Space + , Str "markers," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-list-style" + , [ "section" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Str "The" + , Space + , Code ( "" , [] , [] ) "list-style" + , Space + , Str "property" + ] + , Div + ( "styling-xhtml-002.xhtml_style-030" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-030" ] + , Space + , Str "images" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style" + , Space + , Str "shorthand" + , Space + , Str "property" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "using" + , Space + , Str "a" + , Space + , Str "gif" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ul" + , Space + , Str "element." + ] + , BulletList + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "the" + , Space + , Str "purple" + , Space + , Str "and" + , Space + , Str "aqua" + , Space + , Str "square" + , Space + , Str "bullet" + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-list-style-position" + , [ "section" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Str "The" + , Space + , Code ( "" , [] , [] ) "list-style-position" + , Space + , Str "property" + ] + , Div + ( "styling-xhtml-002.xhtml_style-040" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-040" ] + , Space + , Str "The" + , Space + , Code ( "" , [] , [] ) "list-style-position" + , Space + , Str "property:" + , Space + , Code ( "" , [] , [] ) "inside" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-position" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "inside" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ul" + , Space + , Str "element." + ] + , BulletList + [ [ Plain + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + ] + ] + , [ Plain + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + ] + ] + , [ Plain + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + ] + ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "markers" + , Space + , Str "inside" + , Space + , Str "the" + , Space + , Str "indentation," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-041" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-041" ] + , Space + , Str "The" + , Space + , Code ( "" , [] , [] ) "list-style-position" + , Space + , Str "property:" + , Space + , Code ( "" , [] , [] ) "outside" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "list-style-position" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "outside" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ul" + , Space + , Str "element." + ] + , BulletList + [ [ Plain + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + ] + ] + , [ Plain + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + ] + ] + , [ Plain + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + ] + ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "has" + , Space + , Str "the" + , Space + , Str "default" + , Space + , Str "setting" + , Space + , Str "(marker" + , Space + , Str "outside" + , Space + , Str "the" + , Space + , Str "indentation)," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-list-start" + , [ "section" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Str "The" + , Space + , Str "HTML" + , Space + , Code ( "" , [] , [] ) "start" + , Space + , Str "attribute" + ] + , Div + ( "styling-xhtml-002.xhtml_style-050" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-050" ] + , Space + , Str "Without" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "set" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "start" + , Space + , Str "attribute" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element" + , Space + , Str "with" + , Space + , Str "no" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property." + ] + , OrderedList + ( 25 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "starts" + , Space + , Str "at" + , Space + , Str "25," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-002.xhtml_style-051" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 4 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-051" ] + , Space + , Str "With" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "set" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "start" + , Space + , Str "attribute" + , Space + , Str "is" + , Space + , Str "supported" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "ol" + , Space + , Str "element" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Code ( "" , [] , [] ) "list-style-type" + , Space + , Str "property." + ] + , OrderedList + ( 50 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Lorem" ] ] + , [ Plain [ Str "Ipsum" ] ] + , [ Plain [ Str "Dolor" ] ] + , [ Plain [ Str "Sit" ] ] + , [ Plain [ Str "Amet" ] ] + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "list" + , Space + , Str "starts" + , Space + , Str "at" + , Space + , Str "'L'" + , Space + , Str "(50)," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + ] + ] + , Para [ Span ( "styling-xhtml-004.xhtml" , [] , [] ) [] ] + , Div + ( "styling-xhtml-004.xhtml_style-media-rules" + , [ "section" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Code ( "" , [] , [] ) "@media" , Space , Str "Rules" ] + , Div + ( "styling-xhtml-004.xhtml_style-210" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-210" ] + , Space + , Code ( "" , [] , [] ) "all" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "all" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "styling-xhtml-004.xhtml_style-211" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-211" ] + , Space + , Code ( "" , [] , [] ) "screen" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "screen" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "styling-xhtml-004.xhtml_style-212" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-212" ] + , Space + , Code ( "" , [] , [] ) "handheld" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "handheld" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "styling-xhtml-004.xhtml_style-213" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-213" ] + , Space + , Code ( "" , [] , [] ) "tv" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "tv" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "styling-xhtml-004.xhtml_style-220" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-220" ] + , Space + , Code ( "" , [] , [] ) "orientation:landscape" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "orientation:landscape" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"" + , Space + , Str "when" + , Space + , Str "the" + , Space + , Str "device" + , Space + , Str "is" + , Space + , Str "held" + , Space + , Str "in" + , Space + , Str "landscape" + , Space + , Str "mode," + , Space + , Str "and" + , Space + , Str "the" + , Space + , Str "device" + , Space + , Str "supports" + , Space + , Str "multiple" + , Space + , Str "orientations," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "styling-xhtml-004.xhtml_style-221" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-221" ] + , Space + , Code ( "" , [] , [] ) "orientation:portrait" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "orientation:portrait" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"" + , Space + , Str "when" + , Space + , Str "the" + , Space + , Str "device" + , Space + , Str "is" + , Space + , Str "held" + , Space + , Str "in" + , Space + , Str "portrait" + , Space + , Str "mode," + , Space + , Str "and" + , Space + , Str "the" + , Space + , Str "device" + , Space + , Str "supports" + , Space + , Str "multiple" + , Space + , Str "orientations," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "styling-xhtml-004.xhtml_style-230" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-230" ] + , Space + , Code ( "" , [] , [] ) "min-width" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "min-width:200px" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "styling-xhtml-004.xhtml_style-231" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-231" ] + , Space + , Code ( "" , [] , [] ) "max-width" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "max-width:2000px" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "styling-xhtml-004.xhtml_style-240" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-240" ] + , Space + , Code ( "" , [] , [] ) "min-device-width" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "min-device-width:200px" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + , Div + ( "styling-xhtml-004.xhtml_style-241" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 3 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-241" ] + , Space + , Code ( "" , [] , [] ) "max-device-width" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "@media" + , Space + , Str "rule" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Code ( "" , [] , [] ) "max-device-width:2000px" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para [ Str "FAIL" ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "reads" + , Space + , Str "\"FAIL\"," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "fails." + ] + ] + ] + , Para [ Span ( "styling-xhtml-005.xhtml" , [] , [] ) [] ] + , Div + ( "styling-xhtml-005.xhtml_style-text-xform" + , [ "section" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "The" + , Space + , Code ( "" , [] , [] ) "text-transform" + , Space + , Str "property" + ] + , Div + ( "styling-xhtml-005.xhtml_style-310" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-310" ] + , Space + , Code ( "" , [] , [] ) "uppercase" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "text-transform" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Str "uppercase" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "is" + , Space + , Str "in" + , Space + , Str "upper" + , Space + , Str "case," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-005.xhtml_style-311" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-311" ] + , Space + , Code ( "" , [] , [] ) "capitalize" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "text-transform" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Str "capitalize" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "If" + , Space + , Str "each" + , Space + , Str "first" + , Space + , Str "letter" + , Space + , Str "of" + , Space + , Str "each" + , Space + , Str "word" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "is" + , Space + , Str "in" + , Space + , Str "upper" + , Space + , Str "case," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-005.xhtml_style-312" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-312" ] + , Space + , Code ( "" , [] , [] ) "lowercase" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "text-transform" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Str "lowercase" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Para + [ Str "Lorem" + , Space + , Str "ipsum" + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipisicing" + , Space + , Str "elit," + , Space + , Str "sed" + , Space + , Str "do" + , Space + , Str "eiusmod" + , Space + , Str "tempor" + , Space + , Str "incididunt" + , Space + , Str "ut" + , Space + , Str "labore" + , Space + , Str "et" + , Space + , Str "dolore" + , Space + , Str "magna" + , Space + , Str "aliqua." + , Space + , Str "Ut" + , Space + , Str "enim" + , Space + , Str "ad" + , Space + , Str "minim" + , Space + , Str "veniam," + , Space + , Str "quis" + , Space + , Str "nostrud" + , Space + , Str "exercitation" + , Space + , Str "ullamco" + , Space + , Str "laboris" + , Space + , Str "nisi" + , Space + , Str "ut" + , Space + , Str "aliquip" + , Space + , Str "ex" + , Space + , Str "ea" + , Space + , Str "commodo" + , Space + , Str "consequat." + , Space + , Str "Duis" + , Space + , Str "aute" + , Space + , Str "irure" + , Space + , Str "dolor" + , Space + , Str "in" + , Space + , Str "reprehenderit" + , Space + , Str "in" + , Space + , Str "voluptate" + , Space + , Str "velit" + , Space + , Str "esse" + , Space + , Str "cillum" + , Space + , Str "dolore" + , Space + , Str "eu" + , Space + , Str "fugiat" + , Space + , Str "nulla" + , Space + , Str "pariatur." + , Space + , Str "Excepteur" + , Space + , Str "sint" + , Space + , Str "occaecat" + , Space + , Str "cupidatat" + , Space + , Str "non" + , Space + , Str "proident," + , Space + , Str "sunt" + , Space + , Str "in" + , Space + , Str "culpa" + , Space + , Str "qui" + , Space + , Str "officia" + , Space + , Str "deserunt" + , Space + , Str "mollit" + , Space + , Str "anim" + , Space + , Str "id" + , Space + , Str "est" + , Space + , Str "laborum." + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "preceding" + , Space + , Str "paragraph" + , Space + , Str "is" + , Space + , Str "in" + , Space + , Str "lower" + , Space + , Str "case," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + ] + , Para [ Span ( "styling-xhtml-006.xhtml" , [] , [] ) [] ] + , Div + ( "styling-xhtml-006.xhtml_style-ruby" + , [ "section" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "The" + , Space + , Code ( "" , [] , [] ) "epub-ruby-position" + , Space + , Str "property" + ] + , Div + ( "styling-xhtml-006.xhtml_style-410" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-410" ] + , Space + , Code ( "" , [] , [] ) "over" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "-epub-ruby-position" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Str "over" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Plain + [ RawInline (Format "html") "" + , Strong [ Str "Lorem" , Space , Str "Ipsum" ] + , Space + , RawInline (Format "html") "" + , Str "(" + , RawInline (Format "html") "" + , RawInline (Format "html") "" + , Str "Lorem" + , Space + , Str "Ipsum" + , RawInline (Format "html") "" + , RawInline (Format "html") "" + , Str ")" + , RawInline (Format "html") "" + , RawInline (Format "html") "" + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "Ruby" + , Space + , Str "text" + , Space + , Str "is" + , Space + , Str "positioned" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Link + ( "" , [] , [] ) + [ Str "over" ] + ( "http://www.w3.org/TR/css3-writing-modes/#over" + , "" + ) + , Space + , Str "side" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "ruby" + , Space + , Str "base," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-006.xhtml_style-411" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-411" ] + , Space + , Code ( "" , [] , [] ) "under" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "-epub-ruby-position" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Str "under" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Plain + [ RawInline (Format "html") "" + , Strong [ Str "Lorem" , Space , Str "Ipsum" ] + , Space + , RawInline (Format "html") "" + , Str "(" + , RawInline (Format "html") "" + , RawInline (Format "html") "" + , Str "Lorem" + , Space + , Str "Ipsum" + , RawInline (Format "html") "" + , RawInline (Format "html") "" + , Str ")" + , RawInline (Format "html") "" + , RawInline (Format "html") "" + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "Ruby" + , Space + , Str "text" + , Space + , Str "is" + , Space + , Str "positioned" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Link + ( "" , [] , [] ) + [ Str "under" ] + ( "http://www.w3.org/TR/css3-writing-modes/#under" + , "" + ) + , Space + , Str "side" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "ruby" + , Space + , Str "base," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + , Div + ( "styling-xhtml-006.xhtml_style-412" + , [ "section" , "ctest" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Span ( "" , [ "nature" ] , [] ) [ Str "[REQUIRED]" ] + , Space + , Span ( "" , [ "test-id" ] , [] ) [ Str "style-412" ] + , Space + , Code ( "" , [] , [] ) "inter-character" + ] + , Para + [ Str "Tests" + , Space + , Str "whether" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "-epub-ruby-position" + , Space + , Str "property" + , Space + , Str "set" + , Space + , Str "to" + , Space + , Str "inter-caracter" + , Space + , Str "is" + , Space + , Str "supported." + ] + , Plain + [ RawInline + (Format "html") + "" + , Strong [ Str "Lorem" , Space , Str "Ipsum" ] + , Space + , RawInline (Format "html") "" + , Str "(" + , RawInline (Format "html") "" + , RawInline (Format "html") "" + , Str "Lorem" + , Space + , Str "Ipsum" + , RawInline (Format "html") "" + , RawInline (Format "html") "" + , Str ")" + , RawInline (Format "html") "" + , RawInline (Format "html") "" + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "Ruby" + , Space + , Str "text" + , Space + , Str "is" + , Space + , Str "positioned" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "right" + , Space + , Str "side" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "base" + , Space + , Str "text," + , Space + , Str "the" + , Space + , Str "test" + , Space + , Str "passes." + ] + ] + ] + ] diff --git a/test/epub/img.epub b/test/epub/img.epub Binary files a/test/epub/img.epub and b/test/epub/img.epub differ diff --git a/test/epub/img_no_cover.epub b/test/epub/img_no_cover.epub new file mode 100644 Binary files /dev/null and b/test/epub/img_no_cover.epub differ diff --git a/test/epub/wasteland.epub b/test/epub/wasteland.epub Binary files a/test/epub/wasteland.epub and b/test/epub/wasteland.epub differ diff --git a/test/epub/wasteland.native b/test/epub/wasteland.native --- a/test/epub/wasteland.native +++ b/test/epub/wasteland.native @@ -1,941 +1,4602 @@ -[Para [Image ("",[],[]) [] ("wasteland-cover.jpg","")] -,Para [Span ("wasteland-content.xhtml",[],[]) []] -,Div ("wasteland-content.xhtml#frontmatter",["section"],[("type","frontmatter")]) - [] -,Div ("wasteland-content.xhtml#bodymatter",["section"],[("type","bodymatter")]) - [Div ("wasteland-content.xhtml#ch1",["section"],[]) - [Header 2 ("",[],[]) [Str "I.",Space,Str "THE",Space,Str "BURIAL",Space,Str "OF",Space,Str "THE",Space,Str "DEAD"] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "April",Space,Str "is",Space,Str "the",Space,Str "cruellest",Space,Str "month,",Space,Str "breeding"]] - ,Div ("",[],[]) - [Plain [Str "Lilacs",Space,Str "out",Space,Str "of",Space,Str "the",Space,Str "dead",Space,Str "land,",Space,Str "mixing"]] - ,Div ("",[],[]) - [Plain [Str "Memory",Space,Str "and",Space,Str "desire,",Space,Str "stirring"]] - ,Div ("",[],[]) - [Plain [Str "Dull",Space,Str "roots",Space,Str "with",Space,Str "spring",Space,Str "rain."]] - ,Div ("",[],[]) - [Plain [Str "Winter",Space,Str "kept",Space,Str "us",Space,Str "warm,",Space,Str "covering"]] - ,Div ("",[],[]) - [Plain [Str "Earth",Space,Str "in",Space,Str "forgetful",Space,Str "snow,",Space,Str "feeding"]] - ,Div ("",[],[]) - [Plain [Str "A",Space,Str "little",Space,Str "life",Space,Str "with",Space,Str "dried",Space,Str "tubers."]] - ,Div ("",[],[]) - [Plain [Str "Summer",Space,Str "surprised",Space,Str "us,",Space,Str "coming",Space,Str "over",Space,Str "the",Space,Str "Starnbergersee"]] - ,Div ("",[],[]) - [Plain [Str "With",Space,Str "a",Space,Str "shower",Space,Str "of",Space,Str "rain;",Space,Str "we",Space,Str "stopped",Space,Str "in",Space,Str "the",Space,Str "colonnade,"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "went",Space,Str "on",Space,Str "in",Space,Str "sunlight,",Space,Str "into",Space,Str "the",Space,Str "Hofgarten,",Span ("",["lnum"],[]) [Str "10"]]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "drank",Space,Str "coffee,",Space,Str "and",Space,Str "talked",Space,Str "for",Space,Str "an",Space,Str "hour."]] - ,Div ("",[],[("lang","de")]) - [Plain [Str "Bin",Space,Str "gar",Space,Str "keine",Space,Str "Russin,",Space,Str "stamm'",Space,Str "aus",Space,Str "Litauen,",Space,Str "echt",SoftBreak,Str "deutsch."]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "when",Space,Str "we",Space,Str "were",Space,Str "children,",Space,Str "staying",Space,Str "at",Space,Str "the",Space,Str "archduke's,"]] - ,Div ("",[],[]) - [Plain [Str "My",Space,Str "cousin's,",Space,Str "he",Space,Str "took",Space,Str "me",Space,Str "out",Space,Str "on",Space,Str "a",Space,Str "sled,"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "I",Space,Str "was",Space,Str "frightened.",Space,Str "He",Space,Str "said,",Space,Str "Marie,"]] - ,Div ("",[],[]) - [Plain [Str "Marie,",Space,Str "hold",Space,Str "on",Space,Str "tight.",Space,Str "And",Space,Str "down",Space,Str "we",Space,Str "went."]] - ,Div ("",[],[]) - [Plain [Str "In",Space,Str "the",Space,Str "mountains,",Space,Str "there",Space,Str "you",Space,Str "feel",Space,Str "free."]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "read,",Space,Str "much",Space,Str "of",Space,Str "the",Space,Str "night,",Space,Str "and",Space,Str "go",Space,Str "south",Space,Str "in",Space,Str "the",Space,Str "winter."]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "What",Space,Str "are",Space,Str "the",Space,Str "roots",Space,Str "that",Space,Str "clutch,",Space,Str "what",Space,Str "branches",Space,Str "grow"]] - ,Div ("wasteland-content.xhtml#ln20",[],[]) - [Plain [Str "Out",Space,Str "of",Space,Str "this",Space,Str "stony",Space,Str "rubbish?",Space,Str "Son",Space,Str "of",Space,Str "man,",Note [Para [Link ("",[],[]) [Str "Line",Space,Str "20."] ("#wasteland-content.xhtml#ln20",""),Space,Str "Cf.",Space,Str "Ezekiel",Space,Str "2:1."]]] - ,Div ("",[],[]) - [Plain [Str "You",Space,Str "cannot",Space,Str "say,",Space,Str "or",Space,Str "guess,",Space,Str "for",Space,Str "you",Space,Str "know",Space,Str "only"]] - ,Div ("",[],[]) - [Plain [Str "A",Space,Str "heap",Space,Str "of",Space,Str "broken",Space,Str "images,",Space,Str "where",Space,Str "the",Space,Str "sun",Space,Str "beats,"]] - ,Div ("wasteland-content.xhtml#ln23",[],[]) - [Plain [Str "And",Space,Str "the",Space,Str "dead",Space,Str "tree",Space,Str "gives",Space,Str "no",Space,Str "shelter,",Space,Str "the",Space,Str "cricket",Space,Str "no",Space,Str "relief,",Note [Para [Link ("",[],[]) [Str "23."] ("#wasteland-content.xhtml#ln23",""),Space,Str "Cf.",Space,Str "Ecclesiastes",Space,Str "12:5."]]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "the",Space,Str "dry",Space,Str "stone",Space,Str "no",Space,Str "sound",Space,Str "of",Space,Str "water.",Space,Str "Only"]] - ,Div ("",[],[]) - [Plain [Str "There",Space,Str "is",Space,Str "shadow",Space,Str "under",Space,Str "this",Space,Str "red",Space,Str "rock,"]] - ,Div ("",[],[]) - [Plain [Str "(Come",Space,Str "in",Space,Str "under",Space,Str "the",Space,Str "shadow",Space,Str "of",Space,Str "this",Space,Str "red",Space,Str "rock),"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "I",Space,Str "will",Space,Str "show",Space,Str "you",Space,Str "something",Space,Str "different",Space,Str "from",Space,Str "either"]] - ,Div ("",[],[]) - [Plain [Str "Your",Space,Str "shadow",Space,Str "at",Space,Str "morning",Space,Str "striding",Space,Str "behind",Space,Str "you"]] - ,Div ("",[],[]) - [Plain [Str "Or",Space,Str "your",Space,Str "shadow",Space,Str "at",Space,Str "evening",Space,Str "rising",Space,Str "to",Space,Str "meet",Space,Str "you;"]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "will",Space,Str "show",Space,Str "you",Space,Str "fear",Space,Str "in",Space,Str "a",Space,Str "handful",Space,Str "of",Space,Str "dust.",Span ("",["lnum"],[]) [Str "30"]]] - ,BlockQuote - [Div ("",[],[]) - [Div ("wasteland-content.xhtml#ln31",[],[]) - [Plain [Str "Frisch",Space,Str "weht",Space,Str "der",Space,Str "Wind",Note [Para [Link ("",[],[]) [Str "31."] ("#wasteland-content.xhtml#ln31",""),Space,Str "V.",Space,Str "Tristan",Space,Str "und",Space,Str "Isolde,",Space,Str "i,",Space,Str "verses",Space,Str "5-8."]]] - ,Div ("",[],[]) - [Plain [Str "Der",Space,Str "Heimat",Space,Str "zu"]] - ,Div ("",[],[]) - [Plain [Str "Mein",Space,Str "Irisch",Space,Str "Kind,"]] - ,Div ("",[],[]) - [Plain [Str "Wo",Space,Str "weilest",Space,Str "du?"]]] - ,RawBlock (Format "html") "" - ,Div ("",[],[]) - [Plain [Str "\"You",Space,Str "gave",Space,Str "me",Space,Str "hyacinths",Space,Str "first",Space,Str "a",Space,Str "year",Space,Str "ago;"]] - ,Div ("",[],[]) - [Plain [Str "\"They",Space,Str "called",Space,Str "me",Space,Str "the",Space,Str "hyacinth",Space,Str "girl.\""]] - ,Div ("",[],[]) - [Plain [Str "\8213Yet",Space,Str "when",Space,Str "we",Space,Str "came",Space,Str "back,",Space,Str "late,",Space,Str "from",Space,Str "the",Space,Str "Hyacinth",SoftBreak,Str "garden,"]] - ,Div ("",[],[]) - [Plain [Str "Your",Space,Str "arms",Space,Str "full,",Space,Str "and",Space,Str "your",Space,Str "hair",Space,Str "wet,",Space,Str "I",Space,Str "could",Space,Str "not"]] - ,Div ("",[],[]) - [Plain [Str "Speak,",Space,Str "and",Space,Str "my",Space,Str "eyes",Space,Str "failed,",Space,Str "I",Space,Str "was",Space,Str "neither"]] - ,Div ("",[],[]) - [Plain [Str "Living",Space,Str "nor",Space,Str "dead,",Space,Str "and",Space,Str "I",Space,Str "knew",Space,Str "nothing,",Span ("",["lnum"],[]) [Str "40"]]] - ,Div ("",[],[]) - [Plain [Str "Looking",Space,Str "into",Space,Str "the",Space,Str "heart",Space,Str "of",Space,Str "light,",Space,Str "the",Space,Str "silence."]] - ,Div ("wasteland-content.xhtml#ln42",[],[("lang","de")]) - [Plain [Emph [Str "Od'",Space,Str "und",Space,Str "leer",Space,Str "das",Space,Str "Meer"],Str ".",Note [Para [Link ("",[],[]) [Str "42."] ("#wasteland-content.xhtml#ln42",""),Space,Str "Id.",Space,Str "iii,",Space,Str "verse",Space,Str "24."]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "Madame",Space,Str "Sosostris,",Space,Str "famous",Space,Str "clairvoyante,"]] - ,Div ("",[],[]) - [Plain [Str "Had",Space,Str "a",Space,Str "bad",Space,Str "cold,",Space,Str "nevertheless"]] - ,Div ("",[],[]) - [Plain [Str "Is",Space,Str "known",Space,Str "to",Space,Str "be",Space,Str "the",Space,Str "wisest",Space,Str "woman",Space,Str "in",Space,Str "Europe,"]] - ,Div ("wasteland-content.xhtml#ln46",[],[]) - [Plain [Str "With",Space,Str "a",Space,Str "wicked",Space,Str "pack",Space,Str "of",Space,Str "cards.",Space,Str "Here,",Space,Str "said",Space,Str "she,",Note [Para [Link ("",[],[]) [Str "46."] ("#wasteland-content.xhtml#ln46",""),Space,Str "I",Space,Str "am",Space,Str "not",Space,Str "familiar",Space,Str "with",Space,Str "the",Space,Str "exact",Space,Str "constitution",Space,Str "of",Space,Str "the",Space,Str "Tarot",Space,Str "pack",Space,Str "of",SoftBreak,Str "cards,",Space,Str "from",Space,Str "which",Space,Str "I",Space,Str "have",Space,Str "obviously",Space,Str "departed",Space,Str "to",Space,Str "suit",Space,Str "my",Space,Str "own",Space,Str "convenience.",SoftBreak,Str "The",Space,Str "Hanged",Space,Str "Man,",Space,Str "a",Space,Str "member",Space,Str "of",Space,Str "the",Space,Str "traditional",Space,Str "pack,",Space,Str "fits",Space,Str "my",Space,Str "purpose",Space,Str "in",Space,Str "two",SoftBreak,Str "ways:",Space,Str "because",Space,Str "he",Space,Str "is",Space,Str "associated",Space,Str "in",Space,Str "my",Space,Str "mind",Space,Str "with",Space,Str "the",Space,Str "Hanged",Space,Str "God",Space,Str "of",Space,Str "Frazer,",SoftBreak,Str "and",Space,Str "because",Space,Str "I",Space,Str "associate",Space,Str "him",Space,Str "with",Space,Str "the",Space,Str "hooded",Space,Str "figure",Space,Str "in",Space,Str "the",Space,Str "passage",Space,Str "of",Space,Str "the",SoftBreak,Str "disciples",Space,Str "to",Space,Str "Emmaus",Space,Str "in",Space,Str "Part",Space,Str "V.",Space,Str "The",Space,Str "Phoenician",Space,Str "Sailor",Space,Str "and",Space,Str "the",Space,Str "Merchant",SoftBreak,Str "appear",Space,Str "later;",Space,Str "also",Space,Str "the",Space,Str "\"crowds",Space,Str "of",Space,Str "people,\"",Space,Str "and",Space,Str "Death",Space,Str "by",Space,Str "Water",Space,Str "is",SoftBreak,Str "executed",Space,Str "in",Space,Str "Part",Space,Str "IV.",Space,Str "The",Space,Str "Man",Space,Str "with",Space,Str "Three",Space,Str "Staves",Space,Str "(an",Space,Str "authentic",Space,Str "member",Space,Str "of",SoftBreak,Str "the",Space,Str "Tarot",Space,Str "pack)",Space,Str "I",Space,Str "associate,",Space,Str "quite",Space,Str "arbitrarily,",Space,Str "with",Space,Str "the",Space,Str "Fisher",Space,Str "King",SoftBreak,Str "himself."]]] - ,Div ("",[],[]) - [Plain [Str "Is",Space,Str "your",Space,Str "card,",Space,Str "the",Space,Str "drowned",Space,Str "Phoenician",Space,Str "Sailor,"]] - ,Div ("",[],[]) - [Plain [Str "(Those",Space,Str "are",Space,Str "pearls",Space,Str "that",Space,Str "were",Space,Str "his",Space,Str "eyes.",Space,Str "Look!)"]] - ,Div ("",[],[]) - [Plain [Str "Here",Space,Str "is",Space,Str "Belladonna,",Space,Str "the",Space,Str "Lady",Space,Str "of",Space,Str "the",Space,Str "Rocks,"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "lady",Space,Str "of",Space,Str "situations.",Span ("",["lnum"],[]) [Str "50"]]] - ,Div ("",[],[]) - [Plain [Str "Here",Space,Str "is",Space,Str "the",Space,Str "man",Space,Str "with",Space,Str "three",Space,Str "staves,",Space,Str "and",Space,Str "here",Space,Str "the",Space,Str "Wheel,"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "here",Space,Str "is",Space,Str "the",Space,Str "one-eyed",Space,Str "merchant,",Space,Str "and",Space,Str "this",Space,Str "card,"]] - ,Div ("",[],[]) - [Plain [Str "Which",Space,Str "is",Space,Str "blank,",Space,Str "is",Space,Str "something",Space,Str "he",Space,Str "carries",Space,Str "on",Space,Str "his",Space,Str "back,"]] - ,Div ("",[],[]) - [Plain [Str "Which",Space,Str "I",Space,Str "am",Space,Str "forbidden",Space,Str "to",Space,Str "see.",Space,Str "I",Space,Str "do",Space,Str "not",Space,Str "find"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "Hanged",Space,Str "Man.",Space,Str "Fear",Space,Str "death",Space,Str "by",Space,Str "water."]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "see",Space,Str "crowds",Space,Str "of",Space,Str "people,",Space,Str "walking",Space,Str "round",Space,Str "in",Space,Str "a",Space,Str "ring."]] - ,Div ("",[],[]) - [Plain [Str "Thank",Space,Str "you.",Space,Str "If",Space,Str "you",Space,Str "see",Space,Str "dear",Space,Str "Mrs.",Space,Str "Equitone,"]] - ,Div ("",[],[]) - [Plain [Str "Tell",Space,Str "her",Space,Str "I",Space,Str "bring",Space,Str "the",Space,Str "horoscope",Space,Str "myself:"]] - ,Div ("",[],[]) - [Plain [Str "One",Space,Str "must",Space,Str "be",Space,Str "so",Space,Str "careful",Space,Str "these",Space,Str "days."]]] - ,Div ("",["linegroup"],[]) - [Div ("wasteland-content.xhtml#ln60",[],[]) - [Plain [Str "Unreal",Space,Str "City,",Note [Para [Link ("",[],[]) [Str "60."] ("#wasteland-content.xhtml#ln60",""),Space,Str "Cf.",Space,Str "Baudelaire:"],BlockQuote [Para [Str "\"Fourmillante",Space,Str "cite;,",Space,Str "cite;",Space,Str "pleine",Space,Str "de",Space,Str "reves,",LineBreak,Str "Ou",Space,Str "le",Space,Str "spectre",Space,Str "en",SoftBreak,Str "plein",Space,Str "jour",Space,Str "raccroche",Space,Str "le",Space,Str "passant.\""]]]] - ,Div ("",[],[]) - [Plain [Str "Under",Space,Str "the",Space,Str "brown",Space,Str "fog",Space,Str "of",Space,Str "a",Space,Str "winter",Space,Str "dawn,"]] - ,Div ("",[],[]) - [Plain [Str "A",Space,Str "crowd",Space,Str "flowed",Space,Str "over",Space,Str "London",Space,Str "Bridge,",Space,Str "so",Space,Str "many,"]] - ,Div ("wasteland-content.xhtml#ln63",[],[]) - [Plain [Str "I",Space,Str "had",Space,Str "not",Space,Str "thought",Space,Str "death",Space,Str "had",Space,Str "undone",Space,Str "so",Space,Str "many.",Note [Para [Link ("",[],[]) [Str "63."] ("#wasteland-content.xhtml#ln63",""),Space,Str "Cf.",Space,Str "Inferno,",Space,Str "iii.",Space,Str "55-7."],BlockQuote [Para [Str "\"si",Space,Str "lunga",Space,Str "tratta",LineBreak,Str "di",Space,Str "gente,",Space,Str "ch'io",Space,Str "non",Space,Str "avrei",Space,Str "mai",Space,Str "creduto",LineBreak,Str "che",SoftBreak,Str "morte",Space,Str "tanta",Space,Str "n'avesse",Space,Str "disfatta.\""]]]] - ,Div ("wasteland-content.xhtml#ln64",[],[]) - [Plain [Str "Sighs,",Space,Str "short",Space,Str "and",Space,Str "infrequent,",Space,Str "were",Space,Str "exhaled,",Note [Para [Link ("",[],[]) [Str "64."] ("#wasteland-content.xhtml#ln64",""),Space,Str "Cf.",Space,Str "Inferno,",Space,Str "iv.",Space,Str "25-7:"],BlockQuote [Para [Str "\"Quivi,",Space,Str "secondo",Space,Str "che",Space,Str "per",Space,Str "ascoltahre,",LineBreak,Str "\"non",Space,Str "avea",Space,Str "pianto,",Space,Str "ma'",Space,Str "che",Space,Str "di",SoftBreak,Str "sospiri,",LineBreak,Str "\"che",Space,Str "l'aura",Space,Str "eterna",Space,Str "facevan",Space,Str "tremare.\""]]]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "each",Space,Str "man",Space,Str "fixed",Space,Str "his",Space,Str "eyes",Space,Str "before",Space,Str "his",Space,Str "feet."]] - ,Div ("",[],[]) - [Plain [Str "Flowed",Space,Str "up",Space,Str "the",Space,Str "hill",Space,Str "and",Space,Str "down",Space,Str "King",Space,Str "William",Space,Str "Street,"]] - ,Div ("",[],[]) - [Plain [Str "To",Space,Str "where",Space,Str "Saint",Space,Str "Mary",Space,Str "Woolnoth",Space,Str "kept",Space,Str "the",Space,Str "hours"]] - ,Div ("wasteland-content.xhtml#ln68",[],[]) - [Plain [Str "With",Space,Str "a",Space,Str "dead",Space,Str "sound",Space,Str "on",Space,Str "the",Space,Str "final",Space,Str "stroke",Space,Str "of",Space,Str "nine.",Note [Para [Link ("",[],[]) [Str "68."] ("#wasteland-content.xhtml#ln68",""),Space,Str "A",Space,Str "phenomenon",Space,Str "which",Space,Str "I",Space,Str "have",Space,Str "often",Space,Str "noticed."]]] - ,Div ("",[],[]) - [Plain [Str "There",Space,Str "I",Space,Str "saw",Space,Str "one",Space,Str "I",Space,Str "knew,",Space,Str "and",Space,Str "stopped",Space,Str "him,",Space,Str "crying",SoftBreak,Str "\"Stetson!"]] - ,Div ("",[],[]) - [Plain [Str "\"You",Space,Str "who",Space,Str "were",Space,Str "with",Space,Str "me",Space,Str "in",Space,Str "the",Space,Str "ships",Space,Str "at",Space,Str "Mylae!",Span ("",["lnum"],[]) [Str "70"]]] - ,Div ("",[],[]) - [Plain [Str "\"That",Space,Str "corpse",Space,Str "you",Space,Str "planted",Space,Str "last",Space,Str "year",Space,Str "in",Space,Str "your",Space,Str "garden,"]] - ,Div ("",[],[]) - [Plain [Str "\"Has",Space,Str "it",Space,Str "begun",Space,Str "to",Space,Str "sprout?",Space,Str "Will",Space,Str "it",Space,Str "bloom",Space,Str "this",Space,Str "year?"]] - ,Div ("",[],[]) - [Plain [Str "\"Or",Space,Str "has",Space,Str "the",Space,Str "sudden",Space,Str "frost",Space,Str "disturbed",Space,Str "its",Space,Str "bed?"]]] - ,Div ("",["linegroup"],[]) - [Div ("wasteland-content.xhtml#ln74",[],[]) - [Plain [Str "\"Oh",Space,Str "keep",Space,Str "the",Space,Str "Dog",Space,Str "far",Space,Str "hence,",Space,Str "that's",Space,Str "friend",Space,Str "to",Space,Str "men,",Note [Para [Link ("",[],[]) [Str "74."] ("#wasteland-content.xhtml#ln74",""),Space,Str "Cf.",Space,Str "the",Space,Str "Dirge",Space,Str "in",Space,Str "Webster's",Space,Str "White",Space,Str "Devil",Space,Str "."]]] - ,Div ("",[],[]) - [Plain [Str "\"Or",Space,Str "with",Space,Str "his",Space,Str "nails",Space,Str "he'll",Space,Str "dig",Space,Str "it",Space,Str "up",Space,Str "again!"]] - ,Div ("wasteland-content.xhtml#ln76",[],[]) - [Plain [Str "\"You!",Space,Span ("",[],[("lang","fr")]) [Str "hypocrite",Space,Str "lecteur!",Space,Str "-",Space,Str "mon",Space,Str "semblable,",Space,Str "-",SoftBreak,Str "mon",Space,Str "frere"],Space,Str "!\"",Note [Para [Link ("",[],[]) [Str "76."] ("#wasteland-content.xhtml#ln76",""),Space,Str "V.",Space,Str "Baudelaire,",Space,Str "Preface",Space,Str "to",Space,Str "Fleurs",Space,Str "du",Space,Str "Mal."]]] - ,Div ("wasteland-content.xhtml#ch2",["section"],[]) - [Header 2 ("",[],[]) [Str "II.",Space,Str "A",Space,Str "GAME",Space,Str "OF",Space,Str "CHESS"] - ,Div ("",["linegroup"],[]) - [Div ("wasteland-content.xhtml#ln77",[],[]) - [Plain [Str "The",Space,Str "Chair",Space,Str "she",Space,Str "sat",Space,Str "in,",Space,Str "like",Space,Str "a",Space,Str "burnished",Space,Str "throne,",Note [Para [Link ("",[],[]) [Str "77."] ("#wasteland-content.xhtml#ln77",""),Space,Str "Cf.",Space,Str "Antony",Space,Str "and",Space,Str "Cleopatra,",Space,Str "II.",Space,Str "ii.,",Space,Str "l.",Space,Str "190."]]] - ,Div ("",[],[]) - [Plain [Str "Glowed",Space,Str "on",Space,Str "the",Space,Str "marble,",Space,Str "where",Space,Str "the",Space,Str "glass"]] - ,Div ("",[],[]) - [Plain [Str "Held",Space,Str "up",Space,Str "by",Space,Str "standards",Space,Str "wrought",Space,Str "with",Space,Str "fruited",Space,Str "vines"]] - ,Div ("",[],[]) - [Plain [Str "From",Space,Str "which",Space,Str "a",Space,Str "golden",Space,Str "Cupidon",Space,Str "peeped",Space,Str "out",Span ("",["lnum"],[]) [Str "80"]]] - ,Div ("",[],[]) - [Plain [Str "(Another",Space,Str "hid",Space,Str "his",Space,Str "eyes",Space,Str "behind",Space,Str "his",Space,Str "wing)"]] - ,Div ("",[],[]) - [Plain [Str "Doubled",Space,Str "the",Space,Str "flames",Space,Str "of",Space,Str "sevenbranched",Space,Str "candelabra"]] - ,Div ("",[],[]) - [Plain [Str "Reflecting",Space,Str "light",Space,Str "upon",Space,Str "the",Space,Str "table",Space,Str "as"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "glitter",Space,Str "of",Space,Str "her",Space,Str "jewels",Space,Str "rose",Space,Str "to",Space,Str "meet",Space,Str "it,"]] - ,Div ("",[],[]) - [Plain [Str "From",Space,Str "satin",Space,Str "cases",Space,Str "poured",Space,Str "in",Space,Str "rich",Space,Str "profusion;"]] - ,Div ("",[],[]) - [Plain [Str "In",Space,Str "vials",Space,Str "of",Space,Str "ivory",Space,Str "and",Space,Str "coloured",Space,Str "glass"]] - ,Div ("",[],[]) - [Plain [Str "Unstoppered,",Space,Str "lurked",Space,Str "her",Space,Str "strange",Space,Str "synthetic",Space,Str "perfumes,"]] - ,Div ("",[],[]) - [Plain [Str "Unguent,",Space,Str "powdered,",Space,Str "or",Space,Str "liquid",Space,Str "-",Space,Str "troubled,",Space,Str "confused"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "drowned",Space,Str "the",Space,Str "sense",Space,Str "in",Space,Str "odours;",Space,Str "stirred",Space,Str "by",Space,Str "the",Space,Str "air"]] - ,Div ("",[],[]) - [Plain [Str "That",Space,Str "freshened",Space,Str "from",Space,Str "the",Space,Str "window,",Space,Str "these",Space,Str "ascended",Span ("",["lnum"],[]) [Str "90"]]] - ,Div ("",[],[]) - [Plain [Str "In",Space,Str "fattening",Space,Str "the",Space,Str "prolonged",Space,Str "candle-flames,"]] - ,Div ("wasteland-content.xhtml#ln92",[],[]) - [Plain [Str "Flung",Space,Str "their",Space,Str "smoke",Space,Str "into",Space,Str "the",Space,Str "laquearia,",Note [Para [Link ("",[],[]) [Str "92."] ("#wasteland-content.xhtml#ln92",""),Space,Str "Laquearia.",Space,Str "V.",Space,Str "Aeneid,",Space,Str "I.",Space,Str "726:"],BlockQuote [Para [Str "dependent",Space,Str "lychni",Space,Str "laquearibus",Space,Str "aureis",Space,Str "incensi,",Space,Str "et",Space,Str "noctem",SoftBreak,Str "flammis",LineBreak,Str "funalia",Space,Str "vincunt."]]]] - ,Div ("",[],[]) - [Plain [Str "Stirring",Space,Str "the",Space,Str "pattern",Space,Str "on",Space,Str "the",Space,Str "coffered",Space,Str "ceiling."]] - ,Div ("",[],[]) - [Plain [Str "Huge",Space,Str "sea-wood",Space,Str "fed",Space,Str "with",Space,Str "copper"]] - ,Div ("",[],[]) - [Plain [Str "Burned",Space,Str "green",Space,Str "and",Space,Str "orange,",Space,Str "framed",Space,Str "by",Space,Str "the",Space,Str "coloured",Space,Str "stone,"]] - ,Div ("",[],[]) - [Plain [Str "In",Space,Str "which",Space,Str "sad",Space,Str "light",Space,Str "a",Space,Str "carved",Space,Str "dolphin",Space,Str "swam."]] - ,Div ("",[],[]) - [Plain [Str "Above",Space,Str "the",Space,Str "antique",Space,Str "mantel",Space,Str "was",Space,Str "displayed"]] - ,Div ("wasteland-content.xhtml#ln98",[],[]) - [Plain [Str "As",Space,Str "though",Space,Str "a",Space,Str "window",Space,Str "gave",Space,Str "upon",Space,Str "the",Space,Str "sylvan",Space,Str "scene",Note [Para [Link ("",[],[]) [Str "98."] ("#wasteland-content.xhtml#ln98",""),Space,Str "Sylvan",Space,Str "scene.",Space,Str "V.",Space,Str "Milton,",Space,Str "Paradise",Space,Str "Lost,",Space,Str "iv.",Space,Str "140."]]] - ,Div ("wasteland-content.xhtml#ln99",[],[]) - [Plain [Str "The",Space,Str "change",Space,Str "of",Space,Str "Philomel,",Space,Str "by",Space,Str "the",Space,Str "barbarous",Space,Str "king",Note [Para [Link ("",[],[]) [Str "99."] ("#wasteland-content.xhtml#ln99",""),Space,Str "V.",Space,Str "Ovid,",Space,Str "Metamorphoses,",Space,Str "vi,",Space,Str "Philomela."]]] - ,Div ("wasteland-content.xhtml#ln100",[],[]) - [Plain [Str "So",Space,Str "rudely",Space,Str "forced;",Space,Str "yet",Space,Str "there",Space,Str "the",Space,Str "nightingale",Note [Para [Link ("",[],[]) [Str "100."] ("#wasteland-content.xhtml#ln100",""),Space,Str "Cf.",Space,Str "Part",Space,Str "III,",Space,Str "l.",Space,Str "204."]]] - ,Div ("",[],[]) - [Plain [Str "Filled",Space,Str "all",Space,Str "the",Space,Str "desert",Space,Str "with",Space,Str "inviolable",Space,Str "voice"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "still",Space,Str "she",Space,Str "cried,",Space,Str "and",Space,Str "still",Space,Str "the",Space,Str "world",Space,Str "pursues,"]] - ,Div ("",[],[]) - [Plain [Str "\"Jug",Space,Str "Jug\"",Space,Str "to",Space,Str "dirty",Space,Str "ears."]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "other",Space,Str "withered",Space,Str "stumps",Space,Str "of",Space,Str "time"]] - ,Div ("",[],[]) - [Plain [Str "Were",Space,Str "told",Space,Str "upon",Space,Str "the",Space,Str "walls;",Space,Str "staring",Space,Str "forms"]] - ,Div ("",[],[]) - [Plain [Str "Leaned",Space,Str "out,",Space,Str "leaning,",Space,Str "hushing",Space,Str "the",Space,Str "room",Space,Str "enclosed."]] - ,Div ("",[],[]) - [Plain [Str "Footsteps",Space,Str "shuffled",Space,Str "on",Space,Str "the",Space,Str "stair."]] - ,Div ("",[],[]) - [Plain [Str "Under",Space,Str "the",Space,Str "firelight,",Space,Str "under",Space,Str "the",Space,Str "brush,",Space,Str "her",Space,Str "hair"]] - ,Div ("",[],[]) - [Plain [Str "Spread",Space,Str "out",Space,Str "in",Space,Str "fiery",Space,Str "points"]] - ,Div ("",[],[]) - [Plain [Str "Glowed",Space,Str "into",Space,Str "words,",Space,Str "then",Space,Str "would",Space,Str "be",Space,Str "savagely",Space,Str "still.",Span ("",["lnum"],[]) [Str "110"]]]] - ,Div ("",["linegroup"],[]) - [Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "\"My",Space,Str "nerves",Space,Str "are",Space,Str "bad",Space,Str "to-night.",Space,Str "Yes,",Space,Str "bad.",Space,Str "Stay",Space,Str "with",Space,Str "me."]] - ,Div ("",[],[]) - [Plain [Str "\"Speak",Space,Str "to",Space,Str "me.",Space,Str "Why",Space,Str "do",Space,Str "you",Space,Str "never",Space,Str "speak.",Space,Str "Speak."]] - ,Div ("",[],[]) - [Plain [Str "\"What",Space,Str "are",Space,Str "you",Space,Str "thinking",Space,Str "of?",Space,Str "What",Space,Str "thinking?",Space,Str "What?"]] - ,Div ("",[],[]) - [Plain [Str "\"I",Space,Str "never",Space,Str "know",Space,Str "what",Space,Str "you",Space,Str "are",Space,Str "thinking.",Space,Str "Think.\""]]] - ,Div ("",["linegroup"],[]) - [Div ("wasteland-content.xhtml#ln115",[],[]) - [Plain [Str "I",Space,Str "think",Space,Str "we",Space,Str "are",Space,Str "in",Space,Str "rats'",Space,Str "alley",Note [Para [Link ("",[],[]) [Str "115."] ("#wasteland-content.xhtml#ln115",""),Space,Str "Cf.",Space,Str "Part",Space,Str "III,",Space,Str "l.",Space,Str "195."]]] - ,Div ("",[],[]) - [Plain [Str "Where",Space,Str "the",Space,Str "dead",Space,Str "men",Space,Str "lost",Space,Str "their",Space,Str "bones."]]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "\"What",Space,Str "is",Space,Str "that",Space,Str "noise?\""]] - ,Div ("wasteland-content.xhtml#ln118",["indent"],[]) - [Plain [Str "The",Space,Str "wind",Space,Str "under",Space,Str "the",Space,Str "door.",Note [Para [Link ("",[],[]) [Str "118."] ("#wasteland-content.xhtml#ln118",""),Space,Str "Cf.",Space,Str "Webster:"],BlockQuote [Para [Str "\"Is",Space,Str "the",Space,Str "wind",Space,Str "in",Space,Str "that",Space,Str "door",Space,Str "still?\""]]]] - ,Div ("",[],[]) - [Plain [Str "\"What",Space,Str "is",Space,Str "that",Space,Str "noise",Space,Str "now?",Space,Str "What",Space,Str "is",Space,Str "the",Space,Str "wind",Space,Str "doing?\""]] - ,Div ("",["indent"],[]) - [Plain [Str "Nothing",Space,Str "again",Space,Str "nothing.",Span ("",["lnum"],[]) [Str "120"]]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "\"Do"]] - ,Div ("",[],[]) - [Plain [Str "\"You",Space,Str "know",Space,Str "nothing?",Space,Str "Do",Space,Str "you",Space,Str "see",Space,Str "nothing?",Space,Str "Do",Space,Str "you",Space,Str "remember"]] - ,Div ("",[],[]) - [Plain [Str "\"Nothing?\""]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "I",Space,Str "remember"]] - ,Div ("",[],[]) - [Plain [Str "Those",Space,Str "are",Space,Str "pearls",Space,Str "that",Space,Str "were",Space,Str "his",Space,Str "eyes."]] - ,Div ("wasteland-content.xhtml#ln126",[],[]) - [Plain [Str "\"Are",Space,Str "you",Space,Str "alive,",Space,Str "or",Space,Str "not?",Space,Str "Is",Space,Str "there",Space,Str "nothing",Space,Str "in",Space,Str "your",Space,Str "head?\"",Note [Para [Link ("",[],[]) [Str "126."] ("#wasteland-content.xhtml#ln126",""),Space,Str "Cf.",Space,Str "Part",Space,Str "I,",Space,Str "l.",Space,Str "37,",Space,Str "48."]]] - ,Div ("",[],[]) - [Plain [Str "But"]] - ,Div ("",[],[]) - [Plain [Str "O",Space,Str "O",Space,Str "O",Space,Str "O",Space,Str "that",Space,Str "Shakespeherian",Space,Str "Rag\8213"]] - ,Div ("",[],[]) - [Plain [Str "It's",Space,Str "so",Space,Str "elegant"]] - ,Div ("",[],[]) - [Plain [Str "So",Space,Str "intelligent",Span ("",["lnum"],[]) [Str "130"]]] - ,Div ("",[],[]) - [Plain [Str "\"What",Space,Str "shall",Space,Str "I",Space,Str "do",Space,Str "now?",Space,Str "What",Space,Str "shall",Space,Str "I",Space,Str "do?\""]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "shall",Space,Str "rush",Space,Str "out",Space,Str "as",Space,Str "I",Space,Str "am,",Space,Str "and",Space,Str "walk",Space,Str "the",Space,Str "street"]] - ,Div ("",[],[]) - [Plain [Str "\"With",Space,Str "my",Space,Str "hair",Space,Str "down,",Space,Str "so.",Space,Str "What",Space,Str "shall",Space,Str "we",Space,Str "do",Space,Str "to-morrow?"]] - ,Div ("",[],[]) - [Plain [Str "\"What",Space,Str "shall",Space,Str "we",Space,Str "ever",Space,Str "do?\""]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "hot",Space,Str "water",Space,Str "at",Space,Str "ten."]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "if",Space,Str "it",Space,Str "rains,",Space,Str "a",Space,Str "closed",Space,Str "car",Space,Str "at",Space,Str "four."]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "we",Space,Str "shall",Space,Str "play",Space,Str "a",Space,Str "game",Space,Str "of",Space,Str "chess,"]] - ,Div ("wasteland-content.xhtml#ln138",[],[]) - [Plain [Str "Pressing",Space,Str "lidless",Space,Str "eyes",Space,Str "and",Space,Str "waiting",Space,Str "for",Space,Str "a",Space,Str "knock",Space,Str "upon",Space,Str "the",Space,Str "door.",Note [Para [Link ("",[],[]) [Str "138."] ("#wasteland-content.xhtml#ln138",""),Space,Str "Cf.",Space,Str "the",Space,Str "game",Space,Str "of",Space,Str "chess",Space,Str "in",Space,Str "Middleton's",Space,Str "Women",Space,Str "beware",Space,Str "Women."]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "When",Space,Str "Lil's",Space,Str "husband",Space,Str "got",Space,Str "demobbed,",Space,Str "I",Space,Str "said",Space,Str "-"]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "didn't",Space,Str "mince",Space,Str "my",Space,Str "words,",Space,Str "I",Space,Str "said",Space,Str "to",Space,Str "her",Space,Str "myself,",Span ("",["lnum"],[]) [Str "140"]]] - ,Div ("",[],[]) - [Plain [Str "HURRY",Space,Str "UP",Space,Str "PLEASE",Space,Str "ITS",Space,Str "TIME"]] - ,Div ("",[],[]) - [Plain [Str "Now",Space,Str "Albert's",Space,Str "coming",Space,Str "back,",Space,Str "make",Space,Str "yourself",Space,Str "a",Space,Str "bit",Space,Str "smart."]] - ,Div ("",[],[]) - [Plain [Str "He'll",Space,Str "want",Space,Str "to",Space,Str "know",Space,Str "what",Space,Str "you",Space,Str "done",Space,Str "with",Space,Str "that",Space,Str "money",Space,Str "he",Space,Str "gave",SoftBreak,Str "you"]] - ,Div ("",[],[]) - [Plain [Str "To",Space,Str "get",Space,Str "yourself",Space,Str "some",Space,Str "teeth.",Space,Str "He",Space,Str "did,",Space,Str "I",Space,Str "was",Space,Str "there."]] - ,Div ("",[],[]) - [Plain [Str "You",Space,Str "have",Space,Str "them",Space,Str "all",Space,Str "out,",Space,Str "Lil,",Space,Str "and",Space,Str "get",Space,Str "a",Space,Str "nice",Space,Str "set,"]] - ,Div ("",[],[]) - [Plain [Str "He",Space,Str "said,",Space,Str "I",Space,Str "swear,",Space,Str "I",Space,Str "can't",Space,Str "bear",Space,Str "to",Space,Str "look",Space,Str "at",Space,Str "you."]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "no",Space,Str "more",Space,Str "can't",Space,Str "I,",Space,Str "I",Space,Str "said,",Space,Str "and",Space,Str "think",Space,Str "of",Space,Str "poor",Space,Str "Albert,"]] - ,Div ("",[],[]) - [Plain [Str "He's",Space,Str "been",Space,Str "in",Space,Str "the",Space,Str "army",Space,Str "four",Space,Str "years,",Space,Str "he",Space,Str "wants",Space,Str "a",Space,Str "good",Space,Str "time,"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "if",Space,Str "you",Space,Str "don't",Space,Str "give",Space,Str "it",Space,Str "him,",Space,Str "there's",Space,Str "others",Space,Str "will,",Space,Str "I",SoftBreak,Str "said."]] - ,Div ("",[],[]) - [Plain [Str "Oh",Space,Str "is",Space,Str "there,",Space,Str "she",Space,Str "said.",Space,Str "Something",Space,Str "o'",Space,Str "that,",Space,Str "I",Space,Str "said.",Span ("",["lnum"],[]) [Str "150"]]] - ,Div ("",[],[]) - [Plain [Str "Then",Space,Str "I'll",Space,Str "know",Space,Str "who",Space,Str "to",Space,Str "thank,",Space,Str "she",Space,Str "said,",Space,Str "and",Space,Str "give",Space,Str "me",Space,Str "a",Space,Str "straight",SoftBreak,Str "look."]] - ,Div ("",[],[]) - [Plain [Str "HURRY",Space,Str "UP",Space,Str "PLEASE",Space,Str "ITS",Space,Str "TIME"]] - ,Div ("",[],[]) - [Plain [Str "If",Space,Str "you",Space,Str "don't",Space,Str "like",Space,Str "it",Space,Str "you",Space,Str "can",Space,Str "get",Space,Str "on",Space,Str "with",Space,Str "it,",Space,Str "I",Space,Str "said."]] - ,Div ("",[],[]) - [Plain [Str "Others",Space,Str "can",Space,Str "pick",Space,Str "and",Space,Str "choose",Space,Str "if",Space,Str "you",Space,Str "can't."]] - ,Div ("",[],[]) - [Plain [Str "But",Space,Str "if",Space,Str "Albert",Space,Str "makes",Space,Str "off,",Space,Str "it",Space,Str "won't",Space,Str "be",Space,Str "for",Space,Str "lack",Space,Str "of",SoftBreak,Str "telling."]] - ,Div ("",[],[]) - [Plain [Str "You",Space,Str "ought",Space,Str "to",Space,Str "be",Space,Str "ashamed,",Space,Str "I",Space,Str "said,",Space,Str "to",Space,Str "look",Space,Str "so",Space,Str "antique."]] - ,Div ("",[],[]) - [Plain [Str "(And",Space,Str "her",Space,Str "only",Space,Str "thirty-one.)"]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "can't",Space,Str "help",Space,Str "it,",Space,Str "she",Space,Str "said,",Space,Str "pulling",Space,Str "a",Space,Str "long",Space,Str "face,"]] - ,Div ("",[],[]) - [Plain [Str "It's",Space,Str "them",Space,Str "pills",Space,Str "I",Space,Str "took,",Space,Str "to",Space,Str "bring",Space,Str "it",Space,Str "off,",Space,Str "she",Space,Str "said."]] - ,Div ("",[],[]) - [Plain [Str "(She's",Space,Str "had",Space,Str "five",Space,Str "already,",Space,Str "and",Space,Str "nearly",Space,Str "died",Space,Str "of",Space,Str "young",Space,Str "George.)",Span ("",["lnum"],[]) [Str "160"]]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "chemist",Space,Str "said",Space,Str "it",Space,Str "would",Space,Str "be",Space,Str "all",Space,Str "right,",Space,Str "but",Space,Str "I've",Space,Str "never",Space,Str "been",Space,Str "the",SoftBreak,Str "same."]] - ,Div ("",[],[]) - [Plain [Str "You",Space,Emph [Str "are"],Space,Str "a",Space,Str "proper",Space,Str "fool,",Space,Str "I",Space,Str "said."]] - ,Div ("",[],[]) - [Plain [Str "Well,",Space,Str "if",Space,Str "Albert",Space,Str "won't",Space,Str "leave",Space,Str "you",Space,Str "alone,",Space,Str "there",Space,Str "it",Space,Str "is,",Space,Str "I",SoftBreak,Str "said,"]] - ,Div ("",[],[]) - [Plain [Str "What",Space,Str "you",Space,Str "get",Space,Str "married",Space,Str "for",Space,Str "if",Space,Str "you",Space,Str "don't",Space,Str "want",Space,Str "children?"]] - ,Div ("",[],[]) - [Plain [Str "HURRY",Space,Str "UP",Space,Str "PLEASE",Space,Str "ITS",Space,Str "TIME"]] - ,Div ("",[],[]) - [Plain [Str "Well,",Space,Str "that",Space,Str "Sunday",Space,Str "Albert",Space,Str "was",Space,Str "home,",Space,Str "they",Space,Str "had",Space,Str "a",Space,Str "hot",SoftBreak,Str "gammon,"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "they",Space,Str "asked",Space,Str "me",Space,Str "in",Space,Str "to",Space,Str "dinner,",Space,Str "to",Space,Str "get",Space,Str "the",Space,Str "beauty",Space,Str "of",Space,Str "it",SoftBreak,Str "hot\8213"]] - ,Div ("",[],[]) - [Plain [Str "HURRY",Space,Str "UP",Space,Str "PLEASE",Space,Str "ITS",Space,Str "TIME"]] - ,Div ("",[],[]) - [Plain [Str "HURRY",Space,Str "UP",Space,Str "PLEASE",Space,Str "ITS",Space,Str "TIME"]] - ,Div ("",[],[]) - [Plain [Str "Goonight",Space,Str "Bill.",Space,Str "Goonight",Space,Str "Lou.",Space,Str "Goonight",Space,Str "May.",Space,Str "Goonight.",Span ("",["lnum"],[]) [Str "170"]]] - ,Div ("",[],[]) - [Plain [Str "Ta",Space,Str "ta.",Space,Str "Goonight.",Space,Str "Goonight."]] - ,Div ("",[],[]) - [Plain [Str "Good",Space,Str "night,",Space,Str "ladies,",Space,Str "good",Space,Str "night,",Space,Str "sweet",Space,Str "ladies,",Space,Str "good",Space,Str "night,",Space,Str "good",SoftBreak,Str "night."]]] - ,RawBlock (Format "html") "
    " - ,Div ("wasteland-content.xhtml#ch3",["section"],[]) - [Header 2 ("",[],[]) [Str "III.",Space,Str "THE",Space,Str "FIRE",Space,Str "SERMON"] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "The",Space,Str "river's",Space,Str "tent",Space,Str "is",Space,Str "broken:",Space,Str "the",Space,Str "last",Space,Str "fingers",Space,Str "of",Space,Str "leaf"]] - ,Div ("",[],[]) - [Plain [Str "Clutch",Space,Str "and",Space,Str "sink",Space,Str "into",Space,Str "the",Space,Str "wet",Space,Str "bank.",Space,Str "The",Space,Str "wind"]] - ,Div ("",[],[]) - [Plain [Str "Crosses",Space,Str "the",Space,Str "brown",Space,Str "land,",Space,Str "unheard.",Space,Str "The",Space,Str "nymphs",Space,Str "are",SoftBreak,Str "departed."]] - ,Div ("wasteland-content.xhtml#ln176",[],[]) - [Plain [Str "Sweet",Space,Str "Thames,",Space,Str "run",Space,Str "softly,",Space,Str "till",Space,Str "I",Space,Str "end",Space,Str "my",Space,Str "song.",Note [Para [Link ("",[],[]) [Str "176."] ("#wasteland-content.xhtml#ln176",""),Space,Str "V.",Space,Str "Spenser,",Space,Str "Prothalamion."]]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "river",Space,Str "bears",Space,Str "no",Space,Str "empty",Space,Str "bottles,",Space,Str "sandwich",Space,Str "papers,"]] - ,Div ("",[],[]) - [Plain [Str "Silk",Space,Str "handkerchiefs,",Space,Str "cardboard",Space,Str "boxes,",Space,Str "cigarette",Space,Str "ends"]] - ,Div ("",[],[]) - [Plain [Str "Or",Space,Str "other",Space,Str "testimony",Space,Str "of",Space,Str "summer",Space,Str "nights.",Space,Str "The",Space,Str "nymphs",Space,Str "are",SoftBreak,Str "departed."]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "their",Space,Str "friends,",Space,Str "the",Space,Str "loitering",Space,Str "heirs",Space,Str "of",Space,Str "city",Space,Str "directors;",Span ("",["lnum"],[]) [Str "180"]]] - ,Div ("",[],[]) - [Plain [Str "Departed,",Space,Str "have",Space,Str "left",Space,Str "no",Space,Str "addresses."]] - ,Div ("",[],[]) - [Plain [Str "By",Space,Str "the",Space,Str "waters",Space,Str "of",Space,Str "Leman",Space,Str "I",Space,Str "sat",Space,Str "down",Space,Str "and",Space,Str "wept",Space,Str ".",Space,Str ".",Space,Str "."]] - ,Div ("",[],[]) - [Plain [Str "Sweet",Space,Str "Thames,",Space,Str "run",Space,Str "softly",Space,Str "till",Space,Str "I",Space,Str "end",Space,Str "my",Space,Str "song,"]] - ,Div ("",[],[]) - [Plain [Str "Sweet",Space,Str "Thames,",Space,Str "run",Space,Str "softly,",Space,Str "for",Space,Str "I",Space,Str "speak",Space,Str "not",Space,Str "loud",Space,Str "or",Space,Str "long."]] - ,Div ("",[],[]) - [Plain [Str "But",Space,Str "at",Space,Str "my",Space,Str "back",Space,Str "in",Space,Str "a",Space,Str "cold",Space,Str "blast",Space,Str "I",Space,Str "hear"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "rattle",Space,Str "of",Space,Str "the",Space,Str "bones,",Space,Str "and",Space,Str "chuckle",Space,Str "spread",Space,Str "from",Space,Str "ear",Space,Str "to",SoftBreak,Str "ear."]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "A",Space,Str "rat",Space,Str "crept",Space,Str "softly",Space,Str "through",Space,Str "the",Space,Str "vegetation"]] - ,Div ("",[],[]) - [Plain [Str "Dragging",Space,Str "its",Space,Str "slimy",Space,Str "belly",Space,Str "on",Space,Str "the",Space,Str "bank"]] - ,Div ("",[],[]) - [Plain [Str "While",Space,Str "I",Space,Str "was",Space,Str "fishing",Space,Str "in",Space,Str "the",Space,Str "dull",Space,Str "canal"]] - ,Div ("",[],[]) - [Plain [Str "On",Space,Str "a",Space,Str "winter",Space,Str "evening",Space,Str "round",Space,Str "behind",Space,Str "the",Space,Str "gashouse",Span ("",["lnum"],[]) [Str "190"]]] - ,Div ("",[],[]) - [Plain [Str "Musing",Space,Str "upon",Space,Str "the",Space,Str "king",Space,Str "my",Space,Str "brother's",Space,Str "wreck"]] - ,Div ("wasteland-content.xhtml#ln192",[],[]) - [Plain [Str "And",Space,Str "on",Space,Str "the",Space,Str "king",Space,Str "my",Space,Str "father's",Space,Str "death",Space,Str "before",Space,Str "him.",Note [Para [Link ("",[],[]) [Str "192."] ("#wasteland-content.xhtml#ln192",""),Space,Str "Cf.",Space,Str "The",Space,Str "Tempest,",Space,Str "I.",Space,Str "ii."]]] - ,Div ("",[],[]) - [Plain [Str "White",Space,Str "bodies",Space,Str "naked",Space,Str "on",Space,Str "the",Space,Str "low",Space,Str "damp",Space,Str "ground"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "bones",Space,Str "cast",Space,Str "in",Space,Str "a",Space,Str "little",Space,Str "low",Space,Str "dry",Space,Str "garret,"]] - ,Div ("",[],[]) - [Plain [Str "Rattled",Space,Str "by",Space,Str "the",Space,Str "rat's",Space,Str "foot",Space,Str "only,",Space,Str "year",Space,Str "to",Space,Str "year."]] - ,Div ("wasteland-content.xhtml#ln196",[],[]) - [Plain [Str "But",Space,Str "at",Space,Str "my",Space,Str "back",Space,Str "from",Space,Str "time",Space,Str "to",Space,Str "time",Space,Str "I",Space,Str "hear",Note [Para [Link ("",[],[]) [Str "196."] ("#wasteland-content.xhtml#ln196",""),Space,Str "Cf.",Space,Str "Marvell,",Space,Str "To",Space,Str "His",Space,Str "Coy",Space,Str "Mistress."]]] - ,Div ("wasteland-content.xhtml#ln197",[],[]) - [Plain [Str "The",Space,Str "sound",Space,Str "of",Space,Str "horns",Space,Str "and",Space,Str "motors,",Space,Str "which",Space,Str "shall",Space,Str "bring",Note [Para [Link ("",[],[]) [Str "197."] ("#wasteland-content.xhtml#ln197",""),Space,Str "Cf.",Space,Str "Day,",Space,Str "Parliament",Space,Str "of",Space,Str "Bees:"],BlockQuote [Div ("",[],[]) [Div ("",[],[]) [Plain [Str "\"When",Space,Str "of",Space,Str "the",Space,Str "sudden,",Space,Str "listening,",Space,Str "you",Space,Str "shall",SoftBreak,Str "hear,"]],Div ("",[],[]) [Plain [Str "\"A",Space,Str "noise",Space,Str "of",Space,Str "horns",Space,Str "and",Space,Str "hunting,",Space,Str "which",Space,Str "shall",SoftBreak,Str "bring"]],Div ("",[],[]) [Plain [Str "\"Actaeon",Space,Str "to",Space,Str "Diana",Space,Str "in",Space,Str "the",Space,Str "spring,"]],Div ("",[],[]) [Plain [Str "\"Where",Space,Str "all",Space,Str "shall",Space,Str "see",Space,Str "her",Space,Str "naked",Space,Str "skin",Space,Str ".",Space,Str ".",Space,Str ".\""]]]]]] - ,Div ("",[],[]) - [Plain [Str "Sweeney",Space,Str "to",Space,Str "Mrs.",Space,Str "Porter",Space,Str "in",Space,Str "the",Space,Str "spring."]] - ,Div ("wasteland-content.xhtml#ln199",[],[]) - [Plain [Str "O",Space,Str "the",Space,Str "moon",Space,Str "shone",Space,Str "bright",Space,Str "on",Space,Str "Mrs.",Space,Str "Porter",Note [Para [Link ("",[],[]) [Str "199."] ("#wasteland-content.xhtml#ln199",""),Space,Str "I",Space,Str "do",Space,Str "not",Space,Str "know",Space,Str "the",Space,Str "origin",Space,Str "of",Space,Str "the",Space,Str "ballad",Space,Str "from",Space,Str "which",Space,Str "these",Space,Str "lines",Space,Str "are",SoftBreak,Str "taken:",Space,Str "it",Space,Str "was",Space,Str "reported",Space,Str "to",Space,Str "me",Space,Str "from",Space,Str "Sydney,",Space,Str "Australia."]]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "on",Space,Str "her",Space,Str "daughter",Span ("",["lnum"],[]) [Str "200"]]] - ,Div ("",[],[]) - [Plain [Str "They",Space,Str "wash",Space,Str "their",Space,Str "feet",Space,Str "in",Space,Str "soda",Space,Str "water"]] - ,Div ("wasteland-content.xhtml#ln202",[],[("lang","fr")]) - [Plain [Emph [Str "Et",Space,Str "O",Space,Str "ces",Space,Str "voix",Space,Str "d'enfants,",Space,Str "chantant",Space,Str "dans",Space,Str "la",Space,Str "coupole"],Str "!",Note [Para [Link ("",[],[]) [Str "202."] ("#wasteland-content.xhtml#ln202",""),Space,Str "V.",Space,Str "Verlaine,",Space,Str "Parsifal."]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "Twit",Space,Str "twit",Space,Str "twit"]] - ,Div ("",[],[]) - [Plain [Str "Jug",Space,Str "jug",Space,Str "jug",Space,Str "jug",Space,Str "jug",Space,Str "jug"]] - ,Div ("",[],[]) - [Plain [Str "So",Space,Str "rudely",Space,Str "forc'd."]] - ,Div ("",[],[]) - [Plain [Str "Tereu"]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "Unreal",Space,Str "City"]] - ,Div ("",[],[]) - [Plain [Str "Under",Space,Str "the",Space,Str "brown",Space,Str "fog",Space,Str "of",Space,Str "a",Space,Str "winter",Space,Str "noon"]] - ,Div ("",[],[]) - [Plain [Str "Mr.",Space,Str "Eugenides,",Space,Str "the",Space,Str "Smyrna",Space,Str "merchant"]] - ,Div ("wasteland-content.xhtml#ln210",[],[]) - [Plain [Str "Unshaven,",Space,Str "with",Space,Str "a",Space,Str "pocket",Space,Str "full",Space,Str "of",Space,Str "currants",Note [Para [Link ("",[],[]) [Str "210."] ("#wasteland-content.xhtml#ln210",""),Space,Str "The",Space,Str "currants",Space,Str "were",Space,Str "quoted",Space,Str "at",Space,Str "a",Space,Str "price",Space,Str "\"cost",Space,Str "insurance",Space,Str "and",Space,Str "freight",Space,Str "to",SoftBreak,Str "London\";",Space,Str "and",Space,Str "the",Space,Str "Bill",Space,Str "of",Space,Str "Lading",Space,Str "etc.",Space,Str "were",Space,Str "to",Space,Str "be",Space,Str "handed",Space,Str "to",Space,Str "the",Space,Str "buyer",Space,Str "upon",SoftBreak,Str "payment",Space,Str "of",Space,Str "the",Space,Str "sight",Space,Str "draft."]]] - ,Div ("",[],[]) - [Plain [Str "C.i.f.",Space,Str "London:",Space,Str "documents",Space,Str "at",Space,Str "sight,"]] - ,Div ("",[],[]) - [Plain [Str "Asked",Space,Str "me",Space,Str "in",Space,Str "demotic",Space,Str "French"]] - ,Div ("",[],[]) - [Plain [Str "To",Space,Str "luncheon",Space,Str "at",Space,Str "the",Space,Str "Cannon",Space,Str "Street",Space,Str "Hotel"]] - ,Div ("",[],[]) - [Plain [Str "Followed",Space,Str "by",Space,Str "a",Space,Str "weekend",Space,Str "at",Space,Str "the",Space,Str "Metropole."]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "At",Space,Str "the",Space,Str "violet",Space,Str "hour,",Space,Str "when",Space,Str "the",Space,Str "eyes",Space,Str "and",Space,Str "back"]] - ,Div ("",[],[]) - [Plain [Str "Turn",Space,Str "upward",Space,Str "from",Space,Str "the",Space,Str "desk,",Space,Str "when",Space,Str "the",Space,Str "human",Space,Str "engine",Space,Str "waits"]] - ,Div ("",[],[]) - [Plain [Str "Like",Space,Str "a",Space,Str "taxi",Space,Str "throbbing",Space,Str "waiting,"]] - ,Div ("wasteland-content.xhtml#ln218",[],[]) - [Plain [Str "I",Space,Str "Tiresias,",Space,Str "though",Space,Str "blind,",Space,Str "throbbing",Space,Str "between",Space,Str "two",Space,Str "lives,",Note [Para [Link ("",[],[]) [Str "218."] ("#wasteland-content.xhtml#ln218",""),Space,Str "Tiresias,",Space,Str "although",Space,Str "a",Space,Str "mere",Space,Str "spectator",Space,Str "and",Space,Str "not",Space,Str "indeed",Space,Str "a",Space,Str "\"character,\"",Space,Str "is",SoftBreak,Str "yet",Space,Str "the",Space,Str "most",Space,Str "important",Space,Str "personage",Space,Str "in",Space,Str "the",Space,Str "poem,",Space,Str "uniting",Space,Str "all",Space,Str "the",Space,Str "rest.",Space,Str "Just",SoftBreak,Str "as",Space,Str "the",Space,Str "one-eyed",Space,Str "merchant,",Space,Str "seller",Space,Str "of",Space,Str "currants,",Space,Str "melts",Space,Str "into",Space,Str "the",Space,Str "Phoenician",SoftBreak,Str "Sailor,",Space,Str "and",Space,Str "the",Space,Str "latter",Space,Str "is",Space,Str "not",Space,Str "wholly",Space,Str "distinct",Space,Str "from",Space,Str "Ferdinand",Space,Str "Prince",Space,Str "of",SoftBreak,Str "Naples,",Space,Str "so",Space,Str "all",Space,Str "the",Space,Str "women",Space,Str "are",Space,Str "one",Space,Str "woman,",Space,Str "and",Space,Str "the",Space,Str "two",Space,Str "sexes",Space,Str "meet",Space,Str "in",SoftBreak,Str "Tiresias.",Space,Str "What",Space,Str "Tiresias",Space,Str "sees,",Space,Str "in",Space,Str "fact,",Space,Str "is",Space,Str "the",Space,Str "substance",Space,Str "of",Space,Str "the",Space,Str "poem.",Space,Str "The",SoftBreak,Str "whole",Space,Str "passage",Space,Str "from",Space,Str "Ovid",Space,Str "is",Space,Str "of",Space,Str "great",Space,Str "anthropological",Space,Str "interest:"],BlockQuote [Para [Str "'.",Space,Str ".",Space,Str ".",Space,Str "Cum",Space,Str "Iunone",Space,Str "iocos",Space,Str "et",Space,Str "maior",Space,Str "vestra",Space,Str "profecto",Space,Str "est",LineBreak,Str "Quam,",Space,Str "quae",SoftBreak,Str "contingit",Space,Str "maribus,'",Space,Str "dixisse,",Space,Str "'voluptas.'",LineBreak,Str "Illa",Space,Str "negat;",Space,Str "placuit",SoftBreak,Str "quae",Space,Str "sit",Space,Str "sententia",Space,Str "docti",LineBreak,Str "Quaerere",Space,Str "Tiresiae:",Space,Str "venus",Space,Str "huic",Space,Str "erat",SoftBreak,Str "utraque",Space,Str "nota.",LineBreak,Str "Nam",Space,Str "duo",Space,Str "magnorum",Space,Str "viridi",Space,Str "coeuntia",Space,Str "silva",LineBreak,Str "Corpora",Space,Str "serpentum",Space,Str "baculi",Space,Str "violaverat",Space,Str "ictu",LineBreak,Str "Deque",Space,Str "viro",Space,Str "factus,",SoftBreak,Str "mirabile,",Space,Str "femina",Space,Str "septem",LineBreak,Str "Egerat",Space,Str "autumnos;",Space,Str "octavo",Space,Str "rursus",SoftBreak,Str "eosdem",LineBreak,Str "Vidit",Space,Str "et",Space,Str "'est",Space,Str "vestrae",Space,Str "si",Space,Str "tanta",Space,Str "potentia",Space,Str "plagae,'",LineBreak,Str "Dixit",Space,Str "'ut",Space,Str "auctoris",Space,Str "sortem",Space,Str "in",Space,Str "contraria",Space,Str "mutet,",LineBreak,Str "Nunc",Space,Str "quoque",Space,Str "vos",SoftBreak,Str "feriam!'",Space,Str "percussis",Space,Str "anguibus",Space,Str "isdem",LineBreak,Str "Forma",Space,Str "prior",Space,Str "rediit",SoftBreak,Str "genetivaque",Space,Str "venit",Space,Str "imago.",LineBreak,Str "Arbiter",Space,Str "hic",Space,Str "igitur",Space,Str "sumptus",Space,Str "de",Space,Str "lite",SoftBreak,Str "iocosa",LineBreak,Str "Dicta",Space,Str "Iovis",Space,Str "firmat;",Space,Str "gravius",Space,Str "Saturnia",Space,Str "iusto",LineBreak,Str "Nec",SoftBreak,Str "pro",Space,Str "materia",Space,Str "fertur",Space,Str "doluisse",Space,Str "suique",LineBreak,Str "Iudicis",Space,Str "aeterna",Space,Str "damnavit",SoftBreak,Str "lumina",Space,Str "nocte,",LineBreak,Str "At",Space,Str "pater",Space,Str "omnipotens",Space,Str "(neque",Space,Str "enim",Space,Str "licet",Space,Str "inrita",SoftBreak,Str "cuiquam",LineBreak,Str "Facta",Space,Str "dei",Space,Str "fecisse",Space,Str "deo)",Space,Str "pro",Space,Str "lumine",Space,Str "adempto",LineBreak,Str "Scire",SoftBreak,Str "futura",Space,Str "dedit",Space,Str "poenamque",Space,Str "levavit",Space,Str "honore.",LineBreak]]]] - ,Div ("",[],[]) - [Plain [Str "Old",Space,Str "man",Space,Str "with",Space,Str "wrinkled",Space,Str "female",Space,Str "breasts,",Space,Str "can",Space,Str "see"]] - ,Div ("",[],[]) - [Plain [Str "At",Space,Str "the",Space,Str "violet",Space,Str "hour,",Space,Str "the",Space,Str "evening",Space,Str "hour",Space,Str "that",Space,Str "strives",Span ("",["lnum"],[]) [Str "220"]]] - ,Div ("wasteland-content.xhtml#ln221",[],[]) - [Plain [Str "Homeward,",Space,Str "and",Space,Str "brings",Space,Str "the",Space,Str "sailor",Space,Str "home",Space,Str "from",Space,Str "sea,",Note [Para [Link ("",[],[]) [Str "221."] ("#wasteland-content.xhtml#ln221",""),Space,Str "This",Space,Str "may",Space,Str "not",Space,Str "appear",Space,Str "as",Space,Str "exact",Space,Str "as",Space,Str "Sappho's",Space,Str "lines,",Space,Str "but",Space,Str "I",Space,Str "had",Space,Str "in",Space,Str "mind",SoftBreak,Str "the",Space,Str "\"longshore\"",Space,Str "or",Space,Str "\"dory\"",Space,Str "fisherman,",Space,Str "who",Space,Str "returns",Space,Str "at",Space,Str "nightfall."]]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "typist",Space,Str "home",Space,Str "at",Space,Str "teatime,",Space,Str "clears",Space,Str "her",Space,Str "breakfast,",Space,Str "lights"]] - ,Div ("",[],[]) - [Plain [Str "Her",Space,Str "stove,",Space,Str "and",Space,Str "lays",Space,Str "out",Space,Str "food",Space,Str "in",Space,Str "tins."]] - ,Div ("",[],[]) - [Plain [Str "Out",Space,Str "of",Space,Str "the",Space,Str "window",Space,Str "perilously",Space,Str "spread"]] - ,Div ("",[],[]) - [Plain [Str "Her",Space,Str "drying",Space,Str "combinations",Space,Str "touched",Space,Str "by",Space,Str "the",Space,Str "sun's",Space,Str "last",Space,Str "rays,"]] - ,Div ("",[],[]) - [Plain [Str "On",Space,Str "the",Space,Str "divan",Space,Str "are",Space,Str "piled",Space,Str "(at",Space,Str "night",Space,Str "her",Space,Str "bed)"]] - ,Div ("",[],[]) - [Plain [Str "Stockings,",Space,Str "slippers,",Space,Str "camisoles,",Space,Str "and",Space,Str "stays."]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "Tiresias,",Space,Str "old",Space,Str "man",Space,Str "with",Space,Str "wrinkled",Space,Str "dugs"]] - ,Div ("",[],[]) - [Plain [Str "Perceived",Space,Str "the",Space,Str "scene,",Space,Str "and",Space,Str "foretold",Space,Str "the",Space,Str "rest",Space,Str "-"]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "too",Space,Str "awaited",Space,Str "the",Space,Str "expected",Space,Str "guest.",Span ("",["lnum"],[]) [Str "230"]]] - ,Div ("",[],[]) - [Plain [Str "He,",Space,Str "the",Space,Str "young",Space,Str "man",Space,Str "carbuncular,",Space,Str "arrives,"]] - ,Div ("",[],[]) - [Plain [Str "A",Space,Str "small",Space,Str "house",Space,Str "agent's",Space,Str "clerk,",Space,Str "with",Space,Str "one",Space,Str "bold",Space,Str "stare,"]] - ,Div ("",[],[]) - [Plain [Str "One",Space,Str "of",Space,Str "the",Space,Str "low",Space,Str "on",Space,Str "whom",Space,Str "assurance",Space,Str "sits"]] - ,Div ("",[],[]) - [Plain [Str "As",Space,Str "a",Space,Str "silk",Space,Str "hat",Space,Str "on",Space,Str "a",Space,Str "Bradford",Space,Str "millionaire."]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "time",Space,Str "is",Space,Str "now",Space,Str "propitious,",Space,Str "as",Space,Str "he",Space,Str "guesses,"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "meal",Space,Str "is",Space,Str "ended,",Space,Str "she",Space,Str "is",Space,Str "bored",Space,Str "and",Space,Str "tired,"]] - ,Div ("",[],[]) - [Plain [Str "Endeavours",Space,Str "to",Space,Str "engage",Space,Str "her",Space,Str "in",Space,Str "caresses"]] - ,Div ("",[],[]) - [Plain [Str "Which",Space,Str "still",Space,Str "are",Space,Str "unreproved,",Space,Str "if",Space,Str "undesired."]] - ,Div ("",[],[]) - [Plain [Str "Flushed",Space,Str "and",Space,Str "decided,",Space,Str "he",Space,Str "assaults",Space,Str "at",Space,Str "once;"]] - ,Div ("",[],[]) - [Plain [Str "Exploring",Space,Str "hands",Space,Str "encounter",Space,Str "no",Space,Str "defence;",Span ("",["lnum"],[]) [Str "240"]]] - ,Div ("",[],[]) - [Plain [Str "His",Space,Str "vanity",Space,Str "requires",Space,Str "no",Space,Str "response,"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "makes",Space,Str "a",Space,Str "welcome",Space,Str "of",Space,Str "indifference."]] - ,Div ("",[],[]) - [Plain [Str "(And",Space,Str "I",Space,Str "Tiresias",Space,Str "have",Space,Str "foresuffered",Space,Str "all"]] - ,Div ("",[],[]) - [Plain [Str "Enacted",Space,Str "on",Space,Str "this",Space,Str "same",Space,Str "divan",Space,Str "or",Space,Str "bed;"]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "who",Space,Str "have",Space,Str "sat",Space,Str "by",Space,Str "Thebes",Space,Str "below",Space,Str "the",Space,Str "wall"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "walked",Space,Str "among",Space,Str "the",Space,Str "lowest",Space,Str "of",Space,Str "the",Space,Str "dead.)"]] - ,Div ("",[],[]) - [Plain [Str "Bestows",Space,Str "one",Space,Str "final",Space,Str "patronising",Space,Str "kiss,"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "gropes",Space,Str "his",Space,Str "way,",Space,Str "finding",Space,Str "the",Space,Str "stairs",Space,Str "unlit",Space,Str ".",Space,Str ".",Space,Str "."]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "She",Space,Str "turns",Space,Str "and",Space,Str "looks",Space,Str "a",Space,Str "moment",Space,Str "in",Space,Str "the",Space,Str "glass,"]] - ,Div ("",[],[]) - [Plain [Str "Hardly",Space,Str "aware",Space,Str "of",Space,Str "her",Space,Str "departed",Space,Str "lover;",Span ("",["lnum"],[]) [Str "250"]]] - ,Div ("",[],[]) - [Plain [Str "Her",Space,Str "brain",Space,Str "allows",Space,Str "one",Space,Str "half-formed",Space,Str "thought",Space,Str "to",Space,Str "pass:"]] - ,Div ("",[],[]) - [Plain [Str "\"Well",Space,Str "now",Space,Str "that's",Space,Str "done:",Space,Str "and",Space,Str "I'm",Space,Str "glad",Space,Str "it's",Space,Str "over.\""]] - ,Div ("wasteland-content.xhtml#ln253",[],[]) - [Plain [Str "When",Space,Str "lovely",Space,Str "woman",Space,Str "stoops",Space,Str "to",Space,Str "folly",Space,Str "and",Note [Para [Link ("",[],[]) [Str "253."] ("#wasteland-content.xhtml#ln253",""),Space,Str "V.",Space,Str "Goldsmith,",Space,Str "the",Space,Str "song",Space,Str "in",Space,Str "The",Space,Str "Vicar",Space,Str "of",Space,Str "Wakefield."]]] - ,Div ("",[],[]) - [Plain [Str "Paces",Space,Str "about",Space,Str "her",Space,Str "room",Space,Str "again,",Space,Str "alone,"]] - ,Div ("",[],[]) - [Plain [Str "She",Space,Str "smoothes",Space,Str "her",Space,Str "hair",Space,Str "with",Space,Str "automatic",Space,Str "hand,"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "puts",Space,Str "a",Space,Str "record",Space,Str "on",Space,Str "the",Space,Str "gramophone."]]] - ,Div ("",["linegroup"],[]) - [Div ("wasteland-content.xhtml#ln257",[],[]) - [Plain [Str "\"This",Space,Str "music",Space,Str "crept",Space,Str "by",Space,Str "me",Space,Str "upon",Space,Str "the",Space,Str "waters\"",Note [Para [Link ("",[],[]) [Str "257."] ("#wasteland-content.xhtml#ln257",""),Space,Str "V.",Space,Str "The",Space,Str "Tempest,",Space,Str "as",Space,Str "above."]]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "along",Space,Str "the",Space,Str "Strand,",Space,Str "up",Space,Str "Queen",Space,Str "Victoria",Space,Str "Street."]] - ,Div ("",[],[]) - [Plain [Str "O",Space,Str "City",Space,Str "city,",Space,Str "I",Space,Str "can",Space,Str "sometimes",Space,Str "hear"]] - ,Div ("",[],[]) - [Plain [Str "Beside",Space,Str "a",Space,Str "public",Space,Str "bar",Space,Str "in",Space,Str "Lower",Space,Str "Thames",Space,Str "Street,",Span ("",["lnum"],[]) [Str "260"]]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "pleasant",Space,Str "whining",Space,Str "of",Space,Str "a",Space,Str "mandoline"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "a",Space,Str "clatter",Space,Str "and",Space,Str "a",Space,Str "chatter",Space,Str "from",Space,Str "within"]] - ,Div ("",[],[]) - [Plain [Str "Where",Space,Str "fishmen",Space,Str "lounge",Space,Str "at",Space,Str "noon:",Space,Str "where",Space,Str "the",Space,Str "walls"]] - ,Div ("wasteland-content.xhtml#ln264",[],[]) - [Plain [Str "Of",Space,Str "Magnus",Space,Str "Martyr",Space,Str "hold",Note [Para [Link ("",[],[]) [Str "264."] ("#wasteland-content.xhtml#ln264",""),Space,Str "The",Space,Str "interior",Space,Str "of",Space,Str "St.",Space,Str "Magnus",Space,Str "Martyr",Space,Str "is",Space,Str "to",Space,Str "my",Space,Str "mind",Space,Str "one",Space,Str "of",Space,Str "the",Space,Str "finest",SoftBreak,Str "among",Space,Str "Wren's",Space,Str "interiors.",Space,Str "See",Space,Str "The",Space,Str "Proposed",Space,Str "Demolition",Space,Str "of",Space,Str "Nineteen",Space,Str "City",SoftBreak,Str "Churches",Space,Str "(P.",Space,Str "S.",Space,Str "King",Space,Str "&",Space,Str "Son,",Space,Str "Ltd.)."]]] - ,Div ("",[],[]) - [Plain [Str "Inexplicable",Space,Str "splendour",Space,Str "of",Space,Str "Ionian",Space,Str "white",Space,Str "and",Space,Str "gold."]]] - ,Div ("",["linegroup","indent"],[]) - [Div ("wasteland-content.xhtml#ln266",[],[]) - [Plain [Str "The",Space,Str "river",Space,Str "sweats",Note [Para [Link ("",[],[]) [Str "266."] ("#wasteland-content.xhtml#ln266",""),Space,Str "The",Space,Str "Song",Space,Str "of",Space,Str "the",Space,Str "(three)",Space,Str "Thames-daughters",Space,Str "begins",Space,Str "here.",Space,Str "From",Space,Str "line",Space,Str "292",SoftBreak,Str "to",Space,Str "306",Space,Str "inclusive",Space,Str "they",Space,Str "speak",Space,Str "in",Space,Str "turn.",Space,Str "V.",Space,Str "Gutterdsammerung,",Space,Str "III.",Space,Str "i:",Space,Str "the",SoftBreak,Str "Rhine-daughters."]]] - ,Div ("",[],[]) - [Plain [Str "Oil",Space,Str "and",Space,Str "tar"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "barges",Space,Str "drift"]] - ,Div ("",[],[]) - [Plain [Str "With",Space,Str "the",Space,Str "turning",Space,Str "tide"]] - ,Div ("",[],[]) - [Plain [Str "Red",Space,Str "sails",Span ("",["lnum"],[]) [Str "270"]]] - ,Div ("",[],[]) - [Plain [Str "Wide"]] - ,Div ("",[],[]) - [Plain [Str "To",Space,Str "leeward,",Space,Str "swing",Space,Str "on",Space,Str "the",Space,Str "heavy",Space,Str "spar."]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "barges",Space,Str "wash"]] - ,Div ("",[],[]) - [Plain [Str "Drifting",Space,Str "logs"]] - ,Div ("",[],[]) - [Plain [Str "Down",Space,Str "Greenwich",Space,Str "reach"]] - ,Div ("",[],[]) - [Plain [Str "Past",Space,Str "the",Space,Str "Isle",Space,Str "of",Space,Str "Dogs."]] - ,Div ("",["indent"],[]) - [Plain [Str "Weialala",Space,Str "leia"]] - ,Div ("",["indent"],[]) - [Plain [Str "Wallala",Space,Str "leialala"]]] - ,Div ("",["linegroup","indent"],[]) - [Div ("wasteland-content.xhtml#ln279",[],[]) - [Plain [Str "Elizabeth",Space,Str "and",Space,Str "Leicester",Note [Para [Link ("",[],[]) [Str "279."] ("#wasteland-content.xhtml#ln279",""),Space,Str "V.",Space,Str "Froude,",Space,Str "Elizabeth,",Space,Str "Vol.",Space,Str "I,",Space,Str "ch.",Space,Str "iv,",Space,Str "letter",Space,Str "of",Space,Str "De",Space,Str "Quadra",Space,Str "to",Space,Str "Philip",SoftBreak,Str "of",Space,Str "Spain:"],BlockQuote [Div ("",[],[]) [Div ("",[],[]) [Plain [Str "\"In",Space,Str "the",Space,Str "afternoon",Space,Str "we",Space,Str "were",Space,Str "in",Space,Str "a",Space,Str "barge,",Space,Str "watching",Space,Str "the",SoftBreak,Str "games",Space,Str "on",Space,Str "the",Space,Str "river."]],Div ("",[],[]) [Plain [Str "(The",Space,Str "queen)",Space,Str "was",Space,Str "alone",Space,Str "with",Space,Str "Lord",Space,Str "Robert",Space,Str "and",Space,Str "myself",SoftBreak,Str "on",Space,Str "the",Space,Str "poop,"]],Div ("",[],[]) [Plain [Str "when",Space,Str "they",Space,Str "began",Space,Str "to",Space,Str "talk",Space,Str "nonsense,",Space,Str "and",Space,Str "went",Space,Str "so",Space,Str "far",SoftBreak,Str "that",Space,Str "Lord",Space,Str "Robert"]],Div ("",[],[]) [Plain [Str "at",Space,Str "last",Space,Str "said,",Space,Str "as",Space,Str "I",Space,Str "was",Space,Str "on",Space,Str "the",Space,Str "spot",Space,Str "there",Space,Str "was",Space,Str "no",SoftBreak,Str "reason",Space,Str "why",Space,Str "they"]],Div ("",[],[]) [Plain [Str "should",Space,Str "not",Space,Str "be",Space,Str "married",Space,Str "if",Space,Str "the",Space,Str "queen",Space,Str "pleased.\""]]]]]] - ,Div ("",[],[]) - [Plain [Str "Beating",Space,Str "oars",Span ("",["lnum"],[]) [Str "280"]]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "stern",Space,Str "was",Space,Str "formed"]] - ,Div ("",[],[]) - [Plain [Str "A",Space,Str "gilded",Space,Str "shell"]] - ,Div ("",[],[]) - [Plain [Str "Red",Space,Str "and",Space,Str "gold"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "brisk",Space,Str "swell"]] - ,Div ("",[],[]) - [Plain [Str "Rippled",Space,Str "both",Space,Str "shores"]] - ,Div ("",[],[]) - [Plain [Str "Southwest",Space,Str "wind"]] - ,Div ("",[],[]) - [Plain [Str "Carried",Space,Str "down",Space,Str "stream"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "peal",Space,Str "of",Space,Str "bells"]] - ,Div ("",[],[]) - [Plain [Str "White",Space,Str "towers"]] - ,Div ("",["indent"],[]) - [Plain [Str "Weialala",Space,Str "leia",Span ("",["lnum"],[]) [Str "290"]]] - ,Div ("",["indent"],[]) - [Plain [Str "Wallala",Space,Str "leialala"]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "\"Trams",Space,Str "and",Space,Str "dusty",Space,Str "trees."]] - ,Div ("wasteland-content.xhtml#ln293",[],[]) - [Plain [Str "Highbury",Space,Str "bore",Space,Str "me.",Space,Str "Richmond",Space,Str "and",Space,Str "Kew",Note [Para [Link ("",[],[]) [Str "293."] ("#wasteland-content.xhtml#ln293",""),Space,Str "Cf.",Space,Str "Purgatorio,",Space,Str "v.",Space,Str "133:"],BlockQuote [Para [Str "\"Ricorditi",Space,Str "di",Space,Str "me,",Space,Str "che",Space,Str "son",Space,Str "la",Space,Str "Pia;",LineBreak,Str "Siena",Space,Str "mi",Space,Str "fe',",Space,Str "disfecemi",SoftBreak,Str "Maremma.\""]]]] - ,Div ("",[],[]) - [Plain [Str "Undid",Space,Str "me.",Space,Str "By",Space,Str "Richmond",Space,Str "I",Space,Str "raised",Space,Str "my",Space,Str "knees"]] - ,Div ("",[],[]) - [Plain [Str "Supine",Space,Str "on",Space,Str "the",Space,Str "floor",Space,Str "of",Space,Str "a",Space,Str "narrow",Space,Str "canoe.\""]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "\"My",Space,Str "feet",Space,Str "are",Space,Str "at",Space,Str "Moorgate,",Space,Str "and",Space,Str "my",Space,Str "heart"]] - ,Div ("",[],[]) - [Plain [Str "Under",Space,Str "my",Space,Str "feet.",Space,Str "After",Space,Str "the",Space,Str "event"]] - ,Div ("",[],[]) - [Plain [Str "He",Space,Str "wept.",Space,Str "He",Space,Str "promised",Space,Str "'a",Space,Str "new",Space,Str "start'."]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "made",Space,Str "no",Space,Str "comment.",Space,Str "What",Space,Str "should",Space,Str "I",Space,Str "resent?\""]] - ,Div ("",[],[]) - [Plain [Str "\"On",Space,Str "Margate",Space,Str "Sands.",Span ("",["lnum"],[]) [Str "300"]]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "can",Space,Str "connect"]] - ,Div ("",[],[]) - [Plain [Str "Nothing",Space,Str "with",Space,Str "nothing."]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "broken",Space,Str "fingernails",Space,Str "of",Space,Str "dirty",Space,Str "hands."]] - ,Div ("",[],[]) - [Plain [Str "My",Space,Str "people",Space,Str "humble",Space,Str "people",Space,Str "who",Space,Str "expect"]] - ,Div ("",[],[]) - [Plain [Str "Nothing.\""]] - ,Div ("",["indent"],[]) - [Plain [Str "la",Space,Str "la"]]] - ,Div ("",["linegroup"],[]) - [Div ("wasteland-content.xhtml#ln307",[],[]) - [Plain [Str "To",Space,Str "Carthage",Space,Str "then",Space,Str "I",Space,Str "came",Note [Para [Link ("",[],[]) [Str "307."] ("#wasteland-content.xhtml#ln307",""),Space,Str "V.",Space,Str "St.",Space,Str "Augustine's",Space,Str "Confessions:",Space,Str "\"to",Space,Str "Carthage",Space,Str "then",Space,Str "I",Space,Str "came,",Space,Str "where",Space,Str "a",SoftBreak,Str "cauldron",Space,Str "of",Space,Str "unholy",Space,Str "loves",Space,Str "sang",Space,Str "all",Space,Str "about",Space,Str "mine",Space,Str "ears.\""]]] - ,Div ("",["linegroup"],[]) - [Div ("wasteland-content.xhtml#ln308",[],[]) - [Plain [Str "Burning",Space,Str "burning",Space,Str "burning",Space,Str "burning",Note [Para [Link ("",[],[]) [Str "308."] ("#wasteland-content.xhtml#ln308",""),Space,Str "The",Space,Str "complete",Space,Str "text",Space,Str "of",Space,Str "the",Space,Str "Buddha's",Space,Str "Fire",Space,Str "Sermon",Space,Str "(which",Space,Str "corresponds",Space,Str "in",SoftBreak,Str "importance",Space,Str "to",Space,Str "the",Space,Str "Sermon",Space,Str "on",Space,Str "the",Space,Str "Mount)",Space,Str "from",Space,Str "which",Space,Str "these",Space,Str "words",Space,Str "are",Space,Str "taken,",SoftBreak,Str "will",Space,Str "be",Space,Str "found",Space,Str "translated",Space,Str "in",Space,Str "the",Space,Str "late",Space,Str "Henry",Space,Str "Clarke",Space,Str "Warren's",Space,Str "Buddhism",Space,Str "in",SoftBreak,Str "Translation",Space,Str "(Harvard",Space,Str "Oriental",Space,Str "Series).",Space,Str "Mr.",Space,Str "Warren",Space,Str "was",Space,Str "one",Space,Str "of",Space,Str "the",Space,Str "great",SoftBreak,Str "pioneers",Space,Str "of",Space,Str "Buddhist",Space,Str "studies",Space,Str "in",Space,Str "the",Space,Str "Occident."]]] - ,Div ("wasteland-content.xhtml#ln309",[],[]) - [Plain [Str "O",Space,Str "Lord",Space,Str "Thou",Space,Str "pluckest",Space,Str "me",Space,Str "out",Note [Para [Link ("",[],[]) [Str "309."] ("#wasteland-content.xhtml#ln309",""),Space,Str "From",Space,Str "St.",Space,Str "Augustine's",Space,Str "Confessions",Space,Str "again.",Space,Str "The",Space,Str "collocation",Space,Str "of",Space,Str "these",Space,Str "two",SoftBreak,Str "representatives",Space,Str "of",Space,Str "eastern",Space,Str "and",Space,Str "western",Space,Str "asceticism,",Space,Str "as",Space,Str "the",Space,Str "culmination",Space,Str "of",SoftBreak,Str "this",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "poem,",Space,Str "is",Space,Str "not",Space,Str "an",Space,Str "accident."]]] - ,Div ("",[],[]) - [Plain [Str "O",Space,Str "Lord",Space,Str "Thou",Space,Str "pluckest",Span ("",["lnum"],[]) [Str "310"]]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "burning"]]] - ,RawBlock (Format "html") "
    " - ,Div ("wasteland-content.xhtml#ch4",["section"],[]) - [Header 2 ("",[],[]) [Str "IV.",Space,Str "DEATH",Space,Str "BY",Space,Str "WATER"] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "Phlebas",Space,Str "the",Space,Str "Phoenician,",Space,Str "a",Space,Str "fortnight",Space,Str "dead,"]] - ,Div ("",[],[]) - [Plain [Str "Forgot",Space,Str "the",Space,Str "cry",Space,Str "of",Space,Str "gulls,",Space,Str "and",Space,Str "the",Space,Str "deep",Space,Str "sea",Space,Str "swell"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "the",Space,Str "profit",Space,Str "and",Space,Str "loss."]]] - ,Div ("",["linegroup"],[]) - [Div ("",["indent2"],[]) - [Plain [Str "A",Space,Str "current",Space,Str "under",Space,Str "sea"]] - ,Div ("",[],[]) - [Plain [Str "Picked",Space,Str "his",Space,Str "bones",Space,Str "in",Space,Str "whispers.",Space,Str "As",Space,Str "he",Space,Str "rose",Space,Str "and",Space,Str "fell"]] - ,Div ("",[],[]) - [Plain [Str "He",Space,Str "passed",Space,Str "the",Space,Str "stages",Space,Str "of",Space,Str "his",Space,Str "age",Space,Str "and",Space,Str "youth"]] - ,Div ("",[],[]) - [Plain [Str "Entering",Space,Str "the",Space,Str "whirlpool."]]] - ,Div ("",["linegroup"],[]) - [Div ("",["indent2"],[]) - [Plain [Str "Gentile",Space,Str "or",Space,Str "Jew"]] - ,Div ("",[],[]) - [Plain [Str "O",Space,Str "you",Space,Str "who",Space,Str "turn",Space,Str "the",Space,Str "wheel",Space,Str "and",Space,Str "look",Space,Str "to",Space,Str "windward,",Span ("",["lnum"],[]) [Str "320"]]] - ,Div ("",[],[]) - [Plain [Str "Consider",Space,Str "Phlebas,",Space,Str "who",Space,Str "was",Space,Str "once",Space,Str "handsome",Space,Str "and",Space,Str "tall",Space,Str "as",Space,Str "you."]]]] - ,Div ("wasteland-content.xhtml#ch5",["section"],[]) - [Header 2 ("",[],[]) [Str "V.",Space,Str "WHAT",Space,Str "THE",Space,Str "THUNDER",Space,Str "SAID"] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "After",Space,Str "the",Space,Str "torchlight",Space,Str "red",Space,Str "on",Space,Str "sweaty",Space,Str "faces"]] - ,Div ("",[],[]) - [Plain [Str "After",Space,Str "the",Space,Str "frosty",Space,Str "silence",Space,Str "in",Space,Str "the",Space,Str "gardens"]] - ,Div ("",[],[]) - [Plain [Str "After",Space,Str "the",Space,Str "agony",Space,Str "in",Space,Str "stony",Space,Str "places"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "shouting",Space,Str "and",Space,Str "the",Space,Str "crying"]] - ,Div ("",[],[]) - [Plain [Str "Prison",Space,Str "and",Space,Str "palace",Space,Str "and",Space,Str "reverberation"]] - ,Div ("",[],[]) - [Plain [Str "Of",Space,Str "thunder",Space,Str "of",Space,Str "spring",Space,Str "over",Space,Str "distant",Space,Str "mountains"]] - ,Div ("",[],[]) - [Plain [Str "He",Space,Str "who",Space,Str "was",Space,Str "living",Space,Str "is",Space,Str "now",Space,Str "dead"]] - ,Div ("",[],[]) - [Plain [Str "We",Space,Str "who",Space,Str "were",Space,Str "living",Space,Str "are",Space,Str "now",Space,Str "dying"]] - ,Div ("",[],[]) - [Plain [Str "With",Space,Str "a",Space,Str "little",Space,Str "patience",Span ("",["lnum"],[]) [Str "330"]]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "Here",Space,Str "is",Space,Str "no",Space,Str "water",Space,Str "but",Space,Str "only",Space,Str "rock"]] - ,Div ("",[],[]) - [Plain [Str "Rock",Space,Str "and",Space,Str "no",Space,Str "water",Space,Str "and",Space,Str "the",Space,Str "sandy",Space,Str "road"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "road",Space,Str "winding",Space,Str "above",Space,Str "among",Space,Str "the",Space,Str "mountains"]] - ,Div ("",[],[]) - [Plain [Str "Which",Space,Str "are",Space,Str "mountains",Space,Str "of",Space,Str "rock",Space,Str "without",Space,Str "water"]] - ,Div ("",[],[]) - [Plain [Str "If",Space,Str "there",Space,Str "were",Space,Str "water",Space,Str "we",Space,Str "should",Space,Str "stop",Space,Str "and",Space,Str "drink"]] - ,Div ("",[],[]) - [Plain [Str "Amongst",Space,Str "the",Space,Str "rock",Space,Str "one",Space,Str "cannot",Space,Str "stop",Space,Str "or",Space,Str "think"]] - ,Div ("",[],[]) - [Plain [Str "Sweat",Space,Str "is",Space,Str "dry",Space,Str "and",Space,Str "feet",Space,Str "are",Space,Str "in",Space,Str "the",Space,Str "sand"]] - ,Div ("",[],[]) - [Plain [Str "If",Space,Str "there",Space,Str "were",Space,Str "only",Space,Str "water",Space,Str "amongst",Space,Str "the",Space,Str "rock"]] - ,Div ("",[],[]) - [Plain [Str "Dead",Space,Str "mountain",Space,Str "mouth",Space,Str "of",Space,Str "carious",Space,Str "teeth",Space,Str "that",Space,Str "cannot",Space,Str "spit"]] - ,Div ("",[],[]) - [Plain [Str "Here",Space,Str "one",Space,Str "can",Space,Str "neither",Space,Str "stand",Space,Str "nor",Space,Str "lie",Space,Str "nor",Space,Str "sit",Span ("",["lnum"],[]) [Str "340"]]] - ,Div ("",[],[]) - [Plain [Str "There",Space,Str "is",Space,Str "not",Space,Str "even",Space,Str "silence",Space,Str "in",Space,Str "the",Space,Str "mountains"]] - ,Div ("",[],[]) - [Plain [Str "But",Space,Str "dry",Space,Str "sterile",Space,Str "thunder",Space,Str "without",Space,Str "rain"]] - ,Div ("",[],[]) - [Plain [Str "There",Space,Str "is",Space,Str "not",Space,Str "even",Space,Str "solitude",Space,Str "in",Space,Str "the",Space,Str "mountains"]] - ,Div ("",[],[]) - [Plain [Str "But",Space,Str "red",Space,Str "sullen",Space,Str "faces",Space,Str "sneer",Space,Str "and",Space,Str "snarl"]] - ,Div ("",[],[]) - [Plain [Str "From",Space,Str "doors",Space,Str "of",Space,Str "mudcracked",Space,Str "houses"]] - ,Div ("",["linegroup"],[]) - [Div ("",["indent2"],[]) - [Plain [Str "If",Space,Str "there",Space,Str "were",Space,Str "water"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "no",Space,Str "rock"]] - ,Div ("",[],[]) - [Plain [Str "If",Space,Str "there",Space,Str "were",Space,Str "rock"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "also",Space,Str "water"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "water",Span ("",["lnum"],[]) [Str "350"]]] - ,Div ("",[],[]) - [Plain [Str "A",Space,Str "spring"]] - ,Div ("",[],[]) - [Plain [Str "A",Space,Str "pool",Space,Str "among",Space,Str "the",Space,Str "rock"]] - ,Div ("",[],[]) - [Plain [Str "If",Space,Str "there",Space,Str "were",Space,Str "the",Space,Str "sound",Space,Str "of",Space,Str "water",Space,Str "only"]] - ,Div ("",[],[]) - [Plain [Str "Not",Space,Str "the",Space,Str "cicada"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "dry",Space,Str "grass",Space,Str "singing"]] - ,Div ("",[],[]) - [Plain [Str "But",Space,Str "sound",Space,Str "of",Space,Str "water",Space,Str "over",Space,Str "a",Space,Str "rock"]] - ,Div ("wasteland-content.xhtml#ln357",[],[]) - [Plain [Str "Where",Space,Str "the",Space,Str "hermit-thrush",Space,Str "sings",Space,Str "in",Space,Str "the",Space,Str "pine",Space,Str "trees",Note [Para [Link ("",[],[]) [Str "357."] ("#wasteland-content.xhtml#ln357",""),Space,Str "This",Space,Str "is",Space,Str "Turdus",Space,Str "aonalaschkae",Space,Str "pallasii,",Space,Str "the",Space,Str "hermit-thrush",Space,Str "which",Space,Str "I",Space,Str "have",SoftBreak,Str "heard",Space,Str "in",Space,Str "Quebec",Space,Str "County.",Space,Str "Chapman",Space,Str "says",Space,Str "(Handbook",Space,Str "of",Space,Str "Birds",Space,Str "of",Space,Str "Eastern",Space,Str "North",SoftBreak,Str "America)",Space,Str "\"it",Space,Str "is",Space,Str "most",Space,Str "at",Space,Str "home",Space,Str "in",Space,Str "secluded",Space,Str "woodland",Space,Str "and",Space,Str "thickety",Space,Str "retreats.",SoftBreak,Str ".",Space,Str ".",Space,Str ".",Space,Str "Its",Space,Str "notes",Space,Str "are",Space,Str "not",Space,Str "remarkable",Space,Str "for",Space,Str "variety",Space,Str "or",Space,Str "volume,",Space,Str "but",Space,Str "in",Space,Str "purity",SoftBreak,Str "and",Space,Str "sweetness",Space,Str "of",Space,Str "tone",Space,Str "and",Space,Str "exquisite",Space,Str "modulation",Space,Str "they",Space,Str "are",Space,Str "unequalled.\"",Space,Str "Its",SoftBreak,Str "\"water-dripping",Space,Str "song\"",Space,Str "is",Space,Str "justly",Space,Str "celebrated."]]] - ,Div ("",[],[]) - [Plain [Str "Drip",Space,Str "drop",Space,Str "drip",Space,Str "drop",Space,Str "drop",Space,Str "drop",Space,Str "drop"]] - ,Div ("",[],[]) - [Plain [Str "But",Space,Str "there",Space,Str "is",Space,Str "no",Space,Str "water"]]]] - ,Div ("",["linegroup"],[]) - [Div ("wasteland-content.xhtml#ln360",[],[]) - [Plain [Str "Who",Space,Str "is",Space,Str "the",Space,Str "third",Space,Str "who",Space,Str "walks",Space,Str "always",Space,Str "beside",Space,Str "you?",Note [Para [Link ("",[],[]) [Str "360."] ("#wasteland-content.xhtml#ln360",""),Space,Str "The",Space,Str "following",Space,Str "lines",Space,Str "were",Space,Str "stimulated",Space,Str "by",Space,Str "the",Space,Str "account",Space,Str "of",Space,Str "one",Space,Str "of",Space,Str "the",SoftBreak,Str "Antarctic",Space,Str "expeditions",Space,Str "(I",Space,Str "forget",Space,Str "which,",Space,Str "but",Space,Str "I",Space,Str "think",Space,Str "one",Space,Str "of",Space,Str "Shackleton's):",SoftBreak,Str "it",Space,Str "was",Space,Str "related",Space,Str "that",Space,Str "the",Space,Str "party",Space,Str "of",Space,Str "explorers,",Space,Str "at",Space,Str "the",Space,Str "extremity",Space,Str "of",Space,Str "their",SoftBreak,Str "strength,",Space,Str "had",Space,Str "the",Space,Str "constant",Space,Str "delusion",Space,Str "that",Space,Str "there",Space,Str "was",Space,Str "one",Space,Str "more",Space,Str "member",Space,Str "than",SoftBreak,Str "could",Space,Str "actually",Space,Str "be",Space,Str "counted."]]] - ,Div ("",[],[]) - [Plain [Str "When",Space,Str "I",Space,Str "count,",Space,Str "there",Space,Str "are",Space,Str "only",Space,Str "you",Space,Str "and",Space,Str "I",Space,Str "together"]] - ,Div ("",[],[]) - [Plain [Str "But",Space,Str "when",Space,Str "I",Space,Str "look",Space,Str "ahead",Space,Str "up",Space,Str "the",Space,Str "white",Space,Str "road"]] - ,Div ("",[],[]) - [Plain [Str "There",Space,Str "is",Space,Str "always",Space,Str "another",Space,Str "one",Space,Str "walking",Space,Str "beside",Space,Str "you"]] - ,Div ("",[],[]) - [Plain [Str "Gliding",Space,Str "wrapt",Space,Str "in",Space,Str "a",Space,Str "brown",Space,Str "mantle,",Space,Str "hooded"]] - ,Div ("",[],[]) - [Plain [Str "I",Space,Str "do",Space,Str "not",Space,Str "know",Space,Str "whether",Space,Str "a",Space,Str "man",Space,Str "or",Space,Str "a",Space,Str "woman"]] - ,Div ("wasteland-content.xhtml#ln367",[],[]) - [Plain [Str "\8213But",Space,Str "who",Space,Str "is",Space,Str "that",Space,Str "on",Space,Str "the",Space,Str "other",Space,Str "side",Space,Str "of",Space,Str "you?",Note [Para [Link ("",[],[]) [Str "367-77."] ("#wasteland-content.xhtml#ln367",""),Space,Str "Cf.",Space,Str "Hermann",Space,Str "Hesse,",Space,Str "Blick",Space,Str "ins",Space,Str "Chaos:"],BlockQuote [Para [Str "\"Schon",Space,Str "ist",Space,Str "halb",Space,Str "Europa,",Space,Str "schon",Space,Str "ist",Space,Str "zumindest",Space,Str "der",Space,Str "halbe",Space,Str "Osten",Space,Str "Europas",SoftBreak,Str "auf",Space,Str "dem",LineBreak,Str "Wege",Space,Str "zum",Space,Str "Chaos,",Space,Str "fhrt",Space,Str "betrunken",Space,Str "im",Space,Str "heiligem",Space,Str "Wahn",Space,Str "am",SoftBreak,Str "Abgrund",Space,Str "entlang",LineBreak,Str "und",Space,Str "singt",Space,Str "dazu,",Space,Str "singt",Space,Str "betrunken",Space,Str "und",Space,Str "hymnisch",SoftBreak,Str "wie",Space,Str "Dmitri",Space,Str "Karamasoff",Space,Str "sang.",LineBreak,Str "Ueber",Space,Str "diese",Space,Str "Lieder",Space,Str "lacht",Space,Str "der",SoftBreak,Str "Bsrger",Space,Str "beleidigt,",Space,Str "der",Space,Str "Heilige",LineBreak,Str "und",Space,Str "Seher",Space,Str "hrt",Space,Str "sie",Space,Str "mit",SoftBreak,Str "Trvnen.\""]]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "What",Space,Str "is",Space,Str "that",Space,Str "sound",Space,Str "high",Space,Str "in",Space,Str "the",Space,Str "air"]] - ,Div ("",[],[]) - [Plain [Str "Murmur",Space,Str "of",Space,Str "maternal",Space,Str "lamentation"]] - ,Div ("",[],[]) - [Plain [Str "Who",Space,Str "are",Space,Str "those",Space,Str "hooded",Space,Str "hordes",Space,Str "swarming"]] - ,Div ("",[],[]) - [Plain [Str "Over",Space,Str "endless",Space,Str "plains,",Space,Str "stumbling",Space,Str "in",Space,Str "cracked",Space,Str "earth",Span ("",["lnum"],[]) [Str "370"]]] - ,Div ("",[],[]) - [Plain [Str "Ringed",Space,Str "by",Space,Str "the",Space,Str "flat",Space,Str "horizon",Space,Str "only"]] - ,Div ("",[],[]) - [Plain [Str "What",Space,Str "is",Space,Str "the",Space,Str "city",Space,Str "over",Space,Str "the",Space,Str "mountains"]] - ,Div ("",[],[]) - [Plain [Str "Cracks",Space,Str "and",Space,Str "reforms",Space,Str "and",Space,Str "bursts",Space,Str "in",Space,Str "the",Space,Str "violet",Space,Str "air"]] - ,Div ("",[],[]) - [Plain [Str "Falling",Space,Str "towers"]] - ,Div ("",[],[]) - [Plain [Str "Jerusalem",Space,Str "Athens",Space,Str "Alexandria"]] - ,Div ("",[],[]) - [Plain [Str "Vienna",Space,Str "London"]] - ,Div ("",[],[]) - [Plain [Str "Unreal"]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "A",Space,Str "woman",Space,Str "drew",Space,Str "her",Space,Str "long",Space,Str "black",Space,Str "hair",Space,Str "out",Space,Str "tight"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "fiddled",Space,Str "whisper",Space,Str "music",Space,Str "on",Space,Str "those",Space,Str "strings"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "bats",Space,Str "with",Space,Str "baby",Space,Str "faces",Space,Str "in",Space,Str "the",Space,Str "violet",Space,Str "light",Span ("",["lnum"],[]) [Str "380"]]] - ,Div ("",[],[]) - [Plain [Str "Whistled,",Space,Str "and",Space,Str "beat",Space,Str "their",Space,Str "wings"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "crawled",Space,Str "head",Space,Str "downward",Space,Str "down",Space,Str "a",Space,Str "blackened",Space,Str "wall"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "upside",Space,Str "down",Space,Str "in",Space,Str "air",Space,Str "were",Space,Str "towers"]] - ,Div ("",[],[]) - [Plain [Str "Tolling",Space,Str "reminiscent",Space,Str "bells,",Space,Str "that",Space,Str "kept",Space,Str "the",Space,Str "hours"]] - ,Div ("",[],[]) - [Plain [Str "And",Space,Str "voices",Space,Str "singing",Space,Str "out",Space,Str "of",Space,Str "empty",Space,Str "cisterns",Space,Str "and",Space,Str "exhausted",SoftBreak,Str "wells."]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "In",Space,Str "this",Space,Str "decayed",Space,Str "hole",Space,Str "among",Space,Str "the",Space,Str "mountains"]] - ,Div ("",[],[]) - [Plain [Str "In",Space,Str "the",Space,Str "faint",Space,Str "moonlight,",Space,Str "the",Space,Str "grass",Space,Str "is",Space,Str "singing"]] - ,Div ("",[],[]) - [Plain [Str "Over",Space,Str "the",Space,Str "tumbled",Space,Str "graves,",Space,Str "about",Space,Str "the",Space,Str "chapel"]] - ,Div ("",[],[]) - [Plain [Str "There",Space,Str "is",Space,Str "the",Space,Str "empty",Space,Str "chapel,",Space,Str "only",Space,Str "the",Space,Str "wind's",Space,Str "home."]] - ,Div ("",[],[]) - [Plain [Str "It",Space,Str "has",Space,Str "no",Space,Str "windows,",Space,Str "and",Space,Str "the",Space,Str "door",Space,Str "swings,",Span ("",["lnum"],[]) [Str "390"]]] - ,Div ("",[],[]) - [Plain [Str "Dry",Space,Str "bones",Space,Str "can",Space,Str "harm",Space,Str "no",Space,Str "one."]] - ,Div ("",[],[]) - [Plain [Str "Only",Space,Str "a",Space,Str "cock",Space,Str "stood",Space,Str "on",Space,Str "the",Space,Str "rooftree"]] - ,Div ("",[],[]) - [Plain [Str "Co",Space,Str "co",Space,Str "rico",Space,Str "co",Space,Str "co",Space,Str "rico"]] - ,Div ("",[],[]) - [Plain [Str "In",Space,Str "a",Space,Str "flash",Space,Str "of",Space,Str "lightning.",Space,Str "Then",Space,Str "a",Space,Str "damp",Space,Str "gust"]] - ,Div ("",[],[]) - [Plain [Str "Bringing",Space,Str "rain"]]] - ,Div ("",["linegroup"],[]) - [Div ("",[],[]) - [Plain [Str "Ganga",Space,Str "was",Space,Str "sunken,",Space,Str "and",Space,Str "the",Space,Str "limp",Space,Str "leaves"]] - ,Div ("",[],[]) - [Plain [Str "Waited",Space,Str "for",Space,Str "rain,",Space,Str "while",Space,Str "the",Space,Str "black",Space,Str "clouds"]] - ,Div ("",[],[]) - [Plain [Str "Gathered",Space,Str "far",Space,Str "distant,",Space,Str "over",Space,Str "Himavant."]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "jungle",Space,Str "crouched,",Space,Str "humped",Space,Str "in",Space,Str "silence."]] - ,Div ("",[],[]) - [Plain [Str "Then",Space,Str "spoke",Space,Str "the",Space,Str "thunder",Span ("",["lnum"],[]) [Str "400"]]] - ,Div ("",[],[]) - [Plain [Str "DA"]] - ,Div ("wasteland-content.xhtml#ln402",[],[]) - [Plain [Span ("",[],[("lang","sa")]) [Str "Datta"],Str ":",Space,Str "what",Space,Str "have",Space,Str "we",Space,Str "given?",Note [Para [Link ("",[],[]) [Str "402."] ("#wasteland-content.xhtml#ln402",""),Space,Quoted DoubleQuote [Str "\"Datta,",Space,Str "dayadhvam,",Space,Str "damyata\""],Space,Str "(Give,",Space,Str "sympathize,",SoftBreak,Str "control).",Space,Str "The",Space,Str "fable",Space,Str "of",Space,Str "the",Space,Str "meaning",Space,Str "of",Space,Str "the",Space,Str "Thunder",Space,Str "is",Space,Str "found",Space,Str "in",Space,Str "the",SoftBreak,Str "Brihadaranyaka-Upanishad,",Space,Str "5,",Space,Str "1.",Space,Str "A",Space,Str "translation",Space,Str "is",Space,Str "found",Space,Str "in",Space,Str "Deussen's",SoftBreak,Str "Sechzig",Space,Str "Upanishads",Space,Str "des",Space,Str "Veda,",Space,Str "p.",Space,Str "489."]]] - ,Div ("",[],[]) - [Plain [Str "My",Space,Str "friend,",Space,Str "blood",Space,Str "shaking",Space,Str "my",Space,Str "heart"]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "awful",Space,Str "daring",Space,Str "of",Space,Str "a",Space,Str "moment's",Space,Str "surrender"]] - ,Div ("",[],[]) - [Plain [Str "Which",Space,Str "an",Space,Str "age",Space,Str "of",Space,Str "prudence",Space,Str "can",Space,Str "never",Space,Str "retract"]] - ,Div ("",[],[]) - [Plain [Str "By",Space,Str "this,",Space,Str "and",Space,Str "this",Space,Str "only,",Space,Str "we",Space,Str "have",Space,Str "existed"]] - ,Div ("",[],[]) - [Plain [Str "Which",Space,Str "is",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "found",Space,Str "in",Space,Str "our",Space,Str "obituaries"]] - ,Div ("wasteland-content.xhtml#ln408",[],[]) - [Plain [Str "Or",Space,Str "in",Space,Str "memories",Space,Str "draped",Space,Str "by",Space,Str "the",Space,Str "beneficent",Space,Str "spider",Note [Para [Link ("",[],[]) [Str "408."] ("#wasteland-content.xhtml#ln408",""),Space,Str "Cf.",Space,Str "Webster,",Space,Str "The",Space,Str "White",Space,Str "Devil,",Space,Str "v.",Space,Str "vi:"],BlockQuote [Para [Str "\".",Space,Str ".",Space,Str ".",Space,Str "they'll",Space,Str "remarry",LineBreak,Str "Ere",Space,Str "the",Space,Str "worm",Space,Str "pierce",Space,Str "your",Space,Str "winding-sheet,",SoftBreak,Str "ere",Space,Str "the",Space,Str "spider",LineBreak,Str "Make",Space,Str "a",Space,Str "thin",Space,Str "curtain",Space,Str "for",Space,Str "your",Space,Str "epitaphs.\""]]]] - ,Div ("",[],[]) - [Plain [Str "Or",Space,Str "under",Space,Str "seals",Space,Str "broken",Space,Str "by",Space,Str "the",Space,Str "lean",Space,Str "solicitor"]] - ,Div ("",[],[]) - [Plain [Str "In",Space,Str "our",Space,Str "empty",Space,Str "rooms",Span ("",["lnum"],[]) [Str "410"]]] - ,Div ("",[],[]) - [Plain [Str "DA"]] - ,Div ("wasteland-content.xhtml#ln412",[],[]) - [Plain [Span ("",[],[("lang","sa")]) [Str "Dayadhvam"],Str ":",Space,Str "I",Space,Str "have",Space,Str "heard",Space,Str "the",Space,Str "key",Note [Para [Link ("",[],[]) [Str "412."] ("#wasteland-content.xhtml#ln412",""),Space,Str "Cf.",Space,Str "Inferno,",Space,Str "xxxiii.",Space,Str "46:"],BlockQuote [Para [Str "\"ed",Space,Str "io",Space,Str "sentii",Space,Str "chiavar",Space,Str "l'uscio",Space,Str "di",Space,Str "sotto",LineBreak,Str "all'orribile",Space,Str "torre.\""]],Para [Str "Also",Space,Str "F.",Space,Str "H.",Space,Str "Bradley,",Space,Str "Appearance",Space,Str "and",Space,Str "Reality,",Space,Str "p.",Space,Str "346:"],BlockQuote [Para [Str "\"My",Space,Str "external",Space,Str "sensations",Space,Str "are",Space,Str "no",Space,Str "less",Space,Str "private",Space,Str "to",Space,Str "myself",Space,Str "than",Space,Str "are",Space,Str "my",SoftBreak,Str "thoughts",Space,Str "or",Space,Str "my",Space,Str "feelings.",Space,Str "In",Space,Str "either",Space,Str "case",Space,Str "my",Space,Str "experience",Space,Str "falls",Space,Str "within",SoftBreak,Str "my",Space,Str "own",Space,Str "circle,",Space,Str "a",Space,Str "circle",Space,Str "closed",Space,Str "on",Space,Str "the",Space,Str "outside;",Space,Str "and,",Space,Str "with",Space,Str "all",Space,Str "its",SoftBreak,Str "elements",Space,Str "alike,",Space,Str "every",Space,Str "sphere",Space,Str "is",Space,Str "opaque",Space,Str "to",Space,Str "the",Space,Str "others",Space,Str "which",Space,Str "surround",SoftBreak,Str "it.",Space,Str ".",Space,Str ".",Space,Str ".",Space,Str "In",Space,Str "brief,",Space,Str "regarded",Space,Str "as",Space,Str "an",Space,Str "existence",Space,Str "which",Space,Str "appears",Space,Str "in",Space,Str "a",SoftBreak,Str "soul,",Space,Str "the",Space,Str "whole",Space,Str "world",Space,Str "for",Space,Str "each",Space,Str "is",Space,Str "peculiar",Space,Str "and",Space,Str "private",Space,Str "to",Space,Str "that",SoftBreak,Str "soul.\""]]]] - ,Div ("",[],[]) - [Plain [Str "Turn",Space,Str "in",Space,Str "the",Space,Str "door",Space,Str "once",Space,Str "and",Space,Str "turn",Space,Str "once",Space,Str "only"]] - ,Div ("",[],[]) - [Plain [Str "We",Space,Str "think",Space,Str "of",Space,Str "the",Space,Str "key,",Space,Str "each",Space,Str "in",Space,Str "his",Space,Str "prison"]] - ,Div ("",[],[]) - [Plain [Str "Thinking",Space,Str "of",Space,Str "the",Space,Str "key,",Space,Str "each",Space,Str "confirms",Space,Str "a",Space,Str "prison"]] - ,Div ("",[],[]) - [Plain [Str "Only",Space,Str "at",Space,Str "nightfall,",Space,Str "aetherial",Space,Str "rumours"]] - ,Div ("",[],[]) - [Plain [Str "Revive",Space,Str "for",Space,Str "a",Space,Str "moment",Space,Str "a",Space,Str "broken",Space,Str "Coriolanus"]] - ,Div ("",[],[]) - [Plain [Str "DA"]] - ,Div ("",[],[]) - [Plain [Span ("",[],[("lang","sa")]) [Str "Damyata"],Str ":",Space,Str "The",Space,Str "boat",Space,Str "responded"]] - ,Div ("",[],[]) - [Plain [Str "Gaily,",Space,Str "to",Space,Str "the",Space,Str "hand",Space,Str "expert",Space,Str "with",Space,Str "sail",Space,Str "and",Space,Str "oar",Span ("",["lnum"],[]) [Str "420"]]] - ,Div ("",[],[]) - [Plain [Str "The",Space,Str "sea",Space,Str "was",Space,Str "calm,",Space,Str "your",Space,Str "heart",Space,Str "would",Space,Str "have",Space,Str "responded"]] - ,Div ("",[],[]) - [Plain [Str "Gaily,",Space,Str "when",Space,Str "invited,",Space,Str "beating",Space,Str "obedient"]] - ,Div ("",[],[]) - [Plain [Str "To",Space,Str "controlling",Space,Str "hands"]]] - ,Div ("",["linegroup"],[]) - [Div ("",["indent"],[]) - [Plain [Str "I",Space,Str "sat",Space,Str "upon",Space,Str "the",Space,Str "shore"]] - ,Div ("wasteland-content.xhtml#ln425",[],[]) - [Plain [Str "Fishing,",Space,Str "with",Space,Str "the",Space,Str "arid",Space,Str "plain",Space,Str "behind",Space,Str "me",Note [Para [Link ("",[],[]) [Str "425."] ("#wasteland-content.xhtml#ln425",""),Space,Str "V.",Space,Str "Weston,",Space,Str "From",Space,Str "Ritual",Space,Str "to",Space,Str "Romance;",Space,Str "chapter",Space,Str "on",Space,Str "the",Space,Str "Fisher",Space,Str "King."]]] - ,Div ("",[],[]) - [Plain [Str "Shall",Space,Str "I",Space,Str "at",Space,Str "least",Space,Str "set",Space,Str "my",Space,Str "lands",Space,Str "in",Space,Str "order?"]] - ,Div ("",[],[]) - [Plain [Str "London",Space,Str "Bridge",Space,Str "is",Space,Str "falling",Space,Str "down",Space,Str "falling",Space,Str "down",Space,Str "falling",Space,Str "down"]] - ,Div ("wasteland-content.xhtml#ln428",[],[("lang","it")]) - [Plain [Emph [Str "Poi",Space,Str "s'ascose",Space,Str "nel",Space,Str "foco",Space,Str "che",Space,Str "gli",Space,Str "affina"],SoftBreak,Note [Para [Link ("",[],[]) [Str "428."] ("#wasteland-content.xhtml#ln428",""),Space,Str "V.",Space,Str "Purgatorio,",Space,Str "xxvi.",Space,Str "148."],BlockQuote [Para [Str "\"'Ara",Space,Str "vos",Space,Str "prec",Space,Str "per",Space,Str "aquella",Space,Str "valor",LineBreak,Str "'que",Space,Str "vos",Space,Str "guida",Space,Str "al",Space,Str "som",Space,Str "de",SoftBreak,Str "l'escalina,",LineBreak,Str "'sovegna",Space,Str "vos",Space,Str "a",Space,Str "temps",Space,Str "de",Space,Str "ma",Space,Str "dolor.'",LineBreak,Str "Poi",SoftBreak,Str "s'ascose",Space,Str "nel",Space,Str "foco",Space,Str "che",Space,Str "gli",Space,Str "affina.\""]]]] - ,Div ("wasteland-content.xhtml#ln429",[],[]) - [Plain [Span ("",[],[("lang","it")]) [SoftBreak,Emph [Str "Quando",Space,Str "fiam",Space,Str "ceu",Space,Str "chelidon"],SoftBreak],Space,Str "-",Space,Str "O",Space,Str "swallow",Space,Str "swallow",Note [Para [Link ("",[],[]) [Str "429."] ("#wasteland-content.xhtml#ln429",""),Space,Str "V.",Space,Str "Pervigilium",Space,Str "Veneris.",Space,Str "Cf.",Space,Str "Philomela",Space,Str "in",Space,Str "Parts",Space,Str "II",Space,Str "and",Space,Str "III."]]] - ,Div ("wasteland-content.xhtml#ln430",[],[("lang","fr")]) - [Plain [Emph [Str "Le",Space,Str "Prince",Space,Str "d'Aquitaine",Space,Str "a",Space,Str "la",Space,Str "tour",Space,Str "abolie"],SoftBreak,Note [Para [Link ("",[],[]) [Str "430."] ("#wasteland-content.xhtml#ln430",""),Space,Str "V.",Space,Str "Gerard",Space,Str "de",Space,Str "Nerval,",Space,Str "Sonnet",Space,Str "El",Space,Str "Desdichado."]]] - ,Div ("",[],[]) - [Plain [Str "These",Space,Str "fragments",Space,Str "I",Space,Str "have",Space,Str "shored",Space,Str "against",Space,Str "my",Space,Str "ruins"]] - ,Div ("wasteland-content.xhtml#ln432",[],[]) - [Plain [Str "Why",Space,Str "then",Space,Str "Ile",Space,Str "fit",Space,Str "you.",Space,Str "Hieronymo's",Space,Str "mad",Space,Str "againe.",Note [Para [Link ("",[],[]) [Str "432."] ("#wasteland-content.xhtml#ln432",""),Space,Str "V.",Space,Str "Kyd's",Space,Str "Spanish",Space,Str "Tragedy."]]] - ,Div ("",[],[("lang","sa")]) - [Plain [Str "Datta.",Space,Str "Dayadhvam.",Space,Str "Damyata."]] - ,Div ("wasteland-content.xhtml#ln434",["linegroup","indent"],[]) - [Plain [Span ("",[],[("lang","sa")]) [Str "Shantih",Space,Str "shantih",Space,Str "shantih",Note [Para [Link ("",[],[]) [Str "434."] ("#wasteland-content.xhtml#ln434",""),Space,Str "Shantih.",Space,Str "Repeated",Space,Str "as",Space,Str "here,",Space,Str "a",Space,Str "formal",Space,Str "ending",Space,Str "to",Space,Str "an",Space,Str "Upanishad.",Space,Str "'The",SoftBreak,Str "Peace",Space,Str "which",Space,Str "passeth",Space,Str "understanding'",Space,Str "is",Space,Str "a",Space,Str "feeble",Space,Str "translation",Space,Str "of",Space,Str "the",SoftBreak,Str "content",Space,Str "of",Space,Str "this",Space,Str "word."]]]] - ,Div ("wasteland-content.xhtml#backmatter",["section"],[("type","backmatter")]) - [Div ("wasteland-content.xhtml#rearnotes",["section"],[("type","rearnotes")]) - [Header 2 ("",[],[]) [Str "NOTES",Space,Str "ON",Space,Str "\"THE",Space,Str "WASTE",Space,Str "LAND\""] - ,Para [Str "Not",Space,Str "only",Space,Str "the",Space,Str "title,",Space,Str "but",Space,Str "the",Space,Str "plan",Space,Str "and",Space,Str "a",Space,Str "good",Space,Str "deal",Space,Str "of",Space,Str "the",Space,Str "incidental",Space,Str "symbolism",Space,Str "of",SoftBreak,Str "the",Space,Str "poem",Space,Str "were",Space,Str "suggested",Space,Str "by",Space,Str "Miss",Space,Str "Jessie",Space,Str "L.",Space,Str "Weston's",Space,Str "book",Space,Str "on",Space,Str "the",Space,Str "Grail",Space,Str "legend:",SoftBreak,Str "From",Space,Str "Ritual",Space,Str "to",Space,Str "Romance"] - ,Para [Str "Indeed,",Space,Str "so",Space,Str "deeply",Space,Str "am",Space,Str "I",Space,Str "indebted,",Space,Str "Miss",Space,Str "Weston's",Space,Str "book",Space,Str "will",Space,Str "elucidate",Space,Str "the",SoftBreak,Str "difficulties",Space,Str "of",Space,Str "the",Space,Str "poem",Space,Str "much",Space,Str "better",Space,Str "than",Space,Str "my",Space,Str "notes",Space,Str "can",Space,Str "do;",Space,Str "and",Space,Str "I",Space,Str "recommend",Space,Str "it",SoftBreak,Str "(apart",Space,Str "from",Space,Str "the",Space,Str "great",Space,Str "interest",Space,Str "of",Space,Str "the",Space,Str "book",Space,Str "itself)",Space,Str "to",Space,Str "any",Space,Str "who",Space,Str "think",Space,Str "such",SoftBreak,Str "elucidation",Space,Str "of",Space,Str "the",Space,Str "poem",Space,Str "worth",Space,Str "the",Space,Str "trouble.",Space,Str "To",Space,Str "another",Space,Str "work",Space,Str "of",Space,Str "anthropology",Space,Str "I",Space,Str "am",SoftBreak,Str "indebted",Space,Str "in",Space,Str "general,",Space,Str "one",Space,Str "which",Space,Str "has",Space,Str "influenced",Space,Str "our",Space,Str "generation",Space,Str "profoundly;",Space,Str "I",Space,Str "mean",SoftBreak,Str "The",Space,Str "Golden",Space,Str "Bough;",Space,Str "I",Space,Str "have",Space,Str "used",Space,Str "especially",Space,Str "the",Space,Str "two",Space,Str "volumes",Space,Str "Adonis,",Space,Str "Attis,",Space,Str "Osiris.",SoftBreak,Str "Anyone",Space,Str "who",Space,Str "is",Space,Str "acquainted",Space,Str "with",Space,Str "these",Space,Str "works",Space,Str "will",Space,Str "immediately",Space,Str "recognise",Space,Str "in",Space,Str "the",Space,Str "poem",SoftBreak,Str "certain",Space,Str "references",Space,Str "to",Space,Str "vegetation",Space,Str "ceremonies."] - ,Div ("",["section"],[]) - [Header 3 ("",[],[]) [Str "I.",Space,Str "THE",Space,Str "BURIAL",Space,Str "OF",Space,Str "THE",Space,Str "DEAD"]] - ,Div ("",["section"],[]) - [Header 3 ("",[],[]) [Str "II.",Space,Str "A",Space,Str "GAME",Space,Str "OF",Space,Str "CHESS"]] - ,Div ("",["section"],[]) - [Header 3 ("",[],[]) [Str "III.",Space,Str "THE",Space,Str "FIRE",Space,Str "SERMON"]] - ,Div ("",["section"],[]) - [Header 3 ("",[],[]) [Str "V.",Space,Str "WHAT",Space,Str "THE",Space,Str "THUNDER",Space,Str "SAID"] - ,Para [Str "In",Space,Str "the",Space,Str "first",Space,Str "part",Space,Str "of",Space,Str "Part",Space,Str "V",Space,Str "three",Space,Str "themes",Space,Str "are",Space,Str "employed:",Space,Str "the",Space,Str "journey",Space,Str "to",Space,Str "Emmaus,",SoftBreak,Str "the",Space,Str "approach",Space,Str "to",Space,Str "the",Space,Str "Chapel",Space,Str "Perilous",Space,Str "(see",Space,Str "Miss",Space,Str "Weston's",Space,Str "book)",Space,Str "and",Space,Str "the",Space,Str "present",SoftBreak,Str "decay",Space,Str "of",Space,Str "eastern",Space,Str "Europe."]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] +Pandoc + Meta + { unMeta = + fromList + [ ( "author" , MetaInlines [ Str "T.S. Eliot" ] ) + , ( "date" , MetaInlines [ Str "2011-09-01" ] ) + , ( "identifier" + , MetaInlines + [ Str "code.google.com.epub-samples.wasteland-basic" ] + ) + , ( "language" , MetaInlines [ Str "en-US" ] ) + , ( "rights" + , MetaInlines + [ Str + "This work is shared with the public using the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) license." + ] + ) + , ( "title" , MetaInlines [ Str "The Waste Land" ] ) + ] + } + [ Para + [ Image ( "" , [] , [] ) [] ( "wasteland-cover.jpg" , "" ) ] + , Para [ Span ( "wasteland-content.xhtml" , [] , [] ) [] ] + , Div + ( "wasteland-content.xhtml_frontmatter" + , [ "section" , "frontmatter" ] + , [] + ) + [] + , Div + ( "wasteland-content.xhtml_bodymatter" + , [ "section" , "bodymatter" ] + , [] + ) + [ Div + ( "wasteland-content.xhtml_ch1" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "I." + , Space + , Str "THE" + , Space + , Str "BURIAL" + , Space + , Str "OF" + , Space + , Str "THE" + , Space + , Str "DEAD" + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "" , [] , [] ) + [ Plain + [ Str "April" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "cruellest" + , Space + , Str "month," + , Space + , Str "breeding" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Lilacs" + , Space + , Str "out" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "dead" + , Space + , Str "land," + , Space + , Str "mixing" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Memory" + , Space + , Str "and" + , Space + , Str "desire," + , Space + , Str "stirring" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Dull" + , Space + , Str "roots" + , Space + , Str "with" + , Space + , Str "spring" + , Space + , Str "rain." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Winter" + , Space + , Str "kept" + , Space + , Str "us" + , Space + , Str "warm," + , Space + , Str "covering" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Earth" + , Space + , Str "in" + , Space + , Str "forgetful" + , Space + , Str "snow," + , Space + , Str "feeding" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "A" + , Space + , Str "little" + , Space + , Str "life" + , Space + , Str "with" + , Space + , Str "dried" + , Space + , Str "tubers." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Summer" + , Space + , Str "surprised" + , Space + , Str "us," + , Space + , Str "coming" + , Space + , Str "over" + , Space + , Str "the" + , Space + , Str "Starnbergersee" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "With" + , Space + , Str "a" + , Space + , Str "shower" + , Space + , Str "of" + , Space + , Str "rain;" + , Space + , Str "we" + , Space + , Str "stopped" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "colonnade," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "went" + , Space + , Str "on" + , Space + , Str "in" + , Space + , Str "sunlight," + , Space + , Str "into" + , Space + , Str "the" + , Space + , Str "Hofgarten," + , Span ( "" , [ "lnum" ] , [] ) [ Str "10" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "drank" + , Space + , Str "coffee," + , Space + , Str "and" + , Space + , Str "talked" + , Space + , Str "for" + , Space + , Str "an" + , Space + , Str "hour." + ] + ] + , Div + ( "" , [] , [ ( "lang" , "de" ) ] ) + [ Plain + [ Str "Bin" + , Space + , Str "gar" + , Space + , Str "keine" + , Space + , Str "Russin," + , Space + , Str "stamm'" + , Space + , Str "aus" + , Space + , Str "Litauen," + , Space + , Str "echt" + , SoftBreak + , Str "deutsch." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "when" + , Space + , Str "we" + , Space + , Str "were" + , Space + , Str "children," + , Space + , Str "staying" + , Space + , Str "at" + , Space + , Str "the" + , Space + , Str "archduke's," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "My" + , Space + , Str "cousin's," + , Space + , Str "he" + , Space + , Str "took" + , Space + , Str "me" + , Space + , Str "out" + , Space + , Str "on" + , Space + , Str "a" + , Space + , Str "sled," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "I" + , Space + , Str "was" + , Space + , Str "frightened." + , Space + , Str "He" + , Space + , Str "said," + , Space + , Str "Marie," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Marie," + , Space + , Str "hold" + , Space + , Str "on" + , Space + , Str "tight." + , Space + , Str "And" + , Space + , Str "down" + , Space + , Str "we" + , Space + , Str "went." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "In" + , Space + , Str "the" + , Space + , Str "mountains," + , Space + , Str "there" + , Space + , Str "you" + , Space + , Str "feel" + , Space + , Str "free." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "I" + , Space + , Str "read," + , Space + , Str "much" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "night," + , Space + , Str "and" + , Space + , Str "go" + , Space + , Str "south" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "winter." + ] + ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "" , [] , [] ) + [ Plain + [ Str "What" + , Space + , Str "are" + , Space + , Str "the" + , Space + , Str "roots" + , Space + , Str "that" + , Space + , Str "clutch," + , Space + , Str "what" + , Space + , Str "branches" + , Space + , Str "grow" + ] + ] + , Div + ( "wasteland-content.xhtml_ln20" , [] , [] ) + [ Plain + [ Str "Out" + , Space + , Str "of" + , Space + , Str "this" + , Space + , Str "stony" + , Space + , Str "rubbish?" + , Space + , Str "Son" + , Space + , Str "of" + , Space + , Str "man," + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "Line" , Space , Str "20." ] + ( "#wasteland-content.xhtml_ln20" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Ezekiel" + , Space + , Str "2:1." + ] + ] + , Span ( "" , [ "lnum" ] , [] ) [ Str "20" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "You" + , Space + , Str "cannot" + , Space + , Str "say," + , Space + , Str "or" + , Space + , Str "guess," + , Space + , Str "for" + , Space + , Str "you" + , Space + , Str "know" + , Space + , Str "only" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "A" + , Space + , Str "heap" + , Space + , Str "of" + , Space + , Str "broken" + , Space + , Str "images," + , Space + , Str "where" + , Space + , Str "the" + , Space + , Str "sun" + , Space + , Str "beats," + ] + ] + , Div + ( "wasteland-content.xhtml_ln23" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "the" + , Space + , Str "dead" + , Space + , Str "tree" + , Space + , Str "gives" + , Space + , Str "no" + , Space + , Str "shelter," + , Space + , Str "the" + , Space + , Str "cricket" + , Space + , Str "no" + , Space + , Str "relief," + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "23." ] + ( "#wasteland-content.xhtml_ln23" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Ecclesiastes" + , Space + , Str "12:5." + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "the" + , Space + , Str "dry" + , Space + , Str "stone" + , Space + , Str "no" + , Space + , Str "sound" + , Space + , Str "of" + , Space + , Str "water." + , Space + , Str "Only" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "There" + , Space + , Str "is" + , Space + , Str "shadow" + , Space + , Str "under" + , Space + , Str "this" + , Space + , Str "red" + , Space + , Str "rock," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "(Come" + , Space + , Str "in" + , Space + , Str "under" + , Space + , Str "the" + , Space + , Str "shadow" + , Space + , Str "of" + , Space + , Str "this" + , Space + , Str "red" + , Space + , Str "rock)," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "I" + , Space + , Str "will" + , Space + , Str "show" + , Space + , Str "you" + , Space + , Str "something" + , Space + , Str "different" + , Space + , Str "from" + , Space + , Str "either" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Your" + , Space + , Str "shadow" + , Space + , Str "at" + , Space + , Str "morning" + , Space + , Str "striding" + , Space + , Str "behind" + , Space + , Str "you" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Or" + , Space + , Str "your" + , Space + , Str "shadow" + , Space + , Str "at" + , Space + , Str "evening" + , Space + , Str "rising" + , Space + , Str "to" + , Space + , Str "meet" + , Space + , Str "you;" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "I" + , Space + , Str "will" + , Space + , Str "show" + , Space + , Str "you" + , Space + , Str "fear" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "handful" + , Space + , Str "of" + , Space + , Str "dust." + , Span ( "" , [ "lnum" ] , [] ) [ Str "30" ] + ] + ] + , BlockQuote + [ Div + ( "" , [] , [] ) + [ Div + ( "wasteland-content.xhtml_ln31" , [] , [] ) + [ Plain + [ Str "Frisch" + , Space + , Str "weht" + , Space + , Str "der" + , Space + , Str "Wind" + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "31." ] + ( "#wasteland-content.xhtml_ln31" + , "" + ) + , Space + , Str "V." + , Space + , Str "Tristan" + , Space + , Str "und" + , Space + , Str "Isolde," + , Space + , Str "i," + , Space + , Str "verses" + , Space + , Str "5-8." + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Der" + , Space + , Str "Heimat" + , Space + , Str "zu" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Mein" + , Space + , Str "Irisch" + , Space + , Str "Kind," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Wo" + , Space + , Str "weilest" + , Space + , Str "du?" + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"You" + , Space + , Str "gave" + , Space + , Str "me" + , Space + , Str "hyacinths" + , Space + , Str "first" + , Space + , Str "a" + , Space + , Str "year" + , Space + , Str "ago;" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"They" + , Space + , Str "called" + , Space + , Str "me" + , Space + , Str "the" + , Space + , Str "hyacinth" + , Space + , Str "girl.\"" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\8213Yet" + , Space + , Str "when" + , Space + , Str "we" + , Space + , Str "came" + , Space + , Str "back," + , Space + , Str "late," + , Space + , Str "from" + , Space + , Str "the" + , Space + , Str "Hyacinth" + , SoftBreak + , Str "garden," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Your" + , Space + , Str "arms" + , Space + , Str "full," + , Space + , Str "and" + , Space + , Str "your" + , Space + , Str "hair" + , Space + , Str "wet," + , Space + , Str "I" + , Space + , Str "could" + , Space + , Str "not" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Speak," + , Space + , Str "and" + , Space + , Str "my" + , Space + , Str "eyes" + , Space + , Str "failed," + , Space + , Str "I" + , Space + , Str "was" + , Space + , Str "neither" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Living" + , Space + , Str "nor" + , Space + , Str "dead," + , Space + , Str "and" + , Space + , Str "I" + , Space + , Str "knew" + , Space + , Str "nothing," + , Span ( "" , [ "lnum" ] , [] ) [ Str "40" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Looking" + , Space + , Str "into" + , Space + , Str "the" + , Space + , Str "heart" + , Space + , Str "of" + , Space + , Str "light," + , Space + , Str "the" + , Space + , Str "silence." + ] + ] + , Div + ( "wasteland-content.xhtml_ln42" + , [] + , [ ( "lang" , "de" ) ] + ) + [ Plain + [ Emph + [ Str "Od'" + , Space + , Str "und" + , Space + , Str "leer" + , Space + , Str "das" + , Space + , Str "Meer" + ] + , Str "." + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "42." ] + ( "#wasteland-content.xhtml_ln42" + , "" + ) + , Space + , Str "Id." + , Space + , Str "iii," + , Space + , Str "verse" + , Space + , Str "24." + ] + ] + ] + ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "" , [] , [] ) + [ Plain + [ Str "Madame" + , Space + , Str "Sosostris," + , Space + , Str "famous" + , Space + , Str "clairvoyante," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Had" + , Space + , Str "a" + , Space + , Str "bad" + , Space + , Str "cold," + , Space + , Str "nevertheless" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Is" + , Space + , Str "known" + , Space + , Str "to" + , Space + , Str "be" + , Space + , Str "the" + , Space + , Str "wisest" + , Space + , Str "woman" + , Space + , Str "in" + , Space + , Str "Europe," + ] + ] + , Div + ( "wasteland-content.xhtml_ln46" , [] , [] ) + [ Plain + [ Str "With" + , Space + , Str "a" + , Space + , Str "wicked" + , Space + , Str "pack" + , Space + , Str "of" + , Space + , Str "cards." + , Space + , Str "Here," + , Space + , Str "said" + , Space + , Str "she," + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "46." ] + ( "#wasteland-content.xhtml_ln46" + , "" + ) + , Space + , Str "I" + , Space + , Str "am" + , Space + , Str "not" + , Space + , Str "familiar" + , Space + , Str "with" + , Space + , Str "the" + , Space + , Str "exact" + , Space + , Str "constitution" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "Tarot" + , Space + , Str "pack" + , Space + , Str "of" + , SoftBreak + , Str "cards," + , Space + , Str "from" + , Space + , Str "which" + , Space + , Str "I" + , Space + , Str "have" + , Space + , Str "obviously" + , Space + , Str "departed" + , Space + , Str "to" + , Space + , Str "suit" + , Space + , Str "my" + , Space + , Str "own" + , Space + , Str "convenience." + , SoftBreak + , Str "The" + , Space + , Str "Hanged" + , Space + , Str "Man," + , Space + , Str "a" + , Space + , Str "member" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "traditional" + , Space + , Str "pack," + , Space + , Str "fits" + , Space + , Str "my" + , Space + , Str "purpose" + , Space + , Str "in" + , Space + , Str "two" + , SoftBreak + , Str "ways:" + , Space + , Str "because" + , Space + , Str "he" + , Space + , Str "is" + , Space + , Str "associated" + , Space + , Str "in" + , Space + , Str "my" + , Space + , Str "mind" + , Space + , Str "with" + , Space + , Str "the" + , Space + , Str "Hanged" + , Space + , Str "God" + , Space + , Str "of" + , Space + , Str "Frazer," + , SoftBreak + , Str "and" + , Space + , Str "because" + , Space + , Str "I" + , Space + , Str "associate" + , Space + , Str "him" + , Space + , Str "with" + , Space + , Str "the" + , Space + , Str "hooded" + , Space + , Str "figure" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "passage" + , Space + , Str "of" + , Space + , Str "the" + , SoftBreak + , Str "disciples" + , Space + , Str "to" + , Space + , Str "Emmaus" + , Space + , Str "in" + , Space + , Str "Part" + , Space + , Str "V." + , Space + , Str "The" + , Space + , Str "Phoenician" + , Space + , Str "Sailor" + , Space + , Str "and" + , Space + , Str "the" + , Space + , Str "Merchant" + , SoftBreak + , Str "appear" + , Space + , Str "later;" + , Space + , Str "also" + , Space + , Str "the" + , Space + , Str "\"crowds" + , Space + , Str "of" + , Space + , Str "people,\"" + , Space + , Str "and" + , Space + , Str "Death" + , Space + , Str "by" + , Space + , Str "Water" + , Space + , Str "is" + , SoftBreak + , Str "executed" + , Space + , Str "in" + , Space + , Str "Part" + , Space + , Str "IV." + , Space + , Str "The" + , Space + , Str "Man" + , Space + , Str "with" + , Space + , Str "Three" + , Space + , Str "Staves" + , Space + , Str "(an" + , Space + , Str "authentic" + , Space + , Str "member" + , Space + , Str "of" + , SoftBreak + , Str "the" + , Space + , Str "Tarot" + , Space + , Str "pack)" + , Space + , Str "I" + , Space + , Str "associate," + , Space + , Str "quite" + , Space + , Str "arbitrarily," + , Space + , Str "with" + , Space + , Str "the" + , Space + , Str "Fisher" + , Space + , Str "King" + , SoftBreak + , Str "himself." + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Is" + , Space + , Str "your" + , Space + , Str "card," + , Space + , Str "the" + , Space + , Str "drowned" + , Space + , Str "Phoenician" + , Space + , Str "Sailor," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "(Those" + , Space + , Str "are" + , Space + , Str "pearls" + , Space + , Str "that" + , Space + , Str "were" + , Space + , Str "his" + , Space + , Str "eyes." + , Space + , Str "Look!)" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Here" + , Space + , Str "is" + , Space + , Str "Belladonna," + , Space + , Str "the" + , Space + , Str "Lady" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "Rocks," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "The" + , Space + , Str "lady" + , Space + , Str "of" + , Space + , Str "situations." + , Span ( "" , [ "lnum" ] , [] ) [ Str "50" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Here" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "man" + , Space + , Str "with" + , Space + , Str "three" + , Space + , Str "staves," + , Space + , Str "and" + , Space + , Str "here" + , Space + , Str "the" + , Space + , Str "Wheel," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "here" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "one-eyed" + , Space + , Str "merchant," + , Space + , Str "and" + , Space + , Str "this" + , Space + , Str "card," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Which" + , Space + , Str "is" + , Space + , Str "blank," + , Space + , Str "is" + , Space + , Str "something" + , Space + , Str "he" + , Space + , Str "carries" + , Space + , Str "on" + , Space + , Str "his" + , Space + , Str "back," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Which" + , Space + , Str "I" + , Space + , Str "am" + , Space + , Str "forbidden" + , Space + , Str "to" + , Space + , Str "see." + , Space + , Str "I" + , Space + , Str "do" + , Space + , Str "not" + , Space + , Str "find" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "The" + , Space + , Str "Hanged" + , Space + , Str "Man." + , Space + , Str "Fear" + , Space + , Str "death" + , Space + , Str "by" + , Space + , Str "water." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "I" + , Space + , Str "see" + , Space + , Str "crowds" + , Space + , Str "of" + , Space + , Str "people," + , Space + , Str "walking" + , Space + , Str "round" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "ring." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Thank" + , Space + , Str "you." + , Space + , Str "If" + , Space + , Str "you" + , Space + , Str "see" + , Space + , Str "dear" + , Space + , Str "Mrs." + , Space + , Str "Equitone," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Tell" + , Space + , Str "her" + , Space + , Str "I" + , Space + , Str "bring" + , Space + , Str "the" + , Space + , Str "horoscope" + , Space + , Str "myself:" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "One" + , Space + , Str "must" + , Space + , Str "be" + , Space + , Str "so" + , Space + , Str "careful" + , Space + , Str "these" + , Space + , Str "days." + ] + ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "wasteland-content.xhtml_ln60" , [] , [] ) + [ Plain + [ Str "Unreal" + , Space + , Str "City," + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "60." ] + ( "#wasteland-content.xhtml_ln60" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Baudelaire:" + ] + , BlockQuote + [ Para + [ Str "\"Fourmillante" + , Space + , Str "cite;," + , Space + , Str "cite;" + , Space + , Str "pleine" + , Space + , Str "de" + , Space + , Str "reves," + , LineBreak + , Str "Ou" + , Space + , Str "le" + , Space + , Str "spectre" + , Space + , Str "en" + , SoftBreak + , Str "plein" + , Space + , Str "jour" + , Space + , Str "raccroche" + , Space + , Str "le" + , Space + , Str "passant.\"" + ] + ] + ] + , Span ( "" , [ "lnum" ] , [] ) [ Str "60" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Under" + , Space + , Str "the" + , Space + , Str "brown" + , Space + , Str "fog" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "winter" + , Space + , Str "dawn," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "A" + , Space + , Str "crowd" + , Space + , Str "flowed" + , Space + , Str "over" + , Space + , Str "London" + , Space + , Str "Bridge," + , Space + , Str "so" + , Space + , Str "many," + ] + ] + , Div + ( "wasteland-content.xhtml_ln63" , [] , [] ) + [ Plain + [ Str "I" + , Space + , Str "had" + , Space + , Str "not" + , Space + , Str "thought" + , Space + , Str "death" + , Space + , Str "had" + , Space + , Str "undone" + , Space + , Str "so" + , Space + , Str "many." + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "63." ] + ( "#wasteland-content.xhtml_ln63" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Inferno," + , Space + , Str "iii." + , Space + , Str "55-7." + ] + , BlockQuote + [ Para + [ Str "\"si" + , Space + , Str "lunga" + , Space + , Str "tratta" + , LineBreak + , Str "di" + , Space + , Str "gente," + , Space + , Str "ch'io" + , Space + , Str "non" + , Space + , Str "avrei" + , Space + , Str "mai" + , Space + , Str "creduto" + , LineBreak + , Str "che" + , SoftBreak + , Str "morte" + , Space + , Str "tanta" + , Space + , Str "n'avesse" + , Space + , Str "disfatta.\"" + ] + ] + ] + ] + ] + , Div + ( "wasteland-content.xhtml_ln64" , [] , [] ) + [ Plain + [ Str "Sighs," + , Space + , Str "short" + , Space + , Str "and" + , Space + , Str "infrequent," + , Space + , Str "were" + , Space + , Str "exhaled," + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "64." ] + ( "#wasteland-content.xhtml_ln64" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Inferno," + , Space + , Str "iv." + , Space + , Str "25-7:" + ] + , BlockQuote + [ Para + [ Str "\"Quivi," + , Space + , Str "secondo" + , Space + , Str "che" + , Space + , Str "per" + , Space + , Str "ascoltahre," + , LineBreak + , Str "\"non" + , Space + , Str "avea" + , Space + , Str "pianto," + , Space + , Str "ma'" + , Space + , Str "che" + , Space + , Str "di" + , SoftBreak + , Str "sospiri," + , LineBreak + , Str "\"che" + , Space + , Str "l'aura" + , Space + , Str "eterna" + , Space + , Str "facevan" + , Space + , Str "tremare.\"" + ] + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "each" + , Space + , Str "man" + , Space + , Str "fixed" + , Space + , Str "his" + , Space + , Str "eyes" + , Space + , Str "before" + , Space + , Str "his" + , Space + , Str "feet." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Flowed" + , Space + , Str "up" + , Space + , Str "the" + , Space + , Str "hill" + , Space + , Str "and" + , Space + , Str "down" + , Space + , Str "King" + , Space + , Str "William" + , Space + , Str "Street," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "To" + , Space + , Str "where" + , Space + , Str "Saint" + , Space + , Str "Mary" + , Space + , Str "Woolnoth" + , Space + , Str "kept" + , Space + , Str "the" + , Space + , Str "hours" + ] + ] + , Div + ( "wasteland-content.xhtml_ln68" , [] , [] ) + [ Plain + [ Str "With" + , Space + , Str "a" + , Space + , Str "dead" + , Space + , Str "sound" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "final" + , Space + , Str "stroke" + , Space + , Str "of" + , Space + , Str "nine." + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "68." ] + ( "#wasteland-content.xhtml_ln68" + , "" + ) + , Space + , Str "A" + , Space + , Str "phenomenon" + , Space + , Str "which" + , Space + , Str "I" + , Space + , Str "have" + , Space + , Str "often" + , Space + , Str "noticed." + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "There" + , Space + , Str "I" + , Space + , Str "saw" + , Space + , Str "one" + , Space + , Str "I" + , Space + , Str "knew," + , Space + , Str "and" + , Space + , Str "stopped" + , Space + , Str "him," + , Space + , Str "crying" + , SoftBreak + , Str "\"Stetson!" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"You" + , Space + , Str "who" + , Space + , Str "were" + , Space + , Str "with" + , Space + , Str "me" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "ships" + , Space + , Str "at" + , Space + , Str "Mylae!" + , Span ( "" , [ "lnum" ] , [] ) [ Str "70" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"That" + , Space + , Str "corpse" + , Space + , Str "you" + , Space + , Str "planted" + , Space + , Str "last" + , Space + , Str "year" + , Space + , Str "in" + , Space + , Str "your" + , Space + , Str "garden," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"Has" + , Space + , Str "it" + , Space + , Str "begun" + , Space + , Str "to" + , Space + , Str "sprout?" + , Space + , Str "Will" + , Space + , Str "it" + , Space + , Str "bloom" + , Space + , Str "this" + , Space + , Str "year?" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"Or" + , Space + , Str "has" + , Space + , Str "the" + , Space + , Str "sudden" + , Space + , Str "frost" + , Space + , Str "disturbed" + , Space + , Str "its" + , Space + , Str "bed?" + ] + ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "wasteland-content.xhtml_ln74" , [] , [] ) + [ Plain + [ Str "\"Oh" + , Space + , Str "keep" + , Space + , Str "the" + , Space + , Str "Dog" + , Space + , Str "far" + , Space + , Str "hence," + , Space + , Str "that's" + , Space + , Str "friend" + , Space + , Str "to" + , Space + , Str "men," + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "74." ] + ( "#wasteland-content.xhtml_ln74" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "the" + , Space + , Str "Dirge" + , Space + , Str "in" + , Space + , Str "Webster's" + , Space + , Str "White" + , Space + , Str "Devil" + , Space + , Str "." + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"Or" + , Space + , Str "with" + , Space + , Str "his" + , Space + , Str "nails" + , Space + , Str "he'll" + , Space + , Str "dig" + , Space + , Str "it" + , Space + , Str "up" + , Space + , Str "again!" + ] + ] + , Div + ( "wasteland-content.xhtml_ln76" , [] , [] ) + [ Plain + [ Str "\"You!" + , Space + , Span + ( "" , [] , [ ( "lang" , "fr" ) ] ) + [ Str "hypocrite" + , Space + , Str "lecteur!" + , Space + , Str "-" + , Space + , Str "mon" + , Space + , Str "semblable," + , Space + , Str "-" + , SoftBreak + , Str "mon" + , Space + , Str "frere" + ] + , Space + , Str "!\"" + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "76." ] + ( "#wasteland-content.xhtml_ln76" + , "" + ) + , Space + , Str "V." + , Space + , Str "Baudelaire," + , Space + , Str "Preface" + , Space + , Str "to" + , Space + , Str "Fleurs" + , Space + , Str "du" + , Space + , Str "Mal." + ] + ] + ] + ] + ] + ] + , Div + ( "wasteland-content.xhtml_ch2" , [ "section" ] , [] ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "II." + , Space + , Str "A" + , Space + , Str "GAME" + , Space + , Str "OF" + , Space + , Str "CHESS" + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "wasteland-content.xhtml_ln77" , [] , [] ) + [ Plain + [ Str "The" + , Space + , Str "Chair" + , Space + , Str "she" + , Space + , Str "sat" + , Space + , Str "in," + , Space + , Str "like" + , Space + , Str "a" + , Space + , Str "burnished" + , Space + , Str "throne," + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "77." ] + ( "#wasteland-content.xhtml_ln77" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Antony" + , Space + , Str "and" + , Space + , Str "Cleopatra," + , Space + , Str "II." + , Space + , Str "ii.," + , Space + , Str "l." + , Space + , Str "190." + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Glowed" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "marble," + , Space + , Str "where" + , Space + , Str "the" + , Space + , Str "glass" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Held" + , Space + , Str "up" + , Space + , Str "by" + , Space + , Str "standards" + , Space + , Str "wrought" + , Space + , Str "with" + , Space + , Str "fruited" + , Space + , Str "vines" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "From" + , Space + , Str "which" + , Space + , Str "a" + , Space + , Str "golden" + , Space + , Str "Cupidon" + , Space + , Str "peeped" + , Space + , Str "out" + , Span ( "" , [ "lnum" ] , [] ) [ Str "80" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "(Another" + , Space + , Str "hid" + , Space + , Str "his" + , Space + , Str "eyes" + , Space + , Str "behind" + , Space + , Str "his" + , Space + , Str "wing)" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Doubled" + , Space + , Str "the" + , Space + , Str "flames" + , Space + , Str "of" + , Space + , Str "sevenbranched" + , Space + , Str "candelabra" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Reflecting" + , Space + , Str "light" + , Space + , Str "upon" + , Space + , Str "the" + , Space + , Str "table" + , Space + , Str "as" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "The" + , Space + , Str "glitter" + , Space + , Str "of" + , Space + , Str "her" + , Space + , Str "jewels" + , Space + , Str "rose" + , Space + , Str "to" + , Space + , Str "meet" + , Space + , Str "it," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "From" + , Space + , Str "satin" + , Space + , Str "cases" + , Space + , Str "poured" + , Space + , Str "in" + , Space + , Str "rich" + , Space + , Str "profusion;" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "In" + , Space + , Str "vials" + , Space + , Str "of" + , Space + , Str "ivory" + , Space + , Str "and" + , Space + , Str "coloured" + , Space + , Str "glass" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Unstoppered," + , Space + , Str "lurked" + , Space + , Str "her" + , Space + , Str "strange" + , Space + , Str "synthetic" + , Space + , Str "perfumes," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Unguent," + , Space + , Str "powdered," + , Space + , Str "or" + , Space + , Str "liquid" + , Space + , Str "-" + , Space + , Str "troubled," + , Space + , Str "confused" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "drowned" + , Space + , Str "the" + , Space + , Str "sense" + , Space + , Str "in" + , Space + , Str "odours;" + , Space + , Str "stirred" + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "air" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "That" + , Space + , Str "freshened" + , Space + , Str "from" + , Space + , Str "the" + , Space + , Str "window," + , Space + , Str "these" + , Space + , Str "ascended" + , Span ( "" , [ "lnum" ] , [] ) [ Str "90" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "In" + , Space + , Str "fattening" + , Space + , Str "the" + , Space + , Str "prolonged" + , Space + , Str "candle-flames," + ] + ] + , Div + ( "wasteland-content.xhtml_ln92" , [] , [] ) + [ Plain + [ Str "Flung" + , Space + , Str "their" + , Space + , Str "smoke" + , Space + , Str "into" + , Space + , Str "the" + , Space + , Str "laquearia," + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "92." ] + ( "#wasteland-content.xhtml_ln92" + , "" + ) + , Space + , Str "Laquearia." + , Space + , Str "V." + , Space + , Str "Aeneid," + , Space + , Str "I." + , Space + , Str "726:" + ] + , BlockQuote + [ Para + [ Str "dependent" + , Space + , Str "lychni" + , Space + , Str "laquearibus" + , Space + , Str "aureis" + , Space + , Str "incensi," + , Space + , Str "et" + , Space + , Str "noctem" + , SoftBreak + , Str "flammis" + , LineBreak + , Str "funalia" + , Space + , Str "vincunt." + ] + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Stirring" + , Space + , Str "the" + , Space + , Str "pattern" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "coffered" + , Space + , Str "ceiling." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Huge" + , Space + , Str "sea-wood" + , Space + , Str "fed" + , Space + , Str "with" + , Space + , Str "copper" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Burned" + , Space + , Str "green" + , Space + , Str "and" + , Space + , Str "orange," + , Space + , Str "framed" + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "coloured" + , Space + , Str "stone," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "In" + , Space + , Str "which" + , Space + , Str "sad" + , Space + , Str "light" + , Space + , Str "a" + , Space + , Str "carved" + , Space + , Str "dolphin" + , Space + , Str "swam." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Above" + , Space + , Str "the" + , Space + , Str "antique" + , Space + , Str "mantel" + , Space + , Str "was" + , Space + , Str "displayed" + ] + ] + , Div + ( "wasteland-content.xhtml_ln98" , [] , [] ) + [ Plain + [ Str "As" + , Space + , Str "though" + , Space + , Str "a" + , Space + , Str "window" + , Space + , Str "gave" + , Space + , Str "upon" + , Space + , Str "the" + , Space + , Str "sylvan" + , Space + , Str "scene" + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "98." ] + ( "#wasteland-content.xhtml_ln98" + , "" + ) + , Space + , Str "Sylvan" + , Space + , Str "scene." + , Space + , Str "V." + , Space + , Str "Milton," + , Space + , Str "Paradise" + , Space + , Str "Lost," + , Space + , Str "iv." + , Space + , Str "140." + ] + ] + ] + ] + , Div + ( "wasteland-content.xhtml_ln99" , [] , [] ) + [ Plain + [ Str "The" + , Space + , Str "change" + , Space + , Str "of" + , Space + , Str "Philomel," + , Space + , Str "by" + , Space + , Str "the" + , Space + , Str "barbarous" + , Space + , Str "king" + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "99." ] + ( "#wasteland-content.xhtml_ln99" + , "" + ) + , Space + , Str "V." + , Space + , Str "Ovid," + , Space + , Str "Metamorphoses," + , Space + , Str "vi," + , Space + , Str "Philomela." + ] + ] + ] + ] + , Div + ( "wasteland-content.xhtml_ln100" , [] , [] ) + [ Plain + [ Str "So" + , Space + , Str "rudely" + , Space + , Str "forced;" + , Space + , Str "yet" + , Space + , Str "there" + , Space + , Str "the" + , Space + , Str "nightingale" + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "100." ] + ( "#wasteland-content.xhtml_ln100" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Part" + , Space + , Str "III," + , Space + , Str "l." + , Space + , Str "204." + ] + ] + , SoftBreak + , Span ( "" , [ "lnum" ] , [] ) [ Str "100" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Filled" + , Space + , Str "all" + , Space + , Str "the" + , Space + , Str "desert" + , Space + , Str "with" + , Space + , Str "inviolable" + , Space + , Str "voice" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "still" + , Space + , Str "she" + , Space + , Str "cried," + , Space + , Str "and" + , Space + , Str "still" + , Space + , Str "the" + , Space + , Str "world" + , Space + , Str "pursues," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"Jug" + , Space + , Str "Jug\"" + , Space + , Str "to" + , Space + , Str "dirty" + , Space + , Str "ears." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "other" + , Space + , Str "withered" + , Space + , Str "stumps" + , Space + , Str "of" + , Space + , Str "time" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Were" + , Space + , Str "told" + , Space + , Str "upon" + , Space + , Str "the" + , Space + , Str "walls;" + , Space + , Str "staring" + , Space + , Str "forms" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Leaned" + , Space + , Str "out," + , Space + , Str "leaning," + , Space + , Str "hushing" + , Space + , Str "the" + , Space + , Str "room" + , Space + , Str "enclosed." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Footsteps" + , Space + , Str "shuffled" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "stair." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Under" + , Space + , Str "the" + , Space + , Str "firelight," + , Space + , Str "under" + , Space + , Str "the" + , Space + , Str "brush," + , Space + , Str "her" + , Space + , Str "hair" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Spread" + , Space + , Str "out" + , Space + , Str "in" + , Space + , Str "fiery" + , Space + , Str "points" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Glowed" + , Space + , Str "into" + , Space + , Str "words," + , Space + , Str "then" + , Space + , Str "would" + , Space + , Str "be" + , Space + , Str "savagely" + , Space + , Str "still." + , Span ( "" , [ "lnum" ] , [] ) [ Str "110" ] + ] + ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "" , [] , [] ) + [ Plain + [ Str "\"My" + , Space + , Str "nerves" + , Space + , Str "are" + , Space + , Str "bad" + , Space + , Str "to-night." + , Space + , Str "Yes," + , Space + , Str "bad." + , Space + , Str "Stay" + , Space + , Str "with" + , Space + , Str "me." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"Speak" + , Space + , Str "to" + , Space + , Str "me." + , Space + , Str "Why" + , Space + , Str "do" + , Space + , Str "you" + , Space + , Str "never" + , Space + , Str "speak." + , Space + , Str "Speak." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"What" + , Space + , Str "are" + , Space + , Str "you" + , Space + , Str "thinking" + , Space + , Str "of?" + , Space + , Str "What" + , Space + , Str "thinking?" + , Space + , Str "What?" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"I" + , Space + , Str "never" + , Space + , Str "know" + , Space + , Str "what" + , Space + , Str "you" + , Space + , Str "are" + , Space + , Str "thinking." + , Space + , Str "Think.\"" + ] + ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "wasteland-content.xhtml_ln115" , [] , [] ) + [ Plain + [ Str "I" + , Space + , Str "think" + , Space + , Str "we" + , Space + , Str "are" + , Space + , Str "in" + , Space + , Str "rats'" + , Space + , Str "alley" + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "115." ] + ( "#wasteland-content.xhtml_ln115" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Part" + , Space + , Str "III," + , Space + , Str "l." + , Space + , Str "195." + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Where" + , Space + , Str "the" + , Space + , Str "dead" + , Space + , Str "men" + , Space + , Str "lost" + , Space + , Str "their" + , Space + , Str "bones." + ] + ] + ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "" , [] , [] ) + [ Plain + [ Str "\"What" + , Space + , Str "is" + , Space + , Str "that" + , Space + , Str "noise?\"" + ] + ] + , Div + ( "wasteland-content.xhtml_ln118" + , [ "indent" ] + , [] + ) + [ Plain + [ Str "The" + , Space + , Str "wind" + , Space + , Str "under" + , Space + , Str "the" + , Space + , Str "door." + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "118." ] + ( "#wasteland-content.xhtml_ln118" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Webster:" + ] + , BlockQuote + [ Para + [ Str "\"Is" + , Space + , Str "the" + , Space + , Str "wind" + , Space + , Str "in" + , Space + , Str "that" + , Space + , Str "door" + , Space + , Str "still?\"" + ] + ] + ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"What" + , Space + , Str "is" + , Space + , Str "that" + , Space + , Str "noise" + , Space + , Str "now?" + , Space + , Str "What" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "wind" + , Space + , Str "doing?\"" + ] + ] + , Div + ( "" , [ "indent" ] , [] ) + [ Plain + [ Str "Nothing" + , Space + , Str "again" + , Space + , Str "nothing." + , Span ( "" , [ "lnum" ] , [] ) [ Str "120" ] + ] + ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div ( "" , [] , [] ) [ Plain [ Str "\"Do" ] ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"You" + , Space + , Str "know" + , Space + , Str "nothing?" + , Space + , Str "Do" + , Space + , Str "you" + , Space + , Str "see" + , Space + , Str "nothing?" + , Space + , Str "Do" + , Space + , Str "you" + , Space + , Str "remember" + ] + ] + , Div ( "" , [] , [] ) [ Plain [ Str "\"Nothing?\"" ] ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "" , [] , [] ) + [ Plain [ Str "I" , Space , Str "remember" ] ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Those" + , Space + , Str "are" + , Space + , Str "pearls" + , Space + , Str "that" + , Space + , Str "were" + , Space + , Str "his" + , Space + , Str "eyes." + ] + ] + , Div + ( "wasteland-content.xhtml_ln126" , [] , [] ) + [ Plain + [ Str "\"Are" + , Space + , Str "you" + , Space + , Str "alive," + , Space + , Str "or" + , Space + , Str "not?" + , Space + , Str "Is" + , Space + , Str "there" + , Space + , Str "nothing" + , Space + , Str "in" + , Space + , Str "your" + , Space + , Str "head?\"" + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "126." ] + ( "#wasteland-content.xhtml_ln126" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "Part" + , Space + , Str "I," + , Space + , Str "l." + , Space + , Str "37," + , Space + , Str "48." + ] + ] + ] + ] + , Div ( "" , [] , [] ) [ Plain [ Str "But" ] ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "O" + , Space + , Str "O" + , Space + , Str "O" + , Space + , Str "O" + , Space + , Str "that" + , Space + , Str "Shakespeherian" + , Space + , Str "Rag\8213" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "It's" + , Space + , Str "so" + , Space + , Str "elegant" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "So" + , Space + , Str "intelligent" + , Span ( "" , [ "lnum" ] , [] ) [ Str "130" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"What" + , Space + , Str "shall" + , Space + , Str "I" + , Space + , Str "do" + , Space + , Str "now?" + , Space + , Str "What" + , Space + , Str "shall" + , Space + , Str "I" + , Space + , Str "do?\"" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "I" + , Space + , Str "shall" + , Space + , Str "rush" + , Space + , Str "out" + , Space + , Str "as" + , Space + , Str "I" + , Space + , Str "am," + , Space + , Str "and" + , Space + , Str "walk" + , Space + , Str "the" + , Space + , Str "street" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"With" + , Space + , Str "my" + , Space + , Str "hair" + , Space + , Str "down," + , Space + , Str "so." + , Space + , Str "What" + , Space + , Str "shall" + , Space + , Str "we" + , Space + , Str "do" + , Space + , Str "to-morrow?" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "\"What" + , Space + , Str "shall" + , Space + , Str "we" + , Space + , Str "ever" + , Space + , Str "do?\"" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "The" + , Space + , Str "hot" + , Space + , Str "water" + , Space + , Str "at" + , Space + , Str "ten." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "if" + , Space + , Str "it" + , Space + , Str "rains," + , Space + , Str "a" + , Space + , Str "closed" + , Space + , Str "car" + , Space + , Str "at" + , Space + , Str "four." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "we" + , Space + , Str "shall" + , Space + , Str "play" + , Space + , Str "a" + , Space + , Str "game" + , Space + , Str "of" + , Space + , Str "chess," + ] + ] + , Div + ( "wasteland-content.xhtml_ln138" , [] , [] ) + [ Plain + [ Str "Pressing" + , Space + , Str "lidless" + , Space + , Str "eyes" + , Space + , Str "and" + , Space + , Str "waiting" + , Space + , Str "for" + , Space + , Str "a" + , Space + , Str "knock" + , Space + , Str "upon" + , Space + , Str "the" + , Space + , Str "door." + , Note + [ Para + [ Link + ( "" , [] , [] ) + [ Str "138." ] + ( "#wasteland-content.xhtml_ln138" + , "" + ) + , Space + , Str "Cf." + , Space + , Str "the" + , Space + , Str "game" + , Space + , Str "of" + , Space + , Str "chess" + , Space + , Str "in" + , Space + , Str "Middleton's" + , Space + , Str "Women" + , Space + , Str "beware" + , Space + , Str "Women." + ] + ] + ] + ] + ] + , Div + ( "" , [ "linegroup" ] , [] ) + [ Div + ( "" , [] , [] ) + [ Plain + [ Str "When" + , Space + , Str "Lil's" + , Space + , Str "husband" + , Space + , Str "got" + , Space + , Str "demobbed," + , Space + , Str "I" + , Space + , Str "said" + , Space + , Str "-" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "I" + , Space + , Str "didn't" + , Space + , Str "mince" + , Space + , Str "my" + , Space + , Str "words," + , Space + , Str "I" + , Space + , Str "said" + , Space + , Str "to" + , Space + , Str "her" + , Space + , Str "myself," + , Span ( "" , [ "lnum" ] , [] ) [ Str "140" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "HURRY" + , Space + , Str "UP" + , Space + , Str "PLEASE" + , Space + , Str "ITS" + , Space + , Str "TIME" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Now" + , Space + , Str "Albert's" + , Space + , Str "coming" + , Space + , Str "back," + , Space + , Str "make" + , Space + , Str "yourself" + , Space + , Str "a" + , Space + , Str "bit" + , Space + , Str "smart." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "He'll" + , Space + , Str "want" + , Space + , Str "to" + , Space + , Str "know" + , Space + , Str "what" + , Space + , Str "you" + , Space + , Str "done" + , Space + , Str "with" + , Space + , Str "that" + , Space + , Str "money" + , Space + , Str "he" + , Space + , Str "gave" + , SoftBreak + , Str "you" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "To" + , Space + , Str "get" + , Space + , Str "yourself" + , Space + , Str "some" + , Space + , Str "teeth." + , Space + , Str "He" + , Space + , Str "did," + , Space + , Str "I" + , Space + , Str "was" + , Space + , Str "there." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "You" + , Space + , Str "have" + , Space + , Str "them" + , Space + , Str "all" + , Space + , Str "out," + , Space + , Str "Lil," + , Space + , Str "and" + , Space + , Str "get" + , Space + , Str "a" + , Space + , Str "nice" + , Space + , Str "set," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "He" + , Space + , Str "said," + , Space + , Str "I" + , Space + , Str "swear," + , Space + , Str "I" + , Space + , Str "can't" + , Space + , Str "bear" + , Space + , Str "to" + , Space + , Str "look" + , Space + , Str "at" + , Space + , Str "you." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "no" + , Space + , Str "more" + , Space + , Str "can't" + , Space + , Str "I," + , Space + , Str "I" + , Space + , Str "said," + , Space + , Str "and" + , Space + , Str "think" + , Space + , Str "of" + , Space + , Str "poor" + , Space + , Str "Albert," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "He's" + , Space + , Str "been" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "army" + , Space + , Str "four" + , Space + , Str "years," + , Space + , Str "he" + , Space + , Str "wants" + , Space + , Str "a" + , Space + , Str "good" + , Space + , Str "time," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "if" + , Space + , Str "you" + , Space + , Str "don't" + , Space + , Str "give" + , Space + , Str "it" + , Space + , Str "him," + , Space + , Str "there's" + , Space + , Str "others" + , Space + , Str "will," + , Space + , Str "I" + , SoftBreak + , Str "said." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Oh" + , Space + , Str "is" + , Space + , Str "there," + , Space + , Str "she" + , Space + , Str "said." + , Space + , Str "Something" + , Space + , Str "o'" + , Space + , Str "that," + , Space + , Str "I" + , Space + , Str "said." + , Span ( "" , [ "lnum" ] , [] ) [ Str "150" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Then" + , Space + , Str "I'll" + , Space + , Str "know" + , Space + , Str "who" + , Space + , Str "to" + , Space + , Str "thank," + , Space + , Str "she" + , Space + , Str "said," + , Space + , Str "and" + , Space + , Str "give" + , Space + , Str "me" + , Space + , Str "a" + , Space + , Str "straight" + , SoftBreak + , Str "look." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "HURRY" + , Space + , Str "UP" + , Space + , Str "PLEASE" + , Space + , Str "ITS" + , Space + , Str "TIME" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "If" + , Space + , Str "you" + , Space + , Str "don't" + , Space + , Str "like" + , Space + , Str "it" + , Space + , Str "you" + , Space + , Str "can" + , Space + , Str "get" + , Space + , Str "on" + , Space + , Str "with" + , Space + , Str "it," + , Space + , Str "I" + , Space + , Str "said." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Others" + , Space + , Str "can" + , Space + , Str "pick" + , Space + , Str "and" + , Space + , Str "choose" + , Space + , Str "if" + , Space + , Str "you" + , Space + , Str "can't." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "But" + , Space + , Str "if" + , Space + , Str "Albert" + , Space + , Str "makes" + , Space + , Str "off," + , Space + , Str "it" + , Space + , Str "won't" + , Space + , Str "be" + , Space + , Str "for" + , Space + , Str "lack" + , Space + , Str "of" + , SoftBreak + , Str "telling." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "You" + , Space + , Str "ought" + , Space + , Str "to" + , Space + , Str "be" + , Space + , Str "ashamed," + , Space + , Str "I" + , Space + , Str "said," + , Space + , Str "to" + , Space + , Str "look" + , Space + , Str "so" + , Space + , Str "antique." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "(And" + , Space + , Str "her" + , Space + , Str "only" + , Space + , Str "thirty-one.)" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "I" + , Space + , Str "can't" + , Space + , Str "help" + , Space + , Str "it," + , Space + , Str "she" + , Space + , Str "said," + , Space + , Str "pulling" + , Space + , Str "a" + , Space + , Str "long" + , Space + , Str "face," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "It's" + , Space + , Str "them" + , Space + , Str "pills" + , Space + , Str "I" + , Space + , Str "took," + , Space + , Str "to" + , Space + , Str "bring" + , Space + , Str "it" + , Space + , Str "off," + , Space + , Str "she" + , Space + , Str "said." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "(She's" + , Space + , Str "had" + , Space + , Str "five" + , Space + , Str "already," + , Space + , Str "and" + , Space + , Str "nearly" + , Space + , Str "died" + , Space + , Str "of" + , Space + , Str "young" + , Space + , Str "George.)" + , Span ( "" , [ "lnum" ] , [] ) [ Str "160" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "The" + , Space + , Str "chemist" + , Space + , Str "said" + , Space + , Str "it" + , Space + , Str "would" + , Space + , Str "be" + , Space + , Str "all" + , Space + , Str "right," + , Space + , Str "but" + , Space + , Str "I've" + , Space + , Str "never" + , Space + , Str "been" + , Space + , Str "the" + , SoftBreak + , Str "same." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "You" + , Space + , Emph [ Str "are" ] + , Space + , Str "a" + , Space + , Str "proper" + , Space + , Str "fool," + , Space + , Str "I" + , Space + , Str "said." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Well," + , Space + , Str "if" + , Space + , Str "Albert" + , Space + , Str "won't" + , Space + , Str "leave" + , Space + , Str "you" + , Space + , Str "alone," + , Space + , Str "there" + , Space + , Str "it" + , Space + , Str "is," + , Space + , Str "I" + , SoftBreak + , Str "said," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "What" + , Space + , Str "you" + , Space + , Str "get" + , Space + , Str "married" + , Space + , Str "for" + , Space + , Str "if" + , Space + , Str "you" + , Space + , Str "don't" + , Space + , Str "want" + , Space + , Str "children?" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "HURRY" + , Space + , Str "UP" + , Space + , Str "PLEASE" + , Space + , Str "ITS" + , Space + , Str "TIME" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Well," + , Space + , Str "that" + , Space + , Str "Sunday" + , Space + , Str "Albert" + , Space + , Str "was" + , Space + , Str "home," + , Space + , Str "they" + , Space + , Str "had" + , Space + , Str "a" + , Space + , Str "hot" + , SoftBreak + , Str "gammon," + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "And" + , Space + , Str "they" + , Space + , Str "asked" + , Space + , Str "me" + , Space + , Str "in" + , Space + , Str "to" + , Space + , Str "dinner," + , Space + , Str "to" + , Space + , Str "get" + , Space + , Str "the" + , Space + , Str "beauty" + , Space + , Str "of" + , Space + , Str "it" + , SoftBreak + , Str "hot\8213" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "HURRY" + , Space + , Str "UP" + , Space + , Str "PLEASE" + , Space + , Str "ITS" + , Space + , Str "TIME" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "HURRY" + , Space + , Str "UP" + , Space + , Str "PLEASE" + , Space + , Str "ITS" + , Space + , Str "TIME" + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Goonight" + , Space + , Str "Bill." + , Space + , Str "Goonight" + , Space + , Str "Lou." + , Space + , Str "Goonight" + , Space + , Str "May." + , Space + , Str "Goonight." + , Span ( "" , [ "lnum" ] , [] ) [ Str "170" ] + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Ta" + , Space + , Str "ta." + , Space + , Str "Goonight." + , Space + , Str "Goonight." + ] + ] + , Div + ( "" , [] , [] ) + [ Plain + [ Str "Good" + , Space + , Str "night," + , Space + , Str "ladies," + , Space + , Str "good" + , Space + , Str "night," + , Space + , Str "sweet" + , Space + , Str "ladies," + , Space + , Str "good" + , Space + , Str "night," + , Space + , Str "good" + , SoftBreak + , Str "night." + ] + ] + ] + ] + ] + , Div + ( "wasteland-content.xhtml_backmatter" + , [ "section" , "backmatter" ] + , [] + ) + [ Div + ( "wasteland-content.xhtml_rearnotes" + , [ "rearnotes" ] + , [] + ) + [ Header + 2 + ( "" , [] , [] ) + [ Str "NOTES" + , Space + , Str "ON" + , Space + , Str "\"THE" + , Space + , Str "WASTE" + , Space + , Str "LAND\"" + ] + , Para + [ Str "Not" + , Space + , Str "only" + , Space + , Str "the" + , Space + , Str "title," + , Space + , Str "but" + , Space + , Str "the" + , Space + , Str "plan" + , Space + , Str "and" + , Space + , Str "a" + , Space + , Str "good" + , Space + , Str "deal" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "incidental" + , Space + , Str "symbolism" + , Space + , Str "of" + , SoftBreak + , Str "the" + , Space + , Str "poem" + , Space + , Str "were" + , Space + , Str "suggested" + , Space + , Str "by" + , Space + , Str "Miss" + , Space + , Str "Jessie" + , Space + , Str "L." + , Space + , Str "Weston's" + , Space + , Str "book" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "Grail" + , Space + , Str "legend:" + , SoftBreak + , Str "From" + , Space + , Str "Ritual" + , Space + , Str "to" + , Space + , Str "Romance" + ] + , Para + [ Str "Indeed," + , Space + , Str "so" + , Space + , Str "deeply" + , Space + , Str "am" + , Space + , Str "I" + , Space + , Str "indebted," + , Space + , Str "Miss" + , Space + , Str "Weston's" + , Space + , Str "book" + , Space + , Str "will" + , Space + , Str "elucidate" + , Space + , Str "the" + , SoftBreak + , Str "difficulties" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "poem" + , Space + , Str "much" + , Space + , Str "better" + , Space + , Str "than" + , Space + , Str "my" + , Space + , Str "notes" + , Space + , Str "can" + , Space + , Str "do;" + , Space + , Str "and" + , Space + , Str "I" + , Space + , Str "recommend" + , Space + , Str "it" + , SoftBreak + , Str "(apart" + , Space + , Str "from" + , Space + , Str "the" + , Space + , Str "great" + , Space + , Str "interest" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "book" + , Space + , Str "itself)" + , Space + , Str "to" + , Space + , Str "any" + , Space + , Str "who" + , Space + , Str "think" + , Space + , Str "such" + , SoftBreak + , Str "elucidation" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "poem" + , Space + , Str "worth" + , Space + , Str "the" + , Space + , Str "trouble." + , Space + , Str "To" + , Space + , Str "another" + , Space + , Str "work" + , Space + , Str "of" + , Space + , Str "anthropology" + , Space + , Str "I" + , Space + , Str "am" + , SoftBreak + , Str "indebted" + , Space + , Str "in" + , Space + , Str "general," + , Space + , Str "one" + , Space + , Str "which" + , Space + , Str "has" + , Space + , Str "influenced" + , Space + , Str "our" + , Space + , Str "generation" + , Space + , Str "profoundly;" + , Space + , Str "I" + , Space + , Str "mean" + , SoftBreak + , Str "The" + , Space + , Str "Golden" + , Space + , Str "Bough;" + , Space + , Str "I" + , Space + , Str "have" + , Space + , Str "used" + , Space + , Str "especially" + , Space + , Str "the" + , Space + , Str "two" + , Space + , Str "volumes" + , Space + , Str "Adonis," + , Space + , Str "Attis," + , Space + , Str "Osiris." + , SoftBreak + , Str "Anyone" + , Space + , Str "who" + , Space + , Str "is" + , Space + , Str "acquainted" + , Space + , Str "with" + , Space + , Str "these" + , Space + , Str "works" + , Space + , Str "will" + , Space + , Str "immediately" + , Space + , Str "recognise" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "poem" + , SoftBreak + , Str "certain" + , Space + , Str "references" + , Space + , Str "to" + , Space + , Str "vegetation" + , Space + , Str "ceremonies." + ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 3 + ( "" , [] , [] ) + [ Str "I." + , Space + , Str "THE" + , Space + , Str "BURIAL" + , Space + , Str "OF" + , Space + , Str "THE" + , Space + , Str "DEAD" + ] + ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 3 + ( "" , [] , [] ) + [ Str "II." + , Space + , Str "A" + , Space + , Str "GAME" + , Space + , Str "OF" + , Space + , Str "CHESS" + ] + ] + ] + ] + ] diff --git a/test/fb2/basic.fb2 b/test/fb2/basic.fb2 --- a/test/fb2/basic.fb2 +++ b/test/fb2/basic.fb2 @@ -1,3 +1,73 @@ -unrecognisedpandoc<p />
    <p>Top-level title</p>
    <p>Section</p>
    <p>Subsection</p>

    This emphasized strong verbatim markdown. See this link[1].

    Ordered list:

    1. one

    2. two

    3. three

    Blockquote is for citatons.

    Code

    block

    is

    for

    code.

    Strikeout is Pandoc’s extension. Superscript and subscripts too: H2O is a liquid[2]. 210 is 1024.

    Math is another Pandoc extension: E = m c^2.

    <p>1</p>

    http://example.com/

    <p>2</p>

    Sometimes.

     - + + + +unrecognised + + +pandoc + + + + +<p /> + +
    + +<p>Top-level title</p> + +
    + +<p>Section</p> + +
    + +<p>Subsection</p> + +

    This emphasized strong verbatim markdown. +See this link.

    +

    Ordered list:

    +

    1. one

    +

    2. two

    +

    3. three

    + +

    Blockquote +is +for +citatons.

    +     + +

    +Code +

    +

    +block +

    +

    +is +

    +

    +for +

    +

    +code. +

    + +

    +Strikeout is Pandoc’s extension. +Superscript and subscripts too: H2O is a liquid[1]. +210 is 1024.

    +

    Math is another Pandoc extension: E = m c^2.

    +
    +
    +
    + + +
    + +<p>1</p> + +

    Sometimes.

    +
    + +     diff --git a/test/fb2/images-embedded.fb2 b/test/fb2/images-embedded.fb2 --- a/test/fb2/images-embedded.fb2 +++ b/test/fb2/images-embedded.fb2 @@ -1,2 +1,2 @@ -unrecognisedpandoc<p />
    This image was embedded using data URI scheme

    This image was embedded using data URI scheme

    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     +unrecognisedpandoc<p />
    This image was embedded using data URI scheme

    This image was embedded using data URI scheme

    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     diff --git a/test/fb2/images.fb2 b/test/fb2/images.fb2 --- a/test/fb2/images.fb2 +++ b/test/fb2/images.fb2 @@ -1,2 +1,2 @@ -unrecognisedpandoc<p />

    This example test if Pandoc correctly embeds images into FictionBook.

    Small inline image: alt text a small PNG image.

    Paragraph image:

    alt text of a big JPEG image

    alt text of a big missing image

    A missing image inline: alt text of missing image.

    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     +unrecognisedpandoc<p />

    This example test if Pandoc correctly embeds images into FictionBook.

    Small inline image: alt text a small PNG image.

    Paragraph image:

    alt text of a big JPEG image

    alt text of a big missing image

    A missing image inline: alt text of missing image.

    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     diff --git a/test/fb2/meta.fb2 b/test/fb2/meta.fb2 new file mode 100644 --- /dev/null +++ b/test/fb2/meta.fb2 @@ -0,0 +1,3 @@ + +unrecognisedBook title

    This is the abstract.

    It consists of two paragraphs.

    pandoc    <p>Book title</p>     + diff --git a/test/fb2/meta.markdown b/test/fb2/meta.markdown new file mode 100644 --- /dev/null +++ b/test/fb2/meta.markdown @@ -0,0 +1,7 @@ +--- +title: Book title +abstract: | + This is the abstract. + + It consists of two paragraphs. +--- diff --git a/test/fb2/reader/emphasis.fb2 b/test/fb2/reader/emphasis.fb2 new file mode 100644 --- /dev/null +++ b/test/fb2/reader/emphasis.fb2 @@ -0,0 +1,11 @@ + + + +
    +

    Plain, strong, emphasis, strong emphasis, emphasized strong.

    +

    Strikethrough: deleted

    +

    Subscript and superscript

    +

    Some code

    +
    + +     diff --git a/test/fb2/reader/emphasis.native b/test/fb2/reader/emphasis.native new file mode 100644 --- /dev/null +++ b/test/fb2/reader/emphasis.native @@ -0,0 +1,35 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Div + ( "" , [ "section" ] , [] ) + [ Para + [ Str "Plain," + , Space + , Strong [ Str "strong" ] + , Str "," + , Space + , Emph [ Str "emphasis" ] + , Str "," + , Space + , Strong [ Emph [ Str "strong" , Space , Str "emphasis" ] ] + , Str "," + , Space + , Emph + [ Strong [ Str "emphasized" , Space , Str "strong" ] ] + , Str "." + ] + , Para + [ Str "Strikethrough:" + , Space + , Strikeout [ Str "deleted" ] + ] + , Para + [ Subscript [ Str "Subscript" ] + , Space + , Str "and" + , Space + , Superscript [ Str "superscript" ] + ] + , Para [ Str "Some" , Space , Code ( "" , [] , [] ) "code" ] + ] + ] diff --git a/test/fb2/reader/epigraph.fb2 b/test/fb2/reader/epigraph.fb2 new file mode 100644 --- /dev/null +++ b/test/fb2/reader/epigraph.fb2 @@ -0,0 +1,18 @@ + + + + +

    Body epigraph

    +     +
    + +

    Section epigraph

    +     +
    + +

    Subsection epigraph

    +     +
    +
    + +     diff --git a/test/fb2/reader/epigraph.native b/test/fb2/reader/epigraph.native new file mode 100644 --- /dev/null +++ b/test/fb2/reader/epigraph.native @@ -0,0 +1,18 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Div + ( "" , [ "epigraph" ] , [] ) + [ Para [ Str "Body" , Space , Str "epigraph" ] ] + , Div + ( "" , [ "section" ] , [] ) + [ Div + ( "" , [ "epigraph" ] , [] ) + [ Para [ Str "Section" , Space , Str "epigraph" ] ] + , Div + ( "" , [ "section" ] , [] ) + [ Div + ( "" , [ "epigraph" ] , [] ) + [ Para [ Str "Subsection" , Space , Str "epigraph" ] ] + ] + ] + ] diff --git a/test/fb2/reader/meta.fb2 b/test/fb2/reader/meta.fb2 new file mode 100644 --- /dev/null +++ b/test/fb2/reader/meta.fb2 @@ -0,0 +1,26 @@ + + + + + + First + Middle + Last + + + Another + Author + + Book title + +

    Book annotation

    +

    Second paragraph of book annotation

    +     + foo, bar, baz + 2018 +     +     + + <p>Body title</p> + +     diff --git a/test/fb2/reader/meta.native b/test/fb2/reader/meta.native new file mode 100644 --- /dev/null +++ b/test/fb2/reader/meta.native @@ -0,0 +1,48 @@ +Pandoc + Meta + { unMeta = + fromList + [ ( "abstract" + , MetaBlocks + [ Para [ Str "Book" , Space , Str "annotation" ] + , Para + [ Str "Second" + , Space + , Str "paragraph" + , Space + , Str "of" + , Space + , Str "book" + , Space + , Str "annotation" + ] + ] + ) + , ( "author" + , MetaList + [ MetaInlines + [ Str "First" + , Space + , Str "Middle" + , Space + , Str "Last" + ] + , MetaInlines [ Str "Another" , Space , Str "Author" ] + ] + ) + , ( "date" , MetaInlines [ Str "2018" ] ) + , ( "keywords" + , MetaList + [ MetaString "foo" + , MetaString "bar" + , MetaString "baz" + ] + ) + , ( "title" + , MetaInlines [ Str "Book" , Space , Str "title" ] + ) + ] + } + [ Header + 1 ( "" , [] , [] ) [ Str "Body" , Space , Str "title" ] + ] diff --git a/test/fb2/reader/notes.fb2 b/test/fb2/reader/notes.fb2 new file mode 100644 --- /dev/null +++ b/test/fb2/reader/notes.fb2 @@ -0,0 +1,19 @@ + + + +
    +

    Note 1.

    +

    Second note 2.

    +
    + + +
    + <p>1</p> +

    Note contents

    +
    +
    + <p>2</p> +

    Second note contents.

    +
    + +     diff --git a/test/fb2/reader/notes.native b/test/fb2/reader/notes.native new file mode 100644 --- /dev/null +++ b/test/fb2/reader/notes.native @@ -0,0 +1,28 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Div + ( "" , [ "section" ] , [] ) + [ Para + [ Str "Note" + , Space + , Note [ Para [ Str "Note" , Space , Str "contents" ] ] + , Str "." + ] + , Para + [ Str "Second" + , Space + , Str "note" + , Space + , Note + [ Para + [ Str "Second" + , Space + , Str "note" + , Space + , Str "contents." + ] + ] + , Str "." + ] + ] + ] diff --git a/test/fb2/reader/poem.fb2 b/test/fb2/reader/poem.fb2 new file mode 100644 --- /dev/null +++ b/test/fb2/reader/poem.fb2 @@ -0,0 +1,28 @@ + + + +
    + + + <p>Poem title</p> + + +

    Poem epigraph

    +     + + Subtitle + + <p>First stanza title</p> + + Verse + More verse + + + One more stanza + + Author + April 2018 +     +
    + +     diff --git a/test/fb2/reader/poem.native b/test/fb2/reader/poem.native new file mode 100644 --- /dev/null +++ b/test/fb2/reader/poem.native @@ -0,0 +1,25 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Div + ( "" , [ "section" ] , [] ) + [ Header + 2 ( "" , [] , [] ) [ Str "Poem" , Space , Str "title" ] + , Div + ( "" , [ "epigraph" ] , [] ) + [ Para [ Str "Poem" , Space , Str "epigraph" ] ] + , Header 2 ( "" , [ "unnumbered" ] , [] ) [ Str "Subtitle" ] + , Header + 2 + ( "" , [] , [] ) + [ Str "First" , Space , Str "stanza" , Space , Str "title" ] + , LineBlock + [ [ Str "Verse" ] + , [ Emph [ Str "More" ] , Space , Str "verse" ] + ] + , LineBlock + [ [ Str "One" , Space , Str "more" , Space , Str "stanza" ] + ] + , Para [ Str "Author" ] + , Para [ Str "April" , Space , Str "2018" ] + ] + ] diff --git a/test/fb2/reader/titles.fb2 b/test/fb2/reader/titles.fb2 new file mode 100644 --- /dev/null +++ b/test/fb2/reader/titles.fb2 @@ -0,0 +1,18 @@ + + + + <p>Body title</p> +
    + <p>Section title</p> +
    + + <p>Subsection title</p> + <p>with multiple paragraphs</p> + +
    +
    + <p>Another subsection title</p> +
    +
    + +     diff --git a/test/fb2/reader/titles.native b/test/fb2/reader/titles.native new file mode 100644 --- /dev/null +++ b/test/fb2/reader/titles.native @@ -0,0 +1,38 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Header + 1 ( "" , [] , [] ) [ Str "Body" , Space , Str "title" ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 2 ( "" , [] , [] ) [ Str "Section" , Space , Str "title" ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 3 + ( "" , [] , [] ) + [ Str "Subsection" + , Space + , Str "title" + , LineBreak + , Str "with" + , Space + , Str "multiple" + , Space + , Str "paragraphs" + ] + ] + , Div + ( "" , [ "section" ] , [] ) + [ Header + 3 + ( "" , [] , [] ) + [ Str "Another" + , Space + , Str "subsection" + , Space + , Str "title" + ] + ] + ] + ] diff --git a/test/fb2/test.jpg b/test/fb2/test.jpg Binary files a/test/fb2/test.jpg and b/test/fb2/test.jpg differ diff --git a/test/fb2/titles.fb2 b/test/fb2/titles.fb2 --- a/test/fb2/titles.fb2 +++ b/test/fb2/titles.fb2 @@ -1,3 +1,3 @@ -unrecognisedpandoc<p />
    <p>Simple title</p>

    This example tests if Pandoc doesn’t insert forbidden elements in FictionBook titles.

    <p>Emphasized Strong Title</p>
     +unrecognisedpandoc<p />
    <p>Simple title</p>

    This example tests FictionBook titles.

    <p><emphasis>Emphasized</emphasis> <strong>Strong</strong> Title</p>
     diff --git a/test/fb2/titles.markdown b/test/fb2/titles.markdown --- a/test/fb2/titles.markdown +++ b/test/fb2/titles.markdown @@ -1,6 +1,6 @@ # Simple title -This example tests if Pandoc doesn't insert forbidden elements in FictionBook titles. +This example tests FictionBook titles. # *Emphasized* **Strong** Title diff --git a/test/haddock-reader.native b/test/haddock-reader.native --- a/test/haddock-reader.native +++ b/test/haddock-reader.native @@ -1,31 +1,401 @@ -Pandoc (Meta {unMeta = fromList []}) -[Para [Str "This",Space,Str "file",Space,Str "tests",Space,Str "the",Space,Str "Pandoc",Space,Str "reader",Space,Str "for",Space,Str "Haddock.",SoftBreak,Str "We've",Space,Str "borrowed",Space,Str "examples",Space,Str "from",Space,Str "Haddock's",Space,Str "documentation:",Space,Link ("",[],[]) [Str "http://www.haskell.org/haddock/doc/html/ch03s08.html"] ("http://www.haskell.org/haddock/doc/html/ch03s08.html","http://www.haskell.org/haddock/doc/html/ch03s08.html"),Str "."] -,Para [Str "The",Space,Str "following",Space,Str "characters",Space,Str "have",Space,Str "special",Space,Str "meanings",Space,Str "in",Space,Str "Haddock,",Space,Str "/,",Space,Str "',",Space,Str "`,",Space,Str "\",",Space,Str "@,",Space,Str "<,",Space,Str "so",Space,Str "they",Space,Str "must",Space,Str "be",Space,Str "escaped."] -,Para [Str "*",Space,Str "This",Space,Str "is",Space,Str "a",Space,Str "paragraph,",Space,Str "not",Space,Str "a",Space,Str "list",Space,Str "item.",SoftBreak,Str ">",Space,Str "This",Space,Str "sentence",Space,Str "is",Space,Str "not",Space,Str "code.",SoftBreak,Str ">>>",Space,Str "This",Space,Str "is",Space,Str "not",Space,Str "an",Space,Str "example."] -,Para [Str "The",Space,Str "references",Space,Str "\955,",Space,Str "\955",Space,Str "and",Space,Str "\955",Space,Str "all",Space,Str "represent",Space,Str "the",Space,Str "lower-case",Space,Str "letter",Space,Str "lambda."] -,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "code",Space,Str "block:"] -,CodeBlock ("",[],[]) "map :: (a -> b) -> [a] -> [b]\nmap _ [] = []\nmap f (x:xs) = f x : map f xs" -,Para [Str "This",Space,Str "is",Space,Str "another",Space,Str "code",Space,Str "block:"] -,Para [Code ("",[],[]) "f x = x + x.",LineBreak,Code ("",[],[]) "The @...@ code block ",Emph [Code ("",[],[]) "interprets markup normally"],Code ("",[],[]) ".",Code ("",["haskell","module"],[]) "Module.Foo",Code ("",[],[]) "",LineBreak,Code ("",[],[]) "\"Hello World\""] -,Para [Str "Haddock",Space,Str "supports",Space,Str "REPL",Space,Str "examples:"] -,Para [Code ("",["prompt"],[]) ">>>",Space,Code ("",["haskell","expr"],[]) "fib 10",LineBreak,Code ("",["result"],[]) "55"] -,Para [Code ("",["prompt"],[]) ">>>",Space,Code ("",["haskell","expr"],[]) "putStrLn \"foo\\nbar\"",LineBreak,Code ("",["result"],[]) "foo",LineBreak,Code ("",["result"],[]) "bar"] -,Para [Str "That",Space,Str "was",Space,Emph [Str "really",Space,Str "cool"],Str "!",SoftBreak,Str "I",Space,Str "had",Space,Str "no",Space,Str "idea",Space,Code ("",[],[]) "fib 10 = 55",Str "."] -,Para [Str "This",Space,Str "module",Space,Str "defines",Space,Str "the",Space,Str "type",Space,Code ("",["haskell","identifier"],[]) "T",Str ".",SoftBreak,Str "The",Space,Str "identifier",Space,Code ("",["haskell","identifier"],[]) "M.T",Space,Str "is",Space,Str "not",Space,Str "in",Space,Str "scope",SoftBreak,Str "I",Space,Str "don't",Space,Str "have",Space,Str "to",Space,Str "escape",Space,Str "my",Space,Str "apostrophes;",Space,Str "great,",Space,Str "isn't",Space,Str "it?",SoftBreak,Str "This",Space,Str "is",Space,Str "a",Space,Str "reference",Space,Str "to",Space,Str "the",Space,Code ("",["haskell","module"],[]) "Foo",Space,Str "module."] -,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "bulleted",Space,Str "list:"] -,BulletList - [[Para [Str "first",Space,Str "item"]] - ,[Para [Str "second",Space,Str "item"]]] -,Para [Str "This",Space,Str "is",Space,Str "an",Space,Str "enumerated",Space,Str "list:"] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Para [Str "first",Space,Str "item"]] - ,[Para [Str "second",Space,Str "item"]]] -,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "definition",Space,Str "list:"] -,DefinitionList - [([Code ("",[],[]) "foo"], - [[Para [Str "The",Space,Str "description",Space,Str "of",Space,Code ("",[],[]) "foo",Str "."]]]) - ,([Code ("",[],[]) "bar"], - [[Para [Str "The",Space,Str "description",Space,Str "of",Space,Code ("",[],[]) "bar",Str "."]]])] -,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "link:",Space,Link ("",[],[]) [Str "http://haskell.org"] ("http://haskell.org","http://haskell.org")] -,Para [Link ("",[],[]) [Str "Haskell"] ("http://haskell.org","http://haskell.org"),Space,Str "is",Space,Str "a",Space,Str "fun",Space,Str "language!"] -,Para [Link ("",[],[]) [Str "Click",Space,Str "Here!"] ("http://example.com","http://example.com")]] +Pandoc + Meta { unMeta = fromList [] } + [ Para + [ Str "This" + , Space + , Str "file" + , Space + , Str "tests" + , Space + , Str "the" + , Space + , Str "Pandoc" + , Space + , Str "reader" + , Space + , Str "for" + , Space + , Str "Haddock." + , SoftBreak + , Str "We've" + , Space + , Str "borrowed" + , Space + , Str "examples" + , Space + , Str "from" + , Space + , Str "Haddock's" + , Space + , Str "documentation:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.haskell.org/haddock/doc/html/ch03s08.html" + ] + ( "http://www.haskell.org/haddock/doc/html/ch03s08.html" + , "http://www.haskell.org/haddock/doc/html/ch03s08.html" + ) + , Str "." + ] + , Para + [ Str "The" + , Space + , Str "following" + , Space + , Str "characters" + , Space + , Str "have" + , Space + , Str "special" + , Space + , Str "meanings" + , Space + , Str "in" + , Space + , Str "Haddock," + , Space + , Str "/," + , Space + , Str "'," + , Space + , Str "`," + , Space + , Str "\"," + , Space + , Str "@," + , Space + , Str "<," + , Space + , Str "so" + , Space + , Str "they" + , Space + , Str "must" + , Space + , Str "be" + , Space + , Str "escaped." + ] + , Para + [ Str "*" + , Space + , Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "paragraph," + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item." + , SoftBreak + , Str ">" + , Space + , Str "This" + , Space + , Str "sentence" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "code." + , SoftBreak + , Str ">>>" + , Space + , Str "This" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "an" + , Space + , Str "example." + ] + , Para + [ Str "The" + , Space + , Str "references" + , Space + , Str "\955," + , Space + , Str "\955" + , Space + , Str "and" + , Space + , Str "\955" + , Space + , Str "all" + , Space + , Str "represent" + , Space + , Str "the" + , Space + , Str "lower-case" + , Space + , Str "letter" + , Space + , Str "lambda." + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "code" + , Space + , Str "block:" + ] + , CodeBlock + ( "" , [] , [] ) + "map :: (a -> b) -> [a] -> [b]\nmap _ [] = []\nmap f (x:xs) = f x : map f xs" + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "another" + , Space + , Str "code" + , Space + , Str "block:" + ] + , Para + [ Code ( "" , [] , [] ) "f x = x + x." + , LineBreak + , Code ( "" , [] , [] ) "The @...@ code block " + , Emph + [ Code ( "" , [] , [] ) "interprets markup normally" ] + , Code ( "" , [] , [] ) "." + , Code ( "" , [ "haskell" , "module" ] , [] ) "Module.Foo" + , Code ( "" , [] , [] ) "" + , LineBreak + , Code ( "" , [] , [] ) "\"Hello World\"" + ] + , Para + [ Str "Haddock" + , Space + , Str "supports" + , Space + , Str "REPL" + , Space + , Str "examples:" + ] + , Para + [ Code ( "" , [ "prompt" ] , [] ) ">>>" + , Space + , Code ( "" , [ "haskell" , "expr" ] , [] ) "fib 10" + , LineBreak + , Code ( "" , [ "result" ] , [] ) "55" + ] + , Para + [ Code ( "" , [ "prompt" ] , [] ) ">>>" + , Space + , Code + ( "" , [ "haskell" , "expr" ] , [] ) + "putStrLn \"foo\\nbar\"" + , LineBreak + , Code ( "" , [ "result" ] , [] ) "foo" + , LineBreak + , Code ( "" , [ "result" ] , [] ) "bar" + ] + , Para + [ Str "That" + , Space + , Str "was" + , Space + , Emph [ Str "really" , Space , Str "cool" ] + , Str "!" + , SoftBreak + , Str "I" + , Space + , Str "had" + , Space + , Str "no" + , Space + , Str "idea" + , Space + , Code ( "" , [] , [] ) "fib 10 = 55" + , Str "." + ] + , Para + [ Str "This" + , Space + , Str "module" + , Space + , Str "defines" + , Space + , Str "the" + , Space + , Str "type" + , Space + , Code ( "" , [ "haskell" , "identifier" ] , [] ) "T" + , Str "." + , SoftBreak + , Str "The" + , Space + , Str "identifier" + , Space + , Code ( "" , [ "haskell" , "identifier" ] , [] ) "M.T" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "in" + , Space + , Str "scope" + , SoftBreak + , Str "I" + , Space + , Str "don't" + , Space + , Str "have" + , Space + , Str "to" + , Space + , Str "escape" + , Space + , Str "my" + , Space + , Str "apostrophes;" + , Space + , Str "great," + , Space + , Str "isn't" + , Space + , Str "it?" + , SoftBreak + , Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "reference" + , Space + , Str "to" + , Space + , Str "the" + , Space + , Code ( "" , [ "haskell" , "module" ] , [] ) "Foo" + , Space + , Str "module." + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "bulleted" + , Space + , Str "list:" + ] + , BulletList + [ [ Para [ Str "first" , Space , Str "item" ] ] + , [ Para [ Str "second" , Space , Str "item" ] ] + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "enumerated" + , Space + , Str "list:" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Para [ Str "first" , Space , Str "item" ] ] + , [ Para [ Str "second" , Space , Str "item" ] ] + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "definition" + , Space + , Str "list:" + ] + , DefinitionList + [ ( [ Code ( "" , [] , [] ) "foo" ] + , [ [ Para + [ Str "The" + , Space + , Str "description" + , Space + , Str "of" + , Space + , Code ( "" , [] , [] ) "foo" + , Str "." + ] + ] + ] + ) + , ( [ Code ( "" , [] , [] ) "bar" ] + , [ [ Para + [ Str "The" + , Space + , Str "description" + , Space + , Str "of" + , Space + , Code ( "" , [] , [] ) "bar" + , Str "." + ] + ] + ] + ) + ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "link:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://haskell.org" ] + ( "http://haskell.org" , "http://haskell.org" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "Haskell" ] + ( "http://haskell.org" , "http://haskell.org" ) + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "fun" + , Space + , Str "language!" + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "Click" , Space , Str "Here!" ] + ( "http://example.com" , "http://example.com" ) + ] + ] diff --git a/test/html-reader.html b/test/html-reader.html --- a/test/html-reader.html +++ b/test/html-reader.html @@ -81,6 +81,10 @@

    And a following paragraph.

    +

    Inline quotes

    +

    Normal text but then a inline quote.

    +

    Missing a cite attribute means its just normal text

    +

    Code Blocks

    Code:

    ---- (should be four hyphens)
@@ -483,6 +487,7 @@
     
 
 
    
+
    Row headers
    
 
@@ -519,6 +524,9 @@
         
+    
+        
+    
@@ -530,12 +538,37 @@
 
    
     
     
    2
         3
     
    Details
    
     
         
     
    
 
    
 
+    
+        
+        
+        
+    
+    
+        
+    
+    
+    
+    
+        
+        
+        
+    
+    
+
    
     
    
         X
         Y
         Z
     
    
     
    123
    Details
    456
    
+
    
+
+    
+        
+        
+        
+    
+    
@@ -652,6 +685,7 @@
     
    XYZ
    
         1
         2
         3
    
 
    
 
    
+
    tbody tags omitted
    
 
@@ -665,6 +699,7 @@
     
    
     
    
         1
    
 
    
 
    
+
    empty head
    
 
@@ -682,6 +717,7 @@
     
    
     
     
 
    
 
    
+
    explicit body and foot
    
 
@@ -697,6 +733,78 @@
         
+
    
     
     
    6
     
    
     
    
+
    Colspans and Rowspans
    
+
+    
+        
+        
+    
+    
+        
+    
+
    1 and 23
    4, 5, and 6
    
+
    
+
+    
+    
+        
+    
+    
+    
+    
+        
+        
+        
+    
+    
+        
+        
+    
+    
+
    Numbers
    1 and 423
    56
    
+
    Attributes
    
+
+  
+    
+      
+    
+    
+    
+        
+        
+        
+    
+    
+    
+    
+        
+        
+        
+    
+    
+
    Cat X
    123
    456
    
+
    Tag omission
    
+
    thead, tbody, and tfoot
    
+
+    
+        
+            
+            
+            
+        
+    
+        
+            
+            
+            
+        
+    
+        
+            
+            
+            
+        
    XYZ
    123
    456
    
 
    
 
    Empty Tables
    
 
    This section should be empty.
    
diff --git a/test/html-reader.native b/test/html-reader.native
--- a/test/html-reader.native
+++ b/test/html-reader.native
@@ -1,473 +1,3383 @@
-Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
-[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber's",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
-,HorizontalRule
-,Header 1 ("headers",[],[]) [Str "Headers"]
-,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embedded",Space,Str "link"] ("/url","")]
-,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 4 ("level-4",[],[]) [Str "Level",Space,Str "4"]
-,Header 5 ("level-5",[],[]) [Str "Level",Space,Str "5"]
-,Header 1 ("level-1",[],[]) [Str "Level",Space,Str "1"]
-,Header 2 ("level-2-with-emphasis",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 3 ("level-3",[],[]) [Str "Level",Space,Str "3"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,Header 2 ("level-2",[],[]) [Str "Level",Space,Str "2"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,HorizontalRule
-,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
-,Para [Str "Here's",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",Space,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",Space,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item."]
-,Para [Str "Here's",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",Space,Str "*",Space,Str "criminey."]
-,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
-,HorizontalRule
-,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
-,Para [Str "E-mail",Space,Str "style:"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",Space,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."]]
-,BlockQuote
- [Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"
- ,Para [Str "A",Space,Str "list:"]
- ,OrderedList (1,DefaultStyle,DefaultDelim)
-  [[Plain [Str "item",Space,Str "one"]]
-  ,[Plain [Str "item",Space,Str "two"]]]
- ,Para [Str "Nested",Space,Str "block",Space,Str "quotes:"]
- ,BlockQuote
-  [Para [Str "nested"]]
- ,BlockQuote
-  [Para [Str "nested"]]]
-,Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",Space,Str ">",Space,Str "1."]
-,Para [Str "Box-style:"]
-,BlockQuote
- [Para [Str "Example:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"]
-,BlockQuote
- [OrderedList (1,DefaultStyle,DefaultDelim)
-  [[Plain [Str "do",Space,Str "laundry"]]
-  ,[Plain [Str "take",Space,Str "out",Space,Str "the",Space,Str "trash"]]]]
-,Para [Str "Here's",Space,Str "a",Space,Str "nested",Space,Str "one:"]
-,BlockQuote
- [Para [Str "Joe",Space,Str "said:"]
- ,BlockQuote
-  [Para [Str "Don't",Space,Str "quote",Space,Str "me."]]]
-,Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."]
-,HorizontalRule
-,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"]
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
-,Para [Str "And:"]
-,CodeBlock ("",[],[]) "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
-,HorizontalRule
-,Header 1 ("lists",[],[]) [Str "Lists"]
-,Header 2 ("unordered",[],[]) [Str "Unordered"]
-,Para [Str "Asterisks",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "asterisk",Space,Str "1"]]
- ,[Plain [Str "asterisk",Space,Str "2"]]
- ,[Plain [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Asterisks",Space,Str "loose:"]
-,BulletList
- [[Para [Str "asterisk",Space,Str "1"]]
- ,[Para [Str "asterisk",Space,Str "2"]]
- ,[Para [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Plus",Space,Str "1"]]
- ,[Plain [Str "Plus",Space,Str "2"]]
- ,[Plain [Str "Plus",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Plus",Space,Str "1"]]
- ,[Para [Str "Plus",Space,Str "2"]]
- ,[Para [Str "Plus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Minus",Space,Str "1"]]
- ,[Plain [Str "Minus",Space,Str "2"]]
- ,[Plain [Str "Minus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Minus",Space,Str "1"]]
- ,[Para [Str "Minus",Space,Str "2"]]
- ,[Para [Str "Minus",Space,Str "3"]]]
-,Header 2 ("ordered",[],[]) [Str "Ordered"]
-,Para [Str "Tight:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second"]]
- ,[Plain [Str "Third"]]]
-,Para [Str "and:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "One"]]
- ,[Plain [Str "Two"]]
- ,[Plain [Str "Three"]]]
-,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "First"]]
- ,[Para [Str "Second"]]
- ,[Para [Str "Third"]]]
-,Para [Str "and",Space,Str "using",Space,Str "spaces:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "One"]]
- ,[Para [Str "Two"]]
- ,[Para [Str "Three"]]]
-,Para [Str "Multiple",Space,Str "paragraphs:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
-  ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog's",Space,Str "back."]]
- ,[Para [Str "Item",Space,Str "2."]]
- ,[Para [Str "Item",Space,Str "3."]]]
-,Para [Str "List",Space,Str "styles:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- []
-,OrderedList (1,LowerRoman,DefaultDelim)
- []
-,OrderedList (1,LowerRoman,DefaultDelim)
- []
-,OrderedList (1,DefaultStyle,DefaultDelim)
- []
-,OrderedList (1,LowerRoman,DefaultDelim)
- []
-,OrderedList (1,LowerRoman,DefaultDelim)
- []
-,Header 2 ("nested",[],[]) [Str "Nested"]
-,BulletList
- [[Plain [Str "Tab"]
-  ,BulletList
-   [[Plain [Str "Tab"]
-    ,BulletList
-     [[Plain [Str "Tab"]]]]]]]
-,Para [Str "Here's",Space,Str "another:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second:"]
-  ,BulletList
-   [[Plain [Str "Fee"]]
-   ,[Plain [Str "Fie"]]
-   ,[Plain [Str "Foe"]]]]
- ,[Plain [Str "Third"]]]
-,Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BulletList
-   [[Plain [Str "Fee"]]
-   ,[Plain [Str "Fie"]]
-   ,[Plain [Str "Foe"]]]]
- ,[Para [Str "Third"]]]
-,Header 2 ("tabs-and-spaces",[],[]) [Str "Tabs",Space,Str "and",Space,Str "spaces"]
-,BulletList
- [[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"]]
- ,[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"]
-  ,BulletList
-   [[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"]]
-   ,[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"]]]]]
-,Header 2 ("fancy-list-markers",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"]
-,OrderedList (2,Decimal,DefaultDelim)
- [[Plain [Str "begins",Space,Str "with",Space,Str "2"]]
- ,[Para [Str "and",Space,Str "now",Space,Str "3"]
-  ,Para [Str "with",Space,Str "a",Space,Str "continuation"]
-  ,OrderedList (4,LowerRoman,DefaultDelim)
-   [[Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",Space,Str "starting",Space,Str "with",Space,Str "4"]]
-   ,[Plain [Str "more",Space,Str "items"]
-    ,OrderedList (1,UpperAlpha,DefaultDelim)
-     [[Plain [Str "a",Space,Str "subsublist"]]
-     ,[Plain [Str "a",Space,Str "subsublist"]]]]]]]
-,Para [Str "Nesting:"]
-,OrderedList (1,UpperAlpha,DefaultDelim)
- [[Plain [Str "Upper",Space,Str "Alpha"]
-  ,OrderedList (1,UpperRoman,DefaultDelim)
-   [[Plain [Str "Upper",Space,Str "Roman."]
-    ,OrderedList (6,Decimal,DefaultDelim)
-     [[Plain [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"]
-      ,OrderedList (3,LowerAlpha,DefaultDelim)
-       [[Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]]
-,Para [Str "Autonumbering:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Autonumber."]]
- ,[Plain [Str "More."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "Nested."]]]]]
-,HorizontalRule
-,Header 2 ("definition",[],[]) [Str "Definition"]
-,DefinitionList
- [([Str "Violin"],
-   [[Plain [Str "Stringed",Space,Str "musical",Space,Str "instrument."]]
-   ,[Plain [Str "Torture",Space,Str "device."]]])
- ,([Str "Cello",LineBreak,Str "Violoncello"],
-   [[Plain [Str "Low-voiced",Space,Str "stringed",Space,Str "instrument."]]])]
-,HorizontalRule
-,Header 1 ("inline-markup",[],[]) [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 "."]
-,Para [Str "Empty",Space,Strong [],Space,Str "and",Space,Emph [],Str "."]
-,Para [Str "An",Space,Emph [Link ("",[],[]) [Str "emphasized",Space,Str "link"] ("/url","")],Str "."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",Space,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",Space,Code ("",[],[]) "",Str "."]
-,Para [Str "This",Space,Str "is",Space,SmallCaps [Str "small",Space,Str "caps"],Str "."]
-,Para [Str "These",Space,Str "are",Space,Str "all",Space,Str "underlined:",Space,Span ("",["underline"],[]) [Str "foo"],Space,Str "and",Space,Span ("",["underline"],[]) [Str "bar"],Str "."]
-,Para [Str "These",Space,Str "are",Space,Str "all",Space,Str "strikethrough:",Space,Strikeout [Str "foo"],Str ",",Space,Strikeout [Str "bar"],Str ",",Space,Str "and",Space,Strikeout [Str "baz"],Str "."]
-,HorizontalRule
-,Header 1 ("smart-quotes-ellipses-dashes",[],[]) [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"]
-,Para [Str "\"Hello,\"",Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Str "\"'Shelob'",Space,Str "is",Space,Str "my",Space,Str "name.\""]
-,Para [Str "'A',",Space,Str "'B',",Space,Str "and",Space,Str "'C'",Space,Str "are",Space,Str "letters."]
-,Para [Str "'Oak,'",Space,Str "'elm,'",Space,Str "and",Space,Str "'beech'",Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees.",Space,Str "So",Space,Str "is",Space,Str "'pine.'"]
-,Para [Str "'He",Space,Str "said,",Space,Str "\"I",Space,Str "want",Space,Str "to",Space,Str "go.\"'",Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70's?"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Str "'",Code ("",[],[]) "code",Str "'",Space,Str "and",Space,Str "a",Space,Str "\"",Link ("",[],[]) [Str "quoted",Space,Str "link"] ("http://example.com/?foo=1&bar=2",""),Str "\"."]
-,Para [Str "Some",Space,Str "dashes:",Space,Str "one---two",Space,Str "---",Space,Str "three--four",Space,Str "--",Space,Str "five."]
-,Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5-7,",Space,Str "255-66,",Space,Str "1987-1999."]
-,Para [Str "Ellipses...and.",Space,Str ".",Space,Str ".and",Space,Str ".",Space,Str ".",Space,Str ".",Space,Str "."]
-,HorizontalRule
-,Header 1 ("latex",[],[]) [Str "LaTeX"]
-,BulletList
- [[Plain [Str "\\cite[22-23]{smith.1899}"]]
- ,[Plain [Str "\\doublespacing"]]
- ,[Plain [Str "$2+2=4$"]]
- ,[Plain [Str "$x",Space,Str "\\in",Space,Str "y$"]]
- ,[Plain [Str "$\\alpha",Space,Str "\\wedge",Space,Str "\\omega$"]]
- ,[Plain [Str "$223$"]]
- ,[Plain [Str "$p$-Tree"]]
- ,[Plain [Str "$\\frac{d}{dx}f(x)=\\lim_{h\\to",Space,Str "0}\\frac{f(x+h)-f(x)}{h}$"]]
- ,[Plain [Str "Here's",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,Str "$\\alpha",Space,Str "+",Space,Str "\\omega",Space,Str "\\times",Space,Str "x^2$."]]]
-,Para [Str "These",Space,Str "shouldn't",Space,Str "be",Space,Str "math:"]
-,BulletList
- [[Plain [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code ("",[],[]) "$e = mc^2$",Str "."]]
- ,[Plain [Str "$22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$34,000.",Space,Str "(It",Space,Str "worked",Space,Str "if",Space,Str "\"lot\"",Space,Str "is",Space,Str "emphasized.)"]]
- ,[Plain [Str "Escaped",Space,Code ("",[],[]) "$",Str ":",Space,Str "$73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23$."]]]
-,Para [Str "Here's",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]
-,Para [Str "\\begin{tabular}{|l|l|}\\hline",Space,Str "Animal",Space,Str "&",Space,Str "Number",Space,Str "\\\\",Space,Str "\\hline",Space,Str "Dog",Space,Str "&",Space,Str "2",Space,Str "\\\\",Space,Str "Cat",Space,Str "&",Space,Str "1",Space,Str "\\\\",Space,Str "\\hline",Space,Str "\\end{tabular}"]
-,HorizontalRule
-,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"]
-,BulletList
- [[Plain [Str "I",Space,Str "hat:",Space,Str "\206"]]
- ,[Plain [Str "o",Space,Str "umlaut:",Space,Str "\246"]]
- ,[Plain [Str "section:",Space,Str "\167"]]
- ,[Plain [Str "set",Space,Str "membership:",Space,Str "\8712"]]
- ,[Plain [Str "copyright:",Space,Str "\169"]]]
-,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-,Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."]
-,Para [Str "This",Space,Str "&",Space,Str "that."]
-,Para [Str "4",Space,Str "<",Space,Str "5."]
-,Para [Str "6",Space,Str ">",Space,Str "5."]
-,Para [Str "Backslash:",Space,Str "\\"]
-,Para [Str "Backtick:",Space,Str "`"]
-,Para [Str "Asterisk:",Space,Str "*"]
-,Para [Str "Underscore:",Space,Str "_"]
-,Para [Str "Left",Space,Str "brace:",Space,Str "{"]
-,Para [Str "Right",Space,Str "brace:",Space,Str "}"]
-,Para [Str "Left",Space,Str "bracket:",Space,Str "["]
-,Para [Str "Right",Space,Str "bracket:",Space,Str "]"]
-,Para [Str "Left",Space,Str "paren:",Space,Str "("]
-,Para [Str "Right",Space,Str "paren:",Space,Str ")"]
-,Para [Str "Greater-than:",Space,Str ">"]
-,Para [Str "Hash:",Space,Str "#"]
-,Para [Str "Period:",Space,Str "."]
-,Para [Str "Bang:",Space,Str "!"]
-,Para [Str "Plus:",Space,Str "+"]
-,Para [Str "Minus:",Space,Str "-"]
-,HorizontalRule
-,Header 1 ("links",[],[]) [Str "Links"]
-,Header 2 ("explicit",[],[]) [Str "Explicit"]
-,Para [Str "Just",Space,Str "a",Space,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title preceded by two spaces"),Str "."]
-,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")]
-,Para [Str "Email",Space,Str "link",Space,Str "(nobody",Space,Str "[at]",Space,Str "nowhere.net)"]
-,Para [Link ("",[],[]) [Str "Empty"] ("",""),Str "."]
-,Header 2 ("reference",[],[]) [Str "Reference"]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "With",Space,Link ("",[],[]) [Str "embedded",Space,Str "[brackets]"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "b"] ("/url/",""),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "once"] ("/url",""),Str "."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "twice"] ("/url",""),Str "."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "thrice"] ("/url",""),Str "."]
-,Para [Str "This",Space,Str "should",Space,Str "[not]",Space,Str "be",Space,Str "a",Space,Str "link."]
-,CodeBlock ("",[],[]) "[not]: /url"
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/","Title with \"quotes\" inside"),Str "."]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "biz"] ("/url/","Title with \"quote\" inside"),Str "."]
-,Header 2 ("with-ampersands",[],[]) [Str "With",Space,Str "ampersands"]
-,Para [Str "Here's",Space,Str "a",Space,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."]
-,Para [Str "Here's",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link ("",[],[]) [Str "AT&T"] ("http://att.com/","AT&T"),Str "."]
-,Para [Str "Here's",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."]
-,Para [Str "Here's",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] ("/script?foo=1&bar=2",""),Str "."]
-,Header 2 ("autolinks",[],[]) [Str "Autolinks"]
-,Para [Str "With",Space,Str "an",Space,Str "ampersand:",Space,Link ("",[],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")]
-,BulletList
- [[Plain [Str "In",Space,Str "a",Space,Str "list?"]]
- ,[Plain [Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]]
- ,[Plain [Str "It",Space,Str "should."]]]
-,Para [Str "An",Space,Str "e-mail",Space,Str "address:",Space,Str "nobody",Space,Str "[at]",Space,Str "nowhere.net"]
-,BlockQuote
- [Para [Str "Blockquoted:",Space,Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]]
-,Para [Str "Auto-links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ("",[],[]) ""]
-,CodeBlock ("",[],[]) "or here: "
-,HorizontalRule
-,Header 1 ("images",[],[]) [Str "Images"]
-,Para [Str "From",Space,Str "\"Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune\"",Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"]
-,Para [Image ("",[],[]) [Str "lalune"] ("lalune.jpg","Voyage dans la Lune")]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image ("",[],[]) [Str "movie"] ("movie.jpg",""),Space,Str "icon."]
-,HorizontalRule
-,Header 1 ("footnotes",[],[]) [Str "Footnotes"]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference",Link ("",[],[]) [Str "(1)"] ("#note_1",""),Str ",",Space,Str "and",Space,Str "another",Link ("",[],[]) [Str "(longnote)"] ("#note_longnote",""),Str ".",Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space^(my",Space,Str "note)."]
-,Para [Link ("",[],[]) [Str "(1)"] ("#ref_1",""),Space,Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "in",Space,Str "the",Space,Str "document,",Space,Str "not",Space,Str "just",Space,Str "at",Space,Str "the",Space,Str "end."]
-,Para [Link ("",[],[]) [Str "(longnote)"] ("#ref_longnote",""),Space,Str "Here's",Space,Str "the",Space,Str "other",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."]
-,Para [Str "Caret",Space,Str "characters",Space,Str "are",Space,Str "used",Space,Str "to",Space,Str "indicate",Space,Str "that",Space,Str "the",Space,Str "blocks",Space,Str "all",Space,Str "belong",Space,Str "to",Space,Str "a",Space,Str "single",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "block",Space,Str "quotes)."]
-,CodeBlock ("",[],[]) "  {  }"
-,Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "use",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",Space,Str "of",Space,Str "every",Space,Str "line,",Space,Str "as",Space,Str "with",Space,Str "blockquotes,",Space,Str "but",Space,Str "all",Space,Str "that",Space,Str "you",Space,Str "need",Space,Str "is",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",Space,Str "of",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "the",Space,Str "block",Space,Str "and",Space,Str "any",Space,Str "preceding",Space,Str "blank",Space,Str "lines."]
-,Para [Str "text",Space,Emph [Str "Leading",Space,Str "space"]]
-,Para [Emph [Str "Trailing",Space,Str "space"],Space,Str "text"]
-,Para [Str "text",Space,Emph [Str "Leading",Space,Str "spaces"]]
-,Para [Emph [Str "Trailing",Space,Str "spaces"],Space,Str "text"]
-,Header 1 ("tables",[],[]) [Str "Tables"]
-,Header 2 ("tables-with-headers",[],[]) [Str "Tables",Space,Str "with",Space,Str "Headers"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "X"]]
- ,[Plain [Str "Y"]]
- ,[Plain [Str "Z"]]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "X"]]
- ,[Plain [Str "Y"]]
- ,[Plain [Str "Z"]]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "X"]]
- ,[Plain [Str "Y"]]
- ,[Plain [Str "Z"]]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "X"]]
- ,[Plain [Str "Y"]]
- ,[Plain [Str "Z"]]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "X"]]
- ,[Plain [Str "Y"]]
- ,[Plain [Str "Z"]]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "X"]]
- ,[Plain [Str "Y"]]
- ,[Plain [Str "Z"]]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "X"]]
- ,[Plain [Str "Y"]]
- ,[Plain [Str "Z"]]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "X"]]
- ,[Plain [Str "Y"]]
- ,[Plain [Str "Z"]]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.3333333333333333,0.3333333333333333,0.3333333333333333]
- [[Plain [Str "X"]]
- ,[Plain [Str "Y"]]
- ,[Plain [Str "Z"]]]
- [[[Plain [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,Header 2 ("tables-without-headers",[],[]) [Str "Tables",Space,Str "without",Space,Str "Headers"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,HorizontalRule
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "1"]]
-  ,[Plain [Str "2"]]
-  ,[Plain [Str "3"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "5"]]
-  ,[Plain [Str "6"]]]]
-,Header 2 ("empty-tables",[],[]) [Str "Empty",Space,Str "Tables"]
-,Para [Str "This",Space,Str "section",Space,Str "should",Space,Str "be",Space,Str "empty."]]
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "generator" , MetaInlines [ Str "pandoc" ] )
+          , ( "title"
+            , MetaInlines
+                [ Str "Pandoc"
+                , Space
+                , Str "Test"
+                , Space
+                , Str "Suite"
+                ]
+            )
+          ]
+    }
+  [ Header
+      1
+      ( "pandoc-test-suite" , [ "title" ] , [] )
+      [ Str "Pandoc" , Space , Str "Test" , Space , Str "Suite" ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "set"
+      , Space
+      , Str "of"
+      , Space
+      , Str "tests"
+      , Space
+      , Str "for"
+      , Space
+      , Str "pandoc."
+      , Space
+      , Str "Most"
+      , Space
+      , Str "of"
+      , Space
+      , Str "them"
+      , Space
+      , Str "are"
+      , Space
+      , Str "adapted"
+      , Space
+      , Str "from"
+      , Space
+      , Str "John"
+      , Space
+      , Str "Gruber's"
+      , Space
+      , Str "markdown"
+      , Space
+      , Str "test"
+      , Space
+      , Str "suite."
+      ]
+  , HorizontalRule
+  , Header 1 ( "headers" , [] , [] ) [ Str "Headers" ]
+  , Header
+      2
+      ( "level-2-with-an-embedded-link" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "2"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "embedded" , Space , Str "link" ]
+          ( "/url" , "" )
+      ]
+  , Header
+      3
+      ( "level-3-with-emphasis" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "3"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "emphasis" ]
+      ]
+  , Header
+      4 ( "level-4" , [] , [] ) [ Str "Level" , Space , Str "4" ]
+  , Header
+      5 ( "level-5" , [] , [] ) [ Str "Level" , Space , Str "5" ]
+  , Header
+      1 ( "level-1" , [] , [] ) [ Str "Level" , Space , Str "1" ]
+  , Header
+      2
+      ( "level-2-with-emphasis" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "2"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "emphasis" ]
+      ]
+  , Header
+      3 ( "level-3" , [] , [] ) [ Str "Level" , Space , Str "3" ]
+  , Para
+      [ Str "with"
+      , Space
+      , Str "no"
+      , Space
+      , Str "blank"
+      , Space
+      , Str "line"
+      ]
+  , Header
+      2 ( "level-2" , [] , [] ) [ Str "Level" , Space , Str "2" ]
+  , Para
+      [ Str "with"
+      , Space
+      , Str "no"
+      , Space
+      , Str "blank"
+      , Space
+      , Str "line"
+      ]
+  , HorizontalRule
+  , Header 1 ( "paragraphs" , [] , [] ) [ Str "Paragraphs" ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Str "regular"
+      , Space
+      , Str "paragraph."
+      ]
+  , Para
+      [ Str "In"
+      , Space
+      , Str "Markdown"
+      , Space
+      , Str "1.0.0"
+      , Space
+      , Str "and"
+      , Space
+      , Str "earlier."
+      , Space
+      , Str "Version"
+      , Space
+      , Str "8."
+      , Space
+      , Str "This"
+      , Space
+      , Str "line"
+      , Space
+      , Str "turns"
+      , Space
+      , Str "into"
+      , Space
+      , Str "a"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item."
+      , Space
+      , Str "Because"
+      , Space
+      , Str "a"
+      , Space
+      , Str "hard-wrapped"
+      , Space
+      , Str "line"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "middle"
+      , Space
+      , Str "of"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph"
+      , Space
+      , Str "looked"
+      , Space
+      , Str "like"
+      , Space
+      , Str "a"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item."
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "one"
+      , Space
+      , Str "with"
+      , Space
+      , Str "a"
+      , Space
+      , Str "bullet."
+      , Space
+      , Str "*"
+      , Space
+      , Str "criminey."
+      ]
+  , Para
+      [ Str "There"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "hard"
+      , Space
+      , Str "line"
+      , Space
+      , Str "break"
+      , LineBreak
+      , Str "here."
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "block-quotes" , [] , [] )
+      [ Str "Block" , Space , Str "Quotes" ]
+  , Para [ Str "E-mail" , Space , Str "style:" ]
+  , BlockQuote
+      [ Para
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote."
+          , Space
+          , Str "It"
+          , Space
+          , Str "is"
+          , Space
+          , Str "pretty"
+          , Space
+          , Str "short."
+          ]
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "Code"
+          , Space
+          , Str "in"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote:"
+          ]
+      , CodeBlock
+          ( "" , [] , [] ) "sub status {\n    print \"working\";\n}"
+      , Para [ Str "A" , Space , Str "list:" ]
+      , OrderedList
+          ( 1 , DefaultStyle , DefaultDelim )
+          [ [ Plain [ Str "item" , Space , Str "one" ] ]
+          , [ Plain [ Str "item" , Space , Str "two" ] ]
+          ]
+      , Para
+          [ Str "Nested"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quotes:"
+          ]
+      , BlockQuote [ Para [ Str "nested" ] ]
+      , BlockQuote [ Para [ Str "nested" ] ]
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      , Space
+      , Str "2"
+      , Space
+      , Str ">"
+      , Space
+      , Str "1."
+      ]
+  , Para [ Str "Box-style:" ]
+  , BlockQuote
+      [ Para [ Str "Example:" ]
+      , CodeBlock
+          ( "" , [] , [] ) "sub status {\n    print \"working\";\n}"
+      ]
+  , BlockQuote
+      [ OrderedList
+          ( 1 , DefaultStyle , DefaultDelim )
+          [ [ Plain [ Str "do" , Space , Str "laundry" ] ]
+          , [ Plain
+                [ Str "take"
+                , Space
+                , Str "out"
+                , Space
+                , Str "the"
+                , Space
+                , Str "trash"
+                ]
+            ]
+          ]
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Str "nested"
+      , Space
+      , Str "one:"
+      ]
+  , BlockQuote
+      [ Para [ Str "Joe" , Space , Str "said:" ]
+      , BlockQuote
+          [ Para
+              [ Str "Don't" , Space , Str "quote" , Space , Str "me." ]
+          ]
+      ]
+  , Para
+      [ Str "And"
+      , Space
+      , Str "a"
+      , Space
+      , Str "following"
+      , Space
+      , Str "paragraph."
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "inline-quotes" , [] , [] )
+      [ Str "Inline" , Space , Str "quotes" ]
+  , Para
+      [ Str "Normal"
+      , Space
+      , Str "text"
+      , Space
+      , Str "but"
+      , Space
+      , Str "then"
+      , Space
+      , Str "a"
+      , Space
+      , Quoted
+          DoubleQuote
+          [ Span
+              ( ""
+              , []
+              , [ ( "cite"
+                  , "https://www.imdb.com/title/tt0062622/quotes/qt0396921"
+                  )
+                ]
+              )
+              [ Str "inline" , Space , Str "quote" ]
+          ]
+      , Str "."
+      ]
+  , Para
+      [ Quoted
+          DoubleQuote
+          [ Str "Missing"
+          , Space
+          , Str "a"
+          , Space
+          , Str "cite"
+          , Space
+          , Str "attribute"
+          , Space
+          , Str "means"
+          , Space
+          , Str "its"
+          , Space
+          , Str "just"
+          , Space
+          , Str "normal"
+          , Space
+          , Str "text"
+          ]
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "code-blocks" , [] , [] )
+      [ Str "Code" , Space , Str "Blocks" ]
+  , Para [ Str "Code:" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
+  , Para [ Str "And:" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
+  , HorizontalRule
+  , Header 1 ( "lists" , [] , [] ) [ Str "Lists" ]
+  , Header 2 ( "unordered" , [] , [] ) [ Str "Unordered" ]
+  , Para [ Str "Asterisks" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Plain [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Plain [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Plain [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Asterisks" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Para [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Pluses" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Plain [ Str "Plus" , Space , Str "1" ] ]
+      , [ Plain [ Str "Plus" , Space , Str "2" ] ]
+      , [ Plain [ Str "Plus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Pluses" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Para [ Str "Plus" , Space , Str "1" ] ]
+      , [ Para [ Str "Plus" , Space , Str "2" ] ]
+      , [ Para [ Str "Plus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Minuses" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Plain [ Str "Minus" , Space , Str "1" ] ]
+      , [ Plain [ Str "Minus" , Space , Str "2" ] ]
+      , [ Plain [ Str "Minus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Minuses" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Para [ Str "Minus" , Space , Str "1" ] ]
+      , [ Para [ Str "Minus" , Space , Str "2" ] ]
+      , [ Para [ Str "Minus" , Space , Str "3" ] ]
+      ]
+  , Header 2 ( "ordered" , [] , [] ) [ Str "Ordered" ]
+  , Para [ Str "Tight:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain [ Str "First" ] ]
+      , [ Plain [ Str "Second" ] ]
+      , [ Plain [ Str "Third" ] ]
+      ]
+  , Para [ Str "and:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain [ Str "One" ] ]
+      , [ Plain [ Str "Two" ] ]
+      , [ Plain [ Str "Three" ] ]
+      ]
+  , Para
+      [ Str "Loose" , Space , Str "using" , Space , Str "tabs:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second" ] ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para
+      [ Str "and" , Space , Str "using" , Space , Str "spaces:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "One" ] ]
+      , [ Para [ Str "Two" ] ]
+      , [ Para [ Str "Three" ] ]
+      ]
+  , Para [ Str "Multiple" , Space , Str "paragraphs:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para
+            [ Str "Item"
+            , Space
+            , Str "1,"
+            , Space
+            , Str "graf"
+            , Space
+            , Str "one."
+            ]
+        , Para
+            [ Str "Item"
+            , Space
+            , Str "1."
+            , Space
+            , Str "graf"
+            , Space
+            , Str "two."
+            , Space
+            , Str "The"
+            , Space
+            , Str "quick"
+            , Space
+            , Str "brown"
+            , Space
+            , Str "fox"
+            , Space
+            , Str "jumped"
+            , Space
+            , Str "over"
+            , Space
+            , Str "the"
+            , Space
+            , Str "lazy"
+            , Space
+            , Str "dog's"
+            , Space
+            , Str "back."
+            ]
+        ]
+      , [ Para [ Str "Item" , Space , Str "2." ] ]
+      , [ Para [ Str "Item" , Space , Str "3." ] ]
+      ]
+  , Para [ Str "List" , Space , Str "styles:" ]
+  , OrderedList ( 1 , DefaultStyle , DefaultDelim ) []
+  , OrderedList ( 1 , LowerRoman , DefaultDelim ) []
+  , OrderedList ( 1 , LowerRoman , DefaultDelim ) []
+  , OrderedList ( 1 , DefaultStyle , DefaultDelim ) []
+  , OrderedList ( 1 , LowerRoman , DefaultDelim ) []
+  , OrderedList ( 1 , LowerRoman , DefaultDelim ) []
+  , Header 2 ( "nested" , [] , [] ) [ Str "Nested" ]
+  , BulletList
+      [ [ Plain [ Str "Tab" ]
+        , BulletList
+            [ [ Plain [ Str "Tab" ]
+              , BulletList [ [ Plain [ Str "Tab" ] ] ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Here's" , Space , Str "another:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain [ Str "First" ] ]
+      , [ Plain [ Str "Second:" ]
+        , BulletList
+            [ [ Plain [ Str "Fee" ] ]
+            , [ Plain [ Str "Fie" ] ]
+            , [ Plain [ Str "Foe" ] ]
+            ]
+        ]
+      , [ Plain [ Str "Third" ] ]
+      ]
+  , Para
+      [ Str "Same"
+      , Space
+      , Str "thing"
+      , Space
+      , Str "but"
+      , Space
+      , Str "with"
+      , Space
+      , Str "paragraphs:"
+      ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second:" ]
+        , BulletList
+            [ [ Plain [ Str "Fee" ] ]
+            , [ Plain [ Str "Fie" ] ]
+            , [ Plain [ Str "Foe" ] ]
+            ]
+        ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Header
+      2
+      ( "tabs-and-spaces" , [] , [] )
+      [ Str "Tabs" , Space , Str "and" , Space , Str "spaces" ]
+  , BulletList
+      [ [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "tabs"
+            ]
+        ]
+      , [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "spaces"
+            ]
+        , BulletList
+            [ [ Para
+                  [ Str "this"
+                  , Space
+                  , Str "is"
+                  , Space
+                  , Str "an"
+                  , Space
+                  , Str "example"
+                  , Space
+                  , Str "list"
+                  , Space
+                  , Str "item"
+                  , Space
+                  , Str "indented"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "tabs"
+                  ]
+              ]
+            , [ Para
+                  [ Str "this"
+                  , Space
+                  , Str "is"
+                  , Space
+                  , Str "an"
+                  , Space
+                  , Str "example"
+                  , Space
+                  , Str "list"
+                  , Space
+                  , Str "item"
+                  , Space
+                  , Str "indented"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "spaces"
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Header
+      2
+      ( "fancy-list-markers" , [] , [] )
+      [ Str "Fancy" , Space , Str "list" , Space , Str "markers" ]
+  , OrderedList
+      ( 2 , Decimal , DefaultDelim )
+      [ [ Plain
+            [ Str "begins" , Space , Str "with" , Space , Str "2" ]
+        ]
+      , [ Para [ Str "and" , Space , Str "now" , Space , Str "3" ]
+        , Para
+            [ Str "with"
+            , Space
+            , Str "a"
+            , Space
+            , Str "continuation"
+            ]
+        , OrderedList
+            ( 4 , LowerRoman , DefaultDelim )
+            [ [ Plain
+                  [ Str "sublist"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "roman"
+                  , Space
+                  , Str "numerals,"
+                  , Space
+                  , Str "starting"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "4"
+                  ]
+              ]
+            , [ Plain [ Str "more" , Space , Str "items" ]
+              , OrderedList
+                  ( 1 , UpperAlpha , DefaultDelim )
+                  [ [ Plain [ Str "a" , Space , Str "subsublist" ] ]
+                  , [ Plain [ Str "a" , Space , Str "subsublist" ] ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Nesting:" ]
+  , OrderedList
+      ( 1 , UpperAlpha , DefaultDelim )
+      [ [ Plain [ Str "Upper" , Space , Str "Alpha" ]
+        , OrderedList
+            ( 1 , UpperRoman , DefaultDelim )
+            [ [ Plain [ Str "Upper" , Space , Str "Roman." ]
+              , OrderedList
+                  ( 6 , Decimal , DefaultDelim )
+                  [ [ Plain
+                        [ Str "Decimal"
+                        , Space
+                        , Str "start"
+                        , Space
+                        , Str "with"
+                        , Space
+                        , Str "6"
+                        ]
+                    , OrderedList
+                        ( 3 , LowerAlpha , DefaultDelim )
+                        [ [ Plain
+                              [ Str "Lower"
+                              , Space
+                              , Str "alpha"
+                              , Space
+                              , Str "with"
+                              , Space
+                              , Str "paren"
+                              ]
+                          ]
+                        ]
+                    ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Autonumbering:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain [ Str "Autonumber." ] ]
+      , [ Plain [ Str "More." ]
+        , OrderedList
+            ( 1 , DefaultStyle , DefaultDelim )
+            [ [ Plain [ Str "Nested." ] ] ]
+        ]
+      ]
+  , HorizontalRule
+  , Header 2 ( "definition" , [] , [] ) [ Str "Definition" ]
+  , DefinitionList
+      [ ( [ Str "Violin" ]
+        , [ [ Plain
+                [ Str "Stringed"
+                , Space
+                , Str "musical"
+                , Space
+                , Str "instrument."
+                ]
+            ]
+          , [ Plain [ Str "Torture" , Space , Str "device." ] ]
+          ]
+        )
+      , ( [ Str "Cello" , LineBreak , Str "Violoncello" ]
+        , [ [ Plain
+                [ Str "Low-voiced"
+                , Space
+                , Str "stringed"
+                , Space
+                , Str "instrument."
+                ]
+            ]
+          ]
+        )
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "inline-markup" , [] , [] )
+      [ 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 "."
+      ]
+  , Para
+      [ Str "Empty"
+      , Space
+      , Strong []
+      , Space
+      , Str "and"
+      , Space
+      , Emph []
+      , Str "."
+      ]
+  , Para
+      [ Str "An"
+      , Space
+      , Emph
+          [ Link
+              ( "" , [] , [] )
+              [ Str "emphasized" , Space , Str "link" ]
+              ( "/url" , "" )
+          ]
+      , Str "."
+      ]
+  , Para
+      [ Strong
+          [ Emph
+              [ Str "This"
+              , Space
+              , Str "is"
+              , Space
+              , Str "strong"
+              , Space
+              , Str "and"
+              , Space
+              , Str "em."
+              ]
+          ]
+      ]
+  , Para
+      [ Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Emph [ Str "this" ] ]
+      , Space
+      , Str "word."
+      ]
+  , Para
+      [ Strong
+          [ Emph
+              [ Str "This"
+              , Space
+              , Str "is"
+              , Space
+              , Str "strong"
+              , Space
+              , Str "and"
+              , Space
+              , Str "em."
+              ]
+          ]
+      ]
+  , Para
+      [ Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Emph [ Str "this" ] ]
+      , Space
+      , Str "word."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "code:"
+      , Space
+      , Code ( "" , [] , [] ) ">"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "$"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "\\"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "\\$"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) ""
+      , Str "."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , SmallCaps [ Str "small" , Space , Str "caps" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "These"
+      , Space
+      , Str "are"
+      , Space
+      , Str "all"
+      , Space
+      , Str "underlined:"
+      , Space
+      , Underline [ Str "foo" ]
+      , Space
+      , Str "and"
+      , Space
+      , Underline [ Str "bar" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "These"
+      , Space
+      , Str "are"
+      , Space
+      , Str "all"
+      , Space
+      , Str "strikethrough:"
+      , Space
+      , Strikeout [ Str "foo" ]
+      , Str ","
+      , Space
+      , Strikeout [ Str "bar" ]
+      , Str ","
+      , Space
+      , Str "and"
+      , Space
+      , Strikeout [ Str "baz" ]
+      , Str "."
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "smart-quotes-ellipses-dashes" , [] , [] )
+      [ Str "Smart"
+      , Space
+      , Str "quotes,"
+      , Space
+      , Str "ellipses,"
+      , Space
+      , Str "dashes"
+      ]
+  , Para
+      [ Str "\"Hello,\""
+      , Space
+      , Str "said"
+      , Space
+      , Str "the"
+      , Space
+      , Str "spider."
+      , Space
+      , Str "\"'Shelob'"
+      , Space
+      , Str "is"
+      , Space
+      , Str "my"
+      , Space
+      , Str "name.\""
+      ]
+  , Para
+      [ Str "'A',"
+      , Space
+      , Str "'B',"
+      , Space
+      , Str "and"
+      , Space
+      , Str "'C'"
+      , Space
+      , Str "are"
+      , Space
+      , Str "letters."
+      ]
+  , Para
+      [ Str "'Oak,'"
+      , Space
+      , Str "'elm,'"
+      , Space
+      , Str "and"
+      , Space
+      , Str "'beech'"
+      , Space
+      , Str "are"
+      , Space
+      , Str "names"
+      , Space
+      , Str "of"
+      , Space
+      , Str "trees."
+      , Space
+      , Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Str "'pine.'"
+      ]
+  , Para
+      [ Str "'He"
+      , Space
+      , Str "said,"
+      , Space
+      , Str "\"I"
+      , Space
+      , Str "want"
+      , Space
+      , Str "to"
+      , Space
+      , Str "go.\"'"
+      , Space
+      , Str "Were"
+      , Space
+      , Str "you"
+      , Space
+      , Str "alive"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "70's?"
+      ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "some"
+      , Space
+      , Str "quoted"
+      , Space
+      , Str "'"
+      , Code ( "" , [] , [] ) "code"
+      , Str "'"
+      , Space
+      , Str "and"
+      , Space
+      , Str "a"
+      , Space
+      , Str "\""
+      , Link
+          ( "" , [] , [] )
+          [ Str "quoted" , Space , Str "link" ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      , Str "\"."
+      ]
+  , Para
+      [ Str "Some"
+      , Space
+      , Str "dashes:"
+      , Space
+      , Str "one---two"
+      , Space
+      , Str "---"
+      , Space
+      , Str "three--four"
+      , Space
+      , Str "--"
+      , Space
+      , Str "five."
+      ]
+  , Para
+      [ Str "Dashes"
+      , Space
+      , Str "between"
+      , Space
+      , Str "numbers:"
+      , Space
+      , Str "5-7,"
+      , Space
+      , Str "255-66,"
+      , Space
+      , Str "1987-1999."
+      ]
+  , Para
+      [ Str "Ellipses...and."
+      , Space
+      , Str "."
+      , Space
+      , Str ".and"
+      , Space
+      , Str "."
+      , Space
+      , Str "."
+      , Space
+      , Str "."
+      , Space
+      , Str "."
+      ]
+  , HorizontalRule
+  , Header 1 ( "latex" , [] , [] ) [ Str "LaTeX" ]
+  , BulletList
+      [ [ Plain [ Str "\\cite[22-23]{smith.1899}" ] ]
+      , [ Plain [ Str "\\doublespacing" ] ]
+      , [ Plain [ Str "$2+2=4$" ] ]
+      , [ Plain
+            [ Str "$x" , Space , Str "\\in" , Space , Str "y$" ]
+        ]
+      , [ Plain
+            [ Str "$\\alpha"
+            , Space
+            , Str "\\wedge"
+            , Space
+            , Str "\\omega$"
+            ]
+        ]
+      , [ Plain [ Str "$223$" ] ]
+      , [ Plain [ Str "$p$-Tree" ] ]
+      , [ Plain
+            [ Str "$\\frac{d}{dx}f(x)=\\lim_{h\\to"
+            , Space
+            , Str "0}\\frac{f(x+h)-f(x)}{h}$"
+            ]
+        ]
+      , [ Plain
+            [ Str "Here's"
+            , Space
+            , Str "one"
+            , Space
+            , Str "that"
+            , Space
+            , Str "has"
+            , Space
+            , Str "a"
+            , Space
+            , Str "line"
+            , Space
+            , Str "break"
+            , Space
+            , Str "in"
+            , Space
+            , Str "it:"
+            , Space
+            , Str "$\\alpha"
+            , Space
+            , Str "+"
+            , Space
+            , Str "\\omega"
+            , Space
+            , Str "\\times"
+            , Space
+            , Str "x^2$."
+            ]
+        ]
+      ]
+  , Para
+      [ Str "These"
+      , Space
+      , Str "shouldn't"
+      , Space
+      , Str "be"
+      , Space
+      , Str "math:"
+      ]
+  , BulletList
+      [ [ Plain
+            [ Str "To"
+            , Space
+            , Str "get"
+            , Space
+            , Str "the"
+            , Space
+            , Str "famous"
+            , Space
+            , Str "equation,"
+            , Space
+            , Str "write"
+            , Space
+            , Code ( "" , [] , [] ) "$e = mc^2$"
+            , Str "."
+            ]
+        ]
+      , [ Plain
+            [ Str "$22,000"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Emph [ Str "lot" ]
+            , Space
+            , Str "of"
+            , Space
+            , Str "money."
+            , Space
+            , Str "So"
+            , Space
+            , Str "is"
+            , Space
+            , Str "$34,000."
+            , Space
+            , Str "(It"
+            , Space
+            , Str "worked"
+            , Space
+            , Str "if"
+            , Space
+            , Str "\"lot\""
+            , Space
+            , Str "is"
+            , Space
+            , Str "emphasized.)"
+            ]
+        ]
+      , [ Plain
+            [ Str "Escaped"
+            , Space
+            , Code ( "" , [] , [] ) "$"
+            , Str ":"
+            , Space
+            , Str "$73"
+            , Space
+            , Emph
+                [ Str "this"
+                , Space
+                , Str "should"
+                , Space
+                , Str "be"
+                , Space
+                , Str "emphasized"
+                ]
+            , Space
+            , Str "23$."
+            ]
+        ]
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Str "LaTeX"
+      , Space
+      , Str "table:"
+      ]
+  , Para
+      [ Str "\\begin{tabular}{|l|l|}\\hline"
+      , Space
+      , Str "Animal"
+      , Space
+      , Str "&"
+      , Space
+      , Str "Number"
+      , Space
+      , Str "\\\\"
+      , Space
+      , Str "\\hline"
+      , Space
+      , Str "Dog"
+      , Space
+      , Str "&"
+      , Space
+      , Str "2"
+      , Space
+      , Str "\\\\"
+      , Space
+      , Str "Cat"
+      , Space
+      , Str "&"
+      , Space
+      , Str "1"
+      , Space
+      , Str "\\\\"
+      , Space
+      , Str "\\hline"
+      , Space
+      , Str "\\end{tabular}"
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "special-characters" , [] , [] )
+      [ Str "Special" , Space , Str "Characters" ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "some"
+      , Space
+      , Str "unicode:"
+      ]
+  , BulletList
+      [ [ Plain
+            [ Str "I" , Space , Str "hat:" , Space , Str "\206" ]
+        ]
+      , [ Plain
+            [ Str "o" , Space , Str "umlaut:" , Space , Str "\246" ]
+        ]
+      , [ Plain [ Str "section:" , Space , Str "\167" ] ]
+      , [ Plain
+            [ Str "set"
+            , Space
+            , Str "membership:"
+            , Space
+            , Str "\8712"
+            ]
+        ]
+      , [ Plain [ Str "copyright:" , Space , Str "\169" ] ]
+      ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "has"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "their"
+      , Space
+      , Str "name."
+      ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "is"
+      , Space
+      , Str "another"
+      , Space
+      , Str "way"
+      , Space
+      , Str "to"
+      , Space
+      , Str "write"
+      , Space
+      , Str "it."
+      ]
+  , Para
+      [ Str "This" , Space , Str "&" , Space , Str "that." ]
+  , Para [ Str "4" , Space , Str "<" , Space , Str "5." ]
+  , Para [ Str "6" , Space , Str ">" , Space , Str "5." ]
+  , Para [ Str "Backslash:" , Space , Str "\\" ]
+  , Para [ Str "Backtick:" , Space , Str "`" ]
+  , Para [ Str "Asterisk:" , Space , Str "*" ]
+  , Para [ Str "Underscore:" , Space , Str "_" ]
+  , Para
+      [ Str "Left" , Space , Str "brace:" , Space , Str "{" ]
+  , Para
+      [ Str "Right" , Space , Str "brace:" , Space , Str "}" ]
+  , Para
+      [ Str "Left" , Space , Str "bracket:" , Space , Str "[" ]
+  , Para
+      [ Str "Right" , Space , Str "bracket:" , Space , Str "]" ]
+  , Para
+      [ Str "Left" , Space , Str "paren:" , Space , Str "(" ]
+  , Para
+      [ Str "Right" , Space , Str "paren:" , Space , Str ")" ]
+  , Para [ Str "Greater-than:" , Space , Str ">" ]
+  , Para [ Str "Hash:" , Space , Str "#" ]
+  , Para [ Str "Period:" , Space , Str "." ]
+  , Para [ Str "Bang:" , Space , Str "!" ]
+  , Para [ Str "Plus:" , Space , Str "+" ]
+  , Para [ Str "Minus:" , Space , Str "-" ]
+  , HorizontalRule
+  , Header 1 ( "links" , [] , [] ) [ Str "Links" ]
+  , Header 2 ( "explicit" , [] , [] ) [ Str "Explicit" ]
+  , Para
+      [ Str "Just"
+      , Space
+      , Str "a"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "URL" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , Space , Str "and" , Space , Str "title" ]
+          ( "/url/" , "title" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , Space , Str "and" , Space , Str "title" ]
+          ( "/url/" , "title preceded by two spaces" )
+      , Str "."
+      ]
+  , 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" )
+      ]
+  , Para
+      [ Str "Email"
+      , Space
+      , Str "link"
+      , Space
+      , Str "(nobody"
+      , Space
+      , Str "[at]"
+      , Space
+      , Str "nowhere.net)"
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "Empty" ] ( "" , "" )
+      , Str "."
+      ]
+  , Header 2 ( "reference" , [] , [] ) [ Str "Reference" ]
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "With"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "embedded" , Space , Str "[brackets]" ]
+          ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "b" ] ( "/url/" , "" )
+      , Space
+      , Str "by"
+      , Space
+      , Str "itself"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link."
+      ]
+  , Para
+      [ Str "Indented"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "once" ] ( "/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Indented"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "twice" ] ( "/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Indented"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "thrice" ] ( "/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Str "[not]"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link."
+      ]
+  , CodeBlock ( "" , [] , [] ) "[not]: /url"
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "bar" ]
+          ( "/url/" , "Title with \"quotes\" inside" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "biz" ]
+          ( "/url/" , "Title with \"quote\" inside" )
+      , Str "."
+      ]
+  , Header
+      2
+      ( "with-ampersands" , [] , [] )
+      [ Str "With" , Space , Str "ampersands" ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "link"
+          , Space
+          , Str "with"
+          , Space
+          , Str "an"
+          , Space
+          , Str "ampersand"
+          , Space
+          , Str "in"
+          , Space
+          , Str "the"
+          , Space
+          , Str "URL"
+          ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Str "amersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "link"
+      , Space
+      , Str "text:"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "AT&T" ]
+          ( "http://att.com/" , "AT&T" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "an"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "inline" , Space , Str "link" ]
+          ( "/script?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "an"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "inline"
+          , Space
+          , Str "link"
+          , Space
+          , Str "in"
+          , Space
+          , Str "pointy"
+          , Space
+          , Str "braces"
+          ]
+          ( "/script?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Header 2 ( "autolinks" , [] , [] ) [ Str "Autolinks" ]
+  , Para
+      [ Str "With"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand:"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "http://example.com/?foo=1&bar=2" ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      ]
+  , BulletList
+      [ [ Plain
+            [ Str "In" , Space , Str "a" , Space , Str "list?" ]
+        ]
+      , [ Plain
+            [ Link
+                ( "" , [] , [] )
+                [ Str "http://example.com/" ]
+                ( "http://example.com/" , "" )
+            ]
+        ]
+      , [ Plain [ Str "It" , Space , Str "should." ] ]
+      ]
+  , Para
+      [ Str "An"
+      , Space
+      , Str "e-mail"
+      , Space
+      , Str "address:"
+      , Space
+      , Str "nobody"
+      , Space
+      , Str "[at]"
+      , Space
+      , Str "nowhere.net"
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "Blockquoted:"
+          , Space
+          , Link
+              ( "" , [] , [] )
+              [ Str "http://example.com/" ]
+              ( "http://example.com/" , "" )
+          ]
+      ]
+  , Para
+      [ Str "Auto-links"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "occur"
+      , Space
+      , Str "here:"
+      , Space
+      , Code ( "" , [] , [] ) ""
+      ]
+  , CodeBlock
+      ( "" , [] , [] ) "or here: "
+  , HorizontalRule
+  , Header 1 ( "images" , [] , [] ) [ Str "Images" ]
+  , Para
+      [ Str "From"
+      , Space
+      , Str "\"Voyage"
+      , Space
+      , Str "dans"
+      , Space
+      , Str "la"
+      , Space
+      , Str "Lune\""
+      , Space
+      , Str "by"
+      , Space
+      , Str "Georges"
+      , Space
+      , Str "Melies"
+      , Space
+      , Str "(1902):"
+      ]
+  , Para
+      [ Image
+          ( "" , [] , [] )
+          [ Str "lalune" ]
+          ( "lalune.jpg" , "Voyage dans la Lune" )
+      ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "movie"
+      , Space
+      , Image
+          ( "" , [] , [] ) [ Str "movie" ] ( "movie.jpg" , "" )
+      , Space
+      , Str "icon."
+      ]
+  , HorizontalRule
+  , Header 1 ( "footnotes" , [] , [] ) [ Str "Footnotes" ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "footnote"
+      , Space
+      , Str "reference"
+      , Link ( "" , [] , [] ) [ Str "(1)" ] ( "#note_1" , "" )
+      , Str ","
+      , Space
+      , Str "and"
+      , Space
+      , Str "another"
+      , Link
+          ( "" , [] , [] )
+          [ Str "(longnote)" ]
+          ( "#note_longnote" , "" )
+      , Str "."
+      , Space
+      , Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Emph [ Str "not" ]
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "footnote"
+      , Space
+      , Str "reference,"
+      , Space
+      , Str "because"
+      , Space
+      , Str "it"
+      , Space
+      , Str "contains"
+      , Space
+      , Str "a"
+      , Space
+      , Str "space^(my"
+      , Space
+      , Str "note)."
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "(1)" ] ( "#ref_1" , "" )
+      , Space
+      , Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "the"
+      , Space
+      , Str "footnote."
+      , Space
+      , Str "It"
+      , Space
+      , Str "can"
+      , Space
+      , Str "go"
+      , Space
+      , Str "anywhere"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "document,"
+      , Space
+      , Str "not"
+      , Space
+      , Str "just"
+      , Space
+      , Str "at"
+      , Space
+      , Str "the"
+      , Space
+      , Str "end."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "(longnote)" ]
+          ( "#ref_longnote" , "" )
+      , Space
+      , Str "Here's"
+      , Space
+      , Str "the"
+      , Space
+      , Str "other"
+      , Space
+      , Str "note."
+      , Space
+      , Str "This"
+      , Space
+      , Str "one"
+      , Space
+      , Str "contains"
+      , Space
+      , Str "multiple"
+      , Space
+      , Str "blocks."
+      ]
+  , Para
+      [ Str "Caret"
+      , Space
+      , Str "characters"
+      , Space
+      , Str "are"
+      , Space
+      , Str "used"
+      , Space
+      , Str "to"
+      , Space
+      , Str "indicate"
+      , Space
+      , Str "that"
+      , Space
+      , Str "the"
+      , Space
+      , Str "blocks"
+      , Space
+      , Str "all"
+      , Space
+      , Str "belong"
+      , Space
+      , Str "to"
+      , Space
+      , Str "a"
+      , Space
+      , Str "single"
+      , Space
+      , Str "footnote"
+      , Space
+      , Str "(as"
+      , Space
+      , Str "with"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quotes)."
+      ]
+  , CodeBlock ( "" , [] , [] ) "  {  }"
+  , Para
+      [ Str "If"
+      , Space
+      , Str "you"
+      , Space
+      , Str "want,"
+      , Space
+      , Str "you"
+      , Space
+      , Str "can"
+      , Space
+      , Str "use"
+      , Space
+      , Str "a"
+      , Space
+      , Str "caret"
+      , Space
+      , Str "at"
+      , Space
+      , Str "the"
+      , Space
+      , Str "beginning"
+      , Space
+      , Str "of"
+      , Space
+      , Str "every"
+      , Space
+      , Str "line,"
+      , Space
+      , Str "as"
+      , Space
+      , Str "with"
+      , Space
+      , Str "blockquotes,"
+      , Space
+      , Str "but"
+      , Space
+      , Str "all"
+      , Space
+      , Str "that"
+      , Space
+      , Str "you"
+      , Space
+      , Str "need"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "caret"
+      , Space
+      , Str "at"
+      , Space
+      , Str "the"
+      , Space
+      , Str "beginning"
+      , Space
+      , Str "of"
+      , Space
+      , Str "the"
+      , Space
+      , Str "first"
+      , Space
+      , Str "line"
+      , Space
+      , Str "of"
+      , Space
+      , Str "the"
+      , Space
+      , Str "block"
+      , Space
+      , Str "and"
+      , Space
+      , Str "any"
+      , Space
+      , Str "preceding"
+      , Space
+      , Str "blank"
+      , Space
+      , Str "lines."
+      ]
+  , Para
+      [ Str "text"
+      , Space
+      , Emph [ Str "Leading" , Space , Str "space" ]
+      ]
+  , Para
+      [ Emph [ Str "Trailing" , Space , Str "space" ]
+      , Space
+      , Str "text"
+      ]
+  , Para
+      [ Str "text"
+      , Space
+      , Emph [ Str "Leading" , Space , Str "spaces" ]
+      ]
+  , Para
+      [ Emph [ Str "Trailing" , Space , Str "spaces" ]
+      , Space
+      , Str "text"
+      ]
+  , Header 1 ( "tables" , [] , [] ) [ Str "Tables" ]
+  , Header
+      2
+      ( "tables-with-headers" , [] , [] )
+      [ Str "Tables"
+      , Space
+      , Str "with"
+      , Space
+      , Str "Headers"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "X" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Y" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Z" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "X" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Y" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Z" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Para [ Str "Row" , Space , Str "headers" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "X" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Y" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Z" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 1)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "X" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Y" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Z" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 3)
+                  [ Plain [ Str "Details" ] ]
+              ]
+          ]
+      ]
+      (TableFoot
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "4" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "5" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "6" ] ]
+             ]
+         ])
+  , HorizontalRule
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "X" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Y" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Z" ] ]
+              ]
+          ]
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 3)
+                  [ Plain [ Str "Details" ] ]
+              ]
+          ]
+      ]
+      (TableFoot
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "4" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "5" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "6" ] ]
+             ]
+         ])
+  , HorizontalRule
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "X" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Y" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Z" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          ]
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "X" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Y" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Z" ] ]
+              ]
+          ]
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "X" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Y" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Z" ] ]
+              ]
+          ]
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "X" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Y" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Z" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          ]
+      , TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "X" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Y" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Z" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          ]
+      , TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Header
+      2
+      ( "tables-without-headers" , [] , [] )
+      [ Str "Tables"
+      , Space
+      , Str "without"
+      , Space
+      , Str "Headers"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Para
+      [ Str "tbody" , Space , Str "tags" , Space , Str "omitted" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Para [ Str "empty" , Space , Str "head" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Para
+      [ Str "explicit"
+      , Space
+      , Str "body"
+      , Space
+      , Str "and"
+      , Space
+      , Str "foot"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          ]
+      ]
+      (TableFoot
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "4" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "5" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "6" ] ]
+             ]
+         ])
+  , Header
+      2
+      ( "colspans-and-rowspans" , [] , [] )
+      [ Str "Colspans"
+      , Space
+      , Str "and"
+      , Space
+      , Str "Rowspans"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 2)
+                  [ Plain
+                      [ Str "1" , Space , Str "and" , Space , Str "2" ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 3)
+                  [ Plain
+                      [ Str "4,"
+                      , Space
+                      , Str "5,"
+                      , Space
+                      , Str "and"
+                      , Space
+                      , Str "6"
+                      ]
+                  ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , HorizontalRule
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 3)
+                 [ Plain [ Str "Numbers" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 2)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "1" , Space , Str "and" , Space , Str "4" ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "6" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Header 2 ( "attributes" , [] , [] ) [ Str "Attributes" ]
+  , Table
+      ( "attrib-test-table" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [ "table-head" ] , [] )
+         [ Row
+             ( "" , [ "table-head-row" ] , [] )
+             [ Cell
+                 ( "" , [] , [ ( "abbr" , "x" ) ] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 3)
+                 [ Plain [ Str "Cat" , Space , Str "X" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [ "main" ] , [ ( "part" , "body" ) ] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [ ( "part" , "row" ) ] )
+              [ Cell
+                  ( "" , [] , [ ( "part" , "cell" ) ] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [ ( "valign" , "bottom" ) ] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [ ( "style" , "color: #151950" ) ] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          ]
+      ]
+      (TableFoot
+         ( "" , [ "summary" ] , [] )
+         [ Row
+             ( "" , [] , [ ( "bgcolor" , "#ccc" ) ] )
+             [ Cell
+                 ( "" , [] , [ ( "square" , "true" ) ] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "4" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "5" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "6" ] ]
+             ]
+         ])
+  , Header
+      2
+      ( "tag-omission" , [] , [] )
+      [ Str "Tag" , Space , Str "omission" ]
+  , Para
+      [ Str "thead,"
+      , Space
+      , Str "tbody,"
+      , Space
+      , Str "and"
+      , Space
+      , Str "tfoot"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "X" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Y" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Z" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "3" ] ]
+              ]
+          ]
+      ]
+      (TableFoot
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "4" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "5" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "6" ] ]
+             ]
+         ])
+  , Header
+      2
+      ( "empty-tables" , [] , [] )
+      [ Str "Empty" , Space , Str "Tables" ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "section"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "empty."
+      ]
+  ]
diff --git a/test/ipynb/mime.ipynb b/test/ipynb/mime.ipynb
new file mode 100644
--- /dev/null
+++ b/test/ipynb/mime.ipynb
@@ -0,0 +1,187 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "0ad1fbe7-107b-4668-ae4d-8ce4ae9a4400",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from __future__ import annotations\n",
+    "\n",
+    "from dataclasses import dataclass"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "c2d3a9f4-dfdb-4ced-bbcd-3dfd1780af80",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "7.29.0\n"
+     ]
+    }
+   ],
+   "source": [
+    "import IPython\n",
+    "\n",
+    "print(IPython.__version__)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "21e7a4a1-0cf8-48cc-823c-dca698ae6853",
+   "metadata": {},
+   "source": [
+    "Supported IPython display formatters:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "id": "053cdbc4-b157-4e3e-9c86-8f374770d006",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "text/plain\n",
+      "text/html\n",
+      "text/markdown\n",
+      "image/svg+xml\n",
+      "image/png\n",
+      "application/pdf\n",
+      "image/jpeg\n",
+      "text/latex\n",
+      "application/json\n",
+      "application/javascript\n"
+     ]
+    }
+   ],
+   "source": [
+    "ip = get_ipython()\n",
+    "for mime in ip.display_formatter.formatters:\n",
+    "    print(mime)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "d79b063d-ce81-497b-a0ea-5b2e2972e845",
+   "metadata": {},
+   "source": [
+    "Let's write a simple class that will output different mime:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "id": "c847636c-1c45-432e-9d8d-7310dd7f5637",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "@dataclass\n",
+    "class Mime:\n",
+    "    math: str\n",
+    "\n",
+    "    def _repr_mimebundle_(\n",
+    "        self,\n",
+    "        include: Container[str] | None = None,\n",
+    "        exclude: Container[str] | None = None,\n",
+    "        **kwargs,\n",
+    "    ) -> dict[str, str]:\n",
+    "        string = self.math\n",
+    "        data = {\n",
+    "            \"text/plain\": string,\n",
+    "            \"text/html\": (latex := f\"\\\\[{string}\\\\]\"),\n",
+    "            \"text/markdown\": f\"$${string}$$\",\n",
+    "            # \"image/svg+xml\":,\n",
+    "            # \"image/png\":,\n",
+    "            # \"application/pdf\":,\n",
+    "            # \"image/jpeg\":,\n",
+    "            \"text/latex\": latex,\n",
+    "            # \"application/json\":,\n",
+    "            # \"application/javascript\":,\n",
+    "        }\n",
+    "        if include:\n",
+    "            data = {k: v for k, v in data.items() if k in include}\n",
+    "        if exclude:\n",
+    "            data = {k: v for k, v in data.items() if k not in exclude}\n",
+    "        return data"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "id": "4fa54f22-0c3a-4809-91f7-ea7101ff1907",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "mime = Mime(\"E = mc^2\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "id": "c419e6a6-240c-4af0-a244-5f1526705c30",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "\\[E = mc^2\\]"
+      ],
+      "text/latex": [
+       "\\[E = mc^2\\]"
+      ],
+      "text/markdown": [
+       "$$E = mc^2$$"
+      ],
+      "text/plain": [
+       "E = mc^2"
+      ]
+     },
+     "execution_count": 6,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "mime"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "bf140b8e-16ac-4670-9778-f1c1d9486f9d",
+   "metadata": {},
+   "source": [
+    "Note that #7561 made ipynb reader aware of this, and #7563 made ipynb writer aware of this."
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.9.6"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/test/ipynb/mime.native b/test/ipynb/mime.native
new file mode 100644
--- /dev/null
+++ b/test/ipynb/mime.native
@@ -0,0 +1,154 @@
+[ Div
+    ( "0ad1fbe7-107b-4668-ae4d-8ce4ae9a4400"
+    , [ "cell" , "code" ]
+    , [ ( "execution_count" , "1" ) ]
+    )
+    [ CodeBlock
+        ( "" , [ "python" ] , [] )
+        "from __future__ import annotations\n\nfrom dataclasses import dataclass"
+    ]
+, Div
+    ( "c2d3a9f4-dfdb-4ced-bbcd-3dfd1780af80"
+    , [ "cell" , "code" ]
+    , [ ( "execution_count" , "2" ) ]
+    )
+    [ CodeBlock
+        ( "" , [ "python" ] , [] )
+        "import IPython\n\nprint(IPython.__version__)"
+    , Div
+        ( "" , [ "output" , "stream" , "stdout" ] , [] )
+        [ CodeBlock ( "" , [] , [] ) "7.29.0\n" ]
+    ]
+, Div
+    ( "21e7a4a1-0cf8-48cc-823c-dca698ae6853"
+    , [ "cell" , "markdown" ]
+    , []
+    )
+    [ Para
+        [ Str "Supported"
+        , Space
+        , Str "IPython"
+        , Space
+        , Str "display"
+        , Space
+        , Str "formatters:"
+        ]
+    ]
+, Div
+    ( "053cdbc4-b157-4e3e-9c86-8f374770d006"
+    , [ "cell" , "code" ]
+    , [ ( "execution_count" , "3" ) ]
+    )
+    [ CodeBlock
+        ( "" , [ "python" ] , [] )
+        "ip = get_ipython()\nfor mime in ip.display_formatter.formatters:\n    print(mime)"
+    , Div
+        ( "" , [ "output" , "stream" , "stdout" ] , [] )
+        [ CodeBlock
+            ( "" , [] , [] )
+            "text/plain\ntext/html\ntext/markdown\nimage/svg+xml\nimage/png\napplication/pdf\nimage/jpeg\ntext/latex\napplication/json\napplication/javascript\n"
+        ]
+    ]
+, Div
+    ( "d79b063d-ce81-497b-a0ea-5b2e2972e845"
+    , [ "cell" , "markdown" ]
+    , []
+    )
+    [ Para
+        [ Str "Let's"
+        , Space
+        , Str "write"
+        , Space
+        , Str "a"
+        , Space
+        , Str "simple"
+        , Space
+        , Str "class"
+        , Space
+        , Str "that"
+        , Space
+        , Str "will"
+        , Space
+        , Str "output"
+        , Space
+        , Str "different"
+        , Space
+        , Str "mime:"
+        ]
+    ]
+, Div
+    ( "c847636c-1c45-432e-9d8d-7310dd7f5637"
+    , [ "cell" , "code" ]
+    , [ ( "execution_count" , "4" ) ]
+    )
+    [ CodeBlock
+        ( "" , [ "python" ] , [] )
+        "@dataclass\nclass Mime:\n    math: str\n\n    def _repr_mimebundle_(\n        self,\n        include: Container[str] | None = None,\n        exclude: Container[str] | None = None,\n        **kwargs,\n    ) -> dict[str, str]:\n        string = self.math\n        data = {\n            \"text/plain\": string,\n            \"text/html\": (latex := f\"\\\\[{string}\\\\]\"),\n            \"text/markdown\": f\"$${string}$$\",\n            # \"image/svg+xml\":,\n            # \"image/png\":,\n            # \"application/pdf\":,\n            # \"image/jpeg\":,\n            \"text/latex\": latex,\n            # \"application/json\":,\n            # \"application/javascript\":,\n        }\n        if include:\n            data = {k: v for k, v in data.items() if k in include}\n        if exclude:\n            data = {k: v for k, v in data.items() if k not in exclude}\n        return data"
+    ]
+, Div
+    ( "4fa54f22-0c3a-4809-91f7-ea7101ff1907"
+    , [ "cell" , "code" ]
+    , [ ( "execution_count" , "5" ) ]
+    )
+    [ CodeBlock
+        ( "" , [ "python" ] , [] ) "mime = Mime(\"E = mc^2\")"
+    ]
+, Div
+    ( "c419e6a6-240c-4af0-a244-5f1526705c30"
+    , [ "cell" , "code" ]
+    , [ ( "execution_count" , "6" ) ]
+    )
+    [ CodeBlock ( "" , [ "python" ] , [] ) "mime"
+    , Div
+        ( ""
+        , [ "output" , "execute_result" ]
+        , [ ( "execution_count" , "6" ) ]
+        )
+        [ RawBlock (Format "html") "\\[E = mc^2\\]"
+        , RawBlock (Format "latex") "\\[E = mc^2\\]"
+        , RawBlock (Format "markdown") "$$E = mc^2$$"
+        , CodeBlock ( "" , [] , [] ) "E = mc^2"
+        ]
+    ]
+, Div
+    ( "bf140b8e-16ac-4670-9778-f1c1d9486f9d"
+    , [ "cell" , "markdown" ]
+    , []
+    )
+    [ Para
+        [ Str "Note"
+        , Space
+        , Str "that"
+        , Space
+        , Str "#7561"
+        , Space
+        , Str "made"
+        , Space
+        , Str "ipynb"
+        , Space
+        , Str "reader"
+        , Space
+        , Str "aware"
+        , Space
+        , Str "of"
+        , Space
+        , Str "this,"
+        , Space
+        , Str "and"
+        , Space
+        , Str "#7563"
+        , Space
+        , Str "made"
+        , Space
+        , Str "ipynb"
+        , Space
+        , Str "writer"
+        , Space
+        , Str "aware"
+        , Space
+        , Str "of"
+        , Space
+        , Str "this."
+        ]
+    ]
+]
diff --git a/test/ipynb/mime.out.ipynb b/test/ipynb/mime.out.ipynb
new file mode 100644
--- /dev/null
+++ b/test/ipynb/mime.out.ipynb
@@ -0,0 +1,169 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from __future__ import annotations\n",
+    "\n",
+    "from dataclasses import dataclass"
+   ],
+   "id": "0ad1fbe7-107b-4668-ae4d-8ce4ae9a4400"
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": [
+      "7.29.0\n"
+     ]
+    }
+   ],
+   "source": [
+    "import IPython\n",
+    "\n",
+    "print(IPython.__version__)"
+   ],
+   "id": "c2d3a9f4-dfdb-4ced-bbcd-3dfd1780af80"
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Supported IPython display formatters:"
+   ],
+   "id": "21e7a4a1-0cf8-48cc-823c-dca698ae6853"
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "stream",
+     "name": "stdout",
+     "text": [
+      "text/plain\n",
+      "text/html\n",
+      "text/markdown\n",
+      "image/svg+xml\n",
+      "image/png\n",
+      "application/pdf\n",
+      "image/jpeg\n",
+      "text/latex\n",
+      "application/json\n",
+      "application/javascript\n"
+     ]
+    }
+   ],
+   "source": [
+    "ip = get_ipython()\n",
+    "for mime in ip.display_formatter.formatters:\n",
+    "    print(mime)"
+   ],
+   "id": "053cdbc4-b157-4e3e-9c86-8f374770d006"
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Let's write a simple class that will output different mime:"
+   ],
+   "id": "d79b063d-ce81-497b-a0ea-5b2e2972e845"
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "@dataclass\n",
+    "class Mime:\n",
+    "    math: str\n",
+    "\n",
+    "    def _repr_mimebundle_(\n",
+    "        self,\n",
+    "        include: Container[str] | None = None,\n",
+    "        exclude: Container[str] | None = None,\n",
+    "        **kwargs,\n",
+    "    ) -> dict[str, str]:\n",
+    "        string = self.math\n",
+    "        data = {\n",
+    "            \"text/plain\": string,\n",
+    "            \"text/html\": (latex := f\"\\\\[{string}\\\\]\"),\n",
+    "            \"text/markdown\": f\"$${string}$$\",\n",
+    "            # \"image/svg+xml\":,\n",
+    "            # \"image/png\":,\n",
+    "            # \"application/pdf\":,\n",
+    "            # \"image/jpeg\":,\n",
+    "            \"text/latex\": latex,\n",
+    "            # \"application/json\":,\n",
+    "            # \"application/javascript\":,\n",
+    "        }\n",
+    "        if include:\n",
+    "            data = {k: v for k, v in data.items() if k in include}\n",
+    "        if exclude:\n",
+    "            data = {k: v for k, v in data.items() if k not in exclude}\n",
+    "        return data"
+   ],
+   "id": "c847636c-1c45-432e-9d8d-7310dd7f5637"
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "mime = Mime(\"E = mc^2\")"
+   ],
+   "id": "4fa54f22-0c3a-4809-91f7-ea7101ff1907"
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "execute_result",
+     "execution_count": 6,
+     "metadata": {},
+     "data": {
+      "text/html": [
+       "\\[E = mc^2\\]"
+      ],
+      "text/latex": [
+       "\\[E = mc^2\\]"
+      ],
+      "text/markdown": [
+       "$$E = mc^2$$"
+      ],
+      "text/plain": [
+       "E = mc^2"
+      ]
+     }
+    }
+   ],
+   "source": [
+    "mime"
+   ],
+   "id": "c419e6a6-240c-4af0-a244-5f1526705c30"
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Note that #7561 made ipynb reader aware of this, and #7563 made ipynb writer aware of this."
+   ],
+   "id": "bf140b8e-16ac-4670-9778-f1c1d9486f9d"
+  }
+ ],
+ "nbformat": 4,
+ "nbformat_minor": 5,
+ "metadata": {}
+}
diff --git a/test/ipynb/rank.ipynb b/test/ipynb/rank.ipynb
new file mode 100644
--- /dev/null
+++ b/test/ipynb/rank.ipynb
@@ -0,0 +1,60 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "5cf8f54d-bf3c-4db2-996d-22662a86ad43",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import matplotlib.pyplot as plt"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "a0228622-9ff8-4392-9ddd-f70a90f0e106",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": "
    you should see this when converting from ipynb to html instead of the image below.
    ",
+      "image/png": "iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAOXRFWHRTb2Z0d2FyZQBNYXRwbG90bGliIHZlcnNpb24zLjUuMCwgaHR0cHM6Ly9tYXRwbG90bGliLm9yZy8/fFQqAAAACXBIWXMAAACdAAAAnQGPcuduAAAASUlEQVR4nGNkYGBgc1HM+/lfkI/hqQ0XAwsDAwPDzSphBi6h/wwlahsgAiJCHxkkBL4zWLA8YGBkYGBgZGBg4GRgYPjDwMDABADgfgxL+wQIRAAAAABJRU5ErkJggg==\n",
+      "text/plain": [
+       "
    "
+      ]
+     },
+     "metadata": {
+      "needs_background": "light"
+     },
+     "output_type": "display_data"
+    }
+   ],
+   "source": [
+    "fig, ax = plt.subplots(figsize=(1, 1), dpi=4)\n",
+    "ax.imshow([[0, 1], [2, 3]]);"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.10.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/test/ipynb/rank.out.html b/test/ipynb/rank.out.html
new file mode 100644
--- /dev/null
+++ b/test/ipynb/rank.out.html
@@ -0,0 +1,14 @@
+
    
+
    import matplotlib.pyplot as plt
    
+
    
+
    
+
    fig, ax = plt.subplots(figsize=(1, 1), dpi=4)
+ax.imshow([[0, 1], [2, 3]]);
    
+
    
+
    you should see this when converting from ipynb to html instead of the image below.
    
+
    
+
    
diff --git a/test/ipynb/simple.in.native b/test/ipynb/simple.in.native
new file mode 100644
--- /dev/null
+++ b/test/ipynb/simple.in.native
@@ -0,0 +1,15 @@
+Pandoc (Meta {unMeta = fromList [("jupyter",MetaMap (fromList [("nbformat",MetaInlines [Str "4"]),("nbformat_minor",MetaInlines [Str "5"])]))]})
+[Div ("uid1",["cell","markdown"],[])
+ [Header 1 ("lorem-ipsum",[],[]) [Str "Lorem",Space,Str "ipsum"]
+ ,Para [Strong [Str "Lorem",Space,Str "ipsum"],Space,Str "dolor",Space,Str "sit",Space,Str "amet,",Space,Str "consectetur",Space,Str "adipiscing",Space,Str "elit.",Space,Str "Nunc",Space,Str "luctus",SoftBreak,Str "bibendum",Space,Str "felis",Space,Str "dictum",Space,Str "sodales."]]
+,Div ("uid2",["cell","code"],[])
+ [CodeBlock ("",["python"],[]) "print(\"hello\")"]
+,Div ("uid3",["cell","markdown"],[])
+ [Header 2 ("pyout",[],[]) [Str "Pyout"]]
+,Div ("uid4",["cell","code"],[("execution_count","2")])
+ [CodeBlock ("",["python"],[]) "from IPython.display import HTML\nHTML(\"\"\"\n\nHTML\n\"\"\")"
+ ,Div ("uid5",["output","execute_result"],[("execution_count","2")])
+  [RawBlock (Format "html") "\nHTML\nhello"]]
+,Div ("uid6",["cell","markdown"],[("tags","[\"foo\",\"bar\"]")])
+ [Header 2 ("image",[],[]) [Str "Image"]
+ ,Para [Str "This",Space,Str "image",Space,Image ("",[],[]) [Str "the",Space,Str "moon"] ("lalune.jpg",""),Space,Str "will",Space,Str "be",Space,Str "included",Space,Str "as",Space,Str "a",Space,Str "cell",SoftBreak,Str "attachment."]]]
diff --git a/test/ipynb/simple.ipynb b/test/ipynb/simple.ipynb
new file mode 100644
--- /dev/null
+++ b/test/ipynb/simple.ipynb
@@ -0,0 +1,91 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Lorem ipsum\n",
+    "===========\n",
+    "\n",
+    "**Lorem ipsum** dolor sit amet, consectetur adipiscing elit. Nunc luctus\n",
+    "bibendum felis dictum sodales."
+   ],
+   "id": "uid1"
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "print(\"hello\")"
+   ],
+   "id": "uid2"
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Pyout\n",
+    "-----"
+   ],
+   "id": "uid3"
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [
+    {
+     "output_type": "execute_result",
+     "execution_count": 2,
+     "metadata": {},
+     "data": {
+      "text/html": [
+       "\n",
+       "HTML\n",
+       "hello"
+      ]
+     }
+    }
+   ],
+   "source": [
+    "from IPython.display import HTML\n",
+    "HTML(\"\"\"\n",
+    "\n",
+    "HTML\n",
+    "\"\"\")"
+   ],
+   "id": "uid4"
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "tags": [
+     "foo",
+     "bar"
+    ]
+   },
+   "source": [
+    "Image\n",
+    "-----\n",
+    "\n",
+    "This image ![the moon](attachment:lalune.jpg) will be included as a cell\n",
+    "attachment."
+   ],
+   "attachments": {
+    "lalune.jpg": {
+     "image/jpeg": "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\nsSjCcDmgVAAbgYoGYJ3nk9qBUAYHAoP/2Q==\n"
+    }
+   },
+   "id": "uid6"
+  }
+ ],
+ "nbformat": 4,
+ "nbformat_minor": 5,
+ "metadata": {}
+}
diff --git a/test/ipynb/simple.out.native b/test/ipynb/simple.out.native
new file mode 100644
--- /dev/null
+++ b/test/ipynb/simple.out.native
@@ -0,0 +1,103 @@
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "jupyter"
+            , MetaMap
+                (fromList
+                   [ ( "nbformat" , MetaString "4" )
+                   , ( "nbformat_minor" , MetaString "5" )
+                   ])
+            )
+          ]
+    }
+  [ Div
+      ( "uid1" , [ "cell" , "markdown" ] , [] )
+      [ Header
+          1
+          ( "lorem-ipsum" , [] , [] )
+          [ Str "Lorem" , Space , Str "ipsum" ]
+      , Para
+          [ Strong [ Str "Lorem" , Space , Str "ipsum" ]
+          , Space
+          , Str "dolor"
+          , Space
+          , Str "sit"
+          , Space
+          , Str "amet,"
+          , Space
+          , Str "consectetur"
+          , Space
+          , Str "adipiscing"
+          , Space
+          , Str "elit."
+          , Space
+          , Str "Nunc"
+          , Space
+          , Str "luctus"
+          , SoftBreak
+          , Str "bibendum"
+          , Space
+          , Str "felis"
+          , Space
+          , Str "dictum"
+          , Space
+          , Str "sodales."
+          ]
+      ]
+  , Div
+      ( "uid2" , [ "cell" , "code" ] , [] )
+      [ CodeBlock ( "" , [ "python" ] , [] ) "print(\"hello\")" ]
+  , Div
+      ( "uid3" , [ "cell" , "markdown" ] , [] )
+      [ Header 2 ( "pyout" , [] , [] ) [ Str "Pyout" ] ]
+  , Div
+      ( "uid4"
+      , [ "cell" , "code" ]
+      , [ ( "execution_count" , "2" ) ]
+      )
+      [ CodeBlock
+          ( "" , [ "python" ] , [] )
+          "from IPython.display import HTML\nHTML(\"\"\"\n\nHTML\n\"\"\")"
+      , Div
+          ( ""
+          , [ "output" , "execute_result" ]
+          , [ ( "execution_count" , "2" ) ]
+          )
+          [ RawBlock
+              (Format "html")
+              "\nHTML\nhello"
+          ]
+      ]
+  , Div
+      ( "uid6"
+      , [ "cell" , "markdown" ]
+      , [ ( "tags" , "[\"foo\",\"bar\"]" ) ]
+      )
+      [ Header 2 ( "image" , [] , [] ) [ Str "Image" ]
+      , Para
+          [ Str "This"
+          , Space
+          , Str "image"
+          , Space
+          , Image
+              ( "" , [] , [] )
+              [ Str "the" , Space , Str "moon" ]
+              ( "uid6-lalune.jpg" , "" )
+          , Space
+          , Str "will"
+          , Space
+          , Str "be"
+          , Space
+          , Str "included"
+          , Space
+          , Str "as"
+          , Space
+          , Str "a"
+          , Space
+          , Str "cell"
+          , SoftBreak
+          , Str "attachment."
+          ]
+      ]
+  ]
diff --git a/test/jats-reader.native b/test/jats-reader.native
--- a/test/jats-reader.native
+++ b/test/jats-reader.native
@@ -1,422 +1,3673 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"]]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
-[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",SoftBreak,Str "Gruber's",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
-,Header 1 ("headers",[],[]) [Str "Headers"]
-,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",SoftBreak,Link ("",[],[]) [Str "embedded",SoftBreak,Str "link"] ("/url","")]
-,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 4 ("level-4",[],[]) [Str "Level",Space,Str "4"]
-,Header 5 ("level-5",[],[]) [Str "Level",Space,Str "5"]
-,Header 1 ("level-1",[],[]) [Str "Level",Space,Str "1"]
-,Header 2 ("level-2-with-emphasis",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 3 ("level-3",[],[]) [Str "Level",Space,Str "3"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,Header 2 ("level-2",[],[]) [Str "Level",Space,Str "2"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
-,Para [Str "Here's",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",Space,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",SoftBreak,Str "list",Space,Str "item.",Space,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",SoftBreak,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item."]
-,Para [Str "Here's",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",Space,Str "*",Space,Str "criminey."]
-,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
-,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
-,Para [Str "E-mail",Space,Str "style:"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",Space,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."]]
-,BlockQuote
- [Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"
- ,Para [Str "A",Space,Str "list:"]
- ,OrderedList (1,DefaultStyle,DefaultDelim)
-  [[Para [Str "item",Space,Str "one"]]
-  ,[Para [Str "item",Space,Str "two"]]]
- ,Para [Str "Nested",Space,Str "block",Space,Str "quotes:"]
- ,BlockQuote
-  [Para [Str "nested"]]
- ,BlockQuote
-  [Para [Str "nested"]]]
-,Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",Space,Str ">",Space,Str "1."]
-,Para [Str "Box-style:"]
-,BlockQuote
- [Para [Str "Example:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"]
-,BlockQuote
- [OrderedList (1,DefaultStyle,DefaultDelim)
-  [[Para [Str "do",Space,Str "laundry"]]
-  ,[Para [Str "take",Space,Str "out",Space,Str "the",Space,Str "trash"]]]]
-,Para [Str "Here's",Space,Str "a",Space,Str "nested",Space,Str "one:"]
-,BlockQuote
- [Para [Str "Joe",Space,Str "said:"]
- ,BlockQuote
-  [Para [Str "Don't",Space,Str "quote",Space,Str "me."]]]
-,Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."]
-,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"]
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
-,Para [Str "And:"]
-,CodeBlock ("",[],[]) "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
-,Header 1 ("lists",[],[]) [Str "Lists"]
-,Header 2 ("unordered",[],[]) [Str "Unordered"]
-,Para [Str "Asterisks",Space,Str "tight:"]
-,BulletList
- [[Para [Str "asterisk",Space,Str "1"]]
- ,[Para [Str "asterisk",Space,Str "2"]]
- ,[Para [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Asterisks",Space,Str "loose:"]
-,BulletList
- [[Para [Str "asterisk",Space,Str "1"]]
- ,[Para [Str "asterisk",Space,Str "2"]]
- ,[Para [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "tight:"]
-,BulletList
- [[Para [Str "Plus",Space,Str "1"]]
- ,[Para [Str "Plus",Space,Str "2"]]
- ,[Para [Str "Plus",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Plus",Space,Str "1"]]
- ,[Para [Str "Plus",Space,Str "2"]]
- ,[Para [Str "Plus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "tight:"]
-,BulletList
- [[Para [Str "Minus",Space,Str "1"]]
- ,[Para [Str "Minus",Space,Str "2"]]
- ,[Para [Str "Minus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Minus",Space,Str "1"]]
- ,[Para [Str "Minus",Space,Str "2"]]
- ,[Para [Str "Minus",Space,Str "3"]]]
-,Header 2 ("ordered",[],[]) [Str "Ordered"]
-,Para [Str "Tight:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "First"]]
- ,[Para [Str "Second"]]
- ,[Para [Str "Third"]]]
-,Para [Str "and:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "One"]]
- ,[Para [Str "Two"]]
- ,[Para [Str "Three"]]]
-,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "First"]]
- ,[Para [Str "Second"]]
- ,[Para [Str "Third"]]]
-,Para [Str "and",Space,Str "using",Space,Str "spaces:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "One"]]
- ,[Para [Str "Two"]]
- ,[Para [Str "Three"]]]
-,Para [Str "Multiple",Space,Str "paragraphs:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
-  ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",SoftBreak,Str "dog's",Space,Str "back."]]
- ,[Para [Str "Item",Space,Str "2."]]
- ,[Para [Str "Item",Space,Str "3."]]]
-,Para [Str "List",Space,Str "styles:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- []
-,OrderedList (1,LowerRoman,DefaultDelim)
- []
-,Header 2 ("nested",[],[]) [Str "Nested"]
-,BulletList
- [[Para [Str "Tab"]
-  ,BulletList
-   [[Para [Str "Tab"]
-    ,BulletList
-     [[Para [Str "Tab"]]]]]]]
-,Para [Str "Here's",Space,Str "another:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BulletList
-   [[Para [Str "Fee"]]
-   ,[Para [Str "Fie"]]
-   ,[Para [Str "Foe"]]]]
- ,[Para [Str "Third"]]]
-,Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BulletList
-   [[Para [Str "Fee"]]
-   ,[Para [Str "Fie"]]
-   ,[Para [Str "Foe"]]]]
- ,[Para [Str "Third"]]]
-,Header 2 ("tabs-and-spaces",[],[]) [Str "Tabs",Space,Str "and",Space,Str "spaces"]
-,BulletList
- [[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"]]
- ,[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"]
-  ,BulletList
-   [[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"]]
-   ,[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"]]]]]
-,Header 2 ("fancy-list-markers",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"]
-,Para [Str "Autonumbering:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "Autonumber."]]
- ,[Para [Str "More."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Para [Str "Nested."]]]]]
-,Header 2 ("definition",[],[]) [Str "Definition"]
-,DefinitionList
- [([Str "Violin"],
-   [[Para [Str "Stringed",Space,Str "musical",Space,Str "instrument."]
-    ,Para [Str "Torture",Space,Str "device."]]])
- ,([Str "Cello",LineBreak,Str "Violoncello"],
-   [[Para [Str "Low-voiced",Space,Str "stringed",Space,Str "instrument."]]])]
-,Header 1 ("inline-markup",[],[]) [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",SoftBreak,Str "this"],Str "."]
-,Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",SoftBreak,Strong [Str "is",Space,Str "this"],Str "."]
-,Para [Str "Empty",Space,Strong [],Space,Str "and",Space,Emph [],Str "."]
-,Para [Str "An",SoftBreak,Emph [Link ("",[],[]) [Str "emphasized",SoftBreak,Str "link"] ("/url","")],Str "."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",SoftBreak,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",SoftBreak,Code ("",[],[]) "",Str "."]
-,Para [Str "This",Space,Str "is",Space,SmallCaps [Str "small",Space,Str "caps"],Str "."]
-,Para [Str "These",Space,Str "are",Space,Str "all",Space,Str "underlined:",Space,Str "foo",Space,Str "and",Space,Str "bar."]
-,Para [Str "These",Space,Str "are",Space,Str "all",Space,Str "strikethrough:",Space,Strikeout [Str "foo"],Str ",",SoftBreak,Strikeout [Str "bar"],Str ",",Space,Str "and",Space,Strikeout [Str "baz"],Str "."]
-,Header 1 ("smart-quotes-ellipses-dashes",[],[]) [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"]
-,Para [Str "\"Hello,\"",Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Str "\"'Shelob'",Space,Str "is",Space,Str "my",Space,Str "name.\""]
-,Para [Str "'A',",Space,Str "'B',",Space,Str "and",Space,Str "'C'",Space,Str "are",Space,Str "letters."]
-,Para [Str "'Oak,'",Space,Str "'elm,'",Space,Str "and",Space,Str "'beech'",Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees.",Space,Str "So",Space,Str "is",Space,Str "'pine.'"]
-,Para [Str "'He",Space,Str "said,",Space,Str "\"I",Space,Str "want",Space,Str "to",Space,Str "go.\"'",Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70's?"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Str "'",Code ("",[],[]) "code",Str "'",Space,Str "and",Space,Str "a",SoftBreak,Str "\"",Link ("",[],[]) [Str "quoted",SoftBreak,Str "link"] ("http://example.com/?foo=1&bar=2",""),Str "\"."]
-,Para [Str "Some",Space,Str "dashes:",Space,Str "one---two",Space,Str "---",Space,Str "three--four",Space,Str "--",Space,Str "five."]
-,Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5-7,",Space,Str "255-66,",Space,Str "1987-1999."]
-,Para [Str "Ellipses...and.",Space,Str ".",Space,Str ".and",Space,Str ".",Space,Str ".",Space,Str ".",Space,Str "."]
-,Header 1 ("latex",[],[]) [Str "LaTeX"]
-,BulletList
- [[Para [Str "\\cite[22-23]{smith.1899}"]]
- ,[Para [Str "\\doublespacing"]]
- ,[Para [Str "$2+2=4$"]]
- ,[Para [Str "$x",Space,Str "\\in",Space,Str "y$"]]
- ,[Para [Str "$\\alpha",Space,Str "\\wedge",Space,Str "\\omega$"]]
- ,[Para [Str "$223$"]]
- ,[Para [Str "$p$-Tree"]]
- ,[Para [Str "$\\frac{d}{dx}f(x)=\\lim_{h\\to",Space,Str "0}\\frac{f(x+h)-f(x)}{h}$"]]
- ,[Para [Str "Here's",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,Str "$\\alpha",Space,Str "+",Space,Str "\\omega",Space,Str "\\times",SoftBreak,Str "x^2$."]]]
-,Para [Str "These",Space,Str "shouldn't",Space,Str "be",Space,Str "math:"]
-,BulletList
- [[Para [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",SoftBreak,Code ("",[],[]) "$e = mc^2$",Str "."]]
- ,[Para [Str "$22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$34,000.",Space,Str "(It",SoftBreak,Str "worked",Space,Str "if",Space,Str "\"lot\"",Space,Str "is",Space,Str "emphasized.)"]]
- ,[Para [Str "Escaped",Space,Code ("",[],[]) "$",Str ":",Space,Str "$73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",SoftBreak,Str "emphasized"],Space,Str "23$."]]]
-,Para [Str "Here's",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]
-,Para [Str "\\begin{tabular}{|l|l|}\\hline",Space,Str "Animal",Space,Str "&",Space,Str "Number",Space,Str "\\\\",Space,Str "\\hline",Space,Str "Dog",Space,Str "&",SoftBreak,Str "2",Space,Str "\\\\",Space,Str "Cat",Space,Str "&",Space,Str "1",Space,Str "\\\\",Space,Str "\\hline",Space,Str "\\end{tabular}"]
-,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"]
-,BulletList
- [[Para [Str "I",Space,Str "hat:",Space,Str "\206"]]
- ,[Para [Str "o",Space,Str "umlaut:",Space,Str "\246"]]
- ,[Para [Str "section:",Space,Str "\167"]]
- ,[Para [Str "set",Space,Str "membership:",Space,Str "elem"]]
- ,[Para [Str "copyright:",Space,Str "\169"]]]
-,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-,Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."]
-,Para [Str "This",Space,Str "&",Space,Str "that."]
-,Para [Str "4",Space,Str "<",Space,Str "5."]
-,Para [Str "6",Space,Str ">",Space,Str "5."]
-,Para [Str "Backslash:",Space,Str "\\"]
-,Para [Str "Backtick:",Space,Str "`"]
-,Para [Str "Asterisk:",Space,Str "*"]
-,Para [Str "Underscore:",Space,Str "_"]
-,Para [Str "Left",Space,Str "brace:",Space,Str "{"]
-,Para [Str "Right",Space,Str "brace:",Space,Str "}"]
-,Para [Str "Left",Space,Str "bracket:",Space,Str "["]
-,Para [Str "Right",Space,Str "bracket:",Space,Str "]"]
-,Para [Str "Left",Space,Str "paren:",Space,Str "("]
-,Para [Str "Right",Space,Str "paren:",Space,Str ")"]
-,Para [Str "Greater-than:",Space,Str ">"]
-,Para [Str "Hash:",Space,Str "#"]
-,Para [Str "Period:",Space,Str "."]
-,Para [Str "Bang:",Space,Str "!"]
-,Para [Str "Plus:",Space,Str "+"]
-,Para [Str "Minus:",Space,Str "-"]
-,Header 1 ("links",[],[]) [Str "Links"]
-,Header 2 ("explicit",[],[]) [Str "Explicit"]
-,Para [Str "Just",Space,Str "a",SoftBreak,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "URL",SoftBreak,Str "and",Space,Str "title"] ("/url/","title"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",SoftBreak,Str "and",Space,Str "title"] ("/url/","title preceded by two spaces"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",SoftBreak,Str "and",Space,Str "title"] ("/url/","title preceded by a tab"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",SoftBreak,Str "and",Space,Str "title"] ("/url/","title with \"quotes\" in it")]
-,Para [Link ("",[],[]) [Str "URL",SoftBreak,Str "and",Space,Str "title"] ("/url/","title with single quotes")]
-,Para [Str "Email",Space,Str "link",Space,Str "(nobody",Space,Str "[at]",Space,Str "nowhere.net)"]
-,Para [Link ("",[],[]) [Str "Empty"] ("",""),Str "."]
-,Header 2 ("reference",[],[]) [Str "Reference"]
-,Para [Str "Foo",SoftBreak,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "Foo",SoftBreak,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "Foo",SoftBreak,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "With",Space,Link ("",[],[]) [Str "embedded",SoftBreak,Str "[brackets]"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "b"] ("/url/",""),Space,Str "by",SoftBreak,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."]
-,Para [Str "Indented",SoftBreak,Link ("",[],[]) [Str "once"] ("/url",""),Str "."]
-,Para [Str "Indented",SoftBreak,Link ("",[],[]) [Str "twice"] ("/url",""),Str "."]
-,Para [Str "Indented",SoftBreak,Link ("",[],[]) [Str "thrice"] ("/url",""),Str "."]
-,Para [Str "This",Space,Str "should",Space,Str "[not]",Space,Str "be",Space,Str "a",Space,Str "link."]
-,CodeBlock ("",[],[]) "[not]: /url"
-,Para [Str "Foo",SoftBreak,Link ("",[],[]) [Str "bar"] ("/url/","Title with \"quotes\" inside"),Str "."]
-,Para [Str "Foo",SoftBreak,Link ("",[],[]) [Str "biz"] ("/url/","Title with \"quote\" inside"),Str "."]
-,Header 2 ("with-ampersands",[],[]) [Str "With",Space,Str "ampersands"]
-,Para [Str "Here's",Space,Str "a",SoftBreak,Link ("",[],[]) [Str "link",SoftBreak,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."]
-,Para [Str "Here's",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",SoftBreak,Link ("",[],[]) [Str "AT&T"] ("http://att.com/","AT&T"),Str "."]
-,Para [Str "Here's",Space,Str "an",SoftBreak,Link ("",[],[]) [Str "inline",SoftBreak,Str "link"] ("/script?foo=1&bar=2",""),Str "."]
-,Para [Str "Here's",Space,Str "an",SoftBreak,Link ("",[],[]) [Str "inline",SoftBreak,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] ("/script?foo=1&bar=2",""),Str "."]
-,Header 2 ("autolinks",[],[]) [Str "Autolinks"]
-,Para [Str "With",Space,Str "an",Space,Str "ampersand:",SoftBreak,Link ("",[],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")]
-,BulletList
- [[Para [Str "In",Space,Str "a",Space,Str "list?"]]
- ,[Para [Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]]
- ,[Para [Str "It",Space,Str "should."]]]
-,Para [Str "An",Space,Str "e-mail",Space,Str "address:",Space,Str "nobody",Space,Str "[at]",Space,Str "nowhere.net"]
-,BlockQuote
- [Para [Str "Blockquoted:",SoftBreak,Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]]
-,Para [Str "Auto-links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",SoftBreak,Code ("",[],[]) ""]
-,CodeBlock ("",[],[]) "or here: "
-,Header 1 ("images",[],[]) [Str "Images"]
-,Para [Str "From",Space,Str "\"Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune\"",Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"]
-,Para [Image ("",[],[]) [] ("lalune.jpg","Voyage dans la Lune")]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",SoftBreak,Image ("",[],[]) [] ("movie.jpg",""),SoftBreak,Str "icon."]
-,Header 1 ("footnotes",[],[]) [Str "Footnotes"]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference",Link ("",[],[]) [Str "(1)"] ("#note_1",""),Str ",",SoftBreak,Str "and",SoftBreak,Str "another",Link ("",[],[]) [Str "(longnote)"] ("#note_longnote",""),Str ".",SoftBreak,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",SoftBreak,Str "contains",Space,Str "a",Space,Str "space^(my",Space,Str "note)."]
-,Para [Link ("",[],[]) [Str "(1)"] ("#ref_1",""),Space,Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",SoftBreak,Str "go",Space,Str "anywhere",Space,Str "in",Space,Str "the",Space,Str "document,",Space,Str "not",Space,Str "just",Space,Str "at",Space,Str "the",Space,Str "end."]
-,Para [Link ("",[],[]) [Str "(longnote)"] ("#ref_longnote",""),Space,Str "Here's",SoftBreak,Str "the",Space,Str "other",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."]
-,Para [Str "Caret",Space,Str "characters",Space,Str "are",Space,Str "used",Space,Str "to",Space,Str "indicate",Space,Str "that",Space,Str "the",Space,Str "blocks",Space,Str "all",Space,Str "belong",Space,Str "to",SoftBreak,Str "a",Space,Str "single",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "block",Space,Str "quotes)."]
-,CodeBlock ("",[],[]) "  {  }"
-,Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "use",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",Space,Str "of",Space,Str "every",Space,Str "line,",Space,Str "as",SoftBreak,Str "with",Space,Str "blockquotes,",Space,Str "but",Space,Str "all",Space,Str "that",Space,Str "you",Space,Str "need",Space,Str "is",Space,Str "a",Space,Str "caret",Space,Str "at",Space,Str "the",Space,Str "beginning",SoftBreak,Str "of",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "the",Space,Str "block",Space,Str "and",Space,Str "any",Space,Str "preceding",Space,Str "blank",Space,Str "lines."]
-,Para [Str "text",Space,Emph [Str "Leading",Space,Str "space"]]
-,Para [Emph [Str "Trailing",Space,Str "space"],Space,Str "text"]
-,Para [Str "text",Space,Emph [Str "Leading",Space,Str "spaces"]]
-,Para [Emph [Str "Trailing",Space,Str "spaces"],Space,Str "text"]
-,Header 1 ("tables",[],[]) [Str "Tables"]
-,Header 2 ("tables-with-headers",[],[]) [Str "Tables",Space,Str "with",Space,Str "Headers"]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Para [Str "X"]]
- ,[Para [Str "Y"]]
- ,[Para [Str "Z"]]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Para [Str "X"]]
- ,[Para [Str "Y"]]
- ,[Para [Str "Z"]]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Para [Str "X"]]
- ,[Para [Str "Y"]]
- ,[Para [Str "Z"]]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Para [Str "X"]]
- ,[Para [Str "Y"]]
- ,[Para [Str "Z"]]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Para [Str "X"]]
- ,[Para [Str "Y"]]
- ,[Para [Str "Z"]]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Para [Str "X"]]
- ,[Para [Str "Y"]]
- ,[Para [Str "Z"]]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Para [Str "X"]]
- ,[Para [Str "Y"]]
- ,[Para [Str "Z"]]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Para [Str "X"]]
- ,[Para [Str "Y"]]
- ,[Para [Str "Z"]]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[Para [Str "X"]]
- ,[Para [Str "Y"]]
- ,[Para [Str "Z"]]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Header 2 ("tables-without-headers",[],[]) [Str "Tables",Space,Str "without",Space,Str "Headers"]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Para [Str "1"]]
-  ,[Para [Str "2"]]
-  ,[Para [Str "3"]]]
- ,[[Para [Str "4"]]
-  ,[Para [Str "5"]]
-  ,[Para [Str "6"]]]]
-,Header 2 ("empty-tables",[],[]) [Str "Empty",Space,Str "Tables"]
-,Para [Str "This",Space,Str "section",Space,Str "should",Space,Str "be",Space,Str "empty."]]
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "author"
+            , MetaList
+                [ MetaInlines [ Str "John" , Space , Str "MacFarlane" ]
+                , MetaInlines [ Str "Anonymous" ]
+                ]
+            )
+          , ( "copyright"
+            , MetaMap
+                (fromList
+                   [ ( "holder" , MetaString "MacFarlane et al" )
+                   , ( "statement"
+                     , MetaString "\169 2023, MacFarlane et al"
+                     )
+                   , ( "year" , MetaString "2023" )
+                   ])
+            )
+          , ( "license"
+            , MetaMap
+                (fromList
+                   [ ( "link"
+                     , MetaString
+                         "https://creativecommons.org/licenses/by/4.0/"
+                     )
+                   , ( "text"
+                     , MetaString
+                         "This document is distributed under a Creative Commons Attribution 4.0 International license."
+                     )
+                   , ( "type" , MetaString "open-access" )
+                   ])
+            )
+          , ( "references"
+            , MetaList
+                [ MetaMap (fromList [ ( "id" , MetaString "note_1" ) ])
+                , MetaMap
+                    (fromList [ ( "id" , MetaString "note_longnote" ) ])
+                ]
+            )
+          , ( "title"
+            , MetaInlines
+                [ Str "Pandoc"
+                , Space
+                , Str "Test"
+                , Space
+                , Str "Suite"
+                ]
+            )
+          ]
+    }
+  [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "set"
+      , Space
+      , Str "of"
+      , Space
+      , Str "tests"
+      , Space
+      , Str "for"
+      , Space
+      , Str "pandoc."
+      , Space
+      , Str "Most"
+      , Space
+      , Str "of"
+      , Space
+      , Str "them"
+      , Space
+      , Str "are"
+      , Space
+      , Str "adapted"
+      , Space
+      , Str "from"
+      , Space
+      , Str "John"
+      , Space
+      , Str "Gruber's"
+      , Space
+      , Str "markdown"
+      , Space
+      , Str "test"
+      , Space
+      , Str "suite."
+      ]
+  , Header 1 ( "headers" , [] , [] ) [ Str "Headers" ]
+  , Header
+      2
+      ( "level-2-with-an-embedded-link" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "2"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "embedded" , SoftBreak , Str "link" ]
+          ( "/url" , "" )
+      ]
+  , Header
+      3
+      ( "level-3-with-emphasis" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "3"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "emphasis" ]
+      ]
+  , Header
+      4 ( "level-4" , [] , [] ) [ Str "Level" , Space , Str "4" ]
+  , Header
+      5 ( "level-5" , [] , [] ) [ Str "Level" , Space , Str "5" ]
+  , Header
+      1 ( "level-1" , [] , [] ) [ Str "Level" , Space , Str "1" ]
+  , Header
+      2
+      ( "level-2-with-emphasis" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "2"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "emphasis" ]
+      ]
+  , Header
+      3 ( "level-3" , [] , [] ) [ Str "Level" , Space , Str "3" ]
+  , Para
+      [ Str "with"
+      , Space
+      , Str "no"
+      , Space
+      , Str "blank"
+      , Space
+      , Str "line"
+      ]
+  , Header
+      2 ( "level-2" , [] , [] ) [ Str "Level" , Space , Str "2" ]
+  , Para
+      [ Str "with"
+      , Space
+      , Str "no"
+      , Space
+      , Str "blank"
+      , Space
+      , Str "line"
+      ]
+  , Header 1 ( "paragraphs" , [] , [] ) [ Str "Paragraphs" ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Str "regular"
+      , Space
+      , Str "paragraph."
+      ]
+  , Para
+      [ Str "In"
+      , Space
+      , Str "Markdown"
+      , Space
+      , Str "1.0.0"
+      , Space
+      , Str "and"
+      , Space
+      , Str "earlier."
+      , Space
+      , Str "Version"
+      , Space
+      , Str "8."
+      , Space
+      , Str "This"
+      , Space
+      , Str "line"
+      , Space
+      , Str "turns"
+      , Space
+      , Str "into"
+      , Space
+      , Str "a"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item."
+      , Space
+      , Str "Because"
+      , Space
+      , Str "a"
+      , Space
+      , Str "hard-wrapped"
+      , Space
+      , Str "line"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "middle"
+      , Space
+      , Str "of"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph"
+      , Space
+      , Str "looked"
+      , Space
+      , Str "like"
+      , Space
+      , Str "a"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item."
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "one"
+      , Space
+      , Str "with"
+      , Space
+      , Str "a"
+      , Space
+      , Str "bullet."
+      , Space
+      , Str "*"
+      , Space
+      , Str "criminey."
+      ]
+  , Para
+      [ Str "There"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Strong
+          [ Str "hard"
+          , Space
+          , Str "line"
+          , Space
+          , Str "break"
+          , LineBreak
+          ]
+      , Str "here."
+      ]
+  , Header 1 ( "statements" , [] , [] ) [ Str "Statements" ]
+  , Header
+      2 ( "" , [] , [] ) [ Str "CAP" , Space , Str "TITLE" ]
+  , Para
+      [ Str "Some"
+      , Space
+      , Str "text"
+      , Space
+      , Str "to"
+      , Space
+      , Str "make"
+      , Space
+      , Str "this"
+      , Space
+      , Str "regular"
+      ]
+  , Header
+      1
+      ( "block-quotes" , [] , [] )
+      [ Str "Block" , Space , Str "Quotes" ]
+  , Para [ Str "E-mail" , Space , Str "style:" ]
+  , BlockQuote
+      [ Para
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote."
+          , Space
+          , Str "It"
+          , Space
+          , Str "is"
+          , Space
+          , Str "pretty"
+          , Space
+          , Str "short."
+          ]
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "Code"
+          , Space
+          , Str "in"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote:"
+          ]
+      , CodeBlock
+          ( "" , [] , [] ) "sub status {\n    print \"working\";\n}"
+      , Para [ Str "A" , Space , Str "list:" ]
+      , OrderedList
+          ( 1 , DefaultStyle , DefaultDelim )
+          [ [ Para [ Str "item" , Space , Str "one" ] ]
+          , [ Para [ Str "item" , Space , Str "two" ] ]
+          ]
+      , Para
+          [ Str "Nested"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quotes:"
+          ]
+      , BlockQuote [ Para [ Str "nested" ] ]
+      , BlockQuote [ Para [ Str "nested" ] ]
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      , Space
+      , Str "2"
+      , Space
+      , Str ">"
+      , Space
+      , Str "1."
+      ]
+  , Para [ Str "Box-style:" ]
+  , BlockQuote
+      [ Para [ Str "Example:" ]
+      , CodeBlock
+          ( "" , [] , [] ) "sub status {\n    print \"working\";\n}"
+      ]
+  , BlockQuote
+      [ OrderedList
+          ( 1 , DefaultStyle , DefaultDelim )
+          [ [ Para [ Str "do" , Space , Str "laundry" ] ]
+          , [ Para
+                [ Str "take"
+                , Space
+                , Str "out"
+                , Space
+                , Str "the"
+                , Space
+                , Str "trash"
+                ]
+            ]
+          ]
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Str "nested"
+      , Space
+      , Str "one:"
+      ]
+  , BlockQuote
+      [ Para [ Str "Joe" , Space , Str "said:" ]
+      , BlockQuote
+          [ Para
+              [ Str "Don't" , Space , Str "quote" , Space , Str "me." ]
+          ]
+      ]
+  , Para
+      [ Str "And"
+      , Space
+      , Str "a"
+      , Space
+      , Str "following"
+      , Space
+      , Str "paragraph."
+      ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote"
+      , Space
+      , Str "inside"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph."
+      , Space
+      , Str "Start"
+      , Space
+      , Str "of"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph"
+      , Space
+      , Str "is"
+      , Space
+      , Str "here,"
+      , Space
+      , Str "and"
+      , Space
+      , Str "the"
+      , Space
+      , Str "quote"
+      , Space
+      , Str "is"
+      , Space
+      , Str "below:"
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "My" , Space , Str "block" , Space , Str "quote" ]
+      ]
+  , Para
+      [ Str "End"
+      , Space
+      , Str "of"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph"
+      ]
+  , Header 1 ( "formulae" , [] , [] ) [ Str "Formulae" ]
+  , Header
+      2
+      ( "inline-formulae" , [] , [] )
+      [ Str "Inline"
+      , Space
+      , Str "formulae"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "inline-formula" ]
+      ]
+  , Para
+      [ Strong
+          [ Str "Inside" , Space , Str "a" , Space , Str "paragraph" ]
+      , Str ","
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "natively"
+      , Space
+      , Str "coded"
+      , Space
+      , Str "inside"
+      , Space
+      , Str "the"
+      , Space
+      , Str "paragraph,"
+      , Space
+      , Str "and"
+      , Space
+      , Str "show"
+      , Space
+      , Str "inline:"
+      ]
+  , Para
+      [ Str "Einstein"
+      , Space
+      , Str "showed"
+      , Space
+      , Str "that"
+      , Space
+      , Math InlineMath "e=mc^2"
+      , Str "."
+      , SoftBreak
+      , Str "This"
+      , Space
+      , Str "formula"
+      , Space
+      , Str "is"
+      , Space
+      , Str "important"
+      , Space
+      , Str "because\8230"
+      ]
+  , Header
+      2
+      ( "disp-formulae" , [] , [] )
+      [ Str "Block"
+      , Space
+      , Str "formulae"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "disp-formula" ]
+      ]
+  , Para
+      [ Strong
+          [ Str "Inside" , Space , Str "a" , Space , Str "paragraph" ]
+      , Str ","
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "natively"
+      , Space
+      , Str "coded"
+      , Space
+      , Str "inside"
+      , Space
+      , Str "the"
+      , Space
+      , Str "paragraph,"
+      , Space
+      , Str "but"
+      , Space
+      , Str "show"
+      , Space
+      , Str "as"
+      , Space
+      , Str "block:"
+      ]
+  , Para
+      [ Str "Einstein"
+      , Space
+      , Str "showed"
+      , Space
+      , Str "that"
+      , Space
+      , Math DisplayMath "e=mc^2"
+      , Str "."
+      , SoftBreak
+      , Str "This"
+      , Space
+      , Str "formula"
+      , Space
+      , Str "is"
+      , Space
+      , Str "important"
+      , Space
+      , Str "because\8230"
+      ]
+  , Para
+      [ Strong
+          [ Str "Outside"
+          , Space
+          , Str "a"
+          , Space
+          , Str "paragraph"
+          ]
+      , Str ","
+      , Space
+      , Str "should"
+      , Space
+      , Str "show"
+      , Space
+      , Str "as"
+      , Space
+      , Str "block:"
+      ]
+  , Para
+      [ Str "Einstein"
+      , Space
+      , Str "showed"
+      , Space
+      , Str "that"
+      ]
+  , Div
+      ( "" , [ "disp-formula" ] , [] )
+      [ Para [ Math DisplayMath "e=mc^2" ] ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "formula"
+      , Space
+      , Str "is"
+      , Space
+      , Str "important"
+      , Space
+      , Str "because\8230"
+      ]
+  , Header
+      2
+      ( "no-formula-wrapper" , [] , [] )
+      [ Str "Without"
+      , Space
+      , Str "a"
+      , Space
+      , Str "formula"
+      , Space
+      , Str "wrapper"
+      ]
+  , Para
+      [ Strong
+          [ Str "Inside" , Space , Str "a" , Space , Str "paragraph" ]
+      , Str ","
+      , Space
+      , Str "should"
+      , Space
+      , Str "show"
+      , Space
+      , Str "inline:"
+      ]
+  , Para
+      [ Str "Einstein"
+      , Space
+      , Str "showed"
+      , Space
+      , Str "that"
+      , Space
+      , Math InlineMath "e=mc^2"
+      , Str "."
+      , SoftBreak
+      , Str "This"
+      , Space
+      , Str "formula"
+      , Space
+      , Str "is"
+      , Space
+      , Str "important"
+      , Space
+      , Str "because\8230"
+      ]
+  , Para
+      [ Strong
+          [ Str "Outside"
+          , Space
+          , Str "a"
+          , Space
+          , Str "paragraph"
+          ]
+      , Str ","
+      , Space
+      , Str "should"
+      , Space
+      , Str "show"
+      , Space
+      , Str "as"
+      , Space
+      , Str "block:"
+      ]
+  , Para
+      [ Str "Einstein"
+      , Space
+      , Str "showed"
+      , Space
+      , Str "that"
+      ]
+  , Para [ Math DisplayMath "e=mc^2" ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "formula"
+      , Space
+      , Str "is"
+      , Space
+      , Str "important"
+      , Space
+      , Str "because\8230"
+      ]
+  , Header
+      2
+      ( "misc-formulae" , [] , [] )
+      [ Str "Formulae"
+      , Space
+      , Str "with"
+      , Space
+      , Str "miscelaneus"
+      , Space
+      , Str "elements"
+      ]
+  , Para
+      [ Str "Regardless"
+      , Space
+      , Str "of"
+      , Space
+      , Str "whether"
+      , Space
+      , Str "or"
+      , Space
+      , Str "not"
+      , Space
+      , Str "they"
+      , Space
+      , Str "are"
+      , Space
+      , Str "inside"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph,"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "wrapped"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "div,"
+      , Space
+      , Str "and"
+      , Space
+      , Str "displayed"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block:"
+      ]
+  , Para
+      [ Strong
+          [ Str "Inside"
+          , Space
+          , Str "a"
+          , Space
+          , Str "paragraph:"
+          ]
+      ]
+  , Para
+      [ Str "Einstein"
+      , Space
+      , Str "definitely"
+      , Space
+      , Str "showed"
+      , Space
+      , Str "that"
+      ]
+  , Div
+      ( "" , [ "disp-formula" ] , [] )
+      [ Para [ Str "Abstract" , Space , Str "text" ]
+      , Para
+          [ Image
+              ( "graphic001"
+              , [ "This"
+                , "is"
+                , "the"
+                , "role"
+                , "of"
+                , "the"
+                , "graphic"
+                ]
+              , []
+              )
+              [ Str "Alternative"
+              , Space
+              , Str "text"
+              , Space
+              , Str "of"
+              , Space
+              , Str "the"
+              , Space
+              , Str "graphic"
+              ]
+              ( "https://lh3.googleusercontent.com/dB7iirJ3ncQaVMBGE2YX-WCeoAVIChb6NAzoFcKCFChMsrixJvD7ZRbvcaC-ceXEzXYaoH4K5vaoRDsUyBHFkpIDPnsn3bnzovbvi0a2Gg=s660"
+              , "This is the title of the graphic"
+              )
+          ]
+      , Para [ Math DisplayMath "e=mc^2" ]
+      ]
+  , Para
+      [ Str "."
+      , SoftBreak
+      , Str "This"
+      , Space
+      , Str "formula"
+      , Space
+      , Str "is"
+      , Space
+      , Str "important"
+      , Space
+      , Str "because\8230"
+      ]
+  , Para
+      [ Strong
+          [ Str "Outside"
+          , Space
+          , Str "of"
+          , Space
+          , Str "a"
+          , Space
+          , Str "paragraph:"
+          ]
+      ]
+  , Para
+      [ Str "Paragraph"
+      , Space
+      , Str "before:"
+      , Space
+      , Str "Einstein"
+      , Space
+      , Str "showed"
+      , Space
+      , Str "that"
+      ]
+  , Div
+      ( "" , [ "disp-formula" ] , [] )
+      [ Para [ Str "Abstract" , Space , Str "text" ]
+      , Para
+          [ Image
+              ( "graphic003" , [] , [] )
+              [ Str "Alternative"
+              , Space
+              , Str "text"
+              , Space
+              , Str "1"
+              ]
+              ( "Title 3" , "" )
+          ]
+      , Para [ Math DisplayMath "e=mc^2" ]
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "formula"
+      , Space
+      , Str "is"
+      , Space
+      , Str "important"
+      , Space
+      , Str "because\8230"
+      ]
+  , Figure
+      ( "fig-1" , [] , [] )
+      (Caption Nothing [ Plain [ Str "bar" ] ])
+      [ Plain [ Str "alternative-decription" ]
+      , Para [ Image ( "" , [] , [] ) [] ( "foo.png" , "" ) ]
+      ]
+  , Header
+      1
+      ( "code-blocks" , [] , [] )
+      [ Str "Code" , Space , Str "Blocks" ]
+  , Para [ Str "Code:" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
+  , Para [ Str "And:" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
+  , Header 1 ( "lists" , [] , [] ) [ Str "Lists" ]
+  , Header 2 ( "unordered" , [] , [] ) [ Str "Unordered" ]
+  , Para [ Str "Asterisks" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Para [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Asterisks" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Para [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Pluses" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Para [ Str "Plus" , Space , Str "1" ] ]
+      , [ Para [ Str "Plus" , Space , Str "2" ] ]
+      , [ Para [ Str "Plus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Pluses" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Para [ Str "Plus" , Space , Str "1" ] ]
+      , [ Para [ Str "Plus" , Space , Str "2" ] ]
+      , [ Para [ Str "Plus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Minuses" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Para [ Str "Minus" , Space , Str "1" ] ]
+      , [ Para [ Str "Minus" , Space , Str "2" ] ]
+      , [ Para [ Str "Minus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Minuses" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Para [ Str "Minus" , Space , Str "1" ] ]
+      , [ Para [ Str "Minus" , Space , Str "2" ] ]
+      , [ Para [ Str "Minus" , Space , Str "3" ] ]
+      ]
+  , Header 2 ( "ordered" , [] , [] ) [ Str "Ordered" ]
+  , Para [ Str "Tight:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second" ] ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para [ Str "and:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "One" ] ]
+      , [ Para [ Str "Two" ] ]
+      , [ Para [ Str "Three" ] ]
+      ]
+  , Para
+      [ Str "Loose" , Space , Str "using" , Space , Str "tabs:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second" ] ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para
+      [ Str "and" , Space , Str "using" , Space , Str "spaces:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "One" ] ]
+      , [ Para [ Str "Two" ] ]
+      , [ Para [ Str "Three" ] ]
+      ]
+  , Para [ Str "Multiple" , Space , Str "paragraphs:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para
+            [ Str "Item"
+            , Space
+            , Str "1,"
+            , Space
+            , Str "graf"
+            , Space
+            , Str "one."
+            ]
+        , Para
+            [ Str "Item"
+            , Space
+            , Str "1."
+            , Space
+            , Str "graf"
+            , Space
+            , Str "two."
+            , Space
+            , Str "The"
+            , Space
+            , Str "quick"
+            , Space
+            , Str "brown"
+            , Space
+            , Str "fox"
+            , Space
+            , Str "jumped"
+            , Space
+            , Str "over"
+            , Space
+            , Str "the"
+            , Space
+            , Str "lazy"
+            , SoftBreak
+            , Str "dog's"
+            , Space
+            , Str "back."
+            ]
+        ]
+      , [ Para [ Str "Item" , Space , Str "2." ] ]
+      , [ Para [ Str "Item" , Space , Str "3." ] ]
+      ]
+  , Para [ Str "List" , Space , Str "styles:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "one" ] ]
+      , [ Para [ Str "two" ] ]
+      , [ Para [ Str "three" ] ]
+      ]
+  , OrderedList
+      ( 1 , LowerRoman , DefaultDelim )
+      [ [ Para [ Str "one" ] ]
+      , [ Para [ Str "two" ] ]
+      , [ Para [ Str "three" ] ]
+      ]
+  , Header 2 ( "nested" , [] , [] ) [ Str "Nested" ]
+  , BulletList
+      [ [ Para [ Str "Tab" ]
+        , BulletList
+            [ [ Para [ Str "Tab" ]
+              , BulletList [ [ Para [ Str "Tab" ] ] ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Here's" , Space , Str "another:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second:" ]
+        , BulletList
+            [ [ Para [ Str "Fee" ] ]
+            , [ Para [ Str "Fie" ] ]
+            , [ Para [ Str "Foe" ] ]
+            ]
+        ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para
+      [ Str "Same"
+      , Space
+      , Str "thing"
+      , Space
+      , Str "but"
+      , Space
+      , Str "with"
+      , Space
+      , Str "paragraphs:"
+      ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second:" ]
+        , BulletList
+            [ [ Para [ Str "Fee" ] ]
+            , [ Para [ Str "Fie" ] ]
+            , [ Para [ Str "Foe" ] ]
+            ]
+        ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Header
+      2
+      ( "tabs-and-spaces" , [] , [] )
+      [ Str "Tabs" , Space , Str "and" , Space , Str "spaces" ]
+  , BulletList
+      [ [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "tabs"
+            ]
+        ]
+      , [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "spaces"
+            ]
+        , BulletList
+            [ [ Para
+                  [ Str "this"
+                  , Space
+                  , Str "is"
+                  , Space
+                  , Str "an"
+                  , Space
+                  , Str "example"
+                  , Space
+                  , Str "list"
+                  , Space
+                  , Str "item"
+                  , Space
+                  , Str "indented"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "tabs"
+                  ]
+              ]
+            , [ Para
+                  [ Str "this"
+                  , Space
+                  , Str "is"
+                  , Space
+                  , Str "an"
+                  , Space
+                  , Str "example"
+                  , Space
+                  , Str "list"
+                  , Space
+                  , Str "item"
+                  , Space
+                  , Str "indented"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "spaces"
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Header
+      2
+      ( "fancy-list-markers" , [] , [] )
+      [ Str "Fancy" , Space , Str "list" , Space , Str "markers" ]
+  , Para [ Str "Autonumbering:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "Autonumber." ] ]
+      , [ Para [ Str "More." ]
+        , OrderedList
+            ( 1 , DefaultStyle , DefaultDelim )
+            [ [ Para [ Str "Nested." ] ] ]
+        ]
+      ]
+  , Header 2 ( "definition" , [] , [] ) [ Str "Definition" ]
+  , DefinitionList
+      [ ( [ Str "Violin" ]
+        , [ [ Para
+                [ Str "Stringed"
+                , Space
+                , Str "musical"
+                , Space
+                , Str "instrument."
+                ]
+            , Para [ Str "Torture" , Space , Str "device." ]
+            ]
+          ]
+        )
+      , ( [ Str "Cello"
+          , Strong [ LineBreak ]
+          , Str "Violoncello"
+          ]
+        , [ [ Para
+                [ Str "Low-voiced"
+                , Space
+                , Str "stringed"
+                , Space
+                , Str "instrument."
+                ]
+            ]
+          ]
+        )
+      ]
+  , Header
+      2
+      ( "list-inside-paragraph" , [] , [] )
+      [ Str "List"
+      , Space
+      , Str "inside"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph"
+      ]
+  , Para
+      [ Str "Start"
+      , Space
+      , Str "of"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph."
+      ]
+  , BulletList
+      [ [ Para [ Str "Red" ] ] , [ Para [ Str "Blue" ] ] ]
+  , Para
+      [ Str "End" , Space , Str "of" , Space , Str "paragraph." ]
+  , Header
+      1
+      ( "inline-markup" , [] , [] )
+      [ 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" , SoftBreak , Str "this" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Str "strong" ]
+      , Str ","
+      , Space
+      , Str "and"
+      , Space
+      , Str "so"
+      , SoftBreak
+      , Strong [ Str "is" , Space , Str "this" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "Empty"
+      , Space
+      , Strong []
+      , Space
+      , Str "and"
+      , Space
+      , Emph []
+      , Str "."
+      ]
+  , Para
+      [ Str "An"
+      , SoftBreak
+      , Emph
+          [ Link
+              ( "" , [] , [] )
+              [ Str "emphasized" , SoftBreak , Str "link" ]
+              ( "/url" , "" )
+          ]
+      , Str "."
+      ]
+  , Para
+      [ Strong
+          [ Emph
+              [ Str "This"
+              , Space
+              , Str "is"
+              , Space
+              , Str "strong"
+              , Space
+              , Str "and"
+              , Space
+              , Str "em."
+              ]
+          ]
+      ]
+  , Para
+      [ Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Emph [ Str "this" ] ]
+      , Space
+      , Str "word."
+      ]
+  , Para
+      [ Strong
+          [ Emph
+              [ Str "This"
+              , Space
+              , Str "is"
+              , Space
+              , Str "strong"
+              , Space
+              , Str "and"
+              , Space
+              , Str "em."
+              ]
+          ]
+      ]
+  , Para
+      [ Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Emph [ Str "this" ] ]
+      , Space
+      , Str "word."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "code:"
+      , Space
+      , Code ( "" , [] , [] ) ">"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "$"
+      , Str ","
+      , SoftBreak
+      , Code ( "" , [] , [] ) "\\"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "\\$"
+      , Str ","
+      , SoftBreak
+      , Code ( "" , [] , [] ) ""
+      , Str "."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , SmallCaps [ Str "small" , Space , Str "caps" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "These"
+      , Space
+      , Str "are"
+      , Space
+      , Str "all"
+      , Space
+      , Str "underlined:"
+      , Space
+      , Str "foo"
+      , Space
+      , Str "and"
+      , Space
+      , Str "bar."
+      ]
+  , Para
+      [ Str "These"
+      , Space
+      , Str "are"
+      , Space
+      , Str "all"
+      , Space
+      , Str "strikethrough:"
+      , Space
+      , Strikeout [ Str "foo" ]
+      , Str ","
+      , SoftBreak
+      , Strikeout [ Str "bar" ]
+      , Str ","
+      , Space
+      , Str "and"
+      , Space
+      , Strikeout [ Str "baz" ]
+      , Str "."
+      ]
+  , Header
+      1
+      ( "smart-quotes-ellipses-dashes" , [] , [] )
+      [ Str "Smart"
+      , Space
+      , Str "quotes,"
+      , Space
+      , Str "ellipses,"
+      , Space
+      , Str "dashes"
+      ]
+  , Para
+      [ Str "\"Hello,\""
+      , Space
+      , Str "said"
+      , Space
+      , Str "the"
+      , Space
+      , Str "spider."
+      , Space
+      , Str "\"'Shelob'"
+      , Space
+      , Str "is"
+      , Space
+      , Str "my"
+      , Space
+      , Str "name.\""
+      ]
+  , Para
+      [ Str "'A',"
+      , Space
+      , Str "'B',"
+      , Space
+      , Str "and"
+      , Space
+      , Str "'C'"
+      , Space
+      , Str "are"
+      , Space
+      , Str "letters."
+      ]
+  , Para
+      [ Str "'Oak,'"
+      , Space
+      , Str "'elm,'"
+      , Space
+      , Str "and"
+      , Space
+      , Str "'beech'"
+      , Space
+      , Str "are"
+      , Space
+      , Str "names"
+      , Space
+      , Str "of"
+      , Space
+      , Str "trees."
+      , Space
+      , Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Str "'pine.'"
+      ]
+  , Para
+      [ Str "'He"
+      , Space
+      , Str "said,"
+      , Space
+      , Str "\"I"
+      , Space
+      , Str "want"
+      , Space
+      , Str "to"
+      , Space
+      , Str "go.\"'"
+      , Space
+      , Str "Were"
+      , Space
+      , Str "you"
+      , Space
+      , Str "alive"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "70's?"
+      ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "some"
+      , Space
+      , Str "quoted"
+      , Space
+      , Str "'"
+      , Code ( "" , [] , [] ) "code"
+      , Str "'"
+      , Space
+      , Str "and"
+      , Space
+      , Str "a"
+      , SoftBreak
+      , Str "\""
+      , Link
+          ( "" , [] , [] )
+          [ Str "quoted" , SoftBreak , Str "link" ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      , Str "\"."
+      ]
+  , Para
+      [ Str "Some"
+      , Space
+      , Str "dashes:"
+      , Space
+      , Str "one---two"
+      , Space
+      , Str "---"
+      , Space
+      , Str "three--four"
+      , Space
+      , Str "--"
+      , Space
+      , Str "five."
+      ]
+  , Para
+      [ Str "Dashes"
+      , Space
+      , Str "between"
+      , Space
+      , Str "numbers:"
+      , Space
+      , Str "5-7,"
+      , Space
+      , Str "255-66,"
+      , Space
+      , Str "1987-1999."
+      ]
+  , Para
+      [ Str "Ellipses...and."
+      , Space
+      , Str "."
+      , Space
+      , Str ".and"
+      , Space
+      , Str "."
+      , Space
+      , Str "."
+      , Space
+      , Str "."
+      , Space
+      , Str "."
+      ]
+  , Header 1 ( "latex" , [] , [] ) [ Str "LaTeX" ]
+  , BulletList
+      [ [ Para [ Str "\\cite[22-23]{smith.1899}" ] ]
+      , [ Para [ Str "\\doublespacing" ] ]
+      , [ Para [ Str "$2+2=4$" ] ]
+      , [ Para
+            [ Str "$x" , Space , Str "\\in" , Space , Str "y$" ]
+        ]
+      , [ Para
+            [ Str "$\\alpha"
+            , Space
+            , Str "\\wedge"
+            , Space
+            , Str "\\omega$"
+            ]
+        ]
+      , [ Para [ Str "$223$" ] ]
+      , [ Para [ Str "$p$-Tree" ] ]
+      , [ Para
+            [ Str "$\\frac{d}{dx}f(x)=\\lim_{h\\to"
+            , Space
+            , Str "0}\\frac{f(x+h)-f(x)}{h}$"
+            ]
+        ]
+      , [ Para
+            [ Str "Here's"
+            , Space
+            , Str "one"
+            , Space
+            , Str "that"
+            , Space
+            , Str "has"
+            , Space
+            , Str "a"
+            , Space
+            , Str "line"
+            , Space
+            , Str "break"
+            , Space
+            , Str "in"
+            , Space
+            , Str "it:"
+            , Space
+            , Str "$\\alpha"
+            , Space
+            , Str "+"
+            , Space
+            , Str "\\omega"
+            , Space
+            , Str "\\times"
+            , SoftBreak
+            , Str "x^2$."
+            ]
+        ]
+      ]
+  , Para
+      [ Str "These"
+      , Space
+      , Str "shouldn't"
+      , Space
+      , Str "be"
+      , Space
+      , Str "math:"
+      ]
+  , BulletList
+      [ [ Para
+            [ Str "To"
+            , Space
+            , Str "get"
+            , Space
+            , Str "the"
+            , Space
+            , Str "famous"
+            , Space
+            , Str "equation,"
+            , Space
+            , Str "write"
+            , SoftBreak
+            , Code ( "" , [] , [] ) "$e = mc^2$"
+            , Str "."
+            ]
+        ]
+      , [ Para
+            [ Str "$22,000"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Emph [ Str "lot" ]
+            , Space
+            , Str "of"
+            , Space
+            , Str "money."
+            , Space
+            , Str "So"
+            , Space
+            , Str "is"
+            , Space
+            , Str "$34,000."
+            , Space
+            , Str "(It"
+            , SoftBreak
+            , Str "worked"
+            , Space
+            , Str "if"
+            , Space
+            , Str "\"lot\""
+            , Space
+            , Str "is"
+            , Space
+            , Str "emphasized.)"
+            ]
+        ]
+      , [ Para
+            [ Str "Escaped"
+            , Space
+            , Code ( "" , [] , [] ) "$"
+            , Str ":"
+            , Space
+            , Str "$73"
+            , Space
+            , Emph
+                [ Str "this"
+                , Space
+                , Str "should"
+                , Space
+                , Str "be"
+                , SoftBreak
+                , Str "emphasized"
+                ]
+            , Space
+            , Str "23$."
+            ]
+        ]
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Str "LaTeX"
+      , Space
+      , Str "table:"
+      ]
+  , Para
+      [ Str "\\begin{tabular}{|l|l|}\\hline"
+      , Space
+      , Str "Animal"
+      , Space
+      , Str "&"
+      , Space
+      , Str "Number"
+      , Space
+      , Str "\\\\"
+      , Space
+      , Str "\\hline"
+      , Space
+      , Str "Dog"
+      , Space
+      , Str "&"
+      , SoftBreak
+      , Str "2"
+      , Space
+      , Str "\\\\"
+      , Space
+      , Str "Cat"
+      , Space
+      , Str "&"
+      , Space
+      , Str "1"
+      , Space
+      , Str "\\\\"
+      , Space
+      , Str "\\hline"
+      , Space
+      , Str "\\end{tabular}"
+      ]
+  , Header
+      1
+      ( "special-characters" , [] , [] )
+      [ Str "Special" , Space , Str "Characters" ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "some"
+      , Space
+      , Str "unicode:"
+      ]
+  , BulletList
+      [ [ Para
+            [ Str "I" , Space , Str "hat:" , Space , Str "\206" ]
+        ]
+      , [ Para
+            [ Str "o" , Space , Str "umlaut:" , Space , Str "\246" ]
+        ]
+      , [ Para [ Str "section:" , Space , Str "\167" ] ]
+      , [ Para
+            [ Str "set"
+            , Space
+            , Str "membership:"
+            , Space
+            , Str "elem"
+            ]
+        ]
+      , [ Para [ Str "copyright:" , Space , Str "\169" ] ]
+      ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "has"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "their"
+      , Space
+      , Str "name."
+      ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "is"
+      , Space
+      , Str "another"
+      , Space
+      , Str "way"
+      , Space
+      , Str "to"
+      , Space
+      , Str "write"
+      , Space
+      , Str "it."
+      ]
+  , Para
+      [ Str "This" , Space , Str "&" , Space , Str "that." ]
+  , Para [ Str "4" , Space , Str "<" , Space , Str "5." ]
+  , Para [ Str "6" , Space , Str ">" , Space , Str "5." ]
+  , Para [ Str "Backslash:" , Space , Str "\\" ]
+  , Para [ Str "Backtick:" , Space , Str "`" ]
+  , Para [ Str "Asterisk:" , Space , Str "*" ]
+  , Para [ Str "Underscore:" , Space , Str "_" ]
+  , Para
+      [ Str "Left" , Space , Str "brace:" , Space , Str "{" ]
+  , Para
+      [ Str "Right" , Space , Str "brace:" , Space , Str "}" ]
+  , Para
+      [ Str "Left" , Space , Str "bracket:" , Space , Str "[" ]
+  , Para
+      [ Str "Right" , Space , Str "bracket:" , Space , Str "]" ]
+  , Para
+      [ Str "Left" , Space , Str "paren:" , Space , Str "(" ]
+  , Para
+      [ Str "Right" , Space , Str "paren:" , Space , Str ")" ]
+  , Para [ Str "Greater-than:" , Space , Str ">" ]
+  , Para [ Str "Hash:" , Space , Str "#" ]
+  , Para [ Str "Period:" , Space , Str "." ]
+  , Para [ Str "Bang:" , Space , Str "!" ]
+  , Para [ Str "Plus:" , Space , Str "+" ]
+  , Para [ Str "Minus:" , Space , Str "-" ]
+  , Header 1 ( "links" , [] , [] ) [ Str "Links" ]
+  , Header 2 ( "explicit" , [] , [] ) [ Str "Explicit" ]
+  , Para
+      [ Str "Just"
+      , Space
+      , Str "a"
+      , SoftBreak
+      , Link ( "" , [] , [] ) [ Str "URL" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , SoftBreak , Str "and" , Space , Str "title" ]
+          ( "/url/" , "title" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , SoftBreak , Str "and" , Space , Str "title" ]
+          ( "/url/" , "title preceded by two spaces" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , SoftBreak , Str "and" , Space , Str "title" ]
+          ( "/url/" , "title preceded by a tab" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , SoftBreak , Str "and" , Space , Str "title" ]
+          ( "/url/" , "title with \"quotes\" in it" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , SoftBreak , Str "and" , Space , Str "title" ]
+          ( "/url/" , "title with single quotes" )
+      ]
+  , Para
+      [ Str "Email"
+      , Space
+      , Str "link"
+      , Space
+      , Str "(nobody"
+      , Space
+      , Str "[at]"
+      , Space
+      , Str "nowhere.net)"
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "Empty" ] ( "" , "" )
+      , Str "."
+      ]
+  , Header 2 ( "reference" , [] , [] ) [ Str "Reference" ]
+  , Para
+      [ Str "Foo"
+      , SoftBreak
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Foo"
+      , SoftBreak
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Foo"
+      , SoftBreak
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "With"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "embedded" , SoftBreak , Str "[brackets]" ]
+          ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "b" ] ( "/url/" , "" )
+      , Space
+      , Str "by"
+      , SoftBreak
+      , Str "itself"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link."
+      ]
+  , Para
+      [ Str "Indented"
+      , SoftBreak
+      , Link ( "" , [] , [] ) [ Str "once" ] ( "/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Indented"
+      , SoftBreak
+      , Link ( "" , [] , [] ) [ Str "twice" ] ( "/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Indented"
+      , SoftBreak
+      , Link ( "" , [] , [] ) [ Str "thrice" ] ( "/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Str "[not]"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link."
+      ]
+  , CodeBlock ( "" , [] , [] ) "[not]: /url"
+  , Para
+      [ Str "Foo"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "bar" ]
+          ( "/url/" , "Title with \"quotes\" inside" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Foo"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "biz" ]
+          ( "/url/" , "Title with \"quote\" inside" )
+      , Str "."
+      ]
+  , Header
+      2
+      ( "with-ampersands" , [] , [] )
+      [ Str "With" , Space , Str "ampersands" ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "link"
+          , SoftBreak
+          , Str "with"
+          , Space
+          , Str "an"
+          , Space
+          , Str "ampersand"
+          , Space
+          , Str "in"
+          , Space
+          , Str "the"
+          , Space
+          , Str "URL"
+          ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Str "amersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "link"
+      , Space
+      , Str "text:"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "AT&T" ]
+          ( "http://att.com/" , "AT&T" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "an"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "inline" , SoftBreak , Str "link" ]
+          ( "/script?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "an"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "inline"
+          , SoftBreak
+          , Str "link"
+          , Space
+          , Str "in"
+          , Space
+          , Str "pointy"
+          , Space
+          , Str "braces"
+          ]
+          ( "/script?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Header 2 ( "autolinks" , [] , [] ) [ Str "Autolinks" ]
+  , Para
+      [ Str "With"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand:"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "http://example.com/?foo=1&bar=2" ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      ]
+  , BulletList
+      [ [ Para
+            [ Str "In" , Space , Str "a" , Space , Str "list?" ]
+        ]
+      , [ Para
+            [ Link
+                ( "" , [] , [] )
+                [ Str "http://example.com/" ]
+                ( "http://example.com/" , "" )
+            ]
+        ]
+      , [ Para [ Str "It" , Space , Str "should." ] ]
+      ]
+  , Para
+      [ Str "An"
+      , Space
+      , Str "e-mail"
+      , Space
+      , Str "address:"
+      , Space
+      , Str "nobody"
+      , Space
+      , Str "[at]"
+      , Space
+      , Str "nowhere.net"
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "Blockquoted:"
+          , SoftBreak
+          , Link
+              ( "" , [] , [] )
+              [ Str "http://example.com/" ]
+              ( "http://example.com/" , "" )
+          ]
+      ]
+  , Para
+      [ Str "Auto-links"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "occur"
+      , Space
+      , Str "here:"
+      , SoftBreak
+      , Code ( "" , [] , [] ) ""
+      ]
+  , CodeBlock
+      ( "" , [] , [] ) "or here: "
+  , Header 1 ( "images" , [] , [] ) [ Str "Images" ]
+  , Para
+      [ Str "From"
+      , Space
+      , Str "\"Voyage"
+      , Space
+      , Str "dans"
+      , Space
+      , Str "la"
+      , Space
+      , Str "Lune\""
+      , Space
+      , Str "by"
+      , Space
+      , Str "Georges"
+      , Space
+      , Str "Melies"
+      , Space
+      , Str "(1902):"
+      ]
+  , Para
+      [ Image
+          ( "" , [] , [] ) [] ( "lalune.jpg" , "Voyage dans la Lune" )
+      ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "movie"
+      , SoftBreak
+      , Image ( "" , [] , [] ) [] ( "movie.jpg" , "" )
+      , SoftBreak
+      , Str "icon."
+      ]
+  , Header 1 ( "footnotes" , [] , [] ) [ Str "Footnotes" ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "footnote"
+      , Space
+      , Str "reference"
+      , Link ( "" , [] , [] ) [ Str "(1)" ] ( "#note_1" , "" )
+      , Str ","
+      , SoftBreak
+      , Str "and"
+      , SoftBreak
+      , Str "another"
+      , Link
+          ( "" , [] , [] )
+          [ Str "(longnote)" ]
+          ( "#note_longnote" , "" )
+      , Str "."
+      , SoftBreak
+      , Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Emph [ Str "not" ]
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "footnote"
+      , Space
+      , Str "reference,"
+      , Space
+      , Str "because"
+      , Space
+      , Str "it"
+      , SoftBreak
+      , Str "contains"
+      , Space
+      , Str "a"
+      , Space
+      , Str "space^(my"
+      , Space
+      , Str "note)."
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "(1)" ] ( "#ref_1" , "" )
+      , Space
+      , Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "the"
+      , Space
+      , Str "footnote."
+      , Space
+      , Str "It"
+      , Space
+      , Str "can"
+      , SoftBreak
+      , Str "go"
+      , Space
+      , Str "anywhere"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "document,"
+      , Space
+      , Str "not"
+      , Space
+      , Str "just"
+      , Space
+      , Str "at"
+      , Space
+      , Str "the"
+      , Space
+      , Str "end."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "(longnote)" ]
+          ( "#ref_longnote" , "" )
+      , Space
+      , Str "Here's"
+      , SoftBreak
+      , Str "the"
+      , Space
+      , Str "other"
+      , Space
+      , Str "note."
+      , Space
+      , Str "This"
+      , Space
+      , Str "one"
+      , Space
+      , Str "contains"
+      , Space
+      , Str "multiple"
+      , Space
+      , Str "blocks."
+      ]
+  , Para
+      [ Str "Caret"
+      , Space
+      , Str "characters"
+      , Space
+      , Str "are"
+      , Space
+      , Str "used"
+      , Space
+      , Str "to"
+      , Space
+      , Str "indicate"
+      , Space
+      , Str "that"
+      , Space
+      , Str "the"
+      , Space
+      , Str "blocks"
+      , Space
+      , Str "all"
+      , Space
+      , Str "belong"
+      , Space
+      , Str "to"
+      , SoftBreak
+      , Str "a"
+      , Space
+      , Str "single"
+      , Space
+      , Str "footnote"
+      , Space
+      , Str "(as"
+      , Space
+      , Str "with"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quotes)."
+      ]
+  , CodeBlock ( "" , [] , [] ) "  {  }"
+  , Para
+      [ Str "If"
+      , Space
+      , Str "you"
+      , Space
+      , Str "want,"
+      , Space
+      , Str "you"
+      , Space
+      , Str "can"
+      , Space
+      , Str "use"
+      , Space
+      , Str "a"
+      , Space
+      , Str "caret"
+      , Space
+      , Str "at"
+      , Space
+      , Str "the"
+      , Space
+      , Str "beginning"
+      , Space
+      , Str "of"
+      , Space
+      , Str "every"
+      , Space
+      , Str "line,"
+      , Space
+      , Str "as"
+      , SoftBreak
+      , Str "with"
+      , Space
+      , Str "blockquotes,"
+      , Space
+      , Str "but"
+      , Space
+      , Str "all"
+      , Space
+      , Str "that"
+      , Space
+      , Str "you"
+      , Space
+      , Str "need"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "caret"
+      , Space
+      , Str "at"
+      , Space
+      , Str "the"
+      , Space
+      , Str "beginning"
+      , SoftBreak
+      , Str "of"
+      , Space
+      , Str "the"
+      , Space
+      , Str "first"
+      , Space
+      , Str "line"
+      , Space
+      , Str "of"
+      , Space
+      , Str "the"
+      , Space
+      , Str "block"
+      , Space
+      , Str "and"
+      , Space
+      , Str "any"
+      , Space
+      , Str "preceding"
+      , Space
+      , Str "blank"
+      , Space
+      , Str "lines."
+      ]
+  , Para
+      [ Str "text"
+      , Space
+      , Emph [ Str "Leading" , Space , Str "space" ]
+      ]
+  , Para
+      [ Emph [ Str "Trailing" , Space , Str "space" ]
+      , Space
+      , Str "text"
+      ]
+  , Para
+      [ Str "text"
+      , Space
+      , Emph [ Str "Leading" , Space , Str "spaces" ]
+      ]
+  , Para
+      [ Emph [ Str "Trailing" , Space , Str "spaces" ]
+      , Space
+      , Str "text"
+      ]
+  , Header 1 ( "tables" , [] , [] ) [ Str "Tables" ]
+  , Header
+      2
+      ( "tables-with-headers" , [] , [] )
+      [ Str "Tables"
+      , Space
+      , Str "with"
+      , Space
+      , Str "Headers"
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "X" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Y" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Z" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "X" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Y" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Z" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "X" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Y" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Z" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "X" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Y" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Z" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "X" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Y" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Z" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "X" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Y" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Z" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "X" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Y" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Z" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "r1a" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "r1b" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "r1c" ] ]
+                 ]
+             , Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "X" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Y" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Z" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "X" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Y" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "Z" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Header
+      2
+      ( "tables-without-headers" , [] , [] )
+      [ Str "Tables"
+      , Space
+      , Str "without"
+      , Space
+      , Str "Headers"
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead ( "" , [] , [] ) [])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead ( "" , [] , [] ) [])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead ( "" , [] , [] ) [])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead ( "" , [] , [] ) [])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Header
+      2
+      ( "table-with-spans-and-alignments" , [] , [] )
+      [ Str "Tables"
+      , Space
+      , Str "with"
+      , Space
+      , Str "spans"
+      , Space
+      , Str "and"
+      , Space
+      , Str "alignments"
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 2)
+                     [ Para [ Str "1" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignRight
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "2" ] ]
+                 ]
+             ])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 2)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignLeft
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 2)
+                      (ColSpan 1)
+                      [ Para [ Str "4" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "5" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "6" ] ]
+                  ]
+              , Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 2)
+                      [ Para [ Str "7" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Header
+      2
+      ( "table-with-footer" , [] , [] )
+      [ Str "Table" , Space , Str "with" , Space , Str "footer" ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead ( "" , [] , [] ) [])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "3" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot
+             ( "" , [] , [] )
+             [ Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignRight
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "f1" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "f2" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "f3" ] ]
+                 ]
+             , Row
+                 ( "" , [] , [] )
+                 [ Cell
+                     ( "" , [] , [] )
+                     AlignRight
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "f4" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "f5" ] ]
+                 , Cell
+                     ( "" , [] , [] )
+                     AlignDefault
+                     (RowSpan 1)
+                     (ColSpan 1)
+                     [ Para [ Str "f6" ] ]
+                 ]
+             ])
+      ]
+  , Header
+      2
+      ( "table-with-multiple-bodies" , [] , [] )
+      [ Str "Table"
+      , Space
+      , Str "With"
+      , Space
+      , Str "Multiple"
+      , Space
+      , Str "Bodies"
+      ]
+  , Div
+      ( "" , [ "table-wrap" ] , [] )
+      [ Table
+          ( "" , [] , [] )
+          (Caption Nothing [])
+          [ ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          , ( AlignLeft , ColWidthDefault )
+          ]
+          (TableHead ( "" , [] , [] ) [])
+          [ TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignRight
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "a1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "a2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "a3" ] ]
+                  ]
+              ]
+          , TableBody
+              ( "" , [] , [] )
+              (RowHeadColumns 0)
+              []
+              [ Row
+                  ( "" , [] , [] )
+                  [ Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "b1" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "b2" ] ]
+                  , Cell
+                      ( "" , [] , [] )
+                      AlignDefault
+                      (RowSpan 1)
+                      (ColSpan 1)
+                      [ Para [ Str "b3" ] ]
+                  ]
+              ]
+          ]
+          (TableFoot ( "" , [] , [] ) [])
+      ]
+  , Header
+      2
+      ( "empty-tables" , [] , [] )
+      [ Str "Empty" , Space , Str "Tables" ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "section"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "empty."
+      ]
+  , Header 1 ( "" , [] , [] ) [ Str "References" ]
+  , Div ( "refs" , [] , [] ) []
+  , Header 1 ( "" , [] , [] ) [ Str "Notes" ]
+  , Div ( "refs" , [] , [] ) []
+  ]
diff --git a/test/jats-reader.xml b/test/jats-reader.xml
--- a/test/jats-reader.xml
+++ b/test/jats-reader.xml
@@ -1,1785 +1,1460 @@
 
-
-
    
-
-
-
-
-
-
-
-
-
-
-Pandoc Test Suite
-
-
-  
-    
-      MacFarlane
-      John
-    
-  
-    
-      Anonymous
-    
-  
-
-
-
-
-
    
-  This is a set of tests for pandoc. Most of them are adapted from John
-  Gruber's markdown test suite.
-
    
-
-  Headers
-  
-    Level 2 with an
-    <ext-link ext-link-type="uri" xlink:href="/url">embedded
-    link</ext-link>
-    
-      Level 3 with <italic>emphasis</italic>
-      
-        Level 4
-        
-          Level 5
-        
-      
-    
-  
-
-
-  Level 1
-  
-    Level 2 with <italic>emphasis</italic>
-    
-      Level 3
-      
    
-        with no blank line
-      
    
-        
-      
-  
-    Level 2
-    
    
-      with no blank line
-    
    
-      
-    
-
-  Paragraphs
-  
    
-    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 of a paragraph
-    looked like a list item.
-  
    
-  
    
-    Here's one with a bullet. * criminey.
-  
    
-  
    
-    There should be a hard line breakhere.
-  
    
-    
-
-  Block Quotes
-  
    
-    E-mail style:
-  
    
-  
-    
    
-      This is a block quote. It is pretty short.
-    
    
-      
-  
-    
    
-      Code in a block quote:
-    
    
-    sub status {
-    print "working";
-}
-    
    
-      A list:
-    
    
-    
-      
-        
    
-          item one
-        
    
-          
-      
-        
    
-          item two
-        
    
-          
-        
-    
    
-      Nested block quotes:
-    
    
-    
-      
    
-        nested
-      
    
-        
-    
-      
    
-        nested
-      
    
-        
-      
-  
    
-    This should not be a block quote: 2 > 1.
-  
    
-  
    
-    Box-style:
-  
    
-  
-    
    
-      Example:
-    
    
-    sub status {
-    print "working";
-}
-      
-  
-    
-      
-        
    
-          do laundry
-        
    
-          
-      
-        
    
-          take out the trash
-        
    
-          
-        
-      
-  
    
-    Here's a nested one:
-  
    
-  
-    
    
-      Joe said:
-    
    
-    
-      
    
-        Don't quote me.
-      
    
-        
-      
-  
    
-    And a following paragraph.
-  
    
-    
-
-  Code Blocks
-  
    
-    Code:
-  
    
-  ---- (should be four hyphens)
-
-sub status {
-    print "working";
-}
-
-this code block is indented by one tab
-  
    
-    And:
-  
    
-      this code block is indented by two tabs
-
-These should not be escaped:  \$ \\ \> \[ \{
-    
-
-  Lists
-  
-    Unordered
-    
    
-      Asterisks tight:
-    
    
-    
-      
-        
    
-          asterisk 1
-        
    
-          
-      
-        
    
-          asterisk 2
-        
    
-          
-      
-        
    
-          asterisk 3
-        
    
-          
-        
-    
    
-      Asterisks loose:
-    
    
-    
-      
-        
    
-          asterisk 1
-        
    
-          
-      
-        
    
-          asterisk 2
-        
    
-          
-      
-        
    
-          asterisk 3
-        
    
-          
-        
-    
    
-      Pluses tight:
-    
    
-    
-      
-        
    
-          Plus 1
-        
    
-          
-      
-        
    
-          Plus 2
-        
    
-          
-      
-        
    
-          Plus 3
-        
    
-          
-        
-    
    
-      Pluses loose:
-    
    
-    
-      
-        
    
-          Plus 1
-        
    
-          
-      
-        
    
-          Plus 2
-        
    
-          
-      
-        
    
-          Plus 3
-        
    
-          
-        
-    
    
-      Minuses tight:
-    
    
-    
-      
-        
    
-          Minus 1
-        
    
-          
-      
-        
    
-          Minus 2
-        
    
-          
-      
-        
    
-          Minus 3
-        
    
-          
-        
-    
    
-      Minuses loose:
-    
    
-    
-      
-        
    
-          Minus 1
-        
    
-          
-      
-        
    
-          Minus 2
-        
    
-          
-      
-        
    
-          Minus 3
-        
    
-          
-        
-      
-  
-    Ordered
-    
    
-      Tight:
-    
    
-    
-      
-        
    
-          First
-        
    
-          
-      
-        
    
-          Second
-        
    
-          
-      
-        
    
-          Third
-        
    
-          
-        
-    
    
-      and:
-    
    
-    
-      
-        
    
-          One
-        
    
-          
-      
-        
    
-          Two
-        
    
-          
-      
-        
    
-          Three
-        
    
-          
-        
-    
    
-      Loose using tabs:
-    
    
-    
-      
-        
    
-          First
-        
    
-          
-      
-        
    
-          Second
-        
    
-          
-      
-        
    
-          Third
-        
    
-          
-        
-    
    
-      and using spaces:
-    
    
-    
-      
-        
    
-          One
-        
    
-          
-      
-        
    
-          Two
-        
    
-          
-      
-        
    
-          Three
-        
    
-          
-        
-    
    
-      Multiple paragraphs:
-    
    
-    
-      
-        
    
-          Item 1, graf one.
-        
    
-        
    
-          Item 1. graf two. The quick brown fox jumped over the lazy
-          dog's back.
-        
    
-          
-      
-        
    
-          Item 2.
-        
    
-          
-      
-        
    
-          Item 3.
-        
    
-          
-        
-    
    
-      List styles:
-    
    
-    
-    
-      
-  
-    Nested
-    
-      
-        
    
-          Tab
-        
    
-        
-          
-            
    
-              Tab
-            
    
-            
-              
-                
    
-                  Tab
-                
    
-                  
-                
-              
-            
-          
-        
-    
    
-      Here's another:
-    
    
-    
-      
-        
    
-          First
-        
    
-          
-      
-        
    
-          Second:
-        
    
-        
-          
-            
    
-              Fee
-            
    
-              
-          
-            
    
-              Fie
-            
    
-              
-          
-            
    
-              Foe
-            
    
-              
-            
-          
-      
-        
    
-          Third
-        
    
-          
-        
-    
    
-      Same thing but with paragraphs:
-    
    
-    
-      
-        
    
-          First
-        
    
-          
-      
-        
    
-          Second:
-        
    
-        
-          
-            
    
-              Fee
-            
    
-              
-          
-            
    
-              Fie
-            
    
-              
-          
-            
    
-              Foe
-            
    
-              
-            
-          
-      
-        
    
-          Third
-        
    
-          
-        
-      
-  
-    Tabs and spaces
-    
-      
-        
    
-          this is a list item indented with tabs
-        
    
-          
-      
-        
    
-          this is a list item indented with spaces
-        
    
-        
-          
-            
    
-              this is an example list item indented with tabs
-            
    
-              
-          
-            
    
-              this is an example list item indented with spaces
-            
    
-              
-            
-          
-        
-      
-  
-    Fancy list markers
-    
    
-      Autonumbering:
-    
    
-    
-      
-        
    
-          Autonumber.
-        
    
-          
-      
-        
    
-          More.
-        
    
-        
-          
-            
    
-              Nested.
-            
    
-              
-            
-          
-        
-      
-  
-    Definition
-    
-      
-        
-          Violin
-        
-        
-          
    
-            Stringed musical instrument.
-          
    
-          
    
-            Torture device.
-          
    
-            
-          
-      
-        
-          CelloVioloncello
-        
-        
-          
    
-            Low-voiced stringed instrument.
-          
    
-            
-          
-        
-      
-    
-
-  Inline Markup
-  
    
-    This is emphasized, and so is
-    this.
-  
    
-  
    
-    This is strong, and so
-    is this.
-  
    
-  
    
-    Empty  and .
-  
    
-  
    
-    An
-    emphasized
-    link.
-  
    
-  
    
-    This is strong and em.
-  
    
-  
    
-    So is this word.
-  
    
-  
    
-    This is strong and em.
-  
    
-  
    
-    So is this word.
-  
    
-  
    
-    This is code: >, $,
-    \, \$,
-    <html>.
-  
    
-  
    
-    This is small caps.
-  
    
-  
    
-    These are all underlined: foo and bar.
-  
    
-  
    
-    These are all strikethrough: foo,
-    bar, and baz.
-  
    
-    
-
-  Smart quotes, ellipses, dashes
-  
    
-    "Hello," said the spider. "'Shelob' is my name."
-  
    
-  
    
-    'A', 'B', and 'C' are letters.
-  
    
-  
    
-    'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.'
-  
    
-  
    
-    'He said, "I want to go."' Were you alive in the 70's?
-  
    
-  
    
-    Here is some quoted 'code' and a
-    "quoted
-    link".
-  
    
-  
    
-    Some dashes: one---two --- three--four -- five.
-  
    
-  
    
-    Dashes between numbers: 5-7, 255-66, 1987-1999.
-  
    
-  
    
-    Ellipses...and. . .and . . . .
-  
    
-    
-
-  LaTeX
-  
-    
-      
    
-        \cite[22-23]{smith.1899}
-      
    
-        
-    
-      
    
-        \doublespacing
-      
    
-        
-    
-      
    
-        $2+2=4$
-      
    
-        
-    
-      
    
-        $x \in y$
-      
    
-        
-    
-      
    
-        $\alpha \wedge \omega$
-      
    
-        
-    
-      
    
-        $223$
-      
    
-        
-    
-      
    
-        $p$-Tree
-      
    
-        
-    
-      
    
-        $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
-      
    
-        
-    
-      
    
-        Here's one that has a line break in it: $\alpha + \omega \times
-        x^2$.
-      
    
-        
-      
-  
    
-    These shouldn't be math:
-  
    
-  
-    
-      
    
-        To get the famous equation, write
-        $e = mc^2$.
-      
    
-        
-    
-      
    
-        $22,000 is a lot of money. So is $34,000. (It
-        worked if "lot" is emphasized.)
-      
    
-        
-    
-      
    
-        Escaped $: $73 this should be
-        emphasized 23$.
-      
    
-        
-      
-  
    
-    Here's a LaTeX table:
-  
    
-  
    
-    \begin{tabular}{|l|l|}\hline Animal & Number \\ \hline Dog &
-    2 \\ Cat & 1 \\ \hline \end{tabular}
-  
    
-    
-
-  Special Characters
-  
    
-    Here is some unicode:
-  
    
-  
-    
-      
    
-        I hat: Î
-      
    
-        
-    
-      
    
-        o umlaut: ö
-      
    
-        
-    
-      
    
-        section: §
-      
    
-        
-    
-      
    
-        set membership: elem
-      
    
-        
-    
-      
    
-        copyright: ©
-      
    
-        
-      
-  
    
-    AT&T has an ampersand in their name.
-  
    
-  
    
-    AT&T is another way to write it.
-  
    
-  
    
-    This & that.
-  
    
-  
    
-    4 < 5.
-  
    
-  
    
-    6 > 5.
-  
    
-  
    
-    Backslash: \
-  
    
-  
    
-    Backtick: `
-  
    
-  
    
-    Asterisk: *
-  
    
-  
    
-    Underscore: _
-  
    
-  
    
-    Left brace: {
-  
    
-  
    
-    Right brace: }
-  
    
-  
    
-    Left bracket: [
-  
    
-  
    
-    Right bracket: ]
-  
    
-  
    
-    Left paren: (
-  
    
-  
    
-    Right paren: )
-  
    
-  
    
-    Greater-than: >
-  
    
-  
    
-    Hash: #
-  
    
-  
    
-    Period: .
-  
    
-  
    
-    Bang: !
-  
    
-  
    
-    Plus: +
-  
    
-  
    
-    Minus: -
-  
    
-    
-
-  Links
-  
-    Explicit
-    
    
-      Just a
-      URL.
-    
    
-    
    
-      URL
-      and title.
-    
    
-    
    
-      URL
-      and title.
-    
    
-    
    
-      URL
-      and title.
-    
    
-    
    
-      URL
-      and title
-    
    
-    
    
-      URL
-      and title
-    
    
-    
    
-      Email link (nobody [at] nowhere.net)
-    
    
-    
    
-      Empty.
-    
    
-      
-  
-    Reference
-    
    
-      Foo
-      bar.
-    
    
-    
    
-      Foo
-      bar.
-    
    
-    
    
-      Foo
-      bar.
-    
    
-    
    
-      With embedded
-      [brackets].
-    
    
-    
    
-      b by
-      itself should be a link.
-    
    
-    
    
-      Indented
-      once.
-    
    
-    
    
-      Indented
-      twice.
-    
    
-    
    
-      Indented
-      thrice.
-    
    
-    
    
-      This should [not] be a link.
-    
    
-    [not]: /url
-    
    
-      Foo
-      bar.
-    
    
-    
    
-      Foo
-      biz.
-    
    
-      
-  
-    With ampersands
-    
    
-      Here's a
-      link
-      with an ampersand in the URL.
-    
    
-    
    
-      Here's a link with an amersand in the link text:
-      AT&T.
-    
    
-    
    
-      Here's an
-      inline
-      link.
-    
    
-    
    
-      Here's an
-      inline
-      link in pointy braces.
-    
    
-      
-  
-    Autolinks
-    
    
-      With an ampersand:
-      http://example.com/?foo=1&bar=2
-    
    
-    
-      
-        
    
-          In a list?
-        
    
-          
-      
-        
    
-          http://example.com/
-        
    
-          
-      
-        
    
-          It should.
-        
    
-          
-        
-    
    
-      An e-mail address: nobody [at] nowhere.net
-    
    
-    
-      
    
-        Blockquoted:
-        http://example.com/
-      
    
-        
-    
    
-      Auto-links should not occur here:
-      <http://example.com/>
-    
    
-    or here: <http://example.com/>
-      
-    
-
-  Images
-  
    
-    From "Voyage dans la Lune" by Georges Melies (1902):
-  
    
-  
    
-    
-  
    
-  
    
-    Here is a movie
-    
-    icon.
-  
    
-    
-
-  Footnotes
-  
    
-    Here is a footnote reference(1),
-    and
-    another(longnote).
-    This should not be a footnote reference, because it
-    contains a space^(my note).
-  
    
-  
    
-    (1) Here is the footnote. It can
-    go anywhere in the document, not just at the end.
-  
    
-  
    
-    (longnote) Here's
-    the other note. This one contains multiple blocks.
-  
    
-  
    
-    Caret characters are used to indicate that the blocks all belong to
-    a single footnote (as with block quotes).
-  
    
-    { <code> }
-  
    
-    If you want, you can use a caret at the beginning of every line, as
-    with blockquotes, but all that you need is a caret at the beginning
-    of the first line of the block and any preceding blank lines.
-  
    
-  
    
-    text Leading space
-  
    
-  
    
-    Trailing space text
-  
    
-  
    
-    text Leading spaces
-  
    
-  
    
-    Trailing spaces text
-  
    
-    
-
-  Tables
-  
-    Tables with Headers
-    
-      -      -      -      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              X
-            
    
-              		
-            
    
-              Y
-            
    
-              		
-            
    
-              Z
-            
    
-          
    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              X
-            
    
-              		
-            
    
-              Y
-            
    
-              		
-            
    
-              Z
-            
    
-          
    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              X
-            
    
-              		
-            
    
-              Y
-            
    
-              		
-            
    
-              Z
-            
    
-          
    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              X
-            
    
-              		
-            
    
-              Y
-            
    
-              		
-            
    
-              Z
-            
    
-          
    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              X
-            
    
-              		
-            
    
-              Y
-            
    
-              		
-            
    
-              Z
-            
    
-          
    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              X
-            
    
-              		
-            
    
-              Y
-            
    
-              		
-            
    
-              Z
-            
    
-          
    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              X
-            
    
-              		
-            
    
-              Y
-            
    
-              		
-            
    
-              Z
-            
    
-          
    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              X
-            
    
-              		
-            
    
-              Y
-            
    
-              		
-            
    
-              Z
-            
    
-          
    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-      
-      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              X
-            
    
-              		
-            
    
-              Y
-            
    
-              		
-            
    
-              Z
-            
    
-          
    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-      
-  
-    Tables without Headers
-    
-      -      -      -      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-    
-      -      -      -      
-        
-          
-          
-          
-        
-        
-          
-          
-          
-        
-      
-    
    



    
-            
    
-              1
-            
    
-              		
-            
    
-              2
-            
    
-              		
-            
    
-              3
-            
    
-          
    
-            
    
-              4
-            
    
-              		
-            
    
-              5
-            
    
-              		
-            
    
-              6
-            
    
-          
    
-      
-  
-    Empty Tables
-    
    
-      This section should be empty.
-    
    
-      
-    
-
-
+
+
    
+
+    pmc
+
+
+
+
+
+
+
+
+
+
+
+Pandoc Test Suite
+
+
+  
+    
+      MacFarlane
+      John
+    
+  
+  
+    
+      Anonymous
+    
+  
+
+
+        © 2023, MacFarlane et al
+        2023
+        MacFarlane et al
+        
+          https://creativecommons.org/licenses/by/4.0/
+          This document is distributed under a Creative Commons Attribution 4.0 International license.
+        
+      
+
+
+
+
    This is a set of tests for pandoc. Most of them are adapted from John Gruber's markdown test suite.
    
+
+  Headers
+  
+    Level 2 with an
+    <ext-link ext-link-type="uri" xlink:href="/url">embedded
+    link</ext-link>
+    
+      Level 3 with <italic>emphasis</italic>
+      
+        Level 4
+        
+          Level 5
+        
+      
+    
+  
+
+
+  Level 1
+  
+    Level 2 with <italic>emphasis</italic>
+    
+      Level 3
+      
    with no blank line
    
+        
+      
+  
+    Level 2
+    
    with no blank line
    
+      
+    
+
+  Paragraphs
+  
    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 of a paragraph looked like a list item.
    
+  
    Here's one with a bullet. * criminey.
    
+  
    There should be a hard line breakhere.
    
+    
+
+   Statements 
+  
+    
+     CAP TITLE 
+    
     Some text to make this regular 
    
+      
+    
+
+  Block Quotes
+  
    E-mail style:
    
+  
+    
    This is a block quote. It is pretty short.
    
+      
+  
+    
    Code in a block quote:
    
+    sub status {
+    print "working";
+}
+    
    A list:
    
+    
+      
+        
    item one
    
+          
+      
+        
    item two
    
+          
+        
+    
    Nested block quotes:
    
+    
+      
    nested
    
+        
+    
+      
    nested
    
+        
+      
+  
    This should not be a block quote: 2 > 1.
    
+  
    Box-style:
    
+  
+    
    Example:
    
+    sub status {
+    print "working";
+}
+      
+  
+    
+      
+        
    do laundry
    
+          
+      
+        
    take out the trash
    
+          
+        
+      
+  
    Here's a nested one:
    
+  
+    
    Joe said:
    
+    
+      
    Don't quote me.
    
+        
+      
+  
    And a following paragraph.
    
+  
    
+     Here is a block quote inside a paragraph. Start of a paragraph is here, and the quote is below:
+      
+        
    My block quote
    
+      
+     End of a paragraph
+  
    
+    
+
+  Formulae
+  
+    Inline formulae with <italic>inline-formula</italic>
+    
    Inside a paragraph, should be natively coded inside the paragraph, and show inline:
    
+    
    Einstein showed that 
+      
+      e=mc2.
+      This formula is important because…
    
+      
+  
+    Block formulae with <italic>disp-formula</italic>
+    
    Inside a paragraph, should be natively coded inside the paragraph, but show as block:
    
+    
    Einstein showed that 
+      
+      e=mc2.
+      This formula is important because…
    
+    
    Outside a paragraph, should show as block:
    
+    
    Einstein showed that 
    
+    
+      
+      e=mc2
+    
    This formula is important because…
    
+      
+  
+    Without a formula wrapper
+    
    Inside a paragraph, should show inline:
    
+    
    Einstein showed that 
+      
+      e=mc2.
+      This formula is important because…
    
+    
    Outside a paragraph, should show as block:
    
+    
    Einstein showed that 
    
+    
+      
+      e=mc2
+    
    This formula is important because…
    
+      
+  
+    Formulae with miscelaneus elements
+    
    Regardless of whether or not they are inside a paragraph, should be wrapped in a div, and displayed in a block:
    
+    
    Inside a paragraph:
    
+    
    Einstein definitely showed that 
+      
+        
+          
    Abstract text
    
+        
+        
+          Alternative text of the graphic
+          
+            This is the title of the caption
+            
    Google doodle from 14 March 2003
    
+            
+        
+          
+          e=mc2
+          
+            Alternative text 2
+            
    Google doodle from 14 March 2003
    
+              
+            
+      .
+      This formula is important because…
    
+    
    Outside of a paragraph:
    
+    
    Paragraph before: Einstein showed that 
    
+    
+      
+        
    Abstract text
    
+          
+      
+        Alternative text 1
+        
    Google doodle from 14 March 2003
    
+          
+      
+        
+        e=mc2
+        
+          Alternative text 2
+          
    Google doodle from 14 March 2003
    
+            
+          
+        
+    
    This formula is important because…
    
+      
+    
+
+  
+    
+      
    bar
    
+    
+    alternative-decription
+    
+      
+    
+
+  Code Blocks
+  
    Code:
    
+  ---- (should be four hyphens)
+
+sub status {
+    print "working";
+}
+
+this code block is indented by one tab
+  
    And:
    
+      this code block is indented by two tabs
+
+These should not be escaped:  \$ \\ \> \[ \{
+    
+
+  Lists
+  
+    Unordered
+    
    Asterisks tight:
    
+    
+      
+        
    asterisk 1
    
+          
+      
+        
    asterisk 2
    
+          
+      
+        
    asterisk 3
    
+          
+        
+    
    Asterisks loose:
    
+    
+      
+        
    asterisk 1
    
+          
+      
+        
    asterisk 2
    
+          
+      
+        
    asterisk 3
    
+          
+        
+    
    Pluses tight:
    
+    
+      
+        
    Plus 1
    
+          
+      
+        
    Plus 2
    
+          
+      
+        
    Plus 3
    
+          
+        
+    
    Pluses loose:
    
+    
+      
+        
    Plus 1
    
+          
+      
+        
    Plus 2
    
+          
+      
+        
    Plus 3
    
+          
+        
+    
    Minuses tight:
    
+    
+      
+        
    Minus 1
    
+          
+      
+        
    Minus 2
    
+          
+      
+        
    Minus 3
    
+          
+        
+    
    Minuses loose:
    
+    
+      
+        
    Minus 1
    
+          
+      
+        
    Minus 2
    
+          
+      
+        
    Minus 3
    
+          
+        
+      
+  
+    Ordered
+    
    Tight:
    
+    
+      
+        
    First
    
+          
+      
+        
    Second
    
+          
+      
+        
    Third
    
+          
+        
+    
    and:
    
+    
+      
+        
    One
    
+          
+      
+        
    Two
    
+          
+      
+        
    Three
    
+          
+        
+    
    Loose using tabs:
    
+    
+      
+        
    First
    
+          
+      
+        
    Second
    
+          
+      
+        
    Third
    
+          
+        
+    
    and using spaces:
    
+    
+      
+        
    One
    
+          
+      
+        
    Two
    
+          
+      
+        
    Three
    
+          
+        
+    
    Multiple paragraphs:
    
+    
+      
+        
    Item 1, graf one.
    
+        
    Item 1. graf two. The quick brown fox jumped over the lazy
+          dog's back.
    
+          
+      
+        
    Item 2.
    
+          
+      
+        
    Item 3.
    
+          
+        
+    
    List styles:
    
+    
+      
    one
    ,
+      
    two
    ,
+      
    three
    
+        
+    
+      
    one
    ,
+      
    two
    ,
+      
    three
    
+        
+      
+  
+    Nested
+    
+      
+        
    Tab
    
+        
+          
+            
    Tab
    
+            
+              
+                
    Tab
    
+                  
+                
+              
+            
+          
+        
+    
    Here's another:
    
+    
+      
+        
    First
    
+          
+      
+        
    Second:
    
+        
+          
+            
    Fee
    
+              
+          
+            
    Fie
    
+              
+          
+            
    Foe
    
+              
+            
+          
+      
+        
    Third
    
+          
+        
+    
    Same thing but with paragraphs:
    
+    
+      
+        
    First
    
+          
+      
+        
    Second:
    
+        
+          
+            
    Fee
    
+              
+          
+            
    Fie
    
+              
+          
+            
    Foe
    
+              
+            
+          
+      
+        
    Third
    
+          
+        
+      
+  
+    Tabs and spaces
+    
+      
+        
    this is a list item indented with tabs
    
+          
+      
+        
    this is a list item indented with spaces
    
+        
+          
+            
    this is an example list item indented with tabs
    
+              
+          
+            
    this is an example list item indented with spaces
    
+              
+            
+          
+        
+      
+  
+    Fancy list markers
+    
    Autonumbering:
    
+    
+      
+        
    Autonumber.
    
+          
+      
+        
    More.
    
+        
+          
+            
    Nested.
    
+              
+            
+          
+        
+      
+  
+    Definition
+    
+      
+        
+          Violin
+        
+        
+          
    Stringed musical instrument.
    
+          
    Torture device.
    
+            
+          
+      
+        
+          CelloVioloncello
+        
+        
+          
    Low-voiced stringed instrument.
    
+            
+          
+        
+      
+  
+    List inside a paragraph
+    
    
+      Start of a paragraph.
+      
+        
+          
+          
    Red
    
+        
+        
+          
+          
    Blue
    
+            
+      
+      End of paragraph.
+    
    
+      
+    
+
+  Inline Markup
+  
    This is emphasized, and so is
+    this.
    
+  
    This is strong, and so
+    is this.
    
+  
    Empty  and .
    
+  
    An
+    emphasized
+    link.
    
+  
    This is strong and em.
    
+  
    So is this word.
    
+  
    This is strong and em.
    
+  
    So is this word.
    
+  
    This is code: >, $,
+    \, \$,
+    <html>.
    
+  
    This is small caps.
    
+  
    These are all underlined: foo and bar.
    
+  
    These are all strikethrough: foo,
+    bar, and baz.
    
+    
+
+  Smart quotes, ellipses, dashes
+  
    "Hello," said the spider. "'Shelob' is my name."
    
+  
    'A', 'B', and 'C' are letters.
    
+  
    'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.'
    
+  
    'He said, "I want to go."' Were you alive in the 70's?
    
+  
    Here is some quoted 'code' and a
+    "quoted
+    link".
    
+  
    Some dashes: one---two --- three--four -- five.
    
+  
    Dashes between numbers: 5-7, 255-66, 1987-1999.
    
+  
    Ellipses...and. . .and . . . .
    
+    
+
+  LaTeX
+  
+    
+      
    \cite[22-23]{smith.1899}
    
+        
+    
+      
    \doublespacing
    
+        
+    
+      
    $2+2=4$
    
+        
+    
+      
    $x \in y$
    
+        
+    
+      
    $\alpha \wedge \omega$
    
+        
+    
+      
    $223$
    
+        
+    
+      
    $p$-Tree
    
+        
+    
+      
    $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
    
+        
+    
+      
    Here's one that has a line break in it: $\alpha + \omega \times
+        x^2$.
    
+        
+      
+  
    These shouldn't be math:
    
+  
+    
+      
    To get the famous equation, write
+        $e = mc^2$.
    
+        
+    
+      
    $22,000 is a lot of money. So is $34,000. (It
+        worked if "lot" is emphasized.)
    
+        
+    
+      
    Escaped $: $73 this should be
+        emphasized 23$.
    
+        
+      
+  
    Here's a LaTeX table:
    
+  
    \begin{tabular}{|l|l|}\hline Animal & Number \\ \hline Dog &
+    2 \\ Cat & 1 \\ \hline \end{tabular}
    
+    
+
+  Special Characters
+  
    Here is some unicode:
    
+  
+    
+      
    I hat: Î
    
+        
+    
+      
    o umlaut: ö
    
+        
+    
+      
    section: §
    
+        
+    
+      
    set membership: elem
    
+        
+    
+      
    copyright: ©
    
+        
+      
+  
    AT&T has an ampersand in their name.
    
+  
    AT&T is another way to write it.
    
+  
    This & that.
    
+  
    4 < 5.
    
+  
    6 > 5.
    
+  
    Backslash: \
    
+  
    Backtick: `
    
+  
    Asterisk: *
    
+  
    Underscore: _
    
+  
    Left brace: {
    
+  
    Right brace: }
    
+  
    Left bracket: [
    
+  
    Right bracket: ]
    
+  
    Left paren: (
    
+  
    Right paren: )
    
+  
    Greater-than: >
    
+  
    Hash: #
    
+  
    Period: .
    
+  
    Bang: !
    
+  
    Plus: +
    
+  
    Minus: -
    
+    
+
+  Links
+  
+    Explicit
+    
    Just a
+      URL.
    
+    
    URL
+      and title.
    
+    
    URL
+      and title.
    
+    
    URL
+      and title.
    
+    
    URL
+      and title
    
+    
    URL
+      and title
    
+    
    Email link (nobody [at] nowhere.net)
    
+    
    Empty.
    
+      
+  
+    Reference
+    
    Foo
+      bar.
    
+    
    Foo
+      bar.
    
+    
    Foo
+      bar.
    
+    
    With embedded
+      [brackets].
    
+    
    b by
+      itself should be a link.
    
+    
    Indented
+      once.
    
+    
    Indented
+      twice.
    
+    
    Indented
+      thrice.
    
+    
    This should [not] be a link.
    
+    [not]: /url
+    
    Foo
+      bar.
    
+    
    Foo
+      biz.
    
+      
+  
+    With ampersands
+    
    Here's a
+      link
+      with an ampersand in the URL.
    
+    
    Here's a link with an amersand in the link text:
+      AT&T.
    
+    
    Here's an
+      inline
+      link.
    
+    
    Here's an
+      inline
+      link in pointy braces.
    
+      
+  
+    Autolinks
+    
    With an ampersand:
+      http://example.com/?foo=1&bar=2
    
+    
+      
+        
    In a list?
    
+          
+      
+        
    http://example.com/
    
+          
+      
+        
    It should.
    
+          
+        
+    
    An e-mail address: nobody [at] nowhere.net
    
+    
+      
    Blockquoted:
+        http://example.com/
    
+        
+    
    Auto-links should not occur here:
+      <http://example.com/>
    
+    or here: <http://example.com/>
+      
+    
+
+  Images
+  
    From "Voyage dans la Lune" by Georges Melies (1902):
    
+  
    
+  
    Here is a movie
+    
+    icon.
    
+    
+
+  Footnotes
+  
    Here is a footnote reference(1),
+    and
+    another(longnote).
+    This should not be a footnote reference, because it
+    contains a space^(my note).
    
+  
    (1) Here is the footnote. It can
+    go anywhere in the document, not just at the end.
    
+  
    (longnote) Here's
+    the other note. This one contains multiple blocks.
    
+  
    Caret characters are used to indicate that the blocks all belong to
+    a single footnote (as with block quotes).
    
+    { <code> }
+  
    If you want, you can use a caret at the beginning of every line, as
+    with blockquotes, but all that you need is a caret at the beginning
+    of the first line of the block and any preceding blank lines.
    
+  
    text Leading space
    
+  
    Trailing space text
    
+  
    text Leading spaces
    
+  
    Trailing spaces text
    
+    
+
+  Tables
+  
+    Tables with Headers
+    
+      +      +      +      
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    X
    
+              		
+            
    Y
    
+              		
+            
    Z
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    X
    
+              		
+            
    Y
    
+              		
+            
    Z
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    X
    
+              		
+            
    Y
    
+              		
+            
    Z
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    X
    
+              		
+            
    Y
    
+              		
+            
    Z
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    X
    
+              		
+            
    Y
    
+              		
+            
    Z
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    X
    
+              		
+            
    Y
    
+              		
+            
    Z
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    X
    
+              		
+            
    Y
    
+              		
+            
    Z
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    r1a
    
+              		
+            
    r1b
    
+              		
+            
    r1c
    
+          
    
+            
    X
    
+              		
+            
    Y
    
+              		
+            
    Z
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    X
    
+              		
+            
    Y
    
+              		
+            
    Z
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+      
+  
+    Tables without Headers
+    
+      +      +      +      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+    
+      +      +      +      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+            
    4
    
+              		
+            
    5
    
+              		
+            
    6
    
+          
    
+      
+  
+    Tables with spans and alignments
+    
+      +      +      +      
+        
+            
+            
+        
+      
+      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
+    
    



    
+                
    1
    
+                		
+                
    2
    
+            
    
+            
    1
    
+            		
+            
    2
    
+        
    
+            
    4
    
+            		
+            
    5
    
+            		
+            
    6
    
+        
    
+            
    7
    
+        
    
+      
+  
+    Table with footer
+    
+      +      +      +      
+        
+          
+          
+          
+        
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    f1
    
+              		
+            
    f2
    
+              		
+            
    f3
    
+          
    
+            
    f4
    
+              		
+            
    f5
    
+              		
+            
    f6
    
+          
    
+            
    1
    
+              		
+            
    2
    
+              		
+            
    3
    
+          
    
+      
+  
+    Table With Multiple Bodies
+    
+      +      +      +      
+        
+          
+          
+          
+        
+      
+      
+        
+          
+          
+          
+        
+      
+    
    



    
+            
    a1
    
+              		
+            
    a2
    
+              		
+            
    a3
    
+          
    
+            
    b1
    
+              		
+            
    b2
    
+              		
+            
    b3
    
+          
    
+      
+  
+    Empty Tables
+    
    This section should be empty.
    
+      
+    
+
+
+  
+    References
+    
    This is reference 1
    
+    
    This is a long note
    
+      
+  
+    Notes
+    
    This is note 1
    
+    
    This is another long note
    
+      
     
 
    
diff --git a/test/jira-reader.jira b/test/jira-reader.jira
new file mode 100644
--- /dev/null
+++ b/test/jira-reader.jira
@@ -0,0 +1,284 @@
+h1. {anchor:headers}Headers
+h2. {anchor:level-2-with-an-embedded-link}Level 2 with an [embedded link|https://test.example/url]
+h3. {anchor:level-3-with-emphasis}Level 3 with _emphasis_
+h4. Level 4
+h5. Level 5
+h6. Level 6
+
+h0. this is not a header.
+
+----
+h1. Paragraphs
+Here’s a regular paragraph.
+
+Here’s one with a bullet. * criminey.
+
+There should be a hard line break
+here.
+
+----
+h1. Block Quotes
+E-mail style:
+
+bq. This is a block quote. It is pretty short.
+{quote}
+Code in a block quote:
+
+{code:java}
+sub status {
+    print "working";
+}
+{code}
+
+An enumeration:
+
+# item one
+# item two
+{quote}
+
+A following paragraph.
+
+----
+h1. Code Blocks
+
+Code:
+
+{code:java}
+---- (should be four hyphens)
+
+sub status {
+    print "working";
+}
+{code}
+And:
+
+{code:java}
+    this code block is indented by two tabs
+
+These should not be escaped:  \$ \\ \> \[ \{
+{code}
+
+----
+h1. {anchor:lists}Lists
+h2. {anchor:unordered}Unordered
+Asterisks:
+
+* asterisk 1
+* asterisk 2
+* asterisk 3
+
+Minuses:
+
+- Minus 1
+- Minus 2
+- Minus 3
+
+h2. Ordered
+
+# First
+# Second
+# Third
+
+Linebreak in paragraph:
+
+# Item 1, line one.
+Item 1. line two. The quick brown fox jumped over the lazy dog’s back.
+# Item 2.
+# Item 3.
+
+h2. Nested
+* Tab
+** Tab
+*** Tab
+
+Here’s another:
+
+# First
+# Second:
+#* Fee
+#* Fie
+#* Foe
+# Third
+
+Nested enumerations:
+
+# Essential
+## Important
+### Relevant
+#### Insignificant
+
+----
+h1. Linebreaks and Markup in Lists
+
+* *apple*
+red fruit
+* *orange*
+orange fruit
+* *banana*
+yellow fruit
+
+Multiple blocks with italics:
+
+* *_apple_*
+red fruit
+contains seeds, crisp, pleasant to taste
+* *_orange_*
+orange fruit
+{code:java}
+{ orange code block }
+{code}
+bq. orange block quote
+
+----
+h1. Colored Text Blocks
+{color:red}
+This is red.
+{color}
+
+h2. Eiffel 65
+
+{color:blue}
+da ba dee
+{color}
+
+----
+h1. Inline Markup
+This is _emphasized_, and so _is this_.
+
+This is *strong*, and so *is this*.
+
+An _[emphasized link|https://my.example/url]_.
+
+*_This is strong and em._*
+
+So is *_this_* word.
+
+This is code: {{>}}, {{$}}, {{\}}, {{\$}}, {{}}.
+
+-This is _strikeout_.-
+
+Superscripts: a{^}bc{^}d a{^}_hello_{^} a{^}hello there{^}.
+
+Subscripts: H{~}2{~}O, C{~}6{~}H{~}12{~}O{~}6{~}, C{~} n {~}H{~}_2n_{~}O{~}n{~}.
+
+These should not be superscripts or subscripts, because of markers used within words: a^b c^d, a~b c~d.
+
+----
+h1. Dashes, and emoticons
+
+Some dashes: one -- two --- three.
+
+Sure (/)
+Nope (x)
+
+Nice :D
+
+Capital d\:D
+
+----
+h1. Math
+
+* 2 + 2 = 4
+* _x_ ∈ {_}y{_}
+* _α_ ∧ {_}ω{_}
+* _p_-Tree
+* Here’s one more: _α_ + {_}ω{_} × {_}x{_}^2^.
+
+
+----
+h1. Special Characters
+Here is some unicode:
+
+* I hat: Î
+* o umlaut: ö
+* section: §
+* set membership: ∈
+* copyright: ©
+
+AT&T has an ampersand in their name.
+
+AT&T is another way to write it.
+
+This & that.
+
+4 < 5.
+
+6 > 5.
+
+Backslash: \
+
+Backtick: `
+
+Asterisk: *
+
+Underscore: _
+
+Left brace: {
+
+Right brace: }
+
+Left bracket: [
+
+Right bracket: ]
+
+Left paren: (
+
+Right paren: )
+
+Greater-than: >
+
+Hash: #
+
+Period: .
+
+Bang: !
+
+Plus: +
+
+Minus: -
+
+----
+h1. Links
+h2. Explicit
+Just a [URL|https://example.org/url].
+
+[File URL|file://some/file/name/].
+
+[IRC link|irc://example.org/pandoc].
+
+[Email link|mailto:nobody@nowhere.invalid]
+
+[Not a link|not a URL].
+
+h2. Reference
+With [embedded \[brackets\]|https://example.net/url/].
+
+https://pandoc.org by itself should be a link.
+
+h2. With ampersands
+Here’s a [link with an ampersand in the URL|http://example.com/?foo=1&bar=2].
+
+Here’s a link with an ampersand in the link text: [AT&T|http://att.com/].
+
+h2. Autolinks
+With an ampersand: http://example.com/?foo=1&bar=2
+
+* In a list?
+* http://example.com/
+* It should.
+
+An e-mail address: mailto:nobody@nowhere.invalid
+
+bq. Blockquoted: http://example.com/
+
+{code:java}
+Autolink should not occur here: 
+{code}
+
+----
+h1. Images
+From "Voyage dans la Lune" by Georges Melies (1902):
+
+!lalune.jpg!
+
+Here is a movie !movie.jpg! icon.
diff --git a/test/jira-reader.native b/test/jira-reader.native
new file mode 100644
--- /dev/null
+++ b/test/jira-reader.native
@@ -0,0 +1,947 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Header
+      1
+      ( "" , [] , [] )
+      [ Span ( "headers" , [] , [] ) [] , Str "Headers" ]
+  , Header
+      2
+      ( "" , [] , [] )
+      [ Span ( "level-2-with-an-embedded-link" , [] , [] ) []
+      , Str "Level"
+      , Space
+      , Str "2"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "embedded" , Space , Str "link" ]
+          ( "https://test.example/url" , "" )
+      ]
+  , Header
+      3
+      ( "" , [] , [] )
+      [ Span ( "level-3-with-emphasis" , [] , [] ) []
+      , Str "Level"
+      , Space
+      , Str "3"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "emphasis" ]
+      ]
+  , Header
+      4 ( "" , [] , [] ) [ Str "Level" , Space , Str "4" ]
+  , Header
+      5 ( "" , [] , [] ) [ Str "Level" , Space , Str "5" ]
+  , Header
+      6 ( "" , [] , [] ) [ Str "Level" , Space , Str "6" ]
+  , Para
+      [ Str "h0."
+      , Space
+      , Str "this"
+      , Space
+      , Str "is"
+      , Space
+      , Str "not"
+      , Space
+      , Str "a"
+      , Space
+      , Str "header."
+      ]
+  , HorizontalRule
+  , Header 1 ( "" , [] , [] ) [ Str "Paragraphs" ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "regular"
+      , Space
+      , Str "paragraph."
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "one"
+      , Space
+      , Str "with"
+      , Space
+      , Str "a"
+      , Space
+      , Str "bullet."
+      , Space
+      , Str "*"
+      , Space
+      , Str "criminey."
+      ]
+  , Para
+      [ Str "There"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "hard"
+      , Space
+      , Str "line"
+      , Space
+      , Str "break"
+      , LineBreak
+      , Str "here."
+      ]
+  , HorizontalRule
+  , Header
+      1 ( "" , [] , [] ) [ Str "Block" , Space , Str "Quotes" ]
+  , Para [ Str "E-mail" , Space , Str "style:" ]
+  , BlockQuote
+      [ Para
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote."
+          , Space
+          , Str "It"
+          , Space
+          , Str "is"
+          , Space
+          , Str "pretty"
+          , Space
+          , Str "short."
+          ]
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "Code"
+          , Space
+          , Str "in"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote:"
+          ]
+      , CodeBlock
+          ( "" , [ "java" ] , [] )
+          "sub status {\n    print \"working\";\n}\n"
+      , Para [ Str "An" , Space , Str "enumeration:" ]
+      , OrderedList
+          ( 1 , DefaultStyle , DefaultDelim )
+          [ [ Para [ Str "item" , Space , Str "one" ] ]
+          , [ Para [ Str "item" , Space , Str "two" ] ]
+          ]
+      ]
+  , Para
+      [ Str "A"
+      , Space
+      , Str "following"
+      , Space
+      , Str "paragraph."
+      ]
+  , HorizontalRule
+  , Header
+      1 ( "" , [] , [] ) [ Str "Code" , Space , Str "Blocks" ]
+  , Para [ Str "Code:" ]
+  , CodeBlock
+      ( "" , [ "java" ] , [] )
+      "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n"
+  , Para [ Str "And:" ]
+  , CodeBlock
+      ( "" , [ "java" ] , [] )
+      "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{\n"
+  , HorizontalRule
+  , Header
+      1
+      ( "" , [] , [] )
+      [ Span ( "lists" , [] , [] ) [] , Str "Lists" ]
+  , Header
+      2
+      ( "" , [] , [] )
+      [ Span ( "unordered" , [] , [] ) [] , Str "Unordered" ]
+  , Para [ Str "Asterisks:" ]
+  , BulletList
+      [ [ Para [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Minuses:" ]
+  , BulletList
+      [ [ Para [ Str "Minus" , Space , Str "1" ] ]
+      , [ Para [ Str "Minus" , Space , Str "2" ] ]
+      , [ Para [ Str "Minus" , Space , Str "3" ] ]
+      ]
+  , Header 2 ( "" , [] , [] ) [ Str "Ordered" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second" ] ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para
+      [ Str "Linebreak"
+      , Space
+      , Str "in"
+      , Space
+      , Str "paragraph:"
+      ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para
+            [ Str "Item"
+            , Space
+            , Str "1,"
+            , Space
+            , Str "line"
+            , Space
+            , Str "one."
+            , LineBreak
+            , Str "Item"
+            , Space
+            , Str "1."
+            , Space
+            , Str "line"
+            , Space
+            , Str "two."
+            , Space
+            , Str "The"
+            , Space
+            , Str "quick"
+            , Space
+            , Str "brown"
+            , Space
+            , Str "fox"
+            , Space
+            , Str "jumped"
+            , Space
+            , Str "over"
+            , Space
+            , Str "the"
+            , Space
+            , Str "lazy"
+            , Space
+            , Str "dog\8217s"
+            , Space
+            , Str "back."
+            ]
+        ]
+      , [ Para [ Str "Item" , Space , Str "2." ] ]
+      , [ Para [ Str "Item" , Space , Str "3." ] ]
+      ]
+  , Header 2 ( "" , [] , [] ) [ Str "Nested" ]
+  , BulletList
+      [ [ Para [ Str "Tab" ]
+        , BulletList
+            [ [ Para [ Str "Tab" ]
+              , BulletList [ [ Para [ Str "Tab" ] ] ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Here\8217s" , Space , Str "another:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second:" ]
+        , BulletList
+            [ [ Para [ Str "Fee" ] ]
+            , [ Para [ Str "Fie" ] ]
+            , [ Para [ Str "Foe" ] ]
+            ]
+        ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para [ Str "Nested" , Space , Str "enumerations:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "Essential" ]
+        , OrderedList
+            ( 1 , DefaultStyle , DefaultDelim )
+            [ [ Para [ Str "Important" ]
+              , OrderedList
+                  ( 1 , DefaultStyle , DefaultDelim )
+                  [ [ Para [ Str "Relevant" ]
+                    , OrderedList
+                        ( 1 , DefaultStyle , DefaultDelim )
+                        [ [ Para [ Str "Insignificant" ] ] ]
+                    ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "" , [] , [] )
+      [ Str "Linebreaks"
+      , Space
+      , Str "and"
+      , Space
+      , Str "Markup"
+      , Space
+      , Str "in"
+      , Space
+      , Str "Lists"
+      ]
+  , BulletList
+      [ [ Para
+            [ Strong [ Str "apple" ]
+            , LineBreak
+            , Str "red"
+            , Space
+            , Str "fruit"
+            ]
+        ]
+      , [ Para
+            [ Strong [ Str "orange" ]
+            , LineBreak
+            , Str "orange"
+            , Space
+            , Str "fruit"
+            ]
+        ]
+      , [ Para
+            [ Strong [ Str "banana" ]
+            , LineBreak
+            , Str "yellow"
+            , Space
+            , Str "fruit"
+            ]
+        ]
+      ]
+  , Para
+      [ Str "Multiple"
+      , Space
+      , Str "blocks"
+      , Space
+      , Str "with"
+      , Space
+      , Str "italics:"
+      ]
+  , BulletList
+      [ [ Para
+            [ Strong [ Emph [ Str "apple" ] ]
+            , LineBreak
+            , Str "red"
+            , Space
+            , Str "fruit"
+            , LineBreak
+            , Str "contains"
+            , Space
+            , Str "seeds,"
+            , Space
+            , Str "crisp,"
+            , Space
+            , Str "pleasant"
+            , Space
+            , Str "to"
+            , Space
+            , Str "taste"
+            ]
+        ]
+      , [ Para
+            [ Strong [ Emph [ Str "orange" ] ]
+            , LineBreak
+            , Str "orange"
+            , Space
+            , Str "fruit"
+            ]
+        , CodeBlock
+            ( "" , [ "java" ] , [] ) "{ orange code block }\n"
+        , BlockQuote
+            [ Para
+                [ Str "orange"
+                , Space
+                , Str "block"
+                , Space
+                , Str "quote"
+                ]
+            ]
+        ]
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "" , [] , [] )
+      [ Str "Colored"
+      , Space
+      , Str "Text"
+      , Space
+      , Str "Blocks"
+      ]
+  , Div
+      ( "" , [] , [ ( "color" , "red" ) ] )
+      [ Para
+          [ LineBreak
+          , Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Str "red."
+          ]
+      ]
+  , Header
+      2 ( "" , [] , [] ) [ Str "Eiffel" , Space , Str "65" ]
+  , Div
+      ( "" , [] , [ ( "color" , "blue" ) ] )
+      [ Para
+          [ LineBreak
+          , Str "da"
+          , Space
+          , Str "ba"
+          , Space
+          , Str "dee"
+          ]
+      ]
+  , 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 "."
+      ]
+  , Para
+      [ Str "An"
+      , Space
+      , Emph
+          [ Link
+              ( "" , [] , [] )
+              [ Str "emphasized" , Space , Str "link" ]
+              ( "https://my.example/url" , "" )
+          ]
+      , Str "."
+      ]
+  , Para
+      [ Strong
+          [ Emph
+              [ Str "This"
+              , Space
+              , Str "is"
+              , Space
+              , Str "strong"
+              , Space
+              , Str "and"
+              , Space
+              , Str "em."
+              ]
+          ]
+      ]
+  , Para
+      [ Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Emph [ Str "this" ] ]
+      , Space
+      , Str "word."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "code:"
+      , Space
+      , Code ( "" , [] , [] ) ">"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "$"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "\\"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "\\$"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) ""
+      , Str "."
+      ]
+  , Para
+      [ Strikeout
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Emph [ Str "strikeout" ]
+          , Str "."
+          ]
+      ]
+  , Para
+      [ Str "Superscripts:"
+      , Space
+      , Str "a"
+      , Superscript [ Str "bc" ]
+      , Str "d"
+      , Space
+      , Str "a"
+      , Superscript [ Emph [ Str "hello" ] ]
+      , Space
+      , Str "a"
+      , Superscript [ Str "hello\160there" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "Subscripts:"
+      , Space
+      , Str "H"
+      , Subscript [ Str "2" ]
+      , Str "O,"
+      , Space
+      , Str "C"
+      , Subscript [ Str "6" ]
+      , Str "H"
+      , Subscript [ Str "12" ]
+      , Str "O"
+      , Subscript [ Str "6" ]
+      , Str ","
+      , Space
+      , Str "C"
+      , Subscript [ Str "\160n\160" ]
+      , Str "H"
+      , Subscript [ Emph [ Str "2n" ] ]
+      , Str "O"
+      , Subscript [ Str "n" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "These"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "be"
+      , Space
+      , Str "superscripts"
+      , Space
+      , Str "or"
+      , Space
+      , Str "subscripts,"
+      , Space
+      , Str "because"
+      , Space
+      , Str "of"
+      , Space
+      , Str "markers"
+      , Space
+      , Str "used"
+      , Space
+      , Str "within"
+      , Space
+      , Str "words:"
+      , Space
+      , Str "a^b"
+      , Space
+      , Str "c^d,"
+      , Space
+      , Str "a~b"
+      , Space
+      , Str "c~d."
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "" , [] , [] )
+      [ Str "Dashes,"
+      , Space
+      , Str "and"
+      , Space
+      , Str "emoticons"
+      ]
+  , Para
+      [ Str "Some"
+      , Space
+      , Str "dashes:"
+      , Space
+      , Str "one"
+      , Space
+      , Str "\8211"
+      , Space
+      , Str "two"
+      , Space
+      , Str "\8212"
+      , Space
+      , Str "three."
+      ]
+  , Para
+      [ Str "Sure"
+      , Space
+      , Str "\10004"
+      , LineBreak
+      , Str "Nope"
+      , Space
+      , Str "\10060"
+      ]
+  , Para [ Str "Nice" , Space , Str "\128515" ]
+  , Para [ Str "Capital" , Space , Str "d:D" ]
+  , HorizontalRule
+  , Header 1 ( "" , [] , [] ) [ Str "Math" ]
+  , BulletList
+      [ [ Para [ Str "2\8197+\8197\&2\8196=\8196\&4" ] ]
+      , [ Para
+            [ Emph [ Str "x" ]
+            , Str "\8196\8712\8196"
+            , Emph [ Str "y" ]
+            ]
+        ]
+      , [ Para
+            [ Emph [ Str "\945" ]
+            , Str "\8197\8743\8197"
+            , Emph [ Str "\969" ]
+            ]
+        ]
+      , [ Para [ Emph [ Str "p" ] , Str "-Tree" ] ]
+      , [ Para
+            [ Str "Here\8217s"
+            , Space
+            , Str "one"
+            , Space
+            , Str "more:"
+            , Space
+            , Emph [ Str "\945" ]
+            , Str "\8197+\8197"
+            , Emph [ Str "\969" ]
+            , Str "\8197\215\8197"
+            , Emph [ Str "x" ]
+            , Superscript [ Str "2" ]
+            , Str "."
+            ]
+        ]
+      ]
+  , HorizontalRule
+  , Header
+      1
+      ( "" , [] , [] )
+      [ Str "Special" , Space , Str "Characters" ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "some"
+      , Space
+      , Str "unicode:"
+      ]
+  , BulletList
+      [ [ Para
+            [ Str "I" , Space , Str "hat:" , Space , Str "\206" ]
+        ]
+      , [ Para
+            [ Str "o" , Space , Str "umlaut:" , Space , Str "\246" ]
+        ]
+      , [ Para [ Str "section:" , Space , Str "\167" ] ]
+      , [ Para
+            [ Str "set"
+            , Space
+            , Str "membership:"
+            , Space
+            , Str "\8712"
+            ]
+        ]
+      , [ Para [ Str "copyright:" , Space , Str "\169" ] ]
+      ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "has"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "their"
+      , Space
+      , Str "name."
+      ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "is"
+      , Space
+      , Str "another"
+      , Space
+      , Str "way"
+      , Space
+      , Str "to"
+      , Space
+      , Str "write"
+      , Space
+      , Str "it."
+      ]
+  , Para
+      [ Str "This" , Space , Str "&" , Space , Str "that." ]
+  , Para [ Str "4" , Space , Str "<" , Space , Str "5." ]
+  , Para [ Str "6" , Space , Str ">" , Space , Str "5." ]
+  , Para [ Str "Backslash:" , Space , Str "\\" ]
+  , Para [ Str "Backtick:" , Space , Str "`" ]
+  , Para [ Str "Asterisk:" , Space , Str "*" ]
+  , Para [ Str "Underscore:" , Space , Str "_" ]
+  , Para
+      [ Str "Left" , Space , Str "brace:" , Space , Str "{" ]
+  , Para
+      [ Str "Right" , Space , Str "brace:" , Space , Str "}" ]
+  , Para
+      [ Str "Left" , Space , Str "bracket:" , Space , Str "[" ]
+  , Para
+      [ Str "Right" , Space , Str "bracket:" , Space , Str "]" ]
+  , Para
+      [ Str "Left" , Space , Str "paren:" , Space , Str "(" ]
+  , Para
+      [ Str "Right" , Space , Str "paren:" , Space , Str ")" ]
+  , Para [ Str "Greater-than:" , Space , Str ">" ]
+  , Para [ Str "Hash:" , Space , Str "#" ]
+  , Para [ Str "Period:" , Space , Str "." ]
+  , Para [ Str "Bang:" , Space , Str "!" ]
+  , Para [ Str "Plus:" , Space , Str "+" ]
+  , Para [ Str "Minus:" , Space , Str "-" ]
+  , HorizontalRule
+  , Header 1 ( "" , [] , [] ) [ Str "Links" ]
+  , Header 2 ( "" , [] , [] ) [ Str "Explicit" ]
+  , Para
+      [ Str "Just"
+      , Space
+      , Str "a"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "URL" ]
+          ( "https://example.org/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "File" , Space , Str "URL" ]
+          ( "file://some/file/name/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "IRC" , Space , Str "link" ]
+          ( "irc://example.org/pandoc" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "Email" , Space , Str "link" ]
+          ( "mailto:nobody@nowhere.invalid" , "" )
+      ]
+  , Para
+      [ Str "[Not"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link|not"
+      , Space
+      , Str "a"
+      , Space
+      , Str "URL]."
+      ]
+  , Header 2 ( "" , [] , [] ) [ Str "Reference" ]
+  , Para
+      [ Str "With"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "embedded" , Space , Str "[brackets]" ]
+          ( "https://example.net/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "https://pandoc.org" ]
+          ( "https://pandoc.org" , "" )
+      , Space
+      , Str "by"
+      , Space
+      , Str "itself"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link."
+      ]
+  , Header
+      2 ( "" , [] , [] ) [ Str "With" , Space , Str "ampersands" ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "link"
+          , Space
+          , Str "with"
+          , Space
+          , Str "an"
+          , Space
+          , Str "ampersand"
+          , Space
+          , Str "in"
+          , Space
+          , Str "the"
+          , Space
+          , Str "URL"
+          ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "link"
+      , Space
+      , Str "text:"
+      , Space
+      , Link
+          ( "" , [] , [] ) [ Str "AT&T" ] ( "http://att.com/" , "" )
+      , Str "."
+      ]
+  , Header 2 ( "" , [] , [] ) [ Str "Autolinks" ]
+  , Para
+      [ Str "With"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand:"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "http://example.com/?foo=1&bar=2" ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      ]
+  , BulletList
+      [ [ Para
+            [ Str "In" , Space , Str "a" , Space , Str "list?" ]
+        ]
+      , [ Para
+            [ Link
+                ( "" , [] , [] )
+                [ Str "http://example.com/" ]
+                ( "http://example.com/" , "" )
+            ]
+        ]
+      , [ Para [ Str "It" , Space , Str "should." ] ]
+      ]
+  , Para
+      [ Str "An"
+      , Space
+      , Str "e-mail"
+      , Space
+      , Str "address:"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "mailto:nobody@nowhere.invalid" ]
+          ( "mailto:nobody@nowhere.invalid" , "" )
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "Blockquoted:"
+          , Space
+          , Link
+              ( "" , [] , [] )
+              [ Str "http://example.com/" ]
+              ( "http://example.com/" , "" )
+          ]
+      ]
+  , CodeBlock
+      ( "" , [ "java" ] , [] )
+      "Autolink should not occur here: \n"
+  , HorizontalRule
+  , Header 1 ( "" , [] , [] ) [ Str "Images" ]
+  , Para
+      [ Str "From"
+      , Space
+      , Str "\"Voyage"
+      , Space
+      , Str "dans"
+      , Space
+      , Str "la"
+      , Space
+      , Str "Lune\""
+      , Space
+      , Str "by"
+      , Space
+      , Str "Georges"
+      , Space
+      , Str "Melies"
+      , Space
+      , Str "(1902):"
+      ]
+  , Para [ Image ( "" , [] , [] ) [] ( "lalune.jpg" , "" ) ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "movie"
+      , Space
+      , Image ( "" , [] , [] ) [] ( "movie.jpg" , "" )
+      , Space
+      , Str "icon."
+      ]
+  ]
diff --git a/test/latex-reader.latex b/test/latex-reader.latex
--- a/test/latex-reader.latex
+++ b/test/latex-reader.latex
@@ -1,23 +1,18 @@
 \documentclass{article}
-\usepackage[mathletters]{ucs}
 \usepackage[utf8x]{inputenc}
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{6pt plus 2pt minus 1pt}
 
-\usepackage[breaklinks=true,unicode=true]{hyperref}
+\usepackage{hyperref}
 \usepackage[normalem]{ulem}
-% avoid problems with \sout in headers with hyperref:
-\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
 \usepackage{enumerate}
+\usepackage{setspace}
 \usepackage{fancyvrb}
 \usepackage{graphicx}
-\usepackage{url}
-
-\setcounter{secnumdepth}{0}
 \VerbatimFootnotes % allows verbatim text in footnotes
+
 \title{Pandoc Test Suite}
 \author{John MacFarlane \and Anonymous}
 \date{July 17, 2006}
+
 \begin{document}
 \maketitle
 
diff --git a/test/latex-reader.native b/test/latex-reader.native
--- a/test/latex-reader.native
+++ b/test/latex-reader.native
@@ -1,375 +1,2291 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"],MetaInlines [Str "Anonymous"]]),("date",MetaInlines [Str "July",Space,Str "17,",Space,Str "2006"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
-[RawBlock (Format "latex") "\\maketitle"
-,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",SoftBreak,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
-,HorizontalRule
-,Header 1 ("headers",[],[]) [Str "Headers"]
-,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embedded",Space,Str "link"] ("/url","")]
-,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Para [Str "Level",Space,Str "4"]
-,Para [Str "Level",Space,Str "5"]
-,Header 1 ("level-1",[],[]) [Str "Level",Space,Str "1"]
-,Header 2 ("level-2-with-emphasis",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 3 ("level-3",[],[]) [Str "Level",Space,Str "3"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,Header 2 ("level-2",[],[]) [Str "Level",Space,Str "2"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,HorizontalRule
-,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",Space,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",SoftBreak,Str "list",Space,Str "item.",Space,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",SoftBreak,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item."]
-,Para [Str "Here\8217s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",Space,Str "*",Space,Str "criminey."]
-,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
-,HorizontalRule
-,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
-,Para [Str "E-mail",Space,Str "style:"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",Space,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."]]
-,BlockQuote
- [Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"
- ,Para [Str "A",Space,Str "list:"]
- ,OrderedList (1,Decimal,Period)
-  [[Para [Str "item",Space,Str "one"]]
-  ,[Para [Str "item",Space,Str "two"]]]
- ,Para [Str "Nested",Space,Str "block",Space,Str "quotes:"]
- ,BlockQuote
-  [Para [Str "nested"]]
- ,BlockQuote
-  [Para [Str "nested"]]]
-,Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",Space,Str ">",Space,Str "1."]
-,Para [Str "Box-style:"]
-,BlockQuote
- [Para [Str "Example:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"]
-,BlockQuote
- [OrderedList (1,Decimal,Period)
-  [[Para [Str "do",Space,Str "laundry"]]
-  ,[Para [Str "take",Space,Str "out",Space,Str "the",Space,Str "trash"]]]]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "nested",Space,Str "one:"]
-,BlockQuote
- [Para [Str "Joe",Space,Str "said:"]
- ,BlockQuote
-  [Para [Str "Don\8217t",Space,Str "quote",Space,Str "me."]]]
-,Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."]
-,HorizontalRule
-,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"]
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
-,Para [Str "And:"]
-,CodeBlock ("",[],[]) "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
-,Para [Str "this",Space,Str "has",Space,Emph [Str "two",LineBreak,Str "lines"]]
-,HorizontalRule
-,Header 1 ("lists",[],[]) [Str "Lists"]
-,Header 2 ("unordered",[],[]) [Str "Unordered"]
-,Para [Str "Asterisks",Space,Str "tight:"]
-,BulletList
- [[Para [Str "asterisk",Space,Str "1"]]
- ,[Para [Str "asterisk",Space,Str "2"]]
- ,[Para [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Asterisks",Space,Str "loose:"]
-,BulletList
- [[Para [Str "asterisk",Space,Str "1"]]
- ,[Para [Str "asterisk",Space,Str "2"]]
- ,[Para [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "tight:"]
-,BulletList
- [[Para [Str "Plus",Space,Str "1"]]
- ,[Para [Str "Plus",Space,Str "2"]]
- ,[Para [Str "Plus",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Plus",Space,Str "1"]]
- ,[Para [Str "Plus",Space,Str "2"]]
- ,[Para [Str "Plus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "tight:"]
-,BulletList
- [[Para [Str "Minus",Space,Str "1"]]
- ,[Para [Str "Minus",Space,Str "2"]]
- ,[Para [Str "Minus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Minus",Space,Str "1"]]
- ,[Para [Str "Minus",Space,Str "2"]]
- ,[Para [Str "Minus",Space,Str "3"]]]
-,Header 2 ("ordered",[],[]) [Str "Ordered"]
-,Para [Str "Tight:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second"]]
- ,[Para [Str "Third"]]]
-,Para [Str "and:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "One"]]
- ,[Para [Str "Two"]]
- ,[Para [Str "Three"]]]
-,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second"]]
- ,[Para [Str "Third"]]]
-,Para [Str "and",Space,Str "using",Space,Str "spaces:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "One"]]
- ,[Para [Str "Two"]]
- ,[Para [Str "Three"]]]
-,Para [Str "Multiple",Space,Str "paragraphs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
-  ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog\8217s",SoftBreak,Str "back."]]
- ,[Para [Str "Item",Space,Str "2."]]
- ,[Para [Str "Item",Space,Str "3."]]]
-,Header 2 ("nested",[],[]) [Str "Nested"]
-,BulletList
- [[Para [Str "Tab"]
-  ,BulletList
-   [[Para [Str "Tab"]
-    ,BulletList
-     [[Para [Str "Tab"]]]]]]]
-,Para [Str "Here\8217s",Space,Str "another:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BulletList
-   [[Para [Str "Fee"]]
-   ,[Para [Str "Fie"]]
-   ,[Para [Str "Foe"]]]]
- ,[Para [Str "Third"]]]
-,Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BulletList
-   [[Para [Str "Fee"]]
-   ,[Para [Str "Fie"]]
-   ,[Para [Str "Foe"]]]]
- ,[Para [Str "Third"]]]
-,Header 2 ("tabs-and-spaces",[],[]) [Str "Tabs",Space,Str "and",Space,Str "spaces"]
-,BulletList
- [[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"]]
- ,[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"]
-  ,BulletList
-   [[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "tabs"]]
-   ,[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",Space,Str "indented",Space,Str "with",Space,Str "spaces"]]]]]
-,Header 2 ("fancy-list-markers",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"]
-,OrderedList (2,Decimal,TwoParens)
- [[Para [Str "begins",Space,Str "with",Space,Str "2"]]
- ,[Para [Str "and",Space,Str "now",Space,Str "3"]
-  ,Para [Str "with",Space,Str "a",Space,Str "continuation"]
-  ,OrderedList (4,LowerRoman,Period)
-   [[Para [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",Space,Str "starting",Space,Str "with",Space,Str "4"]]
-   ,[Para [Str "more",Space,Str "items"]
-    ,OrderedList (1,UpperAlpha,TwoParens)
-     [[Para [Str "a",Space,Str "subsublist"]]
-     ,[Para [Str "a",Space,Str "subsublist"]]]]]]]
-,Para [Str "Nesting:"]
-,OrderedList (1,UpperAlpha,Period)
- [[Para [Str "Upper",Space,Str "Alpha"]
-  ,OrderedList (1,UpperRoman,Period)
-   [[Para [Str "Upper",Space,Str "Roman."]
-    ,OrderedList (6,Decimal,TwoParens)
-     [[Para [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"]
-      ,OrderedList (3,LowerAlpha,OneParen)
-       [[Para [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]]
-,Para [Str "Autonumbering:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "Autonumber."]]
- ,[Para [Str "More."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Para [Str "Nested."]]]]]
-,Para [Str "Should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "list",Space,Str "item:"]
-,Para [Str "M.A.",Space,Str "2007"]
-,Para [Str "B.",Space,Str "Williams"]
-,HorizontalRule
-,Header 1 ("definition-lists",[],[]) [Str "Definition",Space,Str "Lists"]
-,Para [Str "Tight",Space,Str "using",Space,Str "spaces:"]
-,DefinitionList
- [([Str "apple"],
-   [[Para [Str "red",Space,Str "fruit"]]])
- ,([Str "orange"],
-   [[Para [Str "orange",Space,Str "fruit"]]])
- ,([Str "banana"],
-   [[Para [Str "yellow",Space,Str "fruit"]]])]
-,Para [Str "Tight",Space,Str "using",Space,Str "tabs:"]
-,DefinitionList
- [([Str "apple"],
-   [[Para [Str "red",Space,Str "fruit"]]])
- ,([Str "orange"],
-   [[Para [Str "orange",Space,Str "fruit"]]])
- ,([Str "banana"],
-   [[Para [Str "yellow",Space,Str "fruit"]]])]
-,Para [Str "Loose:"]
-,DefinitionList
- [([Str "apple"],
-   [[Para [Str "red",Space,Str "fruit"]]])
- ,([Str "orange"],
-   [[Para [Str "orange",Space,Str "fruit"]]])
- ,([Str "banana"],
-   [[Para [Str "yellow",Space,Str "fruit"]]])]
-,Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics:"]
-,DefinitionList
- [([Emph [Str "apple"]],
-   [[Para [Str "red",Space,Str "fruit"]
-    ,Para [Str "contains",Space,Str "seeds,",Space,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"]]])
- ,([Emph [Str "orange"]],
-   [[Para [Str "orange",Space,Str "fruit"]
-    ,CodeBlock ("",[],[]) "{ orange code block }"
-    ,BlockQuote
-     [Para [Str "orange",Space,Str "block",Space,Str "quote"]]]])]
-,Header 1 ("html-blocks",[],[]) [Str "HTML",Space,Str "Blocks"]
-,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"]
-,Para [Str "foo",SoftBreak,Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation:"]
-,Para [Str "foo",SoftBreak,Str "bar",SoftBreak,Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table:"]
-,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],SoftBreak,Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"],SoftBreak,Str "Here\8217s",Space,Str "a",Space,Str "simple",Space,Str "block:"]
-,Para [Str "foo",SoftBreak,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:"]
-,Para [Str "foo",SoftBreak,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\8217s:"]
-,HorizontalRule
-,Header 1 ("inline-markup",[],[]) [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 "."]
-,Para [Str "An",Space,Emph [Link ("",[],[]) [Str "emphasized",Space,Str "link"] ("/url","")],Str "."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",Space,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",SoftBreak,Code ("",[],[]) "",Str "."]
-,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "strikeout"],Str "."]]
-,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",SoftBreak,Str "a",Superscript [Emph [Str "hello"]],Space,Str "a",Superscript [Str "hello",Space,Str "there"],Str "."]
-,Para [Str "Subscripts:",Space,Str "H",Subscript [Str "2"],Str "O,",Space,Str "H",Subscript [Str "23"],Str "O,",SoftBreak,Str "H",Subscript [Str "many",Space,Str "of",Space,Str "them"],Str "O."]
-,Para [Str "These",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "superscripts",Space,Str "or",Space,Str "subscripts,",Space,Str "because",Space,Str "of",Space,Str "the",SoftBreak,Str "unescaped",Space,Str "spaces:",Space,Str "a^b",Space,Str "c^d,",Space,Str "a",Math InlineMath "\\sim",Str "b",SoftBreak,Str "c",Math InlineMath "\\sim",Str "d."]
-,HorizontalRule
-,Header 1 ("smart-quotes-ellipses-dashes",[],[]) [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"]
-,Para [Quoted DoubleQuote [Str "Hello,"],Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Quoted DoubleQuote [Str "\8198",Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",Space,Str "name."]]
-,Para [Quoted SingleQuote [Str "A"],Str ",",Space,Quoted SingleQuote [Str "B"],Str ",",Space,Str "and",Space,Quoted SingleQuote [Str "C"],Space,Str "are",Space,Str "letters."]
-,Para [Quoted SingleQuote [Str "Oak,"],Space,Quoted SingleQuote [Str "elm,"],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees.",Space,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine."]]
-,Para [Quoted SingleQuote [Str "He",Space,Str "said,",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go."],Str "\8198"],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70\8217s?"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Quoted SingleQuote [Code ("",[],[]) "code"],Space,Str "and",Space,Str "a",SoftBreak,Quoted DoubleQuote [Link ("",[],[]) [Str "quoted",Space,Str "link"] ("http://example.com/?foo=1&bar=2","")],Str "."]
-,Para [Str "Some",Space,Str "dashes:",Space,Str "one\8212two\8212three\8212four\8212five."]
-,Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5\8211\&7,",Space,Str "255\8211\&66,",Space,Str "1987\8211\&1999."]
-,Para [Str "Ellipses\8230and\8230and\8230."]
-,HorizontalRule
-,Header 1 ("latex",[],[]) [Str "LaTeX"]
-,BulletList
- [[Para [Cite [Citation {citationId = "smith.1899", citationPrefix = [], citationSuffix = [Str "22-23"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cite[22-23]{smith.1899}"]]]
- ,[RawBlock (Format "latex") "\\doublespacing"]
- ,[Para [Math InlineMath "2+2=4"]]
- ,[Para [Math InlineMath "x \\in y"]]
- ,[Para [Math InlineMath "\\alpha \\wedge \\omega"]]
- ,[Para [Math InlineMath "223"]]
- ,[Para [Math InlineMath "p",Str "-Tree"]]
- ,[Para [Math InlineMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"]]
- ,[Para [Str "Here\8217s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",SoftBreak,Math InlineMath "\\alpha + \\omega \\times x^2",Str "."]]]
-,Para [Str "These",Space,Str "shouldn\8217t",Space,Str "be",Space,Str "math:"]
-,BulletList
- [[Para [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code ("",[],[]) "$e = mc^2$",Str "."]]
- ,[Para [Str "$22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$34,000.",Space,Str "(It",Space,Str "worked",Space,Str "if",SoftBreak,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized.)"]]
- ,[Para [Str "Escaped",Space,Code ("",[],[]) "$",Str ":",Space,Str "$73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23$."]]]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]
-,Table [] [AlignLeft,AlignLeft] [0.0,0.0]
- [[Plain [Str "Animal"]]
- ,[Plain [Str "Number"]]]
- [[[Plain [Str "Dog"]]
-  ,[Plain [Str "2"]]]
- ,[[Plain [Str "Cat"]]
-  ,[Plain [Str "1"]]]]
-,Para [Str "A",Space,Str "table",Space,Str "with",Space,Str "one",Space,Str "column:"]
-,Table [] [AlignCenter] [0.0]
- [[]]
- [[[Plain [Str "Animal"]]]
- ,[[Plain [Str "Vegetable"]]]]
-,HorizontalRule
-,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"]
-,BulletList
- [[Para [Str "I",Space,Str "hat:",Space,Str "\206"]]
- ,[Para [Str "o",Space,Str "umlaut:",Space,Str "\246"]]
- ,[Para [Str "section:",Space,Str "\167"]]
- ,[Para [Str "set",Space,Str "membership:",Space,Str "\8712"]]
- ,[Para [Str "copyright:",Space,Str "\169"]]]
-,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-,Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."]
-,Para [Str "This",Space,Str "&",Space,Str "that."]
-,Para [Str "4",Space,Str "<",Space,Str "5."]
-,Para [Str "6",Space,Str ">",Space,Str "5."]
-,Para [Str "Backslash:",Space,Str "\\"]
-,Para [Str "Backtick:",Space,Str "\8216"]
-,Para [Str "Asterisk:",Space,Str "*"]
-,Para [Str "Underscore:",Space,Str "_"]
-,Para [Str "Left",Space,Str "brace:",Space,Str "{"]
-,Para [Str "Right",Space,Str "brace:",Space,Str "}"]
-,Para [Str "Left",Space,Str "bracket:",Space,Str "["]
-,Para [Str "Right",Space,Str "bracket:",Space,Str "]"]
-,Para [Str "Left",Space,Str "paren:",Space,Str "("]
-,Para [Str "Right",Space,Str "paren:",Space,Str ")"]
-,Para [Str "Greater-than:",Space,Str ">"]
-,Para [Str "Hash:",Space,Str "#"]
-,Para [Str "Period:",Space,Str "."]
-,Para [Str "Bang:",Space,Str "!"]
-,Para [Str "Plus:",Space,Str "+"]
-,Para [Str "Minus:",Space,Str "-"]
-,HorizontalRule
-,Header 1 ("links",[],[]) [Str "Links"]
-,Header 2 ("explicit",[],[]) [Str "Explicit"]
-,Para [Str "Just",Space,Str "a",Space,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","")]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","")]
-,Para [Link ("",[],[]) [Str "with_underscore"] ("/url/with_underscore","")]
-,Para [Link ("",[],[]) [Str "Email",Space,Str "link"] ("mailto:nobody@nowhere.net","")]
-,Para [Link ("",[],[]) [Str "Empty"] ("",""),Str "."]
-,Header 2 ("reference",[],[]) [Str "Reference"]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "With",Space,Link ("",[],[]) [Str "embedded",Space,Str "[brackets]"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "b"] ("/url/",""),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "once"] ("/url",""),Str "."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "twice"] ("/url",""),Str "."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "thrice"] ("/url",""),Str "."]
-,Para [Str "This",Space,Str "should",Space,Str "[not][]",Space,Str "be",Space,Str "a",Space,Str "link."]
-,CodeBlock ("",[],[]) "[not]: /url"
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "biz"] ("/url/",""),Str "."]
-,Header 2 ("with-ampersands",[],[]) [Str "With",Space,Str "ampersands"]
-,Para [Str "Here\8217s",Space,Str "a",SoftBreak,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",SoftBreak,Link ("",[],[]) [Str "AT&T"] ("http://att.com/",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "an",SoftBreak,Link ("",[],[]) [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] ("/script?foo=1&bar=2",""),Str "."]
-,Header 2 ("autolinks",[],[]) [Str "Autolinks"]
-,Para [Str "With",Space,Str "an",Space,Str "ampersand:",Space,Link ("",[],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")]
-,BulletList
- [[Para [Str "In",Space,Str "a",Space,Str "list?"]]
- ,[Para [Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]]
- ,[Para [Str "It",Space,Str "should."]]]
-,Para [Str "An",Space,Str "e-mail",Space,Str "address:",SoftBreak,Link ("",[],[]) [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")]
-,BlockQuote
- [Para [Str "Blockquoted:",Space,Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]]
-,Para [Str "Auto-links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ("",[],[]) ""]
-,CodeBlock ("",[],[]) "or here: "
-,HorizontalRule
-,Header 1 ("images",[],[]) [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):"]
-,Para [Image ("",[],[]) [Str "image"] ("lalune.jpg","")]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image ("",[],[]) [Str "image"] ("movie.jpg",""),Space,Str "icon."]
-,HorizontalRule
-,Header 1 ("footnotes",[],[]) [Str "Footnotes"]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",SoftBreak,Str "reference,",Note [Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",SoftBreak,Str "reference.",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document."]],SoftBreak,Str "and",SoftBreak,Str "another.",Note [Para [Str "Here\8217s",Space,Str "the",Space,Str "long",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."],Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",SoftBreak,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)."],CodeBlock ("",[],[]) "  {  }",Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",SoftBreak,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block."]],SoftBreak,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",SoftBreak,Str "a",Space,Str "space.[^my",Space,Str "note]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",SoftBreak,Str "note.",Note [Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type.",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",SoftBreak,Link ("",[],[]) [Str "links"] ("http://google.com",""),Space,Str "and",Space,Code ("",[],[]) "]",Space,Str "verbatim",Space,Str "characters,",SoftBreak,Str "as",Space,Str "well",Space,Str "as",Space,Str "[bracketed",Space,Str "text]."]]]
-,BlockQuote
- [Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes.",Note [Para [Str "In",Space,Str "quote."]]]]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",Note [Para [Str "In",Space,Str "list."]]]]]
-,Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",SoftBreak,Str "indented."]
-,Header 1 ("escaped-characters",[],[]) [Str "Escaped",Space,Str "characters"]
-,Para [Str "$",Space,Str "%",Space,Str "&",Space,Str "#",Space,Str "_",Space,Str "{",Space,Str "}"]]
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "author"
+            , MetaList
+                [ MetaInlines [ Str "John" , Space , Str "MacFarlane" ]
+                , MetaInlines [ Str "Anonymous" ]
+                ]
+            )
+          , ( "date"
+            , MetaInlines
+                [ Str "July" , Space , Str "17," , Space , Str "2006" ]
+            )
+          , ( "title"
+            , MetaInlines
+                [ Str "Pandoc"
+                , Space
+                , Str "Test"
+                , Space
+                , Str "Suite"
+                ]
+            )
+          ]
+    }
+  [ RawBlock (Format "latex") "\\maketitle"
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "set"
+      , Space
+      , Str "of"
+      , Space
+      , Str "tests"
+      , Space
+      , Str "for"
+      , Space
+      , Str "pandoc."
+      , Space
+      , Str "Most"
+      , Space
+      , Str "of"
+      , Space
+      , Str "them"
+      , Space
+      , Str "are"
+      , Space
+      , Str "adapted"
+      , Space
+      , Str "from"
+      , SoftBreak
+      , Str "John"
+      , Space
+      , Str "Gruber\8217s"
+      , Space
+      , Str "markdown"
+      , Space
+      , Str "test"
+      , Space
+      , Str "suite."
+      ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header 1 ( "headers" , [] , [] ) [ Str "Headers" ]
+  , Header
+      2
+      ( "level-2-with-an-embedded-link" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "2"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "embedded" , Space , Str "link" ]
+          ( "/url" , "" )
+      ]
+  , Header
+      3
+      ( "level-3-with-emphasis" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "3"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "emphasis" ]
+      ]
+  , Para [ Str "Level" , Space , Str "4" ]
+  , Para [ Str "Level" , Space , Str "5" ]
+  , Header
+      1 ( "level-1" , [] , [] ) [ Str "Level" , Space , Str "1" ]
+  , Header
+      2
+      ( "level-2-with-emphasis" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "2"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "emphasis" ]
+      ]
+  , Header
+      3 ( "level-3" , [] , [] ) [ Str "Level" , Space , Str "3" ]
+  , Para
+      [ Str "with"
+      , Space
+      , Str "no"
+      , Space
+      , Str "blank"
+      , Space
+      , Str "line"
+      ]
+  , Header
+      2 ( "level-2" , [] , [] ) [ Str "Level" , Space , Str "2" ]
+  , Para
+      [ Str "with"
+      , Space
+      , Str "no"
+      , Space
+      , Str "blank"
+      , Space
+      , Str "line"
+      ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header 1 ( "paragraphs" , [] , [] ) [ Str "Paragraphs" ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "regular"
+      , Space
+      , Str "paragraph."
+      ]
+  , Para
+      [ Str "In"
+      , Space
+      , Str "Markdown"
+      , Space
+      , Str "1.0.0"
+      , Space
+      , Str "and"
+      , Space
+      , Str "earlier."
+      , Space
+      , Str "Version"
+      , Space
+      , Str "8."
+      , Space
+      , Str "This"
+      , Space
+      , Str "line"
+      , Space
+      , Str "turns"
+      , Space
+      , Str "into"
+      , Space
+      , Str "a"
+      , SoftBreak
+      , Str "list"
+      , Space
+      , Str "item."
+      , Space
+      , Str "Because"
+      , Space
+      , Str "a"
+      , Space
+      , Str "hard-wrapped"
+      , Space
+      , Str "line"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "middle"
+      , Space
+      , Str "of"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph"
+      , SoftBreak
+      , Str "looked"
+      , Space
+      , Str "like"
+      , Space
+      , Str "a"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item."
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "one"
+      , Space
+      , Str "with"
+      , Space
+      , Str "a"
+      , Space
+      , Str "bullet."
+      , Space
+      , Str "*"
+      , Space
+      , Str "criminey."
+      ]
+  , Para
+      [ Str "There"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "hard"
+      , Space
+      , Str "line"
+      , Space
+      , Str "break"
+      , LineBreak
+      , Str "here."
+      ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header
+      1
+      ( "block-quotes" , [] , [] )
+      [ Str "Block" , Space , Str "Quotes" ]
+  , Para [ Str "E-mail" , Space , Str "style:" ]
+  , BlockQuote
+      [ Para
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote."
+          , Space
+          , Str "It"
+          , Space
+          , Str "is"
+          , Space
+          , Str "pretty"
+          , Space
+          , Str "short."
+          ]
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "Code"
+          , Space
+          , Str "in"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote:"
+          ]
+      , CodeBlock
+          ( "" , [] , [] ) "sub status {\n    print \"working\";\n}"
+      , Para [ Str "A" , Space , Str "list:" ]
+      , OrderedList
+          ( 1 , Decimal , Period )
+          [ [ Para [ Str "item" , Space , Str "one" ] ]
+          , [ Para [ Str "item" , Space , Str "two" ] ]
+          ]
+      , Para
+          [ Str "Nested"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quotes:"
+          ]
+      , BlockQuote [ Para [ Str "nested" ] ]
+      , BlockQuote [ Para [ Str "nested" ] ]
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      , Space
+      , Str "2"
+      , Space
+      , Str ">"
+      , Space
+      , Str "1."
+      ]
+  , Para [ Str "Box-style:" ]
+  , BlockQuote
+      [ Para [ Str "Example:" ]
+      , CodeBlock
+          ( "" , [] , [] ) "sub status {\n    print \"working\";\n}"
+      ]
+  , BlockQuote
+      [ OrderedList
+          ( 1 , Decimal , Period )
+          [ [ Para [ Str "do" , Space , Str "laundry" ] ]
+          , [ Para
+                [ Str "take"
+                , Space
+                , Str "out"
+                , Space
+                , Str "the"
+                , Space
+                , Str "trash"
+                ]
+            ]
+          ]
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "nested"
+      , Space
+      , Str "one:"
+      ]
+  , BlockQuote
+      [ Para [ Str "Joe" , Space , Str "said:" ]
+      , BlockQuote
+          [ Para
+              [ Str "Don\8217t"
+              , Space
+              , Str "quote"
+              , Space
+              , Str "me."
+              ]
+          ]
+      ]
+  , Para
+      [ Str "And"
+      , Space
+      , Str "a"
+      , Space
+      , Str "following"
+      , Space
+      , Str "paragraph."
+      ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header
+      1
+      ( "code-blocks" , [] , [] )
+      [ Str "Code" , Space , Str "Blocks" ]
+  , Para [ Str "Code:" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
+  , Para [ Str "And:" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
+  , Para
+      [ Str "this"
+      , Space
+      , Str "has"
+      , Space
+      , Emph [ Str "two" , LineBreak , Str "lines" ]
+      ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header 1 ( "lists" , [] , [] ) [ Str "Lists" ]
+  , Header 2 ( "unordered" , [] , [] ) [ Str "Unordered" ]
+  , Para [ Str "Asterisks" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Para [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Asterisks" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Para [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Pluses" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Para [ Str "Plus" , Space , Str "1" ] ]
+      , [ Para [ Str "Plus" , Space , Str "2" ] ]
+      , [ Para [ Str "Plus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Pluses" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Para [ Str "Plus" , Space , Str "1" ] ]
+      , [ Para [ Str "Plus" , Space , Str "2" ] ]
+      , [ Para [ Str "Plus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Minuses" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Para [ Str "Minus" , Space , Str "1" ] ]
+      , [ Para [ Str "Minus" , Space , Str "2" ] ]
+      , [ Para [ Str "Minus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Minuses" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Para [ Str "Minus" , Space , Str "1" ] ]
+      , [ Para [ Str "Minus" , Space , Str "2" ] ]
+      , [ Para [ Str "Minus" , Space , Str "3" ] ]
+      ]
+  , Header 2 ( "ordered" , [] , [] ) [ Str "Ordered" ]
+  , Para [ Str "Tight:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second" ] ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para [ Str "and:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "One" ] ]
+      , [ Para [ Str "Two" ] ]
+      , [ Para [ Str "Three" ] ]
+      ]
+  , Para
+      [ Str "Loose" , Space , Str "using" , Space , Str "tabs:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second" ] ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para
+      [ Str "and" , Space , Str "using" , Space , Str "spaces:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "One" ] ]
+      , [ Para [ Str "Two" ] ]
+      , [ Para [ Str "Three" ] ]
+      ]
+  , Para [ Str "Multiple" , Space , Str "paragraphs:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para
+            [ Str "Item"
+            , Space
+            , Str "1,"
+            , Space
+            , Str "graf"
+            , Space
+            , Str "one."
+            ]
+        , Para
+            [ Str "Item"
+            , Space
+            , Str "1."
+            , Space
+            , Str "graf"
+            , Space
+            , Str "two."
+            , Space
+            , Str "The"
+            , Space
+            , Str "quick"
+            , Space
+            , Str "brown"
+            , Space
+            , Str "fox"
+            , Space
+            , Str "jumped"
+            , Space
+            , Str "over"
+            , Space
+            , Str "the"
+            , Space
+            , Str "lazy"
+            , Space
+            , Str "dog\8217s"
+            , SoftBreak
+            , Str "back."
+            ]
+        ]
+      , [ Para [ Str "Item" , Space , Str "2." ] ]
+      , [ Para [ Str "Item" , Space , Str "3." ] ]
+      ]
+  , Header 2 ( "nested" , [] , [] ) [ Str "Nested" ]
+  , BulletList
+      [ [ Para [ Str "Tab" ]
+        , BulletList
+            [ [ Para [ Str "Tab" ]
+              , BulletList [ [ Para [ Str "Tab" ] ] ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Here\8217s" , Space , Str "another:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second:" ]
+        , BulletList
+            [ [ Para [ Str "Fee" ] ]
+            , [ Para [ Str "Fie" ] ]
+            , [ Para [ Str "Foe" ] ]
+            ]
+        ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para
+      [ Str "Same"
+      , Space
+      , Str "thing"
+      , Space
+      , Str "but"
+      , Space
+      , Str "with"
+      , Space
+      , Str "paragraphs:"
+      ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second:" ]
+        , BulletList
+            [ [ Para [ Str "Fee" ] ]
+            , [ Para [ Str "Fie" ] ]
+            , [ Para [ Str "Foe" ] ]
+            ]
+        ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Header
+      2
+      ( "tabs-and-spaces" , [] , [] )
+      [ Str "Tabs" , Space , Str "and" , Space , Str "spaces" ]
+  , BulletList
+      [ [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "tabs"
+            ]
+        ]
+      , [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "spaces"
+            ]
+        , BulletList
+            [ [ Para
+                  [ Str "this"
+                  , Space
+                  , Str "is"
+                  , Space
+                  , Str "an"
+                  , Space
+                  , Str "example"
+                  , Space
+                  , Str "list"
+                  , Space
+                  , Str "item"
+                  , Space
+                  , Str "indented"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "tabs"
+                  ]
+              ]
+            , [ Para
+                  [ Str "this"
+                  , Space
+                  , Str "is"
+                  , Space
+                  , Str "an"
+                  , Space
+                  , Str "example"
+                  , Space
+                  , Str "list"
+                  , Space
+                  , Str "item"
+                  , Space
+                  , Str "indented"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "spaces"
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Header
+      2
+      ( "fancy-list-markers" , [] , [] )
+      [ Str "Fancy" , Space , Str "list" , Space , Str "markers" ]
+  , OrderedList
+      ( 2 , Decimal , TwoParens )
+      [ [ Para
+            [ Str "begins" , Space , Str "with" , Space , Str "2" ]
+        ]
+      , [ Para [ Str "and" , Space , Str "now" , Space , Str "3" ]
+        , Para
+            [ Str "with"
+            , Space
+            , Str "a"
+            , Space
+            , Str "continuation"
+            ]
+        , OrderedList
+            ( 4 , LowerRoman , Period )
+            [ [ Para
+                  [ Str "sublist"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "roman"
+                  , Space
+                  , Str "numerals,"
+                  , Space
+                  , Str "starting"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "4"
+                  ]
+              ]
+            , [ Para [ Str "more" , Space , Str "items" ]
+              , OrderedList
+                  ( 1 , UpperAlpha , TwoParens )
+                  [ [ Para [ Str "a" , Space , Str "subsublist" ] ]
+                  , [ Para [ Str "a" , Space , Str "subsublist" ] ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Nesting:" ]
+  , OrderedList
+      ( 1 , UpperAlpha , Period )
+      [ [ Para [ Str "Upper" , Space , Str "Alpha" ]
+        , OrderedList
+            ( 1 , UpperRoman , Period )
+            [ [ Para [ Str "Upper" , Space , Str "Roman." ]
+              , OrderedList
+                  ( 6 , Decimal , TwoParens )
+                  [ [ Para
+                        [ Str "Decimal"
+                        , Space
+                        , Str "start"
+                        , Space
+                        , Str "with"
+                        , Space
+                        , Str "6"
+                        ]
+                    , OrderedList
+                        ( 3 , LowerAlpha , OneParen )
+                        [ [ Para
+                              [ Str "Lower"
+                              , Space
+                              , Str "alpha"
+                              , Space
+                              , Str "with"
+                              , Space
+                              , Str "paren"
+                              ]
+                          ]
+                        ]
+                    ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Autonumbering:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "Autonumber." ] ]
+      , [ Para [ Str "More." ]
+        , OrderedList
+            ( 1 , DefaultStyle , DefaultDelim )
+            [ [ Para [ Str "Nested." ] ] ]
+        ]
+      ]
+  , Para
+      [ Str "Should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item:"
+      ]
+  , Para [ Str "M.A." , Space , Str "2007" ]
+  , Para [ Str "B." , Space , Str "Williams" ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header
+      1
+      ( "definition-lists" , [] , [] )
+      [ Str "Definition" , Space , Str "Lists" ]
+  , Para
+      [ Str "Tight"
+      , Space
+      , Str "using"
+      , Space
+      , Str "spaces:"
+      ]
+  , DefinitionList
+      [ ( [ Str "apple" ]
+        , [ [ Para [ Str "red" , Space , Str "fruit" ] ] ]
+        )
+      , ( [ Str "orange" ]
+        , [ [ Para [ Str "orange" , Space , Str "fruit" ] ] ]
+        )
+      , ( [ Str "banana" ]
+        , [ [ Para [ Str "yellow" , Space , Str "fruit" ] ] ]
+        )
+      ]
+  , Para
+      [ Str "Tight" , Space , Str "using" , Space , Str "tabs:" ]
+  , DefinitionList
+      [ ( [ Str "apple" ]
+        , [ [ Para [ Str "red" , Space , Str "fruit" ] ] ]
+        )
+      , ( [ Str "orange" ]
+        , [ [ Para [ Str "orange" , Space , Str "fruit" ] ] ]
+        )
+      , ( [ Str "banana" ]
+        , [ [ Para [ Str "yellow" , Space , Str "fruit" ] ] ]
+        )
+      ]
+  , Para [ Str "Loose:" ]
+  , DefinitionList
+      [ ( [ Str "apple" ]
+        , [ [ Para [ Str "red" , Space , Str "fruit" ] ] ]
+        )
+      , ( [ Str "orange" ]
+        , [ [ Para [ Str "orange" , Space , Str "fruit" ] ] ]
+        )
+      , ( [ Str "banana" ]
+        , [ [ Para [ Str "yellow" , Space , Str "fruit" ] ] ]
+        )
+      ]
+  , Para
+      [ Str "Multiple"
+      , Space
+      , Str "blocks"
+      , Space
+      , Str "with"
+      , Space
+      , Str "italics:"
+      ]
+  , DefinitionList
+      [ ( [ Emph [ Str "apple" ] ]
+        , [ [ Para [ Str "red" , Space , Str "fruit" ]
+            , Para
+                [ Str "contains"
+                , Space
+                , Str "seeds,"
+                , Space
+                , Str "crisp,"
+                , Space
+                , Str "pleasant"
+                , Space
+                , Str "to"
+                , Space
+                , Str "taste"
+                ]
+            ]
+          ]
+        )
+      , ( [ Emph [ Str "orange" ] ]
+        , [ [ Para [ Str "orange" , Space , Str "fruit" ]
+            , CodeBlock ( "" , [] , [] ) "{ orange code block }"
+            , BlockQuote
+                [ Para
+                    [ Str "orange"
+                    , Space
+                    , Str "block"
+                    , Space
+                    , Str "quote"
+                    ]
+                ]
+            ]
+          ]
+        )
+      ]
+  , Header
+      1
+      ( "html-blocks" , [] , [] )
+      [ Str "HTML" , Space , Str "Blocks" ]
+  , Para
+      [ Str "Simple"
+      , Space
+      , Str "block"
+      , Space
+      , Str "on"
+      , Space
+      , Str "one"
+      , Space
+      , Str "line:"
+      ]
+  , Para
+      [ Str "foo"
+      , SoftBreak
+      , Str "And"
+      , Space
+      , Str "nested"
+      , Space
+      , Str "without"
+      , Space
+      , Str "indentation:"
+      ]
+  , Para
+      [ Str "foo"
+      , SoftBreak
+      , Str "bar"
+      , SoftBreak
+      , Str "Interpreted"
+      , Space
+      , Str "markdown"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "table:"
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Emph [ Str "emphasized" ]
+      , SoftBreak
+      , Str "And"
+      , Space
+      , Str "this"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Str "strong" ]
+      , SoftBreak
+      , Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "simple"
+      , Space
+      , Str "block:"
+      ]
+  , Para
+      [ Str "foo"
+      , SoftBreak
+      , 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:" ]
+  , Para
+      [ Str "foo"
+      , SoftBreak
+      , 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\8217s:" ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header
+      1
+      ( "inline-markup" , [] , [] )
+      [ 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 "."
+      ]
+  , Para
+      [ Str "An"
+      , Space
+      , Emph
+          [ Link
+              ( "" , [] , [] )
+              [ Str "emphasized" , Space , Str "link" ]
+              ( "/url" , "" )
+          ]
+      , Str "."
+      ]
+  , Para
+      [ Strong
+          [ Emph
+              [ Str "This"
+              , Space
+              , Str "is"
+              , Space
+              , Str "strong"
+              , Space
+              , Str "and"
+              , Space
+              , Str "em."
+              ]
+          ]
+      ]
+  , Para
+      [ Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Emph [ Str "this" ] ]
+      , Space
+      , Str "word."
+      ]
+  , Para
+      [ Strong
+          [ Emph
+              [ Str "This"
+              , Space
+              , Str "is"
+              , Space
+              , Str "strong"
+              , Space
+              , Str "and"
+              , Space
+              , Str "em."
+              ]
+          ]
+      ]
+  , Para
+      [ Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Emph [ Str "this" ] ]
+      , Space
+      , Str "word."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "code:"
+      , Space
+      , Code ( "" , [] , [] ) ">"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "$"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "\\"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "\\$"
+      , Str ","
+      , SoftBreak
+      , Code ( "" , [] , [] ) ""
+      , Str "."
+      ]
+  , Para
+      [ Strikeout
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Emph [ Str "strikeout" ]
+          , Str "."
+          ]
+      ]
+  , Para
+      [ Str "Superscripts:"
+      , Space
+      , Str "a"
+      , Superscript [ Str "bc" ]
+      , Str "d"
+      , SoftBreak
+      , Str "a"
+      , Superscript [ Emph [ Str "hello" ] ]
+      , Space
+      , Str "a"
+      , Superscript [ Str "hello" , Space , Str "there" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "Subscripts:"
+      , Space
+      , Str "H"
+      , Subscript [ Str "2" ]
+      , Str "O,"
+      , Space
+      , Str "H"
+      , Subscript [ Str "23" ]
+      , Str "O,"
+      , SoftBreak
+      , Str "H"
+      , Subscript
+          [ Str "many" , Space , Str "of" , Space , Str "them" ]
+      , Str "O."
+      ]
+  , Para
+      [ Str "These"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "be"
+      , Space
+      , Str "superscripts"
+      , Space
+      , Str "or"
+      , Space
+      , Str "subscripts,"
+      , Space
+      , Str "because"
+      , Space
+      , Str "of"
+      , Space
+      , Str "the"
+      , SoftBreak
+      , Str "unescaped"
+      , Space
+      , Str "spaces:"
+      , Space
+      , Str "a^b"
+      , Space
+      , Str "c^d,"
+      , Space
+      , Str "a"
+      , Math InlineMath "\\sim"
+      , Str "b"
+      , SoftBreak
+      , Str "c"
+      , Math InlineMath "\\sim"
+      , Str "d."
+      ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header
+      1
+      ( "smart-quotes-ellipses-dashes" , [] , [] )
+      [ Str "Smart"
+      , Space
+      , Str "quotes,"
+      , Space
+      , Str "ellipses,"
+      , Space
+      , Str "dashes"
+      ]
+  , Para
+      [ Quoted DoubleQuote [ Str "Hello," ]
+      , Space
+      , Str "said"
+      , Space
+      , Str "the"
+      , Space
+      , Str "spider."
+      , Space
+      , Quoted
+          DoubleQuote
+          [ Str "\8198"
+          , Quoted SingleQuote [ Str "Shelob" ]
+          , Space
+          , Str "is"
+          , Space
+          , Str "my"
+          , Space
+          , Str "name."
+          ]
+      ]
+  , Para
+      [ Quoted SingleQuote [ Str "A" ]
+      , Str ","
+      , Space
+      , Quoted SingleQuote [ Str "B" ]
+      , Str ","
+      , Space
+      , Str "and"
+      , Space
+      , Quoted SingleQuote [ Str "C" ]
+      , Space
+      , Str "are"
+      , Space
+      , Str "letters."
+      ]
+  , Para
+      [ Quoted SingleQuote [ Str "Oak," ]
+      , Space
+      , Quoted SingleQuote [ Str "elm," ]
+      , Space
+      , Str "and"
+      , Space
+      , Quoted SingleQuote [ Str "beech" ]
+      , Space
+      , Str "are"
+      , Space
+      , Str "names"
+      , Space
+      , Str "of"
+      , Space
+      , Str "trees."
+      , Space
+      , Str "So"
+      , Space
+      , Str "is"
+      , Space
+      , Quoted SingleQuote [ Str "pine." ]
+      ]
+  , Para
+      [ Quoted
+          SingleQuote
+          [ Str "He"
+          , Space
+          , Str "said,"
+          , Space
+          , Quoted
+              DoubleQuote
+              [ Str "I"
+              , Space
+              , Str "want"
+              , Space
+              , Str "to"
+              , Space
+              , Str "go."
+              ]
+          , Str "\8198"
+          ]
+      , Space
+      , Str "Were"
+      , Space
+      , Str "you"
+      , Space
+      , Str "alive"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "70\8217s?"
+      ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "some"
+      , Space
+      , Str "quoted"
+      , Space
+      , Quoted SingleQuote [ Code ( "" , [] , [] ) "code" ]
+      , Space
+      , Str "and"
+      , Space
+      , Str "a"
+      , SoftBreak
+      , Quoted
+          DoubleQuote
+          [ Link
+              ( "" , [] , [] )
+              [ Str "quoted" , Space , Str "link" ]
+              ( "http://example.com/?foo=1&bar=2" , "" )
+          ]
+      , Str "."
+      ]
+  , Para
+      [ Str "Some"
+      , Space
+      , Str "dashes:"
+      , Space
+      , Str "one\8212two\8212three\8212four\8212five."
+      ]
+  , Para
+      [ Str "Dashes"
+      , Space
+      , Str "between"
+      , Space
+      , Str "numbers:"
+      , Space
+      , Str "5\8211\&7,"
+      , Space
+      , Str "255\8211\&66,"
+      , Space
+      , Str "1987\8211\&1999."
+      ]
+  , Para [ Str "Ellipses\8230and\8230and\8230." ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header 1 ( "latex" , [] , [] ) [ Str "LaTeX" ]
+  , BulletList
+      [ [ Para
+            [ Cite
+                [ Citation
+                    { citationId = "smith.1899"
+                    , citationPrefix = []
+                    , citationSuffix = [ Str "22-23" ]
+                    , citationMode = NormalCitation
+                    , citationNoteNum = 0
+                    , citationHash = 0
+                    }
+                ]
+                [ RawInline (Format "latex") "\\cite[22-23]{smith.1899}"
+                ]
+            ]
+        ]
+      , [ RawBlock (Format "latex") "\\doublespacing" ]
+      , [ Para [ Math InlineMath "2+2=4" ] ]
+      , [ Para [ Math InlineMath "x \\in y" ] ]
+      , [ Para [ Math InlineMath "\\alpha \\wedge \\omega" ] ]
+      , [ Para [ Math InlineMath "223" ] ]
+      , [ Para [ Math InlineMath "p" , Str "-Tree" ] ]
+      , [ Para
+            [ Math
+                InlineMath
+                "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"
+            ]
+        ]
+      , [ Para
+            [ Str "Here\8217s"
+            , Space
+            , Str "one"
+            , Space
+            , Str "that"
+            , Space
+            , Str "has"
+            , Space
+            , Str "a"
+            , Space
+            , Str "line"
+            , Space
+            , Str "break"
+            , Space
+            , Str "in"
+            , Space
+            , Str "it:"
+            , SoftBreak
+            , Math InlineMath "\\alpha + \\omega \\times x^2"
+            , Str "."
+            ]
+        ]
+      ]
+  , Para
+      [ Str "These"
+      , Space
+      , Str "shouldn\8217t"
+      , Space
+      , Str "be"
+      , Space
+      , Str "math:"
+      ]
+  , BulletList
+      [ [ Para
+            [ Str "To"
+            , Space
+            , Str "get"
+            , Space
+            , Str "the"
+            , Space
+            , Str "famous"
+            , Space
+            , Str "equation,"
+            , Space
+            , Str "write"
+            , Space
+            , Code ( "" , [] , [] ) "$e = mc^2$"
+            , Str "."
+            ]
+        ]
+      , [ Para
+            [ Str "$22,000"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Emph [ Str "lot" ]
+            , Space
+            , Str "of"
+            , Space
+            , Str "money."
+            , Space
+            , Str "So"
+            , Space
+            , Str "is"
+            , Space
+            , Str "$34,000."
+            , Space
+            , Str "(It"
+            , Space
+            , Str "worked"
+            , Space
+            , Str "if"
+            , SoftBreak
+            , Quoted DoubleQuote [ Str "lot" ]
+            , Space
+            , Str "is"
+            , Space
+            , Str "emphasized.)"
+            ]
+        ]
+      , [ Para
+            [ Str "Escaped"
+            , Space
+            , Code ( "" , [] , [] ) "$"
+            , Str ":"
+            , Space
+            , Str "$73"
+            , Space
+            , Emph
+                [ Str "this"
+                , Space
+                , Str "should"
+                , Space
+                , Str "be"
+                , Space
+                , Str "emphasized"
+                ]
+            , Space
+            , Str "23$."
+            ]
+        ]
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "LaTeX"
+      , Space
+      , Str "table:"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignLeft , ColWidthDefault )
+      , ( AlignLeft , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Animal" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Number" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Dog" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "2" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Cat" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "A"
+      , Space
+      , Str "table"
+      , Space
+      , Str "with"
+      , Space
+      , Str "one"
+      , Space
+      , Str "column:"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignCenter , ColWidthDefault ) ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Animal" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Vegetable" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header
+      1
+      ( "special-characters" , [] , [] )
+      [ Str "Special" , Space , Str "Characters" ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "some"
+      , Space
+      , Str "unicode:"
+      ]
+  , BulletList
+      [ [ Para
+            [ Str "I" , Space , Str "hat:" , Space , Str "\206" ]
+        ]
+      , [ Para
+            [ Str "o" , Space , Str "umlaut:" , Space , Str "\246" ]
+        ]
+      , [ Para [ Str "section:" , Space , Str "\167" ] ]
+      , [ Para
+            [ Str "set"
+            , Space
+            , Str "membership:"
+            , Space
+            , Str "\8712"
+            ]
+        ]
+      , [ Para [ Str "copyright:" , Space , Str "\169" ] ]
+      ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "has"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "their"
+      , Space
+      , Str "name."
+      ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "is"
+      , Space
+      , Str "another"
+      , Space
+      , Str "way"
+      , Space
+      , Str "to"
+      , Space
+      , Str "write"
+      , Space
+      , Str "it."
+      ]
+  , Para
+      [ Str "This" , Space , Str "&" , Space , Str "that." ]
+  , Para [ Str "4" , Space , Str "<" , Space , Str "5." ]
+  , Para [ Str "6" , Space , Str ">" , Space , Str "5." ]
+  , Para [ Str "Backslash:" , Space , Str "\\" ]
+  , Para [ Str "Backtick:" , Space , Str "\8216" ]
+  , Para [ Str "Asterisk:" , Space , Str "*" ]
+  , Para [ Str "Underscore:" , Space , Str "_" ]
+  , Para
+      [ Str "Left" , Space , Str "brace:" , Space , Str "{" ]
+  , Para
+      [ Str "Right" , Space , Str "brace:" , Space , Str "}" ]
+  , Para
+      [ Str "Left" , Space , Str "bracket:" , Space , Str "[" ]
+  , Para
+      [ Str "Right" , Space , Str "bracket:" , Space , Str "]" ]
+  , Para
+      [ Str "Left" , Space , Str "paren:" , Space , Str "(" ]
+  , Para
+      [ Str "Right" , Space , Str "paren:" , Space , Str ")" ]
+  , Para [ Str "Greater-than:" , Space , Str ">" ]
+  , Para [ Str "Hash:" , Space , Str "#" ]
+  , Para [ Str "Period:" , Space , Str "." ]
+  , Para [ Str "Bang:" , Space , Str "!" ]
+  , Para [ Str "Plus:" , Space , Str "+" ]
+  , Para [ Str "Minus:" , Space , Str "-" ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header 1 ( "links" , [] , [] ) [ Str "Links" ]
+  , Header 2 ( "explicit" , [] , [] ) [ Str "Explicit" ]
+  , Para
+      [ Str "Just"
+      , Space
+      , Str "a"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "URL" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , Space , Str "and" , Space , Str "title" ]
+          ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , Space , Str "and" , Space , Str "title" ]
+          ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , Space , Str "and" , Space , Str "title" ]
+          ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , Space , Str "and" , Space , Str "title" ]
+          ( "/url/" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "URL" , Space , Str "and" , Space , Str "title" ]
+          ( "/url/" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "with_underscore" ]
+          ( "/url/with_underscore" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "Email" , Space , Str "link" ]
+          ( "mailto:nobody@nowhere.net" , "" )
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "Empty" ] ( "" , "" )
+      , Str "."
+      ]
+  , Header 2 ( "reference" , [] , [] ) [ Str "Reference" ]
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "With"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "embedded" , Space , Str "[brackets]" ]
+          ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "b" ] ( "/url/" , "" )
+      , Space
+      , Str "by"
+      , Space
+      , Str "itself"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link."
+      ]
+  , Para
+      [ Str "Indented"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "once" ] ( "/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Indented"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "twice" ] ( "/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Indented"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "thrice" ] ( "/url" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Str "[not][]"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link."
+      ]
+  , CodeBlock ( "" , [] , [] ) "[not]: /url"
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Foo"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "biz" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Header
+      2
+      ( "with-ampersands" , [] , [] )
+      [ Str "With" , Space , Str "ampersands" ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "link"
+          , Space
+          , Str "with"
+          , Space
+          , Str "an"
+          , Space
+          , Str "ampersand"
+          , Space
+          , Str "in"
+          , Space
+          , Str "the"
+          , Space
+          , Str "URL"
+          ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Str "amersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "link"
+      , Space
+      , Str "text:"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] ) [ Str "AT&T" ] ( "http://att.com/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "an"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "inline" , Space , Str "link" ]
+          ( "/script?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "an"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "inline"
+          , Space
+          , Str "link"
+          , Space
+          , Str "in"
+          , Space
+          , Str "pointy"
+          , Space
+          , Str "braces"
+          ]
+          ( "/script?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Header 2 ( "autolinks" , [] , [] ) [ Str "Autolinks" ]
+  , Para
+      [ Str "With"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand:"
+      , Space
+      , Link
+          ( "" , [ "uri" ] , [] )
+          [ Str "http://example.com/?foo=1&bar=2" ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      ]
+  , BulletList
+      [ [ Para
+            [ Str "In" , Space , Str "a" , Space , Str "list?" ]
+        ]
+      , [ Para
+            [ Link
+                ( "" , [ "uri" ] , [] )
+                [ Str "http://example.com/" ]
+                ( "http://example.com/" , "" )
+            ]
+        ]
+      , [ Para [ Str "It" , Space , Str "should." ] ]
+      ]
+  , Para
+      [ Str "An"
+      , Space
+      , Str "e-mail"
+      , Space
+      , Str "address:"
+      , SoftBreak
+      , Link
+          ( "" , [] , [] )
+          [ Str "nobody@nowhere.net" ]
+          ( "mailto:nobody@nowhere.net" , "" )
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "Blockquoted:"
+          , Space
+          , Link
+              ( "" , [ "uri" ] , [] )
+              [ Str "http://example.com/" ]
+              ( "http://example.com/" , "" )
+          ]
+      ]
+  , Para
+      [ Str "Auto-links"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "occur"
+      , Space
+      , Str "here:"
+      , Space
+      , Code ( "" , [] , [] ) ""
+      ]
+  , CodeBlock
+      ( "" , [] , [] ) "or here: "
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header 1 ( "images" , [] , [] ) [ 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):"
+      ]
+  , Para
+      [ Image
+          ( "" , [] , [] ) [ Str "image" ] ( "lalune.jpg" , "" )
+      ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "movie"
+      , Space
+      , Image
+          ( "" , [] , [] ) [ Str "image" ] ( "movie.jpg" , "" )
+      , Space
+      , Str "icon."
+      ]
+  , Div ( "" , [ "center" ] , [] ) [ HorizontalRule ]
+  , Header 1 ( "footnotes" , [] , [] ) [ Str "Footnotes" ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "footnote"
+      , SoftBreak
+      , Str "reference,"
+      , Note
+          [ Para
+              [ Str "Here"
+              , Space
+              , Str "is"
+              , Space
+              , Str "the"
+              , Space
+              , Str "footnote."
+              , Space
+              , Str "It"
+              , Space
+              , Str "can"
+              , Space
+              , Str "go"
+              , Space
+              , Str "anywhere"
+              , Space
+              , Str "after"
+              , Space
+              , Str "the"
+              , Space
+              , Str "footnote"
+              , SoftBreak
+              , Str "reference."
+              , Space
+              , Str "It"
+              , Space
+              , Str "need"
+              , Space
+              , Str "not"
+              , Space
+              , Str "be"
+              , Space
+              , Str "placed"
+              , Space
+              , Str "at"
+              , Space
+              , Str "the"
+              , Space
+              , Str "end"
+              , Space
+              , Str "of"
+              , Space
+              , Str "the"
+              , Space
+              , Str "document."
+              ]
+          ]
+      , SoftBreak
+      , Str "and"
+      , SoftBreak
+      , Str "another."
+      , Note
+          [ Para
+              [ Str "Here\8217s"
+              , Space
+              , Str "the"
+              , Space
+              , Str "long"
+              , Space
+              , Str "note."
+              , Space
+              , Str "This"
+              , Space
+              , Str "one"
+              , Space
+              , Str "contains"
+              , Space
+              , Str "multiple"
+              , Space
+              , Str "blocks."
+              ]
+          , Para
+              [ Str "Subsequent"
+              , Space
+              , Str "blocks"
+              , Space
+              , Str "are"
+              , Space
+              , Str "indented"
+              , Space
+              , Str "to"
+              , Space
+              , Str "show"
+              , Space
+              , Str "that"
+              , Space
+              , Str "they"
+              , Space
+              , Str "belong"
+              , Space
+              , Str "to"
+              , Space
+              , Str "the"
+              , SoftBreak
+              , Str "footnote"
+              , Space
+              , Str "(as"
+              , Space
+              , Str "with"
+              , Space
+              , Str "list"
+              , Space
+              , Str "items)."
+              ]
+          , CodeBlock ( "" , [] , [] ) "  {  }"
+          , Para
+              [ Str "If"
+              , Space
+              , Str "you"
+              , Space
+              , Str "want,"
+              , Space
+              , Str "you"
+              , Space
+              , Str "can"
+              , Space
+              , Str "indent"
+              , Space
+              , Str "every"
+              , Space
+              , Str "line,"
+              , Space
+              , Str "but"
+              , Space
+              , Str "you"
+              , Space
+              , Str "can"
+              , Space
+              , Str "also"
+              , Space
+              , Str "be"
+              , Space
+              , Str "lazy"
+              , SoftBreak
+              , Str "and"
+              , Space
+              , Str "just"
+              , Space
+              , Str "indent"
+              , Space
+              , Str "the"
+              , Space
+              , Str "first"
+              , Space
+              , Str "line"
+              , Space
+              , Str "of"
+              , Space
+              , Str "each"
+              , Space
+              , Str "block."
+              ]
+          ]
+      , SoftBreak
+      , Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Emph [ Str "not" ]
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "footnote"
+      , Space
+      , Str "reference,"
+      , Space
+      , Str "because"
+      , Space
+      , Str "it"
+      , Space
+      , Str "contains"
+      , SoftBreak
+      , Str "a"
+      , Space
+      , Str "space.[^my"
+      , Space
+      , Str "note]"
+      , Space
+      , Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "an"
+      , Space
+      , Str "inline"
+      , SoftBreak
+      , Str "note."
+      , Note
+          [ Para
+              [ Str "This"
+              , Space
+              , Str "is"
+              , Space
+              , Emph [ Str "easier" ]
+              , Space
+              , Str "to"
+              , Space
+              , Str "type."
+              , Space
+              , Str "Inline"
+              , Space
+              , Str "notes"
+              , Space
+              , Str "may"
+              , Space
+              , Str "contain"
+              , SoftBreak
+              , Link
+                  ( "" , [] , [] )
+                  [ Str "links" ]
+                  ( "http://google.com" , "" )
+              , Space
+              , Str "and"
+              , Space
+              , Code ( "" , [] , [] ) "]"
+              , Space
+              , Str "verbatim"
+              , Space
+              , Str "characters,"
+              , SoftBreak
+              , Str "as"
+              , Space
+              , Str "well"
+              , Space
+              , Str "as"
+              , Space
+              , Str "[bracketed"
+              , Space
+              , Str "text]."
+              ]
+          ]
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "Notes"
+          , Space
+          , Str "can"
+          , Space
+          , Str "go"
+          , Space
+          , Str "in"
+          , Space
+          , Str "quotes."
+          , Note [ Para [ Str "In" , Space , Str "quote." ] ]
+          ]
+      ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para
+            [ Str "And"
+            , Space
+            , Str "in"
+            , Space
+            , Str "list"
+            , Space
+            , Str "items."
+            , Note [ Para [ Str "In" , Space , Str "list." ] ]
+            ]
+        ]
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "paragraph"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "be"
+      , Space
+      , Str "part"
+      , Space
+      , Str "of"
+      , Space
+      , Str "the"
+      , Space
+      , Str "note,"
+      , Space
+      , Str "as"
+      , Space
+      , Str "it"
+      , Space
+      , Str "is"
+      , Space
+      , Str "not"
+      , SoftBreak
+      , Str "indented."
+      ]
+  , Header
+      1
+      ( "escaped-characters" , [] , [] )
+      [ Str "Escaped" , Space , Str "characters" ]
+  , Para
+      [ Str "$"
+      , Space
+      , Str "%"
+      , Space
+      , Str "&"
+      , Space
+      , Str "#"
+      , Space
+      , Str "_"
+      , Space
+      , Str "{"
+      , Space
+      , Str "}"
+      ]
+  ]
diff --git a/test/lhs-test-markdown.native b/test/lhs-test-markdown.native
--- a/test/lhs-test-markdown.native
+++ b/test/lhs-test-markdown.native
@@ -1,8 +1,124 @@
-[Header 1 ("lhs-test",[],[]) [Str "lhs",Space,Str "test"]
-,Para [Code ("",[],[]) "unsplit",Space,Str "is",Space,Str "an",Space,Str "arrow",Space,Str "that",Space,Str "takes",Space,Str "a",Space,Str "pair",Space,Str "of",Space,Str "values",Space,Str "and",Space,Str "combines",Space,Str "them",Space,Str "to",SoftBreak,Str "return",Space,Str "a",Space,Str "single",Space,Str "value:"]
-,CodeBlock ("",["sourceCode","literate","haskell"],[]) "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n          -- arr (\\op (x,y) -> x `op` y)"
-,Para [Code ("",[],[]) "(***)",Space,Str "combines",Space,Str "two",Space,Str "arrows",Space,Str "into",Space,Str "a",Space,Str "new",Space,Str "arrow",Space,Str "by",Space,Str "running",Space,Str "the",Space,Str "two",Space,Str "arrows",Space,Str "on",Space,Str "a",SoftBreak,Str "pair",Space,Str "of",Space,Str "values",Space,Str "(one",Space,Str "arrow",Space,Str "on",Space,Str "the",Space,Str "first",Space,Str "item",Space,Str "of",Space,Str "the",Space,Str "pair",Space,Str "and",Space,Str "one",Space,Str "arrow",Space,Str "on",Space,Str "the",SoftBreak,Str "second",Space,Str "item",Space,Str "of",Space,Str "the",Space,Str "pair)."]
-,CodeBlock ("",[],[]) "f *** g = first f >>> second g"
-,Para [Str "Block",Space,Str "quote:"]
-,BlockQuote
- [Para [Str "foo",Space,Str "bar"]]]
+[ Header
+    1
+    ( "lhs-test" , [] , [] )
+    [ Str "lhs" , Space , Str "test" ]
+, Para
+    [ Code ( "" , [] , [] ) "unsplit"
+    , Space
+    , Str "is"
+    , Space
+    , Str "an"
+    , Space
+    , Str "arrow"
+    , Space
+    , Str "that"
+    , Space
+    , Str "takes"
+    , Space
+    , Str "a"
+    , Space
+    , Str "pair"
+    , Space
+    , Str "of"
+    , Space
+    , Str "values"
+    , Space
+    , Str "and"
+    , Space
+    , Str "combines"
+    , Space
+    , Str "them"
+    , Space
+    , Str "to"
+    , SoftBreak
+    , Str "return"
+    , Space
+    , Str "a"
+    , Space
+    , Str "single"
+    , Space
+    , Str "value:"
+    ]
+, CodeBlock
+    ( "" , [ "haskell" , "literate" ] , [] )
+    "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n          -- arr (\\op (x,y) -> x `op` y)"
+, Para
+    [ Code ( "" , [] , [] ) "(***)"
+    , Space
+    , Str "combines"
+    , Space
+    , Str "two"
+    , Space
+    , Str "arrows"
+    , Space
+    , Str "into"
+    , Space
+    , Str "a"
+    , Space
+    , Str "new"
+    , Space
+    , Str "arrow"
+    , Space
+    , Str "by"
+    , Space
+    , Str "running"
+    , Space
+    , Str "the"
+    , Space
+    , Str "two"
+    , Space
+    , Str "arrows"
+    , Space
+    , Str "on"
+    , Space
+    , Str "a"
+    , SoftBreak
+    , Str "pair"
+    , Space
+    , Str "of"
+    , Space
+    , Str "values"
+    , Space
+    , Str "(one"
+    , Space
+    , Str "arrow"
+    , Space
+    , Str "on"
+    , Space
+    , Str "the"
+    , Space
+    , Str "first"
+    , Space
+    , Str "item"
+    , Space
+    , Str "of"
+    , Space
+    , Str "the"
+    , Space
+    , Str "pair"
+    , Space
+    , Str "and"
+    , Space
+    , Str "one"
+    , Space
+    , Str "arrow"
+    , Space
+    , Str "on"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "second"
+    , Space
+    , Str "item"
+    , Space
+    , Str "of"
+    , Space
+    , Str "the"
+    , Space
+    , Str "pair)."
+    ]
+, CodeBlock
+    ( "" , [] , [] ) "f *** g = first f >>> second g"
+, Para [ Str "Block" , Space , Str "quote:" ]
+, BlockQuote [ Para [ Str "foo" , Space , Str "bar" ] ]
+]
diff --git a/test/lhs-test.html b/test/lhs-test.html
--- a/test/lhs-test.html
+++ b/test/lhs-test.html
@@ -1,92 +1,9 @@
-
-
-
-  
-  
-  
-  lhs-test
-  
-  
-  
-
-
 
    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)
    
 
    (***) 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).
    
@@ -95,5 +12,3 @@
 
    
 
    foo bar
    
 
    
-
-
diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
--- a/test/lhs-test.html+lhs
+++ b/test/lhs-test.html+lhs
@@ -1,92 +1,9 @@
-
-
-
-  
-  
-  
-  lhs-test
-  
-  
-  
-
-
 
    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)
    
 
    (***) 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).
    
@@ -95,5 +12,3 @@
 
    
 
    foo bar
    
 
    
-
-
diff --git a/test/lhs-test.latex b/test/lhs-test.latex
--- a/test/lhs-test.latex
+++ b/test/lhs-test.latex
@@ -1,110 +1,13 @@
-\PassOptionsToPackage{unicode=true}{hyperref} % options for packages loaded elsewhere
-\PassOptionsToPackage{hyphens}{url}
-%
-\documentclass[]{article}
-\usepackage{lmodern}
-\usepackage{amssymb,amsmath}
-\usepackage{ifxetex,ifluatex}
-\usepackage{fixltx2e} % provides \textsubscript
-\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
-  \usepackage[T1]{fontenc}
-  \usepackage[utf8]{inputenc}
-  \usepackage{textcomp} % provides euro and other symbols
-\else % if luatex or xelatex
-  \usepackage{unicode-math}
-  \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
-\fi
-% use upquote if available, for straight quotes in verbatim environments
-\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
-% use microtype if available
-\IfFileExists{microtype.sty}{%
-\usepackage[]{microtype}
-\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
-}{}
-\IfFileExists{parskip.sty}{%
-\usepackage{parskip}
-}{% else
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{6pt plus 2pt minus 1pt}
-}
-\usepackage{hyperref}
-\hypersetup{
-            pdfborder={0 0 0},
-            breaklinks=true}
-\urlstyle{same}  % don't use monospace font for urls
-\usepackage{color}
-\usepackage{fancyvrb}
-\newcommand{\VerbBar}{|}
-\newcommand{\VERB}{\Verb[commandchars=\\\{\}]}
-\DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
-% Add ',fontsize=\small' for more characters per line
-\newenvironment{Shaded}{}{}
-\newcommand{\AlertTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
-\newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
-\newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
-\newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
-\newcommand{\BuiltInTok}[1]{#1}
-\newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
-\newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}}
-\newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
-\newcommand{\ConstantTok}[1]{\textcolor[rgb]{0.53,0.00,0.00}{#1}}
-\newcommand{\ControlFlowTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
-\newcommand{\DataTypeTok}[1]{\textcolor[rgb]{0.56,0.13,0.00}{#1}}
-\newcommand{\DecValTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
-\newcommand{\DocumentationTok}[1]{\textcolor[rgb]{0.73,0.13,0.13}{\textit{#1}}}
-\newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
-\newcommand{\ExtensionTok}[1]{#1}
-\newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
-\newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
-\newcommand{\ImportTok}[1]{#1}
-\newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
-\newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
-\newcommand{\NormalTok}[1]{#1}
-\newcommand{\OperatorTok}[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
-\newcommand{\OtherTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{#1}}
-\newcommand{\PreprocessorTok}[1]{\textcolor[rgb]{0.74,0.48,0.00}{#1}}
-\newcommand{\RegionMarkerTok}[1]{#1}
-\newcommand{\SpecialCharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
-\newcommand{\SpecialStringTok}[1]{\textcolor[rgb]{0.73,0.40,0.53}{#1}}
-\newcommand{\StringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
-\newcommand{\VariableTok}[1]{\textcolor[rgb]{0.10,0.09,0.49}{#1}}
-\newcommand{\VerbatimStringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
-\newcommand{\WarningTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
-\setlength{\emergencystretch}{3em}  % prevent overfull lines
-\providecommand{\tightlist}{%
-  \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
-\setcounter{secnumdepth}{0}
-% Redefines (sub)paragraphs to behave more like sections
-\ifx\paragraph\undefined\else
-\let\oldparagraph\paragraph
-\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}}
-\fi
-\ifx\subparagraph\undefined\else
-\let\oldsubparagraph\subparagraph
-\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}}
-\fi
-
-% set default figure placement to htbp
-\makeatletter
-\def\fps@figure{htbp}
-\makeatother
-
-
-\date{}
-
-\begin{document}
-
-\hypertarget{lhs-test}{%
-\section{lhs test}\label{lhs-test}}
+\section{lhs test}\label{lhs-test}
 
 \texttt{unsplit} is an arrow that takes a pair of values and combines them to
 return a single value:
 
 \begin{Shaded}
 \begin{Highlighting}[]
-\OtherTok{unsplit ::}\NormalTok{ (}\DataTypeTok{Arrow}\NormalTok{ a) }\OtherTok{=>}\NormalTok{ (b }\OtherTok{->}\NormalTok{ c }\OtherTok{->}\NormalTok{ d) }\OtherTok{->}\NormalTok{ a (b, c) d}
-\NormalTok{unsplit }\FunctionTok{=}\NormalTok{ arr }\FunctionTok{.}\NormalTok{ uncurry}
-          \CommentTok{-- arr (\textbackslash{}op (x,y) -> x `op` y)}
+\OtherTok{unsplit ::}\NormalTok{ (}\DataTypeTok{Arrow}\NormalTok{ a) }\OtherTok{=\textgreater{}}\NormalTok{ (b }\OtherTok{{-}\textgreater{}}\NormalTok{ c }\OtherTok{{-}\textgreater{}}\NormalTok{ d) }\OtherTok{{-}\textgreater{}}\NormalTok{ a (b, c) d}
+\NormalTok{unsplit }\OtherTok{=}\NormalTok{ arr }\OperatorTok{.} \FunctionTok{uncurry}
+          \CommentTok{{-}{-} arr (\textbackslash{}op (x,y) {-}\textgreater{} x \textasciigrave{}op\textasciigrave{} y)}
 \end{Highlighting}
 \end{Shaded}
 
@@ -121,5 +24,3 @@
 \begin{quote}
 foo bar
 \end{quote}
-
-\end{document}
diff --git a/test/lhs-test.latex+lhs b/test/lhs-test.latex+lhs
--- a/test/lhs-test.latex+lhs
+++ b/test/lhs-test.latex+lhs
@@ -1,66 +1,4 @@
-\PassOptionsToPackage{unicode=true}{hyperref} % options for packages loaded elsewhere
-\PassOptionsToPackage{hyphens}{url}
-%
-\documentclass[]{article}
-\usepackage{lmodern}
-\usepackage{amssymb,amsmath}
-\usepackage{ifxetex,ifluatex}
-\usepackage{fixltx2e} % provides \textsubscript
-\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
-  \usepackage[T1]{fontenc}
-  \usepackage[utf8]{inputenc}
-  \usepackage{textcomp} % provides euro and other symbols
-\else % if luatex or xelatex
-  \usepackage{unicode-math}
-  \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
-\fi
-% use upquote if available, for straight quotes in verbatim environments
-\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
-% use microtype if available
-\IfFileExists{microtype.sty}{%
-\usepackage[]{microtype}
-\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
-}{}
-\IfFileExists{parskip.sty}{%
-\usepackage{parskip}
-}{% else
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{6pt plus 2pt minus 1pt}
-}
-\usepackage{hyperref}
-\hypersetup{
-            pdfborder={0 0 0},
-            breaklinks=true}
-\urlstyle{same}  % don't use monospace font for urls
-\usepackage{listings}
-\newcommand{\passthrough}[1]{#1}
-\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
-\setlength{\emergencystretch}{3em}  % prevent overfull lines
-\providecommand{\tightlist}{%
-  \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
-\setcounter{secnumdepth}{0}
-% Redefines (sub)paragraphs to behave more like sections
-\ifx\paragraph\undefined\else
-\let\oldparagraph\paragraph
-\renewcommand{\paragraph}[1]{\oldparagraph{#1}\mbox{}}
-\fi
-\ifx\subparagraph\undefined\else
-\let\oldsubparagraph\subparagraph
-\renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}}
-\fi
-
-% set default figure placement to htbp
-\makeatletter
-\def\fps@figure{htbp}
-\makeatother
-
-
-\date{}
-
-\begin{document}
-
-\hypertarget{lhs-test}{%
-\section{lhs test}\label{lhs-test}}
+\section{lhs test}\label{lhs-test}
 
 \texttt{unsplit} is an arrow that takes a pair of values and combines them to
 return a single value:
@@ -84,5 +22,3 @@
 \begin{quote}
 foo bar
 \end{quote}
-
-\end{document}
diff --git a/test/lhs-test.markdown b/test/lhs-test.markdown
--- a/test/lhs-test.markdown
+++ b/test/lhs-test.markdown
@@ -4,7 +4,7 @@
 `unsplit` is an arrow that takes a pair of values and combines them to
 return a single value:
 
-``` {.sourceCode .literate .haskell}
+``` {.haskell .literate}
 unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
 unsplit = arr . uncurry
           -- arr (\op (x,y) -> x `op` y)
diff --git a/test/lhs-test.native b/test/lhs-test.native
--- a/test/lhs-test.native
+++ b/test/lhs-test.native
@@ -1,8 +1,124 @@
-[Header 1 ("lhs-test",[],[]) [Str "lhs",Space,Str "test"]
-,Para [Code ("",[],[]) "unsplit",Space,Str "is",Space,Str "an",Space,Str "arrow",Space,Str "that",Space,Str "takes",Space,Str "a",Space,Str "pair",Space,Str "of",Space,Str "values",Space,Str "and",Space,Str "combines",Space,Str "them",Space,Str "to",SoftBreak,Str "return",Space,Str "a",Space,Str "single",Space,Str "value:"]
-,CodeBlock ("",["sourceCode","literate","haskell"],[]) "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n          -- arr (\\op (x,y) -> x `op` y)"
-,Para [Code ("",[],[]) "(***)",Space,Str "combines",Space,Str "two",Space,Str "arrows",Space,Str "into",Space,Str "a",Space,Str "new",Space,Str "arrow",Space,Str "by",Space,Str "running",Space,Str "the",Space,Str "two",Space,Str "arrows",Space,Str "on",Space,Str "a",SoftBreak,Str "pair",Space,Str "of",Space,Str "values",Space,Str "(one",Space,Str "arrow",Space,Str "on",Space,Str "the",Space,Str "first",Space,Str "item",Space,Str "of",Space,Str "the",Space,Str "pair",Space,Str "and",Space,Str "one",Space,Str "arrow",Space,Str "on",Space,Str "the",SoftBreak,Str "second",Space,Str "item",Space,Str "of",Space,Str "the",Space,Str "pair)."]
-,CodeBlock ("",[],[]) "f *** g = first f >>> second g"
-,Para [Str "Block",Space,Str "quote:"]
-,BlockQuote
- [Para [Str "foo",Space,Str "bar"]]]
+[ Header
+    1
+    ( "lhs-test" , [] , [] )
+    [ Str "lhs" , Space , Str "test" ]
+, Para
+    [ Code ( "" , [] , [] ) "unsplit"
+    , Space
+    , Str "is"
+    , Space
+    , Str "an"
+    , Space
+    , Str "arrow"
+    , Space
+    , Str "that"
+    , Space
+    , Str "takes"
+    , Space
+    , Str "a"
+    , Space
+    , Str "pair"
+    , Space
+    , Str "of"
+    , Space
+    , Str "values"
+    , Space
+    , Str "and"
+    , Space
+    , Str "combines"
+    , Space
+    , Str "them"
+    , Space
+    , Str "to"
+    , SoftBreak
+    , Str "return"
+    , Space
+    , Str "a"
+    , Space
+    , Str "single"
+    , Space
+    , Str "value:"
+    ]
+, CodeBlock
+    ( "" , [ "haskell" , "literate" ] , [] )
+    "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n          -- arr (\\op (x,y) -> x `op` y)"
+, Para
+    [ Code ( "" , [] , [] ) "(***)"
+    , Space
+    , Str "combines"
+    , Space
+    , Str "two"
+    , Space
+    , Str "arrows"
+    , Space
+    , Str "into"
+    , Space
+    , Str "a"
+    , Space
+    , Str "new"
+    , Space
+    , Str "arrow"
+    , Space
+    , Str "by"
+    , Space
+    , Str "running"
+    , Space
+    , Str "the"
+    , Space
+    , Str "two"
+    , Space
+    , Str "arrows"
+    , Space
+    , Str "on"
+    , Space
+    , Str "a"
+    , SoftBreak
+    , Str "pair"
+    , Space
+    , Str "of"
+    , Space
+    , Str "values"
+    , Space
+    , Str "(one"
+    , Space
+    , Str "arrow"
+    , Space
+    , Str "on"
+    , Space
+    , Str "the"
+    , Space
+    , Str "first"
+    , Space
+    , Str "item"
+    , Space
+    , Str "of"
+    , Space
+    , Str "the"
+    , Space
+    , Str "pair"
+    , Space
+    , Str "and"
+    , Space
+    , Str "one"
+    , Space
+    , Str "arrow"
+    , Space
+    , Str "on"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "second"
+    , Space
+    , Str "item"
+    , Space
+    , Str "of"
+    , Space
+    , Str "the"
+    , Space
+    , Str "pair)."
+    ]
+, CodeBlock
+    ( "" , [] , [] ) "f *** g = first f >>> second g"
+, Para [ Str "Block" , Space , Str "quote:" ]
+, BlockQuote [ Para [ Str "foo" , Space , Str "bar" ] ]
+]
diff --git a/test/lhs-test.rst b/test/lhs-test.rst
--- a/test/lhs-test.rst
+++ b/test/lhs-test.rst
@@ -6,9 +6,9 @@
 
 .. code:: haskell
 
-    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
@@ -16,8 +16,8 @@
 
 ::
 
-    f *** g = first f >>> second g
+   f *** g = first f >>> second g
 
 Block quote:
 
-    foo bar
+   foo bar
diff --git a/test/lhs-test.rst+lhs b/test/lhs-test.rst+lhs
--- a/test/lhs-test.rst+lhs
+++ b/test/lhs-test.rst+lhs
@@ -14,8 +14,8 @@
 
 ::
 
-    f *** g = first f >>> second g
+   f *** g = first f >>> second g
 
 Block quote:
 
-    foo bar
+   foo bar
diff --git a/test/lua/attr-test.lua b/test/lua/attr-test.lua
deleted file mode 100644
--- a/test/lua/attr-test.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-function Div (div)
-  div.attributes.five = ("%d"):format(div.attributes.two + div.attributes.three)
-  div.attributes.two = nil
-  div.attributes.one = "eins"
-  return div
-end
diff --git a/test/lua/block-count.lua b/test/lua/block-count.lua
deleted file mode 100644
--- a/test/lua/block-count.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-local num_blocks = 0
-
-function Block(el)
-  num_blocks = num_blocks + 1
-end
-
-function Pandoc(blocks, meta)
-  return pandoc.Pandoc {
-    pandoc.Para{pandoc.Str(num_blocks)}
-  }
-end
diff --git a/test/lua/hello-world-doc.lua b/test/lua/hello-world-doc.lua
deleted file mode 100644
--- a/test/lua/hello-world-doc.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-  {
-    Pandoc = function(doc)
-      local meta = {}
-      local hello = { pandoc.Str "Hello,", pandoc.Space(), pandoc.Str "World!" }
-      local blocks = { pandoc.Para(hello) }
-      return pandoc.Pandoc(blocks, meta)
-    end
-  }
-}
diff --git a/test/lua/implicit-doc-filter.lua b/test/lua/implicit-doc-filter.lua
deleted file mode 100644
--- a/test/lua/implicit-doc-filter.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-function Doc (doc)
-  local meta = {}
-  local hello = { pandoc.Str "Hello,", pandoc.Space(), pandoc.Str "World!" }
-  local blocks = { pandoc.Para(hello) }
-  return pandoc.Pandoc(blocks, meta)
-end
diff --git a/test/lua/markdown-reader.lua b/test/lua/markdown-reader.lua
deleted file mode 100644
--- a/test/lua/markdown-reader.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
-  {
-    RawBlock = function (elem)
-      if elem.format == "markdown" then
-        local pd = pandoc.read(elem.text, "markdown")
-        return pd.blocks[1]
-      else
-        return elem
-      end
-    end,
-  }
-}
diff --git a/test/lua/metatable-catch-all.lua b/test/lua/metatable-catch-all.lua
deleted file mode 100644
--- a/test/lua/metatable-catch-all.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-local num_inlines = 0
-
-function catch_all(el)
-  if el.tag and pandoc.Inline.constructor[el.tag] then
-    num_inlines = num_inlines + 1
-  end
-end
-
-function Pandoc(blocks, meta)
-  return pandoc.Pandoc {
-    pandoc.Para{pandoc.Str(num_inlines)}
-  }
-end
-
-return {
-  setmetatable(
-    {Pandoc = Pandoc},
-    {__index = function(_) return catch_all end}
-  )
-}
diff --git a/test/lua/plain-to-para.lua b/test/lua/plain-to-para.lua
deleted file mode 100644
--- a/test/lua/plain-to-para.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-  { Plain = function (elem)
-      return pandoc.Para(elem.content)
-  end,
-  }
-}
diff --git a/test/lua/single-to-double-quoted.lua b/test/lua/single-to-double-quoted.lua
deleted file mode 100644
--- a/test/lua/single-to-double-quoted.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-  {
-    Quoted = function (elem)
-      if elem.quotetype == "SingleQuote" then
-        elem.quotetype = "DoubleQuote"
-      end
-      return elem
-    end,
-  }
-}
diff --git a/test/lua/smallcaps-title.lua b/test/lua/smallcaps-title.lua
deleted file mode 100644
--- a/test/lua/smallcaps-title.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
-  {
-    Meta = function(meta)
-      -- The call to `MetaInlines` is redundant and used for testing purposes
-      -- only. The explicit use of a MetaValue constructor is only useful when
-      -- used with an empty table: `MetaInlines{}` is read differently than
-      -- `MetaBlocks{}`.
-      meta.title = pandoc.MetaInlines{pandoc.SmallCaps(meta.title)}
-      return meta
-    end
-  }
-}
diff --git a/test/lua/strmacro.lua b/test/lua/strmacro.lua
deleted file mode 100644
--- a/test/lua/strmacro.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  {
-    Str = function (elem)
-      if elem.text == "{{helloworld}}" then
-        return pandoc.Emph {pandoc.Str "Hello, World"}
-      else
-        return elem
-      end
-    end,
-  }
-}
diff --git a/test/lua/test-pandoc-utils.lua b/test/lua/test-pandoc-utils.lua
deleted file mode 100644
--- a/test/lua/test-pandoc-utils.lua
+++ /dev/null
@@ -1,115 +0,0 @@
-utils = require 'pandoc.utils'
-
--- hierarchicalize
-------------------------------------------------------------------------
-function test_hierarchicalize ()
-  local blks = {
-    pandoc.Header(1, {pandoc.Str 'First'}),
-    pandoc.Header(2, {pandoc.Str 'Second'}),
-    pandoc.Header(2, {pandoc.Str 'Third'}),
-  }
-  local hblks = utils.hierarchicalize(blks)
-  return hblks[1].t == "Sec"
-    and hblks[1].contents[1].t == "Sec"
-    and hblks[1].contents[2].numbering[1] == 1
-    and hblks[1].contents[2].numbering[2] == 2
-end
-
--- SHA1
-------------------------------------------------------------------------
-function test_sha1 ()
-  local ref_hash = '0a0a9f2a6772942557ab5355d76af442f8f65e01'
-  local hash = utils.sha1 'Hello, World!'
-  return hash == ref_hash
-end
-
--- Pipe
-------------------------------------------------------------------------
-function file_exists (filename)
-  local fh = io.open(filename, 'r')
-  return fh ~= nil and (fh:close() or true)
-end
-
-function warn (...) io.stderr:write(...) end
-
-function test_pipe ()
-  if not file_exists('/bin/sed') then
-    warn 'Did not find /bin/sed, skipping test'
-    return true
-  end
-  local pipe_result = pandoc.pipe('/bin/sed', {'-e', 's/a/b/'}, 'abc')
-  return pipe_result == 'bbc'
-end
-
-function test_failing_pipe ()
-  if not file_exists('/bin/false') then
-    warn 'Did not find /bin/false, skipping test'
-    return true
-  end
-  local res, err = pcall(pandoc.pipe, '/bin/false', {}, 'abc')
-  return not res and
-    err.command == '/bin/false' and
-    err.error_code == 1 and
-    err.output == ''
-end
-
--- Read
-------------------------------------------------------------------------
-function test_read ()
-  local valid_markdown = '*Hello*, World!\n'
-  local res = pandoc.read(valid_markdown).blocks[1].content
-  return res[1].t == 'Emph' and res[3].t == 'Space' and res[4].t == 'Str'
-end
-
-function test_failing_read ()
-  local res, err = pcall(pandoc.read, 'foo', 'nosuchreader')
-  return not res and err:match 'Unknown reader: nosuchreader'
-end
-
--- Stringify
-------------------------------------------------------------------------
-function test_stringify ()
-  local inline = pandoc.Emph{
-    pandoc.Str 'Cogito',
-    pandoc.Space(),
-    pandoc.Str 'ergo',
-    pandoc.Space(),
-    pandoc.Str 'sum.',
-  }
-  return utils.stringify(inline) == 'Cogito ergo sum.'
-end
-
--- to_roman_numeral
-------------------------------------------------------------------------
-function test_to_roman_numeral ()
-  return utils.to_roman_numeral(1888) == 'MDCCCLXXXVIII'
-    -- calling with a string fails
-    and not pcall(utils.to_roman_numeral, 'not a number')
-end
-
--- normalize_date
-------------------------------------------------------------------------
-function test_normalize_date ()
-  return utils.normalize_date("12/31/2017") == '2017-12-31'
-    and utils.normalize_date("pandoc") == nil
-end
-
--- Return result
-------------------------------------------------------------------------
-function run(fn)
-  return fn() and "OK" or "FAIL"
-end
-
-function Para (el)
-  return {
-    pandoc.Plain{pandoc.Str("hierarchicalize: " .. run(test_hierarchicalize))},
-    pandoc.Plain{pandoc.Str("normalize_date: " .. run(test_normalize_date))},
-    pandoc.Plain{pandoc.Str("pipe: " .. run(test_pipe))},
-    pandoc.Plain{pandoc.Str("failing pipe: " .. run(test_failing_pipe))},
-    pandoc.Plain{pandoc.Str("read: " .. run(test_read))},
-    pandoc.Plain{pandoc.Str("failing read: " .. run(test_failing_read))},
-    pandoc.Plain{pandoc.Str("sha1: " .. run(test_sha1))},
-    pandoc.Plain{pandoc.Str("stringify: " .. run(test_stringify))},
-    pandoc.Plain{pandoc.Str("to_roman_numeral: " .. run(test_to_roman_numeral))},
-  }
-end
diff --git a/test/lua/undiv.lua b/test/lua/undiv.lua
deleted file mode 100644
--- a/test/lua/undiv.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-function Div(el)
-  return el.content
-end
diff --git a/test/lua/uppercase-header.lua b/test/lua/uppercase-header.lua
deleted file mode 100644
--- a/test/lua/uppercase-header.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local text = require 'text'
-
-local function str_to_uppercase (s)
-  return pandoc.Str(text.upper(s.text))
-end
-
-function Header (el)
-  return pandoc.walk_block(el, {Str = str_to_uppercase})
-end
diff --git a/test/man-reader.man b/test/man-reader.man
new file mode 100644
--- /dev/null
+++ b/test/man-reader.man
@@ -0,0 +1,391 @@
+.TH "PANDOC-MAN-TESTS" "1" "Oct 17, 2018" "v1.0.1" "Pandoc Tests"
+.PP
+This is a set of tests for pandoc.
+.PP
+   *   *   *   *   *
+.SH Headers
+.SH Level 1
+.SS Level 2
+
+   *   *   *   *   *
+.SH Paragraphs
+.PP
+Here's a regular paragraph.
+.PP
+Another 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 of a paragraph looked like a list
+item.
+.PP
+There should be a hard line break
+.PD 0
+.P
+.PD
+here.
+.PP
+   *   *   *   *   *
+.SH Block Quotes
+Code in a block quote:
+.RS
+.nf
+\f[C]
+sub\ status\ {
+\ \ \ \ print\ "working";
+}
+\f[]
+.fi
+.RE
+.PP
+A list:
+.IP "1." 3
+item one
+.IP "2." 3
+item two
+.PP
+.SH Code Blocks
+.PP
+Code:
+.IP
+.nf
+\f[C]
+\-\-\-\- (should be four hyphens)
+
+sub status {
+    print "working";
+}
+
+\f[]
+.fi
+.PP
+And:
+.IP
+.nf
+\f[C]
+\tthis code line is indented by one tab
+\f[]
+.fi
+.PP
+   *   *   *   *   *
+.SH Lists
+.SS Unordered
+.PP
+Asterisks:
+.IP \[bu] 2
+asterisk 1
+.IP \[bu] 2
+asterisk 2
+.IP \[bu] 2
+asterisk 3
+.PP
+.SS Ordered
+.IP "1." 3
+First
+.IP "2." 3
+Second
+.IP "3." 3
+Third
+.PP
+.SS Nested
+.IP \[bu] 2
+Tab
+.RS 2
+.IP \[bu] 2
+Tab
+.RS 2
+.IP \[bu] 2
+Tab
+.RE
+.RE
+.PP
+Here's another:
+.IP "1." 3
+First
+.IP "2." 3
+Second:
+.RS 4
+.IP \[bu] 2
+Fee
+.IP \[bu] 2
+Fie
+.IP \[bu] 2
+Foe
+.RE
+.IP "3." 3
+Third
+.PP
+Same thing:
+.IP "1." 3
+First
+.IP "2." 3
+Second:
+.RS 4
+.IP \[bu] 2
+Fee
+.IP \[bu] 2
+Fie
+.IP \[bu] 2
+Foe
+.RE
+.IP "3." 3
+Third
+.SS different styles:
+.IP "A." 3
+Upper Alpha
+.RS 4
+.IP "I." 3
+Upper Roman.
+.RS 4
+.IP "(6)" 4
+Decimal start with 6
+.RS 4
+.IP "c)" 3
+Lower alpha with paren
+.RE
+.RE
+.RE
+.SS Ordered
+Definition lists
+.TP
+.B term1
+definition 1
+.RS
+.PP
+continued
+.RE
+.TP
+.B term2
+definition 2
+   *   *   *   *   *
+.SH Special Characters
+AT&T has an ampersand in their name.
+.PP
+4 < 5.
+.PP
+6 > 5.
+.PP
+Backslash: \\
+.PP
+Backtick: `
+.PP
+Asterisk: *
+.PP
+Underscore: _
+.PP
+Left brace: {
+.PP
+Right brace: }
+.PP
+Left bracket: [
+.PP
+Right bracket: ]
+.PP
+Left paren: (
+.PP
+Right paren: )
+.PP
+Greater\-than: >
+.PP
+Hash: #
+.PP
+Period: .
+.PP
+Bang: !
+.PP
+Plus: +
+.PP
+Minus: \-
+.PP
+.SH Links
+.PP
+.UR http://\:example.com
+some random
+site
+.UE .
+.PP
+.MT me@example.com
+my email address
+.ME .
+.SH Macros
+.de au
+.B
+Me Myself
+..
+.de auth !!
+.I
+The author is \\$1.
+.!!
+.au
+and I.
+.auth "John Jones"
+.ds me The \f[B]Author\f[R]
+It's \*(me.
+.SH Tables
+.TS
+tab(@);
+r l c l.
+T{
+Right
+T}@T{
+Left
+T}@T{
+Center
+T}@T{
+Default
+T}
+_
+T{
+12
+T}@T{
+12
+T}@T{
+12
+T}@T{
+12
+T}
+T{
+123
+T}@T{
+123
+T}@T{
+123
+T}@T{
+123
+T}
+T{
+1
+T}@T{
+1
+T}@T{
+1
+T}@T{
+1
+T}
+.TE
+.TS
+allbox tab(;);
+rlcl.
+T{
+Right
+T};T{
+Left
+T};T{
+Center
+T};T{
+Left
+\f[I]more\f[R]
+T}
+_
+T{
+12
+T};T{
+12
+T};T{
+12
+T};T{
+12
+T}
+T{
+123
+T};T{
+123
+T};T{
+123
+T};T{
+123
+T}
+T{
+1
+T};T{
+1
+T};T{
+1
+T};T{
+1
+T}
+.TE
+.TS
+tab(@);
+cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).
+T{
+Centered Header
+T}@T{
+Left Aligned
+T}@T{
+Right Aligned
+T}@T{
+Default aligned
+T}
+_
+T{
+First
+T}@T{
+row
+T}@T{
+12.0
+T}@T{
+Example of a row that spans multiple lines.
+T}
+T{
+Second
+T}@T{
+row
+T}@T{
+5.0
+T}@T{
+Here\[cq]s another one.
+Note the blank line between rows.
+T}
+.TE
+.PP
+Table without column headers:
+.PP
+.TS
+tab(@);
+r l c r.
+T{
+12
+T}@T{
+12
+T}@T{
+12
+T}@T{
+12
+T}
+T{
+123
+T}@T{
+123
+T}@T{
+123
+T}@T{
+123
+T}
+T{
+1
+T}@T{
+1
+T}@T{
+1
+T}@T{
+1
+T}
+.TE
+.TS
+tab(@);
+rl.
+a@b
+T{
+.PP
+one
+.PP
+two
+T}@T{
+.nf
+some
+   code
+.fi
+T}
+.TE
+
diff --git a/test/man-reader.native b/test/man-reader.native
new file mode 100644
--- /dev/null
+++ b/test/man-reader.native
@@ -0,0 +1,951 @@
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "date"
+            , MetaInlines
+                [ Str "Oct" , Space , Str "17," , Space , Str "2018" ]
+            )
+          , ( "footer" , MetaInlines [ Str "v1.0.1" ] )
+          , ( "header"
+            , MetaInlines [ Str "Pandoc" , Space , Str "Tests" ]
+            )
+          , ( "section" , MetaInlines [ Str "1" ] )
+          , ( "title" , MetaInlines [ Str "PANDOC-MAN-TESTS" ] )
+          ]
+    }
+  [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "set"
+      , Space
+      , Str "of"
+      , Space
+      , Str "tests"
+      , Space
+      , Str "for"
+      , Space
+      , Str "pandoc."
+      ]
+  , Para
+      [ Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      ]
+  , Header 1 ( "headers" , [] , [] ) [ Str "Headers" ]
+  , Header
+      1 ( "level-1" , [] , [] ) [ Str "Level" , Space , Str "1" ]
+  , Header
+      2 ( "level-2" , [] , [] ) [ Str "Level" , Space , Str "2" ]
+  , Para
+      [ Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      ]
+  , Header 1 ( "paragraphs" , [] , [] ) [ Str "Paragraphs" ]
+  , Para
+      [ Str "Here's"
+      , Space
+      , Str "a"
+      , Space
+      , Str "regular"
+      , Space
+      , Str "paragraph."
+      ]
+  , Para
+      [ Str "Another"
+      , Space
+      , Str "paragraph"
+      , Space
+      , Str "In"
+      , Space
+      , Str "Markdown"
+      , Space
+      , Str "1.0.0"
+      , Space
+      , Str "and"
+      , Space
+      , Str "earlier."
+      , Space
+      , Str "Version"
+      , Space
+      , Str "8."
+      , Space
+      , Str "This"
+      , Space
+      , Str "line"
+      , Space
+      , Str "turns"
+      , Space
+      , Str "into"
+      , Space
+      , Str "a"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item."
+      , Space
+      , Str "Because"
+      , Space
+      , Str "a"
+      , Space
+      , Str "hard-wrapped"
+      , Space
+      , Str "line"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "middle"
+      , Space
+      , Str "of"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph"
+      , Space
+      , Str "looked"
+      , Space
+      , Str "like"
+      , Space
+      , Str "a"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item."
+      ]
+  , Para
+      [ Str "There"
+      , Space
+      , Str "should"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "hard"
+      , Space
+      , Str "line"
+      , Space
+      , Str "break"
+      ]
+  , Para [ Str "here." ]
+  , Para
+      [ Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      ]
+  , Header
+      1
+      ( "block-quotes" , [] , [] )
+      [ Str "Block" , Space , Str "Quotes" ]
+  , Para
+      [ Str "Code"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      ]
+  , BlockQuote
+      [ CodeBlock
+          ( "" , [] , [] ) "sub status {\n    print \"working\";\n}"
+      ]
+  , Para [ Str "A" , Space , Str "list:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "item" , Space , Str "one" ] ]
+      , [ Para [ Str "item" , Space , Str "two" ] ]
+      ]
+  , Header
+      1
+      ( "code-blocks" , [] , [] )
+      [ Str "Code" , Space , Str "Blocks" ]
+  , Para [ Str "Code:" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n"
+  , Para [ Str "And:" ]
+  , CodeBlock
+      ( "" , [] , [] ) "\tthis code line is indented by one tab"
+  , Para
+      [ Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      , Space
+      , Str "*"
+      ]
+  , Header 1 ( "lists" , [] , [] ) [ Str "Lists" ]
+  , Header 2 ( "unordered" , [] , [] ) [ Str "Unordered" ]
+  , Para [ Str "Asterisks:" ]
+  , BulletList
+      [ [ Para [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Para [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Header 2 ( "ordered" , [] , [] ) [ Str "Ordered" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second" ] ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Header 2 ( "nested" , [] , [] ) [ Str "Nested" ]
+  , BulletList
+      [ [ Para [ Str "Tab" ]
+        , BulletList
+            [ [ Para [ Str "Tab" ]
+              , BulletList [ [ Para [ Str "Tab" ] ] ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Here's" , Space , Str "another:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second:" ]
+        , BulletList
+            [ [ Para [ Str "Fee" ] ]
+            , [ Para [ Str "Fie" ] ]
+            , [ Para [ Str "Foe" ] ]
+            ]
+        ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Para [ Str "Same" , Space , Str "thing:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second:" ]
+        , BulletList
+            [ [ Para [ Str "Fee" ] ]
+            , [ Para [ Str "Fie" ] ]
+            , [ Para [ Str "Foe" ] ]
+            ]
+        ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Header
+      2
+      ( "different-styles" , [] , [] )
+      [ Str "different" , Space , Str "styles:" ]
+  , OrderedList
+      ( 1 , UpperAlpha , Period )
+      [ [ Para [ Str "Upper" , Space , Str "Alpha" ]
+        , OrderedList
+            ( 1 , UpperRoman , Period )
+            [ [ Para [ Str "Upper" , Space , Str "Roman." ]
+              , OrderedList
+                  ( 6 , Decimal , TwoParens )
+                  [ [ Para
+                        [ Str "Decimal"
+                        , Space
+                        , Str "start"
+                        , Space
+                        , Str "with"
+                        , Space
+                        , Str "6"
+                        ]
+                    , OrderedList
+                        ( 3 , LowerAlpha , OneParen )
+                        [ [ Para
+                              [ Str "Lower"
+                              , Space
+                              , Str "alpha"
+                              , Space
+                              , Str "with"
+                              , Space
+                              , Str "paren"
+                              ]
+                          ]
+                        ]
+                    ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Header 2 ( "ordered-1" , [] , [] ) [ Str "Ordered" ]
+  , Para [ Str "Definition" , Space , Str "lists" ]
+  , DefinitionList
+      [ ( [ Strong [ Str "term1" ] ]
+        , [ [ Para [ Str "definition" , Space , Str "1" ]
+            , Para [ Str "continued" ]
+            ]
+          ]
+        )
+      , ( [ Strong [ Str "term2" ] ]
+        , [ [ Para
+                [ Str "definition"
+                , Space
+                , Str "2"
+                , Space
+                , Str "*"
+                , Space
+                , Str "*"
+                , Space
+                , Str "*"
+                , Space
+                , Str "*"
+                , Space
+                , Str "*"
+                ]
+            ]
+          ]
+        )
+      ]
+  , Header
+      1
+      ( "special-characters" , [] , [] )
+      [ Str "Special" , Space , Str "Characters" ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "has"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "their"
+      , Space
+      , Str "name."
+      ]
+  , Para [ Str "4" , Space , Str "<" , Space , Str "5." ]
+  , Para [ Str "6" , Space , Str ">" , Space , Str "5." ]
+  , Para [ Str "Backslash:" , Space , Str "\\" ]
+  , Para [ Str "Backtick:" , Space , Str "`" ]
+  , Para [ Str "Asterisk:" , Space , Str "*" ]
+  , Para [ Str "Underscore:" , Space , Str "_" ]
+  , Para
+      [ Str "Left" , Space , Str "brace:" , Space , Str "{" ]
+  , Para
+      [ Str "Right" , Space , Str "brace:" , Space , Str "}" ]
+  , Para
+      [ Str "Left" , Space , Str "bracket:" , Space , Str "[" ]
+  , Para
+      [ Str "Right" , Space , Str "bracket:" , Space , Str "]" ]
+  , Para
+      [ Str "Left" , Space , Str "paren:" , Space , Str "(" ]
+  , Para
+      [ Str "Right" , Space , Str "paren:" , Space , Str ")" ]
+  , Para [ Str "Greater-than:" , Space , Str ">" ]
+  , Para [ Str "Hash:" , Space , Str "#" ]
+  , Para [ Str "Period:" , Space , Str "." ]
+  , Para [ Str "Bang:" , Space , Str "!" ]
+  , Para [ Str "Plus:" , Space , Str "+" ]
+  , Para [ Str "Minus:" , Space , Str "-" ]
+  , Header 1 ( "links" , [] , [] ) [ Str "Links" ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "some" , Space , Str "randomsite" ]
+          ( "http://example.com" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "my" , Space , Str "email" , Space , Str "address" ]
+          ( "mailto:me@example.com" , "" )
+      , Str "."
+      ]
+  , Header 1 ( "macros" , [] , [] ) [ Str "Macros" ]
+  , Para
+      [ Strong [ Str "Me" , Space , Str "Myself" ]
+      , Space
+      , Str "and"
+      , Space
+      , Str "I."
+      , Space
+      , Emph
+          [ Str "The"
+          , Space
+          , Str "author"
+          , Space
+          , Str "is"
+          , Space
+          , Str "John"
+          , Space
+          , Str "Jones."
+          ]
+      , Space
+      , Str "It's"
+      , Space
+      , Str "The"
+      , Space
+      , Strong [ Str "Author" ]
+      , Str "."
+      ]
+  , Header 1 ( "tables" , [] , [] ) [ Str "Tables" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignRight , ColWidthDefault )
+      , ( AlignLeft , ColWidthDefault )
+      , ( AlignCenter , ColWidthDefault )
+      , ( AlignLeft , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Right" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Left" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Center" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Default" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignRight , ColWidthDefault )
+      , ( AlignLeft , ColWidthDefault )
+      , ( AlignCenter , ColWidthDefault )
+      , ( AlignLeft , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Right" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Left" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Center" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Left" , Space , Emph [ Str "more" ] ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignCenter , ColWidthDefault )
+      , ( AlignLeft , ColWidthDefault )
+      , ( AlignRight , ColWidthDefault )
+      , ( AlignLeft , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Centered" , Space , Str "Header" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Left" , Space , Str "Aligned" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Right" , Space , Str "Aligned" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Default" , Space , Str "aligned" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "First" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "row" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12.0" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "Example"
+                      , Space
+                      , Str "of"
+                      , Space
+                      , Str "a"
+                      , Space
+                      , Str "row"
+                      , Space
+                      , Str "that"
+                      , Space
+                      , Str "spans"
+                      , Space
+                      , Str "multiple"
+                      , Space
+                      , Str "lines."
+                      ]
+                  ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Second" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "row" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "5.0" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "Here\8217s"
+                      , Space
+                      , Str "another"
+                      , Space
+                      , Str "one."
+                      , Space
+                      , Str "Note"
+                      , Space
+                      , Str "the"
+                      , Space
+                      , Str "blank"
+                      , Space
+                      , Str "line"
+                      , Space
+                      , Str "between"
+                      , Space
+                      , Str "rows."
+                      ]
+                  ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Table"
+      , Space
+      , Str "without"
+      , Space
+      , Str "column"
+      , Space
+      , Str "headers:"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignRight , ColWidthDefault )
+      , ( AlignLeft , ColWidthDefault )
+      , ( AlignCenter , ColWidthDefault )
+      , ( AlignRight , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "12" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "123" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "1" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignRight , ColWidth 0.5 )
+      , ( AlignLeft , ColWidth 0.5 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "a" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "b" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "one" ] , Para [ Str "two" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ CodeBlock ( "" , [] , [] ) "some\n   code" ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  ]
diff --git a/test/markdown-citations.native b/test/markdown-citations.native
--- a/test/markdown-citations.native
+++ b/test/markdown-citations.native
@@ -1,17 +1,522 @@
-[Header 1 ("pandoc-with-citeproc-hs",[],[]) [Str "Pandoc",Space,Str "with",Space,Str "citeproc-hs"]
-,BulletList
- [[Para [Cite [Citation {citationId = "nonexistent", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@nonexistent]"]]]
- ,[Para [Cite [Citation {citationId = "nonexistent", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@nonexistent"]]]
- ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@item1"],Space,Str "says",Space,Str "blah."]]
- ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Str "p.\160\&30"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@item1",Space,Str "[p.",Space,Str "30]"],Space,Str "says",Space,Str "blah."]]
- ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Str "p.\160\&30,",Space,Str "with",Space,Str "suffix"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@item1",Space,Str "[p.",Space,Str "30,",Space,Str "with",Space,Str "suffix]"],Space,Str "says",Space,Str "blah."]]
- ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.\160\&30"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 0},Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [Str "see",Space,Str "also"], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "@item1",Space,Str "[-@item2",Space,Str "p.",Space,Str "30;",Space,Str "see",Space,Str "also",Space,Str "@\1087\1091\1085\1082\1090\&3]"],Space,Str "says",Space,Str "blah."]]
- ,[Para [Str "In",Space,Str "a",Space,Str "note.",Note [Para [Cite [Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [], citationSuffix = [Str "p.\160\&12"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@\1087\1091\1085\1082\1090\&3",Space,Str "[p.",Space,Str "12]"],Space,Str "and",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "locators",Space,Cite [Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@\1087\1091\1085\1082\1090\&3]"],Str "."]]]]
- ,[Para [Str "A",Space,Str "citation",Space,Str "group",Space,Cite [Citation {citationId = "item1", citationPrefix = [Str "see"], citationSuffix = [Space,Str "chap.",Space,Str "3"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [Str "also"], citationSuffix = [Space,Str "p.\160\&34-35"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[see",Space,Str "@item1",Space,Str "chap.",Space,Str "3;",Space,Str "also",Space,Str "@\1087\1091\1085\1082\1090\&3",Space,Str "p.",Space,Str "34-35]"],Str "."]]
- ,[Para [Str "Another",Space,Str "one",Space,Cite [Citation {citationId = "item1", citationPrefix = [Str "see"], citationSuffix = [Space,Str "p.\160\&34-35"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[see",Space,Str "@item1",Space,Str "p.",Space,Str "34-35]"],Str "."]]
- ,[Para [Str "And",Space,Str "another",Space,Str "one",Space,Str "in",Space,Str "a",Space,Str "note.",Note [Para [Str "Some",Space,Str "citations",Space,Cite [Citation {citationId = "item1", citationPrefix = [Str "see"], citationSuffix = [Space,Str "chap.",Space,Str "3"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[see",Space,Str "@item1",Space,Str "chap.",Space,Str "3;",Space,Str "@\1087\1091\1085\1082\1090\&3;",Space,Str "@item2]"],Str "."]]]]
- ,[Para [Str "Citation",Space,Str "with",Space,Str "a",Space,Str "suffix",Space,Str "and",Space,Str "locator",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Space,Str "pp.\160\&33,",Space,Str "35-37,",Space,Str "and",Space,Str "nowhere",Space,Str "else"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@item1",Space,Str "pp.",Space,Str "33,",Space,Str "35-37,",Space,Str "and",Space,Str "nowhere",Space,Str "else]"],Str "."]]
- ,[Para [Str "Citation",Space,Str "with",Space,Str "suffix",Space,Str "only",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Space,Str "and",Space,Str "nowhere",Space,Str "else"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@item1",Space,Str "and",Space,Str "nowhere",Space,Str "else]"],Str "."]]
- ,[Para [Str "Now",Space,Str "some",Space,Str "modifiers.",Note [Para [Str "Like",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "author:",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 0}] [Str "[-@item1]"],Str ",",Space,Str "and",Space,Str "now",Space,Str "Doe",Space,Str "with",Space,Str "a",Space,Str "locator",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.\160\&44"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 0}] [Str "[-@item2",Space,Str "p.",Space,Str "44]"],Str "."]]]]
- ,[Para [Str "With",Space,Str "some",Space,Str "markup",Space,Cite [Citation {citationId = "item1", citationPrefix = [Emph [Str "see"]], citationSuffix = [Space,Str "p.",Space,Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[*see*",Space,Str "@item1",Space,Str "p.",Space,Str "**32**]"],Str "."]]]
-,Header 1 ("references",[],[]) [Str "References"]]
+[ Header
+    1
+    ( "pandoc-with-citeproc-hs" , [] , [] )
+    [ Str "Pandoc"
+    , Space
+    , Str "with"
+    , Space
+    , Str "citeproc-hs"
+    ]
+, BulletList
+    [ [ Para
+          [ Cite
+              [ Citation
+                  { citationId = "nonexistent"
+                  , citationPrefix = []
+                  , citationSuffix = []
+                  , citationMode = NormalCitation
+                  , citationNoteNum = 1
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "[@nonexistent]" ]
+          ]
+      ]
+    , [ Para
+          [ Cite
+              [ Citation
+                  { citationId = "nonexistent"
+                  , citationPrefix = []
+                  , citationSuffix = []
+                  , citationMode = AuthorInText
+                  , citationNoteNum = 2
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "@nonexistent" ]
+          ]
+      ]
+    , [ Para
+          [ Cite
+              [ Citation
+                  { citationId = "item1"
+                  , citationPrefix = []
+                  , citationSuffix = []
+                  , citationMode = AuthorInText
+                  , citationNoteNum = 3
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "@item1" ]
+          , Space
+          , Str "says"
+          , Space
+          , Str "blah."
+          ]
+      ]
+    , [ Para
+          [ Cite
+              [ Citation
+                  { citationId = "item1"
+                  , citationPrefix = []
+                  , citationSuffix = [ Str "p.\160\&30" ]
+                  , citationMode = AuthorInText
+                  , citationNoteNum = 4
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "@item1" , Space , Str "[p." , Space , Str "30]" ]
+          , Space
+          , Str "says"
+          , Space
+          , Str "blah."
+          ]
+      ]
+    , [ Para
+          [ Cite
+              [ Citation
+                  { citationId = "item1"
+                  , citationPrefix = []
+                  , citationSuffix =
+                      [ Str "p.\160\&30,"
+                      , Space
+                      , Str "with"
+                      , Space
+                      , Str "suffix"
+                      ]
+                  , citationMode = AuthorInText
+                  , citationNoteNum = 5
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "@item1"
+              , Space
+              , Str "[p."
+              , Space
+              , Str "30,"
+              , Space
+              , Str "with"
+              , Space
+              , Str "suffix]"
+              ]
+          , Space
+          , Str "says"
+          , Space
+          , Str "blah."
+          ]
+      ]
+    , [ Para
+          [ Cite
+              [ Citation
+                  { citationId = "item1"
+                  , citationPrefix = []
+                  , citationSuffix = []
+                  , citationMode = AuthorInText
+                  , citationNoteNum = 6
+                  , citationHash = 0
+                  }
+              , Citation
+                  { citationId = "item2"
+                  , citationPrefix = []
+                  , citationSuffix = [ Space , Str "p.\160\&30" ]
+                  , citationMode = SuppressAuthor
+                  , citationNoteNum = 6
+                  , citationHash = 0
+                  }
+              , Citation
+                  { citationId = "\1087\1091\1085\1082\1090\&3"
+                  , citationPrefix = [ Str "see" , Space , Str "also" ]
+                  , citationSuffix = []
+                  , citationMode = NormalCitation
+                  , citationNoteNum = 6
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "@item1"
+              , Space
+              , Str "[-@item2"
+              , Space
+              , Str "p."
+              , Space
+              , Str "30;"
+              , Space
+              , Str "see"
+              , Space
+              , Str "also"
+              , Space
+              , Str "@\1087\1091\1085\1082\1090\&3]"
+              ]
+          , Space
+          , Str "says"
+          , Space
+          , Str "blah."
+          ]
+      ]
+    , [ Para
+          [ Str "In"
+          , Space
+          , Str "a"
+          , Space
+          , Str "note."
+          , Note
+              [ Para
+                  [ Cite
+                      [ Citation
+                          { citationId = "\1087\1091\1085\1082\1090\&3"
+                          , citationPrefix = []
+                          , citationSuffix = [ Str "p.\160\&12" ]
+                          , citationMode = AuthorInText
+                          , citationNoteNum = 7
+                          , citationHash = 0
+                          }
+                      ]
+                      [ Str "@\1087\1091\1085\1082\1090\&3"
+                      , Space
+                      , Str "[p."
+                      , Space
+                      , Str "12]"
+                      ]
+                  , Space
+                  , Str "and"
+                  , Space
+                  , Str "a"
+                  , Space
+                  , Str "citation"
+                  , Space
+                  , Str "without"
+                  , Space
+                  , Str "locators"
+                  , Space
+                  , Cite
+                      [ Citation
+                          { citationId = "\1087\1091\1085\1082\1090\&3"
+                          , citationPrefix = []
+                          , citationSuffix = []
+                          , citationMode = NormalCitation
+                          , citationNoteNum = 7
+                          , citationHash = 0
+                          }
+                      ]
+                      [ Str "[@\1087\1091\1085\1082\1090\&3]" ]
+                  , Str "."
+                  ]
+              ]
+          ]
+      ]
+    , [ Para
+          [ Str "A"
+          , Space
+          , Str "citation"
+          , Space
+          , Str "group"
+          , Space
+          , Cite
+              [ Citation
+                  { citationId = "item1"
+                  , citationPrefix = [ Str "see" ]
+                  , citationSuffix = [ Space , Str "chap.\160\&3" ]
+                  , citationMode = NormalCitation
+                  , citationNoteNum = 8
+                  , citationHash = 0
+                  }
+              , Citation
+                  { citationId = "\1087\1091\1085\1082\1090\&3"
+                  , citationPrefix = [ Str "also" ]
+                  , citationSuffix = [ Space , Str "p.\160\&34-35" ]
+                  , citationMode = NormalCitation
+                  , citationNoteNum = 8
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "[see"
+              , Space
+              , Str "@item1"
+              , Space
+              , Str "chap."
+              , Space
+              , Str "3;"
+              , Space
+              , Str "also"
+              , Space
+              , Str "@\1087\1091\1085\1082\1090\&3"
+              , Space
+              , Str "p."
+              , Space
+              , Str "34-35]"
+              ]
+          , Str "."
+          ]
+      ]
+    , [ Para
+          [ Str "Another"
+          , Space
+          , Str "one"
+          , Space
+          , Cite
+              [ Citation
+                  { citationId = "item1"
+                  , citationPrefix = [ Str "see" ]
+                  , citationSuffix = [ Space , Str "p.\160\&34-35" ]
+                  , citationMode = NormalCitation
+                  , citationNoteNum = 9
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "[see"
+              , Space
+              , Str "@item1"
+              , Space
+              , Str "p."
+              , Space
+              , Str "34-35]"
+              ]
+          , Str "."
+          ]
+      ]
+    , [ Para
+          [ Str "And"
+          , Space
+          , Str "another"
+          , Space
+          , Str "one"
+          , Space
+          , Str "in"
+          , Space
+          , Str "a"
+          , Space
+          , Str "note."
+          , Note
+              [ Para
+                  [ Str "Some"
+                  , Space
+                  , Str "citations"
+                  , Space
+                  , Cite
+                      [ Citation
+                          { citationId = "item1"
+                          , citationPrefix = [ Str "see" ]
+                          , citationSuffix =
+                              [ Space , Str "chap.\160\&3" ]
+                          , citationMode = NormalCitation
+                          , citationNoteNum = 10
+                          , citationHash = 0
+                          }
+                      , Citation
+                          { citationId = "\1087\1091\1085\1082\1090\&3"
+                          , citationPrefix = []
+                          , citationSuffix = []
+                          , citationMode = NormalCitation
+                          , citationNoteNum = 10
+                          , citationHash = 0
+                          }
+                      , Citation
+                          { citationId = "item2"
+                          , citationPrefix = []
+                          , citationSuffix = []
+                          , citationMode = NormalCitation
+                          , citationNoteNum = 10
+                          , citationHash = 0
+                          }
+                      ]
+                      [ Str "[see"
+                      , Space
+                      , Str "@item1"
+                      , Space
+                      , Str "chap."
+                      , Space
+                      , Str "3;"
+                      , Space
+                      , Str "@\1087\1091\1085\1082\1090\&3;"
+                      , Space
+                      , Str "@item2]"
+                      ]
+                  , Str "."
+                  ]
+              ]
+          ]
+      ]
+    , [ Para
+          [ Str "Citation"
+          , Space
+          , Str "with"
+          , Space
+          , Str "a"
+          , Space
+          , Str "suffix"
+          , Space
+          , Str "and"
+          , Space
+          , Str "locator"
+          , Space
+          , Cite
+              [ Citation
+                  { citationId = "item1"
+                  , citationPrefix = []
+                  , citationSuffix =
+                      [ Space
+                      , Str "pp.\160\&33,"
+                      , Space
+                      , Str "35-37,"
+                      , Space
+                      , Str "and"
+                      , Space
+                      , Str "nowhere"
+                      , Space
+                      , Str "else"
+                      ]
+                  , citationMode = NormalCitation
+                  , citationNoteNum = 11
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "[@item1"
+              , Space
+              , Str "pp."
+              , Space
+              , Str "33,"
+              , Space
+              , Str "35-37,"
+              , Space
+              , Str "and"
+              , Space
+              , Str "nowhere"
+              , Space
+              , Str "else]"
+              ]
+          , Str "."
+          ]
+      ]
+    , [ Para
+          [ Str "Citation"
+          , Space
+          , Str "with"
+          , Space
+          , Str "suffix"
+          , Space
+          , Str "only"
+          , Space
+          , Cite
+              [ Citation
+                  { citationId = "item1"
+                  , citationPrefix = []
+                  , citationSuffix =
+                      [ Space
+                      , Str "and"
+                      , Space
+                      , Str "nowhere"
+                      , Space
+                      , Str "else"
+                      ]
+                  , citationMode = NormalCitation
+                  , citationNoteNum = 12
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "[@item1"
+              , Space
+              , Str "and"
+              , Space
+              , Str "nowhere"
+              , Space
+              , Str "else]"
+              ]
+          , Str "."
+          ]
+      ]
+    , [ Para
+          [ Str "Now"
+          , Space
+          , Str "some"
+          , Space
+          , Str "modifiers."
+          , Note
+              [ Para
+                  [ Str "Like"
+                  , Space
+                  , Str "a"
+                  , Space
+                  , Str "citation"
+                  , Space
+                  , Str "without"
+                  , Space
+                  , Str "author:"
+                  , Space
+                  , Cite
+                      [ Citation
+                          { citationId = "item1"
+                          , citationPrefix = []
+                          , citationSuffix = []
+                          , citationMode = SuppressAuthor
+                          , citationNoteNum = 13
+                          , citationHash = 0
+                          }
+                      ]
+                      [ Str "[-@item1]" ]
+                  , Str ","
+                  , Space
+                  , Str "and"
+                  , Space
+                  , Str "now"
+                  , Space
+                  , Str "Doe"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "a"
+                  , Space
+                  , Str "locator"
+                  , Space
+                  , Cite
+                      [ Citation
+                          { citationId = "item2"
+                          , citationPrefix = []
+                          , citationSuffix =
+                              [ Space , Str "p.\160\&44" ]
+                          , citationMode = SuppressAuthor
+                          , citationNoteNum = 13
+                          , citationHash = 0
+                          }
+                      ]
+                      [ Str "[-@item2"
+                      , Space
+                      , Str "p."
+                      , Space
+                      , Str "44]"
+                      ]
+                  , Str "."
+                  ]
+              ]
+          ]
+      ]
+    , [ Para
+          [ Str "With"
+          , Space
+          , Str "some"
+          , Space
+          , Str "markup"
+          , Space
+          , Cite
+              [ Citation
+                  { citationId = "item1"
+                  , citationPrefix = [ Emph [ Str "see" ] ]
+                  , citationSuffix =
+                      [ Space , Str "p.\160" , Strong [ Str "32" ] ]
+                  , citationMode = NormalCitation
+                  , citationNoteNum = 14
+                  , citationHash = 0
+                  }
+              ]
+              [ Str "[*see*"
+              , Space
+              , Str "@item1"
+              , Space
+              , Str "p."
+              , Space
+              , Str "**32**]"
+              ]
+          , Str "."
+          ]
+      ]
+    ]
+, Header 1 ( "references" , [] , [] ) [ Str "References" ]
+]
diff --git a/test/markdown-reader-more.native b/test/markdown-reader-more.native
--- a/test/markdown-reader-more.native
+++ b/test/markdown-reader-more.native
@@ -1,196 +1,1715 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Author",Space,Str "One"],MetaInlines [Str "Author",Space,Str "Two"],MetaInlines [Str "Author",Space,Str "Three"],MetaInlines [Str "Author",Space,Str "Four"]]),("title",MetaInlines [Str "Title",SoftBreak,Str "spanning",Space,Str "multiple",Space,Str "lines"])]})
-[Header 1 ("additional-markdown-reader-tests",[],[]) [Str "Additional",Space,Str "markdown",Space,Str "reader",Space,Str "tests"]
-,Header 2 ("blank-line-before-url-in-link-reference",[],[]) [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"]
-,Para [Link ("",[],[]) [Str "foo"] ("/url",""),Space,Str "and",Space,Link ("",[],[]) [Str "bar"] ("/url","title")]
-,Header 2 ("raw-context-environments",[],[]) [Str "Raw",Space,Str "ConTeXt",Space,Str "environments"]
-,RawBlock (Format "context") "\\placeformula \\startformula\n   L_{1} = L_{2}\n   \\stopformula\n\n\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"
-,Header 2 ("raw-latex-environments",[],[]) [Str "Raw",Space,Str "LaTeX",Space,Str "environments"]
-,RawBlock (Format "latex") "\\begin{center}\n\\begin{tikzpicture}[baseline={([yshift=+-.5ex]current bounding box.center)}, level distance=24pt]\n\\Tree [.{S} [.NP John\\index{i} ] [.VP [.V likes ] [.NP himself\\index{i,*j} ]]]\n\\end{tikzpicture}\n\\end{center}"
-,Header 2 ("urls-with-spaces-and-punctuation",[],[]) [Str "URLs",Space,Str "with",Space,Str "spaces",Space,Str "and",Space,Str "punctuation"]
-,Para [Link ("",[],[]) [Str "foo"] ("/bar%20and%20baz",""),SoftBreak,Link ("",[],[]) [Str "foo"] ("/bar%20and%20baz",""),SoftBreak,Link ("",[],[]) [Str "foo"] ("/bar%20and%20baz",""),SoftBreak,Link ("",[],[]) [Str "foo"] ("bar%20baz","title")]
-,Para [Link ("",[],[]) [Str "baz"] ("/foo%20foo",""),Space,Link ("",[],[]) [Str "bam"] ("/foo%20fee",""),Space,Link ("",[],[]) [Str "bork"] ("/foo/zee%20zob","title")]
-,Para [Link ("",[],[]) [Str "Ward\8217s",Space,Str "method."] ("http://en.wikipedia.org/wiki/Ward's_method","")]
-,Header 2 ("horizontal-rules-with-spaces-at-end",[],[]) [Str "Horizontal",Space,Str "rules",Space,Str "with",Space,Str "spaces",Space,Str "at",Space,Str "end"]
-,HorizontalRule
-,HorizontalRule
-,Header 2 ("raw-html-before-header",[],[]) [Str "Raw",Space,Str "HTML",Space,Str "before",Space,Str "header"]
-,Para [RawInline (Format "html") "",RawInline (Format "html") ""]
-,Header 3 ("my-header",[],[]) [Str "my",Space,Str "header"]
-,Header 2 ("in-math",[],[]) [Str "$",Space,Str "in",Space,Str "math"]
-,Para [Math InlineMath "\\$2 + \\$3"]
-,Para [Math InlineMath "x = \\text{the $n$th root of $y$}"]
-,Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "math:"]
-,Para [Str "$PATH",Space,Str "90",Space,Str "$PATH"]
-,Header 2 ("commented-out-list-item",[],[]) [Str "Commented-out",Space,Str "list",Space,Str "item"]
-,BulletList
- [[Plain [Str "one",SoftBreak,RawInline (Format "html") ""]]
- ,[Plain [Str "three"]]]
-,Header 2 ("indented-code-at-beginning-of-list",[],[]) [Str "Indented",Space,Str "code",Space,Str "at",Space,Str "beginning",Space,Str "of",Space,Str "list"]
-,BulletList
- [[CodeBlock ("",[],[]) "code\ncode"
-  ,OrderedList (1,Decimal,Period)
-   [[CodeBlock ("",[],[]) "code\ncode"]
-   ,[CodeBlock ("",[],[]) "code\ncode"]]
-  ,BulletList
-   [[CodeBlock ("",[],[]) "code\ncode"]
-   ,[Plain [Str "no",Space,Str "code"]]]]]
-,Header 2 ("backslash-newline",[],[]) [Str "Backslash",Space,Str "newline"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Header 2 ("code-spans",[],[]) [Str "Code",Space,Str "spans"]
-,Para [Code ("",[],[]) "hi\\"]
-,Para [Code ("",[],[]) "hi there"]
-,Para [Code ("",[],[]) "hi````there"]
-,Para [Str "`hi"]
-,Para [Str "there`"]
-,Header 2 ("multilingual-urls",[],[]) [Str "Multilingual",Space,Str "URLs"]
-,Para [Link ("",[],[]) [Str "http://\27979.com?\27979=\27979"] ("http://\27979.com?\27979=\27979","")]
-,Para [Link ("",[],[]) [Str "foo"] ("/bar/\27979?x=\27979","title")]
-,Para [Link ("",[],[]) [Str "\27979@foo.\27979.baz"] ("mailto:\27979@foo.\27979.baz","")]
-,Header 2 ("numbered-examples",[],[]) [Str "Numbered",Space,Str "examples"]
-,OrderedList (1,Example,TwoParens)
- [[Plain [Str "First",Space,Str "example."]]
- ,[Plain [Str "Second",Space,Str "example."]]]
-,Para [Str "Explanation",Space,Str "of",Space,Str "examples",Space,Str "(2)",Space,Str "and",Space,Str "(3)."]
-,OrderedList (3,Example,TwoParens)
- [[Plain [Str "Third",Space,Str "example."]]]
-,Header 2 ("macros",[],[]) [Str "Macros"]
-,Para [Math InlineMath "\\langle x,y \\rangle"]
-,Header 2 ("case-insensitive-references",[],[]) [Str "Case-insensitive",Space,Str "references"]
-,Para [Link ("",[],[]) [Str "Fum"] ("/fum","")]
-,Para [Link ("",[],[]) [Str "FUM"] ("/fum","")]
-,Para [Link ("",[],[]) [Str "bat"] ("/bat","")]
-,Header 2 ("curly-smart-quotes",[],[]) [Str "Curly",Space,Str "smart",Space,Str "quotes"]
-,Para [Quoted DoubleQuote [Str "Hi"]]
-,Para [Quoted SingleQuote [Str "Hi"]]
-,Header 2 ("consecutive-lists",[],[]) [Str "Consecutive",Space,Str "lists"]
-,BulletList
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]]]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]]]
-,OrderedList (1,LowerAlpha,Period)
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]]]
-,Header 2 ("implicit-header-references",[],[]) [Str "Implicit",Space,Str "header",Space,Str "references"]
-,Header 3 ("my-header-1",[],[]) [Str "My",Space,Str "header"]
-,Header 3 ("my-other-header",[],[]) [Str "My",Space,Str "other",Space,Str "header"]
-,Para [Str "A",Space,Str "link",Space,Str "to",Space,Link ("",[],[]) [Str "My",Space,Str "header"] ("#my-header-1",""),Str "."]
-,Para [Str "Another",Space,Str "link",Space,Str "to",Space,Link ("",[],[]) [Str "it"] ("#my-header-1",""),Str "."]
-,Para [Str "Should",Space,Str "be",Space,Link ("",[],[]) [Str "case",Space,Str "insensitive"] ("#my-header-1",""),Str "."]
-,Para [Str "Link",Space,Str "to",Space,Link ("",[],[]) [Str "Explicit",Space,Str "header",Space,Str "attributes"] ("#foobar",""),Str "."]
-,Para [Str "But",Space,Str "this",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "link",Space,Str "to",Space,Link ("",[],[]) [Str "My",Space,Str "other",Space,Str "header"] ("/foo",""),Str ",",Space,Str "since",Space,Str "the",Space,Str "reference",Space,Str "is",Space,Str "defined."]
-,Header 2 ("foobar",["baz"],[("key","val")]) [Str "Explicit",Space,Str "header",Space,Str "attributes"]
-,BlockQuote
- [Header 2 ("foobar",["baz"],[("key","val")]) [Str "Header",Space,Str "attributes",Space,Str "inside",Space,Str "block",Space,Str "quote"]]
-,Header 2 ("line-blocks",[],[]) [Str "Line",Space,Str "blocks"]
-,LineBlock
- [[Str "But",Space,Str "can",Space,Str "a",Space,Str "bee",Space,Str "be",Space,Str "said",Space,Str "to",Space,Str "be"]
- ,[Str "\160\160\160\160or",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "an",Space,Str "entire",Space,Str "bee,"]
- ,[Str "\160\160\160\160\160\160\160\160when",Space,Str "half",Space,Str "the",Space,Str "bee",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "bee,"]
- ,[Str "\160\160\160\160\160\160\160\160\160\160\160\160due",Space,Str "to",Space,Str "some",Space,Str "ancient",Space,Str "injury?"]
- ,[]
- ,[Str "Continuation",Space,Str "line"]
- ,[Str "\160\160and",Space,Str "another"]]
-,Header 2 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
- [[Plain [Str "col",Space,Str "1"]]
- ,[Plain [Str "col",Space,Str "2"]]
- ,[Plain [Str "col",Space,Str "3"]]]
- [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Para [Str "Headless"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Para [Str "With",Space,Str "alignments"]
-,Table [] [AlignRight,AlignLeft,AlignCenter] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
- [[Plain [Str "col",Space,Str "1"]]
- ,[Plain [Str "col",Space,Str "2"]]
- ,[Plain [Str "col",Space,Str "3"]]]
- [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Para [Str "Headless",Space,Str "with",Space,Str "alignments"]
-,Table [] [AlignRight,AlignLeft,AlignCenter] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]
- [[]
- ,[]
- ,[]]
- [[[Header 1 ("col-1",[],[]) [Str "col",Space,Str "1"]
-   ,Plain [Str "col",Space,Str "1"]]
-  ,[Header 1 ("col-2",[],[]) [Str "col",Space,Str "2"]
-   ,Plain [Str "col",Space,Str "2"]]
-  ,[Header 1 ("col-3",[],[]) [Str "col",Space,Str "3"]
-   ,Plain [Str "col",Space,Str "3"]]]
- ,[[Para [Str "r1",Space,Str "a"]
-   ,Para [Str "r1",Space,Str "bis"]]
-  ,[BulletList
-    [[Plain [Str "b"]]
-    ,[Plain [Str "b",Space,Str "2"]]
-    ,[Plain [Str "b",Space,Str "2"]]]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]]
-,Para [Str "Empty",Space,Str "cells"]
-,Table [] [AlignDefault,AlignDefault] [5.555555555555555e-2,5.555555555555555e-2]
- [[]
- ,[]]
- [[[]
-  ,[]]]
-,Header 2 ("entities-in-links-and-titles",[],[]) [Str "Entities",Space,Str "in",Space,Str "links",Space,Str "and",Space,Str "titles"]
-,Para [Link ("",[],[]) [Str "link"] ("/\252rl","\246\246!")]
-,Para [Link ("",[],[]) [Str "http://g\246\246gle.com"] ("http://g\246\246gle.com","")]
-,Para [Link ("",[],[]) [Str "me@ex\228mple.com"] ("mailto:me@ex\228mple.com","")]
-,Para [Link ("",[],[]) [Str "foobar"] ("/\252rl","\246\246!")]
-,Header 2 ("parentheses-in-urls",[],[]) [Str "Parentheses",Space,Str "in",Space,Str "URLs"]
-,Para [Link ("",[],[]) [Str "link"] ("/hi(there)","")]
-,Para [Link ("",[],[]) [Str "link"] ("/hithere)","")]
-,Para [Link ("",[],[]) [Str "linky"] ("hi_(there_(nested))","")]
-,Header 2 ("backslashes-in-link-references",[],[]) [Str "Backslashes",Space,Str "in",Space,Str "link",Space,Str "references"]
-,Para [Link ("",[],[]) [Str "*",RawInline (Format "tex") "\\a"] ("b","")]
-,Header 2 ("reference-link-fallbacks",[],[]) [Str "Reference",Space,Str "link",Space,Str "fallbacks"]
-,Para [Str "[",Emph [Str "not",Space,Str "a",Space,Str "link"],Str "]",Space,Str "[",Emph [Str "nope"],Str "]\8230"]
-,Header 2 ("reference-link-followed-by-a-citation",[],[]) [Str "Reference",Space,Str "link",Space,Str "followed",Space,Str "by",Space,Str "a",Space,Str "citation"]
-,Para [Str "MapReduce",Space,Str "is",Space,Str "a",Space,Str "paradigm",Space,Str "popularized",Space,Str "by",Space,Link ("",[],[]) [Str "Google"] ("http://google.com",""),Space,Cite [Citation {citationId = "mapreduce", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@mapreduce]"],Space,Str "as",Space,Str "its",SoftBreak,Str "most",Space,Str "vocal",Space,Str "proponent."]
-,Header 2 ("empty-reference-links",[],[]) [Str "Empty",Space,Str "reference",Space,Str "links"]
-,Para [Str "bar"]
-,Para [Link ("",[],[]) [Str "foo2"] ("","")]
-,Header 2 ("wrapping-shouldnt-introduce-new-list-items",[],[]) [Str "Wrapping",Space,Str "shouldn\8217t",Space,Str "introduce",Space,Str "new",Space,Str "list",Space,Str "items"]
-,BulletList
- [[Plain [Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "2015."]]]
-,Header 2 ("bracketed-spans",[],[]) [Str "Bracketed",Space,Str "spans"]
-,Para [Span ("id",["class"],[("key","val")]) [Emph [Str "foo"],Space,Str "bar",Space,Str "baz",Space,Link ("",[],[]) [Str "link"] ("url","")]]]
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "author"
+            , MetaList
+                [ MetaInlines [ Str "Author" , Space , Str "One" ]
+                , MetaInlines [ Str "Author" , Space , Str "Two" ]
+                , MetaInlines [ Str "Author" , Space , Str "Three" ]
+                , MetaInlines [ Str "Author" , Space , Str "Four" ]
+                ]
+            )
+          , ( "title"
+            , MetaInlines
+                [ Str "Title"
+                , SoftBreak
+                , Str "spanning"
+                , Space
+                , Str "multiple"
+                , Space
+                , Str "lines"
+                ]
+            )
+          ]
+    }
+  [ Header
+      1
+      ( "additional-markdown-reader-tests" , [] , [] )
+      [ Str "Additional"
+      , Space
+      , Str "markdown"
+      , Space
+      , Str "reader"
+      , Space
+      , Str "tests"
+      ]
+  , Header
+      2
+      ( "blank-line-before-url-in-link-reference" , [] , [] )
+      [ Str "Blank"
+      , Space
+      , Str "line"
+      , Space
+      , Str "before"
+      , Space
+      , Str "URL"
+      , Space
+      , Str "in"
+      , Space
+      , Str "link"
+      , Space
+      , Str "reference"
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "foo" ] ( "/url" , "" )
+      , Space
+      , Str "and"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url" , "title" )
+      ]
+  , Header
+      2
+      ( "raw-context-environments" , [] , [] )
+      [ Str "Raw"
+      , Space
+      , Str "ConTeXt"
+      , Space
+      , Str "environments"
+      ]
+  , RawBlock (Format "tex") "\\placeformula \\startformula"
+  , Para
+      [ Str "L_{1}"
+      , Space
+      , Str "="
+      , Space
+      , Str "L_{2}"
+      , SoftBreak
+      , RawInline (Format "tex") "\\stopformula"
+      ]
+  , RawBlock
+      (Format "tex")
+      "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"
+  , Header
+      2
+      ( "raw-latex-environments" , [] , [] )
+      [ Str "Raw"
+      , Space
+      , Str "LaTeX"
+      , Space
+      , Str "environments"
+      ]
+  , RawBlock
+      (Format "tex")
+      "\\begin{center}\n\\begin{tikzpicture}[baseline={([yshift=+-.5ex]current bounding box.center)}, level distance=24pt]\n\\Tree [.{S} [.NP John\\index{i} ] [.VP [.V likes ] [.NP himself\\index{i,*j} ]]]\n\\end{tikzpicture}\n\\end{center}"
+  , Header
+      2
+      ( "urls-with-spaces-and-punctuation" , [] , [] )
+      [ Str "URLs"
+      , Space
+      , Str "with"
+      , Space
+      , Str "spaces"
+      , Space
+      , Str "and"
+      , Space
+      , Str "punctuation"
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] ) [ Str "foo" ] ( "/bar%20and%20baz" , "" )
+      , SoftBreak
+      , Link
+          ( "" , [] , [] ) [ Str "foo" ] ( "/bar%20and%20baz" , "" )
+      , SoftBreak
+      , Link
+          ( "" , [] , [] ) [ Str "foo" ] ( "/bar%20and%20baz" , "" )
+      , SoftBreak
+      , Link
+          ( "" , [] , [] ) [ Str "foo" ] ( "bar%20baz" , "title" )
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "baz" ] ( "/foo%20foo" , "" )
+      , Space
+      , Link ( "" , [] , [] ) [ Str "bam" ] ( "/foo%20fee" , "" )
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "bork" ]
+          ( "/foo/zee%20zob" , "title" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "Ward\8217s" , Space , Str "method." ]
+          ( "http://en.wikipedia.org/wiki/Ward's_method" , "" )
+      ]
+  , Header
+      2
+      ( "horizontal-rules-with-spaces-at-end" , [] , [] )
+      [ Str "Horizontal"
+      , Space
+      , Str "rules"
+      , Space
+      , Str "with"
+      , Space
+      , Str "spaces"
+      , Space
+      , Str "at"
+      , Space
+      , Str "end"
+      ]
+  , HorizontalRule
+  , HorizontalRule
+  , Header
+      2
+      ( "raw-html-before-header" , [] , [] )
+      [ Str "Raw"
+      , Space
+      , Str "HTML"
+      , Space
+      , Str "before"
+      , Space
+      , Str "header"
+      ]
+  , Para
+      [ RawInline (Format "html") ""
+      , RawInline (Format "html") ""
+      ]
+  , Header
+      3
+      ( "my-header" , [] , [] )
+      [ Str "my" , Space , Str "header" ]
+  , Header
+      2
+      ( "in-math" , [] , [] )
+      [ Str "$" , Space , Str "in" , Space , Str "math" ]
+  , Para [ Math InlineMath "\\$2 + \\$3" ]
+  , Para
+      [ Math InlineMath "x = \\text{the $n$th root of $y$}" ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "should"
+      , Space
+      , Str "not"
+      , Space
+      , Str "be"
+      , Space
+      , Str "math:"
+      ]
+  , Para
+      [ Str "$PATH" , Space , Str "90" , Space , Str "$PATH" ]
+  , Header
+      2
+      ( "commented-out-list-item" , [] , [] )
+      [ Str "Commented-out"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item"
+      ]
+  , BulletList
+      [ [ Plain [ Str "one" , SoftBreak , Str "" ] ]
+      , [ Plain [ Str "three" ] ]
+      ]
+  , Header
+      2
+      ( "indented-code-at-beginning-of-list" , [] , [] )
+      [ Str "Indented"
+      , Space
+      , Str "code"
+      , Space
+      , Str "at"
+      , Space
+      , Str "beginning"
+      , Space
+      , Str "of"
+      , Space
+      , Str "list"
+      ]
+  , BulletList
+      [ [ CodeBlock ( "" , [] , [] ) "code\ncode"
+        , OrderedList
+            ( 1 , Decimal , Period )
+            [ [ CodeBlock ( "" , [] , [] ) "code\ncode" ]
+            , [ CodeBlock ( "" , [] , [] ) "code\ncode" ]
+            ]
+        , BulletList
+            [ [ CodeBlock ( "" , [] , [] ) "code\ncode" ]
+            , [ Plain [ Str "no" , Space , Str "code" ] ]
+            ]
+        ]
+      ]
+  , Header
+      2
+      ( "backslash-newline" , [] , [] )
+      [ Str "Backslash" , Space , Str "newline" ]
+  , Para [ Str "hi" , LineBreak , Str "there" ]
+  , Header
+      2
+      ( "code-spans" , [] , [] )
+      [ Str "Code" , Space , Str "spans" ]
+  , Para [ Code ( "" , [] , [] ) "hi\\" ]
+  , Para [ Code ( "" , [] , [] ) "hi there" ]
+  , Para [ Code ( "" , [] , [] ) "hi````there" ]
+  , Para [ Str "`hi" ]
+  , Para [ Str "there`" ]
+  , Header
+      2
+      ( "multilingual-urls" , [] , [] )
+      [ Str "Multilingual" , Space , Str "URLs" ]
+  , Para
+      [ Link
+          ( "" , [ "uri" ] , [] )
+          [ Str "http://\27979.com?\27979=\27979" ]
+          ( "http://\27979.com?\27979=\27979" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "foo" ]
+          ( "/bar/\27979?x=\27979" , "title" )
+      ]
+  , Para
+      [ Link
+          ( "" , [ "email" ] , [] )
+          [ Str "\27979@foo.\27979.baz" ]
+          ( "mailto:\27979@foo.\27979.baz" , "" )
+      ]
+  , Header
+      2
+      ( "numbered-examples" , [] , [] )
+      [ Str "Numbered" , Space , Str "examples" ]
+  , OrderedList
+      ( 1 , Example , TwoParens )
+      [ [ Plain [ Str "First" , Space , Str "example." ] ]
+      , [ Plain [ Str "Second" , Space , Str "example." ] ]
+      ]
+  , Para
+      [ Str "Explanation"
+      , Space
+      , Str "of"
+      , Space
+      , Str "examples"
+      , Space
+      , Str "(2)"
+      , Space
+      , Str "and"
+      , Space
+      , Str "(3)."
+      ]
+  , OrderedList
+      ( 3 , Example , TwoParens )
+      [ [ Plain [ Str "Third" , Space , Str "example." ] ] ]
+  , Header 2 ( "macros" , [] , [] ) [ Str "Macros" ]
+  , RawBlock
+      (Format "tex")
+      "\\newcommand{\\tuple}[1]{\\langle #1 \\rangle}"
+  , Para [ Math InlineMath "\\langle x,y \\rangle" ]
+  , Header
+      2
+      ( "case-insensitive-references" , [] , [] )
+      [ Str "Case-insensitive" , Space , Str "references" ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "Fum" ] ( "/fum" , "" ) ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "FUM" ] ( "/fum" , "" ) ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "bat" ] ( "/bat" , "" ) ]
+  , Header
+      2
+      ( "curly-smart-quotes" , [] , [] )
+      [ Str "Curly" , Space , Str "smart" , Space , Str "quotes" ]
+  , Para [ Str "\8220Hi\8221" ]
+  , Para [ Str "\8216Hi\8217" ]
+  , Header
+      2
+      ( "consecutive-lists" , [] , [] )
+      [ Str "Consecutive" , Space , Str "lists" ]
+  , BulletList
+      [ [ Plain [ Str "one" ] ] , [ Plain [ Str "two" ] ] ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Plain [ Str "one" ] ] , [ Plain [ Str "two" ] ] ]
+  , OrderedList
+      ( 1 , LowerAlpha , Period )
+      [ [ Plain [ Str "one" ] ] , [ Plain [ Str "two" ] ] ]
+  , Header
+      2
+      ( "implicit-header-references" , [] , [] )
+      [ Str "Implicit"
+      , Space
+      , Str "header"
+      , Space
+      , Str "references"
+      ]
+  , Header
+      3
+      ( "my-header-1" , [] , [] )
+      [ Str "My" , Space , Str "header" ]
+  , Header
+      3
+      ( "my-other-header" , [] , [] )
+      [ Str "My" , Space , Str "other" , Space , Str "header" ]
+  , Para
+      [ Str "A"
+      , Space
+      , Str "link"
+      , Space
+      , Str "to"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "My" , Space , Str "header" ]
+          ( "#my-header" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Another"
+      , Space
+      , Str "link"
+      , Space
+      , Str "to"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "it" ] ( "#my-header" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Should"
+      , Space
+      , Str "be"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "case" , Space , Str "insensitive" ]
+          ( "#my-header" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Link"
+      , Space
+      , Str "to"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "Explicit"
+          , Space
+          , Str "header"
+          , Space
+          , Str "attributes"
+          ]
+          ( "#foobar" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "But"
+      , Space
+      , Str "this"
+      , Space
+      , Str "is"
+      , Space
+      , Str "not"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link"
+      , Space
+      , Str "to"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "My" , Space , Str "other" , Space , Str "header" ]
+          ( "/foo" , "" )
+      , Str ","
+      , Space
+      , Str "since"
+      , Space
+      , Str "the"
+      , Space
+      , Str "reference"
+      , Space
+      , Str "is"
+      , Space
+      , Str "defined."
+      ]
+  , Header
+      2
+      ( "foobar" , [ "baz" ] , [ ( "key" , "val" ) ] )
+      [ Str "Explicit"
+      , Space
+      , Str "header"
+      , Space
+      , Str "attributes"
+      ]
+  , BlockQuote
+      [ Header
+          2
+          ( "foobar" , [ "baz" ] , [ ( "key" , "val" ) ] )
+          [ Str "Header"
+          , Space
+          , Str "attributes"
+          , Space
+          , Str "inside"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote"
+          ]
+      ]
+  , Header
+      2
+      ( "line-blocks" , [] , [] )
+      [ Str "Line" , Space , Str "blocks" ]
+  , LineBlock
+      [ [ Str "But"
+        , Space
+        , Str "can"
+        , Space
+        , Str "a"
+        , Space
+        , Str "bee"
+        , Space
+        , Str "be"
+        , Space
+        , Str "said"
+        , Space
+        , Str "to"
+        , Space
+        , Str "be"
+        ]
+      , [ Str "\160\160\160\160or"
+        , Space
+        , Str "not"
+        , Space
+        , Str "to"
+        , Space
+        , Str "be"
+        , Space
+        , Str "an"
+        , Space
+        , Str "entire"
+        , Space
+        , Str "bee,"
+        ]
+      , [ Str "\160\160\160\160\160\160\160\160when"
+        , Space
+        , Str "half"
+        , Space
+        , Str "the"
+        , Space
+        , Str "bee"
+        , Space
+        , Str "is"
+        , Space
+        , Str "not"
+        , Space
+        , Str "a"
+        , Space
+        , Str "bee,"
+        ]
+      , [ Str
+            "\160\160\160\160\160\160\160\160\160\160\160\160due"
+        , Space
+        , Str "to"
+        , Space
+        , Str "some"
+        , Space
+        , Str "ancient"
+        , Space
+        , Str "injury?"
+        ]
+      , []
+      , [ Str "Continuation" , Space , Str "line" ]
+      , [ Str "\160\160and" , Space , Str "another" ]
+      ]
+  , Header
+      2
+      ( "grid-tables" , [] , [] )
+      [ Str "Grid" , Space , Str "Tables" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.2638888888888889 )
+      , ( AlignDefault , ColWidth 0.16666666666666666 )
+      , ( AlignDefault , ColWidth 0.18055555555555555 )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "1" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "2" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "3" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "r1"
+                      , Space
+                      , Str "a"
+                      , SoftBreak
+                      , Str "r1"
+                      , Space
+                      , Str "bis"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "b"
+                      , SoftBreak
+                      , Str "b"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "c"
+                      , SoftBreak
+                      , Str "c"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para [ Str "Headless" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.2638888888888889 )
+      , ( AlignDefault , ColWidth 0.16666666666666666 )
+      , ( AlignDefault , ColWidth 0.18055555555555555 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "r1"
+                      , Space
+                      , Str "a"
+                      , SoftBreak
+                      , Str "r1"
+                      , Space
+                      , Str "bis"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "b"
+                      , SoftBreak
+                      , Str "b"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "c"
+                      , SoftBreak
+                      , Str "c"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para [ Str "With" , Space , Str "alignments" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignRight , ColWidth 0.2638888888888889 )
+      , ( AlignLeft , ColWidth 0.16666666666666666 )
+      , ( AlignCenter , ColWidth 0.18055555555555555 )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "1" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "2" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "3" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "r1"
+                      , Space
+                      , Str "a"
+                      , SoftBreak
+                      , Str "r1"
+                      , Space
+                      , Str "bis"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "b"
+                      , SoftBreak
+                      , Str "b"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "c"
+                      , SoftBreak
+                      , Str "c"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Headless"
+      , Space
+      , Str "with"
+      , Space
+      , Str "alignments"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignRight , ColWidth 0.2638888888888889 )
+      , ( AlignLeft , ColWidth 0.16666666666666666 )
+      , ( AlignCenter , ColWidth 0.18055555555555555 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "r1"
+                      , Space
+                      , Str "a"
+                      , SoftBreak
+                      , Str "r1"
+                      , Space
+                      , Str "bis"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "b"
+                      , SoftBreak
+                      , Str "b"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "c"
+                      , SoftBreak
+                      , Str "c"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Spaces"
+      , Space
+      , Str "at"
+      , Space
+      , Str "ends"
+      , Space
+      , Str "of"
+      , Space
+      , Str "lines"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.2638888888888889 )
+      , ( AlignDefault , ColWidth 0.16666666666666666 )
+      , ( AlignDefault , ColWidth 0.18055555555555555 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "r1"
+                      , Space
+                      , Str "a"
+                      , SoftBreak
+                      , Str "r1"
+                      , Space
+                      , Str "bis"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "b"
+                      , SoftBreak
+                      , Str "b"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "c"
+                      , SoftBreak
+                      , Str "c"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Multiple"
+      , Space
+      , Str "blocks"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "cell"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.2638888888888889 )
+      , ( AlignDefault , ColWidth 0.16666666666666666 )
+      , ( AlignDefault , ColWidth 0.18055555555555555 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Header
+                      1
+                      ( "col-1" , [] , [] )
+                      [ Str "col" , Space , Str "1" ]
+                  , Para [ Str "col" , Space , Str "1" ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Header
+                      1
+                      ( "col-2" , [] , [] )
+                      [ Str "col" , Space , Str "2" ]
+                  , Para [ Str "col" , Space , Str "2" ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Header
+                      1
+                      ( "col-3" , [] , [] )
+                      [ Str "col" , Space , Str "3" ]
+                  , Para [ Str "col" , Space , Str "3" ]
+                  ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "r1" , Space , Str "a" ]
+                  , Para [ Str "r1" , Space , Str "bis" ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ BulletList
+                      [ [ Plain [ Str "b" ] ]
+                      , [ Plain [ Str "b" , Space , Str "2" ] ]
+                      , [ Plain [ Str "b" , Space , Str "2" ] ]
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "c"
+                      , SoftBreak
+                      , Str "c"
+                      , Space
+                      , Str "2"
+                      , SoftBreak
+                      , Str "c"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "East"
+      , Space
+      , Str "Asian"
+      , Space
+      , Str "characters"
+      , Space
+      , Str "have"
+      , Space
+      , Str "double"
+      , Space
+      , Str "width"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 4.1666666666666664e-2 )
+      , ( AlignDefault , ColWidth 6.944444444444445e-2 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "\39770" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "fish" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Zero-width"
+      , Space
+      , Str "space"
+      , Space
+      , Str "in"
+      , Space
+      , Str "German"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.1111111111111111 )
+      , ( AlignDefault , ColWidth 0.1111111111111111 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "German" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "English" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Auf\8204lage" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "edition" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Zero-width"
+      , Space
+      , Str "non-joiner"
+      , Space
+      , Str "in"
+      , Space
+      , Str "Persian"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.1111111111111111 )
+      , ( AlignDefault , ColWidth 0.1388888888888889 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "\1605\1740\8204\1582\1608\1575\1607\1605" ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "I"
+                      , Space
+                      , Str "want"
+                      , Space
+                      , Str "to"
+                      ]
+                  ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para [ Str "Empty" , Space , Str "cells" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 5.555555555555555e-2 )
+      , ( AlignDefault , ColWidth 5.555555555555555e-2 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  []
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  []
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Table"
+      , Space
+      , Str "with"
+      , Space
+      , Str "cells"
+      , Space
+      , Str "spanning"
+      , Space
+      , Str "multiple"
+      , Space
+      , Str "rows"
+      , Space
+      , Str "or"
+      , Space
+      , Str "columns:"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.19444444444444445 )
+      , ( AlignDefault , ColWidth 0.1111111111111111 )
+      , ( AlignDefault , ColWidth 0.1527777777777778 )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 2)
+                 [ Plain [ Str "Property" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Earth" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 3)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "Temperature"
+                      , SoftBreak
+                      , Str "1961-1990"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "min" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "-89.2" , Space , Str "\176C" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "mean" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "14" , Space , Str "\176C" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "min" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "56.7" , Space , Str "\176C" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Table"
+      , Space
+      , Str "with"
+      , Space
+      , Str "complex"
+      , Space
+      , Str "header:"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.3055555555555556 )
+      , ( AlignDefault , ColWidth 0.1111111111111111 )
+      , ( AlignDefault , ColWidth 0.1111111111111111 )
+      , ( AlignDefault , ColWidth 0.1111111111111111 )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 2)
+                 (ColSpan 1)
+                 [ Plain [ Str "Location" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 3)
+                 [ Plain
+                     [ Str "Temperature"
+                     , Space
+                     , Str "1961-1990"
+                     , SoftBreak
+                     , Str "in"
+                     , Space
+                     , Str "degree"
+                     , Space
+                     , Str "Celsius"
+                     ]
+                 ]
+             ]
+         , Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "min" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "mean" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "max" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Antarctica" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "-89.2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "N/A" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "19.8" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Earth" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "-89.2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "14" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "56.7" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Header
+      2
+      ( "entities-in-links-and-titles" , [] , [] )
+      [ Str "Entities"
+      , Space
+      , Str "in"
+      , Space
+      , Str "links"
+      , Space
+      , Str "and"
+      , Space
+      , Str "titles"
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] ) [ Str "link" ] ( "/\252rl" , "\246\246!" )
+      ]
+  , Para
+      [ Link
+          ( "" , [ "uri" ] , [] )
+          [ Str "http://g\246\246gle.com" ]
+          ( "http://g\246\246gle.com" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [ "email" ] , [] )
+          [ Str "me@ex\228mple.com" ]
+          ( "mailto:me@ex\228mple.com" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "foobar" ]
+          ( "/\252rl" , "\246\246!" )
+      ]
+  , Header
+      2
+      ( "parentheses-in-urls" , [] , [] )
+      [ Str "Parentheses"
+      , Space
+      , Str "in"
+      , Space
+      , Str "URLs"
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "link" ] ( "/hi(there)" , "" )
+      ]
+  , Para
+      [ Link ( "" , [] , [] ) [ Str "link" ] ( "/hithere)" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "linky" ]
+          ( "hi_(there_(nested))" , "" )
+      ]
+  , Header
+      2
+      ( "backslashes-in-link-references" , [] , [] )
+      [ Str "Backslashes"
+      , Space
+      , Str "in"
+      , Space
+      , Str "link"
+      , Space
+      , Str "references"
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "*" , RawInline (Format "tex") "\\a" ]
+          ( "b" , "" )
+      ]
+  , Header
+      2
+      ( "reference-link-fallbacks" , [] , [] )
+      [ Str "Reference"
+      , Space
+      , Str "link"
+      , Space
+      , Str "fallbacks"
+      ]
+  , Para
+      [ Str "["
+      , Emph [ Str "not" , Space , Str "a" , Space , Str "link" ]
+      , Str "]"
+      , Space
+      , Str "["
+      , Emph [ Str "nope" ]
+      , Str "]\8230"
+      ]
+  , Header
+      2
+      ( "reference-link-followed-by-a-citation" , [] , [] )
+      [ Str "Reference"
+      , Space
+      , Str "link"
+      , Space
+      , Str "followed"
+      , Space
+      , Str "by"
+      , Space
+      , Str "a"
+      , Space
+      , Str "citation"
+      ]
+  , Para
+      [ Str "MapReduce"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paradigm"
+      , Space
+      , Str "popularized"
+      , Space
+      , Str "by"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "Google" ]
+          ( "http://google.com" , "" )
+      , Space
+      , Cite
+          [ Citation
+              { citationId = "mapreduce"
+              , citationPrefix = []
+              , citationSuffix = []
+              , citationMode = NormalCitation
+              , citationNoteNum = 2
+              , citationHash = 0
+              }
+          ]
+          [ Str "[@mapreduce]" ]
+      , Space
+      , Str "as"
+      , Space
+      , Str "its"
+      , SoftBreak
+      , Str "most"
+      , Space
+      , Str "vocal"
+      , Space
+      , Str "proponent."
+      ]
+  , Header
+      2
+      ( "empty-reference-links" , [] , [] )
+      [ Str "Empty"
+      , Space
+      , Str "reference"
+      , Space
+      , Str "links"
+      ]
+  , Para [ Str "bar" ]
+  , Para [ Link ( "" , [] , [] ) [ Str "foo2" ] ( "" , "" ) ]
+  , Header
+      2
+      ( "wrapping-shouldnt-introduce-new-list-items" , [] , [] )
+      [ Str "Wrapping"
+      , Space
+      , Str "shouldn\8217t"
+      , Space
+      , Str "introduce"
+      , Space
+      , Str "new"
+      , Space
+      , Str "list"
+      , Space
+      , Str "items"
+      ]
+  , BulletList
+      [ [ Plain
+            [ Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "blah"
+            , Space
+            , Str "2015."
+            ]
+        ]
+      ]
+  , Header
+      2
+      ( "bracketed-spans" , [] , [] )
+      [ Str "Bracketed" , Space , Str "spans" ]
+  , Para
+      [ Span
+          ( "id" , [ "class" ] , [ ( "key" , "val" ) ] )
+          [ Emph [ Str "foo" ]
+          , Space
+          , Str "bar"
+          , Space
+          , Str "baz"
+          , Space
+          , Link ( "" , [] , [] ) [ Str "link" ] ( "url" , "" )
+          ]
+      ]
+  ]
diff --git a/test/markdown-reader-more.txt b/test/markdown-reader-more.txt
--- a/test/markdown-reader-more.txt
+++ b/test/markdown-reader-more.txt
@@ -260,11 +260,57 @@
 | r1 bis           | - b 2     | c 2        |
 +------------------+-----------+------------+
 
+East Asian characters have double width
+
++--+----+
+|魚|fish|
++--+----+
+
+Zero-width space in German
+
++-------+-------+
+|German |English|
++-------+-------+
+|Auf‌lage|edition|
++-------+-------+
+
+Zero-width non-joiner in Persian
+
++-------+---------+
+|می‌خواهم|I want to|
++-------+---------+
+
 Empty cells
 
 +---+---+
 |   |   |
 +---+---+
+
+
+Table with cells spanning multiple rows or columns:
+
++---------------------+----------+
+| Property            | Earth    |
++=============+=======+==========+
+|             | min   | -89.2 °C |
+| Temperature +-------+----------+
+| 1961-1990   | mean  | 14 °C    |
+|             +-------+----------+
+|             | min   | 56.7 °C  |
++-------------+-------+----------+
+
+Table with complex header:
+
++---------------------+-----------------------+
+| Location            | Temperature 1961-1990 |
+|                     | in degree Celsius     |
+|                     +-------+-------+-------+
+|                     | min   | mean  | max   |
++=====================+=======+=======+=======+
+| Antarctica          | -89.2 | N/A   | 19.8  |
++---------------------+-------+-------+-------+
+| Earth               | -89.2 | 14    | 56.7  |
++---------------------+-------+-------+-------+
 
 ## Entities in links and titles
 
diff --git a/test/mediawiki-reader.native b/test/mediawiki-reader.native
--- a/test/mediawiki-reader.native
+++ b/test/mediawiki-reader.native
@@ -1,262 +1,1395 @@
-Pandoc (Meta {unMeta = fromList []})
-[Header 1 ("header",[],[]) [Str "header"]
-,Header 2 ("header-level-two",[],[]) [Str "header",Space,Str "level",Space,Str "two"]
-,Header 3 ("header-level-3",[],[]) [Str "header",Space,Str "level",Space,Str "3"]
-,Header 4 ("header-level-four",[],[]) [Str "header",Space,Emph [Str "level"],Space,Str "four"]
-,Header 5 ("header-level-5",[],[]) [Str "header",Space,Str "level",Space,Str "5"]
-,Header 6 ("header-level-6",[],[]) [Str "header",Space,Str "level",Space,Str "6"]
-,Para [Str "=======",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "========"]
-,Para [Code ("",[],[]) "==\160not\160a\160header\160=="]
-,Header 2 ("emph-and-strong",[],[]) [Str "emph",Space,Str "and",Space,Str "strong"]
-,Para [Emph [Str "emph"],Space,Strong [Str "strong"]]
-,Para [Strong [Emph [Str "strong",Space,Str "and",Space,Str "emph"]]]
-,Para [Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]]
-,Para [Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]]
-,Para [Emph [Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]]
-,Header 2 ("horizontal-rule",[],[]) [Str "horizontal",Space,Str "rule"]
-,Para [Str "top"]
-,HorizontalRule
-,Para [Str "bottom"]
-,HorizontalRule
-,Header 2 ("nowiki",[],[]) [Str "nowiki"]
-,Para [Str "''not",Space,Str "emph''"]
-,Header 2 ("strikeout",[],[]) [Str "strikeout"]
-,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "struck",Space,Str "out"]]]
-,Header 2 ("entities",[],[]) [Str "entities"]
-,Para [Str "hi",Space,Str "&",Space,Str "low"]
-,Para [Str "hi",Space,Str "&",Space,Str "low"]
-,Para [Str "G\246del"]
-,Para [Str "\777\2730"]
-,Header 2 ("comments",[],[]) [Str "comments"]
-,Para [Str "inline",Space,Str "comment"]
-,Para [Str "between",Space,Str "blocks"]
-,Header 2 ("linebreaks",[],[]) [Str "linebreaks"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Header 2 ("indents",[],[]) [Str ":",Space,Str "indents"]
-,Para [Str "hi"]
-,DefinitionList
- [([],
-   [[Plain [Str "there"]]])]
-,Para [Str "bud"]
-,Para [Str "hi"]
-,DefinitionList
- [([],
-   [[DefinitionList
-     [([],
-       [[Plain [Str "there"]]])]]])]
-,Para [Str "bud"]
-,Header 2 ("p-tags",[],[]) [Str "p",Space,Str "tags"]
-,Para [Str "hi",Space,Str "there"]
-,Para [Str "bud"]
-,Para [Str "another"]
-,Header 2 ("raw-html",[],[]) [Str "raw",Space,Str "html"]
-,Para [Str "hi",Space,RawInline (Format "html") "",Emph [Str "there"],RawInline (Format "html") "",Str "."]
-,Para [RawInline (Format "html") "",Str "inserted",RawInline (Format "html") ""]
-,RawBlock (Format "html") "
    "
-,Para [Str "hi",Space,Emph [Str "there"]]
-,RawBlock (Format "html") "
    "
-,Header 2 ("sup-sub-del",[],[]) [Str "sup,",Space,Str "sub,",Space,Str "del"]
-,Para [Str "H",Subscript [Str "2"],Str "O",Space,Str "base",Superscript [Emph [Str "exponent"]],SoftBreak,Strikeout [Str "hello"]]
-,Header 2 ("inline-code",[],[]) [Str "inline",Space,Str "code"]
-,Para [Code ("",[],[]) "*\8594*",Space,Code ("",[],[]) "typed",Space,Code ("",["haskell"],[]) ">>="]
-,Header 2 ("code-blocks",[],[]) [Str "code",Space,Str "blocks"]
-,CodeBlock ("",[],[]) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
-,CodeBlock ("",["haskell"],[]) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
-,CodeBlock ("",["ruby","numberLines"],[("startFrom","100")]) "widgets.each do |w|\n  print w.price\nend"
-,Header 2 ("block-quotes",[],[]) [Str "block",Space,Str "quotes"]
-,Para [Str "Regular",Space,Str "paragraph"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote."]
- ,Para [Str "With",Space,Str "two",Space,Str "paragraphs."]]
-,Para [Str "Nother",Space,Str "paragraph."]
-,Header 2 ("external-links",[],[]) [Str "external",Space,Str "links"]
-,Para [Link ("",[],[]) [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
-,Para [Link ("",[],[]) [Str "http://pandoc.org"] ("http://pandoc.org","")]
-,Para [Link ("",[],[]) [Str "1"] ("http://google.com",""),Space,Link ("",[],[]) [Str "2"] ("http://yahoo.com","")]
-,Para [Link ("",[],[]) [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
-,Header 2 ("internal-links",[],[]) [Str "internal",Space,Str "links"]
-,Para [Link ("",[],[]) [Str "Help"] ("Help","wikilink")]
-,Para [Link ("",[],[]) [Str "the",Space,Str "help",Space,Str "page"] ("Help","wikilink")]
-,Para [Link ("",[],[]) [Str "Helpers"] ("Help","wikilink")]
-,Para [Link ("",[],[]) [Str "Help"] ("Help","wikilink"),Str "ers"]
-,Para [Link ("",[],[]) [Str "Contents"] ("Help:Contents","wikilink")]
-,Para [Link ("",[],[]) [Str "#My",Space,Str "anchor"] ("#My_anchor","wikilink")]
-,Para [Link ("",[],[]) [Str "and",Space,Str "text"] ("Page#with_anchor","wikilink")]
-,Header 2 ("images",[],[]) [Str "images"]
-,Para [Image ("",[],[]) [Str "caption"] ("example.jpg","fig:caption")]
-,Para [Image ("",[],[]) [Str "the",Space,Emph [Str "caption"],Space,Str "with",Space,Link ("",[],[]) [Str "external",Space,Str "link"] ("http://google.com","")] ("example.jpg","fig:the caption with external link")]
-,Para [Image ("",[],[("width","30"),("height","40")]) [Str "caption"] ("example.jpg","fig:caption")]
-,Para [Image ("",[],[("width","30")]) [Str "caption"] ("example.jpg","fig:caption")]
-,Para [Image ("",[],[("width","30")]) [Str "caption"] ("example.jpg","fig:caption")]
-,Para [Image ("",[],[]) [Str "example.jpg"] ("example.jpg","fig:example.jpg")]
-,Para [Image ("",[],[]) [Str "example_es.jpg"] ("example_es.jpg","fig:example_es.jpg")]
-,Header 2 ("lists",[],[]) [Str "lists"]
-,BulletList
- [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]
- ,[Plain [Str "with",Space,Str "an",Space,Str "asterisk",Space,Str "(*)."]
-  ,BulletList
-   [[Plain [Str "More",Space,Str "asterisks",Space,Str "gives",Space,Str "deeper"]
-    ,BulletList
-     [[Plain [Str "and",Space,Str "deeper",Space,Str "levels."]]]]]]
- ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]
-  ,BulletList
-   [[BulletList
-     [[Plain [Str "But",Space,Str "jumping",Space,Str "levels",Space,Str "creates",Space,Str "empty",Space,Str "space."]]]]]]]
-,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "ends",Space,Str "the",Space,Str "list."]
-,BulletList
- [[BulletList
-   [[Plain [Str "two"]]]]
- ,[Plain [Str "one"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]
- ,[Plain [Str "with",Space,Str "a",Space,Str "number",Space,Str "sign",Space,Str "(#)."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "More",Space,Str "number",Space,Str "signs",Space,Str "gives",Space,Str "deeper"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "and",Space,Str "deeper"]]
-     ,[Plain [Str "levels."]]]]]]
- ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "But",Space,Str "jumping",Space,Str "levels",Space,Str "creates",Space,Str "empty",Space,Str "space."]]]]]]
- ,[Plain [Str "Blank",Space,Str "lines"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "end",Space,Str "the",Space,Str "list",Space,Str "and",Space,Str "start",Space,Str "another."]]]
-,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "also",SoftBreak,Str "ends",Space,Str "the",Space,Str "list."]
-,DefinitionList
- [([Str "item",Space,Str "1"],
-   [[Plain [Str "definition",Space,Str "1"]]])
- ,([Str "item",Space,Str "2"],
-   [[Plain [Str "definition",Space,Str "2-1"]]
-   ,[Plain [Str "definition",Space,Str "2-2"]]])]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]
-  ,BulletList
-   [[Plain [Str "two",Space,Str "point",Space,Str "one"]]
-   ,[Plain [Str "two",Space,Str "point",Space,Str "two"]]]]
- ,[Plain [Str "three"]
-  ,DefinitionList
-   [([Str "three",Space,Str "item",Space,Str "one"],
-     [[Plain [Str "three",Space,Str "def",Space,Str "one"]]])]]
- ,[Plain [Str "four"]
-  ,DefinitionList
-   [([],
-     [[Plain [Str "four",Space,Str "def",Space,Str "one"]]
-     ,[Plain [Str "this",Space,Str "looks",Space,Str "like",Space,Str "a",Space,Str "continuation"]]
-     ,[Plain [Str "and",Space,Str "is",Space,Str "often",Space,Str "used"]]
-     ,[Plain [Str "instead",LineBreak,Str "of",Space,Str "
    "]]])]]
- ,[Plain [RawInline (Format "mediawiki") "{{{template\n|author=John\n|title=My Book\n}}}"]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "five",Space,Str "sub",Space,Str "1"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "five",Space,Str "sub",Space,Str "1",Space,Str "sub",Space,Str "1"]]]]
-   ,[Plain [Str "five",Space,Str "sub",Space,Str "2"]]]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "list",Space,Str "item",Space,Emph [Str "emph"]]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "list",Space,Str "item",Space,Str "B1"]]
-   ,[Plain [Str "list",Space,Str "item",Space,Str "B2"]]]
-  ,Para [Str "continuing",Space,Str "list",Space,Str "item",Space,Str "A1"]]
- ,[Plain [Str "list",Space,Str "item",Space,Str "A2"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "abc"]]
- ,[Plain [Str "def"]]
- ,[Plain [Str "ghi"]]]
-,OrderedList (9,DefaultStyle,DefaultDelim)
- [[Plain [Str "Amsterdam"]]
- ,[Plain [Str "Rotterdam"]]
- ,[Plain [Str "The",Space,Str "Hague"]]]
-,Header 2 ("math",[],[]) [Str "math"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Math InlineMath "x=\\frac{y^\\pi}{z}",Str "."]
-,Para [Str "With",Space,Str "spaces:",Space,Math InlineMath "x=\\frac{y^\\pi}{z}",Str "."]
-,Header 2 ("preformatted-blocks",[],[]) [Str "preformatted",Space,Str "blocks"]
-,Para [Code ("",[],[]) "Start\160each\160line\160with\160a\160space.",LineBreak,Code ("",[],[]) "Text\160is\160",Strong [Code ("",[],[]) "preformatted"],Code ("",[],[]) "\160and",LineBreak,Emph [Code ("",[],[]) "markups"],Code ("",[],[]) "\160",Strong [Emph [Code ("",[],[]) "can"]],Code ("",[],[]) "\160be\160done."]
-,Para [Code ("",[],[]) "\160hell\160\160\160\160\160\160yeah"]
-,Para [Code ("",[],[]) "Start\160with\160a\160space\160in\160the\160first\160column,",LineBreak,Code ("",[],[]) "(before\160the\160).",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "Then\160your\160block\160format\160will\160be",LineBreak,Code ("",[],[]) "\160\160\160\160maintained.",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "This\160is\160good\160for\160copying\160in\160code\160blocks:",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "def\160function():",LineBreak,Code ("",[],[]) "\160\160\160\160\"\"\"documentation\160string\"\"\"",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "\160\160\160\160if\160True:",LineBreak,Code ("",[],[]) "\160\160\160\160\160\160\160\160print\160True",LineBreak,Code ("",[],[]) "\160\160\160\160else:",LineBreak,Code ("",[],[]) "\160\160\160\160\160\160\160\160print\160False"]
-,Para [Str "Not"]
-,RawBlock (Format "html") "
    "
-,Para [Str "preformatted"]
-,Para [Str "Don't",Space,Str "need"]
-,Para [Code ("",[],[]) "a\160blank\160line"]
-,Para [Str "around",Space,Str "a",Space,Str "preformatted",Space,Str "block."]
-,Header 2 ("templates",[],[]) [Str "templates"]
-,RawBlock (Format "mediawiki") "{{Welcome}}"
-,RawBlock (Format "mediawiki") "{{Foo:Bar}}"
-,RawBlock (Format "mediawiki") "{{Thankyou|all your effort|Me}}"
-,Para [Str "Written",Space,RawInline (Format "mediawiki") "{{{date}}}",Space,Str "by",Space,RawInline (Format "mediawiki") "{{{name}}}",Str "."]
-,Header 2 ("tables",[],[]) [Str "tables"]
-,Table [] [AlignDefault,AlignDefault] [0.0,0.0]
- [[]
- ,[]]
- [[[Para [Str "Orange"]]
-  ,[Para [Str "Apple"]]]
- ,[[Para [Str "Bread"]]
-  ,[Para [Str "Pie"]]]
- ,[[Para [Str "Butter"]]
-  ,[Para [Str "Ice",Space,Str "cream"]]]]
-,Table [Str "Food",Space,Str "complements"] [AlignDefault,AlignDefault] [0.0,0.0]
- [[Para [Str "Orange"]]
- ,[Para [Str "Apple"]]]
- [[[Para [Str "Bread"]]
-  ,[Para [Str "Pie"]]]
- ,[[Para [Str "Butter"]]
-  ,[Para [Str "Ice",Space,Str "cream"]]]]
-,Table [Str "Food",Space,Str "complements"] [AlignDefault,AlignDefault] [0.0,0.0]
- [[Para [Str "Orange"]]
- ,[Para [Str "Apple"]]]
- [[[Para [Str "Bread"]
-   ,Para [Str "and",Space,Str "cheese"]]
-  ,[Para [Str "Pie"]
-   ,OrderedList (1,DefaultStyle,DefaultDelim)
-    [[Plain [Str "apple"]]
-    ,[Plain [Str "carrot"]]]]]]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Para [Str "Orange"]]
-  ,[Para [Str "Apple"]]
-  ,[Para [Str "more"]]]
- ,[[Para [Str "Bread"]]
-  ,[Para [Str "Pie"]]
-  ,[Para [Str "more"]]]
- ,[[Para [Str "Butter"]]
-  ,[Para [Str "Ice",Space,Str "cream"]]
-  ,[Para [Str "and",Space,Str "more"]]]]
-,Table [] [AlignLeft,AlignRight,AlignCenter] [0.25,0.125,0.125]
- [[Para [Str "Left"]]
- ,[Para [Str "Right"]]
- ,[Para [Str "Center"]]]
- [[[Para [Str "left"]]
-  ,[Para [Str "15.00"]]
-  ,[Para [Str "centered"]]]
- ,[[Para [Str "more"]]
-  ,[Para [Str "2.0"]]
-  ,[Para [Str "more"]]]]
-,Table [] [AlignDefault,AlignDefault] [0.0,0.0]
- [[]
- ,[]]
- [[[Para [Str "Orange"]]
-  ,[Para [Str "Apple"]]]
- ,[[Para [Str "Bread"]]
-  ,[Table [] [AlignDefault,AlignDefault] [0.0,0.0]
-    [[Para [Str "fruit"]]
-    ,[Para [Str "topping"]]]
-    [[[Para [Str "apple"]]
-     ,[Para [Str "ice",Space,Str "cream"]]]]]]
- ,[[Para [Str "Butter"]]
-  ,[Para [Str "Ice",Space,Str "cream"]]]]
-,Table [] [AlignDefault] [0.0]
- [[]]
- [[[Para [Str "Orange"]]]]
-,Para [Str "Paragraph",Space,Str "after",Space,Str "the",Space,Str "table."]
-,Table [] [AlignDefault,AlignDefault] [0.0,0.0]
- [[Para [Str "fruit"]]
- ,[Para [Str "topping"]]]
- [[[Para [Str "apple"]]
-  ,[Para [Str "ice",Space,Str "cream"]]]]
-,Header 2 ("notes",[],[]) [Str "notes"]
-,Para [Str "My",Space,Str "note!",Note [Plain [Str "This."]]]
-,Para [Str "URL",Space,Str "note.",Note [Plain [Link ("",[],[]) [Str "http://docs.python.org/library/functions.html#range"] ("http://docs.python.org/library/functions.html#range","")]]]]
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Header 1 ( "header" , [] , [] ) [ Str "header" ]
+  , Header
+      2
+      ( "header_level_two" , [] , [] )
+      [ Str "header" , Space , Str "level" , Space , Str "two" ]
+  , Header
+      3
+      ( "header_level_3" , [] , [] )
+      [ Str "header" , Space , Str "level" , Space , Str "3" ]
+  , Header
+      4
+      ( "header_level_four" , [] , [] )
+      [ Str "header"
+      , Space
+      , Emph [ Str "level" ]
+      , Space
+      , Str "four"
+      ]
+  , Header
+      5
+      ( "header_level_5" , [] , [] )
+      [ Str "header" , Space , Str "level" , Space , Str "5" ]
+  , Header
+      6
+      ( "header_level_6" , [] , [] )
+      [ Str "header" , Space , Str "level" , Space , Str "6" ]
+  , Para
+      [ Str "======="
+      , Space
+      , Str "not"
+      , Space
+      , Str "a"
+      , Space
+      , Str "header"
+      , Space
+      , Str "========"
+      ]
+  , Para
+      [ Code ( "" , [] , [] ) "==\160not\160a\160header\160==" ]
+  , Header
+      2
+      ( "emph_and_strong" , [] , [] )
+      [ Str "emph" , Space , Str "and" , Space , Str "strong" ]
+  , Para
+      [ Emph [ Str "emph" ] , Space , Strong [ Str "strong" ] ]
+  , Para
+      [ Strong
+          [ Emph
+              [ Str "strong" , Space , Str "and" , Space , Str "emph" ]
+          ]
+      ]
+  , Para
+      [ Strong
+          [ Emph [ Str "emph" , Space , Str "inside" ]
+          , Space
+          , Str "strong"
+          ]
+      ]
+  , Para
+      [ Strong
+          [ Str "strong"
+          , Space
+          , Str "with"
+          , Space
+          , Emph [ Str "emph" ]
+          ]
+      ]
+  , Para
+      [ Emph
+          [ Strong [ Str "strong" , Space , Str "inside" ]
+          , Space
+          , Str "emph"
+          ]
+      ]
+  , Header
+      2
+      ( "horizontal_rule" , [] , [] )
+      [ Str "horizontal" , Space , Str "rule" ]
+  , Para [ Str "top" ]
+  , HorizontalRule
+  , Para [ Str "bottom" ]
+  , HorizontalRule
+  , Header 2 ( "nowiki" , [] , [] ) [ Str "nowiki" ]
+  , Para [ Str "''not" , Space , Str "emph''" ]
+  , Header 2 ( "strikeout" , [] , [] ) [ Str "strikeout" ]
+  , Para
+      [ Strikeout
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Emph [ Str "struck" , Space , Str "out" ]
+          ]
+      ]
+  , Header 2 ( "entities" , [] , [] ) [ Str "entities" ]
+  , Para [ Str "hi" , Space , Str "&" , Space , Str "low" ]
+  , Para [ Str "hi" , Space , Str "&" , Space , Str "low" ]
+  , Para [ Str "G\246del" ]
+  , Para [ Str "\777\2730" ]
+  , Header 2 ( "comments" , [] , [] ) [ Str "comments" ]
+  , Para [ Str "inline" , Space , Str "comment" ]
+  , Para [ Str "between" , Space , Str "blocks" ]
+  , Header 2 ( "linebreaks" , [] , [] ) [ Str "linebreaks" ]
+  , Para [ Str "hi" , LineBreak , Str "there" ]
+  , Para [ Str "hi" , LineBreak , Str "there" ]
+  , Header
+      2
+      ( "indents" , [] , [] )
+      [ Str ":" , Space , Str "indents" ]
+  , Para [ Str "hi" ]
+  , DefinitionList [ ( [] , [ [ Plain [ Str "there" ] ] ] ) ]
+  , Para [ Str "bud" ]
+  , Para [ Str "hi" ]
+  , DefinitionList
+      [ ( []
+        , [ [ DefinitionList
+                [ ( [] , [ [ Plain [ Str "there" ] ] ] ) ]
+            ]
+          ]
+        )
+      ]
+  , Para [ Str "bud" ]
+  , Header
+      2 ( "p_tags" , [] , [] ) [ Str "p" , Space , Str "tags" ]
+  , Para [ Str "hi" , Space , Str "there" ]
+  , Para [ Str "bud" ]
+  , Para [ Str "another" ]
+  , Header
+      2
+      ( "raw_html" , [] , [] )
+      [ Str "raw" , Space , Str "html" ]
+  , Para
+      [ Str "hi"
+      , Space
+      , RawInline (Format "html") ""
+      , Emph [ Str "there" ]
+      , RawInline (Format "html") ""
+      , Str "."
+      ]
+  , Para
+      [ RawInline (Format "html") ""
+      , Str "inserted"
+      , RawInline (Format "html") ""
+      ]
+  , RawBlock (Format "html") "
    "
+  , Para [ Str "hi" , Space , Emph [ Str "there" ] ]
+  , RawBlock (Format "html") "
    "
+  , Header
+      2
+      ( "sup_sub_del" , [] , [] )
+      [ Str "sup," , Space , Str "sub," , Space , Str "del" ]
+  , Para
+      [ Str "H"
+      , Subscript [ Str "2" ]
+      , Str "O"
+      , Space
+      , Str "base"
+      , Superscript [ Emph [ Str "exponent" ] ]
+      , SoftBreak
+      , Strikeout [ Str "hello" ]
+      ]
+  , Header
+      2
+      ( "inline_code" , [] , [] )
+      [ Str "inline" , Space , Str "code" ]
+  , Para
+      [ Code ( "" , [] , [] ) "*\8594*"
+      , Space
+      , Code ( "" , [] , [] ) "typed"
+      , Space
+      , Code ( "" , [ "haskell" ] , [] ) ">>="
+      ]
+  , Header
+      2
+      ( "code_blocks" , [] , [] )
+      [ Str "code" , Space , Str "blocks" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
+  , CodeBlock
+      ( "" , [ "haskell" ] , [] )
+      "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
+  , CodeBlock
+      ( ""
+      , [ "ruby" , "numberLines" ]
+      , [ ( "startFrom" , "100" ) ]
+      )
+      "widgets.each do |w|\n  print w.price\nend"
+  , Header
+      2
+      ( "block_quotes" , [] , [] )
+      [ Str "block" , Space , Str "quotes" ]
+  , Para [ Str "Regular" , Space , Str "paragraph" ]
+  , BlockQuote
+      [ Para
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote."
+          ]
+      , Para
+          [ Str "With"
+          , Space
+          , Str "two"
+          , Space
+          , Str "paragraphs."
+          ]
+      ]
+  , Para [ Str "Nother" , Space , Str "paragraph." ]
+  , Header
+      2
+      ( "external_links" , [] , [] )
+      [ Str "external" , Space , Str "links" ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Emph [ Str "Google" ]
+          , Space
+          , Str "search"
+          , Space
+          , Str "engine"
+          ]
+          ( "http://google.com" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "http://pandoc.org" ]
+          ( "http://pandoc.org" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] ) [ Str "1" ] ( "http://google.com" , "" )
+      , Space
+      , Link
+          ( "" , [] , [] ) [ Str "2" ] ( "http://yahoo.com" , "" )
+      ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "email" , Space , Str "me" ]
+          ( "mailto:info@example.org" , "" )
+      ]
+  , Header
+      2
+      ( "internal_links" , [] , [] )
+      [ Str "internal" , Space , Str "links" ]
+  , Para
+      [ Link
+          ( "" , [ "wikilink" ] , [] )
+          [ Str "Help" ]
+          ( "Help" , "Help" )
+      ]
+  , Para
+      [ Link
+          ( "" , [ "wikilink" ] , [] )
+          [ Str "the" , Space , Str "help" , Space , Str "page" ]
+          ( "Help" , "the help page" )
+      ]
+  , Para
+      [ Link
+          ( "" , [ "wikilink" ] , [] )
+          [ Str "Helpers" ]
+          ( "Help" , "Help" )
+      ]
+  , Para
+      [ Link
+          ( "" , [ "wikilink" ] , [] )
+          [ Str "Help" ]
+          ( "Help" , "Help" )
+      , Str "ers"
+      ]
+  , Para
+      [ Link
+          ( "" , [ "wikilink" ] , [] )
+          [ Str "Contents" ]
+          ( "Help:Contents" , "Contents" )
+      ]
+  , Para
+      [ Link
+          ( "" , [ "wikilink" ] , [] )
+          [ Str "#My" , Space , Str "anchor" ]
+          ( "#My_anchor" , "#My anchor" )
+      ]
+  , Para
+      [ Link
+          ( "" , [ "wikilink" ] , [] )
+          [ Str "and" , Space , Str "text" ]
+          ( "Page#with_anchor" , "and text" )
+      ]
+  , Header 2 ( "images" , [] , [] ) [ Str "images" ]
+  , Figure
+      ( "" , [] , [] )
+      (Caption Nothing [ Plain [ Str "caption" ] ])
+      [ Plain
+          [ Image ( "" , [] , [] ) [] ( "example.jpg" , "caption" ) ]
+      ]
+  , Figure
+      ( "" , [] , [] )
+      (Caption
+         Nothing
+         [ Plain
+             [ Str "the"
+             , Space
+             , Emph [ Str "caption" ]
+             , Space
+             , Str "with"
+             , Space
+             , Link
+                 ( "" , [] , [] )
+                 [ Str "external" , Space , Str "link" ]
+                 ( "http://google.com" , "" )
+             ]
+         ])
+      [ Plain
+          [ Image
+              ( "" , [] , [] )
+              []
+              ( "example.jpg" , "the caption with external link" )
+          ]
+      ]
+  , Figure
+      ( "" , [] , [] )
+      (Caption Nothing [ Plain [ Str "caption" ] ])
+      [ Plain
+          [ Image
+              ( "" , [] , [ ( "width" , "30" ) , ( "height" , "40" ) ] )
+              []
+              ( "example.jpg" , "caption" )
+          ]
+      ]
+  , Figure
+      ( "" , [] , [] )
+      (Caption Nothing [ Plain [ Str "caption" ] ])
+      [ Plain
+          [ Image
+              ( "" , [] , [ ( "width" , "30" ) ] )
+              []
+              ( "example.jpg" , "caption" )
+          ]
+      ]
+  , Figure
+      ( "" , [] , [] )
+      (Caption Nothing [ Plain [ Str "caption" ] ])
+      [ Plain
+          [ Image
+              ( "" , [] , [ ( "width" , "30" ) ] )
+              []
+              ( "example.jpg" , "caption" )
+          ]
+      ]
+  , Figure
+      ( "" , [] , [] )
+      (Caption Nothing [ Plain [ Str "example.jpg" ] ])
+      [ Plain
+          [ Image
+              ( "" , [] , [] ) [] ( "example.jpg" , "example.jpg" )
+          ]
+      ]
+  , Figure
+      ( "" , [] , [] )
+      (Caption Nothing [ Plain [ Str "example_es.jpg" ] ])
+      [ Plain
+          [ Image
+              ( "" , [] , [] )
+              []
+              ( "example_es.jpg" , "example_es.jpg" )
+          ]
+      ]
+  , Header 2 ( "lists" , [] , [] ) [ Str "lists" ]
+  , BulletList
+      [ [ Plain
+            [ Str "Start" , Space , Str "each" , Space , Str "line" ]
+        ]
+      , [ Plain
+            [ Str "with"
+            , Space
+            , Str "an"
+            , Space
+            , Str "asterisk"
+            , Space
+            , Str "(*)."
+            ]
+        , BulletList
+            [ [ Plain
+                  [ Str "More"
+                  , Space
+                  , Str "asterisks"
+                  , Space
+                  , Str "gives"
+                  , Space
+                  , Str "deeper"
+                  ]
+              , BulletList
+                  [ [ Plain
+                        [ Str "and"
+                        , Space
+                        , Str "deeper"
+                        , Space
+                        , Str "levels."
+                        ]
+                    ]
+                  ]
+              ]
+            ]
+        ]
+      , [ Plain
+            [ Str "Line"
+            , Space
+            , Str "breaks"
+            , LineBreak
+            , Str "don't"
+            , Space
+            , Str "break"
+            , Space
+            , Str "levels."
+            ]
+        , BulletList
+            [ [ BulletList
+                  [ [ Plain
+                        [ Str "But"
+                        , Space
+                        , Str "jumping"
+                        , Space
+                        , Str "levels"
+                        , Space
+                        , Str "creates"
+                        , Space
+                        , Str "empty"
+                        , Space
+                        , Str "space."
+                        ]
+                    ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Para
+      [ Str "Any"
+      , Space
+      , Str "other"
+      , Space
+      , Str "start"
+      , Space
+      , Str "ends"
+      , Space
+      , Str "the"
+      , Space
+      , Str "list."
+      ]
+  , BulletList
+      [ [ BulletList [ [ Plain [ Str "two" ] ] ] ]
+      , [ Plain [ Str "one" ] ]
+      ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain
+            [ Str "Start" , Space , Str "each" , Space , Str "line" ]
+        ]
+      , [ Plain
+            [ Str "with"
+            , Space
+            , Str "a"
+            , Space
+            , Str "number"
+            , Space
+            , Str "sign"
+            , Space
+            , Str "(#)."
+            ]
+        , OrderedList
+            ( 1 , DefaultStyle , DefaultDelim )
+            [ [ Plain
+                  [ Str "More"
+                  , Space
+                  , Str "number"
+                  , Space
+                  , Str "signs"
+                  , Space
+                  , Str "gives"
+                  , Space
+                  , Str "deeper"
+                  ]
+              , OrderedList
+                  ( 1 , DefaultStyle , DefaultDelim )
+                  [ [ Plain [ Str "and" , Space , Str "deeper" ] ]
+                  , [ Plain [ Str "levels." ] ]
+                  ]
+              ]
+            ]
+        ]
+      , [ Plain
+            [ Str "Line"
+            , Space
+            , Str "breaks"
+            , LineBreak
+            , Str "don't"
+            , Space
+            , Str "break"
+            , Space
+            , Str "levels."
+            ]
+        , OrderedList
+            ( 1 , DefaultStyle , DefaultDelim )
+            [ [ OrderedList
+                  ( 1 , DefaultStyle , DefaultDelim )
+                  [ [ Plain
+                        [ Str "But"
+                        , Space
+                        , Str "jumping"
+                        , Space
+                        , Str "levels"
+                        , Space
+                        , Str "creates"
+                        , Space
+                        , Str "empty"
+                        , Space
+                        , Str "space."
+                        ]
+                    ]
+                  ]
+              ]
+            ]
+        ]
+      , [ Plain [ Str "Blank" , Space , Str "lines" ] ]
+      ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain
+            [ Str "end"
+            , Space
+            , Str "the"
+            , Space
+            , Str "list"
+            , Space
+            , Str "and"
+            , Space
+            , Str "start"
+            , Space
+            , Str "another."
+            ]
+        ]
+      ]
+  , Para
+      [ Str "Any"
+      , Space
+      , Str "other"
+      , Space
+      , Str "start"
+      , Space
+      , Str "also"
+      , SoftBreak
+      , Str "ends"
+      , Space
+      , Str "the"
+      , Space
+      , Str "list."
+      ]
+  , DefinitionList
+      [ ( [ Str "item" , Space , Str "1" ]
+        , [ [ Plain [ Str "definition" , Space , Str "1" ] ] ]
+        )
+      , ( [ Str "item" , Space , Str "2" ]
+        , [ [ Plain [ Str "definition" , Space , Str "2-1" ] ]
+          , [ Plain [ Str "definition" , Space , Str "2-2" ] ]
+          ]
+        )
+      ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain [ Str "one" ] ]
+      , [ Plain [ Str "two" ]
+        , BulletList
+            [ [ Plain
+                  [ Str "two"
+                  , Space
+                  , Str "point"
+                  , Space
+                  , Str "one"
+                  ]
+              ]
+            , [ Plain
+                  [ Str "two"
+                  , Space
+                  , Str "point"
+                  , Space
+                  , Str "two"
+                  ]
+              ]
+            ]
+        ]
+      , [ Plain [ Str "three" ]
+        , DefinitionList
+            [ ( [ Str "three" , Space , Str "item" , Space , Str "one" ]
+              , [ [ Plain
+                      [ Str "three"
+                      , Space
+                      , Str "def"
+                      , Space
+                      , Str "one"
+                      ]
+                  ]
+                ]
+              )
+            ]
+        ]
+      , [ Plain [ Str "four" ]
+        , DefinitionList
+            [ ( []
+              , [ [ Plain
+                      [ Str "four"
+                      , Space
+                      , Str "def"
+                      , Space
+                      , Str "one"
+                      ]
+                  ]
+                , [ Plain
+                      [ Str "this"
+                      , Space
+                      , Str "looks"
+                      , Space
+                      , Str "like"
+                      , Space
+                      , Str "a"
+                      , Space
+                      , Str "continuation"
+                      ]
+                  ]
+                , [ Plain
+                      [ Str "and"
+                      , Space
+                      , Str "is"
+                      , Space
+                      , Str "often"
+                      , Space
+                      , Str "used"
+                      ]
+                  ]
+                , [ Plain
+                      [ Str "instead"
+                      , LineBreak
+                      , Str "of"
+                      , Space
+                      , Str "
    "
+                      ]
+                  ]
+                ]
+              )
+            ]
+        ]
+      , [ Plain
+            [ RawInline
+                (Format "mediawiki")
+                "{{{template\n|author=John\n|title=My Book\n}}}"
+            ]
+        , OrderedList
+            ( 1 , DefaultStyle , DefaultDelim )
+            [ [ Plain
+                  [ Str "five" , Space , Str "sub" , Space , Str "1" ]
+              , OrderedList
+                  ( 1 , DefaultStyle , DefaultDelim )
+                  [ [ Plain
+                        [ Str "five"
+                        , Space
+                        , Str "sub"
+                        , Space
+                        , Str "1"
+                        , Space
+                        , Str "sub"
+                        , Space
+                        , Str "1"
+                        ]
+                    ]
+                  ]
+              ]
+            , [ Plain
+                  [ Str "five" , Space , Str "sub" , Space , Str "2" ]
+              ]
+            ]
+        ]
+      ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain
+            [ Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Emph [ Str "emph" ]
+            ]
+        , OrderedList
+            ( 1 , DefaultStyle , DefaultDelim )
+            [ [ Plain
+                  [ Str "list" , Space , Str "item" , Space , Str "B1" ]
+              ]
+            , [ Plain
+                  [ Str "list" , Space , Str "item" , Space , Str "B2" ]
+              ]
+            ]
+        , Para
+            [ Str "continuing"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "A1"
+            ]
+        ]
+      , [ Plain
+            [ Str "list" , Space , Str "item" , Space , Str "A2" ]
+        ]
+      ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain [ Str "abc" ] ]
+      , [ Plain [ Str "def" ] ]
+      , [ Plain [ Str "ghi" ] ]
+      ]
+  , OrderedList
+      ( 9 , DefaultStyle , DefaultDelim )
+      [ [ Plain [ Str "Amsterdam" ] ]
+      , [ Plain [ Str "Rotterdam" ] ]
+      , [ Plain [ Str "The" , Space , Str "Hague" ] ]
+      ]
+  , Header 2 ( "math" , [] , [] ) [ Str "math" ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "some"
+      , Space
+      , Math InlineMath "x=\\frac{y^\\pi}{z}"
+      , Str "."
+      ]
+  , Para
+      [ Str "With"
+      , Space
+      , Str "spaces:"
+      , Space
+      , Math InlineMath "x=\\frac{y^\\pi}{z}"
+      , Str "."
+      ]
+  , Header
+      2
+      ( "preformatted_blocks" , [] , [] )
+      [ Str "preformatted" , Space , Str "blocks" ]
+  , Para
+      [ Code
+          ( "" , [] , [] )
+          "Start\160each\160line\160with\160a\160space."
+      , LineBreak
+      , Code ( "" , [] , [] ) "Text\160is\160"
+      , Strong [ Code ( "" , [] , [] ) "preformatted" ]
+      , Code ( "" , [] , [] ) "\160and"
+      , LineBreak
+      , Emph [ Code ( "" , [] , [] ) "markups" ]
+      , Code ( "" , [] , [] ) "\160"
+      , Strong [ Emph [ Code ( "" , [] , [] ) "can" ] ]
+      , Code ( "" , [] , [] ) "\160be\160done."
+      ]
+  , Para
+      [ Code
+          ( "" , [] , [] ) "\160hell\160\160\160\160\160\160yeah"
+      ]
+  , Para
+      [ Code
+          ( "" , [] , [] )
+          "Start\160with\160a\160space\160in\160the\160first\160column,"
+      , LineBreak
+      , Code ( "" , [] , [] ) "(before\160the\160)."
+      , LineBreak
+      , Code ( "" , [] , [] ) ""
+      , LineBreak
+      , Code
+          ( "" , [] , [] )
+          "Then\160your\160block\160format\160will\160be"
+      , LineBreak
+      , Code ( "" , [] , [] ) "\160\160\160\160maintained."
+      , LineBreak
+      , Code ( "" , [] , [] ) ""
+      , LineBreak
+      , Code
+          ( "" , [] , [] )
+          "This\160is\160good\160for\160copying\160in\160code\160blocks:"
+      , LineBreak
+      , Code ( "" , [] , [] ) ""
+      , LineBreak
+      , Code ( "" , [] , [] ) "def\160function():"
+      , LineBreak
+      , Code
+          ( "" , [] , [] )
+          "\160\160\160\160\"\"\"documentation\160string\"\"\""
+      , LineBreak
+      , Code ( "" , [] , [] ) ""
+      , LineBreak
+      , Code ( "" , [] , [] ) "\160\160\160\160if\160True:"
+      , LineBreak
+      , Code
+          ( "" , [] , [] )
+          "\160\160\160\160\160\160\160\160print\160True"
+      , LineBreak
+      , Code ( "" , [] , [] ) "\160\160\160\160else:"
+      , LineBreak
+      , Code
+          ( "" , [] , [] )
+          "\160\160\160\160\160\160\160\160print\160False"
+      ]
+  , Para [ Str "Not" ]
+  , RawBlock (Format "html") "
    "
+  , Para [ Str "preformatted" ]
+  , Para [ Str "Don't" , Space , Str "need" ]
+  , Para [ Code ( "" , [] , [] ) "a\160blank\160line" ]
+  , Para
+      [ Str "around"
+      , Space
+      , Str "a"
+      , Space
+      , Str "preformatted"
+      , Space
+      , Str "block."
+      ]
+  , Header 2 ( "templates" , [] , [] ) [ Str "templates" ]
+  , RawBlock (Format "mediawiki") "{{Welcome}}"
+  , RawBlock (Format "mediawiki") "{{Foo:Bar}}"
+  , RawBlock
+      (Format "mediawiki") "{{Thankyou|all your effort|Me}}"
+  , Para
+      [ Str "Written"
+      , Space
+      , RawInline (Format "mediawiki") "{{{date}}}"
+      , Space
+      , Str "by"
+      , Space
+      , RawInline (Format "mediawiki") "{{{name}}}"
+      , Str "."
+      ]
+  , Header 2 ( "tables" , [] , [] ) [ Str "tables" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Orange" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Apple" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Bread" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Pie" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Butter" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Ice" , Space , Str "cream" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Table
+      ( "" , [] , [] )
+      (Caption
+         Nothing
+         [ Plain [ Str "Food" , Space , Str "complements" ] ])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Para [ Str "Orange" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Para [ Str "Apple" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Bread" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Pie" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Butter" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Ice" , Space , Str "cream" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Table
+      ( "" , [] , [] )
+      (Caption
+         Nothing
+         [ Plain [ Str "Food" , Space , Str "complements" ] ])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Para [ Str "Orange" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Para [ Str "Apple" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Bread" ]
+                  , Para [ Str "and" , Space , Str "cheese" ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Pie" ]
+                  , OrderedList
+                      ( 1 , DefaultStyle , DefaultDelim )
+                      [ [ Plain [ Str "apple" ] ]
+                      , [ Plain [ Str "carrot" ] ]
+                      ]
+                  ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Orange" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Apple" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "more" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Bread" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Pie" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "more" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Butter" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Ice" , Space , Str "cream" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "and" , Space , Str "more" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignLeft , ColWidth 0.25 )
+      , ( AlignRight , ColWidth 0.125 )
+      , ( AlignCenter , ColWidth 0.125 )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [ ( "width" , "50%" ) ] )
+                 AlignLeft
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Para [ Str "Left" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignRight
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Para [ Str "Right" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignCenter
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Para [ Str "Center" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "left" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "15.00" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "centered" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "more" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "2.0" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "more" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Orange" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Apple" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Bread" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Table
+                      ( "" , [] , [] )
+                      (Caption Nothing [])
+                      [ ( AlignDefault , ColWidthDefault )
+                      , ( AlignDefault , ColWidthDefault )
+                      ]
+                      (TableHead
+                         ( "" , [] , [] )
+                         [ Row
+                             ( "" , [] , [] )
+                             [ Cell
+                                 ( "" , [] , [] )
+                                 AlignDefault
+                                 (RowSpan 1)
+                                 (ColSpan 1)
+                                 [ Para [ Str "fruit" ] ]
+                             , Cell
+                                 ( "" , [] , [] )
+                                 AlignDefault
+                                 (RowSpan 1)
+                                 (ColSpan 1)
+                                 [ Para [ Str "topping" ] ]
+                             ]
+                         ])
+                      [ TableBody
+                          ( "" , [] , [] )
+                          (RowHeadColumns 0)
+                          []
+                          [ Row
+                              ( "" , [] , [] )
+                              [ Cell
+                                  ( "" , [] , [] )
+                                  AlignDefault
+                                  (RowSpan 1)
+                                  (ColSpan 1)
+                                  [ Para [ Str "apple" ] ]
+                              , Cell
+                                  ( "" , [] , [] )
+                                  AlignDefault
+                                  (RowSpan 1)
+                                  (ColSpan 1)
+                                  [ Para
+                                      [ Str "ice"
+                                      , Space
+                                      , Str "cream"
+                                      ]
+                                  ]
+                              ]
+                          ]
+                      ]
+                      (TableFoot ( "" , [] , [] ) [])
+                  ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Butter" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Ice" , Space , Str "cream" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault ) ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Orange" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Paragraph"
+      , Space
+      , Str "after"
+      , Space
+      , Str "the"
+      , Space
+      , Str "table."
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Para [ Str "fruit" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Para [ Str "topping" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "apple" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "ice" , Space , Str "cream" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Header 2 ( "notes" , [] , [] ) [ Str "notes" ]
+  , Para
+      [ Str "My"
+      , Space
+      , Str "note!"
+      , Note [ Plain [ Str "This." ] ]
+      ]
+  , Para
+      [ Str "URL"
+      , Space
+      , Str "note."
+      , Note
+          [ Plain
+              [ Link
+                  ( "" , [] , [] )
+                  [ Str
+                      "http://docs.python.org/library/functions.html#range"
+                  ]
+                  ( "http://docs.python.org/library/functions.html#range"
+                  , ""
+                  )
+              ]
+          ]
+      ]
+  ]
diff --git a/test/odt/markdown/blockquote2.md b/test/odt/markdown/blockquote2.md
new file mode 100644
--- /dev/null
+++ b/test/odt/markdown/blockquote2.md
@@ -0,0 +1,3 @@
+Paragraph
+
+> A blockquote.
diff --git a/test/odt/markdown/formula.md b/test/odt/markdown/formula.md
new file mode 100644
--- /dev/null
+++ b/test/odt/markdown/formula.md
@@ -0,0 +1,1 @@
+$$E = {m \cdot c^{2}}$$
diff --git a/test/odt/native/imageIndex.native b/test/odt/native/imageIndex.native
--- a/test/odt/native/imageIndex.native
+++ b/test/odt/native/imageIndex.native
@@ -1,1 +1,28 @@
-[Para [Image ("",[],[("width","5.292cm"),("height","5.292cm")]) [Str "Abbildung",Space,Str "1:",Space,Str "Image",Space,Str "caption"] ("Pictures/10000000000000FA000000FAD6A15225.jpg","fig:")]]
+[ Figure
+  ( "" , [] , [] )
+  (Caption
+     Nothing
+     [ Plain
+         [ Str "Image"
+         , Space
+         , Str "caption"
+         ]
+     ])
+  [ Plain
+      [ Image
+          ( ""
+          , []
+          , [ ( "width" , "5.292cm" ) , ( "height" , "5.292cm" ) ]
+          )
+          [ Str "Abbildung"
+          , Space
+          , Str "1:"
+          , Space
+          , Str "Image"
+          , Space
+          , Str "caption"
+          ]
+          ( "Pictures/10000000000000FA000000FAD6A15225.jpg" , "" )
+      ]
+  ]
+]
diff --git a/test/odt/native/imageRelative.native b/test/odt/native/imageRelative.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/imageRelative.native
@@ -0,0 +1,10 @@
+[ Para
+    [ Image
+        ( ""
+        , []
+        , [ ( "width" , "5.292cm" ) , ( "height" , "5.292cm" ) ]
+        )
+        []
+        ( "../../lalune.jpg" , "" )
+    ]
+]
diff --git a/test/odt/native/imageWithCaption.native b/test/odt/native/imageWithCaption.native
--- a/test/odt/native/imageWithCaption.native
+++ b/test/odt/native/imageWithCaption.native
@@ -1,1 +1,28 @@
-[Para [Image ("",[],[("width","5.292cm"),("height","5.292cm")]) [Str "Abbildung",Space,Str "1:",Space,Str "Image",Space,Str "caption"] ("Pictures/10000000000000FA000000FAD6A15225.jpg","fig:")]]
+[ Figure
+  ( "" , [] , [] )
+  (Caption
+     Nothing
+     [ Plain
+         [ Str "Image"
+         , Space
+         , Str "caption"
+         ]
+     ])
+  [ Plain
+      [ Image
+          ( ""
+          , []
+          , [ ( "width" , "5.292cm" ) , ( "height" , "5.292cm" ) ]
+          )
+          [ Str "Abbildung"
+          , Space
+          , Str "1:"
+          , Space
+          , Str "Image"
+          , Space
+          , Str "caption"
+          ]
+          ( "Pictures/10000000000000FA000000FAD6A15225.jpg" , "" )
+      ]
+  ]
+]
diff --git a/test/odt/native/listContinueNumbering.native b/test/odt/native/listContinueNumbering.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/listContinueNumbering.native
@@ -0,0 +1,89 @@
+[ OrderedList
+    ( 1 , Decimal , Period )
+    [ [ Plain
+            [ Str "Some" , Space , Str "text" , Space , Str "(1.)" ]
+        ]
+    ]
+, Para []
+, Para
+    [ Str "Some"
+    , Space
+    , Str "text"
+    , Space
+    , Str "in"
+    , Space
+    , Str "between."
+    ]
+, Para []
+, OrderedList
+    ( 2 , Decimal , Period )
+    [ [ Plain
+            [ Str "Some" , Space , Str "text" , Space , Str "(2.)" ]
+        ]
+    , [ Plain
+            [ Str "Some" , Space , Str "text" , Space , Str "(3.)" ]
+        ]
+    ]
+, Para []
+, Para
+    [ Str "Some"
+    , Space
+    , Str "text"
+    , Space
+    , Str "in"
+    , Space
+    , Str "between."
+    ]
+, Para []
+, OrderedList
+    ( 4 , Decimal , Period )
+    [ [ Plain
+            [ Str "Some" , Space , Str "text" , Space , Str "(4.)" ]
+        ]
+    ]
+, Para []
+, Para
+    [ Str "Some"
+    , Space
+    , Str "text"
+    , Space
+    , Str "before"
+    , Space
+    , Str "starting"
+    , Space
+    , Str "new"
+    , Space
+    , Str "list"
+    , Space
+    , Str "from"
+    , Space
+    , Str "1."
+    ]
+, Para []
+, OrderedList
+    ( 1 , Decimal , Period )
+    [ [ Plain
+            [ Str "Some" , Space , Str "text" , Space , Str "(1.)" ]
+        ]
+    ]
+, Para []
+, Para
+    [ Str "Some"
+    , Space
+    , Str "text"
+    , Space
+    , Str "in"
+    , Space
+    , Str "between."
+    ]
+, Para []
+, OrderedList
+    ( 2 , Decimal , Period )
+    [ [ Plain
+            [ Str "Some" , Space , Str "text" , Space , Str "(2.)" ]
+        ]
+    , [ Plain
+            [ Str "Some" , Space , Str "text" , Space , Str "(3.)" ]
+        ]
+    ]
+]
diff --git a/test/odt/native/listContinueNumbering2.native b/test/odt/native/listContinueNumbering2.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/listContinueNumbering2.native
@@ -0,0 +1,95 @@
+[ OrderedList
+    ( 1 , Decimal , Period )
+    [ [ Para [ Str "Top" , Space , Str "one" ]
+      , OrderedList
+          ( 1 , LowerAlpha , Period )
+          [[ Plain
+             [ Str "Sub"
+             , Space
+             , Str "item"
+             , Space
+             , Str "1.a"
+             ]
+            ]
+          , [ Plain
+              [ Str "Sub"
+              , Space
+              , Str "item"
+              , Space
+              , Str "1.b"
+              ]
+            ]
+          ]
+      ]
+    ]
+, Para []
+, Para
+    [ Str "Some"
+    , Space
+    , Str "text"
+    , Space
+    , Str "in"
+    , Space
+    , Str "between."
+    ]
+, Para []
+, OrderedList
+    ( 2 , Decimal , Period )
+    [ [ Para [ Str "Top" , Space , Str "two" ]
+      , OrderedList
+          ( 1 , LowerAlpha , Period )
+          [ [ Plain
+              [ Str "Sub"
+              , Space
+              , Str "item"
+              , Space
+              , Str "2.a"
+              ]
+            ]
+          , [ Plain
+              [ Str "Sub"
+              , Space
+              , Str "item"
+              , Space
+              , Str "2.b"
+              ]
+            ]
+          ]
+      ]
+    ]
+, Para []
+, Para
+    [ Str "Some"
+    , Space
+    , Str "text"
+    , Space
+    , Str "in"
+    , Space
+    , Str "between."
+    ]
+, Para []
+, OrderedList
+    ( 3 , Decimal , Period )
+    [ [ Para [ Str "Top" , Space , Str "three" ]
+      , OrderedList
+          ( 1 , LowerAlpha , Period )
+          [ [ Plain
+              [ Str "Sub"
+              , Space
+              , Str "item"
+              , Space
+              , Str "3.a"
+              ]
+            ]
+          , [ Plain
+              [ Str "Sub"
+              , Space
+              , Str "item"
+              , Space
+              , Str "3.b"
+              ]
+            ]
+          ]
+      ]
+    ]
+]
diff --git a/test/odt/native/orderedListHeader.native b/test/odt/native/orderedListHeader.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/orderedListHeader.native
@@ -0,0 +1,80 @@
+[ OrderedList
+    ( 1 , Decimal , Period )
+    [ [ Plain
+          [ Str "A"
+          , Space
+          , Str "list"
+          , Space
+          , Str "item"
+          , Space
+          , Str "(list-header)"
+          ]
+      ]
+    , [ Plain [ Str "A" , Space , Str "second" ] ]
+    , [ Para [ Str "A" , Space , Str "third" ]
+      , OrderedList
+          ( 1 , Decimal , Period )
+          [ [ Para
+                [ Str "New"
+                , Space
+                , Str "level!"
+                , Space
+                , Str "(list-header)"
+                ]
+            , OrderedList
+                ( 1 , Decimal , Period )
+                [ [ Plain
+                      [ Str "And"
+                      , Space
+                      , Str "another!"
+                      , Space
+                      , Str "(list-header)"
+                      ]
+                  ]
+                , [ Plain
+                      [ Str "It's"
+                      , Space
+                      , Str "great"
+                      , Space
+                      , Str "up"
+                      , Space
+                      , Str "here!"
+                      ]
+                  ]
+                ]
+            ]
+          , [ Plain [ Str "Oh" , Space , Str "noes" ] ]
+          , [ Plain [ Str "We" , Space , Str "fell!" ] ]
+          ]
+      ]
+    , [ Plain [ Str "Maybe" , Space , Str "someone" ] ]
+    , [ Plain [ Str "Pushed" , Space , Str "us?" ] ]
+    ]
+, Para []
+, OrderedList
+    ( 4 , Decimal , Period )
+    [ [ Plain
+          [ Str "Start"
+          , Space
+          , Str "new"
+          , Space
+          , Str "list,"
+          , Space
+          , Str "but"
+          , Space
+          , Str "a"
+          , Space
+          , Str "different"
+          , Space
+          , Str "starting"
+          , Space
+          , Str "point."
+          , Space
+          , Str "(list-header)"
+          ]
+      ]
+    , [ Plain
+          [ Str "Because" , Space , Str "we" , Space , Str "can." ]
+      ]
+    ]
+]
diff --git a/test/odt/native/preformattedText.native b/test/odt/native/preformattedText.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/preformattedText.native
@@ -0,0 +1,4 @@
+[ CodeBlock
+    ( "" , [] , [] )
+    "void main() {\n    printf(\"Hello world\");\n}"
+]
diff --git a/test/odt/native/preformattedTextParentStyle.native b/test/odt/native/preformattedTextParentStyle.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/preformattedTextParentStyle.native
@@ -0,0 +1,4 @@
+[ CodeBlock
+    ( "" , [] , [] )
+    "void main() {\n    printf(\"Hello world\");\n}"
+]
diff --git a/test/odt/native/simpleTable.native b/test/odt/native/simpleTable.native
--- a/test/odt/native/simpleTable.native
+++ b/test/odt/native/simpleTable.native
@@ -1,1 +1,1 @@
-[Table [] [AlignDefault,AlignDefault] [0.0,0.0] [[],[]] [[[Plain [Str "Content"]],[Plain [Str "More",Space,Str "content"]]]],Para []]
+[Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) []) [TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Content"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "More",Space,Str "content"]]]]] (TableFoot ("",[],[]) []),Para []]
diff --git a/test/odt/native/simpleTableWithCaption.native b/test/odt/native/simpleTableWithCaption.native
--- a/test/odt/native/simpleTableWithCaption.native
+++ b/test/odt/native/simpleTableWithCaption.native
@@ -1,1 +1,1 @@
-[Table [Str "Table",Space,Str "1:",Space,Str "Some",Space,Str "caption",Space,Str "for",Space,Str "a",Space,Str "table"] [AlignDefault,AlignDefault] [0.0,0.0] [[],[]] [[[Plain [Str "Content"]],[Plain [Str "More",Space,Str "content"]]]],Para []]
+[Table ("",[],[]) (Caption Nothing [Para [Str "Table",Space,Str "1:",Space,Str "Some",Space,Str "caption",Space,Str "for",Space,Str "a",Space,Str "table"]]) [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) []) [TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Content"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "More",Space,Str "content"]]]]] (TableFoot ("",[],[]) []),Para []]
diff --git a/test/odt/native/simpleTableWithHeader.native b/test/odt/native/simpleTableWithHeader.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/simpleTableWithHeader.native
@@ -0,0 +1,79 @@
+[ Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "A" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "B" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "C" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [ Plain [] ]
+            , Cell
+                ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [ Plain [] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "2" ] ]
+            , Cell
+                ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [ Plain [] ]
+            , Cell
+                ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [ Plain [] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "3" ] ]
+            , Cell
+                ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [ Plain [] ]
+            , Cell
+                ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) [ Plain [] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para []
+]
diff --git a/test/odt/native/simpleTableWithMultipleHeaderRows.native b/test/odt/native/simpleTableWithMultipleHeaderRows.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/simpleTableWithMultipleHeaderRows.native
@@ -0,0 +1,125 @@
+[ Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "A" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "B" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "C" ] ]
+           ]
+       , Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "I" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "II" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "II" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "2" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "3" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para []
+]
+
diff --git a/test/odt/native/sourceText.native b/test/odt/native/sourceText.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/sourceText.native
@@ -0,0 +1,11 @@
+[ Header
+    1
+    ( "test-foo" , [] , [] )
+    [ Span ( "anchor" , [] , [] ) []
+    , Str "Test"
+    , Space
+    , Code ( "" , [] , [] ) "foo"
+    ]
+, Para
+    [ Str "Hello" , Space , Code ( "" , [] , [] ) "world" ]
+]
diff --git a/test/odt/native/tab.native b/test/odt/native/tab.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/tab.native
@@ -0,0 +1,1 @@
+[Para [Str "Three",Space,Str "tabs",Space,Str "between",Space,Str "A",Space,Str "and",Space,Str "B",Space,Str "will",Space,Str "be",Space,Str "converted",Space,Str "to",Space,Str "one",Space,Str "Space:",Space,Str "A",Space,Str "B."]]
diff --git a/test/odt/native/tableWithContents.native b/test/odt/native/tableWithContents.native
--- a/test/odt/native/tableWithContents.native
+++ b/test/odt/native/tableWithContents.native
@@ -1,1 +1,1 @@
-[Table [] [AlignDefault,AlignDefault] [0.0,0.0] [[],[]]  [[[Plain [Str "A"]],[Plain [Str "B"]]],[[Plain [Str "C"]],[Plain [Str "D"]]]],Para []]
+[Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) []) [TableBody ("",[],[]) (RowHeadColumns 0) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "A"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "B"]]],Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "C"]],Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "D"]]]]] (TableFoot ("",[],[]) []),Para []]
diff --git a/test/odt/native/tableWithSpans.native b/test/odt/native/tableWithSpans.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/tableWithSpans.native
@@ -0,0 +1,134 @@
+[ Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 2)
+               (ColSpan 1)
+               [ Plain
+                   [ Str "H1"
+                   , Space
+                   , Str "Rowspan"
+                   , Space
+                   , Str "2"
+                   ]
+               ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "H1-2" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "H1-3" ] ]
+           ]
+       , Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 2)
+               [ Plain [ Str "H2-2/3" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "B1-1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "B1-2" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 3)
+                (ColSpan 1)
+                [ Plain [ Str "Rowspan" , Space , Str "3" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "B2-1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "B2-2" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 2)
+                [ Plain [ Str "Columnspan" , Space , Str "2" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "B4-1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 2)
+                (ColSpan 2)
+                [ Plain
+                    [ Str "Columnspan"
+                    , Space
+                    , Str "&"
+                    , Space
+                    , Str "Rowspan"
+                    , Space
+                    , Str "2"
+                    ]
+                ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "B5-1" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para []
+]
diff --git a/test/odt/native/unorderedListHeader.native b/test/odt/native/unorderedListHeader.native
new file mode 100644
--- /dev/null
+++ b/test/odt/native/unorderedListHeader.native
@@ -0,0 +1,50 @@
+[ BulletList
+    [ [ Plain
+          [ Str "A"
+          , Space
+          , Str "list"
+          , Space
+          , Str "item"
+          , Space
+          , Str "(list-header)"
+          ]
+      ]
+    , [ Plain [ Str "A" , Space , Str "second" ] ]
+    , [ Para [ Str "A" , Space , Str "third" ]
+      , BulletList
+          [ [ Para
+                [ Str "New"
+                , Space
+                , Str "level!"
+                , Space
+                , Str "(list-header)"
+                ]
+            , BulletList
+                [ [ Plain
+                      [ Str "And"
+                      , Space
+                      , Str "another!"
+                      , Space
+                      , Str "(list-header)"
+                      ]
+                  ]
+                , [ Plain
+                      [ Str "It's"
+                      , Space
+                      , Str "great"
+                      , Space
+                      , Str "up"
+                      , Space
+                      , Str "here!"
+                      ]
+                  ]
+                ]
+            ]
+          , [ Plain [ Str "Oh" , Space , Str "noes" ] ]
+          , [ Plain [ Str "We" , Space , Str "fell!" ] ]
+          ]
+      ]
+    , [ Plain [ Str "Maybe" , Space , Str "someone" ] ]
+    , [ Plain [ Str "Pushed" , Space , Str "us?" ] ]
+    ]
+]
diff --git a/test/odt/odt/blockquote2.odt b/test/odt/odt/blockquote2.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/blockquote2.odt differ
diff --git a/test/odt/odt/imageRelative.odt b/test/odt/odt/imageRelative.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/imageRelative.odt differ
diff --git a/test/odt/odt/listContinueNumbering.odt b/test/odt/odt/listContinueNumbering.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/listContinueNumbering.odt differ
diff --git a/test/odt/odt/listContinueNumbering2.odt b/test/odt/odt/listContinueNumbering2.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/listContinueNumbering2.odt differ
diff --git a/test/odt/odt/orderedListHeader.odt b/test/odt/odt/orderedListHeader.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/orderedListHeader.odt differ
diff --git a/test/odt/odt/preformattedText.odt b/test/odt/odt/preformattedText.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/preformattedText.odt differ
diff --git a/test/odt/odt/preformattedTextParentStyle.odt b/test/odt/odt/preformattedTextParentStyle.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/preformattedTextParentStyle.odt differ
diff --git a/test/odt/odt/simpleTableWithHeader.odt b/test/odt/odt/simpleTableWithHeader.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/simpleTableWithHeader.odt differ
diff --git a/test/odt/odt/simpleTableWithMultipleHeaderRows.odt b/test/odt/odt/simpleTableWithMultipleHeaderRows.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/simpleTableWithMultipleHeaderRows.odt differ
diff --git a/test/odt/odt/sourceText.odt b/test/odt/odt/sourceText.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/sourceText.odt differ
diff --git a/test/odt/odt/tab.odt b/test/odt/odt/tab.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/tab.odt differ
diff --git a/test/odt/odt/tableWithSpans.odt b/test/odt/odt/tableWithSpans.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/tableWithSpans.odt differ
diff --git a/test/odt/odt/unorderedListHeader.odt b/test/odt/odt/unorderedListHeader.odt
new file mode 100644
Binary files /dev/null and b/test/odt/odt/unorderedListHeader.odt differ
diff --git a/test/opml-reader.native b/test/opml-reader.native
--- a/test/opml-reader.native
+++ b/test/opml-reader.native
@@ -1,66 +1,123 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Dave",Space,Str "Winer"]]),("date",MetaInlines [Str "Thu,",Space,Str "14",Space,Str "Jul",Space,Str "2005",Space,Str "23:41:05",Space,Str "GMT"]),("title",MetaInlines [Str "States"])]})
-[Header 1 ("",[],[]) [Str "United",Space,Str "States"]
-,Header 2 ("",[],[]) [Str "Far",Space,Str "West"]
-,Header 3 ("",[],[]) [Str "Alaska"]
-,Header 3 ("",[],[]) [Str "California"]
-,Header 3 ("",[],[]) [Str "Hawaii"]
-,Header 3 ("",[],[]) [Strong [Str "Nevada"]]
-,Para [Str "I",Space,Str "lived",Space,Str "here",Space,Emph [Str "once"],Str "."]
-,Para [Str "Loved",Space,Str "it."]
-,Header 4 ("",[],[]) [Link ("",[],[]) [Str "Reno"] ("http://www.reno.gov","")]
-,Header 4 ("",[],[]) [Str "Las",Space,Str "Vegas"]
-,Header 4 ("",[],[]) [Str "Ely"]
-,Header 4 ("",[],[]) [Str "Gerlach"]
-,Header 3 ("",[],[]) [Str "Oregon"]
-,Header 3 ("",[],[]) [Str "Washington"]
-,Header 2 ("",[],[]) [Str "Great",Space,Str "Plains"]
-,Header 3 ("",[],[]) [Str "Kansas"]
-,Header 3 ("",[],[]) [Str "Nebraska"]
-,Header 3 ("",[],[]) [Str "North",Space,Str "Dakota"]
-,Header 3 ("",[],[]) [Str "Oklahoma"]
-,Header 3 ("",[],[]) [Str "South",Space,Str "Dakota"]
-,Header 2 ("",[],[]) [Str "Mid-Atlantic"]
-,Header 3 ("",[],[]) [Str "Delaware"]
-,Header 3 ("",[],[]) [Str "Maryland"]
-,Header 3 ("",[],[]) [Str "New",Space,Str "Jersey"]
-,Header 3 ("",[],[]) [Str "New",Space,Str "York"]
-,Header 3 ("",[],[]) [Str "Pennsylvania"]
-,Header 2 ("",[],[]) [Str "Midwest"]
-,Header 3 ("",[],[]) [Str "Illinois"]
-,Header 3 ("",[],[]) [Str "Indiana"]
-,Header 3 ("",[],[]) [Str "Iowa"]
-,Header 3 ("",[],[]) [Str "Kentucky"]
-,Header 3 ("",[],[]) [Str "Michigan"]
-,Header 3 ("",[],[]) [Str "Minnesota"]
-,Header 3 ("",[],[]) [Str "Missouri"]
-,Header 3 ("",[],[]) [Str "Ohio"]
-,Header 3 ("",[],[]) [Str "West",Space,Str "Virginia"]
-,Header 3 ("",[],[]) [Str "Wisconsin"]
-,Header 2 ("",[],[]) [Str "Mountains"]
-,Header 3 ("",[],[]) [Str "Colorado"]
-,Header 3 ("",[],[]) [Str "Idaho"]
-,Header 3 ("",[],[]) [Str "Montana"]
-,Header 3 ("",[],[]) [Str "Utah"]
-,Header 3 ("",[],[]) [Str "Wyoming"]
-,Header 2 ("",[],[]) [Str "New",Space,Str "England"]
-,Header 3 ("",[],[]) [Str "Connecticut"]
-,Header 3 ("",[],[]) [Str "Maine"]
-,Header 3 ("",[],[]) [Str "Massachusetts"]
-,Header 3 ("",[],[]) [Str "New",Space,Str "Hampshire"]
-,Header 3 ("",[],[]) [Str "Rhode",Space,Str "Island"]
-,Header 3 ("",[],[]) [Str "Vermont"]
-,Header 2 ("",[],[]) [Str "South"]
-,Header 3 ("",[],[]) [Str "Alabama"]
-,Header 3 ("",[],[]) [Str "Arkansas"]
-,Header 3 ("",[],[]) [Str "Florida"]
-,Header 3 ("",[],[]) [Str "Georgia"]
-,Header 3 ("",[],[]) [Str "Louisiana"]
-,Header 3 ("",[],[]) [Str "Mississippi"]
-,Header 3 ("",[],[]) [Str "North",Space,Str "Carolina"]
-,Header 3 ("",[],[]) [Str "South",Space,Str "Carolina"]
-,Header 3 ("",[],[]) [Str "Tennessee"]
-,Header 3 ("",[],[]) [Str "Virginia"]
-,Header 2 ("",[],[]) [Str "Southwest"]
-,Header 3 ("",[],[]) [Str "Arizona"]
-,Header 3 ("",[],[]) [Str "New",Space,Str "Mexico"]
-,Header 3 ("",[],[]) [Str "Texas"]]
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "author"
+            , MetaList
+                [ MetaInlines [ Str "Dave" , Space , Str "Winer" ] ]
+            )
+          , ( "date"
+            , MetaInlines
+                [ Str "Thu,"
+                , Space
+                , Str "14"
+                , Space
+                , Str "Jul"
+                , Space
+                , Str "2005"
+                , Space
+                , Str "23:41:05"
+                , Space
+                , Str "GMT"
+                ]
+            )
+          , ( "title" , MetaInlines [ Str "States" ] )
+          ]
+    }
+  [ Header
+      1 ( "" , [] , [] ) [ Str "United" , Space , Str "States" ]
+  , Header
+      2 ( "" , [] , [] ) [ Str "Far" , Space , Str "West" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Alaska" ]
+  , Header 3 ( "" , [] , [] ) [ Str "California" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Hawaii" ]
+  , Header 3 ( "" , [] , [] ) [ Strong [ Str "Nevada" ] ]
+  , Para
+      [ Str "I"
+      , Space
+      , Str "lived"
+      , Space
+      , Str "here"
+      , Space
+      , Emph [ Str "once" ]
+      , Str "."
+      ]
+  , Para [ Str "Loved" , Space , Str "it." ]
+  , Header
+      4
+      ( "" , [] , [] )
+      [ Link
+          ( "" , [] , [] )
+          [ Str "Reno" ]
+          ( "http://www.reno.gov" , "" )
+      ]
+  , Header
+      4 ( "" , [] , [] ) [ Str "Las" , Space , Str "Vegas" ]
+  , Header 4 ( "" , [] , [] ) [ Str "Ely" ]
+  , Header 4 ( "" , [] , [] ) [ Str "Gerlach" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Oregon" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Washington" ]
+  , Header
+      2 ( "" , [] , [] ) [ Str "Great" , Space , Str "Plains" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Kansas" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Nebraska" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "North" , Space , Str "Dakota" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Oklahoma" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "South" , Space , Str "Dakota" ]
+  , Header 2 ( "" , [] , [] ) [ Str "Mid-Atlantic" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Delaware" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Maryland" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "New" , Space , Str "Jersey" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "New" , Space , Str "York" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Pennsylvania" ]
+  , Header 2 ( "" , [] , [] ) [ Str "Midwest" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Illinois" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Indiana" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Iowa" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Kentucky" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Michigan" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Minnesota" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Missouri" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Ohio" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "West" , Space , Str "Virginia" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Wisconsin" ]
+  , Header 2 ( "" , [] , [] ) [ Str "Mountains" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Colorado" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Idaho" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Montana" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Utah" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Wyoming" ]
+  , Header
+      2 ( "" , [] , [] ) [ Str "New" , Space , Str "England" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Connecticut" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Maine" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Massachusetts" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "New" , Space , Str "Hampshire" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "Rhode" , Space , Str "Island" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Vermont" ]
+  , Header 2 ( "" , [] , [] ) [ Str "South" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Alabama" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Arkansas" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Florida" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Georgia" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Louisiana" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Mississippi" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "North" , Space , Str "Carolina" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "South" , Space , Str "Carolina" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Tennessee" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Virginia" ]
+  , Header 2 ( "" , [] , [] ) [ Str "Southwest" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Arizona" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "New" , Space , Str "Mexico" ]
+  , Header 3 ( "" , [] , [] ) [ Str "Texas" ]
+  ]
diff --git a/test/org-select-tags.native b/test/org-select-tags.native
new file mode 100644
--- /dev/null
+++ b/test/org-select-tags.native
@@ -0,0 +1,103 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Header
+      1
+      ( "will-appear-because-it-is-the-ancestor-of-something-tagged-yes"
+      , []
+      , []
+      )
+      [ Str "Will"
+      , Space
+      , Str "appear"
+      , Space
+      , Str "because"
+      , Space
+      , Str "it"
+      , Space
+      , Str "is"
+      , Space
+      , Str "the"
+      , Space
+      , Str "ancestor"
+      , Space
+      , Str "of"
+      , Space
+      , Str "something"
+      , Space
+      , Str "tagged"
+      , Space
+      , Str "\"yes\""
+      ]
+  , Header
+      2
+      ( "will-appear" , [] , [] )
+      [ Str "Will"
+      , Space
+      , Str "appear"
+      , Space
+      , Span
+          ( "" , [ "tag" ] , [ ( "tag-name" , "yes" ) ] )
+          [ SmallCaps [ Str "yes" ] ]
+      ]
+  , Header
+      3
+      ( "will-appear-since-the-entire-subtree-of-something-selected-will-appear"
+      , []
+      , []
+      )
+      [ Str "Will"
+      , Space
+      , Str "appear"
+      , Space
+      , Str "since"
+      , Space
+      , Str "the"
+      , Space
+      , Str "entire"
+      , Space
+      , Str "subtree"
+      , Space
+      , Str "of"
+      , Space
+      , Str "something"
+      , Space
+      , Str "selected"
+      , Space
+      , Str "will"
+      , Space
+      , Str "appear"
+      ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Para [ Str "Will" , Space , Str "appear" ] ] ]
+  , Header
+      2
+      ( "will-appear-because-it-is-the-ancestor-of-something-listed-in-select-tags"
+      , []
+      , []
+      )
+      [ Str "Will"
+      , Space
+      , Str "appear"
+      , Space
+      , Str "because"
+      , Space
+      , Str "it"
+      , Space
+      , Str "is"
+      , Space
+      , Str "the"
+      , Space
+      , Str "ancestor"
+      , Space
+      , Str "of"
+      , Space
+      , Str "something"
+      , Space
+      , Str "listed"
+      , Space
+      , Str "in"
+      , Space
+      , Str "SELECT-TAGS"
+      ]
+  ]
diff --git a/test/org-select-tags.org b/test/org-select-tags.org
new file mode 100644
--- /dev/null
+++ b/test/org-select-tags.org
@@ -0,0 +1,17 @@
+#+select_tags: yes no
+#+exclude_tags: no
+
+In a document containing one or more trees containing a tag
+listed in SELECT_TAGS, only those trees and their ancestor nodes will appear;
+this text and any other text preceding the first headline
+won't appear for such documents.
+
+* Will appear because it is the ancestor of something tagged "yes"
+** Will appear                                                           :yes:
+*** Will appear since the entire subtree of something selected will appear
+**** Will appear
+*** Will not appear since this has tagged with something in EXCLUDE-TAGS :no:
+** Will not appear since it's not an ancestor of listed in SELECT-TAGS
+** Will appear because it is the ancestor of something listed in SELECT-TAGS
+*** Will not appear because it has an EXCLUDE-TAG, but since "no" is also listed as a SELECT-TAG, it will force its parent to appear :no:
+* Will not appear
diff --git a/test/pipe-tables.native b/test/pipe-tables.native
--- a/test/pipe-tables.native
+++ b/test/pipe-tables.native
@@ -1,115 +1,927 @@
-[Para [Str "Simplest",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "Default1"]]
- ,[Plain [Str "Default2"]]
- ,[Plain [Str "Default3"]]]
- [[[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]]
- ,[[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]]
- ,[[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]]]
-,Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"]
-,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignDefault,AlignCenter] [0.0,0.0,0.0,0.0]
- [[Plain [Str "Right"]]
- ,[Plain [Str "Left"]]
- ,[Plain [Str "Default"]]
- ,[Plain [Str "Center"]]]
- [[[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]]
- ,[[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]]
- ,[[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]]]
-,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table [] [AlignRight,AlignLeft,AlignCenter] [0.0,0.0,0.0]
- [[Plain [Str "Right"]]
- ,[Plain [Str "Left"]]
- ,[Plain [Str "Center"]]]
- [[[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]]
- ,[[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]]
- ,[[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]]]
-,Para [Str "Headerless",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table [] [AlignRight,AlignLeft,AlignCenter] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "12"]]
-  ,[Plain [Str "12"]]
-  ,[Plain [Str "12"]]]
- ,[[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]]
- ,[[Plain [Str "1"]]
-  ,[Plain [Str "1"]]
-  ,[Plain [Str "1"]]]]
-,Para [Str "Table",Space,Str "without",Space,Str "sides:"]
-,Table [] [AlignDefault,AlignRight] [0.0,0.0]
- [[Plain [Str "Fruit"]]
- ,[Plain [Str "Quantity"]]]
- [[[Plain [Str "apple"]]
-  ,[Plain [Str "5"]]]
- ,[[Plain [Str "orange"]]
-  ,[Plain [Str "17"]]]
- ,[[Plain [Str "pear"]]
-  ,[Plain [Str "302"]]]]
-,Para [Str "One-column:"]
-,Table [] [AlignDefault] [0.0]
- [[Plain [Str "hi"]]]
- [[[Plain [Str "lo"]]]]
-,Para [Str "Header-less",Space,Str "one-column:"]
-,Table [] [AlignCenter] [0.0]
- [[]]
- [[[Plain [Str "hi"]]]]
-,Para [Str "Indented",Space,Str "left",Space,Str "column:"]
-,Table [] [AlignRight,AlignLeft] [0.0,0.0]
- [[Plain [Str "Number",Space,Str "of",Space,Str "siblings"]]
- ,[Plain [Str "Salary"]]]
- [[[Plain [Str "3"]]
-  ,[Plain [Str "33"]]]
- ,[[Plain [Str "4"]]
-  ,[Plain [Str "44"]]]]
-,Para [Str "Long",Space,Str "pipe",Space,Str "table",Space,Str "with",Space,Str "relative",Space,Str "widths:"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.15517241379310345,0.1724137931034483,0.6724137931034483]
- [[Plain [Str "Default1"]]
- ,[Plain [Str "Default2"]]
- ,[Plain [Str "Default3"]]]
- [[[Plain [Str "123"]]
-  ,[Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "table",Space,Str "cell"]]
-  ,[Plain [Str "and",Space,Str "this",Space,Str "is",Space,Str "a",Space,Str "really",Space,Str "long",Space,Str "table",Space,Str "cell",Space,Str "that",Space,Str "will",Space,Str "probably",Space,Str "need",Space,Str "wrapping"]]]
- ,[[Plain [Str "123"]]
-  ,[Plain [Str "123"]]
-  ,[Plain [Str "123"]]]]
-,Para [Str "Pipe",Space,Str "table",Space,Str "with",Space,Str "no",Space,Str "body:"]
-,Table [] [AlignDefault] [0.0]
- [[Plain [Str "Header"]]]
- []
-,Para [Str "Pipe",Space,Str "table",Space,Str "with",Space,Str "tricky",Space,Str "cell",Space,Str "contents",Space,Str "(see",Space,Str "#2765):"]
-,Table [] [AlignLeft,AlignRight,AlignRight] [0.0,0.0,0.0]
- [[]
- ,[Plain [Str "IP_gene8-_1st"]]
- ,[Plain [Str "IP_gene8+_1st"]]]
- [[[Plain [Str "IP_gene8-_1st"]]
-  ,[Plain [Str "1.0000000"]]
-  ,[Plain [Str "0.4357325"]]]
- ,[[Plain [Str "IP_gene8+_1st"]]
-  ,[Plain [Str "0.4357325"]]
-  ,[Plain [Str "1.0000000"]]]
- ,[[Plain [Str "foo",Code ("",[],[]) "bar|baz"]]
-  ,[Plain [Str "and|escaped"]]
-  ,[Plain [Str "3.0000000"]]]]]
+[ Para
+    [ Str "Simplest"
+    , Space
+    , Str "table"
+    , Space
+    , Str "without"
+    , Space
+    , Str "caption:"
+    ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Default1" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Default2" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Default3" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para
+    [ Str "Simple"
+    , Space
+    , Str "table"
+    , Space
+    , Str "with"
+    , Space
+    , Str "caption:"
+    ]
+, Table
+    ( "" , [] , [] )
+    (Caption
+       Nothing
+       [ Plain
+           [ Str "Demonstration"
+           , Space
+           , Str "of"
+           , Space
+           , Str "simple"
+           , Space
+           , Str "table"
+           , Space
+           , Str "syntax."
+           ]
+       ])
+    [ ( AlignRight , ColWidthDefault )
+    , ( AlignLeft , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    , ( AlignCenter , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Right" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Left" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Default" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Center" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para
+    [ Str "Simple"
+    , Space
+    , Str "table"
+    , Space
+    , Str "without"
+    , Space
+    , Str "caption:"
+    ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignRight , ColWidthDefault )
+    , ( AlignLeft , ColWidthDefault )
+    , ( AlignCenter , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Right" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Left" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Center" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para
+    [ Str "Headerless"
+    , Space
+    , Str "table"
+    , Space
+    , Str "without"
+    , Space
+    , Str "caption:"
+    ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignRight , ColWidthDefault )
+    , ( AlignLeft , ColWidthDefault )
+    , ( AlignCenter , ColWidthDefault )
+    ]
+    (TableHead ( "" , [] , [] ) [])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "12" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para
+    [ Str "Table" , Space , Str "without" , Space , Str "sides:" ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidthDefault )
+    , ( AlignRight , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Fruit" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Quantity" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "apple" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "5" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "orange" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "17" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "pear" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "302" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para [ Str "One-column:" ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidthDefault ) ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "hi" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "lo" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para [ Str "Header-less" , Space , Str "one-column:" ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignCenter , ColWidthDefault ) ]
+    (TableHead ( "" , [] , [] ) [])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "hi" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para
+    [ Str "Indented" , Space , Str "left" , Space , Str "column:" ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignRight , ColWidthDefault )
+    , ( AlignLeft , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain
+                   [ Str "Number" , Space , Str "of" , Space , Str "siblings" ]
+               ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Salary" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "3" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "33" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "4" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "44" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para
+    [ Str "Long"
+    , Space
+    , Str "pipe"
+    , Space
+    , Str "table"
+    , Space
+    , Str "with"
+    , Space
+    , Str "relative"
+    , Space
+    , Str "widths:"
+    ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidth 0.15517241379310345 )
+    , ( AlignDefault , ColWidth 0.1724137931034483 )
+    , ( AlignDefault , ColWidth 0.6724137931034483 )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Default1" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Default2" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Default3" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain
+                    [ Str "this"
+                    , Space
+                    , Str "is"
+                    , Space
+                    , Str "a"
+                    , Space
+                    , Str "table"
+                    , Space
+                    , Str "cell"
+                    ]
+                ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain
+                    [ Str "and"
+                    , Space
+                    , Str "this"
+                    , Space
+                    , Str "is"
+                    , Space
+                    , Str "a"
+                    , Space
+                    , Str "really"
+                    , Space
+                    , Str "long"
+                    , Space
+                    , Str "table"
+                    , Space
+                    , Str "cell"
+                    , Space
+                    , Str "that"
+                    , Space
+                    , Str "will"
+                    , Space
+                    , Str "probably"
+                    , Space
+                    , Str "need"
+                    , Space
+                    , Str "wrapping"
+                    ]
+                ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "123" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para
+    [ Str "Pipe"
+    , Space
+    , Str "table"
+    , Space
+    , Str "with"
+    , Space
+    , Str "no"
+    , Space
+    , Str "body:"
+    ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidthDefault ) ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Header" ] ]
+           ]
+       ])
+    [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para
+    [ Str "Pipe"
+    , Space
+    , Str "table"
+    , Space
+    , Str "with"
+    , Space
+    , Str "tricky"
+    , Space
+    , Str "cell"
+    , Space
+    , Str "contents"
+    , Space
+    , Str "(see"
+    , Space
+    , Str "#2765):"
+    ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignLeft , ColWidthDefault )
+    , ( AlignRight , ColWidthDefault )
+    , ( AlignRight , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell ( "" , [] , [] ) AlignDefault (RowSpan 1) (ColSpan 1) []
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "IP_gene8-_1st" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "IP_gene8+_1st" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "IP_gene8-_1st" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1.0000000" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "0.4357325" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "IP_gene8+_1st" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "0.4357325" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "1.0000000" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "foo" , Code ( "" , [] , [] ) "bar|baz" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "and|escaped" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "3.0000000" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+]
diff --git a/test/pod-reader.native b/test/pod-reader.native
new file mode 100644
--- /dev/null
+++ b/test/pod-reader.native
@@ -0,0 +1,393 @@
+[ Header
+    1
+    ( "" , [] , [] )
+    [ Str "POD" , Space , Str "TEST" , Space , Str "SUITE" ]
+, Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "test"
+    , Space
+    , Link
+        ( "" , [] , [] )
+        [ Str "Pod" ]
+        ( "https://perldoc.pl/perlpod" , "" )
+    , Space
+    , Str "document"
+    , Space
+    , Str "for"
+    , Space
+    , Str "pandoc."
+    ]
+, Header 2 ( "" , [] , [] ) [ Str "Head" , Space , Str "2" ]
+, Header
+    3
+    ( "" , [] , [] )
+    [ Str "Head"
+    , Space
+    , Str "3:"
+    , Space
+    , Emph [ Str "The>" , Space , Str "This is a raw block destined for the HTML format\n\n"
+, BulletList
+    [ [ Para [ Str "Bulleted" , Space , Str "list" ] ]
+    , [ Para [ Str "Ordered" , Space , Str "list" ]
+      , OrderedList
+          ( 1 , DefaultStyle , DefaultDelim )
+          [ [ Para
+                [ Str "Here's"
+                , Space
+                , Str "a"
+                , Space
+                , Str "verbatim"
+                , Space
+                , Str "paragraph"
+                , Space
+                , Str "in"
+                , Space
+                , Str "this"
+                , Space
+                , Str "list"
+                , Space
+                , Str "item:"
+                ]
+            , CodeBlock
+                ( "" , [] , [] )
+                "    this is a code block\nthis is still part of the code block\n  so is this.\nIt seems that the prefixed spaces in verbatim blocks in pod don't get stripped.\n\n This should continue the previous code block despite the intervening blank\n line, because the first line starts with a space\n\n\n\n    the above blank lines with varying numbers of spaces should also be in\n the code block\n    pod formatters should (but not must) expand tabs by default\nso we're not special casing pandoc's behavior there in any way\n"
+            , Para
+                [ Str "Wow,"
+                , Space
+                , Str "that"
+                , Space
+                , Str "was"
+                , Space
+                , Str "fun."
+                ]
+            ]
+          , [ Para [ Str "Definition" , Space , Str "list" ]
+            , DefinitionList
+                [ ( [ Span
+                        ( "" , [] , [] )
+                        [ Str "Marvin"
+                        , Space
+                        , Str "the"
+                        , Space
+                        , Str "Martian"
+                        ]
+                    ]
+                  , [ [ Para
+                          [ Str "A"
+                          , Space
+                          , Str "cartoon"
+                          , Space
+                          , Str "alien"
+                          ]
+                      ]
+                    ]
+                  )
+                , ( [ Span
+                        ( "" , [] , [] )
+                        [ Emph
+                            [ Str "The"
+                            , Space
+                            , Str "Sun"
+                            , Space
+                            , Str "Also"
+                            , Space
+                            , Str "Rises"
+                            ]
+                        ]
+                    ]
+                  , [ [ Para
+                          [ Str "A"
+                          , Space
+                          , Str "novel"
+                          , Space
+                          , Str "by"
+                          , Space
+                          , Str "Ernest"
+                          , Space
+                          , Str "Hemingway"
+                          ]
+                      ]
+                    ]
+                  )
+                , ( [ Span
+                        ( "" , [] , [] )
+                        [ Code ( "" , [] , [] ) "undefined" ]
+                    ]
+                  , [ [] ]
+                  )
+                , ( [ Span
+                        ( "" , [] , [] )
+                        [ Str "And"
+                        , Space
+                        , Str "now,"
+                        , Space
+                        , Str "a"
+                        , Space
+                        , Str "quotation"
+                        ]
+                    ]
+                  , [ [ BlockQuote
+                          [ Para
+                              [ Str "Where's"
+                              , Space
+                              , Str "my"
+                              , Space
+                              , Str "space"
+                              , Space
+                              , Str "modulator?"
+                              ]
+                          ]
+                      ]
+                    ]
+                  )
+                ]
+            ]
+          , [ Para
+                [ Str "And"
+                , Space
+                , Str "the"
+                , Space
+                , Str "list"
+                , Space
+                , Str "continues."
+                ]
+            ]
+          ]
+      ]
+    , [ Para
+          [ Str "And"
+          , Space
+          , Str "so"
+          , Space
+          , Str "does"
+          , Space
+          , Str "the"
+          , Space
+          , Str "other"
+          , Space
+          , Str "one,"
+          , Space
+          , Str "even"
+          , Space
+          , Str "if"
+          , Space
+          , Str "I"
+          , Space
+          , Str "forget"
+          , Space
+          , Str "the"
+          , Space
+          , Str "asterisk."
+          ]
+      ]
+    ]
+, Div
+    ( "" , [ "neat" ] , [] )
+    [ Para
+        [ Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Str "div"
+        , Space
+        , Str "for"
+        , Space
+        , Str "our"
+        , Space
+        , Str "purposes."
+        ]
+    , Para
+        [ Str "It"
+        , Space
+        , Str "should"
+        , Space
+        , Str "parse"
+        , Space
+        , Strong [ Str "content" ]
+        , Space
+        , Str "inside"
+        , Space
+        , Str "of"
+        , Space
+        , Str "it."
+        ]
+    , BulletList
+        [ [ Para [ Str "Like" , Space , Str "this" ] ] ]
+    ]
+, Div
+    ( "" , [ "excitement" ] , [] )
+    [ Para
+        [ Str "this"
+        , Space
+        , Str "is"
+        , Space
+        , Str "its"
+        , Space
+        , Str "own"
+        , Space
+        , Str "div"
+        ]
+    ]
+, RawBlock
+    (Format "html") " 
    and this is its own raw block
    \n"
+, RawBlock (Format "html") "\n
    so is this
    \n"
+, Header
+    2
+    ( "" , [] , [] )
+    [ Code ( "" , [] , [] ) "=cut"
+    , Space
+    , Str "before"
+    , Space
+    , Str "any"
+    , Space
+    , Code ( "" , [] , [] ) "=item"
+    , Space
+    , Str "in"
+    , Space
+    , Code ( "" , [] , [] ) "=over"
+    ]
+, BulletList
+    [ [ Para [ Str "a" ] , Para [ Str "b" ] ]
+    , [ Para [ Str "c" ] ]
+    ]
+]
diff --git a/test/pod-reader.pod b/test/pod-reader.pod
new file mode 100644
--- /dev/null
+++ b/test/pod-reader.pod
@@ -0,0 +1,155 @@
+text before any Pod commands is not parsed, which is unusual for formats
+supported by pandoc, but 
+
+=head1 POD TEST SUITE
+
+This is a test L document for pandoc.
+
+=encoding utf8
+
+=head2 Head 2
+
+=head3 Head 3: I<< The> >
+
+=head4 How to use the L command,
+an introduction
+
+=head5 C and his 52 assistants
+
+=head6 The =head5 and =head6 commands are newer and my syntax highlighting
+doesn't recognize them. In any case, it should be possible to have a very long
+paragraph in the heading.
+
+=head6
+It should also be possible to start the heading paragraph on the next line
+
+=cut
+
+This doesn't get parsed at all.
+
+=begin html
+
+This is a raw block destined for the HTML format
+
+=end html
+
+=over
+
+=item *
+
+Bulleted list
+
+=item *
+
+Ordered list
+
+=over
+
+=item 1.
+
+Here's a verbatim paragraph in this list item:
+
+    this is a code block
+this is still part of the code block
+  so is this.
+It seems that the prefixed spaces in verbatim blocks in pod don't get stripped.
+
+ This should continue the previous code block despite the intervening blank
+ line, because the first line starts with a space
+    
+
+ 
+    the above blank lines with varying numbers of spaces should also be in
+ the code block
+	pod formatters should (but not must) expand tabs by default
+so we're not special casing pandoc's behavior there in any way
+
+Wow, that was fun.
+
+=item 2.
+
+Definition list
+
+=over
+
+=item Marvin the MZ<>artian
+
+A cartoon alien
+
+=item I
+
+A novel by Ernest Hemingway
+
+=item C
+
+=item And now, a quotation
+
+=over
+
+Where's my space modulator?
+
+=back
+
+=back
+
+=item 3.
+
+And the list continues.
+
+=back
+
+=item
+
+And so does the other one, even if I forget the asterisk.
+
+=back
+
+=begin :neat
+
+This is a div for our purposes.
+
+It should parse B<< content >> inside of it.
+
+=over
+
+=item
+
+Like this
+
+=back
+
+=end :neat
+
+=for :excitement this is its own div
+
+=for html 
    and this is its own raw block
    
+
+=for html
+
    so is this
    
+
+=head2 C<=cut> before any C<=item> in C<=over>
+
+=over
+
+=cut
+
+blah
+
+=item *
+
+a
+
+=cut
+
+blah blah
+
+=pod
+
+b
+
+=item *
+
+c
+
+=back
diff --git a/test/pptx-reader/basic.native b/test/pptx-reader/basic.native
new file mode 100644
--- /dev/null
+++ b/test/pptx-reader/basic.native
@@ -0,0 +1,149 @@
+[ Header 2 ( "slide-1" , [] , [] ) [ Str "LLMs" ]
+, BulletList
+    [ [ Plain
+          [ Str
+              "Provider  \61664 Available LLMs \8211 who manages? How?"
+          ]
+      ]
+    , [ Plain
+          [ Str
+              "EW maintained list of \8220approved\8221 LLMs for Universal workers"
+          ]
+      ]
+    , [ Plain
+          [ Str
+              "Rebuilding of UWs to the \8220Newgen\8221 thing completely"
+          ]
+      ]
+    , [ Plain [ Str "Streaming support" ] ]
+    , [ Plain [ Str "Multimodal (voice streaming) models?" ] ]
+    ]
+, Header
+    2
+    ( "slide-2" , [] , [] )
+    [ Str "Everworker   venn   diagram" ]
+, Para [ Str "SKILLS" ]
+, Para [ Str "" ]
+, Para [ Str "Specialized Workers / Workflows:" ]
+, Para [ Str "" ]
+, Para [ Str "n8n, UI Path, " ]
+, Para [ Str "other RPA" ]
+, Para [ Str "BRAINS" ]
+, Para [ Str "" ]
+, Para [ Str "Universal Workers / AI Agents:" ]
+, Para [ Str "" ]
+, Para [ Str "openai , anthropic," ]
+, Para [ Str "Crew AI, other " ]
+, Para [ Str "\8220AI natives\8221" ]
+, Para [ Str "KNOWLEDGE " ]
+, Para [ Str "" ]
+, Para [ Str "Data / " ]
+, Para [ Str "RAG Pipelines" ]
+, Para [ Str "" ]
+, Para
+    [ Str "Vector DBs, specialized data prep vendors, \8230" ]
+, Para [ Str "glean" ]
+, Para [ Str "EW" ]
+, Header 2 ( "slide-3" , [] , [] ) [ Str "Table" ]
+, Table
+    ( "" , [] , [] )
+    (Caption Nothing [])
+    [ ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    , ( AlignDefault , ColWidthDefault )
+    ]
+    (TableHead
+       ( "" , [] , [] )
+       [ Row
+           ( "" , [] , [] )
+           [ Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Col1" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Col2" ] ]
+           , Cell
+               ( "" , [] , [] )
+               AlignDefault
+               (RowSpan 1)
+               (ColSpan 1)
+               [ Plain [ Str "Col3" ] ]
+           ]
+       ])
+    [ TableBody
+        ( "" , [] , [] )
+        (RowHeadColumns 0)
+        []
+        [ Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "Name" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "Anton" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "Antich" ] ]
+            ]
+        , Row
+            ( "" , [] , [] )
+            [ Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "Age" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "23" ] ]
+            , Cell
+                ( "" , [] , [] )
+                AlignDefault
+                (RowSpan 1)
+                (ColSpan 1)
+                [ Plain [ Str "years" ] ]
+            ]
+        ]
+    ]
+    (TableFoot ( "" , [] , [] ) [])
+, Para
+    [ Image
+        ( "" , [] , [] ) [] ( "ppt/media/image1.png" , "Picture 6" )
+    ]
+, Header 2 ( "slide-4" , [] , [] ) [ Str "Smart Art" ]
+, Div
+    ( ""
+    , [ "smartart" , "chevron2" ]
+    , [ ( "layout" , "chevron2" ) ]
+    )
+    [ Para [ Strong [ Str "First" ] ]
+    , BulletList
+        [ [ Plain [ Str "another" ] ]
+        , [ Plain [ Str "subtitle" ] ]
+        ]
+    , Para [ Strong [ Str "Second" ] ]
+    , BulletList
+        [ [ Plain [ Str "and yet again" ] ]
+        , [ Plain [ Str "yet more" ] ]
+        ]
+    ]
+]
diff --git a/test/pptx-reader/basic.pptx b/test/pptx-reader/basic.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx-reader/basic.pptx differ
diff --git a/test/pptx/background-image/input.native b/test/pptx/background-image/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/background-image/input.native
@@ -0,0 +1,17 @@
+[Header 1 ("section-header-with-background-image",[],[("background-image","movie.jpg")]) [Str "Section",Space,Str "Header",Space,Str "(with",Space,Str "background",Space,Str "image)"]
+,Header 2 ("slide-1",[],[("background-image","lalune.jpg")]) [Str "Slide",Space,Str "1"]
+,Para [Str "This",Space,Str "slide",Space,Str "has",Space,Str "a",Space,Str "moon",Space,Str "background."]
+,Header 2 ("slide-2",[],[("background-image","movie.jpg")]) [Str "Slide",Space,Str "2"]
+,Para [Str "This",Space,Str "slide",Space,Str "has",Space,Str "a",Space,Str "movie",Space,Str "background."]
+,Header 2 ("slide-3",[],[("background-image","movie.jpg")]) [Str "Slide",Space,Str "3"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "Background",Space,Str "images",Space,Str "work",Space,Str "in",Space,Str "two-column",Space,Str "layout."]]
+ ,Div ("",["column"],[])
+  [Para [Str "hello"]]]
+,Header 2 ("slide-4",[],[("background-image","movie.jpg")]) [Str "Slide",Space,Str "4"]
+,Para [Str "You",Space,Str "can",Space,Str "have",Space,Str "images",Space,Str "on",Space,Str "slides",Space,Str "that",Space,Str "have",Space,Str "background",Space,Str "images:"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]
+,Header 2 ("section",[],[("background-image","lalune.jpg")]) []
+,Div ("",["notes"],[])
+ [Para [Str "Blank",Space,Str "slides",Space,Str "can",Space,Str "have",Space,Str "background",Space,Str "images."]]]
diff --git a/test/pptx/background-image/output.pptx b/test/pptx/background-image/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/background-image/output.pptx differ
diff --git a/test/pptx/background-image/templated.pptx b/test/pptx/background-image/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/background-image/templated.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/input.native b/test/pptx/blanks/just-speaker-notes/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/blanks/just-speaker-notes/input.native
@@ -0,0 +1,7 @@
+[Header 1 ("first-slide",[],[]) [Str "First",Space,Str "slide"]
+,Para [Str "Nothing",Space,Str "to",Space,Str "see",Space,Str "here"]
+,Header 1 ("section",[],[]) []
+,Div ("",["notes"],[])
+ [Para [Str "Some",Space,Str "notes",Space,Str "here:",Space,Str "this",Space,Str "first",Space,Str "slide",Space,Str "should",Space,Str "use",Space,Str "the",Space,Str "Blank",Space,Str "template"]]
+,Header 1 ("third-slide",[],[]) [Str "Third",Space,Str "slide"]
+,Para [Str "The",Space,Str "second",Space,Str "slide",Space,Str "should",Space,Str "be",Space,Str "blank"]]
diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/blanks/just-speaker-notes/output.pptx differ
diff --git a/test/pptx/blanks/just-speaker-notes/templated.pptx b/test/pptx/blanks/just-speaker-notes/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/blanks/just-speaker-notes/templated.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/input.native b/test/pptx/blanks/nbsp-in-body/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/blanks/nbsp-in-body/input.native
@@ -0,0 +1,6 @@
+[Header 1 ("first-slide",[],[]) [Str "First",Space,Str "slide"]
+,Para [Str "Uninteresting,",Space,Str "normal"]
+,Header 1 ("section",[],[]) []
+,Para [Str "\160"]
+,Header 1 ("third-slide",[],[]) [Str "Third",Space,Str "slide"]
+,Para [Str "Was",Space,Str "the",Space,Str "previous",Space,Str "one",Space,Str "blank?"]]
diff --git a/test/pptx/blanks/nbsp-in-body/output.pptx b/test/pptx/blanks/nbsp-in-body/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/blanks/nbsp-in-body/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-body/templated.pptx b/test/pptx/blanks/nbsp-in-body/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/blanks/nbsp-in-body/templated.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/input.native b/test/pptx/blanks/nbsp-in-heading/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/blanks/nbsp-in-heading/input.native
@@ -0,0 +1,5 @@
+[Header 1 ("first-slide",[],[]) [Str "First",Space,Str "slide"]
+,Para [Str "Uninteresting,",Space,Str "normal"]
+,Header 1 ("section",[],[]) [Str "\160"]
+,Header 1 ("third-slide",[],[]) [Str "Third",Space,Str "slide"]
+,Para [Str "Was",Space,Str "the",Space,Str "previous",Space,Str "one",Space,Str "blank?"]]
diff --git a/test/pptx/blanks/nbsp-in-heading/output.pptx b/test/pptx/blanks/nbsp-in-heading/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/blanks/nbsp-in-heading/output.pptx differ
diff --git a/test/pptx/blanks/nbsp-in-heading/templated.pptx b/test/pptx/blanks/nbsp-in-heading/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/blanks/nbsp-in-heading/templated.pptx differ
diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/code-custom/output.pptx differ
diff --git a/test/pptx/code-custom/templated.pptx b/test/pptx/code-custom/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/code-custom/templated.pptx differ
diff --git a/test/pptx/code/input.native b/test/pptx/code/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/code/input.native
@@ -0,0 +1,21 @@
+[Header 1 ("header-with-inline-code",[],[]) [Str "Header",Space,Str "with",Space,Code ("",[],[]) "inline code"]
+,CodeBlock ("",[],[]) "Code at level 0"
+,BulletList
+ [[Para [Str "Bullet",Space,Str "item",Space,Str "with",Space,Code ("",[],[]) "inline code"]
+  ,CodeBlock ("",[],[]) "Code block at level 1"
+  ,BulletList
+   [[Para [Str "with",Space,Code ("",[],[]) "nested"]
+    ,CodeBlock ("",[],[]) "lvl2\nlvl2\nlvl2"
+    ,Header 2 ("second-heading-level-with-code",[],[]) [Str "Second",Space,Str "heading",Space,Str "level",Space,Str "with",Space,Code ("",[],[]) "code"]]]]]
+,Header 1 ("syntax-highlighting",[],[]) [Str "Syntax",Space,Str "highlighting"]
+,CodeBlock ("",["haskell"],[]) "id :: a -> a\nid x = x"
+,BulletList
+ [[Para [Str "Nested"]
+  ,CodeBlock ("",["haskell"],[]) "g :: Int -> Int\ng x = x * 3"]]
+,Header 1 ("two-column-slide",[],[]) [Str "Two",Space,Str "column",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[("width","50%")])
+  [BulletList
+   [[Plain [Str "A",Space,Str "total",Space,Str "alternative",Space,Str "for",Space,Code ("",[],[]) "head"]]]]
+ ,Div ("",["column"],[("width","50%")])
+  [CodeBlock ("",[],[]) "safeHead :: [a] -> Maybe a\nsafeHead [] = Nothing\nsafeHead (x:_) = Just x"]]]
diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/code/output.pptx differ
diff --git a/test/pptx/code/templated.pptx b/test/pptx/code/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/code/templated.pptx differ
diff --git a/test/pptx/comparison/both-columns/input.native b/test/pptx/comparison/both-columns/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/comparison/both-columns/input.native
@@ -0,0 +1,23 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "plus"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a",Space,Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])
+  ,Para [Str "Then",Space,Str "some",Space,Str "more",Space,Str "text"]]
+ ,Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Para [Image ("",[],[]) [Str "Plus",Space,Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/both-columns/output.pptx differ
diff --git a/test/pptx/comparison/both-columns/templated.pptx b/test/pptx/comparison/both-columns/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/both-columns/templated.pptx differ
diff --git a/test/pptx/comparison/extra-image/input.native b/test/pptx/comparison/extra-image/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/comparison/extra-image/input.native
@@ -0,0 +1,24 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "plus"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a",Space,Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])
+  ,Para [Str "Then",Space,Str "some",Space,Str "more",Space,Str "text"]]
+ ,Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Para [Image ("",[],[]) [Str "Plus",Space,Str "an",Space,Str "image"] ("lalune.jpg","fig:")]
+  ,Para [Image ("",[],[]) [Str "And",Space,Str "another",Space,Str "image"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/extra-image/output.pptx differ
diff --git a/test/pptx/comparison/extra-image/templated.pptx b/test/pptx/comparison/extra-image/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/extra-image/templated.pptx differ
diff --git a/test/pptx/comparison/extra-text/input.native b/test/pptx/comparison/extra-text/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/comparison/extra-text/input.native
@@ -0,0 +1,23 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "plus"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a",Space,Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])
+  ,Para [Str "Then",Space,Str "some",Space,Str "more",Space,Str "text"]]
+ ,Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Para [Image ("",[],[]) [Str "Plus",Space,Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/extra-text/output.pptx differ
diff --git a/test/pptx/comparison/extra-text/templated.pptx b/test/pptx/comparison/extra-text/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/extra-text/templated.pptx differ
diff --git a/test/pptx/comparison/non-text-first/input.native b/test/pptx/comparison/non-text-first/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/comparison/non-text-first/input.native
@@ -0,0 +1,21 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])
+  ,Para [Str "Plus",Space,Str "a",Space,Str "paragraph",Space,Str "here"]]
+ ,Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "Just",Space,Str "an",Space,Str "image",Space,Str "on",Space,Str "this",Space,Str "side"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/non-text-first/output.pptx differ
diff --git a/test/pptx/comparison/non-text-first/templated.pptx b/test/pptx/comparison/non-text-first/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/non-text-first/templated.pptx differ
diff --git a/test/pptx/comparison/one-column/input.native b/test/pptx/comparison/one-column/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/comparison/one-column/input.native
@@ -0,0 +1,21 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "A",Space,Str "paragraph",Space,Str "here"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 0.125)
+   ,(AlignDefault,ColWidth 0.125)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "plus"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "a",Space,Str "table"]]]])]
+   (TableFoot ("",[],[])
+   [])]
+ ,Div ("",["column"],[])
+  [Para [Str "Only",Space,Str "a",Space,Str "paragraph",Space,Str "here"]]]]
diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/one-column/output.pptx differ
diff --git a/test/pptx/comparison/one-column/templated.pptx b/test/pptx/comparison/one-column/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/comparison/one-column/templated.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/input.native b/test/pptx/content-with-caption/heading-text-image/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/content-with-caption/heading-text-image/input.native
@@ -0,0 +1,3 @@
+[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"]
+,Para [Str "Some",Space,Str "text",Space,Str "here"]
+,Para [Image ("",[],[]) [Str "Followed",Space,Str "by",Space,Str "a",Space,Str "picture"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/content-with-caption/heading-text-image/output.pptx b/test/pptx/content-with-caption/heading-text-image/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/content-with-caption/heading-text-image/output.pptx differ
diff --git a/test/pptx/content-with-caption/heading-text-image/templated.pptx b/test/pptx/content-with-caption/heading-text-image/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/content-with-caption/heading-text-image/templated.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/input.native b/test/pptx/content-with-caption/image-text/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/content-with-caption/image-text/input.native
@@ -0,0 +1,2 @@
+[Para [Image ("",[],[]) [Str "The",Space,Str "picture",Space,Str "first"] ("lalune.jpg","fig:")]
+,Para [Str "Then",Space,Str "some",Space,Str "text",Space,Str "here"]]
diff --git a/test/pptx/content-with-caption/image-text/output.pptx b/test/pptx/content-with-caption/image-text/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/content-with-caption/image-text/output.pptx differ
diff --git a/test/pptx/content-with-caption/image-text/templated.pptx b/test/pptx/content-with-caption/image-text/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/content-with-caption/image-text/templated.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/input.native b/test/pptx/content-with-caption/text-image/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/content-with-caption/text-image/input.native
@@ -0,0 +1,2 @@
+[Para [Str "Some",Space,Str "text",Space,Str "here"]
+,Para [Image ("",[],[]) [Str "Followed",Space,Str "by",Space,Str "a",Space,Str "picture"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/content-with-caption/text-image/output.pptx b/test/pptx/content-with-caption/text-image/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/content-with-caption/text-image/output.pptx differ
diff --git a/test/pptx/content-with-caption/text-image/templated.pptx b/test/pptx/content-with-caption/text-image/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/content-with-caption/text-image/templated.pptx differ
diff --git a/test/pptx/document-properties-short-desc/input.native b/test/pptx/document-properties-short-desc/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/document-properties-short-desc/input.native
@@ -0,0 +1,2 @@
+Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "A.",Space,Str "M."]]),("description",MetaInlines [Str "Short",Space,RawInline (Format "html") "",Str "description",RawInline (Format "html") "",Space,Str "&."]),("keywords",MetaList [MetaInlines [Str "keyword",Space,Str "1"],MetaInlines [Str "keyword",Space,Str "2"]]),("subject",MetaInlines [Str "This",Space,Str "is",Space,Str "the",Space,Str "subject"]),("title",MetaInlines [Str "Testing",Space,Str "custom",Space,Str "properties"])]})
+[Para [Str "Testing",Space,Str "document",Space,Str "properties"]]
diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/document-properties-short-desc/output.pptx differ
diff --git a/test/pptx/document-properties-short-desc/templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/document-properties-short-desc/templated.pptx differ
diff --git a/test/pptx/document-properties/input.native b/test/pptx/document-properties/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/document-properties/input.native
@@ -0,0 +1,2 @@
+Pandoc (Meta {unMeta = fromList [("Company",MetaInlines [Str "My",Space,Str "Company"]),("Second Custom Property",MetaInlines [Str "Second",Space,Str "custom",Space,Str "property",Space,Str "value"]),("abstract",MetaBlocks [Plain [Str "Quite",Space,Str "a",Space,Str "long",Space,Str "description",SoftBreak,Str "spanning",Space,Str "several",Space,Str "lines"]]),("author",MetaList [MetaInlines [Str "A.",Space,Str "M."]]),("category",MetaInlines [Str "My",Space,Str "Category"]),("custom1",MetaInlines [Str "First",Space,Str "custom",Space,Str "property",Space,Str "value"]),("custom3",MetaInlines [Str "Escaping",Space,Str "amp",Space,Str "&",Space,Str "."]),("custom4",MetaInlines [Str "Escaping",Space,Str "LT,GT",Space,Str "<",Space,Str "asdf",Space,Str ">",Space,Str "<"]),("custom5",MetaInlines [Str "Escaping",Space,Str "html",Space,RawInline (Format "html") "",Str "asdf",RawInline (Format "html") ""]),("custom6",MetaInlines [Str "Escaping",Space,Emph [Str "MD"],Space,Str "\225",Space,Str "a"]),("custom9",MetaInlines [Str "Extended",Space,Str "chars:",Space,Str "\8364",Space,Str "\225",Space,Str "\233",Space,Str "\237",Space,Str "\243",Space,Str "\250",Space,Str "$"]),("description",MetaBlocks [Para [Str "Long",Space,Str "description",Space,Str "spanning",SoftBreak,Str "several",Space,Str "lines."],Plain [Str "This",Space,Str "is",Space,Str "\225",Space,Str "second",Space,RawInline (Format "html") "",Str "line",RawInline (Format "html") "",Str "."]]),("keywords",MetaList [MetaInlines [Str "keyword",Space,Str "1"],MetaInlines [Str "keyword",Space,Str "2"]]),("lang",MetaInlines [Str "en-US"]),("nested-custom",MetaList [MetaMap (fromList [("custom 7",MetaInlines [Str "Nested",Space,Str "Custom",Space,Str "value",Space,Str "7"])]),MetaMap (fromList [("custom 8",MetaInlines [Str "Nested",Space,Str "Custom",Space,Str "value",Space,Str "8"])])]),("subject",MetaInlines [Str "This",Space,Str "is",Space,Str "the",Space,Str "subject"]),("subtitle",MetaInlines [Str "This",Space,Str "is",Space,Str "a",Space,Str "subtitle"]),("title",MetaInlines [Str "Testing",Space,Str "custom",Space,Str "properties"])]})
+[Para [Str "Testing",Space,Str "document",Space,Str "properties"]]
diff --git a/test/pptx/document-properties/output.pptx b/test/pptx/document-properties/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/document-properties/output.pptx differ
diff --git a/test/pptx/document-properties/templated.pptx b/test/pptx/document-properties/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/document-properties/templated.pptx differ
diff --git a/test/pptx/endnotes-toc/output.pptx b/test/pptx/endnotes-toc/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/endnotes-toc/output.pptx differ
diff --git a/test/pptx/endnotes-toc/templated.pptx b/test/pptx/endnotes-toc/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/endnotes-toc/templated.pptx differ
diff --git a/test/pptx/endnotes/input.native b/test/pptx/endnotes/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/endnotes/input.native
@@ -0,0 +1,2 @@
+Pandoc (Meta {unMeta = fromList []})
+[Para [Str "Here",Space,Str "is",Space,Str "one",Space,Str "note.",Note [Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "note."]],Space,Str "And",Space,Str "one",Space,Str "more",Space,Str "note.",Note [Para [Str "And",Space,Str "another",Space,Str "note."]]]]
diff --git a/test/pptx/endnotes/output.pptx b/test/pptx/endnotes/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/endnotes/output.pptx differ
diff --git a/test/pptx/endnotes/templated.pptx b/test/pptx/endnotes/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/endnotes/templated.pptx differ
diff --git a/test/pptx/footer/basic/output.pptx b/test/pptx/footer/basic/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/footer/basic/output.pptx differ
diff --git a/test/pptx/footer/basic/reference.pptx b/test/pptx/footer/basic/reference.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/footer/basic/reference.pptx differ
diff --git a/test/pptx/footer/fixed-date/output.pptx b/test/pptx/footer/fixed-date/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/footer/fixed-date/output.pptx differ
diff --git a/test/pptx/footer/fixed-date/reference.pptx b/test/pptx/footer/fixed-date/reference.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/footer/fixed-date/reference.pptx differ
diff --git a/test/pptx/footer/higher-slide-number/output.pptx b/test/pptx/footer/higher-slide-number/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/footer/higher-slide-number/output.pptx differ
diff --git a/test/pptx/footer/higher-slide-number/reference.pptx b/test/pptx/footer/higher-slide-number/reference.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/footer/higher-slide-number/reference.pptx differ
diff --git a/test/pptx/footer/input.native b/test/pptx/footer/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/footer/input.native
@@ -0,0 +1,66 @@
+Pandoc (Meta {unMeta = fromList [("author",MetaInlines [Str "Me"]),("date",MetaInlines [Str "14/09/1995"]),("title",MetaInlines [Str "Slides"])]})
+[Header 2 ("slide-1",[],[]) [Str "Slide",Space,Str "1"]
+,Para [Str "Hello",Space,Str "there"]
+,Header 1 ("layouts",[],[]) [Str "Layouts"]
+,Header 2 ("slide-3",[],[]) [Str "Slide",Space,Str "3"]
+,Para [Str "Does",Space,Str "it",Space,Str "work",Space,Str "on",Space,Str "other",Space,Str "layouts?"]
+,Table ("",[],[]) (Caption Nothing
+ [])
+ [(AlignDefault,ColWidth 5.555555555555555e-2)
+ ,(AlignDefault,ColWidth 5.555555555555555e-2)]
+ (TableHead ("",[],[])
+ [])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "2"]]]])]
+ (TableFoot ("",[],[])
+ [])
+,Header 2 ("slide-4",[],[]) [Str "Slide",Space,Str "4"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "hello",Space,Str "hello"]]
+ ,Div ("",["column"],[])
+  [Para [Str "goood",Space,Str "bye"]]]
+,Header 2 ("slide-5",[],[]) [Str "Slide",Space,Str "5"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "Hello",Space,Str "there"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 5.555555555555555e-2)
+   ,(AlignDefault,ColWidth 5.555555555555555e-2)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "1"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "2"]]]])]
+   (TableFoot ("",[],[])
+   [])]
+ ,Div ("",["column"],[])
+  [Para [Str "oh",Space,Str "wait"]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 5.555555555555555e-2)
+   ,(AlignDefault,ColWidth 5.555555555555555e-2)]
+   (TableHead ("",[],[])
+   [])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "1"]]
+     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "2"]]]])]
+   (TableFoot ("",[],[])
+   [])]]
+,Header 2 ("section",[],[]) []
+,Div ("",["notes"],[])
+ [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "blank",Space,Str "slide:",Space,Str "does",Space,Str "it",Space,Str "have",Space,Str "a",Space,Str "footer?"]]]
diff --git a/test/pptx/footer/no-title-slide/output.pptx b/test/pptx/footer/no-title-slide/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/footer/no-title-slide/output.pptx differ
diff --git a/test/pptx/footer/no-title-slide/reference.pptx b/test/pptx/footer/no-title-slide/reference.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/footer/no-title-slide/reference.pptx differ
diff --git a/test/pptx/images/input.native b/test/pptx/images/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/images/input.native
@@ -0,0 +1,5 @@
+Pandoc (Meta {unMeta = fromList []})
+[Para [Image ("",[],[]) [] ("lalune.jpg","")]
+,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")]
+,Header 1 ("one-more",[],[]) [Str "One",Space,Str "More"]
+,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/images/output.pptx b/test/pptx/images/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/images/output.pptx differ
diff --git a/test/pptx/images/templated.pptx b/test/pptx/images/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/images/templated.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/input.native b/test/pptx/incremental-lists/with-flag/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/incremental-lists/with-flag/input.native
@@ -0,0 +1,139 @@
+[Header 1 ("slide-1-content",[],[]) [Str "Slide",Space,Str "1",Space,Str "(Content)"]
+,BulletList
+ [[Plain [Str "These"]]
+ ,[Plain [Str "bullets"]]
+ ,[Plain [Str "should"]]
+ ,[Plain [Str "be"]]
+ ,[Plain [Str "incremental"]]]
+,Header 1 ("slide-2-content",[],[]) [Str "Slide",Space,Str "2",Space,Str "(Content)"]
+,BulletList
+ [[Para [Str "as"]]
+ ,[Para [Str "should"]]
+ ,[Para [Str "these"]]]
+,Header 1 ("slide-3-content",[],[]) [Str "Slide",Space,Str "3",Space,Str "(Content)"]
+,Para [Str "Even",Space,Str "with",Space,Str "some",Space,Str "text",Space,Str "first,",Space,Str "these",Space,Str "should:"]
+,BulletList
+ [[Plain [Str "also"]]
+ ,[Plain [Str "be"]]
+ ,[Plain [Str "incremental"]]]
+,Header 1 ("slide-4-content",[],[]) [Str "Slide",Space,Str "4",Space,Str "(Content)"]
+,OrderedList (1,Decimal,Period)
+ [[Plain [Str "These"]]
+ ,[Plain [Str "are"]]
+ ,[Plain [Str "incremental"]]]
+,Para [Str "But",Space,Str "this",Space,Str "text",Space,Str "isn\8217t"]
+,BulletList
+ [[Plain [Str "But"]]
+ ,[Plain [Str "these"]]
+ ,[Plain [Str "are"]]]
+,Header 1 ("slide-5-two-content",[],[]) [Str "Slide",Space,Str "5",Space,Str "(Two",Space,Str "Content)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "left:"]
+  ,BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "by"]]
+   ,[Plain [Str "one"]]]
+  ,Para [Str "With",Space,Str "something",Space,Str "below"]]
+ ,Div ("",["column"],[])
+  [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "right:"]
+  ,BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "by"]]
+   ,[Plain [Str "one"]]]
+  ,Para [Str "With",Space,Str "something",Space,Str "else",Space,Str "below"]]]
+,Header 1 ("slide-6-two-content-right",[],[]) [Str "Slide",Space,Str "6",Space,Str "(Two",Space,Str "Content",Space,Str "Right)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [BulletList
+   [[Plain [Str "An"]]
+   ,[Plain [Str "Incremental"]]
+   ,[Plain [Str "List"]]]]]
+,Header 1 ("slide-7-content-with-caption",[],[]) [Str "Slide",Space,Str "7",Space,Str "(Content",Space,Str "with",Space,Str "Caption)"]
+,Para [Str "First,",Space,Str "we",Space,Str "have",Space,Str "some",Space,Str "incremental",Space,Str "bullets:"]
+,BulletList
+ [[Plain [Str "one"]]
+ ,[Plain [Str "two"]]
+ ,[Plain [Str "three"]]]
+,Para [Str "Then,",Space,Str "a",Space,Str "picture:"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]
+,Header 1 ("slide-8-comparison",[],[]) [Str "Slide",Space,Str "8",Space,Str "(Comparison)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]
+  ,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [OrderedList (1,Decimal,Period)
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 5.555555555555555e-2)]
+   (TableHead ("",[],[])
+   [Row ("",[],[])
+    [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+     [Plain [Str "1"]]]])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "2"]]]])]
+   (TableFoot ("",[],[])
+   [])]]
+,Header 1 ("slide-9-content",[],[]) [Str "Slide",Space,Str "9",Space,Str "(Content)"]
+,Div ("",["nonincremental"],[])
+ [BulletList
+  [[Plain [Str "these"]]
+  ,[Plain [Str "are"]]
+  ,[Plain [Str "not"]]
+  ,[Plain [Str "incremental"]]]]
+,BulletList
+ [[Plain [Str "these"]]
+ ,[Plain [Str "are"]]]
+,Header 1 ("slide-10-content",[],[]) [Str "Slide",Space,Str "10",Space,Str "(Content)"]
+,Div ("",["incremental","nonincremental"],[])
+ [BulletList
+  [[Plain [Str "these"]]
+  ,[Plain [Str "are"]]
+  ,[Plain [Str "incremental"]]
+  ,[Plain [Str "(the",Space,Str "incremental",Space,Str "class",Space,Str "wins)"]]]]
+,Header 1 ("slide-11-content",[],[]) [Str "Slide",Space,Str "11",Space,Str "(Content)"]
+,Para [Str "These",Space,Str "bullets",Space,Str "are",Space,Str "not",Space,Str "incremental:"]
+,BlockQuote
+ [BulletList
+  [[Plain [Str "one"]]
+  ,[Plain [Str "two"]]
+  ,[Plain [Str "three"]]]]
+,Para [Str "These",Space,Str "are:"]
+,Div ("",["nonincremental"],[])
+ [BlockQuote
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]]]
+,Para [Str "These",Space,Str "are",Space,Str "not:"]
+,BlockQuote
+ [Div ("",["nonincremental"],[])
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]]]
+,Header 1 ("slide-12-content",[],[]) [Str "Slide",Space,Str "12",Space,Str "(Content)"]
+,Div ("",["nonincremental"],[])
+ [Div ("",["incremental"],[])
+  [BulletList
+   [[Plain [Str "these"]]
+   ,[Plain [Str "are"]]
+   ,[Plain [Str "incremental"]]]]]
+,Div ("",["incremental"],[])
+ [Div ("",["nonincremental"],[])
+  [BulletList
+   [[Plain [Str "these"]]
+   ,[Plain [Str "are"]]
+   ,[Plain [Str "not"]]]]]]
diff --git a/test/pptx/incremental-lists/with-flag/output.pptx b/test/pptx/incremental-lists/with-flag/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/with-flag/templated.pptx b/test/pptx/incremental-lists/with-flag/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/templated.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/input.native b/test/pptx/incremental-lists/without-flag/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/incremental-lists/without-flag/input.native
@@ -0,0 +1,137 @@
+[Header 1 ("slide-1-content",[],[]) [Str "Slide",Space,Str "1",Space,Str "(Content)"]
+,Div ("",["incremental"],[])
+ [BulletList
+  [[Plain [Str "These"]]
+  ,[Plain [Str "bullets"]]
+  ,[Plain [Str "should"]]
+  ,[Plain [Str "be"]]
+  ,[Plain [Str "incremental"]]]]
+,Header 1 ("slide-2-content",[],[]) [Str "Slide",Space,Str "2",Space,Str "(Content)"]
+,BulletList
+ [[Plain [Str "These"]]
+ ,[Plain [Str "are"]]
+ ,[Plain [Str "not"]]]
+,Header 1 ("slide-3-content",[],[]) [Str "Slide",Space,Str "3",Space,Str "(Content)"]
+,Para [Str "Even",Space,Str "with",Space,Str "some",Space,Str "text",Space,Str "first,",Space,Str "these",Space,Str "should:"]
+,Div ("",["incremental"],[])
+ [BulletList
+  [[Plain [Str "also"]]
+  ,[Plain [Str "be"]]
+  ,[Plain [Str "incremental"]]]]
+,Header 1 ("slide-4-content",[],[]) [Str "Slide",Space,Str "4",Space,Str "(Content)"]
+,Div ("",["incremental"],[])
+ [OrderedList (1,Decimal,Period)
+  [[Plain [Str "These"]]
+  ,[Plain [Str "are"]]
+  ,[Plain [Str "incremental"]]]]
+,Para [Str "But",Space,Str "this",Space,Str "text",Space,Str "isn\8217t"]
+,Header 1 ("slide-5-two-content",[],[]) [Str "Slide",Space,Str "5",Space,Str "(Two",Space,Str "Content)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "left:"]
+  ,Div ("",["incremental"],[])
+   [BulletList
+    [[Plain [Str "one"]]
+    ,[Plain [Str "by"]]
+    ,[Plain [Str "one"]]]]
+  ,Para [Str "With",Space,Str "something",Space,Str "below"]]
+ ,Div ("",["column"],[])
+  [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "right:"]
+  ,Div ("",["incremental"],[])
+   [BulletList
+    [[Plain [Str "one"]]
+    ,[Plain [Str "by"]]
+    ,[Plain [Str "one"]]]]
+  ,BulletList
+   [[Plain [Str "already"]]
+   ,[Plain [Str "here"]]
+   ,[Plain [Str "though"]]]]]
+,Header 1 ("slide-6-two-content-right",[],[]) [Str "Slide",Space,Str "6",Space,Str "(Two",Space,Str "Content",Space,Str "Right)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [Div ("",["incremental"],[])
+   [BulletList
+    [[Plain [Str "An"]]
+    ,[Plain [Str "Incremental"]]
+    ,[Plain [Str "List"]]]]]]
+,Header 1 ("slide-7-content-with-caption",[],[]) [Str "Slide",Space,Str "7",Space,Str "(Content",Space,Str "with",Space,Str "Caption)"]
+,Para [Str "First,",Space,Str "we",Space,Str "have",Space,Str "some",Space,Str "incremental",Space,Str "bullets:"]
+,Div ("",["incremental"],[])
+ [BulletList
+  [[Plain [Str "one"]]
+  ,[Plain [Str "two"]]
+  ,[Plain [Str "three"]]]]
+,Para [Str "Then,",Space,Str "a",Space,Str "picture:"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]
+,Header 1 ("slide-8-comparison",[],[]) [Str "Slide",Space,Str "8",Space,Str "(Comparison)"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Div ("",["incremental"],[])
+   [BulletList
+    [[Plain [Str "one"]]
+    ,[Plain [Str "two"]]
+    ,[Plain [Str "three"]]]]
+  ,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [Div ("",["incremental"],[])
+   [OrderedList (1,Decimal,Period)
+    [[Plain [Str "one"]]
+    ,[Plain [Str "two"]]
+    ,[Plain [Str "three"]]]]
+  ,Table ("",[],[]) (Caption Nothing
+   [])
+   [(AlignDefault,ColWidth 5.555555555555555e-2)]
+   (TableHead ("",[],[])
+   [Row ("",[],[])
+    [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+     [Plain [Str "1"]]]])
+   [(TableBody ("",[],[]) (RowHeadColumns 0)
+    []
+    [Row ("",[],[])
+     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+      [Plain [Str "2"]]]])]
+   (TableFoot ("",[],[])
+   [])]]
+,Header 1 ("slide-10-content",[],[]) [Str "Slide",Space,Str "10",Space,Str "(Content)"]
+,Div ("",["incremental","nonincremental"],[])
+ [BulletList
+  [[Plain [Str "these"]]
+  ,[Plain [Str "are"]]
+  ,[Plain [Str "incremental"]]
+  ,[Plain [Str "(the",Space,Str "incremental",Space,Str "class",Space,Str "wins)"]]]]
+,Header 1 ("slide-11-content",[],[]) [Str "Slide",Space,Str "11",Space,Str "(Content)"]
+,Para [Str "These",Space,Str "bullets",Space,Str "are",Space,Str "incremental:"]
+,BlockQuote
+ [BulletList
+  [[Plain [Str "one"]]
+  ,[Plain [Str "two"]]
+  ,[Plain [Str "three"]]]]
+,Para [Str "These",Space,Str "are",Space,Str "not:"]
+,Div ("",["incremental"],[])
+ [BlockQuote
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]]]
+,Para [Str "These",Space,Str "are:"]
+,BlockQuote
+ [Div ("",["incremental"],[])
+  [BulletList
+   [[Plain [Str "one"]]
+   ,[Plain [Str "two"]]
+   ,[Plain [Str "three"]]]]]
+,Header 1 ("slide-12-content",[],[]) [Str "Slide",Space,Str "12",Space,Str "(Content)"]
+,Div ("",["nonincremental"],[])
+ [Div ("",["incremental"],[])
+  [BulletList
+   [[Plain [Str "these"]]
+   ,[Plain [Str "are"]]
+   ,[Plain [Str "incremental"]]]]]
+,Div ("",["incremental"],[])
+ [Div ("",["nonincremental"],[])
+  [BulletList
+   [[Plain [Str "these"]]
+   ,[Plain [Str "are"]]
+   ,[Plain [Str "not"]]]]]]
diff --git a/test/pptx/incremental-lists/without-flag/output.pptx b/test/pptx/incremental-lists/without-flag/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/incremental-lists/without-flag/output.pptx differ
diff --git a/test/pptx/incremental-lists/without-flag/templated.pptx b/test/pptx/incremental-lists/without-flag/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/incremental-lists/without-flag/templated.pptx differ
diff --git a/test/pptx/inline-formatting/input.native b/test/pptx/inline-formatting/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/inline-formatting/input.native
@@ -0,0 +1,5 @@
+[Para [Str "Here",Space,Str "are",Space,Str "examples",Space,Str "of",Space,Emph [Str "italics"],Str ",",Space,Strong [Str "bold"],Str ",",Space,Str "and",Space,Strong [Emph [Str "bold",Space,Str "italics"]],Str "."]
+,Para [Str "Here",Space,Str "is",Space,Strikeout [Str "strook-three"],Space,Str "strike-through",Space,Str "and",Space,SmallCaps [Str "small",Space,Str "caps"],Str "."]
+,Para [Str "Here",Space,Str "is",Space,Span ("",["underline"],[]) [Str "some",Space,Emph [Str "underlined"],Space,Strong [Str "text"]],Str "."]
+,Para [Str "We",Space,Str "can",Space,Str "also",Space,Str "do",Space,Str "subscripts",Space,Str "(H",Subscript [Str "2"],Str "0)",Space,Str "and",Space,Str "super",Superscript [Str "script"],Str "."]
+,RawBlock (Format "html") ""]
diff --git a/test/pptx/inline-formatting/output.pptx b/test/pptx/inline-formatting/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/inline-formatting/output.pptx differ
diff --git a/test/pptx/inline-formatting/templated.pptx b/test/pptx/inline-formatting/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/inline-formatting/templated.pptx differ
diff --git a/test/pptx/layouts/deleted.pptx b/test/pptx/layouts/deleted.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/layouts/deleted.pptx differ
diff --git a/test/pptx/layouts/input.native b/test/pptx/layouts/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/layouts/input.native
@@ -0,0 +1,23 @@
+Pandoc (Meta {unMeta = fromList [("title",MetaInlines [Str "Testing",Space,Str "Layouts"])]})
+[Header 2 ("slide-1",[],[]) [Str "Slide",Space,Str "1"]
+,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "title",Space,Str "and",Space,Str "content",Space,Str "slide"]
+,Header 2 ("slide-2",[],[]) [Str "Slide",Space,Str "2"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "This"]]
+ ,Div ("",["column"],[])
+  [Para [Str "\8230is",Space,Str "a",Space,Str "two-column",Space,Str "slide"]]]
+,Header 2 ("slide-3",[],[]) [Str "Slide",Space,Str "3"]
+,Para [Str "This",Space,Str "slide",Space,Str "is",Space,Str "a",Space,Str "Content",Space,Str "with",Space,Str "Caption",Space,Str "slide"]
+,Para [Image ("",[],[]) [Str "Content"] ("lalune.jpg","fig:")]
+,Header 2 ("slide-4",[],[]) [Str "Slide",Space,Str "4"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "This",Space,Str "slide",Space,Str "is",Space,Str "a",Space,Str "Comparison",Space,Str "slide:"]
+  ,Para [Image ("",[],[]) [Str "Content"] ("lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "other",Space,Str "text"]]]
+,Header 1 ("section-header",[],[]) [Str "Section",Space,Str "header"]
+,Header 2 ("section",[],[]) []
+,Div ("",["notes"],[])
+ [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "blank",Space,Str "slide"]]]
diff --git a/test/pptx/layouts/moved.pptx b/test/pptx/layouts/moved.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/layouts/moved.pptx differ
diff --git a/test/pptx/list-level/input.native b/test/pptx/list-level/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/list-level/input.native
@@ -0,0 +1,20 @@
+[Header 1 ("slide",[],[]) [Str "Slide"]
+,BulletList
+ [[Para [Str "Top-level"]
+  ,Para [Str "With",Space,Str "continuation",Space,Str "paragraph"]]
+ ,[Para [Str "Then:"]
+  ,BulletList
+   [[Plain [Str "nested"]]
+   ,[Plain [Str "list"]]
+   ,[Plain [Str "items"]]]]]
+,Header 1 ("slide-1",[],[]) [Str "Slide"]
+,Para [Str "Paragraph."]
+,OrderedList (1,Decimal,Period)
+ [[Para [Str "Top-level"]
+  ,Para [Str "Continuation"]
+  ,OrderedList (1,Decimal,Period)
+   [[Para [Str "Sub-list"]
+    ,Para [Str "With",Space,Str "Continuation"]]
+   ,[Para [Str "(still",Space,Str "sub-list)"]]]]
+ ,[Para [Str "(back",Space,Str "to",Space,Str "top-level)"]]]
+,Para [Str "Paragraph."]]
diff --git a/test/pptx/list-level/output.pptx b/test/pptx/list-level/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/list-level/output.pptx differ
diff --git a/test/pptx/list-level/templated.pptx b/test/pptx/list-level/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/list-level/templated.pptx differ
diff --git a/test/pptx/lists/input.native b/test/pptx/lists/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/lists/input.native
@@ -0,0 +1,18 @@
+[Header 1 ("lists",[],[]) [Str "Lists"]
+,BulletList
+ [[Para [Str "Bulleted",Space,Str "bulleted",Space,Str "lists."]]
+ ,[Para [Str "And",Space,Str "go",Space,Str "to",Space,Str "arbitrary",Space,Str "depth."]
+  ,BulletList
+   [[Para [Str "Like",Space,Str "this"]
+    ,BulletList
+     [[Plain [Str "Or",Space,Str "this"]]]]
+   ,[Para [Str "Back",Space,Str "to",Space,Str "here."]]]]]
+,Header 1 ("lists-continued",[],[]) [Str "Lists",Space,Str "(continued)"]
+,Para [Str "Lists",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "numbered:"]
+,OrderedList (1,Decimal,Period)
+ [[Para [Str "Tomatoes"]]
+ ,[Para [Str "Potatoes",Space,Str "of",Space,Str "various",Space,Str "sorts"]
+  ,OrderedList (1,LowerAlpha,Period)
+   [[Para [Str "sweet",Space,Str "potatoes"]]
+   ,[Para [Str "russet",Space,Str "potates"]]]]
+ ,[Para [Str "Tornadoes,",Space,Str "for",Space,Str "the",Space,Str "rhyme."]]]]
diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/lists/output.pptx differ
diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/lists/templated.pptx differ
diff --git a/test/pptx/metadata-speaker-notes/input.native b/test/pptx/metadata-speaker-notes/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/metadata-speaker-notes/input.native
@@ -0,0 +1,3 @@
+Pandoc (Meta {unMeta = fromList [("author",MetaInlines [Str "Jesse",Space,Str "Rosenthal"]),("notes",MetaBlocks [Para [Str "These",Space,Str "are",Space,Str "speaker",Space,Str "notes",Space,Str "from",Space,Str "metadata."]]),("title",MetaInlines [Str "Testing"])]})
+[Header 1 ("a-header",[],[]) [Str "A",Space,Str "header"]
+,Para [Str "And",Space,Str "a",Space,Str "new",Space,Str "slide."]]
diff --git a/test/pptx/metadata-speaker-notes/output.pptx b/test/pptx/metadata-speaker-notes/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/metadata-speaker-notes/output.pptx differ
diff --git a/test/pptx/metadata-speaker-notes/templated.pptx b/test/pptx/metadata-speaker-notes/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/metadata-speaker-notes/templated.pptx differ
diff --git a/test/pptx/pauses/without-incremental/output.pptx b/test/pptx/pauses/without-incremental/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/pauses/without-incremental/output.pptx differ
diff --git a/test/pptx/pauses/without-incremental/templated.pptx b/test/pptx/pauses/without-incremental/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/pauses/without-incremental/templated.pptx differ
diff --git a/test/pptx/raw-ooxml/input.native b/test/pptx/raw-ooxml/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/raw-ooxml/input.native
@@ -0,0 +1,3 @@
+[Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "text,",Space,Str "written",Space,Str "as",Space,Str "a",Space,Str "raw",Space,Str "inline:",Space,RawInline (Format "openxml") "Here are examples of italics, bold"]
+,HorizontalRule
+,RawBlock (Format "openxml") "\n        \n          \n          \n            \n          \n          \n            \n          \n        \n        \n        \n          \n          \n          \n            \n            \n              \n              Bulleted bulleted lists.\n            \n          \n          \n            \n            \n              \n              And go to arbitrary depth.\n            \n          \n          \n            \n            \n              \n              Like this\n            \n          \n          \n            \n            \n              \n              Or this\n            \n          \n          \n            \n            \n              \n              Back to here.\n            \n          \n        \n      "]
diff --git a/test/pptx/raw-ooxml/output.pptx b/test/pptx/raw-ooxml/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/raw-ooxml/output.pptx differ
diff --git a/test/pptx/raw-ooxml/templated.pptx b/test/pptx/raw-ooxml/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/raw-ooxml/templated.pptx differ
diff --git a/test/pptx/reference-deleted-layouts.pptx b/test/pptx/reference-deleted-layouts.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/reference-deleted-layouts.pptx differ
diff --git a/test/pptx/reference-depth.pptx b/test/pptx/reference-depth.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/reference-depth.pptx differ
diff --git a/test/pptx/reference-moved-layouts.pptx b/test/pptx/reference-moved-layouts.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/reference-moved-layouts.pptx differ
diff --git a/test/pptx/reference-no-slides.pptx b/test/pptx/reference-no-slides.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/reference-no-slides.pptx differ
diff --git a/test/pptx/reference-no-slides/add-slides/input.native b/test/pptx/reference-no-slides/add-slides/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/reference-no-slides/add-slides/input.native
@@ -0,0 +1,14 @@
+[ Header
+    2
+    ( "first-slide" , [] , [] )
+    [ Str "First" , Space , Str "Slide" ]
+, Para [ Str "Title" ]
+, Header
+    2
+    ( "second-slide" , [] , [] )
+    [ Str "Second" , Space , Str "Slide" ]
+, BulletList
+    [ [ Plain [ Str "First" , Space , Str "item" ] ]
+    , [ Plain [ Str "Second" , Space , Str "item" ] ]
+    ]
+]
diff --git a/test/pptx/reference-no-slides/add-slides/output.pptx b/test/pptx/reference-no-slides/add-slides/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/reference-no-slides/add-slides/output.pptx differ
diff --git a/test/pptx/reference-no-slides/with-notes/input.native b/test/pptx/reference-no-slides/with-notes/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/reference-no-slides/with-notes/input.native
@@ -0,0 +1,70 @@
+[ Header
+    2
+    ( "first-slide" , [] , [] )
+    [ Str "First" , Space , Str "Slide" ]
+, Para
+    [ Str "First"
+    , Space
+    , Str "slide"
+    , Space
+    , Str "with"
+    , Space
+    , Str "notes"
+    ]
+, Div
+    ( "" , [ "notes" ] , [] )
+    [ Para
+        [ Str "Notes"
+        , Space
+        , Str "for"
+        , Space
+        , Str "the"
+        , Space
+        , Str "first"
+        , Space
+        , Str "slide"
+        ]
+    ]
+, Header
+    2
+    ( "second-slide" , [] , [] )
+    [ Str "Second" , Space , Str "Slide" ]
+, Para
+    [ Str "Slide"
+    , Space
+    , Str "without"
+    , Space
+    , Str "notes"
+    ]
+, Header
+    2
+    ( "third-slide" , [] , [] )
+    [ Str "Third" , Space , Str "Slide" ]
+, Para
+    [ Str "Slide"
+    , Space
+    , Str "with"
+    , Space
+    , Str "notes"
+    , Space
+    , Str "again"
+    ]
+, BulletList
+    [ [ Plain [ Str "First" , Space , Str "item" ] ]
+    , [ Plain [ Str "Second" , Space , Str "item" ] ]
+    ]
+, Div
+    ( "" , [ "notes" ] , [] )
+    [ Para
+        [ Str "Notes"
+        , Space
+        , Str "for"
+        , Space
+        , Str "the"
+        , Space
+        , Str "third"
+        , Space
+        , Str "slides"
+        ]
+    ]
+]
diff --git a/test/pptx/reference-no-slides/with-notes/output.pptx b/test/pptx/reference-no-slides/with-notes/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/reference-no-slides/with-notes/output.pptx differ
diff --git a/test/pptx/remove-empty-slides/input.native b/test/pptx/remove-empty-slides/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/remove-empty-slides/input.native
@@ -0,0 +1,5 @@
+[Para [Str "Content"]
+,Para [Image ("",[],[]) [] ("lalune.jpg",""),Space,RawInline (Format "html") ""]
+,HorizontalRule
+,HorizontalRule
+,Para [Str "More",Space,Str "content"]]
diff --git a/test/pptx/remove-empty-slides/output.pptx b/test/pptx/remove-empty-slides/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/remove-empty-slides/output.pptx differ
diff --git a/test/pptx/remove-empty-slides/templated.pptx b/test/pptx/remove-empty-slides/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/remove-empty-slides/templated.pptx differ
diff --git a/test/pptx/single-column/image/input.native b/test/pptx/single-column/image/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/single-column/image/input.native
@@ -0,0 +1,22 @@
+[ Header
+    1
+    ( "single-column" , [] , [] )
+    [ Str "Single" , Space , Str "column" ]
+, Div
+    ( "" , [ "columns" ] , [] )
+    [ Div
+        ( "" , [ "column" ] , [] )
+        [ Figure
+            ( "" , [] , [] )
+            (Caption
+               Nothing [ Plain [ Str "an" , Space , Str "image" ] ])
+            [ Plain
+                [ Image
+                    ( "" , [] , [] )
+                    [ Str "an" , Space , Str "image" ]
+                    ( "lalune.jpg" , "" )
+                ]
+            ]
+        ]
+    ]
+]
diff --git a/test/pptx/single-column/image/output.pptx b/test/pptx/single-column/image/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/single-column/image/output.pptx differ
diff --git a/test/pptx/single-column/image/templated.pptx b/test/pptx/single-column/image/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/single-column/image/templated.pptx differ
diff --git a/test/pptx/single-column/text/input.native b/test/pptx/single-column/text/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/single-column/text/input.native
@@ -0,0 +1,13 @@
+[ Header
+    1
+    ( "single-column" , [] , [] )
+    [ Str "Single" , Space , Str "column" ]
+, Div
+    ( "" , [ "columns" ] , [] )
+    [ Div
+        ( "" , [ "column" ] , [] )
+        [ Para [ Str "One" , Space , Str "paragraph." ]
+        , Para [ Str "Another" , Space , Str "paragraph." ]
+        ]
+    ]
+]
diff --git a/test/pptx/single-column/text/output.pptx b/test/pptx/single-column/text/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/single-column/text/output.pptx differ
diff --git a/test/pptx/single-column/text/templated.pptx b/test/pptx/single-column/text/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/single-column/text/templated.pptx differ
diff --git a/test/pptx/slide-breaks-slide-level-1/output.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-breaks-slide-level-1/output.pptx differ
diff --git a/test/pptx/slide-breaks-slide-level-1/templated.pptx b/test/pptx/slide-breaks-slide-level-1/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-breaks-slide-level-1/templated.pptx differ
diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-breaks-toc/output.pptx differ
diff --git a/test/pptx/slide-breaks-toc/templated.pptx b/test/pptx/slide-breaks-toc/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-breaks-toc/templated.pptx differ
diff --git a/test/pptx/slide-breaks/input.native b/test/pptx/slide-breaks/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/slide-breaks/input.native
@@ -0,0 +1,7 @@
+Pandoc (Meta {unMeta = fromList []})
+[Para [Str "Break",Space,Str "with",Space,Str "a",Space,Str "new",Space,Str "section-level",Space,Str "header"]
+,Header 1 ("below-section-level",[],[]) [Str "Below",Space,Str "section-level"]
+,Header 2 ("section-level",[],[]) [Str "Section-level"]
+,Para [Str "Third",Space,Str "slide",Space,Str "(with",Space,Str "a",Space,Str "section-level",Space,Str "of",Space,Str "2)"]
+,HorizontalRule
+,Para [Str "This",Space,Str "is",Space,Str "another",Space,Str "slide."]]
diff --git a/test/pptx/slide-breaks/output.pptx b/test/pptx/slide-breaks/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-breaks/output.pptx differ
diff --git a/test/pptx/slide-breaks/templated.pptx b/test/pptx/slide-breaks/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-breaks/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h1-h2-with-table/input.native b/test/pptx/slide-level-0/h1-h2-with-table/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/slide-level-0/h1-h2-with-table/input.native
@@ -0,0 +1,14 @@
+[Header 1 ("hello",[],[]) [Str "Hello"]
+,Header 2 ("there",[],[]) [Str "There"]
+,Table ("",[],[]) (Caption Nothing
+ [])
+ [(AlignDefault,ColWidth 5.555555555555555e-2)]
+ (TableHead ("",[],[])
+ [])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]]])]
+ (TableFoot ("",[],[])
+ [])]
diff --git a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx differ
diff --git a/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/input.native b/test/pptx/slide-level-0/h1-with-image/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/slide-level-0/h1-with-image/input.native
@@ -0,0 +1,2 @@
+[Header 1 ("hello",[],[]) [Str "Hello"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/slide-level-0/h1-with-image/output.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-image/output.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-image/templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-image/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-table/input.native b/test/pptx/slide-level-0/h1-with-table/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/slide-level-0/h1-with-table/input.native
@@ -0,0 +1,13 @@
+[Header 1 ("hello",[],[]) [Str "Hello"]
+,Table ("",[],[]) (Caption Nothing
+ [])
+ [(AlignDefault,ColWidth 5.555555555555555e-2)]
+ (TableHead ("",[],[])
+ [])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]]])]
+ (TableFoot ("",[],[])
+ [])]
diff --git a/test/pptx/slide-level-0/h1-with-table/output.pptx b/test/pptx/slide-level-0/h1-with-table/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-table/output.pptx differ
diff --git a/test/pptx/slide-level-0/h1-with-table/templated.pptx b/test/pptx/slide-level-0/h1-with-table/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-table/templated.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/input.native b/test/pptx/slide-level-0/h2-with-image/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/slide-level-0/h2-with-image/input.native
@@ -0,0 +1,2 @@
+[Header 2 ("hello",[],[]) [Str "Hello"]
+,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]]
diff --git a/test/pptx/slide-level-0/h2-with-image/output.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-level-0/h2-with-image/output.pptx differ
diff --git a/test/pptx/slide-level-0/h2-with-image/templated.pptx b/test/pptx/slide-level-0/h2-with-image/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/slide-level-0/h2-with-image/templated.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/input.native b/test/pptx/speaker-notes-after-metadata/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/speaker-notes-after-metadata/input.native
@@ -0,0 +1,5 @@
+Pandoc (Meta {unMeta = fromList [("author",MetaInlines [Str "Jesse",Space,Str "Rosenthal"]),("title",MetaInlines [Str "Testing"])]})
+[Div ("",["notes"],[])
+ [Para [Str "Some",Space,Str "speaker",Space,Str "notes"]]
+,Header 1 ("a-header",[],[]) [Str "A",Space,Str "header"]
+,Para [Str "And",Space,Str "a",Space,Str "new",Space,Str "slide."]]
diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/speaker-notes-after-metadata/output.pptx differ
diff --git a/test/pptx/speaker-notes-after-metadata/templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/speaker-notes-after-metadata/templated.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/input.native b/test/pptx/speaker-notes-afterheader/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/speaker-notes-afterheader/input.native
@@ -0,0 +1,3 @@
+[Header 1 ("here-is-a-single-header",[],[]) [Str "Here",Space,Str "is",Space,Str "a",Space,Str "single",Space,Str "header"]
+,Div ("",["notes"],[])
+ [Para [Str "and",Space,Str "here",Space,Str "are",Space,Str "some",Space,Str "notes"]]]
diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/speaker-notes-afterheader/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterheader/templated.pptx b/test/pptx/speaker-notes-afterheader/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/speaker-notes-afterheader/templated.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/input.native b/test/pptx/speaker-notes-afterseps/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/speaker-notes-afterseps/input.native
@@ -0,0 +1,63 @@
+[Para [Image ("",[],[]) [Str "The",Space,Str "moon"] ("lalune.jpg","fig:")]
+,Div ("",["notes"],[])
+ [Para [Str "chicken",Space,Str "and",Space,Str "dumplings"]]
+,Table ("",[],[]) (Caption Nothing
+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]])
+ [(AlignRight,ColWidthDefault)
+ ,(AlignLeft,ColWidthDefault)
+ ,(AlignCenter,ColWidthDefault)
+ ,(AlignDefault,ColWidthDefault)]
+ (TableHead ("",[],[])
+ [Row ("",[],[])
+  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Right"]]
+  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Left"]]
+  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Center"]]
+  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Default"]]]])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]]
+  ,Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]]
+  ,Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]]])]
+ (TableFoot ("",[],[])
+ [])
+,Div ("",["notes"],[])
+ [Para [Str "foo",Space,Str "bar"]]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [BulletList
+   [[Para [Str "some",Space,Str "stuff"]]
+   ,[Para [Str "some",Space,Str "more",Space,Str "stuff"]]]
+  ,Div ("",["notes"],[])
+   [Para [Str "Some",Space,Str "notes",Space,Str "inside",Space,Str "a",Space,Str "column"]]]
+ ,Div ("",["column"],[])
+  [Para [Str "Some",Space,Str "other",Space,Emph [Str "stuff"]]]]
+,Div ("",["notes"],[])
+ [Para [Str "Some",Space,Str "notes",Space,Str "outside",Space,Str "the",Space,Str "column"]]]
diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/speaker-notes-afterseps/output.pptx differ
diff --git a/test/pptx/speaker-notes-afterseps/templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/speaker-notes-afterseps/templated.pptx differ
diff --git a/test/pptx/speaker-notes/input.native b/test/pptx/speaker-notes/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/speaker-notes/input.native
@@ -0,0 +1,17 @@
+[Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "slide."]
+,Div ("",["notes"],[])
+ [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "note."]
+ ,Para [Str "Here",Space,Str "is",Space,Emph [Str "some"],Space,Strong [Str "other"],Space,Str "formatting."]]
+,HorizontalRule
+,Para [Str "A",Space,Str "page",Space,Str "with",Space,Str "no",Space,Str "speaker",Space,Str "notes"]
+,HorizontalRule
+,Div ("",["notes"],[])
+ [Para [Str "The",Space,Str "first",Space,Str "note",Space,Str "div"]]
+,Para [Str "A",Space,Str "page",Space,Str "with",Space,Str "two",Space,Str "notes."]
+,Div ("",["notes"],[])
+ [Para [Str "The",Space,Str "second",Space,Str "note",Space,Str "div"]]
+,HorizontalRule
+,Para [Str "Strip",Space,Str "links",Space,Str "and",Space,Str "footnotes."]
+,Div ("",["notes"],[])
+ [Para [Str "No",Space,Link ("",[],[]) [Str "link"] ("https://www.google.com",""),Space,Str "here."]
+ ,Para [Str "No",Space,Str "note",Space,Str "here.",Note [Para [Str "You\8217ll",Space,Str "never",Space,Str "read",Space,Str "this"]]]]]
diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/speaker-notes/output.pptx differ
diff --git a/test/pptx/speaker-notes/templated.pptx b/test/pptx/speaker-notes/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/speaker-notes/templated.pptx differ
diff --git a/test/pptx/start-numbering-at/input.native b/test/pptx/start-numbering-at/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/start-numbering-at/input.native
@@ -0,0 +1,9 @@
+[Header 2 ("example-numbering-mwe",[],[]) [Str "Example",Space,Str "numbering",Space,Str "MWE"]
+,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "slide",Space,Str "with",Space,Str "examples",Space,Str "in",Space,Str "(1)",Space,Str "and",Space,Str "(2)"]
+,OrderedList (1,Example,TwoParens)
+ [[Plain [Str "First"]]
+ ,[Plain [Str "Second"]]]
+,Header 2 ("a-second-slide",[],[]) [Str "A",Space,Str "second",Space,Str "slide"]
+,Para [Str "This",Space,Str "second",Space,Str "slide",Space,Str "has",Space,Str "a",Space,Str "third",Space,Str "example",Space,Str "in",Space,Str "(3)."]
+,OrderedList (3,Example,TwoParens)
+ [[Plain [Str "Third"]]]]
diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/start-numbering-at/output.pptx differ
diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/start-numbering-at/templated.pptx differ
diff --git a/test/pptx/tables/input.native b/test/pptx/tables/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/tables/input.native
@@ -0,0 +1,95 @@
+[Header 2 ("a-table-with-a-caption",[],[]) [Str "A",Space,Str "Table,",Space,Str "with",Space,Str "a",Space,Str "caption"]
+,Table ("",[],[]) (Caption Nothing
+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]])
+ [(AlignRight,ColWidthDefault)
+ ,(AlignLeft,ColWidthDefault)
+ ,(AlignCenter,ColWidthDefault)
+ ,(AlignDefault,ColWidthDefault)]
+ (TableHead ("",[],[])
+ [Row ("",[],[])
+  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Right"]]
+  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Left"]]
+  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Center"]]
+  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Default"]]]])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]]
+  ,Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]]
+  ,Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]]])]
+ (TableFoot ("",[],[])
+ [])
+,Table ("",[],[]) (Caption Nothing
+ [])
+ [(AlignRight,ColWidthDefault)
+ ,(AlignLeft,ColWidthDefault)
+ ,(AlignCenter,ColWidthDefault)
+ ,(AlignDefault,ColWidthDefault)]
+ (TableHead ("",[],[])
+ [Row ("",[],[])
+  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Right"]]
+  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Left"]]
+  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Center"]]
+  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Plain [Str "Default"]]]])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "12"]]]
+  ,Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "123"]]]
+  ,Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "1"]]]])]
+ (TableFoot ("",[],[])
+ [])]
diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/tables/output.pptx differ
diff --git a/test/pptx/tables/templated.pptx b/test/pptx/tables/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/tables/templated.pptx differ
diff --git a/test/pptx/two-column/all-text/input.native b/test/pptx/two-column/all-text/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/two-column/all-text/input.native
@@ -0,0 +1,9 @@
+Pandoc (Meta {unMeta = fromList []})
+[Header 1 ("two-column-layout",[],[]) [Str "Two-Column",Space,Str "Layout"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "One",Space,Str "paragraph."]
+  ,Para [Str "Another",Space,Str "paragraph."]]
+ ,Div ("",["column"],[])
+  [Para [Str "Second",Space,Str "column",Space,Str "paragraph."]
+  ,Para [Str "Another",Space,Str "second",Space,Str "paragraph."]]]]
diff --git a/test/pptx/two-column/all-text/output.pptx b/test/pptx/two-column/all-text/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/two-column/all-text/output.pptx differ
diff --git a/test/pptx/two-column/all-text/templated.pptx b/test/pptx/two-column/all-text/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/two-column/all-text/templated.pptx differ
diff --git a/test/pptx/two-column/text-and-image/input.native b/test/pptx/two-column/text-and-image/input.native
new file mode 100644
--- /dev/null
+++ b/test/pptx/two-column/text-and-image/input.native
@@ -0,0 +1,12 @@
+[Header 1 ("slide-1",[],[]) [Str "Slide",Space,Str "1"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]
+ ,Div ("",["column"],[])
+  [Para [Str "This",Space,Str "should",Space,Str "use",Space,Str "Two",Space,Str "Content,",Space,Emph [Str "not"],Space,Str "Comparison!"]]]
+,Header 1 ("slide-2",[],[]) [Str "Slide",Space,Str "2"]
+,Div ("",["columns"],[])
+ [Div ("",["column"],[])
+  [Para [Str "This",Space,Str "should",Space,Str "also",Space,Str "use",Space,Str "Two",Space,Str "Content"]]
+ ,Div ("",["column"],[])
+  [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]]]
diff --git a/test/pptx/two-column/text-and-image/output.pptx b/test/pptx/two-column/text-and-image/output.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/two-column/text-and-image/output.pptx differ
diff --git a/test/pptx/two-column/text-and-image/templated.pptx b/test/pptx/two-column/text-and-image/templated.pptx
new file mode 100644
Binary files /dev/null and b/test/pptx/two-column/text-and-image/templated.pptx differ
diff --git a/test/rst-reader.native b/test/rst-reader.native
--- a/test/rst-reader.native
+++ b/test/rst-reader.native
@@ -1,335 +1,1948 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"],MetaInlines [Str "Anonymous"]]),("date",MetaInlines [Str "July",Space,Str "17,",Space,Str "2006"]),("revision",MetaBlocks [Para [Str "3"]]),("subtitle",MetaInlines [Str "Subtitle"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
-[Header 1 ("level-one-header",[],[]) [Str "Level",Space,Str "one",Space,Str "header"]
-,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",SoftBreak,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
-,Header 2 ("level-two-header",[],[]) [Str "Level",Space,Str "two",Space,Str "header"]
-,Header 3 ("level-three",[],[]) [Str "Level",Space,Str "three"]
-,Header 4 ("level-four-with-emphasis",[],[]) [Str "Level",Space,Str "four",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 5 ("level-five",[],[]) [Str "Level",Space,Str "five"]
-,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",SoftBreak,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",SoftBreak,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",SoftBreak,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",SoftBreak,Str "list",Space,Str "item."]
-,Para [Str "Here\8217s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",SoftBreak,Str "*",Space,Str "criminey."]
-,Para [Str "Horizontal",Space,Str "rule:"]
-,HorizontalRule
-,Para [Str "Another:"]
-,HorizontalRule
-,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "block",Space,Str "quote:"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",SoftBreak,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."]]
-,Para [Str "Here\8217s",Space,Str "another,",Space,Str "differently",Space,Str "indented:"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",SoftBreak,Str "It\8217s",Space,Str "indented",Space,Str "with",Space,Str "a",Space,Str "tab."]
- ,Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"
- ,Para [Str "List",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
- ,OrderedList (1,Decimal,Period)
-  [[Plain [Str "item",Space,Str "one"]]
-  ,[Plain [Str "item",Space,Str "two"]]]
- ,Para [Str "Nested",Space,Str "block",Space,Str "quotes:"]
- ,BlockQuote
-  [Para [Str "nested"]
-  ,BlockQuote
-   [Para [Str "nested"]]]]
-,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"]
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}"
-,CodeBlock ("",[],[]) "this code block is indented by one tab"
-,Para [Str "And:"]
-,CodeBlock ("",[],[]) "this block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
-,Para [Str "And:"]
-,CodeBlock ("",["sourceCode","python"],[]) "def my_function(x):\n    return x + 1"
-,Header 1 ("lists",[],[]) [Str "Lists"]
-,Header 2 ("unordered",[],[]) [Str "Unordered"]
-,Para [Str "Asterisks",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "asterisk",Space,Str "1"]]
- ,[Plain [Str "asterisk",Space,Str "2"]]
- ,[Plain [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Asterisks",Space,Str "loose:"]
-,BulletList
- [[Plain [Str "asterisk",Space,Str "1"]]
- ,[Plain [Str "asterisk",Space,Str "2"]]
- ,[Plain [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Plus",Space,Str "1"]]
- ,[Plain [Str "Plus",Space,Str "2"]]
- ,[Plain [Str "Plus",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "loose:"]
-,BulletList
- [[Plain [Str "Plus",Space,Str "1"]]
- ,[Plain [Str "Plus",Space,Str "2"]]
- ,[Plain [Str "Plus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Minus",Space,Str "1"]]
- ,[Plain [Str "Minus",Space,Str "2"]]
- ,[Plain [Str "Minus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "loose:"]
-,BulletList
- [[Plain [Str "Minus",Space,Str "1"]]
- ,[Plain [Str "Minus",Space,Str "2"]]
- ,[Plain [Str "Minus",Space,Str "3"]]]
-,Header 2 ("ordered",[],[]) [Str "Ordered"]
-,Para [Str "Tight:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second"]]
- ,[Plain [Str "Third"]]]
-,Para [Str "and:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "One"]]
- ,[Plain [Str "Two"]]
- ,[Plain [Str "Three"]]]
-,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second"]]
- ,[Plain [Str "Third"]]]
-,Para [Str "and",Space,Str "using",Space,Str "spaces:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "One"]]
- ,[Plain [Str "Two"]]
- ,[Plain [Str "Three"]]]
-,Para [Str "Multiple",Space,Str "paragraphs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
-  ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog\8217s",SoftBreak,Str "back."]]
- ,[Plain [Str "Item",Space,Str "2."]]
- ,[Plain [Str "Item",Space,Str "3."]]]
-,Para [Str "Nested:"]
-,BulletList
- [[Plain [Str "Tab"]
-  ,BulletList
-   [[Plain [Str "Tab"]
-    ,BulletList
-     [[Plain [Str "Tab"]]]]]]]
-,Para [Str "Here\8217s",Space,Str "another:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BlockQuote
-   [BulletList
-    [[Plain [Str "Fee"]]
-    ,[Plain [Str "Fie"]]
-    ,[Plain [Str "Foe"]]]]]
- ,[Plain [Str "Third"]]]
-,Header 2 ("fancy-list-markers",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"]
-,OrderedList (2,Decimal,TwoParens)
- [[Plain [Str "begins",Space,Str "with",Space,Str "2"]]
- ,[Para [Str "and",Space,Str "now",Space,Str "3"]
-  ,Para [Str "with",Space,Str "a",Space,Str "continuation"]
-  ,OrderedList (4,LowerRoman,Period)
-   [[Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",Space,Str "starting",Space,Str "with",Space,Str "4"]]
-   ,[Plain [Str "more",Space,Str "items"]
-    ,OrderedList (1,UpperAlpha,TwoParens)
-     [[Plain [Str "a",Space,Str "subsublist"]]
-     ,[Plain [Str "a",Space,Str "subsublist"]]]]]]]
-,Para [Str "Nesting:"]
-,OrderedList (1,UpperAlpha,Period)
- [[Plain [Str "Upper",Space,Str "Alpha"]
-  ,OrderedList (1,UpperRoman,Period)
-   [[Plain [Str "Upper",Space,Str "Roman."]
-    ,OrderedList (6,Decimal,TwoParens)
-     [[Plain [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"]
-      ,OrderedList (3,LowerAlpha,OneParen)
-       [[Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]]
-,Para [Str "Autonumbering:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Autonumber."]]
- ,[Plain [Str "More."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "Nested."]]]]]
-,Para [Str "Autonumbering",Space,Str "with",Space,Str "explicit",Space,Str "start:"]
-,OrderedList (4,LowerAlpha,TwoParens)
- [[Plain [Str "item",Space,Str "1"]]
- ,[Plain [Str "item",Space,Str "2"]]]
-,Header 2 ("definition",[],[]) [Str "Definition"]
-,DefinitionList
- [([Str "term",Space,Str "1"],
-   [[Para [Str "Definition",Space,Str "1."]]])
- ,([Str "term",Space,Str "2"],
-   [[Para [Str "Definition",Space,Str "2,",Space,Str "paragraph",Space,Str "1."]
-    ,Para [Str "Definition",Space,Str "2,",Space,Str "paragraph",Space,Str "2."]]])
- ,([Str "term",Space,Str "with",Space,Emph [Str "emphasis"]],
-   [[Para [Str "Definition",Space,Str "3."]]])]
-,Header 1 ("field-lists",[],[]) [Str "Field",Space,Str "Lists"]
-,BlockQuote
- [DefinitionList
-  [([Str "address"],
-    [[Para [Str "61",Space,Str "Main",Space,Str "St."]]])
-  ,([Str "city"],
-    [[Para [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",SoftBreak,Str "USA"]]])
-  ,([Str "phone"],
-    [[Para [Str "123-4567"]]])]]
-,DefinitionList
- [([Str "address"],
-   [[Para [Str "61",Space,Str "Main",Space,Str "St."]]])
- ,([Str "city"],
-   [[Para [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",SoftBreak,Str "USA"]]])
- ,([Str "phone"],
-   [[Para [Str "123-4567"]]])]
-,Header 1 ("html-blocks",[],[]) [Str "HTML",Space,Str "Blocks"]
-,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"]
-,RawBlock (Format "html") "
    foo
    "
-,Para [Str "Now,",Space,Str "nested:"]
-,RawBlock (Format "html") "
    \n    
    \n        
    \n            foo\n        
    \n    
    \n
    "
-,Header 1 ("latex-block",[],[]) [Str "LaTeX",Space,Str "Block"]
-,RawBlock (Format "latex") "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog    & 2      \\\\\nCat    & 1      \\\\ \\hline\n\\end{tabular}"
-,Header 1 ("inline-markup",[],[]) [Str "Inline",Space,Str "Markup"]
-,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ".",Space,Str "This",Space,Str "is",Space,Strong [Str "strong"],Str "."]
-,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",Space,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",Space,Code ("",[],[]) "",Str "."]
-,Para [Str "This",Space,Str "is",Subscript [Str "subscripted"],Space,Str "and",Space,Str "this",Space,Str "is",Space,Superscript [Str "superscripted"],Str "."]
-,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"]
-,BulletList
- [[Plain [Str "I",Space,Str "hat:",Space,Str "\206"]]
- ,[Plain [Str "o",Space,Str "umlaut:",Space,Str "\246"]]
- ,[Plain [Str "section:",Space,Str "\167"]]
- ,[Plain [Str "set",Space,Str "membership:",Space,Str "\8712"]]
- ,[Plain [Str "copyright:",Space,Str "\169"]]]
-,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-,Para [Str "This",Space,Str "&",Space,Str "that."]
-,Para [Str "4",Space,Str "<",Space,Str "5."]
-,Para [Str "6",Space,Str ">",Space,Str "5."]
-,Para [Str "Backslash:",Space,Str "\\"]
-,Para [Str "Backtick:",Space,Str "`"]
-,Para [Str "Asterisk:",Space,Str "*"]
-,Para [Str "Underscore:",Space,Str "_"]
-,Para [Str "Left",Space,Str "brace:",Space,Str "{"]
-,Para [Str "Right",Space,Str "brace:",Space,Str "}"]
-,Para [Str "Left",Space,Str "bracket:",Space,Str "["]
-,Para [Str "Right",Space,Str "bracket:",Space,Str "]"]
-,Para [Str "Left",Space,Str "paren:",Space,Str "("]
-,Para [Str "Right",Space,Str "paren:",Space,Str ")"]
-,Para [Str "Greater-than:",Space,Str ">"]
-,Para [Str "Hash:",Space,Str "#"]
-,Para [Str "Period:",Space,Str "."]
-,Para [Str "Bang:",Space,Str "!"]
-,Para [Str "Plus:",Space,Str "+"]
-,Para [Str "Minus:",Space,Str "-"]
-,Header 1 ("links",[],[]) [Str "Links"]
-,Para [Str "Explicit:",Space,Str "a",Space,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."]
-,Para [Str "Explicit",Space,Str "with",Space,Str "no",Space,Str "label:",Space,Link ("",[],[]) [Str "foo"] ("foo",""),Str "."]
-,Para [Str "Two",Space,Str "anonymous",Space,Str "links:",Space,Link ("",[],[]) [Str "the",Space,Str "first"] ("/url1/",""),Space,Str "and",Space,Link ("",[],[]) [Str "the",Space,Str "second"] ("/url2/","")]
-,Para [Str "Reference",Space,Str "links:",Space,Link ("",[],[]) [Str "link1"] ("/url1/",""),Space,Str "and",Space,Link ("",[],[]) [Str "link2"] ("/url2/",""),Space,Str "and",Space,Link ("",[],[]) [Str "link1"] ("/url1/",""),Space,Str "again."]
-,Para [Str "Another",Space,Link ("",[],[]) [Str "style",Space,Str "of",Space,Str "reference",Space,Str "link"] ("/url1/",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "a",Space,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link ("",[],[]) [Str "AT&T"] ("/url/",""),Str "."]
-,Para [Str "Autolinks:",Space,Link ("",[],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2",""),Space,Str "and",Space,Link ("",[],[]) [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net",""),Str "."]
-,Para [Str "But",Space,Str "not",Space,Str "here:"]
-,CodeBlock ("",[],[]) "http://example.com/"
-,Header 1 ("images",[],[]) [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):"]
-,Para [Image ("",[],[]) [Str "image"] ("lalune.jpg","")]
-,Para [Image ("",[],[("height","2343px")]) [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."]
-,Para [Str "And",Space,Str "an",Space,Link ("",[],[]) [Image ("",[],[]) [Str "A movie"] ("movie.jpg","")] ("/url",""),Str "."]
-,Header 1 ("comments",[],[]) [Str "Comments"]
-,Para [Str "First",Space,Str "paragraph"]
-,Para [Str "Another",Space,Str "paragraph"]
-,Para [Str "A",Space,Str "third",Space,Str "paragraph"]
-,Header 1 ("line-blocks",[],[]) [Str "Line",Space,Str "blocks"]
-,LineBlock
- [[Str "But",Space,Str "can",Space,Str "a",Space,Str "bee",Space,Str "be",Space,Str "said",Space,Str "to",Space,Str "be"]
- ,[Str "\160\160\160\160or",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "an",Space,Str "entire",Space,Str "bee,"]
- ,[Str "\160\160\160\160\160\160\160\160when",Space,Str "half",Space,Str "the",Space,Str "bee",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "bee,"]
- ,[Str "\160\160\160\160\160\160\160\160\160\160\160\160due",Space,Str "to",Space,Str "some",Space,Str "ancient",Space,Str "injury?"]
- ,[]
- ,[Str "Continuation",Space,Str "line"]
- ,[Str "\160\160and",Space,Str "another"]]
-,Header 1 ("simple-tables",[],[]) [Str "Simple",Space,Str "Tables"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[Plain [Str "col",Space,Str "1"]]
- ,[Plain [Str "col",Space,Str "2"]]
- ,[Plain [Str "col",Space,Str "3"]]]
- [[[Plain [Str "r1",Space,Str "a"]]
-  ,[Plain [Str "b"]]
-  ,[Plain [Str "c"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Para [Str "Headless"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "r1",Space,Str "a"]]
-  ,[Plain [Str "b"]]
-  ,[Plain [Str "c"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Header 1 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625]
- [[Plain [Str "col",Space,Str "1"]]
- ,[Plain [Str "col",Space,Str "2"]]
- ,[Plain [Str "col",Space,Str "3"]]]
- [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Para [Str "Headless"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625]
- [[]
- ,[]
- ,[]]
- [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-  ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
- ,[[Plain [Str "r2",Space,Str "d"]]
-  ,[Plain [Str "e"]]
-  ,[Plain [Str "f"]]]]
-,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"]
-,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625]
- [[]
- ,[]
- ,[]]
- [[[Para [Str "r1",Space,Str "a"]
-   ,Para [Str "r1",Space,Str "bis"]]
-  ,[BulletList
-    [[Plain [Str "b"]]
-    ,[Plain [Str "b",Space,Str "2"]]
-    ,[Plain [Str "b",Space,Str "2"]]]]
-  ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]]
-,Header 1 ("footnotes",[],[]) [Str "Footnotes"]
-,Para [Note [Para [Str "Note",Space,Str "with",Space,Str "one",Space,Str "line."]]]
-,Para [Note [Para [Str "Note",Space,Str "with",SoftBreak,Str "continuation",Space,Str "line."]]]
-,Para [Note [Para [Str "Note",Space,Str "with"],Para [Str "continuation",Space,Str "block."]]]
-,Para [Note [Para [Str "Note",Space,Str "with",SoftBreak,Str "continuation",Space,Str "line"],Para [Str "and",Space,Str "a",Space,Str "second",Space,Str "para."]]]
-,Para [Str "Not",Space,Str "in",Space,Str "note."]
-,Header 1 ("math",[],[]) [Str "Math"]
-,Para [Str "Some",Space,Str "inline",Space,Str "math",Space,Math InlineMath "E=mc^2",Str ".",Space,Str "Now",Space,Str "some",SoftBreak,Str "display",Space,Str "math:"]
-,Para [Math DisplayMath "E=mc^2"]
-,Para [Math DisplayMath "E = mc^2"]
-,Para [Math DisplayMath "E = mc^2",Math DisplayMath "\\alpha = \\beta"]
-,Para [Math DisplayMath "E &= mc^2\\\\\nF &= \\pi E",Math DisplayMath "F &= \\gamma \\alpha^2"]
-,Para [Str "All",Space,Str "done."]
-,Header 1 ("default-role",[],[]) [Str "Default-Role"]
-,Para [Str "Try",Space,Str "changing",Space,Str "the",Space,Str "default",Space,Str "role",Space,Str "to",Space,Str "a",Space,Str "few",Space,Str "different",Space,Str "things."]
-,Header 2 ("doesnt-break-title-parsing",[],[]) [Str "Doesn\8217t",Space,Str "Break",Space,Str "Title",Space,Str "Parsing"]
-,Para [Str "Inline",Space,Str "math:",Space,Math InlineMath "E=mc^2",Space,Str "or",Space,Math InlineMath "E=mc^2",Space,Str "or",Space,Math InlineMath "E=mc^2",Str ".",SoftBreak,Str "Other",Space,Str "roles:",Space,Superscript [Str "super"],Str ",",Space,Subscript [Str "sub"],Str "."]
-,Para [Math DisplayMath "\\alpha = beta",Math DisplayMath "E = mc^2"]
-,Para [Str "Some",Space,Superscript [Str "of"],Space,Str "these",Space,Superscript [Str "words"],Space,Str "are",Space,Str "in",Space,Superscript [Str "superscript"],Str "."]
-,Para [Str "Reset",Space,Str "default-role",Space,Str "to",Space,Str "the",Space,Str "default",Space,Str "default."]
-,Para [Str "And",Space,Str "now",Space,Str "some-invalid-string-3231231",Space,Str "is",Space,Str "nonsense."]
-,Para [Str "And",Space,Str "now",Space,Str "with",Space,RawInline (Format "html") "inline HTML",Str "."]
-,Para [Str "And",Space,Str "some",Space,Str "inline",Space,Str "haskell",Space,Code ("",["haskell","sourceCode"],[]) "fmap id [1,2..10]",Str "."]
-,Para [Str "Indirect",Space,Str "python",Space,Str "role",Space,Code ("",["py","python","indirect","sourceCode"],[]) "[x*x for x in [1,2,3,4,5]]",Str "."]
-,Para [Str "Different",Space,Str "indirect",Space,Str "C",Space,Code ("",["c","different-indirect","sourceCode"],[]) "int x = 15;",Str "."]
-,Header 2 ("literal-symbols",[],[]) [Str "Literal",Space,Str "symbols"]
-,Para [Str "2*2",Space,Str "=",Space,Str "4*1"]]
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "author"
+            , MetaList
+                [ MetaInlines [ Str "John" , Space , Str "MacFarlane" ]
+                , MetaInlines [ Str "Anonymous" ]
+                ]
+            )
+          , ( "date"
+            , MetaInlines
+                [ Str "July" , Space , Str "17," , Space , Str "2006" ]
+            )
+          , ( "revision" , MetaInlines [ Str "3" ] )
+          , ( "subtitle" , MetaInlines [ Str "Subtitle" ] )
+          , ( "title"
+            , MetaInlines
+                [ Str "Pandoc" , Space , Str "Test" , Space , Str "Suite" ]
+            )
+          ]
+    }
+  [ Header
+      1
+      ( "level-one-header" , [] , [] )
+      [ Str "Level" , Space , Str "one" , Space , Str "header" ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "set"
+      , Space
+      , Str "of"
+      , Space
+      , Str "tests"
+      , Space
+      , Str "for"
+      , Space
+      , Str "pandoc."
+      , Space
+      , Str "Most"
+      , Space
+      , Str "of"
+      , Space
+      , Str "them"
+      , Space
+      , Str "are"
+      , Space
+      , Str "adapted"
+      , Space
+      , Str "from"
+      , SoftBreak
+      , Str "John"
+      , Space
+      , Str "Gruber\8217s"
+      , Space
+      , Str "markdown"
+      , Space
+      , Str "test"
+      , Space
+      , Str "suite."
+      ]
+  , Header
+      2
+      ( "level-two-header" , [] , [] )
+      [ Str "Level" , Space , Str "two" , Space , Str "header" ]
+  , Header
+      3 ( "level-three" , [] , [] ) [ Str "Level" , Space , Str "three" ]
+  , Header
+      4
+      ( "level-four-with-emphasis" , [] , [] )
+      [ Str "Level"
+      , Space
+      , Str "four"
+      , Space
+      , Str "with"
+      , Space
+      , Emph [ Str "emphasis" ]
+      ]
+  , Header
+      5 ( "level-five" , [] , [] ) [ Str "Level" , Space , Str "five" ]
+  , Header 1 ( "paragraphs" , [] , [] ) [ Str "Paragraphs" ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "regular"
+      , Space
+      , Str "paragraph."
+      ]
+  , Para
+      [ Str "In"
+      , Space
+      , Str "Markdown"
+      , Space
+      , Str "1.0.0"
+      , Space
+      , Str "and"
+      , Space
+      , Str "earlier."
+      , Space
+      , Str "Version"
+      , SoftBreak
+      , Str "8."
+      , Space
+      , Str "This"
+      , Space
+      , Str "line"
+      , Space
+      , Str "turns"
+      , Space
+      , Str "into"
+      , Space
+      , Str "a"
+      , Space
+      , Str "list"
+      , Space
+      , Str "item."
+      , SoftBreak
+      , Str "Because"
+      , Space
+      , Str "a"
+      , Space
+      , Str "hard-wrapped"
+      , Space
+      , Str "line"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , SoftBreak
+      , Str "middle"
+      , Space
+      , Str "of"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph"
+      , Space
+      , Str "looked"
+      , Space
+      , Str "like"
+      , Space
+      , Str "a"
+      , SoftBreak
+      , Str "list"
+      , Space
+      , Str "item."
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "one"
+      , Space
+      , Str "with"
+      , Space
+      , Str "a"
+      , Space
+      , Str "bullet."
+      , SoftBreak
+      , Str "*"
+      , Space
+      , Str "criminey."
+      ]
+  , Para [ Str "Horizontal" , Space , Str "rule:" ]
+  , HorizontalRule
+  , Para [ Str "Another:" ]
+  , HorizontalRule
+  , Header
+      1
+      ( "block-quotes" , [] , [] )
+      [ Str "Block" , Space , Str "Quotes" ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote."
+          , SoftBreak
+          , Str "It"
+          , Space
+          , Str "is"
+          , Space
+          , Str "pretty"
+          , Space
+          , Str "short."
+          ]
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "another,"
+      , Space
+      , Str "differently"
+      , Space
+      , Str "indented:"
+      ]
+  , BlockQuote
+      [ Para
+          [ Str "This"
+          , Space
+          , Str "is"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote."
+          , SoftBreak
+          , Str "It\8217s"
+          , Space
+          , Str "indented"
+          , Space
+          , Str "with"
+          , Space
+          , Str "a"
+          , Space
+          , Str "tab."
+          ]
+      , Para
+          [ Str "Code"
+          , Space
+          , Str "in"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote:"
+          ]
+      , CodeBlock
+          ( "" , [] , [] ) "sub status {\n    print \"working\";\n}"
+      , Para
+          [ Str "List"
+          , Space
+          , Str "in"
+          , Space
+          , Str "a"
+          , Space
+          , Str "block"
+          , Space
+          , Str "quote:"
+          ]
+      , OrderedList
+          ( 1 , Decimal , Period )
+          [ [ Plain [ Str "item" , Space , Str "one" ] ]
+          , [ Plain [ Str "item" , Space , Str "two" ] ]
+          ]
+      , Para
+          [ Str "Nested" , Space , Str "block" , Space , Str "quotes:" ]
+      , BlockQuote
+          [ Para [ Str "nested" ] , BlockQuote [ Para [ Str "nested" ] ] ]
+      ]
+  , Header
+      1 ( "code-blocks" , [] , [] ) [ Str "Code" , Space , Str "Blocks" ]
+  , Para [ Str "Code:" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}"
+  , CodeBlock
+      ( "" , [] , [] ) "this code block is indented by one tab"
+  , Para [ Str "And:" ]
+  , CodeBlock
+      ( "" , [] , [] )
+      "this block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
+  , Para [ Str "And:" ]
+  , CodeBlock
+      ( "" , [ "python" ] , [] ) "def my_function(x):\n    return x + 1"
+  , Para
+      [ Str "If"
+      , Space
+      , Str "we"
+      , Space
+      , Str "use"
+      , Space
+      , Str "the"
+      , Space
+      , Str "highlight"
+      , Space
+      , Str "directive,"
+      , Space
+      , Str "we"
+      , Space
+      , Str "can"
+      , Space
+      , Str "specify"
+      , Space
+      , Str "a"
+      , Space
+      , Str "default"
+      , Space
+      , Str "language"
+      , SoftBreak
+      , Str "for"
+      , Space
+      , Str "literate"
+      , Space
+      , Str "blocks."
+      ]
+  , CodeBlock
+      ( "" , [ "haskell" ] , [] )
+      "-- this code is in haskell\ndata Tree = Leaf | Node Tree Tree"
+  , CodeBlock
+      ( "" , [ "haskell" ] , [] )
+      "-- this code is in haskell too\ndata Nat = Zero | Succ Nat"
+  , CodeBlock
+      ( "" , [ "javascript" ] , [] )
+      "-- this code is in javascript\nlet f = (x, y) => x + y"
+  , Header 1 ( "lists" , [] , [] ) [ Str "Lists" ]
+  , Header 2 ( "unordered" , [] , [] ) [ Str "Unordered" ]
+  , Para [ Str "Asterisks" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Plain [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Plain [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Plain [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Asterisks" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Plain [ Str "asterisk" , Space , Str "1" ] ]
+      , [ Plain [ Str "asterisk" , Space , Str "2" ] ]
+      , [ Plain [ Str "asterisk" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Pluses" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Plain [ Str "Plus" , Space , Str "1" ] ]
+      , [ Plain [ Str "Plus" , Space , Str "2" ] ]
+      , [ Plain [ Str "Plus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Pluses" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Plain [ Str "Plus" , Space , Str "1" ] ]
+      , [ Plain [ Str "Plus" , Space , Str "2" ] ]
+      , [ Plain [ Str "Plus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Minuses" , Space , Str "tight:" ]
+  , BulletList
+      [ [ Plain [ Str "Minus" , Space , Str "1" ] ]
+      , [ Plain [ Str "Minus" , Space , Str "2" ] ]
+      , [ Plain [ Str "Minus" , Space , Str "3" ] ]
+      ]
+  , Para [ Str "Minuses" , Space , Str "loose:" ]
+  , BulletList
+      [ [ Plain [ Str "Minus" , Space , Str "1" ] ]
+      , [ Plain [ Str "Minus" , Space , Str "2" ] ]
+      , [ Plain [ Str "Minus" , Space , Str "3" ] ]
+      ]
+  , Header 2 ( "ordered" , [] , [] ) [ Str "Ordered" ]
+  , Para [ Str "Tight:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Plain [ Str "First" ] ]
+      , [ Plain [ Str "Second" ] ]
+      , [ Plain [ Str "Third" ] ]
+      ]
+  , Para [ Str "and:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Plain [ Str "One" ] ]
+      , [ Plain [ Str "Two" ] ]
+      , [ Plain [ Str "Three" ] ]
+      ]
+  , Para [ Str "Loose" , Space , Str "using" , Space , Str "tabs:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Plain [ Str "First" ] ]
+      , [ Plain [ Str "Second" ] ]
+      , [ Plain [ Str "Third" ] ]
+      ]
+  , Para [ Str "and" , Space , Str "using" , Space , Str "spaces:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Plain [ Str "One" ] ]
+      , [ Plain [ Str "Two" ] ]
+      , [ Plain [ Str "Three" ] ]
+      ]
+  , Para [ Str "Multiple" , Space , Str "paragraphs:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para
+            [ Str "Item"
+            , Space
+            , Str "1,"
+            , Space
+            , Str "graf"
+            , Space
+            , Str "one."
+            ]
+        , Para
+            [ Str "Item"
+            , Space
+            , Str "1."
+            , Space
+            , Str "graf"
+            , Space
+            , Str "two."
+            , Space
+            , Str "The"
+            , Space
+            , Str "quick"
+            , Space
+            , Str "brown"
+            , Space
+            , Str "fox"
+            , Space
+            , Str "jumped"
+            , Space
+            , Str "over"
+            , Space
+            , Str "the"
+            , Space
+            , Str "lazy"
+            , Space
+            , Str "dog\8217s"
+            , SoftBreak
+            , Str "back."
+            ]
+        ]
+      , [ Para [ Str "Item" , Space , Str "2." ] ]
+      , [ Para [ Str "Item" , Space , Str "3." ] ]
+      ]
+  , Para [ Str "Nested:" ]
+  , BulletList
+      [ [ Plain [ Str "Tab" ]
+        , BulletList
+            [ [ Plain [ Str "Tab" ] , BulletList [ [ Plain [ Str "Tab" ] ] ] ]
+            ]
+        ]
+      ]
+  , Para [ Str "Here\8217s" , Space , Str "another:" ]
+  , OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "First" ] ]
+      , [ Para [ Str "Second:" ]
+        , BlockQuote
+            [ BulletList
+                [ [ Plain [ Str "Fee" ] ]
+                , [ Plain [ Str "Fie" ] ]
+                , [ Plain [ Str "Foe" ] ]
+                ]
+            ]
+        ]
+      , [ Para [ Str "Third" ] ]
+      ]
+  , Header
+      2
+      ( "fancy-list-markers" , [] , [] )
+      [ Str "Fancy" , Space , Str "list" , Space , Str "markers" ]
+  , OrderedList
+      ( 2 , Decimal , TwoParens )
+      [ [ Para [ Str "begins" , Space , Str "with" , Space , Str "2" ] ]
+      , [ Para [ Str "and" , Space , Str "now" , Space , Str "3" ]
+        , Para
+            [ Str "with" , Space , Str "a" , Space , Str "continuation" ]
+        , OrderedList
+            ( 4 , LowerRoman , Period )
+            [ [ Plain
+                  [ Str "sublist"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "roman"
+                  , Space
+                  , Str "numerals,"
+                  , Space
+                  , Str "starting"
+                  , Space
+                  , Str "with"
+                  , Space
+                  , Str "4"
+                  ]
+              ]
+            , [ Plain [ Str "more" , Space , Str "items" ]
+              , OrderedList
+                  ( 1 , UpperAlpha , TwoParens )
+                  [ [ Plain [ Str "a" , Space , Str "subsublist" ] ]
+                  , [ Plain [ Str "a" , Space , Str "subsublist" ] ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Nesting:" ]
+  , OrderedList
+      ( 1 , UpperAlpha , Period )
+      [ [ Plain [ Str "Upper" , Space , Str "Alpha" ]
+        , OrderedList
+            ( 1 , UpperRoman , Period )
+            [ [ Plain [ Str "Upper" , Space , Str "Roman." ]
+              , OrderedList
+                  ( 6 , Decimal , TwoParens )
+                  [ [ Plain
+                        [ Str "Decimal"
+                        , Space
+                        , Str "start"
+                        , Space
+                        , Str "with"
+                        , Space
+                        , Str "6"
+                        ]
+                    , OrderedList
+                        ( 3 , LowerAlpha , OneParen )
+                        [ [ Plain
+                              [ Str "Lower"
+                              , Space
+                              , Str "alpha"
+                              , Space
+                              , Str "with"
+                              , Space
+                              , Str "paren"
+                              ]
+                          ]
+                        ]
+                    ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Para [ Str "Autonumbering:" ]
+  , OrderedList
+      ( 1 , DefaultStyle , DefaultDelim )
+      [ [ Plain [ Str "Autonumber." ] ]
+      , [ Plain [ Str "More." ]
+        , OrderedList
+            ( 1 , DefaultStyle , DefaultDelim ) [ [ Plain [ Str "Nested." ] ] ]
+        ]
+      ]
+  , Para
+      [ Str "Autonumbering"
+      , Space
+      , Str "with"
+      , Space
+      , Str "explicit"
+      , Space
+      , Str "start:"
+      ]
+  , OrderedList
+      ( 4 , LowerAlpha , TwoParens )
+      [ [ Plain [ Str "item" , Space , Str "1" ] ]
+      , [ Plain [ Str "item" , Space , Str "2" ] ]
+      ]
+  , Header 2 ( "definition" , [] , [] ) [ Str "Definition" ]
+  , DefinitionList
+      [ ( [ Str "term" , Space , Str "1" ]
+        , [ [ Para [ Str "Definition" , Space , Str "1." ] ] ]
+        )
+      , ( [ Str "term" , Space , Str "2" ]
+        , [ [ Para
+                [ Str "Definition"
+                , Space
+                , Str "2,"
+                , Space
+                , Str "paragraph"
+                , Space
+                , Str "1."
+                ]
+            , Para
+                [ Str "Definition"
+                , Space
+                , Str "2,"
+                , Space
+                , Str "paragraph"
+                , Space
+                , Str "2."
+                ]
+            ]
+          ]
+        )
+      , ( [ Str "term"
+          , Space
+          , Str "with"
+          , Space
+          , Emph [ Str "emphasis" ]
+          ]
+        , [ [ Para [ Str "Definition" , Space , Str "3." ] ] ]
+        )
+      ]
+  , Header
+      1 ( "field-lists" , [] , [] ) [ Str "Field" , Space , Str "Lists" ]
+  , BlockQuote
+      [ DefinitionList
+          [ ( [ Str "address" ]
+            , [ [ Plain [ Str "61" , Space , Str "Main" , Space , Str "St." ] ]
+              ]
+            )
+          , ( [ Str "city" ]
+            , [ [ Plain
+                    [ Emph [ Str "Nowhere" ]
+                    , Str ","
+                    , Space
+                    , Str "MA,"
+                    , SoftBreak
+                    , Str "USA"
+                    ]
+                ]
+              ]
+            )
+          , ( [ Str "phone" ] , [ [ Plain [ Str "123-4567" ] ] ] )
+          ]
+      ]
+  , DefinitionList
+      [ ( [ Str "address" ]
+        , [ [ Plain [ Str "61" , Space , Str "Main" , Space , Str "St." ] ]
+          ]
+        )
+      , ( [ Str "city" ]
+        , [ [ Plain
+                [ Emph [ Str "Nowhere" ]
+                , Str ","
+                , Space
+                , Str "MA,"
+                , SoftBreak
+                , Str "USA"
+                ]
+            ]
+          ]
+        )
+      , ( [ Str "phone" ] , [ [ Plain [ Str "123-4567" ] ] ] )
+      ]
+  , Header
+      1 ( "html-blocks" , [] , [] ) [ Str "HTML" , Space , Str "Blocks" ]
+  , Para
+      [ Str "Simple"
+      , Space
+      , Str "block"
+      , Space
+      , Str "on"
+      , Space
+      , Str "one"
+      , Space
+      , Str "line:"
+      ]
+  , RawBlock (Format "html") "
    foo
    "
+  , Para [ Str "Now," , Space , Str "nested:" ]
+  , RawBlock
+      (Format "html")
+      "
    \n    
    \n        
    \n            foo\n        
    \n    
    \n
    "
+  , Header
+      1 ( "latex-block" , [] , [] ) [ Str "LaTeX" , Space , Str "Block" ]
+  , RawBlock
+      (Format "latex")
+      "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog    & 2      \\\\\nCat    & 1      \\\\ \\hline\n\\end{tabular}"
+  , Header
+      1
+      ( "inline-markup" , [] , [] )
+      [ Str "Inline" , Space , Str "Markup" ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Emph [ Str "emphasized" ]
+      , Str "."
+      , Space
+      , Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Strong [ Str "strong" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "code:"
+      , Space
+      , Code ( "" , [] , [] ) ">"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "$"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "\\"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) "\\$"
+      , Str ","
+      , Space
+      , Code ( "" , [] , [] ) ""
+      , Str "."
+      ]
+  , Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Subscript [ Str "subscripted" ]
+      , Space
+      , Str "and"
+      , Space
+      , Str "this"
+      , Space
+      , Str "is"
+      , Space
+      , Superscript [ Str "superscripted" ]
+      , Str "."
+      ]
+  , Header
+      1
+      ( "special-characters" , [] , [] )
+      [ Str "Special" , Space , Str "Characters" ]
+  , Para
+      [ Str "Here"
+      , Space
+      , Str "is"
+      , Space
+      , Str "some"
+      , Space
+      , Str "unicode:"
+      ]
+  , BulletList
+      [ [ Plain [ Str "I" , Space , Str "hat:" , Space , Str "\206" ] ]
+      , [ Plain [ Str "o" , Space , Str "umlaut:" , Space , Str "\246" ]
+        ]
+      , [ Plain [ Str "section:" , Space , Str "\167" ] ]
+      , [ Plain
+            [ Str "set" , Space , Str "membership:" , Space , Str "\8712" ]
+        ]
+      , [ Plain [ Str "copyright:" , Space , Str "\169" ] ]
+      ]
+  , Para
+      [ Str "AT&T"
+      , Space
+      , Str "has"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "their"
+      , Space
+      , Str "name."
+      ]
+  , Para [ Str "This" , Space , Str "&" , Space , Str "that." ]
+  , Para [ Str "4" , Space , Str "<" , Space , Str "5." ]
+  , Para [ Str "6" , Space , Str ">" , Space , Str "5." ]
+  , Para [ Str "Backslash:" , Space , Str "\\" ]
+  , Para [ Str "Backtick:" , Space , Str "`" ]
+  , Para [ Str "Asterisk:" , Space , Str "*" ]
+  , Para [ Str "Underscore:" , Space , Str "_" ]
+  , Para [ Str "Left" , Space , Str "brace:" , Space , Str "{" ]
+  , Para [ Str "Right" , Space , Str "brace:" , Space , Str "}" ]
+  , Para [ Str "Left" , Space , Str "bracket:" , Space , Str "[" ]
+  , Para [ Str "Right" , Space , Str "bracket:" , Space , Str "]" ]
+  , Para [ Str "Left" , Space , Str "paren:" , Space , Str "(" ]
+  , Para [ Str "Right" , Space , Str "paren:" , Space , Str ")" ]
+  , Para [ Str "Greater-than:" , Space , Str ">" ]
+  , Para [ Str "Hash:" , Space , Str "#" ]
+  , Para [ Str "Period:" , Space , Str "." ]
+  , Para [ Str "Bang:" , Space , Str "!" ]
+  , Para [ Str "Plus:" , Space , Str "+" ]
+  , Para [ Str "Minus:" , Space , Str "-" ]
+  , Header 1 ( "links" , [] , [] ) [ Str "Links" ]
+  , Para
+      [ Str "Explicit:"
+      , Space
+      , Str "a"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "URL" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Explicit"
+      , Space
+      , Str "with"
+      , Space
+      , Str "no"
+      , Space
+      , Str "label:"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "foo" ] ( "foo" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Two"
+      , Space
+      , Str "anonymous"
+      , Space
+      , Str "links:"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "the" , Space , Str "first" ]
+          ( "/url1/" , "" )
+      , Space
+      , Str "and"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "the" , Space , Str "second" ]
+          ( "/url2/" , "" )
+      ]
+  , Para
+      [ Str "Reference"
+      , Space
+      , Str "links:"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "link1" ] ( "/url1/" , "" )
+      , Space
+      , Str "and"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "link2" ] ( "/url2/" , "" )
+      , Space
+      , Str "and"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "link1" ] ( "/url1/" , "" )
+      , Space
+      , Str "again."
+      ]
+  , Para
+      [ Str "Another"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "style"
+          , Space
+          , Str "of"
+          , Space
+          , Str "reference"
+          , Space
+          , Str "link"
+          ]
+          ( "/url1/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "link"
+          , Space
+          , Str "with"
+          , Space
+          , Str "an"
+          , Space
+          , Str "ampersand"
+          , Space
+          , Str "in"
+          , Space
+          , Str "the"
+          , Space
+          , Str "URL"
+          ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Here\8217s"
+      , Space
+      , Str "a"
+      , Space
+      , Str "link"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Str "amersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "link"
+      , Space
+      , Str "text:"
+      , Space
+      , Link ( "" , [] , [] ) [ Str "AT&T" ] ( "/url/" , "" )
+      , Str "."
+      ]
+  , Para
+      [ Str "Autolinks:"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "http://example.com/?foo=1&bar=2" ]
+          ( "http://example.com/?foo=1&bar=2" , "" )
+      , Space
+      , Str "and"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Str "nobody@nowhere.net" ]
+          ( "mailto:nobody@nowhere.net" , "" )
+      , Str "."
+      ]
+  , Para [ Str "But" , Space , Str "not" , Space , Str "here:" ]
+  , CodeBlock ( "" , [] , [] ) "http://example.com/"
+  , Header 1 ( "images" , [] , [] ) [ 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):"
+      ]
+  , Para
+      [ Image ( "" , [] , [] ) [ Str "image" ] ( "lalune.jpg" , "" ) ]
+  , Para
+      [ Image
+          ( "" , [] , [ ( "height" , "2343px" ) ] )
+          [ 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."
+      ]
+  , Para
+      [ Str "And"
+      , Space
+      , Str "an"
+      , Space
+      , Link
+          ( "" , [] , [] )
+          [ Image ( "" , [] , [] ) [ Str "A movie" ] ( "movie.jpg" , "" ) ]
+          ( "/url" , "" )
+      , Str "."
+      ]
+  , Header 1 ( "comments" , [] , [] ) [ Str "Comments" ]
+  , Para [ Str "First" , Space , Str "paragraph" ]
+  , Para [ Str "Another" , Space , Str "paragraph" ]
+  , Para [ Str "A" , Space , Str "third" , Space , Str "paragraph" ]
+  , Header
+      1 ( "line-blocks" , [] , [] ) [ Str "Line" , Space , Str "blocks" ]
+  , LineBlock
+      [ [ Str "But"
+        , Space
+        , Str "can"
+        , Space
+        , Str "a"
+        , Space
+        , Str "bee"
+        , Space
+        , Str "be"
+        , Space
+        , Str "said"
+        , Space
+        , Str "to"
+        , Space
+        , Str "be"
+        ]
+      , [ Str "\160\160\160\160or"
+        , Space
+        , Str "not"
+        , Space
+        , Str "to"
+        , Space
+        , Str "be"
+        , Space
+        , Str "an"
+        , Space
+        , Str "entire"
+        , Space
+        , Str "bee,"
+        ]
+      , [ Str "\160\160\160\160\160\160\160\160when"
+        , Space
+        , Str "half"
+        , Space
+        , Str "the"
+        , Space
+        , Str "bee"
+        , Space
+        , Str "is"
+        , Space
+        , Str "not"
+        , Space
+        , Str "a"
+        , Space
+        , Str "bee,"
+        ]
+      , [ Str "\160\160\160\160\160\160\160\160\160\160\160\160due"
+        , Space
+        , Str "to"
+        , Space
+        , Str "some"
+        , Space
+        , Str "ancient"
+        , Space
+        , Str "injury?"
+        ]
+      , []
+      , [ Str "Continuation" , Space , Str "line" ]
+      , [ Str "\160\160and" , Space , Str "another" ]
+      ]
+  , Header
+      1
+      ( "simple-tables" , [] , [] )
+      [ Str "Simple" , Space , Str "Tables" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "1" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "2" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "3" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r1" , Space , Str "a" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "b" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "c" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para [ Str "Headless" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r1" , Space , Str "a" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "b" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "c" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Header
+      1 ( "grid-tables" , [] , [] ) [ Str "Grid" , Space , Str "Tables" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.2375 )
+      , ( AlignDefault , ColWidth 0.15 )
+      , ( AlignDefault , ColWidth 0.1625 )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "1" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "2" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "col" , Space , Str "3" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "r1"
+                      , Space
+                      , Str "a"
+                      , SoftBreak
+                      , Str "r1"
+                      , Space
+                      , Str "bis"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "b" , SoftBreak , Str "b" , Space , Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "c" , SoftBreak , Str "c" , Space , Str "2" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para [ Str "Headless" ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.2375 )
+      , ( AlignDefault , ColWidth 0.15 )
+      , ( AlignDefault , ColWidth 0.1625 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "r1"
+                      , Space
+                      , Str "a"
+                      , SoftBreak
+                      , Str "r1"
+                      , Space
+                      , Str "bis"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "b" , SoftBreak , Str "b" , Space , Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "c" , SoftBreak , Str "c" , Space , Str "2" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Spaces"
+      , Space
+      , Str "at"
+      , Space
+      , Str "ends"
+      , Space
+      , Str "of"
+      , Space
+      , Str "lines"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.2375 )
+      , ( AlignDefault , ColWidth 0.15 )
+      , ( AlignDefault , ColWidth 0.1625 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "r1"
+                      , Space
+                      , Str "a"
+                      , SoftBreak
+                      , Str "r1"
+                      , Space
+                      , Str "bis"
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "b" , SoftBreak , Str "b" , Space , Str "2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "c" , SoftBreak , Str "c" , Space , Str "2" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "r2" , Space , Str "d" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "e" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "f" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Multiple"
+      , Space
+      , Str "blocks"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "cell"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.2375 )
+      , ( AlignDefault , ColWidth 0.15 )
+      , ( AlignDefault , ColWidth 0.1625 )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "r1" , Space , Str "a" ]
+                  , Para [ Str "r1" , Space , Str "bis" ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ BulletList
+                      [ [ Plain [ Str "b" ] ]
+                      , [ Plain [ Str "b" , Space , Str "2" ] ]
+                      , [ Plain [ Str "b" , Space , Str "2" ] ]
+                      ]
+                  ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain
+                      [ Str "c"
+                      , SoftBreak
+                      , Str "c"
+                      , Space
+                      , Str "2"
+                      , SoftBreak
+                      , Str "c"
+                      , Space
+                      , Str "2"
+                      ]
+                  ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Table"
+      , Space
+      , Str "with"
+      , Space
+      , Str "cells"
+      , Space
+      , Str "spanning"
+      , Space
+      , Str "multiple"
+      , Space
+      , Str "rows"
+      , Space
+      , Str "or"
+      , Space
+      , Str "columns:"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.175 )
+      , ( AlignDefault , ColWidth 0.1 )
+      , ( AlignDefault , ColWidth 0.1375 )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 2)
+                 [ Plain [ Str "Property" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "Earth" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 3)
+                  (ColSpan 1)
+                  [ Plain [ Str "Temperature" , SoftBreak , Str "1961-1990" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "min" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "-89.2" , Space , Str "\176C" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "mean" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "14" , Space , Str "\176C" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "min" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "56.7" , Space , Str "\176C" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Para
+      [ Str "Table"
+      , Space
+      , Str "with"
+      , Space
+      , Str "complex"
+      , Space
+      , Str "header:"
+      ]
+  , Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidth 0.275 )
+      , ( AlignDefault , ColWidth 0.1 )
+      , ( AlignDefault , ColWidth 0.1 )
+      , ( AlignDefault , ColWidth 0.1 )
+      ]
+      (TableHead
+         ( "" , [] , [] )
+         [ Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 2)
+                 (ColSpan 1)
+                 [ Plain [ Str "Location" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 3)
+                 [ Plain
+                     [ Str "Temperature"
+                     , Space
+                     , Str "1961-1990"
+                     , SoftBreak
+                     , Str "in"
+                     , Space
+                     , Str "degree"
+                     , Space
+                     , Str "Celsius"
+                     ]
+                 ]
+             ]
+         , Row
+             ( "" , [] , [] )
+             [ Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "min" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "mean" ] ]
+             , Cell
+                 ( "" , [] , [] )
+                 AlignDefault
+                 (RowSpan 1)
+                 (ColSpan 1)
+                 [ Plain [ Str "max" ] ]
+             ]
+         ])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Antarctica" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "-89.2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "N/A" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "19.8" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "Earth" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "-89.2" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "14" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Plain [ Str "56.7" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  , Header 1 ( "footnotes" , [] , [] ) [ Str "Footnotes" ]
+  , Para
+      [ Note
+          [ Para
+              [ Str "Note"
+              , Space
+              , Str "with"
+              , Space
+              , Str "one"
+              , Space
+              , Str "line."
+              ]
+          ]
+      ]
+  , Para
+      [ Note
+          [ Para
+              [ Str "Note"
+              , Space
+              , Str "with"
+              , SoftBreak
+              , Str "continuation"
+              , Space
+              , Str "line."
+              ]
+          ]
+      ]
+  , Para
+      [ Note
+          [ Para [ Str "Note" , Space , Str "with" ]
+          , Para [ Str "continuation" , Space , Str "block." ]
+          ]
+      ]
+  , Para
+      [ Note
+          [ Para
+              [ Str "Note"
+              , Space
+              , Str "with"
+              , SoftBreak
+              , Str "continuation"
+              , Space
+              , Str "line"
+              ]
+          , Para
+              [ Str "and"
+              , Space
+              , Str "a"
+              , Space
+              , Str "second"
+              , Space
+              , Str "para."
+              ]
+          ]
+      ]
+  , Para [ Str "Not" , Space , Str "in" , Space , Str "note." ]
+  , Header 1 ( "math" , [] , [] ) [ Str "Math" ]
+  , Para
+      [ Str "Some"
+      , Space
+      , Str "inline"
+      , Space
+      , Str "math"
+      , Space
+      , Math InlineMath "E=mc^2"
+      , Str "."
+      , Space
+      , Str "Now"
+      , Space
+      , Str "some"
+      , SoftBreak
+      , Str "display"
+      , Space
+      , Str "math:"
+      ]
+  , Para [ Math DisplayMath "E=mc^2" ]
+  , Para [ Math DisplayMath "E = mc^2" ]
+  , Para
+      [ Math DisplayMath "E = mc^2"
+      , Math DisplayMath "\\alpha = \\beta"
+      ]
+  , Para
+      [ Span
+          ( "" , [] , [ ( "label" , "hithere" ) , ( "nowrap" , "" ) ] )
+          [ Math
+              DisplayMath
+              "\\begin{aligned}\nE &= mc^2\\\\\nF &= \\pi E\n\\end{aligned}"
+          , Math DisplayMath "F &= \\gamma \\alpha^2"
+          ]
+      ]
+  , Para [ Str "All" , Space , Str "done." ]
+  , Header 1 ( "default-role" , [] , [] ) [ Str "Default-Role" ]
+  , Para
+      [ Str "Try"
+      , Space
+      , Str "changing"
+      , Space
+      , Str "the"
+      , Space
+      , Str "default"
+      , Space
+      , Str "role"
+      , Space
+      , Str "to"
+      , Space
+      , Str "a"
+      , Space
+      , Str "few"
+      , Space
+      , Str "different"
+      , Space
+      , Str "things."
+      ]
+  , Header
+      2
+      ( "doesnt-break-title-parsing" , [] , [] )
+      [ Str "Doesn\8217t"
+      , Space
+      , Str "Break"
+      , Space
+      , Str "Title"
+      , Space
+      , Str "Parsing"
+      ]
+  , Para
+      [ Str "Inline"
+      , Space
+      , Str "math:"
+      , Space
+      , Math InlineMath "E=mc^2"
+      , Space
+      , Str "or"
+      , Space
+      , Math InlineMath "E=mc^2"
+      , Space
+      , Str "or"
+      , Space
+      , Math InlineMath "E=mc^2"
+      , Str "."
+      , SoftBreak
+      , Str "Other"
+      , Space
+      , Str "roles:"
+      , Space
+      , Superscript [ Str "super" ]
+      , Str ","
+      , Space
+      , Subscript [ Str "sub" ]
+      , Str "."
+      ]
+  , Para
+      [ Math DisplayMath "\\alpha = beta" , Math DisplayMath "E = mc^2" ]
+  , Para
+      [ Str "Some"
+      , Space
+      , Superscript [ Str "of" ]
+      , Space
+      , Str "these"
+      , Space
+      , Superscript [ Str "words" ]
+      , Space
+      , Str "are"
+      , Space
+      , Str "in"
+      , Space
+      , Superscript [ Str "superscript" ]
+      , Str "."
+      ]
+  , Para
+      [ Str "Reset"
+      , Space
+      , Str "default-role"
+      , Space
+      , Str "to"
+      , Space
+      , Str "the"
+      , Space
+      , Str "default"
+      , Space
+      , Str "default."
+      ]
+  , Para
+      [ Str "And"
+      , Space
+      , Str "now"
+      , Space
+      , Span
+          ( "" , [ "title-ref" ] , [] ) [ Str "some-invalid-string-3231231" ]
+      , Space
+      , Str "is"
+      , Space
+      , Str "nonsense."
+      ]
+  , Para
+      [ Str "And"
+      , Space
+      , Str "now"
+      , Space
+      , Str "with"
+      , Space
+      , RawInline
+          (Format "html") "inline HTML"
+      , Str "."
+      ]
+  , Para
+      [ Str "And"
+      , Space
+      , Str "some"
+      , Space
+      , Str "inline"
+      , Space
+      , Str "haskell"
+      , Space
+      , Code ( "" , [ "haskell" ] , [] ) "fmap id [1,2..10]"
+      , Str "."
+      ]
+  , Para
+      [ Str "Indirect"
+      , Space
+      , Str "python"
+      , Space
+      , Str "role"
+      , Space
+      , Code
+          ( "" , [ "py" , "python" , "indirect" ] , [] )
+          "[x*x for x in [1,2,3,4,5]]"
+      , Str "."
+      ]
+  , Para
+      [ Str "Different"
+      , Space
+      , Str "indirect"
+      , Space
+      , Str "C"
+      , Space
+      , Code ( "" , [ "c" , "different-indirect" ] , [] ) "int x = 15;"
+      , Str "."
+      ]
+  , Header
+      2
+      ( "literal-symbols" , [] , [] )
+      [ Str "Literal" , Space , Str "symbols" ]
+  , Para [ Str "2*2" , Space , Str "=" , Space , Str "4*1" ]
+  ]
diff --git a/test/rst-reader.rst b/test/rst-reader.rst
--- a/test/rst-reader.rst
+++ b/test/rst-reader.rst
@@ -107,6 +107,30 @@
    def my_function(x):
        return x + 1
 
+If we use the highlight directive, we can specify a default language
+for literate blocks.
+
+.. highlight:: haskell
+
+::
+
+  -- this code is in haskell
+  data Tree = Leaf | Node Tree Tree
+
+::
+
+  -- this code is in haskell too
+  data Nat = Zero | Succ Nat
+
+.. highlight:: javascript
+
+::
+
+  -- this code is in javascript
+  let f = (x, y) => x + y
+
+.. highlight::
+
 Lists
 =====
 
@@ -192,7 +216,7 @@
 
 	Item 1. graf two. The quick brown fox jumped over the lazy dog's
 	back.
-	
+
 2.	Item 2.
 
 3.	Item 3.
@@ -518,6 +542,31 @@
 |                  | - b 2     | c 2        | 
 | r1 bis           | - b 2     | c 2        | 
 +------------------+-----------+------------+
+
+Table with cells spanning multiple rows or columns:
+
++---------------------+----------+
+| Property            | Earth    |
++=============+=======+==========+
+|             | min   | -89.2 °C |
+| Temperature +-------+----------+
+| 1961-1990   | mean  | 14 °C    |
+|             +-------+----------+
+|             | min   | 56.7 °C  |
++-------------+-------+----------+
+
+Table with complex header:
+
++---------------------+-----------------------+
+| Location            | Temperature 1961-1990 |
+|                     | in degree Celsius     |
+|                     +-------+-------+-------+
+|                     | min   | mean  | max   |
++=====================+=======+=======+=======+
+| Antarctica          | -89.2 | N/A   | 19.8  |
++---------------------+-------+-------+-------+
+| Earth               | -89.2 | 14    | 56.7  |
++---------------------+-------+-------+-------+
 
 Footnotes
 =========
diff --git a/test/rtf/accent.native b/test/rtf/accent.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/accent.native
@@ -0,0 +1,18 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Para
+      [ Str "le"
+      , Space
+      , Str "caf\233"
+      , Space
+      , Str "o\249"
+      , Space
+      , Str "on"
+      , Space
+      , Str "ne"
+      , Space
+      , Str "fume"
+      , Space
+      , Str "pas"
+      ]
+  ]
diff --git a/test/rtf/accent.rtf b/test/rtf/accent.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/accent.rtf
@@ -0,0 +1,3 @@
+{\rtf1\ansi
+{ le caf\'e9 o\'f9 on ne fume pas }
+}
diff --git a/test/rtf/bookmark.native b/test/rtf/bookmark.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/bookmark.native
@@ -0,0 +1,11 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Para
+      [ Span ( "bookmark_1" , [] , [] ) [ Str "Bookmark_1" ] ]
+  , Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "click" , Space , Str "me" ]
+          ( "#bookmark_1" , "" )
+      ]
+  ]
diff --git a/test/rtf/bookmark.rtf b/test/rtf/bookmark.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/bookmark.rtf
@@ -0,0 +1,8 @@
+{\rtf1\ansi
+\pard
+{\*\bkmkstart bookmark_1}Bookmark_1{\*\bkmkend bookmark_1}
+\par
+\pard
+{\field{\*\fldinst { HYPERLINK  \\l "bookmark_1" }}{\fldrslt{click me}}}
+\par
+}
diff --git a/test/rtf/footnote.native b/test/rtf/footnote.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/footnote.native
@@ -0,0 +1,130 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Para
+      [ Str "Mead's"
+      , Space
+      , Str "landmark"
+      , Space
+      , Str "study"
+      , Space
+      , Str "has"
+      , Space
+      , Str "been"
+      , Space
+      , Str "amply"
+      , Space
+      , Str "annotated."
+      , Note
+          [ Para
+              [ Str "See"
+              , Space
+              , Str "Sahlins,"
+              , Space
+              , Str "Bateson,"
+              , Space
+              , Str "and"
+              , Space
+              , Str "Geertz"
+              , Space
+              , Str "for"
+              , Space
+              , Str "a"
+              , Space
+              , Str "complete"
+              , Space
+              , Str "bibliography."
+              ]
+          ]
+      , Space
+      , Str "It"
+      , Space
+      , Str "was"
+      , Space
+      , Str "her"
+      , Space
+      , Str "work"
+      , Space
+      , Str "in"
+      , Space
+      , Str "America"
+      , Space
+      , Str "during"
+      , Space
+      , Str "the"
+      , Space
+      , Str "Second"
+      , Space
+      , Str "World"
+      , Space
+      , Str "War,"
+      , Space
+      , Str "however,"
+      , Space
+      , Str "that"
+      , Space
+      , Str "forms"
+      , Space
+      , Str "the"
+      , Space
+      , Str "basis"
+      , Space
+      , Str "for"
+      , Space
+      , Str "the"
+      , Space
+      , Str "paper."
+      , Space
+      , Str "As"
+      , Space
+      , Str "others"
+      , Space
+      , Str "have"
+      , Space
+      , Str "noted,"
+      , Note
+          [ Para
+              [ Str "A"
+              , Space
+              , Str "complete"
+              , Space
+              , Str "bibliography"
+              , Space
+              , Str "will"
+              , Space
+              , Str "be"
+              , Space
+              , Str "found"
+              , Space
+              , Str "at"
+              , Space
+              , Str "the"
+              , Space
+              , Str "end"
+              , Space
+              , Str "of"
+              , Space
+              , Str "this"
+              , Space
+              , Str "chapter."
+              ]
+          ]
+      , Space
+      , Str "this"
+      , Space
+      , Str "period"
+      , Space
+      , Str "was"
+      , Space
+      , Str "a"
+      , Space
+      , Str "turning"
+      , Space
+      , Str "point"
+      , Space
+      , Str "for"
+      , Space
+      , Str "Margaret"
+      , Space
+      , Str "Mead."
+      ]
+  ]
diff --git a/test/rtf/footnote.rtf b/test/rtf/footnote.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/footnote.rtf
@@ -0,0 +1,11 @@
+{\rtf1\ansi
+\ftnbj\ftnrestart \sectd \linemod0\linex0\endnhere \pard\plain
+\ri1170 \fs20 {\pu6 Mead's landmark study has been amply annotated.\chftn
+{\footnote \pard\plain \s246 \fs20 {\up6\chftn }
+See Sahlins, Bateson, and Geertz for a complete bibliography.} It was 
+her work in America during the Second World War, however, that forms 
+the basis for the paper. As others have noted,\chftn
+{\footnote \pard\plain \s246 \fs20 {\up6\chftn}
+A complete bibliography will be found at the end of this chapter.} 
+this period was a turning point for Margaret Mead.}
+\par}
diff --git a/test/rtf/formatting.native b/test/rtf/formatting.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/formatting.native
@@ -0,0 +1,45 @@
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "operator"
+            , MetaInlines [ Str "John" , Space , Str "MacFarlane" ]
+            )
+          ]
+    }
+  [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "test"
+      , Space
+      , Str "of"
+      , Space
+      , Str "FORMATTING."
+      , Space
+      , Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "hidden:"
+      , Space
+      , Str "."
+      ]
+  , Para [ SmallCaps [ Str "Small" , Space , Str "Caps" ] ]
+  , Para [ Strong [ Str "bold" ] ]
+  , Para [ Emph [ Str "italics" ] ]
+  , Para
+      [ Strong
+          [ Str "bold"
+          , Space
+          , Emph [ Str "and" , Space , Str "italics" ]
+          ]
+      ]
+  , Para [ Underline [ Str "underlined" ] ]
+  , Para [ Strikeout [ Str "strikeout" ] ]
+  , Para [ Str "x" , Superscript [ Str "superscript" ] ]
+  , Para [ Str "x" , Subscript [ Str "subscript" ] ]
+  ]
diff --git a/test/rtf/formatting.rtf b/test/rtf/formatting.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/formatting.rtf
@@ -0,0 +1,201 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f4\fbidi \fnil\fcharset0\fprq2{\*\panose 00000000000000000000}Helvetica;}
+{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}
+{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1068\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f1069\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f1071\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f1072\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f1073\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f1074\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f1075\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f1076\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f1108\fbidi \fnil\fcharset238\fprq2 Helvetica CE;}
+{\f1109\fbidi \fnil\fcharset204\fprq2 Helvetica Cyr;}{\f1111\fbidi \fnil\fcharset161\fprq2 Helvetica Greek;}{\f1112\fbidi \fnil\fcharset162\fprq2 Helvetica Tur;}{\f1115\fbidi \fnil\fcharset186\fprq2 Helvetica Baltic;}
+{\f1116\fbidi \fnil\fcharset163\fprq2 Helvetica (Vietnamese);}{\f1408\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f1409\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f1411\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}
+{\f1412\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f1415\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f1416\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}
+{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}
+{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}
+{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}
+{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
+\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}{\*\defchp \fs24\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs24\alang1025 \ltrch\fcs0 
+\fs24\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 
+\snext11 \ssemihidden \sunhideused Normal Table;}}{\*\rsidtbl \rsid2168431\rsid14113975}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\operator John MacFarlane}
+{\creatim\yr2021\mo8\dy4\hr17\min1}{\revtim\yr2021\mo8\dy4\hr17\min2}{\version2}{\edmins1}{\nofpages1}{\nofwords21}{\nofchars120}{\nofcharsws140}{\vern6543}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
+\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
+\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701
+\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot2168431 \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2
+\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6
+\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang 
+{\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\nowidctlpar\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs24\alang1025 \ltrch\fcs0 
+\fs24\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 This is a test of }{\rtlch\fcs1 \af4 \ltrch\fcs0 
+\caps\f4\insrsid14113975\charrsid2168431 \hich\af4\dbch\af31505\loch\f4 formatting}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 .}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid2168431 \hich\af4\dbch\af31505\loch\f4   This is hidden: }{\rtlch\fcs1 \af4 
+\ltrch\fcs0 \v\f4\insrsid2168431\charrsid2168431 \hich\af4\dbch\af31505\loch\f4 secret}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid2168431 .}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 
+\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \scaps\f4\insrsid14113975\charrsid2168431 \hich\af4\dbch\af31505\loch\f4 Small Caps
+\par }{\rtlch\fcs1 \ab\af4 \ltrch\fcs0 \b\f4\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 bold}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 
+\par }{\rtlch\fcs1 \ai\af4 \ltrch\fcs0 \i\f4\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 italics}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 
+\par }{\rtlch\fcs1 \ab\af4 \ltrch\fcs0 \b\f4\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 bold }{\rtlch\fcs1 \ab\ai\af4 \ltrch\fcs0 \b\i\f4\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 and italics}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 
+\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\ul\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 underlined}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 
+\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \strike\f4\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 strikeout
+\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 x}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\super\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 superscript}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 
+\par \hich\af4\dbch\af31505\loch\f4 x}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\sub\insrsid14113975 \hich\af4\dbch\af31505\loch\f4 subscript}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid14113975 
+\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
+9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
+5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
+b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
+0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
+a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
+c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
+0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
+a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
+6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
+4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
+4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f
+7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd
+ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d
+7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b
+d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52
+fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71
+b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b
+fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567
+9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd
+79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf
+5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2
+d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1
+738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68
+2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac
+5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a
+b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9
+493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2
+be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f
+f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64
+7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e
+b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4
+6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd
+f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d
+7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39
+4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf
+1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a
+faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2
+67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9
+416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27
+1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b
+8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4
+8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65
+2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36
+3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e
+3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985
+0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000
+0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000
+000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000
+7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000
+000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000
+000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
+\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text;
+\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;
+\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;
+\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1;
+\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision;
+\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;
+\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1;
+\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;
+\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;
+\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;
+\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;
+\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;
+\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;
+\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;
+\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;
+\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;
+\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
+\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
+\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
+\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
+\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
+\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
+\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
+\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
+\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
+\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore }}
diff --git a/test/rtf/heading.native b/test/rtf/heading.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/heading.native
@@ -0,0 +1,10 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Header
+      1 ( "" , [] , [] ) [ Str "Heading" , Space , Str "1" ]
+  , Header
+      2 ( "" , [] , [] ) [ Str "Heading" , Space , Str "2" ]
+  , Header
+      3 ( "" , [] , [] ) [ Str "Heading" , Space , Str "3" ]
+  , Para [ Str "Paragraph" ]
+  ]
diff --git a/test/rtf/heading.rtf b/test/rtf/heading.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/heading.rtf
@@ -0,0 +1,223 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31506\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}
+{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}
+{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f44\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f45\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f47\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f48\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f49\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f50\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f51\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f52\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f384\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f385\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
+{\f387\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f388\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f391\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f392\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}
+{\f414\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f415\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f417\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f418\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\f419\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f420\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f421\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f422\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}
+{\f424\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\f425\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\f427\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\f428\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}
+{\f429\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\f430\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}{\f431\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\f432\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}
+{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}
+{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}
+{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}
+{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
+{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
+\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;\caccentone\ctint255\cshade191\red47\green84\blue150;
+\caccentone\ctint255\cshade127\red31\green55\blue99;}{\*\defchp \f31506\fs22 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{
+\s1\ql \li0\ri0\sb240\sl259\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31503\afs32\alang1025 \ltrch\fcs0 
+\fs32\cf19\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink15 \sqformat \spriority9 \styrsid2496039 heading 1;}{\s2\ql \li0\ri0\sb40\sl259\slmult1
+\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31503\afs26\alang1025 \ltrch\fcs0\b\fs26\cf19\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext0 \slink16 \sunhideused \sqformat \spriority9 \styrsid2496039 heading 2;}{\s3\ql \li0\ri0\sb40\sl259\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0 \rtlch\fcs1 
+\af31503\afs24\alang1025 \ltrch\fcs0 \fs24\cf20\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink17 \sunhideused \sqformat \spriority9 \styrsid2496039 heading 3;}{\*\cs10 \additive 
+\ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused 
+Normal Table;}{\*\cs15 \additive \rtlch\fcs1 \af31503\afs32 \ltrch\fcs0 \fs32\cf19\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink1 \slocked \spriority9 \styrsid2496039 Heading 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \af31503\afs26 \ltrch\fcs0 
+\fs26\cf19\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink2 \slocked \spriority9 \styrsid2496039 Heading 2 Char;}{\*\cs17 \additive \rtlch\fcs1 \af31503\afs24 \ltrch\fcs0 \fs24\cf20\loch\f31502\hich\af31502\dbch\af31501 
+\sbasedon10 \slink3 \slocked \spriority9 \styrsid2496039 Heading 3 Char;}}{\*\rsidtbl \rsid1718450\rsid2496039\rsid2631807\rsid4616182\rsid10489260}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1
+\mwrapIndent1440\mintLim0\mnaryLim1}
+{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
+\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1\noxlattoyen
+\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin1440\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
+\asianbrkrule\rsidroot2496039\newtblstyruls\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0
+{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang 
+{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang 
+{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
+\pard\plain \ltrpar\s1\ql \li0\ri0\sb240\sl259\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0\pararsid2496039 \rtlch\fcs1 \af31503\afs32\alang1025 \ltrch\fcs0 
+\fs32\cf19\lang1033\langfe1033\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31503 \ltrch\fcs0 \insrsid2496039 \hich\af31502\dbch\af31501\loch\f31502 H\hich\af31502\dbch\af31501\loch\f31502 eading 1}{\rtlch\fcs1 
+\af31503 \ltrch\fcs0 \insrsid2631807 
+\par }\pard\plain \ltrpar\s2\ql \li0\ri0\sb40\sl259\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0\pararsid2496039 \rtlch\fcs1 \af31503\afs26\alang1025 \ltrch\fcs0 
+\fs26\cf19\lang1033\langfe1033\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31503 \ltrch\fcs0 \insrsid2496039 \hich\af31502\dbch\af31501\loch\f31502 H\hich\af31502\dbch\af31501\loch\f31502 eading }{\rtlch\fcs1 
+\af31503 \ltrch\fcs0 \insrsid2496039 \hich\af31502\dbch\af31501\loch\f31502 2}{\rtlch\fcs1 \af31503 \ltrch\fcs0 \insrsid2496039 
+\par }\pard\plain \ltrpar\s3\ql \li0\ri0\sb40\sl259\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0\pararsid2496039 \rtlch\fcs1 \af31503\afs24\alang1025 \ltrch\fcs0 
+\fs24\cf20\lang1033\langfe1033\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31503 \ltrch\fcs0 \insrsid2496039 \hich\af31502\dbch\af31501\loch\f31502 H\hich\af31502\dbch\af31501\loch\f31502 eading }{\rtlch\fcs1 
+\af31503 \ltrch\fcs0 \insrsid2496039 \hich\af31502\dbch\af31501\loch\f31502 3}{\rtlch\fcs1 \af31503 \ltrch\fcs0 \insrsid2496039 
+\par }\pard\plain \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 
+\af31507 \ltrch\fcs0 \insrsid2496039 Paragraph
+\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
+9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
+5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
+b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
+0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
+a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
+c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
+0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
+a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
+6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
+4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
+4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100d3130843c40600008b1a0000160000007468656d652f7468656d652f
+7468656d65312e786d6cec595d8bdb46147d2ff43f08bd3bfe92fcb1c41b6cd9ceb6d94d42eca4e4716c8fadc98e344633de8d0981923c160aa569e943037deb
+43691b48a02fe9afd936a54d217fa17746b63c638fbb9b2585a5640d8b343af7ce997bafce1d4997afdc8fa87384134e58dc708b970aae83e3211b9178d2706f
+f7bbb99aeb7081e211a22cc60d778eb97b65f7c30f2ea31d11e2083b601ff31dd4704321a63bf93c1fc230e297d814c7706dcc920809384d26f951828ec16f44
+f3a542a1928f10895d274611b8bd311e932176fad2a5bbbb74dea1701a0b2e078634e949d7d8b050d8d1615122f89c0734718e106db830cf881df7f17de13a14
+7101171a6e41fdb9f9ddcb79b4b330a2628bad66d7557f0bbb85c1e8b0a4e64c26836c52cff3bd4a33f3af00546ce23ad54ea553c9fc29001a0e61a52917d367
+b514780bac064a0f2dbedbd576b968e035ffe50dce4d5ffe0cbc02a5febd0d7cb71b40140dbc02a5787f03efb7eaadb6e95f81527c65035f2d34db5ed5f0af40
+2125f1e106bae057cac172b51964cce89e155ef7bd6eb5b470be42413564d525a718b3586cabb508dd6349170012489120b123e6533c4643a8e20051324888b3
+4f262114de14c58cc370a154e816caf05ffe3c75a4328a7630d2ac252f60c23786241f870f1332150df763f0ea6a90372f7f7cf3f2b973f2e8c5c9a35f4e1e3f
+3e79f473eac8b0da43f144b77afdfd177f3ffdd4f9ebf977af9f7c65c7731dfffb4f9ffdf6eb977620ac741582575f3ffbe3c5b357df7cfee70f4f2cf0668206
+3abc4f22cc9debf8d8b9c52258980a81c91c0f92b7b3e88788e816cd78c2518ce42c16ff1d111ae8eb73449105d7c26604ef24203136e0d5d93d83702f4c6682
+583c5e0b230378c0186db1c41a856b722e2dccfd593cb14f9ecc74dc2d848e6c73072836f2db994d415b89cd65106283e64d8a62812638c6c291d7d821c696d5
+dd25c488eb0119268cb3b170ee12a7858835247d3230aa6965b44722c8cbdc4610f26dc4e6e08ed362d4b6ea363e32917057206a21dfc7d408e355341328b2b9
+eca388ea01df4722b491eccd93a18eeb7001999e60ca9cce08736eb3b991c07ab5a45f0379b1a7fd80ce231399087268f3b98f18d3916d761884289adab03d12
+873af6237e08258a9c9b4cd8e007ccbc43e439e401c55bd37d876023dda7abc16d50569dd2aa40e4955962c9e555cc8cfaedcde91861253520fc869e47243e55
+dcd764ddff6f651d84f4d5b74f2dabbaa882de4c88f58eda5b93f16db875f10e583222175fbbdb6816dfc470bb6c36b0f7d2fd5ebaddffbd746fbb9fdfbd60af
+341ae45b6e15d3adbadab8475bf7ed6342694fcc29dee76aebcea1338dba3028edd4332bce9ee3a6211cca3b192630709304291b2761e21322c25e88a6b0bf2f
+bad2c9842f5c4fb833651cb6fd6ad8ea5be2e92c3a60a3f471b558948fa6a978702456e3053f1b87470d91a22bd5d52358e65eb19da847e5250169fb3624b4c9
+4c12650b89ea725006493d9843d02c24d4cade098bba85454dba5fa66a830550cbb2025b2707365c0dd7f7c0048ce0890a513c92794a53bdccae4ae6bbccf4b6
+601a1500fb886505ac325d975cb72e4fae2e2db53364da20a1959b49424546f5301ea2115e54a71c3d0b8db7cd757d9552839e0c859a0f4a6b45a35afb3716e7
+cd35d8ad6b038d75a5a0b173dc702b651f4a6688a60d770c8ffd70184da176b8dcf2223a8177674391a437fc7994659a70d1463c4c03ae4427558388089c3894
+440d572e3f4b038d9586286ec51208c28525570759b968e420e96692f1788c87424fbb3622239d9e82c2a75a61bdaacccf0f96966c06e9ee85a363674067c92d
+0425e6578b328023c2e1ed4f318de688c0ebcc4cc856f5b7d69816b2abbf4f5435948e233a0dd1a2a3e8629ec295946774d4591603ed6cb16608a8169245231c
+4c6483d5836a74d3ac6ba41cb676ddd38d64e434d15cf54c435564d7b4ab9831c3b20dacc5f27c4d5e63b50c31689adee153e95e97dcfa52ebd6f60959978080
+67f1b374dd3334048dda6a32839a64bc29c352b317a366ef582ef0146a6769129aea57966ed7e296f508eb743078aece0f76eb550b43e3e5be52455a7df7d03f
+4db0c13d108f36bc049e51c1552ae1c343826043d4537b925436e016b92f16b7061c39b38434dc0705bfe905253fc8156a7e27e795bd42aee637cbb9a6ef978b
+1dbf5868b74a0fa1b188302afae937972ebc8aa2f3c5971735bef1f5255abe6dbb3464519ea9af2b79455c7d7d2996b67f7d710888ce834aa95b2fd75b955cbd
+dcece6bc76ab96ab079556ae5d09aaed6e3bf06bf5ee43d7395260af590ebc4aa796ab148320e7550a927ead9eab7aa552d3ab366b1daff970b18d8195a7f2b1
+88058457f1dafd070000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f7468656d652f5f72656c732f7468
+656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c082e8761be9969
+bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198720e274a939cd08a54f980ae38
+a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa4c04ca5bbaba
+c4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c0200001300000000000000000000000000000000005b436f6e74656e745f
+54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000000000300100005f72656c732f2e72
+656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000190200007468656d652f7468656d652f746865
+6d654d616e616765722e786d6c504b01022d0014000600080000002100d3130843c40600008b1a00001600000000000000000000000000d60200007468656d65
+2f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b0100002700000000000000000000000000ce0900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000c90a00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax375\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
+\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text;
+\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;
+\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;
+\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1;
+\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision;
+\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;
+\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1;
+\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;
+\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;
+\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;
+\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;
+\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;
+\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;
+\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;
+\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;
+\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;
+\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
+\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
+\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
+\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
+\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
+\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
+\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
+\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
+\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
+\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;}}{\*\datastore 010500000200000018000000
+4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
+d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000b002
+c4a57123d401feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000105000000000000}}
diff --git a/test/rtf/image.native b/test/rtf/image.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/image.native
@@ -0,0 +1,12 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Para
+      [ Image
+          ( ""
+          , []
+          , [ ( "width" , "2.0in" ) , ( "height" , "2.0in" ) ]
+          )
+          [ Str "image" ]
+          ( "f9d88c3dbe18f6a7f5670e994a947d51216cdf0e.jpg" , "" )
+      ]
+  ]
diff --git a/test/rtf/image.rtf b/test/rtf/image.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/image.rtf
@@ -0,0 +1,6 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 \fmodern Courier;}}
+{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
+\widowctrl\hyphauto
+
+{\pard \ql \f0 \sa180 \li0 \fi0 {\pict\jpegblip\picw250\pich250\picwgoal2880\pichgoal2880 \bin ffd8ffe000104a46494600010101007800780000ffdb00430006040506050406060506070706080a100a0a09090a140e0f0c1017141818171416161a1d251f1a1b231c1616202c20232627292a29191f2d302d283025282928ffdb0043010707070a080a130a0a13281a161a2828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828282828ffc000110800fa00fa03011100021101031101ffc4001c0000000701010000000000000000000000010203040506070008ffc4003e100002010303020404040502050500030001020300041105122106311322415107617181143291a1234252b1c115f016336272d1082443e1f1265382ffc40017010101010100000000000000000000000000010204ffc4001b11010101010003010000000000000000000001110212213141ffda000c03010002110311003f00dadd18a10a704f6a95ccc57e37750782b0d8d9ea0cd32e7c5446e07e9f4ad723119a7b89e61e348f260719278aad613cbb640002938c76a182b264fc87bd13009c0c019c76e3d68a072e1cf6f4cd502d330c28269a61bb39c923923d4fad44c08dccb95cfd28b8280769ee08a263891e1808739e4f1d8d149392172cc714050dbb9fde8960ed8c60b79b1ed44103b05c331dbdb1dc5026ac1946d20ff8140aa631c773ec738a0346a003bf93e9cf02801895e7b9a01886796c923bd0090a06393c76a0142003ce3d86680d8dd9392303f5341ccc1b3cf7a2c812c37e4923d381429757013209fa511c18146c9247a0f6a007900c0c671c6280854e086c673eb45c27c038fd68aedff2fda836ef881f136f25d5e6b7d1262964aa02b03f98fbf153131935edcc97576f35c33349212cc4f39f7ab26186dfce5b200f73451f7600dcb8cf27e7400c0b291914046c9e0718fde81371b8e7273f4ef4007691919240e714097f31f376e7b5008caee27807b0f5a02c8e1b3c6d27d33cd0201d839523144d1a149ae084b78da47638211771fd050d582c3a0faab5119b6d12f8ab1c06788a0fd4e2ac356fd1fe08754ddccaba849696309e598c9e2103fed1dcfdeadc44fea5ff00a7f956366d375e492403ca935bedcf1eea4ff6ac68a55efc1beb3b552574f8e7009ff933a927ec715bc82b3a8f4d6bba5ca1352d22fe061cf9a0383f71dea5119cc6c0baed3eaac0f1fad40897dcc3d81f7a052366c1007df3400f21edefc5008c28f30c9c5170ee4fc37830086395250a7c66770c18e78da31c0c63de8609b41f7c515c5172a30c3b76344a3e377cb2339cf7a242aea89808cce368272b8c1a2e107c672a49f5c1a181c9c7ae7da8a2119e7b1f5068099ffa68258a132062d8f9e0f34059502b61bf2824e681bb297ced2a71efda80f19c47b9c77fdbe74057c13e539cf3c1a0eeeb9c73f33405ddb4f18249c1e28062b79ae242902024465b9214614649e7bd0362a7249eddc513456e5720f38f5a1a98e96e95d6baa6ebc2d1ad1e65521649bb469f563534d6d7d31f04347d2a2fc5f535db6a0e83718906c887cbbe5a9a8bef44dce9f731ca9a2e89169d6d6f2184b1455dc07b11dcfeb4d16f119c649a681285b03d3e5500f87820ff006a0e098191de80ac9b8904647b55d11da9681a56a31f87a869f6970b8ffe4883629a289aefc16e92d441682da5b098f21ed9f033f353914d19b751fc08d66cc16d12fe2bf45ec92ff0df1fdbfb559ec667aff4eeb1a04db359d3ae6d40eccebe53f46ec7f5ab82263da7dcf3eb5174e5181076918c7de869503232491ee4515c1803824f03b51287f30e0e7d803449494832c157278a2e8c71fcb9f9d144639236824d01e142efb1768cfb9c7ef40512a818de78ff00a682518e7cc30ab9e00a02cce9953247bd41e467191ed9a04205ee99da4e4e3d283a524b0427b5026c18a8e082067db8341ce0e39ed409b6502907391edda80f2dfdc496f0c124ac6184b144cf0a4e338fd2894f7a7342d4ba9b568f4fd261f12571966270a8bfd47d8511bae85f02b47b7fc34bac5d5c5dc88a0c90ab6c8d9bedce3ef4d1ad691a6dae976a96d616d15b409f9638d70054a1dbc68ea51d4329f4619a8022b78e04548515117b05000a035c5c4702a995c26e3819f534047bcb68a458cce866719540724d02e41c0f7a012a40f6141cbc8e7bd01719e38e6838af1c0a04ca8206d3cd037bdb082fad9e0bd8a39e0718649141047d0d5d18f759fc0cd3af164b8e9999acae4e4f81236e898f7c0f55fed574615aee83a96817ef67abda3db4ebdb7f66f983d88a061bb8db9e3d45165076db83c1f950a53780d8247c80a2398f182724f1c7ad080c608cfa7a51a0062adc7afbd0130173bb9c5070f071cb37e82826106e8f615e01c9e680d6b35bc534be3c1e3831b2aa962bb188f2b71df1de819ae4b1048c7f57bd01a58268e332642ae0704f7cf6207af6a01b99e17b7b6416e227407c494139909ed9f4c0a04a4e501e0f1eb40d263e53dce7fa682c9d0bd13abf58dd6db18bc2b157c4975270ab8ef8f563f21447a73a03a1f4de8eb031582b497328066b97fcd21ff038edfde88b7e32703bd64188e7e6283864b73400cd804b67ca3268317eacea6d56ff005233592f8b6303f953fa4af7c2fa93417fe98b763e0ea171297bab98558068f695ce0e08fdbd281e5c6a57ba5e9d14d716ef7774f2ec112601da4f27ec2827ada74bab559a20e148fcae36b0f91140283729c77a0e0a7777a01dac68395719e39a029607cb901b19c501480ab9279f4a086ea8d0b48d76c0586b7143224a76c61ce1831fe93e86b43cd1f12fe19ea7d2533dcdbeebcd20b612651e68f9ece3fcf6fa5067cbcf20ff009a051724905411e94032799060723da8406d6c67e7ea68d0e1770fe5cfb5026c37039ef9a02eca098c91e6e01e71c500b1d8a49c12786cf6a06a4e256008e3d050119958007920e2801154e32fb4120927b014017eb1c523ac5209a356215c291b87be28957ef853f0d66eaa99352d515e1d190f947669ce7b0ffa7e74a8f4be996569a5d9c56b6704705b46bb5238d42851f2ac875712bc70b3c30f892019540704d01ad2669a0491936330c95ce7140b2e4939a03638c7e8680ae485e33bbe540d60d3ada162c90a02c7270a39340a4f28b68da4645007a8f6a069a746f73235ddcefc391e12b2e1916824948742c99382473c73404791c617695279dc0640f9502c578c9efeb4095cb4cb0830ba21cf999c6401f4f5a05061d430c8079a02e03b3004311c7d281b5e3cd676c65489ee594e4aafe6c7ae07a9a0a075bbea3a8ea96f047d3935ebc404f04ad29411e08e011d98fed416fd212ee5b05b4d5ad6300c615807f1171eaa49eff5ad418c7c55f8466dd66d57a521f20cbcd66a7247a9283dbe5418a63862479877cf1f6c5008e400bdf1ce684016fe53dfbd1a73794600e08ce3d6800377c8c7d6800a9cf75fd4503d91492460f7ee3d28247a7b459f5fd592d22711c206f9e563858a31f99cfd050583518ba75247b1d134f9aed21396d4669769931dc01c003f7a329c4d17458ac5b55d36c12e040a3f1da75c1cb04ede2447f7f6a94567ad7a66db4fbbb29ba7d65b8b4bd8ccd09c8231eaa07b8ab04a7c2cf87b3f53ea8d77abc72c1a5dabe2452bb5a561fc83e5ee7e541e988218ed2dd22b7855228d76a46a00000ec00a510bd4dd511f4fe84da95cc31f880022da4902b1e7d3e99ac86fd03d631f565b4ee6d4dbbc649009cab2e48c83f514165b8b94b6895c44f279c280839e78ce28178ae6de46748a789e453865570483ec6812d42e85a421fc37918b00a883924d024c6e99b7a2a966c0009e17dc9f9fed40f81c77e28139218e4ff9815b9cf23340a01c907b9140201038ed402fcafd28386464e4fd33c50272bc60032609cf00fbd024f722dc66f24822ddf972f8feff00e280f69b24844919cac9ce7de83a447f30ded823007b50459d6ecacb528349b979127651b1dc795f1f3f7a0990148054823dc5015d491c0a0c3be337c2ff00c489b5ee9c87172016b9b541c49ff5a8f7f71eb560c1fc43e0a47e1aa94277310431f91fa551c1727f29ed409b641c86e31839a3454805739c1f6a026f1fd740f64665fc8c31cfde82db79bb40e9e8f49b62eb7d7e8b717ec832c91ff247fa1dc7df2281bcc9369d671493c422b7911654c1215f92bb8827bf068624ba635392df5eb4b9924558ee5bc19b71cee43c6dc7cf34c657be8db0b0b9d0f51d2afe668934dbf9628ddb8c2b8c0073f3a80da37546a7d25174fd95dc125c69f7313ee5655dfc313bd483cf07b1f6a68d5b48d5ec758b612e9d7293211c8fe653f35ee2a084eb9e8bb1eafb3582fe496278f3e1c919fcb9f97ad03ee8dd017a6741b6d3229dae161057c5750a48249ec3eb4139238568f6a9e7b103b5037934cb3793c610a2cd9277a8da73f5140ee38f6280c4b11c65b934023006d50050030e4647de80c846de3b500fcf9fbd0197273ed4007b91400e580c8e45074a82400e72682b36fd2162b7f25ddc09af2766ceeb872db79cf00f6a0b3229550140e07007a50092db860673de818df473c862686dad6470d9cce3b7b63e740fa1de6252ebb5bd81cd00bee2d800d003a6464004763ce683ce9f1cbe1f1d3a67ea1d1a30b68edffba814708c7f9c63d0fafceaca31e6dc71e1f07daa82608c83819f7a1a11ce149238fd68d0a579ec682cfd27a7c3a86bd10bc38b3b756b8b93c1fe1a8c91f7381f7a034f752ea5aa5c5eb292f732128037619c018f6ec282e5a2cb047abda74d5ce9b6da80f136de4a496219b3e48c92000323ea73467519d3da5bb757dbda410ac90c77c23058f99007ee7ec31416882ee47d23acb5185caf8bab4691b1efe57fff0038a9457ee75a82f6e7429350466b482f2742c0f74241c80c38c64541a9cfa1e89ac0177d33ab3d8de28f2b5bca429f91140e2c7a9b5ae9fb85b6ea9b46b9b3c796fe040768f76ec0fafb1f9505df4ebdb3d4edd6e74db98ee216fe68ce47d280648f75e2485a44da385ddc13f4a025ddbdbea16a633286566ce55f9c8f6c502ad750db2c514f30dec428247e6340bbf04100b73402afb943ed2b9e30683836defe9403bc1e06734020e06280cafe8683a375941d841c77c1a0151b467b50159f00e4127e5402872371040c5046eb5aadbe9b1c02e2f6dad25b89047099c677b7b0140fe3f1010afc803f3018e68160c3041ee2823f5dba92d34db89a1d9e2843b03b6d05bd013560c1748d57aa2797c6b35bab78e6959dc47231580ff336dcfb03c1a58364b5bbb7d7fa7b7427f1f673830c8664285bd1815238fad20f2c7c41e979ba43aa2e2c1cb1b663bede438f3a13c7dc76fb5515e9065b851f7a02950002a09c51a1b83cf14176e90d3645e9ad7752752aac23b3439c066665c827e944d29a6410aea725c4567135bd840d3c88a723728c29c9efe6c50d3ee9545b0bf8ef2e6e3c2fc2c6f72f2920e5f19039ee4938a9a875d03278377acf52ddf867f036ef71923932bfe51fbd3475cdc369df0db4fb389d4ea37970fa9cc0b00511795ce7d4f181eb4cd2451755fc45ac16d637381b14ca36b641dfce723e4053170d6cb52bbb362f6d3cb19241f2b9029862f09f143549ba7e7d2eef6caf2797c66ee17fdfd69862d1a069da7dfdac579d17adcda5ea9e1a992376c4723e39e3b024fd7e94c458ac3e25dee8d31d3bae74e7b79002bf8b8549471db38f5f4ed4c165e943a06a328d4ba605b4b22a1523c420c64fbaf38a82d36f0ce7cf7463790729b53017e940e0b0ceceed8ce0500e1b70daa08f5c9ed41d271cd0132476e7d7ff00aa069797d2411168ed9a41fcc858211f73c5075acb25ca6fb82aa31e58a36c81f561dcd033d42169e158ac64b98151b3981c2966cf639f4a064c7a8ac55e4865b7d493701e1c8e52403ea3cbfda827e390ca3f2c914aa81991bd281cdacc2747215c60e0ee5c67e940cb51b0b2bcbd824bfb08ee1a252d1caea1821cfa67b1fa504982b2283ce08f518a08abb82f6dd0369a5662081e14ce40c7ae1b04fda82275cb0bfd4f4536f7114589a5412461f3e4ce4e0e060f63f6ab2893d3b4b5b5b78e22ed22aae3cc3cc7e64fad3449a22a461500007602a0cd7e3b74c26b5d2ad79147baf34eccca40e4a7f30ff3f6aba3cd0543267eb5427b86f1f4c76ef45d0eca1ad5ef224d13e1cf4fd9b22192fa67bc955f8c8c617fba9fb510d7a6ed3fd43a735e5b54964be658c048fb6cdd9e7eb8a186bac97d174e6d22e23437b7ac26b95e77c68bf950fa7279e2b22dba45b59e97a669fa4ea36aeff89cea9a90451fc355ff0096ad9f4ce3f41570675d4fa8c77da8de5cde5be26bc653171ca47dc1f6c9fed5562b97f70276808da7c24f0c1c63804e33fa8a2928c0e0383c8f7ed41d92a41393f4a2548595c2c37493db4cd04e8a08f139566edfef3445b6e7aeaf65d2df48ea2b11776ae02a93e564c772adef409f4ee8ba9a21d73a36fa579ad9f325afe599171ed9c30a960d5ba0fe2843abb47a6f510fc26a4c36890f9558fcc6783506a1147b510024e30339ce680d2c6ae9861eb9a009178a0205443b989e39cd01d8075e3047ce80563057ca381ed4011c4531e503d85013c91b804a21279c903341131cda8c3abdc8650f6d20c4321232adec3dc504bab2c113c9293bb1963df3408dd4b75e1efb2856463dbc43b4631fad047e9177ad4fe32ea16b1db4b8fe1aa92571f5f5a0916bc8e0895af5c46c17cd8c9ff7da80f6d736f7f6915c59cab35bc837238ed8a072a31c1ef4062870718a06f7702dc5b3c522ee4752ae0fa8230683c75d6ba3b74ef535fe984929149e4278ca9e47edfdab42058003763ed409f88ffd6dfad06b1f12ae612fa0c76e0b471e9916d23f973eb4158d3efeff004a984da5debc1295d8e4018dbf3145d583a2ad96f356bbd7f5d90dc59587f1e79a6392f28fcaa3ee47159444ea3aa5ddfc7acf50dcdc344d7a4dbc317f52641200f6000fdeb41b5ef51d8eab672ffa9e971c97c11638268e431a46000012a3b9a351567db823b11f3ef40948e428048207a8340ab48ae83cb83ee0f3428a982719edf3e68c9cc97d3fe15ad8c9be138f2bf38e7b8f6ef40f7a5f55bdd3f56b46d3649127f1405f08e7249c76f5fa50689d48ba5f545cdcbdb462cba9206411b2b055bb07d4fb1c73528d4fa8f52d62cf47b6b8d2e65fc458c49f8a818795c151939f977a823ba0fe253750eb7fe937b04293f9f6c90be41dbdc7ff006283473c1efc1a06f69776d73bbf0f2aca32572bc80470450284a46dfca19f819f5a04e799614def26c0bdce09cfd85045dc75769d12dc3c3e2491db0dd3c85195235f7c91cfd066ae0cdba9be31f4ec61a386c1ef9d4ee473e45cfb1cf34c101d3ff1ac9d481d46c628ed24751881880833f988e7b0fa5328dfed2f2def2ce2b9b79925b791772ca87208f7a60182ee2b95cc0c48f53823fbd40ac658b30f4f4a086d4ee1d75bb6b78f4e965596366fc5211b23238008fde81f43692da5bc30d97831a0397dc09e3d714087506bf61a2c4cd77324726d2caaec141f9fd2ae0c435bf8c57173ad7876f7a2daca10489121244cdf319ce3dbf5a834fe81f881a6f57bcb6ba7c53c72c11873e28cee1db391dbef4199ff00ea4348116a5a66a8a8a04aad04847a90723f6ad7d18c312ddc02a3815423ba0f63fa541687bd9efe1b533b3c9e0a78473e899e318a09bd0ba6eef543e3b2bd8e9b10064bd9e4da001dc81401aeeb29a984d0ba7d5e1d06d4e6594f06523bc8e7f5c0ac8af752dfc17d7090d9218ec6d9447129ee71fcc4fb9cd6842ab10dc0014f3e5a2c1704b671dfdc734525226dc939e283a362c7f940344a380393df144733e2276e38f5efcd01b4bbbfc3dda4a9298a44395902e4a9c70682660d4265d62de40b1bdc1545054f95c8fe627df141af7c3af8808f3dd68dd5d2a45765884b8908d8c3b6c27b7a77a945d7a5fa474bd2ba8e4d5748b28624955d5d8b13b79ee9e983d8d40a753758c7a46b96f6114725dc92279a2810b3a64f94900763cfafa503fd3b59b79ed84da34713c0cd890f0a158fa1f981de826e1b548959fc4dc5cee24b6467e59ed4101ff19e9f676baa5d6a72c50adb4ad1ac790ccc076200f7ad41e7df881d79a87576a5f87b0f161d381db1c2a36e7e6d8ff3416bf87ff082c6f208ef7a82f22b9761bd6d619785f6dc477fa53705ab57f83bd297ceb1e9caf67708db9c4526723e849e3e94f212dd25d117fd29a8c09a76b534fa39cf8b6b71ced38e36fb73417f52e64548e34007e673e9f21ef590a1c918c90718dc281a69b68f67118d9da5058b798f6fa7fe280daadd1b2d36eae70710c4d263df0a4d583cc7a668fd4bf11b5837d7c93dcd9a3146959822a0e781f4cfa55161e9dd7fa67a4f55b9e9aea3e9f81fc09ca0ba118998fcdb2338c7b528d39f4cd2ba76e2d357d292df4eb391809963420ce1b1b576fa1e7359119f1eb4e17dd033ca172d6b2a4df303383fdeb5c8f2eef3bce4e0e335684cb0c9f354160d36f64b0baf16072b91b5f03391f43c51aab23a5debe91c4fad4d73689e6fc3a290573ff4f03e59f4a3280d67581ce916567f84b58ce0a1fccec3d58fa9a084de08c90464e4d1a8e419059b201f4a05630a176918efc50176293872c17bf14042aa0125b03db14046c60b60123fde6827fa0c68edd5365ff11346ba6292ee64194240c807e59a32b7fc51bfe8bd5ed5db424860beb62b89218422ce09c11c01dbbd0660ae110bf1bf2154838dbebfefeb41a8f4cdac7f117458f4d9ecd2df53b4cf81a822808c47255c0f7c8e7fb54a2ec2cfabba3b4b4b8d3af12eedad40926b0f070a13f9b633649f7a82eba6ea4357d321d4ecad512daf20df26e016507fa4fbfaf3e98f9d067dd2bd2faac9aa4d72d72d1e9510ca46a7631c7a320e18f1dfd7bd059afb7da816d23de4ba5de211346a1e4785f190548e4648c63b64e6b43ce9d5baafe3b539c5b452dbda46c638a167cb281c73ee4ff9340e3a3fa5f5aea4ba58f4bb57dbfcf2b02a8bf7f7a0de3a5fa0b50d2a2d92eb3e048c0a97c867dbedcf6a944e5cf4f6b76d1b3d8ea42795066266c87c81c65b9cfaf15048e83af3cd64abac08edaf01546c38dae4e0657ee6826e5b892de3702292e2545ddb55700fd0fbfca81c4b3bc718716eef9eeaa402280d14ab3c0b2c65c06fe571823ed40df56b217fa6dd5ab9216689a33f2c8c558307e83b8d77a37aaa7d22f2512c28768800c9954671b3d33ebef568d0ef7a7749eb0b5bbbb162d657b32b46d2e1564c8ed9c5644d1b0b9bbd261d2a440af6cb0e2e5b1e7dbc1238e0f7a0375b696daa7496a3a4dac8a92cf078685b271db04d391e40d5ec4586a1716de2a49e0c8c85d3b120f715ba1899173ff305413070abd89cfe9f5a2d3ee9c8639fa874eb6b804c52dc46b20c9f302c3bd11e84d47e1af4d5dc6521d3e3b662c19a58721ff5a9a321f89bd27a374b456d158dccd34d333332c9b4b2afbe47a7cb1f7aa33d2bc0d8c0f1c8f6a2c14b6d501b39cf63450897380c319e3de8065031c038f7ed40d8faf1ce41e4d004876a8dc3cc7e743025c956c818028c904579e7f0e15695c9c0541924f6c00283d0bf07f42d6b48820b8d62d20b2b58d656404959e52f83c8ff00fcfafbd4a35bb06f12391a48dd55cee2b2f3818ed8f6a8158a159890f02242079147623e631c502b0db436d1ecb7458d4738038fb0a087d6eeb508f48bb7d32d95750752b6c26c905b3ddb6f61eb574794f5cb6b9d0fa9678b512b25d24bbe52b8c1638278fbd582c57ff12afaed45b5bc0d0d8a8c08a2731ee3eec5793f40450466a1d59af446293c186cd53ca0c36eab93dc649e49fbd048e89f1675ed35e301e293919dcbf9867b37cbe94a35fe94ea4d33aba6824306dc48015750d86c6e247b0cf63591a40b8dc23fc30f14138dcac3000f9d03687547f12e8dd5af816b13148dddbcd29039c0f6f6f7a0eb5d62caf5636825db70c9bc4328f0dc0271c8a090627d3073ce681acf6505ccf14d35bc2f2c2731bb28254fb8a075144a83ca806792400334049ee6281e2496408656d880ff0031f61fa50446bd76058ea1b9e21025a3bb48afe71df9c7b71de9c8f196a0de23ca7b827d4f7add117e0cbfd4b5059392369663ff004e71c51aa97e8f555eadd258f2bf8a889cff00dc28cbd0bf123a926e96d163bdb74490bca2321c678209ff001591e71eafd7a7d7ef45cde2c20aae144638033fb9ad2e1b5e69d058da431ccf21d4a5c3b4631b62523807feaf5c7a50222f2d648c25f5aeec8c2cd19dae3d3e87e944d3eb7e90d425b49ef2292de38224f1505c3f8724a9eeaa7bd0d57a60406059436306868a7803839c7ad1a158039c13f4a33a716767f8cb9b6b55e1ae2458813e9938cd07a9f42d0b4de99b4b7d1f41b58ff19b03c93ba06607fa8b1f5f619a5b8266d74a65d42da6ba90cce996dcdc8c9fff006a5a2c2635083b05ef83eb5028076341db4b1ed9f7a04651fc41db18ed419d75b744dbea335fcb0db0335f2057901c05da73c8f9d5d18a75174a3f4c47335e35da4ce418a489374254f707d463d33565d1529b569a489a17944b06ec8057d71dcd037b4b6b8bfba31584124b27e62a8a4f1ea68357f83da7ea5a76bfe0912453ccabb49194653cb60f6ce3dfda983d196cd108c2401711f9768e306b2297d73fc6d02773a8b591922693c5004bb9d72542fa2f6efde8314ff867aeeec27500b77bb5670e36ca19b1dff2e7f2fd2837ce8bd5dd348b78b552219022870d9c46e792a4f6c608a0b846c8e03232b29ec41cd0199f1410fd4b24b1e8f712c0a5e4452d851e6c639dbf3238a0afa42ba77475e4ba8470896681da45180b18da76af3c9029c8f26dc1df2b9c606e273e86b743331924f27f4a82c12280e59b008e79f6a2d4d74188ff00e30d203a82ad7519c1ff00b860d11ba7c5e86c9fa3afae6f4091e043e021270b21e01c7dcd6479ab4dd3aeb56be4b7b184cf2b301b57d07bfd2b4bad0fe25e9f6960ba7c7a55ac50cd750335ccaade7723b83b8f6e38a2207a5ba4e7ea3d93780cb616ca53781f99fbff009a0b675a5be9765d43a75a6ad3b25adb4185429b831c70303dfdfd2831eb8954ca48f3827819c71ed406b2b1b9bf9a5fc1c4ce2253238047957dc9345d122b792eee522811a495ce1157b93ed444ff0049f476b1aaf51c761345269d25be269259570c833c6077249e062a68f53e8ef0da69509d4ae225b92a04af232ab16f98cf1f4a5a266d4dbca8af13a329ecca723f51502d14f0cb9f05d1c8ee01c91f6a0393b4edfe63c8a031608859b38f97340d84d04e5846eae50f9829ce3eb400fb24466041f5e3d2823f56d22db57b192d6e61468a41c823ff0035651916bbf04ada7badda5cad6d1b72c09dc33f2a6875d25f0865d06fe2bc6d4c4d3282026cca8cfafcfd29a34cd234a10c768f711a78f1bb392a3001208e3ec69a26a58d640c832091c90706a084ea1d3eeafdadf4f86da3166c0b4b397c18f046140f5ce4d04f4702436e91c28a9122e028ed8a0a9f5a5b6a09a1bc5a135bc72cce048b3c5bc15c638f9d59043fc2db997481aa69dae49e1cb6bb643239211939e467818f97bd305965ebce9a10bc8da9dbaa2679dd9ce3d8530572cfac87566ab05ae9f1490692b9696e1f833738555f96793504df5f25945d2576b7ec16dc46792381c7b7ad5e60f234980e42f6c9c56a82ec3eff00bd4124e49700f1c646e3cd169ce9575f83d52cee324347323f6e3861ff008a23d47d4ba6a75074fdcd8ef317e2e2ff0098bdd4706a60c3f4ae8cd5f44eb8fc3e97248a638cbc73bf90483d463b373e9574685abf42a6b5649fea72bbdeac4a8d3b018cfae31f7a6895b6b29b41d30d8e9f6bbed9213e1b7a994e724fcbb5064bd7835a9752d3af75d8116354778f660788cbd9483dbb0a0cd20b2b8d43528ad2088bdcccf854039cff00e2827a0d34e9da1de896f2182492efc0976f998aa827d3d334113a74aa9a9298628e74570478bc0c7cf1da83724bb8246d3e6416b0384da61b5501c9f5c3704f152c037561a95f5fce61d3ad6db4ab950f34b331dd9f4191db8fdcd406d67a675ab4b6d325d1af248272a43430315ddec7038f6ad4b3f448bf47eb71cb69abddebf21d5e26896203846c30c8603b9c6452d9835901405660376319ac84bf13180779d8bb82827d4fb0a06f777367a75acd7170f1430a9f331200cfceae061a0cf6dac692d7365266191db0578f5edf3a6075a6c9278b3433188a467860d96fbd40fe540471409aa0c1140750001ed8ed4058e15133c983960077edf6a06faade5c5b7822d2d926766cb967da2341dd8f0727d85033d27597d62e2ee3163756915bbf8799d71e2f19dcbf2a092b88dd9a311950a0e5b70ce47fe6ac18af53f5b69da9752dd69da9ca906876e24465d9e69881c6ff005c679c0aa2bfd267a347512c93dbb5d42d90d3c800b68c9ce0ec3cfa528db74ad034db5905ee8be1ac728dc153984f3f980f4fb56453be2de8f647a6aff53796596f0aed46798ec033ce149c0fb0ad71479c9bb9dc3bf3c55a0b95f65a825150b481a407b93c0fda8a29c06671dc93803bd131eafd0af6dffe18d2ee25982a4b04603b7a9c631fad03bbe586381bc5945b96385718c827db3eb5288eb8ba934eb15fc3c535f05427796dcccdec7150637d5bd55d5362b7975aa4d0d919018adec8637807bb60723000e4f7cd58203538aefa8aeb478a7b9beba924547b8774cf8608036a80704639cf1f9855d1a7f4c68b67a03de5e5d59dad8d988c62e1c0f107a1e7fdf7a082ea6d07a6e3e99375a7cb6b3db093c727701e2360f7f53dfb50653d4130d42ee18f48b3f0232a15218936963ebf5fbd06dbf0cfa74855b9d46e04b730c6144691e12307d33ea7de8348ba6b5478a279a004f98c479247b81f5a9438805ac0be2e02e73c9ef8fbd40c2346d43578eefc40da7da1dc8b8eefea4fcb9fef419beabf12a4bcebcb2d2fa7ee0dc58492084b30236bb6467dce383f6a0b87556a67a7f4d95a0bbb5468816f0a69c78b2e072572719ce78357079dfab3af2e7a92c963b88d94abbbf91cedc93edf418aa2c5f0dbe2a6a9a0c90d8de34773a6a8da1186d6403fa48fec682d9adeb7a9b4c9d572dacc9a6c9700456e5ca910e000ecbd8e580352fb1ae7476bd6dd49a325e5a9f3025245fe961dea097523cc0919a032af039a006936c81423104649c703ef40dcce64bc3035a87b6f0c378f9fe7cf2b8fdf340a4b6e25962915d94a67807839f7a043586922b5636ec44c061063f31f6ab079d7fe19b7eb2d4efeef55d5d74f992e9a0fc3a441dcb13927b838c9aa2d4bf042c618e178efee6e18104870172318edf5c1e6945bbe1a748ea7d2315edbea3a99bcb190030c401010e4e783ee0fa56455be3d6b90c1a6268d69e17f1486900ee98ec29ccc183119419e7e55ba11f089f523ef5058363a8059fb8e31e9421b491056c01819e28d3d0ff07eea3d53a1e3b6b8db235aca63c139c0eea68ca47a9fa6ef757b83ff00bf68ad428c2f248c7a8f9fcea518df516adac74e7544f63a2ea172f1800291e6cee19ec78cd5826344e85b6bad25ba8fade5b99dae0ee11efc71e858f7e7d054a2d7d39a75ae8f7b6b00b8917f1516624b78429da327cec493db1db1d8540cf4aea28f58d6aeae2f6dd64b498082d880488d149fcea7d4939ab04175e6850a8d32de3b78e380c8de32c4db4e18e430fef543cf86fd0d691b4fabdf6648b3b2db69ce7dd87be68342d2f4fb9b5b891af1a28a2dc05bc5036d001e0eef7352884b961a2ea9aa7555c885e08d45b5bc52b61b686c120fb939fb541276bd4b61d53624d942e2f6200bc32290633e99f4233416dd3ad3f0d611c0c77b632e71dc9ef41156dd27a45addcb3dbd9c513b1dd941821bdc7b558333b9f873757fd69a85e3f813e9c7723b5d93265d872473c11544a68ff08fa75e290b42ec4e4124e70738fa5048e89f0f745d2aeadd2decedda6525c975121183c77f7a945c754d0e0d563682ed43425369403bff00bcd58308ba7d5fe13f5a05889974a9d8b46aede4914f707d88ff001528ddf4fd7edb54d1a1d56c312dab2e64dbc9418e78f5c541296d70b716d1cd6f8789977230ecc280cb7519b816f212b205de4e0843ce300f6cfcb39a0545c42cee88e0b458ddec33ee680eac92266360debc7b5056fad2d354b9b189745744be121daf27e550548ce3d4d58324d07a725e98ea2b7ff5381f5169a7579d021fe13904ee43ddfbe49038ab46e76cf05cc714f6d309232a4a98ce54fd6b2196bb7f2e9b631b2c427b891b6851db3eff002007341e5bf887aa2ea3d4f77378be381e42fdb711ed5a1554395caf1cd07617dcd04fc85402101da791421b49920331381c60d1a69bf02f56f03a925b12c162b98c955f775e47df19a32d99b518268e4491668704a79d4aeec7b7bd4a30feb7e9144d76e265697c3e2693631674273803e556087d76f35fd49859e9925ccf611141106f2e182e3241f727f5a94681a268f79ad1b1b8b9dd66b1c2b1ce9bb06361c1e7bf3fe6a096b0d3ba57488e485b52b40909c386901607d47bf7a0ae758eb69ac4d15be81a748f0a9c35cc90b2eff4c03c1c638a0b77405c5d5d45f87be5fe359a88b81b401dc1c7d38fb50586fed18ea3015790091591e447c1518c8c7a0a0a5754d8c9d49a8d9f4ee9dba0b3b5224b9692327728f627e7c6682f9a7e996b6b3a8b6b748a348820c7720761412c064e3041ce282b5d4bd73d3bd3f33daea97ac2e540dd0a292dc8cd043c1f15ba2a7923b65bb910371b9a12141f9d02edf13ba2ade56857551e5e77244c54fd0e280746ebfe99bbbd655d56dcdc9ce08465565f4ee3bfca82d53eb3a6dac3e25c5f5ba646402e33fa77a0aff5b74ad8757e9ca972844aa37c520fcca7d3f5ab067bd369a8f467544d626c98e9f7118f0200e4465c903049c8c9e6ad1b24334b6fa6249716cab20037c309dd83db03b5640dddac3764a4f02cb1103863919fa7a1a06d6f600c37162911b7b252b87dc773f1927393f4a079f868edae1ae6328a8b1ed38e30050226e85d5dc1f879011b3c47c2f604719f9d01eff4f4b83e3c6b18bb452b1cac9b8a83de80b16e8208a3b7b58e1407cc061427cc0ff1560ce7a8f592d69a97504cad2dac01a2b53900c3e9e51ea58f727d0551e73bfb86b99a49a46dcf21c96340dc13804f20f6f9501c0e3b8a0963316fcc4607007f57bd084d64dec01200ce483468ff0040d525d1755b4d4206ff0095207c11dc67ff0019a18f56584f6daad9dade4211e39104a8ded9152b235cd8c530613229c8c1c8ef50472e81690ee00322b0c100f0debdbb7ca8111ace856371358cba85aa5cc407891ccf83f2ef4048b4ad2e59bf116769672c72f99dd1437239078e2824a4d3e1b94559234110e781839fa0a0561b38ad532a12319c86c6307e740a9732a3a00cac870cd8e0faf0681be8b6db965bb909df3c85806eeabced5a09523647e6e0fef419a6adf116daf7ac34be9dd1da686e7f1ca2e243b76320ce57df9ff1560cc3e3f470ff00c78255b842b35bc6c4af9b6e323d3e95467b6365f8dbcf062beb68c119595d8aaff6e282422e9899b4f6bb5d46cda2562a76316c1078f4a0859e1b9b762c0bf94f0e84feb4125a57505c58ea70dd5d0174a986d92b1c13f6f5a0de7a5be366877260b5d42dee2d2423124a487507ebdf15289dd3fac7a7bab6feded74d61733473acdb5a162142ff00313d81ed505fa58fc6d809380c1b9f5c502e0e05040ea367a85dea454de2ff00a610375b04c16c7a16ef8340b5f6930dce9375636acf6a278f04c5dd4f1dbf4a084e91d06f3a52dee62bbd4a2b882494ced3c8a448063b63b638fde803ab7ae749b2b3096d792c93c8c109b55dcd18ce3710473ffdd043dc758dc5869044565aa5dda4c3c2b7bc78c1f14e3963db03e7c0ab066bf1327d41ba76ca6bc48ecad24c456f6b0c87cf8e4bbfa138c0fa9aa3297c83dd4e28395811cf2680a5b93c7ed413cd1ff0f3c797b8031406645236b0508406f30e68ba49c051b97d0e0e7d28ad57e19f575c5be8f269515dac772877c11bc464dea7ba8c739ce78f9d3193bb8ebfea2bcbd6b5b6b8b58bb7f13c2f0ce31cf0deb4c0f2dbad6d743d2ee99efae752d6c02a86e0054524f6383c7ff94c0b6af274c75149a46a5a82c46f1e1479fc3190bd8156fbe7f4a960bf74e9d253f1167a3ac09e0856610e3041ec7f6c540f67b892cee7f8d18368232ef2af2508c7047cf340ead5bf130accc9b1186541e723d09ffc5033bbb1b82d74d6b37f1244daa1b38073df3f4a08eeb1d3b50d4fa6a5b4d32f12cef1902ee73e523d476fde8306eb0d3fabfa4ba92c278af67bb7281606472f90bdd58558253a6afb40ea1d62283a8b461a66a6f931cf6a7c2466f7cfb939e7b5515fbed3747b5eb8f06eb78d35080a2ec9719c76f98049a0b4ebdd37d1bad869acbf0b03c5c16b29444adf50ded41995f68564a263a66b31cd02be152505493f51c1a088bab69ad1bc179e320f07c37c8a0692b46c4995f0381db39a0b2fc34e971d57d4705bc8db6c50ef9dd97b81fcbf7381528f5ae97a1d8e996d1db69b0c7648855b10a81b80f43c739c54134147b9a036063279fb5046e957726a0f2cfe04915b06db1788305ffeac7a0a00d72f8d9c491c06337533050ac7185cf2df6a06da2da4293488f34973328c34aea428c9ec3eded40ee7d2ad249448f6b133820ee2833df3fde819ea96897461b05b87815f2ee919e5d47704fa039ab079b3e326b70eafd4ef6d6650d8e9ebf868b69c8247723efebf2aa280eb9193ebedc5002a124e015340018fb8fde82cf32b1603d0678cd02406dce3008e47ce81b499c331383c9c9f5a2e9c69377369f7d6f796a4acf148acb83fb511e91b3b3d0bab745b7d45acedd8e3732b71b1fd73f7a5a19eafd09a56a0a96b1c705b49c48510761ce4fcfbd4d0d752826b2b583476fc3daacb295b79d768de8a32b1e71f989e49f6a7d14dd1af5ba275a45b8b093c054492ea769092373765c1da4679fbd306e36ba9595fe9f0dcdbcc92c33e1579cf27d0d409ea178f68521b6b76926ee8a7853f7ff140bc768d78f6f73748d1cd103b543f0091cf6efc502f7319dac194371d8b6326829f0c501d7ae6fa568d5d4942c806d4db81839f53c8cd59456fae6e628749b5bab8b1865b08e4726588ec11e7f2e49071c93da9a31dd4341d675e9a5bad374f9858162d0b4ac70e18f0573df35a0c759f87bd53a404f174f965dfff00f479b1ef570576e34bd4b4cc0bdb3b9b7258a00e846e3f2a94376475cee4914af7ca9150685f09ba61efb52fc7dd69bf8eb7c158d1d0b47bb38f37efde968d6eeb4eb5e91d6ad25b660aee59974db6881690918e31ce39279e062a5a34bb57b88adedd1e379679065d80036679e6a07e8391bce7e940c659ef5afe1286de3b16f2b8903094b7b2fa7ce81eb380c4260ed193f2a0cd6fa5d4a4ea0fc7bdadcce923158a3039db83c038e3ef41a0e96b2ad8a35e009291b8a939d9f227e43bd590436bbd6fa269202c974b7123602c76e779624e00e29833bf897d493e896525dbcb2a6b5a9c3e1456b91b6d60cf989c7f31f7a60c02490961ebcf3eb541308e39e067b507007b96007a67fb50178f97eb4165ce18165c2927b773fad023202d9c8dbb7818ff003408300b87f2f1c107d0d0c15a4f2e339c90467f6a18bdfc2cea8ff4bd561b4b9ba686d6e64552c4f954e7d7e46a60f4688d240af1b2bc6cbf5047ca960617ba658de1b792f2d94a5ab33461b18524633fa1a81b5c8b5168967369d23c0e0a24622dc981d81c76aba29df0bb48d660d52fceb88d069f04aeb69130037127f37b9c0ed9a8350781240bbc06da72323b1f7a0eb8816e633192ebc8c9472a78fa50349b4c83c068e24f0ddbcc1c13b837be4d055b57e98b996d4db5b4a893dc1e6620b6ccf2c467efc504ce97a38d3f4d874bf09af6d46e2f25cb82724e791db15650a43f878b51fc34f3da8f132b6d6a98c80a39ff007e99aba249631b58b9047239ec3e55368aeeb7d2da6f52c0eb7f16e87f2c6e836ba90724ab7a67b55d115ac7c3e8aed2182def4c56a14096368959a423d77e3229a27b41e9d8343b01069c8a8dc9660aa3713df3c64d4a1c695d3d6b67a8cba94b9b8d4e61869e4e4a8c636a7f4afcaa09a485519caae19b966f7a0435196582c656b74df3e308beec7b50629375775b691ac5bdb6b16d6378779f019b00a31cf391c9c2f1daae0b35ef52f5374de88d77aa45a6cd25ddc0108694ee2188c28007603d6a0d16c92430a4b2ed3230dc401855cfa0a0a07c45d7b5db9d462e9ee960b14b2ee134ef8c850012147ec78ab0670b643a2efae753d72686e6e2da211db42176079c8e768f65e39f7aa332d6f58bbd635096f6fe6692695b24f603d801e82823cb900ee00e68006460051dfd680ed9f0c905b713d8d006d5f5419fa505a18f94e40501b1b81a04186d62402c87be3d6810b81290aea8467201231cd1749dbc437f9f1e201db3de8ba07dc0175c027f28a335b17c26f888d6b6d0e8fabf892a29c453b1e547f49f7a946d6424f08236491c833ee0835073294888894120700f0280813c40a6711bc8843e00fca7d3ef40e41dc081f9a811681c6f7565329185623b7e9de812b3bcf11ff0b74563bd50494cf120071b97e5fda80d7577046c9019d5669dbc340324eec67fb734103d5da96bf67a7cf0e916f6e2765f25ddc4c11107ab1c8c647cce2816d3ec7f0f6564cae6e67da375e6d52cc4af2e4fb13ed4145f899d47b3499f4bb6d46cda49b69b92921565c3648e3dd40c81cd5c0ae89f13ec246d3e379ed2d6da180b5d34849da1780b128e49271c9f4a60ba685d5fa36bc42d95c324ec7090cc9b1d87b81ed50588958977cacaaa3b9341c655f12348d1dcb8dc1946540f99a019e2134454eeda7bed3839cd052fe2136b536b5d3563a1ca53c49da4b9507198940ce7e5c9fbe281c6b7a974cf4ee4ea7242d76dc784a3c595b3e9b464e3f6ad0ac745ccbd4fadcbabea42da56959a382ce7460d6b1a93c01f97272093ebf6a82f1ad6af0e9da5cb3cecf6902216919f82aa3818c7a9f4c530649a9f5269ba7429d472239bc991a1b0d3c3152880f0f23039e7bf3de90635ab6a377aa5ebdcdecef2c9239e59f3827e5ed54302195fcc38cd01245395c1f5f4a05b606538e483c501b6939e3b5077860f3914165754c33e549000dbe87de813b820c27fa7baafb8a04a69c98e281e42618c795338033df1f3a06c03e4e029247007ad010093c35674da71f977640340081a190658e41c820f141b0fc33f8926c218b4ed609366a02249bb2d19ce3ea4528dbece68eead926b7916689c643a9e0d643387521fea2f693c2d6efc786ee46d9bfed3eff2a04669edf5295ff057a60bd865309246d3bbbedc1efef41d63a8dec9ab4fa7dd4510fc3c69234ca186e2d9c003b7a67bd034bad0a5bb96e25d575267889cc1b54446d9bd0a37bfbfbd02925945a72cba8dddc48b3f87b1e58f23c623f292bdb7fa7cf38a0a5750f54ebba56a9a67fc516b6d6fd3970ea9234677c8dc7f38f6e4640ce282d1ac4b16bfa72c1d2bad430cd1ba822061865f5007d3daac19cf547c189357d561bbd3eee683c62cd786e9b73337b8c7bd512bd39f06adedec2de0d5ae639da372e6485363107f97767b505cee755d03a5e58ac228659af123184b7b733322e38c91dbf5a943ab3d52e64b49ee755d2e64950e238e35f10c884e17cbe87dc540e6d7509a4f110e9f7566a471712850abf6ce463e6280bacea36fd33a4497f773cf32c698dcc4beee33938edc7ad05534aea683ae61d64c4d2a69b6b88d16d5ca5c303f3e386cf61db140e27b5e99e96b64bdd562b6b30aa36c6c37cac7dc9eec6b42c1a66a962fa70beb6b516d0cbe76322f86c78f6c66831bf8b5d5d2dfa35a5dce60b1933b6ce3c788769f2b331ec1b8fd2831b79649984b239773c1dc68129725c1c640e73400ec781d8fb1a03c4a85d0c8582640257bd01e51fc42236263c9c67be280429c6037eb405dbf5fd682c2a0bb976cf07d3fc5009279ef8ec4e68193a9902b28e7dc71fb501d95b098e0f6dd9e0d0049131019b047b8390281bb292484e47c8500c4f242c3076bf704704739a0be7c3febfbae9a5daf23cd017c7e19fb107bb67d0f6fd6837cd2757d1fab34f4f05e37dde630b1c3a91edf4f7159103d6eb7da65fdbdf59dadb5e2460ac876ed9e1c8c060f9efe9c8a0a75cfc42d5742d2ee5a7e9dbb494b6d6b9bc930cce4f940e3cd81ed4160e98f88315e689fff0022b57664199cc5196f0c7a164ef8f98cd0589baffa68590985eb15c0db1985839f6c2919340b69d03f5285bdd6f4bf021424db4329cb153fccc3d09c76a090d3340d2f479a7bab3b38e2924e5e451cfd280d7dafe936f6c5e4bd89813b02a36589ce318a0358dc35cc4e17f9bf234cdbb78fa0c607a7340e6cec20b1596610c6934b8323226379edda81da8dcb9ec40a042f50b5bb21645473b58b11dbd7bfca8304f8add5d67a9ea8ba5d8ea72c1a4d8a952f10f2c920e368cf71e99fad5833dd0754d6ed66bdb2e9a91a5babb2a310465a57c1ddc1038e7bd5171d3748b8d46ee1ff005298dc6a764c27d4eeaee7fe1c01795881c9e7804fe940dbe287c4b6d75a1b1d1c986d62277c91bf131f4c0f6fad0663737135d3b497124924871f98e7803007d2811dc5b83903dc0a0333f03be7de8122df2c9a05a11e5f51f7a05ce7071804fca8033e5da0734020b0183bb23e5416269577ed0e5323078ceeefdff6a03dbcd62914c2f629a47c622689800879e4fbd046f9d8a2a03e31385c0e73da8b83ca590947dcaead8208e73da8849b3e19ce704f7c5015586d006431f5cf61f3a04ee586ff002481c8fe6191408f0011eb8e30682774dea9bbb5784492ca6385832e1ca95e3d2834be9df8c312e2db5eb4375080337000f1303d18763591a469baef4d755989ec6f6dae5a23e20b599406dd8e080ddbed41272f4dd8caf1c86d163910f9595882a3d718a035edd695d3b6a926b57d0ac65b10b4e06eedd863bf141077fd7af2782bd3fa26a1a8891d57c630948c0279393dcd04cf5875258f4de9f0cb7b7b6d66d2b81ba752d85f5214724fed41036bd79d2fe319d7a8f4b9c81e58de2f04827b9ce09a07a3acecf54b790685ace8697606009e52c377b7f2e682b097d7d36acf0f55df5edbdc0977412468cb6ce3be10af3c63b9c8a0b0751f505be9690dd5d752436f62a3fe4c6448f3b7b0c64e38f615734651f107e3045ac42b67a7693018633b965bc1bc838ee173807bf7cd33065baaeb1a95f2c11dfcd2bc51fe48880aa3e8a062a8b059f595df4ae9a74de9e9ec499d43c97b1427c6e47e525bb63e4282ad3ea3712893c599dbc4259c1627713c927de81043950df97db1406da8411c92063be280230839627078e79a0390a71b5bb5003a8c1232338e4507025573e9fbd02a0e41dc0e680c3691cf714053bb34160895dc16f291d98d02322aa39f3e14707ffaa06f202a5bb0c7201f4a343aca51090497efdfbfce89840c8db8e46573923ff14410b00490d9f5c1a0425dd8ce4673e873cd0265e4dbe7041ed814009b8cbb8e5863bd07163b7716e0607b6698060b96b7b9478dc8643918247ee39a60b7e97f133a8b4e0c63d4ee597380923970a3ef4c0e13e25dfcfab457ba95bdbddb212016501867b9cfbfda982f907c74b282da34874a9048aa479c83838edc62982b7ac7c42d235cd67f15ac5b40c366418a2cb0c1c81e6f5e31db14c160d035de8cd4a3f18ea96562cc37359dfe9cac887fef039fd6b39446f56ea5d13a9dca4579a922496b1975b8d22dfc3566cf9557230703be715ac1431d4d2275325d7fae6b4f6f182a93ef1e32a9f41938f6a60afeb1a95c5fea53dccf772cf2c8c489240031f627e7565c0d67bbf160487c1801073bc0c31f91f953420f2bc8c7c52cc540032738a809905c0f4fa501940208e73df34028e703938a0577ae013f4a001300db4f03b71407461ce0502dca8c9c7dcf6a003fafcbdcd0070bc1e0fd734070db467b8a04cb9c9e68274b93bcb1daa40200ed4099765249ec476cf340849b8b264823bf34689ee009cb671df1409bc8e8b8e770e3ec68984d9c953cf97be2860b248caaebc107dc67f7a184c31232db88fd451031ce50e76039f5c8045026efb8f93279e0fd680b239504f0483d88ef409ee25bb90c79c0e050151c6e21b39ce783eb40adbcc2cefa17bdb61322387781c950e3dbdf9c8a066f28790b22e013db3dbef54726081e63c6460d34191b1bb0720f634060e7600412c781502409c8e3d7b500ed71dbef8ed40243f181c0a02e5d4e0fad006f644e4819e3b501f7e3049e7b501bc43b4e391da80558003392d40a23305e320d02e64cf998e1bf5a032b0c927b8e68049c8c8e71c6280377043118f4e680bbff00de0504ddbb3128371c1c64668024e59f3cd02521254e4fad1a2107e48fe6a6809ddb9e78a029e1463d05027ffc744a6c3857c7b1a205ff00e637fbf4a02b12b1794e39f4a02024e7249ed409924720906800005173fd7404989698ee39e4f7a04cf723d07a501fff0097ed406ffe36a018ff00281e99a037f4d0731f3bfd28007e53400ff99a810248c0cf140bc60123233cff008a0557f9beb4056eff007a07109243e79a03778b27bfbd02b128c27039a054001b818a06609de793da815006070283ffd9}\par}
+}
diff --git a/test/rtf/link.native b/test/rtf/link.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/link.native
@@ -0,0 +1,9 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Para
+      [ Link
+          ( "" , [] , [] )
+          [ Str "pandoc" ]
+          ( "http://pandoc.org" , "" )
+      ]
+  ]
diff --git a/test/rtf/link.rtf b/test/rtf/link.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/link.rtf
@@ -0,0 +1,7 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 \fmodern Courier;}}
+{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
+\widowctrl\hyphauto
+
+{\pard \ql \f0 \sa180 \li0 \fi0 {\field{\*\fldinst{HYPERLINK "http://pandoc.org"}}{\fldrslt{pandoc}}}
+\par}
+}
diff --git a/test/rtf/list_complex.native b/test/rtf/list_complex.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/list_complex.native
@@ -0,0 +1,64 @@
+Pandoc
+  Meta
+    { unMeta =
+        fromList
+          [ ( "author"
+            , MetaInlines [ Str "Cynthia" , Space , Str "Johnson" ]
+            )
+          , ( "operator"
+            , MetaInlines [ Str "John" , Space , Str "MacFarlane" ]
+            )
+          , ( "title"
+            , MetaInlines
+                [ Str "Text"
+                , Space
+                , Str "before"
+                , Space
+                , Str "list"
+                ]
+            )
+          ]
+    }
+  [ OrderedList
+      ( 1 , Decimal , Period )
+      [ [ Para [ Str "One" ] ]
+      , [ Para [ Str "Two" ]
+        , OrderedList
+            ( 1 , LowerAlpha , Period )
+            [ [ Para [ Str "Three" ] ]
+            , [ Para [ Str "Four" ]
+              , OrderedList
+                  ( 1 , LowerRoman , Period )
+                  [ [ Para [ Str "Five" ] ]
+                  , [ Para [ Str "Six" ]
+                    , OrderedList
+                        ( 1 , UpperAlpha , Period )
+                        [ [ Para [ Str "Seven" ] ]
+                        , [ Para [ Str "Eight" ]
+                          , OrderedList
+                              ( 1 , UpperRoman , Period )
+                              [ [ Para [ Str "Nine" ] ]
+                              , [ Para [ Str "Ten" ]
+                                , BulletList
+                                    [ [ Para [ Str "Eleven" ] ]
+                                    , [ Para [ Str "Twelve" ] ]
+                                    ]
+                                ]
+                              ]
+                          ]
+                        ]
+                    ]
+                  ]
+              ]
+            ]
+        ]
+      ]
+  , Para
+      [ Str "Out" , Space , Str "of" , Space , Str "list!" ]
+  , Para [ Str "Start" , Space , Str "with" ]
+  , OrderedList
+      ( 7 , Decimal , Period )
+      [ [ Para [ Str "Seven" , Space , Str "Start" ] ]
+      , [ Para [ Str "Eight" , Space , Str "Continue" ] ]
+      ]
+  ]
diff --git a/test/rtf/list_complex.rtf b/test/rtf/list_complex.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/list_complex.rtf
@@ -0,0 +1,299 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff45\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}
+{\f3\fbidi \fdecor\fcharset2\fprq2{\*\panose 00000000000000000000}Symbol;}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f45\fbidi \fnil\fcharset0\fprq2{\*\panose 00000000000000000000}Times;}
+{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f52\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\f53\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f55\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f56\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f57\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f58\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f59\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f60\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f72\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}
+{\f73\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f75\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f76\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f77\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}
+{\f78\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f79\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f80\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f392\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}
+{\f393\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f395\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f396\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f399\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}
+{\f400\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f502\fbidi \fnil\fcharset238\fprq2 Times CE;}{\f503\fbidi \fnil\fcharset204\fprq2 Times Cyr;}{\f505\fbidi \fnil\fcharset161\fprq2 Times Greek;}
+{\f506\fbidi \fnil\fcharset162\fprq2 Times Tur;}{\f509\fbidi \fnil\fcharset186\fprq2 Times Baltic;}{\f510\fbidi \fnil\fcharset163\fprq2 Times (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}
+{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}
+{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
+{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
+\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}{\*\defchp \fs24\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af45\afs24\alang1025 \ltrch\fcs0 
+\fs24\lang1033\langfe1033\loch\f45\hich\af45\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 
+\snext11 \ssemihidden \sunhideused Normal Table;}}{\*\listtable{\list\listtemplateid2032649{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 _;}{\levelnumbers;}
+\fs28\cf0\loch\af3\hich\af3\dbch\af0\fbias0\hres0\chhres0 \fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'04\'00.\'01.;}{\levelnumbers\'01\'03;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-432\li792\jclisttab\tx792\lin792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'06\'00.\'01.\'02.;}{\levelnumbers\'01\'03\'05;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-504\li1224\jclisttab\tx1440\lin1224 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'08\'00.\'01.\'02.\'03.;}{\levelnumbers
+\'01\'03\'05\'07;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-648\li1728\jclisttab\tx2160\lin1728 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'0a\'00.\'01.\'02.\'03.\'04.;}{\levelnumbers\'01\'03\'05\'07\'09;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-792\li2232\jclisttab\tx2520\lin2232 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'0c\'00.\'01.\'02.\'03.\'04.\'05.;}{\levelnumbers\'01\'03\'05\'07\'09\'0b;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-936\li2736\jclisttab\tx3240\lin2736 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'0e\'00.\'01.\'02.\'03.\'04.\'05.\'06.;}{\levelnumbers\'01\'03\'05\'07\'09\'0b\'0d;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-1080\li3240\jclisttab\tx3600\lin3240 }{\listlevel\levelnfc0\levelnfcn0\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'10\'00.\'01.\'02.\'03.\'04.\'05.\'06.\'07.;}{\levelnumbers\'01\'03\'05\'07\'09\'0b\'0d\'0f;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-1224\li3744\jclisttab\tx4320\lin3744 }
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'12\'00.\'01.\'02.\'03.\'04.\'05.\'06.\'07.\'08.;}{\levelnumbers\'01\'03\'05\'07\'09\'0b\'0d\'0f\'11;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\hres0\chhres0 \fi-1440\li4320\jclisttab\tx4680\lin4320 }{\listname ;}\listid161162663}{\list\listtemplateid-1055851588{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }
+{\listlevel\levelnfc1\levelnfcn1\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace540\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li3420\lin3420 }{\listlevel\levelnfc23\levelnfcn23
+\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li4500\lin4500 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid180975272}{\list\listtemplateid-1055851588\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698703\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
+\leveltemplateid67698709\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc1\levelnfcn1\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace540\levelindent0{\leveltext
+\leveltemplateid67698707\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li3420\lin3420 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li4500\lin4500 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698703
+\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698713
+\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698715
+\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid581336416}{\list\listtemplateid-1516889114\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid592708402}{\list\listtemplateid353931476{\listlevel\levelnfc0\levelnfcn0
+\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'02\'03.;}{\levelnumbers
+\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc1\levelnfcn1\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace540\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\hres0\chhres0 \fi-180\li3420\lin3420 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid621182402}{\list\listtemplateid-37037068{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid982349901}{\list\listtemplateid-2094603378{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid1082678316}{\list\listtemplateid166376406\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0
+\leveljcn0\levelfollow0\levelstartat7\levelspace0\levelindent0{\leveltext\leveltemplateid-1898031884\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2
+\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid1306352145}
+{\list\listtemplateid2032649{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li360\jclisttab\tx360\lin360 }
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'04\'00.\'01.;}{\levelnumbers\'01\'03;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-432\li792\jclisttab\tx792\lin792 }{\listlevel
+\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'06\'00.\'01.\'02.;}{\levelnumbers\'01\'03\'05;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-504\li1224\jclisttab\tx1440\lin1224 }{\listlevel
+\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'08\'00.\'01.\'02.\'03.;}{\levelnumbers\'01\'03\'05\'07;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-648\li1728\jclisttab\tx2160\lin1728 }
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'0a\'00.\'01.\'02.\'03.\'04.;}{\levelnumbers\'01\'03\'05\'07\'09;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-792\li2232
+\jclisttab\tx2520\lin2232 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'0c\'00.\'01.\'02.\'03.\'04.\'05.;}{\levelnumbers\'01\'03\'05\'07\'09\'0b;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\hres0\chhres0 \fi-936\li2736\jclisttab\tx3240\lin2736 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'0e\'00.\'01.\'02.\'03.\'04.\'05.\'06.;}{\levelnumbers\'01\'03\'05\'07\'09\'0b\'0d;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-1080\li3240\jclisttab\tx3600\lin3240 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'10\'00.\'01.\'02.\'03.\'04.\'05.\'06.\'07.;}{\levelnumbers\'01\'03\'05\'07\'09\'0b\'0d\'0f;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-1224\li3744\jclisttab\tx4320\lin3744 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\'12\'00.\'01.\'02.\'03.\'04.\'05.\'06.\'07.\'08.;}{\levelnumbers\'01\'03\'05\'07\'09\'0b\'0d\'0f\'11;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-1440\li4320\jclisttab\tx4680\lin4320 }{\listname 
+;}\listid1517575639}{\list\listtemplateid-2069710980{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0\hres0\chhres0 
+\fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel
+\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }
+{\listname ;}\listid1762801537}}{\*\listoverridetable{\listoverride\listid1517575639\listoverridecount0\ls1}{\listoverride\listid161162663\listoverridecount0\ls2}{\listoverride\listid581336416\listoverridecount0\ls3}{\listoverride\listid1082678316
+\listoverridecount0\ls4}{\listoverride\listid1762801537\listoverridecount0\ls5}{\listoverride\listid621182402\listoverridecount0\ls6}{\listoverride\listid592708402\listoverridecount0\ls7}{\listoverride\listid180975272\listoverridecount0\ls8}
+{\listoverride\listid1306352145\listoverridecount0\levelstartat7\ls9}{\listoverride\listid982349901\listoverridecount0\ls10}}{\*\rsidtbl \rsid329053\rsid3617154\rsid3749795\rsid9258424}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0
+\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title Text before list}{\author Cynthia Johnson}{\operator John MacFarlane}{\creatim\yr2003\mo10\dy13\hr19\min55}{\revtim\yr2021\mo8\dy9\hr10\min28}{\version4}{\edmins6}{\nofpages1}{\nofwords15}
+{\nofchars87}{\nofcharsws101}{\vern4617}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
+\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\noxlattoyen
+\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow0\dgvshow0
+\jexpand\viewkind1\viewscale154\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\rsidroot3749795 \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect
+\linex0\endnhere\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4
+\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}
+{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 
+\hich\af45\dbch\af31505\loch\f45 1.\tab}\pard\plain \ltrpar\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls3\adjustright\rin0\lin720\itap0\pararsid9258424 \rtlch\fcs1 \af45\afs24\alang1025 \ltrch\fcs0 
+\fs24\lang1033\langfe1033\loch\af45\hich\af45\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid9258424 \hich\af45\dbch\af31505\loch\f45 One}{\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid329053 
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 \hich\af45\dbch\af31505\loch\f45 2.\tab}}{\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid9258424 \hich\af45\dbch\af31505\loch\f45 Two
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 \hich\af45\dbch\af31505\loch\f45 a.\tab}}\pard \ltrpar
+\ql \fi-360\li1440\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls3\ilvl1\adjustright\rin0\lin1440\itap0\pararsid9258424 {\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid9258424 \hich\af45\dbch\af31505\loch\f45 Three
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 \hich\af45\dbch\af31505\loch\f45 b.\tab}\hich\af45\dbch\af31505\loch\f45 Four
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 \hich\af45\dbch\af31505\loch\f45 i.\tab}}\pard \ltrpar
+\ql \fi-180\li2160\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls3\ilvl2\adjustright\rin0\lin2160\itap0\pararsid9258424 {\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid9258424 \hich\af45\dbch\af31505\loch\f45 Five
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 \hich\af45\dbch\af31505\loch\f45 ii.\tab}\hich\af45\dbch\af31505\loch\f45 Six
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 \hich\af45\dbch\af31505\loch\f45 A.\tab}}\pard \ltrpar
+\ql \fi-360\li2880\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls3\ilvl3\adjustright\rin0\lin2880\itap0\pararsid9258424 {\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid9258424 \hich\af45\dbch\af31505\loch\f45 Seven
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 \hich\af45\dbch\af31505\loch\f45 B.\tab}\hich\af45\dbch\af31505\loch\f45 Eight
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 \hich\af45\dbch\af31505\loch\f45 I.\tab}}\pard \ltrpar
+\ql \fi-180\li3420\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls3\ilvl4\adjustright\rin0\lin3420\itap0\pararsid9258424 {\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid9258424 \hich\af45\dbch\af31505\loch\f45 Nine
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af0 \ltrch\fcs0 \f45\insrsid9258424 \hich\af45\dbch\af31505\loch\f45 II.\tab}\hich\af45\dbch\af31505\loch\f45 Ten
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af45 \ltrch\fcs0 \f2\insrsid9258424 \hich\af2\dbch\af31505\loch\f2 o\tab}}\pard \ltrpar\ql \fi-360\li4500\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls3\ilvl5\adjustright\rin0\lin4500\itap0\pararsid9258424 {
+\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid9258424 \hich\af45\dbch\af31505\loch\f45 Eleven
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af45 \ltrch\fcs0 \f2\insrsid9258424 \hich\af2\dbch\af31505\loch\f2 o\tab}\hich\af45\dbch\af31505\loch\f45 Twelve
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9258424 {\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid9258424 \hich\af45\dbch\af31505\loch\f45 Out of list!
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3617154 {\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid3617154 \hich\af45\dbch\af31505\loch\f45 Start with
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af45 \ltrch\fcs0 \f45\insrsid3617154 \hich\af45\dbch\af31505\loch\f45 7.\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls9\adjustright\rin0\lin720\itap0\pararsid3617154 {
+\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid3617154 \hich\af45\dbch\af31505\loch\f45 Seven Start
+\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af45 \ltrch\fcs0 \f45\insrsid3617154 \hich\af45\dbch\af31505\loch\f45 8.\tab}\hich\af45\dbch\af31505\loch\f45 Eight Continue
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3617154 {\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid3617154 
+\par }\pard \ltrpar\ql \li4140\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin4140\itap0\pararsid9258424 {\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid9258424 
+\par }{\rtlch\fcs1 \af45 \ltrch\fcs0 \insrsid3617154 
+\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
+9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
+5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
+b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
+0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
+a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
+c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
+0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
+a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
+6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
+4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
+4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f
+7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd
+ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d
+7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b
+d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52
+fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71
+b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b
+fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567
+9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd
+79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf
+5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2
+d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1
+738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68
+2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac
+5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a
+b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9
+493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2
+be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f
+f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64
+7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e
+b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4
+6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd
+f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d
+7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39
+4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf
+1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a
+faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2
+67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9
+416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27
+1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b
+8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4
+8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65
+2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36
+3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e
+3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985
+0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000
+0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000
+000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000
+7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000
+000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000
+000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
+\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;
+\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;
+\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;
+\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;
+\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;
+\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
+\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
+\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
+\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
+\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
+\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
+\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
+\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
+\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
+\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore }}
diff --git a/test/rtf/list_simple.native b/test/rtf/list_simple.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/list_simple.native
@@ -0,0 +1,10 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ BulletList
+      [ [ Para [ Str "one" ] ]
+      , [ Para [ Str "two" ]
+        , BulletList [ [ Para [ Str "sub" ] ] ]
+        ]
+      ]
+  , BulletList [ [ Para [ Str "new" , Space , Str "list" ] ] ]
+  ]
diff --git a/test/rtf/list_simple.rtf b/test/rtf/list_simple.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/list_simple.rtf
@@ -0,0 +1,17 @@
+{\rtf1\ansi\ansicpg1252\cocoartf2513
+\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid2\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li1440\lin1440 }{\listname ;}\listid1}
+{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
+\margl1440\margr1440\vieww11520\viewh8400\viewkind0
+\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural\partightenfactor0
+\ls1\ilvl0
+\f0\fs24 \cf0 {\listtext	\uc0\u8226 	}one\
+{\listtext	\uc0\u8226 	}two\
+\pard\tx940\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1440\fi-1440\pardirnatural\partightenfactor0
+\ls1\ilvl1\cf0 {\listtext	\uc0\u8259 	}sub\
+\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural\partightenfactor0
+\ls2\ilvl0\cf0 {\listtext	\uc0\u8226 	}new list\
+}
diff --git a/test/rtf/table_error_codes.native b/test/rtf/table_error_codes.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/table_error_codes.native
@@ -0,0 +1,422 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Code" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "Error" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "3" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocFailOnWarningError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "4" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocAppError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "5" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocTemplateError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "6" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocOptionError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "21" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUnknownReaderError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "22" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUnknownWriterError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "23" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUnsupportedExtensionError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "24" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocCiteprocError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "31" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocEpubSubdirectoryError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "43" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocPDFError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "44" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocXMLError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "47" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocPDFProgramNotFoundError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "61" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocHttpError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "62" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocShouldNeverHappenError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "63" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocSomeError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "64" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocParseError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "65" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocParsecError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "66" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocMakePDFError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "67" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocSyntaxMapError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "83" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocFilterError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "91" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocMacroLoop" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "92" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUTF8DecodingError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "93" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocIpynbDecodingError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "94" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocUnsupportedCharsetError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "97" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocCouldNotFindDataFileError" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "99" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "PandocResourceNotFound" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  ]
diff --git a/test/rtf/table_error_codes.rtf b/test/rtf/table_error_codes.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/table_error_codes.rtf
@@ -0,0 +1,300 @@
+{\rtf1\ansi
+{
+\trowd \trgaph120
+\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 Code\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Error\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 3\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocFailOnWarningError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 4\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocAppError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 5\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocTemplateError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 6\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocOptionError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 21\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocUnknownReaderError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 22\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocUnknownWriterError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 23\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocUnsupportedExtensionError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 24\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocCiteprocError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 31\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocEpubSubdirectoryError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 43\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocPDFError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 44\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocXMLError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 47\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocPDFProgramNotFoundError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 61\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocHttpError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 62\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocShouldNeverHappenError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 63\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocSomeError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 64\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocParseError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 65\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocParsecError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 66\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocMakePDFError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 67\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocSyntaxMapError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 83\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocFilterError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 91\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocMacroLoop\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 92\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocUTF8DecodingError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 93\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocIpynbDecodingError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 94\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocUnsupportedCharsetError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 97\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocCouldNotFindDataFileError\par}
+\cell}
+}
+\intbl\row}
+{
+\trowd \trgaph120
+\cellx4320\cellx8640
+\trkeep\intbl
+{
+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 99\par}
+\cell}
+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 PandocResourceNotFound\par}
+\cell}
+}
+\intbl\row}
+{\pard \ql \f0 \sa180 \li0 \fi0 \par}
+}
diff --git a/test/rtf/table_simple.native b/test/rtf/table_simple.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/table_simple.native
@@ -0,0 +1,73 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Table
+      ( "" , [] , [] )
+      (Caption Nothing [])
+      [ ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      , ( AlignDefault , ColWidthDefault )
+      ]
+      (TableHead ( "" , [] , [] ) [])
+      [ TableBody
+          ( "" , [] , [] )
+          (RowHeadColumns 0)
+          []
+          [ Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "A" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "B" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "C" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "D" ] ]
+              ]
+          , Row
+              ( "" , [] , [] )
+              [ Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "E" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "F" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "G" ] ]
+              , Cell
+                  ( "" , [] , [] )
+                  AlignDefault
+                  (RowSpan 1)
+                  (ColSpan 1)
+                  [ Para [ Str "H" ] ]
+              ]
+          ]
+      ]
+      (TableFoot ( "" , [] , [] ) [])
+  ]
diff --git a/test/rtf/table_simple.rtf b/test/rtf/table_simple.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/table_simple.rtf
@@ -0,0 +1,19 @@
+{\rtf1\ansi
+\par
+\trowd
+\cellx10836
+\pard \intbl A \cell
+\pard \intbl B \cell
+\pard \intbl C \cell
+\pard \intbl D \cell
+\row
+\trowd
+\cellx10836
+\pard \intbl E \cell
+\pard \intbl F \cell
+\pard \intbl G \cell
+\pard \intbl H \cell
+\row
+\pard
+}
+
diff --git a/test/rtf/unicode.native b/test/rtf/unicode.native
new file mode 100644
--- /dev/null
+++ b/test/rtf/unicode.native
@@ -0,0 +1,3 @@
+Pandoc
+  Meta { unMeta = fromList [] }
+  [ Para [ Str "\8220hi\8221\8216hi\8217\61623\945\228" ] ]
diff --git a/test/rtf/unicode.rtf b/test/rtf/unicode.rtf
new file mode 100644
--- /dev/null
+++ b/test/rtf/unicode.rtf
@@ -0,0 +1,9 @@
+{\rtf1\ansi
+\pard
+\'93hi\'94
+\u8216\'93hi\u8217\'94
+\u-3913?
+\u945a
+{\uc2\u228\'E8a}
+\par
+}
diff --git a/test/s5-basic.html b/test/s5-basic.html
--- a/test/s5-basic.html
+++ b/test/s5-basic.html
@@ -11,10 +11,27 @@
   
   My S5 Document
   
   
   
@@ -53,7 +70,8 @@
 
    
 
    Math
    
 
      
-
    • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
      • 
+
    • $\frac{d}{dx}f(x)=\lim_{h\to
+0}\frac{f(x+h)-f(x)}{h}$
      •
    diff --git a/test/s5-fancy.html b/test/s5-fancy.html --- a/test/s5-fancy.html +++ b/test/s5-fancy.html @@ -11,10 +11,26 @@ My S5 Document @@ -26,207 +42,9 @@ - +
    @@ -254,7 +72,8 @@

    Math

      -
    • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
      • +
    • \(\frac{d}{dx}f(x)=\lim_{h\to +0}\frac{f(x+h)-f(x)}{h}\)
    diff --git a/test/s5-fragment.html b/test/s5-fragment.html --- a/test/s5-fragment.html +++ b/test/s5-fragment.html @@ -5,5 +5,6 @@

    Math

      -
    • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
      • +
    • $\frac{d}{dx}f(x)=\lim_{h\to +0}\frac{f(x+h)-f(x)}{h}$
    diff --git a/test/s5-inserts.html b/test/s5-inserts.html --- a/test/s5-inserts.html +++ b/test/s5-inserts.html @@ -3,16 +3,33 @@ - + My S5 Document STUFF INSERTED @@ -32,7 +49,8 @@

    Math

      -
    • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
      • +
    • $\frac{d}{dx}f(x)=\lim_{h\to +0}\frac{f(x+h)-f(x)}{h}$
    STUFF INSERTED diff --git a/test/tables-rstsubset.native b/test/tables-rstsubset.native --- a/test/tables-rstsubset.native +++ b/test/tables-rstsubset.native @@ -1,114 +1,964 @@ -[Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"] -,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1,8.75e-2,0.1125,0.125] - [[Plain [Str "Right"]] - ,[Plain [Str "Left"]] - ,[Plain [Str "Center"]] - ,[Plain [Str "Default"]]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"] -,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1,8.75e-2,0.1125,0.125] - [[Plain [Str "Right"]] - ,[Plain [Str "Left"]] - ,[Plain [Str "Center"]] - ,[Plain [Str "Default"]]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"] -,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1,8.75e-2,0.1125,0.125] - [[Plain [Str "Right"]] - ,[Plain [Str "Left"]] - ,[Plain [Str "Center"]] - ,[Plain [Str "Default"]]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"] -,Table [Str "Here\8217s",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325] - [[Plain [Str "Centered",SoftBreak,Str "Header"]] - ,[Plain [Str "Left",SoftBreak,Str "Aligned"]] - ,[Plain [Str "Right",SoftBreak,Str "Aligned"]] - ,[Plain [Str "Default",Space,Str "aligned"]]] - [[[Plain [Str "First"]] - ,[Plain [Str "row"]] - ,[Plain [Str "12.0"]] - ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,[[Plain [Str "Second"]] - ,[Plain [Str "row"]] - ,[Plain [Str "5.0"]] - ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",SoftBreak,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",SoftBreak,Str "between",Space,Str "rows."]]]] -,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"] -,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325] - [[Plain [Str "Centered",SoftBreak,Str "Header"]] - ,[Plain [Str "Left",SoftBreak,Str "Aligned"]] - ,[Plain [Str "Right",SoftBreak,Str "Aligned"]] - ,[Plain [Str "Default",Space,Str "aligned"]]] - [[[Plain [Str "First"]] - ,[Plain [Str "row"]] - ,[Plain [Str "12.0"]] - ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,[[Plain [Str "Second"]] - ,[Plain [Str "row"]] - ,[Plain [Str "5.0"]] - ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",SoftBreak,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",SoftBreak,Str "between",Space,Str "rows."]]]] -,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"] -,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [7.5e-2,7.5e-2,7.5e-2,7.5e-2] - [[] - ,[] - ,[] - ,[]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"] -,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.325] - [[] - ,[] - ,[] - ,[]] - [[[Plain [Str "First"]] - ,[Plain [Str "row"]] - ,[Plain [Str "12.0"]] - ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,[[Plain [Str "Second"]] - ,[Plain [Str "row"]] - ,[Plain [Str "5.0"]] - ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",SoftBreak,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",SoftBreak,Str "between",Space,Str "rows."]]]]] +[ Para + [ Str "Simple" + , Space + , Str "table" + , Space + , Str "with" + , Space + , Str "caption:" + ] +, Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Demonstration" + , Space + , Str "of" + , Space + , Str "simple" + , Space + , Str "table" + , Space + , Str "syntax." + ] + ]) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Simple" + , Space + , Str "table" + , Space + , Str "without" + , Space + , Str "caption:" + ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Simple" + , Space + , Str "table" + , Space + , Str "indented" + , Space + , Str "two" + , Space + , Str "spaces:" + ] +, Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Demonstration" + , Space + , Str "of" + , Space + , Str "simple" + , Space + , Str "table" + , Space + , Str "syntax." + ] + ]) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "with" + , Space + , Str "caption:" + ] +, Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Here\8217s" + , Space + , Str "the" + , Space + , Str "caption." + , Space + , Str "It" + , Space + , Str "may" + , Space + , Str "span" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ]) + [ ( AlignDefault , ColWidth 0.15 ) + , ( AlignDefault , ColWidth 0.1375 ) + , ( AlignDefault , ColWidth 0.1625 ) + , ( AlignDefault , ColWidth 0.35 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Centered" , SoftBreak , Str "Header" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" , SoftBreak , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" , SoftBreak , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" , Space , Str "aligned" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Example" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "row" + , Space + , Str "that" + , SoftBreak + , Str "spans" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Here\8217s" + , Space + , Str "another" + , Space + , Str "one." + , Space + , Str "Note" + , SoftBreak + , Str "the" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , SoftBreak + , Str "rows." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "without" + , Space + , Str "caption:" + ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.15 ) + , ( AlignDefault , ColWidth 0.1375 ) + , ( AlignDefault , ColWidth 0.1625 ) + , ( AlignDefault , ColWidth 0.35 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Centered" , SoftBreak , Str "Header" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" , SoftBreak , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" , SoftBreak , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" , Space , Str "aligned" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Example" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "row" + , Space + , Str "that" + , SoftBreak + , Str "spans" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Here\8217s" + , Space + , Str "another" + , Space + , Str "one." + , Space + , Str "Note" + , SoftBreak + , Str "the" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , SoftBreak + , Str "rows." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Table" + , Space + , Str "without" + , Space + , Str "column" + , Space + , Str "headers:" + ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "without" + , Space + , Str "column" + , Space + , Str "headers:" + ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.15 ) + , ( AlignDefault , ColWidth 0.1375 ) + , ( AlignDefault , ColWidth 0.1625 ) + , ( AlignDefault , ColWidth 0.35 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Example" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "row" + , Space + , Str "that" + , SoftBreak + , Str "spans" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Here\8217s" + , Space + , Str "another" + , Space + , Str "one." + , Space + , Str "Note" + , SoftBreak + , Str "the" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , SoftBreak + , Str "rows." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/tables.asciidoc b/test/tables.asciidoc --- a/test/tables.asciidoc +++ b/test/tables.asciidoc @@ -2,66 +2,66 @@ .Demonstration of simple table syntax. [cols=">,<,^,",options="header",] -|============================ +|=== |Right |Left |Center |Default |12 |12 |12 |12 |123 |123 |123 |123 |1 |1 |1 |1 -|============================ +|=== Simple table without caption: [cols=">,<,^,",options="header",] -|============================ +|=== |Right |Left |Center |Default |12 |12 |12 |12 |123 |123 |123 |123 |1 |1 |1 |1 -|============================ +|=== Simple table indented two spaces: .Demonstration of simple table syntax. [cols=">,<,^,",options="header",] -|============================ +|=== |Right |Left |Center |Default |12 |12 |12 |12 |123 |123 |123 |123 |1 |1 |1 |1 -|============================ +|=== Multiline table with caption: .Here’s the caption. It may span multiple lines. -[width="78%",cols="^21%,<17%,>20%,<42%",options="header",] -|======================================================================= +[width="80%",cols="^20%,<17%,>20%,<43%",options="header",] +|=== |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. -|======================================================================= +|=== Multiline table without caption: -[width="78%",cols="^21%,<17%,>20%,<42%",options="header",] -|======================================================================= +[width="80%",cols="^20%,<17%,>20%,<43%",options="header",] +|=== |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: [cols=">,<,^,>",] -|================== +|=== |12 |12 |12 |12 |123 |123 |123 |123 |1 |1 |1 |1 -|================== +|=== Multiline table without column headers: -[width="78%",cols="^21%,<17%,>20%,42%",] -|======================================================================= +[width="80%",cols="^20%,<17%,>20%,43%",] +|=== |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/test/tables.asciidoc_legacy b/test/tables.asciidoc_legacy new file mode 100644 --- /dev/null +++ b/test/tables.asciidoc_legacy @@ -0,0 +1,67 @@ +Simple table with caption: + +.Demonstration of simple table syntax. +[cols=">,<,^,",options="header",] +|=== +|Right |Left |Center |Default +|12 |12 |12 |12 +|123 |123 |123 |123 +|1 |1 |1 |1 +|=== + +Simple table without caption: + +[cols=">,<,^,",options="header",] +|=== +|Right |Left |Center |Default +|12 |12 |12 |12 +|123 |123 |123 |123 +|1 |1 |1 |1 +|=== + +Simple table indented two spaces: + +.Demonstration of simple table syntax. +[cols=">,<,^,",options="header",] +|=== +|Right |Left |Center |Default +|12 |12 |12 |12 +|123 |123 |123 |123 +|1 |1 |1 |1 +|=== + +Multiline table with caption: + +.Here’s the caption. It may span multiple lines. +[width="80%",cols="^20%,<17%,>20%,<43%",options="header",] +|=== +|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. +|=== + +Multiline table without caption: + +[width="80%",cols="^20%,<17%,>20%,<43%",options="header",] +|=== +|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: + +[cols=">,<,^,>",] +|=== +|12 |12 |12 |12 +|123 |123 |123 |123 +|1 |1 |1 |1 +|=== + +Multiline table without column headers: + +[width="80%",cols="^20%,<17%,>20%,43%",] +|=== +|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/test/tables.bbcode b/test/tables.bbcode new file mode 100644 --- /dev/null +++ b/test/tables.bbcode @@ -0,0 +1,60 @@ +Simple table with caption: + +Demonstration of simple table syntax. +[table] +[tr][th]Right[/th][th]Left[/th][th]Center[/th][th]Default[/th][/tr] +[tr][td]12[/td][td]12[/td][td]12[/td][td]12[/td][/tr] +[tr][td]123[/td][td]123[/td][td]123[/td][td]123[/td][/tr] +[tr][td]1[/td][td]1[/td][td]1[/td][td]1[/td][/tr] +[/table] + +Simple table without caption: + +[table] +[tr][th]Right[/th][th]Left[/th][th]Center[/th][th]Default[/th][/tr] +[tr][td]12[/td][td]12[/td][td]12[/td][td]12[/td][/tr] +[tr][td]123[/td][td]123[/td][td]123[/td][td]123[/td][/tr] +[tr][td]1[/td][td]1[/td][td]1[/td][td]1[/td][/tr] +[/table] + +Simple table indented two spaces: + +Demonstration of simple table syntax. +[table] +[tr][th]Right[/th][th]Left[/th][th]Center[/th][th]Default[/th][/tr] +[tr][td]12[/td][td]12[/td][td]12[/td][td]12[/td][/tr] +[tr][td]123[/td][td]123[/td][td]123[/td][td]123[/td][/tr] +[tr][td]1[/td][td]1[/td][td]1[/td][td]1[/td][/tr] +[/table] + +Multiline table with caption: + +Here's the caption. It may span multiple lines. +[table] +[tr][th]Centered Header[/th][th]Left Aligned[/th][th]Right Aligned[/th][th]Default aligned[/th][/tr] +[tr][td]First[/td][td]row[/td][td]12.0[/td][td]Example of a row that spans multiple lines.[/td][/tr] +[tr][td]Second[/td][td]row[/td][td]5.0[/td][td]Here's another one. Note the blank line between rows.[/td][/tr] +[/table] + +Multiline table without caption: + +[table] +[tr][th]Centered Header[/th][th]Left Aligned[/th][th]Right Aligned[/th][th]Default aligned[/th][/tr] +[tr][td]First[/td][td]row[/td][td]12.0[/td][td]Example of a row that spans multiple lines.[/td][/tr] +[tr][td]Second[/td][td]row[/td][td]5.0[/td][td]Here's another one. Note the blank line between rows.[/td][/tr] +[/table] + +Table without column headers: + +[table] +[tr][td]12[/td][td]12[/td][td]12[/td][td]12[/td][/tr] +[tr][td]123[/td][td]123[/td][td]123[/td][td]123[/td][/tr] +[tr][td]1[/td][td]1[/td][td]1[/td][td]1[/td][/tr] +[/table] + +Multiline table without column headers: + +[table] +[tr][td]First[/td][td]row[/td][td]12.0[/td][td]Example of a row that spans multiple lines.[/td][/tr] +[tr][td]Second[/td][td]row[/td][td]5.0[/td][td]Here's another one. Note the blank line between rows.[/td][/tr] +[/table] diff --git a/test/tables.context b/test/tables.context --- a/test/tables.context +++ b/test/tables.context @@ -1,175 +1,258 @@ Simple table with caption: -\placetable{Demonstration of simple table syntax.} -\starttable[|r|l|c|l|] -\HL -\NC Right -\NC Left -\NC Center -\NC Default -\NC\AR -\HL -\NC 12 -\NC 12 -\NC 12 -\NC 12 -\NC\AR -\NC 123 -\NC 123 -\NC 123 -\NC 123 -\NC\AR -\NC 1 -\NC 1 -\NC 1 -\NC 1 -\NC\AR -\HL -\stoptable +\startplacetable[title={Demonstration of simple table syntax.}] +\startxtable +\startxtablehead[head] +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=left] Right \stopxcell +\startxcell[align=right] Left \stopxcell +\startxcell[align=middle] Center \stopxcell +\startxcell Default \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablehead +\startxtablebody[body] +\startxrow +\startxcell[align=left] 12 \stopxcell +\startxcell[align=right] 12 \stopxcell +\startxcell[align=middle] 12 \stopxcell +\startxcell 12 \stopxcell +\stopxrow +\startxrow +\startxcell[align=left] 123 \stopxcell +\startxcell[align=right] 123 \stopxcell +\startxcell[align=middle] 123 \stopxcell +\startxcell 123 \stopxcell +\stopxrow +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=left] 1 \stopxcell +\startxcell[align=right] 1 \stopxcell +\startxcell[align=middle] 1 \stopxcell +\startxcell 1 \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablebody +\startxtablefoot[foot] +\stopxtablefoot +\stopxtable +\stopplacetable Simple table without caption: -\placetable[none]{} -\starttable[|r|l|c|l|] -\HL -\NC Right -\NC Left -\NC Center -\NC Default -\NC\AR -\HL -\NC 12 -\NC 12 -\NC 12 -\NC 12 -\NC\AR -\NC 123 -\NC 123 -\NC 123 -\NC 123 -\NC\AR -\NC 1 -\NC 1 -\NC 1 -\NC 1 -\NC\AR -\HL -\stoptable +\startplacetable[location=none] +\startxtable +\startxtablehead[head] +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=left] Right \stopxcell +\startxcell[align=right] Left \stopxcell +\startxcell[align=middle] Center \stopxcell +\startxcell Default \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablehead +\startxtablebody[body] +\startxrow +\startxcell[align=left] 12 \stopxcell +\startxcell[align=right] 12 \stopxcell +\startxcell[align=middle] 12 \stopxcell +\startxcell 12 \stopxcell +\stopxrow +\startxrow +\startxcell[align=left] 123 \stopxcell +\startxcell[align=right] 123 \stopxcell +\startxcell[align=middle] 123 \stopxcell +\startxcell 123 \stopxcell +\stopxrow +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=left] 1 \stopxcell +\startxcell[align=right] 1 \stopxcell +\startxcell[align=middle] 1 \stopxcell +\startxcell 1 \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablebody +\startxtablefoot[foot] +\stopxtablefoot +\stopxtable +\stopplacetable Simple table indented two spaces: -\placetable{Demonstration of simple table syntax.} -\starttable[|r|l|c|l|] -\HL -\NC Right -\NC Left -\NC Center -\NC Default -\NC\AR -\HL -\NC 12 -\NC 12 -\NC 12 -\NC 12 -\NC\AR -\NC 123 -\NC 123 -\NC 123 -\NC 123 -\NC\AR -\NC 1 -\NC 1 -\NC 1 -\NC 1 -\NC\AR -\HL -\stoptable +\startplacetable[title={Demonstration of simple table syntax.}] +\startxtable +\startxtablehead[head] +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=left] Right \stopxcell +\startxcell[align=right] Left \stopxcell +\startxcell[align=middle] Center \stopxcell +\startxcell Default \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablehead +\startxtablebody[body] +\startxrow +\startxcell[align=left] 12 \stopxcell +\startxcell[align=right] 12 \stopxcell +\startxcell[align=middle] 12 \stopxcell +\startxcell 12 \stopxcell +\stopxrow +\startxrow +\startxcell[align=left] 123 \stopxcell +\startxcell[align=right] 123 \stopxcell +\startxcell[align=middle] 123 \stopxcell +\startxcell 123 \stopxcell +\stopxrow +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=left] 1 \stopxcell +\startxcell[align=right] 1 \stopxcell +\startxcell[align=middle] 1 \stopxcell +\startxcell 1 \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablebody +\startxtablefoot[foot] +\stopxtablefoot +\stopxtable +\stopplacetable Multiline table with caption: -\placetable{Here's the caption. It may span multiple lines.} -\starttable[|cp(0.15\textwidth)|lp(0.14\textwidth)|rp(0.16\textwidth)|lp(0.34\textwidth)|] -\HL -\NC Centered Header -\NC Left Aligned -\NC Right Aligned -\NC Default aligned -\NC\AR -\HL -\NC First -\NC row -\NC 12.0 -\NC Example of a row that spans multiple lines. -\NC\AR -\NC Second -\NC row -\NC 5.0 -\NC Here's another one. Note the blank line between rows. -\NC\AR -\HL -\stoptable +\startplacetable[title={Here's the caption. It may span multiple lines.}] +\startxtable +\startxtablehead[head] +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=middle,width={0.15\textwidth}] Centered Header \stopxcell +\startxcell[align=right,width={0.14\textwidth}] Left Aligned \stopxcell +\startxcell[align=left,width={0.16\textwidth}] Right Aligned \stopxcell +\startxcell[align=right,width={0.35\textwidth}] Default aligned \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablehead +\startxtablebody[body] +\startxrow +\startxcell[align=middle,width={0.15\textwidth}] First \stopxcell +\startxcell[align=right,width={0.14\textwidth}] row \stopxcell +\startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell +\startxcell[align=right,width={0.35\textwidth}] Example of a row that spans +multiple lines. \stopxcell +\stopxrow +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell +\startxcell[align=right,width={0.14\textwidth}] row \stopxcell +\startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell +\startxcell[align=right,width={0.35\textwidth}] Here's another one. Note the +blank line between rows. \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablebody +\startxtablefoot[foot] +\stopxtablefoot +\stopxtable +\stopplacetable Multiline table without caption: -\placetable[none]{} -\starttable[|cp(0.15\textwidth)|lp(0.14\textwidth)|rp(0.16\textwidth)|lp(0.34\textwidth)|] -\HL -\NC Centered Header -\NC Left Aligned -\NC Right Aligned -\NC Default aligned -\NC\AR -\HL -\NC First -\NC row -\NC 12.0 -\NC Example of a row that spans multiple lines. -\NC\AR -\NC Second -\NC row -\NC 5.0 -\NC Here's another one. Note the blank line between rows. -\NC\AR -\HL -\stoptable +\startplacetable[location=none] +\startxtable +\startxtablehead[head] +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=middle,width={0.15\textwidth}] Centered Header \stopxcell +\startxcell[align=right,width={0.14\textwidth}] Left Aligned \stopxcell +\startxcell[align=left,width={0.16\textwidth}] Right Aligned \stopxcell +\startxcell[align=right,width={0.35\textwidth}] Default aligned \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablehead +\startxtablebody[body] +\startxrow +\startxcell[align=middle,width={0.15\textwidth}] First \stopxcell +\startxcell[align=right,width={0.14\textwidth}] row \stopxcell +\startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell +\startxcell[align=right,width={0.35\textwidth}] Example of a row that spans +multiple lines. \stopxcell +\stopxrow +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell +\startxcell[align=right,width={0.14\textwidth}] row \stopxcell +\startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell +\startxcell[align=right,width={0.35\textwidth}] Here's another one. Note the +blank line between rows. \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablebody +\startxtablefoot[foot] +\stopxtablefoot +\stopxtable +\stopplacetable Table without column headers: -\placetable[none]{} -\starttable[|r|l|c|r|] -\HL -\NC 12 -\NC 12 -\NC 12 -\NC 12 -\NC\AR -\NC 123 -\NC 123 -\NC 123 -\NC 123 -\NC\AR -\NC 1 -\NC 1 -\NC 1 -\NC 1 -\NC\AR -\HL -\stoptable +\startplacetable[location=none] +\startxtable +\startxtablehead[head] +\stopxtablehead +\startxtablebody[body] +\startxrow +\startxcell[align=left] 12 \stopxcell +\startxcell[align=right] 12 \stopxcell +\startxcell[align=middle] 12 \stopxcell +\startxcell[align=left] 12 \stopxcell +\stopxrow +\startxrow +\startxcell[align=left] 123 \stopxcell +\startxcell[align=right] 123 \stopxcell +\startxcell[align=middle] 123 \stopxcell +\startxcell[align=left] 123 \stopxcell +\stopxrow +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=left] 1 \stopxcell +\startxcell[align=right] 1 \stopxcell +\startxcell[align=middle] 1 \stopxcell +\startxcell[align=left] 1 \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablebody +\startxtablefoot[foot] +\stopxtablefoot +\stopxtable +\stopplacetable Multiline table without column headers: -\placetable[none]{} -\starttable[|cp(0.15\textwidth)|lp(0.14\textwidth)|rp(0.16\textwidth)|lp(0.34\textwidth)|] -\HL -\NC First -\NC row -\NC 12.0 -\NC Example of a row that spans multiple lines. -\NC\AR -\NC Second -\NC row -\NC 5.0 -\NC Here's another one. Note the blank line between rows. -\NC\AR -\HL -\stoptable +\startplacetable[location=none] +\startxtable +\startxtablehead[head] +\stopxtablehead +\startxtablebody[body] +\startxrow +\startxcell[align=middle,width={0.15\textwidth}] First \stopxcell +\startxcell[align=right,width={0.14\textwidth}] row \stopxcell +\startxcell[align=left,width={0.16\textwidth}] 12.0 \stopxcell +\startxcell[width={0.35\textwidth}] Example of a row that spans multiple +lines. \stopxcell +\stopxrow +\startxrowgroup[lastrow] +\startxrow +\startxcell[align=middle,width={0.15\textwidth}] Second \stopxcell +\startxcell[align=right,width={0.14\textwidth}] row \stopxcell +\startxcell[align=left,width={0.16\textwidth}] 5.0 \stopxcell +\startxcell[width={0.35\textwidth}] Here's another one. Note the blank line +between rows. \stopxcell +\stopxrow +\stopxrowgroup +\stopxtablebody +\startxtablefoot[foot] +\stopxtablefoot +\stopxtable +\stopplacetable diff --git a/test/tables.custom b/test/tables.custom deleted file mode 100644 --- a/test/tables.custom +++ /dev/null @@ -1,201 +0,0 @@ -

    Simple table with caption:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Demonstration of simple table syntax.
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    Simple table without caption:

    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    Simple table indented two spaces:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Demonstration of simple table syntax.
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    Multiline table with caption:

    - - - ----- - - - - - - - - - - - - - - - - - -
    Here’s the caption. -It may span multiple lines.
    Centered -HeaderLeft -AlignedRight -AlignedDefault aligned
    Firstrow12.0Example of a row that spans -multiple lines.
    Secondrow5.0Here’s another one. Note -the blank line between rows.
    Multiline table without caption:

    - - ----- - - - - - - - - - - - - - - - - - -
    Centered -HeaderLeft -AlignedRight -AlignedDefault aligned
    Firstrow12.0Example of a row that spans -multiple lines.
    Secondrow5.0Here’s another one. Note -the blank line between rows.
    Table without column headers:

    - - - - - - - - - - - - - - - - - - - - -
    12121212
    123123123123
    1111
    Multiline table without column headers:

    - - ----- - - - - - - - - - - - -
    Firstrow12.0Example of a row that spans -multiple lines.
    Secondrow5.0Here’s another one. Note -the blank line between rows.
    - - Demonstration of simple table syntax. - + Demonstration of simple table syntax. @@ -147,9 +145,7 @@ Simple table indented two spaces:
    - - Demonstration of simple table syntax. - + Demonstration of simple table syntax. @@ -221,14 +217,12 @@ Multiline table with caption:
    - - Here’s the caption. It may span multiple lines. - + Here’s the caption. It may span multiple lines. - + @@ -285,7 +279,7 @@ - + @@ -397,7 +391,7 @@ - + diff --git a/test/tables.docbook5 b/test/tables.docbook5 --- a/test/tables.docbook5 +++ b/test/tables.docbook5 @@ -2,9 +2,7 @@ Simple table with caption:
    - - Demonstration of simple table syntax. - + Demonstration of simple table syntax. @@ -147,9 +145,7 @@ Simple table indented two spaces:
    - - Demonstration of simple table syntax. - + Demonstration of simple table syntax. @@ -221,14 +217,12 @@ Multiline table with caption:
    - - Here’s the caption. It may span multiple lines. - + Here’s the caption. It may span multiple lines. - + @@ -285,7 +279,7 @@ - + @@ -397,7 +391,7 @@ - + diff --git a/test/tables.dokuwiki b/test/tables.dokuwiki --- a/test/tables.dokuwiki +++ b/test/tables.dokuwiki @@ -44,4 +44,3 @@ | 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/test/tables.fb2 b/test/tables.fb2 --- a/test/tables.fb2 +++ b/test/tables.fb2 @@ -1,3 +1,15 @@ -unrecognisedpandoc<p />

    Simple table with caption:

    RightLeftCenterDefault
    12121212
    123123123123
    1111

    Demonstration of simple table syntax.

    Simple table without caption:

    RightLeftCenterDefault
    12121212
    123123123123
    1111

    Simple table indented two spaces:

    RightLeftCenterDefault
    12121212
    123123123123
    1111

    Demonstration of simple table syntax.

    Multiline table with caption:

    Centered HeaderLeft AlignedRight AlignedDefault aligned
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between rows.

    Here’s the caption. It may span multiple lines.

    Multiline table without caption:

    Centered HeaderLeft AlignedRight AlignedDefault aligned
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between rows.

    Table without column headers:

    12121212
    123123123123
    1111

    Multiline table without column headers:

    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between rows.

    - +unrecognisedpandoc<p />

    Simple table with caption:

    RightLeftCenterDefault
    12121212
    123123123123
    1111

    Demonstration of simple table syntax.

    Simple table without caption:

    RightLeftCenterDefault
    12121212
    123123123123
    1111

    Simple table indented two spaces:

    RightLeftCenterDefault
    12121212
    123123123123
    1111

    Demonstration of simple table syntax.

    Multiline table with caption:

    Centered +HeaderLeft +AlignedRight +AlignedDefault aligned
    Firstrow12.0Example of a row that spans +multiple lines.
    Secondrow5.0Here’s another one. Note +the blank line between rows.

    Here’s the caption. +It may span multiple lines.

    Multiline table without caption:

    Centered +HeaderLeft +AlignedRight +AlignedDefault aligned
    Firstrow12.0Example of a row that spans +multiple lines.
    Secondrow5.0Here’s another one. Note +the blank line between rows.

    Table without column headers:

    12121212
    123123123123
    1111

    Multiline table without column headers:

    Firstrow12.0Example of a row that spans +multiple lines.
    Secondrow5.0Here’s another one. Note +the blank line between rows.

     diff --git a/test/tables.haddock b/test/tables.haddock --- a/test/tables.haddock +++ b/test/tables.haddock @@ -1,76 +1,90 @@ 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. ++-------+------+--------+---------+ +| Right | Left | Center | Default | ++======:+:=====+:======:+=========+ +| 12 | 12 | 12 | 12 | ++-------+------+--------+---------+ +| 123 | 123 | 123 | 123 | ++-------+------+--------+---------+ +| 1 | 1 | 1 | 1 | ++-------+------+--------+---------+ +Demonstration of simple table syntax. + 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. ++-------+------+--------+---------+ +| Right | Left | Center | Default | ++======:+:=====+:======:+=========+ +| 12 | 12 | 12 | 12 | ++-------+------+--------+---------+ +| 123 | 123 | 123 | 123 | ++-------+------+--------+---------+ +| 1 | 1 | 1 | 1 | ++-------+------+--------+---------+ +Demonstration of simple table syntax. + Multiline table with caption: -> -------------------------------------------------------------- -> Centered Left Right Default aligned -> Header Aligned 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. ++-----------+----------+------------+---------------------------+ +| Centered | Left | Right | Default aligned | +| Header | Aligned | 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. + Multiline table without caption: -> -------------------------------------------------------------- -> Centered Left Right Default aligned -> Header Aligned 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 | Left | Right | Default aligned | +| Header | Aligned | 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/test/tables.html4 b/test/tables.html4 --- a/test/tables.html4 +++ b/test/tables.html4 @@ -2,7 +2,7 @@ - + @@ -10,19 +10,19 @@ - + - + - + @@ -33,7 +33,7 @@

    Simple table without caption:

    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    - + @@ -41,19 +41,19 @@ - + - + - + @@ -65,7 +65,7 @@
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    - + @@ -73,19 +73,19 @@ - + - + - + @@ -94,16 +94,16 @@
    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1

    Multiline table with caption:

    - +
    -+ - + @@ -111,13 +111,13 @@ - + - + @@ -126,15 +126,15 @@
    Here’s the caption. It may span multiple lines.
    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0

    Multiline table without caption:

    - +
    -+ - + @@ -142,13 +142,13 @@ - + - + @@ -159,19 +159,19 @@

    Table without column headers:

    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    - + - + - + @@ -180,21 +180,21 @@
    12 12 12 12
    123 123 123 123
    1 1 1

    Multiline table without column headers:

    - +
    -+ - + - + diff --git a/test/tables.html5 b/test/tables.html5 --- a/test/tables.html5 +++ b/test/tables.html5 @@ -2,7 +2,7 @@
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    - + @@ -10,19 +10,19 @@ - + - + - + @@ -33,7 +33,7 @@

    Simple table without caption:

    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    - + @@ -41,19 +41,19 @@ - + - + - + @@ -65,7 +65,7 @@
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    - + @@ -73,19 +73,19 @@ - + - + - + @@ -94,16 +94,16 @@
    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1

    Multiline table with caption:

    - +
    -+ - + @@ -111,30 +111,31 @@ - + - + - +
    Here’s the caption. It may span multiple lines.
    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0Here’s another one. Note the blank line between rows.Here’s another one. Note the blank line between +rows.

    Multiline table without caption:

    - +
    -+ - + @@ -142,36 +143,37 @@ - + - + - +
    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0Here’s another one. Note the blank line between rows.Here’s another one. Note the blank line between +rows.

    Table without column headers:

    - + - + - + @@ -180,21 +182,21 @@
    12 12 12 12
    123 123 123 123
    1 1 1

    Multiline table without column headers:

    - +
    -+ - + - + diff --git a/test/tables.icml b/test/tables.icml --- a/test/tables.icml +++ b/test/tables.icml @@ -395,7 +395,7 @@ - + @@ -497,7 +497,7 @@ - + @@ -695,7 +695,7 @@ - + diff --git a/test/tables.jats b/test/tables.jats deleted file mode 100644 --- a/test/tables.jats +++ /dev/null @@ -1,430 +0,0 @@ -

    - Simple table with caption: -

    - -     -
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
     -

    - Demonstration of simple table syntax. -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Right - - Left - - Center - - Default -
    - 12 - - 12 - - 12 - - 12 -
    - 123 - - 123 - - 123 - - 123 -
    - 1 - - 1 - - 1 - - 1 -
    - -

    - Simple table without caption: -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Right - - Left - - Center - - Default -
    - 12 - - 12 - - 12 - - 12 -
    - 123 - - 123 - - 123 - - 123 -
    - 1 - - 1 - - 1 - - 1 -
    -

    - Simple table indented two spaces: -

    - - -

    - Demonstration of simple table syntax. -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Right - - Left - - Center - - Default -
    - 12 - - 12 - - 12 - - 12 -
    - 123 - - 123 - - 123 - - 123 -
    - 1 - - 1 - - 1 - - 1 -
    -     -

    - Multiline table with caption: -

    - - -

    - Here’s the caption. It may span multiple lines. -

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

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

    - Table without column headers: -

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    - 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. -
    diff --git a/test/tables.jats_archiving b/test/tables.jats_archiving new file mode 100644 --- /dev/null +++ b/test/tables.jats_archiving @@ -0,0 +1,226 @@ +

    Simple table with caption:

    + + +

    Demonstration of simple table syntax.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    +     +

    Simple table without caption:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    +     +

    Simple table indented two spaces:

    + + +

    Demonstration of simple table syntax.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    +     +

    Multiline table with caption:

    + + +

    Here’s the caption. It may span multiple lines.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Centered HeaderLeft AlignedRight AlignedDefault aligned
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between + rows.
    +     +

    Multiline table without caption:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Centered HeaderLeft AlignedRight AlignedDefault aligned
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between + rows.
    +     +

    Table without column headers:

    + + + + + + + + + + + + + + + + + + + + + + +
    12121212
    123123123123
    1111
    +     +

    Multiline table without column headers:

    + + + + + + + + + + + + + + + + + + + + + + +
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between rows.
    +     diff --git a/test/tables.jats_articleauthoring b/test/tables.jats_articleauthoring new file mode 100644 --- /dev/null +++ b/test/tables.jats_articleauthoring @@ -0,0 +1,226 @@ +

    Simple table with caption:

    + + +

    Demonstration of simple table syntax.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    +     +

    Simple table without caption:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    +     +

    Simple table indented two spaces:

    + + +

    Demonstration of simple table syntax.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    +     +

    Multiline table with caption:

    + + +

    Here’s the caption. It may span multiple lines.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Centered HeaderLeft AlignedRight AlignedDefault aligned
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between + rows.
    +     +

    Multiline table without caption:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Centered HeaderLeft AlignedRight AlignedDefault aligned
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between + rows.
    +     +

    Table without column headers:

    + + + + + + + + + + + + + + + + + + + + + + +
    12121212
    123123123123
    1111
    +     +

    Multiline table without column headers:

    + + + + + + + + + + + + + + + + + + + + + + +
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between rows.
    +     diff --git a/test/tables.jats_publishing b/test/tables.jats_publishing new file mode 100644 --- /dev/null +++ b/test/tables.jats_publishing @@ -0,0 +1,226 @@ +

    Simple table with caption:

    + + +

    Demonstration of simple table syntax.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    +     +

    Simple table without caption:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    +     +

    Simple table indented two spaces:

    + + +

    Demonstration of simple table syntax.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    RightLeftCenterDefault
    12121212
    123123123123
    1111
    +     +

    Multiline table with caption:

    + + +

    Here’s the caption. It may span multiple lines.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Centered HeaderLeft AlignedRight AlignedDefault aligned
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between + rows.
    +     +

    Multiline table without caption:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Centered HeaderLeft AlignedRight AlignedDefault aligned
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between + rows.
    +     +

    Table without column headers:

    + + + + + + + + + + + + + + + + + + + + + + +
    12121212
    123123123123
    1111
    +     +

    Multiline table without column headers:

    + + + + + + + + + + + + + + + + + + + + + + +
    Firstrow12.0Example of a row that spans multiple lines.
    Secondrow5.0Here’s another one. Note the blank line between rows.
    +     diff --git a/test/tables.jira b/test/tables.jira new file mode 100644 --- /dev/null +++ b/test/tables.jira @@ -0,0 +1,43 @@ +Simple table with caption: + +|| Right || Left || Center || Default || +| 12 | 12 | 12 | 12 | +| 123 | 123 | 123 | 123 | +| 1 | 1 | 1 | 1 | + +Simple table without caption: + +|| 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 | + +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. | + +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. | + +Table without column headers: + +| 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. | diff --git a/test/tables.latex b/test/tables.latex --- a/test/tables.latex +++ b/test/tables.latex @@ -2,169 +2,148 @@ \begin{longtable}[]{@{}rlcl@{}} \caption{Demonstration of simple table syntax.}\tabularnewline -\toprule -Right & Left & Center & Default\tabularnewline -\midrule +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} \endfirsthead -\toprule -Right & Left & Center & Default\tabularnewline -\midrule +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} \endhead -12 & 12 & 12 & 12\tabularnewline -123 & 123 & 123 & 123\tabularnewline -1 & 1 & 1 & 1\tabularnewline -\bottomrule +\bottomrule\noalign{} +\endlastfoot +12 & 12 & 12 & 12 \\ +123 & 123 & 123 & 123 \\ +1 & 1 & 1 & 1 \\ \end{longtable} Simple table without caption: +{\def\LTcaptype{none} % do not increment counter \begin{longtable}[]{@{}rlcl@{}} -\toprule -Right & Left & Center & Default\tabularnewline -\midrule +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} \endhead -12 & 12 & 12 & 12\tabularnewline -123 & 123 & 123 & 123\tabularnewline -1 & 1 & 1 & 1\tabularnewline -\bottomrule +\bottomrule\noalign{} +\endlastfoot +12 & 12 & 12 & 12 \\ +123 & 123 & 123 & 123 \\ +1 & 1 & 1 & 1 \\ \end{longtable} +} Simple table indented two spaces: \begin{longtable}[]{@{}rlcl@{}} \caption{Demonstration of simple table syntax.}\tabularnewline -\toprule -Right & Left & Center & Default\tabularnewline -\midrule +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} \endfirsthead -\toprule -Right & Left & Center & Default\tabularnewline -\midrule +\toprule\noalign{} +Right & Left & Center & Default \\ +\midrule\noalign{} \endhead -12 & 12 & 12 & 12\tabularnewline -123 & 123 & 123 & 123\tabularnewline -1 & 1 & 1 & 1\tabularnewline -\bottomrule +\bottomrule\noalign{} +\endlastfoot +12 & 12 & 12 & 12 \\ +123 & 123 & 123 & 123 \\ +1 & 1 & 1 & 1 \\ \end{longtable} Multiline table with caption: -\begin{longtable}[]{@{}clrl@{}} +\begin{longtable}[]{@{} + >{\centering\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.1500}} + >{\raggedright\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.1375}} + >{\raggedleft\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.1625}} + >{\raggedright\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.3500}}@{}} \caption{Here's the caption. It may span multiple lines.}\tabularnewline -\toprule -\begin{minipage}[b]{0.13\columnwidth}\centering -Centered Header\strut -\end{minipage} & \begin{minipage}[b]{0.12\columnwidth}\raggedright -Left Aligned\strut -\end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft -Right Aligned\strut -\end{minipage} & \begin{minipage}[b]{0.30\columnwidth}\raggedright -Default aligned\strut -\end{minipage}\tabularnewline -\midrule +\toprule\noalign{} +\begin{minipage}[b]{\linewidth}\centering +Centered Header +\end{minipage} & \begin{minipage}[b]{\linewidth}\raggedright +Left Aligned +\end{minipage} & \begin{minipage}[b]{\linewidth}\raggedleft +Right Aligned +\end{minipage} & \begin{minipage}[b]{\linewidth}\raggedright +Default aligned +\end{minipage} \\ +\midrule\noalign{} \endfirsthead -\toprule -\begin{minipage}[b]{0.13\columnwidth}\centering -Centered Header\strut -\end{minipage} & \begin{minipage}[b]{0.12\columnwidth}\raggedright -Left Aligned\strut -\end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft -Right Aligned\strut -\end{minipage} & \begin{minipage}[b]{0.30\columnwidth}\raggedright -Default aligned\strut -\end{minipage}\tabularnewline -\midrule +\toprule\noalign{} +\begin{minipage}[b]{\linewidth}\centering +Centered Header +\end{minipage} & \begin{minipage}[b]{\linewidth}\raggedright +Left Aligned +\end{minipage} & \begin{minipage}[b]{\linewidth}\raggedleft +Right Aligned +\end{minipage} & \begin{minipage}[b]{\linewidth}\raggedright +Default aligned +\end{minipage} \\ +\midrule\noalign{} \endhead -\begin{minipage}[t]{0.13\columnwidth}\centering -First\strut -\end{minipage} & \begin{minipage}[t]{0.12\columnwidth}\raggedright -row\strut -\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft -12.0\strut -\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright -Example of a row that spans multiple lines.\strut -\end{minipage}\tabularnewline -\begin{minipage}[t]{0.13\columnwidth}\centering -Second\strut -\end{minipage} & \begin{minipage}[t]{0.12\columnwidth}\raggedright -row\strut -\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft -5.0\strut -\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright -Here's another one. Note the blank line between rows.\strut -\end{minipage}\tabularnewline -\bottomrule +\bottomrule\noalign{} +\endlastfoot +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. \\ \end{longtable} Multiline table without caption: -\begin{longtable}[]{@{}clrl@{}} -\toprule -\begin{minipage}[b]{0.13\columnwidth}\centering -Centered Header\strut -\end{minipage} & \begin{minipage}[b]{0.12\columnwidth}\raggedright -Left Aligned\strut -\end{minipage} & \begin{minipage}[b]{0.14\columnwidth}\raggedleft -Right Aligned\strut -\end{minipage} & \begin{minipage}[b]{0.30\columnwidth}\raggedright -Default aligned\strut -\end{minipage}\tabularnewline -\midrule +{\def\LTcaptype{none} % do not increment counter +\begin{longtable}[]{@{} + >{\centering\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.1500}} + >{\raggedright\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.1375}} + >{\raggedleft\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.1625}} + >{\raggedright\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.3500}}@{}} +\toprule\noalign{} +\begin{minipage}[b]{\linewidth}\centering +Centered Header +\end{minipage} & \begin{minipage}[b]{\linewidth}\raggedright +Left Aligned +\end{minipage} & \begin{minipage}[b]{\linewidth}\raggedleft +Right Aligned +\end{minipage} & \begin{minipage}[b]{\linewidth}\raggedright +Default aligned +\end{minipage} \\ +\midrule\noalign{} \endhead -\begin{minipage}[t]{0.13\columnwidth}\centering -First\strut -\end{minipage} & \begin{minipage}[t]{0.12\columnwidth}\raggedright -row\strut -\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft -12.0\strut -\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright -Example of a row that spans multiple lines.\strut -\end{minipage}\tabularnewline -\begin{minipage}[t]{0.13\columnwidth}\centering -Second\strut -\end{minipage} & \begin{minipage}[t]{0.12\columnwidth}\raggedright -row\strut -\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft -5.0\strut -\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright -Here's another one. Note the blank line between rows.\strut -\end{minipage}\tabularnewline -\bottomrule +\bottomrule\noalign{} +\endlastfoot +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. \\ \end{longtable} +} Table without column headers: +{\def\LTcaptype{none} % do not increment counter \begin{longtable}[]{@{}rlcr@{}} -\toprule +\toprule\noalign{} \endhead -12 & 12 & 12 & 12\tabularnewline -123 & 123 & 123 & 123\tabularnewline -1 & 1 & 1 & 1\tabularnewline -\bottomrule +\bottomrule\noalign{} +\endlastfoot +12 & 12 & 12 & 12 \\ +123 & 123 & 123 & 123 \\ +1 & 1 & 1 & 1 \\ \end{longtable} +} Multiline table without column headers: -\begin{longtable}[]{@{}clrl@{}} -\toprule +{\def\LTcaptype{none} % do not increment counter +\begin{longtable}[]{@{} + >{\centering\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.1500}} + >{\raggedright\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.1375}} + >{\raggedleft\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.1625}} + >{\raggedright\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.3500}}@{}} +\toprule\noalign{} \endhead -\begin{minipage}[t]{0.13\columnwidth}\centering -First\strut -\end{minipage} & \begin{minipage}[t]{0.12\columnwidth}\raggedright -row\strut -\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft -12.0\strut -\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright -Example of a row that spans multiple lines.\strut -\end{minipage}\tabularnewline -\begin{minipage}[t]{0.13\columnwidth}\centering -Second\strut -\end{minipage} & \begin{minipage}[t]{0.12\columnwidth}\raggedright -row\strut -\end{minipage} & \begin{minipage}[t]{0.14\columnwidth}\raggedleft -5.0\strut -\end{minipage} & \begin{minipage}[t]{0.30\columnwidth}\raggedright -Here's another one. Note the blank line between rows.\strut -\end{minipage}\tabularnewline -\bottomrule +\bottomrule\noalign{} +\endlastfoot +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. \\ \end{longtable} +} diff --git a/test/tables.man b/test/tables.man --- a/test/tables.man +++ b/test/tables.man @@ -135,10 +135,10 @@ .PP Multiline table with caption: .PP -Here's the caption. It may span multiple lines. +Here\(cqs the caption. It may span multiple lines. .TS tab(@); -cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). +cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n). T{ Centered Header T}@T{ @@ -165,7 +165,7 @@ T}@T{ 5.0 T}@T{ -Here's another one. +Here\(cqs another one. Note the blank line between rows. T} .TE @@ -174,7 +174,7 @@ .PP .TS tab(@); -cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). +cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n). T{ Centered Header T}@T{ @@ -201,7 +201,7 @@ T}@T{ 5.0 T}@T{ -Here's another one. +Here\(cqs another one. Note the blank line between rows. T} .TE @@ -244,7 +244,7 @@ .PP .TS tab(@); -cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). +cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n). T{ First T}@T{ @@ -261,7 +261,7 @@ T}@T{ 5.0 T}@T{ -Here's another one. +Here\(cqs another one. Note the blank line between rows. T} .TE diff --git a/test/tables.markdown b/test/tables.markdown --- a/test/tables.markdown +++ b/test/tables.markdown @@ -28,33 +28,33 @@ Multiline table with caption: - -------------------------------------------------------------- + --------------------------------------------------------------- Centered Left Right Default aligned Header Aligned Aligned - ----------- ---------- ------------ -------------------------- - First row 12.0 Example of a row that - spans multiple lines. + ----------- ---------- ------------ --------------------------- + 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. Multiline table without caption: - -------------------------------------------------------------- + --------------------------------------------------------------- Centered Left Right Default aligned Header Aligned Aligned - ----------- ---------- ------------ -------------------------- - First row 12.0 Example of a row that - spans multiple lines. + ----------- ---------- ------------ --------------------------- + 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: @@ -66,11 +66,11 @@ Multiline table without column headers: - ----------- ---------- ------------ -------------------------- - First row 12.0 Example of a row that - spans multiple lines. + ----------- ---------- ------------ --------------------------- + 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/test/tables.markua b/test/tables.markua new file mode 100644 --- /dev/null +++ b/test/tables.markua @@ -0,0 +1,58 @@ +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. + +Simple table without caption: + +| 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. + +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. + +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. | + +Table without column headers: + +| | | | | +|----:|:----|:---:|----:| +| 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. | diff --git a/test/tables.mediawiki b/test/tables.mediawiki --- a/test/tables.mediawiki +++ b/test/tables.mediawiki @@ -1,146 +1,152 @@ Simple table with caption: -{| +{| class="wikitable" |+ Demonstration of simple table syntax. -!align="right"| Right -! Left -!align="center"| Center +|- +! style="text-align: right;"| Right +! style="text-align: left;"| Left +! style="text-align: center;"| Center ! Default |- -|align="right"| 12 -| 12 -|align="center"| 12 +| style="text-align: right;"| 12 +| style="text-align: left;"| 12 +| style="text-align: center;"| 12 | 12 |- -|align="right"| 123 -| 123 -|align="center"| 123 +| style="text-align: right;"| 123 +| style="text-align: left;"| 123 +| style="text-align: center;"| 123 | 123 |- -|align="right"| 1 -| 1 -|align="center"| 1 +| style="text-align: right;"| 1 +| style="text-align: left;"| 1 +| style="text-align: center;"| 1 | 1 |} Simple table without caption: -{| -!align="right"| Right -! Left -!align="center"| Center +{| class="wikitable" +|- +! style="text-align: right;"| Right +! style="text-align: left;"| Left +! style="text-align: center;"| Center ! Default |- -|align="right"| 12 -| 12 -|align="center"| 12 +| style="text-align: right;"| 12 +| style="text-align: left;"| 12 +| style="text-align: center;"| 12 | 12 |- -|align="right"| 123 -| 123 -|align="center"| 123 +| style="text-align: right;"| 123 +| style="text-align: left;"| 123 +| style="text-align: center;"| 123 | 123 |- -|align="right"| 1 -| 1 -|align="center"| 1 +| style="text-align: right;"| 1 +| style="text-align: left;"| 1 +| style="text-align: center;"| 1 | 1 |} Simple table indented two spaces: -{| +{| class="wikitable" |+ Demonstration of simple table syntax. -!align="right"| Right -! Left -!align="center"| Center +|- +! style="text-align: right;"| Right +! style="text-align: left;"| Left +! style="text-align: center;"| Center ! Default |- -|align="right"| 12 -| 12 -|align="center"| 12 +| style="text-align: right;"| 12 +| style="text-align: left;"| 12 +| style="text-align: center;"| 12 | 12 |- -|align="right"| 123 -| 123 -|align="center"| 123 +| style="text-align: right;"| 123 +| style="text-align: left;"| 123 +| style="text-align: center;"| 123 | 123 |- -|align="right"| 1 -| 1 -|align="center"| 1 +| style="text-align: right;"| 1 +| style="text-align: left;"| 1 +| style="text-align: center;"| 1 | 1 |} Multiline table with caption: -{| +{| class="wikitable" |+ Here’s the caption. It may span multiple lines. -!align="center" width="15%"| Centered Header -!width="13%"| Left Aligned -!align="right" width="16%"| Right Aligned -!width="33%"| Default aligned |- -|align="center"| First -| row -|align="right"| 12.0 -| Example of a row that spans multiple lines. +! style="text-align: center;"| Centered Header +! style="text-align: left;"| Left Aligned +! style="text-align: right;"| Right Aligned +! style="text-align: left;"| Default aligned |- -|align="center"| Second -| row -|align="right"| 5.0 -| Here’s another one. Note the blank line between rows. +| style="text-align: center;"| First +| style="text-align: left;"| row +| style="text-align: right;"| 12.0 +| style="text-align: left;"| Example of a row that spans multiple lines. +|- +| style="text-align: center;"| Second +| style="text-align: left;"| row +| style="text-align: right;"| 5.0 +| style="text-align: left;"| Here’s another one. Note the blank line between rows. |} Multiline table without caption: -{| -!align="center" width="15%"| Centered Header -!width="13%"| Left Aligned -!align="right" width="16%"| Right Aligned -!width="33%"| Default aligned +{| class="wikitable" |- -|align="center"| First -| row -|align="right"| 12.0 -| Example of a row that spans multiple lines. +! style="text-align: center;"| Centered Header +! style="text-align: left;"| Left Aligned +! style="text-align: right;"| Right Aligned +! style="text-align: left;"| Default aligned |- -|align="center"| Second -| row -|align="right"| 5.0 -| Here’s another one. Note the blank line between rows. +| style="text-align: center;"| First +| style="text-align: left;"| row +| style="text-align: right;"| 12.0 +| style="text-align: left;"| Example of a row that spans multiple lines. +|- +| style="text-align: center;"| Second +| style="text-align: left;"| row +| style="text-align: right;"| 5.0 +| style="text-align: left;"| Here’s another one. Note the blank line between rows. |} Table without column headers: -{| -|align="right"| 12 -| 12 -|align="center"| 12 -|align="right"| 12 +{| class="wikitable" |- -|align="right"| 123 -| 123 -|align="center"| 123 -|align="right"| 123 +| style="text-align: right;"| 12 +| style="text-align: left;"| 12 +| style="text-align: center;"| 12 +| style="text-align: right;"| 12 |- -|align="right"| 1 -| 1 -|align="center"| 1 -|align="right"| 1 +| style="text-align: right;"| 123 +| style="text-align: left;"| 123 +| style="text-align: center;"| 123 +| style="text-align: right;"| 123 +|- +| style="text-align: right;"| 1 +| style="text-align: left;"| 1 +| style="text-align: center;"| 1 +| style="text-align: right;"| 1 |} Multiline table without column headers: -{| -|align="center" width="15%"| First -|width="13%"| row -|align="right" width="16%"| 12.0 -|width="33%"| Example of a row that spans multiple lines. +{| class="wikitable" |- -|align="center"| Second -| row -|align="right"| 5.0 +| style="text-align: center;"| First +| style="text-align: left;"| row +| style="text-align: right;"| 12.0 +| Example of a row that spans multiple lines. +|- +| style="text-align: center;"| Second +| style="text-align: left;"| row +| style="text-align: right;"| 5.0 | Here’s another one. Note the blank line between rows. |} - diff --git a/test/tables.ms b/test/tables.ms --- a/test/tables.ms +++ b/test/tables.ms @@ -2,6 +2,7 @@ Simple table with caption: .PP Demonstration of simple table syntax. +.na .TS delim(@@) tab( ); r l c l. @@ -43,9 +44,11 @@ 1 T} .TE +.ad .LP Simple table without caption: .PP +.na .TS delim(@@) tab( ); r l c l. @@ -87,10 +90,12 @@ 1 T} .TE +.ad .LP Simple table indented two spaces: .PP Demonstration of simple table syntax. +.na .TS delim(@@) tab( ); r l c l. @@ -132,13 +137,16 @@ 1 T} .TE +.ad .LP Multiline table with caption: .PP -Here's the caption. It may span multiple lines. +Here\(cqs the caption. It may span multiple lines. +.na +.nr LLold \n[LL] .TS delim(@@) tab( ); -cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). +cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n). T{ Centered Header T} T{ @@ -150,31 +158,43 @@ T} _ T{ +.nr LL 10.5n First T} T{ +.nr LL 9.6n row T} T{ +.nr LL 11.4n 12.0 T} T{ +.nr LL 24.5n Example of a row that spans multiple lines. T} T{ +.nr LL 10.5n Second T} T{ +.nr LL 9.6n row T} T{ +.nr LL 11.4n 5.0 T} T{ -Here's another one. +.nr LL 24.5n +Here\(cqs another one. Note the blank line between rows. T} .TE +.nr LL \n[LLold] +.ad .LP Multiline table without caption: .PP +.na +.nr LLold \n[LL] .TS delim(@@) tab( ); -cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). +cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n). T{ Centered Header T} T{ @@ -186,28 +206,39 @@ T} _ T{ +.nr LL 10.5n First T} T{ +.nr LL 9.6n row T} T{ +.nr LL 11.4n 12.0 T} T{ +.nr LL 24.5n Example of a row that spans multiple lines. T} T{ +.nr LL 10.5n Second T} T{ +.nr LL 9.6n row T} T{ +.nr LL 11.4n 5.0 T} T{ -Here's another one. +.nr LL 24.5n +Here\(cqs another one. Note the blank line between rows. T} .TE +.nr LL \n[LLold] +.ad .LP Table without column headers: .PP +.na .TS delim(@@) tab( ); r l c r. @@ -239,29 +270,42 @@ 1 T} .TE +.ad .LP Multiline table without column headers: .PP +.na +.nr LLold \n[LL] .TS delim(@@) tab( ); -cw(10.5n) lw(9.6n) rw(11.4n) lw(23.6n). +cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n). T{ +.nr LL 10.5n First T} T{ +.nr LL 9.6n row T} T{ +.nr LL 11.4n 12.0 T} T{ +.nr LL 24.5n Example of a row that spans multiple lines. T} T{ +.nr LL 10.5n Second T} T{ +.nr LL 9.6n row T} T{ +.nr LL 11.4n 5.0 T} T{ -Here's another one. +.nr LL 24.5n +Here\(cqs another one. Note the blank line between rows. T} .TE +.nr LL \n[LLold] +.ad diff --git a/test/tables.muse b/test/tables.muse --- a/test/tables.muse +++ b/test/tables.muse @@ -23,17 +23,30 @@ 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. +| - ++:---------:+:---------+-----------:+:--------------------------+ +| Centered | Left | Right | Default aligned | +| Header | Aligned | 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. | ++-----------+----------+------------+---------------------------+ 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 | Left | Right | Default aligned | +| Header | Aligned | 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 @@ -42,5 +55,11 @@ 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/test/tables.native b/test/tables.native --- a/test/tables.native +++ b/test/tables.native @@ -1,114 +1,964 @@ -[Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"] -,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0] - [[Plain [Str "Right"]] - ,[Plain [Str "Left"]] - ,[Plain [Str "Center"]] - ,[Plain [Str "Default"]]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"] -,Table [] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0] - [[Plain [Str "Right"]] - ,[Plain [Str "Left"]] - ,[Plain [Str "Center"]] - ,[Plain [Str "Default"]]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"] -,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0] - [[Plain [Str "Right"]] - ,[Plain [Str "Left"]] - ,[Plain [Str "Center"]] - ,[Plain [Str "Default"]]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"] -,Table [Str "Here\8217s",Space,Str "the",Space,Str "caption.",SoftBreak,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.3375] - [[Plain [Str "Centered",SoftBreak,Str "Header"]] - ,[Plain [Str "Left",SoftBreak,Str "Aligned"]] - ,[Plain [Str "Right",SoftBreak,Str "Aligned"]] - ,[Plain [Str "Default",Space,Str "aligned"]]] - [[[Plain [Str "First"]] - ,[Plain [Str "row"]] - ,[Plain [Str "12.0"]] - ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]] - ,[[Plain [Str "Second"]] - ,[Plain [Str "row"]] - ,[Plain [Str "5.0"]] - ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]] -,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"] -,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.3375] - [[Plain [Str "Centered",SoftBreak,Str "Header"]] - ,[Plain [Str "Left",SoftBreak,Str "Aligned"]] - ,[Plain [Str "Right",SoftBreak,Str "Aligned"]] - ,[Plain [Str "Default",Space,Str "aligned"]]] - [[[Plain [Str "First"]] - ,[Plain [Str "row"]] - ,[Plain [Str "12.0"]] - ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]] - ,[[Plain [Str "Second"]] - ,[Plain [Str "row"]] - ,[Plain [Str "5.0"]] - ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]] -,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"] -,Table [] [AlignRight,AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0,0.0] - [[] - ,[] - ,[] - ,[]] - [[[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]] - ,[Plain [Str "12"]]] - ,[[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]] - ,[Plain [Str "123"]]] - ,[[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]] - ,[Plain [Str "1"]]]] -,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"] -,Table [] [AlignCenter,AlignLeft,AlignRight,AlignDefault] [0.15,0.1375,0.1625,0.3375] - [[] - ,[] - ,[] - ,[]] - [[[Plain [Str "First"]] - ,[Plain [Str "row"]] - ,[Plain [Str "12.0"]] - ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]] - ,[[Plain [Str "Second"]] - ,[Plain [Str "row"]] - ,[Plain [Str "5.0"]] - ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]] +[ Para + [ Str "Simple" + , Space + , Str "table" + , Space + , Str "with" + , Space + , Str "caption:" + ] +, Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Demonstration" + , Space + , Str "of" + , Space + , Str "simple" + , Space + , Str "table" + , Space + , Str "syntax." + ] + ]) + [ ( AlignRight , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Simple" + , Space + , Str "table" + , Space + , Str "without" + , Space + , Str "caption:" + ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignRight , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Simple" + , Space + , Str "table" + , Space + , Str "indented" + , Space + , Str "two" + , Space + , Str "spaces:" + ] +, Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Demonstration" + , Space + , Str "of" + , Space + , Str "simple" + , Space + , Str "table" + , Space + , Str "syntax." + ] + ]) + [ ( AlignRight , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Center" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "with" + , Space + , Str "caption:" + ] +, Table + ( "" , [] , [] ) + (Caption + Nothing + [ Plain + [ Str "Here\8217s" + , Space + , Str "the" + , Space + , Str "caption." + , SoftBreak + , Str "It" + , Space + , Str "may" + , Space + , Str "span" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ]) + [ ( AlignCenter , ColWidth 0.15 ) + , ( AlignLeft , ColWidth 0.1375 ) + , ( AlignRight , ColWidth 0.1625 ) + , ( AlignLeft , ColWidth 0.35 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Centered" , SoftBreak , Str "Header" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" , SoftBreak , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" , SoftBreak , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" , Space , Str "aligned" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Example" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "row" + , Space + , Str "that" + , Space + , Str "spans" + , SoftBreak + , Str "multiple" + , Space + , Str "lines." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Here\8217s" + , Space + , Str "another" + , Space + , Str "one." + , Space + , Str "Note" + , SoftBreak + , Str "the" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , Space + , Str "rows." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "without" + , Space + , Str "caption:" + ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidth 0.15 ) + , ( AlignLeft , ColWidth 0.1375 ) + , ( AlignRight , ColWidth 0.1625 ) + , ( AlignLeft , ColWidth 0.35 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Centered" , SoftBreak , Str "Header" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Left" , SoftBreak , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Right" , SoftBreak , Str "Aligned" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Default" , Space , Str "aligned" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Example" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "row" + , Space + , Str "that" + , Space + , Str "spans" + , SoftBreak + , Str "multiple" + , Space + , Str "lines." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Here\8217s" + , Space + , Str "another" + , Space + , Str "one." + , Space + , Str "Note" + , SoftBreak + , Str "the" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , Space + , Str "rows." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Table" + , Space + , Str "without" + , Space + , Str "column" + , Space + , Str "headers:" + ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignRight , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignRight , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "123" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +, Para + [ Str "Multiline" + , Space + , Str "table" + , Space + , Str "without" + , Space + , Str "column" + , Space + , Str "headers:" + ] +, Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidth 0.15 ) + , ( AlignLeft , ColWidth 0.1375 ) + , ( AlignRight , ColWidth 0.1625 ) + , ( AlignDefault , ColWidth 0.35 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "First" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "12.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Example" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "row" + , Space + , Str "that" + , Space + , Str "spans" + , SoftBreak + , Str "multiple" + , Space + , Str "lines." + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Second" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "row" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5.0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Here\8217s" + , Space + , Str "another" + , Space + , Str "one." + , Space + , Str "Note" + , SoftBreak + , Str "the" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , Space + , Str "rows." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] diff --git a/test/tables.opendocument b/test/tables.opendocument --- a/test/tables.opendocument +++ b/test/tables.opendocument @@ -1,4 +1,6 @@ Simple table with caption: +Demonstration of simple table +syntax. @@ -6,64 +8,63 @@ - + Right - + Left - + Center - + Default - + 12 - + 12 - + 12 - + 12 - + 123 - + 123 - + 123 - + 123 - + 1 - + 1 - + 1 - + 1 -Demonstration of simple table syntax. Simple table without caption: @@ -73,65 +74,67 @@ - + Right - + Left - + Center - + Default - + 12 - + 12 - + 12 - + 12 - + 123 - + 123 - + 123 - + 123 - + 1 - + 1 - + 1 - + 1 Simple table indented two spaces: +Demonstration of simple table +syntax. @@ -139,66 +142,67 @@ - + Right - + Left - + Center - + Default - + 12 - + 12 - + 12 - + 12 - + 123 - + 123 - + 123 - + 123 - + 1 - + 1 - + 1 - + 1 -Demonstration of simple table syntax. Multiline table with caption: +Here’s the caption. It may span multiple +lines. @@ -206,53 +210,51 @@ - + 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. Multiline table without caption: @@ -262,46 +264,46 @@ - + 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. @@ -315,44 +317,44 @@ - + 12 - + 12 - + 12 - + 12 - + 123 - + 123 - + 123 - + 123 - + 1 - + 1 - + 1 - + 1 @@ -365,31 +367,31 @@ - + 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/test/tables.org b/test/tables.org --- a/test/tables.org +++ b/test/tables.org @@ -1,51 +1,51 @@ Simple table with caption: -| Right | Left | Center | Default | -|---------+--------+----------+-----------| -| 12 | 12 | 12 | 12 | -| 123 | 123 | 123 | 123 | -| 1 | 1 | 1 | 1 | -#+CAPTION: Demonstration of simple table syntax. +| Right | Left | Center | Default | +|-------+------+--------+---------| +| 12 | 12 | 12 | 12 | +| 123 | 123 | 123 | 123 | +| 1 | 1 | 1 | 1 | +#+caption: Demonstration of simple table syntax. 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 | -#+CAPTION: Demonstration of simple table syntax. +| Right | Left | Center | Default | +|-------+------+--------+---------| +| 12 | 12 | 12 | 12 | +| 123 | 123 | 123 | 123 | +| 1 | 1 | 1 | 1 | +#+caption: Demonstration of simple table syntax. 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. | -#+CAPTION: Here's the caption. It may span multiple lines. +| 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. | +#+caption: Here's the caption. It may span multiple lines. 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/test/tables.plain b/test/tables.plain --- a/test/tables.plain +++ b/test/tables.plain @@ -28,33 +28,33 @@ Multiline table with caption: - -------------------------------------------------------------- + --------------------------------------------------------------- Centered Left Right Default aligned Header Aligned Aligned - ----------- ---------- ------------ -------------------------- - First row 12.0 Example of a row that - spans multiple lines. + ----------- ---------- ------------ --------------------------- + 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. Multiline table without caption: - -------------------------------------------------------------- + --------------------------------------------------------------- Centered Left Right Default aligned Header Aligned Aligned - ----------- ---------- ------------ -------------------------- - First row 12.0 Example of a row that - spans multiple lines. + ----------- ---------- ------------ --------------------------- + 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: @@ -66,11 +66,11 @@ Multiline table without column headers: - ----------- ---------- ------------ -------------------------- - First row 12.0 Example of a row that - spans multiple lines. + ----------- ---------- ------------ --------------------------- + 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/test/tables.rst b/test/tables.rst --- a/test/tables.rst +++ b/test/tables.rst @@ -2,89 +2,81 @@ .. table:: Demonstration of simple table syntax. - +-------+------+--------+---------+ - | 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 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: .. table:: Demonstration of simple table syntax. - +-------+------+--------+---------+ - | 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 + ===== ==== ====== ======= Multiline table with caption: .. table:: Here’s the caption. It may span multiple lines. - +----------+---------+-----------+-------------------------+ - | Centered | Left | Right | Default aligned | - | Header | Aligned | 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 | Left | Right | Default aligned | + | Header | Aligned | 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. | + +-----------+----------+------------+---------------------------+ Multiline table without caption: -+----------+---------+-----------+-------------------------+ -| Centered | Left | Right | Default aligned | -| Header | Aligned | 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 | Left | Right | Default aligned | +| Header | Aligned | 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/test/tables.rtf b/test/tables.rtf --- a/test/tables.rtf +++ b/test/tables.rtf @@ -187,7 +187,7 @@ {\pard \ql \f0 \sa180 \li0 \fi0 Multiline table with caption:\par} { \trowd \trgaph120 -\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6804 +\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6912 \trkeep\intbl { {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par} @@ -202,7 +202,7 @@ \intbl\row} { \trowd \trgaph120 -\cellx1296\cellx2484\cellx3888\cellx6804 +\cellx1296\cellx2484\cellx3888\cellx6912 \trkeep\intbl { {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par} @@ -217,7 +217,7 @@ \intbl\row} { \trowd \trgaph120 -\cellx1296\cellx2484\cellx3888\cellx6804 +\cellx1296\cellx2484\cellx3888\cellx6912 \trkeep\intbl { {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par} @@ -234,7 +234,7 @@ {\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without caption:\par} { \trowd \trgaph120 -\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6804 +\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6912 \trkeep\intbl { {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par} @@ -249,7 +249,7 @@ \intbl\row} { \trowd \trgaph120 -\cellx1296\cellx2484\cellx3888\cellx6804 +\cellx1296\cellx2484\cellx3888\cellx6912 \trkeep\intbl { {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par} @@ -264,7 +264,7 @@ \intbl\row} { \trowd \trgaph120 -\cellx1296\cellx2484\cellx3888\cellx6804 +\cellx1296\cellx2484\cellx3888\cellx6912 \trkeep\intbl { {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par} @@ -328,7 +328,7 @@ {\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without column headers:\par} { \trowd \trgaph120 -\cellx1296\cellx2484\cellx3888\cellx6804 +\cellx1296\cellx2484\cellx3888\cellx6912 \trkeep\intbl { {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par} @@ -343,7 +343,7 @@ \intbl\row} { \trowd \trgaph120 -\cellx1296\cellx2484\cellx3888\cellx6804 +\cellx1296\cellx2484\cellx3888\cellx6912 \trkeep\intbl { {{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par} @@ -357,4 +357,3 @@ } \intbl\row} {\pard \ql \f0 \sa180 \li0 \fi0 \par} - diff --git a/test/tables.tei b/test/tables.tei --- a/test/tables.tei +++ b/test/tables.tei @@ -123,12 +123,6 @@

    Table without column headers:

    - - - - - -

    12

    12

     @@ -150,12 +144,6 @@

    Multiline table without column headers:

    - - - - - -

    First

    row

     diff --git a/test/tables.texinfo b/test/tables.texinfo --- a/test/tables.texinfo +++ b/test/tables.texinfo @@ -3,7 +3,7 @@ Simple table with caption: -@float +@float Table @multitable {Right} {Left} {Center} {Default} @headitem Right @@ -55,7 +55,7 @@ Simple table indented two spaces: -@float +@float Table @multitable {Right} {Left} {Center} {Default} @headitem Right @@ -82,8 +82,8 @@ @end float Multiline table with caption: -@float -@multitable @columnfractions 0.15 0.14 0.16 0.34 +@float Table +@multitable @columnfractions 0.15 0.14 0.16 0.35 @headitem Centered Header @tab Left Aligned @@ -104,7 +104,7 @@ @end float Multiline table without caption: -@multitable @columnfractions 0.15 0.14 0.16 0.34 +@multitable @columnfractions 0.15 0.14 0.16 0.35 @headitem Centered Header @tab Left Aligned @@ -144,7 +144,7 @@ Multiline table without column headers: -@multitable @columnfractions 0.15 0.14 0.16 0.34 +@multitable @columnfractions 0.15 0.14 0.16 0.35 @item First @tab row diff --git a/test/tables.textile b/test/tables.textile --- a/test/tables.textile +++ b/test/tables.textile @@ -3,7 +3,7 @@
    - + @@ -11,19 +11,19 @@ - + - + - + @@ -44,7 +44,7 @@
    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    - + @@ -52,19 +52,19 @@ - + - + - + @@ -80,9 +80,9 @@ -+ - + @@ -90,13 +90,13 @@ - + - + @@ -111,9 +111,9 @@ -+ - + @@ -121,13 +121,13 @@ - + - + @@ -148,15 +148,15 @@ -+ - + - + @@ -164,4 +164,3 @@
    Demonstration of simple table syntax.
    Right Left Center
    12 12 12 12
    123 123 123 123
    1 1 1
    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    Centered Header Left Aligned Right Aligned
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    First row 12.0 Example of a row that spans multiple lines.
    Second row 5.0
    - diff --git a/test/tables.txt b/test/tables.txt --- a/test/tables.txt +++ b/test/tables.txt @@ -72,4 +72,3 @@ Second row 5.0 Here's another one. Note the blank line between rows. ---------- --------- ----------- --------------------------- - diff --git a/test/tables.typst b/test/tables.typst new file mode 100644 --- /dev/null +++ b/test/tables.typst @@ -0,0 +1,105 @@ +Simple table with caption: + +#figure( + align(center)[#table( + columns: 4, + align: (right,left,center,auto,), + table.header([Right], [Left], [Center], [Default],), + table.hline(), + [12], [12], [12], [12], + [123], [123], [123], [123], + [1], [1], [1], [1], + )] + , caption: [Demonstration of simple table syntax.] + , kind: table + ) + +Simple table without caption: + +#figure( + align(center)[#table( + columns: 4, + align: (right,left,center,auto,), + table.header([Right], [Left], [Center], [Default],), + table.hline(), + [12], [12], [12], [12], + [123], [123], [123], [123], + [1], [1], [1], [1], + )] + , kind: table + ) + +Simple table indented two spaces: + +#figure( + align(center)[#table( + columns: 4, + align: (right,left,center,auto,), + table.header([Right], [Left], [Center], [Default],), + table.hline(), + [12], [12], [12], [12], + [123], [123], [123], [123], + [1], [1], [1], [1], + )] + , caption: [Demonstration of simple table syntax.] + , kind: table + ) + +Multiline table with caption: + +#figure( + align(center)[#table( + columns: (15%, 13.75%, 16.25%, 35%), + align: (center,left,right,left,), + table.header([Centered Header], [Left Aligned], [Right Aligned], [Default + aligned],), + table.hline(), + [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.], + )] + , caption: [Here's the caption. It may span multiple lines.] + , kind: table + ) + +Multiline table without caption: + +#figure( + align(center)[#table( + columns: (15%, 13.75%, 16.25%, 35%), + align: (center,left,right,left,), + table.header([Centered Header], [Left Aligned], [Right Aligned], [Default + aligned],), + table.hline(), + [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.], + )] + , kind: table + ) + +Table without column headers: + +#figure( + align(center)[#table( + columns: 4, + align: (right,left,center,right,), + [12], [12], [12], [12], + [123], [123], [123], [123], + [1], [1], [1], [1], + )] + , kind: table + ) + +Multiline table without column headers: + +#figure( + align(center)[#table( + columns: (15%, 13.75%, 16.25%, 35%), + align: (center,left,right,auto,), + [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.], + )] + , kind: table + ) diff --git a/test/tables.vimdoc b/test/tables.vimdoc new file mode 100644 --- /dev/null +++ b/test/tables.vimdoc @@ -0,0 +1,65 @@ +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. + +Simple table without caption: + + 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. + +Multiline table with caption: + + Centered Left Right Default aligned + Header Aligned 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. + +Multiline table without caption: + + Centered Left Right Default aligned + Header Aligned 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 + +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. diff --git a/test/tables.xwiki b/test/tables.xwiki new file mode 100644 --- /dev/null +++ b/test/tables.xwiki @@ -0,0 +1,45 @@ +Simple table with caption: + +|=Right |=Left |=Center |=Default +|12 |12 |12 |12 +|123 |123 |123 |123 +|1 |1 |1 |1 + +Simple table without caption: + +|=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 + +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. + +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. + +Table without column headers: + +|= |= |= |= +|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. diff --git a/test/tables.zimwiki b/test/tables.zimwiki --- a/test/tables.zimwiki +++ b/test/tables.zimwiki @@ -53,4 +53,3 @@ |:--------:|:----|-----:|-----------------------------------------------------| | 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/test/tables/nordics.html4 b/test/tables/nordics.html4 new file mode 100644 --- /dev/null +++ b/test/tables/nordics.html4 @@ -0,0 +1,59 @@ + + ++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    States belonging to the Nordics.
    NameCapitalPopulation
    +(in 2018)    		Area
    +(in km2)
    DenmarkCopenhagen5,809,50243,094
    FinlandHelsinki5,537,364338,145
    IcelandReykjavik343,518103,000
    NorwayOslo5,372,191323,802
    SwedenStockholm10,313,447450,295
    Total27,376,0221,258,336
    diff --git a/test/tables/nordics.html5 b/test/tables/nordics.html5 new file mode 100644 --- /dev/null +++ b/test/tables/nordics.html5 @@ -0,0 +1,59 @@ + + ++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    States belonging to the Nordics.
    NameCapitalPopulation
    +(in 2018)    		Area
    +(in km2)
    DenmarkCopenhagen5,809,50243,094
    FinlandHelsinki5,537,364338,145
    IcelandReykjavik343,518103,000
    NorwayOslo5,372,191323,802
    SwedenStockholm10,313,447450,295
    Total27,376,0221,258,336
    diff --git a/test/tables/nordics.jats_archiving b/test/tables/nordics.jats_archiving new file mode 100644 --- /dev/null +++ b/test/tables/nordics.jats_archiving @@ -0,0 +1,56 @@ + + +

    States belonging to the Nordics.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameCapitalPopulation(in 2018)Area(in km2)
    Total27,376,0221,258,336
    DenmarkCopenhagen5,809,50243,094
    FinlandHelsinki5,537,364338,145
    IcelandReykjavik343,518103,000
    NorwayOslo5,372,191323,802
    SwedenStockholm10,313,447450,295
    +     diff --git a/test/tables/nordics.latex b/test/tables/nordics.latex new file mode 100644 --- /dev/null +++ b/test/tables/nordics.latex @@ -0,0 +1,45 @@ +\begin{longtable}[]{@{} + >{\centering\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.3000}} + >{\raggedright\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.3000}} + >{\raggedright\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.2000}} + >{\raggedright\arraybackslash}p{(\linewidth - 6\tabcolsep) * \real{0.2000}}@{}} +\caption[Nordic countries]{States belonging to the +\emph{Nordics.}}\label{nordics}\tabularnewline +\toprule\noalign{} +\begin{minipage}[b]{\linewidth}\centering +Name +\end{minipage} & \begin{minipage}[b]{\linewidth}\centering +Capital +\end{minipage} & \begin{minipage}[b]{\linewidth}\centering +Population\\ +(in 2018)\strut +\end{minipage} & \begin{minipage}[b]{\linewidth}\centering +Area\\ +(in km\textsuperscript{2})\strut +\end{minipage} \\ +\midrule\noalign{} +\endfirsthead +\toprule\noalign{} +\begin{minipage}[b]{\linewidth}\centering +Name +\end{minipage} & \begin{minipage}[b]{\linewidth}\centering +Capital +\end{minipage} & \begin{minipage}[b]{\linewidth}\centering +Population\\ +(in 2018)\strut +\end{minipage} & \begin{minipage}[b]{\linewidth}\centering +Area\\ +(in km\textsuperscript{2})\strut +\end{minipage} \\ +\midrule\noalign{} +\endhead +\midrule\noalign{} +Total & & 27,376,022 & 1,258,336 \\ +\bottomrule\noalign{} +\endlastfoot +Denmark & Copenhagen & 5,809,502 & 43,094 \\ +Finland & Helsinki & 5,537,364 & 338,145 \\ +Iceland & Reykjavik & 343,518 & 103,000 \\ +Norway & Oslo & 5,372,191 & 323,802 \\ +Sweden & Stockholm & 10,313,447 & 450,295 \\ +\end{longtable} diff --git a/test/tables/nordics.markdown b/test/tables/nordics.markdown new file mode 100644 --- /dev/null +++ b/test/tables/nordics.markdown @@ -0,0 +1,18 @@ ++-----------------------+-----------------------+---------------+---------------+ +| Name | Capital | Population\ | Area\ | +| | | (in 2018) | (in km^2^) | ++:=====================:+:======================+:==============+:==============+ +| Denmark | Copenhagen | 5,809,502 | 43,094 | ++-----------------------+-----------------------+---------------+---------------+ +| Finland | Helsinki | 5,537,364 | 338,145 | ++-----------------------+-----------------------+---------------+---------------+ +| Iceland | Reykjavik | 343,518 | 103,000 | ++-----------------------+-----------------------+---------------+---------------+ +| Norway | Oslo | 5,372,191 | 323,802 | ++-----------------------+-----------------------+---------------+---------------+ +| Sweden | Stockholm | 10,313,447 | 450,295 | ++=======================+=======================+===============+===============+ +| Total | | 27,376,022 | 1,258,336 | ++=======================+=======================+===============+===============+ + +: States belonging to the *Nordics.* {#nordics source="wikipedia"} diff --git a/test/tables/nordics.mediawiki b/test/tables/nordics.mediawiki new file mode 100644 --- /dev/null +++ b/test/tables/nordics.mediawiki @@ -0,0 +1,40 @@ +{| id="nordics" class="wikitable" data-source="wikipedia" +|+ States belonging to the ''Nordics.'' +|- +! style="text-align: center;"| Name +! style="text-align: center;"| Capital +! style="text-align: center;"| Population
    +(in 2018) +! style="text-align: center;"| Area
    +(in km2) +|- class="country" +! style="text-align: center;"| Denmark +| style="text-align: left;"| Copenhagen +| style="text-align: left;"| 5,809,502 +| style="text-align: left;"| 43,094 +|- class="country" +! style="text-align: center;"| Finland +| style="text-align: left;"| Helsinki +| style="text-align: left;"| 5,537,364 +| style="text-align: left;"| 338,145 +|- class="country" +! style="text-align: center;"| Iceland +| style="text-align: left;"| Reykjavik +| style="text-align: left;"| 343,518 +| style="text-align: left;"| 103,000 +|- class="country" +! style="text-align: center;"| Norway +| style="text-align: left;"| Oslo +| style="text-align: left;"| 5,372,191 +| style="text-align: left;"| 323,802 +|- class="country" +! style="text-align: center;"| Sweden +| style="text-align: left;"| Stockholm +| style="text-align: left;"| 10,313,447 +| style="text-align: left;"| 450,295 +|- id="summary" +! style="text-align: center;"| Total +! style="text-align: left;"| +! id="total-population" style="text-align: left;"| 27,376,022 +! id="total-area" style="text-align: left;"| 1,258,336 +|} diff --git a/test/tables/nordics.native b/test/tables/nordics.native new file mode 100644 --- /dev/null +++ b/test/tables/nordics.native @@ -0,0 +1,73 @@ +[Table ("nordics",[],[("source","wikipedia")]) (Caption (Just [Str "Nordic",Space,Str "countries"]) + [Para [Str "States",Space,Str "belonging",Space,Str "to",Space,Str "the",Space,Emph [Str "Nordics."]]]) + [(AlignCenter,ColWidth 0.3) + ,(AlignLeft,ColWidth 0.3) + ,(AlignLeft,ColWidth 0.2) + ,(AlignLeft,ColWidth 0.2)] + (TableHead ("",["simple-head"],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) + [Plain [Str "Name"]] + ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) + [Plain [Str "Capital"]] + ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) + [Plain [Str "Population",LineBreak,Str "(in",Space,Str "2018)"]] + ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) + [Plain [Str "Area",LineBreak,Str "(in",Space,Str "km",Superscript [Str "2"],Str ")"]]]]) + [(TableBody ("",["souvereign-states"],[]) (RowHeadColumns 1) + [] + [Row ("",["country"],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Denmark"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Copenhagen"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5,809,502"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "43,094"]]] + ,Row ("",["country"],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Finland"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Helsinki"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5,537,364"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "338,145"]]] + ,Row ("",["country"],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Iceland"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Reykjavik"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "343,518"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "103,000"]]] + ,Row ("",["country"],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Norway"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Oslo"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5,372,191"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "323,802"]]] + ,Row ("",["country"],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Sweden"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Stockholm"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "10,313,447"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "450,295"]]]])] + (TableFoot ("",[],[]) + [Row ("summary",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Total"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [] + ,Cell ("total-population",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "27,376,022"]] + ,Cell ("total-area",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1,258,336"]]]])] diff --git a/test/tables/nordics.typst b/test/tables/nordics.typst new file mode 100644 --- /dev/null +++ b/test/tables/nordics.typst @@ -0,0 +1,21 @@ +#figure( + align(center)[#table( + columns: (30%, 30%, 20%, 20%), + align: (center,left,left,left,), + table.header(table.cell(align: center)[Name], table.cell(align: center)[Capital], table.cell(align: center)[Population + \ (in 2018)], table.cell(align: center)[Area \ (in km#super[2])],), + table.hline(), + [Denmark], [Copenhagen], [5,809,502], [43,094], + [Finland], [Helsinki], [5,537,364], [338,145], + [Iceland], [Reykjavik], [343,518], [103,000], + [Norway], [Oslo], [5,372,191], [323,802], + [Sweden], [Stockholm], [10,313,447], [450,295], + table.hline(), + table.footer([Total], [], [27,376,022], [1,258,336],), + )] + , caption: [States belonging to the #emph[Nordics.] + + ] + , kind: table + ) + diff --git a/test/tables/planets.html4 b/test/tables/planets.html4 new file mode 100644 --- /dev/null +++ b/test/tables/planets.html4 @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Data about the planets of our solar system.

    NameMass (10^24kg)Diameter (km)Density (kg/m^3)Gravity (m/s^2)Length of day (hours)Distance from Sun (10^6km)Mean temperature (C)Number of moonsNotes
    Terrestrial planetsMercury0.3304,87954273.74222.657.91670Closest to the Sun
    Venus4.8712,10452438.92802.0108.24640
    Earth5.9712,75655149.824.0149.6151Our world
    Mars0.6426,79239333.724.7227.9-652The red planet
    Jovian planetsGas giantsJupiter1898142,984132623.19.9778.6-11067The largest planet
    Saturn568120,5366879.010.71433.5-14062
    Ice giantsUranus86.851,11812718.717.22872.5-19527
    Neptune10249,528163811.016.14495.1-20014
    Dwarf planetsPluto0.01462,37020950.7153.35906.4-2255Declassified as a planet in 2006.
    diff --git a/test/tables/planets.html5 b/test/tables/planets.html5 new file mode 100644 --- /dev/null +++ b/test/tables/planets.html5 @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Data about the planets of our solar system.

    NameMass (10^24kg)Diameter (km)Density (kg/m^3)Gravity (m/s^2)Length of day (hours)Distance from Sun (10^6km)Mean temperature (C)Number of moonsNotes
    Terrestrial planetsMercury0.3304,87954273.74222.657.91670Closest to the Sun
    Venus4.8712,10452438.92802.0108.24640
    Earth5.9712,75655149.824.0149.6151Our world
    Mars0.6426,79239333.724.7227.9-652The red planet
    Jovian planetsGas giantsJupiter1898142,984132623.19.9778.6-11067The largest planet
    Saturn568120,5366879.010.71433.5-14062
    Ice giantsUranus86.851,11812718.717.22872.5-19527
    Neptune10249,528163811.016.14495.1-20014
    Dwarf planetsPluto0.01462,37020950.7153.35906.4-2255Declassified as a planet in 2006.
    diff --git a/test/tables/planets.jats_archiving b/test/tables/planets.jats_archiving new file mode 100644 --- /dev/null +++ b/test/tables/planets.jats_archiving @@ -0,0 +1,128 @@ + + +

    Data about the planets of our solar system.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NameMass (10^24kg)Diameter (km)Density (kg/m^3)Gravity (m/s^2)Length of day (hours)Distance from Sun (10^6km)Mean temperature (C)Number of moonsNotes
    Terrestrial planetsMercury0.3304,87954273.74222.657.91670Closest to the Sun
    Venus4.8712,10452438.92802.0108.24640
    Earth5.9712,75655149.824.0149.6151Our world
    Mars0.6426,79239333.724.7227.9-652The red planet
    Jovian planetsGas giantsJupiter1898142,984132623.19.9778.6-11067The largest planet
    Saturn568120,5366879.010.71433.5-14062
    Ice giantsUranus86.851,11812718.717.22872.5-19527
    Neptune10249,528163811.016.14495.1-20014
    Dwarf planetsPluto0.01462,37020950.7153.35906.4-2255Declassified as a planet in 2006.
    +     diff --git a/test/tables/planets.latex b/test/tables/planets.latex new file mode 100644 --- /dev/null +++ b/test/tables/planets.latex @@ -0,0 +1,36 @@ +\begin{longtable}[]{@{}cclrrrrrrrrl@{}} +\caption{Data about the planets of our solar system.}\tabularnewline +\toprule\noalign{} +\multicolumn{2}{@{}c}{% +} & Name & Mass (10\^{}24kg) & Diameter (km) & Density (kg/m\^{}3) & Gravity +(m/s\^{}2) & Length of day (hours) & Distance from Sun (10\^{}6km) & Mean +temperature (C) & Number of moons & Notes \\ +\midrule\noalign{} +\endfirsthead +\toprule\noalign{} +\multicolumn{2}{@{}c}{% +} & Name & Mass (10\^{}24kg) & Diameter (km) & Density (kg/m\^{}3) & Gravity +(m/s\^{}2) & Length of day (hours) & Distance from Sun (10\^{}6km) & Mean +temperature (C) & Number of moons & Notes \\ +\midrule\noalign{} +\endhead +\bottomrule\noalign{} +\endlastfoot +\multicolumn{2}{@{}c}{% +\multirow{4}{*}{\centering\arraybackslash Terrestrial planets}} & Mercury & +0.330 & 4,879 & 5427 & 3.7 & 4222.6 & 57.9 & 167 & 0 & Closest to the Sun \\ +& & Venus & 4.87 & 12,104 & 5243 & 8.9 & 2802.0 & 108.2 & 464 & 0 & \\ +& & Earth & 5.97 & 12,756 & 5514 & 9.8 & 24.0 & 149.6 & 15 & 1 & Our world \\ +& & Mars & 0.642 & 6,792 & 3933 & 3.7 & 24.7 & 227.9 & -65 & 2 & The red +planet \\ +\multirow{4}{*}{\centering\arraybackslash Jovian planets} & +\multirow{2}{*}{\centering\arraybackslash Gas giants} & Jupiter & 1898 & 142,984 +& 1326 & 23.1 & 9.9 & 778.6 & -110 & 67 & The largest planet \\ +& & Saturn & 568 & 120,536 & 687 & 9.0 & 10.7 & 1433.5 & -140 & 62 & \\ +& \multirow{2}{*}{\centering\arraybackslash Ice giants} & Uranus & 86.8 & 51,118 +& 1271 & 8.7 & 17.2 & 2872.5 & -195 & 27 & \\ +& & Neptune & 102 & 49,528 & 1638 & 11.0 & 16.1 & 4495.1 & -200 & 14 & \\ +\multicolumn{2}{@{}c}{% +Dwarf planets} & Pluto & 0.0146 & 2,370 & 2095 & 0.7 & 153.3 & 5906.4 & -225 & 5 +& Declassified as a planet in 2006. \\ +\end{longtable} diff --git a/test/tables/planets.markdown b/test/tables/planets.markdown new file mode 100644 --- /dev/null +++ b/test/tables/planets.markdown @@ -0,0 +1,31 @@ ++------------------+---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ +| | Name | Mass | Diameter | Density | Gravity | Length | Distance | Mean | Number | Notes | +| | | (10\^24kg) | (km) | (kg/m\^3) | (m/s\^2) | of day | from Sun | temperature | of | | +| | | | | | | (hours) | (10\^6km) | (C) | moons | | ++:=======:+:======:+=========+===========:+=========:+==========:+=========:+========:+==========:+============:+=======:+==============+ +| Terrestrial | Mercury | 0.330 | 4,879 | 5427 | 3.7 | 4222.6 | 57.9 | 167 | 0 | Closest to | +| planets | | | | | | | | | | the Sun | +| +---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ +| | Venus | 4.87 | 12,104 | 5243 | 8.9 | 2802.0 | 108.2 | 464 | 0 | | +| +---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ +| | Earth | 5.97 | 12,756 | 5514 | 9.8 | 24.0 | 149.6 | 15 | 1 | Our world | +| +---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ +| | Mars | 0.642 | 6,792 | 3933 | 3.7 | 24.7 | 227.9 | -65 | 2 | The red | +| | | | | | | | | | | planet | ++---------+--------+---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ +| Jovian | Gas | Jupiter | 1898 | 142,984 | 1326 | 23.1 | 9.9 | 778.6 | -110 | 67 | The largest | +| planets | giants | | | | | | | | | | planet | +| | +---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ +| | | Saturn | 568 | 120,536 | 687 | 9.0 | 10.7 | 1433.5 | -140 | 62 | | +| +--------+---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ +| | Ice | Uranus | 86.8 | 51,118 | 1271 | 8.7 | 17.2 | 2872.5 | -195 | 27 | | +| | giants | | | | | | | | | | | +| | +---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ +| | | Neptune | 102 | 49,528 | 1638 | 11.0 | 16.1 | 4495.1 | -200 | 14 | | ++---------+--------+---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ +| Dwarf planets | Pluto | 0.0146 | 2,370 | 2095 | 0.7 | 153.3 | 5906.4 | -225 | 5 | Declassified | +| | | | | | | | | | | as a planet | +| | | | | | | | | | | in 2006. | ++------------------+---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+ + +: Data about the planets of our solar system. diff --git a/test/tables/planets.mediawiki b/test/tables/planets.mediawiki new file mode 100644 --- /dev/null +++ b/test/tables/planets.mediawiki @@ -0,0 +1,119 @@ +{| class="wikitable" +|+ Data about the planets of our solar system. +|- +! colspan="2" style="text-align: center;"| +! Name +! style="text-align: right;"| Mass (10^24kg) +! style="text-align: right;"| Diameter (km) +! style="text-align: right;"| Density (kg/m^3) +! style="text-align: right;"| Gravity (m/s^2) +! style="text-align: right;"| Length of day (hours) +! style="text-align: right;"| Distance from Sun (10^6km) +! style="text-align: right;"| Mean temperature (C) +! style="text-align: right;"| Number of moons +! Notes +|- +! rowspan="4" colspan="2" style="text-align: center;"| Terrestrial planets +! Mercury +| style="text-align: right;"| 0.330 +| style="text-align: right;"| 4,879 +| style="text-align: right;"| 5427 +| style="text-align: right;"| 3.7 +| style="text-align: right;"| 4222.6 +| style="text-align: right;"| 57.9 +| style="text-align: right;"| 167 +| style="text-align: right;"| 0 +| Closest to the Sun +|- +! Venus +| style="text-align: right;"| 4.87 +| style="text-align: right;"| 12,104 +| style="text-align: right;"| 5243 +| style="text-align: right;"| 8.9 +| style="text-align: right;"| 2802.0 +| style="text-align: right;"| 108.2 +| style="text-align: right;"| 464 +| style="text-align: right;"| 0 +| +|- +! Earth +| style="text-align: right;"| 5.97 +| style="text-align: right;"| 12,756 +| style="text-align: right;"| 5514 +| style="text-align: right;"| 9.8 +| style="text-align: right;"| 24.0 +| style="text-align: right;"| 149.6 +| style="text-align: right;"| 15 +| style="text-align: right;"| 1 +| Our world +|- +! Mars +| style="text-align: right;"| 0.642 +| style="text-align: right;"| 6,792 +| style="text-align: right;"| 3933 +| style="text-align: right;"| 3.7 +| style="text-align: right;"| 24.7 +| style="text-align: right;"| 227.9 +| style="text-align: right;"| -65 +| style="text-align: right;"| 2 +| The red planet +|- +! rowspan="4" style="text-align: center;"| Jovian planets +! rowspan="2" style="text-align: center;"| Gas giants +! Jupiter +| style="text-align: right;"| 1898 +| style="text-align: right;"| 142,984 +| style="text-align: right;"| 1326 +| style="text-align: right;"| 23.1 +| style="text-align: right;"| 9.9 +| style="text-align: right;"| 778.6 +| style="text-align: right;"| -110 +| style="text-align: right;"| 67 +| The largest planet +|- +! Saturn +| style="text-align: right;"| 568 +| style="text-align: right;"| 120,536 +| style="text-align: right;"| 687 +| style="text-align: right;"| 9.0 +| style="text-align: right;"| 10.7 +| style="text-align: right;"| 1433.5 +| style="text-align: right;"| -140 +| style="text-align: right;"| 62 +| +|- +! rowspan="2" style="text-align: center;"| Ice giants +! Uranus +| style="text-align: right;"| 86.8 +| style="text-align: right;"| 51,118 +| style="text-align: right;"| 1271 +| style="text-align: right;"| 8.7 +| style="text-align: right;"| 17.2 +| style="text-align: right;"| 2872.5 +| style="text-align: right;"| -195 +| style="text-align: right;"| 27 +| +|- +! Neptune +| style="text-align: right;"| 102 +| style="text-align: right;"| 49,528 +| style="text-align: right;"| 1638 +| style="text-align: right;"| 11.0 +| style="text-align: right;"| 16.1 +| style="text-align: right;"| 4495.1 +| style="text-align: right;"| -200 +| style="text-align: right;"| 14 +| +|- +! colspan="2" style="text-align: center;"| Dwarf planets +! Pluto +| style="text-align: right;"| 0.0146 +| style="text-align: right;"| 2,370 +| style="text-align: right;"| 2095 +| style="text-align: right;"| 0.7 +| style="text-align: right;"| 153.3 +| style="text-align: right;"| 5906.4 +| style="text-align: right;"| -225 +| style="text-align: right;"| 5 +| Declassified as a planet in 2006. +|} diff --git a/test/tables/planets.native b/test/tables/planets.native new file mode 100644 --- /dev/null +++ b/test/tables/planets.native @@ -0,0 +1,241 @@ +[Table ("",[],[]) (Caption Nothing + [Para [Str "Data",Space,Str "about",Space,Str "the",Space,Str "planets",Space,Str "of",Space,Str "our",Space,Str "solar",Space,Str "system."]]) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 2) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Name"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Mass",Space,Str "(10^24kg)"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Diameter",Space,Str "(km)"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Density",Space,Str "(kg/m^3)"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Gravity",Space,Str "(m/s^2)"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Length",Space,Str "of",Space,Str "day",Space,Str "(hours)"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Distance",Space,Str "from",Space,Str "Sun",Space,Str "(10^6km)"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Mean",Space,Str "temperature",Space,Str "(C)"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Number",Space,Str "of",Space,Str "moons"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Notes"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 3) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 4) (ColSpan 2) + [Plain [Str "Terrestrial",Space,Str "planets"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Mercury"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "0.330"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "4,879"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5427"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "3.7"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "4222.6"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "57.9"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "167"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Closest",Space,Str "to",Space,Str "the",Space,Str "Sun"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Venus"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "4.87"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12,104"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5243"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "8.9"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "2802.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "108.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "464"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Earth"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5.97"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12,756"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5514"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "9.8"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "24.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "149.6"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "15"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Our",Space,Str "world"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Mars"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "0.642"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "6,792"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "3933"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "3.7"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "24.7"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "227.9"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "-65"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "The",Space,Str "red",Space,Str "planet"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 4) (ColSpan 1) + [Plain [Str "Jovian",Space,Str "planets"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 2) (ColSpan 1) + [Plain [Str "Gas",Space,Str "giants"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Jupiter"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1898"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "142,984"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1326"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "23.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "9.9"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "778.6"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "-110"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "67"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "The",Space,Str "largest",Space,Str "planet"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Saturn"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "568"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "120,536"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "687"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "9.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "10.7"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1433.5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "-140"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "62"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 2) (ColSpan 1) + [Plain [Str "Ice",Space,Str "giants"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Uranus"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "86.8"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "51,118"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1271"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "8.7"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "17.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "2872.5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "-195"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "27"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Neptune"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "102"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "49,528"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1638"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "11.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "16.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "4495.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "-200"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "14"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 2) + [Plain [Str "Dwarf",Space,Str "planets"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Pluto"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "0.0146"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "2,370"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "2095"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "0.7"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "153.3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5906.4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "-225"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Declassified",Space,Str "as",Space,Str "a",Space,Str "planet",Space,Str "in",Space,Str "2006."]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/tables/planets.typst b/test/tables/planets.typst new file mode 100644 --- /dev/null +++ b/test/tables/planets.typst @@ -0,0 +1,33 @@ +#figure( + align(center)[#table( + columns: 12, + align: (center,center,auto,right,right,right,right,right,right,right,right,auto,), + table.header(table.cell(colspan: 2)[], [Name], [Mass (10^24kg)], [Diameter + (km)], [Density (kg/m^3)], [Gravity (m/s^2)], [Length of day + (hours)], [Distance from Sun (10^6km)], [Mean temperature (C)], [Number of + moons], [Notes],), + table.hline(), + table.cell(rowspan: 4, colspan: 2)[Terrestrial + planets], [Mercury], [0.330], [4,879], [5427], [3.7], [4222.6], [57.9], [167], [0], [Closest + to the Sun], + [Venus], [4.87], [12,104], [5243], [8.9], [2802.0], [108.2], [464], [0], [], + [Earth], [5.97], [12,756], [5514], [9.8], [24.0], [149.6], [15], [1], [Our + world], + [Mars], [0.642], [6,792], [3933], [3.7], [24.7], [227.9], [-65], [2], [The + red planet], + table.cell(rowspan: 4)[Jovian planets], table.cell(rowspan: 2)[Gas + giants], [Jupiter], [1898], [142,984], [1326], [23.1], [9.9], [778.6], [-110], [67], [The + largest planet], + [Saturn], [568], [120,536], [687], [9.0], [10.7], [1433.5], [-140], [62], [], + table.cell(rowspan: 2)[Ice + giants], [Uranus], [86.8], [51,118], [1271], [8.7], [17.2], [2872.5], [-195], [27], [], + [Neptune], [102], [49,528], [1638], [11.0], [16.1], [4495.1], [-200], [14], [], + table.cell(colspan: 2)[Dwarf + planets], [Pluto], [0.0146], [2,370], [2095], [0.7], [153.3], [5906.4], [-225], [5], [Declassified + as a planet in 2006.], + )] + , caption: [Data about the planets of our solar system. + + ] + , kind: table + ) diff --git a/test/tables/students.html4 b/test/tables/students.html4 new file mode 100644 --- /dev/null +++ b/test/tables/students.html4 @@ -0,0 +1,55 @@ + + ++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    List of Students
    Student IDName
    Computer Science
    3741255Jones, Martha
    4077830Pierce, Benjamin
    5151701Kirk, James
    Russian Literature
    3971244Nim, Victor
    Astrophysics
    4100332Petrov, Alexandra
    4100332Toyota, Hiroko
    diff --git a/test/tables/students.html5 b/test/tables/students.html5 new file mode 100644 --- /dev/null +++ b/test/tables/students.html5 @@ -0,0 +1,55 @@ + + ++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    List of Students
    Student IDName
    Computer Science
    3741255Jones, Martha
    4077830Pierce, Benjamin
    5151701Kirk, James
    Russian Literature
    3971244Nim, Victor
    Astrophysics
    4100332Petrov, Alexandra
    4100332Toyota, Hiroko
    diff --git a/test/tables/students.jats_archiving b/test/tables/students.jats_archiving new file mode 100644 --- /dev/null +++ b/test/tables/students.jats_archiving @@ -0,0 +1,56 @@ + + +

    List of Students

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Student IDName
    Computer Science
    3741255Jones, Martha
    4077830Pierce, Benjamin
    5151701Kirk, James
    Russian Literature
    3971244Nim, Victor
    Astrophysics
    4100332Petrov, Alexandra
    4100332Toyota, Hiroko
    +     diff --git a/test/tables/students.latex b/test/tables/students.latex new file mode 100644 --- /dev/null +++ b/test/tables/students.latex @@ -0,0 +1,35 @@ +\begin{longtable}[]{@{} + >{\raggedright\arraybackslash}p{(\linewidth - 2\tabcolsep) * \real{0.5000}} + >{\raggedright\arraybackslash}p{(\linewidth - 2\tabcolsep) * \real{0.5000}}@{}} +\caption{List of Students}\label{students}\tabularnewline +\toprule\noalign{} +\begin{minipage}[b]{\linewidth}\centering +Student ID +\end{minipage} & \begin{minipage}[b]{\linewidth}\centering +Name +\end{minipage} \\ +\midrule\noalign{} +\endfirsthead +\toprule\noalign{} +\begin{minipage}[b]{\linewidth}\centering +Student ID +\end{minipage} & \begin{minipage}[b]{\linewidth}\centering +Name +\end{minipage} \\ +\midrule\noalign{} +\endhead +\bottomrule\noalign{} +\endlastfoot +\multicolumn{2}{@{}>{\raggedright\arraybackslash}p{(\linewidth - 2\tabcolsep) * \real{1.0000} + 2\tabcolsep}@{}}{% +Computer Science} \\ +3741255 & Jones, Martha \\ +4077830 & Pierce, Benjamin \\ +5151701 & Kirk, James \\ +\multicolumn{2}{@{}>{\raggedright\arraybackslash}p{(\linewidth - 2\tabcolsep) * \real{1.0000} + 2\tabcolsep}@{}}{% +Russian Literature} \\ +3971244 & Nim, Victor \\ +\multicolumn{2}{@{}>{\raggedright\arraybackslash}p{(\linewidth - 2\tabcolsep) * \real{1.0000} + 2\tabcolsep}@{}}{% +Astrophysics} \\ +4100332 & Petrov, Alexandra \\ +4100332 & Toyota, Hiroko \\ +\end{longtable} diff --git a/test/tables/students.markdown b/test/tables/students.markdown new file mode 100644 --- /dev/null +++ b/test/tables/students.markdown @@ -0,0 +1,23 @@ ++-----------------------------------------+-----------------------------------------+ +| Student ID | Name | ++:========================================+:========================================+ +| Computer Science | ++-----------------------------------------+-----------------------------------------+ +| 3741255 | Jones, Martha | ++-----------------------------------------+-----------------------------------------+ +| 4077830 | Pierce, Benjamin | ++-----------------------------------------+-----------------------------------------+ +| 5151701 | Kirk, James | ++-----------------------------------------+-----------------------------------------+ +| Russian Literature | ++-----------------------------------------+-----------------------------------------+ +| 3971244 | Nim, Victor | ++-----------------------------------------+-----------------------------------------+ +| Astrophysics | ++-----------------------------------------+-----------------------------------------+ +| 4100332 | Petrov, Alexandra | ++-----------------------------------------+-----------------------------------------+ +| 4100332 | Toyota, Hiroko | ++-----------------------------------------+-----------------------------------------+ + +: List of Students {#students source="mdn"} diff --git a/test/tables/students.mediawiki b/test/tables/students.mediawiki new file mode 100644 --- /dev/null +++ b/test/tables/students.mediawiki @@ -0,0 +1,30 @@ +{| id="students" class="wikitable" data-source="mdn" +|+ List of Students +|- +! style="text-align: center;"| Student ID +! style="text-align: center;"| Name +|- +! colspan="2" style="text-align: left;"| Computer Science +|- +| style="text-align: left;"| 3741255 +| style="text-align: left;"| Jones, Martha +|- +| style="text-align: left;"| 4077830 +| style="text-align: left;"| Pierce, Benjamin +|- +| style="text-align: left;"| 5151701 +| style="text-align: left;"| Kirk, James +|- +! colspan="2" style="text-align: left;"| Russian Literature +|- +| style="text-align: left;"| 3971244 +| style="text-align: left;"| Nim, Victor +|- +! colspan="2" style="text-align: left;"| Astrophysics +|- +| style="text-align: left;"| 4100332 +| style="text-align: left;"| Petrov, Alexandra +|- +| style="text-align: left;"| 4100332 +| style="text-align: left;"| Toyota, Hiroko +|} diff --git a/test/tables/students.native b/test/tables/students.native new file mode 100644 --- /dev/null +++ b/test/tables/students.native @@ -0,0 +1,54 @@ +[Table ("students",[],[("source","mdn")]) (Caption Nothing + [Para [Str "List",Space,Str "of",Space,Str "Students"]]) + [(AlignLeft,ColWidth 0.5) + ,(AlignLeft,ColWidth 0.5)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) + [Plain [Str "Student",Space,Str "ID"]] + ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) + [Plain [Str "Name"]]]]) + [(TableBody ("",["souvereign-states"],[]) (RowHeadColumns 0) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 2) + [Plain [Str "Computer",Space,Str "Science"]]]] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "3741255"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Jones,",Space,Str "Martha"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "4077830"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Pierce,",Space,Str "Benjamin"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "5151701"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Kirk,",Space,Str "James"]]]]) + ,(TableBody ("",[],[]) (RowHeadColumns 0) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 2) + [Plain [Str "Russian",Space,Str "Literature"]]]] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "3971244"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Nim,",Space,Str "Victor"]]]]) + ,(TableBody ("",[],[]) (RowHeadColumns 0) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 2) + [Plain [Str "Astrophysics"]]]] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "4100332"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Petrov,",Space,Str "Alexandra"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "4100332"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Toyota,",Space,Str "Hiroko"]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/tables/students.typst b/test/tables/students.typst new file mode 100644 --- /dev/null +++ b/test/tables/students.typst @@ -0,0 +1,26 @@ +#figure( + align(center)[#table( + columns: (50%, 50%), + align: (left,left,), + table.header(table.cell(align: center)[Student + ID], table.cell(align: center)[Name],), + table.hline(), + table.cell(colspan: 2)[Computer Science], + table.hline(), + [3741255], [Jones, Martha], + [4077830], [Pierce, Benjamin], + [5151701], [Kirk, James], + table.cell(colspan: 2)[Russian Literature], + table.hline(), + [3971244], [Nim, Victor], + table.cell(colspan: 2)[Astrophysics], + table.hline(), + [4100332], [Petrov, Alexandra], + [4100332], [Toyota, Hiroko], + )] + , caption: [List of Students + + ] + , kind: table + ) + diff --git a/test/test-pandoc.hs b/test/test-pandoc.hs --- a/test/test-pandoc.hs +++ b/test/test-pandoc.hs @@ -1,54 +1,77 @@ -{-# OPTIONS_GHC -Wall #-} - -module Main where +module Main (main) where +import System.Environment (getArgs, getExecutablePath) +import qualified Control.Exception as E +import Text.Pandoc.App (convertWithOpts, handleOptInfo, defaultOpts, options, + parseOptionsFromArgs) +import Text.Pandoc.Error (handleError) +import Text.Pandoc.Scripting (noEngine) import GHC.IO.Encoding import Test.Tasty import qualified Tests.Command -import qualified Tests.Lua import qualified Tests.Old import qualified Tests.Readers.Creole import qualified Tests.Readers.Docx +import qualified Tests.Readers.Pptx +import qualified Tests.Readers.Xlsx +import qualified Tests.Readers.DokuWiki import qualified Tests.Readers.EPUB +import qualified Tests.Readers.FB2 import qualified Tests.Readers.HTML import qualified Tests.Readers.JATS +import qualified Tests.Readers.Jira import qualified Tests.Readers.LaTeX import qualified Tests.Readers.Markdown import qualified Tests.Readers.Muse -import qualified Tests.Readers.Odt +import qualified Tests.Readers.ODT import qualified Tests.Readers.Org import qualified Tests.Readers.RST +import qualified Tests.Readers.RTF import qualified Tests.Readers.Txt2Tags +import qualified Tests.Readers.Man +import qualified Tests.Readers.Mdoc +import qualified Tests.Readers.Pod import qualified Tests.Shared import qualified Tests.Writers.AsciiDoc import qualified Tests.Writers.ConTeXt -import qualified Tests.Writers.Docbook +import qualified Tests.Writers.DocBook import qualified Tests.Writers.Docx import qualified Tests.Writers.FB2 import qualified Tests.Writers.HTML import qualified Tests.Writers.JATS +import qualified Tests.Writers.Jira import qualified Tests.Writers.LaTeX import qualified Tests.Writers.Markdown +import qualified Tests.Writers.Ms import qualified Tests.Writers.Muse import qualified Tests.Writers.Native import qualified Tests.Writers.Org import qualified Tests.Writers.Plain import qualified Tests.Writers.Powerpoint import qualified Tests.Writers.RST +import qualified Tests.Writers.AnnotatedTable import qualified Tests.Writers.TEI +import qualified Tests.Writers.Markua +import qualified Tests.Writers.BBCode +import qualified Tests.XML +import qualified Tests.MediaBag import Text.Pandoc.Shared (inDirectory) -tests :: TestTree -tests = testGroup "pandoc tests" [ Tests.Command.tests - , testGroup "Old" Tests.Old.tests +tests :: FilePath -> TestTree +tests pandocPath = testGroup "pandoc tests" + [ Tests.Command.tests + , testGroup "Old" (Tests.Old.tests pandocPath) , testGroup "Shared" Tests.Shared.tests + , testGroup "MediaBag" Tests.MediaBag.tests + , testGroup "XML" Tests.XML.tests , testGroup "Writers" [ testGroup "Native" Tests.Writers.Native.tests , testGroup "ConTeXt" Tests.Writers.ConTeXt.tests , testGroup "LaTeX" Tests.Writers.LaTeX.tests , testGroup "HTML" Tests.Writers.HTML.tests , testGroup "JATS" Tests.Writers.JATS.tests - , testGroup "Docbook" Tests.Writers.Docbook.tests + , testGroup "Jira" Tests.Writers.Jira.tests + , testGroup "Docbook" Tests.Writers.DocBook.tests , testGroup "Markdown" Tests.Writers.Markdown.tests , testGroup "Org" Tests.Writers.Org.tests , testGroup "Plain" Tests.Writers.Plain.tests @@ -56,28 +79,53 @@ , testGroup "Docx" Tests.Writers.Docx.tests , testGroup "RST" Tests.Writers.RST.tests , testGroup "TEI" Tests.Writers.TEI.tests + , testGroup "markua" Tests.Writers.Markua.tests , testGroup "Muse" Tests.Writers.Muse.tests , testGroup "FB2" Tests.Writers.FB2.tests , testGroup "PowerPoint" Tests.Writers.Powerpoint.tests + , testGroup "Ms" Tests.Writers.Ms.tests + , testGroup "AnnotatedTable" Tests.Writers.AnnotatedTable.tests + , testGroup "BBCode" Tests.Writers.BBCode.tests ] , testGroup "Readers" [ testGroup "LaTeX" Tests.Readers.LaTeX.tests , testGroup "Markdown" Tests.Readers.Markdown.tests , testGroup "HTML" Tests.Readers.HTML.tests , testGroup "JATS" Tests.Readers.JATS.tests + , testGroup "Jira" Tests.Readers.Jira.tests , testGroup "Org" Tests.Readers.Org.tests , testGroup "RST" Tests.Readers.RST.tests + , testGroup "RTF" Tests.Readers.RTF.tests , testGroup "Docx" Tests.Readers.Docx.tests - , testGroup "Odt" Tests.Readers.Odt.tests + , testGroup "Pptx" Tests.Readers.Pptx.tests + , testGroup "Xlsx" Tests.Readers.Xlsx.tests + , testGroup "ODT" Tests.Readers.ODT.tests , testGroup "Txt2Tags" Tests.Readers.Txt2Tags.tests , testGroup "EPUB" Tests.Readers.EPUB.tests , testGroup "Muse" Tests.Readers.Muse.tests , testGroup "Creole" Tests.Readers.Creole.tests + , testGroup "Man" Tests.Readers.Man.tests + , testGroup "Mdoc" Tests.Readers.Mdoc.tests + , testGroup "FB2" Tests.Readers.FB2.tests + , testGroup "DokuWiki" Tests.Readers.DokuWiki.tests + , testGroup "Pod" Tests.Readers.Pod.tests ] - , testGroup "Lua filters" Tests.Lua.tests ] main :: IO () main = do setLocaleEncoding utf8 - inDirectory "test" $ defaultMain tests + args <- getArgs + case args of + "--emulate":args' -> -- emulate pandoc executable + E.catch + (do + res <- parseOptionsFromArgs options defaultOpts "pandoc" args' + case res of + Left e -> handleOptInfo noEngine e + Right opts -> convertWithOpts noEngine opts) + (handleError . Left) + _ -> inDirectory "test" $ do + fp <- getExecutablePath + -- putStrLn $ "Using pandoc executable at " ++ fp + defaultMain $ tests fp diff --git a/test/testsuite.native b/test/testsuite.native --- a/test/testsuite.native +++ b/test/testsuite.native @@ -1,409 +1,2238 @@ -Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"],MetaInlines [Str "Anonymous"]]),("date",MetaInlines [Str "July",Space,Str "17,",Space,Str "2006"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]}) -[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",SoftBreak,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."] -,HorizontalRule -,Header 1 ("headers",[],[]) [Str "Headers"] -,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embedded",Space,Str "link"] ("/url","")] -,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Emph [Str "emphasis"]] -,Header 4 ("level-4",[],[]) [Str "Level",Space,Str "4"] -,Header 5 ("level-5",[],[]) [Str "Level",Space,Str "5"] -,Header 1 ("level-1",[],[]) [Str "Level",Space,Str "1"] -,Header 2 ("level-2-with-emphasis",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Emph [Str "emphasis"]] -,Header 3 ("level-3",[],[]) [Str "Level",Space,Str "3"] -,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"] -,Header 2 ("level-2",[],[]) [Str "Level",Space,Str "2"] -,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"] -,HorizontalRule -,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"] -,Para [Str "Here\8217s",Space,Str "a",Space,Str "regular",Space,Str "paragraph."] -,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",SoftBreak,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",SoftBreak,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",SoftBreak,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",SoftBreak,Str "list",Space,Str "item."] -,Para [Str "Here\8217s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",SoftBreak,Str "*",Space,Str "criminey."] -,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."] -,HorizontalRule -,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"] -,Para [Str "E-mail",Space,Str "style:"] -,BlockQuote - [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",SoftBreak,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."]] -,BlockQuote - [Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"] - ,CodeBlock ("",[],[]) "sub status {\n print \"working\";\n}" - ,Para [Str "A",Space,Str "list:"] - ,OrderedList (1,Decimal,Period) - [[Plain [Str "item",Space,Str "one"]] - ,[Plain [Str "item",Space,Str "two"]]] - ,Para [Str "Nested",Space,Str "block",Space,Str "quotes:"] - ,BlockQuote - [Para [Str "nested"]] - ,BlockQuote - [Para [Str "nested"]]] -,Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",SoftBreak,Str ">",Space,Str "1."] -,Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."] -,HorizontalRule -,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"] -,Para [Str "Code:"] -,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n\nthis code block is indented by one tab" -,Para [Str "And:"] -,CodeBlock ("",[],[]) " this code block is indented by two tabs\n\nThese should not be escaped: \\$ \\\\ \\> \\[ \\{" -,HorizontalRule -,Header 1 ("lists",[],[]) [Str "Lists"] -,Header 2 ("unordered",[],[]) [Str "Unordered"] -,Para [Str "Asterisks",Space,Str "tight:"] -,BulletList - [[Plain [Str "asterisk",Space,Str "1"]] - ,[Plain [Str "asterisk",Space,Str "2"]] - ,[Plain [Str "asterisk",Space,Str "3"]]] -,Para [Str "Asterisks",Space,Str "loose:"] -,BulletList - [[Para [Str "asterisk",Space,Str "1"]] - ,[Para [Str "asterisk",Space,Str "2"]] - ,[Para [Str "asterisk",Space,Str "3"]]] -,Para [Str "Pluses",Space,Str "tight:"] -,BulletList - [[Plain [Str "Plus",Space,Str "1"]] - ,[Plain [Str "Plus",Space,Str "2"]] - ,[Plain [Str "Plus",Space,Str "3"]]] -,Para [Str "Pluses",Space,Str "loose:"] -,BulletList - [[Para [Str "Plus",Space,Str "1"]] - ,[Para [Str "Plus",Space,Str "2"]] - ,[Para [Str "Plus",Space,Str "3"]]] -,Para [Str "Minuses",Space,Str "tight:"] -,BulletList - [[Plain [Str "Minus",Space,Str "1"]] - ,[Plain [Str "Minus",Space,Str "2"]] - ,[Plain [Str "Minus",Space,Str "3"]]] -,Para [Str "Minuses",Space,Str "loose:"] -,BulletList - [[Para [Str "Minus",Space,Str "1"]] - ,[Para [Str "Minus",Space,Str "2"]] - ,[Para [Str "Minus",Space,Str "3"]]] -,Header 2 ("ordered",[],[]) [Str "Ordered"] -,Para [Str "Tight:"] -,OrderedList (1,Decimal,Period) - [[Plain [Str "First"]] - ,[Plain [Str "Second"]] - ,[Plain [Str "Third"]]] -,Para [Str "and:"] -,OrderedList (1,Decimal,Period) - [[Plain [Str "One"]] - ,[Plain [Str "Two"]] - ,[Plain [Str "Three"]]] -,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"] -,OrderedList (1,Decimal,Period) - [[Para [Str "First"]] - ,[Para [Str "Second"]] - ,[Para [Str "Third"]]] -,Para [Str "and",Space,Str "using",Space,Str "spaces:"] -,OrderedList (1,Decimal,Period) - [[Para [Str "One"]] - ,[Para [Str "Two"]] - ,[Para [Str "Three"]]] -,Para [Str "Multiple",Space,Str "paragraphs:"] -,OrderedList (1,Decimal,Period) - [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."] - ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog\8217s",SoftBreak,Str "back."]] - ,[Para [Str "Item",Space,Str "2."]] - ,[Para [Str "Item",Space,Str "3."]]] -,Header 2 ("nested",[],[]) [Str "Nested"] -,BulletList - [[Plain [Str "Tab"] - ,BulletList - [[Plain [Str "Tab"] - ,BulletList - [[Plain [Str "Tab"]]]]]]] -,Para [Str "Here\8217s",Space,Str "another:"] -,OrderedList (1,Decimal,Period) - [[Plain [Str "First"]] - ,[Plain [Str "Second:"] - ,BulletList - [[Plain [Str "Fee"]] - ,[Plain [Str "Fie"]] - ,[Plain [Str "Foe"]]]] - ,[Plain [Str "Third"]]] -,Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs:"] -,OrderedList (1,Decimal,Period) - [[Para [Str "First"]] - ,[Para [Str "Second:"] - ,BulletList - [[Plain [Str "Fee"]] - ,[Plain [Str "Fie"]] - ,[Plain [Str "Foe"]]]] - ,[Para [Str "Third"]]] -,Header 2 ("tabs-and-spaces",[],[]) [Str "Tabs",Space,Str "and",Space,Str "spaces"] -,BulletList - [[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "tabs"]] - ,[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "spaces"] - ,BulletList - [[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "tabs"]] - ,[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "spaces"]]]]] -,Header 2 ("fancy-list-markers",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"] -,OrderedList (2,Decimal,TwoParens) - [[Plain [Str "begins",Space,Str "with",Space,Str "2"]] - ,[Para [Str "and",Space,Str "now",Space,Str "3"] - ,Para [Str "with",Space,Str "a",Space,Str "continuation"] - ,OrderedList (4,LowerRoman,Period) - [[Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",SoftBreak,Str "starting",Space,Str "with",Space,Str "4"]] - ,[Plain [Str "more",Space,Str "items"] - ,OrderedList (1,UpperAlpha,TwoParens) - [[Plain [Str "a",Space,Str "subsublist"]] - ,[Plain [Str "a",Space,Str "subsublist"]]]]]]] -,Para [Str "Nesting:"] -,OrderedList (1,UpperAlpha,Period) - [[Plain [Str "Upper",Space,Str "Alpha"] - ,OrderedList (1,UpperRoman,Period) - [[Plain [Str "Upper",Space,Str "Roman."] - ,OrderedList (6,Decimal,TwoParens) - [[Plain [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"] - ,OrderedList (3,LowerAlpha,OneParen) - [[Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]] -,Para [Str "Autonumbering:"] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Autonumber."]] - ,[Plain [Str "More."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Nested."]]]]] -,Para [Str "Should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "list",Space,Str "item:"] -,Para [Str "M.A.\160\&2007"] -,Para [Str "B.",Space,Str "Williams"] -,HorizontalRule -,Header 1 ("definition-lists",[],[]) [Str "Definition",Space,Str "Lists"] -,Para [Str "Tight",Space,Str "using",Space,Str "spaces:"] -,DefinitionList - [([Str "apple"], - [[Plain [Str "red",Space,Str "fruit"]]]) - ,([Str "orange"], - [[Plain [Str "orange",Space,Str "fruit"]]]) - ,([Str "banana"], - [[Plain [Str "yellow",Space,Str "fruit"]]])] -,Para [Str "Tight",Space,Str "using",Space,Str "tabs:"] -,DefinitionList - [([Str "apple"], - [[Plain [Str "red",Space,Str "fruit"]]]) - ,([Str "orange"], - [[Plain [Str "orange",Space,Str "fruit"]]]) - ,([Str "banana"], - [[Plain [Str "yellow",Space,Str "fruit"]]])] -,Para [Str "Loose:"] -,DefinitionList - [([Str "apple"], - [[Para [Str "red",Space,Str "fruit"]]]) - ,([Str "orange"], - [[Para [Str "orange",Space,Str "fruit"]]]) - ,([Str "banana"], - [[Para [Str "yellow",Space,Str "fruit"]]])] -,Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics:"] -,DefinitionList - [([Emph [Str "apple"]], - [[Para [Str "red",Space,Str "fruit"] - ,Para [Str "contains",Space,Str "seeds,",SoftBreak,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"]]]) - ,([Emph [Str "orange"]], - [[Para [Str "orange",Space,Str "fruit"] - ,CodeBlock ("",[],[]) "{ orange code block }" - ,BlockQuote - [Para [Str "orange",Space,Str "block",Space,Str "quote"]]]])] -,Para [Str "Multiple",Space,Str "definitions,",Space,Str "tight:"] -,DefinitionList - [([Str "apple"], - [[Plain [Str "red",Space,Str "fruit"]] - ,[Plain [Str "computer"]]]) - ,([Str "orange"], - [[Plain [Str "orange",Space,Str "fruit"]] - ,[Plain [Str "bank"]]])] -,Para [Str "Multiple",Space,Str "definitions,",Space,Str "loose:"] -,DefinitionList - [([Str "apple"], - [[Para [Str "red",Space,Str "fruit"]] - ,[Para [Str "computer"]]]) - ,([Str "orange"], - [[Para [Str "orange",Space,Str "fruit"]] - ,[Para [Str "bank"]]])] -,Para [Str "Blank",Space,Str "line",Space,Str "after",Space,Str "term,",Space,Str "indented",Space,Str "marker,",Space,Str "alternate",Space,Str "markers:"] -,DefinitionList - [([Str "apple"], - [[Para [Str "red",Space,Str "fruit"]] - ,[Para [Str "computer"]]]) - ,([Str "orange"], - [[Para [Str "orange",Space,Str "fruit"] - ,OrderedList (1,Decimal,Period) - [[Plain [Str "sublist"]] - ,[Plain [Str "sublist"]]]]])] -,Header 1 ("html-blocks",[],[]) [Str "HTML",Space,Str "Blocks"] -,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"] -,Div ("",[],[]) - [Plain [Str "foo"]] -,Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation:"] -,Div ("",[],[]) - [Div ("",[],[]) - [Div ("",[],[]) - [Para [Str "foo"]]] - ,Div ("",[],[]) - [Plain [Str "bar"]]] -,Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table:"] -,RawBlock (Format "html") "" -,RawBlock (Format "html") "" -,RawBlock (Format "html") "" -,RawBlock (Format "html") "" -,RawBlock (Format "html") "" -,RawBlock (Format "html") "
    " -,Plain [Str "This",Space,Str "is",Space,Emph [Str "emphasized"]] -,RawBlock (Format "html") "" -,Plain [Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"]] -,RawBlock (Format "html") "
    " -,RawBlock (Format "html") "" -,Para [Str "Here\8217s",Space,Str "a",Space,Str "simple",Space,Str "block:"] -,Div ("",[],[]) - [Para [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:"] -,Div ("",[],[]) - [Div ("",[],[]) - [Div ("",[],[]) - [Plain [Str "foo"]]]] -,Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment:"] -,RawBlock (Format "html") "" -,Para [Str "Multiline:"] -,RawBlock (Format "html") "" -,RawBlock (Format "html") "" -,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:"] -,RawBlock (Format "html") "" -,Para [Str "Code:"] -,CodeBlock ("",[],[]) "
    " -,Para [Str "Hr\8217s:"] -,RawBlock (Format "html") "
    " -,RawBlock (Format "html") "
    " -,RawBlock (Format "html") "
    " -,RawBlock (Format "html") "
    " -,RawBlock (Format "html") "
    " -,RawBlock (Format "html") "
    " -,RawBlock (Format "html") "
    " -,RawBlock (Format "html") "
    " -,RawBlock (Format "html") "
    " -,HorizontalRule -,Header 1 ("inline-markup",[],[]) [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 "."] -,Para [Str "An",Space,Emph [Link ("",[],[]) [Str "emphasized",Space,Str "link"] ("/url","")],Str "."] -,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]] -,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."] -,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]] -,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."] -,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",Space,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",Space,Code ("",[],[]) "",Str "."] -,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "strikeout"],Str "."]] -,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Superscript [Emph [Str "hello"]],Space,Str "a",Superscript [Str "hello\160there"],Str "."] -,Para [Str "Subscripts:",Space,Str "H",Subscript [Str "2"],Str "O,",Space,Str "H",Subscript [Str "23"],Str "O,",Space,Str "H",Subscript [Str "many\160of\160them"],Str "O."] -,Para [Str "These",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "superscripts",Space,Str "or",Space,Str "subscripts,",SoftBreak,Str "because",Space,Str "of",Space,Str "the",Space,Str "unescaped",Space,Str "spaces:",Space,Str "a^b",Space,Str "c^d,",Space,Str "a~b",Space,Str "c~d."] -,HorizontalRule -,Header 1 ("smart-quotes-ellipses-dashes",[],[]) [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"] -,Para [Quoted DoubleQuote [Str "Hello,"],Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Quoted DoubleQuote [Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",Space,Str "name."]] -,Para [Quoted SingleQuote [Str "A"],Str ",",Space,Quoted SingleQuote [Str "B"],Str ",",Space,Str "and",Space,Quoted SingleQuote [Str "C"],Space,Str "are",Space,Str "letters."] -,Para [Quoted SingleQuote [Str "Oak,"],Space,Quoted SingleQuote [Str "elm,"],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees.",SoftBreak,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine."]] -,Para [Quoted SingleQuote [Str "He",Space,Str "said,",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go."]],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",SoftBreak,Str "70\8217s?"] -,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Quoted SingleQuote [Code ("",[],[]) "code"],Space,Str "and",Space,Str "a",Space,Quoted DoubleQuote [Link ("",[],[]) [Str "quoted",Space,Str "link"] ("http://example.com/?foo=1&bar=2","")],Str "."] -,Para [Str "Some",Space,Str "dashes:",Space,Str "one\8212two",Space,Str "\8212",Space,Str "three\8212four",Space,Str "\8212",Space,Str "five."] -,Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5\8211\&7,",Space,Str "255\8211\&66,",Space,Str "1987\8211\&1999."] -,Para [Str "Ellipses\8230and\8230and\8230."] -,HorizontalRule -,Header 1 ("latex",[],[]) [Str "LaTeX"] -,BulletList - [[Plain [RawInline (Format "tex") "\\cite[22-23]{smith.1899}"]] - ,[Plain [Math InlineMath "2+2=4"]] - ,[Plain [Math InlineMath "x \\in y"]] - ,[Plain [Math InlineMath "\\alpha \\wedge \\omega"]] - ,[Plain [Math InlineMath "223"]] - ,[Plain [Math InlineMath "p",Str "-Tree"]] - ,[Plain [Str "Here\8217s",Space,Str "some",Space,Str "display",Space,Str "math:",SoftBreak,Math DisplayMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"]] - ,[Plain [Str "Here\8217s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,Math InlineMath "\\alpha + \\omega \\times x^2",Str "."]]] -,Para [Str "These",Space,Str "shouldn\8217t",Space,Str "be",Space,Str "math:"] -,BulletList - [[Plain [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code ("",[],[]) "$e = mc^2$",Str "."]] - ,[Plain [Str "$22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$34,000.",SoftBreak,Str "(It",Space,Str "worked",Space,Str "if",Space,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized.)"]] - ,[Plain [Str "Shoes",Space,Str "($20)",Space,Str "and",Space,Str "socks",Space,Str "($5)."]] - ,[Plain [Str "Escaped",Space,Code ("",[],[]) "$",Str ":",Space,Str "$73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23$."]]] -,Para [Str "Here\8217s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"] -,RawBlock (Format "latex") "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}" -,HorizontalRule -,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"] -,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"] -,BulletList - [[Plain [Str "I",Space,Str "hat:",Space,Str "\206"]] - ,[Plain [Str "o",Space,Str "umlaut:",Space,Str "\246"]] - ,[Plain [Str "section:",Space,Str "\167"]] - ,[Plain [Str "set",Space,Str "membership:",Space,Str "\8712"]] - ,[Plain [Str "copyright:",Space,Str "\169"]]] -,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."] -,Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."] -,Para [Str "This",Space,Str "&",Space,Str "that."] -,Para [Str "4",Space,Str "<",Space,Str "5."] -,Para [Str "6",Space,Str ">",Space,Str "5."] -,Para [Str "Backslash:",Space,Str "\\"] -,Para [Str "Backtick:",Space,Str "`"] -,Para [Str "Asterisk:",Space,Str "*"] -,Para [Str "Underscore:",Space,Str "_"] -,Para [Str "Left",Space,Str "brace:",Space,Str "{"] -,Para [Str "Right",Space,Str "brace:",Space,Str "}"] -,Para [Str "Left",Space,Str "bracket:",Space,Str "["] -,Para [Str "Right",Space,Str "bracket:",Space,Str "]"] -,Para [Str "Left",Space,Str "paren:",Space,Str "("] -,Para [Str "Right",Space,Str "paren:",Space,Str ")"] -,Para [Str "Greater-than:",Space,Str ">"] -,Para [Str "Hash:",Space,Str "#"] -,Para [Str "Period:",Space,Str "."] -,Para [Str "Bang:",Space,Str "!"] -,Para [Str "Plus:",Space,Str "+"] -,Para [Str "Minus:",Space,Str "-"] -,HorizontalRule -,Header 1 ("links",[],[]) [Str "Links"] -,Header 2 ("explicit",[],[]) [Str "Explicit"] -,Para [Str "Just",Space,Str "a",Space,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title"),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title preceded by two spaces"),Str "."] -,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")] -,Para [Link ("",[],[]) [Str "with_underscore"] ("/url/with_underscore","")] -,Para [Link ("",[],[]) [Str "Email",Space,Str "link"] ("mailto:nobody@nowhere.net","")] -,Para [Link ("",[],[]) [Str "Empty"] ("",""),Str "."] -,Header 2 ("reference",[],[]) [Str "Reference"] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."] -,Para [Str "With",Space,Link ("",[],[]) [Str "embedded",Space,Str "[brackets]"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "b"] ("/url/",""),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."] -,Para [Str "Indented",Space,Link ("",[],[]) [Str "once"] ("/url",""),Str "."] -,Para [Str "Indented",Space,Link ("",[],[]) [Str "twice"] ("/url",""),Str "."] -,Para [Str "Indented",Space,Link ("",[],[]) [Str "thrice"] ("/url",""),Str "."] -,Para [Str "This",Space,Str "should",Space,Str "[not][]",Space,Str "be",Space,Str "a",Space,Str "link."] -,CodeBlock ("",[],[]) "[not]: /url" -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/","Title with \"quotes\" inside"),Str "."] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "biz"] ("/url/","Title with \"quote\" inside"),Str "."] -,Header 2 ("with-ampersands",[],[]) [Str "With",Space,Str "ampersands"] -,Para [Str "Here\8217s",Space,Str "a",Space,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."] -,Para [Str "Here\8217s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link ("",[],[]) [Str "AT&T"] ("http://att.com/","AT&T"),Str "."] -,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."] -,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] ("/script?foo=1&bar=2",""),Str "."] -,Header 2 ("autolinks",[],[]) [Str "Autolinks"] -,Para [Str "With",Space,Str "an",Space,Str "ampersand:",Space,Link ("",[],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")] -,BulletList - [[Plain [Str "In",Space,Str "a",Space,Str "list?"]] - ,[Plain [Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]] - ,[Plain [Str "It",Space,Str "should."]]] -,Para [Str "An",Space,Str "e-mail",Space,Str "address:",Space,Link ("",[],[]) [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")] -,BlockQuote - [Para [Str "Blockquoted:",Space,Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]] -,Para [Str "Auto-links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ("",[],[]) ""] -,CodeBlock ("",[],[]) "or here: " -,HorizontalRule -,Header 1 ("images",[],[]) [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):"] -,Para [Image ("",[],[]) [Str "lalune"] ("lalune.jpg","fig:Voyage dans la Lune")] -,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image ("",[],[]) [Str "movie"] ("movie.jpg",""),Space,Str "icon."] -,HorizontalRule -,Header 1 ("footnotes",[],[]) [Str "Footnotes"] -,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Note [Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",SoftBreak,Str "reference.",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document."]],Space,Str "and",Space,Str "another.",Note [Para [Str "Here\8217s",Space,Str "the",Space,Str "long",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",SoftBreak,Str "blocks."],Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",SoftBreak,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)."],CodeBlock ("",[],[]) " { }",Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",SoftBreak,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block."]],SoftBreak,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",SoftBreak,Str "contains",Space,Str "a",Space,Str "space.[^my",Space,Str "note]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note.",Note [Para [Str "This",SoftBreak,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type.",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",SoftBreak,Link ("",[],[]) [Str "links"] ("http://google.com",""),Space,Str "and",Space,Code ("",[],[]) "]",Space,Str "verbatim",Space,Str "characters,",SoftBreak,Str "as",Space,Str "well",Space,Str "as",Space,Str "[bracketed",Space,Str "text]."]]] -,BlockQuote - [Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes.",Note [Para [Str "In",Space,Str "quote."]]]] -,OrderedList (1,Decimal,Period) - [[Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",Note [Para [Str "In",Space,Str "list."]]]]] -,Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."]] +Pandoc + Meta + { unMeta = + fromList + [ ( "author" + , MetaList + [ MetaInlines [ Str "John" , Space , Str "MacFarlane" ] + , MetaInlines [ Str "Anonymous" ] + ] + ) + , ( "date" + , MetaInlines + [ Str "July" , Space , Str "17," , Space , Str "2006" ] + ) + , ( "title" + , MetaInlines + [ Str "Pandoc" + , Space + , Str "Test" + , Space + , Str "Suite" + ] + ) + ] + } + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "set" + , Space + , Str "of" + , Space + , Str "tests" + , Space + , Str "for" + , Space + , Str "pandoc." + , Space + , Str "Most" + , Space + , Str "of" + , Space + , Str "them" + , Space + , Str "are" + , Space + , Str "adapted" + , Space + , Str "from" + , SoftBreak + , Str "John" + , Space + , Str "Gruber\8217s" + , Space + , Str "markdown" + , Space + , Str "test" + , Space + , Str "suite." + ] + , HorizontalRule + , Header 1 ( "headers" , [] , [] ) [ Str "Headers" ] + , Header + 2 + ( "level-2-with-an-embedded-link" , [] , [] ) + [ Str "Level" + , Space + , Str "2" + , Space + , Str "with" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "embedded" , Space , Str "link" ] + ( "/url" , "" ) + ] + , Header + 3 + ( "level-3-with-emphasis" , [] , [] ) + [ Str "Level" + , Space + , Str "3" + , Space + , Str "with" + , Space + , Emph [ Str "emphasis" ] + ] + , Header + 4 ( "level-4" , [] , [] ) [ Str "Level" , Space , Str "4" ] + , Header + 5 ( "level-5" , [] , [] ) [ Str "Level" , Space , Str "5" ] + , Header + 1 ( "level-1" , [] , [] ) [ Str "Level" , Space , Str "1" ] + , Header + 2 + ( "level-2-with-emphasis" , [] , [] ) + [ Str "Level" + , Space + , Str "2" + , Space + , Str "with" + , Space + , Emph [ Str "emphasis" ] + ] + , Header + 3 ( "level-3" , [] , [] ) [ Str "Level" , Space , Str "3" ] + , Para + [ Str "with" + , Space + , Str "no" + , Space + , Str "blank" + , Space + , Str "line" + ] + , Header + 2 ( "level-2" , [] , [] ) [ Str "Level" , Space , Str "2" ] + , Para + [ Str "with" + , Space + , Str "no" + , Space + , Str "blank" + , Space + , Str "line" + ] + , HorizontalRule + , Header 1 ( "paragraphs" , [] , [] ) [ Str "Paragraphs" ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "regular" + , Space + , Str "paragraph." + ] + , Para + [ Str "In" + , Space + , Str "Markdown" + , Space + , Str "1.0.0" + , Space + , Str "and" + , Space + , Str "earlier." + , Space + , Str "Version" + , SoftBreak + , Str "8." + , Space + , Str "This" + , Space + , Str "line" + , Space + , Str "turns" + , Space + , Str "into" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item." + , SoftBreak + , Str "Because" + , Space + , Str "a" + , Space + , Str "hard-wrapped" + , Space + , Str "line" + , Space + , Str "in" + , Space + , Str "the" + , SoftBreak + , Str "middle" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "paragraph" + , Space + , Str "looked" + , Space + , Str "like" + , Space + , Str "a" + , SoftBreak + , Str "list" + , Space + , Str "item." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "one" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "bullet." + , SoftBreak + , Str "*" + , Space + , Str "criminey." + ] + , Para + [ Str "There" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "hard" + , Space + , Str "line" + , Space + , Str "break" + , LineBreak + , Str "here." + ] + , HorizontalRule + , Header + 1 + ( "block-quotes" , [] , [] ) + [ Str "Block" , Space , Str "Quotes" ] + , Para [ Str "E-mail" , Space , Str "style:" ] + , BlockQuote + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote." + , SoftBreak + , Str "It" + , Space + , Str "is" + , Space + , Str "pretty" + , Space + , Str "short." + ] + ] + , BlockQuote + [ Para + [ Str "Code" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote:" + ] + , CodeBlock + ( "" , [] , [] ) "sub status {\n print \"working\";\n}" + , Para [ Str "A" , Space , Str "list:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "item" , Space , Str "one" ] ] + , [ Plain [ Str "item" , Space , Str "two" ] ] + ] + , Para + [ Str "Nested" + , Space + , Str "block" + , Space + , Str "quotes:" + ] + , BlockQuote [ Para [ Str "nested" ] ] + , BlockQuote [ Para [ Str "nested" ] ] + ] + , Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote:" + , Space + , Str "2" + , SoftBreak + , Str ">" + , Space + , Str "1." + ] + , Para + [ Str "And" + , Space + , Str "a" + , Space + , Str "following" + , Space + , Str "paragraph." + ] + , HorizontalRule + , Header + 1 + ( "code-blocks" , [] , [] ) + [ Str "Code" , Space , Str "Blocks" ] + , Para [ Str "Code:" ] + , CodeBlock + ( "" , [] , [] ) + "---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n\nthis code block is indented by one tab" + , Para [ Str "And:" ] + , CodeBlock + ( "" , [] , [] ) + " this code block is indented by two tabs\n\nThese should not be escaped: \\$ \\\\ \\> \\[ \\{" + , HorizontalRule + , Header 1 ( "lists" , [] , [] ) [ Str "Lists" ] + , Header 2 ( "unordered" , [] , [] ) [ Str "Unordered" ] + , Para [ Str "Asterisks" , Space , Str "tight:" ] + , BulletList + [ [ Plain [ Str "asterisk" , Space , Str "1" ] ] + , [ Plain [ Str "asterisk" , Space , Str "2" ] ] + , [ Plain [ Str "asterisk" , Space , Str "3" ] ] + ] + , Para [ Str "Asterisks" , Space , Str "loose:" ] + , BulletList + [ [ Para [ Str "asterisk" , Space , Str "1" ] ] + , [ Para [ Str "asterisk" , Space , Str "2" ] ] + , [ Para [ Str "asterisk" , Space , Str "3" ] ] + ] + , Para [ Str "Pluses" , Space , Str "tight:" ] + , BulletList + [ [ Plain [ Str "Plus" , Space , Str "1" ] ] + , [ Plain [ Str "Plus" , Space , Str "2" ] ] + , [ Plain [ Str "Plus" , Space , Str "3" ] ] + ] + , Para [ Str "Pluses" , Space , Str "loose:" ] + , BulletList + [ [ Para [ Str "Plus" , Space , Str "1" ] ] + , [ Para [ Str "Plus" , Space , Str "2" ] ] + , [ Para [ Str "Plus" , Space , Str "3" ] ] + ] + , Para [ Str "Minuses" , Space , Str "tight:" ] + , BulletList + [ [ Plain [ Str "Minus" , Space , Str "1" ] ] + , [ Plain [ Str "Minus" , Space , Str "2" ] ] + , [ Plain [ Str "Minus" , Space , Str "3" ] ] + ] + , Para [ Str "Minuses" , Space , Str "loose:" ] + , BulletList + [ [ Para [ Str "Minus" , Space , Str "1" ] ] + , [ Para [ Str "Minus" , Space , Str "2" ] ] + , [ Para [ Str "Minus" , Space , Str "3" ] ] + ] + , Header 2 ( "ordered" , [] , [] ) [ Str "Ordered" ] + , Para [ Str "Tight:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "First" ] ] + , [ Plain [ Str "Second" ] ] + , [ Plain [ Str "Third" ] ] + ] + , Para [ Str "and:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "One" ] ] + , [ Plain [ Str "Two" ] ] + , [ Plain [ Str "Three" ] ] + ] + , Para + [ Str "Loose" , Space , Str "using" , Space , Str "tabs:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Para [ Str "First" ] ] + , [ Para [ Str "Second" ] ] + , [ Para [ Str "Third" ] ] + ] + , Para + [ Str "and" , Space , Str "using" , Space , Str "spaces:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Para [ Str "One" ] ] + , [ Para [ Str "Two" ] ] + , [ Para [ Str "Three" ] ] + ] + , Para [ Str "Multiple" , Space , Str "paragraphs:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Para + [ Str "Item" + , Space + , Str "1," + , Space + , Str "graf" + , Space + , Str "one." + ] + , Para + [ Str "Item" + , Space + , Str "1." + , Space + , Str "graf" + , Space + , Str "two." + , Space + , Str "The" + , Space + , Str "quick" + , Space + , Str "brown" + , Space + , Str "fox" + , Space + , Str "jumped" + , Space + , Str "over" + , Space + , Str "the" + , Space + , Str "lazy" + , Space + , Str "dog\8217s" + , SoftBreak + , Str "back." + ] + ] + , [ Para [ Str "Item" , Space , Str "2." ] ] + , [ Para [ Str "Item" , Space , Str "3." ] ] + ] + , Header 2 ( "nested" , [] , [] ) [ Str "Nested" ] + , BulletList + [ [ Plain [ Str "Tab" ] + , BulletList + [ [ Plain [ Str "Tab" ] + , BulletList [ [ Plain [ Str "Tab" ] ] ] + ] + ] + ] + ] + , Para [ Str "Here\8217s" , Space , Str "another:" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "First" ] ] + , [ Plain [ Str "Second:" ] + , BulletList + [ [ Plain [ Str "Fee" ] ] + , [ Plain [ Str "Fie" ] ] + , [ Plain [ Str "Foe" ] ] + ] + ] + , [ Plain [ Str "Third" ] ] + ] + , Para + [ Str "Same" + , Space + , Str "thing" + , Space + , Str "but" + , Space + , Str "with" + , Space + , Str "paragraphs:" + ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Para [ Str "First" ] ] + , [ Para [ Str "Second:" ] + , BulletList + [ [ Plain [ Str "Fee" ] ] + , [ Plain [ Str "Fie" ] ] + , [ Plain [ Str "Foe" ] ] + ] + ] + , [ Para [ Str "Third" ] ] + ] + , Header + 2 + ( "tabs-and-spaces" , [] , [] ) + [ Str "Tabs" , Space , Str "and" , Space , Str "spaces" ] + , BulletList + [ [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item" + , SoftBreak + , Str "indented" + , Space + , Str "with" + , Space + , Str "tabs" + ] + ] + , [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item" + , SoftBreak + , Str "indented" + , Space + , Str "with" + , Space + , Str "spaces" + ] + , BulletList + [ [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "example" + , Space + , Str "list" + , Space + , Str "item" + , SoftBreak + , Str "indented" + , Space + , Str "with" + , Space + , Str "tabs" + ] + ] + , [ Para + [ Str "this" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "example" + , Space + , Str "list" + , Space + , Str "item" + , SoftBreak + , Str "indented" + , Space + , Str "with" + , Space + , Str "spaces" + ] + ] + ] + ] + ] + , Header + 2 + ( "fancy-list-markers" , [] , [] ) + [ Str "Fancy" , Space , Str "list" , Space , Str "markers" ] + , OrderedList + ( 2 , Decimal , TwoParens ) + [ [ Para + [ Str "begins" , Space , Str "with" , Space , Str "2" ] + ] + , [ Para [ Str "and" , Space , Str "now" , Space , Str "3" ] + , Para + [ Str "with" + , Space + , Str "a" + , Space + , Str "continuation" + ] + , OrderedList + ( 4 , LowerRoman , Period ) + [ [ Plain + [ Str "sublist" + , Space + , Str "with" + , Space + , Str "roman" + , Space + , Str "numerals," + , SoftBreak + , Str "starting" + , Space + , Str "with" + , Space + , Str "4" + ] + ] + , [ Plain [ Str "more" , Space , Str "items" ] + , OrderedList + ( 1 , UpperAlpha , TwoParens ) + [ [ Plain [ Str "a" , Space , Str "subsublist" ] ] + , [ Plain [ Str "a" , Space , Str "subsublist" ] ] + ] + ] + ] + ] + ] + , Para [ Str "Nesting:" ] + , OrderedList + ( 1 , UpperAlpha , Period ) + [ [ Plain [ Str "Upper" , Space , Str "Alpha" ] + , OrderedList + ( 1 , UpperRoman , Period ) + [ [ Plain [ Str "Upper" , Space , Str "Roman." ] + , OrderedList + ( 6 , Decimal , TwoParens ) + [ [ Plain + [ Str "Decimal" + , Space + , Str "start" + , Space + , Str "with" + , Space + , Str "6" + ] + , OrderedList + ( 3 , LowerAlpha , OneParen ) + [ [ Plain + [ Str "Lower" + , Space + , Str "alpha" + , Space + , Str "with" + , Space + , Str "paren" + ] + ] + ] + ] + ] + ] + ] + ] + ] + , Para [ Str "Autonumbering:" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Autonumber." ] ] + , [ Plain [ Str "More." ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "Nested." ] ] ] + ] + ] + , Para + [ Str "Should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "item:" + ] + , Para [ Str "M.A.\160\&2007" ] + , Para [ Str "B." , Space , Str "Williams" ] + , HorizontalRule + , Header + 1 + ( "definition-lists" , [] , [] ) + [ Str "Definition" , Space , Str "Lists" ] + , Para + [ Str "Tight" + , Space + , Str "using" + , Space + , Str "spaces:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Plain [ Str "red" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "orange" ] + , [ [ Plain [ Str "orange" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "banana" ] + , [ [ Plain [ Str "yellow" , Space , Str "fruit" ] ] ] + ) + ] + , Para + [ Str "Tight" , Space , Str "using" , Space , Str "tabs:" ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Plain [ Str "red" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "orange" ] + , [ [ Plain [ Str "orange" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "banana" ] + , [ [ Plain [ Str "yellow" , Space , Str "fruit" ] ] ] + ) + ] + , Para [ Str "Loose:" ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] ] ] + ) + , ( [ Str "banana" ] + , [ [ Para [ Str "yellow" , Space , Str "fruit" ] ] ] + ) + ] + , Para + [ Str "Multiple" + , Space + , Str "blocks" + , Space + , Str "with" + , Space + , Str "italics:" + ] + , DefinitionList + [ ( [ Emph [ Str "apple" ] ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] + , Para + [ Str "contains" + , Space + , Str "seeds," + , SoftBreak + , Str "crisp," + , Space + , Str "pleasant" + , Space + , Str "to" + , Space + , Str "taste" + ] + ] + ] + ) + , ( [ Emph [ Str "orange" ] ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] + , CodeBlock ( "" , [] , [] ) "{ orange code block }" + , BlockQuote + [ Para + [ Str "orange" + , Space + , Str "block" + , Space + , Str "quote" + ] + ] + ] + ] + ) + ] + , Para + [ Str "Multiple" + , Space + , Str "definitions," + , Space + , Str "tight:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Plain [ Str "red" , Space , Str "fruit" ] ] + , [ Plain [ Str "computer" ] ] + ] + ) + , ( [ Str "orange" ] + , [ [ Plain [ Str "orange" , Space , Str "fruit" ] ] + , [ Plain [ Str "bank" ] ] + ] + ) + ] + , Para + [ Str "Multiple" + , Space + , Str "definitions," + , Space + , Str "loose:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] ] + , [ Para [ Str "computer" ] ] + ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] ] + , [ Para [ Str "bank" ] ] + ] + ) + ] + , Para + [ Str "Blank" + , Space + , Str "line" + , Space + , Str "after" + , Space + , Str "term," + , Space + , Str "indented" + , Space + , Str "marker," + , Space + , Str "alternate" + , Space + , Str "markers:" + ] + , DefinitionList + [ ( [ Str "apple" ] + , [ [ Para [ Str "red" , Space , Str "fruit" ] ] + , [ Para [ Str "computer" ] ] + ] + ) + , ( [ Str "orange" ] + , [ [ Para [ Str "orange" , Space , Str "fruit" ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain [ Str "sublist" ] ] + , [ Plain [ Str "sublist" ] ] + ] + ] + ] + ) + ] + , Header + 1 + ( "html-blocks" , [] , [] ) + [ Str "HTML" , Space , Str "Blocks" ] + , Para + [ Str "Simple" + , Space + , Str "block" + , Space + , Str "on" + , Space + , Str "one" + , Space + , Str "line:" + ] + , Div ( "" , [] , [] ) [ Plain [ Str "foo" ] ] + , Para + [ Str "And" + , Space + , Str "nested" + , Space + , Str "without" + , Space + , Str "indentation:" + ] + , Div + ( "" , [] , [] ) + [ Div + ( "" , [] , [] ) + [ Div ( "" , [] , [] ) [ Para [ Str "foo" ] ] ] + , Div ( "" , [] , [] ) [ Plain [ Str "bar" ] ] + ] + , Para + [ Str "Interpreted" + , Space + , Str "markdown" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "table:" + ] + , RawBlock (Format "html") "" + , RawBlock (Format "html") "" + , RawBlock (Format "html") "" + , RawBlock (Format "html") "" + , RawBlock (Format "html") "" + , RawBlock (Format "html") "
    " + , Plain + [ Str "This" + , Space + , Str "is" + , Space + , Emph [ Str "emphasized" ] + ] + , RawBlock (Format "html") "" + , Plain + [ Str "And" + , Space + , Str "this" + , Space + , Str "is" + , Space + , Strong [ Str "strong" ] + ] + , RawBlock (Format "html") "
    " + , RawBlock + (Format "html") + "" + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "simple" + , Space + , Str "block:" + ] + , Div ( "" , [] , [] ) [ Para [ 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:" ] + , Div + ( "" , [] , [] ) + [ Div + ( "" , [] , [] ) + [ Div ( "" , [] , [] ) [ Plain [ Str "foo" ] ] ] + ] + , Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "just" + , Space + , Str "be" + , Space + , Str "an" + , Space + , Str "HTML" + , Space + , Str "comment:" + ] + , RawBlock (Format "html") "" + , Para [ Str "Multiline:" ] + , RawBlock (Format "html") "" + , RawBlock + (Format "html") "" + , 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:" + ] + , RawBlock (Format "html") "" + , Para [ Str "Code:" ] + , CodeBlock ( "" , [] , [] ) "
    " + , Para [ Str "Hr\8217s:" ] + , RawBlock (Format "html") "
    " + , RawBlock (Format "html") "
    " + , RawBlock (Format "html") "
    " + , RawBlock (Format "html") "
    " + , RawBlock (Format "html") "
    " + , RawBlock (Format "html") "
    " + , RawBlock (Format "html") "
    " + , RawBlock (Format "html") "
    " + , RawBlock (Format "html") "
    " + , HorizontalRule + , Header + 1 + ( "inline-markup" , [] , [] ) + [ 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 "." + ] + , Para + [ Str "An" + , Space + , Emph + [ Link + ( "" , [] , [] ) + [ Str "emphasized" , Space , Str "link" ] + ( "/url" , "" ) + ] + , Str "." + ] + , Para + [ Strong + [ Emph + [ Str "This" + , Space + , Str "is" + , Space + , Str "strong" + , Space + , Str "and" + , Space + , Str "em." + ] + ] + ] + , Para + [ Str "So" + , Space + , Str "is" + , Space + , Strong [ Emph [ Str "this" ] ] + , Space + , Str "word." + ] + , Para + [ Strong + [ Emph + [ Str "This" + , Space + , Str "is" + , Space + , Str "strong" + , Space + , Str "and" + , Space + , Str "em." + ] + ] + ] + , Para + [ Str "So" + , Space + , Str "is" + , Space + , Strong [ Emph [ Str "this" ] ] + , Space + , Str "word." + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "code:" + , Space + , Code ( "" , [] , [] ) ">" + , Str "," + , Space + , Code ( "" , [] , [] ) "$" + , Str "," + , Space + , Code ( "" , [] , [] ) "\\" + , Str "," + , Space + , Code ( "" , [] , [] ) "\\$" + , Str "," + , Space + , Code ( "" , [] , [] ) "" + , Str "." + ] + , Para + [ Strikeout + [ Str "This" + , Space + , Str "is" + , Space + , Emph [ Str "strikeout" ] + , Str "." + ] + ] + , Para + [ Str "Superscripts:" + , Space + , Str "a" + , Superscript [ Str "bc" ] + , Str "d" + , Space + , Str "a" + , Superscript [ Emph [ Str "hello" ] ] + , Space + , Str "a" + , Superscript [ Str "hello\160there" ] + , Str "." + ] + , Para + [ Str "Subscripts:" + , Space + , Str "H" + , Subscript [ Str "2" ] + , Str "O," + , Space + , Str "H" + , Subscript [ Str "23" ] + , Str "O," + , Space + , Str "H" + , Subscript [ Str "many\160of\160them" ] + , Str "O." + ] + , Para + [ Str "These" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "superscripts" + , Space + , Str "or" + , Space + , Str "subscripts," + , SoftBreak + , Str "because" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "unescaped" + , Space + , Str "spaces:" + , Space + , Str "a^b" + , Space + , Str "c^d," + , Space + , Str "a~b" + , Space + , Str "c~d." + ] + , HorizontalRule + , Header + 1 + ( "smart-quotes-ellipses-dashes" , [] , [] ) + [ Str "Smart" + , Space + , Str "quotes," + , Space + , Str "ellipses," + , Space + , Str "dashes" + ] + , Para + [ Quoted DoubleQuote [ Str "Hello," ] + , Space + , Str "said" + , Space + , Str "the" + , Space + , Str "spider." + , Space + , Quoted + DoubleQuote + [ Quoted SingleQuote [ Str "Shelob" ] + , Space + , Str "is" + , Space + , Str "my" + , Space + , Str "name." + ] + ] + , Para + [ Quoted SingleQuote [ Str "A" ] + , Str "," + , Space + , Quoted SingleQuote [ Str "B" ] + , Str "," + , Space + , Str "and" + , Space + , Quoted SingleQuote [ Str "C" ] + , Space + , Str "are" + , Space + , Str "letters." + ] + , Para + [ Quoted SingleQuote [ Str "Oak," ] + , Space + , Quoted SingleQuote [ Str "elm," ] + , Space + , Str "and" + , Space + , Quoted SingleQuote [ Str "beech" ] + , Space + , Str "are" + , Space + , Str "names" + , Space + , Str "of" + , Space + , Str "trees." + , SoftBreak + , Str "So" + , Space + , Str "is" + , Space + , Quoted SingleQuote [ Str "pine." ] + ] + , Para + [ Quoted + SingleQuote + [ Str "He" + , Space + , Str "said," + , Space + , Quoted + DoubleQuote + [ Str "I" + , Space + , Str "want" + , Space + , Str "to" + , Space + , Str "go." + ] + ] + , Space + , Str "Were" + , Space + , Str "you" + , Space + , Str "alive" + , Space + , Str "in" + , Space + , Str "the" + , SoftBreak + , Str "70\8217s?" + ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "some" + , Space + , Str "quoted" + , Space + , Quoted SingleQuote [ Code ( "" , [] , [] ) "code" ] + , Space + , Str "and" + , Space + , Str "a" + , Space + , Quoted + DoubleQuote + [ Link + ( "" , [] , [] ) + [ Str "quoted" , Space , Str "link" ] + ( "http://example.com/?foo=1&bar=2" , "" ) + ] + , Str "." + ] + , Para + [ Str "Some" + , Space + , Str "dashes:" + , Space + , Str "one\8212two" + , Space + , Str "\8212" + , Space + , Str "three\8212four" + , Space + , Str "\8212" + , Space + , Str "five." + ] + , Para + [ Str "Dashes" + , Space + , Str "between" + , Space + , Str "numbers:" + , Space + , Str "5\8211\&7," + , Space + , Str "255\8211\&66," + , Space + , Str "1987\8211\&1999." + ] + , Para [ Str "Ellipses\8230and\8230and\8230." ] + , HorizontalRule + , Header 1 ( "latex" , [] , [] ) [ Str "LaTeX" ] + , BulletList + [ [ Plain + [ RawInline (Format "tex") "\\cite[22-23]{smith.1899}" ] + ] + , [ Plain [ Math InlineMath "2+2=4" ] ] + , [ Plain [ Math InlineMath "x \\in y" ] ] + , [ Plain [ Math InlineMath "\\alpha \\wedge \\omega" ] ] + , [ Plain [ Math InlineMath "223" ] ] + , [ Plain [ Math InlineMath "p" , Str "-Tree" ] ] + , [ Plain + [ Str "Here\8217s" + , Space + , Str "some" + , Space + , Str "display" + , Space + , Str "math:" + , SoftBreak + , Math + DisplayMath + "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}" + ] + ] + , [ Plain + [ Str "Here\8217s" + , Space + , Str "one" + , Space + , Str "that" + , Space + , Str "has" + , Space + , Str "a" + , Space + , Str "line" + , Space + , Str "break" + , Space + , Str "in" + , Space + , Str "it:" + , Space + , Math InlineMath "\\alpha + \\omega \\times x^2" + , Str "." + ] + ] + ] + , Para + [ Str "These" + , Space + , Str "shouldn\8217t" + , Space + , Str "be" + , Space + , Str "math:" + ] + , BulletList + [ [ Plain + [ Str "To" + , Space + , Str "get" + , Space + , Str "the" + , Space + , Str "famous" + , Space + , Str "equation," + , Space + , Str "write" + , Space + , Code ( "" , [] , [] ) "$e = mc^2$" + , Str "." + ] + ] + , [ Plain + [ Str "$22,000" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Emph [ Str "lot" ] + , Space + , Str "of" + , Space + , Str "money." + , Space + , Str "So" + , Space + , Str "is" + , Space + , Str "$34,000." + , SoftBreak + , Str "(It" + , Space + , Str "worked" + , Space + , Str "if" + , Space + , Quoted DoubleQuote [ Str "lot" ] + , Space + , Str "is" + , Space + , Str "emphasized.)" + ] + ] + , [ Plain + [ Str "Shoes" + , Space + , Str "($20)" + , Space + , Str "and" + , Space + , Str "socks" + , Space + , Str "($5)." + ] + ] + , [ Plain + [ Str "Escaped" + , Space + , Code ( "" , [] , [] ) "$" + , Str ":" + , Space + , Str "$73" + , Space + , Emph + [ Str "this" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "emphasized" + ] + , Space + , Str "23$." + ] + ] + ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "LaTeX" + , Space + , Str "table:" + ] + , RawBlock + (Format "tex") + "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog & 2 \\\\\nCat & 1 \\\\ \\hline\n\\end{tabular}" + , HorizontalRule + , Header + 1 + ( "special-characters" , [] , [] ) + [ Str "Special" , Space , Str "Characters" ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "some" + , Space + , Str "unicode:" + ] + , BulletList + [ [ Plain + [ Str "I" , Space , Str "hat:" , Space , Str "\206" ] + ] + , [ Plain + [ Str "o" , Space , Str "umlaut:" , Space , Str "\246" ] + ] + , [ Plain [ Str "section:" , Space , Str "\167" ] ] + , [ Plain + [ Str "set" + , Space + , Str "membership:" + , Space + , Str "\8712" + ] + ] + , [ Plain [ Str "copyright:" , Space , Str "\169" ] ] + ] + , Para + [ Str "AT&T" + , Space + , Str "has" + , Space + , Str "an" + , Space + , Str "ampersand" + , Space + , Str "in" + , Space + , Str "their" + , Space + , Str "name." + ] + , Para + [ Str "AT&T" + , Space + , Str "is" + , Space + , Str "another" + , Space + , Str "way" + , Space + , Str "to" + , Space + , Str "write" + , Space + , Str "it." + ] + , Para + [ Str "This" , Space , Str "&" , Space , Str "that." ] + , Para [ Str "4" , Space , Str "<" , Space , Str "5." ] + , Para [ Str "6" , Space , Str ">" , Space , Str "5." ] + , Para [ Str "Backslash:" , Space , Str "\\" ] + , Para [ Str "Backtick:" , Space , Str "`" ] + , Para [ Str "Asterisk:" , Space , Str "*" ] + , Para [ Str "Underscore:" , Space , Str "_" ] + , Para + [ Str "Left" , Space , Str "brace:" , Space , Str "{" ] + , Para + [ Str "Right" , Space , Str "brace:" , Space , Str "}" ] + , Para + [ Str "Left" , Space , Str "bracket:" , Space , Str "[" ] + , Para + [ Str "Right" , Space , Str "bracket:" , Space , Str "]" ] + , Para + [ Str "Left" , Space , Str "paren:" , Space , Str "(" ] + , Para + [ Str "Right" , Space , Str "paren:" , Space , Str ")" ] + , Para [ Str "Greater-than:" , Space , Str ">" ] + , Para [ Str "Hash:" , Space , Str "#" ] + , Para [ Str "Period:" , Space , Str "." ] + , Para [ Str "Bang:" , Space , Str "!" ] + , Para [ Str "Plus:" , Space , Str "+" ] + , Para [ Str "Minus:" , Space , Str "-" ] + , HorizontalRule + , Header 1 ( "links" , [] , [] ) [ Str "Links" ] + , Header 2 ( "explicit" , [] , [] ) [ Str "Explicit" ] + , Para + [ Str "Just" + , Space + , Str "a" + , Space + , Link ( "" , [] , [] ) [ Str "URL" ] ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "URL" , Space , Str "and" , Space , Str "title" ] + ( "/url/" , "title" ) + , Str "." + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "URL" , Space , Str "and" , Space , Str "title" ] + ( "/url/" , "title preceded by two spaces" ) + , Str "." + ] + , 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" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "with_underscore" ] + ( "/url/with_underscore" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "Email" , Space , Str "link" ] + ( "mailto:nobody@nowhere.net" , "" ) + ] + , Para + [ Link ( "" , [] , [] ) [ Str "Empty" ] ( "" , "" ) + , Str "." + ] + , Header 2 ( "reference" , [] , [] ) [ Str "Reference" ] + , Para + [ Str "Foo" + , Space + , Link ( "" , [] , [] ) [ Str "bar" ] ( "/url/" , "" ) + , Str "." + ] + , Para + [ Str "With" + , Space + , Link + ( "" , [] , [] ) + [ Str "embedded" , Space , Str "[brackets]" ] + ( "/url/" , "" ) + , Str "." + ] + , Para + [ Link ( "" , [] , [] ) [ Str "b" ] ( "/url/" , "" ) + , Space + , Str "by" + , Space + , Str "itself" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "link." + ] + , Para + [ Str "Indented" + , Space + , Link ( "" , [] , [] ) [ Str "once" ] ( "/url" , "" ) + , Str "." + ] + , Para + [ Str "Indented" + , Space + , Link ( "" , [] , [] ) [ Str "twice" ] ( "/url" , "" ) + , Str "." + ] + , Para + [ Str "Indented" + , Space + , Link ( "" , [] , [] ) [ Str "thrice" ] ( "/url" , "" ) + , Str "." + ] + , Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "[not][]" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "link." + ] + , CodeBlock ( "" , [] , [] ) "[not]: /url" + , Para + [ Str "Foo" + , Space + , Link + ( "" , [] , [] ) + [ Str "bar" ] + ( "/url/" , "Title with \"quotes\" inside" ) + , Str "." + ] + , Para + [ Str "Foo" + , Space + , Link + ( "" , [] , [] ) + [ Str "biz" ] + ( "/url/" , "Title with \"quote\" inside" ) + , Str "." + ] + , Header + 2 + ( "with-ampersands" , [] , [] ) + [ Str "With" , Space , Str "ampersands" ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Link + ( "" , [] , [] ) + [ Str "link" + , Space + , Str "with" + , Space + , Str "an" + , Space + , Str "ampersand" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "URL" + ] + ( "http://example.com/?foo=1&bar=2" , "" ) + , Str "." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "link" + , Space + , Str "with" + , Space + , Str "an" + , Space + , Str "amersand" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "link" + , Space + , Str "text:" + , Space + , Link + ( "" , [] , [] ) + [ Str "AT&T" ] + ( "http://att.com/" , "AT&T" ) + , Str "." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "inline" , Space , Str "link" ] + ( "/script?foo=1&bar=2" , "" ) + , Str "." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "inline" + , Space + , Str "link" + , Space + , Str "in" + , Space + , Str "pointy" + , Space + , Str "braces" + ] + ( "/script?foo=1&bar=2" , "" ) + , Str "." + ] + , Header 2 ( "autolinks" , [] , [] ) [ Str "Autolinks" ] + , Para + [ Str "With" + , Space + , Str "an" + , Space + , Str "ampersand:" + , Space + , Link + ( "" , [ "uri" ] , [] ) + [ Str "http://example.com/?foo=1&bar=2" ] + ( "http://example.com/?foo=1&bar=2" , "" ) + ] + , BulletList + [ [ Plain + [ Str "In" , Space , Str "a" , Space , Str "list?" ] + ] + , [ Plain + [ Link + ( "" , [ "uri" ] , [] ) + [ Str "http://example.com/" ] + ( "http://example.com/" , "" ) + ] + ] + , [ Plain [ Str "It" , Space , Str "should." ] ] + ] + , Para + [ Str "An" + , Space + , Str "e-mail" + , Space + , Str "address:" + , Space + , Link + ( "" , [ "email" ] , [] ) + [ Str "nobody@nowhere.net" ] + ( "mailto:nobody@nowhere.net" , "" ) + ] + , BlockQuote + [ Para + [ Str "Blockquoted:" + , Space + , Link + ( "" , [ "uri" ] , [] ) + [ Str "http://example.com/" ] + ( "http://example.com/" , "" ) + ] + ] + , Para + [ Str "Auto-links" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "occur" + , Space + , Str "here:" + , Space + , Code ( "" , [] , [] ) "" + ] + , CodeBlock + ( "" , [] , [] ) "or here: " + , HorizontalRule + , Header 1 ( "images" , [] , [] ) [ 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):" + ] + , Figure + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "lalune" ] ]) + [ Plain + [ Image + ( "" , [] , [] ) + [ Str "lalune" ] + ( "lalune.jpg" , "Voyage dans la Lune" ) + ] + ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "movie" + , Space + , Image + ( "" , [] , [] ) [ Str "movie" ] ( "movie.jpg" , "" ) + , Space + , Str "icon." + ] + , HorizontalRule + , Header 1 ( "footnotes" , [] , [] ) [ Str "Footnotes" ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "footnote" + , Space + , Str "reference," + , Note + [ Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "footnote." + , Space + , Str "It" + , Space + , Str "can" + , Space + , Str "go" + , Space + , Str "anywhere" + , Space + , Str "after" + , Space + , Str "the" + , Space + , Str "footnote" + , SoftBreak + , Str "reference." + , Space + , Str "It" + , Space + , Str "need" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "placed" + , Space + , Str "at" + , Space + , Str "the" + , Space + , Str "end" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "document." + ] + ] + , Space + , Str "and" + , Space + , Str "another." + , Note + [ Para + [ Str "Here\8217s" + , Space + , Str "the" + , Space + , Str "long" + , Space + , Str "note." + , Space + , Str "This" + , Space + , Str "one" + , Space + , Str "contains" + , Space + , Str "multiple" + , SoftBreak + , Str "blocks." + ] + , Para + [ Str "Subsequent" + , Space + , Str "blocks" + , Space + , Str "are" + , Space + , Str "indented" + , Space + , Str "to" + , Space + , Str "show" + , Space + , Str "that" + , Space + , Str "they" + , Space + , Str "belong" + , Space + , Str "to" + , Space + , Str "the" + , SoftBreak + , Str "footnote" + , Space + , Str "(as" + , Space + , Str "with" + , Space + , Str "list" + , Space + , Str "items)." + ] + , CodeBlock ( "" , [] , [] ) " { }" + , Para + [ Str "If" + , Space + , Str "you" + , Space + , Str "want," + , Space + , Str "you" + , Space + , Str "can" + , Space + , Str "indent" + , Space + , Str "every" + , Space + , Str "line," + , Space + , Str "but" + , Space + , Str "you" + , Space + , Str "can" + , Space + , Str "also" + , Space + , Str "be" + , SoftBreak + , Str "lazy" + , Space + , Str "and" + , Space + , Str "just" + , Space + , Str "indent" + , Space + , Str "the" + , Space + , Str "first" + , Space + , Str "line" + , Space + , Str "of" + , Space + , Str "each" + , Space + , Str "block." + ] + ] + , SoftBreak + , Str "This" + , Space + , Str "should" + , Space + , Emph [ Str "not" ] + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "footnote" + , Space + , Str "reference," + , Space + , Str "because" + , Space + , Str "it" + , SoftBreak + , Str "contains" + , Space + , Str "a" + , Space + , Str "space.[^my" + , Space + , Str "note]" + , Space + , Str "Here" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "inline" + , Space + , Str "note." + , Note + [ Para + [ Str "This" + , SoftBreak + , Str "is" + , Space + , Emph [ Str "easier" ] + , Space + , Str "to" + , Space + , Str "type." + , Space + , Str "Inline" + , Space + , Str "notes" + , Space + , Str "may" + , Space + , Str "contain" + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "links" ] + ( "http://google.com" , "" ) + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "]" + , Space + , Str "verbatim" + , Space + , Str "characters," + , SoftBreak + , Str "as" + , Space + , Str "well" + , Space + , Str "as" + , Space + , Str "[bracketed" + , Space + , Str "text]." + ] + ] + ] + , BlockQuote + [ Para + [ Str "Notes" + , Space + , Str "can" + , Space + , Str "go" + , Space + , Str "in" + , Space + , Str "quotes." + , Note [ Para [ Str "In" , Space , Str "quote." ] ] + ] + ] + , OrderedList + ( 1 , Decimal , Period ) + [ [ Plain + [ Str "And" + , Space + , Str "in" + , Space + , Str "list" + , Space + , Str "items." + , Note [ Para [ Str "In" , Space , Str "list." ] ] + ] + ] + ] + , Para + [ Str "This" + , Space + , Str "paragraph" + , Space + , Str "should" + , Space + , Str "not" + , Space + , Str "be" + , Space + , Str "part" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "note," + , Space + , Str "as" + , Space + , Str "it" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "indented." + ] + ] diff --git a/test/testsuite.txt b/test/testsuite.txt --- a/test/testsuite.txt +++ b/test/testsuite.txt @@ -522,8 +522,7 @@ - $p$-Tree - Here's some display math: $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ -- Here's one that has a line break in it: $\alpha + \omega \times -x^2$. +- Here's one that has a line break in it: $\alpha + \omega \times x^2$. These shouldn't be math: diff --git a/test/textile-reader.native b/test/textile-reader.native --- a/test/textile-reader.native +++ b/test/textile-reader.native @@ -1,180 +1,1290 @@ -Pandoc (Meta {unMeta = fromList []}) -[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc",Space,Str "Textile",Space,Str "Reader.",Space,Str "Part",Space,Str "of",Space,Str "it",Space,Str "comes",LineBreak,Str "from",Space,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."] -,HorizontalRule -,Header 1 ("headers",[],[]) [Str "Headers"] -,Header 2 ("level-2-with-an-embeded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embeded",Space,Str "link"] ("http://www.example.com","")] -,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Strong [Str "emphasis"]] -,Header 4 ("level-4",[],[]) [Str "Level",Space,Str "4"] -,Header 5 ("level-5",[],[]) [Str "Level",Space,Str "5"] -,Header 6 ("level-6",[],[]) [Str "Level",Space,Str "6"] -,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"] -,Para [Str "Here\8217s",Space,Str "a",Space,Str "regular",Space,Str "paragraph."] -,Para [Str "Line",Space,Str "breaks",Space,Str "are",Space,Str "preserved",Space,Str "in",Space,Str "textile,",Space,Str "so",Space,Str "you",Space,Str "can",Space,Str "not",Space,Str "wrap",Space,Str "your",Space,Str "very",LineBreak,Str "long",Space,Str "paragraph",Space,Str "with",Space,Str "your",Space,Str "favourite",Space,Str "text",Space,Str "editor",Space,Str "and",Space,Str "have",Space,Str "it",Space,Str "rendered",LineBreak,Str "with",Space,Str "no",Space,Str "break."] -,Para [Str "Here\8217s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet."] -,BulletList - [[Plain [Str "criminey."]]] -,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "paragraph",Space,Str "break",Space,Str "between",Space,Str "here"] -,Para [Str "and",Space,Str "here."] -,Para [Str "pandoc",Space,Str "converts",Space,Str "textile."] -,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"] -,BlockQuote - [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "famous",Space,Str "quote",Space,Str "from",Space,Str "somebody.",Space,Str "He",Space,Str "had",Space,Str "a",Space,Str "lot",Space,Str "of",Space,Str "things",Space,Str "to",LineBreak,Str "say,",Space,Str "so",Space,Str "the",Space,Str "text",Space,Str "is",Space,Str "really",Space,Str "really",Space,Str "long",Space,Str "and",Space,Str "spans",Space,Str "on",Space,Str "multiple",Space,Str "lines."]] -,Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."] -,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"] -,Para [Str "Code:"] -,CodeBlock ("",[],[]) " ---- (should be four hyphens)\n\n sub status {\n print \"working\";\n }\n\n this code block is indented by one tab" -,Para [Str "And:"] -,CodeBlock ("",[],[]) " this code block is indented by two tabs\n\n These should not be escaped: \\$ \\\\ \\> \\[ \\{" -,CodeBlock ("",[],[]) "Code block with .bc\n continued\n @",Str ",",Space,Code ("",[],[]) "@",Str "."] -,Header 1 ("notextile",[],[]) [Str "Notextile"] -,Para [Str "A",Space,Str "block",Space,Str "of",Space,Str "text",Space,Str "can",Space,Str "be",Space,Str "protected",Space,Str "with",Space,Str "notextile",Space,Str ":"] -,Para [Str "\nNo *bold* and\n* no bullet\n"] -,Para [Str "and",Space,Str "inlines",Space,Str "can",Space,Str "be",Space,Str "protected",Space,Str "with",Space,Str "double *equals (=)* markup."] -,Header 1 ("lists",[],[]) [Str "Lists"] -,Header 2 ("unordered",[],[]) [Str "Unordered"] -,Para [Str "Asterisks",Space,Str "tight:"] -,BulletList - [[Plain [Str "asterisk",Space,Str "1"]] - ,[Plain [Str "asterisk",Space,Str "2"]] - ,[Plain [Str "asterisk",Space,Str "3"]]] -,Para [Str "With",Space,Str "line",Space,Str "breaks:"] -,BulletList - [[Plain [Str "asterisk",Space,Str "1",LineBreak,Str "newline"]] - ,[Plain [Str "asterisk",Space,Str "2"]]] -,Header 2 ("ordered",[],[]) [Str "Ordered"] -,Para [Str "Tight:"] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "First"]] - ,[Plain [Str "Second"]] - ,[Plain [Str "Third"]]] -,Header 2 ("nested",[],[]) [Str "Nested"] -,BulletList - [[Plain [Str "ui",Space,Str "1"] - ,BulletList - [[Plain [Str "ui",Space,Str "1.1"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "oi",Space,Str "1.1.1"]] - ,[Plain [Str "oi",Space,Str "1.1.2"]]]] - ,[Plain [Str "ui",Space,Str "1.2"]]]] - ,[Plain [Str "ui",Space,Str "2"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "oi",Space,Str "2.1"] - ,BulletList - [[Plain [Str "ui",Space,Str "2.1.1"]] - ,[Plain [Str "ui",Space,Str "2.1.2"]]]]]]] -,Header 2 ("issue-1500",[],[]) [Str "Issue",Space,Str "#1500"] -,BulletList - [[Plain [Str "one"]] - ,[Plain [Str "two",LineBreak,Str "->",Space,Str "and",Space,Str "more"]]] -,Header 2 ("issue-1513",[],[]) [Str "Issue",Space,Str "#1513"] -,Para [Str "List:"] -,BulletList - [[Plain [Str "one"]] - ,[Plain [Str "two"]]] -,Header 2 ("definition-list",[],[]) [Str "Definition",Space,Str "List"] -,DefinitionList - [([Str "coffee"], - [[Plain [Str "Hot",Space,Str "and",Space,Str "black"]]]) - ,([Str "tea"], - [[Plain [Str "Also",Space,Str "hot,",Space,Str "but",Space,Str "a",Space,Str "little",Space,Str "less",Space,Str "black"]]]) - ,([Str "milk"], - [[Para [Str "Nourishing",Space,Str "beverage",Space,Str "for",Space,Str "baby",Space,Str "cows."] - ,Para [Str "Cold",Space,Str "drink",Space,Str "that",Space,Str "goes",Space,Str "great",Space,Str "with",Space,Str "cookies."]]]) - ,([Str "beer"], - [[Plain [Str "fresh",Space,Str "and",Space,Str "bitter"]]])] -,Header 1 ("inline-markup",[],[]) [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 ".",LineBreak,Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str ".",LineBreak,Str "This",Space,Str "is",Space,Span ("",["underline"],[]) [Str "inserted"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "deleted"],Str ".",LineBreak,Str "Hyphenated-words-are-ok,",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str "strange_underscore_notation.",LineBreak,Str "A",Space,Link ("",[],[]) [Strong [Str "strong",Space,Str "link"]] ("http://www.foobar.com",""),Str "."] -,Para [Emph [Strong [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]],LineBreak,Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Space,Str "and",Space,Emph [Strong [Str "that",Space,Str "one"]],Str ".",LineBreak,Strikeout [Str "This",Space,Str "is",Space,Str "strikeout",Space,Str "and",Space,Strong [Str "strong"]]] -,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Space,Superscript [Strong [Str "hello"]],Space,Str "a",Superscript [Str "hello",Space,Str "there"],Str ".",LineBreak,Str "Subscripts:",Space,Subscript [Str "here"],Space,Str "H",Space,Subscript [Str "2"],Str "O,",Space,Str "H",Space,Subscript [Str "23"],Str "O,",Space,Str "H",Space,Subscript [Str "many",Space,Str "of",Space,Str "them"],Str "O."] -,Para [Str "Dashes",Space,Str ":",Space,Str "How",Space,Str "cool",Space,Str "\8212",Space,Str "automatic",Space,Str "dashes."] -,Para [Str "Elipses",Space,Str ":",Space,Str "He",Space,Str "thought",Space,Str "and",Space,Str "thought",Space,Str "\8230",Space,Str "and",Space,Str "then",Space,Str "thought",Space,Str "some",Space,Str "more."] -,Para [Str "Quotes",Space,Str "and",Space,Str "apostrophes",Space,Str ":",Space,Quoted DoubleQuote [Str "I\8217d",Space,Str "like",Space,Str "to",Space,Str "thank",Space,Str "you"],Space,Str "for",Space,Str "example."] -,Header 1 ("links",[],[]) [Str "Links"] -,Header 2 ("explicit",[],[]) [Str "Explicit"] -,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 [Quoted DoubleQuote [Str "not",Space,Str "a",Space,Str "link"],Str ":",Space,Str "foo"] -,Para [Str "Automatic",Space,Str "linking",Space,Str "to",Space,Link ("",[],[]) [Str "http://www.example.com"] ("http://www.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."] -,Para [Str "A",Space,Str "link",Link ("",[],[]) [Str "with",Space,Str "brackets"] ("http://www.example.com",""),Str "and",Space,Str "no",Space,Str "spaces."] -,Header 1 ("tables",[],[]) [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 ("without-headers",[],[]) [Str "Without",Space,Str "headers"] -,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Str "name"]] - ,[Plain [Str "age"]] - ,[Plain [Str "sex"]]] - ,[[Plain [Str "joan"]] - ,[Plain [Str "24"]] - ,[Plain [Str "f"]]] - ,[[Plain [Str "archie"]] - ,[Plain [Str "29"]] - ,[Plain [Str "m"]]] - ,[[Plain [Str "bella"]] - ,[Plain [Str "45"]] - ,[Plain [Str "f"]]]] -,Para [Str "and",Space,Str "some",Space,Str "text",Space,Str "following",Space,Str "\8230"] -,Header 2 ("with-headers",[],[]) [Str "With",Space,Str "headers"] -,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [[Plain [Str "name"]] - ,[Plain [Str "age"]] - ,[Plain [Str "sex"]]] - [[[Plain [Str "joan"]] - ,[Plain [Str "24"]] - ,[Plain [Str "f"]]] - ,[[Plain [Str "archie"]] - ,[Plain [Str "29"]] - ,[Plain [Str "m"]]] - ,[[Plain [Str "bella"]] - ,[Plain [Str "45"]] - ,[Plain [Str "f"]]]] -,Header 1 ("images",[],[]) [Str "Images"] -,Para [Str "Textile",Space,Str "inline",Space,Str "image",Space,Str "syntax,",Space,Str "like",LineBreak,Str "here",Space,Image ("",[],[]) [Str "this is the alt text"] ("this_is_an_image.png","this is the alt text"),LineBreak,Str "and",Space,Str "here",Space,Image ("",[],[]) [Str ""] ("this_is_an_image.png",""),Str "."] -,Header 1 ("attributes",[],[]) [Str "Attributes"] -,Header 2 ("ident",["bar","foo"],[("style","color:red;"),("lang","en")]) [Str "HTML",Space,Str "and",Space,Str "CSS",Space,Str "attributes",Space,Str "are",Space,Str "parsed",Space,Str "in",Space,Str "headers."] -,Header 2 ("centered",[],[("style","text-align:center;")]) [Str "Centered"] -,Header 2 ("right",[],[("style","text-align:right;")]) [Str "Right"] -,Header 2 ("justified",[],[("lang","en"),("style","color:blue;text-align:justify;")]) [Str "Justified"] -,Para [Str "as",Space,Str "well",Space,Str "as",Space,Strong [Span ("",["foo"],[]) [Str "inline",Space,Str "attributes"]],Space,Str "of",Space,Span ("",[],[("style","color:red;")]) [Str "all",Space,Str "kind"]] -,Para [Str "and",Space,Str "paragraph",Space,Str "attributes,",Space,Str "and",Space,Str "table",Space,Str "attributes."] -,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Str "name"]] - ,[Plain [Str "age"]] - ,[Plain [Str "sex"]]] - ,[[Plain [Str "joan"]] - ,[Plain [Str "24"]] - ,[Plain [Str "f"]]]] -,Para [Emph [Str "(class#id)",Space,Str "emph"]] -,Para [Emph [Str "(no",Space,Str "class#id)",Space,Str "emph"]] -,Header 1 ("entities",[],[]) [Str "Entities"] -,Para [Str "*",LineBreak,Str "&"] -,Header 1 ("raw-html",[],[]) [Str "Raw",Space,Str "HTML"] -,Para [Str "However,",Space,RawInline (Format "html") "",Space,Str "raw",Space,Str "HTML",Space,Str "inlines",Space,RawInline (Format "html") "",Space,Str "are",Space,Str "accepted,",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str ":"] -,RawBlock (Format "html") "
    " -,Para [Str "any",Space,Strong [Str "Raw",Space,Str "HTML",Space,Str "Block"],Space,Str "with",Space,Str "bold"] -,RawBlock (Format "html") "
    " -,Para [Str "Html",Space,Str "blocks",Space,Str "can"] -,RawBlock (Format "html") "
    " -,Para [Str "interrupt",Space,Str "paragraphs"] -,RawBlock (Format "html") "
    " -,Para [Str "as",Space,Str "well."] -,Para [Str "Can",Space,Str "you",Space,Str "prove",Space,Str "that",Space,Str "2",Space,Str "<",Space,Str "3",Space,Str "?"] -,Header 1 ("acronyms-and-marks",[],[]) [Str "Acronyms",Space,Str "and",Space,Str "marks"] -,Para [Str "PBS (Public Broadcasting System)"] -,Para [Str "Hi\8482"] -,Para [Str "Hi",Space,Str "\8482"] -,Para [Str "\174",Space,Str "Hi\174"] -,Para [Str "Hi\169\&2008",Space,Str "\169",Space,Str "2008"] -,Header 1 ("footnotes",[],[]) [Str "Footnotes"] -,Para [Str "A",Space,Str "note.",Note [Para [Str "The",Space,Str "note",LineBreak,Str "is",Space,Str "here!"]],Space,Str "Another",Space,Str "note",Note [Para [Str "Other",Space,Str "note."]],Str "."] -,Header 1 ("comment-blocks",[],[]) [Str "Comment",Space,Str "blocks"] -,Para [Str "not",Space,Str "a",Space,Str "comment."]] +Pandoc + Meta { unMeta = fromList [] } + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "set" + , Space + , Str "of" + , Space + , Str "tests" + , Space + , Str "for" + , Space + , Str "pandoc" + , Space + , Str "Textile" + , Space + , Str "Reader." + , Space + , Str "Part" + , Space + , Str "of" + , Space + , Str "it" + , Space + , Str "comes" + , LineBreak + , Str "from" + , Space + , Str "John" + , Space + , Str "Gruber\8217s" + , Space + , Str "markdown" + , Space + , Str "test" + , Space + , Str "suite." + ] + , HorizontalRule + , Header 1 ( "headers" , [] , [] ) [ Str "Headers" ] + , Header + 2 + ( "level-2-with-an-embedded-link" , [] , [] ) + [ Str "Level" + , Space + , Str "2" + , Space + , Str "with" + , Space + , Str "an" + , Space + , Link + ( "" , [] , [] ) + [ Str "embedded" , Space , Str "link" ] + ( "http://www.example.com" , "" ) + ] + , Header + 3 + ( "level-3-with-emphasis" , [] , [] ) + [ Str "Level" + , Space + , Str "3" + , Space + , Str "with" + , Space + , Strong [ Str "emphasis" ] + ] + , Header + 4 ( "level-4" , [] , [] ) [ Str "Level" , Space , Str "4" ] + , Header + 5 ( "level-5" , [] , [] ) [ Str "Level" , Space , Str "5" ] + , Header + 6 ( "level-6" , [] , [] ) [ Str "Level" , Space , Str "6" ] + , Header 1 ( "paragraphs" , [] , [] ) [ Str "Paragraphs" ] + , Para + [ Str "Here\8217s" + , Space + , Str "a" + , Space + , Str "regular" + , Space + , Str "paragraph." + ] + , Para + [ Str "Line" + , Space + , Str "breaks" + , Space + , Str "are" + , Space + , Str "preserved" + , Space + , Str "in" + , Space + , Str "textile," + , Space + , Str "so" + , Space + , Str "you" + , Space + , Str "can" + , Space + , Str "not" + , Space + , Str "wrap" + , Space + , Str "your" + , Space + , Str "very" + , LineBreak + , Str "long" + , Space + , Str "paragraph" + , Space + , Str "with" + , Space + , Str "your" + , Space + , Str "favourite" + , Space + , Str "text" + , Space + , Str "editor" + , Space + , Str "and" + , Space + , Str "have" + , Space + , Str "it" + , Space + , Str "rendered" + , LineBreak + , Str "with" + , Space + , Str "no" + , Space + , Str "break." + ] + , Para + [ Str "Here\8217s" + , Space + , Str "one" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "bullet." + ] + , BulletList [ [ Plain [ Str "criminey." ] ] ] + , Para + [ Str "There" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "paragraph" + , Space + , Str "break" + , Space + , Str "between" + , Space + , Str "here" + ] + , Para [ Str "and" , Space , Str "here." ] + , Para + [ Str "pandoc" + , Space + , Str "converts" + , Space + , Str "textile." + ] + , Header + 1 + ( "block-quotes" , [] , [] ) + [ Str "Block" , Space , Str "Quotes" ] + , BlockQuote + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "famous" + , Space + , Str "quote" + , Space + , Str "from" + , Space + , Str "somebody." + , Space + , Str "He" + , Space + , Str "had" + , Space + , Str "a" + , Space + , Str "lot" + , Space + , Str "of" + , Space + , Str "things" + , Space + , Str "to" + , LineBreak + , Str "say," + , Space + , Str "so" + , Space + , Str "the" + , Space + , Str "text" + , Space + , Str "is" + , Space + , Str "really" + , Space + , Str "really" + , Space + , Str "long" + , Space + , Str "and" + , Space + , Str "spans" + , Space + , Str "on" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + ] + , Para + [ Str "And" + , Space + , Str "a" + , Space + , Str "following" + , Space + , Str "paragraph." + ] + , Header + 1 + ( "code-blocks" , [] , [] ) + [ Str "Code" , Space , Str "Blocks" ] + , Para [ Str "Code:" ] + , CodeBlock + ( "" , [] , [] ) + " ---- (should be four hyphens)\n\n sub status {\n print \"working\";\n }\n\n this code block is indented by one tab" + , Para [ Str "And:" ] + , CodeBlock + ( "" , [] , [] ) + " this code block is indented by two tabs\n\n These should not be escaped: \\$ \\\\ \\> \\[ \\{" + , CodeBlock + ( "" , [] , [] ) + "Code block with .bc\n continued\n @" + , Str "," + , Space + , Code ( "" , [] , [] ) "@" + , Str "." + ] + , Header 1 ( "notextile" , [] , [] ) [ Str "Notextile" ] + , Para + [ Str "A" + , Space + , Str "block" + , Space + , Str "of" + , Space + , Str "text" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "protected" + , Space + , Str "with" + , Space + , Str "notextile" + , Space + , Str ":" + ] + , Para [ Str "\nNo *bold* and\n* no bullet\n" ] + , Para + [ Str "and" + , Space + , Str "inlines" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "protected" + , Space + , Str "with" + , Space + , Str "double *equals (=)* markup." + ] + , Header 1 ( "lists" , [] , [] ) [ Str "Lists" ] + , Header 2 ( "unordered" , [] , [] ) [ Str "Unordered" ] + , Para [ Str "Asterisks" , Space , Str "tight:" ] + , BulletList + [ [ Plain [ Str "asterisk" , Space , Str "1" ] ] + , [ Plain [ Str "asterisk" , Space , Str "2" ] ] + , [ Plain [ Str "asterisk" , Space , Str "3" ] ] + ] + , Para + [ Str "With" , Space , Str "line" , Space , Str "breaks:" ] + , BulletList + [ [ Plain + [ Str "asterisk" + , Space + , Str "1" + , LineBreak + , Str "newline" + ] + ] + , [ Plain [ Str "asterisk" , Space , Str "2" ] ] + ] + , Header 2 ( "ordered" , [] , [] ) [ Str "Ordered" ] + , Para [ Str "Tight:" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "First" ] ] + , [ Plain [ Str "Second" ] ] + , [ Plain [ Str "Third" ] ] + ] + , Header 2 ( "nested" , [] , [] ) [ Str "Nested" ] + , BulletList + [ [ Plain [ Str "ui" , Space , Str "1" ] + , BulletList + [ [ Plain [ Str "ui" , Space , Str "1.1" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "oi" , Space , Str "1.1.1" ] ] + , [ Plain [ Str "oi" , Space , Str "1.1.2" ] ] + ] + ] + , [ Plain [ Str "ui" , Space , Str "1.2" ] ] + ] + ] + , [ Plain [ Str "ui" , Space , Str "2" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "oi" , Space , Str "2.1" ] + , BulletList + [ [ Plain [ Str "ui" , Space , Str "2.1.1" ] ] + , [ Plain [ Str "ui" , Space , Str "2.1.2" ] ] + ] + ] + ] + ] + ] + , Header + 2 + ( "issue-1500" , [] , [] ) + [ Str "Issue" , Space , Str "#1500" ] + , BulletList + [ [ Plain [ Str "one" ] ] + , [ Plain + [ Str "two" + , LineBreak + , Str "->" + , Space + , Str "and" + , Space + , Str "more" + ] + ] + ] + , Header + 2 + ( "issue-1513" , [] , [] ) + [ Str "Issue" , Space , Str "#1513" ] + , Para [ Str "List:" ] + , BulletList + [ [ Plain [ Str "one" ] ] , [ Plain [ Str "two" ] ] ] + , Header + 2 + ( "definition-list" , [] , [] ) + [ Str "Definition" , Space , Str "List" ] + , DefinitionList + [ ( [ Str "coffee" ] + , [ [ Plain + [ Str "Hot" , Space , Str "and" , Space , Str "black" ] + ] + ] + ) + , ( [ Str "tea" ] + , [ [ Plain + [ Str "Also" + , Space + , Str "hot," + , Space + , Str "but" + , Space + , Str "a" + , Space + , Str "little" + , Space + , Str "less" + , Space + , Str "black" + ] + ] + ] + ) + , ( [ Str "milk" ] + , [ [ Para + [ Str "Nourishing" + , Space + , Str "beverage" + , Space + , Str "for" + , Space + , Str "baby" + , Space + , Str "cows." + ] + , Para + [ Str "Cold" + , Space + , Str "drink" + , Space + , Str "that" + , Space + , Str "goes" + , Space + , Str "great" + , Space + , Str "with" + , Space + , Str "cookies." + ] + ] + ] + ) + , ( [ Str "beer" ] + , [ [ Plain + [ Str "fresh" + , Space + , Str "and" + , Space + , Str "bitter" + ] + ] + ] + ) + ] + , Header + 1 + ( "inline-markup" , [] , [] ) + [ 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 "." + , LineBreak + , Str "This" + , Space + , Str "is" + , Space + , Strong [ Str "strong" ] + , Str "," + , Space + , Str "and" + , Space + , Str "so" + , Space + , Strong [ Str "is" , Space , Str "this" ] + , Str "." + , LineBreak + , Str "This" + , Space + , Str "is" + , Space + , Underline [ Str "inserted" ] + , Str "," + , Space + , Str "and" + , Space + , Str "this" + , Space + , Str "is" + , Space + , Strikeout [ Str "deleted" ] + , Str "." + , LineBreak + , Str "Hyphenated-words-are-ok," + , Space + , Str "as" + , Space + , Str "well" + , Space + , Str "as" + , Space + , Str "strange_underscore_notation." + , LineBreak + , Str "A" + , Space + , Link + ( "" , [] , [] ) + [ Strong [ Str "strong" , Space , Str "link" ] ] + ( "http://www.foobar.com" , "" ) + , Str "." + ] + , Para + [ Emph + [ Strong + [ Str "This" + , Space + , Str "is" + , Space + , Str "strong" + , Space + , Str "and" + , Space + , Str "em." + ] + ] + , LineBreak + , Str "So" + , Space + , Str "is" + , Space + , Strong [ Emph [ Str "this" ] ] + , Space + , Str "word" + , Space + , Str "and" + , Space + , Emph [ Strong [ Str "that" , Space , Str "one" ] ] + , Str "." + , LineBreak + , Strikeout + [ Str "This" + , Space + , Str "is" + , Space + , Str "strikeout" + , Space + , Str "and" + , Space + , Strong [ Str "strong" ] + ] + ] + , Para + [ Str "Superscripts:" + , Space + , Str "a" + , Superscript [ Str "bc" ] + , Str "d" + , Space + , Str "a" + , Space + , Superscript [ Strong [ Str "hello" ] ] + , Space + , Str "a" + , Superscript [ Str "hello" , Space , Str "there" ] + , Str "." + , LineBreak + , Str "Subscripts:" + , Space + , Subscript [ Str "here" ] + , Space + , Str "H" + , Space + , Subscript [ Str "2" ] + , Str "O," + , Space + , Str "H" + , Space + , Subscript [ Str "23" ] + , Str "O," + , Space + , Str "H" + , Space + , Subscript + [ Str "many" , Space , Str "of" , Space , Str "them" ] + , Str "O." + ] + , Para + [ Str "Dashes" + , Space + , Str ":" + , Space + , Str "How" + , Space + , Str "cool" + , Space + , Str "\8212" + , Space + , Str "automatic" + , Space + , Str "dashes." + ] + , Para + [ Str "Ellipses" + , Space + , Str ":" + , Space + , Str "He" + , Space + , Str "thought" + , Space + , Str "and" + , Space + , Str "thought" + , Space + , Str "\8230" + , Space + , Str "and" + , Space + , Str "then" + , Space + , Str "thought" + , Space + , Str "some" + , Space + , Str "more." + ] + , Para + [ Str "Quotes" + , Space + , Str "and" + , Space + , Str "apostrophes" + , Space + , Str ":" + , Space + , Quoted + DoubleQuote + [ Str "I\8217d" + , Space + , Str "like" + , Space + , Str "to" + , Space + , Str "thank" + , Space + , Str "you" + ] + , Space + , Str "for" + , Space + , Str "example." + ] + , Header 1 ( "links" , [] , [] ) [ Str "Links" ] + , Header 2 ( "explicit" , [] , [] ) [ Str "Explicit" ] + , 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 + [ Quoted + DoubleQuote + [ Str "not" , Space , Str "a" , Space , Str "link" ] + , Str ":" + , Space + , Str "foo" + ] + , Para + [ Str "Automatic" + , Space + , Str "linking" + , Space + , Str "to" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.example.com" ] + ( "http://www.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." + ] + , Para + [ Str "A" + , Space + , Str "link" + , Link + ( "" , [] , [] ) + [ Str "with" , Space , Str "brackets" ] + ( "http://www.example.com" , "" ) + , Str "and" + , Space + , Str "no" + , Space + , Str "spaces." + ] + , Para + [ Str "A" + , Space + , Link + ( "" , [] , [] ) [ Str "link" ] ( "ftp://example.com" , "" ) + , Space + , Str "to" + , Space + , Str "a" + , Space + , Str "named" + , Space + , Str "target" + ] + , Para + [ Str "A" + , Space + , Link ( "" , [] , [] ) [ Str "link" ] ( "missing" , "" ) + , Space + , Str "to" + , Space + , Str "a" + , Space + , Str "missing" + , Space + , Str "target" + ] + , Header 1 ( "tables" , [] , [] ) [ 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 + ( "without-headers" , [] , [] ) + [ Str "Without" , Space , Str "headers" ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "name" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "age" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "sex" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "joan" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "24" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "f" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "archie" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "29" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "m" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "bella" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "45" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "f" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "and" + , Space + , Str "some" + , Space + , Str "text" + , Space + , Str "following" + , Space + , Str "\8230" + ] + , Header + 2 + ( "with-headers" , [] , [] ) + [ Str "With" , Space , Str "headers" ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "name" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "age" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "sex" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "joan" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "24" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "f" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "archie" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "29" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "m" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "bella" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "45" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "f" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Header 1 ( "images" , [] , [] ) [ Str "Images" ] + , Para + [ Str "Textile" + , Space + , Str "inline" + , Space + , Str "image" + , Space + , Str "syntax," + , Space + , Str "like" + , LineBreak + , Str "here" + , Space + , Image + ( "" , [] , [] ) + [ Str "this is the alt text" ] + ( "this_is_an_image.png" , "this is the alt text" ) + , LineBreak + , Str "and" + , Space + , Str "here" + , Space + , Image + ( "" , [] , [] ) [ Str "" ] ( "this_is_an_image.png" , "" ) + , Str "." + ] + , Header 1 ( "attributes" , [] , [] ) [ Str "Attributes" ] + , Header + 2 + ( "ident" + , [ "bar" , "foo" ] + , [ ( "style" , "color:red;" ) , ( "lang" , "en" ) ] + ) + [ Str "HTML" + , Space + , Str "and" + , Space + , Str "CSS" + , Space + , Str "attributes" + , Space + , Str "are" + , Space + , Str "parsed" + , Space + , Str "in" + , Space + , Str "headers." + ] + , Header + 2 + ( "centered" , [] , [ ( "style" , "text-align:center;" ) ] ) + [ Str "Centered" ] + , Header + 2 + ( "right" , [] , [ ( "style" , "text-align:right;" ) ] ) + [ Str "Right" ] + , Header + 2 + ( "justified" + , [] + , [ ( "lang" , "en" ) + , ( "style" , "color:blue;text-align:justify;" ) + ] + ) + [ Str "Justified" ] + , Para + [ Str "as" + , Space + , Str "well" + , Space + , Str "as" + , Space + , Strong + [ Span + ( "" , [ "foo" ] , [] ) + [ Str "inline" , Space , Str "attributes" ] + ] + , Space + , Str "of" + , Space + , Span + ( "" , [] , [ ( "style" , "color:red;" ) ] ) + [ Str "all" , Space , Str "kind" ] + ] + , Div + ( "" , [] , [ ( "style" , "color:green;" ) ] ) + [ Para + [ Str "and" + , Space + , Str "paragraph" + , Space + , Str "attributes," + , Space + , Str "and" + , Space + , Str "table" + , Space + , Str "attributes." + ] + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "name" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "age" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "sex" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "joan" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "24" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "f" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para [ Emph [ Str "(class#id)" , Space , Str "emph" ] ] + , Para + [ Emph + [ Str "(no" , Space , Str "class#id)" , Space , Str "emph" ] + ] + , Header 1 ( "entities" , [] , [] ) [ Str "Entities" ] + , Para [ Str "*" , LineBreak , Str "&" ] + , Header + 1 + ( "raw-html" , [] , [] ) + [ Str "Raw" , Space , Str "HTML" ] + , Para + [ Str "However," + , Space + , RawInline (Format "html") "" + , Space + , Str "raw" + , Space + , Str "HTML" + , Space + , Str "inlines" + , Space + , RawInline (Format "html") "" + , Space + , Str "are" + , Space + , Str "accepted," + , Space + , Str "as" + , Space + , Str "well" + , Space + , Str "as" + , Space + , Str ":" + ] + , RawBlock (Format "html") "
    " + , Para + [ Str "any" + , Space + , Strong + [ Str "Raw" , Space , Str "HTML" , Space , Str "Block" ] + , Space + , Str "with" + , Space + , Str "bold" + ] + , RawBlock (Format "html") "
    " + , Para + [ Str "Html" , Space , Str "blocks" , Space , Str "can" ] + , RawBlock (Format "html") "
    " + , Para [ Str "interrupt" , Space , Str "paragraphs" ] + , RawBlock (Format "html") "
    " + , Para [ Str "as" , Space , Str "well." ] + , Para + [ Str "Can" + , Space + , Str "you" + , Space + , Str "prove" + , Space + , Str "that" + , Space + , Str "2" + , Space + , Str "<" + , Space + , Str "3" + , Space + , Str "?" + ] + , Header + 1 + ( "acronyms-and-marks" , [] , [] ) + [ Str "Acronyms" , Space , Str "and" , Space , Str "marks" ] + , Para [ Str "PBS (Public Broadcasting System)" ] + , Para [ Str "Hi\8482" ] + , Para [ Str "Hi" , Space , Str "\8482" ] + , Para [ Str "\174" , Space , Str "Hi\174" ] + , Para + [ Str "Hi\169\&2008" + , Space + , Str "\169" + , Space + , Str "2008" + ] + , Header 1 ( "footnotes" , [] , [] ) [ Str "Footnotes" ] + , Para + [ Str "A" + , Space + , Str "note." + , Note + [ Para + [ Str "The" + , Space + , Str "note" + , LineBreak + , Str "is" + , Space + , Str "here!" + ] + ] + , Space + , Str "Another" + , Space + , Str "note" + , Note [ Para [ Str "Other" , Space , Str "note." ] ] + , Str "." + ] + , Header + 1 + ( "comment-blocks" , [] , [] ) + [ Str "Comment" , Space , Str "blocks" ] + , Para + [ Str "not" , Space , Str "a" , Space , Str "comment." ] + ] diff --git a/test/textile-reader.textile b/test/textile-reader.textile --- a/test/textile-reader.textile +++ b/test/textile-reader.textile @@ -5,7 +5,7 @@ h1. Headers -h2. Level 2 with an "embeded link":http://www.example.com +h2. Level 2 with an "embedded link":http://www.example.com h3. Level 3 with *emphasis* @@ -162,7 +162,7 @@ Dashes : How cool -- automatic dashes. -Elipses : He thought and thought ... and then thought some more. +Ellipses : He thought and thought ... and then thought some more. Quotes and apostrophes : "I'd like to thank you" for example. @@ -183,6 +183,10 @@ A link["with brackets":http://www.example.com]and no spaces. +A "link":link-target to a named target + +A "link":missing to a missing target + h1. Tables Textile allows tables with and without headers : @@ -269,7 +273,7 @@ fn1. The note is here! -fn2. Other note. +fn2^. Other note. h1. Comment blocks @@ -277,3 +281,5 @@ is here. not a comment. + +[link-target]ftp://example.com diff --git a/test/tikiwiki-reader.native b/test/tikiwiki-reader.native --- a/test/tikiwiki-reader.native +++ b/test/tikiwiki-reader.native @@ -1,130 +1,782 @@ -Pandoc (Meta {unMeta = fromList []}) -[Header 1 ("header",[],[]) [Str "header"] -,Header 2 ("header-level-two",[],[]) [Str "header",Space,Str "level",Space,Str "two"] -,Header 3 ("header-level-3",[],[]) [Str "header",Space,Str "level",Space,Str "3"] -,Header 4 ("header-_level_-four",[],[]) [Str "header",Space,Str "_level_",Space,Str "four"] -,Header 5 ("header-level-5",[],[]) [Str "header",Space,Str "level",Space,Str "5"] -,Header 6 ("header-level-6",[],[]) [Str "header",Space,Str "level",Space,Str "6"] -,Para [Str "!!!!!!!",Space,Str "not",Space,Str "a",Space,Str "header"] -,Para [Str "--++",Space,Str "not",Space,Str "a",Space,Str "header"] -,Header 1 ("emph-and-strong",[],[]) [Str "emph",Space,Str "and",Space,Str "strong"] -,Para [Emph [Str "emph"],Space,Strong [Str "strong"]] -,Para [Emph [Strong [Str "strong",Space,Str "and",Space,Str "emph",Space,Str "1"]]] -,Para [Strong [Emph [Str "strong",Space,Str "and",Space,Str "emph",Space,Str "2"]]] -,Para [Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]] -,Para [Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]] -,Para [Emph [Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]] -,Header 1 ("horizontal-rule",[],[]) [Str "horizontal",Space,Str "rule"] -,Para [Str "top"] -,HorizontalRule -,Para [Str "bottom"] -,HorizontalRule -,Header 1 ("nop",[],[]) [Str "nop"] -,Para [Str "__not emph__"] -,Header 1 ("entities",[],[]) [Str "entities"] -,Para [Str "hi",Space,Str "&",Space,Str "low"] -,Para [Str "hi",Space,Str "&",Space,Str "low"] -,Para [Str "G\246del"] -,Para [Str "\777\2730"] -,Header 1 ("linebreaks",[],[]) [Str "linebreaks"] -,Para [Str "hi",LineBreak,Str "there"] -,Para [Str "hi",LineBreak,Str "there"] -,Header 1 ("inline-code",[],[]) [Str "inline",Space,Str "code"] -,Para [Code ("",[],[]) "*\8594*",Space,Code ("",[],[]) "typed",Space,Code ("",[],[]) ">>="] -,Header 1 ("code-blocks",[],[]) [Str "code",Space,Str "blocks"] -,CodeBlock ("",[],[]) "\ncase xs of\n (_:_) -> reverse xs\n [] -> ['*']\n" -,CodeBlock ("",["haskell"],[("colors","haskell"),("ln","0")]) "\ncase xs of\n (_:_) -> reverse xs\n [] -> ['*']\n" -,Header 1 ("external-links",[],[]) [Str "external",Space,Str "links"] -,Para [Link ("",[],[]) [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")] -,Para [Link ("",[],[]) [Str "http://pandoc.org"] ("http://pandoc.org","")] -,Para [Link ("",[],[]) [Str "http://google.com"] ("http://google.com",""),Space,Link ("",[],[]) [Str "http://yahoo.com"] ("http://yahoo.com","")] -,Para [Link ("",[],[]) [Str "email",Space,Str "me"] ("mailto:info@example.org","")] -,Para [Str "http://google.com"] -,Para [Str "info@example.org"] -,Header 1 ("lists",[],[]) [Str "lists"] -,BulletList - [[Plain [Str "Start",Space,Str "each",Space,Str "line",Space]] - ,[Plain [Str "with",Space,Str "an",Space,Str "asterisk",Space,Str "(*).",Space] - ,BulletList - [[Plain [Str "More",Space,Str "asterisks",Space,Str "gives",Space,Str "deeper",Space] - ,BulletList - [[Plain [Str "and",Space,Str "deeper",Space,Str "levels.",Space]]]]]] - ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels.",Space]] - ,[Plain [Str "Continuations",Space,Str "are",Space,Str "also",Space,Str "possible",Space] - ,BulletList - [[Plain [Str "and",Space,Str "do",Space,Str "not",Space,Str "break",Space,Str "the",Space,Str "list",Space,Str "flow",Space]]]] - ,[Plain [Str "Level",Space,Str "one",Space]]] -,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "ends",Space,Str "the",Space,Str "list."] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Start",Space,Str "each",Space,Str "line",Space]] - ,[Plain [Str "with",Space,Str "a",Space,Str "number",Space,Str "(1.).",Space] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "More",Space,Str "number",Space,Str "signs",Space,Str "gives",Space,Str "deeper",Space] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "and",Space,Str "deeper",Space]] - ,[Plain [Str "levels.",Space]]]]]] - ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels.",Space]] - ,[Plain [Str "Blank",Space,Str "lines",Space]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "end",Space,Str "the",Space,Str "list",Space,Str "and",Space,Str "start",Space,Str "another.",Space]]] -,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "also",Space,Str "ends",Space,Str "the",Space,Str "list."] -,DefinitionList - [([Str "item",Space,Str "1"], - [[Plain [Str "definition",Space,Str "1",Space]]]) - ,([Str "item",Space,Str "2"], - [[Plain [Str "definition",Space,Str "2-1",Space,Str "definition",Space,Str "2-2",Space]]]) - ,([Str "item",Space,Emph [Str "3"]], - [[Plain [Str "definition",Space,Emph [Str "3"],Space]]])] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "one",Space]] - ,[Plain [Str "two",Space] - ,BulletList - [[Plain [Str "two",Space,Str "point",Space,Str "one",Space]] - ,[Plain [Str "two",Space,Str "point",Space,Str "two",Space]]]] - ,[Plain [Str "three",Space]] - ,[Plain [Str "four",Space]] - ,[Plain [Str "five",Space] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "five",Space,Str "sub",Space,Str "1",Space] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "five",Space,Str "sub",Space,Str "1",Space,Str "sub",Space,Str "1",Space]]]] - ,[Plain [Str "five",Space,Str "sub",Space,Str "2",Space]]]]] -,Header 1 ("tables",[],[]) [Str "tables"] -,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[Plain [Str ""]] - ,[Plain [Str ""]]] - [[[Plain [Str "Orange"]] - ,[Plain [Str "Apple"]]] - ,[[Plain [Str "Bread"]] - ,[Plain [Str "Pie"]]] - ,[[Plain [Str "Butter"]] - ,[Plain [Str "Ice",Space,Str "cream"]]]] -,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[Plain [Str ""]] - ,[Plain [Str ""]]] - [[[Plain [Str "Orange"]] - ,[Plain [Str "Apple"]]] - ,[[Plain [Str "Bread"]] - ,[Plain [Str "Pie"]]] - ,[[Plain [Strong [Str "Butter"]]] - ,[Plain [Str "Ice",Space,Str "cream"]]]] -,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[Plain [Str ""]] - ,[Plain [Str ""]]] - [[[Plain [Str "Orange"]] - ,[Plain [Str "Apple"]]] - ,[[Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]] - ,[Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]] -,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [[Plain [Str ""]] - ,[Plain [Str ""]] - ,[Plain [Str ""]]] - [[[Plain [Space,Str "Orange",Space]] - ,[Plain [Space,Str "Apple",Space]] - ,[Plain [Space,Str "more"]]] - ,[[Plain [Space,Str "Bread",Space]] - ,[Plain [Space,Str "Pie",Space]] - ,[Plain [Space,Str "more"]]] - ,[[Plain [Space,Str "Butter",Space]] - ,[Plain [Space,Str "Ice",Space,Str "cream",Space]] - ,[Plain [Space,Str "and",Space,Str "more",Space]]]]] +Pandoc + Meta { unMeta = fromList [] } + [ Header 1 ( "header" , [] , [] ) [ Str "header" ] + , Header + 2 + ( "header-level-two" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "two" ] + , Header + 3 + ( "header-level-3" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "3" ] + , Header + 4 + ( "header-_level_-four" , [] , [] ) + [ Str "header" + , Space + , Str "_level_" + , Space + , Str "four" + ] + , Header + 5 + ( "header-level-5" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "5" ] + , Header + 6 + ( "header-level-6" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "6" ] + , Para + [ Str "!!!!!!!" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "header" + ] + , Para + [ Str "--++" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "header" + ] + , Header + 1 + ( "emph-and-strong" , [] , [] ) + [ Str "emph" , Space , Str "and" , Space , Str "strong" ] + , Para + [ Emph [ Str "emph" ] , Space , Strong [ Str "strong" ] ] + , Para + [ Emph + [ Strong + [ Str "strong" + , Space + , Str "and" + , Space + , Str "emph" + , Space + , Str "1" + ] + ] + ] + , Para + [ Strong + [ Emph + [ Str "strong" + , Space + , Str "and" + , Space + , Str "emph" + , Space + , Str "2" + ] + ] + ] + , Para + [ Strong + [ Emph [ Str "emph" , Space , Str "inside" ] + , Space + , Str "strong" + ] + ] + , Para + [ Strong + [ Str "strong" + , Space + , Str "with" + , Space + , Emph [ Str "emph" ] + ] + ] + , Para + [ Emph + [ Strong [ Str "strong" , Space , Str "inside" ] + , Space + , Str "emph" + ] + ] + , Header + 1 + ( "other-inlines" , [] , [] ) + [ Str "other" , Space , Str "inlines" ] + , Para + [ Underline [ Str "underlined" , Space , Str "text" ] ] + , Para [ Strikeout [ Str "strikeout" ] ] + , Header + 1 + ( "horizontal-rule" , [] , [] ) + [ Str "horizontal" , Space , Str "rule" ] + , Para [ Str "top" ] + , HorizontalRule + , Para [ Str "bottom" ] + , HorizontalRule + , Header 1 ( "nop" , [] , [] ) [ Str "nop" ] + , Para [ Str "__not emph__" ] + , Header 1 ( "entities" , [] , [] ) [ Str "entities" ] + , Para [ Str "hi" , Space , Str "&" , Space , Str "low" ] + , Para [ Str "hi" , Space , Str "&" , Space , Str "low" ] + , Para [ Str "G\246del" ] + , Para [ Str "\777\2730" ] + , Header 1 ( "linebreaks" , [] , [] ) [ Str "linebreaks" ] + , Para [ Str "hi" , LineBreak , Str "there" ] + , Para [ Str "hi" , LineBreak , Str "there" ] + , Header + 1 + ( "inline-code" , [] , [] ) + [ Str "inline" , Space , Str "code" ] + , Para + [ Code ( "" , [] , [] ) "*\8594*" + , Space + , Code ( "" , [] , [] ) "typed" + , Space + , Code ( "" , [] , [] ) ">>=" + ] + , Header + 1 + ( "code-blocks" , [] , [] ) + [ Str "code" , Space , Str "blocks" ] + , CodeBlock + ( "" , [] , [] ) + "\ncase xs of\n (_:_) -> reverse xs\n [] -> ['*']\n" + , CodeBlock + ( "" + , [ "haskell" ] + , [ ( "colors" , "haskell" ) , ( "ln" , "0" ) ] + ) + "\ncase xs of\n (_:_) -> reverse xs\n [] -> ['*']\n" + , Header + 1 + ( "external-links" , [] , [] ) + [ Str "external" , Space , Str "links" ] + , Para + [ Link + ( "" , [] , [] ) + [ Emph [ Str "Google" ] + , Space + , Str "search" + , Space + , Str "engine" + ] + ( "http://google.com" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "http://pandoc.org" ] + ( "http://pandoc.org" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "http://google.com" ] + ( "http://google.com" , "" ) + , Space + , Link + ( "" , [] , [] ) + [ Str "http://yahoo.com" ] + ( "http://yahoo.com" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "email" , Space , Str "me" ] + ( "mailto:info@example.org" , "" ) + ] + , Para [ Str "http://google.com" ] + , Para [ Str "info@example.org" ] + , Header 1 ( "lists" , [] , [] ) [ Str "lists" ] + , BulletList + [ [ Plain + [ Str "Start" , Space , Str "each" , Space , Str "line" ] + ] + , [ Plain + [ Str "with" + , Space + , Str "an" + , Space + , Str "asterisk" + , Space + , Str "(*)." + ] + , BulletList + [ [ Plain + [ Str "More" + , Space + , Str "asterisks" + , Space + , Str "gives" + , Space + , Str "deeper" + ] + , BulletList + [ [ Plain + [ Str "and" + , Space + , Str "deeper" + , Space + , Str "levels." + ] + ] + ] + ] + ] + ] + , [ Plain + [ Str "Line" + , Space + , Str "breaks" + , LineBreak + , Str "don't" + , Space + , Str "break" + , Space + , Str "levels." + ] + ] + , [ Plain + [ Str "Continuations" + , Space + , Str "are" + , Space + , Str "also" + , Space + , Str "possible" + ] + , BulletList + [ [ Plain + [ Str "and" + , Space + , Str "do" + , Space + , Str "not" + , Space + , Str "break" + , Space + , Str "the" + , Space + , Str "list" + , Space + , Str "flow" + ] + ] + ] + ] + , [ Plain [ Str "Level" , Space , Str "one" ] ] + ] + , Para + [ Str "Any" + , Space + , Str "other" + , Space + , Str "start" + , Space + , Str "ends" + , Space + , Str "the" + , Space + , Str "list." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Start" , Space , Str "each" , Space , Str "line" ] + ] + , [ Plain + [ Str "with" + , Space + , Str "a" + , Space + , Str "number" + , Space + , Str "(1.)." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "More" + , Space + , Str "number" + , Space + , Str "signs" + , Space + , Str "gives" + , Space + , Str "deeper" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "and" , Space , Str "deeper" ] ] + , [ Plain [ Str "levels." ] ] + ] + ] + ] + ] + , [ Plain + [ Str "Line" + , Space + , Str "breaks" + , LineBreak + , Str "don't" + , Space + , Str "break" + , Space + , Str "levels." + ] + ] + , [ Plain [ Str "Blank" , Space , Str "lines" ] ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "end" + , Space + , Str "the" + , Space + , Str "list" + , Space + , Str "and" + , Space + , Str "start" + , Space + , Str "another." + ] + ] + ] + , Para + [ Str "Any" + , Space + , Str "other" + , Space + , Str "start" + , Space + , Str "also" + , Space + , Str "ends" + , Space + , Str "the" + , Space + , Str "list." + ] + , DefinitionList + [ ( [ Str "item" , Space , Str "1" ] + , [ [ Plain [ Str "definition" , Space , Str "1" ] ] ] + ) + , ( [ Str "item" , Space , Str "2" ] + , [ [ Plain + [ Str "definition" + , Space + , Str "2-1" + , Space + , Str "definition" + , Space + , Str "2-2" + ] + ] + ] + ) + , ( [ Str "item" , Space , Emph [ Str "3" ] ] + , [ [ Plain [ Str "definition" , Space , Emph [ Str "3" ] ] + ] + ] + ) + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "one" ] ] + , [ Plain [ Str "two" ] + , BulletList + [ [ Plain + [ Str "two" + , Space + , Str "point" + , Space + , Str "one" + ] + ] + , [ Plain + [ Str "two" + , Space + , Str "point" + , Space + , Str "two" + ] + ] + ] + ] + , [ Plain [ Str "three" ] ] + , [ Plain [ Str "four" ] ] + , [ Plain [ Str "five" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "five" , Space , Str "sub" , Space , Str "1" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "five" + , Space + , Str "sub" + , Space + , Str "1" + , Space + , Str "sub" + , Space + , Str "1" + ] + ] + ] + ] + , [ Plain + [ Str "five" , Space , Str "sub" , Space , Str "2" ] + ] + ] + ] + ] + , Header 1 ( "tables" , [] , [] ) [ Str "tables" ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Orange" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Apple" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Bread" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Pie" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Butter" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Ice" , Space , Str "cream" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Orange" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Apple" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Bread" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Pie" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Strong [ Str "Butter" ] ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Ice" , Space , Str "cream" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Orange" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Apple" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Bread" + , LineBreak + , LineBreak + , Str "and" + , Space + , Str "cheese" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Pie" + , LineBreak + , LineBreak + , Strong [ Str "apple" ] + , Space + , Str "and" + , Space + , Emph [ Str "carrot" ] + , Space + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Space , Str "Orange" , Space ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Space , Str "Apple" , Space ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Space , Str "more" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Space , Str "Bread" , Space ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Space , Str "Pie" , Space ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Space , Str "more" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Space , Str "Butter" , Space ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Space + , Str "Ice" + , Space + , Str "cream" + , Space + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Space , Str "and" , Space , Str "more" , Space ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] diff --git a/test/tikiwiki-reader.tikiwiki b/test/tikiwiki-reader.tikiwiki --- a/test/tikiwiki-reader.tikiwiki +++ b/test/tikiwiki-reader.tikiwiki @@ -28,6 +28,12 @@ ''__strong inside__ emph'' +! other inlines + +===underlined text=== + +--strikeout-- + ! horizontal rule top diff --git a/test/twiki-reader.native b/test/twiki-reader.native --- a/test/twiki-reader.native +++ b/test/twiki-reader.native @@ -1,174 +1,879 @@ -Pandoc (Meta {unMeta = fromList []}) -[Header 1 ("header",[],[]) [Str "header"] -,Header 2 ("header-level-two",[],[]) [Str "header",Space,Str "level",Space,Str "two"] -,Header 3 ("header-level-3",[],[]) [Str "header",Space,Str "level",Space,Str "3"] -,Header 4 ("header-level-four",[],[]) [Str "header",Space,Emph [Str "level"],Space,Str "four"] -,Header 5 ("header-level-5",[],[]) [Str "header",Space,Str "level",Space,Str "5"] -,Header 6 ("header-level-6",[],[]) [Str "header",Space,Str "level",Space,Str "6"] -,Para [Str "---+++++++",Space,Str "not",Space,Str "a",Space,Str "header"] -,Para [Str "--++",Space,Str "not",Space,Str "a",Space,Str "header"] -,Header 1 ("emph-and-strong",[],[]) [Str "emph",Space,Str "and",Space,Str "strong"] -,Para [Emph [Str "emph"],Space,Strong [Str "strong"]] -,Para [Emph [Strong [Str "strong",Space,Str "and",Space,Str "emph"]]] -,Para [Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]] -,Para [Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]] -,Para [Emph [Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]] -,Header 1 ("horizontal-rule",[],[]) [Str "horizontal",Space,Str "rule"] -,Para [Str "top"] -,HorizontalRule -,Para [Str "bottom"] -,HorizontalRule -,Header 1 ("nop",[],[]) [Str "nop"] -,Para [Str "_not",Space,Str "emph_"] -,Header 1 ("entities",[],[]) [Str "entities"] -,Para [Str "hi",Space,Str "&",Space,Str "low"] -,Para [Str "hi",Space,Str "&",Space,Str "low"] -,Para [Str "G\246del"] -,Para [Str "\777\2730"] -,Header 1 ("comments",[],[]) [Str "comments"] -,Para [Str "inline",Space,Str "comment"] -,Para [Str "between",Space,Str "blocks"] -,Header 1 ("linebreaks",[],[]) [Str "linebreaks"] -,Para [Str "hi",LineBreak,Str "there"] -,Para [Str "hi",LineBreak,Str "there"] -,Header 1 ("inline-code",[],[]) [Str "inline",Space,Str "code"] -,Para [Code ("",[],[]) "*\8594*",Space,Code ("",[],[]) "typed",Space,Code ("",["haskell"],[]) ">>="] -,Header 1 ("code-blocks",[],[]) [Str "code",Space,Str "blocks"] -,CodeBlock ("",[],[]) "case xs of\n (_:_) -> reverse xs\n [] -> ['*']" -,CodeBlock ("",["haskell"],[]) "case xs of\n (_:_) -> reverse xs\n [] -> ['*']" -,Header 1 ("block-quotes",[],[]) [Str "block",Space,Str "quotes"] -,Para [Str "Regular",Space,Str "paragraph"] -,BlockQuote - [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote."] - ,Para [Str "With",Space,Str "two",Space,Str "paragraphs."]] -,Para [Str "Nother",Space,Str "paragraph."] -,Header 1 ("external-links",[],[]) [Str "external",Space,Str "links"] -,Para [Link ("",[],[]) [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")] -,Para [Link ("",[],[]) [Str "http://pandoc.org"] ("http://pandoc.org","")] -,Para [Link ("",[],[]) [Str "http://google.com"] ("http://google.com",""),Space,Link ("",[],[]) [Str "http://yahoo.com"] ("http://yahoo.com","")] -,Para [Link ("",[],[]) [Str "email",Space,Str "me"] ("mailto:info@example.org","")] -,Para [Str "http://google.com"] -,Para [Str "http://google.com"] -,Para [Str "http://google.com"] -,Para [Str "info@example.org"] -,Para [Str "info@example.org"] -,Para [Str "info@example.org"] -,Header 1 ("lists",[],[]) [Str "lists"] -,BulletList - [[Plain [Str "Start",Space,Str "each",Space,Str "line"]] - ,[Plain [Str "with",Space,Str "an",Space,Str "asterisk",Space,Str "(*)."] - ,BulletList - [[Plain [Str "More",Space,Str "asterisks",Space,Str "gives",Space,Str "deeper"] - ,BulletList - [[Plain [Str "and",Space,Str "deeper",Space,Str "levels."]]]]]] - ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]] - ,[Plain [Str "Continuations",Space,Str "are",Space,Str "also",Space,Str "possible"] - ,BulletList - [[Plain [Str "and",Space,Str "do",Space,Str "not",Space,Str "break",Space,Str "the",Space,Str "list",Space,Str "flow"]]]] - ,[Plain [Str "Level",Space,Str "one"]]] -,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "ends",Space,Str "the",Space,Str "list."] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Start",Space,Str "each",Space,Str "line"]] - ,[Plain [Str "with",Space,Str "a",Space,Str "number",Space,Str "(1.)."] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "More",Space,Str "number",Space,Str "signs",Space,Str "gives",Space,Str "deeper"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "and",Space,Str "deeper"]] - ,[Plain [Str "levels."]]]]]] - ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]] - ,[Plain [Str "Blank",Space,Str "lines"]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "end",Space,Str "the",Space,Str "list",Space,Str "and",Space,Str "start",Space,Str "another."]]] -,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "also",Space,Str "ends",Space,Str "the",Space,Str "list."] -,DefinitionList - [([Str "item",Space,Str "1"], - [[Plain [Str "definition",Space,Str "1"]]]) - ,([Str "item",Space,Str "2"], - [[Plain [Str "definition",Space,Str "2-1",Space,Str "definition",Space,Str "2-2"]]]) - ,([Str "item",Space,Emph [Str "3"]], - [[Plain [Str "definition",Space,Emph [Str "3"]]]])] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "one"]] - ,[Plain [Str "two"] - ,BulletList - [[Plain [Str "two",Space,Str "point",Space,Str "one"]] - ,[Plain [Str "two",Space,Str "point",Space,Str "two"]]]] - ,[Plain [Str "three"] - ,DefinitionList - [([Str "three",Space,Str "item",Space,Str "one"], - [[Plain [Str "three",Space,Str "def",Space,Str "one"]]])]] - ,[Plain [Str "four"] - ,DefinitionList - [([Str "four",Space,Str "def",Space,Str "one"], - [[Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "continuation"]]])]] - ,[Plain [Str "five"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "five",Space,Str "sub",Space,Str "1"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "five",Space,Str "sub",Space,Str "1",Space,Str "sub",Space,Str "1"]]]] - ,[Plain [Str "five",Space,Str "sub",Space,Str "2"]]]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "other"] - ,OrderedList (1,UpperRoman,DefaultDelim) - [[Plain [Str "list"]] - ,[Plain [Str "styles"]]]] - ,[Plain [Str "are"] - ,OrderedList (1,LowerRoman,DefaultDelim) - [[Plain [Str "also"]] - ,[Plain [Str "possible"]]]] - ,[Plain [Str "all"] - ,OrderedList (1,LowerAlpha,DefaultDelim) - [[Plain [Str "the"]] - ,[Plain [Str "different"]] - ,[Plain [Str "styles"]]]] - ,[Plain [Str "are"] - ,OrderedList (1,UpperAlpha,DefaultDelim) - [[Plain [Str "implemented"]] - ,[Plain [Str "and"]] - ,[Plain [Str "supported"]]]]] -,Header 1 ("tables",[],[]) [Str "tables"] -,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[] - ,[]] - [[[Plain [Str "Orange"]] - ,[Plain [Str "Apple"]]] - ,[[Plain [Str "Bread"]] - ,[Plain [Str "Pie"]]] - ,[[Plain [Str "Butter"]] - ,[Plain [Str "Ice",Space,Str "cream"]]]] -,Table [] [AlignLeft,AlignLeft] [0.0,0.0] - [[Plain [Str "Orange"]] - ,[Plain [Str "Apple"]]] - [[[Plain [Str "Bread"]] - ,[Plain [Str "Pie"]]] - ,[[Plain [Strong [Str "Butter"]]] - ,[Plain [Str "Ice",Space,Str "cream"]]]] -,Table [] [AlignLeft,AlignLeft] [0.0,0.0] - [[Plain [Str "Orange"]] - ,[Plain [Str "Apple"]]] - [[[Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]] - ,[Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"]]]]] -,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Str "Orange"]] - ,[Plain [Str "Apple"]] - ,[Plain [Str "more"]]] - ,[[Plain [Str "Bread"]] - ,[Plain [Str "Pie"]] - ,[Plain [Str "more"]]] - ,[[Plain [Str "Butter"]] - ,[Plain [Str "Ice",Space,Str "cream"]] - ,[Plain [Str "and",Space,Str "more"]]]] -,Header 1 ("macros",[],[]) [Str "macros"] -,Para [Span ("",["twiki-macro","TEST"],[]) []] -,Para [Span ("",["twiki-macro","TEST"],[]) [Str ""]] -,Para [Span ("",["twiki-macro","TEST"],[]) [Str "content with spaces"]] -,Para [Span ("",["twiki-macro","TEST"],[]) [Str "content with spaces"]] -,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test")]) [Str "content with spaces"]] -,Para [Span ("",["twiki-macro","TEST"],[]) [Str "content with spaces ARG1=test"]] -,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test")]) [Str "content with spaces"]] -,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test"),("ARG2","test2")]) [Str ""]] -,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test"),("ARG2","test2")]) [Str ""]] -,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test"),("ARG2","test2")]) [Str "multiline\ndoes also work"]]] +Pandoc + Meta { unMeta = fromList [] } + [ Header 1 ( "header" , [] , [] ) [ Str "header" ] + , Header + 2 + ( "header-level-two" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "two" ] + , Header + 3 + ( "header-level-3" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "3" ] + , Header + 4 + ( "header-level-four" , [] , [] ) + [ Str "header" + , Space + , Emph [ Str "level" ] + , Space + , Str "four" + ] + , Header + 5 + ( "header-level-5" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "5" ] + , Header + 6 + ( "header-level-6" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "6" ] + , Para + [ Str "---+++++++" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "header" + ] + , Para + [ Str "--++" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "header" + ] + , Header + 1 + ( "emph-and-strong" , [] , [] ) + [ Str "emph" , Space , Str "and" , Space , Str "strong" ] + , Para + [ Emph [ Str "emph" ] , Space , Strong [ Str "strong" ] ] + , Para + [ Emph + [ Strong + [ Str "strong" , Space , Str "and" , Space , Str "emph" ] + ] + ] + , Para + [ Strong + [ Emph [ Str "emph" , Space , Str "inside" ] + , Space + , Str "strong" + ] + ] + , Para + [ Strong + [ Str "strong" + , Space + , Str "with" + , Space + , Emph [ Str "emph" ] + ] + ] + , Para + [ Emph + [ Strong [ Str "strong" , Space , Str "inside" ] + , Space + , Str "emph" + ] + ] + , Header + 1 + ( "horizontal-rule" , [] , [] ) + [ Str "horizontal" , Space , Str "rule" ] + , Para [ Str "top" ] + , HorizontalRule + , Para [ Str "bottom" ] + , HorizontalRule + , Header 1 ( "nop" , [] , [] ) [ Str "nop" ] + , Para [ Str "_not" , Space , Str "emph_" ] + , Header 1 ( "entities" , [] , [] ) [ Str "entities" ] + , Para [ Str "hi" , Space , Str "&" , Space , Str "low" ] + , Para [ Str "hi" , Space , Str "&" , Space , Str "low" ] + , Para [ Str "G\246del" ] + , Para [ Str "\777\2730" ] + , Header 1 ( "comments" , [] , [] ) [ Str "comments" ] + , Para [ Str "inline" , Space , Str "comment" ] + , Para [ Str "between" , Space , Str "blocks" ] + , Header 1 ( "linebreaks" , [] , [] ) [ Str "linebreaks" ] + , Para [ Str "hi" , LineBreak , Str "there" ] + , Para [ Str "hi" , LineBreak , Str "there" ] + , Header + 1 + ( "inline-code" , [] , [] ) + [ Str "inline" , Space , Str "code" ] + , Para + [ Code ( "" , [] , [] ) "*\8594*" + , Space + , Code ( "" , [] , [] ) "typed" + , Space + , Code ( "" , [ "haskell" ] , [] ) ">>=" + ] + , Header + 1 + ( "code-blocks" , [] , [] ) + [ Str "code" , Space , Str "blocks" ] + , CodeBlock + ( "" , [] , [] ) + "case xs of\n (_:_) -> reverse xs\n [] -> ['*']" + , CodeBlock + ( "" , [ "haskell" ] , [] ) + "case xs of\n (_:_) -> reverse xs\n [] -> ['*']" + , Header + 1 + ( "block-quotes" , [] , [] ) + [ Str "block" , Space , Str "quotes" ] + , Para [ Str "Regular" , Space , Str "paragraph" ] + , BlockQuote + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote." + ] + , Para + [ Str "With" + , Space + , Str "two" + , Space + , Str "paragraphs." + ] + ] + , Para [ Str "Nother" , Space , Str "paragraph." ] + , Header + 1 + ( "internal-links" , [] , [] ) + [ Str "internal" , Space , Str "links" ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "MySimplePage" ] + ( "MySimplePage" , "" ) + ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "My23Page23" ] + ( "My23Page23" , "" ) + ] + , Header + 1 + ( "external-links" , [] , [] ) + [ Str "external" , Space , Str "links" ] + , Para + [ Link + ( "" , [] , [] ) + [ Emph [ Str "Google" ] + , Space + , Str "search" + , Space + , Str "engine" + ] + ( "http://google.com" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "http://pandoc.org" ] + ( "http://pandoc.org" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "http://google.com" ] + ( "http://google.com" , "" ) + , Space + , Link + ( "" , [] , [] ) + [ Str "http://yahoo.com" ] + ( "http://yahoo.com" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "email" , Space , Str "me" ] + ( "mailto:info@example.org" , "" ) + ] + , Para [ Str "http://google.com" ] + , Para [ Str "http://google.com" ] + , Para [ Str "http://google.com" ] + , Para [ Str "info@example.org" ] + , Para [ Str "info@example.org" ] + , Para [ Str "info@example.org" ] + , Header 1 ( "lists" , [] , [] ) [ Str "lists" ] + , BulletList + [ [ Plain + [ Str "Start" , Space , Str "each" , Space , Str "line" ] + ] + , [ Plain + [ Str "with" + , Space + , Str "an" + , Space + , Str "asterisk" + , Space + , Str "(*)." + ] + , BulletList + [ [ Plain + [ Str "More" + , Space + , Str "asterisks" + , Space + , Str "gives" + , Space + , Str "deeper" + ] + , BulletList + [ [ Plain + [ Str "and" + , Space + , Str "deeper" + , Space + , Str "levels." + ] + ] + ] + ] + ] + ] + , [ Plain + [ Str "Line" + , Space + , Str "breaks" + , LineBreak + , Str "don't" + , Space + , Str "break" + , Space + , Str "levels." + ] + ] + , [ Plain + [ Str "Continuations" + , Space + , Str "are" + , Space + , Str "also" + , Space + , Str "possible" + ] + , BulletList + [ [ Plain + [ Str "and" + , Space + , Str "do" + , Space + , Str "not" + , Space + , Str "break" + , Space + , Str "the" + , Space + , Str "list" + , Space + , Str "flow" + ] + ] + ] + ] + , [ Plain [ Str "Level" , Space , Str "one" ] ] + ] + , Para + [ Str "Any" + , Space + , Str "other" + , Space + , Str "start" + , Space + , Str "ends" + , Space + , Str "the" + , Space + , Str "list." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Start" , Space , Str "each" , Space , Str "line" ] + ] + , [ Plain + [ Str "with" + , Space + , Str "a" + , Space + , Str "number" + , Space + , Str "(1.)." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "More" + , Space + , Str "number" + , Space + , Str "signs" + , Space + , Str "gives" + , Space + , Str "deeper" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "and" , Space , Str "deeper" ] ] + , [ Plain [ Str "levels." ] ] + ] + ] + ] + ] + , [ Plain + [ Str "Line" + , Space + , Str "breaks" + , LineBreak + , Str "don't" + , Space + , Str "break" + , Space + , Str "levels." + ] + ] + , [ Plain [ Str "Blank" , Space , Str "lines" ] ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "end" + , Space + , Str "the" + , Space + , Str "list" + , Space + , Str "and" + , Space + , Str "start" + , Space + , Str "another." + ] + ] + ] + , Para + [ Str "Any" + , Space + , Str "other" + , Space + , Str "start" + , Space + , Str "also" + , Space + , Str "ends" + , Space + , Str "the" + , Space + , Str "list." + ] + , DefinitionList + [ ( [ Str "item" , Space , Str "1" ] + , [ [ Plain [ Str "definition" , Space , Str "1" ] ] ] + ) + , ( [ Str "item" , Space , Str "2" ] + , [ [ Plain + [ Str "definition" + , Space + , Str "2-1" + , Space + , Str "definition" + , Space + , Str "2-2" + ] + ] + ] + ) + , ( [ Str "item" , Space , Emph [ Str "3" ] ] + , [ [ Plain [ Str "definition" , Space , Emph [ Str "3" ] ] + ] + ] + ) + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "one" ] ] + , [ Plain [ Str "two" ] + , BulletList + [ [ Plain + [ Str "two" + , Space + , Str "point" + , Space + , Str "one" + ] + ] + , [ Plain + [ Str "two" + , Space + , Str "point" + , Space + , Str "two" + ] + ] + ] + ] + , [ Plain [ Str "three" ] + , DefinitionList + [ ( [ Str "three" , Space , Str "item" , Space , Str "one" ] + , [ [ Plain + [ Str "three" + , Space + , Str "def" + , Space + , Str "one" + ] + ] + ] + ) + ] + ] + , [ Plain [ Str "four" ] + , DefinitionList + [ ( [ Str "four" , Space , Str "def" , Space , Str "one" ] + , [ [ Plain + [ Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "continuation" + ] + ] + ] + ) + ] + ] + , [ Plain [ Str "five" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "five" , Space , Str "sub" , Space , Str "1" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "five" + , Space + , Str "sub" + , Space + , Str "1" + , Space + , Str "sub" + , Space + , Str "1" + ] + ] + ] + ] + , [ Plain + [ Str "five" , Space , Str "sub" , Space , Str "2" ] + ] + ] + ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "other" ] + , OrderedList + ( 1 , UpperRoman , DefaultDelim ) + [ [ Plain [ Str "list" ] ] , [ Plain [ Str "styles" ] ] ] + ] + , [ Plain [ Str "are" ] + , OrderedList + ( 1 , LowerRoman , DefaultDelim ) + [ [ Plain [ Str "also" ] ] , [ Plain [ Str "possible" ] ] ] + ] + , [ Plain [ Str "all" ] + , OrderedList + ( 1 , LowerAlpha , DefaultDelim ) + [ [ Plain [ Str "the" ] ] + , [ Plain [ Str "different" ] ] + , [ Plain [ Str "styles" ] ] + ] + ] + , [ Plain [ Str "are" ] + , OrderedList + ( 1 , UpperAlpha , DefaultDelim ) + [ [ Plain [ Str "implemented" ] ] + , [ Plain [ Str "and" ] ] + , [ Plain [ Str "supported" ] ] + ] + ] + ] + , Header 1 ( "tables" , [] , [] ) [ Str "tables" ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Orange" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Apple" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Bread" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Pie" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Butter" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Ice" , Space , Str "cream" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Orange" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Apple" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Bread" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Pie" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Strong [ Str "Butter" ] ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Ice" , Space , Str "cream" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Orange" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Apple" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Bread" + , LineBreak + , LineBreak + , Str "and" + , Space + , Str "cheese" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "Pie" + , LineBreak + , LineBreak + , Strong [ Str "apple" ] + , Space + , Str "and" + , Space + , Emph [ Str "carrot" ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Orange" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Apple" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "more" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Bread" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Pie" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "more" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Butter" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Ice" , Space , Str "cream" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "and" , Space , Str "more" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Header 1 ( "macros" , [] , [] ) [ Str "macros" ] + , Para [ Span ( "" , [ "twiki-macro" , "TEST" ] , [] ) [] ] + , Para + [ Span ( "" , [ "twiki-macro" , "TEST" ] , [] ) [ Str "" ] ] + , Para + [ Span + ( "" , [ "twiki-macro" , "TEST" ] , [] ) + [ Str "content with spaces" ] + ] + , Para + [ Span + ( "" , [ "twiki-macro" , "TEST" ] , [] ) + [ Str "content with spaces" ] + ] + , Para + [ Span + ( "" + , [ "twiki-macro" , "TEST" ] + , [ ( "ARG1" , "test" ) ] + ) + [ Str "content with spaces" ] + ] + , Para + [ Span + ( "" , [ "twiki-macro" , "TEST" ] , [] ) + [ Str "content with spaces ARG1=test" ] + ] + , Para + [ Span + ( "" + , [ "twiki-macro" , "TEST" ] + , [ ( "ARG1" , "test" ) ] + ) + [ Str "content with spaces" ] + ] + , Para + [ Span + ( "" + , [ "twiki-macro" , "TEST" ] + , [ ( "ARG1" , "test" ) , ( "ARG2" , "test2" ) ] + ) + [ Str "" ] + ] + , Para + [ Span + ( "" + , [ "twiki-macro" , "TEST" ] + , [ ( "ARG1" , "test" ) , ( "ARG2" , "test2" ) ] + ) + [ Str "" ] + ] + , Para + [ Span + ( "" + , [ "twiki-macro" , "TEST" ] + , [ ( "ARG1" , "test" ) , ( "ARG2" , "test2" ) ] + ) + [ Str "multiline\ndoes also work" ] + ] + ] diff --git a/test/twiki-reader.twiki b/test/twiki-reader.twiki --- a/test/twiki-reader.twiki +++ b/test/twiki-reader.twiki @@ -93,6 +93,12 @@ Nother paragraph. +---+ internal links + +MySimplePage + +My23Page23 + ---+ external links [[http://google.com][Google search engine]] diff --git a/test/txt2tags.native b/test/txt2tags.native --- a/test/txt2tags.native +++ b/test/txt2tags.native @@ -1,611 +1,5299 @@ -Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]),("date",MetaInlines [Str "date"]),("includeconf",MetaString "rules.conf"),("title",MetaInlines [Str "Txt2tags",Space,Str "Markup",Space,Str "Rules"])]}) -[Para [Str "This",Space,Str "document",Space,Str "describes",Space,Str "all",Space,Str "the",Space,Str "details",Space,Str "about",Space,Str "each",Space,Str "txt2tags",Space,Str "mark.",SoftBreak,Str "The",Space,Str "target",Space,Str "audience",Space,Str "are",Space,Strong [Str "experienced"],Space,Str "users.",Space,Str "You",Space,Str "may",Space,Str "find",Space,Str "it",SoftBreak,Str "useful",Space,Str "if",Space,Str "you",Space,Str "want",Space,Str "to",Space,Str "master",Space,Str "the",Space,Str "marks",Space,Str "or",Space,Str "solve",Space,Str "a",Space,Str "specific",Space,Str "problem",SoftBreak,Str "about",Space,Str "a",Space,Str "mark."] -,Para [Str "If",Space,Str "you",Space,Str "are",Space,Str "new",Space,Str "to",Space,Str "txt2tags",Space,Str "or",Space,Str "just",Space,Str "want",Space,Str "to",Space,Str "know",Space,Str "which",Space,Str "are",Space,Str "the",SoftBreak,Str "available",Space,Str "marks,",Space,Str "please",Space,Str "read",Space,Str "the",Space,Link ("",[],[]) [Str "Markup",Space,Str "Demo"] ("MARKUPDEMO",""),Str "."] -,Para [Str "Note",Space,Str "1:",Space,Str "This",Space,Str "document",Space,Str "is",Space,Str "generated",Space,Str "directly",Space,Str "from",Space,Str "the",Space,Str "txt2tags",SoftBreak,Str "test-suite.",Space,Str "All",Space,Str "the",Space,Str "rules",Space,Str "mentioned",Space,Str "here",Space,Str "are",Space,Str "100%",Space,Str "in",Space,Str "sync",Space,Str "with",Space,Str "the",SoftBreak,Str "current",Space,Str "program",Space,Str "code."] -,Para [Str "Note",Space,Str "2:",Space,Str "A",Space,Str "good",Space,Str "practice",Space,Str "is",Space,Str "to",Space,Str "consult",Space,Link ("",[],[]) [Str "the",Space,Str "sources"] ("rules.t2t",""),Space,Str "when",SoftBreak,Str "reading,",Space,Str "to",Space,Str "see",Space,Str "how",Space,Str "the",Space,Str "texts",Space,Str "were",Space,Str "made."] -,Para [Str "Table",Space,Str "of",Space,Str "Contents:"] -,HorizontalRule -,Header 1 ("paragraph",[],[]) [Str "Paragraph"] -,Para [Str "A",Space,Str "paragraph",Space,Str "is",Space,Str "composed",Space,Str "by",Space,Str "one",Space,Str "or",Space,Str "more",Space,Str "lines.",SoftBreak,Str "A",Space,Str "blank",Space,Str "line",Space,Str "(or",Space,Str "a",Space,Str "table,",Space,Str "or",Space,Str "a",Space,Str "list)",Space,Str "ends",Space,Str "the",SoftBreak,Str "current",Space,Str "paragraph."] -,Para [Str "Leading",Space,Str "and",Space,Str "trailing",Space,Str "spaces",Space,Str "are",Space,Str "ignored."] -,Para [Str "A",Space,Str "comment",Space,Str "line",Space,Str "can",Space,Str "be",Space,Str "placed",Space,Str "inside",Space,Str "a",Space,Str "paragraph.",SoftBreak,Str "It",Space,Str "will",Space,Str "not",Space,Str "affect",Space,Str "it."] -,Para [Str "The",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "file",Space,Str "(EOF)",Space,Str "closes",Space,Str "the",SoftBreak,Str "currently",Space,Str "open",Space,Str "paragraph."] -,Header 1 ("comment",[],[]) [Str "Comment"] -,Para [Str "%",Space,Str "not",Space,Str "on",Space,Str "the",Space,Str "line",Space,Str "beginning",Space,Str "(at",Space,Str "column",Space,Str "2)"] -,Para [Str "some",Space,Str "text",Space,Str "%",Space,Str "half",Space,Str "line",Space,Str "comments",Space,Str "are",Space,Str "not",Space,Str "allowed"] -,Header 1 ("line",[],[]) [Str "Line"] -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,HorizontalRule -,Para [Strikeout [Str "-----"],SoftBreak,Strikeout [Str "-------",Space,Str "--------"]] -,Para [Strikeout [Str "-------+--------"]] -,Para [Str "(",Space,Strikeout [Str "----------------"],Space,Str ")"] -,Header 1 ("inline",[],[]) [Str "Inline"] -,Para [Str "i)",Space,Strong [Str "b"],Space,Emph [Str "i"],Space,Span ("",["underline"],[]) [Str "u"],Space,Strikeout [Str "s"],Space,Code ("",[],[]) "m",Space,Str "r",Space,RawInline (Format "html") "t",SoftBreak,Str "i)",Space,Strong [Str "bo"],Space,Emph [Str "it"],Space,Span ("",["underline"],[]) [Str "un"],Space,Strikeout [Str "st"],Space,Code ("",[],[]) "mo",Space,Str "ra",Space,RawInline (Format "html") "tg",SoftBreak,Str "i)",Space,Strong [Str "bold"],Space,Emph [Str "ital"],Space,Span ("",["underline"],[]) [Str "undr"],Space,Strikeout [Str "strk"],Space,Code ("",[],[]) "mono",Space,Str "raw",Space,RawInline (Format "html") "tggd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "ld"],Space,Emph [Str "it",Space,Str "al"],Space,Span ("",["underline"],[]) [Str "un",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "rk"],Space,Code ("",[],[]) "mo no",Space,Str "r",Space,Str "aw",Space,RawInline (Format "html") "tg gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "*",Space,Str "ld"],Space,Emph [Str "it",Space,Str "/",Space,Str "al"],Space,Span ("",["underline"],[]) [Str "un",Space,Str "_",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "-",Space,Str "rk"],Space,Code ("",[],[]) "mo ` no",Space,Str "r",Space,Str "\"",Space,Str "aw",Space,RawInline (Format "html") "tg ' gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "**ld"],Space,Emph [Str "it",Space,Str "//al"],Space,Span ("",["underline"],[]) [Str "un",Space,Str "__dr"],Space,Strikeout [Str "st",Space,Str "--rk"],Space,Code ("",[],[]) "mo ``no",Space,Str "r",Space,Str "\"\"aw",Space,RawInline (Format "html") "tg ''gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "**",Space,Str "ld"],Space,Emph [Str "it",Space,Str "//",Space,Str "al"],Space,Span ("",["underline"],[]) [Str "un",Space,Str "__",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "--",Space,Str "rk"],Space,Code ("",[],[]) "mo `` no",Space,Str "r",Space,Str "\"\"",Space,Str "aw",Space,RawInline (Format "html") "tg '' gd",SoftBreak,Str "i)",Space,Strong [Str "**bold**"],Space,Emph [Str "//ital//"],Space,Span ("",["underline"],[]) [Str "__undr__"],Space,Strikeout [Str "--strk--"],Space,Code ("",[],[]) "``mono``",Space,Str "\"\"raw\"\"",Space,RawInline (Format "html") "''tggd''",SoftBreak,Str "i)",Space,Strong [Str "*bold*"],Space,Emph [Str "/ital/"],Space,Span ("",["underline"],[]) [Str "_undr_"],Space,Strikeout [Str "-strk-"],Space,Code ("",[],[]) "`mono`",Space,Str "\"raw\"",Space,RawInline (Format "html") "'tggd'"] -,Para [Str "i)",Space,Strong [Str "*"],Space,Emph [Str "/"],Space,Span ("",["underline"],[]) [Str "_"],Space,Strikeout [Str "-"],Space,Code ("",[],[]) "`",Space,Str "\"",Space,RawInline (Format "html") "'",SoftBreak,Str "i)",Space,Strong [Str "**"],Space,Emph [Str "//"],Space,Span ("",["underline"],[]) [Str "__"],Space,Strikeout [Str "--"],Space,Code ("",[],[]) "``",Space,Str "\"\"",Space,RawInline (Format "html") "''",SoftBreak,Str "i)",Space,Strong [Str "***"],Space,Emph [Str "///"],Space,Span ("",["underline"],[]) [Str "___"],Space,Strikeout [Str "---"],Space,Code ("",[],[]) "```",Space,Str "\"\"\"",Space,RawInline (Format "html") "'''",SoftBreak,Str "i)",Space,Strong [Str "****"],Space,Emph [Str "////"],Space,Span ("",["underline"],[]) [Str "____"],Space,Strikeout [Str "----"],Space,Code ("",[],[]) "````",Space,Str "\"\"\"\"",Space,RawInline (Format "html") "''''",SoftBreak,Str "i)",Space,Strong [Str "*****"],Space,Emph [Str "/////"],Space,Span ("",["underline"],[]) [Str "_____"],Space,Strikeout [Str "-----"],Space,Code ("",[],[]) "`````",Space,Str "\"\"\"\"\"",Space,RawInline (Format "html") "'''''",SoftBreak,Str "i)",Space,Strong [Str "******"],Space,Emph [Str "//////"],Space,Span ("",["underline"],[]) [Str "______"],Space,Strikeout [Str "------"],Space,Code ("",[],[]) "``````",Space,Str "\"\"\"\"\"\"",Space,RawInline (Format "html") "''''''"] -,Para [Str "i)",Space,Str "****",Space,Str "////",Space,Str "____",Space,Str "----",Space,Str "````",Space,Str "\"\"\"\"",Space,Str "''''",SoftBreak,Str "i)",Space,Str "**",Space,Str "**",Space,Str "//",Space,Str "//",Space,Str "__",Space,Str "__",Space,Str "--",Space,Str "--",Space,Str "``",Space,Str "``",Space,Str "\"\"",Space,Str "\"\"",Space,Str "''",Space,Str "''"] -,Para [Str "i)",Space,Str "**",Space,Str "bold**",Space,Str "//",Space,Str "ital//",Space,Str "__",Space,Str "undr__",Space,Str "--",Space,Str "strk--",Space,Str "``",Space,Str "mono``",Space,Str "\"\"",Space,Str "raw\"\"",Space,Str "''",Space,Str "tggd''",SoftBreak,Str "i)",Space,Str "**bold",Space,Str "**",Space,Str "//ital",Space,Str "//",Space,Str "__undr",Space,Str "__",Space,Str "--strk",Space,Str "--",Space,Str "``mono",Space,Str "``",Space,Str "\"\"raw",Space,Str "\"\"",Space,Str "''tggd",Space,Str "''",SoftBreak,Str "i)",Space,Str "**",Space,Str "bold",Space,Str "**",Space,Str "//",Space,Str "ital",Space,Str "//",Space,Str "__",Space,Str "undr",Space,Str "__",Space,Str "--",Space,Str "strk",Space,Str "--",Space,Str "``",Space,Str "mono",Space,Str "``",Space,Str "\"\"",Space,Str "raw",Space,Str "\"\"",Space,Str "''",Space,Str "tggd",Space,Str "''"] -,Header 1 ("link",[],[]) [Str "Link"] -,Para [Link ("",[],[]) [Str "mailto:user@domain.com"] ("user@domain.com",""),SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com"] ("user@domain.com",""),Str ".",SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com"] ("user@domain.com",""),Str ".",Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "mailto:user@domain.com"] ("user@domain.com",""),Str ".",Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "label"] ("user@domain.com",""),SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla"] ("user@domain.com?subject=bla",""),SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla"] ("user@domain.com?subject=bla",""),Str ".",SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla"] ("user@domain.com?subject=bla",""),Str ",",SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com"] ("user@domain.com?subject=bla&cc=otheruser@domain.com",""),SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com"] ("user@domain.com?subject=bla&cc=otheruser@domain.com",""),Str ".",SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com"] ("user@domain.com?subject=bla&cc=otheruser@domain.com",""),Str ",",SoftBreak,Link ("",[],[]) [Str "label"] ("user@domain.com?subject=bla&cc=otheruser@domain.com",""),Str ".",SoftBreak,Link ("",[],[]) [Str "label"] ("user@domain.com?subject=bla&cc=otheruser@domain.com.",""),Str ".",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com"] ("http://www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/"] ("http://www.domain.com/dir/",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir///"] ("http://www.domain.com/dir///",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com."] ("http://www.domain.com.",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com,"] ("http://www.domain.com,",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com."] ("http://www.domain.com.",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com,"] ("http://www.domain.com,",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/."] ("http://www.domain.com/dir/.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com."] ("http://www.domain.com.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/."] ("http://www.domain.com/dir/.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html."] ("http://www.domain.com/dir/index.html.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html,"] ("http://www.domain.com/dir/index.html,",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/#anchor"] ("http://www.domain.com/dir/#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html#anchor"] ("http://www.domain.com/dir/index.html#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html#anchor."] ("http://www.domain.com/dir/index.html#anchor.",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/#anchor."] ("http://www.domain.com/dir/#anchor.",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html#anchor."] ("http://www.domain.com/dir/index.html#anchor.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/#anchor."] ("http://www.domain.com/dir/#anchor.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html#anchor."] ("http://www.domain.com/dir/index.html#anchor.",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://domain.com?a=a@a.a&b=a+b+c."] ("http://domain.com?a=a@a.a&b=a+b+c.",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com?a=a@a.a&b=a+b+c,"] ("http://domain.com?a=a@a.a&b=a+b+c,",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c."] ("http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@."] ("http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com?a=a@a.a&b=a+b+c.#anchor"] ("http://domain.com?a=a@a.a&b=a+b+c.#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor"] ("http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.#anchor"] ("http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com/bla.html."] ("http://user:password@domain.com/bla.html.",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com/dir/."] ("http://user:password@domain.com/dir/.",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com."] ("http://user:password@domain.com.",""),SoftBreak,Link ("",[],[]) [Str "http://user:@domain.com."] ("http://user:@domain.com.",""),SoftBreak,Link ("",[],[]) [Str "http://user@domain.com."] ("http://user@domain.com.",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor"] ("http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c@#anchor"] ("http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c@#anchor",""),SoftBreak,Link ("",[],[]) [Str "label"] ("www.domain.com",""),SoftBreak,Str "[",Space,Str "label",Space,Link ("",[],[]) [Str "www.domain.com"] ("www.domain.com",""),Str "]",SoftBreak,Link ("",[],[]) [Str "label",Space] ("www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "anchor",Space] ("http://www.domain.com/dir/index.html#anchor.",""),SoftBreak,Link ("",[],[]) [Str "login",Space] ("http://user:password@domain.com/bla.html",""),SoftBreak,Link ("",[],[]) [Str "form",Space] ("http://www.domain.com/bla.cgi?a=a@a.a&b=a+b+c.",""),SoftBreak,Link ("",[],[]) [Str "form",Space,Str "&",Space,Str "anchor"] ("http://www.domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor",""),SoftBreak,Link ("",[],[]) [Str "login",Space,Str "&",Space,Str "form",Space] ("http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "up",Space] ("..",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "file",Space] ("bla.html",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "anchor",Space] ("#anchor",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "file/anchor"] ("bla.html#anchor",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "file/anchor"] ("bla.html#anchor.",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "img",Space] ("abc.gif",""),SoftBreak,Link ("",[],[]) [Str "www.fake.com"] ("www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm"] ("http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-"] ("http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_"] ("http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_",""),Str "-1%.",SoftBreak,Link ("",[],[]) [Str "http://foo._user-9:pass!#$%&*()+word@domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_"] ("http://foo._user-9:pass!#$%&*()+word@domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_",""),Str "-1%.",SoftBreak,Link ("",[],[]) [Str "http://L1.com"] ("http://L1.com",""),Space,Str "!",Space,Link ("",[],[]) [Str "mailto:L2@www.com"] ("L2@www.com",""),Space,Str "!",Space,Link ("",[],[]) [Str "L3"] ("www.com",""),Space,Str "!",Space,Link ("",[],[]) [Str "L4"] ("w@ww.com",""),Space,Str "!",Space,Link ("",[],[]) [Str "www.L5.com"] ("www.L5.com",""),SoftBreak,Link ("",[],[]) [Str "www.domain.com"] ("www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "www2.domain.com"] ("www2.domain.com",""),SoftBreak,Link ("",[],[]) [Str "ftp.domain.com"] ("ftp.domain.com",""),SoftBreak,Link ("",[],[]) [Str "WWW.DOMAIN.COM"] ("WWW.DOMAIN.COM",""),SoftBreak,Link ("",[],[]) [Str "FTP.DOMAIN.COM"] ("FTP.DOMAIN.COM",""),SoftBreak,Link ("",[],[]) [Str "label"] ("www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "label"] ("ftp.domain.com",""),SoftBreak,Link ("",[],[]) [Str "label"] ("WWW.DOMAIN.COM",""),SoftBreak,Link ("",[],[]) [Str "label"] ("FTP.DOMAIN.COM",""),SoftBreak,Str "[label",Space,Link ("",[],[]) [Str "www.domain.com"] ("www.domain.com",""),Space,Str "]",SoftBreak,Str "[label]",Space,Link ("",[],[]) [Str "www.domain.com"] ("www.domain.com",""),Str "]"] -,Header 1 ("image",[],[]) [Str "Image"] -,Para [Image ("",[],[]) [] ("img.png","")] -,Para [Link ("",[],[]) [Image ("",[],[]) [] ("img.png","")] ("http://txt2tags.org","")] -,Para [Image ("",[],[]) [] ("img.png",""),Space,Str "Image",Space,Str "at",Space,Str "the",Space,Str "line",Space,Str "beginning."] -,Para [Str "Image",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Image ("",[],[]) [] ("img.png",""),Space,Str "of",Space,Str "the",Space,Str "line."] -,Para [Str "Image",Space,Str "at",Space,Str "the",Space,Str "line",Space,Str "end.",Space,Image ("",[],[]) [] ("img.png","")] -,Para [Image ("",[],[]) [] ("img.png",""),SoftBreak,Image ("",[],[]) [] ("img.png",""),SoftBreak,Image ("",[],[]) [] ("img.png","")] -,Para [Image ("",[],[]) [] ("img.png",""),Image ("",[],[]) [] ("img.png","")] -,Para [Str "Images",Space,Image ("",[],[]) [] ("img.png",""),Space,Str "mixed",Space,Image ("",[],[]) [] ("img.png",""),Space,Str "with",Space,Image ("",[],[]) [] ("img.png",""),Space,Str "text."] -,Para [Str "Images",Space,Str "glued",Space,Str "together:",Space,Image ("",[],[]) [] ("img.png",""),Image ("",[],[]) [] ("img.png",""),Image ("",[],[]) [] ("img.png",""),Str "."] -,Para [Str "[img.png",Space,Str "]"] -,Para [Str "[",Space,Str "img.png]"] -,Para [Str "[",Space,Str "img.png",Space,Str "]"] -,Header 1 ("numtitle",[],[]) [Str "Numbered",Space,Str "Title"] -,Header 1 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "1"] -,Header 2 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "2"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 4 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "4"] -,Header 5 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "5"] -,Header 1 ("lab_el-1",[],[]) [Str "Title",Space,Str "Level",Space,Str "1"] -,Header 2 ("lab_el-2",[],[]) [Str "Title",Space,Str "Level",Space,Str "2"] -,Header 3 ("lab_el-3",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 4 ("lab_el-4",[],[]) [Str "Title",Space,Str "Level",Space,Str "4"] -,Header 5 ("lab_el-5",[],[]) [Str "Title",Space,Str "Level",Space,Str "5"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("lab_el-9",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Para [Str "+Not",Space,Str "Title"] -,Para [Str "++Not",Space,Str "Title+"] -,Para [Str "+++Not",Space,Str "Title++++",SoftBreak,Str "++++++Not",Space,Str "Title",Space,Str "6++++++"] -,Para [Str "+++++++Not",Space,Str "Title",Space,Str "7+++++++",SoftBreak,Str "+Not",Space,Str "Title+",Space,Str "[label1]",SoftBreak,Str "+Not",Space,Str "Title+[",Space,Str "label",Space,Str "]",SoftBreak,Str "+Not",Space,Str "Title+[la/bel]"] -,Header 1 ("title",[],[]) [Str "Title"] -,Header 1 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "1"] -,Header 2 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "2"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 4 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "4"] -,Header 5 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "5"] -,Header 1 ("lab_el-1",[],[]) [Str "Title",Space,Str "Level",Space,Str "1"] -,Header 2 ("lab_el-2",[],[]) [Str "Title",Space,Str "Level",Space,Str "2"] -,Header 3 ("lab_el-3",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 4 ("lab_el-4",[],[]) [Str "Title",Space,Str "Level",Space,Str "4"] -,Header 5 ("lab_el-5",[],[]) [Str "Title",Space,Str "Level",Space,Str "5"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Header 3 ("lab_el-9",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"] -,Para [Str "=Not",Space,Str "Title"] -,Para [Str "==Not",Space,Str "Title="] -,Para [Str "===Not",Space,Str "Title====",SoftBreak,Str "======Not",Space,Str "Title",Space,Str "6======"] -,Para [Str "=======Not",Space,Str "Title",Space,Str "7=======",SoftBreak,Str "=Not",Space,Str "Title=",Space,Str "[label1]",SoftBreak,Str "=Not",Space,Str "Title=[",Space,Str "label",Space,Str "]",SoftBreak,Str "=Not",Space,Str "Title=[la/bel]"] -,Header 1 ("quote",[],[]) [Str "Quote"] -,BlockQuote - [Para [Str "To",Space,Str "quote",Space,Str "a",Space,Str "paragraph,",Space,Str "just",Space,Str "prefix",Space,Str "it",Space,Str "by",Space,Str "a",Space,Str "TAB",SoftBreak,Str "character.",Space,Str "All",Space,Str "the",Space,Str "lines",Space,Str "of",Space,Str "the",Space,Str "paragraph",Space,Str "must",SoftBreak,Str "begin",Space,Str "with",Space,Str "a",Space,Str "TAB."]] -,Para [Str "Any",Space,Str "non-tabbed",Space,Str "line",Space,Str "closes",Space,Str "the",Space,Str "quote",Space,Str "block."] -,BlockQuote - [Para [Str "The",Space,Str "number",Space,Str "of",Space,Str "leading",Space,Str "TABs",Space,Str "identifies",Space,Str "the",Space,Str "quote",SoftBreak,Str "block",Space,Str "depth.",Space,Str "This",Space,Str "is",Space,Str "quote",Space,Str "level",Space,Str "1."] - ,BlockQuote - [Para [Str "With",Space,Str "two",Space,Str "TABs,",Space,Str "we",Space,Str "are",Space,Str "on",Space,Str "the",Space,Str "quote",SoftBreak,Str "level",Space,Str "2."] - ,BlockQuote - [Para [Str "The",Space,Str "more",Space,Str "TABs,",Space,Str "more",Space,Str "deep",Space,Str "is",SoftBreak,Str "the",Space,Str "quote",Space,Str "level."] - ,BlockQuote - [Para [Str "There",Space,Str "isn't",Space,Str "a",Space,Str "limit."]]]]] -,BlockQuote - [BlockQuote - [BlockQuote - [BlockQuote - [Para [Str "This",Space,Str "quote",Space,Str "starts",Space,Str "at",SoftBreak,Str "level",Space,Str "4."]] - ,Para [Str "Then",Space,Str "its",Space,Str "depth",Space,Str "is",Space,Str "decreased."]] - ,Para [Str "Counting",Space,Str "down,",Space,Str "one",Space,Str "by",Space,Str "one."]] - ,Para [Str "Until",Space,Str "the",Space,Str "level",Space,Str "1."]] -,BlockQuote - [BlockQuote - [BlockQuote - [Para [Str "Unlike",Space,Str "lists,",Space,Str "any",Space,Str "quote",Space,Str "block",Space,Str "is",SoftBreak,Str "independent,",Space,Str "not",Space,Str "part",Space,Str "of",Space,Str "a",Space,Str "tree."]]] - ,Para [Str "The",Space,Str "TAB",Space,Str "count",Space,Str "don't",Space,Str "need",Space,Str "to",Space,Str "be",Space,Str "incremental",SoftBreak,Str "by",Space,Str "one."] - ,BlockQuote - [BlockQuote - [BlockQuote - [Para [Str "The",Space,Str "nesting",Space,Str "don't",Space,Str "need",SoftBreak,Str "to",Space,Str "follow",Space,Str "any",Space,Str "rule."]]] - ,Para [Str "Quotes",Space,Str "can",Space,Str "be",Space,Str "opened",Space,Str "and",Space,Str "closed",SoftBreak,Str "in",Space,Str "any",Space,Str "way."] - ,BlockQuote - [BlockQuote - [BlockQuote - [Para [Str "You",Space,Str "choose."]]]]]] -,BlockQuote - [Para [Str "Some",Space,Str "targets",Space,Str "(as",Space,Str "sgml)",Space,Str "don't",Space,Str "support",Space,Str "the",SoftBreak,Str "nesting",Space,Str "of",Space,Str "quotes.",Space,Str "There",Space,Str "is",Space,Str "only",Space,Str "one",Space,Str "quote",SoftBreak,Str "level."] - ,BlockQuote - [Para [Str "In",Space,Str "this",Space,Str "case,",Space,Str "no",Space,Str "matter",Space,Str "how",Space,Str "much",SoftBreak,Str "TABs",Space,Str "are",Space,Str "used",Space,Str "to",Space,Str "define",Space,Str "the",Space,Str "quote",SoftBreak,Str "block,",Space,Str "it",Space,Str "always",Space,Str "will",Space,Str "be",Space,Str "level",Space,Str "1."]]] -,BlockQuote - [Para [Str "Spaces",Space,Str "AFTER",Space,Str "the",Space,Str "TAB",Space,Str "character",Space,Str "are",Space,Str "allowed.",SoftBreak,Str "But",Space,Str "be",Space,Str "careful,",Space,Str "it",Space,Str "can",Space,Str "be",Space,Str "confusing."]] -,Para [Str "Spaces",Space,Str "BEFORE",Space,Str "the",Space,Str "TAB",Space,Str "character",SoftBreak,Str "invalidate",Space,Str "the",Space,Str "mark.",Space,Str "It's",Space,Str "not",Space,Str "quote."] -,BlockQuote - [Para [Str "Paragraph",Space,Str "breaks",Space,Str "inside",Space,Str "a",Space,Str "quote",Space,Str "aren't",SoftBreak,Str "possible."] - ,Para [Str "This",Space,Str "sample",Space,Str "are",Space,Str "two",Space,Str "separated",Space,Str "quoted",SoftBreak,Str "paragraphs,",Space,Str "not",Space,Str "a",Space,Str "quote",Space,Str "block",Space,Str "with",SoftBreak,Str "two",Space,Str "paragraphs",Space,Str "inside."]] -,BlockQuote - [Para [Str "The",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "file",Space,Str "(EOF)",Space,Str "closes",Space,Str "the",SoftBreak,Str "currently",Space,Str "open",Space,Str "quote",Space,Str "block."]] -,Header 1 ("raw",[],[]) [Str "Raw"] -,Para [Str "A raw line.\n"] -,Para [Str " Another raw line, with leading spaces.\n"] -,Para [Str "A raw area delimited\n by lines with marks.\n"] -,Para [Str "Trailing spaces and TABs after the area marks\nare allowed, but not encouraged nor documented.\n"] -,Para [Str "\"\"\"Not",Space,Str "a",Space,Str "raw",Space,Str "line,",Space,Str "need",Space,Str "one",Space,Str "space",Space,Str "after",Space,Str "mark."] -,Para [Str "\"\"\"",SoftBreak,Str "Not",Space,Str "a",Space,Str "raw",Space,Str "area.",SoftBreak,Str "The",Space,Str "marks",Space,Str "must",Space,Str "be",Space,Str "at",Space,Str "the",Space,Str "line",Space,Str "beginning,",SoftBreak,Str "no",Space,Str "leading",Space,Str "spaces.",SoftBreak,Str "\"\"\""] -,Para [Str "The end of the file (EOF) closes\nthe currently open raw area.\n"] -,Header 1 ("verbatim",[],[]) [Str "Verbatim"] -,CodeBlock ("",[],[]) "A verbatim line.\n" -,CodeBlock ("",[],[]) " Another verbatim line, with leading spaces.\n" -,CodeBlock ("",[],[]) "A verbatim area delimited\n by lines with marks.\n" -,CodeBlock ("",[],[]) "Trailing spaces and TABs after the area marks\nare allowed, but not encouraged nor documented.\n" -,Para [Str "```Not",Space,Str "a",Space,Str "verbatim",Space,Str "line,",Space,Str "need",Space,Str "one",Space,Str "space",Space,Str "after",Space,Str "mark."] -,Para [Str "```",SoftBreak,Str "Not",Space,Str "a",Space,Str "verbatim",Space,Str "area.",SoftBreak,Str "The",Space,Str "marks",Space,Str "must",Space,Str "be",Space,Str "at",Space,Str "the",Space,Str "line",Space,Str "beginning,",SoftBreak,Str "no",Space,Str "leading",Space,Str "spaces.",SoftBreak,Str "```"] -,CodeBlock ("",[],[]) "The end of the file (EOF) closes\nthe currently open verbatim area.\n" -,Header 1 ("deflist",[],[]) [Str "Definition",Space,Str "List"] -,DefinitionList - [([Str "Definition",Space,Str "list"], - [[Plain [Str "A",Space,Str "list",Space,Str "with",Space,Str "terms"]]]) - ,([Str "Start",Space,Str "term",Space,Str "with",Space,Str "colon"], - [[Plain [Str "And",Space,Str "its",Space,Str "definition",Space,Str "follows"]]])] -,Header 1 ("numlist",[],[]) [Str "Numbered",Space,Str "List"] -,Para [Str "See",Space,Link ("",[],[]) [Str "List"] ("#list",""),Str ",",Space,Str "the",Space,Str "same",Space,Str "rules",Space,Str "apply."] -,Header 1 ("list",[],[]) [Str "List"] -,BulletList - [[Plain [Str "Use",Space,Str "the",Space,Str "hyphen",Space,Str "to",Space,Str "prefix",Space,Str "list",Space,Str "items."]] - ,[Plain [Str "There",Space,Str "must",Space,Str "be",Space,Str "one",Space,Str "space",Space,Str "after",Space,Str "the",Space,Str "hyphen."]] - ,[Plain [Str "The",Space,Str "list",Space,Str "is",Space,Str "closed",Space,Str "by",Space,Str "two",Space,Str "consecutive",Space,Str "blank",Space,Str "lines."]]] -,BulletList - [[Plain [Str "The",Space,Str "list",Space,Str "can",Space,Str "be",Space,Str "indented",Space,Str "on",Space,Str "the",Space,Str "source",Space,Str "document."]] - ,[Plain [Str "You",Space,Str "can",Space,Str "use",Space,Str "any",Space,Str "number",Space,Str "of",Space,Str "spaces."]] - ,[Plain [Str "The",Space,Str "result",Space,Str "will",Space,Str "be",Space,Str "the",Space,Str "same."]]] -,BulletList - [[Para [Str "Let",Space,Str "one",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "the",Space,Str "list",Space,Str "items."]] - ,[Para [Str "It",Space,Str "will",Space,Str "be",Space,Str "maintained",Space,Str "on",Space,Str "the",Space,Str "conversion."]] - ,[Para [Str "Some",Space,Str "targets",Space,Str "don't",Space,Str "support",Space,Str "this",Space,Str "behavior."]] - ,[Para [Str "This",Space,Str "one",Space,Str "was",Space,Str "separated",Space,Str "by",Space,Str "a",Space,Str "line",Space,Str "with",Space,Str "blanks.",SoftBreak,Str "You",Space,Str "can",Space,Str "also",Space,Str "put",Space,Str "a",Space,Str "blank",Space,Str "line",Space,Str "inside"] - ,Para [Str "the",Space,Str "item",Space,Str "contents",Space,Str "and",Space,Str "it",Space,Str "will",Space,Str "be",Space,Str "preserved."]]] -,Para [Str "-This",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "list",Space,Str "(no",Space,Str "space)"] -,Para [Str "-",Space,Str "This",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "list",Space,Str "(more",Space,Str "than",Space,Str "one",Space,Str "space)"] -,Para [Str "-",Space,Str "This",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "list",Space,Str "(a",Space,Str "TAB",Space,Str "instead",Space,Str "the",Space,Str "space)"] -,BulletList - [[BulletList - [[Plain [Str "This",Space,Str "is",Space,Str "a",Space,Str "list"]]]] - ,[OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "This",Space,Str "is",Space,Str "a",Space,Str "list"]]]] - ,[DefinitionList - [([Str "This",Space,Str "is",Space,Str "a",Space,Str "list"], - [[]])]]] -,BulletList - [[Plain [Str "This",Space,Str "is",Space,Str "the",Space,Str "\"mother\"",Space,Str "list",Space,Str "first",Space,Str "item."]] - ,[Plain [Str "Here",Space,Str "is",Space,Str "the",Space,Str "second,",Space,Str "but",Space,Str "inside",Space,Str "this",Space,Str "item,"] - ,BulletList - [[Plain [Str "there",Space,Str "is",Space,Str "a",Space,Str "sublist,",Space,Str "with",Space,Str "its",Space,Str "own",Space,Str "items."]] - ,[Plain [Str "Note",Space,Str "that",Space,Str "the",Space,Str "items",Space,Str "of",Space,Str "the",Space,Str "same",Space,Str "sublist"]] - ,[Plain [Str "must",Space,Str "have",Space,Str "the",Space,Str "same",Space,Str "indentation."] - ,BulletList - [[Plain [Str "And",Space,Str "this",Space,Str "can",Space,Str "go",Space,Str "on,",Space,Str "opening",Space,Str "sublists."] - ,BulletList - [[Plain [Str "Just",Space,Str "add",Space,Str "leading",Space,Str "spaces",Space,Str "before",Space,Str "the"]] - ,[Plain [Str "hyphen",Space,Str "and",Space,Str "sublists",Space,Str "will",Space,Str "be",Space,Str "opened."]] - ,[Plain [Str "The",Space,Str "two",Space,Str "blank",Space,Str "lines",Space,Str "closes",Space,Str "them",Space,Str "all."]]]]]]]]] -,BulletList - [[Plain [Str "When",Space,Str "nesting",Space,Str "lists,",Space,Str "the",Space,Str "additional",Space,Str "spaces",Space,Str "are",Space,Str "free."]] - ,[Plain [Str "You",Space,Str "can",Space,Str "add",Space,Str "just",Space,Str "one,"] - ,BulletList - [[Plain [Str "or",Space,Str "many."] - ,BulletList - [[Plain [Str "What",Space,Str "matters",Space,Str "is",Space,Str "to",Space,Str "put",Space,Str "more",Space,Str "than",Space,Str "the",Space,Str "previous."]] - ,[Plain [Str "But",Space,Str "remember",Space,Str "that",Space,Str "the",Space,Str "other",Space,Str "items",Space,Str "of",Space,Str "the",Space,Str "same",Space,Str "list"]] - ,[Plain [Str "must",Space,Str "use",Space,Str "the",Space,Str "same",Space,Str "indentation."]]]]]]] -,BulletList - [[Plain [Str "There",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "depth",Space,Str "limit,"] - ,BulletList - [[Plain [Str "you",Space,Str "can",Space,Str "go",Space,Str "deeper",Space,Str "and",Space,Str "deeper."] - ,BulletList - [[Plain [Str "But",Space,Str "some",Space,Str "targets",Space,Str "may",Space,Str "have",Space,Str "restrictions."] - ,BulletList - [[Plain [Str "The",Space,Str "LaTeX",Space,Str "maximum",Space,Str "is",Space,Str "here,",Space,Str "4",Space,Str "levels."]]]]]]]]] -,BulletList - [[Plain [Str "Reverse",Space,Str "nesting",Space,Str "doesn't",Space,Str "work."]] - ,[Plain [Str "Because",Space,Str "a",Space,Str "sublist",Space,Str "*must*",Space,Str "have",Space,Str "a",Space,Str "mother",Space,Str "list."]] - ,[Plain [Str "It's",Space,Str "the",Space,Str "list",Space,Str "concept,",Space,Str "not",Space,Str "a",Space,Str "txt2tags",Space,Str "limitation."]] - ,[Plain [Str "All",Space,Str "this",Space,Str "sublists",Space,Str "will",Space,Str "be",Space,Str "bumped",Space,Str "to",Space,Str "mother",Space,Str "lists."]] - ,[Plain [Str "At",Space,Str "level",Space,Str "1,",Space,Str "like",Space,Str "this",Space,Str "one."]]] -,BulletList - [[Plain [Str "Level",Space,Str "1"] - ,BulletList - [[Plain [Str "Level",Space,Str "2"] - ,BulletList - [[Plain [Str "Level",Space,Str "3"] - ,BulletList - [[Plain [Str "Level",Space,Str "4"]]]] - ,[Plain [Str "Level",Space,Str "3",Space,Str "--",Space,Str "(closed",Space,Str "Level",Space,Str "4)"]]]] - ,[Plain [Str "Level",Space,Str "2",Space,Str "--",Space,Str "(closed",Space,Str "Level",Space,Str "3)"]]]] - ,[Plain [Str "Level",Space,Str "1",Space,Str "--",Space,Str "(closed",Space,Str "Level",Space,Str "2)"]]] -,BulletList - [[Plain [Str "Level",Space,Str "1"] - ,BulletList - [[Plain [Str "Level",Space,Str "2"] - ,BulletList - [[Plain [Str "Level",Space,Str "3"] - ,BulletList - [[Plain [Str "Level",Space,Str "4"]]]]]]]] - ,[Plain [Str "Level",Space,Str "1",Space,Str "--",Space,Str "(closed",Space,Str "Level",Space,Str "4,",Space,Str "Level",Space,Str "3",Space,Str "and",Space,Str "Level",Space,Str "2)"]]] -,BulletList - [[Para [Str "Level",Space,Str "1"] - ,BulletList - [[Para [Str "Level",Space,Str "2",Space,Str "--",Space,Str "blank",Space,Str "BEFORE",Space,Str "and",Space,Str "AFTER",Space,Str "(in)"] - ,BulletList - [[Plain [Str "Level",Space,Str "3"]]]]]]] -,BulletList - [[Plain [Str "Level",Space,Str "4"]]] -,BulletList - [[Para [Str "Level",Space,Str "3"]] - ,[Para [Str "Level",Space,Str "2",Space,Str "--",Space,Str "blank",Space,Str "BEFORE",Space,Str "and",Space,Str "AFTER",Space,Str "(out)"]] - ,[Para [Str "Level",Space,Str "1"] - ,BulletList - [[Para [Str "Level",Space,Str "2",Space,Str "--",Space,Str "blank",Space,Str "BEFORE",Space,Str "(spaces)",Space,Str "and",Space,Str "AFTER",Space,Str "(TAB)"] - ,BulletList - [[Plain [Str "Level",Space,Str "3"]]]]]]] -,BulletList - [[Plain [Str "Level",Space,Str "1"] - ,BulletList - [[Plain [Str "Level",Space,Str "2"] - ,BulletList - [[Plain [Str "Level",Space,Str "3"] - ,BulletList - [[Plain [Str "Level",Space,Str "4"]] - ,[Plain [Str "Level",Space,Str "3.5",Space,Str "???"]]]] - ,[Plain [Str "Level",Space,Str "3"]] - ,[Plain [Str "Level",Space,Str "2.5",Space,Str "???"]]]] - ,[Plain [Str "Level",Space,Str "2"]] - ,[Plain [Str "Level",Space,Str "1.5",Space,Str "???"]]]] - ,[Plain [Str "Level",Space,Str "1"]]] -,BulletList - [[Plain [Str "This",Space,Str "list",Space,Str "is",Space,Str "closed",Space,Str "by",Space,Str "a",Space,Str "line",Space,Str "with",Space,Str "spaces",Space,Str "and",Space,Str "other",Space,Str "with",Space,Str "TABs"]]] -,BulletList - [[Plain [Str "This",Space,Str "list",Space,Str "is",Space,Str "NOT",Space,Str "closed",Space,Str "by",Space,Str "two",Space,Str "comment",Space,Str "lines"]]] -,BulletList - [[Plain [Str "This",Space,Str "list",Space,Str "is",Space,Str "closed",Space,Str "by",Space,Str "a",Space,Str "line",Space,Str "with",Space,Str "spaces",Space,Str "and",Space,Str "TAB,"]] - ,[Plain [Str "then",Space,Str "a",Space,Str "comment",Space,Str "line,",Space,Str "then",Space,Str "an",Space,Str "empty",Space,Str "line."]]] -,BulletList - [[Plain [Str "Level",Space,Str "1"] - ,BulletList - [[Plain [Str "Level",Space,Str "2"] - ,BulletList - [[Plain [Str "Level",Space,Str "3"]]] - ,Plain [Str "-",SoftBreak,Str "Level",Space,Str "2"]]] - ,Plain [Str "-",SoftBreak,Str "Level",Space,Str "1"]]] -,Para [Str "-"] -,BulletList - [[Plain [Str "Empty",Space,Str "item",Space,Str "with",Space,Str "trailing",Space,Str "spaces."]]] -,Para [Str "-"] -,BulletList - [[Plain [Str "Empty",Space,Str "item",Space,Str "with",Space,Str "trailing",Space,Str "TAB."]]] -,Para [Str "-"] -,BulletList - [[Plain [Str "If",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "file",Space,Str "(EOF)",Space,Str "is",Space,Str "hit,"] - ,BulletList - [[Plain [Str "all",Space,Str "the",Space,Str "currently",Space,Str "opened",Space,Str "list",Space,Str "are",Space,Str "closed,"] - ,BulletList - [[Plain [Str "just",Space,Str "like",Space,Str "when",Space,Str "using",Space,Str "the",Space,Str "two",Space,Str "blank",Space,Str "lines."]]]]]]] -,Header 1 ("table",[],[]) [Str "Table"] -,Table [] [AlignRight] [0.0] - [[]] - [[[Plain [Str "Cell",Space,Str "1"]]]] -,Table [] [AlignCenter,AlignCenter,AlignRight] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Str "Cell",Space,Str "1"]] - ,[Plain [Str "Cell",Space,Str "2"]] - ,[Plain [Str "Cell",Space,Str "3"]]]] -,Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Str "Cell",Space,Str "1"]] - ,[Plain [Str "Cell",Space,Str "2"]] - ,[Plain [Str "Cell",Space,Str "3"]]]] -,Para [Str "||",Space,Str "Cell",Space,Str "1",Space,Str "|",Space,Str "Cell",Space,Str "2",Space,Str "|",Space,Str "Cell",Space,Str "3",Space,Str "|"] -,Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0] - [[] - ,[] - ,[]] - [[[Plain [Str "Cell",Space,Str "1"]] - ,[Plain [Str "Cell",Space,Str "2"]] - ,[Plain [Str "Cell",Space,Str "3"]]]] -,Table [] [AlignDefault,AlignCenter,AlignDefault] [0.0,0.0,0.0] - [[Plain [Str "Heading"]] - ,[Plain [Str "Heading"]] - ,[Plain [Str "Heading"]]] - [[[Plain [Str "<-"]] - ,[Plain [Str "--"]] - ,[Plain [Str "->"]]] - ,[[Plain [Str "--"]] - ,[Plain [Str "--"]] - ,[Plain [Str "--"]]] - ,[[Plain [Str "->"]] - ,[Plain [Str "--"]] - ,[Plain [Str "<-"]]]] -,Table [] [AlignDefault,AlignDefault,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0] - [[Plain [Str "1"]] - ,[Plain [Str "2"]] - ,[Plain [Str "3+4"]] - ,[]] - [[[Plain [Str "1"]] - ,[Plain [Str "2"]] - ,[Plain [Str "3"]] - ,[Plain [Str "4"]]] - ,[[Plain [Str "1+2+3"]] - ,[Plain [Str "4"]] - ,[] - ,[]] - ,[[Plain [Str "1"]] - ,[Plain [Str "2+3"]] - ,[Plain [Str "4"]] - ,[]] - ,[[Plain [Str "1+2+3+4"]] - ,[] - ,[] - ,[]]] -,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0] - [[] - ,[] - ,[] - ,[]] - [[[Plain [Str "0"]] - ,[Plain [Str "1"]] - ,[Plain [Str "2"]] - ,[]] - ,[[Plain [Str "4"]] - ,[Plain [Str "5"]] - ,[] - ,[Plain [Str "7"]]] - ,[[Plain [Str "8"]] - ,[] - ,[Plain [Str "A"]] - ,[Plain [Str "B"]]] - ,[[] - ,[Plain [Str "D"]] - ,[Plain [Str "E"]] - ,[Plain [Str "F"]]]] -,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0] - [[] - ,[] - ,[] - ,[] - ,[]] - [[[Plain [Str "1"]] - ,[] - ,[] - ,[] - ,[]] - ,[[Plain [Str "1"]] - ,[Plain [Str "2"]] - ,[] - ,[] - ,[]] - ,[[Plain [Str "1"]] - ,[Plain [Str "2"]] - ,[Plain [Str "3"]] - ,[] - ,[]] - ,[[Plain [Str "1"]] - ,[Plain [Str "2"]] - ,[Plain [Str "3"]] - ,[Plain [Str "4"]] - ,[]] - ,[[Plain [Str "1"]] - ,[Plain [Str "2"]] - ,[Plain [Str "3"]] - ,[Plain [Str "4"]] - ,[Plain [Str "5"]]]] -,Table [] [AlignDefault,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0] - [[] - ,[] - ,[] - ,[] - ,[]] - [[[Plain [Str "Jan"]] - ,[] - ,[] - ,[] - ,[]] - ,[[Plain [Str "Fev"]] - ,[] - ,[] - ,[] - ,[]] - ,[[Plain [Str "Mar"]] - ,[] - ,[] - ,[] - ,[]] - ,[[Plain [Str "Apr"]] - ,[] - ,[] - ,[] - ,[]] - ,[[Plain [Str "May"]] - ,[] - ,[] - ,[] - ,[]] - ,[[Plain [Str "20%"]] - ,[Plain [Str "40%"]] - ,[Plain [Str "60%"]] - ,[Plain [Str "80%"]] - ,[Plain [Str "100%"]]]] -,Table [] [AlignCenter,AlignDefault,AlignDefault,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0] - [[] - ,[] - ,[] - ,[] - ,[]] - [[[] - ,[] - ,[Plain [Str "/"]] - ,[] - ,[]] - ,[[] - ,[Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]] - ,[] - ,[] - ,[]] - ,[[Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]] - ,[] - ,[] - ,[] - ,[]] - ,[[] - ,[Plain [Str "o"]] - ,[] - ,[Plain [Str "o"]] - ,[]] - ,[[] - ,[] - ,[Plain [Str "."]] - ,[] - ,[]] - ,[[] - ,[Plain [Str "=",Space,Str "=",Space,Str "=",Space,Str "="]] - ,[] - ,[] - ,[]]] -,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0] - [[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[]] - [[[Plain [Str "01"]] - ,[Plain [Str "02"]] - ,[] - ,[] - ,[Plain [Str "05"]] - ,[] - ,[Plain [Str "07"]] - ,[]] - ,[[] - ,[] - ,[Plain [Str "11"]] - ,[] - ,[Plain [Str "13"]] - ,[] - ,[] - ,[Plain [Str "16"]]] - ,[[Plain [Str "17"]] - ,[] - ,[Plain [Str "19"]] - ,[Plain [Str "20"]] - ,[] - ,[] - ,[Plain [Str "23"]] - ,[]] - ,[[Plain [Str "25"]] - ,[Plain [Str "26"]] - ,[] - ,[] - ,[Plain [Str "29"]] - ,[Plain [Str "30"]] - ,[] - ,[Plain [Str "32"]]] - ,[[] - ,[] - ,[Plain [Str "35"]] - ,[] - ,[Plain [Str "37"]] - ,[] - ,[Plain [Str "39"]] - ,[Plain [Str "40"]]]] -,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0] - [[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[] - ,[]] - [[[Plain [Str "0"]] - ,[Plain [Str "1"]] - ,[Plain [Str "2"]] - ,[Plain [Str "3"]] - ,[Plain [Str "4"]] - ,[Plain [Str "5"]] - ,[Plain [Str "6"]] - ,[Plain [Str "7"]] - ,[Plain [Str "8"]] - ,[Plain [Str "9"]] - ,[Plain [Str "A"]] - ,[Plain [Str "B"]] - ,[Plain [Str "C"]] - ,[Plain [Str "D"]] - ,[Plain [Str "E"]] - ,[Plain [Str "F"]] - ,[Plain [Str "0"]] - ,[Plain [Str "1"]] - ,[Plain [Str "2"]] - ,[Plain [Str "3"]] - ,[Plain [Str "4"]] - ,[Plain [Str "5"]] - ,[Plain [Str "6"]] - ,[Plain [Str "7"]] - ,[Plain [Str "8"]] - ,[Plain [Str "9"]] - ,[Plain [Str "A"]] - ,[Plain [Str "B"]] - ,[Plain [Str "C"]] - ,[Plain [Str "D"]] - ,[Plain [Str "E"]] - ,[Plain [Str "F"]]]] -,Table [] [AlignCenter] [0.0] - [[]] - [[[]] - ,[[]] - ,[[]]] -,Para [Str "|this|is|not|a|table|"] -,Para [Str "|this|",Space,Str "is|",Space,Str "not|",Space,Str "a|",Space,Str "table|"] -,Para [Str "|this",Space,Str "|is",Space,Str "|not",Space,Str "|a",Space,Str "|table",Space,Str "|"] -,Para [Str "|",Space,Str "this\t|",Space,Str "is\t|",Space,Str "not\t|",Space,Str "a\t|",Space,Str "table\t|"] -,HorizontalRule -,Para [Str "The",Space,Str "End."]] +Pandoc + Meta + { unMeta = + fromList + [ ( "author" , MetaList [ MetaInlines [ Str "author" ] ] ) + , ( "date" , MetaInlines [ Str "date" ] ) + , ( "includeconf" , MetaString "rules.conf" ) + , ( "title" + , MetaInlines + [ Str "Txt2tags" + , Space + , Str "Markup" + , Space + , Str "Rules" + ] + ) + ] + } + [ Para + [ Str "This" + , Space + , Str "document" + , Space + , Str "describes" + , Space + , Str "all" + , Space + , Str "the" + , Space + , Str "details" + , Space + , Str "about" + , Space + , Str "each" + , Space + , Str "txt2tags" + , Space + , Str "mark." + , SoftBreak + , Str "The" + , Space + , Str "target" + , Space + , Str "audience" + , Space + , Str "are" + , Space + , Strong [ Str "experienced" ] + , Space + , Str "users." + , Space + , Str "You" + , Space + , Str "may" + , Space + , Str "find" + , Space + , Str "it" + , SoftBreak + , Str "useful" + , Space + , Str "if" + , Space + , Str "you" + , Space + , Str "want" + , Space + , Str "to" + , Space + , Str "master" + , Space + , Str "the" + , Space + , Str "marks" + , Space + , Str "or" + , Space + , Str "solve" + , Space + , Str "a" + , Space + , Str "specific" + , Space + , Str "problem" + , SoftBreak + , Str "about" + , Space + , Str "a" + , Space + , Str "mark." + ] + , Para + [ Str "If" + , Space + , Str "you" + , Space + , Str "are" + , Space + , Str "new" + , Space + , Str "to" + , Space + , Str "txt2tags" + , Space + , Str "or" + , Space + , Str "just" + , Space + , Str "want" + , Space + , Str "to" + , Space + , Str "know" + , Space + , Str "which" + , Space + , Str "are" + , Space + , Str "the" + , SoftBreak + , Str "available" + , Space + , Str "marks," + , Space + , Str "please" + , Space + , Str "read" + , Space + , Str "the" + , Space + , Link + ( "" , [] , [] ) + [ Str "Markup" , Space , Str "Demo" ] + ( "MARKUPDEMO" , "" ) + , Str "." + ] + , Para + [ Str "Note" + , Space + , Str "1:" + , Space + , Str "This" + , Space + , Str "document" + , Space + , Str "is" + , Space + , Str "generated" + , Space + , Str "directly" + , Space + , Str "from" + , Space + , Str "the" + , Space + , Str "txt2tags" + , SoftBreak + , Str "test-suite." + , Space + , Str "All" + , Space + , Str "the" + , Space + , Str "rules" + , Space + , Str "mentioned" + , Space + , Str "here" + , Space + , Str "are" + , Space + , Str "100%" + , Space + , Str "in" + , Space + , Str "sync" + , Space + , Str "with" + , Space + , Str "the" + , SoftBreak + , Str "current" + , Space + , Str "program" + , Space + , Str "code." + ] + , Para + [ Str "Note" + , Space + , Str "2:" + , Space + , Str "A" + , Space + , Str "good" + , Space + , Str "practice" + , Space + , Str "is" + , Space + , Str "to" + , Space + , Str "consult" + , Space + , Link + ( "" , [] , [] ) + [ Str "the" , Space , Str "sources" ] + ( "rules.t2t" , "" ) + , Space + , Str "when" + , SoftBreak + , Str "reading," + , Space + , Str "to" + , Space + , Str "see" + , Space + , Str "how" + , Space + , Str "the" + , Space + , Str "texts" + , Space + , Str "were" + , Space + , Str "made." + ] + , Para + [ Str "Table" , Space , Str "of" , Space , Str "Contents:" ] + , HorizontalRule + , Header 1 ( "paragraph" , [] , [] ) [ Str "Paragraph" ] + , Para + [ Str "A" + , Space + , Str "paragraph" + , Space + , Str "is" + , Space + , Str "composed" + , Space + , Str "by" + , Space + , Str "one" + , Space + , Str "or" + , Space + , Str "more" + , Space + , Str "lines." + , SoftBreak + , Str "A" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "(or" + , Space + , Str "a" + , Space + , Str "table," + , Space + , Str "or" + , Space + , Str "a" + , Space + , Str "list)" + , Space + , Str "ends" + , Space + , Str "the" + , SoftBreak + , Str "current" + , Space + , Str "paragraph." + ] + , Para + [ Str "Leading" + , Space + , Str "and" + , Space + , Str "trailing" + , Space + , Str "spaces" + , Space + , Str "are" + , Space + , Str "ignored." + ] + , Para + [ Str "A" + , Space + , Str "comment" + , Space + , Str "line" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "placed" + , Space + , Str "inside" + , Space + , Str "a" + , Space + , Str "paragraph." + , SoftBreak + , Str "It" + , Space + , Str "will" + , Space + , Str "not" + , Space + , Str "affect" + , Space + , Str "it." + ] + , Para + [ Str "The" + , Space + , Str "end" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "file" + , Space + , Str "(EOF)" + , Space + , Str "closes" + , Space + , Str "the" + , SoftBreak + , Str "currently" + , Space + , Str "open" + , Space + , Str "paragraph." + ] + , Header 1 ( "comment" , [] , [] ) [ Str "Comment" ] + , Para + [ Str "%" + , Space + , Str "not" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "line" + , Space + , Str "beginning" + , Space + , Str "(at" + , Space + , Str "column" + , Space + , Str "2)" + ] + , Para + [ Str "some" + , Space + , Str "text" + , Space + , Str "%" + , Space + , Str "half" + , Space + , Str "line" + , Space + , Str "comments" + , Space + , Str "are" + , Space + , Str "not" + , Space + , Str "allowed" + ] + , Header 1 ( "line" , [] , [] ) [ Str "Line" ] + , HorizontalRule + , HorizontalRule + , HorizontalRule + , HorizontalRule + , HorizontalRule + , HorizontalRule + , HorizontalRule + , HorizontalRule + , HorizontalRule + , HorizontalRule + , HorizontalRule + , Para + [ Strikeout [ Str "-----" ] + , SoftBreak + , Strikeout [ Str "-------" , Space , Str "--------" ] + ] + , Para [ Strikeout [ Str "-------+--------" ] ] + , Para + [ Str "(" + , Space + , Strikeout [ Str "----------------" ] + , Space + , Str ")" + ] + , Header 1 ( "inline" , [] , [] ) [ Str "Inline" ] + , Para + [ Str "i)" + , Space + , Strong [ Str "b" ] + , Space + , Emph [ Str "i" ] + , Space + , Underline [ Str "u" ] + , Space + , Strikeout [ Str "s" ] + , Space + , Code ( "" , [] , [] ) "m" + , Space + , Str "r" + , Space + , RawInline (Format "html") "t" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "bo" ] + , Space + , Emph [ Str "it" ] + , Space + , Underline [ Str "un" ] + , Space + , Strikeout [ Str "st" ] + , Space + , Code ( "" , [] , [] ) "mo" + , Space + , Str "ra" + , Space + , RawInline (Format "html") "tg" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "bold" ] + , Space + , Emph [ Str "ital" ] + , Space + , Underline [ Str "undr" ] + , Space + , Strikeout [ Str "strk" ] + , Space + , Code ( "" , [] , [] ) "mono" + , Space + , Str "raw" + , Space + , RawInline (Format "html") "tggd" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "bo" , Space , Str "ld" ] + , Space + , Emph [ Str "it" , Space , Str "al" ] + , Space + , Underline [ Str "un" , Space , Str "dr" ] + , Space + , Strikeout [ Str "st" , Space , Str "rk" ] + , Space + , Code ( "" , [] , [] ) "mo no" + , Space + , Str "r" + , Space + , Str "aw" + , Space + , RawInline (Format "html") "tg gd" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "bo" , Space , Str "*" , Space , Str "ld" ] + , Space + , Emph [ Str "it" , Space , Str "/" , Space , Str "al" ] + , Space + , Underline + [ Str "un" , Space , Str "_" , Space , Str "dr" ] + , Space + , Strikeout + [ Str "st" , Space , Str "-" , Space , Str "rk" ] + , Space + , Code ( "" , [] , [] ) "mo ` no" + , Space + , Str "r" + , Space + , Str "\"" + , Space + , Str "aw" + , Space + , RawInline (Format "html") "tg ' gd" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "bo" , Space , Str "**ld" ] + , Space + , Emph [ Str "it" , Space , Str "//al" ] + , Space + , Underline [ Str "un" , Space , Str "__dr" ] + , Space + , Strikeout [ Str "st" , Space , Str "--rk" ] + , Space + , Code ( "" , [] , [] ) "mo ``no" + , Space + , Str "r" + , Space + , Str "\"\"aw" + , Space + , RawInline (Format "html") "tg ''gd" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "bo" , Space , Str "**" , Space , Str "ld" ] + , Space + , Emph [ Str "it" , Space , Str "//" , Space , Str "al" ] + , Space + , Underline + [ Str "un" , Space , Str "__" , Space , Str "dr" ] + , Space + , Strikeout + [ Str "st" , Space , Str "--" , Space , Str "rk" ] + , Space + , Code ( "" , [] , [] ) "mo `` no" + , Space + , Str "r" + , Space + , Str "\"\"" + , Space + , Str "aw" + , Space + , RawInline (Format "html") "tg '' gd" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "**bold**" ] + , Space + , Emph [ Str "//ital//" ] + , Space + , Underline [ Str "__undr__" ] + , Space + , Strikeout [ Str "--strk--" ] + , Space + , Code ( "" , [] , [] ) "``mono``" + , Space + , Str "\"\"raw\"\"" + , Space + , RawInline (Format "html") "''tggd''" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "*bold*" ] + , Space + , Emph [ Str "/ital/" ] + , Space + , Underline [ Str "_undr_" ] + , Space + , Strikeout [ Str "-strk-" ] + , Space + , Code ( "" , [] , [] ) "`mono`" + , Space + , Str "\"raw\"" + , Space + , RawInline (Format "html") "'tggd'" + ] + , Para + [ Str "i)" + , Space + , Strong [ Str "*" ] + , Space + , Emph [ Str "/" ] + , Space + , Underline [ Str "_" ] + , Space + , Strikeout [ Str "-" ] + , Space + , Code ( "" , [] , [] ) "`" + , Space + , Str "\"" + , Space + , RawInline (Format "html") "'" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "**" ] + , Space + , Emph [ Str "//" ] + , Space + , Underline [ Str "__" ] + , Space + , Strikeout [ Str "--" ] + , Space + , Code ( "" , [] , [] ) "``" + , Space + , Str "\"\"" + , Space + , RawInline (Format "html") "''" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "***" ] + , Space + , Emph [ Str "///" ] + , Space + , Underline [ Str "___" ] + , Space + , Strikeout [ Str "---" ] + , Space + , Code ( "" , [] , [] ) "```" + , Space + , Str "\"\"\"" + , Space + , RawInline (Format "html") "'''" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "****" ] + , Space + , Emph [ Str "////" ] + , Space + , Underline [ Str "____" ] + , Space + , Strikeout [ Str "----" ] + , Space + , Code ( "" , [] , [] ) "````" + , Space + , Str "\"\"\"\"" + , Space + , RawInline (Format "html") "''''" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "*****" ] + , Space + , Emph [ Str "/////" ] + , Space + , Underline [ Str "_____" ] + , Space + , Strikeout [ Str "-----" ] + , Space + , Code ( "" , [] , [] ) "`````" + , Space + , Str "\"\"\"\"\"" + , Space + , RawInline (Format "html") "'''''" + , SoftBreak + , Str "i)" + , Space + , Strong [ Str "******" ] + , Space + , Emph [ Str "//////" ] + , Space + , Underline [ Str "______" ] + , Space + , Strikeout [ Str "------" ] + , Space + , Code ( "" , [] , [] ) "``````" + , Space + , Str "\"\"\"\"\"\"" + , Space + , RawInline (Format "html") "''''''" + ] + , Para + [ Str "i)" + , Space + , Str "****" + , Space + , Str "////" + , Space + , Str "____" + , Space + , Str "----" + , Space + , Str "````" + , Space + , Str "\"\"\"\"" + , Space + , Str "''''" + , SoftBreak + , Str "i)" + , Space + , Str "**" + , Space + , Str "**" + , Space + , Str "//" + , Space + , Str "//" + , Space + , Str "__" + , Space + , Str "__" + , Space + , Str "--" + , Space + , Str "--" + , Space + , Str "``" + , Space + , Str "``" + , Space + , Str "\"\"" + , Space + , Str "\"\"" + , Space + , Str "''" + , Space + , Str "''" + ] + , Para + [ Str "i)" + , Space + , Str "**" + , Space + , Str "bold**" + , Space + , Str "//" + , Space + , Str "ital//" + , Space + , Str "__" + , Space + , Str "undr__" + , Space + , Str "--" + , Space + , Str "strk--" + , Space + , Str "``" + , Space + , Str "mono``" + , Space + , Str "\"\"" + , Space + , Str "raw\"\"" + , Space + , Str "''" + , Space + , Str "tggd''" + , SoftBreak + , Str "i)" + , Space + , Str "**bold" + , Space + , Str "**" + , Space + , Str "//ital" + , Space + , Str "//" + , Space + , Str "__undr" + , Space + , Str "__" + , Space + , Str "--strk" + , Space + , Str "--" + , Space + , Str "``mono" + , Space + , Str "``" + , Space + , Str "\"\"raw" + , Space + , Str "\"\"" + , Space + , Str "''tggd" + , Space + , Str "''" + , SoftBreak + , Str "i)" + , Space + , Str "**" + , Space + , Str "bold" + , Space + , Str "**" + , Space + , Str "//" + , Space + , Str "ital" + , Space + , Str "//" + , Space + , Str "__" + , Space + , Str "undr" + , Space + , Str "__" + , Space + , Str "--" + , Space + , Str "strk" + , Space + , Str "--" + , Space + , Str "``" + , Space + , Str "mono" + , Space + , Str "``" + , Space + , Str "\"\"" + , Space + , Str "raw" + , Space + , Str "\"\"" + , Space + , Str "''" + , Space + , Str "tggd" + , Space + , Str "''" + ] + , Header 1 ( "link" , [] , [] ) [ Str "Link" ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "mailto:user@domain.com" ] + ( "user@domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "mailto:user@domain.com" ] + ( "user@domain.com" , "" ) + , Str "." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "mailto:user@domain.com" ] + ( "user@domain.com" , "" ) + , Str "." + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Str "any" + , Space + , Str "text:" + , Space + , Link + ( "" , [] , [] ) + [ Str "mailto:user@domain.com" ] + ( "user@domain.com" , "" ) + , Str "." + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Link + ( "" , [] , [] ) [ Str "label" ] ( "user@domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "mailto:user@domain.com?subject=bla" ] + ( "user@domain.com?subject=bla" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "mailto:user@domain.com?subject=bla" ] + ( "user@domain.com?subject=bla" , "" ) + , Str "." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "mailto:user@domain.com?subject=bla" ] + ( "user@domain.com?subject=bla" , "" ) + , Str "," + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str + "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com" + ] + ( "user@domain.com?subject=bla&cc=otheruser@domain.com" + , "" + ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str + "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com" + ] + ( "user@domain.com?subject=bla&cc=otheruser@domain.com" + , "" + ) + , Str "." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str + "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com" + ] + ( "user@domain.com?subject=bla&cc=otheruser@domain.com" + , "" + ) + , Str "," + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "label" ] + ( "user@domain.com?subject=bla&cc=otheruser@domain.com" + , "" + ) + , Str "." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "label" ] + ( "user@domain.com?subject=bla&cc=otheruser@domain.com." + , "" + ) + , Str "." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com" ] + ( "http://www.domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/" ] + ( "http://www.domain.com/dir/" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir///" ] + ( "http://www.domain.com/dir///" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com." ] + ( "http://www.domain.com." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com," ] + ( "http://www.domain.com," , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com." ] + ( "http://www.domain.com." , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com," ] + ( "http://www.domain.com," , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/." ] + ( "http://www.domain.com/dir/." , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Str "any" + , Space + , Str "text:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com." ] + ( "http://www.domain.com." , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Str "any" + , Space + , Str "text:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/." ] + ( "http://www.domain.com/dir/." , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Str "any" + , Space + , Str "text:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/index.html." ] + ( "http://www.domain.com/dir/index.html." , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Str "any" + , Space + , Str "text:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/index.html," ] + ( "http://www.domain.com/dir/index.html," , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/#anchor" ] + ( "http://www.domain.com/dir/#anchor" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/index.html#anchor" ] + ( "http://www.domain.com/dir/index.html#anchor" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/index.html#anchor." ] + ( "http://www.domain.com/dir/index.html#anchor." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/#anchor." ] + ( "http://www.domain.com/dir/#anchor." , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/index.html#anchor." ] + ( "http://www.domain.com/dir/index.html#anchor." , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Str "any" + , Space + , Str "text:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/#anchor." ] + ( "http://www.domain.com/dir/#anchor." , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Str "any" + , Space + , Str "text:" + , Space + , Link + ( "" , [] , [] ) + [ Str "http://www.domain.com/dir/index.html#anchor." ] + ( "http://www.domain.com/dir/index.html#anchor." , "" ) + , Space + , Str "any" + , Space + , Str "text." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://domain.com?a=a@a.a&b=a+b+c." ] + ( "http://domain.com?a=a@a.a&b=a+b+c." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://domain.com?a=a@a.a&b=a+b+c," ] + ( "http://domain.com?a=a@a.a&b=a+b+c," , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c." ] + ( "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@." ] + ( "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://domain.com?a=a@a.a&b=a+b+c.#anchor" ] + ( "http://domain.com?a=a@a.a&b=a+b+c.#anchor" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor" ] + ( "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.#anchor" ] + ( "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.#anchor" + , "" + ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://user:password@domain.com/bla.html." ] + ( "http://user:password@domain.com/bla.html." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://user:password@domain.com/dir/." ] + ( "http://user:password@domain.com/dir/." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://user:password@domain.com." ] + ( "http://user:password@domain.com." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://user:@domain.com." ] + ( "http://user:@domain.com." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://user@domain.com." ] + ( "http://user@domain.com." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str + "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor" + ] + ( "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor" + , "" + ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str + "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c@#anchor" + ] + ( "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c@#anchor" + , "" + ) + , SoftBreak + , Link + ( "" , [] , [] ) [ Str "label" ] ( "www.domain.com" , "" ) + , SoftBreak + , Str "[" + , Space + , Str "label" + , Space + , Link + ( "" , [] , [] ) + [ Str "www.domain.com" ] + ( "www.domain.com" , "" ) + , Str "]" + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "label" , Space ] + ( "www.domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "anchor" , Space ] + ( "http://www.domain.com/dir/index.html#anchor." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "login" , Space ] + ( "http://user:password@domain.com/bla.html" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "form" , Space ] + ( "http://www.domain.com/bla.cgi?a=a@a.a&b=a+b+c." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "form" , Space , Str "&" , Space , Str "anchor" ] + ( "http://www.domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor" + , "" + ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "login" + , Space + , Str "&" + , Space + , Str "form" + , Space + ] + ( "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c." + , "" + ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "local" + , Space + , Str "link" + , Space + , Str "up" + , Space + ] + ( ".." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "local" + , Space + , Str "link" + , Space + , Str "file" + , Space + ] + ( "bla.html" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "local" + , Space + , Str "link" + , Space + , Str "anchor" + , Space + ] + ( "#anchor" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "local" + , Space + , Str "link" + , Space + , Str "file/anchor" + ] + ( "bla.html#anchor" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "local" + , Space + , Str "link" + , Space + , Str "file/anchor" + ] + ( "bla.html#anchor." , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "local" + , Space + , Str "link" + , Space + , Str "img" + , Space + ] + ( "abc.gif" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "www.fake.com" ] + ( "www.domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str + "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm" + ] + ( "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm" + , "" + ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str + "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-" + ] + ( "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-" + , "" + ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str + "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_" + ] + ( "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_" + , "" + ) + , Str "-1%." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str + "http://foo._user-9:pass!#$%&*()+word@domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_" + ] + ( "http://foo._user-9:pass!#$%&*()+word@domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_" + , "" + ) + , Str "-1%." + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "http://L1.com" ] + ( "http://L1.com" , "" ) + , Space + , Str "!" + , Space + , Link + ( "" , [] , [] ) + [ Str "mailto:L2@www.com" ] + ( "L2@www.com" , "" ) + , Space + , Str "!" + , Space + , Link ( "" , [] , [] ) [ Str "L3" ] ( "www.com" , "" ) + , Space + , Str "!" + , Space + , Link ( "" , [] , [] ) [ Str "L4" ] ( "w@ww.com" , "" ) + , Space + , Str "!" + , Space + , Link + ( "" , [] , [] ) [ Str "www.L5.com" ] ( "www.L5.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "www.domain.com" ] + ( "www.domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "www2.domain.com" ] + ( "www2.domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "ftp.domain.com" ] + ( "ftp.domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "WWW.DOMAIN.COM" ] + ( "WWW.DOMAIN.COM" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) + [ Str "FTP.DOMAIN.COM" ] + ( "FTP.DOMAIN.COM" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) [ Str "label" ] ( "www.domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) [ Str "label" ] ( "ftp.domain.com" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) [ Str "label" ] ( "WWW.DOMAIN.COM" , "" ) + , SoftBreak + , Link + ( "" , [] , [] ) [ Str "label" ] ( "FTP.DOMAIN.COM" , "" ) + , SoftBreak + , Str "[label" + , Space + , Link + ( "" , [] , [] ) + [ Str "www.domain.com" ] + ( "www.domain.com" , "" ) + , Space + , Str "]" + , SoftBreak + , Str "[label]" + , Space + , Link + ( "" , [] , [] ) + [ Str "www.domain.com" ] + ( "www.domain.com" , "" ) + , Str "]" + ] + , Header 1 ( "image" , [] , [] ) [ Str "Image" ] + , Para [ Image ( "" , [] , [] ) [] ( "img.png" , "" ) ] + , Para + [ Link + ( "" , [] , [] ) + [ Image ( "" , [] , [] ) [] ( "img.png" , "" ) ] + ( "https://txt2tags.org" , "" ) + ] + , Para + [ Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , Space + , Str "Image" + , Space + , Str "at" + , Space + , Str "the" + , Space + , Str "line" + , Space + , Str "beginning." + ] + , Para + [ Str "Image" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "middle" + , Space + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "line." + ] + , Para + [ Str "Image" + , Space + , Str "at" + , Space + , Str "the" + , Space + , Str "line" + , Space + , Str "end." + , Space + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + ] + , Para + [ Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , SoftBreak + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , SoftBreak + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + ] + , Para + [ Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + ] + , Para + [ Str "Images" + , Space + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , Space + , Str "mixed" + , Space + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , Space + , Str "with" + , Space + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , Space + , Str "text." + ] + , Para + [ Str "Images" + , Space + , Str "glued" + , Space + , Str "together:" + , Space + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , Image ( "" , [] , [] ) [] ( "img.png" , "" ) + , Str "." + ] + , Para [ Str "[img.png" , Space , Str "]" ] + , Para [ Str "[" , Space , Str "img.png]" ] + , Para [ Str "[" , Space , Str "img.png" , Space , Str "]" ] + , Header + 1 + ( "numtitle" , [] , [] ) + [ Str "Numbered" , Space , Str "Title" ] + , Header + 1 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "1" ] + , Header + 2 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "2" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 4 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "4" ] + , Header + 5 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "5" ] + , Header + 1 + ( "lab_el-1" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "1" ] + , Header + 2 + ( "lab_el-2" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "2" ] + , Header + 3 + ( "lab_el-3" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 4 + ( "lab_el-4" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "4" ] + , Header + 5 + ( "lab_el-5" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "5" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "lab_el-9" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Para [ Str "+Not" , Space , Str "Title" ] + , Para [ Str "++Not" , Space , Str "Title+" ] + , Para + [ Str "+++Not" + , Space + , Str "Title++++" + , SoftBreak + , Str "++++++Not" + , Space + , Str "Title" + , Space + , Str "6++++++" + ] + , Para + [ Str "+++++++Not" + , Space + , Str "Title" + , Space + , Str "7+++++++" + , SoftBreak + , Str "+Not" + , Space + , Str "Title+" + , Space + , Str "[label1]" + , SoftBreak + , Str "+Not" + , Space + , Str "Title+[" + , Space + , Str "label" + , Space + , Str "]" + , SoftBreak + , Str "+Not" + , Space + , Str "Title+[la/bel]" + ] + , Header 1 ( "title" , [] , [] ) [ Str "Title" ] + , Header + 1 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "1" ] + , Header + 2 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "2" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 4 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "4" ] + , Header + 5 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "5" ] + , Header + 1 + ( "lab_el-1" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "1" ] + , Header + 2 + ( "lab_el-2" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "2" ] + , Header + 3 + ( "lab_el-3" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 4 + ( "lab_el-4" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "4" ] + , Header + 5 + ( "lab_el-5" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "5" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Header + 3 + ( "lab_el-9" , [] , [] ) + [ Str "Title" , Space , Str "Level" , Space , Str "3" ] + , Para [ Str "=Not" , Space , Str "Title" ] + , Para [ Str "==Not" , Space , Str "Title=" ] + , Para + [ Str "===Not" + , Space + , Str "Title====" + , SoftBreak + , Str "======Not" + , Space + , Str "Title" + , Space + , Str "6======" + ] + , Para + [ Str "=======Not" + , Space + , Str "Title" + , Space + , Str "7=======" + , SoftBreak + , Str "=Not" + , Space + , Str "Title=" + , Space + , Str "[label1]" + , SoftBreak + , Str "=Not" + , Space + , Str "Title=[" + , Space + , Str "label" + , Space + , Str "]" + , SoftBreak + , Str "=Not" + , Space + , Str "Title=[la/bel]" + ] + , Header 1 ( "quote" , [] , [] ) [ Str "Quote" ] + , BlockQuote + [ Para + [ Str "To" + , Space + , Str "quote" + , Space + , Str "a" + , Space + , Str "paragraph," + , Space + , Str "just" + , Space + , Str "prefix" + , Space + , Str "it" + , Space + , Str "by" + , Space + , Str "a" + , Space + , Str "TAB" + , SoftBreak + , Str "character." + , Space + , Str "All" + , Space + , Str "the" + , Space + , Str "lines" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "paragraph" + , Space + , Str "must" + , SoftBreak + , Str "begin" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "TAB." + ] + ] + , Para + [ Str "Any" + , Space + , Str "non-tabbed" + , Space + , Str "line" + , Space + , Str "closes" + , Space + , Str "the" + , Space + , Str "quote" + , Space + , Str "block." + ] + , BlockQuote + [ Para + [ Str "The" + , Space + , Str "number" + , Space + , Str "of" + , Space + , Str "leading" + , Space + , Str "TABs" + , Space + , Str "identifies" + , Space + , Str "the" + , Space + , Str "quote" + , SoftBreak + , Str "block" + , Space + , Str "depth." + , Space + , Str "This" + , Space + , Str "is" + , Space + , Str "quote" + , Space + , Str "level" + , Space + , Str "1." + ] + , BlockQuote + [ Para + [ Str "With" + , Space + , Str "two" + , Space + , Str "TABs," + , Space + , Str "we" + , Space + , Str "are" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "quote" + , SoftBreak + , Str "level" + , Space + , Str "2." + ] + , BlockQuote + [ Para + [ Str "The" + , Space + , Str "more" + , Space + , Str "TABs," + , Space + , Str "more" + , Space + , Str "deep" + , Space + , Str "is" + , SoftBreak + , Str "the" + , Space + , Str "quote" + , Space + , Str "level." + ] + , BlockQuote + [ Para + [ Str "There" + , Space + , Str "isn't" + , Space + , Str "a" + , Space + , Str "limit." + ] + ] + ] + ] + ] + , BlockQuote + [ BlockQuote + [ BlockQuote + [ BlockQuote + [ Para + [ Str "This" + , Space + , Str "quote" + , Space + , Str "starts" + , Space + , Str "at" + , SoftBreak + , Str "level" + , Space + , Str "4." + ] + ] + , Para + [ Str "Then" + , Space + , Str "its" + , Space + , Str "depth" + , Space + , Str "is" + , Space + , Str "decreased." + ] + ] + , Para + [ Str "Counting" + , Space + , Str "down," + , Space + , Str "one" + , Space + , Str "by" + , Space + , Str "one." + ] + ] + , Para + [ Str "Until" + , Space + , Str "the" + , Space + , Str "level" + , Space + , Str "1." + ] + ] + , BlockQuote + [ BlockQuote + [ BlockQuote + [ Para + [ Str "Unlike" + , Space + , Str "lists," + , Space + , Str "any" + , Space + , Str "quote" + , Space + , Str "block" + , Space + , Str "is" + , SoftBreak + , Str "independent," + , Space + , Str "not" + , Space + , Str "part" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "tree." + ] + ] + ] + , Para + [ Str "The" + , Space + , Str "TAB" + , Space + , Str "count" + , Space + , Str "don't" + , Space + , Str "need" + , Space + , Str "to" + , Space + , Str "be" + , Space + , Str "incremental" + , SoftBreak + , Str "by" + , Space + , Str "one." + ] + , BlockQuote + [ BlockQuote + [ BlockQuote + [ Para + [ Str "The" + , Space + , Str "nesting" + , Space + , Str "don't" + , Space + , Str "need" + , SoftBreak + , Str "to" + , Space + , Str "follow" + , Space + , Str "any" + , Space + , Str "rule." + ] + ] + ] + , Para + [ Str "Quotes" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "opened" + , Space + , Str "and" + , Space + , Str "closed" + , SoftBreak + , Str "in" + , Space + , Str "any" + , Space + , Str "way." + ] + , BlockQuote + [ BlockQuote + [ BlockQuote + [ Para [ Str "You" , Space , Str "choose." ] ] + ] + ] + ] + ] + , BlockQuote + [ Para + [ Str "Some" + , Space + , Str "targets" + , Space + , Str "(as" + , Space + , Str "sgml)" + , Space + , Str "don't" + , Space + , Str "support" + , Space + , Str "the" + , SoftBreak + , Str "nesting" + , Space + , Str "of" + , Space + , Str "quotes." + , Space + , Str "There" + , Space + , Str "is" + , Space + , Str "only" + , Space + , Str "one" + , Space + , Str "quote" + , SoftBreak + , Str "level." + ] + , BlockQuote + [ Para + [ Str "In" + , Space + , Str "this" + , Space + , Str "case," + , Space + , Str "no" + , Space + , Str "matter" + , Space + , Str "how" + , Space + , Str "much" + , SoftBreak + , Str "TABs" + , Space + , Str "are" + , Space + , Str "used" + , Space + , Str "to" + , Space + , Str "define" + , Space + , Str "the" + , Space + , Str "quote" + , SoftBreak + , Str "block," + , Space + , Str "it" + , Space + , Str "always" + , Space + , Str "will" + , Space + , Str "be" + , Space + , Str "level" + , Space + , Str "1." + ] + ] + ] + , BlockQuote + [ Para + [ Str "Spaces" + , Space + , Str "AFTER" + , Space + , Str "the" + , Space + , Str "TAB" + , Space + , Str "character" + , Space + , Str "are" + , Space + , Str "allowed." + , SoftBreak + , Str "But" + , Space + , Str "be" + , Space + , Str "careful," + , Space + , Str "it" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "confusing." + ] + ] + , Para + [ Str "Spaces" + , Space + , Str "BEFORE" + , Space + , Str "the" + , Space + , Str "TAB" + , Space + , Str "character" + , SoftBreak + , Str "invalidate" + , Space + , Str "the" + , Space + , Str "mark." + , Space + , Str "It's" + , Space + , Str "not" + , Space + , Str "quote." + ] + , BlockQuote + [ Para + [ Str "Paragraph" + , Space + , Str "breaks" + , Space + , Str "inside" + , Space + , Str "a" + , Space + , Str "quote" + , Space + , Str "aren't" + , SoftBreak + , Str "possible." + ] + , Para + [ Str "This" + , Space + , Str "sample" + , Space + , Str "are" + , Space + , Str "two" + , Space + , Str "separated" + , Space + , Str "quoted" + , SoftBreak + , Str "paragraphs," + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "quote" + , Space + , Str "block" + , Space + , Str "with" + , SoftBreak + , Str "two" + , Space + , Str "paragraphs" + , Space + , Str "inside." + ] + ] + , BlockQuote + [ Para + [ Str "The" + , Space + , Str "end" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "file" + , Space + , Str "(EOF)" + , Space + , Str "closes" + , Space + , Str "the" + , SoftBreak + , Str "currently" + , Space + , Str "open" + , Space + , Str "quote" + , Space + , Str "block." + ] + ] + , Header 1 ( "raw" , [] , [] ) [ Str "Raw" ] + , Para [ Str "A raw line.\n" ] + , Para [ Str " Another raw line, with leading spaces.\n" ] + , Para + [ Str "A raw area delimited\n by lines with marks.\n" + ] + , Para + [ Str + "Trailing spaces and TABs after the area marks\nare allowed, but not encouraged nor documented.\n" + ] + , Para + [ Str "\"\"\"Not" + , Space + , Str "a" + , Space + , Str "raw" + , Space + , Str "line," + , Space + , Str "need" + , Space + , Str "one" + , Space + , Str "space" + , Space + , Str "after" + , Space + , Str "mark." + ] + , Para + [ Str "\"\"\"" + , SoftBreak + , Str "Not" + , Space + , Str "a" + , Space + , Str "raw" + , Space + , Str "area." + , SoftBreak + , Str "The" + , Space + , Str "marks" + , Space + , Str "must" + , Space + , Str "be" + , Space + , Str "at" + , Space + , Str "the" + , Space + , Str "line" + , Space + , Str "beginning," + , SoftBreak + , Str "no" + , Space + , Str "leading" + , Space + , Str "spaces." + , SoftBreak + , Str "\"\"\"" + ] + , Para + [ Str + "The end of the file (EOF) closes\nthe currently open raw area.\n" + ] + , Header 1 ( "verbatim" , [] , [] ) [ Str "Verbatim" ] + , CodeBlock ( "" , [] , [] ) "A verbatim line.\n" + , CodeBlock + ( "" , [] , [] ) + " Another verbatim line, with leading spaces.\n" + , CodeBlock + ( "" , [] , [] ) + "A verbatim area delimited\n by lines with marks.\n" + , CodeBlock + ( "" , [] , [] ) + "Trailing spaces and TABs after the area marks\nare allowed, but not encouraged nor documented.\n" + , Para + [ Str "```Not" + , Space + , Str "a" + , Space + , Str "verbatim" + , Space + , Str "line," + , Space + , Str "need" + , Space + , Str "one" + , Space + , Str "space" + , Space + , Str "after" + , Space + , Str "mark." + ] + , Para + [ Str "```" + , SoftBreak + , Str "Not" + , Space + , Str "a" + , Space + , Str "verbatim" + , Space + , Str "area." + , SoftBreak + , Str "The" + , Space + , Str "marks" + , Space + , Str "must" + , Space + , Str "be" + , Space + , Str "at" + , Space + , Str "the" + , Space + , Str "line" + , Space + , Str "beginning," + , SoftBreak + , Str "no" + , Space + , Str "leading" + , Space + , Str "spaces." + , SoftBreak + , Str "```" + ] + , CodeBlock + ( "" , [] , [] ) + "The end of the file (EOF) closes\nthe currently open verbatim area.\n" + , Header + 1 + ( "deflist" , [] , [] ) + [ Str "Definition" , Space , Str "List" ] + , DefinitionList + [ ( [ Str "Definition" , Space , Str "list" ] + , [ [ Plain + [ Str "A" + , Space + , Str "list" + , Space + , Str "with" + , Space + , Str "terms" + ] + ] + ] + ) + , ( [ Str "Start" + , Space + , Str "term" + , Space + , Str "with" + , Space + , Str "colon" + ] + , [ [ Plain + [ Str "And" + , Space + , Str "its" + , Space + , Str "definition" + , Space + , Str "follows" + ] + ] + ] + ) + ] + , Header + 1 + ( "numlist" , [] , [] ) + [ Str "Numbered" , Space , Str "List" ] + , Para + [ Str "See" + , Space + , Link ( "" , [] , [] ) [ Str "List" ] ( "#list" , "" ) + , Str "," + , Space + , Str "the" + , Space + , Str "same" + , Space + , Str "rules" + , Space + , Str "apply." + ] + , Header 1 ( "list" , [] , [] ) [ Str "List" ] + , BulletList + [ [ Plain + [ Str "Use" + , Space + , Str "the" + , Space + , Str "hyphen" + , Space + , Str "to" + , Space + , Str "prefix" + , Space + , Str "list" + , Space + , Str "items." + ] + ] + , [ Plain + [ Str "There" + , Space + , Str "must" + , Space + , Str "be" + , Space + , Str "one" + , Space + , Str "space" + , Space + , Str "after" + , Space + , Str "the" + , Space + , Str "hyphen." + ] + ] + , [ Plain + [ Str "The" + , Space + , Str "list" + , Space + , Str "is" + , Space + , Str "closed" + , Space + , Str "by" + , Space + , Str "two" + , Space + , Str "consecutive" + , Space + , Str "blank" + , Space + , Str "lines." + ] + ] + ] + , BulletList + [ [ Plain + [ Str "The" + , Space + , Str "list" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "indented" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "source" + , Space + , Str "document." + ] + ] + , [ Plain + [ Str "You" + , Space + , Str "can" + , Space + , Str "use" + , Space + , Str "any" + , Space + , Str "number" + , Space + , Str "of" + , Space + , Str "spaces." + ] + ] + , [ Plain + [ Str "The" + , Space + , Str "result" + , Space + , Str "will" + , Space + , Str "be" + , Space + , Str "the" + , Space + , Str "same." + ] + ] + ] + , BulletList + [ [ Para + [ Str "Let" + , Space + , Str "one" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "between" + , Space + , Str "the" + , Space + , Str "list" + , Space + , Str "items." + ] + ] + , [ Para + [ Str "It" + , Space + , Str "will" + , Space + , Str "be" + , Space + , Str "maintained" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "conversion." + ] + ] + , [ Para + [ Str "Some" + , Space + , Str "targets" + , Space + , Str "don't" + , Space + , Str "support" + , Space + , Str "this" + , Space + , Str "behavior." + ] + ] + , [ Para + [ Str "This" + , Space + , Str "one" + , Space + , Str "was" + , Space + , Str "separated" + , Space + , Str "by" + , Space + , Str "a" + , Space + , Str "line" + , Space + , Str "with" + , Space + , Str "blanks." + , SoftBreak + , Str "You" + , Space + , Str "can" + , Space + , Str "also" + , Space + , Str "put" + , Space + , Str "a" + , Space + , Str "blank" + , Space + , Str "line" + , Space + , Str "inside" + ] + , Para + [ Str "the" + , Space + , Str "item" + , Space + , Str "contents" + , Space + , Str "and" + , Space + , Str "it" + , Space + , Str "will" + , Space + , Str "be" + , Space + , Str "preserved." + ] + ] + ] + , Para + [ Str "-This" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "(no" + , Space + , Str "space)" + ] + , Para + [ Str "-" + , Space + , Str "This" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "(more" + , Space + , Str "than" + , Space + , Str "one" + , Space + , Str "space)" + ] + , Para + [ Str "-" + , Space + , Str "This" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Str "(a" + , Space + , Str "TAB" + , Space + , Str "instead" + , Space + , Str "the" + , Space + , Str "space)" + ] + , BulletList + [ [ BulletList + [ [ Plain + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "list" + ] + ] + ] + ] + , [ OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "list" + ] + ] + ] + ] + , [ DefinitionList + [ ( [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "list" + ] + , [ [] ] + ) + ] + ] + ] + , BulletList + [ [ Plain + [ Str "This" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "\"mother\"" + , Space + , Str "list" + , Space + , Str "first" + , Space + , Str "item." + ] + ] + , [ Plain + [ Str "Here" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "second," + , Space + , Str "but" + , Space + , Str "inside" + , Space + , Str "this" + , Space + , Str "item," + ] + , BulletList + [ [ Plain + [ Str "there" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "sublist," + , Space + , Str "with" + , Space + , Str "its" + , Space + , Str "own" + , Space + , Str "items." + ] + ] + , [ Plain + [ Str "Note" + , Space + , Str "that" + , Space + , Str "the" + , Space + , Str "items" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "same" + , Space + , Str "sublist" + ] + ] + , [ Plain + [ Str "must" + , Space + , Str "have" + , Space + , Str "the" + , Space + , Str "same" + , Space + , Str "indentation." + ] + , BulletList + [ [ Plain + [ Str "And" + , Space + , Str "this" + , Space + , Str "can" + , Space + , Str "go" + , Space + , Str "on," + , Space + , Str "opening" + , Space + , Str "sublists." + ] + , BulletList + [ [ Plain + [ Str "Just" + , Space + , Str "add" + , Space + , Str "leading" + , Space + , Str "spaces" + , Space + , Str "before" + , Space + , Str "the" + ] + ] + , [ Plain + [ Str "hyphen" + , Space + , Str "and" + , Space + , Str "sublists" + , Space + , Str "will" + , Space + , Str "be" + , Space + , Str "opened." + ] + ] + , [ Plain + [ Str "The" + , Space + , Str "two" + , Space + , Str "blank" + , Space + , Str "lines" + , Space + , Str "closes" + , Space + , Str "them" + , Space + , Str "all." + ] + ] + ] + ] + ] + ] + ] + ] + ] + , BulletList + [ [ Plain + [ Str "When" + , Space + , Str "nesting" + , Space + , Str "lists," + , Space + , Str "the" + , Space + , Str "additional" + , Space + , Str "spaces" + , Space + , Str "are" + , Space + , Str "free." + ] + ] + , [ Plain + [ Str "You" + , Space + , Str "can" + , Space + , Str "add" + , Space + , Str "just" + , Space + , Str "one," + ] + , BulletList + [ [ Plain [ Str "or" , Space , Str "many." ] + , BulletList + [ [ Plain + [ Str "What" + , Space + , Str "matters" + , Space + , Str "is" + , Space + , Str "to" + , Space + , Str "put" + , Space + , Str "more" + , Space + , Str "than" + , Space + , Str "the" + , Space + , Str "previous." + ] + ] + , [ Plain + [ Str "But" + , Space + , Str "remember" + , Space + , Str "that" + , Space + , Str "the" + , Space + , Str "other" + , Space + , Str "items" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "same" + , Space + , Str "list" + ] + ] + , [ Plain + [ Str "must" + , Space + , Str "use" + , Space + , Str "the" + , Space + , Str "same" + , Space + , Str "indentation." + ] + ] + ] + ] + ] + ] + ] + , BulletList + [ [ Plain + [ Str "There" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "depth" + , Space + , Str "limit," + ] + , BulletList + [ [ Plain + [ Str "you" + , Space + , Str "can" + , Space + , Str "go" + , Space + , Str "deeper" + , Space + , Str "and" + , Space + , Str "deeper." + ] + , BulletList + [ [ Plain + [ Str "But" + , Space + , Str "some" + , Space + , Str "targets" + , Space + , Str "may" + , Space + , Str "have" + , Space + , Str "restrictions." + ] + , BulletList + [ [ Plain + [ Str "The" + , Space + , Str "LaTeX" + , Space + , Str "maximum" + , Space + , Str "is" + , Space + , Str "here," + , Space + , Str "4" + , Space + , Str "levels." + ] + ] + ] + ] + ] + ] + ] + ] + ] + , BulletList + [ [ Plain + [ Str "Reverse" + , Space + , Str "nesting" + , Space + , Str "doesn't" + , Space + , Str "work." + ] + ] + , [ Plain + [ Str "Because" + , Space + , Str "a" + , Space + , Str "sublist" + , Space + , Str "*must*" + , Space + , Str "have" + , Space + , Str "a" + , Space + , Str "mother" + , Space + , Str "list." + ] + ] + , [ Plain + [ Str "It's" + , Space + , Str "the" + , Space + , Str "list" + , Space + , Str "concept," + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "txt2tags" + , Space + , Str "limitation." + ] + ] + , [ Plain + [ Str "All" + , Space + , Str "this" + , Space + , Str "sublists" + , Space + , Str "will" + , Space + , Str "be" + , Space + , Str "bumped" + , Space + , Str "to" + , Space + , Str "mother" + , Space + , Str "lists." + ] + ] + , [ Plain + [ Str "At" + , Space + , Str "level" + , Space + , Str "1," + , Space + , Str "like" + , Space + , Str "this" + , Space + , Str "one." + ] + ] + ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "1" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "2" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "3" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "4" ] ] ] + ] + , [ Plain + [ Str "Level" + , Space + , Str "3" + , Space + , Str "--" + , Space + , Str "(closed" + , Space + , Str "Level" + , Space + , Str "4)" + ] + ] + ] + ] + , [ Plain + [ Str "Level" + , Space + , Str "2" + , Space + , Str "--" + , Space + , Str "(closed" + , Space + , Str "Level" + , Space + , Str "3)" + ] + ] + ] + ] + , [ Plain + [ Str "Level" + , Space + , Str "1" + , Space + , Str "--" + , Space + , Str "(closed" + , Space + , Str "Level" + , Space + , Str "2)" + ] + ] + ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "1" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "2" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "3" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "4" ] ] ] + ] + ] + ] + ] + ] + , [ Plain + [ Str "Level" + , Space + , Str "1" + , Space + , Str "--" + , Space + , Str "(closed" + , Space + , Str "Level" + , Space + , Str "4," + , Space + , Str "Level" + , Space + , Str "3" + , Space + , Str "and" + , Space + , Str "Level" + , Space + , Str "2)" + ] + ] + ] + , BulletList + [ [ Para [ Str "Level" , Space , Str "1" ] + , BulletList + [ [ Para + [ Str "Level" + , Space + , Str "2" + , Space + , Str "--" + , Space + , Str "blank" + , Space + , Str "BEFORE" + , Space + , Str "and" + , Space + , Str "AFTER" + , Space + , Str "(in)" + ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "3" ] ] ] + ] + ] + ] + ] + , BulletList [ [ Plain [ Str "Level" , Space , Str "4" ] ] ] + , BulletList + [ [ Para [ Str "Level" , Space , Str "3" ] ] + , [ Para + [ Str "Level" + , Space + , Str "2" + , Space + , Str "--" + , Space + , Str "blank" + , Space + , Str "BEFORE" + , Space + , Str "and" + , Space + , Str "AFTER" + , Space + , Str "(out)" + ] + ] + , [ Para [ Str "Level" , Space , Str "1" ] + , BulletList + [ [ Para + [ Str "Level" + , Space + , Str "2" + , Space + , Str "--" + , Space + , Str "blank" + , Space + , Str "BEFORE" + , Space + , Str "(spaces)" + , Space + , Str "and" + , Space + , Str "AFTER" + , Space + , Str "(TAB)" + ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "3" ] ] ] + ] + ] + ] + ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "1" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "2" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "3" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "4" ] ] + , [ Plain + [ Str "Level" + , Space + , Str "3.5" + , Space + , Str "???" + ] + ] + ] + ] + , [ Plain [ Str "Level" , Space , Str "3" ] ] + , [ Plain + [ Str "Level" + , Space + , Str "2.5" + , Space + , Str "???" + ] + ] + ] + ] + , [ Plain [ Str "Level" , Space , Str "2" ] ] + , [ Plain + [ Str "Level" + , Space + , Str "1.5" + , Space + , Str "???" + ] + ] + ] + ] + , [ Plain [ Str "Level" , Space , Str "1" ] ] + ] + , BulletList + [ [ Plain + [ Str "This" + , Space + , Str "list" + , Space + , Str "is" + , Space + , Str "closed" + , Space + , Str "by" + , Space + , Str "a" + , Space + , Str "line" + , Space + , Str "with" + , Space + , Str "spaces" + , Space + , Str "and" + , Space + , Str "other" + , Space + , Str "with" + , Space + , Str "TABs" + ] + ] + ] + , BulletList + [ [ Plain + [ Str "This" + , Space + , Str "list" + , Space + , Str "is" + , Space + , Str "NOT" + , Space + , Str "closed" + , Space + , Str "by" + , Space + , Str "two" + , Space + , Str "comment" + , Space + , Str "lines" + ] + ] + ] + , BulletList + [ [ Plain + [ Str "This" + , Space + , Str "list" + , Space + , Str "is" + , Space + , Str "closed" + , Space + , Str "by" + , Space + , Str "a" + , Space + , Str "line" + , Space + , Str "with" + , Space + , Str "spaces" + , Space + , Str "and" + , Space + , Str "TAB," + ] + ] + , [ Plain + [ Str "then" + , Space + , Str "a" + , Space + , Str "comment" + , Space + , Str "line," + , Space + , Str "then" + , Space + , Str "an" + , Space + , Str "empty" + , Space + , Str "line." + ] + ] + ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "1" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "2" ] + , BulletList + [ [ Plain [ Str "Level" , Space , Str "3" ] ] ] + , Plain + [ Str "-" + , SoftBreak + , Str "Level" + , Space + , Str "2" + ] + ] + ] + , Plain + [ Str "-" , SoftBreak , Str "Level" , Space , Str "1" ] + ] + ] + , Para [ Str "-" ] + , BulletList + [ [ Plain + [ Str "Empty" + , Space + , Str "item" + , Space + , Str "with" + , Space + , Str "trailing" + , Space + , Str "spaces." + ] + ] + ] + , Para [ Str "-" ] + , BulletList + [ [ Plain + [ Str "Empty" + , Space + , Str "item" + , Space + , Str "with" + , Space + , Str "trailing" + , Space + , Str "TAB." + ] + ] + ] + , Para [ Str "-" ] + , BulletList + [ [ Plain + [ Str "If" + , Space + , Str "the" + , Space + , Str "end" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "file" + , Space + , Str "(EOF)" + , Space + , Str "is" + , Space + , Str "hit," + ] + , BulletList + [ [ Plain + [ Str "all" + , Space + , Str "the" + , Space + , Str "currently" + , Space + , Str "opened" + , Space + , Str "list" + , Space + , Str "are" + , Space + , Str "closed," + ] + , BulletList + [ [ Plain + [ Str "just" + , Space + , Str "like" + , Space + , Str "when" + , Space + , Str "using" + , Space + , Str "the" + , Space + , Str "two" + , Space + , Str "blank" + , Space + , Str "lines." + ] + ] + ] + ] + ] + ] + ] + , Header 1 ( "table" , [] , [] ) [ Str "Table" ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignRight , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignRight , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Str "||" + , Space + , Str "Cell" + , Space + , Str "1" + , Space + , Str "|" + , Space + , Str "Cell" + , Space + , Str "2" + , Space + , Str "|" + , Space + , Str "Cell" + , Space + , Str "3" + , Space + , Str "|" + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" , Space , Str "3" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Heading" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Heading" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Heading" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "<-" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "--" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "->" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "--" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "--" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "--" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "->" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "--" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "<-" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3+4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1+2+3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2+3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1+2+3+4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "A" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "B" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "D" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "E" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "F" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Jan" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Fev" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Mar" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Apr" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "May" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "20%" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "40%" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "60%" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "80%" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "100%" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "/" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "/" + , Space + , Str "/" + , Space + , Str "/" + , Space + , Str "/" + , Space + , Str "/" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "/" + , Space + , Str "/" + , Space + , Str "/" + , Space + , Str "/" + , Space + , Str "/" + , Space + , Str "/" + , Space + , Str "/" + , Space + , Str "/" + , Space + , Str "/" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "o" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "o" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "." ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "=" + , Space + , Str "=" + , Space + , Str "=" + , Space + , Str "=" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "01" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "02" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "05" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "07" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "11" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "13" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "16" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "17" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "19" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "20" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "23" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "25" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "26" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "29" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "30" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "32" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "35" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "37" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "39" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "40" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "9" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "A" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "B" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "C" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "D" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "E" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "F" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "0" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "4" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "6" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "7" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "8" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "9" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "A" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "B" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "C" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "D" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "E" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "F" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para [ Str "|this|is|not|a|table|" ] + , Para + [ Str "|this|" + , Space + , Str "is|" + , Space + , Str "not|" + , Space + , Str "a|" + , Space + , Str "table|" + ] + , Para + [ Str "|this" + , Space + , Str "|is" + , Space + , Str "|not" + , Space + , Str "|a" + , Space + , Str "|table" + , Space + , Str "|" + ] + , Para + [ Str "|" + , Space + , Str "this\t|" + , Space + , Str "is\t|" + , Space + , Str "not\t|" + , Space + , Str "a\t|" + , Space + , Str "table\t|" + ] + , HorizontalRule + , Para [ Str "The" , Space , Str "End." ] + ] diff --git a/test/txt2tags.t2t b/test/txt2tags.t2t --- a/test/txt2tags.t2t +++ b/test/txt2tags.t2t @@ -136,7 +136,7 @@ %%% Syntax: Repetition is greedy %% When the mark character is repeated many times, %% the contents are expanded to the largest possible. -%% Thats why they are greedy, the outer marks are +%% That's why they are greedy, the outer marks are %% the ones used. i) ***** ///// _____ ----- ````` """"" ''''' @@ -270,7 +270,7 @@ [img.png] %%% Syntax: Image pointing to a link: [[img] link] -[[img.png] http://txt2tags.org] +[[img.png] https://txt2tags.org] %%% Align: Image position is preserved when inside paragraph [img.png] Image at the line beginning. diff --git a/test/typst-reader.native b/test/typst-reader.native new file mode 100644 --- /dev/null +++ b/test/typst-reader.native @@ -0,0 +1,5349 @@ +Pandoc + Meta { unMeta = fromList [] } + [ Header + 1 + ( "" , [] , [] ) + [ Str "Fibonacci" , Space , Str "sequence" ] + , Para + [ Str "The" + , Space + , Str "Fibonacci" + , Space + , Str "sequence" + , Space + , Str "is" + , Space + , Str "defined" + , Space + , Str "through" + , Space + , Str "the" + , SoftBreak + , Str "recurrence" + , Space + , Str "relation" + , Space + , Math InlineMath "F_{n} = F_{n - 1} + F_{n - 2}" + , Str "." + , SoftBreak + , Str "It" + , Space + , Str "can" + , Space + , Str "also" + , Space + , Str "be" + , Space + , Str "expressed" + , Space + , Str "in" + , Space + , Emph [ Str "closed" , Space , Str "form:" ] + ] + , Para + [ Math + DisplayMath + "F_{n} = \\left\\lfloor {\\frac{1}{\\sqrt{5}}\\phi^{n}} \\right\\rceil,\\quad\\phi = \\frac{1 + \\sqrt{5}}{2}" + ] + , Para + [ Str "The" + , Space + , Str "first" + , Space + , Str "8" + , Space + , Str "numbers" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "sequence" + , Space + , Str "are:" + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Math InlineMath "F_{1}" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Math InlineMath "F_{2}" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Math InlineMath "F_{3}" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Math InlineMath "F_{4}" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Math InlineMath "F_{5}" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Math InlineMath "F_{6}" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Math InlineMath "F_{7}" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Math InlineMath "F_{8}" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "1" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "3" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "5" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "8" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "13" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para [ Str "21" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Div + ( "" , [ "columns-flow" ] , [ ( "count" , "2" ) ] ) + [ Para + [ Span + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Link + ( "" , [] , [] ) + [ SoftBreak + , Strong + [ Str "Typst" + , Space + , Str "Math" + , Space + , Str "for" + , Space + , Str "Undergrads" + ] + , SoftBreak + ] + ( "https://github.com/johanvx/typst-undergradmath" + , "" + ) + ] + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "Typst" + , Space + , Str "port" + , Space + , Str "of" + , Space + , Emph + [ Span + ( "" , [ "box" ] , [] ) + [ Str "L\8202A\8202" + , Span ( "" , [ "box" ] , [] ) [ Str "T\8202E\8202X" ] + ] + , Space + , Str "Math" + , Space + , Str "for" + , Space + , Str "Undergrads" + ] + , Space + , Str "by" + , Space + , Str "Jim" + , Space + , Str "Hefferon." + , SoftBreak + , Str "The" + , Space + , Str "original" + , Space + , Str "version" + , Space + , Str "is" + , Space + , Str "available" + , Space + , Str "at" + , Space + , Underline + [ Link + ( "" , [] , [] ) + [ Str "https://gitlab.com/jim.hefferon/undergradmath" + ] + ( "https://gitlab.com/jim.hefferon/undergradmath" + , "" + ) + ] + , Str "." + ] + , Para + [ Strong + [ Str "Meaning" + , Space + , Str "of" + , Space + , Str "annotations\8192\160" + ] + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidth 0.3333333333333333 ) + , ( AlignLeft , ColWidth 0.6666666666666666 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Str "2023-05-22" + , Space + , Str "\10060" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "unavailable." + , Space + , Str "Last" + , Space + , Str "check" + , Space + , Str "date" + , Space + , Str "is" + , Space + , Str "2023-05-22." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para [ Span ( "unavailable" , [] , [] ) [] ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidth 0.3333333333333333 ) + , ( AlignLeft , ColWidth 0.6666666666666666 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) [ Str "\128166" ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Str "Get" + , Space + , Str "this" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "tricky" + , Space + , Str "way." + , Space + , Str "Need" + , Space + , Str "a" + , Space + , Str "simpler" + , Space + , Str "method." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para [ Span ( "tricky" , [] , [] ) [] ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidth 0.3333333333333333 ) + , ( AlignLeft , ColWidth 0.6666666666666666 ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Str "No" + , Space + , Str "idea" + , Space + , Str "\128533" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Str "Don\8217t" + , Space + , Str "know" + , Space + , Str "how" + , Space + , Str "to" + , Space + , Str "get" + , Space + , Str "this." + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para [ Span ( "noidea" , [] , [] ) [] ] + , Para + [ Strong [ Str "Rule" , Space , Str "One\8192\160" ] + , Str "Any" + , Space + , Str "mathematics" + , Space + , Str "at" + , Space + , Str "all," + , Space + , Str "even" + , Space + , Str "a" + , Space + , Str "single" + , Space + , Str "character," + , Space + , Str "gets" + , Space + , Str "a" + , Space + , Str "mathematical" + , Space + , Str "setting." + , SoftBreak + , Str "Thus," + , Space + , Str "for" + , Space + , Str "\8220the" + , Space + , Str "value" + , Space + , Str "of" + , Space + , Math InlineMath "x" + , Space + , Str "is" + , Space + , Math InlineMath "7" + , Str "\8221" + , Space + , Str "enter" + , Space + , Code ( "" , [] , [] ) "the value of $x$ is $7$" + , Str "." + ] + , Para + [ Strong [ Str "Template\8192\160" ] + , Str "Your" + , Space + , Str "document" + , Space + , Str "should" + , Space + , Str "contain" + , Space + , Str "at" + , Space + , Str "least" + , Space + , Str "this." + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) "-- document body here --" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Strong + [ Str "Common" , Space , Str "constructs\8192\160" ] + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "x^{2}" + , Str "\8192" + , Code ( "" , [] , [] ) "x^2" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\sqrt{2}" + , Str "," + , Space + , Math InlineMath "\\sqrt[n]{3}" + , Str "\8192" + , Code ( "" , [] , [] ) "sqrt(2)" + , Str "," + , Space + , Code ( "" , [] , [] ) "root(n, 3)" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "x_{i,j}" + , Str "\8192" + , Code ( "" , [] , [] ) "x_(i, j)" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\frac{2}{3}" + , Str "," + , Space + , Math InlineMath "2/3" + , Str "\8192" + , Code ( "" , [] , [] ) "2 / 3" + , Str "," + , Space + , Code ( "" , [] , [] ) "2 \\/ 3" + , Space + , Str "or" + , Space + , Code ( "" , [] , [] ) "2 slash 3" + ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Strong + [ Str "Calligraphic" , Space , Str "letters\8192\160" ] + , Str "Use" + , Space + , Str "as" + , Space + , Str "in" + , Space + , Code ( "" , [] , [] ) "$cal(A)$" + , Str "." + ] + , Para + [ Math DisplayMath "\\mathcal{ABCDEFGHIJKLMNOPQRSTUVWXYZ}" ] + , Para + [ Str "Getting" + , Space + , Str "script" + , Space + , Str "letters" + , Space + , Str "is" + , Space + , Link + ( "" , [ "ref" ] , [] ) + [ Str "[unavailable]" ] + ( "#unavailable" , "" ) + , Str "." + ] + , Para [ Strong [ Str "Greek\8192\160" ] ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\alpha" + , Str "\8192" + , Code ( "" , [] , [] ) "alpha" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\xi" + , Str "," + , Space + , Math InlineMath "\\Xi" + , Str "\8192" + , Code ( "" , [] , [] ) "xi" + , Str "," + , Space + , Code ( "" , [] , [] ) "Xi" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\beta" + , Str "\8192" + , Code ( "" , [] , [] ) "beta" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\959" + , Str "\8192" + , Code ( "" , [] , [] ) "omicron" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\gamma" + , Str "," + , Space + , Math InlineMath "\\Gamma" + , Str "\8192" + , Code ( "" , [] , [] ) "gamma" + , Str "," + , Space + , Code ( "" , [] , [] ) "Gamma" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\pi" + , Str "," + , Space + , Math InlineMath "\\Pi" + , Str "\8192" + , Code ( "" , [] , [] ) "pi" + , Str "," + , Space + , Code ( "" , [] , [] ) "Pi" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\delta" + , Str "," + , Space + , Math InlineMath "\\Delta" + , Str "\8192" + , Code ( "" , [] , [] ) "delta" + , Str "," + , Space + , Code ( "" , [] , [] ) "Delta" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\varpi" + , Str "\8192" + , Code ( "" , [] , [] ) "pi.alt" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\epsilon" + , Str "\8192" + , Code ( "" , [] , [] ) "epsilon.alt" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\rho" + , Str "\8192" + , Code ( "" , [] , [] ) "rho" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\varepsilon" + , Str "\8192" + , Code ( "" , [] , [] ) "epsilon" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\varrho" + , Str "\8192" + , Code ( "" , [] , [] ) "rho.alt" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\zeta" + , Str "\8192" + , Code ( "" , [] , [] ) "zeta" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\sigma" + , Str "," + , Space + , Math InlineMath "\\Sigma" + , Str "\8192" + , Code ( "" , [] , [] ) "sigma" + , Str "," + , Space + , Code ( "" , [] , [] ) "Sigma" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\eta" + , Str "\8192" + , Code ( "" , [] , [] ) "eta" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\varsigma" + , Str "\8192" + , Code ( "" , [] , [] ) "\\u{03C2}" + , Space + , Link + ( "" , [ "ref" ] , [] ) + [ Str "[tricky]" ] + ( "#tricky" , "" ) + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\theta" + , Str "," + , Space + , Math InlineMath "\\Theta" + , Str "\8192" + , Code ( "" , [] , [] ) "theta" + , Str "," + , Space + , Code ( "" , [] , [] ) "Theta" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\tau" + , Str "\8192" + , Code ( "" , [] , [] ) "tau" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\vartheta" + , Str "\8192" + , Code ( "" , [] , [] ) "theta.alt" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\upsilon" + , Str "," + , Space + , Math InlineMath "\\Upsilon" + , Str "\8192" + , Code ( "" , [] , [] ) "upsilon" + , Str "," + , Space + , Code ( "" , [] , [] ) "Upsilon" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\iota" + , Str "\8192" + , Code ( "" , [] , [] ) "iota" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\phi" + , Str "," + , Space + , Math InlineMath "\\Phi" + , Str "\8192" + , Code ( "" , [] , [] ) "phi.alt" + , Str "," + , Space + , Code ( "" , [] , [] ) "Phi" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\kappa" + , Str "\8192" + , Math InlineMath "\922" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\varphi" + , Str "\8192" + , Code ( "" , [] , [] ) "phi" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\lambda" + , Str "," + , Space + , Math InlineMath "\\Lambda" + , Str "\8192" + , Code ( "" , [] , [] ) "lambda" + , Str "," + , Space + , Code ( "" , [] , [] ) "Lambda" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\chi" + , Str "\8192" + , Code ( "" , [] , [] ) "chi" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\mu" + , Str "\8192" + , Code ( "" , [] , [] ) "mu" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\psi" + , Str "," + , Space + , Math InlineMath "\\Psi" + , Str "\8192" + , Code ( "" , [] , [] ) "psi" + , Str "," + , Space + , Code ( "" , [] , [] ) "Psi" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\nu" + , Str "\8192" + , Code ( "" , [] , [] ) "nu" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\omega" + , Str "," + , Space + , Math InlineMath "\\Omega" + , Str "\8192" + , Code ( "" , [] , [] ) "omega" + , Str "," + , Space + , Code ( "" , [] , [] ) "Omega" + ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Strong + [ Str "Sets" + , Space + , Str "and" + , Space + , Str "logic\8192\160" + ] + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\cup" + , Str "\8192" + , Code ( "" , [] , [] ) "union" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\mathbb{R}" + , Str "\8192" + , Code ( "" , [] , [] ) "RR" + , Str "," + , Space + , Code ( "" , [] , [] ) "bb(R)" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\forall" + , Str "\8192" + , Code ( "" , [] , [] ) "forall" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\cap" + , Str "\8192" + , Code ( "" , [] , [] ) "sect" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\mathbb{Z}" + , Str "\8192" + , Code ( "" , [] , [] ) "ZZ" + , Str "," + , Space + , Code ( "" , [] , [] ) "bb(Z)" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\exists" + , Str "\8192" + , Code ( "" , [] , [] ) "exists" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\subset" + , Str "\8192" + , Code ( "" , [] , [] ) "subset" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\mathbb{Q}" + , Str "\8192" + , Code ( "" , [] , [] ) "QQ" + , Str "," + , Space + , Code ( "" , [] , [] ) "bb(Q)" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\neg" + , Str "\8192" + , Code ( "" , [] , [] ) "not" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\subseteq" + , Str "\8192" + , Code ( "" , [] , [] ) "subset.eq" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\mathbb{N}" + , Str "\8192" + , Code ( "" , [] , [] ) "NN" + , Str "," + , Space + , Code ( "" , [] , [] ) "bb(N)" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\vee" + , Str "\8192" + , Code ( "" , [] , [] ) "or" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\supset" + , Str "\8192" + , Code ( "" , [] , [] ) "supset" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\mathbb{C}" + , Str "\8192" + , Code ( "" , [] , [] ) "CC" + , Str "," + , Space + , Code ( "" , [] , [] ) "bb(C)" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\land" + , Str "\8192" + , Code ( "" , [] , [] ) "and" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\supseteq" + , Str "\8192" + , Code ( "" , [] , [] ) "supset.eq" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\varnothing" + , Str "\8192" + , Code ( "" , [] , [] ) "diameter" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\vdash" + , Str "\8192" + , Code ( "" , [] , [] ) "tack.r" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\in" + , Str "\8192" + , Code ( "" , [] , [] ) "in" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\varnothing" + , Str "\8192" + , Code ( "" , [] , [] ) "nothing" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\models" + , Str "\8192" + , Code ( "" , [] , [] ) "models" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\notin" + , Str "\8192" + , Code ( "" , [] , [] ) "in.not" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\1488" + , Str "\8192" + , Code ( "" , [] , [] ) "alef" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\smallsetminus" + , Str "\8192" + , Code ( "" , [] , [] ) "without" + ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "Negate" + , Space + , Str "an" + , Space + , Str "operator," + , Space + , Str "as" + , Space + , Str "in" + , Space + , Math InlineMath "\8836" + , Str "," + , Space + , Str "with" + , Space + , Code ( "" , [] , [] ) "subset.not" + , Str "." + , SoftBreak + , Str "Get" + , Space + , Str "the" + , Space + , Str "set" + , Space + , Str "complement" + , Space + , Math InlineMath "A^{\\mathsf{c}}" + , Space + , Str "with" + , Space + , Code ( "" , [] , [] ) "A^(sans(c))" + , Space + , Str "(or" + , Space + , Math InlineMath "A^{\\complement}" + , Space + , Str "with" + , Space + , Code ( "" , [] , [] ) "A^(complement)" + , Str "," + , Space + , Str "or" + , Space + , Math InlineMath "\\overline{A}" + , Space + , Str "with" + , Space + , Code ( "" , [] , [] ) "overline(A)" + , Str ")." + ] + , DefinitionList + [ ( [ Str "Remark" ] + , [ [ Para + [ Str "Using" + , Space + , Code ( "" , [] , [] ) "diameter" + , Space + , Str "for" + , Space + , Code ( "" , [] , [] ) "\\varnothing" + , Space + , Str "may" + , Space + , Str "cause" + , Space + , Str "some" + , Space + , Str "confusion." + , Space + , Str "However," + , Space + , Span + ( "" , [ "box" ] , [] ) + [ Str "L\8202A\8202" + , Span + ( "" , [ "box" ] , [] ) + [ Str "T\8202E\8202X" ] + ] + , Space + , Str "also" + , Space + , Str "uses" + , Space + , Math InlineMath "\\varnothing" + , Space + , Str "(" + , Code ( "" , [] , [] ) "\\u{2300}" + , Str ")" + , Space + , Str "instead" + , Space + , Str "of" + , Space + , Math InlineMath "\\varnothing" + , Space + , Str "(" + , Code ( "" , [] , [] ) "\\u{2205}" + , Str ")," + , Space + , Str "see" + , Space + , Underline + [ Link + ( "" , [] , [] ) + [ Str "newcm" + , Space + , Math InlineMath "\167" + , Str "13.3" + ] + ( "https://mirrors.sustech.edu.cn/CTAN/fonts/newcomputermodern/doc/newcm-doc.pdf" + , "" + ) + ] + , Str "." + , SoftBreak + , Str "Another" + , Space + , Str "solution" + , Space + , Str "is" + , Space + , Str "to" + , Space + , Str "use" + , Space + , Code + ( "" , [] , [] ) + "text(font: \"Fira Sans\", nothing)" + , Str "," + , Space + , Str "but" + , Space + , Str "the" + , Space + , Str "resultant" + , Space + , Str "glyph" + , Space + , Math InlineMath "\\varnothing" + , Space + , Str "is" + , Space + , Str "subtly" + , Space + , Str "different" + , Space + , Str "from" + , Space + , Str "the" + , Space + , Str "widely" + , Space + , Str "used" + , Space + , Str "one." + , SoftBreak + , Str "Ultimately," + , Space + , Str "the" + , Space + , Str "choice" + , Space + , Str "is" + , Space + , Str "always" + , Space + , Strong [ Str "your" , Space , Str "decision" ] + , Str "." + ] + ] + ] + ) + ] + , Para [ Strong [ Str "Decorations\8192\160" ] ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "f'" + , Str "\8192" + , Code ( "" , [] , [] ) "f'" + , Str "," + , Space + , Code ( "" , [] , [] ) "f prime" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\dot{a}" + , Str "\8192" + , Code ( "" , [] , [] ) "dot(a)" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\widetilde{a}" + , Str "\8192" + , Code ( "" , [] , [] ) "tilde(a)" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "f''" + , Str "\8192" + , Code + ( "" , [] , [] ) "f prime.double" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\ddot{a}" + , Str "\8192" + , Code ( "" , [] , [] ) "diaer(a)" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\overline{a}" + , Str "\8192" + , Code ( "" , [] , [] ) "macron(a)" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\Sigma^{\\ast}" + , Str "\8192" + , Code ( "" , [] , [] ) "Sigma^*" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\hat{a}" + , Str "\8192" + , Code ( "" , [] , [] ) "hat(a)" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math + InlineMath + "\\overset{\\rightarrow}{a}" + , Str "\8192" + , Code ( "" , [] , [] ) "arrow(a)" + ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "If" + , Space + , Str "the" + , Space + , Str "decorated" + , Space + , Str "letter" + , Space + , Str "is" + , Space + , Math InlineMath "i" + , Space + , Str "or" + , Space + , Math InlineMath "j" + , Space + , Str "then" + , Space + , Str "some" + , Space + , Str "decorations" + , Space + , Str "need" + , Space + , Code ( "" , [] , [] ) "\\u{1D6A4}" + , Space + , Link + ( "" , [ "ref" ] , [] ) + [ Str "[tricky]" ] + ( "#tricky" , "" ) + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "\\u{1D6A5}" + , Space + , Link + ( "" , [ "ref" ] , [] ) + [ Str "[tricky]" ] + ( "#tricky" , "" ) + , Str "," + , Space + , Str "as" + , Space + , Str "in" + , Space + , Math InlineMath "\\overset{\\rightarrow}{\\imath}" + , Space + , Str "with" + , Space + , Code ( "" , [] , [] ) "arrow(\\u{1D6A4})" + , Str "." + , SoftBreak + , Str "Some" + , Space + , Str "authors" + , Space + , Str "use" + , Space + , Str "boldface" + , Space + , Str "for" + , Space + , Str "vectors:" + , Space + , Code ( "" , [] , [] ) "bold(x)" + , Str "." + ] + , Para + [ Str "Entering" + , Space + , Code ( "" , [] , [] ) "overline(x + y)" + , Space + , Str "produces" + , Space + , Math InlineMath "\\overline{x + y}" + , Str "," + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "hat(x + y)" + , Space + , Str "gives" + , Space + , Math InlineMath "\\hat{x + y}" + , Str "." + , SoftBreak + , Str "Comment" + , Space + , Str "on" + , Space + , Str "an" + , Space + , Str "expression" + , Space + , Str "as" + , Space + , Str "here" + , Space + , Str "(there" + , Space + , Str "is" + , Space + , Str "also" + , Space + , Code ( "" , [] , [] ) "overbrace(..)" + , Str ")." + ] + , Para + [ Span + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Span + ( "" , [ "box" ] , [] ) + [ Math + InlineMath "\\underset{|A|}{\\underbrace{x + y}}" + , Str "\8192" + , Code ( "" , [] , [] ) "underbrace(x + y, |A|)" + ] + ] + ] + , Para + [ Strong [ Str "Dots\8192\160" ] + , Str "Use" + , Space + , Str "low" + , Space + , Str "dots" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "list" + , Space + , Math InlineMath "\\left\\{ 0,1,2,\\ldots \\right\\}" + , Str "," + , Space + , Str "entered" + , Space + , Str "as" + , Space + , Code ( "" , [] , [] ) "{0, 1, 2, ...}" + , Str "." + , SoftBreak + , Str "Use" + , Space + , Str "centered" + , Space + , Str "dots" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "sum" + , Space + , Str "or" + , Space + , Str "product" + , Space + , Math InlineMath "1 + \\cdots + 100" + , Str "," + , Space + , Str "entered" + , Space + , Str "as" + , Space + , Code ( "" , [] , [] ) "1 + dots.h.c + 100" + , Str "." + , SoftBreak + , Str "You" + , Space + , Str "can" + , Space + , Str "also" + , Space + , Str "get" + , Space + , Str "vertical" + , Space + , Str "dots" + , Space + , Code ( "" , [] , [] ) "dots.v" + , Str "," + , Space + , Str "diagonal" + , Space + , Str "dots" + , Space + , Code ( "" , [] , [] ) "dots.down" + , Space + , Str "and" + , Space + , Str "anti-diagonal" + , Space + , Str "dots" + , Space + , Code ( "" , [] , [] ) "dots.up" + , Str "." + ] + , Para + [ Strong [ Str "Roman" , Space , Str "names\8192\160" ] + , Str "Just" + , Space + , Str "type" + , Space + , Str "them!" + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\sin" + , Str "\8192" + , Code ( "" , [] , [] ) "sin" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\sinh" + , Str "\8192" + , Code ( "" , [] , [] ) "sinh" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\arcsin" + , Str "\8192" + , Code ( "" , [] , [] ) "arcsin" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\cos" + , Str "\8192" + , Code ( "" , [] , [] ) "cos" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\cosh" + , Str "\8192" + , Code ( "" , [] , [] ) "cosh" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\arccos" + , Str "\8192" + , Code ( "" , [] , [] ) "arccos" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\tan" + , Str "\8192" + , Code ( "" , [] , [] ) "tan" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\tanh" + , Str "\8192" + , Code ( "" , [] , [] ) "tanh" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\arctan" + , Str "\8192" + , Code ( "" , [] , [] ) "arctan" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\sec" + , Str "\8192" + , Code ( "" , [] , [] ) "sec" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\coth" + , Str "\8192" + , Code ( "" , [] , [] ) "coth" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\min" + , Str "\8192" + , Code ( "" , [] , [] ) "min" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\csc" + , Str "\8192" + , Code ( "" , [] , [] ) "csc" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\det" + , Str "\8192" + , Code ( "" , [] , [] ) "det" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\max" + , Str "\8192" + , Code ( "" , [] , [] ) "max" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\cot" + , Str "\8192" + , Code ( "" , [] , [] ) "cot" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\dim" + , Str "\8192" + , Code ( "" , [] , [] ) "dim" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\inf" + , Str "\8192" + , Code ( "" , [] , [] ) "inf" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\exp" + , Str "\8192" + , Code ( "" , [] , [] ) "exp" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\ker" + , Str "\8192" + , Code ( "" , [] , [] ) "ker" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\sup" + , Str "\8192" + , Code ( "" , [] , [] ) "sup" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\log" + , Str "\8192" + , Code ( "" , [] , [] ) "log" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\deg" + , Str "\8192" + , Code ( "" , [] , [] ) "deg" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\liminf" + , Str "\8192" + , Code ( "" , [] , [] ) "liminf" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\ln" + , Str "\8192" + , Code ( "" , [] , [] ) "ln" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\arg" + , Str "\8192" + , Code ( "" , [] , [] ) "arg" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\limsup" + , Str "\8192" + , Code ( "" , [] , [] ) "limsup" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\lg" + , Str "\8192" + , Code ( "" , [] , [] ) "lg" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\gcd" + , Str "\8192" + , Code ( "" , [] , [] ) "gcd" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\lim" + , Str "\8192" + , Code ( "" , [] , [] ) "lim" + ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Strong [ Str "Other" , Space , Str "symbols\8192\160" ] ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "<" + , Str "\8192" + , Code ( "" , [] , [] ) "<" + , Str "," + , Space + , Code ( "" , [] , [] ) "lt" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\angle" + , Str "\8192" + , Code ( "" , [] , [] ) "angle" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\cdot" + , Str "\8192" + , Code ( "" , [] , [] ) "dot" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\leq" + , Str "\8192" + , Code ( "" , [] , [] ) "<=" + , Str "," + , Space + , Code ( "" , [] , [] ) "lt.eq" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\measuredangle" + , Str "\8192" + , Code ( "" , [] , [] ) "angle.arc" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\pm" + , Str "\8192" + , Code ( "" , [] , [] ) "plus.minus" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath ">" + , Str "\8192" + , Code ( "" , [] , [] ) ">" + , Str "," + , Space + , Code ( "" , [] , [] ) "gt" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\ell" + , Str "\8192" + , Code ( "" , [] , [] ) "ell" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\mp" + , Str "\8192" + , Code ( "" , [] , [] ) "minus.plus" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\geq" + , Str "\8192" + , Code ( "" , [] , [] ) ">=" + , Str "," + , Space + , Code ( "" , [] , [] ) "gt.eq" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\parallel" + , Str "\8192" + , Code ( "" , [] , [] ) "parallel" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\times" + , Str "\8192" + , Code ( "" , [] , [] ) "times" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\neq" + , Str "\8192" + , Code ( "" , [] , [] ) "!=" + , Str "," + , Space + , Code ( "" , [] , [] ) "eq.not" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "45{^\\circ}" + , Str "\8192" + , Code ( "" , [] , [] ) "45 degree" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\div" + , Str "\8192" + , Code ( "" , [] , [] ) "div" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\ll" + , Str "\8192" + , Code ( "" , [] , [] ) "<<" + , Str "," + , Space + , Code ( "" , [] , [] ) "lt.double" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\cong" + , Str "\8192" + , Code ( "" , [] , [] ) "tilde.equiv" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\ast" + , Str "\8192" + , Code ( "" , [] , [] ) "*" + , Str "," + , Space + , Code ( "" , [] , [] ) "ast" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\gg" + , Str "\8192" + , Code ( "" , [] , [] ) ">>" + , Str "," + , Space + , Code ( "" , [] , [] ) "gt.double" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\ncong" + , Str "\8192" + , Code + ( "" , [] , [] ) "tilde.equiv.not" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\mid" + , Str "\8192" + , Code ( "" , [] , [] ) "divides" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\approx" + , Str "\8192" + , Code ( "" , [] , [] ) "approx" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\sim" + , Str "\8192" + , Code ( "" , [] , [] ) "tilde" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\nmid" + , Str "\8192" + , Code ( "" , [] , [] ) "divides.not" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\asymp" + , Str "\8192" + , Code ( "" , [] , [] ) "\\u{224D}" + , Space + , Link + ( "" , [ "ref" ] , [] ) + [ Str "[tricky]" ] + ( "#tricky" , "" ) + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\simeq" + , Str "\8192" + , Code ( "" , [] , [] ) "tilde.eq" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "n!" + , Str "\8192" + , Code ( "" , [] , [] ) "n!" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\equiv" + , Str "\8192" + , Code ( "" , [] , [] ) "equiv" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\nsim" + , Str "\8192" + , Code ( "" , [] , [] ) "tilde.not" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\partial" + , Str "\8192" + , Code ( "" , [] , [] ) "diff" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\prec" + , Str "\8192" + , Code ( "" , [] , [] ) "prec" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\oplus" + , Str "\8192" + , Code ( "" , [] , [] ) "plus.circle" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\nabla" + , Str "\8192" + , Code ( "" , [] , [] ) "nabla" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\preceq" + , Str "\8192" + , Code ( "" , [] , [] ) "prec.eq" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\ominus" + , Str "\8192" + , Code ( "" , [] , [] ) "minus.circle" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\295" + , Str "\8192" + , Code + ( "" , [] , [] ) "planck.reduce" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\succ" + , Str "\8192" + , Code ( "" , [] , [] ) "succ" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\odot" + , Str "\8192" + , Code ( "" , [] , [] ) "dot.circle" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\circ" + , Str "\8192" + , Code + ( "" , [] , [] ) + "circle.stroked.tiny" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\succeq" + , Str "\8192" + , Code ( "" , [] , [] ) "succ.eq" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\otimes" + , Str "\8192" + , Code ( "" , [] , [] ) "times.circle" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\star" + , Str "\8192" + , Code ( "" , [] , [] ) "star" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\propto" + , Str "\8192" + , Code ( "" , [] , [] ) "prop" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\oslash" + , Str "\8192" + , Code ( "" , [] , [] ) "\\u{2298}" + , Space + , Link + ( "" , [ "ref" ] , [] ) + [ Str "[tricky]" ] + ( "#tricky" , "" ) + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\sqrt{}" + , Str "\8192" + , Code ( "" , [] , [] ) "sqrt(\"\")" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\doteq" + , Str "\8192" + , Code ( "" , [] , [] ) "\\u{2250}" + , Space + , Link + ( "" , [ "ref" ] , [] ) + [ Str "[tricky]" ] + ( "#tricky" , "" ) + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\upharpoonright" + , Str "\8192" + , Code ( "" , [] , [] ) "harpoon.tr" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\10003" + , Str "\8192" + , Code ( "" , [] , [] ) "checkmark" + ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "Use" + , Space + , Code ( "" , [] , [] ) "a divides b" + , Space + , Str "for" + , Space + , Str "the" + , Space + , Str "divides" + , Space + , Str "relation," + , Space + , Math InlineMath "a \\mid b" + , Str "," + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "a divides.not b" + , Space + , Str "for" + , Space + , Str "the" + , Space + , Str "negation," + , Space + , Math InlineMath "a \\nmid b" + , Str "." + , SoftBreak + , Str "Use" + , Space + , Code ( "" , [] , [] ) "|" + , Space + , Str "to" + , Space + , Str "get" + , Space + , Str "set" + , Space + , Str "builder" + , Space + , Str "notation" + , Space + , Math + InlineMath + "\\left\\{ a \\in S~|~a\\text{ is odd} \\right\\}" + , Space + , Str "with" + , Space + , Code ( "" , [] , [] ) "{a in S | a \"is odd\"}" + , Str "." + ] + , Para [ Strong [ Str "Arrows\8192\160" ] ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\rightarrow" + , Str "\8192" + , Code ( "" , [] , [] ) "->" + , Str "," + , Space + , Code ( "" , [] , [] ) "arrow.r" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\mapsto" + , Str "\8192" + , Code ( "" , [] , [] ) "|->" + , Str "," + , Space + , Code ( "" , [] , [] ) "arrow.r.bar" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\nrightarrow" + , Str "\8192" + , Code ( "" , [] , [] ) "arrow.r.not" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\longmapsto" + , Str "\8192" + , Code + ( "" , [] , [] ) + "arrow.r.long.bar" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\longrightarrow" + , Str "\8192" + , Code ( "" , [] , [] ) "arrow.r.long" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\leftarrow" + , Str "\8192" + , Code ( "" , [] , [] ) "<-" + , Str "," + , Space + , Code ( "" , [] , [] ) "arrow.l" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\Rightarrow" + , Str "\8192" + , Code ( "" , [] , [] ) "=>" + , Str "," + , Space + , Code + ( "" , [] , [] ) "arrow.r.double" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math + InlineMath "\\longleftrightarrow" + , Str "\8192" + , Code ( "" , [] , [] ) "<-->" + , Str "," + , Space + , Code + ( "" , [] , [] ) "arrow.l.r.long" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\nRightarrow" + , Str "\8192" + , Code + ( "" , [] , [] ) + "arrow.r.double.not" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\downarrow" + , Str "\8192" + , Code ( "" , [] , [] ) "arrow.b" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\Longrightarrow" + , Str "\8192" + , Code + ( "" , [] , [] ) + "arrow.r.double.long" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\uparrow" + , Str "\8192" + , Code ( "" , [] , [] ) "arrow.t" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\rightsquigarrow" + , Str "\8192" + , Code + ( "" , [] , [] ) "arrow.squiggly" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\updownarrow" + , Str "\8192" + , Code ( "" , [] , [] ) "arrow.t.b" + ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "The" + , Space + , Str "right" + , Space + , Str "arrows" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "first" + , Space + , Str "column" + , Space + , Str "have" + , Space + , Str "matching" + , Space + , Str "left" + , Space + , Str "arrows," + , Space + , Str "such" + , Space + , Str "as" + , Space + , Code ( "" , [] , [] ) "arrow.l.not" + , Str "," + , Space + , Str "and" + , Space + , Str "there" + , Space + , Str "are" + , Space + , Str "some" + , Space + , Str "other" + , Space + , Str "matches" + , Space + , Str "for" + , Space + , Str "down" + , Space + , Str "arrows," + , Space + , Str "etc." + ] + , Para + [ Strong + [ Str "Variable-sized" + , Space + , Str "operators\8192\160" + ] + , Str "The" + , Space + , Str "summation" + , Space + , Math InlineMath "\\sum_{j = 0}^{3}j^{2}" + , Space + , Code ( "" , [] , [] ) "sum_(j = 0)^3 j^2" + , Space + , Str "and" + , Space + , Str "the" + , Space + , Str "integral" + , Space + , Math InlineMath "\\int_{x = 0}^{3}x^{2}dx" + , Space + , Code ( "" , [] , [] ) "integral_(x = 0)^3 x^2 dif x" + , Space + , Str "expand" + , Space + , Str "when" + , Space + , Str "displayed." + ] + , Para + [ Math + DisplayMath + "\\sum_{j = 0}^{3}j^{2}\\qquad\\int_{x = 0}^{3}x^{2}dx" + ] + , Para + [ Str "These" + , Space + , Str "do" + , Space + , Str "the" + , Space + , Str "same." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\int" + , Str "\8192" + , Code ( "" , [] , [] ) "integral" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\iiint" + , Str "\8192" + , Code + ( "" , [] , [] ) "integral.triple" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\bigcup" + , Str "\8192" + , Code ( "" , [] , [] ) "union.big" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\iint" + , Str "\8192" + , Code + ( "" , [] , [] ) "integral.double" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\oint" + , Str "\8192" + , Code + ( "" , [] , [] ) "integral.cont" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\bigcap" + , Str "\8192" + , Code ( "" , [] , [] ) "sect.big" + ] + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para [ Strong [ Str "Fences\8192\160" ] ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "()" + , Str "\8192" + , Code ( "" , [] , [] ) "()" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\langle\\rangle" + , Str "\8192" + , Code + ( "" , [] , [] ) "angle.l angle.r" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math + InlineMath "\\left| {} \\right|" + , Str "\8192" + , Code ( "" , [] , [] ) "abs(\"\")" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math InlineMath "\\lbrack\\rbrack" + , Str "\8192" + , Code ( "" , [] , [] ) "[]" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math + InlineMath + "\\left\\lfloor {} \\right\\rfloor" + , Str "\8192" + , Code ( "" , [] , [] ) "floor(\"\")" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math + InlineMath + "\\left\\| {} \\right\\|" + , Str "\8192" + , Code ( "" , [] , [] ) "norm(\"\")" + ] + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math + InlineMath "\\left\\{ \\right\\}" + , Str "\8192" + , Code ( "" , [] , [] ) "{}" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Span + ( "" , [ "box" ] , [] ) + [ Math + InlineMath + "\\left\\lceil {} \\right\\rceil" + , Str "\8192" + , Code ( "" , [] , [] ) "ceil(\"\")" + ] + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "Fix" + , Space + , Str "the" + , Space + , Str "size" + , Space + , Str "with" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "lr" + , Space + , Str "function." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\left. \\left\\lbrack \\sum_{k = 0}^{n}e^{k^{2}} \\right\\rbrack \\right." + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "lr([sum_(k = 0)^n e^(k^2)], size: #50%)" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "To" + , Space + , Str "have" + , Space + , Str "them" + , Space + , Str "grow" + , Space + , Str "with" + , Space + , Str "the" + , Space + , Str "enclosed" + , Space + , Str "formula," + , Space + , Str "also" + , Space + , Str "use" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "lr" + , Space + , Str "function." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\left\\langle i,2^{2^{i}} \\right\\rangle" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "lr(angle.l i, 2^(2^i) angle.r)" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "Fences" + , Space + , Str "scale" + , Space + , Str "by" + , Space + , Str "default" + , Space + , Str "if" + , Space + , Str "entered" + , Space + , Str "directly" + , Space + , Str "as" + , Space + , Str "codepoints," + , Space + , Str "and" + , Space + , Str "don\8217t" + , Space + , Str "scale" + , Space + , Str "automatically" + , Space + , Str "if" + , Space + , Str "entered" + , Space + , Str "as" + , Space + , Str "symbol" + , Space + , Str "notation." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\left( \\frac{1}{n^{\\alpha}} \\right)" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock ( "" , [] , [] ) "(1 / n^(alpha))" + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath "(\\frac{1}{n^{\\alpha}})" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "paren.l 1 / n^(alpha) paren.r" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "The" + , Space + , Code ( "" , [] , [] ) "lr" + , Space + , Str "function" + , Space + , Str "also" + , Space + , Str "allows" + , Space + , Str "to" + , Space + , Str "scale" + , Space + , Str "unmatched" + , Space + , Str "delimiters" + , Space + , Str "and" + , Space + , Str "one-side" + , Space + , Str "fences." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\left. \\frac{df}{dx} \\right|_{x_{0}}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "lr(frac(dif f, dif x) |)_(x_0)" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Strong [ Str "Arrays," , Space , Str "Matrices\8192\160" ] + , Str "Get" + , Space + , Str "a" + , Space + , Str "matrix" + , Space + , Str "with" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "mat" + , Space + , Str "function." + , Space + , Str "You" + , Space + , Str "can" + , Space + , Str "pass" + , Space + , Str "an" + , Space + , Str "array" + , Space + , Str "to" + , Space + , Str "it." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\begin{pmatrix}\na & b \\\\\nc & d\n\\end{pmatrix}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) "$ mat(a, b; c, d) $" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "In" + , Space + , Str "Typst," + , Space + , Underline + [ Link + ( "" , [] , [] ) + [ Str "array" ] + ( "https://typst.app/docs/reference/typst/array" + , "" + ) + ] + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "sequence" + , Space + , Str "of" + , Space + , Str "values," + , SoftBreak + , Str "while" + , Space + , Str "in" + , Space + , Span + ( "" , [ "box" ] , [] ) + [ Str "L\8202A\8202" + , Span ( "" , [ "box" ] , [] ) [ Str "T\8202E\8202X" ] + ] + , Str "," + , Space + , Str "array" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "matrix" + , Space + , Str "without" + , Space + , Str "fences," + , Space + , Str "which" + , Space + , Str "is" + , Space + , Code ( "" , [] , [] ) "$mat(delim: #none, ..)$" + , Space + , Str "in" + , Space + , Str "Typst." + ] + , Para + [ Str "For" + , Space + , Str "the" + , Space + , Str "determinant" + , Space + , Str "use" + , Space + , Code ( "" , [] , [] ) "|A|" + , Str "," + , Space + , Str "text" + , Space + , Str "operator" + , Space + , Math InlineMath "\\det" + , Space + , Code ( "" , [] , [] ) "det" + , Space + , Str "or" + , Space + , Code ( "" , [] , [] ) "mat(delim: \"|\", ..)" + , Str "." + ] + , Para + [ Str "Definition" + , Space + , Str "by" + , Space + , Str "cases" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "easily" + , Space + , Str "obtained" + , Space + , Str "with" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "cases" + , Space + , Str "function." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "f_{n} = \\begin{cases}\na & \\text{if }n = 0 \\\\\nr \\cdot f_{n - 1} & \\text{else }\n\\end{cases}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "$ f_n = cases(\n a &\"if\" n = 0,\n r dot f_(n - 1) &\"else\"\n) $" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Strong + [ Str "Spacing" + , Space + , Str "in" + , Space + , Str "mathematics\8192\160" + ] + , Str "Improve" + , Space + , Math InlineMath "\\sqrt{2}x" + , Space + , Str "to" + , Space + , Math InlineMath "\\sqrt{2}\\, x" + , Space + , Str "with" + , Space + , Str "a" + , Space + , Str "thin" + , Space + , Str "space," + , Space + , Str "as" + , Space + , Str "in" + , Space + , Code ( "" , [] , [] ) "sqrt(2) thin x" + , Str "." + , SoftBreak + , Str "Slightly" + , Space + , Str "wider" + , Space + , Str "are" + , Space + , Code ( "" , [] , [] ) "medium" + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "thick" + , Space + , Str "(the" + , Space + , Str "three" + , Space + , Str "are" + , Space + , Str "in" + , Space + , Str "ratio" + , Space + , Math InlineMath "3:4:5" + , Str ")." + , SoftBreak + , Str "Bigger" + , Space + , Str "space" + , Space + , Str "is" + , Space + , Code ( "" , [] , [] ) "quad" + , Space + , Str "for" + , Space + , Math InlineMath "\\rightarrow \\quad \\leftarrow" + , Str "," + , Space + , Str "which" + , Space + , Str "is" + , Space + , Str "useful" + , Space + , Str "between" + , Space + , Str "parts" + , Space + , Str "of" + , Space + , Str "a" + , Space + , Str "display." + , SoftBreak + , Str "Get" + , Space + , Str "arbitrary" + , Space + , Str "space" + , Space + , Str "with" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "h" + , Space + , Str "function." + , SoftBreak + , Str "For" + , Space + , Str "example," + , Space + , Str "use" + , Space + , Code ( "" , [] , [] ) "#h(2em)" + , Space + , Str "for" + , Space + , Code ( "" , [] , [] ) "\\qquad" + , Space + , Str "in" + , Space + , Span + ( "" , [ "box" ] , [] ) + [ Str "L\8202A\8202" + , Span ( "" , [ "box" ] , [] ) [ Str "T\8202E\8202X" ] + ] + , Space + , Str "and" + , Space + , Code ( "" , [] , [] ) "#h(-0.1667em)" + , Space + , Str "for" + , Space + , Code ( "" , [] , [] ) "\\!" + , Str "." + ] + , Para + [ Strong + [ Str "Displayed" , Space , Str "equations\8192\160" ] + , Str "Display" + , Space + , Str "equations" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "level" + , Space + , Str "using" + , Space + , Code ( "" , [] , [] ) "$ ... $" + , Space + , Str "with" + , Space + , Str "at" + , Space + , Str "least" + , Space + , Str "one" + , Space + , Str "space" + , Space + , Str "separating" + , Space + , Str "the" + , Space + , Str "math" + , Space + , Str "content" + , Space + , Str "and" + , Space + , Str "the" + , Space + , Code ( "" , [] , [] ) "$" + , Str "." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math DisplayMath "S = k \\cdot \\lg W" ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) "$ S = k dot lg W $" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "You" + , Space + , Str "can" + , Space + , Str "break" + , Space + , Str "into" + , Space + , Str "multiple" + , Space + , Str "lines." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\begin{array}{r}\n\\sin(x) = x - \\frac{x^{3}}{3!} \\\\\n + \\frac{x^{5}}{5!} - \\cdots\n\\end{array}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "$ sin(x) = x - x^3 / 3! \\\n + x^5 / 5! - dots.h.c $" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "Align" + , Space + , Str "equations" + , Space + , Str "using" + , Space + , Code ( "" , [] , [] ) "&" + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\begin{aligned}\n\\nabla \\cdot \\mathbf{D} & = \\rho \\\\\n\\nabla \\cdot \\mathbf{B} & = 0\n\\end{aligned}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "$ nabla dot bold(D) &= rho \\\n nabla dot bold(B) &= 0 $" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "(the" + , Space + , Str "left" + , Space + , Str "or" + , Space + , Str "right" + , Space + , Str "side" + , Space + , Str "of" + , Space + , Str "an" + , Space + , Str "alignment" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "empty)." + , SoftBreak + , Str "Get" + , Space + , Str "a" + , Space + , Str "numbered" + , Space + , Str "version" + , Space + , Str "by" + , Space + , Code ( "" , [] , [] ) "#set math.equation(numbering: ..)" + , Str "." + ] + , Para + [ Strong + [ Str "Calculus" , Space , Str "examples\8192\160" ] + , Str "The" + , Space + , Str "last" + , Space + , Str "three" + , Space + , Str "here" + , Space + , Str "are" + , Space + , Str "display" + , Space + , Str "style." + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + InlineMath + "f:{\\mathbb{R}} \\rightarrow {\\mathbb{R}}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock ( "" , [] , [] ) "f: RR -> RR" ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math InlineMath "9.8\\ \\text{ m/s}^{2}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Code + ( "" , [] , [] ) "\"9.8\" \"m/s\"^2" + , Space + , Link + ( "" , [ "ref" ] , [] ) + [ Str "[tricky]" ] + ( "#tricky" , "" ) + ] + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\lim\\limits_{h \\rightarrow 0}\\frac{f(x + h) - f(x)}{h}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "lim_(h -> 0) (f(x + h) - f(x)) / h" + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\int x^{2}dx = x^{3}/3 + C" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "integral x^2 dif x = x^3 \\/ 3 + C" + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + DisplayMath + "\\nabla = \\mathbf{i}\\frac{d}{dx} + \\mathbf{j}\\frac{d}{dy} + \\mathbf{k}\\frac{d}{dz}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "nabla = bold(i) dif / (dif x) + bold(j) dif / (dif y) + bold(k) dif / (dif z)" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Strong + [ Str "Discrete" + , Space + , Str "mathematics" + , Space + , Str "examples\8192\160" + ] + , Str "For" + , Space + , Str "modulo," + , Space + , Str "there" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "symbol" + , Space + , Math InlineMath "\\equiv" + , Space + , Str "from" + , Space + , Code ( "" , [] , [] ) "equiv" + , Space + , Str "and" + , Space + , Str "a" + , Space + , Str "text" + , Space + , Str "operator" + , Space + , Math InlineMath "\\operatorname{mod}" + , Space + , Str "from" + , Space + , Code ( "" , [] , [] ) "mod" + , Str "." + ] + , Para + [ Str "For" + , Space + , Str "combinations" + , Space + , Str "the" + , Space + , Str "binomial" + , Space + , Str "symbol" + , Space + , Math InlineMath "\\binom{n}{k}" + , Space + , Str "is" + , Space + , Str "from" + , Space + , Code ( "" , [] , [] ) "binom(n, k)" + , Str "." + , SoftBreak + , Str "This" + , Space + , Str "resizes" + , Space + , Str "to" + , Space + , Str "be" + , Space + , Str "bigger" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "display." + ] + , Para + [ Str "For" + , Space + , Str "permutations" + , Space + , Str "use" + , Space + , Math InlineMath "n^{\\underline{r}}" + , Space + , Str "from" + , Space + , Code ( "" , [] , [] ) "n^(underline(r))" + , Space + , Str "(some" + , Space + , Str "authors" + , Space + , Str "use" + , Space + , Math InlineMath "P(n,r)" + , Str "," + , Space + , Str "or" + , Space + , Math InlineMath "{}_{n}P_{r}" + , Space + , Str "from" + , Space + , Code ( "" , [] , [] ) "\"\"_n P_r" + , Str ")." + ] + , Para + [ Strong + [ Str "Statistics" , Space , Str "examples\8192\160" ] + ] + , Div + ( "" , [] , [ ( "align" , "center" ) ] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + InlineMath + "\\sigma^{2} = \\sqrt{{\\sum(x_{i} - \\mu)}^{2}/N}" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "sigma^2 = sqrt(sum(x_i - mu)^2 \\/ N)" + ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Para + [ Math + InlineMath + "E(X) = \\mu_{X} = \\sum(x_{i} - P\\left( x_{i} \\right))" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "E(X) = mu_X = sum(x_i - P(x_i))" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Para + [ Str "The" + , Space + , Str "probability" + , Space + , Str "density" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "normal" + , Space + , Str "distribution" + ] + , Para + [ Math + DisplayMath + "\\frac{1}{\\sqrt{2\\sigma^{2}\\pi}}e^{- \\frac{(x - \\mu)^{2}}{2\\sigma^{2}}}" + ] + , Para + [ Str "comes" , Space , Str "from" , Space , Str "this." ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ CodeBlock + ( "" , [] , [] ) + "1 / sqrt(2 sigma^2 pi)\n e^(- (x - mu)^2 / (2 sigma^2))" + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Para + [ Strong [ Str "For" , Space , Str "more\8192\160" ] + , Str "See" + , Space + , Str "also" + , Space + , Str "the" + , Space + , Str "Typst" + , Space + , Str "Documentation" + , Space + , Str "at" + , Space + , Underline + [ Link + ( "" , [] , [] ) + [ Str "https://typst.app/docs" ] + ( "https://typst.app/docs" , "" ) + ] + , Str "." + ] + , HorizontalRule + , Para + [ Str "johanvx" + , Space + , Str "(" + , Underline + [ Link + ( "" , [] , [] ) + [ Str "https://github.com/johanvx" ] + ( "https://github.com/johanvx" , "" ) + ] + , Str ")" + , Space + , Str "\8202\8193" + , Space + , Str "2023-05-22" + ] + ] + ] diff --git a/test/typst-reader.typ b/test/typst-reader.typ new file mode 100644 --- /dev/null +++ b/test/typst-reader.typ @@ -0,0 +1,28 @@ +#set page(width: 10cm, height: auto) +#set heading(numbering: "1.") + += Fibonacci sequence +The Fibonacci sequence is defined through the +recurrence relation $F_n = F_(n-1) + F_(n-2)$. +It can also be expressed in _closed form:_ + +$ F_n = round(1 / sqrt(5) phi.alt^n), quad + phi.alt = (1 + sqrt(5)) / 2 $ + +#let count = 8 +#let nums = range(1, count + 1) +#let fib(n) = ( + if n <= 2 { 1 } + else { fib(n - 1) + fib(n - 2) } +) + +The first #count numbers of the sequence are: + +#align(center, table( + columns: count, + ..nums.map(n => $F_#n$), + ..nums.map(n => str(fib(n))), +)) + +#include "undergradmath.typ" + diff --git a/test/undergradmath.typ b/test/undergradmath.typ new file mode 100644 --- /dev/null +++ b/test/undergradmath.typ @@ -0,0 +1,510 @@ +// Licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. +// https://creativecommons.org/licenses/by-sa/4.0/ + +// Meta data +#set document(title: "Typst Math for Undergrads", author: "johanvx") + +// Margin +#set page(margin: 0.5in) + +// Font size +#let scriptsize = 7pt +#let normalsize = 10pt +#let large = 12pt +#set text(size: normalsize, lang: "en") + +// Some horizontal spacing +#let kern(length) = h(length, weak: true) +#let enspace = kern(0.5em) +#let qquad = h(2em) + +// For table/grid, something like "lhs \enspace rhs" +#let cell(lhs, rhs) = box(lhs + enspace + rhs) +// Grid for code blocks +#set grid(columns: (2em, auto)) +// Table for math-code listing +#set table(stroke: none, align: horizon + left, inset: 0pt, row-gutter: 0.45em) + +// LaTeX and TeX logos +#let TeX = style(styles => { + let e = measure(text(normalsize, "E"), styles) + let T = "T" + let E = text(normalsize, baseline: e.height / 2, "E") + let X = "X" + box(T + kern(-0.1667em) + E + kern(-0.125em) + X) +}) +#let LaTeX = style(styles => { + let l = measure(text(10pt, "L"), styles) + let a = measure(text(7pt, "A"), styles) + let L = "L" + let A = text(7pt, baseline: a.height - l.height, "A") + box(L + kern(-0.36em) + A + kern(-0.15em) + TeX) +}) + +// Update date +#let date = "2023-05-22" + +// Unavailable (last check date) +#show "??": box(text(red, [#date #emoji.crossmark])) +// Tricky +#show "!!": box(text(blue, emoji.drops)) +// No idea +#show "?!": box(text(orange, [No idea #emoji.face.unhappy])) +// Tricky figure numbering +#set figure(numbering: n => { + ([??], [!!], [?!]).at(n - 1) +}) +// No prefix +#set ref(supplement: "") + +// Justified paragraphs +#set par(justify: true) + +// Two-column body +#show: rest => columns(2, rest) + +// headcolor +#let headcolor = rgb("004225") + +// Run-in sections, like LaTeX \paragraph +#show heading.where( + level: 1 +): it => text( + size: normalsize, + weight: "bold", + fill: headcolor, + it.body + h(0.67em) +) + +// Black raw code +// #show raw.where(block: false): it => { it.text } + +// Title +#align(center, link("https://github.com/johanvx/typst-undergradmath")[ + #text(large, headcolor)[*Typst Math for Undergrads*] +]) + +// Put this here to avoid affecting the title +#show link: underline + +This is a Typst port of _#LaTeX Math for Undergrads_ by Jim Hefferon. +The original version is available at #link("https://gitlab.com/jim.hefferon/undergradmath"). + += Meaning of annotations +#figure( + table( + columns: (1fr, 2fr), + [??], [This is unavailable. Last check date is #date.], + ) +) +#figure( + table( + columns: (1fr, 2fr), + [!!], [Get this in a tricky way. Need a simpler method.], + ) +) +#figure( + table( + columns: (1fr, 2fr), + [?!], [Don't know how to get this.], + ) +) + += Rule One +Any mathematics at all, even a single character, gets a mathematical setting. +Thus, for "the value of $x$ is $7$" enter `the value of $x$ is $7$`. + += Template +Your document should contain at least this. + +#grid( + "", + ``` + -- document body here -- + ``` +) + += Common constructs +#align(center, table( + columns: 2, + column-gutter: 1.5em, + cell($x^2$, `x^2`), + cell([$sqrt(2)$, $root(n, 3)$], [`sqrt(2)`, `root(n, 3)`]), + cell($x_(i, j)$, `x_(i, j)`), + cell([$2 / 3$, $2 \/ 3$], [`2 / 3`, `2 \/ 3` or `2 slash 3`]), // Maybe use `slash`? +)) + += Calligraphic letters +Use as in `$cal(A)$`. + +$ cal(A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) $ + +Getting script letters is @unavailable. + += Greek +#align(center, table( + columns: 2, + column-gutter: 1em, + cell($alpha$, `alpha`), cell([$xi$, $Xi$], [`xi`, `Xi`]), + cell($beta$, `beta`), cell($omicron$, `omicron`), + cell([$gamma$, $Gamma$], [`gamma`, `Gamma`]), cell([$pi$, $Pi$], [`pi`, `Pi`]), + cell([$delta$, $Delta$], [`delta`, `Delta`]), cell($pi.alt$, `pi.alt`), + cell($epsilon.alt$, `epsilon.alt`), cell($rho$, `rho`), + cell($epsilon$, `epsilon`), cell($rho.alt$, `rho.alt`), + cell($zeta$, `zeta`), cell([$sigma$, $Sigma$], [`sigma`, `Sigma`]), + cell($eta$, `eta`), cell($\u{03C2}$, [`\u{03C2}` @tricky]), + cell([$theta$, $Theta$], [`theta`, `Theta`]), cell($tau$, `tau`), + cell($theta.alt$, `theta.alt`), cell([$upsilon$, $Upsilon$], [`upsilon`, `Upsilon`]), + cell($iota$, `iota`), cell([$phi.alt$, $Phi$], [`phi.alt`, `Phi`]), + cell($kappa$, $Kappa$), cell($phi$, `phi`), + cell([$lambda$, $Lambda$], [`lambda`, `Lambda`]), cell($chi$, `chi`), + cell($mu$, `mu`), cell([$psi$, $Psi$], [`psi`, `Psi`]), + cell($nu$, `nu`), cell([$omega$, $Omega$], [`omega`, `Omega`]), +)) + += Sets and logic +#align(center, table( + columns: 3, + column-gutter: 1em, + cell($union$, `union`), cell($RR$, [`RR`, `bb(R)`]), cell($forall$, `forall`), + cell($sect$, `sect`), cell($bb(Z)$, [`ZZ`, `bb(Z)`]), cell($exists$, `exists`), + cell($subset$, `subset`), cell($bb(Q)$, [`QQ`, `bb(Q)`]), cell($not$, `not`), + cell($subset.eq$, `subset.eq`), cell($bb(N)$, [`NN`, `bb(N)`]), cell($or$, `or`), + cell($supset$, `supset`), cell($bb(C)$, [`CC`, `bb(C)`]), cell($and$, `and`), + cell($supset.eq$, `supset.eq`), cell($diameter$, [`diameter`]), cell($tack.r$, `tack.r`), + cell($in$, `in`), cell($nothing$, `nothing`), cell($models$, `models`), + cell($in.not$, `in.not`), cell($alef$, `alef`), cell($without$, `without`), +)) + +Negate an operator, as in $subset.not$, with `subset.not`. +Get the set complement $A^(sans(c))$ with `A^(sans(c))` (or $A^(complement)$ with `A^(complement)`, or $overline(A)$ with `overline(A)`). + +// https://www.ctan.org/tex-archive/fonts/newcomputermodern +// +// README +// +// Version 3.93 +// +// Provides access to Russian and Greek guillemotleft and guillemotright +// using the character variant tables cv3 and cv4 respectively. +// +// The Math fonts provide the character \varnothing, an alternative to \emptyset, +// through Character Variant cv01. The fontsetup package provides the option +// 'varnothing' to easily switch to the alternative character. + +// https://mirrors.sustech.edu.cn/CTAN/fonts/newcomputermodern/doc/newcm-doc.pdf +// The NewComputerModern FontFamily §13.3 +// The Math fonts provide the character \varnothing (⌀, U+2300), as an alternative to \emptyset (a slashed zero), through Character Variant cv01. +// The fontsetup package provides the option ‘varnothing’ to easily switch to the alternative character. + +/ Remark: Using `diameter` for `\varnothing` may cause some confusion. However, #LaTeX also uses $diameter$ (`\u{2300}`) instead of $\u{2205}$ (`\u{2205}`), see #link("https://mirrors.sustech.edu.cn/CTAN/fonts/newcomputermodern/doc/newcm-doc.pdf")[newcm $section$13.3]. + Another solution is to use `text(font: "Fira Sans", nothing)`, but the resultant glyph $text(font: "Fira Sans", nothing)$ is subtly different from the widely used one. + Ultimately, the choice is always *your decision*. + += Decorations +#align(center, table( + columns: 3, + column-gutter: 1em, + cell($f'$, [`f'`, `f prime`]), cell($dot(a)$, `dot(a)`), cell($tilde(a)$, `tilde(a)`), + cell($f prime.double$, `f prime.double`), cell($diaer(a)$, `diaer(a)`), cell($macron(a)$, `macron(a)`), + cell($Sigma^*$, `Sigma^*`), cell($hat(a)$, `hat(a)`), cell($arrow(a)$, `arrow(a)`), +)) + +If the decorated letter is $i$ or $j$ then some decorations need `\u{1D6A4}` @tricky and `\u{1D6A5}` @tricky, as in $arrow(\u{1D6A4})$ with `arrow(\u{1D6A4})`. +Some authors use boldface for vectors: `bold(x)`. + +Entering `overline(x + y)` produces $overline(x + y)$, and `hat(x + y)` gives $hat(x + y)$. +Comment on an expression as here (there is also `overbrace(..)`). + +#align(center, cell( + $underbrace(x + y, |A|)$, + `underbrace(x + y, |A|)`, +)) + += Dots +Use low dots in a list ${0, 1, 2, ...}$, entered as `{0, 1, 2, ...}`. +Use centered dots in a sum or product $1 + dots.h.c + 100$, entered as `1 + dots.h.c + 100`. +You can also get vertical dots `dots.v`, diagonal dots `dots.down` and anti-diagonal dots `dots.up`. + += Roman names +Just type them! + +#align(center, table( + columns: 3, + column-gutter: 1.5em, + cell($sin$, `sin`), cell($sinh$, `sinh`), cell($arcsin$, `arcsin`), + cell($cos$, `cos`), cell($cosh$, `cosh`), cell($arccos$, `arccos`), + cell($tan$, `tan`), cell($tanh$, `tanh`), cell($arctan$, `arctan`), + cell($sec$, `sec`), cell($coth$, `coth`), cell($min$, `min`), + cell($csc$, `csc`), cell($det$, `det`), cell($max$, `max`), + cell($cot$, `cot`), cell($dim$, `dim`), cell($inf$, `inf`), + cell($exp$, `exp`), cell($ker$, `ker`), cell($sup$, `sup`), + cell($log$, `log`), cell($deg$, `deg`), cell($liminf$, `liminf`), + cell($ln$, `ln`), cell($arg$, `arg`), cell($limsup$, `limsup`), + cell($lg$, `lg`), cell($gcd$, `gcd`), cell($lim$, `lim`), +)) + += Other symbols +#align(center, table( + columns: 3, + column-gutter: 1.2em, + cell($<$, [`<`, `lt`]), cell($angle$, `angle`), cell($dot$, [`dot`]), + cell($<=$, [`<=`, `lt.eq`]), cell($angle.arc$, `angle.arc`), cell($plus.minus$, `plus.minus`), + cell($>$, [`>`, `gt`]), cell($ell$, `ell`), cell($minus.plus$, `minus.plus`), + cell($>=$, [`>=`, `gt.eq`]), cell($parallel$, `parallel`), cell($times$, `times`), + cell($!=$, [`!=`, `eq.not`]), cell($45 degree$, `45 degree`), cell($div$, `div`), + cell($<<$, [`<<`, `lt.double`]), cell($tilde.equiv$, `tilde.equiv`), cell($*$, [`*`, `ast`]), + cell($>>$, [`>>`, `gt.double`]), cell($tilde.equiv.not$, `tilde.equiv.not`), cell($divides$, `divides`), + cell($approx$, `approx`), cell($tilde$, `tilde`), cell($divides.not$, `divides.not`), + cell($\u{224D}$, [`\u{224D}` @tricky]), cell($tilde.eq$, `tilde.eq`), cell($n!$, `n!`), + cell($equiv$, `equiv`), cell($tilde.not$, `tilde.not`), cell($diff$, `diff`), + cell($prec$, `prec`), cell($plus.circle$, `plus.circle`), cell($nabla$, `nabla`), + cell($prec.eq$, `prec.eq`), cell($minus.circle$, `minus.circle`), cell($planck.reduce$, `planck.reduce`), + cell($succ$, `succ`), cell($dot.circle$, `dot.circle`), cell($circle.stroked.tiny$, `circle.stroked.tiny`), + cell($succ.eq$, `succ.eq`), cell($times.circle$, `times.circle`), cell($star$, `star`), + cell($prop$, `prop`), cell($\u{2298}$, [`\u{2298}` @tricky]), cell($sqrt("")$, `sqrt("")`), + cell($\u{2250}$, [`\u{2250}` @tricky]), cell($harpoon.tr$, `harpoon.tr`), cell($checkmark$, `checkmark`), +)) + +Use `a divides b` for the divides relation, $a divides b$, and `a divides.not b` for the negation, $a divides.not b$. +Use `|` to get set builder notation ${a in S | a "is odd"}$ with `{a in S | a "is odd"}`. + += Arrows +#align(center, table( + columns: 2, + column-gutter: 1.5em, + cell($->$, [`->`, `arrow.r`]), cell($|->$, [`|->`, `arrow.r.bar`]), + cell($arrow.r.not$, `arrow.r.not`), cell($arrow.r.long.bar$, `arrow.r.long.bar`), + cell($arrow.r.long$, `arrow.r.long`), cell($<-$, [`<-`, `arrow.l`]), + cell($=>$, [`=>`, `arrow.r.double`]), cell($<-->$, [`<-->`, `arrow.l.r.long`]), + cell($arrow.r.double.not$, `arrow.r.double.not`), cell($arrow.b$, `arrow.b`), + cell($arrow.r.double.long$, `arrow.r.double.long`), cell($arrow.t$, `arrow.t`), + cell($arrow.squiggly$, `arrow.squiggly`), cell($arrow.t.b$, `arrow.t.b`), +)) + +The right arrows in the first column have matching left arrows, such as `arrow.l.not`, and there are some other matches for down arrows, etc. + += Variable-sized operators +The summation $sum_(j = 0)^3 j^2$ `sum_(j = 0)^3 j^2` and the integral $integral_(x = 0)^3 x^2 dif x$ `integral_(x = 0)^3 x^2 dif x` expand when displayed. + +$ sum_(j = 0)^3 j^2 qquad integral_(x = 0)^3 x^2 dif x $ + +These do the same. + +#align(center, table( + columns: 3, + cell($integral$, `integral`), cell($integral.triple$, `integral.triple`), cell($union.big$, `union.big`), + cell($integral.double$, `integral.double`), cell($integral.cont$, `integral.cont`), cell($sect.big$, `sect.big`), +)) + += Fences +#align(center, table( + columns: 3, + column-gutter: 1.5em, + cell($()$, `()`), cell($angle.l angle.r$, `angle.l angle.r`), cell($abs("")$, `abs("")`), + cell($[]$, `[]`), cell($floor("")$, `floor("")`), cell($norm("")$, `norm("")`), + cell(${}$, `{}`), cell($ceil("")$, `ceil("")`), +)) + +Fix the size with the `lr` function. + +#align(center, table( + columns: 2, + column-gutter: 0.5em, + $ lr([sum_(k = 0)^n e^(k^2)], size: #50%) $, + ``` + lr([sum_(k = 0)^n e^(k^2)], size: #50%) + ```, +)) + +To have them grow with the enclosed formula, also use the `lr` function. + +#align(center, table( + columns: 2, + column-gutter: 1em, + $ lr(angle.l i, 2^(2^i) angle.r) $, + ``` + lr(angle.l i, 2^(2^i) angle.r) + ```, +)) + +Fences scale by default if entered directly as codepoints, and don't scale automatically if entered as symbol notation. + +#align(center, table( + columns: 2, + column-gutter: 1em, + $ (1 / n^(alpha)) $, + ``` + (1 / n^(alpha)) + ```, + $ paren.l 1 / n^(alpha) paren.r $, + ``` + paren.l 1 / n^(alpha) paren.r + ```, +)) + +The `lr` function also allows to scale unmatched delimiters and one-side fences. + +#align(center, table( + columns: 2, + column-gutter: 1em, + $ lr(frac(dif f, dif x) |)_(x_0) $, + ``` + lr(frac(dif f, dif x) |)_(x_0) + ```, +)) + += Arrays, Matrices +Get a matrix with the `mat` function. You can pass an array to it. + +#align(center, table( + columns: 2, + column-gutter: 1em, + $ mat(a, b; c, d) $, + ``` + $ mat(a, b; c, d) $ + ``` +)) + +In Typst, #link("https://typst.app/docs/reference/typst/array")[array] is a sequence of values, +while in #LaTeX, array is a matrix without fences, which is `$mat(delim: #none, ..)$` in Typst. + +For the determinant use `|A|`, text operator $det$ `det` or `mat(delim: "|", ..)`. + +Definition by cases can be easily obtained with the `cases` function. + +#align(center, table( + columns: 2, + column-gutter: 1em, + $ f_n = cases( + a &"if" n = 0, + r dot f_(n - 1) &"else" + ) $, + ``` + $ f_n = cases( + a &"if" n = 0, + r dot f_(n - 1) &"else" + ) $ + ``` +)) + += Spacing in mathematics +Improve $sqrt(2) x$ to $sqrt(2) thin x$ with a thin space, as in `sqrt(2) thin x`. +Slightly wider are `medium` and `thick` (the three are in ratio $3 : 4 : 5$). +Bigger space is `quad` for $arrow.r quad arrow.l$, which is useful between parts of a display. +Get arbitrary space with the `h` function. +For example, use `#h(2em)` for `\qquad` in #LaTeX and `#h(-0.1667em)` for `\!`. + += Displayed equations +Display equations in a block level using `$ ... $` with at least one space separating the math content and the `$`. + +#align(center, table( + columns: 2, + column-gutter: 1em, + $ S = k dot lg W $, + ``` + $ S = k dot lg W $ + ```, +)) + +You can break into multiple lines. + +#align(center, table( + columns: 2, + column-gutter: 1em, + $ sin(x) = x - x^3 / 3! \ + + x^5 / 5! - dots.h.c $, + ``` + $ sin(x) = x - x^3 / 3! \ + + x^5 / 5! - dots.h.c $ + ```, +)) + +Align equations using `&` + +#align(center, table( + columns: 2, + column-gutter: 1em, + $ nabla dot bold(D) &= rho \ + nabla dot bold(B) &= 0 $, + ``` + $ nabla dot bold(D) &= rho \ + nabla dot bold(B) &= 0 $ + ```, +)) + +(the left or right side of an alignment can be empty). +Get a numbered version by `#set math.equation(numbering: ..)`. + += Calculus examples +The last three here are display style. + +#align(center, table( + align: horizon, + columns: 2, + column-gutter: 1em, + block($f: RR -> RR$), + ``` + f: RR -> RR + ```, + block($"9.8" "m/s"^2$), + block([`"9.8" "m/s"^2` @tricky]), + $ lim_(h->0) (f(x+h)-f(x))/h $, + ``` + lim_(h -> 0) (f(x + h) - f(x)) / h + ```, + $ integral x^2 dif x = x^3 \/ 3 + C $, + ``` + integral x^2 dif x = x^3 \/ 3 + C + ```, + $ nabla = bold(i) dif / (dif x) + bold(j) dif / (dif y) + bold(k) dif / (dif z) $, + ``` + nabla = bold(i) dif / (dif x) + bold(j) dif / (dif y) + bold(k) dif / (dif z) + ```, +)) + += Discrete mathematics examples +For modulo, there is a symbol $equiv$ from `equiv` and a text operator $mod$ from `mod`. + +For combinations the binomial symbol $binom(n, k)$ is from `binom(n, k)`. +This resizes to be bigger in a display. + +For permutations use $n^(underline(r))$ from `n^(underline(r))` (some authors use $P(n, r)$, or $""_n P_r$ from `""_n P_r`). + += Statistics examples +#align(center, table( + align: horizon, + columns: 2, + block($sigma^2 = sqrt(sum(x_i - mu)^2 \/ N)$), + ``` + sigma^2 = sqrt(sum(x_i - mu)^2 \/ N) + ```, + block($E(X) = mu_X = sum(x_i - P(x_i))$), + ``` + E(X) = mu_X = sum(x_i - P(x_i)) + ```, +)) + +The probability density of the normal distribution + +$ 1 / sqrt(2 sigma^2 pi) e^(- (x - mu)^2 / (2 sigma^2)) $ + +comes from this. + +#grid( + "", + ``` + 1 / sqrt(2 sigma^2 pi) + e^(- (x - mu)^2 / (2 sigma^2)) + ``` +) + += For more +See also the Typst Documentation at #link("https://typst.app/docs"). + +#v(1fr) + +#block( + line(length: 100%, stroke: headcolor) + + text(headcolor)[johanvx (https://github.com/johanvx) #h(1fr) #date] +) diff --git a/test/vimdoc/definition-lists.markdown b/test/vimdoc/definition-lists.markdown new file mode 100644 --- /dev/null +++ b/test/vimdoc/definition-lists.markdown @@ -0,0 +1,70 @@ +--- +vimdoc-prefix: pandoc +abstract: "A short description" +filename: "definition-lists.txt" +author: Author +title: Title +--- + +## Basic + +Term 1 +: Definition I + +Term 2 +: Definition II + +Term 3 +: Definition III + +## Code + + + +`leap.opts.keys.next_target` +: Jump to the next available target (use the previous search pattern if no input + has been given). `:h leap-repeat` + +`leap.opts.keys.prev_target` +: Jump to the previous target (revert `next_target`). + +`leap.opts.keys.next_group` +: Shift to the next group of labeled targets. + +`leap.opts.keys.prev_group` +: Shift to the previous group of labeled targets (revert `next_group`). + +## Span + +[Important concept]{#important-concept} +: Definition + +[I am too long to fit on the same line as a reference, so reference is put above me!]{#i-am-too-long} +: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. + +## Commands + +In markdown vim commands are represented as inline code starting with colon (ie. +`:MyCommand`), but writer strips the backticks + +`:FnlCompileBuffer`{#:FnlCompileBuffer} + +: Compiles current active fennel buffer + +`:FnlCompile[!]`{#:FnlCompile} + +: Diff compiles all indexed fennel files + If bang! is present then forcefully compiles all `source` files + +`:[range]Fnl {expr}`{#:Fnl} + +: Evaluates {expr} or range + + ``` + :'<,'>Fnl + + :Fnl (print "Hello World") + + :Fnl (values some_var) + ``` diff --git a/test/vimdoc/definition-lists.vimdoc b/test/vimdoc/definition-lists.vimdoc new file mode 100644 --- /dev/null +++ b/test/vimdoc/definition-lists.vimdoc @@ -0,0 +1,71 @@ +*definition-lists.txt* A short description + + Title by Author + + + Type |gO| to see the table of contents. + +Basic ........................................................... |pandoc-basic| +Code ............................................................. |pandoc-code| +Span ............................................................. |pandoc-span| +Commands ..................................................... |pandoc-commands| + +------------------------------------------------------------------------------ +Basic *pandoc-basic* + +Term 1 + Definition I +Term 2 + Definition II +Term 3 + Definition III + +------------------------------------------------------------------------------ +Code *pandoc-code* + +`leap.opts.keys.next_target` + Jump to the next available target (use the previous search pattern if no + input has been given). |leap-repeat| +`leap.opts.keys.prev_target` + Jump to the previous target (revert `next_target`). +`leap.opts.keys.next_group` + Shift to the next group of labeled targets. +`leap.opts.keys.prev_group` + Shift to the previous group of labeled targets (revert `next_group`). + +------------------------------------------------------------------------------ +Span *pandoc-span* + +Important concept *pandoc-important-concept* + Definition + *pandoc-i-am-too-long* +I am too long to fit on the same line as a reference, so reference is put +above me! + Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. + +------------------------------------------------------------------------------ +Commands *pandoc-commands* + +In markdown vim commands are represented as inline code starting with colon +(ie. `:MyCommand`), but writer strips the backticks + +:FnlCompileBuffer *:FnlCompileBuffer* + Compiles current active fennel buffer + +:FnlCompile[!] *:FnlCompile* + Diff compiles all indexed fennel files If bang! is present then forcefully + compiles all `source` files + +:[range]Fnl {expr} *:Fnl* + Evaluates {expr} or range + + > + :'<,'>Fnl + + :Fnl (print "Hello World") + + :Fnl (values some_var) +< + + vim:tw=78:sw=4:ts=4:ft=help:norl:et: diff --git a/test/vimdoc/headers-numbered.vimdoc b/test/vimdoc/headers-numbered.vimdoc new file mode 100644 --- /dev/null +++ b/test/vimdoc/headers-numbered.vimdoc @@ -0,0 +1,108 @@ + Type |gO| to see the table of contents. + +1. unremarkable header 1 ............................... |unremarkable-header-1| + 1.1 unremarkable header 2 ............................ |unremarkable-header-2| + 1.1.1 unremarkable header 3 ...................... |unremarkable-header-3| + 1.1.2 unremarkable header 3 .................... |unremarkable-header-3-1| + unremarkable header 2 .............................. |unremarkable-header-2-1| + unremarkable header 3 ............................ |unremarkable-header-3-2| + unremarkable header 3 ............................ |unremarkable-header-3-3| +2. bold italic underline strikethrough ............................... |short11| + 2.1 superscript2 subscript3 ........................................ |short21| + 2.1.1 smallcaps code inline math display math .................. |short31| + 2.1.2 link image ............................................... |short32| +3. Long header 1 long header 1 long header 1 long header 1 long heade... |long1| + 3.1 Long header 2 long header 2 long header 2 long header 2 long h... |long21| + 3.1.1 Long header 3 long header 3 long header 3 long header 3.... |long31| + 3.1.2 Long header 3 long header 3 long header 3 long header 3.... |long32| + 3.2 Long header 2 long header 2 long header 2 long header 2 long h... |long22| + 3.2.1 Long header 3 long header 3 long header 3 long header 3.... |long33| + 3.2.2 Long header 3 long header 3 long header 3 long header 3.... |long34| +4. ... |long-header-1-long-header-1-long-header-1-long-header-1-long-header-1-long-header-1-long-header-1| + 4.1 ... |long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2| + 4.1.1 ... |long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3| + 4.1.2 ... |long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-1| + 4.2 ... |long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-1| + 4.2.1 ... |long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-2| + 4.2.2 ... |long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-3| + + +Headers with a short title and implicit ref. Last 3 headers are unnumbered. + +============================================================================== +unremarkable header 1 *unremarkable-header-1* + +------------------------------------------------------------------------------ +unremarkable header 2 *unremarkable-header-2* + +UNREMARKABLE HEADER 3 *unremarkable-header-3* + +UNREMARKABLE HEADER 3 *unremarkable-header-3-1* + +------------------------------------------------------------------------------ +unremarkable header 2 *unremarkable-header-2-1* + +UNREMARKABLE HEADER 3 *unremarkable-header-3-2* + +UNREMARKABLE HEADER 3 *unremarkable-header-3-3* + + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +Headers with various inline elements + +============================================================================== +bold italic underline strikethrough *short11* + +------------------------------------------------------------------------------ +superscript2 subscript3 *short21* + +SMALLCAPS `code` `$inline math$` `$display math$` *short31* + +LINK example.com *short32* + + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +Headers with a long name and explicit short ref + +============================================================================== +Long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 *long1* + +------------------------------------------------------------------------------ +Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 *long21* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long31* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long32* + +------------------------------------------------------------------------------ +Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 *long22* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long33* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long34* + + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +Headers with a long name and implicit ref. + +Since implicit ref is very lengthy, there is no way to fit it. Therefore title +is not rendered and the references exceed the columns (textwidth) limit + +============================================================================== +Long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 *long-header-1-long-header-1-long-header-1-long-header-1-long-header-1-long-header-1-long-header-1* + +------------------------------------------------------------------------------ +Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 *long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-1* + +------------------------------------------------------------------------------ +Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 *long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-1* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-2* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-3* + + vim:tw=78:sw=4:ts=4:ft=help:norl:et: diff --git a/test/vimdoc/headers.markdown b/test/vimdoc/headers.markdown new file mode 100644 --- /dev/null +++ b/test/vimdoc/headers.markdown @@ -0,0 +1,45 @@ +Headers with a short title and implicit ref. Last 3 headers are unnumbered. + +# unremarkable header 1 +## unremarkable header 2 +### unremarkable header 3 +### unremarkable header 3 +## unremarkable header 2 {.unnumbered} +### unremarkable header 3 {.unnumbered} +### unremarkable header 3 {.unnumbered} + +--- + +Headers with various inline elements + +# **bold** *italic* [underline]{.underline} ~strikethrough~ {#short11} +## superscript^2^ subscript~3~ {#short21} +### [smallcaps]{.smallcaps} `code` $inline math$ $$display math$$ {#short31} +### [link](example.com) ![image](https://duckduckgo.com/favicon.ico) {#short32} + +--- + +Headers with a long name and explicit short ref + +# Long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 {#long1} +## Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 {#long21} +### Long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 {#long31} +### Long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 {#long32} +## Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 {#long22} +### Long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 {#long33} +### Long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 {#long34} + +--- + +Headers with a long name and implicit ref. + +Since implicit ref is very lengthy, there is no way to fit it. Therefore title +is not rendered and the references exceed the columns (textwidth) limit + +# Long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 +## Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 +### Long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 +### Long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 +## Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 +### Long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 +### Long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 long header 3 diff --git a/test/vimdoc/headers.vimdoc b/test/vimdoc/headers.vimdoc new file mode 100644 --- /dev/null +++ b/test/vimdoc/headers.vimdoc @@ -0,0 +1,94 @@ + Type |gO| to see the table of contents. + +unremarkable header 1 .................................. |unremarkable-header-1| + unremarkable header 2 ................................ |unremarkable-header-2| + unremarkable header 2 .............................. |unremarkable-header-2-1| +bold italic underline strikethrough .................................. |short11| + superscript2 subscript3 ............................................ |short21| +Long header 1 long header 1 long header 1 long header 1 long header 1... |long1| + Long header 2 long header 2 long header 2 long header 2 long heade... |long21| + Long header 2 long header 2 long header 2 long header 2 long heade... |long22| +... |long-header-1-long-header-1-long-header-1-long-header-1-long-header-1-long-header-1-long-header-1| + ... |long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2| + ... |long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-1| + + +Headers with a short title and implicit ref. Last 3 headers are unnumbered. + +============================================================================== +unremarkable header 1 *unremarkable-header-1* + +------------------------------------------------------------------------------ +unremarkable header 2 *unremarkable-header-2* + +UNREMARKABLE HEADER 3 *unremarkable-header-3* + +UNREMARKABLE HEADER 3 *unremarkable-header-3-1* + +------------------------------------------------------------------------------ +unremarkable header 2 *unremarkable-header-2-1* + +UNREMARKABLE HEADER 3 *unremarkable-header-3-2* + +UNREMARKABLE HEADER 3 *unremarkable-header-3-3* + + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +Headers with various inline elements + +============================================================================== +bold italic underline strikethrough *short11* + +------------------------------------------------------------------------------ +superscript2 subscript3 *short21* + +SMALLCAPS `code` `$inline math$` `$display math$` *short31* + +LINK example.com *short32* + + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +Headers with a long name and explicit short ref + +============================================================================== +Long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 *long1* + +------------------------------------------------------------------------------ +Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 *long21* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long31* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long32* + +------------------------------------------------------------------------------ +Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 *long22* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long33* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long34* + + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +Headers with a long name and implicit ref. + +Since implicit ref is very lengthy, there is no way to fit it. Therefore title +is not rendered and the references exceed the columns (textwidth) limit + +============================================================================== +Long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 long header 1 *long-header-1-long-header-1-long-header-1-long-header-1-long-header-1-long-header-1-long-header-1* + +------------------------------------------------------------------------------ +Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 *long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-1* + +------------------------------------------------------------------------------ +Long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 long header 2 *long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-long-header-2-1* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-2* + +LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 LONG HEADER 3 *long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-long-header-3-3* + + vim:tw=78:sw=4:ts=4:ft=help:norl:et: diff --git a/test/vimdoc/vim-online-doc.markdown b/test/vimdoc/vim-online-doc.markdown new file mode 100644 --- /dev/null +++ b/test/vimdoc/vim-online-doc.markdown @@ -0,0 +1,42 @@ +# Online vim documentation + +While vim documentation can be accessed with `:help`, it may be beneficial to +link to the websites inside readme/markdown docs. Two most common websites are: + +- and +- + +Also it is not uncommon to reference documentation as `:h ` + +## Links to vimhelp.org {#vimhelp-links} + +For introduction to writing help files see + + +Named link: [vimhelp link](https://vimhelp.org/helphelp.txt.html#help-writing) + +## Links to neo.vimhelp.org {#neo-vimhelp-links} + +For introduction to writing help files see + + +Named link: [vimhelp link](https://neo.vimhelp.org/helphelp.txt.html#help-writing) + +## Links to neovim.io {#neovim-io-links} + +For introduction to writing help files see + + +Named link: [neovim.io link](https://neovim.io/doc/user/helphelp.html#help-writing) + +You can also reference whole files with topic omitted: + + +## :h-style documentation {#colon-h-docs} + +For introduction to writing help files see +`:h help-writing` + +Long name for `:help` is also supported: `:help help-writing` + +This is malformed: `:help help-writing `, but this is not: `:help help-writing` diff --git a/test/vimdoc/vim-online-doc.vimdoc b/test/vimdoc/vim-online-doc.vimdoc new file mode 100644 --- /dev/null +++ b/test/vimdoc/vim-online-doc.vimdoc @@ -0,0 +1,53 @@ + Type |gO| to see the table of contents. + +Online vim documentation ............................ |online-vim-documentation| + Links to vimhelp.org ......................................... |vimhelp-links| + Links to neo.vimhelp.org ................................. |neo-vimhelp-links| + Links to neovim.io ......................................... |neovim-io-links| + :h-style documentation ........................................ |colon-h-docs| + +============================================================================== +Online vim documentation *online-vim-documentation* + +While vim documentation can be accessed with `:help`, it may be beneficial to +link to the websites inside readme/markdown docs. Two most common websites +are: + +- https://vimhelp.org/ and +- https://neovim.io/doc/user + +Also it is not uncommon to reference documentation as || + +------------------------------------------------------------------------------ +Links to vimhelp.org *vimhelp-links* + +For introduction to writing help files see |help-writing| + +Named link: vimhelp link |help-writing| + +------------------------------------------------------------------------------ +Links to neo.vimhelp.org *neo-vimhelp-links* + +For introduction to writing help files see |help-writing| + +Named link: vimhelp link |help-writing| + +------------------------------------------------------------------------------ +Links to neovim.io *neovim-io-links* + +For introduction to writing help files see |help-writing| + +Named link: neovim.io link |help-writing| + +You can also reference whole files with topic omitted: |vim_diff.txt| + +------------------------------------------------------------------------------ +:h-style documentation *colon-h-docs* + +For introduction to writing help files see |help-writing| + +Long name for `:help` is also supported: |help-writing| + +This is malformed: |help-writing|, but this is not: |help-writing| + + vim:tw=78:sw=4:ts=4:ft=help:norl:et: diff --git a/test/vimwiki-reader.native b/test/vimwiki-reader.native --- a/test/vimwiki-reader.native +++ b/test/vimwiki-reader.native @@ -1,309 +1,2429 @@ -Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title",MetaInlines [Str "title"])]}) -[Header 1 ("implemented",[],[]) [Emph [Span ("implemented",[],[]) [],Strong [Str "implemented"]]] -,Header 1 ("header",[],[]) [Str "header"] -,Header 2 ("header level two",[],[]) [Str "header",Space,Str "level",Space,Str "two"] -,Header 3 ("header level 3",[],[]) [Str "header",Space,Code ("",[],[]) "level",Space,Str "3"] -,Header 4 ("header level four",[],[]) [Str "header",Space,Strikeout [Str "level"],Space,Str "four"] -,Header 5 ("header level 5",[],[]) [Str "header",Space,Emph [Span ("level",[],[]) [],Strong [Str "level"],Space,Str "5"]] -,Header 6 ("header level 6",[],[]) [Str "header",Space,Str "level",Space,Str "6"] -,Para [Str "=======",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "========"] -,Para [Str "hi==",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "=="] -,Para [Str "===",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "=="] -,Para [Str "===",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "===-"] -,Para [Str "not",Space,Str "a",Space,Str "header:"] -,Para [Str "=n="] -,Para [Str "===",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "===="] -,Header 2 ("centred header",["justcenter"],[]) [Str "centred",Space,Str "header"] -,Header 2 ("header with some == in between",[],[]) [Str "header",Space,Str "with",Space,Str "some",Space,Code ("",[],[]) "==",Space,Str "in",Space,Str "between"] -,Header 2 ("header with some == in between",[],[]) [Str "header",Space,Str "with",Space,Str "some",Space,Str "==",Space,Str "in",Space,Str "between"] -,Header 2 ("header with some ==in between",[],[]) [Str "header",Space,Str "with",Space,Str "some",Space,Str "==in",Space,Str "between"] -,Header 2 ("emph strong and strikeout",[],[]) [Str "emph",Space,Str "strong",Space,Str "and",Space,Str "strikeout"] -,Para [Emph [Str "emph"],Space,Span ("strong",[],[]) [],Strong [Str "strong"]] -,Para [Span ("strong and emph",[],[]) [],Strong [Emph [Str "strong",Space,Str "and",Space,Str "emph"]]] -,Para [Emph [Span ("emph and strong",[],[]) [],Strong [Str "emph",Space,Str "and",Space,Str "strong"]]] -,Para [Span ("emph inside strong",[],[]) [],Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]] -,Para [Span ("strong with emph",[],[]) [],Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]] -,Para [Emph [Span ("strong inside",[],[]) [],Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]] -,Para [Emph [Strikeout [Str "strikeout"],Space,Str "inside",Space,Str "emph"]] -,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "struck",Space,Str "out"],Space,Str "with",Space,Str "emph"]] -,Para [Str "*not",SoftBreak,Str "strong*"] -,Para [Str "just",Space,Str "two",Space,Str "stars:",Space,Str "**"] -,Para [Str "just",Space,Str "two",Space,Str "underscores:",Space,Str "__"] -,Para [Str "just",Space,Str "four",Space,Str "~s:",Space,Str "~~~~"] -,Para [Str "_not",SoftBreak,Str "emph_"] -,Para [Str "~~not",SoftBreak,Str "strikeout~~"] -,Header 2 ("horizontal rule",[],[]) [Str "horizontal",Space,Str "rule"] -,Para [Str "top"] -,HorizontalRule -,Para [Str "middle"] -,HorizontalRule -,Para [Str "not",Space,Str "a",Space,Str "rule-----"] -,Para [Str "not",Space,Str "a",Space,Str "rule",Space,Str "(trailing",Space,Str "spaces):",SoftBreak,Str "-----"] -,Para [Str "not",Space,Str "a",Space,Str "rule",Space,Str "(leading",Space,Str "spaces):",SoftBreak,Str "----"] -,Header 2 ("comments",[],[]) [Str "comments"] -,Para [Str "this",SoftBreak,Str "is",Space,Str "%%",Space,Str "not",Space,Str "secret"] -,Header 2 ("inline code",[],[]) [Str "inline",Space,Str "code"] -,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Code ("",[],[]) "inline code",Str "."] -,Para [Str "Just",Space,Str "two",Space,Str "backticks:",Space,Str "``"] -,Header 2 ("preformatted text",[],[]) [Str "preformatted",Space,Str "text"] -,CodeBlock ("",[],[]) " Tyger! Tyger! burning bright\n In the forests of the night,\n What immortal hand or eye\n Could frame thy fearful symmetry?\n In what distant deeps or skies\n Burnt the fire of thine eyes?\n On what wings dare he aspire?\n What the hand dare sieze the fire?" -,Header 3 ("preformatted text with attributes",[],[]) [Str "preformatted",Space,Str "text",Space,Str "with",Space,Str "attributes"] -,CodeBlock ("",[],[("class","python"),("style","color:blue")]) " for i in range(1, 5):\n print(i)" -,Header 2 ("block quotes",[],[]) [Str "block",Space,Str "quotes"] -,BlockQuote - [Plain [Str "(indentation",Space,Str "4",Space,Str "spaces)",Space,Str "This",Space,Str "would",Space,Str "be",Space,Str "a",Space,Str "blockquote",Space,Str "in",Space,Str "Vimwiki.",Space,Str "It",Space,Str "is",Space,Str "not",Space,Span ("highlighted",[],[]) [],Strong [Str "highlighted"],Space,Str "in",Space,Str "Vim",Space,Str "but",SoftBreak,Str "(indentation",Space,Str "1",Space,Str "space",Space,Str "followed",Space,Str "by",Space,Str "1",Space,Str "tab",Space,Str "of",Space,Str "width",Space,Str "4)",Space,Str "could",Space,Str "be",Space,Str "styled",Space,Str "by",Space,Str "CSS",Space,Str "in",Space,Str "HTML.",Space,Str "Blockquotes",Space,Str "are",Space,Str "usually",Space,Str "used",Space,Str "to",Space,Str "quote",Space,Str "a",SoftBreak,Str "(indentation",Space,Str "1",Space,Str "tab",Space,Str "of",Space,Str "width",Space,Str "4)",Space,Str "long",Space,Str "piece",Space,Str "of",Space,Str "text",Space,Str "from",Space,Str "another",Space,Str "source.",Space,Strikeout [Str "blah",Space,Str "blah"],Space,Span ("-blockquote",[],[]) [Str ""],Span ("blockquote",["tag"],[]) [Str "blockquote"]]] -,Header 2 ("external links",[],[]) [Str "external",Space,Str "links"] -,Para [Link ("",[],[]) [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")] -,Para [Link ("",[],[]) [Str "http://pandoc.org"] ("http://pandoc.org","")] -,Para [Link ("",[],[]) [Str "ftp://vim.org"] ("ftp://vim.org","")] -,Para [Link ("",[],[]) [Str "http://google.com"] ("http://google.com","")] -,Para [Link ("",[],[]) [Str "email",Space,Str "me"] ("mailto:info@example.org","")] -,Para [Link ("",[],[]) [Str "mailto:hello@bye.com"] ("mailto:hello@bye.com","")] -,Header 2 ("internal links",[],[]) [Str "internal",Space,Str "links"] -,Para [Link ("",[],[]) [Str "This is a link"] ("This is a link.html","")] -,Para [Link ("",[],[]) [Str "Description",Space,Str "of",Space,Str "the",Space,Str "link"] ("This is a link source.html","")] -,Para [Link ("",[],[]) [Str "projects/Important Project 1"] ("projects/Important Project 1.html",""),SoftBreak,Link ("",[],[]) [Str "../index"] ("../index.html",""),SoftBreak,Link ("",[],[]) [Str "Other",Space,Str "files"] ("a subdirectory/","")] -,Para [Link ("",[],[]) [Str "try",Space,Str "me",Space,Str "to",Space,Str "test",Space,Str "tag",Space,Str "anchors"] ("#tag-one","")] -,Para [Link ("",[],[]) [Str "try",Space,Str "me",Space,Str "to",Space,Str "test",Space,Str "header",Space,Str "anchors"] ("#block quotes","")] -,Para [Link ("",[],[]) [Str "try",Space,Str "me",Space,Str "to",Space,Str "test",Space,Str "strong",Space,Str "anchors"] ("#strong","")] -,Para [Link ("",[],[]) [Str "Tasks",Space,Str "for",Space,Str "tomorrow"] ("Todo List.html#Tomorrow","")] -,Para [Link ("",[],[]) [Str "diary:2017-05-01"] ("diary/2017-05-01.html","")] -,Para [Link ("",[],[]) [Str "Important",Space,Str "Data"] ("file:../assets/data.csv","")] -,Header 3 ("links with thumbnails",[],[]) [Str "links",Space,Str "with",Space,Str "thumbnails"] -,Para [Link ("",[],[]) [Image ("",[],[]) [Str ""] ("./movie.jpg","")] ("http://www.google.com","")] -,Header 2 ("images",[],[]) [Str "images"] -,Para [Image ("",[],[]) [Str ""] ("file:./lalune.jpg","")] -,Para [Image ("",[],[]) [Str "Vimwiki"] ("http://vimwiki.googlecode.com/hg/images/vimwiki_logo.png",""),SoftBreak,Image ("",[],[]) [Str ""] ("file:./movie.jpg","")] -,Header 3 ("image with attributes",[],[]) [Str "image",Space,Str "with",Space,Str "attributes"] -,Para [Image ("",[],[("style","width:150px;height:120px;")]) [Emph [Str "cool",Space,Str "stuff"]] ("lalune.jpg","")] -,Para [Image ("",[],[("style","font-color:red")]) [Span ("Non-existing",[],[]) [],Strong [Str "Non-existing"],Space,Str "image"] ("nonexist.jpg","")] -,Para [Image ("",[],[("style","width:150px;height:120px;")]) [Emph [Str "cool",Space,Str "stuff"]] ("lalune.jpg","")] -,Header 2 ("lists",[],[]) [Str "lists"] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "ordered",Space,Str "list",Space,Str "item",Space,Str "1,",Space,Str "and",Space,Str "here",Space,Str "is",Space,Str "some",Space,Str "math",Space,Str "belonging",Space,Str "to",Space,Str "list",Space,Str "item",Space,Str "1"] - ,Para [Math DisplayMath "a^2 + b^2 = c^2"] - ,Plain [Str "and",Space,Str "some",Space,Str "preformatted",Space,Str "and",Space,Str "tables",Space,Str "belonging",Space,Str "to",Space,Str "item",Space,Str "1",Space,Str "as",Space,Str "well"] - ,CodeBlock ("",[],[]) "I'm part of item 1." - ,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[] - ,[]] - [[[Plain [Str "this",Space,Str "table"]] - ,[Plain [Str "is"]]] - ,[[Plain [Str "also",Space,Str "a",Space,Str "part"]] - ,[Plain [Str "of",Space,Str "item",Space,Str "1"]]]] - ,Plain [Str "and",Space,Str "some",Space,Str "more",Space,Str "text",Space,Str "belonging",Space,Str "to",Space,Str "item",Space,Str "1."]] - ,[Plain [Str "ordered",Space,Str "list",Space,Str "item",Space,Str "2"]]] -,BulletList - [[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "2"]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "the",Space,Str "#",Space,Str "become",Space,Str "numbers",Space,Str "when",Space,Str "converted",Space,Str "to",Space,Str "HTML"]]] -,BulletList - [[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "2"]]] -,BulletList - [[Plain [Str "Item",Space,Str "1"]] - ,[Plain [Str "Item",Space,Str "2"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Sub",Space,Str "item",Space,Str "1",Space,Str "(indentation",Space,Str "4",Space,Str "spaces)",SoftBreak,Str "Sub",Space,Str "item",Space,Str "1",Space,Str "continued",Space,Str "line.",SoftBreak,Str "Sub",Space,Str "item",Space,Str "1",Space,Str "next",Space,Str "continued",Space,Str "line."]] - ,[Plain [Str "Sub",Space,Str "item",Space,Str "2,",Space,Str "as",Space,Str "an",Space,Str "ordered",Space,Str "list",Space,Str "item",Space,Str "even",Space,Str "though",Space,Str "the",Space,Str "identifier",Space,Str "is",Space,Code ("",[],[]) "*",Space,Str "(indentation",Space,Str "2",Space,Str "spaces",Space,Str "followed",Space,Str "by",Space,Str "one",Space,Str "tab",Space,Str "of",Space,Str "width",Space,Str "4)"]] - ,[Plain [Str "etc.",SoftBreak,Str "Continuation",Space,Str "of",Space,Str "Item",Space,Str "2",SoftBreak,Str "Next",Space,Str "continuation",Space,Str "of",Space,Str "Item",Space,Str "2"]]]]] -,Para [Str "But",Space,Str "this",Space,Str "is",Space,Str "a",Space,Str "new",Space,Str "paragraph."] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "1"] - ,BulletList - [[Plain [Code ("",[],[]) "1.1"]]]] - ,[Plain [Str "2"] - ,BulletList - [[Plain [Str "2.1"]]]]] -,BulletList - [[Plain [Str "3"]]] -,Header 3 ("ordered lists with non-# identifiers",[],[]) [Str "ordered",Space,Str "lists",Space,Str "with",Space,Str "non-#",Space,Str "identifiers"] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]] -,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]] -,BulletList - [[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "2"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Numbered",Space,Str "list",Space,Str "sub",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "more",Space,Str "..."] - ,BulletList - [[Plain [Str "and",Space,Str "more",Space,Str "..."]] - ,[Plain [Str "..."]]]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "sub",Space,Str "item",Space,Str "3"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Numbered",Space,Str "list",Space,Str "sub",Space,Str "sub",Space,Str "item",Space,Str "1"]] - ,[Plain [Str "Numbered",Space,Str "list",Space,Str "sub",Space,Str "sub",Space,Str "item",Space,Str "2"]]]] - ,[Plain [Str "etc."]]]] - ,[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "3"]]] -,Header 2 ("todo lists",[],[]) [Str "todo",Space,Str "lists"] -,BulletList - [[Plain [Span ("",["done0"],[]) [],Str "task",Space,Str "1"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Span ("",["done1"],[]) [],Str "5"]]]] - ,[Plain [Span ("",["done2"],[]) [],Str "3"]] - ,[Plain [Str "[]",Space,Str "not",Space,Str "a",Space,Str "todo",Space,Str "item"]] - ,[Plain [Str "[",Space,Str "]not",Space,Str "a",Space,Str "todo",Space,Str "item"]] - ,[Plain [Str "[r]",Space,Str "not",Space,Str "a",Space,Str "todo",Space,Str "item"]] - ,[Plain [Str "[",Space,Str "]",Space,Str "not",Space,Str "a",Space,Str "todo",Space,Str "item"]] - ,[Plain [Span ("",["done2"],[]) [],Str "a",Space,Str "tab",Space,Str "in",Space,Str "the",Space,Str "todo",Space,Str "list",Space,Str "marker",Space,Code ("",[],[]) "[ ]"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Span ("",["done3"],[]) [],Str "4",SoftBreak,Str "5"]] - ,[Plain [Span ("",["done4"],[]) []] - ,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[] - ,[]] - [[[Plain [Str "a"]] - ,[Plain [Str "b"]]]]]]] - ,[Plain [Span ("",["done4"],[]) [],Str "task",Space,Str "2"]]] -,Header 2 ("math",[],[]) [Str "math"] -,Para [Math InlineMath " \\sum_i a_i^2 = 1 "] -,Para [Math DisplayMath "\\sum_i a_i^2\n=\n1"] -,Para [Math DisplayMath "\\begin{aligned}\n\\sum_i a_i^2 &= 1 + 1 \\\\\n&= 2.\n\\end{aligned}"] -,Para [Str "edge",Space,Str "case",Space,Str "(the",Space,Code ("",[],[]) "c^2 + ",Space,Str "after",Space,Str "the",Space,Str "multline",Space,Str "tag",Space,Str "is",Space,Str "in",Space,Str "the",Space,Str "equation):"] -,Para [Math DisplayMath "\\begin{gathered}\nc^2 + \na^2 + b^2\n\\end{gathered}"] -,Para [Str "edge",Space,Str "case",Space,Str "(the",Space,Str "tag",Space,Str "is",Space,Code ("",[],[]) "hello%bye",Str ")"] -,Para [Math DisplayMath "\\begin{hello%bye}\n\\int_a^b f(x) dx\n\\end{hello%bye}"] -,Para [Str "Just",Space,Str "two",Space,Str "dollar",Space,Str "signs:",Space,Str "$$"] -,Para [Str "[not",Space,Str "math]",Space,Str "You",Space,Str "have",Space,Str "$1",SoftBreak,Str "and",Space,Str "I",Space,Str "have",Space,Str "$1."] -,Header 2 ("tags",[],[]) [Str "tags"] -,Para [Span ("-tag-one",[],[]) [Str ""],Span ("tag-one",["tag"],[]) [Str "tag-one"],Space,Span ("-tag-two",[],[]) [Str ""],Span ("tag-two",["tag"],[]) [Str "tag-two"]] -,Header 2 ("tables",[],[]) [Str "tables"] -,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [[Plain [Str "Year"]] - ,[Plain [Str "Temperature",Space,Str "(low)"]] - ,[Plain [Str "Temperature",Space,Str "(high)"]]] - [[[Plain [Str "1900"]] - ,[Plain [Str "-10"]] - ,[Plain [Str "25"]]] - ,[[Plain [Str "1910"]] - ,[Plain [Str "-15"]] - ,[Plain [Str "30"]]] - ,[[Plain [Str "1920"]] - ,[Plain [Str "-10"]] - ,[Plain [Str "32"]]] - ,[[Plain [Str "1930"]] - ,[Plain [Emph [Str "N/A"]]] - ,[Plain [Emph [Str "N/A"]]]] - ,[[Plain [Str "1940"]] - ,[Plain [Str "-2"]] - ,[Plain [Str "40"]]]] -,Header 3 ("centered headerless tables",[],[]) [Str "centered",Space,Str "headerless",Space,Str "tables"] -,Div ("",["center"],[]) - [Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[] - ,[]] - [[[Plain [Str "a"]] - ,[Plain [Str "b"]]] - ,[[Plain [Str "c"]] - ,[Plain [Str "d"]]]]] -,Header 2 ("paragraphs",[],[]) [Str "paragraphs"] -,Para [Str "This",Space,Str "is",Space,Str "first",Space,Str "paragraph",SoftBreak,Str "with",Space,Str "two",Space,Str "lines."] -,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "second",Space,Str "paragraph",Space,Str "with",SoftBreak,Str "two",Space,Str "lines",Space,Str "after",Space,Str "many",Space,Str "blank",Space,Str "lines."] -,Header 2 ("definition list",[],[]) [Str "definition",Space,Str "list"] -,DefinitionList - [([Str "Term",Space,Str "1"], - [[Plain [Str "Definition",Space,Str "1"]]]) - ,([Str "Term",Space,Str "2"], - [[Plain [Str "Definition",Space,Str "2"]] - ,[Plain [Str "Definition",Space,Str "3"]]]) - ,([Str "Term",Space,Str "::",Space,Span ("separated",[],[]) [],Strong [Str "separated"],Space,Str "by",Space,Str "::",Space,Emph [Str "double",Space,Str "colons"]], - [[Plain [Str "Def1"]] - ,[Plain [Str "Def2"]]]) - ,([Str "Term",Space,Str "with",Space,Str "lots",Space,Str "of",Space,Str "trailing",Space,Str "colons:::::::"], - [[Plain [Str "Definition"]]]) - ,([Str "::",Space,Str "This",Space,Str "is",Space,Str "::",Space,Str "A",Space,Str "term",Space,Str "(rather",Space,Str "than",Space,Str "a",Space,Str "definition)"], - [[Plain [Str "and",Space,Str "this",Space,Str "is",Space,Str "a",Space,Str "definition"]]]) - ,([Str "Term",Space,Str "Without",Space,Str "definitions"], - [[]]) - ,([Str "Part",Space,Str "::",Space,Str "of",Space,Str "::",Space,Str "dt"], - [[Plain [Str "part",Space,Str "of",Space,Str "::dd"]]])] -,DefinitionList - [([], - [[Plain [Str "Definition",Space,Str "1",Space,Str "without",Space,Str "a",Space,Str "term"]] - ,[Plain [Str "Definition",Space,Str "2",Space,Str "without",Space,Str "a",Space,Str "term"]]])] -,DefinitionList - [([Str "T1"], - [[Plain [Str "D1"]]])] -,Para [Str "new",Space,Str "paragraph"] -,DefinitionList - [([Str "T1"], - [[Plain [Str "D1"]]])] -,Para [Str "Not::Definition"] -,Para [Str "Not",Space,Str "::Definition"] -,Para [Str "::Not",Space,Str "definition"] -,BlockQuote - [Plain [Str "::",Space,Str "blockquote"]] -,BlockQuote - [Plain [Str "block",Space,Str "::",Space,Str "quote"]] -,Header 2 ("metadata placeholders",[],[]) [Str "metadata",Space,Str "placeholders"] -,Para [Str "%this",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "placeholder"] -,Para [Str "placeholders",SoftBreak,Str "serves",Space,Str "as",Space,Str "space",Space,Str "/",Space,Str "softbreak",Space,Str "in",Space,Str "paragraphs"] -,Header 2 ("sup, sub",[],[]) [Str "sup,",Space,Str "sub"] -,Para [Str "super",Superscript [Str "script"]] -,Para [Str "sub",Subscript [Str "script"]] -,Header 2 ("the todo mark",[],[]) [Str "the",Space,Str "todo",Space,Str "mark"] -,Para [Span ("",["todo"],[]) [Str "TODO:"]] -,Header 1 ("not implemented yet",[],[]) [Emph [Span ("not implemented yet",[],[]) [],Strong [Str "not",Space,Str "implemented",Space,Str "yet"]]] -,Header 2 ("tables with spans",[],[]) [Str "tables",Space,Str "with",Space,Str "spans"] -,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0] - [[] - ,[] - ,[] - ,[]] - [[[Plain [Str "a"]] - ,[Plain [Str "b"]] - ,[Plain [Str "c"]] - ,[Plain [Str "d"]]] - ,[[Plain [Str "\\/"]] - ,[Plain [Str "e"]] - ,[Plain [Str ">"]] - ,[Plain [Str "f"]]] - ,[[Plain [Str "\\/"]] - ,[Plain [Str "\\/"]] - ,[Plain [Str ">"]] - ,[Plain [Str "g"]]] - ,[[Plain [Str "h"]] - ,[Plain [Str ">"]] - ,[Plain [Str ">"]] - ,[Plain [Str ">"]]]] -,Header 2 ("tables with multiple lines of headers",[],[]) [Str "tables",Space,Str "with",Space,Str "multiple",Space,Str "lines",Space,Str "of",Space,Str "headers"] -,Table [] [AlignDefault,AlignDefault] [0.0,0.0] - [[] - ,[]] - [[[Plain [Str "a"]] - ,[Plain [Str "b"]]] - ,[[Plain [Str "c"]] - ,[Plain [Str "d"]]] - ,[[Plain [Str "---"]] - ,[Plain [Str "---"]]]] -,Header 2 ("some other placeholders",[],[]) [Str "some",Space,Str "other",Space,Str "placeholders"] -,Para [Code ("",[],[]) "template",Space,Str "placeholder",Space,Str "is",Space,Str "ignored."] -,Para [Code ("",[],[]) "nohtml",Space,Str "placeholder",Space,Str "is",Space,Str "ignored."]] +Pandoc + Meta + { unMeta = + fromList + [ ( "date" , MetaInlines [ Str "2017-05-01" ] ) + , ( "title" , MetaInlines [ Str "title" ] ) + ] + } + [ Header + 1 + ( "implemented" , [] , [] ) + [ Emph + [ Span ( "implemented" , [] , [] ) [] + , Strong [ Str "implemented" ] + ] + ] + , Header 1 ( "header" , [] , [] ) [ Str "header" ] + , Header + 2 + ( "header level two" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "two" ] + , Header + 3 + ( "header level 3" , [] , [] ) + [ Str "header" + , Space + , Code ( "" , [] , [] ) "level" + , Space + , Str "3" + ] + , Header + 4 + ( "header level four" , [] , [] ) + [ Str "header" + , Space + , Strikeout [ Str "level" ] + , Space + , Str "four" + ] + , Header + 5 + ( "header level 5" , [] , [] ) + [ Str "header" + , Space + , Emph + [ Span ( "level" , [] , [] ) [] + , Strong [ Str "level" ] + , Space + , Str "5" + ] + ] + , Header + 6 + ( "header level 6" , [] , [] ) + [ Str "header" , Space , Str "level" , Space , Str "6" ] + , Para + [ Str "=======" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "header" + , Space + , Str "========" + ] + , Para + [ Str "hi==" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "header" + , Space + , Str "==" + ] + , Para + [ Str "===" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "header" + , Space + , Str "==" + ] + , Para + [ Str "===" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "header" + , Space + , Str "===-" + ] + , Para + [ Str "not" , Space , Str "a" , Space , Str "header:" ] + , Para [ Str "=n=" ] + , Para + [ Str "===" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "header" + , Space + , Str "====" + ] + , Header + 2 + ( "centred header" , [ "justcenter" ] , [] ) + [ Str "centred" , Space , Str "header" ] + , Header + 2 + ( "header with some == in between" , [] , [] ) + [ Str "header" + , Space + , Str "with" + , Space + , Str "some" + , Space + , Code ( "" , [] , [] ) "==" + , Space + , Str "in" + , Space + , Str "between" + ] + , Header + 2 + ( "header with some == in between" , [] , [] ) + [ Str "header" + , Space + , Str "with" + , Space + , Str "some" + , Space + , Str "==" + , Space + , Str "in" + , Space + , Str "between" + ] + , Header + 2 + ( "header with some ==in between" , [] , [] ) + [ Str "header" + , Space + , Str "with" + , Space + , Str "some" + , Space + , Str "==in" + , Space + , Str "between" + ] + , Header + 2 + ( "emph strong and strikeout" , [] , [] ) + [ Str "emph" + , Space + , Str "strong" + , Space + , Str "and" + , Space + , Str "strikeout" + ] + , Para + [ Emph [ Str "emph" ] + , Space + , Span ( "strong" , [] , [] ) [] + , Strong [ Str "strong" ] + ] + , Para + [ Span ( "strong and emph" , [] , [] ) [] + , Strong + [ Emph + [ Str "strong" , Space , Str "and" , Space , Str "emph" ] + ] + ] + , Para + [ Emph + [ Span ( "emph and strong" , [] , [] ) [] + , Strong + [ Str "emph" , Space , Str "and" , Space , Str "strong" ] + ] + ] + , Para + [ Span ( "emph inside strong" , [] , [] ) [] + , Strong + [ Emph [ Str "emph" , Space , Str "inside" ] + , Space + , Str "strong" + ] + ] + , Para + [ Span ( "strong with emph" , [] , [] ) [] + , Strong + [ Str "strong" + , Space + , Str "with" + , Space + , Emph [ Str "emph" ] + ] + ] + , Para + [ Emph + [ Span ( "strong inside" , [] , [] ) [] + , Strong [ Str "strong" , Space , Str "inside" ] + , Space + , Str "emph" + ] + ] + , Para + [ Emph + [ Strikeout [ Str "strikeout" ] + , Space + , Str "inside" + , Space + , Str "emph" + ] + ] + , Para + [ Strikeout + [ Str "This" + , Space + , Str "is" + , Space + , Emph [ Str "struck" , Space , Str "out" ] + , Space + , Str "with" + , Space + , Str "emph" + ] + ] + , Para [ Str "*not" , SoftBreak , Str "strong*" ] + , Para + [ Str "just" + , Space + , Str "two" + , Space + , Str "stars:" + , Space + , Str "**" + ] + , Para + [ Str "just" + , Space + , Str "two" + , Space + , Str "underscores:" + , Space + , Str "__" + ] + , Para + [ Str "just" + , Space + , Str "four" + , Space + , Str "~s:" + , Space + , Str "~~~~" + ] + , Para [ Str "_not" , SoftBreak , Str "emph_" ] + , Para [ Str "~~not" , SoftBreak , Str "strikeout~~" ] + , Header + 2 + ( "horizontal rule" , [] , [] ) + [ Str "horizontal" , Space , Str "rule" ] + , Para [ Str "top" ] + , HorizontalRule + , Para [ Str "middle" ] + , HorizontalRule + , Para + [ Str "not" , Space , Str "a" , Space , Str "rule-----" ] + , Para + [ Str "not" + , Space + , Str "a" + , Space + , Str "rule" + , Space + , Str "(trailing" + , Space + , Str "spaces):" + , SoftBreak + , Str "-----" + ] + , Para + [ Str "not" + , Space + , Str "a" + , Space + , Str "rule" + , Space + , Str "(leading" + , Space + , Str "spaces):" + , SoftBreak + , Str "----" + ] + , Header 2 ( "comments" , [] , [] ) [ Str "comments" ] + , Para + [ Str "this" + , SoftBreak + , Str "is" + , Space + , Str "%%" + , Space + , Str "not" + , Space + , Str "secret" + ] + , Header + 2 + ( "inline code" , [] , [] ) + [ Str "inline" , Space , Str "code" ] + , Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "some" + , Space + , Code ( "" , [] , [] ) "inline code" + , Str "." + ] + , Para + [ Str "Just" + , Space + , Str "two" + , Space + , Str "backticks:" + , Space + , Str "``" + ] + , Header + 2 + ( "preformatted text" , [] , [] ) + [ Str "preformatted" , Space , Str "text" ] + , CodeBlock + ( "" , [] , [] ) + " Tyger! Tyger! burning bright\n In the forests of the night,\n What immortal hand or eye\n Could frame thy fearful symmetry?\n In what distant deeps or skies\n Burnt the fire of thine eyes?\n On what wings dare he aspire?\n What the hand dare sieze the fire?" + , Header + 3 + ( "preformatted text with attributes" , [] , [] ) + [ Str "preformatted" + , Space + , Str "text" + , Space + , Str "with" + , Space + , Str "attributes" + ] + , CodeBlock + ( "" + , [] + , [ ( "class" , "python" ) , ( "style" , "color:blue" ) ] + ) + " for i in range(1, 5):\n print(i)" + , Header + 3 + ( "preformatted text with nested syntax" , [] , [] ) + [ Str "preformatted" + , Space + , Str "text" + , Space + , Str "with" + , Space + , Str "nested" + , Space + , Str "syntax" + ] + , CodeBlock ( "" , [ "sql" ] , [] ) "SELECT * FROM table" + , Header + 3 + ( "empty preformatted text" , [] , [] ) + [ Str "empty" + , Space + , Str "preformatted" + , Space + , Str "text" + ] + , CodeBlock ( "" , [] , [] ) "" + , Header + 2 + ( "block quotes" , [] , [] ) + [ Str "block" , Space , Str "quotes" ] + , BlockQuote + [ Plain + [ Str "(indentation" + , Space + , Str "4" + , Space + , Str "spaces)" + , Space + , Str "This" + , Space + , Str "would" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "blockquote" + , Space + , Str "in" + , Space + , Str "Vimwiki." + , Space + , Str "It" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Span ( "highlighted" , [] , [] ) [] + , Strong [ Str "highlighted" ] + , Space + , Str "in" + , Space + , Str "Vim" + , Space + , Str "but" + , SoftBreak + , Str "(indentation" + , Space + , Str "1" + , Space + , Str "space" + , Space + , Str "followed" + , Space + , Str "by" + , Space + , Str "1" + , Space + , Str "tab" + , Space + , Str "of" + , Space + , Str "width" + , Space + , Str "4)" + , Space + , Str "could" + , Space + , Str "be" + , Space + , Str "styled" + , Space + , Str "by" + , Space + , Str "CSS" + , Space + , Str "in" + , Space + , Str "HTML." + , Space + , Str "Blockquotes" + , Space + , Str "are" + , Space + , Str "usually" + , Space + , Str "used" + , Space + , Str "to" + , Space + , Str "quote" + , Space + , Str "a" + , SoftBreak + , Str "(indentation" + , Space + , Str "1" + , Space + , Str "tab" + , Space + , Str "of" + , Space + , Str "width" + , Space + , Str "4)" + , Space + , Str "long" + , Space + , Str "piece" + , Space + , Str "of" + , Space + , Str "text" + , Space + , Str "from" + , Space + , Str "another" + , Space + , Str "source." + , Space + , Strikeout [ Str "blah" , Space , Str "blah" ] + , Space + , Span ( "-blockquote" , [] , [] ) [ Str "" ] + , Span + ( "blockquote" , [ "tag" ] , [] ) [ Str "blockquote" ] + ] + ] + , Header + 2 + ( "external links" , [] , [] ) + [ Str "external" , Space , Str "links" ] + , Para + [ Link + ( "" , [] , [] ) + [ Emph [ Str "Google" ] + , Space + , Str "search" + , Space + , Str "engine" + ] + ( "http://google.com" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "http://pandoc.org" ] + ( "http://pandoc.org" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "ftp://vim.org" ] + ( "ftp://vim.org" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "http://google.com" ] + ( "http://google.com" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "email" , Space , Str "me" ] + ( "mailto:info@example.org" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "mailto:hello@bye.com" ] + ( "mailto:hello@bye.com" , "" ) + ] + , Header + 2 + ( "internal links" , [] , [] ) + [ Str "internal" , Space , Str "links" ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "This is a link" ] + ( "This is a link" , "" ) + ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "Description" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "link" + ] + ( "This is a link source" , "" ) + ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "projects/Important Project 1" ] + ( "projects/Important Project 1" , "" ) + , SoftBreak + , Link + ( "" , [ "wikilink" ] , [] ) + [ Str "../index" ] + ( "../index" , "" ) + , SoftBreak + , Link + ( "" , [ "wikilink" ] , [] ) + [ Str "Other" , Space , Str "files" ] + ( "a subdirectory/" , "" ) + ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "try" + , Space + , Str "me" + , Space + , Str "to" + , Space + , Str "test" + , Space + , Str "tag" + , Space + , Str "anchors" + ] + ( "#tag-one" , "" ) + ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "try" + , Space + , Str "me" + , Space + , Str "to" + , Space + , Str "test" + , Space + , Str "header" + , Space + , Str "anchors" + ] + ( "#block quotes" , "" ) + ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "try" + , Space + , Str "me" + , Space + , Str "to" + , Space + , Str "test" + , Space + , Str "strong" + , Space + , Str "anchors" + ] + ( "#strong" , "" ) + ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "Tasks" , Space , Str "for" , Space , Str "tomorrow" ] + ( "Todo List#Tomorrow" , "" ) + ] + , Para + [ Link + ( "" , [ "wikilink" ] , [] ) + [ Str "diary:2017-05-01" ] + ( "diary/2017-05-01" , "" ) + ] + , Para + [ Link + ( "" , [] , [] ) + [ Str "Important" , Space , Str "Data" ] + ( "file:../assets/data.csv" , "" ) + ] + , Header + 3 + ( "links with thumbnails" , [] , [] ) + [ Str "links" + , Space + , Str "with" + , Space + , Str "thumbnails" + ] + , Para + [ Link + ( "" , [] , [] ) + [ Image ( "" , [] , [] ) [ Str "" ] ( "./movie.jpg" , "" ) ] + ( "http://www.google.com" , "" ) + ] + , Header 2 ( "images" , [] , [] ) [ Str "images" ] + , Para + [ Image + ( "" , [] , [] ) [ Str "" ] ( "file:./lalune.jpg" , "" ) + ] + , Para + [ Image + ( "" , [] , [] ) + [ Str "Vimwiki" ] + ( "http://vimwiki.googlecode.com/hg/images/vimwiki_logo.png" + , "" + ) + , SoftBreak + , Image + ( "" , [] , [] ) [ Str "" ] ( "file:./movie.jpg" , "" ) + ] + , Header + 3 + ( "image with attributes" , [] , [] ) + [ Str "image" + , Space + , Str "with" + , Space + , Str "attributes" + ] + , Para + [ Image + ( "" , [] , [ ( "style" , "width:150px;height:120px;" ) ] ) + [ Emph [ Str "cool" , Space , Str "stuff" ] ] + ( "lalune.jpg" , "" ) + ] + , Para + [ Image + ( "" , [] , [ ( "style" , "font-color:red" ) ] ) + [ Span ( "Non-existing" , [] , [] ) [] + , Strong [ Str "Non-existing" ] + , Space + , Str "image" + ] + ( "nonexist.jpg" , "" ) + ] + , Para + [ Image + ( "" , [] , [ ( "style" , "width:150px;height:120px;" ) ] ) + [ Emph [ Str "cool" , Space , Str "stuff" ] ] + ( "lalune.jpg" , "" ) + ] + , Header 2 ( "lists" , [] , [] ) [ Str "lists" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "ordered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1," + , Space + , Str "and" + , Space + , Str "here" + , Space + , Str "is" + , Space + , Str "some" + , Space + , Str "math" + , Space + , Str "belonging" + , Space + , Str "to" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + , Para [ Math DisplayMath "a^2 + b^2 = c^2" ] + , Plain + [ Str "and" + , Space + , Str "some" + , Space + , Str "preformatted" + , Space + , Str "and" + , Space + , Str "tables" + , Space + , Str "belonging" + , Space + , Str "to" + , Space + , Str "item" + , Space + , Str "1" + , Space + , Str "as" + , Space + , Str "well" + ] + , CodeBlock ( "" , [] , [] ) "I'm part of item 1." + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "this" , Space , Str "table" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "is" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "also" + , Space + , Str "a" + , Space + , Str "part" + ] + ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain + [ Str "of" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Plain + [ Str "and" + , Space + , Str "some" + , Space + , Str "more" + , Space + , Str "text" + , Space + , Str "belonging" + , Space + , Str "to" + , Space + , Str "item" + , Space + , Str "1." + ] + ] + , [ Plain + [ Str "ordered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + ] + , BulletList + [ [ Plain + [ Str "Bulleted" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Bulleted" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Bulleted" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "the" + , Space + , Str "#" + , Space + , Str "become" + , Space + , Str "numbers" + , Space + , Str "when" + , Space + , Str "converted" + , Space + , Str "to" + , Space + , Str "HTML" + ] + ] + ] + , BulletList + [ [ Plain + [ Str "Bulleted" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Bulleted" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + ] + , BulletList + [ [ Plain [ Str "Item" , Space , Str "1" ] ] + , [ Plain [ Str "Item" , Space , Str "2" ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Sub" + , Space + , Str "item" + , Space + , Str "1" + , Space + , Str "(indentation" + , Space + , Str "4" + , Space + , Str "spaces)" + , SoftBreak + , Str "Sub" + , Space + , Str "item" + , Space + , Str "1" + , Space + , Str "continued" + , Space + , Str "line." + , SoftBreak + , Str "Sub" + , Space + , Str "item" + , Space + , Str "1" + , Space + , Str "next" + , Space + , Str "continued" + , Space + , Str "line." + ] + ] + , [ Plain + [ Str "Sub" + , Space + , Str "item" + , Space + , Str "2," + , Space + , Str "as" + , Space + , Str "an" + , Space + , Str "ordered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "even" + , Space + , Str "though" + , Space + , Str "the" + , Space + , Str "identifier" + , Space + , Str "is" + , Space + , Code ( "" , [] , [] ) "*" + , Space + , Str "(indentation" + , Space + , Str "2" + , Space + , Str "spaces" + , Space + , Str "followed" + , Space + , Str "by" + , Space + , Str "one" + , Space + , Str "tab" + , Space + , Str "of" + , Space + , Str "width" + , Space + , Str "4)" + ] + ] + , [ Plain + [ Str "etc." + , SoftBreak + , Str "Continuation" + , Space + , Str "of" + , Space + , Str "Item" + , Space + , Str "2" + , SoftBreak + , Str "Next" + , Space + , Str "continuation" + , Space + , Str "of" + , Space + , Str "Item" + , Space + , Str "2" + ] + ] + ] + ] + ] + , Para + [ Str "But" + , Space + , Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "new" + , Space + , Str "paragraph." + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "1" ] + , BulletList [ [ Plain [ Code ( "" , [] , [] ) "1.1" ] ] ] + ] + , [ Plain [ Str "2" ] + , BulletList [ [ Plain [ Str "2.1" ] ] ] + ] + ] + , BulletList [ [ Plain [ Str "3" ] ] ] + , Header + 3 + ( "ordered lists with non-# identifiers" , [] , [] ) + [ Str "ordered" + , Space + , Str "lists" + , Space + , Str "with" + , Space + , Str "non-#" + , Space + , Str "identifiers" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "3" + ] + ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "3" + ] + ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "3" + ] + ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "3" + ] + ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "3" + ] + ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "3" + ] + ] + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "3" + ] + ] + ] + , BulletList + [ [ Plain + [ Str "Bulleted" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Bulleted" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "2" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "sub" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain [ Str "more" , Space , Str "..." ] + , BulletList + [ [ Plain + [ Str "and" + , Space + , Str "more" + , Space + , Str "..." + ] + ] + , [ Plain [ Str "..." ] ] + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "sub" + , Space + , Str "item" + , Space + , Str "3" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "sub" + , Space + , Str "sub" + , Space + , Str "item" + , Space + , Str "1" + ] + ] + , [ Plain + [ Str "Numbered" + , Space + , Str "list" + , Space + , Str "sub" + , Space + , Str "sub" + , Space + , Str "item" + , Space + , Str "2" + ] + ] + ] + ] + , [ Plain [ Str "etc." ] ] + ] + ] + , [ Plain + [ Str "Bulleted" + , Space + , Str "list" + , Space + , Str "item" + , Space + , Str "3" + ] + ] + ] + , Header + 2 + ( "todo lists" , [] , [] ) + [ Str "todo" , Space , Str "lists" ] + , BulletList + [ [ Plain + [ Span ( "" , [ "done0" ] , [] ) [] + , Str "task" + , Space + , Str "1" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Span ( "" , [ "done1" ] , [] ) [] , Str "5" ] ] + ] + ] + , [ Plain [ Span ( "" , [ "done2" ] , [] ) [] , Str "3" ] ] + , [ Plain + [ Str "[]" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "todo" + , Space + , Str "item" + ] + ] + , [ Plain + [ Str "[" + , Space + , Str "]not" + , Space + , Str "a" + , Space + , Str "todo" + , Space + , Str "item" + ] + ] + , [ Plain + [ Str "[r]" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "todo" + , Space + , Str "item" + ] + ] + , [ Plain + [ Str "[" + , Space + , Str "]" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "todo" + , Space + , Str "item" + ] + ] + , [ Plain + [ Span ( "" , [ "done2" ] , [] ) [] + , Str "a" + , Space + , Str "tab" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "todo" + , Space + , Str "list" + , Space + , Str "marker" + , Space + , Code ( "" , [] , [] ) "[ ]" + ] + , OrderedList + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain + [ Span ( "" , [ "done3" ] , [] ) [] + , Str "4" + , SoftBreak + , Str "5" + ] + ] + , [ Plain [ Span ( "" , [ "done4" ] , [] ) [] ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "a" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "b" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + ] + ] + , [ Plain + [ Span ( "" , [ "done4" ] , [] ) [] + , Str "task" + , Space + , Str "2" + ] + ] + ] + , Header 2 ( "math" , [] , [] ) [ Str "math" ] + , Para [ Math InlineMath " \\sum_i a_i^2 = 1 " ] + , Para [ Math DisplayMath "\\sum_i a_i^2\n=\n1" ] + , Para + [ Math + DisplayMath + "\\begin{aligned}\n\\sum_i a_i^2 &= 1 + 1 \\\\\n&= 2.\n\\end{aligned}" + ] + , Para + [ Str "edge" + , Space + , Str "case" + , Space + , Str "(the" + , Space + , Code ( "" , [] , [] ) "c^2 + " + , Space + , Str "after" + , Space + , Str "the" + , Space + , Str "multline" + , Space + , Str "tag" + , Space + , Str "is" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "equation):" + ] + , Para + [ Math + DisplayMath + "\\begin{gathered}\nc^2 + \na^2 + b^2\n\\end{gathered}" + ] + , Para + [ Str "edge" + , Space + , Str "case" + , Space + , Str "(the" + , Space + , Str "tag" + , Space + , Str "is" + , Space + , Code ( "" , [] , [] ) "hello%bye" + , Str ")" + ] + , Para + [ Math + DisplayMath + "\\begin{hello%bye}\n\\int_a^b f(x) dx\n\\end{hello%bye}" + ] + , Para + [ Str "Just" + , Space + , Str "two" + , Space + , Str "dollar" + , Space + , Str "signs:" + , Space + , Str "$$" + ] + , Para + [ Str "[not" + , Space + , Str "math]" + , Space + , Str "You" + , Space + , Str "have" + , Space + , Str "$1" + , SoftBreak + , Str "and" + , Space + , Str "I" + , Space + , Str "have" + , Space + , Str "$1." + ] + , Header 2 ( "tags" , [] , [] ) [ Str "tags" ] + , Para + [ Span ( "-tag-one" , [] , [] ) [ Str "" ] + , Span ( "tag-one" , [ "tag" ] , [] ) [ Str "tag-one" ] + , Space + , Span ( "-tag-two" , [] , [] ) [ Str "" ] + , Span ( "tag-two" , [ "tag" ] , [] ) [ Str "tag-two" ] + ] + , Header 2 ( "tables" , [] , [] ) [ Str "tables" ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Year" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Temperature" , Space , Str "(low)" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Temperature" , Space , Str "(high)" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1900" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "-10" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "25" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1910" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "-15" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "30" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1920" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "-10" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "32" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1930" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Emph [ Str "N/A" ] ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Emph [ Str "N/A" ] ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "1940" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "-2" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "40" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Header + 3 + ( "centered headerless tables" , [] , [] ) + [ Str "centered" + , Space + , Str "headerless" + , Space + , Str "tables" + ] + , Div + ( "" , [ "center" ] , [] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "a" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "b" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "c" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "d" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + ] + , Header 2 ( "paragraphs" , [] , [] ) [ Str "paragraphs" ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "first" + , Space + , Str "paragraph" + , SoftBreak + , Str "with" + , Space + , Str "two" + , Space + , Str "lines." + ] + , Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "second" + , Space + , Str "paragraph" + , Space + , Str "with" + , SoftBreak + , Str "two" + , Space + , Str "lines" + , Space + , Str "after" + , Space + , Str "many" + , Space + , Str "blank" + , Space + , Str "lines." + ] + , Header + 2 + ( "definition list" , [] , [] ) + [ Str "definition" , Space , Str "list" ] + , DefinitionList + [ ( [ Str "Term" , Space , Str "1" ] + , [ [ Plain [ Str "Definition" , Space , Str "1" ] ] ] + ) + , ( [ Str "Term" , Space , Str "2" ] + , [ [ Plain [ Str "Definition" , Space , Str "2" ] ] + , [ Plain [ Str "Definition" , Space , Str "3" ] ] + ] + ) + , ( [ Str "Term" + , Space + , Str "::" + , Space + , Span ( "separated" , [] , [] ) [] + , Strong [ Str "separated" ] + , Space + , Str "by" + , Space + , Str "::" + , Space + , Emph [ Str "double" , Space , Str "colons" ] + ] + , [ [ Plain [ Str "Def1" ] ] , [ Plain [ Str "Def2" ] ] ] + ) + , ( [ Str "Term" + , Space + , Str "with" + , Space + , Str "lots" + , Space + , Str "of" + , Space + , Str "trailing" + , Space + , Str "colons:::::::" + ] + , [ [ Plain [ Str "Definition" ] ] ] + ) + , ( [ Str "::" + , Space + , Str "This" + , Space + , Str "is" + , Space + , Str "::" + , Space + , Str "A" + , Space + , Str "term" + , Space + , Str "(rather" + , Space + , Str "than" + , Space + , Str "a" + , Space + , Str "definition)" + ] + , [ [ Plain + [ Str "and" + , Space + , Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "definition" + ] + ] + ] + ) + , ( [ Str "Term" + , Space + , Str "Without" + , Space + , Str "definitions" + ] + , [ [] ] + ) + , ( [ Str "Part" + , Space + , Str "::" + , Space + , Str "of" + , Space + , Str "::" + , Space + , Str "dt" + ] + , [ [ Plain + [ Str "part" , Space , Str "of" , Space , Str "::dd" ] + ] + ] + ) + ] + , DefinitionList + [ ( [] + , [ [ Plain + [ Str "Definition" + , Space + , Str "1" + , Space + , Str "without" + , Space + , Str "a" + , Space + , Str "term" + ] + ] + , [ Plain + [ Str "Definition" + , Space + , Str "2" + , Space + , Str "without" + , Space + , Str "a" + , Space + , Str "term" + ] + ] + ] + ) + ] + , DefinitionList + [ ( [ Str "T1" ] , [ [ Plain [ Str "D1" ] ] ] ) ] + , Para [ Str "new" , Space , Str "paragraph" ] + , DefinitionList + [ ( [ Str "T1" ] , [ [ Plain [ Str "D1" ] ] ] ) ] + , Para [ Str "Not::Definition" ] + , Para [ Str "Not" , Space , Str "::Definition" ] + , Para [ Str "::Not" , Space , Str "definition" ] + , BlockQuote + [ Plain [ Str "::" , Space , Str "blockquote" ] ] + , BlockQuote + [ Plain + [ Str "block" , Space , Str "::" , Space , Str "quote" ] + ] + , Header + 2 + ( "metadata placeholders" , [] , [] ) + [ Str "metadata" , Space , Str "placeholders" ] + , Para + [ Str "%this" + , Space + , Str "is" + , Space + , Str "not" + , Space + , Str "a" + , Space + , Str "placeholder" + ] + , Para + [ Str "placeholders" + , SoftBreak + , Str "serves" + , Space + , Str "as" + , Space + , Str "space" + , Space + , Str "/" + , Space + , Str "softbreak" + , Space + , Str "in" + , Space + , Str "paragraphs" + ] + , Header + 2 + ( "sup, sub" , [] , [] ) + [ Str "sup," , Space , Str "sub" ] + , Para [ Str "super" , Superscript [ Str "script" ] ] + , Para [ Str "sub" , Subscript [ Str "script" ] ] + , Header + 2 + ( "the todo mark" , [] , [] ) + [ Str "the" , Space , Str "todo" , Space , Str "mark" ] + , Para [ Span ( "" , [ "todo" ] , [] ) [ Str "TODO:" ] ] + , Header + 1 + ( "not implemented yet" , [] , [] ) + [ Emph + [ Span ( "not implemented yet" , [] , [] ) [] + , Strong + [ Str "not" + , Space + , Str "implemented" + , Space + , Str "yet" + ] + ] + ] + , Header + 2 + ( "tables with spans" , [] , [] ) + [ Str "tables" , Space , Str "with" , Space , Str "spans" ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "a" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "b" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "c" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "d" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "\\/" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "e" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str ">" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "f" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "\\/" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "\\/" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str ">" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "g" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "h" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str ">" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str ">" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str ">" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Header + 2 + ( "tables with multiple lines of headers" , [] , [] ) + [ Str "tables" + , Space + , Str "with" + , Space + , Str "multiple" + , Space + , Str "lines" + , Space + , Str "of" + , Space + , Str "headers" + ] + , Table + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "a" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "b" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "c" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "d" ] ] + ] + , Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "---" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "---" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) + , Header + 2 + ( "some other placeholders" , [] , [] ) + [ Str "some" + , Space + , Str "other" + , Space + , Str "placeholders" + ] + , Para + [ Code ( "" , [] , [] ) "template" + , Space + , Str "placeholder" + , Space + , Str "is" + , Space + , Str "ignored." + ] + , Para + [ Code ( "" , [] , [] ) "nohtml" + , Space + , Str "placeholder" + , Space + , Str "is" + , Space + , Str "ignored." + ] + ] diff --git a/test/vimwiki-reader.wiki b/test/vimwiki-reader.wiki --- a/test/vimwiki-reader.wiki +++ b/test/vimwiki-reader.wiki @@ -116,7 +116,18 @@ for i in range(1, 5): print(i) }}} - + +=== preformatted text with nested syntax === + +{{{sql +SELECT * FROM table +}}} + +=== empty preformatted text === + +{{{ +}}} + == block quotes == (indentation 4 spaces) This would be a blockquote in Vimwiki. It is not *highlighted* in Vim but diff --git a/test/writer.asciidoc b/test/writer.asciidoc --- a/test/writer.asciidoc +++ b/test/writer.asciidoc @@ -1,57 +1,38 @@ -Pandoc Test Suite -================= += Pandoc Test Suite John MacFarlane; Anonymous July 17, 2006 +:stem: latexmath This is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite. ''''' -[[headers]] -Headers -------- +== Headers -[[level-2-with-an-embedded-link]] -Level 2 with an link:/url[embedded link] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +=== Level 2 with an link:/url[embedded link] -[[level-3-with-emphasis]] -Level 3 with _emphasis_ -^^^^^^^^^^^^^^^^^^^^^^^ +==== Level 3 with _emphasis_ -[[level-4]] -Level 4 -+++++++ +===== Level 4 -[[level-5]] -Level 5 +====== Level 5 -[[level-1]] -Level 1 -------- +== Level 1 -[[level-2-with-emphasis]] -Level 2 with _emphasis_ -~~~~~~~~~~~~~~~~~~~~~~~ +=== Level 2 with _emphasis_ -[[level-3]] -Level 3 -^^^^^^^ +==== Level 3 with no blank line -[[level-2]] -Level 2 -~~~~~~~ +=== Level 2 with no blank line ''''' -[[paragraphs]] -Paragraphs ----------- +== Paragraphs Here’s a regular paragraph. @@ -59,24 +40,22 @@ Because a hard-wrapped line in the middle of a paragraph looked like a list item. -Here’s one with a bullet. * criminey. +Here’s one with a bullet. ++*++ criminey. There should be a hard line break + here. ''''' -[[block-quotes]] -Block Quotes ------------- +== Block Quotes E-mail style: -__________________________________________ +____ This is a block quote. It is pretty short. -__________________________________________ +____ -______________________ +____ -- Code in a block quote: @@ -88,31 +67,30 @@ A list: -1. item one -2. item two +[arabic] +. item one +. item two 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 Blocks ------------ +== Code Blocks Code: @@ -136,13 +114,9 @@ ''''' -[[lists]] -Lists ------ +== Lists -[[unordered]] -Unordered -~~~~~~~~~ +=== Unordered Asterisks tight: @@ -180,45 +154,46 @@ * Minus 2 * Minus 3 -[[ordered]] -Ordered -~~~~~~~ +=== Ordered Tight: -1. First -2. Second -3. Third +[arabic] +. First +. Second +. Third and: -1. One -2. Two -3. Three +[arabic] +. One +. Two +. Three Loose using tabs: -1. First -2. Second -3. Third +[arabic] +. First +. Second +. Third and using spaces: -1. One -2. Two -3. Three +[arabic] +. One +. Two +. Three Multiple paragraphs: -1. Item 1, graf one. +[arabic] +. Item 1, graf one. + Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. -2. Item 2. -3. Item 3. +. Item 2. +. Item 3. -[[nested]] -Nested -~~~~~~ +=== Nested * Tab ** Tab @@ -226,56 +201,61 @@ Here’s another: -1. First -2. Second: +[arabic] +. First +. Second: * Fee * Fie * Foe -3. Third +. Third Same thing but with paragraphs: -1. First -2. Second: +[arabic] +. First +. Second: * Fee * Fie * Foe -3. Third +. Third -[[tabs-and-spaces]] -Tabs and spaces -~~~~~~~~~~~~~~~ +=== Tabs and spaces * this is a list item indented with tabs * this is a list item indented with spaces ** this is an example list item indented with tabs ** this is an example list item indented with spaces -[[fancy-list-markers]] -Fancy list markers -~~~~~~~~~~~~~~~~~~ +=== Fancy list markers -1. begins with 2 -2. and now 3 +[arabic, start=2] +. begins with 2 +. and now 3 + with a continuation -a. sublist with roman numerals, starting with 4 -b. more items -A. a subsublist -B. a subsublist +[lowerroman, start=4] +.. sublist with roman numerals, starting with 4 +.. more items +[upperalpha] +... a subsublist +... a subsublist Nesting: -A. Upper Alpha -A. Upper Roman. -1. Decimal start with 6 -a. Lower alpha with paren +[upperalpha] +. Upper Alpha +[upperroman] +.. Upper Roman. +[arabic, start=6] +... Decimal start with 6 +[loweralpha, start=3] +.... Lower alpha with paren Autonumbering: -1. Autonumber. -2. More. -1. Nested. +. Autonumber. +. More. +.. Nested. Should not be a list item: @@ -285,9 +265,7 @@ ''''' -[[definition-lists]] -Definition Lists ----------------- +== Definition Lists Tight using spaces: @@ -329,9 +307,9 @@ { orange code block } .... + - __________________ + ____ orange block quote - __________________ + ____ Multiple definitions, tight: @@ -364,12 +342,11 @@ orange:: orange fruit + - 1. sublist - 2. sublist + [arabic] + . sublist + . sublist -[[html-blocks]] -HTML Blocks ------------ +== HTML Blocks Simple block on one line: @@ -431,9 +408,7 @@ ''''' -[[inline-markup]] -Inline Markup -------------- +== Inline Markup This is _emphasized_, and so _is this_. @@ -449,33 +424,31 @@ So is *_this_* word. -This is code: `>`, `$`, `\`, `\$`, ``. +This is code: `++>++`, `$`, `++\++`, `++\++$`, `++<++html++>++`. -[line-through]*This is _strikeout_.* +[line-through]#This is _strikeout_.# Superscripts: a^bc^d a^_hello_^ a^hello there^. Subscripts: H~2~O, H~23~O, H~many of them~O. -These should not be superscripts or subscripts, because of the unescaped -spaces: a^b c^d, a~b c~d. +These should not be superscripts or subscripts, because of the unescaped spaces: +a^b c^d, a~b c~d. ''''' -[[smart-quotes-ellipses-dashes]] -Smart quotes, ellipses, dashes ------------------------------- +== 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. +'`A`', '`B`', and '`C`' are letters. -`Oak,' `elm,' and `beech' are names of trees. So is `pine.' +'`Oak,`' '`elm,`' and '`beech`' are names of trees. So is '`pine.`' -`He said, ``I want to go.''' Were you alive in the 70’s? +'`He said, "`I want to go.`"`' Were you alive in the 70’s? -Here is some quoted ``code`' and a ``http://example.com/?foo=1&bar=2[quoted -link]''. +Here is some quoted '``code``' and a "`http://example.com/?foo=1&bar=2[quoted +link]`". Some dashes: one—two — three—four — five. @@ -485,25 +458,27 @@ ''''' -[[latex]] -LaTeX ------ +== LaTeX * -* latexmath:[$2+2=4$] -* latexmath:[$x \in y$] -* latexmath:[$\alpha \wedge \omega$] -* latexmath:[$223$] -* latexmath:[$p$]-Tree +* latexmath:[2+2=4] +* latexmath:[x \in y] +* latexmath:[\alpha \wedge \omega] +* latexmath:[223] +* latexmath:[p]-Tree * Here’s some display math: -latexmath:[\[\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}\]] ++ +[latexmath] +++++ +\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h} +++++ * Here’s one that has a line break in it: -latexmath:[$\alpha + \omega \times x^2$]. +latexmath:[\alpha + \omega \times x^2]. These shouldn’t be math: * To get the famous equation, write `$e = mc^2$`. -* $22,000 is a _lot_ of money. So is $34,000. (It worked if ``lot'' is +* $22,000 is a _lot_ of money. So is $34,000. (It worked if "`lot`" is emphasized.) * Shoes ($20) and socks ($5). * Escaped `$`: $73 _this should be emphasized_ 23$. @@ -512,9 +487,7 @@ ''''' -[[special-characters]] -Special Characters ------------------- +== Special Characters Here is some unicode: @@ -530,51 +503,47 @@ This & that. -4 < 5. +4 ++<++ 5. -6 > 5. +6 ++>++ 5. -Backslash: \ +Backslash: ++\++ -Backtick: ` +Backtick: ++`++ -Asterisk: * +Asterisk: ++*++ -Underscore: _ +Underscore: ++_++ -Left brace: \{ +Left brace: ++{++ Right brace: } -Left bracket: [ +Left bracket: ++[++ -Right bracket: ] +Right bracket: ++]++ Left paren: ( Right paren: ) -Greater-than: > +Greater-than: ++>++ -Hash: # +Hash: ++#++ Period: . Bang: ! -Plus: + +Plus: {plus} Minus: - ''''' -[[links]] -Links ------ +== Links -[[explicit]] -Explicit -~~~~~~~~ +=== Explicit Just a link:/url/[URL]. @@ -588,19 +557,17 @@ link:/url/[URL and title] -link:/url/with_underscore[with_underscore] +link:/url/with_underscore[with++_++underscore] mailto:nobody@nowhere.net[Email link] link:[Empty]. -[[reference]] -Reference -~~~~~~~~~ +=== Reference Foo link:/url/[bar]. -With link:/url/[embedded [brackets]]. +With link:/url/[embedded ++[++brackets++]++]. link:/url/[b] by itself should be a link. @@ -610,7 +577,7 @@ Indented link:/url[thrice]. -This should [not][] be a link. +This should ++[++not++][]++ be a link. .... [not]: /url @@ -620,9 +587,7 @@ Foo link:/url/[biz]. -[[with-ampersands]] -With ampersands -~~~~~~~~~~~~~~~ +=== With ampersands Here’s a http://example.com/?foo=1&bar=2[link with an ampersand in the URL]. @@ -632,9 +597,7 @@ Here’s an link:/script?foo=1&bar=2[inline link in pointy braces]. -[[autolinks]] -Autolinks -~~~~~~~~~ +=== Autolinks With an ampersand: http://example.com/?foo=1&bar=2 @@ -644,11 +607,11 @@ 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: @@ -656,34 +619,32 @@ ''''' -[[images]] -Images ------- +== Images -From ``Voyage dans la Lune'' by Georges Melies (1902): +From "`Voyage dans la Lune`" by Georges Melies (1902): -image:lalune.jpg[lalune,title="Voyage dans la Lune"] +.lalune +image::lalune.jpg[lalune,title="Voyage dans la Lune"] Here is a movie image:movie.jpg[movie] icon. ''''' -[[footnotes]] -Footnotes ---------- +== Footnotes -Here is a footnote reference,footnote:[Here is the footnote. It can go -anywhere after the footnote reference. It need not be placed at the end of the -document.] and another.[multiblock footnote omitted] This should _not_ be a -footnote reference, because it contains a space.[^my note] Here is an inline +Here is a footnote reference,footnote:[Here is the footnote. It can go anywhere +after the footnote reference. It need not be placed at the end of the document.] +and another.[multiblock footnote omitted] This should _not_ be a footnote +reference, because it contains a space.++[++^my note++]++ Here is an inline note.footnote:[This is _easier_ to type. Inline notes may contain -http://google.com[links] and `]` verbatim characters, as well as [bracketed -text].] +http://google.com[links] and `++]++` verbatim characters, as well as +++[++bracketed text++]++.] -___________________________________________ +____ Notes can go in quotes.footnote:[In quote.] -___________________________________________ +____ -1. And in list items.footnote:[In list.] +[arabic] +. And in list items.footnote:[In list.] This paragraph should not be part of the note, as it is not indented. diff --git a/test/writer.asciidoc_legacy b/test/writer.asciidoc_legacy new file mode 100644 --- /dev/null +++ b/test/writer.asciidoc_legacy @@ -0,0 +1,649 @@ += Pandoc Test Suite +John MacFarlane; Anonymous +July 17, 2006 + +This is a set of tests for pandoc. Most of them are adapted from John Gruber’s +markdown test suite. + +''''' + +== Headers + +=== Level 2 with an link:/url[embedded link] + +==== Level 3 with _emphasis_ + +===== Level 4 + +====== Level 5 + +== Level 1 + +=== Level 2 with _emphasis_ + +==== Level 3 + +with no blank line + +=== Level 2 + +with no blank line + +''''' + +== Paragraphs + +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 of a paragraph looked like a list +item. + +Here’s one with a bullet. ++*++ criminey. + +There should be a hard line break + +here. + +''''' + +== Block Quotes + +E-mail style: + +____ +This is a block quote. It is pretty short. +____ + +____ +-- +Code in a block quote: + +.... +sub status { + print "working"; +} +.... + +A list: + +[arabic] +. item one +. item two + +Nested block quotes: + +____ +nested +____ + +____ +nested +____ + +-- +____ + +This should not be a block quote: 2 ++>++ 1. + +And a following paragraph. + +''''' + +== Code Blocks + +Code: + +.... +---- (should be four hyphens) + +sub status { + print "working"; +} + +this code block is indented by one tab +.... + +And: + +.... + this code block is indented by two tabs + +These should not be escaped: \$ \\ \> \[ \{ +.... + +''''' + +== Lists + +=== Unordered + +Asterisks tight: + +* asterisk 1 +* asterisk 2 +* asterisk 3 + +Asterisks loose: + +* asterisk 1 +* asterisk 2 +* asterisk 3 + +Pluses tight: + +* Plus 1 +* Plus 2 +* Plus 3 + +Pluses loose: + +* Plus 1 +* Plus 2 +* Plus 3 + +Minuses tight: + +* Minus 1 +* Minus 2 +* Minus 3 + +Minuses loose: + +* Minus 1 +* Minus 2 +* Minus 3 + +=== Ordered + +Tight: + +[arabic] +. First +. Second +. Third + +and: + +[arabic] +. One +. Two +. Three + +Loose using tabs: + +[arabic] +. First +. Second +. Third + +and using spaces: + +[arabic] +. One +. Two +. Three + +Multiple paragraphs: + +[arabic] +. Item 1, graf one. ++ +Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. +. Item 2. +. Item 3. + +=== Nested + +* Tab +** Tab +*** Tab + +Here’s another: + +[arabic] +. First +. Second: +* Fee +* Fie +* Foe +. Third + +Same thing but with paragraphs: + +[arabic] +. First +. Second: +* Fee +* Fie +* Foe +. Third + +=== Tabs and spaces + +* this is a list item indented with tabs +* this is a list item indented with spaces +** this is an example list item indented with tabs +** this is an example list item indented with spaces + +=== Fancy list markers + +[arabic, start=2] +. begins with 2 +. and now 3 ++ +with a continuation +[lowerroman, start=4] +.. sublist with roman numerals, starting with 4 +.. more items +[upperalpha] +... a subsublist +... a subsublist + +Nesting: + +[upperalpha] +. Upper Alpha +[upperroman] +.. Upper Roman. +[arabic, start=6] +... Decimal start with 6 +[loweralpha, start=3] +.... Lower alpha with paren + +Autonumbering: + +. Autonumber. +. More. +.. Nested. + +Should not be a list item: + +M.A. 2007 + +B. Williams + +''''' + +== Definition Lists + +Tight using spaces: + +apple:: + red fruit +orange:: + orange fruit +banana:: + yellow fruit + +Tight using tabs: + +apple:: + red fruit +orange:: + orange fruit +banana:: + yellow fruit + +Loose: + +apple:: + red fruit +orange:: + orange fruit +banana:: + yellow fruit + +Multiple blocks with italics: + +_apple_:: + red fruit + + + contains seeds, crisp, pleasant to taste +_orange_:: + orange fruit + + +.... +{ orange code block } +.... + + + ____ + orange block quote + ____ + +Multiple definitions, tight: + +apple:: + red fruit + + + computer +orange:: + orange fruit + + + bank + +Multiple definitions, loose: + +apple:: + red fruit + + + computer +orange:: + orange fruit + + + bank + +Blank line after term, indented marker, alternate markers: + +apple:: + red fruit + + + computer +orange:: + orange fruit + + + [arabic] + . sublist + . sublist + +== HTML Blocks + +Simple block on one line: + +foo + +And nested without indentation: + +foo + +bar + +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: + +.... +
    + foo +
    +.... + +As should this: + +.... +
    foo
    +.... + +Now, nested: + +foo + +This should just be an HTML comment: + +Multiline: + +Code block: + +.... + +.... + +Just plain comment, with trailing spaces on the line: + +Code: + +.... +
    +.... + +Hr’s: + +''''' + +== Inline Markup + +This is _emphasized_, and so _is this_. + +This is *strong*, and so *is this*. + +An _link:/url[emphasized link]_. + +*_This is strong and em._* + +So is *_this_* word. + +*_This is strong and em._* + +So is *_this_* word. + +This is code: `>`, `$`, `\`, `\$`, ``. + +[line-through]#This is _strikeout_.# + +Superscripts: a^bc^d a^_hello_^ a^hello there^. + +Subscripts: H~2~O, H~23~O, H~many of them~O. + +These should not be superscripts or subscripts, because of the unescaped spaces: +a^b c^d, a~b c~d. + +''''' + +== Smart quotes, ellipses, dashes + +``Hello,'' said the spider. ```Shelob' is my name.'' + +`A', `B', and `C' are letters. + +`Oak,' `elm,' and `beech' are names of trees. So is `pine.' + +`He said, ``I want to go.''' Were you alive in the 70’s? + +Here is some quoted ``code`' and a ``http://example.com/?foo=1&bar=2[quoted +link]''. + +Some dashes: one—two — three—four — five. + +Dashes between numbers: 5–7, 255–66, 1987–1999. + +Ellipses…and…and…. + +''''' + +== LaTeX + +* +* latexmath:[$2+2=4$] +* latexmath:[$x \in y$] +* latexmath:[$\alpha \wedge \omega$] +* latexmath:[$223$] +* latexmath:[$p$]-Tree +* Here’s some display math: ++ +[latexmath] +++++ +\[\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}\] +++++ +* Here’s one that has a line break in it: +latexmath:[$\alpha + \omega \times x^2$]. + +These shouldn’t be math: + +* To get the famous equation, write `$e = mc^2$`. +* $22,000 is a _lot_ of money. So is $34,000. (It worked if ``lot'' is +emphasized.) +* Shoes ($20) and socks ($5). +* Escaped `$`: $73 _this should be emphasized_ 23$. + +Here’s a LaTeX table: + +''''' + +== Special Characters + +Here is some unicode: + +* I hat: Î +* o umlaut: ö +* section: § +* set membership: ∈ +* copyright: © + +AT&T has an ampersand in their name. + +AT&T is another way to write it. + +This & that. + +4 ++<++ 5. + +6 ++>++ 5. + +Backslash: ++\++ + +Backtick: ++`++ + +Asterisk: ++*++ + +Underscore: ++_++ + +Left brace: ++{++ + +Right brace: } + +Left bracket: ++[++ + +Right bracket: ++]++ + +Left paren: ( + +Right paren: ) + +Greater-than: ++>++ + +Hash: ++#++ + +Period: . + +Bang: ! + +Plus: {plus} + +Minus: - + +''''' + +== Links + +=== Explicit + +Just a link:/url/[URL]. + +link:/url/[URL and title]. + +link:/url/[URL and title]. + +link:/url/[URL and title]. + +link:/url/[URL and title] + +link:/url/[URL and title] + +link:/url/with_underscore[with++_++underscore] + +mailto:nobody@nowhere.net[Email link] + +link:[Empty]. + +=== Reference + +Foo link:/url/[bar]. + +With link:/url/[embedded ++[++brackets++]++]. + +link:/url/[b] by itself should be a link. + +Indented link:/url[once]. + +Indented link:/url[twice]. + +Indented link:/url[thrice]. + +This should ++[++not++][]++ be a link. + +.... +[not]: /url +.... + +Foo link:/url/[bar]. + +Foo link:/url/[biz]. + +=== With ampersands + +Here’s a http://example.com/?foo=1&bar=2[link with an ampersand in the URL]. + +Here’s a link with an amersand in the link text: http://att.com/[AT&T]. + +Here’s an link:/script?foo=1&bar=2[inline link]. + +Here’s an link:/script?foo=1&bar=2[inline link in pointy braces]. + +=== Autolinks + +With an ampersand: http://example.com/?foo=1&bar=2 + +* In a list? +* http://example.com/ +* It should. + +An e-mail address: nobody@nowhere.net + +____ +Blockquoted: http://example.com/ +____ + +Auto-links should not occur here: `` + +.... +or here: +.... + +''''' + +== Images + +From ``Voyage dans la Lune'' by Georges Melies (1902): + +.lalune +image::lalune.jpg[lalune,title="Voyage dans la Lune"] + +Here is a movie image:movie.jpg[movie] icon. + +''''' + +== Footnotes + +Here is a footnote reference,footnote:[Here is the footnote. It can go anywhere +after the footnote reference. It need not be placed at the end of the document.] +and another.[multiblock footnote omitted] This should _not_ be a footnote +reference, because it contains a space.++[++^my note++]++ Here is an inline +note.footnote:[This is _easier_ to type. Inline notes may contain +http://google.com[links] and `]` verbatim characters, as well as ++[++bracketed +text++]++.] + +____ +Notes can go in quotes.footnote:[In quote.] +____ + +[arabic] +. And in list items.footnote:[In list.] + +This paragraph should not be part of the note, as it is not indented. diff --git a/test/writer.bbcode b/test/writer.bbcode new file mode 100644 --- /dev/null +++ b/test/writer.bbcode @@ -0,0 +1,729 @@ +This is a set of tests for pandoc. Most of them are adapted from John Gruber's markdown test suite. + +* * * + +[u][b]Headers[/b][/u] + +[b]Level 2 with an [url=/url]embedded link[/url][/b] + +[u]Level 3 with [i]emphasis[/i][/u] + +Level 4 + +Level 5 + +[u][b]Level 1[/b][/u] + +[b]Level 2 with [i]emphasis[/i][/b] + +[u]Level 3[/u] + +with no blank line + +[b]Level 2[/b] + +with no blank line + +* * * + +[u][b]Paragraphs[/b][/u] + +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 of a paragraph looked like a list item. + +Here's one with a bullet. * criminey. + +There should be a hard line break +here. + +* * * + +[u][b]Block Quotes[/b][/u] + +E-mail style: + +[quote] +This is a block quote. It is pretty short. +[/quote] + +[quote] +Code in a block quote: + +[code]sub status { + print "working"; +} +[/code] + +A list: + +[list=1] +[*]item one +[*]item two +[/list] + +Nested block quotes: + +[quote] +nested +[/quote] + +[quote] +nested +[/quote] +[/quote] + +This should not be a block quote: 2 > 1. + +And a following paragraph. + +* * * + +[u][b]Code Blocks[/b][/u] + +Code: + +[code]---- (should be four hyphens) + +sub status { + print "working"; +} + +this code block is indented by one tab +[/code] + +And: + +[code] this code block is indented by two tabs + +These should not be escaped: \$ \\ \> \[ \{ +[/code] + +* * * + +[u][b]Lists[/b][/u] + +[b]Unordered[/b] + +Asterisks tight: + +[list] +[*]asterisk 1 +[*]asterisk 2 +[*]asterisk 3 +[/list] + +Asterisks loose: + +[list] +[*]asterisk 1 +[*]asterisk 2 +[*]asterisk 3 +[/list] + +Pluses tight: + +[list] +[*]Plus 1 +[*]Plus 2 +[*]Plus 3 +[/list] + +Pluses loose: + +[list] +[*]Plus 1 +[*]Plus 2 +[*]Plus 3 +[/list] + +Minuses tight: + +[list] +[*]Minus 1 +[*]Minus 2 +[*]Minus 3 +[/list] + +Minuses loose: + +[list] +[*]Minus 1 +[*]Minus 2 +[*]Minus 3 +[/list] + +[b]Ordered[/b] + +Tight: + +[list=1] +[*]First +[*]Second +[*]Third +[/list] + +and: + +[list=1] +[*]One +[*]Two +[*]Three +[/list] + +Loose using tabs: + +[list=1] +[*]First +[*]Second +[*]Third +[/list] + +and using spaces: + +[list=1] +[*]One +[*]Two +[*]Three +[/list] + +Multiple paragraphs: + +[list=1] +[*]Item 1, graf one. + +Item 1. graf two. The quick brown fox jumped over the lazy dog's back. +[*]Item 2. +[*]Item 3. +[/list] + +[b]Nested[/b] + +[list] +[*]Tab + +[list] +[*]Tab + +[list] +[*]Tab +[/list] +[/list] +[/list] + +Here's another: + +[list=1] +[*]First +[*]Second: + +[list] +[*]Fee +[*]Fie +[*]Foe +[/list] +[*]Third +[/list] + +Same thing but with paragraphs: + +[list=1] +[*]First +[*]Second: + +[list] +[*]Fee +[*]Fie +[*]Foe +[/list] +[*]Third +[/list] + +[b]Tabs and spaces[/b] + +[list] +[*]this is a list item indented with tabs +[*]this is a list item indented with spaces + +[list] +[*]this is an example list item indented with tabs +[*]this is an example list item indented with spaces +[/list] +[/list] + +[b]Fancy list markers[/b] + +[list=1] +[*]begins with 2 +[*]and now 3 + +with a continuation + +[list=i] +[*]sublist with roman numerals, starting with 4 +[*]more items + +[list=A] +[*]a subsublist +[*]a subsublist +[/list] +[/list] +[/list] + +Nesting: + +[list=A] +[*]Upper Alpha + +[list=I] +[*]Upper Roman. + +[list=1] +[*]Decimal start with 6 + +[list=a] +[*]Lower alpha with paren +[/list] +[/list] +[/list] +[/list] + +Autonumbering: + +[list=1] +[*]Autonumber. +[*]More. + +[list=1] +[*]Nested. +[/list] +[/list] + +Should not be a list item: + +M.A. 2007 + +B. Williams + +* * * + +[u][b]Definition Lists[/b][/u] + +Tight using spaces: + +apple +[list] +[*]red fruit +[/list] +orange +[list] +[*]orange fruit +[/list] +banana +[list] +[*]yellow fruit +[/list] + +Tight using tabs: + +apple +[list] +[*]red fruit +[/list] +orange +[list] +[*]orange fruit +[/list] +banana +[list] +[*]yellow fruit +[/list] + +Loose: + +apple +[list] +[*]red fruit +[/list] +orange +[list] +[*]orange fruit +[/list] +banana +[list] +[*]yellow fruit +[/list] + +Multiple blocks with italics: + +[i]apple[/i] +[list] +[*]red fruit + +contains seeds, crisp, pleasant to taste +[/list] +[i]orange[/i] +[list] +[*]orange fruit + +[code]{ orange code block } +[/code] + +[quote] +orange block quote +[/quote] +[/list] + +Multiple definitions, tight: + +apple +[list] +[*]red fruit +[*]computer +[/list] +orange +[list] +[*]orange fruit +[*]bank +[/list] + +Multiple definitions, loose: + +apple +[list] +[*]red fruit +[*]computer +[/list] +orange +[list] +[*]orange fruit +[*]bank +[/list] + +Blank line after term, indented marker, alternate markers: + +apple +[list] +[*]red fruit +[*]computer +[/list] +orange +[list] +[*]orange fruit + +[list=1] +[*]sublist +[*]sublist +[/list] +[/list] + +[u][b]HTML Blocks[/b][/u] + +Simple block on one line: + +foo + +And nested without indentation: + +foo + +bar + +Interpreted markdown in a table: + +This is [i]emphasized[/i] + +And this is [b]strong[/b] + +Here's a simple block: + +foo + +This should be a code block, though: + +[code]
    + foo +
    +[/code] + +As should this: + +[code]
    foo
    +[/code] + +Now, nested: + +foo + +This should just be an HTML comment: + +Multiline: + +Code block: + +[code] +[/code] + +Just plain comment, with trailing spaces on the line: + +Code: + +[code]
    +[/code] + +Hr's: + +* * * + +[u][b]Inline Markup[/b][/u] + +This is [i]emphasized[/i], and so [i]is this[/i]. + +This is [b]strong[/b], and so [b]is this[/b]. + +An [i][url=/url]emphasized link[/url][/i]. + +[b][i]This is strong and em.[/i][/b] + +So is [b][i]this[/i][/b] word. + +[b][i]This is strong and em.[/i][/b] + +So is [b][i]this[/i][/b] word. + +This is code: >, $, \, \$, . + +[s]This is [i]strikeout[/i].[/s] + +Superscripts: abcd a[i]hello[/i] ahello there. + +Subscripts: H2O, H23O, Hmany of themO. + +These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d. + +* * * + +[u][b]Smart quotes, ellipses, dashes[/b][/u] + +"Hello," said the spider. "'Shelob' is my name." + +'A', 'B', and 'C' are letters. + +'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.' + +'He said, "I want to go."' Were you alive in the 70's? + +Here is some quoted 'code' and a "[url=http://example.com/?foo=1&bar=2]quoted link[/url]". + +Some dashes: one---two --- three---four --- five. + +Dashes between numbers: 5--7, 255--66, 1987--1999. + +Ellipses...and...and.... + +* * * + +[u][b]LaTeX[/b][/u] + +[list] +[*] +[*]$2+2=4$ +[*]$x \in y$ +[*]$\alpha \wedge \omega$ +[*]$223$ +[*]$p$-Tree +[*]Here's some display math: [code=latex]$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ +[/code] +[*]Here's one that has a line break in it: $\alpha + \omega \times x^2$. +[/list] + +These shouldn't be math: + +[list] +[*]To get the famous equation, write $e = mc^2$. +[*]$22,000 is a [i]lot[/i] of money. So is $34,000. (It worked if "lot" is emphasized.) +[*]Shoes ($20) and socks ($5). +[*]Escaped $: $73 [i]this should be emphasized[/i] 23$. +[/list] + +Here's a LaTeX table: + +* * * + +[u][b]Special Characters[/b][/u] + +Here is some unicode: + +[list] +[*]I hat: Î +[*]o umlaut: ö +[*]section: § +[*]set membership: ∈ +[*]copyright: © +[/list] + +AT&T has an ampersand in their name. + +AT&T is another way to write it. + +This & that. + +4 < 5. + +6 > 5. + +Backslash: \ + +Backtick: ` + +Asterisk: * + +Underscore: _ + +Left brace: { + +Right brace: } + +Left bracket: [ + +Right bracket: ] + +Left paren: ( + +Right paren: ) + +Greater-than: > + +Hash: # + +Period: . + +Bang: ! + +Plus: + + +Minus: - + +* * * + +[u][b]Links[/b][/u] + +[b]Explicit[/b] + +Just a [url=/url/]URL[/url]. + +[url=/url/]URL and title[/url]. + +[url=/url/]URL and title[/url]. + +[url=/url/]URL and title[/url]. + +[url=/url/]URL and title[/url] + +[url=/url/]URL and title[/url] + +[url=/url/with_underscore]with_underscore[/url] + +[email=nobody@nowhere.net]Email link[/email] + +[url]Empty[/url]. + +[b]Reference[/b] + +Foo [url=/url/]bar[/url]. + +With [url=/url/]embedded [brackets][/url]. + +[url=/url/]b[/url] by itself should be a link. + +Indented [url=/url]once[/url]. + +Indented [url=/url]twice[/url]. + +Indented [url=/url]thrice[/url]. + +This should [not][] be a link. + +[code][not]: /url +[/code] + +Foo [url=/url/]bar[/url]. + +Foo [url=/url/]biz[/url]. + +[b]With ampersands[/b] + +Here's a [url=http://example.com/?foo=1&bar=2]link with an ampersand in the URL[/url]. + +Here's a link with an amersand in the link text: [url=http://att.com/]AT&T[/url]. + +Here's an [url=/script?foo=1&bar=2]inline link[/url]. + +Here's an [url=/script?foo=1&bar=2]inline link in pointy braces[/url]. + +[b]Autolinks[/b] + +With an ampersand: [url]http://example.com/?foo=1&bar=2[/url] + +[list] +[*]In a list? +[*][url]http://example.com/[/url] +[*]It should. +[/list] + +An e-mail address: [email]nobody@nowhere.net[/email] + +[quote] +Blockquoted: [url]http://example.com/[/url] +[/quote] + +Auto-links should not occur here: + +[code]or here: +[/code] + +* * * + +[u][b]Images[/b][/u] + +From "Voyage dans la Lune" by Georges Melies (1902): + +[img alt="lalune" title="Voyage dans la Lune"]lalune.jpg[/img] +lalune + +Here is a movie [img alt="movie"]movie.jpg[/img] icon. + +* * * + +[u][b]Footnotes[/b][/u] + +Here is a footnote reference,(1) and another.(2) This should [i]not[/i] be a footnote reference, because it contains a space.[^my note] Here is an inline note.(3) + +[quote] +Notes can go in quotes.(4) +[/quote] + +[list=1] +[*]And in list items.(5) +[/list] + +This paragraph should not be part of the note, as it is not indented. + +* * * + +(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) 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] { } +[/code] + +If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. + +(3) This is [i]easier[/i] to type. Inline notes may contain [url=http://google.com]links[/url] and ] verbatim characters, as well as [bracketed text]. + +(4) In quote. + +(5) In list. diff --git a/test/writer.context b/test/writer.context --- a/test/writer.context +++ b/test/writer.context @@ -6,22 +6,25 @@ style=, color=, contrastcolor=] +\setupurl[style=] % make chapter, section bookmarks visible when opening document \placebookmarks[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][chapter, section] -\setupinteractionscreen[option=bookmark] -\setuptagging[state=start] +\setupinteractionscreen[option={bookmark,title}] +\setuppagenumbering[location={footer,middle}] +\setupstructure[state=start,method=auto] % use microtypography \definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes] +\definefontfeature[default:tnum][default][tnum=yes, pnum=no] \definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes] \setupalign[hz,hanging] \setupitaliccorrection[global, always] \setupbodyfontenvironment[default][em=italic] % use italic as em, not slanted -\definefallbackfamily[mainface][rm][DejaVu Serif][preset=range:greek, force=yes] +\definefallbackfamily[mainface][rm][CMU Serif][preset=range:greek, force=yes] \definefontfamily[mainface][rm][Latin Modern Roman] \definefontfamily[mainface][mm][Latin Modern Math] \definefontfamily[mainface][ss][Latin Modern Sans] @@ -30,13 +33,17 @@ \setupwhitespace[medium] -\setuphead[chapter] [style=\tfd,header=empty] -\setuphead[section] [style=\tfc] -\setuphead[subsection] [style=\tfb] +\setuphead[chapter] [style=\tfd\setupinterlinespace,header=empty] +\setuphead[section] [style=\tfc\setupinterlinespace] +\setuphead[subsection] [style=\tfb\setupinterlinespace] \setuphead[subsubsection] [style=\bf] \setuphead[subsubsubsection] [style=\sc] \setuphead[subsubsubsubsection][style=\it] +\definesectionlevels + [default] + [section, subsection, subsubsection, subsubsubsection, subsubsubsubsection] + \setuphead[chapter, section, subsection, subsubsection, subsubsubsection, subsubsubsubsection][number=no] \definedescription @@ -46,19 +53,26 @@ \setupitemize[autointro] % prevent orphan list intro \setupitemize[indentnext=no] +\defineitemgroup[enumerate] +\setupenumerate[each][fit][itemalign=left,distance=.5em,style={\feature[+][default:tnum]}] + \setupfloat[figure][default={here,nonumber}] \setupfloat[table][default={here,nonumber}] -\setupthinrules[width=15em] % width of horizontal rules +\setupxtable[frame=off] +\setupxtable[head][topframe=on] +\setupxtable[body][] +\setupxtable[foot][] +\setupxtable[lastrow][bottomframe=on] \starttext \startalignment[middle] - {\tfd Pandoc Test Suite} + {\tfd\setupinterlinespace Pandoc Test Suite} \smallskip - {\tfa John MacFarlane\crlf Anonymous} + {\tfa\setupinterlinespace John MacFarlane\crlf Anonymous} \smallskip - {\tfa July 17, 2006} + {\tfa\setupinterlinespace July 17, 2006} \bigskip \stopalignment @@ -67,33 +81,53 @@ \thinrule -\section[headers]{Headers} +\startsectionlevel[title={Headers},reference={headers}] -\subsection[level-2-with-an-embedded-link]{Level 2 with an -\useURL[url1][/url][][embedded link]\from[url1]} +\startsectionlevel[title={Level 2 with an \goto{embedded +link}[url(/url)]},reference={level-2-with-an-embedded-link}] -\subsubsection[level-3-with-emphasis]{Level 3 with {\em emphasis}} +\startsectionlevel[title={Level 3 with {\em +emphasis}},reference={level-3-with-emphasis}] -\subsubsubsection[level-4]{Level 4} +\startsectionlevel[title={Level 4},reference={level-4}] -\subsubsubsubsection[level-5]{Level 5} +\startsectionlevel[title={Level 5},reference={level-5}] -\section[level-1]{Level 1} +\stopsectionlevel -\subsection[level-2-with-emphasis]{Level 2 with {\em emphasis}} +\stopsectionlevel -\subsubsection[level-3]{Level 3} +\stopsectionlevel +\stopsectionlevel + +\stopsectionlevel + +\startsectionlevel[title={Level 1},reference={level-1}] + +\startsectionlevel[title={Level 2 with {\em +emphasis}},reference={level-2-with-emphasis}] + +\startsectionlevel[title={Level 3},reference={level-3}] + with no blank line -\subsection[level-2]{Level 2} +\stopsectionlevel +\stopsectionlevel + +\startsectionlevel[title={Level 2},reference={level-2}] + with no blank line \thinrule -\section[paragraphs]{Paragraphs} +\stopsectionlevel +\stopsectionlevel + +\startsectionlevel[title={Paragraphs},reference={paragraphs}] + Here's a regular paragraph. In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item. @@ -107,8 +141,10 @@ \thinrule -\section[block-quotes]{Block Quotes} +\stopsectionlevel +\startsectionlevel[title={Block Quotes},reference={block-quotes}] + E-mail style: \startblockquote @@ -126,12 +162,12 @@ A list: -\startitemize[n,packed][stopper=.] +\startenumerate[n,packed][stopper=.] \item item one \item item two -\stopitemize +\stopenumerate Nested block quotes: @@ -150,8 +186,10 @@ \thinrule -\section[code-blocks]{Code Blocks} +\stopsectionlevel +\startsectionlevel[title={Code Blocks},reference={code-blocks}] + Code: \starttyping @@ -174,10 +212,12 @@ \thinrule -\section[lists]{Lists} +\stopsectionlevel -\subsection[unordered]{Unordered} +\startsectionlevel[title={Lists},reference={lists}] +\startsectionlevel[title={Unordered},reference={unordered}] + Asterisks tight: \startitemize[packed] @@ -244,55 +284,57 @@ Minus 3 \stopitemize -\subsection[ordered]{Ordered} +\stopsectionlevel +\startsectionlevel[title={Ordered},reference={ordered}] + Tight: -\startitemize[n,packed][stopper=.] +\startenumerate[n,packed][stopper=.] \item First \item Second \item Third -\stopitemize +\stopenumerate and: -\startitemize[n,packed][stopper=.] +\startenumerate[n,packed][stopper=.] \item One \item Two \item Three -\stopitemize +\stopenumerate Loose using tabs: -\startitemize[n][stopper=.] +\startenumerate[n][stopper=.] \item First \item Second \item Third -\stopitemize +\stopenumerate and using spaces: -\startitemize[n][stopper=.] +\startenumerate[n][stopper=.] \item One \item Two \item Three -\stopitemize +\stopenumerate Multiple paragraphs: -\startitemize[n][stopper=.] +\startenumerate[n][stopper=.] \item Item 1, graf one. @@ -301,10 +343,12 @@ Item 2. \item Item 3. -\stopitemize +\stopenumerate -\subsection[nested]{Nested} +\stopsectionlevel +\startsectionlevel[title={Nested},reference={nested}] + \startitemize[packed] \item Tab @@ -320,7 +364,7 @@ Here's another: -\startitemize[n,packed][stopper=.] +\startenumerate[n,packed][stopper=.] \item First \item @@ -335,11 +379,11 @@ \stopitemize \item Third -\stopitemize +\stopenumerate Same thing but with paragraphs: -\startitemize[n][stopper=.] +\startenumerate[n][stopper=.] \item First \item @@ -355,10 +399,12 @@ \stopitemize \item Third -\stopitemize +\stopenumerate -\subsection[tabs-and-spaces]{Tabs and spaces} +\stopsectionlevel +\startsectionlevel[title={Tabs and spaces},reference={tabs-and-spaces}] + \startitemize \item this is a list item indented with tabs @@ -373,9 +419,11 @@ \stopitemize \stopitemize -\subsection[fancy-list-markers]{Fancy list markers} +\stopsectionlevel -\startitemize[n][start=2,left=(,stopper=),width=2.0em] +\startsectionlevel[title={Fancy list markers},reference={fancy-list-markers}] + +\startenumerate[n][start=2,left=(,stopper=)] \item begins with 2 \item @@ -383,51 +431,51 @@ with a continuation - \startitemize[r,packed][start=4,stopper=.,width=2.0em] + \startenumerate[r,packed][start=4,stopper=.] \item sublist with roman numerals, starting with 4 \item more items - \startitemize[A,packed][left=(,stopper=),width=2.0em] + \startenumerate[A,packed][left=(,stopper=)] \item a subsublist \item a subsublist - \stopitemize - \stopitemize -\stopitemize + \stopenumerate + \stopenumerate +\stopenumerate Nesting: -\startitemize[A,packed][stopper=.] +\startenumerate[A,packed][stopper=.] \item Upper Alpha - \startitemize[R,packed][stopper=.] + \startenumerate[R,packed][stopper=.] \item Upper Roman. - \startitemize[n,packed][start=6,left=(,stopper=),width=2.0em] + \startenumerate[n,packed][start=6,left=(,stopper=)] \item Decimal start with 6 - \startitemize[a,packed][start=3,stopper=)] + \startenumerate[a,packed][start=3,stopper=)] \item Lower alpha with paren - \stopitemize - \stopitemize - \stopitemize -\stopitemize + \stopenumerate + \stopenumerate + \stopenumerate +\stopenumerate Autonumbering: -\startitemize[n,packed] +\startenumerate[n,packed] \item Autonumber. \item More. - \startitemize[a,packed] + \startenumerate[a,packed] \item Nested. - \stopitemize -\stopitemize + \stopenumerate +\stopenumerate Should not be a list item: @@ -437,8 +485,12 @@ \thinrule -\section[definition-lists]{Definition Lists} +\stopsectionlevel +\stopsectionlevel + +\startsectionlevel[title={Definition Lists},reference={definition-lists}] + Tight using spaces: \startdescription{apple} @@ -540,16 +592,18 @@ \startdescription{orange} orange fruit - \startitemize[n,packed][stopper=.] + \startenumerate[n,packed][stopper=.] \item sublist \item sublist - \stopitemize + \stopenumerate \stopdescription -\section[html-blocks]{HTML Blocks} +\stopsectionlevel +\startsectionlevel[title={HTML Blocks},reference={html-blocks}] + Simple block on one line: foo @@ -608,13 +662,15 @@ \thinrule -\section[inline-markup]{Inline Markup} +\stopsectionlevel +\startsectionlevel[title={Inline Markup},reference={inline-markup}] + This is {\em emphasized}, and so {\em is this}. This is {\bf strong}, and so {\bf is this}. -An {\em \useURL[url2][/url][][emphasized link]\from[url2]}. +An {\em \goto{emphasized link}[url(/url)]}. {\bf {\em This is strong and em.}} @@ -632,13 +688,16 @@ Subscripts: H\low{2}O, H\low{23}O, H\low{many~of~them}O. -These should not be superscripts or subscripts, because of the unescaped -spaces: a^b c^d, a\lettertilde{}b c\lettertilde{}d. +These should not be superscripts or subscripts, because of the unescaped spaces: +a^b c^d, a\lettertilde{}b c\lettertilde{}d. \thinrule -\section[smart-quotes-ellipses-dashes]{Smart quotes, ellipses, dashes} +\stopsectionlevel +\startsectionlevel[title={Smart quotes, ellipses, +dashes},reference={smart-quotes-ellipses-dashes}] + \quotation{Hello,} said the spider. \quotation{\quote{Shelob} is my name.} \quote{A}, \quote{B}, and \quote{C} are letters. @@ -648,9 +707,8 @@ \quote{He said, \quotation{I want to go.}} Were you alive in the 70's? -Here is some quoted \quote{\type{code}} and a -\quotation{\useURL[url3][http://example.com/?foo=1&bar=2][][quoted -link]\from[url3]}. +Here is some quoted \quote{\type{code}} and a \quotation{\goto{quoted +link}[url(http://example.com/?foo=1&bar=2)]}. Some dashes: one---two --- three---four --- five. @@ -660,8 +718,10 @@ \thinrule -\section[latex]{LaTeX} +\stopsectionlevel +\startsectionlevel[title={LaTeX},reference={latex}] + \startitemize[packed] \item \cite[22-23]{smith.1899} @@ -698,10 +758,18 @@ Here's a LaTeX table: +\begin{tabular}{|l|l|}\hline +Animal & Number \\ \hline +Dog & 2 \\ +Cat & 1 \\ \hline +\end{tabular} + \thinrule -\section[special-characters]{Special Characters} +\stopsectionlevel +\startsectionlevel[title={Special Characters},reference={special-characters}] + Here is some unicode: \startitemize[packed] @@ -761,83 +829,89 @@ \thinrule -\section[links]{Links} +\stopsectionlevel -\subsection[explicit]{Explicit} +\startsectionlevel[title={Links},reference={links}] -Just a \useURL[url4][/url/][][URL]\from[url4]. +\startsectionlevel[title={Explicit},reference={explicit}] -\useURL[url5][/url/][][URL and title]\from[url5]. +Just a \goto{URL}[url(/url/)]. -\useURL[url6][/url/][][URL and title]\from[url6]. +\goto{URL and title}[url(/url/)]. -\useURL[url7][/url/][][URL and title]\from[url7]. +\goto{URL and title}[url(/url/)]. -\useURL[url8][/url/][][URL and title]\from[url8] +\goto{URL and title}[url(/url/)]. -\useURL[url9][/url/][][URL and title]\from[url9] +\goto{URL and title}[url(/url/)] -\useURL[url10][/url/with_underscore][][with_underscore]\from[url10] +\goto{URL and title}[url(/url/)] -\useURL[url11][mailto:nobody@nowhere.net][][Email link]\from[url11] +\goto{with_underscore}[url(/url/with_underscore)] -\useURL[url12][][][Empty]\from[url12]. +\goto{Email link}[url(mailto:nobody@nowhere.net)] -\subsection[reference]{Reference} +\goto{Empty}[url()]. -Foo \useURL[url13][/url/][][bar]\from[url13]. +\stopsectionlevel -With \useURL[url14][/url/][][embedded {[}brackets{]}]\from[url14]. +\startsectionlevel[title={Reference},reference={reference}] -\useURL[url15][/url/][][b]\from[url15] by itself should be a link. +Foo \goto{bar}[url(/url/)]. -Indented \useURL[url16][/url][][once]\from[url16]. +With \goto{embedded {[}brackets{]}}[url(/url/)]. -Indented \useURL[url17][/url][][twice]\from[url17]. +\goto{b}[url(/url/)] by itself should be a link. -Indented \useURL[url18][/url][][thrice]\from[url18]. +Indented \goto{once}[url(/url)]. +Indented \goto{twice}[url(/url)]. + +Indented \goto{thrice}[url(/url)]. + This should {[}not{]}{[}{]} be a link. \starttyping [not]: /url \stoptyping -Foo \useURL[url19][/url/][][bar]\from[url19]. +Foo \goto{bar}[url(/url/)]. -Foo \useURL[url20][/url/][][biz]\from[url20]. +Foo \goto{biz}[url(/url/)]. -\subsection[with-ampersands]{With ampersands} +\stopsectionlevel -Here's a \useURL[url21][http://example.com/?foo=1&bar=2][][link with an -ampersand in the URL]\from[url21]. +\startsectionlevel[title={With ampersands},reference={with-ampersands}] +Here's a \goto{link with an ampersand in the +URL}[url(http://example.com/?foo=1&bar=2)]. + Here's a link with an amersand in the link text: -\useURL[url22][http://att.com/][][AT&T]\from[url22]. +\goto{AT&T}[url(http://att.com/)]. -Here's an \useURL[url23][/script?foo=1&bar=2][][inline link]\from[url23]. +Here's an \goto{inline link}[url(/script?foo=1&bar=2)]. -Here's an \useURL[url24][/script?foo=1&bar=2][][inline link in pointy -braces]\from[url24]. +Here's an \goto{inline link in pointy braces}[url(/script?foo=1&bar=2)]. -\subsection[autolinks]{Autolinks} +\stopsectionlevel -With an ampersand: \useURL[url25][http://example.com/?foo=1&bar=2]\from[url25] +\startsectionlevel[title={Autolinks},reference={autolinks}] +With an ampersand: \useURL[url1][http://example.com/?foo=1&bar=2]\from[url1] + \startitemize[packed] \item In a list? \item - \useURL[url26][http://example.com/]\from[url26] + \useURL[url2][http://example.com/]\from[url2] \item It should. \stopitemize -An e-mail address: -\useURL[url27][mailto:nobody@nowhere.net][][nobody@nowhere.net]\from[url27] +An e-mail address: \goto{nobody@nowhere.net}[url(mailto:nobody@nowhere.net)] \startblockquote -Blockquoted: \useURL[url28][http://example.com/]\from[url28] +Blockquoted: \useURL[url3][http://example.com/]\from[url3] \stopblockquote Auto-links should not occur here: \type{} @@ -848,23 +922,31 @@ \thinrule -\section[images]{Images} +\stopsectionlevel +\stopsectionlevel + +\startsectionlevel[title={Images},reference={images}] + From \quotation{Voyage dans la Lune} by Georges Melies (1902): -\placefigure{lalune}{\externalfigure[lalune.jpg]} +\startplacefigure[title={lalune}] +{\externalfigure[lalune.jpg]} +\stopplacefigure Here is a movie {\externalfigure[movie.jpg]} icon. \thinrule -\section[footnotes]{Footnotes} +\stopsectionlevel -Here is a footnote reference,\footnote{Here is the footnote. It can go - anywhere after the footnote reference. It need not be placed at the end of - the document.} and another.\startbuffer Here's the long note. This one - contains multiple blocks. +\startsectionlevel[title={Footnotes},reference={footnotes}] +Here is a footnote reference,\footnote{Here is the footnote. It can go anywhere + after the footnote reference. It need not be placed at the end of the + document.} and another.\startbuffer 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). @@ -876,18 +958,20 @@ indent the first line of each block.\stopbuffer\footnote{\getbuffer} This should {\em not} be a footnote reference, because it contains a space.{[}^my note{]} Here is an inline note.\footnote{This is {\em easier} to type. Inline - notes may contain \useURL[url29][http://google.com][][links]\from[url29] and - \type{]} verbatim characters, as well as {[}bracketed text{]}.} + notes may contain \goto{links}[url(http://google.com)] and \type{]} verbatim + characters, as well as {[}bracketed text{]}.} \startblockquote Notes can go in quotes.\footnote{In quote.} \stopblockquote -\startitemize[n,packed][stopper=.] +\startenumerate[n,packed][stopper=.] \item And in list items.\footnote{In list.} -\stopitemize +\stopenumerate This paragraph should not be part of the note, as it is not indented. + +\stopsectionlevel \stoptext diff --git a/test/writer.custom b/test/writer.custom deleted file mode 100644 --- a/test/writer.custom +++ /dev/null @@ -1,783 +0,0 @@ -

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

    - -
    - -

    Headers

    - - - -

    Level 3 with emphasis

    - -

    Level 4

    - -
    Level 5
    - -

    Level 1

    - -

    Level 2 with emphasis

    - -

    Level 3

    - -

    with no blank line

    - -

    Level 2

    - -

    with no blank line

    - -
    - -

    Paragraphs

    - -

    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 of a paragraph looked like a -list item.

    - -

    Here’s one with a bullet. -* criminey.

    - -

    There should be a hard line break
    here.

    - -
    - -

    Block Quotes

    - -

    E-mail style:

    - -
    -

    This is a block quote. -It is pretty short.

    -
    - -
    -

    Code in a block quote:

    - -
    sub status {
-    print "working";
-}
    - -

    A list:

    - -
      -
    1. item one
      2. -
    2. item two
      3. -
    - -

    Nested block quotes:

    - -
    -

    nested

    -
    - -
    -

    nested

    -
    -
    - -

    This should not be a block quote: 2 -> 1.

    - -

    And a following paragraph.

    - -
    - -

    Code Blocks

    - -

    Code:

    - -
    ---- (should be four hyphens)
-
-sub status {
-    print "working";
-}
-
-this code block is indented by one tab
    - -

    And:

    - -
        this code block is indented by two tabs
-
-These should not be escaped:  \$ \\ \> \[ \{
    - -
    - -

    Lists

    - -

    Unordered

    - -

    Asterisks tight:

    - -
      -
    • asterisk 1
      • -
    • asterisk 2
      • -
    • asterisk 3
      • -
    - -

    Asterisks loose:

    - -
      -

    • asterisk 1

      • -

    • asterisk 2

      • -

    • asterisk 3

      • -
    - -

    Pluses tight:

    - -
      -
    • Plus 1
      • -
    • Plus 2
      • -
    • Plus 3
      • -
    - -

    Pluses loose:

    - -
      -

    • Plus 1

      • -

    • Plus 2

      • -

    • Plus 3

      • -
    - -

    Minuses tight:

    - -
      -
    • Minus 1
      • -
    • Minus 2
      • -
    • Minus 3
      • -
    - -

    Minuses loose:

    - -
      -

    • Minus 1

      • -

    • Minus 2

      • -

    • Minus 3

      • -
    - -

    Ordered

    - -

    Tight:

    - -
      -
    1. First
      2. -
    2. Second
      3. -
    3. Third
      4. -
    - -

    and:

    - -
      -
    1. One
      2. -
    2. Two
      3. -
    3. Three
      4. -
    - -

    Loose using tabs:

    - -
      -

    1. First

      2. -

    2. Second

      3. -

    3. Third

      4. -
    - -

    and using spaces:

    - -
      -

    1. One

      2. -

    2. Two

      3. -

    3. Three

      4. -
    - -

    Multiple paragraphs:

    - -
      -

    1. Item 1, graf one.

      - -

      Item 1. graf two. The quick brown fox jumped over the lazy dog’s -back.

      2. -

    2. Item 2.

      3. -

    3. Item 3.

      4. -
    - -

    Nested

    - -
      -
    • Tab - -
        -
      • Tab - -
          -
        • Tab
          • -
        • -
      • -
    - -

    Here’s another:

    - -
      -
    1. First
      2. -
    2. Second: - -
        -
      • Fee
        • -
      • Fie
        • -
      • Foe
        • -
      3. -
    3. Third
      4. -
    - -

    Same thing but with paragraphs:

    - -
      -

    1. First

      2. -

    2. Second:

      - -
        -
      • Fee
        • -
      • Fie
        • -
      • Foe
        • -
      3. -

    3. Third

      4. -
    - -

    Tabs and spaces

    - -
      -

    • this is a list item -indented with tabs

      • -

    • this is a list item -indented with spaces

      - -
        -

      • this is an example list item -indented with tabs

        • -

      • this is an example list item -indented with spaces

        • -
      • -
    - -

    Fancy list markers

    - -
      -
    1. begins with 2
      2. -

    2. and now 3

      - -

      with a continuation

      - -
        -
      1. sublist with roman numerals, -starting with 4
        2. -
      2. more items - -
          -
        1. a subsublist
          2. -
        2. a subsublist
          3. -
        3. -
      3. -
    - -

    Nesting:

    - -
      -
    1. Upper Alpha - -
        -
      1. Upper Roman. - -
          -
        1. Decimal start with 6 - -
            -
          1. Lower alpha with paren
            2. -
          2. -
        2. -
      2. -
    - -

    Autonumbering:

    - -
      -
    1. Autonumber.
      2. -
    2. More. - -
        -
      1. Nested.
        2. -
      3. -
    - -

    Should not be a list item:

    - -

    M.A. 2007

    - -

    B. Williams

    - -
    - -

    Definition Lists

    - -

    Tight using spaces:

    - -
    -
    apple
    -
    red fruit
    -
    orange
    -
    orange fruit
    -
    banana
    -
    yellow fruit
    -
    - -

    Tight using tabs:

    - -
    -
    apple
    -
    red fruit
    -
    orange
    -
    orange fruit
    -
    banana
    -
    yellow fruit
    -
    - -

    Loose:

    - -
    -
    apple
    -

    red fruit

    -
    orange
    -

    orange fruit

    -
    banana
    -

    yellow fruit

    -
    - -

    Multiple blocks with italics:

    - -
    -
    apple
    -

    red fruit

    - -

    contains seeds, -crisp, pleasant to taste

    -
    orange
    -

    orange fruit

    - -
    { orange code block }
    - -
    -

    orange block quote

    -
    -
    - -

    Multiple definitions, tight:

    - -
    -
    apple
    -
    red fruit
    -
    computer
    -
    orange
    -
    orange fruit
    -
    bank
    -
    - -

    Multiple definitions, loose:

    - -
    -
    apple
    -

    red fruit

    -

    computer

    -
    orange
    -

    orange fruit

    -

    bank

    -
    - -

    Blank line after term, indented marker, alternate markers:

    - -
    -
    apple
    -

    red fruit

    -

    computer

    -
    orange
    -

    orange fruit

    - -
      -
    1. sublist
      2. -
    2. sublist
      3. -
    -
    - -

    HTML Blocks

    - -

    Simple block on one line:

    - -
    -foo
    - -

    And nested without indentation:

    - -
    -
    -
    -

    foo

    - -
    -bar
    - -

    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.

    - -

    An emphasized link.

    - -

    This is strong and em.

    - -

    So is this word.

    - -

    This is strong and em.

    - -

    So is this word.

    - -

    This is code: >, $, \, \$, <html>.

    - -

    This is strikeout.

    - -

    Superscripts: abcd ahello ahello there.

    - -

    Subscripts: H2O, H23O, Hmany of themO.

    - -

    These should not be superscripts or subscripts, -because of the unescaped spaces: a^b c^d, a~b c~d.

    - -
    - -

    Smart quotes, ellipses, dashes

    - -

    said the spider.

    - -

    , , and are letters.

    - -

    and are names of trees. -So is

    - -

    Were you alive in the -70’s?

    - -

    Here is some quoted and a .

    - -

    Some dashes: one—two — three—four — five.

    - -

    Dashes between numbers: 5–7, 255–66, 1987–1999.

    - -

    Ellipses…and…and….

    - -
    - -

    LaTeX

    - -
      -
    • -
    • \(2+2=4\)
      • -
    • \(x \in y\)
      • -
    • \(\alpha \wedge \omega\)
      • -
    • \(223\)
      • -
    • \(p\)-Tree
      • -
    • Here’s some display math: -\[\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}\]
      • -
    • Here’s one that has a line break in it: \(\alpha + \omega \times x^2\).
      • -
    - -

    These shouldn’t be math:

    - -
      -
    • To get the famous equation, write $e = mc^2$.
      • -
    • $22,000 is a lot of money. So is $34,000. -(It worked if is emphasized.)
      • -
    • Shoes ($20) and socks ($5).
      • -
    • Escaped $: $73 this should be emphasized 23$.
      • -
    - -

    Here’s a LaTeX table:

    - - - -
    - -

    Special Characters

    - -

    Here is some unicode:

    - -
      -
    • I hat: Î
      • -
    • o umlaut: ö
      • -
    • section: §
      • -
    • set membership: ∈
      • -
    • copyright: ©
      • -
    - -

    AT&T has an ampersand in their name.

    - -

    AT&T is another way to write it.

    - -

    This & that.

    - -

    4 < 5.

    - -

    6 > 5.

    - -

    Backslash: \

    - -

    Backtick: `

    - -

    Asterisk: *

    - -

    Underscore: _

    - -

    Left brace: {

    - -

    Right brace: }

    - -

    Left bracket: [

    - -

    Right bracket: ]

    - -

    Left paren: (

    - -

    Right paren: )

    - -

    Greater-than: >

    - -

    Hash: #

    - -

    Period: .

    - -

    Bang: !

    - -

    Plus: +

    - -

    Minus: -

    - -
    - -

    Links

    - -

    Explicit

    - -

    Just a URL.

    - -

    URL and title.

    - -

    URL and title.

    - -

    URL and title.

    - -

    URL and title

    - -

    URL and title

    - -

    with_underscore

    - -

    Email link

    - -

    Empty.

    - -

    Reference

    - -

    Foo bar.

    - -

    With embedded [brackets].

    - -

    b by itself should be a link.

    - -

    Indented once.

    - -

    Indented twice.

    - -

    Indented thrice.

    - -

    This should [not][] be a link.

    - -
    [not]: /url
    - -

    Foo bar.

    - -

    Foo biz.

    - -

    With ampersands

    - -

    Here’s a link with an ampersand in the URL.

    - -

    Here’s a link with an amersand in the link text: AT&T.

    - -

    Here’s an inline link.

    - -

    Here’s an inline link in pointy braces.

    - - - -

    With an ampersand: http://example.com/?foo=1&bar=2

    - - - -

    An e-mail address: nobody@nowhere.net

    - -
    -

    Blockquoted: http://example.com/

    -
    - -

    Auto-links should not occur here: <http://example.com/>

    - -
    or here: <http://example.com/>
    - -
    - -

    Images

    - -

    From by Georges Melies (1902):

    - -
    - -

    lalune

    -
    - -

    Here is a movie icon.

    - -
    - -

    Footnotes

    - -

    Here is a footnote reference,1 and another.2 -This should not be a footnote reference, because it -contains a space.[^my note] Here is an inline note.3

    - -
    -

    Notes can go in quotes.4

    -
    - -
      -
    1. And in list items.5
      2. -
    - -

    This paragraph should not be part of the note, as it is not indented.

    -
      -

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

      3. -

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

      4. -

    4. In quote. ↩

      5. -

    5. In list. ↩

      6. -
    - diff --git a/test/writer.djot b/test/writer.djot new file mode 100644 --- /dev/null +++ b/test/writer.djot @@ -0,0 +1,749 @@ +# Pandoc Test Suite + +John MacFarlane +Anonymous + +July 17, 2006 + +This is a set of tests for pandoc. Most of them are adapted from John Gruber's +markdown test suite. + +* * * * + +{#headers} +# Headers + +{#level-2-with-an-embedded-link} +## Level 2 with an [embedded link](/url) + +{#level-3-with-emphasis} +### Level 3 with _emphasis_ + +{#level-4} +#### Level 4 + +{#level-5} +##### Level 5 + +{#level-1} +# Level 1 + +{#level-2-with-emphasis} +## Level 2 with _emphasis_ + +{#level-3} +### Level 3 + +with no blank line + +{#level-2} +## Level 2 + +with no blank line + +* * * * + +{#paragraphs} +# Paragraphs + +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 of a paragraph looked like a list +item. + +Here's one with a bullet. \* criminey. + +There should be a hard line break\ +here. + +* * * * + +{#block-quotes} +# Block Quotes + +E-mail style: + +> This is a block quote. It is pretty short. + +> Code in a block quote: +> +> ``` +> sub status { +> print "working"; +> } +> ``` +> +> A list: +> +> 1. item one +> 2. item two +> +> Nested block quotes: +> +> > nested +> +> > nested + +This should not be a block quote: 2 \> 1. + +And a following paragraph. + +* * * * + +{#code-blocks} +# Code Blocks + +Code: + +``` +---- (should be four hyphens) + +sub status { + print "working"; +} + +this code block is indented by one tab +``` + +And: + +``` + this code block is indented by two tabs + +These should not be escaped: \$ \\ \> \[ \{ +``` + +* * * * + +{#lists} +# Lists + +{#unordered} +## Unordered + +Asterisks tight: + +- asterisk 1 +- asterisk 2 +- asterisk 3 + +Asterisks loose: + +- asterisk 1 + +- asterisk 2 + +- asterisk 3 + +Pluses tight: + +- Plus 1 +- Plus 2 +- Plus 3 + +Pluses loose: + +- Plus 1 + +- Plus 2 + +- Plus 3 + +Minuses tight: + +- Minus 1 +- Minus 2 +- Minus 3 + +Minuses loose: + +- Minus 1 + +- Minus 2 + +- Minus 3 + +{#ordered} +## Ordered + +Tight: + +1. First +2. Second +3. Third + +and: + +1. One +2. Two +3. Three + +Loose using tabs: + +1. First + +2. Second + +3. Third + +and using spaces: + +1. One + +2. Two + +3. Three + +Multiple paragraphs: + +1. Item 1, graf one. + + Item 1. graf two. The quick brown fox jumped over the lazy dog's back. + +2. Item 2. + +3. Item 3. + +{#nested} +## Nested + +- Tab + + - Tab + + - Tab + +Here's another: + +1. First +2. Second: + + - Fee + - Fie + - Foe +3. Third + +Same thing but with paragraphs: + +1. First + +2. Second: + + - Fee + - Fie + - Foe + +3. Third + +{#tabs-and-spaces} +## Tabs and spaces + +- this is a list item indented with tabs + +- this is a list item indented with spaces + + - this is an example list item indented with tabs + + - this is an example list item indented with spaces + +{#fancy-list-markers} +## Fancy list markers + +(2) begins with 2 + +(3) and now 3 + + with a continuation + + iv. sublist with roman numerals, starting with 4 + v. more items + + (A) a subsublist + (B) a subsublist + +Nesting: + +A. Upper Alpha + + I. Upper Roman. + + (6) Decimal start with 6 + + c) Lower alpha with paren + +Autonumbering: + +1. Autonumber. +2. More. + + 1. Nested. + +Should not be a list item: + +M.A. 2007 + +B. Williams + +* * * * + +{#definition-lists} +# Definition Lists + +Tight using spaces: + +: apple + + red fruit +: orange + + orange fruit +: banana + + yellow fruit + +Tight using tabs: + +: apple + + red fruit +: orange + + orange fruit +: banana + + yellow fruit + +Loose: + +: apple + + red fruit + +: orange + + orange fruit + +: banana + + yellow fruit + +Multiple blocks with italics: + +: _apple_ + + red fruit + + contains seeds, crisp, pleasant to taste + +: _orange_ + + orange fruit + + ``` + { orange code block } + ``` + + > orange block quote + +Multiple definitions, tight: + +: apple + + red fruit + + computer +: orange + + orange fruit + + bank + +Multiple definitions, loose: + +: apple + + red fruit + + computer + +: orange + + orange fruit + + bank + +Blank line after term, indented marker, alternate markers: + +: apple + + red fruit + + computer + +: orange + + orange fruit + + 1. sublist + 2. sublist + +{#html-blocks} +# HTML Blocks + +Simple block on one line: + +::: +foo + +::: + +And nested without indentation: + +:::::: +:::: +::: +foo + +::: + +:::: + +::: +bar + +::: + +:::::: + +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: + +``` +
    + foo +
    +``` + +As should this: + +``` +
    foo
    +``` + +Now, nested: + +::::: +:::: +::: +foo + +::: + +:::: + +::::: + +This should just be an HTML comment: + +Multiline: + +Code block: + +``` + +``` + +Just plain comment, with trailing spaces on the line: + +Code: + +``` +
    +``` + +Hr's: + +* * * * + +{#inline-markup} +# Inline Markup + +This is _emphasized_, and so _is this_. + +This is *strong*, and so *is this*. + +An _[emphasized link](/url)_. + +*_This is strong and em._* + +So is *_this_* word. + +*_This is strong and em._* + +So is *_this_* word. + +This is code: `>`, `$`, `\`, `\$`, ``. + +{-This is _strikeout_.-} + +Superscripts: a^bc^d a^_hello_^ a^hello there^. + +Subscripts: H~2~O, H~23~O, H~many of them~O. + +These should not be superscripts or subscripts, because of the unescaped spaces: +a\^b c\^d, a\~b c\~d. + +* * * * + +{#smart-quotes-ellipses-dashes} +# Smart quotes, ellipses, dashes + +"Hello," said the spider. "'Shelob' is my name." + +'A', 'B', and 'C' are letters. + +'Oak,' 'elm,' and 'beech' are names of trees. So is 'pine.' + +'He said, "I want to go."' Were you alive in the 70's? + +Here is some quoted '`code`' and a "[quoted +link](http://example.com/?foo=1&bar=2)". + +Some dashes: one---two --- three---four --- five. + +Dashes between numbers: 5--7, 255--66, 1987--1999. + +Ellipses...and...and.... + +* * * * + +{#latex} +# LaTeX + +- +- $`2+2=4` +- $`x \in y` +- $`\alpha \wedge \omega` +- $`223` +- $`p`-Tree +- Here's some display math: + $$`\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}` +- Here's one that has a line break in it: $`\alpha + \omega \times x^2`. + +These shouldn't be math: + +- To get the famous equation, write `$e = mc^2$`. +- $22,000 is a _lot_ of money. So is $34,000. (It worked if "lot" is + emphasized.) +- Shoes ($20) and socks ($5). +- Escaped `$`\: $73 _this should be emphasized_ 23$. + +Here's a LaTeX table: + +* * * * + +{#special-characters} +# Special Characters + +Here is some unicode: + +- I hat: Î +- o umlaut: ö +- section: § +- set membership: ∈ +- copyright: © + +AT&T has an ampersand in their name. + +AT&T is another way to write it. + +This & that. + +4 \< 5. + +6 \> 5. + +Backslash: \\ + +Backtick: \` + +Asterisk: \* + +Underscore: \_ + +Left brace: \{ + +Right brace: \} + +Left bracket: \[ + +Right bracket: \] + +Left paren: ( + +Right paren: ) + +Greater-than: \> + +Hash: # + +Period: . + +Bang: \! + +Plus: + + +Minus: - + +* * * * + +{#links} +# Links + +{#explicit} +## Explicit + +Just a [URL](/url/). + +[URL and title](/url/){title="title"}. + +[URL and title](/url/){title="title preceded by two spaces"}. + +[URL and title](/url/){title="title preceded by a tab"}. + +[URL and title](/url/){title="title with \"quotes\" in it"} + +[URL and title](/url/){title="title with single quotes"} + +[with\_underscore](/url/with_underscore) + +[Email link](mailto:nobody@nowhere.net) + +[Empty](). + +{#reference} +## Reference + +Foo [bar](/url/). + +With [embedded \[brackets\]](/url/). + +[b](/url/) by itself should be a link. + +Indented [once](/url). + +Indented [twice](/url). + +Indented [thrice](/url). + +This should \[not\]\[\] be a link. + +``` +[not]: /url +``` + +Foo [bar](/url/){title="Title with \"quotes\" inside"}. + +Foo [biz](/url/){title="Title with \"quote\" inside"}. + +{#with-ampersands} +## With ampersands + +Here's a [link with an ampersand in the URL](http://example.com/?foo=1&bar=2). + +Here's a link with an amersand in the link text: +[AT&T](http://att.com/){title="AT&T"}. + +Here's an [inline link](/script?foo=1&bar=2). + +Here's an [inline link in pointy braces](/script?foo=1&bar=2). + +{#autolinks} +## Autolinks + +With an ampersand: + +- In a list? +- +- It should. + +An e-mail address: + +> Blockquoted: + +Auto-links should not occur here: `` + +``` +or here: +``` + +* * * * + +{#images} +# Images + +From "Voyage dans la Lune" by Georges Melies (1902): + +:::: +![lalune](lalune.jpg){title="Voyage dans la Lune"} + +{.caption} +::: +lalune + +::: + +:::: + +Here is a movie ![movie](movie.jpg) icon. + +* * * * + +{#footnotes} +# Footnotes + +Here is a footnote reference,[^1] and another.[^2] This should _not_ be a +footnote reference, because it contains a space.\[\^my note\] Here is an inline +note.[^3] + +> Notes can go in quotes.[^4] + +1. And in list items.[^5] + +This paragraph should not be part of the note, as it is not indented. + +[^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]: 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). + + ``` + { } + ``` + + If you want, you can indent every line, but you can also be lazy and just + indent the first line of each block. + +[^3]: This is _easier_ to type. Inline notes may contain + [links](http://google.com) and `]` verbatim characters, as well as + \[bracketed text\]. + +[^4]: In quote. + +[^5]: In list. diff --git a/test/writer.docbook4 b/test/writer.docbook4 --- a/test/writer.docbook4 +++ b/test/writer.docbook4 @@ -6,1411 +6,1418 @@ Pandoc Test Suite - John - MacFarlane - - - - Anonymous - - - July 17, 2006 - - - This is a set of tests for pandoc. Most of them are adapted from John - Gruber’s markdown test suite. - - - Headers - - Level 2 with an <ulink url="/url">embedded link</ulink> - - Level 3 with <emphasis>emphasis</emphasis> - - Level 4 - - Level 5 - - - - - - - - - Level 1 - - Level 2 with <emphasis>emphasis</emphasis> - - Level 3 - - with no blank line - - - - - Level 2 - - with no blank line - - - - - Paragraphs - - 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 of a paragraph looked like - a list item. - - - Here’s one with a bullet. * criminey. - -There should be a hard line break -here. - - - Block Quotes - - E-mail style: - -
    - - This is a block quote. It is pretty short. - -
    -
    - - Code in a block quote: - - -sub status { - print "working"; -} - - - A list: - - - - - item one - - - - - item two - - - - - Nested block quotes: - -
    - - nested - -
    -
    - - nested - -
    -
    - - This should not be a block quote: 2 > 1. - - - And a following paragraph. - -     - - Code Blocks - - Code: - - ----- (should be four hyphens) - -sub status { - print "working"; -} - -this code block is indented by one tab - - - And: - - - this code block is indented by two tabs - -These should not be escaped: \$ \\ \> \[ \{ - - - - Lists - - Unordered - - Asterisks tight: - - - - - asterisk 1 - - - - - asterisk 2 - - - - - asterisk 3 - - - - - Asterisks loose: - - - - - asterisk 1 - - - - - asterisk 2 - - - - - asterisk 3 - - - - - Pluses tight: - - - - - Plus 1 - - - - - Plus 2 - - - - - Plus 3 - - - - - Pluses loose: - - - - - Plus 1 - - - - - Plus 2 - - - - - Plus 3 - - - - - Minuses tight: - - - - - Minus 1 - - - - - Minus 2 - - - - - Minus 3 - - - - - Minuses loose: - - - - - Minus 1 - - - - - Minus 2 - - - - - Minus 3 - - - - - - Ordered - - Tight: - - - - - First - - - - - Second - - - - - Third - - - - - and: - - - - - One - - - - - Two - - - - - Three - - - - - Loose using tabs: - - - - - First - - - - - Second - - - - - Third - - - - - and using spaces: - - - - - One - - - - - Two - - - - - Three - - - - - Multiple paragraphs: - - - - - Item 1, graf one. - - - Item 1. graf two. The quick brown fox jumped over the lazy dog’s - back. - - - - - Item 2. - - - - - Item 3. - - - - - - Nested - - - - Tab - - - - - Tab - - - - - Tab - - - - - - - - - Here’s another: - - - - - First - - - - - Second: - - - - - Fee - - - - - Fie - - - - - Foe - - - - - - - Third - - - - - Same thing but with paragraphs: - - - - - First - - - - - Second: - - - - - Fee - - - - - Fie - - - - - Foe - - - - - - - Third - - - - - - Tabs and spaces - - - - this is a list item indented with tabs - - - - - this is a list item indented with spaces - - - - - this is an example list item indented with tabs - - - - - this is an example list item indented with spaces - - - - - - - - Fancy list markers - - - - begins with 2 - - - - - and now 3 - - - with a continuation - - - - - sublist with roman numerals, starting with 4 - - - - - more items - - - - - a subsublist - - - - - a subsublist - - - - - - - - - Nesting: - - - - - Upper Alpha - - - - - Upper Roman. - - - - - Decimal start with 6 - - - - - Lower alpha with paren - - - - - - - - - - - Autonumbering: - - - - - Autonumber. - - - - - More. - - - - - Nested. - - - - - - - Should not be a list item: - - - M.A. 2007 - - - B. Williams - - - - - Definition Lists - - Tight using spaces: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Tight using tabs: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Loose: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Multiple blocks with italics: - - - - - apple - - - - red fruit - - - contains seeds, crisp, pleasant to taste - - - - - - orange - - - - orange fruit - - -{ orange code block } - -
    - - orange block quote - -
    -     -     -     - - Multiple definitions, tight: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - bank - - - - - - Multiple definitions, loose: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - bank - - - - - - Blank line after term, indented marker, alternate markers: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - - - sublist - - - - - sublist - - - - - - -     - - HTML Blocks - - Simple block on one line: - - - foo - - - And nested without indentation: - - - foo - - - bar - - - 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. - - - An emphasized link. - - - This is strong and - em. - - - So is this word. - - - This is strong and - em. - - - So is this word. - - - This is code: >, $, - \, \$, - <html>. - - - This is - strikeout. - - - Superscripts: abcd - ahello - ahello there. - - - Subscripts: H2O, H23O, - Hmany of themO. - - - These should not be superscripts or subscripts, because of the unescaped - spaces: a^b c^d, a~b c~d. - - - - Smart quotes, ellipses, dashes - - Hello, said the spider. Shelob is my - name. - - - A, B, and C are letters. - - - Oak, elm, and beech are names - of trees. So is pine. - - - He said, I want to go. Were you alive in the - 70’s? - - - Here is some quoted code and a - quoted - link. - - - Some dashes: one—two — three—four — five. - - - Dashes between numbers: 5–7, 255–66, 1987–1999. - - - Ellipses…and…and…. - - - - LaTeX - - - - - - - - 2 + 2 = 4 - - - - - x ∈ y - - - - - α ∧ ω - - - - - 223 - - - - - p-Tree - - - - - Here’s some display math: - $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ - - - - - Here’s one that has a line break in it: - α + ω × x2. - - - - - These shouldn’t be math: - - - - - To get the famous equation, write $e = mc^2$. - - - - - $22,000 is a lot of money. So is $34,000. (It - worked if lot is emphasized.) - - - - - Shoes ($20) and socks ($5). - - - - - Escaped $: $73 this should be - emphasized 23$. - - - - - Here’s a LaTeX table: - - - - Special Characters - - Here is some unicode: - - - - - I hat: Î - - - - - o umlaut: ö - - - - - section: § - - - - - set membership: ∈ - - - - - copyright: © - - - - - AT&T has an ampersand in their name. - - - AT&T is another way to write it. - - - This & that. - - - 4 < 5. - - - 6 > 5. - - - Backslash: \ - - - Backtick: ` - - - Asterisk: * - - - Underscore: _ - - - Left brace: { - - - Right brace: } - - - Left bracket: [ - - - Right bracket: ] - - - Left paren: ( - - - Right paren: ) - - - Greater-than: > - - - Hash: # - - - Period: . - - - Bang: ! - - - Plus: + - - - Minus: - - - - - Links - - Explicit - - Just a URL. - - - URL and title. - - - URL and title. - - - URL and title. - - - URL and title - - - URL and title - - - with_underscore - - - Email link (nobody@nowhere.net) - - - Empty. - - - - Reference - - Foo bar. - - - With embedded [brackets]. - - - b by itself should be a link. - - - Indented once. - - - Indented twice. - - - Indented thrice. - - - This should [not][] be a link. - - -[not]: /url - - - Foo bar. - - - Foo biz. - - - - With ampersands - - Here’s a link with an - ampersand in the URL. - - - Here’s a link with an amersand in the link text: - AT&T. - - - Here’s an inline link. - - - Here’s an inline link in pointy - braces. - - - - Autolinks - - With an ampersand: - http://example.com/?foo=1&bar=2 - - - - - In a list? - - - - - http://example.com/ - - - - - It should. - - - - - An e-mail address: nobody@nowhere.net - -
    - - Blockquoted: - http://example.com/ - -
    - - Auto-links should not occur here: - <http://example.com/> - - -or here: <http://example.com/> - -     -     - - Images - - From Voyage dans la Lune by Georges Melies (1902): - -
    - lalune - - - - - lalune - -
    - - Here is a movie - - - - icon. - -     - - Footnotes - - Here is a footnote reference, - - Here is the footnote. It can go anywhere after the footnote reference. - It need not be placed at the end of the document. - - and another. - - 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. - - This should not be a footnote reference, - because it contains a space.[^my note] Here is an inline note. - - This is easier to type. Inline notes may contain - links and ] - verbatim characters, as well as [bracketed text]. - - - -
    - - Notes can go in quotes. - - In quote. - - - -
    - - - - And in list items. - - In list. - - - - - - - This paragraph should not be part of the note, as it is not indented. - -     + + John + MacFarlane + + + + + + Anonymous + + + + July 17, 2006 + + + This is a set of tests for pandoc. Most of them are adapted from John + Gruber’s markdown test suite. + + + Headers + + Level 2 with an <ulink url="/url">embedded link</ulink> + + Level 3 with <emphasis>emphasis</emphasis> + + Level 4 + + Level 5 + + + + + + + + + Level 1 + + Level 2 with <emphasis>emphasis</emphasis> + + Level 3 + + with no blank line + + + + + Level 2 + + with no blank line + + + + + Paragraphs + + 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 of a paragraph looked like + a list item. + + + Here’s one with a bullet. * criminey. + +There should be a hard line break +here. + + + Block Quotes + + E-mail style: + +
    + + This is a block quote. It is pretty short. + +
    +
    + + Code in a block quote: + + +sub status { + print "working"; +} + + + A list: + + + + + item one + + + + + item two + + + + + Nested block quotes: + +
    + + nested + +
    +
    + + nested + +
    +
    + + This should not be a block quote: 2 > 1. + + + And a following paragraph. + +     + + Code Blocks + + Code: + + +---- (should be four hyphens) + +sub status { + print "working"; +} + +this code block is indented by one tab + + + And: + + + this code block is indented by two tabs + +These should not be escaped: \$ \\ \> \[ \{ + + + + Lists + + Unordered + + Asterisks tight: + + + + + asterisk 1 + + + + + asterisk 2 + + + + + asterisk 3 + + + + + Asterisks loose: + + + + + asterisk 1 + + + + + asterisk 2 + + + + + asterisk 3 + + + + + Pluses tight: + + + + + Plus 1 + + + + + Plus 2 + + + + + Plus 3 + + + + + Pluses loose: + + + + + Plus 1 + + + + + Plus 2 + + + + + Plus 3 + + + + + Minuses tight: + + + + + Minus 1 + + + + + Minus 2 + + + + + Minus 3 + + + + + Minuses loose: + + + + + Minus 1 + + + + + Minus 2 + + + + + Minus 3 + + + + + + Ordered + + Tight: + + + + + First + + + + + Second + + + + + Third + + + + + and: + + + + + One + + + + + Two + + + + + Three + + + + + Loose using tabs: + + + + + First + + + + + Second + + + + + Third + + + + + and using spaces: + + + + + One + + + + + Two + + + + + Three + + + + + Multiple paragraphs: + + + + + Item 1, graf one. + + + Item 1. graf two. The quick brown fox jumped over the lazy dog’s + back. + + + + + Item 2. + + + + + Item 3. + + + + + + Nested + + + + Tab + + + + + Tab + + + + + Tab + + + + + + + + + Here’s another: + + + + + First + + + + + Second: + + + + + Fee + + + + + Fie + + + + + Foe + + + + + + + Third + + + + + Same thing but with paragraphs: + + + + + First + + + + + Second: + + + + + Fee + + + + + Fie + + + + + Foe + + + + + + + Third + + + + + + Tabs and spaces + + + + this is a list item indented with tabs + + + + + this is a list item indented with spaces + + + + + this is an example list item indented with tabs + + + + + this is an example list item indented with spaces + + + + + + + + Fancy list markers + + + + begins with 2 + + + + + and now 3 + + + with a continuation + + + + + sublist with roman numerals, starting with 4 + + + + + more items + + + + + a subsublist + + + + + a subsublist + + + + + + + + + Nesting: + + + + + Upper Alpha + + + + + Upper Roman. + + + + + Decimal start with 6 + + + + + Lower alpha with paren + + + + + + + + + + + Autonumbering: + + + + + Autonumber. + + + + + More. + + + + + Nested. + + + + + + + Should not be a list item: + + + M.A. 2007 + + + B. Williams + + + + + Definition Lists + + Tight using spaces: + + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + + + Tight using tabs: + + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + + + Loose: + + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + + + Multiple blocks with italics: + + + + + apple + + + + red fruit + + + contains seeds, crisp, pleasant to taste + + + + + + orange + + + + orange fruit + + +{ orange code block } + +
    + + orange block quote + +
    +     +     +     + + Multiple definitions, tight: + + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + bank + + + + + + Multiple definitions, loose: + + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + bank + + + + + + Blank line after term, indented marker, alternate markers: + + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + + + sublist + + + + + sublist + + + + + + +     + + HTML Blocks + + Simple block on one line: + + + foo + + + And nested without indentation: + + + foo + + + bar + + + 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. + + + An emphasized link. + + + This is strong and + em. + + + So is this word. + + + This is strong and + em. + + + So is this word. + + + This is code: >, $, + \, \$, + <html>. + + + This is + strikeout. + + + Superscripts: abcd + ahello + ahello there. + + + Subscripts: H2O, H23O, + Hmany of themO. + + + These should not be superscripts or subscripts, because of the unescaped + spaces: a^b c^d, a~b c~d. + + + + Smart quotes, ellipses, dashes + + Hello, said the spider. Shelob is my + name. + + + A, B, and C are letters. + + + Oak, elm, and beech are names + of trees. So is pine. + + + He said, I want to go. Were you alive in the + 70’s? + + + Here is some quoted code and a + quoted + link. + + + Some dashes: one—two — three—four — five. + + + Dashes between numbers: 5–7, 255–66, 1987–1999. + + + Ellipses…and…and…. + + + + LaTeX + + + + + + + + 2 + 2 = 4 + + + + + x ∈ y + + + + + α ∧ ω + + + + + 223 + + + + + p-Tree + + + + + Here’s some display math: + $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ + + + + + Here’s one that has a line break in it: + α + ω × x2. + + + + + These shouldn’t be math: + + + + + To get the famous equation, write $e = mc^2$. + + + + + $22,000 is a lot of money. So is $34,000. (It + worked if lot is emphasized.) + + + + + Shoes ($20) and socks ($5). + + + + + Escaped $: $73 this should be + emphasized 23$. + + + + + Here’s a LaTeX table: + + + + Special Characters + + Here is some unicode: + + + + + I hat: Î + + + + + o umlaut: ö + + + + + section: § + + + + + set membership: ∈ + + + + + copyright: © + + + + + AT&T has an ampersand in their name. + + + AT&T is another way to write it. + + + This & that. + + + 4 < 5. + + + 6 > 5. + + + Backslash: \ + + + Backtick: ` + + + Asterisk: * + + + Underscore: _ + + + Left brace: { + + + Right brace: } + + + Left bracket: [ + + + Right bracket: ] + + + Left paren: ( + + + Right paren: ) + + + Greater-than: > + + + Hash: # + + + Period: . + + + Bang: ! + + + Plus: + + + + Minus: - + + + + Links + + Explicit + + Just a URL. + + + URL and title. + + + URL and title. + + + URL and title. + + + URL and title + + + URL and title + + + with_underscore + + + Email link (nobody@nowhere.net) + + + Empty. + + + + Reference + + Foo bar. + + + With embedded [brackets]. + + + b by itself should be a link. + + + Indented once. + + + Indented twice. + + + Indented thrice. + + + This should [not][] be a link. + + +[not]: /url + + + Foo bar. + + + Foo biz. + + + + With ampersands + + Here’s a link with an + ampersand in the URL. + + + Here’s a link with an amersand in the link text: + AT&T. + + + Here’s an inline link. + + + Here’s an inline link in pointy + braces. + + + + Autolinks + + With an ampersand: + http://example.com/?foo=1&bar=2 + + + + + In a list? + + + + + http://example.com/ + + + + + It should. + + + + + An e-mail address: nobody@nowhere.net + +
    + + Blockquoted: + http://example.com/ + +
    + + Auto-links should not occur here: + <http://example.com/> + + +or here: <http://example.com/> + +     +     + + Images + + From Voyage dans la Lune by Georges Melies (1902): + +
    + lalune + + + + + lalune + +
    + + Here is a movie + + + + + movie + + icon. + +     + + Footnotes + + Here is a footnote reference, + + Here is the footnote. It can go anywhere after the footnote reference. + It need not be placed at the end of the document. + + and another. + + 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. + + This should not be a footnote reference, + because it contains a space.[^my note] Here is an inline note. + + This is easier to type. Inline notes may contain + links and ] + verbatim characters, as well as [bracketed text]. + + + +
    + + Notes can go in quotes. + + In quote. + + + +
    + + + + And in list items. + + In list. + + + + + + + This paragraph should not be part of the note, as it is not indented. + +     diff --git a/test/writer.docbook5 b/test/writer.docbook5 --- a/test/writer.docbook5 +++ b/test/writer.docbook5 @@ -7,1385 +7,1392 @@ Pandoc Test Suite - John - MacFarlane - - - - Anonymous - - - July 17, 2006 - - - This is a set of tests for pandoc. Most of them are adapted from John - Gruber’s markdown test suite. - -
    - Headers -
    - Level 2 with an <link xlink:href="/url">embedded - link</link> -
    - Level 3 with <emphasis>emphasis</emphasis> -
    - Level 4 -
    - Level 5 - - -
    -
    -
    -
    -
    -
    - Level 1 -
    - Level 2 with <emphasis>emphasis</emphasis> -
    - Level 3 - - with no blank line - -
    -
    -
    - Level 2 - - with no blank line - -
    -
    -
    - Paragraphs - - 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 of a paragraph looked like - a list item. - - - Here’s one with a bullet. * criminey. - -There should be a hard line break -here. -
    -
    - Block Quotes - - E-mail style: - -
    - - This is a block quote. It is pretty short. - -
    -
    - - Code in a block quote: - - -sub status { - print "working"; -} - - - A list: - - - - - item one - - - - - item two - - - - - Nested block quotes: - -
    - - nested - -
    -
    - - nested - -
    -
    - - This should not be a block quote: 2 > 1. - - - And a following paragraph. - -
    -
    - Code Blocks - - Code: - - ----- (should be four hyphens) - -sub status { - print "working"; -} - -this code block is indented by one tab - - - And: - - - this code block is indented by two tabs - -These should not be escaped: \$ \\ \> \[ \{ - -
    -
    - Lists -
    - Unordered - - Asterisks tight: - - - - - asterisk 1 - - - - - asterisk 2 - - - - - asterisk 3 - - - - - Asterisks loose: - - - - - asterisk 1 - - - - - asterisk 2 - - - - - asterisk 3 - - - - - Pluses tight: - - - - - Plus 1 - - - - - Plus 2 - - - - - Plus 3 - - - - - Pluses loose: - - - - - Plus 1 - - - - - Plus 2 - - - - - Plus 3 - - - - - Minuses tight: - - - - - Minus 1 - - - - - Minus 2 - - - - - Minus 3 - - - - - Minuses loose: - - - - - Minus 1 - - - - - Minus 2 - - - - - Minus 3 - - - -
    -
    - Ordered - - Tight: - - - - - First - - - - - Second - - - - - Third - - - - - and: - - - - - One - - - - - Two - - - - - Three - - - - - Loose using tabs: - - - - - First - - - - - Second - - - - - Third - - - - - and using spaces: - - - - - One - - - - - Two - - - - - Three - - - - - Multiple paragraphs: - - - - - Item 1, graf one. - - - Item 1. graf two. The quick brown fox jumped over the lazy dog’s - back. - - - - - Item 2. - - - - - Item 3. - - - -
    -
    - Nested - - - - Tab - - - - - Tab - - - - - Tab - - - - - - - - - Here’s another: - - - - - First - - - - - Second: - - - - - Fee - - - - - Fie - - - - - Foe - - - - - - - Third - - - - - Same thing but with paragraphs: - - - - - First - - - - - Second: - - - - - Fee - - - - - Fie - - - - - Foe - - - - - - - Third - - - -
    -
    - Tabs and spaces - - - - this is a list item indented with tabs - - - - - this is a list item indented with spaces - - - - - this is an example list item indented with tabs - - - - - this is an example list item indented with spaces - - - - - -
    -
    - Fancy list markers - - - - begins with 2 - - - - - and now 3 - - - with a continuation - - - - - sublist with roman numerals, starting with 4 - - - - - more items - - - - - a subsublist - - - - - a subsublist - - - - - - - - - Nesting: - - - - - Upper Alpha - - - - - Upper Roman. - - - - - Decimal start with 6 - - - - - Lower alpha with paren - - - - - - - - - - - Autonumbering: - - - - - Autonumber. - - - - - More. - - - - - Nested. - - - - - - - Should not be a list item: - - - M.A. 2007 - - - B. Williams - -
    -
    -
    - Definition Lists - - Tight using spaces: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Tight using tabs: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Loose: - - - - - apple - - - - red fruit - - - - - - orange - - - - orange fruit - - - - - - banana - - - - yellow fruit - - - - - - Multiple blocks with italics: - - - - - apple - - - - red fruit - - - contains seeds, crisp, pleasant to taste - - - - - - orange - - - - orange fruit - - -{ orange code block } - -
    - - orange block quote - -
    -     -     -     - - Multiple definitions, tight: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - bank - - - - - - Multiple definitions, loose: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - bank - - - - - - Blank line after term, indented marker, alternate markers: - - - - - apple - - - - red fruit - - - computer - - - - - - orange - - - - orange fruit - - - - - sublist - - - - - sublist - - - - - - -
    -
    - HTML Blocks - - Simple block on one line: - - - foo - - - And nested without indentation: - - - foo - - - bar - - - 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. - - - An emphasized link. - - - This is strong and - em. - - - So is this word. - - - This is strong and - em. - - - So is this word. - - - This is code: >, $, - \, \$, - <html>. - - - This is - strikeout. - - - Superscripts: abcd - ahello - ahello there. - - - Subscripts: H2O, H23O, - Hmany of themO. - - - These should not be superscripts or subscripts, because of the unescaped - spaces: a^b c^d, a~b c~d. - -
    -
    - Smart quotes, ellipses, dashes - - Hello, said the spider. Shelob is my - name. - - - A, B, and C are letters. - - - Oak, elm, and beech are names - of trees. So is pine. - - - He said, I want to go. Were you alive in the - 70’s? - - - Here is some quoted code and a - quoted - link. - - - Some dashes: one—two — three—four — five. - - - Dashes between numbers: 5–7, 255–66, 1987–1999. - - - Ellipses…and…and…. - -
    -
    - LaTeX - - - - - - - - 2 + 2 = 4 - - - - - x ∈ y - - - - - α ∧ ω - - - - - 223 - - - - - p-Tree - - - - - Here’s some display math: - $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ - - - - - Here’s one that has a line break in it: - α + ω × x2. - - - - - These shouldn’t be math: - - - - - To get the famous equation, write $e = mc^2$. - - - - - $22,000 is a lot of money. So is $34,000. (It - worked if lot is emphasized.) - - - - - Shoes ($20) and socks ($5). - - - - - Escaped $: $73 this should be - emphasized 23$. - - - - - Here’s a LaTeX table: - -
    -
    - Special Characters - - Here is some unicode: - - - - - I hat: Î - - - - - o umlaut: ö - - - - - section: § - - - - - set membership: ∈ - - - - - copyright: © - - - - - AT&T has an ampersand in their name. - - - AT&T is another way to write it. - - - This & that. - - - 4 < 5. - - - 6 > 5. - - - Backslash: \ - - - Backtick: ` - - - Asterisk: * - - - Underscore: _ - - - Left brace: { - - - Right brace: } - - - Left bracket: [ - - - Right bracket: ] - - - Left paren: ( - - - Right paren: ) - - - Greater-than: > - - - Hash: # - - - Period: . - - - Bang: ! - - - Plus: + - - - Minus: - - -
    -
    - Links -
    - Explicit - - Just a URL. - - - URL and title. - - - URL and title. - - - URL and title. - - - URL and title - - - URL and title - - - with_underscore - - - Email link (nobody@nowhere.net) - - - Empty. - -
    -
    - Reference - - Foo bar. - - - With embedded [brackets]. - - - b by itself should be a link. - - - Indented once. - - - Indented twice. - - - Indented thrice. - - - This should [not][] be a link. - - -[not]: /url - - - Foo bar. - - - Foo biz. - -
    -
    - With ampersands - - Here’s a link - with an ampersand in the URL. - - - Here’s a link with an amersand in the link text: - AT&T. - - - Here’s an inline link. - - - Here’s an inline link in - pointy braces. - -
    -
    - Autolinks - - With an ampersand: - http://example.com/?foo=1&bar=2 - - - - - In a list? - - - - - http://example.com/ - - - - - It should. - - - - - An e-mail address: nobody@nowhere.net - -
    - - Blockquoted: - http://example.com/ - -
    - - Auto-links should not occur here: - <http://example.com/> - - -or here: <http://example.com/> - -
    -
    -
    - Images - - From Voyage dans la Lune by Georges Melies (1902): - -
    - lalune - - - - - lalune - -
    - - Here is a movie - - - - icon. - -
    -
    - Footnotes - - Here is a footnote reference, - - Here is the footnote. It can go anywhere after the footnote reference. - It need not be placed at the end of the document. - - and another. - - 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. - - This should not be a footnote reference, - because it contains a space.[^my note] Here is an inline note. - - This is easier to type. Inline notes may contain - links and - ] verbatim characters, as well as [bracketed text]. - - - -
    - - Notes can go in quotes. - - In quote. - - - -
    - - - - And in list items. - - In list. - - - - - - - This paragraph should not be part of the note, as it is not indented. - -
    + + John + MacFarlane + + + + + + Anonymous + + + + July 17, 2006 + + + This is a set of tests for pandoc. Most of them are adapted from John + Gruber’s markdown test suite. + +
    + Headers +
    + Level 2 with an <link xlink:href="/url">embedded + link</link> +
    + Level 3 with <emphasis>emphasis</emphasis> +
    + Level 4 +
    + Level 5 + + +
    +
    +
    +
    +
    +
    + Level 1 +
    + Level 2 with <emphasis>emphasis</emphasis> +
    + Level 3 + + with no blank line + +
    +
    +
    + Level 2 + + with no blank line + +
    +
    +
    + Paragraphs + + 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 of a paragraph looked like + a list item. + + + Here’s one with a bullet. * criminey. + +There should be a hard line break +here. +
    +
    + Block Quotes + + E-mail style: + +
    + + This is a block quote. It is pretty short. + +
    +
    + + Code in a block quote: + + +sub status { + print "working"; +} + + + A list: + + + + + item one + + + + + item two + + + + + Nested block quotes: + +
    + + nested + +
    +
    + + nested + +
    +
    + + This should not be a block quote: 2 > 1. + + + And a following paragraph. + +
    +
    + Code Blocks + + Code: + + +---- (should be four hyphens) + +sub status { + print "working"; +} + +this code block is indented by one tab + + + And: + + + this code block is indented by two tabs + +These should not be escaped: \$ \\ \> \[ \{ + +
    +
    + Lists +
    + Unordered + + Asterisks tight: + + + + + asterisk 1 + + + + + asterisk 2 + + + + + asterisk 3 + + + + + Asterisks loose: + + + + + asterisk 1 + + + + + asterisk 2 + + + + + asterisk 3 + + + + + Pluses tight: + + + + + Plus 1 + + + + + Plus 2 + + + + + Plus 3 + + + + + Pluses loose: + + + + + Plus 1 + + + + + Plus 2 + + + + + Plus 3 + + + + + Minuses tight: + + + + + Minus 1 + + + + + Minus 2 + + + + + Minus 3 + + + + + Minuses loose: + + + + + Minus 1 + + + + + Minus 2 + + + + + Minus 3 + + + +
    +
    + Ordered + + Tight: + + + + + First + + + + + Second + + + + + Third + + + + + and: + + + + + One + + + + + Two + + + + + Three + + + + + Loose using tabs: + + + + + First + + + + + Second + + + + + Third + + + + + and using spaces: + + + + + One + + + + + Two + + + + + Three + + + + + Multiple paragraphs: + + + + + Item 1, graf one. + + + Item 1. graf two. The quick brown fox jumped over the lazy dog’s + back. + + + + + Item 2. + + + + + Item 3. + + + +
    +
    + Nested + + + + Tab + + + + + Tab + + + + + Tab + + + + + + + + + Here’s another: + + + + + First + + + + + Second: + + + + + Fee + + + + + Fie + + + + + Foe + + + + + + + Third + + + + + Same thing but with paragraphs: + + + + + First + + + + + Second: + + + + + Fee + + + + + Fie + + + + + Foe + + + + + + + Third + + + +
    +
    + Tabs and spaces + + + + this is a list item indented with tabs + + + + + this is a list item indented with spaces + + + + + this is an example list item indented with tabs + + + + + this is an example list item indented with spaces + + + + + +
    +
    + Fancy list markers + + + + begins with 2 + + + + + and now 3 + + + with a continuation + + + + + sublist with roman numerals, starting with 4 + + + + + more items + + + + + a subsublist + + + + + a subsublist + + + + + + + + + Nesting: + + + + + Upper Alpha + + + + + Upper Roman. + + + + + Decimal start with 6 + + + + + Lower alpha with paren + + + + + + + + + + + Autonumbering: + + + + + Autonumber. + + + + + More. + + + + + Nested. + + + + + + + Should not be a list item: + + + M.A. 2007 + + + B. Williams + +
    +
    +
    + Definition Lists + + Tight using spaces: + + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + + + Tight using tabs: + + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + + + Loose: + + + + + apple + + + + red fruit + + + + + + orange + + + + orange fruit + + + + + + banana + + + + yellow fruit + + + + + + Multiple blocks with italics: + + + + + apple + + + + red fruit + + + contains seeds, crisp, pleasant to taste + + + + + + orange + + + + orange fruit + + +{ orange code block } + +
    + + orange block quote + +
    +     +     +     + + Multiple definitions, tight: + + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + bank + + + + + + Multiple definitions, loose: + + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + bank + + + + + + Blank line after term, indented marker, alternate markers: + + + + + apple + + + + red fruit + + + computer + + + + + + orange + + + + orange fruit + + + + + sublist + + + + + sublist + + + + + + +
    +
    + HTML Blocks + + Simple block on one line: + + + foo + + + And nested without indentation: + + + foo + + + bar + + + 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. + + + An emphasized link. + + + This is strong and + em. + + + So is this word. + + + This is strong and + em. + + + So is this word. + + + This is code: >, $, + \, \$, + <html>. + + + This is + strikeout. + + + Superscripts: abcd + ahello + ahello there. + + + Subscripts: H2O, H23O, + Hmany of themO. + + + These should not be superscripts or subscripts, because of the unescaped + spaces: a^b c^d, a~b c~d. + +
    +
    + Smart quotes, ellipses, dashes + + Hello, said the spider. Shelob is my + name. + + + A, B, and C are letters. + + + Oak, elm, and beech are names + of trees. So is pine. + + + He said, I want to go. Were you alive in the + 70’s? + + + Here is some quoted code and a + quoted + link. + + + Some dashes: one—two — three—four — five. + + + Dashes between numbers: 5–7, 255–66, 1987–1999. + + + Ellipses…and…and…. + +
    +
    + LaTeX + + + + + + + + 2 + 2 = 4 + + + + + x ∈ y + + + + + α ∧ ω + + + + + 223 + + + + + p-Tree + + + + + Here’s some display math: + $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ + + + + + Here’s one that has a line break in it: + α + ω × x2. + + + + + These shouldn’t be math: + + + + + To get the famous equation, write $e = mc^2$. + + + + + $22,000 is a lot of money. So is $34,000. (It + worked if lot is emphasized.) + + + + + Shoes ($20) and socks ($5). + + + + + Escaped $: $73 this should be + emphasized 23$. + + + + + Here’s a LaTeX table: + +
    +
    + Special Characters + + Here is some unicode: + + + + + I hat: Î + + + + + o umlaut: ö + + + + + section: § + + + + + set membership: ∈ + + + + + copyright: © + + + + + AT&T has an ampersand in their name. + + + AT&T is another way to write it. + + + This & that. + + + 4 < 5. + + + 6 > 5. + + + Backslash: \ + + + Backtick: ` + + + Asterisk: * + + + Underscore: _ + + + Left brace: { + + + Right brace: } + + + Left bracket: [ + + + Right bracket: ] + + + Left paren: ( + + + Right paren: ) + + + Greater-than: > + + + Hash: # + + + Period: . + + + Bang: ! + + + Plus: + + + + Minus: - + +
    +
    + Links +
    + Explicit + + Just a URL. + + + URL and title. + + + URL and title. + + + URL and title. + + + URL and title + + + URL and title + + + with_underscore + + + Email link (nobody@nowhere.net) + + + Empty. + +
    +
    + Reference + + Foo bar. + + + With embedded [brackets]. + + + b by itself should be a link. + + + Indented once. + + + Indented twice. + + + Indented thrice. + + + This should [not][] be a link. + + +[not]: /url + + + Foo bar. + + + Foo biz. + +
    +
    + With ampersands + + Here’s a link + with an ampersand in the URL. + + + Here’s a link with an amersand in the link text: + AT&T. + + + Here’s an inline link. + + + Here’s an inline link in + pointy braces. + +
    +
    + Autolinks + + With an ampersand: + http://example.com/?foo=1&bar=2 + + + + + In a list? + + + + + http://example.com/ + + + + + It should. + + + + + An e-mail address: nobody@nowhere.net + +
    + + Blockquoted: + http://example.com/ + +
    + + Auto-links should not occur here: + <http://example.com/> + + +or here: <http://example.com/> + +
    +
    +
    + Images + + From Voyage dans la Lune by Georges Melies (1902): + +
    + lalune + + + + + lalune + +
    + + Here is a movie + + + + + movie + + icon. + +
    +
    + Footnotes + + Here is a footnote reference, + + Here is the footnote. It can go anywhere after the footnote reference. + It need not be placed at the end of the document. + + and another. + + 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. + + This should not be a footnote reference, + because it contains a space.[^my note] Here is an inline note. + + This is easier to type. Inline notes may contain + links and + ] verbatim characters, as well as [bracketed text]. + + + +
    + + Notes can go in quotes. + + In quote. + + + +
    + + + + And in list items. + + In list. + + + + + + + This paragraph should not be part of the note, as it is not indented. + +
    diff --git a/test/writer.dokuwiki b/test/writer.dokuwiki --- a/test/writer.dokuwiki +++ b/test/writer.dokuwiki @@ -48,25 +48,25 @@ > This is a block quote. It is pretty short. -
    -Code in a block quote: +> Code in a block quote: - +> sub status { print "working"; } -A list: - - item one - - item two +> A list: -Nested block quotes: +> - item one +> - item two -> nested +> Nested block quotes: -> nested -
    +>> nested + +>> nested + This should not be a block quote: 2 > 1. And a following paragraph. @@ -87,6 +87,7 @@ this code block is indented by one tab + And: @@ -95,6 +96,7 @@ These should not be escaped: \$ \\ \> \[ \{ + ---- ====== Lists ====== @@ -165,11 +167,12 @@ Multiple paragraphs: -
      -

    1. Item 1, graf one.

      -

      Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.

      2. -

    2. Item 2.

      3. -

    3. Item 3.

    + - +Item 1, graf one. +Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. + + - Item 2. + - Item 3. ===== Nested ===== @@ -204,32 +207,28 @@ ===== Fancy list markers ===== -
      -
    1. begins with 2
      2. -

    2. and now 3

      -

      with a continuation

      -
        -
      1. sublist with roman numerals, starting with 4
        2. -
      2. more items -
          -
        1. a subsublist
          2. -
        2. a subsublist
        -
      -
    + - begins with 2 + - +and now 3 +with a continuation + - sublist with roman numerals, starting with 4 + - more items + - a subsublist + - a subsublist + Nesting: -
      -
    1. Upper Alpha -
        -
      1. Upper Roman. -
          -
        1. Decimal start with 6 -
            -
          1. Lower alpha with paren
          -
        -
      -
    + - +Upper Alpha + - +Upper Roman. + - +Decimal start with 6 + - Lower alpha with paren + + + Autonumbering: @@ -268,31 +267,32 @@ Multiple blocks with italics: -
    -
    //apple//
    -

    red fruit

    -

    contains seeds, crisp, pleasant to taste

    -
    //orange//
    -

    orange fruit

    + * **//apple//** +red fruit +contains seeds, crisp, pleasant to taste + + * **//orange//** +orange fruit { orange code block } ->

    orange block quote

    -
    +> orange block quote + + Multiple definitions, tight: - * **apple** red fruitcomputer - * **orange** orange fruitbank + * **apple** red fruit; computer + * **orange** orange fruit; bank Multiple definitions, loose: - * **apple** red fruitcomputer - * **orange** orange fruitbank + * **apple** red fruit; computer + * **orange** orange fruit; bank Blank line after term, indented marker, alternate markers: - * **apple** red fruitcomputer + * **apple** red fruit; computer * **orange** orange fruit - sublist - sublist @@ -314,23 +314,11 @@ Interpreted markdown in a table: - - - - - - -
    - + This is //emphasized// - - - + And this is **strong** - -
    - - + Here’s a simple block: foo @@ -343,11 +331,13 @@ foo     + As should this:
    foo
     + Now, nested: foo @@ -356,49 +346,29 @@ This should just be an HTML comment: - - - + Multiline: - - - - + Code block: + Just plain comment, with trailing spaces on the line: - - - + Code:
    + Hr’s: - -
    -
    -
    -
    -
    -
    -
    -
    -
    - + ---- ====== Inline Markup ====== @@ -571,6 +541,7 @@ [not]: /url + Foo [[url/|bar]]. Foo [[url/|biz]]. @@ -603,17 +574,20 @@ or here: + ---- ====== Images ====== From “Voyage dans la Lune” by Georges Melies (1902): -{{:lalune.jpg|Voyage dans la Lune lalune}} +{{lalune.jpg|Voyage dans la Lune}} +lalune -Here is a movie {{:movie.jpg|movie}} icon. +Here is a movie {{movie.jpg|movie}} icon. + ---- ====== Footnotes ====== @@ -626,12 +600,13 @@ { } + 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 //not// be a footnote reference, because it contains a space.[^my note] Here is an inline note.((This is //easier// to type. Inline notes may contain [[http://google.com|links]] and ''%%]%%'' verbatim characters, as well as [bracketed text]. )) > Notes can go in quotes.((In quote. -> )) +)) - And in list items.((In list.)) diff --git a/test/writer.fb2 b/test/writer.fb2 --- a/test/writer.fb2 +++ b/test/writer.fb2 @@ -3,7 +3,6 @@ unrecognised -Pandoc Test Suite John MacFarlane @@ -11,6 +10,7 @@ Anonymous +Pandoc Test Suite July 17, 2006 @@ -22,28 +22,29 @@

    Pandoc Test Suite

    -

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

    - -

    ——————————

    +

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

    -
    +
    <p>Headers</p> -
    +