Commit graph

7304 commits

Author SHA1 Message Date
Jesse Rosenthal
2b701f9389 Shared: introduce blocksToInlines function
This is a lossy function for converting `[Block] -> [Inline]`. Its main
use, at the moment, is for docx comments, which can contain arbitrary
blocks (except for footnotes), but which will be converted to spans.

This is, at the moment, pretty useless for everything but the basic
`Para` and `Plain` comments. It can be improved, but the docx reader
should probably emit a warning if the comment contains more than this.
2016-06-23 10:50:46 -04:00
John MacFarlane
319a56aefc Merge pull request #2992 from tarleb/org-partial-functions
Org reader: remove partial functions
2016-06-22 12:51:37 -07:00
John MacFarlane
ba7868765a HTML writer: Better support for raw LaTeX environments.
Previously we just passed all raw TeX through when MathJax
was used for HTML math.  This passed through too much.
With this patch, only raw LaTeX environments that MathJax
can handle get passed through.

This patch also causes raw LaTeX environments to be treated
as math, when possible, with MathML and WebTeX output.

Closes #2758.
2016-06-22 11:47:44 -07:00
John MacFarlane
b06d6c1ff8 Update texmath lower bound. 2016-06-22 11:45:32 -07:00
Albert Krewinkel
7df656089f Org reader: remove partial functions
Partial functions like `head` lead to avoidable errors and should be
avoided.  They are replaced with total functions.

This fixes #2991.
2016-06-21 23:51:15 +02:00
John MacFarlane
175cc2d44d Implement RawInline and RawBlock in sample lua custom writer.
Closes #2985.
2016-06-20 11:55:43 -07:00
John MacFarlane
58d60b1c85 Changed email-obfuscation default to no obfuscation.
- `writerEmailObfuscation` in `defaultWriterOptions` is now
  `NoObfuscation`
- the default for the command-line `--email-obfuscation` option is
  now `none`.

Closes #2988.
2016-06-20 10:37:23 -07:00
John MacFarlane
f04b26d481 Merge pull request #2979 from tarleb/doc-update
Documentation updates
2016-06-14 20:41:24 -06:00
John MacFarlane
15d2c09ba1 Merge pull request #2980 from tarleb/org-raw-inlines
Org reader: raw inlines in arbitrary formats
2016-06-14 20:21:37 -06:00
John MacFarlane
5ea3cc647b Merge pull request #2981 from felixonmars/patch-1
Allow tagsoup 0.14
2016-06-14 19:40:14 -06:00
Felix Yan
f0265d4f34 Allow tagsoup 0.14
Building with the new release went fine here, and it works correctly.
2016-06-14 07:44:09 -05:00
Albert Krewinkel
96516e4d8a Document Org mode as a format containing raw HTML
Raw HTML is kept when the output format is Emacs Org mode.
2016-06-14 00:06:41 +02:00
Albert Krewinkel
29552eff3e Org reader: support arbitrary raw inlines
Org mode allows arbitrary raw inlines ("export snippets" in Emacs
parlance) to be included as `@@format:raw foreign format text@@`.

Support for this features is added to the Org reader.
2016-06-13 23:53:14 +02:00
Albert Krewinkel
cf2502de8f Org writer: support arbitrary raw inlines
Org mode allows arbitrary raw inlines ("export snippets" in Emacs
parlance) to be included as `@@format:raw foreign format text@@`.

Support for this features is added to the Org writer.
2016-06-13 23:13:05 +02:00
Albert Krewinkel
98b081b0db Document Org mode as a format containing raw TeX
Raw TeX is kept verbatim when the output format is Emacs Org mode.
2016-06-12 21:33:06 +02:00
Albert Krewinkel
018e8f5c36 Document MultiMarkdown as input/output format
MultiMarkdown was only mentioned as a supported Markdown dialect but not
as a possible input or output format.  A brief mention is added
everywhere the other supported markdown dialects are mentioned.

This closes #2973.
2016-06-12 21:25:14 +02:00
John MacFarlane
43382cead2 trypandoc: call results 'html' instead of 'result'.
This is for better compatibility with babelmark2.
2016-06-07 23:37:48 -07:00
John MacFarlane
3e06172a00 Merge pull request #2968 from IvoBCD/docbook5-xlink-ns
Docbook writer: Declare xlink namespace in Docbook5 output
2016-06-07 11:27:33 -07:00
John MacFarlane
4136ec0f4a latex template: fix for obscure hyperref/xelatex issue.
Here's a minimal case:

    \documentclass[]{article}
    \usepackage{hyperref}
    \begin{document}
    \section{\%á}
    \end{document}

Without this change, this fails on the second invocation of xelatex.
See https://tex.stackexchange.com/questions/313266/and-non-ascii-characters-in-headings

This affects inputs this like

    # %á

with pdf output via xelatex.
2016-06-07 10:11:48 -07:00
Ivo Clarysse
240cdfd1b3 Docbook writer: Declare xlink namespace in Docbook5 output 2016-06-07 06:03:06 -07:00
John MacFarlane
a184aec707 Merge pull request #2964 from tarleb/org-berkeley-ref
Org reader: "Berkeley style" citation support
2016-06-05 11:58:47 -07:00
Albert Krewinkel
8a9f5915ab Org reader: add support for "Berkeley-style" cites
A specification for an official Org-mode citation syntax was drafted by
Richard Lawrence and enhanced with the help of others on the orgmode
mailing list.  Basic support for this citation style is added to the
reader.

