Commit graph

6428 commits

Author SHA1 Message Date
John MacFarlane
dd29289806 Adjusted man writer test for latest template changes. 2015-10-10 13:41:52 -07:00
John MacFarlane
ce07f1bd68 Man template improvements:
- Added comment stating that the page is autogenerated by
  pandoc, giving version.
- Added `adjusting` and `hyphenate` variables.
- Documented new variables.
2015-10-10 13:15:58 -07:00
John MacFarlane
4aabcf3d4e Merge pull request #2426 from alexvong1995/better-man-writer
Better man writer (revised)
2015-10-10 13:11:21 -07:00
John MacFarlane
087f8757b5 Merge pull request #2445 from adunning/patch-2
Improve links and cross-references in README.
2015-10-09 23:24:33 -07:00
John MacFarlane
a25c565f81 Added comment in .travis.yml to explain last change. 2015-10-09 22:33:15 -07:00
John MacFarlane
fa18e3d7e1 Use dist/setup/setup/sdist instead of cabal sdist.
This should help with older versions of cabal which
can't handle custom preprocessors.

See
http://stackoverflow.com/questions/16256987/haskell-packaging-cabal-package-with-custom-preprocessors
2015-10-09 22:30:35 -07:00
John MacFarlane
d62b1cf180 Setup.hs: rewrite so as not to use process, directory, filepath.
Using anything outside base is dangerous, since older
versions of ghc will link against two different versions.

See e.g.
- https://groups.google.com/forum/#!topic/pandoc-discuss/0r9Hhl730LY
- https://www.reddit.com/r/haskell/comments/3634x2/cabal_is_giving_a_weird_error_when_attempting_to/
- jaspervdj/hakyll#356
2015-10-09 21:50:20 -07:00
John MacFarlane
59193d81fb Removed unneeded imports in benchmark program. 2015-10-09 21:15:18 -07:00
John MacFarlane
70ebccf93b Updated benchmark program. 2015-10-09 18:08:47 -07:00
John MacFarlane
3687dc36d5 Test also on ghc 7.4.2.
Made make_travis_yml.hs a bit more robust.
2015-10-09 14:44:32 -07:00
John MacFarlane
114103d67f LaTeX reader: don't eat excess whitespace after macros.
Really close #2446.
2015-10-09 14:39:42 -07:00
John MacFarlane
8944ccdaca benchmark: Use Criterion.Monad not Criterion.Config. 2015-10-09 14:38:39 -07:00
John MacFarlane
1af8bc6f4d LaTeX reader: don't eat whitespace after macro with only opt arg.
Closes #2446.
2015-10-09 10:32:31 -07:00
John MacFarlane
c13494c808 New .travis.yml.
Autgenerated using make_travis_yml.hs.

This script has been modified to add GHCOPTS.

'make .travis.yml' regenerates it based on the tested-with
field of the cabal file.
2015-10-08 13:39:32 -07:00
Andrew Dunning
7a97ef75ec Correct setspace package usage in README.
Template configured to set `setstretch` directly rather than package options.
2015-10-08 16:27:26 -04:00
John MacFarlane
00e2ae8a67 Simplified travis.yml.
- Follows template on hvr/multi-ghc-travis.
- Don't build with ghc 7.4.2.
- Build tarball after main build.
2015-10-08 13:18:28 -07:00
John MacFarlane
fb8b7800ea Travis: use cabal-install 1.22 not head. 2015-10-08 13:09:54 -07:00
John MacFarlane
21c5b51ce2 travis: use ghc 7.10.2 instead of 7.10.1. 2015-10-08 12:30:13 -07:00
Andrew Dunning
5c803252fc Improve CSL documentation in README. 2015-10-08 13:37:26 -04:00
Andrew Dunning
32964ef860 Improve links and cross-references in README. 2015-10-08 12:04:17 -04:00
John MacFarlane
0abd0a4268 appveyor: don't cache HP or install wix toolset. 2015-10-07 15:20:20 -07:00
mb21
80b851a4cf Change variable to polyglossia-lang.name and .options
closes #2437
2015-10-07 22:53:09 +02:00
John MacFarlane
2e4c4575db appveyor.yml: back to cabal/HP based build.
Can't get stack build to work.

With 64 bit, we run into problems building hslua.
https://github.com/osa1/hslua/issues/22

