Commit graph

7196 commits

Author SHA1 Message Date
John MacFarlane
5f758970a5 Textile reader: support bc.. extended code blocks.
Also, remove trailing newline in code blocks (consistently
with Markdown reader).
2016-07-22 15:32:50 -07:00
John MacFarlane
69e7249ab1 Removed flag setting for texmath in stack.full.yaml. 2016-07-22 15:12:29 -07:00
John MacFarlane
5b46980590 stack.full.yaml - only build pandoc, pandoc-types, pandoc-citeproc. 2016-07-21 22:04:40 -07:00
John MacFarlane
2e27b29fbe Updated stack.full.yaml. 2016-07-21 11:04:53 -07:00
John MacFarlane
fba8dc1b41 make_deb.sh: get pandoc-citeproc LICENSE from github. 2016-07-21 10:29:09 -07:00
John MacFarlane
307b94ac71 make_deb.sh: get pandoc-citeproc.1 directly from github. 2016-07-21 10:14:47 -07:00
John MacFarlane
2bd07f4f01 deb Vagrantfile: install curl. 2016-07-21 09:51:58 -07:00
John MacFarlane
c52fa06900 Small changes in debian package creation.
Use more recent resolver, no longer need custom stack.yaml
for hsb2hs
2016-07-20 13:48:20 -07:00
John MacFarlane
34533dd8d1 LaTeX reader: be more forgiving of non-standard characters.
E.g. `^` outside of math.  Some custom environments give
these a meaning, so we should try not to fall over when we
encounter them.
2016-07-20 11:36:50 -07:00
John MacFarlane
1b6c9733ee LaTeX reader: more robust parsing of unknown environments.
We no longer fail on things like `^` inside options for tikz.
Closes #3026.
2016-07-20 11:18:24 -07:00
John MacFarlane
5611de1473 Restored whitespace between paragraphs in beamer template.
See jgm/pandoc-templates#207.
2016-07-20 10:45:51 -07:00
John MacFarlane
3263ed3c42 RST reader: use Div for admonitions.
Previously blockquotes were used.  Now a Div is used
with class `admonition` and (if relevant) one of the
following:  `attention`, `caution`, `danger`, `error`,
`hint`, `important`, `note`, `tip`, `warning`.

`sidebar` is also put into a Div.

Note: This will change rendering of RST documents!
It should provide much more flexibility.

