Commit graph

5993 commits

Author SHA1 Message Date
John MacFarlane
8245d672bd Fixed tests for change to latex template. 2015-05-02 10:16:26 -07:00
John MacFarlane
f420325273 latex template: use providecommand for tightlist.
This avoids a conflict when memoir class is used.
Thanks to Joseph Harriott.
2015-05-02 09:09:11 -07:00
John MacFarlane
f1aaad9e86 EPUB writer: Use plain writer for metadata dc: fields.
This gives better results when we have, e.g. multiple paragraphs.
Note that tags aren't allowed in these fields.

Closes #2121.
2015-05-01 22:36:38 -07:00
John MacFarlane
9b2f645e2a SelfContained: cssURLs no longer tries to fetch fragment URLs.
The current test is: does the URL start with a `#`?
Closes #2121.
2015-05-01 22:15:43 -07:00
John MacFarlane
4b2f469994 Merge pull request #2123 from hellofloat/master
Added woff2 to MIME types
2015-04-29 16:17:40 -07:00
Alfred Wechselberger
7031748a43 Added woff2 to MIME types 2015-04-29 14:10:30 -07:00
John MacFarlane
55b7afc674 HTML reader: Allow multiple colgroups in table.
Closes #2122.
2015-04-29 12:05:38 -07:00
John MacFarlane
bc95b615b1 appveyor - removed a diagnostic echo. 2015-04-26 18:21:44 -07:00
John MacFarlane
f00641d629 appveyor - use cmd for 'git submodule update'. 2015-04-26 18:19:02 -07:00
John MacFarlane
38067aff75 appveyor - attempt to fix yml errors. 2015-04-26 18:08:19 -07:00
John MacFarlane
bab92c6ce4 appveyor - use powershell for commands.
Another try at getting path setting to work properly.
2015-04-26 17:57:24 -07:00
John MacFarlane
a721968045 appveyor - another attempt at setting the paths. 2015-04-26 16:03:51 -07:00
John MacFarlane
35b6f19bfb appveyor.yml - set path in shell in addition to registry. 2015-04-26 15:46:53 -07:00
John MacFarlane
7b27cc6758 EPUB writer: Remove linear=no from cover itemref.
Closes #1609.
2015-04-26 15:43:58 -07:00
John MacFarlane
107aa2497d appveyor - force rewrite of path in registry. 2015-04-26 14:47:37 -07:00
John MacFarlane
b4c3e35af3 appveyor - set paths in registry. 2015-04-26 14:31:15 -07:00
John MacFarlane
bb8f001015 appveyor.yml - specify full ghc path. 2015-04-26 12:20:53 -07:00
John MacFarlane
3cd1d568ad appveyor.yml - rearranged install and build scripts. 2015-04-26 12:01:57 -07:00
John MacFarlane
1139527160 Added appveyor.yml for Windows CI. 2015-04-26 11:37:37 -07:00
John MacFarlane
d9d88e58e1 Fixed regression with lists inside defintiion lists.
This fixes a regression (not in any released version) on
things like

    hi
    :   - there

Closes #2098.
2015-04-26 11:27:47 -07:00
John MacFarlane
2793d986dc Merge pull request #2112 from lierdakil/issue2101
Custom Writer: Set foreign encoding to UTF-8
2015-04-26 11:16:50 -07:00
John MacFarlane
1868cb5e42 Updated copyright notices to -2015. Closes #2111. 2015-04-26 10:18:29 -07:00
Nikolay Yakimov
a0ec3e85ad Custom Writer: Set foreign encoding to UTF-8
Closes #2101, #1634

