Commit graph

4423 commits

Author SHA1 Message Date
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
John MacFarlane
afa88b4a25 Relaxed version bounds for array, http-conduit, process. 2013-12-09 21:07:33 -08:00
John MacFarlane
f966295770 Don't use tilde code blocks with braced attributes in gfm output.
A consequence of this change is that the backtick form will be
preferred in general if both are enabled.  I think that is good,
as it is much more widespread than the tilde form.

Closes #1084.
2013-12-09 20:31:47 -08:00
John MacFarlane
571480eb4a Updated beamer template for booktabs. 2013-12-09 19:45:51 -08:00
John MacFarlane
1818fefda4 Updated changelog. 2013-12-08 14:35:51 -08:00
John MacFarlane
9673587b38 Version mubp to 1.12.2.1 2013-12-08 14:35:42 -08:00
John MacFarlane
fcc94c788b OSX package: Create .zip rather than .dmg. 2013-12-08 10:30:14 -08:00
John MacFarlane
8e255fad98 Another small performance improvement. 2013-12-07 19:56:54 -08:00
John MacFarlane
e2c4156c20 Small performance improvement in list parsing. 2013-12-07 19:41:42 -08:00
John MacFarlane
e5a7c31a32 Markdown reader: Fixed bug with literal </div> in lists.
Closes #1078.
2013-12-07 17:12:52 -08:00
John MacFarlane
4f64a4bc3b More changes to github-upload.sh. Still doesn't work, though. 2013-12-07 12:59:08 -08:00
John MacFarlane
06d1ec828a Updated changelog. 2013-12-07 11:57:53 -08:00
John MacFarlane
6ba51165b0 Documented use of extensions with non-markdown input formats. 2013-12-06 17:40:11 -08:00
John MacFarlane
bc2c0fd443 Small change to HTML reader tests.
"$" is now a special character.
2013-12-06 17:33:29 -08:00
John MacFarlane
4a14467055 Text.Pandoc: Don't default to pandocExtensions for all writers.
In particular, we don't want to default to math parsing for the
HTML writer.
2013-12-06 17:31:47 -08:00
John MacFarlane
def05d3504 HTML reader: Parse LaTeX math if appropriate options are set.
* Moved inlineMath, displayMath from Markdown reader to Parsing.
* Export them from Parsing.  (API change.)
* Generalize their types.
2013-12-06 17:15:13 -08:00
John MacFarlane
9b6f1fc495 Allow https: to work in pandoc command line arguments.
(Use openURL from Shared instead of simpleHTTP.)
2013-12-05 11:28:22 -08:00
John MacFarlane
5314df51f3 Stop parsing "list lines" when we hit a block tag.
This fixes exponential slowdown in certain input, e.g.
a series of lists followed by `</div>`.
2013-12-04 10:18:05 -08:00
John MacFarlane
eebb15ba1d Use latest pandoc-templates. 2013-12-03 20:56:11 -08:00
John MacFarlane
e3d19bf1cd Merge pull request #1076 from jlduran/booktabs
Add booktabs package for LaTeX tables
2013-12-03 20:55:14 -08:00