Commit graph

4495 commits

Author SHA1 Message Date
John MacFarlane
6ddd9f3239 Increase upper bound on process. 2014-01-06 22:35:06 -08:00
John MacFarlane
d97b1fd14c EPUB writer: Strip out footnotes from toc entries. 2014-01-06 21:51:11 -08:00
John MacFarlane
ba6a26b258 EPUB writer: Avoid duplicate notes when headings contain notes.
This arose because the headings are copied into the metadata
"title" field, and the note gets rendered twice.  We strip the
note now before putting the heading in "title".
2014-01-06 12:12:21 -08:00
John MacFarlane
447a1bbbe8 Added note to Interact.hs recommending 'cabal repl'.
Closes #1110.
2014-01-06 10:20:25 -08:00
John MacFarlane
2dd6d892fa HTML writer: Omit footnotes from TOC entries.
Otherwise we get doubled footnotes when headers have notes!
2014-01-06 10:17:31 -08:00
John MacFarlane
3dd1b1f73a Removed references to biblio2yaml in installers. 2014-01-05 23:18:14 -08:00
John MacFarlane
220e3816a0 make_osx_package: Don't hardcode jgm, use whoami. 2014-01-04 11:43:47 -08:00
John MacFarlane
9ae10b4352 The --bibliography option now sets the biblio-files variable.
So, if you're using `--natbib` or `--biblatex`, you can just use
`--bibliography=foo.bib` instead of `-V bibliofiles=foo`.
2014-01-03 10:11:21 -08:00
John MacFarlane
93eac71383 Documented biblio-files variable 2014-01-03 10:05:56 -08:00
John MacFarlane
36cda45d70 Merge pull request #1005 from nougad/consistent_bibliography
Don't add pandoc-citeproc filter if natbib or biblatex is used
2014-01-02 21:15:41 -08:00
John MacFarlane
e7e76dbdd8 RST writer: Ensure no blank line after def in definition list.
Closes #992.
2014-01-02 21:10:14 -08:00
John MacFarlane
452a140d0c Pretty: Added nestle. API change, minor version bump to 1.12.3. 2014-01-02 21:09:39 -08:00
John MacFarlane
4e7aadb903 HTML writer: With --toc, headers no longer link to themselves.
Closes #1081.
2014-01-02 19:59:33 -08:00
John MacFarlane
b2db6979fe Use isHeaderBlock from Shared rather than defining it anew... 2014-01-02 19:32:13 -08:00
John MacFarlane
33955fd2ef ODT writer: Use mathml for proper rendering of formulas.
Note:  LibreOffice's support for this seems a bit buggy.  But
it should be better than what we had before.
2014-01-02 15:23:40 -08:00
John MacFarlane
ac100f2724 OpenDocument writer: Fixed RawInline, RawBlock so they don't escape. 2014-01-02 15:23:16 -08:00
John MacFarlane
e3d48da627 Moved fixDisplayMath from Docx writer to Writer.Shared. 2014-01-02 15:22:50 -08:00
John MacFarlane
bb0f942463 reference.odt: Tidied styles.xml. 2014-01-02 12:54:33 -08:00
John MacFarlane
f3ee82373b HTML reader: Parse name/content pairs from meta tags as metadata.
Closes #1106.
2014-01-01 09:22:37 -08:00
John MacFarlane
d6ec6cf9cf Docx writer: Fixed problem with some modified reference docx files.
Include `word/_rels/settings.xml.rels` if it exists, as well as other
`rels` files besides the ones pandoc generates explicitly.
2014-01-01 09:01:05 -08:00
John MacFarlane
073b3576d0 reference.docx: Include 'FootnoteText' style.
Otherwise Word ignores the style, even when specified in the pPr element.

