Commit graph

806 commits

Author SHA1 Message Date
John MacFarlane
93e096fe1d Fixed warning. 2013-07-18 21:51:11 -07:00
John MacFarlane
7c980f39bf Improved fetching of external resources.
* In Shared, openURL and fetchItem now return an Either, for
  better error handling. (API change.)
* Better error message when fetching a URL fails with
  `--self-contained`.
* EPUB writer: If resource not found, skip it, as in Docx writer.
* Closes #916.
2013-07-18 20:58:14 -07:00
John MacFarlane
b2385d0e9b Text.Pandoc.ImageSize: Handle EPS.
Closes #903.  This change will make EPS images properly sized
on conversion to Word.
2013-07-16 22:04:59 -07:00
Alexander Kondratskiy
0b49f810f4 Fixing wrong numbered-list indentation in open document format 2013-07-14 14:33:58 -04:00
John MacFarlane
f42095b7b7 Docx writer: Make --no-highlight work properly. 2013-07-13 13:48:50 -07:00
Alexander Kondratskiy
6a235ba606 Checking options before applying syntax highlighting for HTML output 2013-07-13 02:23:27 -04:00
John MacFarlane
bd1079e48e Docx writer: 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.

Perhaps this will help with the corruption problems caused when
different versions of Word resave the reference.docx and
reorganize things.
2013-07-12 20:58:15 +01:00
John MacFarlane
e7b5f2deb5 Docx writer: Use w:br with w:type 'textWrapping' for linebreaks.
Previously we used w:cr.

I don't see a difference between these in my version of Word,
but apparently some do.  Closes #873.
2013-07-04 16:37:44 -07:00
John MacFarlane
3f1937f78e LaTeX writer: Don't use ligatures in escaping inline code. 2013-07-04 15:06:23 -07:00
John MacFarlane
3cd62d7c35 Rename Ext_yaml_title_block -> Ext_yaml_metadata_block. 2013-07-02 20:54:30 -07:00
John MacFarlane
0da863f951 Markdown writer: Changed condition for rendering title block.
Previously it was only rendered if title, author, or date set.
Now any metadata field can be set.
2013-07-02 20:44:19 -07:00
John MacFarlane
1f7ce4a2cd Write full metadata in MMD style title blocks. 2013-07-02 09:03:54 -07:00
John MacFarlane
9009a7e4a8 Markdown writer: Commas are okay in plain yaml scalars.
It's just commas with brackets that can cause problems.
2013-07-01 21:00:46 -07:00
John MacFarlane
e7a68fc7e8 Markdown writer: Render yaml title block fields in alpha order.
This makes the output predictable; previously it varied across
implementations.
2013-07-01 20:56:27 -07:00
John MacFarlane
7f83d88a65 Added Text.Pandoc.Writers.Shared to repository.
This should have been in last commit.
2013-07-01 20:49:22 -07:00
John MacFarlane
956425709d Created Text.Pandoc.Writers.Shared, improved metaToJSON.
* Text.Pandoc.Writers.Shared contains shared functions used
  only in writers.
* metaToJSON now takes a WriterOptions parameter, and will
  return an empty object if standalone is not specified.
2013-07-01 20:47:26 -07:00
John MacFarlane
19ad69b1c6 Improvements to yaml title block writer. 2013-07-01 16:28:34 -07:00
John MacFarlane
2d46828b1c Revert "Markdown writer: Don't include variables in metadata."
This reverts commit 0ec8573347.
2013-07-01 14:17:04 -07:00
John MacFarlane
0ec8573347 Markdown writer: Don't include variables in metadata. 2013-07-01 12:48:13 -07:00
John MacFarlane
5d01e9a117 Markdown writer: Support yaml title block. 2013-06-30 23:37:27 -07:00
John MacFarlane
a1f010de78 Metadata changes: Variables now completely shadow metadata.
Previously if you set a value both in metadata and with a variable,
they'd be combined into a list.  Now the variable replaces the
value in document metadata.  If many variables with the same
name are set, a list is created.

Shared:  metaToJSON now has an argument for a variable list.
2013-06-29 22:14:01 -07:00
John MacFarlane
5cb0f0bbf1 ConTeXt writer: Properly handle tables without captions.
The old output only worked in MkII. This should work in MkIV
as well.

Closes #837.
2013-06-28 21:30:27 -07:00
John MacFarlane
644e3239a9 Custom writer: Pass full metadata, not just tit/auth/date. 2013-06-27 22:55:10 -07:00
John MacFarlane
899a65b7d1 Writers: Use defField for defaults.
This way explicitly specified fields not overridden.

Fixes a problem e.g. with specifying a documentclass via
the command line using -V.
2013-06-27 22:42:55 -07:00
John MacFarlane
dd96213c05 Man writer: give more fine-grained control in template.
Now the `title`, `section`, `header`, and `footer` can 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 parse it as before into a title, section, header, and
footer.  But you can also specify these elements explicitly.

Closes #885.
2013-06-27 19:32:28 -07:00
John MacFarlane
79a4ea03e2 Stop escaping | in LaTeX math.
This caused problems with array environments.  Closes #891.
2013-06-26 20:54:31 -07:00
John MacFarlane
70eeeb82b5 Fixed regression with RTF table of contents. 2013-06-25 22:32:50 -07:00
John MacFarlane
08631ef1a3 Some test suite fixes for new metadata. 2013-06-25 22:32:50 -07:00
John MacFarlane
f869f7e08d Use new flexible metadata type.
* Depend on pandoc 1.12.
* Added yaml dependency.
* `Text.Pandoc.XML`: Removed `stripTags`.  (API change.)
* `Text.Pandoc.Shared`:  Added `metaToJSON`.
  This will be used in writers to create a JSON object for use
  in the templates from the pandoc metadata.
