Commit graph

7481 commits

Author SHA1 Message Date
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
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