Also factored out ByteString, since it's only used as an intermediate
representation.
2015-04-26 08:44:57 +03:00
John MacFarlane
fa76156d24 Added JOPTS to travis.
This way we can set -j2 only for GHC > 7.4.
2015-04-25 12:57:07 -07:00
John MacFarlane
cfd69548b3 Use -j2 for travis builds. (See #2110.) 2015-04-25 12:42:53 -07:00
John MacFarlane
d3009e2027 Merge pull request #2110 from timtylin/patch/travis-new-apt-syntax
Use the new Travis sudo-less syntax for APT dependencies
2015-04-25 10:46:19 -07:00
Tim Lin
0c1b87780f updates travis apt installs to the new sudo-less syntax
New syntax is specified here: http://docs.travis-ci.com/user/apt/
2015-04-25 03:29:42 -07:00
John MacFarlane
095b05e4f9 EPUB tests: don't use joinPath, which varies across platforms.
Instead, use a forward-slash to join paths, regardless of the
platform. This matches the way MediaBag now works.

See
56e4ecab20 (commitcomment-10858449)
2015-04-22 17:38:59 -07:00
John MacFarlane
e1d6be4e30 LaTeX reader: recognize \newpage as a block command. 2015-04-22 08:48:25 -07:00
John MacFarlane
2bca018201 Custom writer: use UTF-8 aware bytestring conversion.
This might help with #2101.
2015-04-21 22:50:58 -07:00
John MacFarlane
eb50bf896c Merge pull request #2099 from RyanGlScott/master
Bump zlib upper version bounds
2015-04-20 14:03:58 -07:00
RyanGlScott
b65238b412 Bump zlib upper version bounds 2015-04-20 13:52:48 -05:00
John MacFarlane
ac75964f4e Merge pull request #2095 from pombreda/patch-1
Fixed typo in URL for dzslides
2015-04-20 09:13:59 -07:00
John MacFarlane
0cd845672b Added license & copyright for lua to COPYRIGHT.
Closes #2096.
2015-04-20 09:02:37 -07:00
Philippe Ombredanne
7d4828252b Fixed typo in URL for dzslides 2015-04-20 12:28:03 +02:00
John MacFarlane
e9d7504bea Rewrote charsInBalancedBrackets.
This version should be a bit more efficient.

This doesn't help with #1735, however.
2015-04-19 17:04:33 -07:00
John MacFarlane
5b5813c30b Merge pull request #2090 from lierdakil/issue2083
Fix for #2083 (citation suffix clashes with links and footnotes)
2015-04-19 16:49:34 -07:00
Nikolay Yakimov
e83968412e MD Reader: Fix links/footnotets after citations
Footnotes: check if '^' follows '['
Links: check if '[' or '(' follows ']'
Shorthand links: attempt to lazily parse suffix as referenceLink
2015-04-20 01:47:02 +03:00
Nikolay Yakimov
c1ff165154 MD Reader: Tests for links/footnotes after citations
In-text citation suffix clashes with links and footnotes
2015-04-20 01:31:45 +03:00
John MacFarlane
1a69896d8f Revert "Merge pull request #1947 from mpickering/Fmonad"
Closes #2062.

This reverts commit c302bdcdbe, reversing
changes made to b983adf0d0.

Conflicts:
	src/Text/Pandoc/Parsing.hs
	src/Text/Pandoc/Readers/Markdown.hs
	src/Text/Pandoc/Readers/Org.hs
	src/Text/Pandoc/Readers/RST.hs
2015-04-18 19:00:32 -07:00
John MacFarlane
343b6051da Added test case for #2062. 2015-04-18 19:00:18 -07:00
John MacFarlane
d20152e011 Markdown writer: improved escaping.
`<` should not be escaped as `\<`, for compatibility with
original Markdown.  We now escape `<` and `>` with entities.
Also, we now backslash-escape square brackets.

Closes #2086.
2015-04-18 10:58:50 -07:00
John MacFarlane
0b80073e7c Merge pull request #2093 from gbataille/genericTypo
Typo on Text.Pandoc.Generic
2015-04-18 10:54:40 -07:00
John MacFarlane
d3544dc6f7 Markdown definition lists: don't require indent for first line.
Previously the body of the definition (after the `:` or `~` marker)
needed to be in column 4.  This commit relaxes that requirement,
to better match the behavior of PHP Markdown Extra.  So, now
this is a valid definition list:

    foo
    : bar

This patch also helps resolve a potentially ambiguity with table
captions:

    foo

      : bar

      -----
      table
      -----

Is "bar" a definition, or the caption for the table?  We'll count
it as a caption for the table.

Closes #2087.
2015-04-18 10:13:32 -07:00
Grégory Bataille
4d4a0a3a01 Typo on Text.Pandoc.Generic 2015-04-18 16:05:30 +02:00
John MacFarlane
10e28ef750 More principled fix for #1820.
If the tag parses as a comment, we check to see if the
input starts with `<!--`. If not, it's bogus comment mode
and we fail htmlTag.

Includes test case.  Closes #1820.
2015-04-17 22:56:33 -07:00
John MacFarlane
aaf5e67624 Merge branch 'jlduran-latex-tightlist' 2015-04-17 19:37:16 -07:00
John MacFarlane
764f677530 Merge branch 'latex-tightlist' of https://github.com/jlduran/pandoc into jlduran-latex-tightlist
Conflicts:
	data/templates
2015-04-17 19:23:13 -07:00
John MacFarlane
28ca8566ab Merge pull request #1954 from mcmtroffaes/feature/citekey-firstchar-alphanum
Allow digit as first character of a citation key.
2015-04-17 19:10:37 -07:00
John MacFarlane
44fcc5f96e Merge pull request #2079 from lierdakil/rst-normalize-headings
RST Writer: Normalize headings to sequential levels
2015-04-17 19:06:25 -07:00