Closes #3031.
2016-07-20 10:14:24 -07:00
John MacFarlane
e2d59461bb Textile reader: improve definition list parsing.
- Allow multiple terms (which we concatenate with linebreaks).
- Fix exponential parsing bug (closes #3020 for real this time).
2016-07-19 09:03:15 -07:00
John MacFarlane
3490932d21 Textile reader: improved table parsing.
We now handle cell and row attributes, mostly by skipping
them.  However, alignments are now handled properly.
Since in pandoc alignment is per-column, not per-cell, we
try to devine column alignments from cell alignments.

Table captions are also now parsed, and textile indicators
for thead and tfoot no longer cause parse failure.  (However,
a row designated as tfoot will just be a regular row in pandoc.)
2016-07-18 22:40:45 -07:00
John MacFarlane
d9880fe340 LaTeX template: Added dummy definition for \institute.
This isn't a standard command, and we want to avoid
a crash when `institute` is used with the default
template.
2016-07-18 22:32:47 -07:00
John MacFarlane
c2179ac4d0 Fixd README date. 2016-07-17 09:27:16 -07:00
John MacFarlane
80ca7a565f Use cmark-0.5.3.1 with stack.lts6.yaml. 2016-07-16 15:27:57 -07:00
John MacFarlane
e71a0e5712 Add aeson-pretty to stack.yaml for deb, windows. 2016-07-16 15:27:14 -07:00
John MacFarlane
e9c20314d0 Use cmark-0.5.3.1 in stack.yaml. 2016-07-16 08:49:46 -07:00
John MacFarlane
ec89846b35 Updated changelog. 2016-07-15 14:57:21 -07:00
John MacFarlane
43740c5fdd Added aeson-pretty to osx/stack.yaml. 2016-07-15 14:57:12 -07:00
John MacFarlane
c2bcefb39e Use cmark-0.5.3 in stack.yaml. 2016-07-15 12:32:25 -07:00
John MacFarlane
d7396e73b4 Don't require haddock-library 1.4.
Instead use CPP to work around version differences.
2016-07-15 12:04:00 -07:00
John MacFarlane
17defd5004 Use liftM since otherwise Functor type constraint needen in ghc 7.8. 2016-07-15 12:02:37 -07:00
John MacFarlane
2f54de7cc4 Fixed compiler warnings. 2016-07-14 23:38:44 -07:00
John MacFarlane
c203ace130 Haddock reader - support math.
The Haddock document model added elements for math
in 1.4.
2016-07-14 23:38:20 -07:00
John MacFarlane
d21701f66c Require haddock-library >= 1.4.
This has math support, DocMathInline and DocMathDisplay.
2016-07-14 23:09:28 -07:00
John MacFarlane
75a9ba5dca Use pandoc-citeproc-0.10.1 for packages. 2016-07-14 22:57:58 -07:00
John MacFarlane
afd986d808 Updated man page. 2016-07-14 22:57:58 -07:00
John MacFarlane
3d6e32bba1 Fixed duplicate reference in README. 2016-07-14 22:57:58 -07:00
Jesse Rosenthal
f529fc17ef Docx Writer: Use actual creation time as doc prop
Previously, we had used the user-supplied date, if available, for Word's
document creation metadata. This could lead to weird results, as in
cases where the user post-dates a document (so the modification might be
prior to the creation). Here we use the actual computer time to set the
document creation.
2016-07-14 17:02:30 -04:00
Jesse Rosenthal
e8e02f1220 Shared: improve year sanity check in normalizeDate
Previously we parsed a list of dates, took the first one, and then
tested its year range. That meant that if the first one failed, we
returned nothing, regardless of what the others did. Now we test for
sanity before running `msum` over the list of Maybe values. Anything
failing the test will be Nothing, so will not be a candidate.
2016-07-14 17:02:30 -04:00
Jesse Rosenthal
bbfcd50fb1 Shared: normalizeDate should reject illegal years.
We only allow years between 1601 and 9999, inclusive. The ISO 8601
actually says that years are supposed to start with 1583, but MS Word
only allows 1601-9999. This should stop corrupted word files if the date
is out of that range, or is parsed incorrectly.
2016-07-14 17:02:30 -04:00
Jesse Rosenthal
4816facee4 Shared: Add further formats for normalizeDate
We want to avoid illegal dates -- in particular years with greater than
four digits. We attempt to parse series of digits first as `%Y%m%d`, then
`%Y%m`, and finally `%Y`.
2016-07-14 17:02:30 -04:00
John MacFarlane
8248dde2b7 Added resolver clause to stack.lts6.yaml. 2016-07-14 10:52:01 -07:00
John MacFarlane
7826cc2a20 Added winpkg target to Makefile.
This downloads the windows package from appveyor and signs
it using the key.

This way we needn't mess with a Windows VM to build the package.
2016-07-14 10:29:46 -07:00
John MacFarlane
bbd7b533ae make_oxs_package.sh - use OSX env variable. 2016-07-14 10:29:34 -07:00
John MacFarlane
d5c3551276 Version to 1.17.2. 2016-07-14 10:26:00 -07:00
John MacFarlane
0b0a0e730f Removed some redundant class constraints. 2016-07-14 08:54:06 -07:00
John MacFarlane
3d86228c5b Fixed lts6 travis build. 2016-07-14 08:46:56 -07:00
John MacFarlane
06a3e6a03f Merge pull request #3019 from tarleb/org-verbatim-fix
Org reader: fix parsing of verbatim inlines
2016-07-14 08:43:39 -07:00
John MacFarlane
00b11bcbcf Fixed exponential parsing bug in textile reader.
Closes #3020.
2016-07-14 08:42:38 -07:00
Albert Krewinkel
529146decf Org reader: fix parsing of verbatim inlines
Org rules for allowed characters before or after markup chars were not
checked for verbatim text.  This resultet in wrong parsing outcomes of
if the verbatim text contained e.g. space enclosed markup characters as
part of the text (`=is_substr = True=`).  Forcing the parser to update
the positions of allowed/forbidden markup border characters fixes this.

This fixes #3016.
2016-07-14 13:33:25 +02:00
John MacFarlane
106786ef1b stack.yaml - use ghc 8.01 and nightly. 2016-07-13 23:03:08 -07:00
John MacFarlane
418ad5cc81 Allow QuickCheck 2.9. 2016-07-11 08:34:35 +01:00
John MacFarlane
e2659a46db Merge pull request #3014 from tarleb/org-writer-div
Org writer: improve Div handling
2016-07-05 12:46:13 -07:00
Albert Krewinkel
5378b7c5bd
Org writer: improve Div handling
Div blocks handling is changed to make the output look more like
idiomatic org mode:

  - Div-wrapped content is output as-is if the div's attribute is the
    null attribute.
  - Div containers with an id but neither classes nor key-value pairs
    are unwrapped and the id is added as an anchor.
  - Divs with classes associated with greater block elements are
    wrapped in a `#+BEGIN`...`#+END` block.
  - The old behavior for Divs with more complex attributes is kept.
2016-07-05 11:49:45 +02:00
John MacFarlane
6ea8ff19c3 Added http-client dependencies to stack.yaml files. 2016-07-04 10:24:28 -07:00
John MacFarlane
374614aaf7 Depend on http-client 0.5, http-client-tls 0.3 2016-07-04 10:23:37 -07:00
John MacFarlane
46f3deb248 Merge pull request #3012 from tarleb/org-drop-ugly-pragma
Org reader: replace ugly code with view pattern
2016-07-04 10:03:24 -07:00