Commit graph

2601 commits

Author SHA1 Message Date
John MacFarlane
6bd686a4f6 Shared: readDefaultDataFile: normalize the paths.
This fixes bugs in `--self-contained` on pandoc compiled with
`embed_data_files`.  The bugs affect (a) paths containing `..`, (b)
Windows, where `\` is path separator.

Closes #833.
2013-04-19 23:03:59 -07:00
John MacFarlane
0ee081ef25 Markdown reader: minor code cleanup. 2013-04-19 20:23:50 -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
5c03275a63 Haddock reader improvements.
- Correctly handle ghci sessions.
- Fixed spacing issues.
- Simplified code.
2013-04-14 21:39:05 -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
dede39452f Added comment/todo to SelfContained. 2013-04-10 10:22:00 -07: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
df1522e1eb Removed unnecessary OPTIONS flag in Haddock/Parse.y. 2013-04-09 19:53:48 -07:00
John MacFarlane
e938fc1ae2 Fixed Haddock reader bugs with list item spaces and examples.
Closes #824.
2013-04-09 18:12:54 -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
David Lazar
67b38fac64 Haddock reader: leaving Space alone in @...@ seems more semantically correct. 2013-04-04 23:11:43 -07:00
David Lazar
100f8df43e Haddock reader: derive Show for Token, making debugging easier. 2013-04-04 23:01:15 -07:00
John MacFarlane
7e4290561d LaTeX reader: Support \textasciitilde, \textasciicircum.
Closes #810.
2013-03-31 21:08:19 -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
David Lazar
8663667788 Haddock reader: make clearer which production the comment refers to. 2013-03-29 11:43:49 -07:00
David Lazar
d2704c2af1 Haddock reader: add the "haskell" attribute to code blocks so they are
highlighted. We reasonably assume that code blocks in Haddock markup
wont be used for anything but Haskell code.
2013-03-29 10:35:06 -07:00
David Lazar
7424454ace Haddock reader: improved error reporting. 2013-03-29 10:22:11 -07:00
John MacFarlane
7cb8b60910 Parsing: Better error reporting in readWith.
- Specialize readWith to String input.
- On error have it print the line in which the error occurred,
  with a caret pointing to the column.
- This should help diagnose parsing problems in LaTeX especially.
2013-03-28 22:20:05 -07:00
John MacFarlane
30969974f0 Haddock writer: use 'text' builder instead of 'str'.
This articulates strings into Str, Space, allowing them to be
hard-wrapped intelligently by the writers.

This patch also fixes a bug with trailing spaces and newlines.
(See #806.)
2013-03-28 20:09:06 -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
David Lazar
18459b95ba Add reader for Haddock markup based on Haddock's own lexer/parser. 2013-03-28 14:53:10 -07:00
John MacFarlane
ee0fc19bc5 Parsing: Further improvements to uri parser.
Don't treat punctuation before percent-encoding as final punctuation.
Don't treat '+' as final punctuation.
2013-03-28 11:33:01 -07:00
John MacFarlane
e81b87c2dc Mediawiki reader: Fixed | links inside table cells.
Improved attribute parsing.
2013-03-28 11:26:22 -07:00
John MacFarlane
998695001a Mediawiki reader: Fixed last commit. 2013-03-28 10:51:14 -07:00
John MacFarlane
48b23d491d MediaWiki reader: Correctly handle indented preformatted text
without preceding or following blank line.
2013-03-28 10:48:00 -07:00
John MacFarlane
099b4b7769 Mediawiki: Fixed regression for <ref>URL</ref>.
`<` is no longer allowed in URLs, according to the uri parser
in Text.Pandoc.Parsing.

Added a test case.
2013-03-28 09:54:02 -07:00
John MacFarlane
351b3e09c3 mediawiki reader: allow space before table rows. 2013-03-27 08:45:51 -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
40f0a6dd66 SelfContained: handle src in embed, audio, source, input tags. 2013-03-26 08:45:25 -07:00
John MacFarlane
727645bc1f Shared: openURL now follows redirects.
Closes #701.
2013-03-26 08:32:02 -07:00
John MacFarlane
0ee54549af SelfContained: strip off fragment, query of relative URL
before treating as a filename.  This fixes `--self-contained`
when used with CSS files that include web fonts using the
method described here:

http://paulirish.com/2009/bulletproof-font-face-implementation-syntax/

Examples from reveal.js themes:

    "../../lib/font/league_gothic-webfont.eot?#iefix"
    "../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular"

Closes #739.
2013-03-25 20:09:24 -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
John MacFarlane
da1e38893a Reveal.js improvements.
Changed name to revealjs (from reveal_js).
Set revealjs-url template variable to 'reveal.js' by default.
2013-03-23 21:48:34 -04:00
John MacFarlane
2ec59935de reveal_js: nested vertical stacks used for hierarchical structure.
Variant of a patch from jamiefolson.
Results for more than one level of nesting may be odd.
Perhaps this needs revising.
2013-03-21 15:46:47 -07:00
John MacFarlane
5b424f881d Support incremental slide view for definition lists.
All slide formats supported.
Simplified some list code.
2013-03-21 15:21:53 -07:00
Jamie F. Olson
6b53a905c4 Added basic support for reveal.js.
Support unordered and ordered lists with "fragment" elements.

Modified by JGM to remove the --reveal_js-url command-line option.
Instead use -V reveal_js-url=... as with slidy and the other slide
formats.  Also cleaned up the list code in the HTML writer.
2013-03-21 14:54:17 -07:00
John MacFarlane
ff9af6c9e5 EPUB writer: Don't add dc:creator tags if present in epub metadata. 2013-03-20 13:10:03 -07:00
John MacFarlane
5b4d239b85 Added OPML template, tests.
Minor fixes to OPML writer.
Improved OPML reader tests.
2013-03-20 10:17:59 -07:00
John MacFarlane
a63c208d77 OPML reader: Type attributes are not case sensitive.
So, `type="link"` or `type="LINK"`.
2013-03-20 09:16:16 -07:00
John MacFarlane
69acb47a34 Added Text.Pandoc.Writers.OPML.
TODO:

* Document in README
* Add tests
* Add template (and add template to cabal file)
2013-03-19 22:49:44 -07:00
John MacFarlane
8aa6172380 Merge branch 'opml' 2013-03-19 20:23:48 -07:00
John MacFarlane
74d53f4347 Added Text.Pandoc.Readers.OPML, exporting readOPML.
The _note attribute is supported.  This is unofficial, but
used e.g. in OmniOutliner and supported by multimarkdown.
We treat the contents as markdown blocks under a section
header.

Added to documentation and tests.
2013-03-19 20:22:14 -07:00
John MacFarlane
d596b0db83 Docx writer: Fixed rendering of display math in lists.
In 1.11 and 1.11.1, display math in lists rendered as a new list
item.  Now it always appears centered, just as outside of lists,
and in proper display math style, no matter how far indented the
containing list item is.

Closes #784.
2013-03-18 19:31:48 -07:00
John MacFarlane
835deee58b Markdown writer: New approach for citations.
* Reverts 1.11 change that caused citations to be rendered as
  markdown citations, even if `--biblio` was specified, unless
  `citation` extension is disabled.  Now, formatted citations
  are always printed if `--biblio` was specified.  If you want to
  reformat markdown keeping pandoc markdown citations intact,
  just don't specify `--biblio`.

* Reverted now unnecessary changes to Text.Pandoc.Biblio adding the raw
  block to mark the bibliography, and to Text.Pandoc.Writers.Markdown
  to remove the bibliography if `citations` not specified.

* If the content of a `Cite` inline is a `RawInline "latex"`, which
  means that a LaTeX citation command was parsed and `--biblio` wasn't
  specified, then render it as a pandoc markdown citation.  This means
  that `pandoc -f latex -t markdown`, without `--biblio`, will convert
  LaTeX citation commands to pandoc markdown citations.
2013-03-17 10:33:54 -07:00
John MacFarlane
99f9126d72 Markdown writer: Omit bibliography when citations enabled.
In 1.11, citations would be rendered as pandoc markdown citations,
but the bibliography would still be printed.

We avoid that by adding a `RawBlock "pandoc" "references"` before
the references.  This allows the markdown writer to find the references
and strip them off when `citations` is enabled.
2013-03-17 09:57:27 -07:00
John MacFarlane
cae52ecc31 Revert "LaTeX reader: citation handling changes."
This reverts commit f7229b1473.
2013-03-17 08:48:29 -07:00
John MacFarlane
f8fec87f09 Fixed numbering mismatch between TOC and sections in HTML.
Also made `--number-offset` affect TOC numbering as well
as section numbering, as it should have all along.

Closes #789.
2013-03-16 14:48:37 -07:00