aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-11-02Preliminary changes for epub3 format.John MacFarlane5-43/+93
* EPUB writer now exports writeEPUB2 and writeEPUB3. * 'epub' output format is epub v2, while 'epub3' is v3.
2012-11-02DocBook reader: Support title in "figure" element.John MacFarlane1-6/+21
Closes #650.
2012-11-01LaTeX reader: Avoid include loops.John MacFarlane1-8/+17
2012-11-01Revert "LaTeX reader: Added code to handleIncludes to avoid inf loops."John MacFarlane1-14/+8
This reverts commit da87837318cf035be407136b39c5ec6a0009adb4. Reason: The code was overzealous and would rule out some things we want to be able to do, like include the same file multiple times.
2012-11-01LaTeX reader: Added code to handleIncludes to avoid inf loops.John MacFarlane1-8/+14
e.g. when one file includes another which includes it.
2012-11-01LaTeX reader: Improved handling of included files.John MacFarlane1-11/+24
* `\input` now works, as well as `\include`. * TEXINPUTS is used. * We now look recursively into included files for more included files.
2012-10-28Removed citationSuppressParens.John MacFarlane5-6/+5
Makefile: Use citeproc-0.3.6 release.
2012-10-22LaTeX reader: Initialize citationSuppressParens field.John MacFarlane3-2/+4
2012-10-22Fixed Biblio for extra parameter on Citation.John MacFarlane1-2/+2
2012-10-21Revert "LaTeX reader: Use new suppressParens option for footnote citations."John MacFarlane4-82/+77
This reverts commit 7499499b68934ae6f3418940328c7fc2bd9fcadd. Conflicts: src/Text/Pandoc/Readers/LaTeX.hs
2012-10-21Revert "Adjust LaTeX reader test for last change."John MacFarlane1-1/+1
This reverts commit ea34087cde44bc941ef0280d10de775a8c7e5426.
2012-10-21Bumped version bound for template-haskell.John MacFarlane1-1/+1
2012-10-20Updated lhs-test.latex for new highlighting-kate treatment of `.John MacFarlane1-1/+1
2012-10-18Fixed bug in fetching CSL files from CSL data directory.John MacFarlane1-2/+2
2012-10-18Removed debug print statement left in my mistake.John MacFarlane1-1/+0
2012-10-15make-pandoc-man-pages: Use MIN_VERSION macro rather than checking GHC version.John MacFarlane1-1/+1
This is more reliable, since directory 1.2.0.1 can be used with GHC < 1.7.6.
2012-10-15Moved man page creation out of Setup.hs.John MacFarlane5-127/+126
* MakeManPage.hs has been transformed into man/make-pandoc-man-pages.hs. * There is now a cabal stanza for this, so the dependencies are handled by cabal. * Special treatment in Setup.hs ensures that this never gets installed; it is built and used to create the man pages. * Setup.hs cleaned up.
2012-10-15LaTeX reader: Basic \enquote support.John MacFarlane1-0/+9
2012-10-15Adjust LaTeX reader test for last change.John MacFarlane1-1/+1
2012-10-15LaTeX reader: Use new suppressParens option for footnote citations.John MacFarlane4-77/+82
Also changed Biblio, Markdown reader, and LaTeX reader tests because of new citationSuppressParens field in Citation.
2012-10-15Removed unneeded function from Setup.hs.John MacFarlane1-6/+0
2012-10-15WhitespaceJohn MacFarlane1-2/+2
2012-10-14Re-added Read instance for ReaderOptions.John MacFarlane1-1/+1
Requires dev version of citeproc-hs.
2012-10-14Makefile: Back to using citeproc-hs repository.John MacFarlane1-1/+1
The released version lacks some features we need.
2012-10-14LaTeX reader: Use normal citations, not author-in-text, for fn cites.John MacFarlane1-4/+4
Eventually it would be nice to use a "suppress outer parens" variant, if citeproc-hs provides one.
2012-10-13Don't expose Text.Pandoc.Biblio.John MacFarlane1-1/+1
It's no longer necessary for library users, as bibliography processing occurs in readMarkdown and readLaTeX.
2012-10-13Moved bibliography processing into readers.John MacFarlane4-33/+43
Previously this was done in src/pandoc.hs, which made it difficult for library users. * Removed readerCitations in ReaderOptions. * Added readerReferences and readerCitationStyle to ReaderOptions. * Moved use of processBiblio from main program to the markdown and LaTeX readers.
2012-10-13Biblio: Make processBiblio take a Maybe Style parameter.John MacFarlane1-3/+4
If Nothing, then nothing is done.
2012-10-13Textile reader: Fixed bug with list items containing line breaks.John MacFarlane3-9/+25
Now pandoc correctly handles hard line breaks inside list items. Previously they broke list parsing. Thanks to Pablo Rodríguez for pointing out the problem.
2012-10-11LaTeX reader: Made rawLaTeXInline more flexible.John MacFarlane1-4/+2
Now it will also try to parse block commands. 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.
2012-10-11LaTeX reader: Make `\noindent` inline rather than block.John MacFarlane1-2/+1
2012-10-11Added MIME types for .wof and .eot.John MacFarlane1-0/+2
Closes #640. i#
2012-10-11EPUB writer improvements.John MacFarlane2-33/+61
* We now convert to XHTML before cutting into chapter-sized chunks. This fixes a number of problems. * `--number-sections` now works properly. * A proper three-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. * New epub-page template without the `$title$` variable. Titles are left in the chapter bodies as an initial h1. * Closes #539.
2012-10-10LaTeX reader: Better support for citation commands.John MacFarlane2-8/+12
* Make `\cite` etc. an AuthorInText. * Make `\footcite` etc. into citations in notes.
2012-10-06RST reader: Don't create empty definition list for metadata field lists.John MacFarlane1-3/+3
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. This patch fixes the problem, which I learned of from http://stackoverflow.com/questions/12762767/modify-variable-in-rst-with-pandoc.
2012-10-06Biblio: Changed type of processBiblio.John MacFarlane2-26/+24
* It is no longer in the IO monad. * setHash uses state rather than Data.Unique. * It takes a Style argument rather than parameters for CSL and abbrev filenames. * pandoc.hs now calls the functions to parse the style file and add abbrevs.
2012-10-05Revert "Added stateWarnings to ParserState, added warning function."John MacFarlane1-8/+0
This reverts commit 5419b504cef0cc6e1a0f3e321b2fc0a66e12db3c.
2012-10-05Added stateWarnings to ParserState, added warning function.John MacFarlane1-0/+8
This will be used to provide warnings for things like duplicate footnote refs and link refs.
2012-10-05Textile reader: Implemented comment blocks.John MacFarlane3-1/+18
2012-10-04Fixed typo.John MacFarlane1-1/+1
2012-10-04Updated mediawiki writer test for `<br />` change.John MacFarlane1-2/+1
2012-10-04Merge pull request #636 from byorgey/masterJohn MacFarlane1-1/+1
Remove newline character from LineBreak output
2012-10-04Remove newline after <br/> in translation of LineBreakBrent Yorgey1-1/+1
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.
2012-10-02Docx writer: Added nsid to abstractNum elements.John MacFarlane1-11/+16
This helps when merging word documents with numbered or bulleted lists. Closes #627.
2012-10-02Use integer ids for bookmarks.John MacFarlane1-6/+8
Closes #626.
2012-10-02Makefile: cabal-dev/cabal update.John MacFarlane1-1/+1
2012-09-30RST reader: Removed 'plain' in blocks, since 'para' includes it.John MacFarlane1-1/+0
2012-09-30RST reader: Consolidate super/subscript, math into interpretedRole.John MacFarlane2-36/+27
2012-09-30RST reader: Renamed 'image' to 'subst', since it now handles more.John MacFarlane1-4/+3
2012-09-30Ignore unknown interpreted roles.John MacFarlane1-3/+12
The contents are treated as rst, not literal, which will sometimes be wrong.