With 32 bit, we run into problems with missing
symbol __mingw_vsprintf in building cmark.
2015-10-07 10:01:19 -07:00
John MacFarlane
1eda820c04 Beamer template: Added space after colon in figure caption. 2015-10-07 09:48:39 -07:00
John MacFarlane
6d3ad456a0 appveyor.yml - try with 32bit version of stack. 2015-10-06 22:39:51 -07:00
John MacFarlane
65b4199bee Updated changelog. Still need to organize this. 2015-10-06 22:37:19 -07:00
John MacFarlane
db936f7233 Allow http-types 0.9. 2015-10-06 09:14:32 -07:00
John MacFarlane
a3838d0530 appveyor.yml: added 'echo "" |' to work around broken stdin. 2015-10-05 22:50:04 -07:00
John MacFarlane
398547bb51 Minor change in README: and -> or.
We never need both polyglossia and babel.
2015-10-05 22:22:45 -07:00
John MacFarlane
ce6b2fce8c Merge pull request #2435 from adunning/patch-2
Revise variables discussion in README.
2015-10-05 22:19:12 -07:00
John MacFarlane
a5fa9e6951 appveyor.yml: in stack steup, specify 64-bit ghc. 2015-10-05 21:42:52 -07:00
John MacFarlane
96c8b9dc05 appveyor.yml: added stack setup. 2015-10-05 20:59:16 -07:00
John MacFarlane
4a64719c59 appveyor.yml: new attempt to build with stack. 2015-10-05 20:51:26 -07:00
Andrew Dunning
317a5441a8 Revise variables discussion in README. 2015-10-05 18:47:58 -04:00
John MacFarlane
869e800bbb Merge pull request #2432 from hftf/hyphens
Docx Reader: Parse soft and non-breaking hyphen elements
2015-10-04 21:56:29 -07:00
John MacFarlane
e32ab441be Updated tests for changes to latex template. 2015-10-04 21:52:08 -07:00
John MacFarlane
15a5993f2e Updated latex template to work better with tufte...
and other packages that include hyperref or color.

Thanks to Xavier Olive.
2015-10-04 21:44:07 -07:00
Ophir Lifshitz
dfd06467ea Docx Reader: Create special punctuation test 2015-10-04 06:11:07 -04:00
Ophir Lifshitz
0b899ce7ef Docx Reader: Parse soft, no-break hyphen elements 2015-10-04 06:11:07 -04:00
John MacFarlane
6d0e586b2d Template updates.
Beamer:  added `innertheme`, `outertheme` variables.

LaTeX:  added `mainfontoptions`, `sansfontoptions`,
`monofontoptions`, `mathfontoptions`, `fontfamilyoptions`.
2015-10-03 17:01:01 -07:00
John MacFarlane
747a7a4cf8 Allow HUnit 1.3 2015-10-03 16:19:53 -07:00
John MacFarlane
421845202d FIxed typo: Ext_superscript, Ext_subscript. 2015-10-03 16:03:40 -07:00
John MacFarlane
68c02e1d01 For markdown_mmd, add: implicit_figures, superscripts, subscripts.
See #2401.
2015-10-03 15:32:01 -07:00
Alex Vong
319832cc19 Set the template variable $pandoc-version$ to pandocVersion by default.
* src/Text/Pandoc/Writers/Man.hs: Set $pandoc-version$ to be pandocVersion.
2015-10-01 02:24:34 +08:00
Alex Vong
d7a19c22be Move the variable pandocVersion from src/Text/Pandoc.hs to
`src/Text/Pandoc/Shared.hs`, so that all Writers can access this variable
without importing `src/Text/Pandoc.hs`, preventing circular import.

* pandoc.hs: Import pandocVersion from `Text.Pandoc.Shared`.
* src/Text/Pandoc.hs: Remove the definition of pandocVersion
 and relevant import.
* src/Text/Pandoc/Shared.hs: Add the definition of pandocVersion
 and relevant import.
2015-10-01 02:24:34 +08:00
Alex Vong
f5e33e0dce Set the template variable $hyphenate$ to true by default
* src/Text/Pandoc/Writers/Man.hs: Set $hyphenate$ to be true.
2015-10-01 02:24:34 +08:00
John MacFarlane
4443af4d8d Beamer template: allow setting outer/inner theme. 2015-09-29 10:00:57 -07:00
John MacFarlane
eb27ef89bc appveyor.yml: removed part that builds the package. 2015-09-27 23:01:56 -07:00
John MacFarlane
06b761be5b appveyor.yml: Fixed another multiline statement. 2015-09-27 21:56:20 -07:00
John MacFarlane
01ddeda11f appveyor.yml: Another attempt to set VERSION. 2015-09-27 21:16:03 -07:00