Commit graph

843 commits

Author SHA1 Message Date
John MacFarlane
54782c2af6 Fixed spacing bugs involving code block attributes.
Closes #763.
2013-03-11 20:45:27 -07:00
John MacFarlane
f7229b1473 LaTeX reader: citation handling changes.
Previously, a LaTeX citation would always be parsed as a Citation
element, with the raw LaTeX in the [Inline] part.

Now, the LaTeX citation is parsed as a Citation element only if
`--biblio` was specified (i.e. only if there is a nonempty set
of references in readerReferences).  Otherwise it is parsed as
raw LaTeX.

This will make it possible to simplify some things in the markdown
writer.  It also makes the LaTeX reader behave more like the Markdown
reader.
2013-03-09 10:33:25 -08:00
John MacFarlane
af7e97b9f5 Markdown writer: 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`.
2013-03-07 16:38:19 -08:00
John MacFarlane
48be39ae2a Support :number-lines: in RST code output. 2013-03-06 10:13:12 -08:00
John MacFarlane
3b63cb0903 Hide Text.Pandoc.Highlighting.
* Moved code for translating listings language names to
  highlighting-kate names and back from LaTeX reader to Highlighting.
* Text.Pandoc.Highlighting no longer exposed (API change)
* Text.Pandoc.Highlighting exports toListingsLang, fromListingsLang
2013-03-05 22:09:42 -08:00
John MacFarlane
0bbee1bcf6 LaTeX writer: Support line numbering with --listings.
If "numberLines" class is present, we add "numbers=left";
if "startFrom" is present, we add "firstnumber=".

Partially addresses #763.
2013-03-04 09:31:31 -08:00
John MacFarlane
76c5ebf141 EPUB writer: 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.
* Results validate with epubcheck 3.0 for both epub and epub3
  output.
* Closes #773.
2013-03-03 08:42:45 -08:00
John MacFarlane
6611ec399c Textile writer: Removed an unused assignment. 2013-03-01 12:17:49 -08:00
John MacFarlane
abdaa96b03 Markdown writer: Use grid tables when needed, and if enabled.
Closes #740.
2013-02-28 20:22:28 -08:00
John MacFarlane
0c9bb40403 Textile writer: Support header attributes. 2013-02-28 18:47:49 -08:00
John MacFarlane
6cfd2e8fa9 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.
2013-02-26 22:59:21 -08:00
John MacFarlane
3fca434737 Changed style names in reference docx.
FootnoteReference -> FootnoteRef.
Hyperlink -> Link.

Why?  Because the old names got changed by Word when the
reference.docx was edited.  I don't understand why, but this
fixes things.

Closes #414.
2013-02-26 22:01:47 -08:00
John MacFarlane
caed0df4a7 Docx writer: Create content types and document rels from scratch.
This fixes problems that arise when you edit the reference.docx
with Word.  Word tends to remove things from the `[Content_Types].xml`
and `word/_rels/document.xml.rels` files that are needed (e.g.
references to the `footnotes.xml` file and image default mime types).
So we regenerate these completely rather than taking them from
the `reference.docx`.

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.

This mostly addresses #414.  The only remaining issue I can see
is the issue of style IDs, which Word inexplicably changes in
some cases when the reference.docx is saved.  E.g.
`FootnoteReference` becomes `FootnoteReference1`.
2013-02-26 20:31:32 -08:00
John MacFarlane
c46eac5aea Refactoring in Docx writer. 2013-02-25 19:04:20 -08:00
John MacFarlane
cae409725f Docx writer: Handle PDF images. 2013-02-23 23:04:42 -08:00
John MacFarlane
dd48e06a4d EPUB writer: Improved behavior with --number-sections.
* 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.
2013-02-23 20:21:45 -08:00
John MacFarlane
ca6cb04509 EPUB writer: more transition.
Changed toChunks to toChapters.
2013-02-23 19:34:04 -08:00
John MacFarlane
9c40535c47 EPUB writer: Temporary step towards a better system for numbering.
With this change, `--number-sections` won't work.  This will
be fixed later.
2013-02-23 18:51:58 -08:00
John MacFarlane
8b8c8cfed9 HTML writer: fix case when writerNumberOffet is empty or short.
We add 0s to the end of the list if it's shorter than needed.
2013-02-23 18:51:33 -08:00
John MacFarlane
756c8d492a --number-from -> --number-offset
Also `writerNumberFrom` -> `writeNumberOffset`.
The offset is a list of numbers (0 by default).
These are added to the section, subsection, etc.
numbers that would have been generated automatically.
2013-02-23 18:11:05 -08:00
John MacFarlane
a7245b453c EPUB writer: Minor section numbering tweaks.
* If we need to add an initial section, make it unnumbered.
* Don't add extra space before unnumbered section titles in TOC.
2013-02-22 20:38:56 -08:00
John MacFarlane
a33828f375 EPUB writer: Use writerNumberFrom instead of ugly hack. 2013-02-22 19:45:39 -08:00
John MacFarlane
9b190ec3db Made HTML writer sensitive to writerNumberFrom. 2013-02-22 19:15:38 -08:00
John MacFarlane
83521c18e9 ConTeXt writer: now sensitive to 'unnumbered' class in headers.
In this case \title, \subject are used instead of \chapter,
\section.
2013-02-18 10:55:08 -08:00
John MacFarlane
8dd00b93e2 LaTeX writer: Omit lists with no items.
Otherwise we get LaTeX errors.
2013-02-16 17:47:45 -08:00
John MacFarlane
eca8c6043b 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.

Note that this fix is a bit hackish and possibly fragile:
if the rendering of section numbers in HTML changes in the
future, it may break.  But it works, without needing
changes in other modules.
2013-02-16 17:36:39 -08:00
John MacFarlane
11f7407445 LaTeX writer: Include unnumbered sections in TOC. 2013-02-15 19:23:51 -08:00
John MacFarlane
0d1fa0a763 Implemented "unnumbered" headers in LaTeX writer.
Starred variants of section commands used when header
has "unnumbered" class.
2013-02-14 19:50:11 -08:00
John MacFarlane
90f0dd15b6 HTML writer: Support header attributes.
Note:  The attributes go on the enclosing section or div
if `--section-divs` is specified.

Also fixed a regression (only now noticed) in html+lhs output.
Previously the bird tracks were being omitted.
2013-02-14 19:35:58 -08:00
John MacFarlane
cdee226586 hierarchicalize: Do not number section with class "unnumbered".
Unnumbered sections get [] for their section number.
So far only the HTML writer has been adjusted to be sensitive
to this.

If we keep this change, all the writers will need to be changed
either (a) to directly check for the "unnumbered" class, if they
do section numbering themselves, or (b) to check for a null section
number, if they use hierarchicalize.
2013-02-13 08:49:48 -08:00
John MacFarlane
a50b83266c HTML writer: Refactored adding attributes to html element. 2013-02-12 21:29:17 -08:00
John MacFarlane
5330e63421 Shared: Changed type of Element.
Sec now includes a field for Attr rather than just String
(the identifier).

Note, this is an API change.
2013-02-12 20:13:23 -08:00
John MacFarlane
57e4f5644f Revert "Citation changes."
This reverts commit d46f434d4b.
2013-02-06 13:14:37 -08:00
John MacFarlane
d46f434d4b Citation changes.
* Citations will work in markdown even if `--biblio` isn't
  specified.  Note:  this may cause unexpected behavior for people
  who use strings of the form `@foo` that are not citations!
* If `--biblio` isn't used, the markdown writer will write markdown
  citations rather than CSL-rendered citations.
* This means, for example, that you can do `pandoc -f latex -t markdown`
  and convert biblatex or natbib citations into pandoc citations.
2013-02-03 10:30:48 -08:00
John MacFarlane
f53e0a44ce DocBook writer: for linebreak, but newline in literallayout.
Closes #725.
2013-01-28 11:18:05 -08:00
John MacFarlane
229c22582f LaTeX writer: Avoid extra space at start/end of table cell.
Thanks to Nick Bart for the suggestion of using @{}.
2013-01-28 10:21:18 -08:00
John MacFarlane
c50af7341e 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 nondefault template users.
2013-01-28 10:10:23 -08:00
John MacFarlane
9d549ab683 RST writer: Use .. code:: language for code blocks with language.
Closes #721.
Also fixed whitespace in lhs tests.
2013-01-26 16:12:11 -08:00
John MacFarlane
2f50406c7f Markdown writer: Use 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.
2013-01-26 14:01:50 -08:00
John MacFarlane
d52a1ec18f Another fix to the CPP macro in EPUB writer. 2013-01-22 08:48:43 -08:00
John MacFarlane
294df9deed Fixed MIN_VERSION - need to sub _ for - in blaze-html. 2013-01-22 08:32:33 -08:00
Jens Petersen
88d0ca8ea7 EPUB: condition Blaze Utf8 module name import on blaze-html version
blaze-html/blaze-markup-0.5 has Text.Blaze.Html.Renderer.Utf8
whereas blaze-html-0.4 has Text.Blaze.Renderer.Utf8.
So this needs to be conditional on the version for pandoc
still be with blaze-html-0.4.x
2013-01-22 10:27:34 +09:00
John MacFarlane
26d30d6d38 Use proportional font for email autolinks with obfuscation.
Closes #714.
2013-01-21 11:28:35 -08:00
John MacFarlane
4ed82686e4 Add data-cites field to citations in HTML5.
This contains a space-separated list of citation IDs.
2013-01-18 12:16:12 -08:00
John MacFarlane
8eab759a9c RTF writer: Added writeRTFWithEmbeddedImages.
* RTF writer:  Export writeRTFWithEmbeddedImages instead of
  rtfEmbedImage.
* Text.Pandoc: Use writeRTFWithEmbeddedImages for RTF.
* Moved code for embedding images in RTF out of pandoc.hs.
2013-01-18 10:33:37 -08:00
John MacFarlane
4aea26e8e1 Convert highlighting-kate language to listings language
if --listings is used.

Closes #704.
2013-01-17 19:47:03 -08:00
John MacFarlane
31fa80fdcb Fixed problem with duplicate ids in epub. 2013-01-16 12:16:49 -08:00
John MacFarlane
7194107733 Implemented Ext_mmd_header_identifiers in markdown writer. 2013-01-16 09:20:48 -08:00
John MacFarlane
fa71969e81 LaTeX writer: Prevent paragraphs containing only linebreaks or spaces. 2013-01-15 23:02:08 -08:00
John MacFarlane
eebed6bc48 Added writerHtmlQTags and --html-q-tags option.
The previous default was to use `<q>` tags in HTML5.
But `<q>` tags are also valid HTML4, and they are not very
robust in HTML5.  Some user agents don't support them,
and some CSS resets prevent pandoc's quotes CSS from working
properly (e.g. bootstrap).  It seems a better default just
to insert quote characters, but the option is provided  for
those who have gotten used to using `<q>` tags.
2013-01-15 18:50:36 -08:00