Commit graph

6125 commits

Author SHA1 Message Date
John MacFarlane
d0ed2560ab Windows installer: use AppData\Local\Pandoc by default.
Not AppData\Local\Apps\Pandoc as wix was now doing.

It is going to be easier if we don't change the install
directory so that users end up with two versions.
2015-06-29 09:39:39 -07:00
John MacFarlane
27754e170b Removed unneeded import. 2015-06-28 23:59:10 -07:00
John MacFarlane
7c6277d2c1 Added a needed import in Shared. 2015-06-28 23:43:17 -07:00
John MacFarlane
36baded572 Make sure we use dist version of reference.docx for some things.
Taking some values from a user-supplied reference.docx
tends to lead to corruption.

This fixes a regression from the last release. Closes #2249.
2015-06-28 23:25:55 -07:00
John MacFarlane
5f198c019b pandoc.wxs: removed line breaks in RegistryValue.
See #2205
2015-06-28 22:43:05 -07:00
John MacFarlane
de184a80ec Let reference.docx/odt behave as if they are virtual data files.
Now they are constructed on the fly from their components,
but we now allow them to be printed with `--print-default-data-file`
and to override the defaults if placed in the user data directory.

Shared now exports getDefaultReferenceDocx and getDefaultReferenceODT
(API change).

These functions have been removed from the Docx and ODT writers.

Shared.readDataFile has been modified so that requests to read
a reference.odt or reference.docx will use these functions to
generate the files.
2015-06-28 22:38:13 -07:00
John MacFarlane
7bbb007359 Minor fixes to previous commit.
* Instead of defining readmeFile in Text.Pandoc.Data (which we forgot
  to export anyway), we simply add a record for "README" to the
  `dataFiles` lookup table.  This allows simplifying some of the code
  for `readDefaultDataFile` in SHared.

* As a bonus, `pandoc --print-default-data-file README` now works.
2015-06-28 20:59:18 -07:00
John MacFarlane
fe625e053d New method for producing man pages.
This change adds `--man1` and `--man5` options to pandoc, so
pandoc can generate its own man pages.

It removes the old overly complex method of building a separate
executable (but not installing it) just to create the man pages.

The man pages are no longer automatically created in the build
process.

The man/ directory has been removed.  The man page templates
have been moved to data/.

New unexported module:  Text.Pandoc.ManPages.

Text.Pandoc.Data now exports readmeFile, and `readDataFile`
knows how to find README.