I believe this should help with issue #901.  You should now get
'FootnoteText' as the style of the footnote.  You'll have to adjust
the style yourself; it's currently just the same as Normal.
2013-12-27 13:54:27 -08:00
John MacFarlane
8e79bbde1e Removed old MarkdownTest_1.0.3 directory (not currently used).
Closes #1104.
2013-12-27 13:36:28 -08:00
John MacFarlane
3f26a02737 Allow temporary 1.2. 2013-12-26 11:12:37 -08:00
John MacFarlane
6e19d5f9e1 Merge pull request #1103 from nikai3d/patch-1
fix typos in README
2013-12-23 14:14:37 -08:00
Nicolas Kaiser
a738153941 fix typos in README 2013-12-23 17:00:14 +01:00
John MacFarlane
3c4aa01664 Merge pull request #1099 from hdevalence/master
Minor HLint-suggested changes
2013-12-19 20:20:06 -08:00
Henry de Valence
3d70059a48 HLint: use fromMaybe
Replace uses of `maybe x id` with `fromMaybe x`.
2013-12-19 21:07:09 -05:00
Henry de Valence
c8fc0a0374 HLint: use /= 2013-12-19 20:46:11 -05:00
Henry de Valence
f6d151889c HLint: redundant parens
Remove parens enclosing a single element.
2013-12-19 20:43:25 -05:00
Henry de Valence
c35f5ba42d HLint: Remove lambdas. 2013-12-19 20:28:53 -05:00
Henry de Valence
0c5e7cf8cb HLint: use elem and notElem
Replaces long conditional chains with calls to `elem` and `notElem`.
2013-12-19 20:19:24 -05:00
Henry de Valence
1ed2c467c9 HLint: Use all
Replace `and . map` with `all`.
2013-12-19 17:06:27 -05:00
John MacFarlane
8053ba2123 LaTeX writer: Better treatment of footnotes in tables.
Notes now appear in the regular sequence, rather than in the
table cell.  (This was a regression in 1.10.)
2013-12-17 20:53:59 -08:00
John MacFarlane
a3f6f2827c LaTeX writer: Factored out function for table cell creation. 2013-12-17 20:10:09 -08:00
John MacFarlane
0132f6fcb7 LaTeX reader: Support babel-style quoting: ` "..."' ``. 2013-12-17 16:03:43 -08:00
John MacFarlane
826443926f Docbook reader: Avoid failure if tbody contains no tr or row elements. 2013-12-16 13:58:54 -08:00
John MacFarlane
2f00f5c7c2 Properly handle script blocks in strict mode.
(That is, markdown-markdown_in_html_blocks.)
Previously a spurious `<p>` tag was being added.

Closes #1093.
2013-12-15 12:27:29 -08:00
John MacFarlane
3b79246c85 Allow use of \includegraphics[size] in beamer.
This just required porting a macro definition from the default
latex template to the default beamer template.
2013-12-13 21:42:53 -08:00
John MacFarlane
94daf912ea Merge pull request #1090 from jrnold/master
LaTeX reader: add support for Verb macro
2013-12-13 21:36:09 -08:00
Jeff Arnold
5adbe7b365 LaTeX reader: add support for Verb macro 2013-12-13 19:16:04 -05:00
John MacFarlane
b2aae73f14 Added Cite function to sample.lua. 2013-12-13 11:19:49 -08:00
John MacFarlane
ca3c292f30 EPUB writer: Fixed bug with --epub-stylesheet.
Now the contents of `writerEpubStylesheet` (set by `--epub-stylesheet`)
should again work, and take precedence over a stylesheet specified
in the metadata.
2013-12-13 11:10:04 -08:00
John MacFarlane
6d0cd9203c Markdown reader: Fixed regression in title blocks.
If author field was empty, date was being ignored.  Closes #1089.
2013-12-12 22:34:56 -08:00
John MacFarlane
46b37b4ddc latex template: Put header-includes after title.
Closes #908.
2013-12-11 22:35:33 -08:00
John MacFarlane
02e3b2afca Updated README (since abstract will work, at least with default latex). 2013-12-11 22:09:49 -08:00
John MacFarlane
225bd8d599 default latex template: added abstract variable. 2013-12-11 22:05:59 -08:00
John MacFarlane
2c886935e6 Added more explanation of metadata in README. 2013-12-11 10:46:36 -08:00
John MacFarlane
7929099a7d Fixed documentation bug. 2013-12-10 10:24:14 -08:00
John MacFarlane
26052d3cba Allow zip-archive 0.2. 2013-12-10 10:24:02 -08:00
John MacFarlane
142f81889b Added withSocketsDo around http conduit code in openURL.
This should address #1080, but further testing on Windows is needed
before we can close the bug.
2013-12-09 22:35:57 -08:00