This closes #1978.
2016-06-05 11:28:57 +02:00
Albert Krewinkel
06dfe3276d Org reader: add semicolon to list of special chars
Semicolons are used as special characters in citations syntax.  This
ensures the correct parsing of Pandoc-style citations:

    [prefix; @key; suffix]

Previously, parsing would have failed unless there was a space or other
special character as the last <prefix> character.
2016-06-05 11:28:57 +02:00
John MacFarlane
97f8f4ad4b Use pandoc-citeproc-0.10 in binary pkgs. 2016-06-04 15:42:07 -07:00
John MacFarlane
20c0366ad8 Removed -rtsopts from library stanza.
It has no effect, and Hackage wouldn't accept the package.
2016-06-04 15:21:56 -07:00
John MacFarlane
6b85783870 make_osx_package.sh: removed executable signing.
We just sign the pkg now.

For some reason we were getting "obsolete resource envelope"
in signing executables.  This seems to be documented here
http://stackoverflow.com/questions/25152451/are-mac-app-store-code-sign-resource-envelopes-always-version-1
and seems to be an El Capitan regression.  Until a solution
is found, we'll just sign the pkg.
2016-06-04 14:02:57 -07:00
John MacFarlane
5ef8498618 appveyor: use improved method for creating msi. 2016-06-04 11:38:38 -07:00
John MacFarlane
146c7a78e5 Improved Windows installer (nkalvi, #2708, #2389).
* Scope selection in the first screen. Since I couldn't detect if the
  user is 'real' admin user, default is still per user.
* Scope is limited to per machine on servers. Though not perfect
  (couldn't detect `DisableMSI` policy), it should handle #2389 better.
* For per machine, location can be changed by selecting Advanced.
  Localization: modified templates from WiX toolkit support localization
  very well. A short sample localization file for en-us is used.
* Dialog elements are moved to their own files.
2016-06-04 11:34:41 -07:00
John MacFarlane
64a037141d Fixed --local-bin-path in deb package script. 2016-06-04 08:11:07 -07:00
John MacFarlane
01f7d54119 Fixed osx packaging issues. 2016-06-04 08:08:33 -07:00
John MacFarlane
b4ea482660 osx build: use --local-bin-path. 2016-06-04 08:04:39 -07:00
John MacFarlane
6f9f790ae8 deb pkg: use --local-bin-path so we don't install to ~/.local. 2016-06-04 08:02:03 -07:00
John MacFarlane
95503a5200 Updated man page. 2016-06-04 07:55:08 -07:00
John MacFarlane
d0c25880a9 Updated date in README. 2016-06-04 07:54:19 -07:00
John MacFarlane
fff88600f5 Updated AUTHORS in README. 2016-06-04 07:53:56 -07:00
John MacFarlane
b895ed50f8 Updated changelog. 2016-06-04 07:42:12 -07:00
John MacFarlane
34510949ca Travis: test with ghc 8.0.1, remove testing with ghc 7.4. 2016-06-04 07:36:15 -07:00
John MacFarlane
9a77544813 Fixed windows/stack.yaml.
Can't set flag on something not in extra-deps.
2016-06-03 14:42:55 -07:00
John MacFarlane
dc0ade3513 Use windows/stack.yaml for appveyor build.
Use released pandoc-citeproc, not git.
2016-06-03 13:41:48 -07:00
John MacFarlane
4177dbef66 appveyor.yml: diagnostics. 2016-06-03 13:25:56 -07:00
John MacFarlane
c4ae3b9855 appveyor.yml: Fix check for existing wixtoolset. 2016-06-03 13:15:34 -07:00
John MacFarlane
4bc0f121c9 Require latest highlighting-kate. 2016-06-03 13:13:47 -07:00
John MacFarlane
920b575a23 appveyor improvements.
- Create pandoc.msi as artifact.
- Don't install wix unless we need to.
2016-06-03 12:37:54 -07:00
John MacFarlane
c00783b510 Windows build: create pandoc-citeproc on appveyor, so we can put in msi.
Updated stackage resolver.
2016-06-03 12:06:25 -07:00
John MacFarlane
8f88a304dd appveyor: Fixed spacing issue in VERSION setting. 2016-06-03 11:31:09 -07:00
John MacFarlane
ab55f956e4 appveyor: another attempt to get version set! 2016-06-03 10:49:30 -07:00
John MacFarlane
366b94d26b appveyor: another try at setting version. 2016-06-03 10:30:06 -07:00
John MacFarlane
99cd7978a3 Updated changelog 2016-06-03 09:44:30 -07:00
John MacFarlane
2b2769975f Merge pull request #2962 from tarleb/org-more-export-settings
Org reader: support more export settings
2016-06-03 09:39:32 -07:00
Albert Krewinkel
f56792927f
Org reader: support special strings export option
Parsing of special strings (like '...' as ellipsis or '--' as en dash)
can be toggled using the `-` option.
2016-06-03 11:41:23 +02:00