Closes #2190.
2015-06-28 14:39:17 -07:00
John MacFarlane
3e5b4faaf2 Version bump to 1.14.1.
Because of the addition of `Options.plainExtensions`.
2015-06-28 11:58:50 -07:00
John MacFarlane
ed9a118b54 Fixed regression in CSS parsing with --self-contained.
In 1b44acf0c5 we replaced some
hackish CSS parsing with css-text, which I thought was a complete
CSS parser.  It turns out that it is very buggy, which results
in lots of things being silently dropped from CSS when
`--self-contained` is used (#2224).

This commit replaces the use of css-text with a small but
more principled css preprocessor, which only removes whitespace
and replaces URLs with base 64 data when possible.

Closes #2224.
2015-06-28 11:54:18 -07:00
John MacFarlane
2768d1c2d2 New pandoc.wxs.
This should allow the user to select a per-user or systemwide install.
It also shows install location in the list of installed programs.

Thanks to @nkalvi.
See #2205.
2015-06-27 20:47:37 -07:00
John MacFarlane
2b1fd52403 Removed unused import. 2015-06-27 20:41:00 -07:00
John MacFarlane
7df4d86006 Textile writer: escape + and - as entities.
Closes #2225.
2015-06-27 20:30:20 -07:00
John MacFarlane
fce3ebb8e0 Plain writer: don't use symbols for super/subscript.
Simplified code by using plainExtensions from Options.

Closes #2237.
2015-06-27 20:19:04 -07:00
John MacFarlane
177533d3f8 Options: Export plainExtensions.
These are the extensions used in `plain` output.
2015-06-27 20:18:14 -07:00
John MacFarlane
ba76e6fcf1 Updated latex writer tests for last template change. 2015-06-27 18:37:59 -07:00
John MacFarlane
6f527e1f1a Updated LaTeX template: CJKoptions variable, allow dvipsnames for colors.
Thanks to Xavier Olive.

The addition of the `CJKoptions` variable allows one to set (e.g.)
a bigger font size for Asian fonts than latin ones.

Including dvipsnames allows specifying colors like MidnightBlue
for link colors.  This brings in a dependency on the color package,
but it is a standard package and required anyway by graphics.
2015-06-27 18:07:49 -07:00
John MacFarlane
3de72d82eb Merge pull request #2241 from mb21/docbook-reader-figures
DocBook reader mediaobjects and figures, closes #2184
2015-06-26 21:23:49 -07:00
mb21
82e363a727 DocBook reader mediaobjects and figures, closes #2184 2015-06-21 18:36:47 +02:00
John MacFarlane
320228777d Document CJKmainfont. 2015-06-13 09:37:03 -07:00
John MacFarlane
602130259d Added CJKmainfont to latex template (Xavier Olive). 2015-06-13 09:35:33 -07:00
John MacFarlane
e69bf25ede epub templates: use 'author.role', not 'author.type'. 2015-06-13 09:33:32 -07:00
John MacFarlane
1d04797d5c Updated pandoc.wxs (from @nvalki). 2015-06-12 21:30:18 -07:00
John MacFarlane
767be5a97b Fixed tests/docx/links.docx for new url. 2015-06-09 16:55:38 -07:00
John MacFarlane
956559b8b8 Merge pull request #2217 from ousia/master
replace old url with pandoc.org
2015-06-09 16:34:56 -07:00
Pablo Rodríguez
c18e93ca6e replace old url with pandoc.org 2015-06-09 22:22:58 +02:00
John MacFarlane
dc0e5c34b7 Amends last commit: don't use https for google charts.
They don't have a certificate.
2015-06-09 12:37:35 -07:00
John MacFarlane
8c47bd63e8 Use https: for mathjax/katex/google-charts CDNs.
Closes #1920.
2015-06-09 12:19:06 -07:00
John MacFarlane
edb0bcc04f Merge pull request #2215 from DigitalPublishingToolkit/icml-crashfix
Fix InDesign crash with URLs containing more than one colon character
2015-06-09 12:11:22 -07:00
John MacFarlane
3e533b4f95 Removed relann1.6. 2015-06-09 11:02:57 -07:00
gohai
f51757bd16 Fix InDesign crash with URLs containing more than one colon character
Colons are valid characters in URLs, and used e.g. by the Internet Archive's Wayback Machine - a popular resource amongst researchers. When InDesign encounters a HyperlinkURLDestination with more than one colon character in it, it crashes when placing the ICML. (This was tested against CS6.) The IDML specification hints at this requirement in section 6.4.1: "The colon apppears in the Name attribute of the style, but is encoded as %3a when it appears in the Self attribute". Follow this example for all colon characters in URLs.
2015-06-09 15:46:23 +02:00
John MacFarlane
70b76bb633 Bump cmark version to >= 0.3.4. 2015-06-08 13:37:11 -07:00
John MacFarlane
7b4f077652 DokuWiki writer: Use proper <code> tags for code blocks.
Closes #2213.
2015-06-07 11:29:47 -07:00
John MacFarlane
cb7dd4469d HTML reader: allow <body> to close <head>. 2015-06-04 10:23:38 +02:00
John MacFarlane
f47f53d959 Windows msi changes (nkalvi):
* Allow setting of installation path.
* Use cleaner wix syntax for setting the path:
  https://www.firegiant.com/wix/tutorial/com-expression-syntax-miscellanea/environmentally-friendly/
* Show the user what changes, in a new command window.

See #2205.
2015-06-03 00:16:38 +02:00
John MacFarlane
d8e37d84ab Updated changelog. 2015-06-02 13:25:56 +02:00
John MacFarlane
bbd429ae70 Version bump to 1.14.0.4, added commonmark template to data files. 2015-06-02 13:23:32 +02:00
John MacFarlane
6f79cf1983 Added default commonmark template. 2015-06-02 13:22:27 +02:00
John MacFarlane
706589b594 Misc. fixes to trypandoc html. 2015-06-02 03:38:31 -07:00
John MacFarlane
1ebfa6bb84 trypandoc: move Convert button, display raw command. 2015-06-02 12:08:03 +02:00
John MacFarlane
a367107483 Bump version to 1.14.0.3; updated changelog. 2015-06-01 10:39:00 +02:00
John MacFarlane
a75998ba24 Allow compilation with syb 0.5.*. 2015-05-31 21:18:39 +02:00
John MacFarlane
3534ad3666 Custom writer: fixed some compiler warnings for ghc < 7.10. 2015-05-31 21:18:26 +02:00
John MacFarlane
cb339c7425 Bump to 1.14.0.2, updated changelog. 2015-05-31 14:10:25 +02:00
John MacFarlane
c327b283c1 Allow building with hslua 0.4. 2015-05-31 13:57:14 +02:00
John MacFarlane
e0aed52c07 Updated INSTALL. 2015-05-28 20:36:04 -07:00
John MacFarlane
3df799adf2 Updated changelog. 2015-05-28 20:35:18 -07:00
John MacFarlane
b241472a90 Better fix for #2187.
* Reverted kludgy change to make-windows-installer.bat.
* Removed make-reference-fiels.hs.
* Moved the individual ingredients of reference.docx and
  reference.odt to the data directory.
* Removed reference.docx and reference.odt from data directory.
* We now build the reference archives from their ingredient pieces
  in the docx and odt writers, instead of having a reference.docx
  or reference.odt intermediary.

This should fix #2187.

It also simplifies the bulid procedure.

The one thing users may notice is different is that you can
no longer get the reference.docx or reference.odt using
`--print-default-data-file`.  Instead, simply generate a
docx or odt using pandoc with a blank or minimal input,
and use that (or a customized version) with `--reference-docx`
or `--reference-odt`.
2015-05-28 18:15:01 -07:00
John MacFarlane
c1f6d5e31f ConTeXt writer: Add reference anchors to Div with ids.
This is useful for pandoc-citeproc linked citations.
2015-05-28 17:46:26 -07:00
John MacFarlane
e54c8613e8 Removed tab chars in Textile reader source. 2015-05-28 13:07:52 -07:00