* Revised readers and writers to use the new Meta type.
* `Text.Pandoc.Options`: Added `Ext_yaml_title_block`.
* Markdown reader:  Added support for YAML metadata block.
  Note that it must come at the beginning of the document.
* `Text.Pandoc.Parsing.ParserState`:  Replace `stateTitle`,
  `stateAuthors`, `stateDate` with `stateMeta`.
* RST reader:  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.
* `Text.Pandoc.Templates`:  Export `renderTemplate'` that takes a string
  instead of a compiled template..
* OPML template:  Use 'for' loop for authors.
* Org template: '#+TITLE:' is inserted before the title.
  Previously the writer did this.
2013-06-24 20:29:41 -07:00
John MacFarlane
e32a8f5981 Revised Text.Pandoc.Templates to accept JSON contexts.
Currently the library is set up with a shim for association
lists, for compatibility, but this can change when the writers
are changed.

New export: `varListToJSON`.

Removed `Empty`.

Simplified template type to a newtype.
2013-06-24 20:27:37 -07:00
John MacFarlane
a43e0ad5d6 Markdown writer: Don't wrap attributes in fenced code blocks. 2013-06-11 10:17:12 -07:00
John MacFarlane
8d19e45b97 LaTeX writer: Always create labels for sections.
Previously the labels were only created when there were links to
the section in the document.

Closes #871.
2013-06-02 14:38:18 -07:00
Max Rydahl Andersen
2e868c8251 Add --atx-headers support to asciidoc and dont print empty identifier blocks ([[]]) on headers 2013-05-31 01:34:46 +02:00
John MacFarlane
7998587810 Added CPP directives to avoid warnings.
For 'import Prelude hiding (catch)'.  catch is no longer in
Prelude starting with base 4.6.
2013-05-29 20:21:32 -07:00
John MacFarlane
f8e6f9c215 EPUB writer: math with --webtex is automatically made self-contained.
And some code cleanup.
2013-05-22 14:51:47 -07:00
John MacFarlane
210855e03e EPUB writer: Download webtex images and include as data URLs.
This allows you to use `--webtex` in creating EPUBs.
2013-05-22 10:21:22 -07:00
John MacFarlane
008273ef67 RTF writer: Properly handle characters above the 0000-FFFF range.
Uses surrogate pairs.  Thanks to Hiromi Ishii for the patch.
2013-05-02 19:42:37 -07:00
John MacFarlane
d776ee191e Don't convert to lowercase in email obfuscation.
Closes #839.
2013-04-25 12:28:55 -07:00
John MacFarlane
a405b81459 Add slash in internal links in reveal.js.
Closes #835.
2013-04-20 14:59:39 -07:00
John MacFarlane
7d7c1f2f8e Fixed footnote numbers in LaTeX/PDF tables.
This fixes a bug wherein notes were numbered incorrectly
in tables.  Closes #827.

Now that we are using longtable, we can just use regular
`\footnote` commands for notes, which simplifies the code
considerably.
2013-04-15 09:10:29 -07:00
John MacFarlane
931b22184a Markdown/RST writers: Only autolink absolute URIs.
This fixes a regression and closes #830.

    $ echo '<a href="x">x</a>' | pandoc -f html -t markdown
    <x>
2013-04-14 22:37:46 -07:00
John MacFarlane
4fa2a94759 Added Text.Pandoc.Writers.Custom, --print-custom-lua-writer.
pandoc -t data/sample.lua

will load the script sample.lua and use it as a custom writer.
data/sample.lua is provided as an example.

Added `--print-custom-lua-writer` option to print the sample
script.
2013-04-14 00:31:39 -05:00
John MacFarlane
da13ad89ce Man writer: use one decimal place for column widths.
This, I hope, will fix test failures on GHC 7.6 due to
(presumably) different rounding or floating point multiplication.
2013-04-09 19:56:43 -07:00
John MacFarlane
ff6394171b Markdown writer: Put multiple authors on separate lines in titleblock.
Also, don't wrap long author entries, as new lines get treated
as new authors.
2013-04-08 09:51:10 -07:00
John MacFarlane
72020f1773 Docx writer: Use Compact style for Plain block elements.
This differentiates between tight and loose lists.
Closes #775.
2013-03-30 22:11:00 -07:00
John MacFarlane
38e35aaeda 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.
2013-03-28 17:34:54 -07:00
John MacFarlane
ba1e74dcd7 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.

Closes #803.
2013-03-26 11:38:50 -07:00
John MacFarlane
b6f75f60d6 EPUB writer: Don't put blank title page in reading sequence.
Set linear="no" if no title block.
Addresses #797.
2013-03-24 23:06:44 -07:00
John MacFarlane
cb906e7512 EPUB writer: Add id="toc-title" to h1 in nav.xhtml.
Closes #799.
2013-03-24 22:41:00 -07:00
John MacFarlane
6217623d0a Added syntax for "pauses" in beamer or reaveljs slide shows.
This gives

    . . .

    a pause.
2013-03-24 21:03:04 -07:00