Commit graph

1811 commits

Author SHA1 Message Date
John MacFarlane
1864bb0994 Data files changes.
* Added `embed_data_files` flag.  (not yet used)
* Shared no longer exports `findDataFile`.
* `readDataFile` now returns a strict bytestring.
* Shared now exports `readDataFileUTF8` which returns a string like
  the old `readDataFile`.
* Rewrote modules to use new data file functions and to avoid
  using functions from Paths_pandoc directly.
2012-12-29 17:54:07 -08:00
John MacFarlane
3df2f1e3de EPUB3: Don't use the switch statement for mathml.
It is not widely implemented yet.
2012-12-19 11:29:03 -08:00
John MacFarlane
2695434113 Fixed bug in withRaw.
Didn't correctly handle case where nothing is parsed.
2012-12-13 19:04:01 -08:00
John MacFarlane
6e36375bdc LaTeX reader: Make command macros work everywhere, including non-math.
Environment macros still not supported.
2012-12-12 19:28:33 -08:00
John MacFarlane
4cd573c61f Textile reader/writer: 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
2012-11-06 16:05:17 -08:00
John MacFarlane
4aa3e1f978 Textile parser: 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.
2012-11-06 09:18:02 -08:00
John MacFarlane
54fb384369 HTML writer: Include highlighting-css for code spans, too.
Previously it was only included if used in a code block.
Closes #653.
2012-11-05 10:45:49 -08:00
John MacFarlane
09603b94f7 LaTeX reader: skip comments in handleIncludes. 2012-11-05 08:22:26 -08:00
John MacFarlane
7af45f78d1 Textile reader: Allow newlines before pipes in table.
Closes #654.
2012-11-05 08:16:15 -08:00
John MacFarlane
5914be88a8 EPUB writer: 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.
2012-11-04 21:21:57 -08:00
John MacFarlane
83b326b005 EPUB: removed need for separate epub-titlepage template.
The titlepage stuff is now folded into the epub-page template.
A titlepage variable selects it.
2012-11-04 21:08:40 -08:00
John MacFarlane
a7b8351d43 EPUB writer: Removed need for separate epub-coverpage template.
The standard epub-page template is now used.
2012-11-04 20:53:41 -08:00
John MacFarlane
7f5e2af1fb EPUB writer: Improved handling of CSS.
* Code highlighting now works by default.
* Quote styles work as in pandoc's HTML writer.
2012-11-04 18:58:37 -08:00
John MacFarlane
9d0b011869 RST writer: Don't add ":align: center" to figures. 2012-11-04 18:33:35 -08:00
John MacFarlane
1f29592b64 EPUB writer: Set epub3 variable before calling templates. 2012-11-04 18:14:27 -08:00
John MacFarlane
ae6028d442 EPUB writer: Better TOC and footnote handling.
* Here we go back to splitting the document at the Pandoc AST
  level, and converting each chapter to HTML separately.
* Fixes bug in footnote processing introduced by
  commit 01d109e2ef.  The bug caused
  all footnotes to appear in the last chapter, so that footnote
  links from other chapters would not work.  Closes #651.
* We also disable writerTableOfContents, since TOC is automatic
  for epub.
2012-11-04 18:06:28 -08:00
John MacFarlane
b69792e2ed EPUB: Use section divs by default for better semantic markup. 2012-11-04 12:51:17 -08:00
John MacFarlane
a2cb53640d LaTeX writer: Don't use [fragile] unnecessarily.
We were using [fragile] on slides even if they only contained
code that was rendered using `\texttt`.  Now `[fragile]` is
only used for slides containing inline code if that code
is rendered using listings. Closes #649.
2012-11-04 11:09:42 -08:00
John MacFarlane
569954e1d5 Improved support for MathML in EPUB3.
* MathML math method now used always in EPUB3 (even if another
  math method specified in options).
* epub:switch is used to specify a non-MathML default. This is supposed
  to proide a good fallback behavior in older readers, though I'm
  not sure how well it works in practice.
