Commit graph

2514 commits

Author SHA1 Message Date
John MacFarlane
52c5cdb04e Biblio: Capitalize citation note only if it has a prefix.
So, author names or titles that aren't capitalized will stay
uncapitalized.
2013-08-06 16:20:45 -07:00
claremacrae
e5004bcff0 Implement strikeout in dokuwiki writer (#386) 2013-08-06 07:43:32 +01:00
John MacFarlane
2d6e0b1530 Remove CPP from default-extensions; add pragmas to modules as needed. 2013-08-04 14:12:13 -07:00
John MacFarlane
5050cff37c Removed comment that chokes recent cpp.
Closes #933.
2013-08-03 23:16:54 -07:00
John MacFarlane
4a84b78100 MediaWiki writer: Use native mediawiki tables instead of HTML.
Closes #720.
2013-08-03 23:05:14 -07:00
John MacFarlane
97b2be599e Text.Pandoc: Don't reexport ToJSONFilter.
It's better just to import this from Text.Pandoc.JSON.
That way, compiled filters will be smaller in size.
2013-08-03 17:02:35 -07:00
John MacFarlane
1567d291a3 Text.Pandoc.JSON: Use To/FromJSON instances from pandoc-types.
* These use GHC generics rather than syb, and are faster.
* toJsonFilter is now a deprecated synonym of toJSONFilter from
  Text.Pandoc.JSON.
* The deprecated jsonFilter function has been removed.
2013-08-03 16:39:43 -07:00
John MacFarlane
a32417378e Biblio: Don't interfere with Notes that aren't citation notes.
Closes #898: notes not generated from citations were being
adjusted (first letter capitalized, for example, against author's
intentions).
2013-08-02 15:37:09 -07:00
John MacFarlane
dceffeb043 Biblio: Override citeproc-hs's endWithPunct.
The new version correctly sees a sentence ending in '.)' as ending
with punctuation.  This fixes a bug which led such sentences to receive
an extra period at the end: '.).'.  Thanks to Steve Petersen for
reporting.
2013-08-02 14:20:44 -07:00
John MacFarlane
7024664dda Fixed compilation with http-conduit flag False. 2013-07-30 08:38:13 -07:00
John MacFarlane
3c06e2692a Markdown atx headers: Allow . or ) after # if no fancy_lists. 2013-07-29 08:38:46 -07:00
claremacrae
b14b2d6a85 Implement footnotes in dokuwiki writer (#386) 2013-07-28 19:19:33 +01:00
claremacrae
b5f86a665d Removed incorrect entity conversion in dokuwiki writer (#386) 2013-07-28 18:59:16 +01:00
claremacrae
51b8ce49f1 Implemented linebreaks in dokuwiki writer (#386) 2013-07-28 18:42:53 +01:00
claremacrae
b77d4456ea Added another todo - dokuwiki writer (#386) 2013-07-26 22:49:19 +01:00
Clare Macrae
2900a9a371 Added some todos to dokuwiki writer (#386) 2013-07-26 22:38:13 +01:00
John MacFarlane
a97f39c12e Beamer: add allowframebreaks to slide if set in header classes.
It's recommended that your bibliography slide have this
attribute:

    # References {.allowframebreaks}

This causes multiple slides to be created if necessary, depending
on the length of the bibliography.
2013-07-26 12:40:56 -07:00
Clare Macrae
5b04d063a1 Convert bullet and numbered lists in dokuwiki writer (#386) 2013-07-26 06:19:40 +01:00
John MacFarlane
d5fad2306a LaTeX writer: Change \ to / in paths.
`/` works even on Windows in LaTeX.  `\` will cause major problems
if unescaped.
2013-07-25 20:29:42 -07:00
John MacFarlane
fb9f2e4bd5 LaTeX reader: Support \v{} for hacek.
Closes #926.
2013-07-25 10:00:11 -07:00
John MacFarlane
85cc140744 Textile reader: Improved handling of <pre> blocks.
* Closed #927 (a bug in which `<pre>` in certain contexts was
  not recognized as a code block).
* Remove internal HTML tags in code blocks, rather than printing
  them verbatim.
* Parse attributes on `<pre>` tag for code blocks.
2013-07-25 09:45:23 -07:00
John MacFarlane
5592666ca4 Text.Pandoc: Added readJSON, writeJSON to the API.
Closes #817.
2013-07-23 22:31:50 -07:00
John MacFarlane
6f99ad8013 Biblio: Tweaks to improve default behavior.
* A suffix beginning with a digit gets 'p' inserted before it
  before passing to citeproc-hs, so that bare numbers are treated
  as page numbers by default.
* A suffix not beginning with punctuation has a space added at
  the beginning (rather than a comma and space, as was done before).
* This adding occurs not just in author-in-text citations, but in
  all citations.

The result of these changes (and the last commit) is that
`\citep[23]{item1}` in LaTeX will be interpreted properly,
with '23' treated as a locator of type 'page'.
2013-07-21 12:16:52 -07:00
John MacFarlane
800c5490ec LaTeX reader: Don't add spurious ", " to citation suffixes.
This is added when needed in Text.Pandoc.Biblio anyway.
2013-07-21 11:44:49 -07:00
John MacFarlane
bd1979f1b7 Markdown reader: Improved strong/emph parsing.
Using technique from github.com/jgm/Markdown.

The new parsing algorithm requires no backtracking, and no keeping
track of nesting levels.

It will give different results in some edge cases but should not
affect most people.
2013-07-20 21:14:38 -07:00
John MacFarlane
7102254e24 PDF generation improvements.
* `Text.Pandoc.PDF` exports `makePDF` instead of `tex2pdf`.
  (API change.)
* `makePDF` walks the pandoc AST and checks for the existence of
  images in the local directory.  If they are not found, it attempts
  to find them, either in the directory containing the first source
  file, or at an absolute URL, or at a URL relative to the base URL
  of the first command line argument.
* Closes #917.
2013-07-20 12:14:43 -07:00
John MacFarlane
fd0f8c1a8a Text.Pandoc.PDF: put temporary output directory in TEXINPUTS.
This will help later when we try to download external resources.
We can put them in the temp directory.  See #917.
2013-07-18 21:53:34 -07:00
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
6c2e76ac61 Added ignore_line_breaks markdown extension.
This causes intra-paragraph line breaks to be ignored,
rather than being treated as hard line breaks or spaces.
This is useful for some East Asian languages, where spaces
aren't used between words, but text is separated into lines
for readability.
2013-07-17 15:38:56 -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
John MacFarlane
94c9825468 HTML reader: read widths from col tags if present.
Closes #893.
2013-07-16 17:03:28 -07:00
John MacFarlane
8483b5756f HTML reader: Handle non-simple tables (#893).
Column widths are divided equally.

TODO:  Get column widths from col tags if present.
2013-07-16 15:50:39 -07:00
John MacFarlane
0bd5830ad4 HTML reader: Generalized table parser.
This commit doesn't change the present behavior at all, but
it will make it easier to support non-simple tables in the future.
2013-07-16 15:37:15 -07:00
Clare Macrae
18565e149a Implement conversion of images in dokuwiki writer (#386) 2013-07-15 19:29:39 +01:00
Clare Macrae
b2a8731e32 Weak implementation of hyperlinks for dokuwiki (#386)
TODO Simplify the code
2013-07-15 09:35:04 +01:00
Alexander Kondratskiy
0b49f810f4 Fixing wrong numbered-list indentation in open document format 2013-07-14 14:33:58 -04:00
Clare Macrae
660fb24472 Implemented horizontal rule for dokuwiki (#386) 2013-07-14 15:03:40 +01:00
Clare Macrae
2afa4ec924 Implemented Emphasis (italic) and Strong (bold) for dokuwiki (#386) 2013-07-14 14:58:42 +01:00
Clare Macrae
a43e5983da Implemented correct output of dokuwiki (#386) 2013-07-14 14:24:20 +01:00
Clare Macrae
7eded47bcd Initial work to create dokuwiki writer (#386)
In this first version, all dokuwiki files are straight copies of the
media wiki counterparts.
2013-07-14 13:40:27 +01: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
ed714b1b52 cabal: Added http-conduit flag, which allows fetching https resources.
It also brings in a large number of dependencies (http-conduit and its
dependencies), which is why for now it is an optional flag.

Closes #820.
2013-07-04 23:13:37 -07: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
aab4c47da5 Text.Pandoc.UTF8: Use strict bytestrings in reading.
The use of lazy bytestrings seemed to cause problems using
pandoc on Windows 7/8 64-bit machines.

Closes #874.
2013-07-04 15:43:42 -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