Commit graph

7069 commits

Author SHA1 Message Date
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
Albert Krewinkel
d4de8451b9 Org reader: support emphasized text export option
Parsing of emphasized text can be toggled using the `*` option.  This
influences parsing of text marked as emphasized, strong, strikeout, and
underline.  Parsing of inline math, code, and verbatim text is not
affected by this option.
2016-06-03 11:17:02 +02:00
Albert Krewinkel
952a7dac58 Org reader: support smart quotes export option
Reading of smart quotes can be toggled using the `'` option.
2016-06-03 11:16:35 +02:00
John MacFarlane
9eb3dba243 appveyor: Fixed version detection. 2016-06-02 22:53:31 -07:00
John MacFarlane
9ea7c7f6ea appveyor: cache wixbin directory. 2016-06-02 22:11:20 -07:00
John MacFarlane
e916c05837 appveyor: maybe fixed escaping. 2016-06-02 22:09:25 -07:00
John MacFarlane
2bff4ad358 Fixed YAML for appveyor.yml. 2016-06-02 21:43:01 -07:00
John MacFarlane
703151c6bb appveyor: fixed set command. 2016-06-02 21:33:57 -07:00
John MacFarlane
ed561e9f93 appveyor: put wix path in quotes. 2016-06-02 21:32:35 -07:00
John MacFarlane
ef6b3b1b75 appveyor: another attempt to get wix paths right. 2016-06-02 21:31:24 -07:00
John MacFarlane
6b47a87d7d appveyor.yml: try to get paths for candle and light right. 2016-06-02 21:12:55 -07:00
John MacFarlane
4a11e0a450 appveyor: try to create msi as artifact. 2016-06-02 16:55:46 -07:00
John MacFarlane
714ea0e01a Updated changelog. 2016-06-02 16:39:44 -07:00
Albert Krewinkel
729fca311f Org reader: drop unused field from parser state
The `OrgParserState` contained both an `orgStateMeta` and
`orgStateMeta'` field, the former for plain meta information and the
latter for F-monad wrapped meta info.  The plain meta info is only used
to make `OrgParserState` an instance of the `HasMeta` class, which in
turn is never used in the reader.  The (F Meta) version is hence renamed
to the "un-primed" version while the other one is dropped.
2016-06-02 15:30:21 +02:00
Albert Krewinkel
512bf2eebf Org reader: undo code duplication
Some code was duplicated (copy-pasted) or placed in an inappropriate
module during the modularization refactoring.  Those functions are moved
into a `Shared` module, as was originally intended but forgotten.
Better documentation of the respective functions is a positive
side-effect.
2016-06-02 15:30:20 +02:00
John MacFarlane
061bc60f70 Merge pull request #2950 from tarleb/org-ref-support
Org reader: support org-ref style citations
2016-05-31 12:44:29 -07:00
John MacFarlane
669ecbd4ab Merge pull request #2954 from tarleb/org-export-blocks
Org export blocks
2016-05-31 11:16:08 -07:00
John MacFarlane
561afac0bc brazilian -> brazil for polyglossia.
Closes #2953.
2016-05-31 11:15:21 -07:00
Albert Krewinkel
c17c62a2c7 Org reader: support new syntax for export blocks
Org-mode version 9 usees a new syntax for export blocks.  Instead of
`#+BEGIN_<FORMAT>`, where `<FORMAT>` is the format of the block's
content, the new format uses `#+BEGIN_export <FORMAT>` instead.  Both
types are supported.
2016-05-29 21:08:50 +02:00
Albert Krewinkel
4f84cf02c7 Org reader: refactor BEGIN…END block parsing
- Reorder functions, grouping related functions together.

- Demote simple functions to local functions if they are used just once.

- Rename and document functions to increase code readability.

- Fix handling of whitespace in blocks, allowing content to be indented
  less then the block header.
