Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
3553 commits 2 branches 0 tags 65 MiB
Commit graph

3553 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
7af45f78d1 Textile reader: Allow newlines before pipes in table. 
Closes #654.
 2012-11-05 08:16:15 -08:00
John MacFarlane
a2c40c36d5 EPUB template: UTF-8, lang tag, meta tags. 2012-11-04 21:40:21 -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
0c5801297d Added epub3 to cabal description 2012-11-04 10:40:11 -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
83556239b1 Use title element in epub templates. 2012-11-02 19:51:29 -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
bfddcb46dc Revert "Adjust LaTeX reader test for last change." 
This reverts commit ea34087cde.
 2012-10-21 23:14:42 -07:00
John MacFarlane
d89b74a003 Bumped version bound for template-haskell. 2012-10-21 14:11:03 -07:00
John MacFarlane
ca583a340f Updated lhs-test.latex for new highlighting-kate treatment of `. 2012-10-20 23:54:05 -07:00
John MacFarlane
b63566f09c Fixed bug in fetching CSL files from CSL data directory. 2012-10-18 08:55:11 -07:00
John MacFarlane
c27b8ba5e2 Removed debug print statement left in my mistake. 2012-10-18 08:46:11 -07:00
John MacFarlane
b808655b2b make-pandoc-man-pages: Use MIN_VERSION macro rather than checking GHC version. 
This is more reliable, since directory 1.2.0.1 can be used with
GHC < 1.7.6.
 2012-10-15 21:31:19 -07:00
John MacFarlane
b3ad94bde9 Moved man page creation out of Setup.hs. 
* 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-15 21:26:24 -07:00
John MacFarlane
6f9151c64e LaTeX reader: Basic \enquote support. 2012-10-15 20:15:34 -07:00
John MacFarlane
ea34087cde Adjust LaTeX reader test for last change. 2012-10-15 20:01:07 -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
b28630f577 Removed unneeded function from Setup.hs. 2012-10-15 19:53:57 -07:00
John MacFarlane
4cc3801fb0 Whitespace 2012-10-15 19:53:52 -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
7179163826 Makefile: Back to using citeproc-hs repository. 
The released version lacks some features we need.
 2012-10-14 21:08:41 -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
91c547a0c6 Don't expose Text.Pandoc.Biblio. 
It's no longer necessary for library users, as bibliography
processing occurs in readMarkdown and readLaTeX.
 2012-10-13 11:36:29 -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