2012-11-04 10:37:57 -08:00
John MacFarlane
dfca59943d EPUB: Don't use opf:role in EPUB3. 2012-11-02 21:23:02 -07:00
John MacFarlane
afa5a4da67 EPUB: Fixed invalid nesting problem in nav.xhtml. 2012-11-02 21:12:56 -07:00
John MacFarlane
e9542a60b5 EPUB: Added properties attribute. 2012-11-02 21:10:08 -07:00
John MacFarlane
63bed5dc2e HTML writer: Use XHtml5 only if blaze version current enough. 2012-11-02 21:04:32 -07:00
John MacFarlane
5b7d27912a HTML writer: Use Text.Blaze.XHtml5 instead of Html5.
This is needed for epub.
2012-11-02 20:59:45 -07:00
John MacFarlane
927e4b92a6 EPUB: Use HTML5 for epub3. 2012-11-02 20:57:18 -07:00
John MacFarlane
927a9271a5 EPUB: Set epub3 template variable controlling doctype. 2012-11-02 20:53:51 -07:00
John MacFarlane
583ce1073c EPUB writer: Don't create entry for nav.xhtml in EPUB2. 2012-11-02 20:25:55 -07:00
John MacFarlane
76d3c0d028 Fixed a couple validation bugs that affect epub2 also. 2012-11-02 20:14:18 -07:00
John MacFarlane
43448d7d53 Preliminary changes for epub3 format.
* EPUB writer now exports writeEPUB2 and writeEPUB3.
* 'epub' output format is epub v2, while 'epub3'
  is v3.
2012-11-02 17:46:22 -07:00
John MacFarlane
7818033df9 DocBook reader: Support title in "figure" element.
Closes #650.
2012-11-02 16:21:06 -07:00
John MacFarlane
a6e56235d5 LaTeX reader: Avoid include loops. 2012-11-01 13:49:20 -07:00
John MacFarlane
0f24816291 Revert "LaTeX reader: Added code to handleIncludes to avoid inf loops."
This reverts commit da87837318.

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-01 10:18:17 -07:00
John MacFarlane
da87837318 LaTeX reader: Added code to handleIncludes to avoid inf loops.
e.g. when one file includes another which includes it.
2012-11-01 10:17:00 -07:00
John MacFarlane
6dff7dccaa LaTeX reader: Improved handling of included files.
* `\input` now works, as well as `\include`.
* TEXINPUTS is used.
* We now look recursively into included files for more included files.
2012-11-01 09:42:10 -07:00
John MacFarlane
06300e59d5 Removed citationSuppressParens.
Makefile: Use citeproc-0.3.6 release.
2012-10-28 09:36:15 -07:00
John MacFarlane
6f2347635c LaTeX reader: Initialize citationSuppressParens field. 2012-10-22 19:17:00 -07:00
John MacFarlane
a23a8e8b67 Fixed Biblio for extra parameter on Citation. 2012-10-22 09:30:05 -07:00
John MacFarlane
cfab8eaecb Revert "LaTeX reader: Use new suppressParens option for footnote citations."
This reverts commit 7499499b68.

Conflicts:

	src/Text/Pandoc/Readers/LaTeX.hs
2012-10-21 23:16:23 -07:00
John MacFarlane
6f9151c64e LaTeX reader: Basic \enquote support. 2012-10-15 20:15:34 -07:00
John MacFarlane
7499499b68 LaTeX reader: Use new suppressParens option for footnote citations.
Also changed Biblio, Markdown reader, and LaTeX reader tests because
of new citationSuppressParens field in Citation.
2012-10-15 19:53:57 -07:00
John MacFarlane
a35b718e7d Re-added Read instance for ReaderOptions.
Requires dev version of citeproc-hs.
2012-10-14 22:14:15 -07:00
John MacFarlane
19e1d746da LaTeX reader: Use normal citations, not author-in-text, for fn cites.
Eventually it would be nice to use a "suppress outer parens" variant,
if citeproc-hs provides one.
2012-10-14 08:44:25 -07:00
John MacFarlane
b5dd06d303 Moved bibliography processing into readers.
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-13 11:33:55 -07:00
John MacFarlane
9a77a3f15b Biblio: Make processBiblio take a Maybe Style parameter.
If Nothing, then nothing is done.
2012-10-13 11:33:33 -07:00
John MacFarlane
ea8b8114e1 Textile reader: Fixed bug with list items containing line breaks.
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-13 10:44:38 -07:00
John MacFarlane
40128754ab LaTeX reader: Made rawLaTeXInline more flexible.
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-11 21:21:09 -07:00
John MacFarlane
cfc2e00b84 LaTeX reader: Make \noindent inline rather than block. 2012-10-11 20:56:44 -07:00
John MacFarlane
1dcd7c66eb Added MIME types for .wof and .eot.
Closes #640.
i#
2012-10-11 09:33:10 -07:00
John MacFarlane
01d109e2ef EPUB writer improvements.
* 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-11 09:13:09 -07:00
John MacFarlane
4349097990 LaTeX reader: Better support for citation commands.
* Make `\cite` etc. an AuthorInText.
* Make `\footcite` etc. into citations in notes.
2012-10-10 19:41:39 -07:00