2016-05-29 21:08:36 +02:00
Albert Krewinkel
bc82123122 Org reader: rename parseInlines to inlines
Having a function starting with `parse` in a parsing library is overly
redundant.  Let's use a nicer, shorter name more in line with the rest
of the library.
2016-05-29 21:08:31 +02:00
Albert Krewinkel
f226cb88b0 Org reader: support org-ref style citations
The *org-ref* package is an org-mode extension commonly used to manage
citations in org documents.  Basic support for the `cite:citeKey` and
`[[cite:citeKey][prefix text::suffix text]]` syntax is added.
2016-05-27 21:19:28 +02:00
John MacFarlane
f54873d5ea Merge pull request #2946 from tarleb/org-modularization
Org-mode reader modularization
2016-05-25 22:37:14 -07:00
Albert Krewinkel
eea6d6568f Org reader: extract blocks parser to module
Block parsing code is moved to a separate module.

This is part of the Org-mode reader cleanup effort.
2016-05-25 23:21:40 +02:00
Albert Krewinkel
39e8b4276e Org reader: extract inline parser to module
Inline parsing code is moved to a separate module.  Parsers for block
starts are extracted as well, as those are used in the `endline` parser.

This is part of the Org-mode reader cleanup effort.
2016-05-25 22:54:45 +02:00
Albert Krewinkel
a340c7249f Org reader: extract parsing function to module
The Org-mode reader uses many functions defined in the
`Text.Pandoc.Parsing` utility module.  Some of the functions are
overwritten with versions adapted to Org-mode idiosyncrasies.  These
special functions, as well as the normal Pandoc versions, are combined
in a single module to increase the ease of use.

This leads to decoupling of Org-mode and Pandoc and hence to slightly
cleaner code.  The downside is code-bloat due to repeated import/export
statements.
2016-05-25 22:53:55 +02:00
John MacFarlane
cc937eea2f Merge pull request #2942 from mb21/epub-reader
EPUB Reader: normalise Link id as well
2016-05-24 11:49:25 -07:00
mb21
340f0aaef8 EPUB Reader: normalise Link id as well 2016-05-24 17:42:37 +02:00
John MacFarlane
bfb18df27e Updated changelog. 2016-05-23 13:38:49 -07:00
John MacFarlane
8466477047 RELEASE-CHECKLIST - hint for more useful git log. 2016-05-23 13:23:13 -07:00
John MacFarlane
654bdf72bf Merge pull request #2941 from tarleb/org-drawer-improvements
Org drawer improvements
2016-05-23 10:39:08 -07:00
Carlos Sosa
5667e0959a Org writer: add drawer capability
For the implementation of the Drawer element in the Org Writer, we make
use of a generic Block container with attributes.  The presence of a
`drawer` class defines that the `Div` constructor is a drawer. The first
class defines the drawer name to use. The key-value list in the
attributes defines the keys to add inside the Drawer. Lastly, the list
of Block elements contains miscellaneous blocks elements to add inside
of the Drawer.

Signed-off-by: Albert Krewinkel <albert@zeitkraut.de>
2016-05-23 10:00:14 +02:00
Albert Krewinkel
a4717c2fc5 Org reader: respect drawer export setting
The `d` export option can be used to control which drawers are exported
and which are discarded.  Basic support for this option is added here.
2016-05-23 09:44:37 +02:00
Albert Krewinkel
f3d27e4c80 Org reader/writer: use CUSTOM_ID in properties
The `ID` property is reserved for internal use by Org-mode and should
not be used.  The `CUSTOM_ID` property is to be used instead, it is
converted to the `ID` property for certain export format.

The reader and writer erroneously used `ID`.  This is corrected by using
`CUSTOM_ID` where appropriate.
2016-05-22 23:01:47 +02:00
John MacFarlane
e3ca9793aa Bumped upper-bounds to build with ghc 8. 2016-05-22 09:21:49 -07:00
John MacFarlane
446cf6a1cf HTML reader: fixed bug in pClose.
This caused exponential parsing behavior in documnets
with unclosed tags in dl, dd, dt.
2016-05-21 23:05:00 -07:00