Commit graph

4875 commits

Author SHA1 Message Date
John MacFarlane
e3ddc371de Markdown reader: Handle c++ and objective-c as language identifiers
in github-style fenced blocks.  Closes #1318.

Note:  This is special-case handling of these two cases.
It would be good to do something more systematic.
2014-05-27 12:44:39 -07:00
John MacFarlane
2d90803b7c Require latest highlighting-kate. Fixes #1317. 2014-05-27 12:12:02 -07:00
John MacFarlane
2e80613451 Markdown reader: inline math must have nonspace before final $.
Closes #1313.
2014-05-27 11:59:28 -07:00
John MacFarlane
fd11a5a5eb Require latest zip-archive.
This has fixes for unicode path names.  Note that compiling
pandoc against zip-archive 0.2.3 or 0.2.3.1 will lead to invalid
zip containers, causing LibreOffice (e.g.) to regard ODTs as corrupt.
2014-05-27 11:22:53 -07:00
John MacFarlane
265f0e3da1 Fixed documentation of attributes. Closes #1315. 2014-05-27 10:39:13 -07:00
John MacFarlane
f1cd6af5ec Updated date on README. 2014-05-27 10:32:46 -07:00
Albert Krewinkel
3238a2f919 Org reader: support for inline LaTeX
Inline LaTeX is now accepted and parsed by the org-mode reader.  Both,
math symbols (like \tau) and LaTeX commands (like \cite{Coffee}), can be
used without any further escaping.
2014-05-20 22:29:21 +02:00
John MacFarlane
3c77ab98bf EPUB writer: Handle multiple dates with OPF event attributes.
Note: in EPUB3 we can have only one dc:date, so only the first
one is used.
2014-05-19 13:25:44 -07:00
John MacFarlane
8d04c821aa Avoid import Prelude hiding (catch).
See #1309.
2014-05-19 09:45:00 -07:00
John MacFarlane
0dd31b68a5 Merge pull request #1309 from michaelt/patch-1
no need to hide 'catch'
2014-05-19 09:34:36 -07:00
John MacFarlane
ee8c8da8cc Removed dependency on conduit.
* http-conduit flag is now https.
* Instead of http-conduit, we depend on http-client and http-client-tls.
2014-05-18 22:07:00 -07:00
Michael Thompson
4c6aaec565 no need to hide 'catch'
This doesn't normally cause a problem because of some ghc workaround special to this case, but I was able to trigger an error with a complicated mixture of sandboxing, directing `cabal` to a locally installed ghc, and something else. `catch` isn't actually used in the file, so it seems it might as well go.
2014-05-17 13:48:31 -04:00
John MacFarlane
0915967d84 Windows build script: add -windows to file name. 2014-05-16 21:55:07 -07:00
John MacFarlane
06da7be1fd make_osx_package: Call zip file pandoc-VERSION-osx.zip.
The zip should not be named SOMETHING.pkg.zip, or OSX finder
will extract it into a folder named SOMETHING.pkg, which it
will interpret as a defective package.

Closes #1308.
2014-05-16 21:53:21 -07:00
John MacFarlane
efe650dc0f Merge pull request #1307 from palday/master
fixed escape for literal paragraph
2014-05-16 11:31:52 -07:00
John MacFarlane
eabaa625fe Fixed travis build to install alex for GHC 7.8.2. 2014-05-16 10:34:20 -07:00
John MacFarlane
650f831949 travis: Test with ghc 7.8.2 rather than 7.8.1. 2014-05-16 09:50:30 -07:00
Phillip Alday
cb6879cd2f fixed escape for literal paragraph 2014-05-16 17:36:01 +02:00
John MacFarlane
9e2d22b148 Merge pull request #1306 from snoyberg/patch-1
Allow scientific 0.3
2014-05-16 08:32:42 -07:00
Michael Snoyman
46e7bcae69 Allow scientific 0.3 2014-05-16 09:32:24 +03:00
John MacFarlane
8de5daed57 Require highlighting-kate 0.5.8.1.
0.5.8 has a serious bug that causes error failure with ocaml and fsharp.
2014-05-15 12:58:30 -07:00
John MacFarlane
c5c9b0d289 EPUB writer: Fixed regression on cover image.
In 1.12.4 and 1.12.4.2, the cover image would not appear properly,
because the metadata id was not correct.

This was introduced by the fix to #1254.

Now we derive the id from the actual cover image filename,
which we preserve rather than using "cover-image."
2014-05-15 10:11:48 -07:00
John MacFarlane
256390b3f9 Fixed 034cd4bb21.
Preserve directory structure for pkg.
2014-05-14 14:23:17 -07:00
John MacFarlane
8b9fafc0e4 Updated changelog. 2014-05-14 13:46:18 -07:00
John MacFarlane
cf533a1c2c Bump version to 1.12.4.2. 2014-05-14 13:46:09 -07:00
John MacFarlane
034cd4bb21 osx package: Include uninstall script in zip file.
Don't put it in $PREFIX/bin as before.
2014-05-14 13:39:31 -07:00
John MacFarlane
60b8b85040 Merge pull request #1293 from tarleb/typo
Process: Fix minor typo in pipeProcess' docs
2014-05-14 06:41:04 -07:00
John MacFarlane
d8e4402928 Merge pull request #1296 from DanStaal/master
Code cleanup and debug.
2014-05-14 06:39:55 -07:00
John MacFarlane
b5959b2007 Merge pull request #1297 from tarleb/citations
Org reader: support Pandocs citation extension
2014-05-14 06:37:29 -07:00
Albert Krewinkel
ceeb701c25 Org reader: support Pandocs citation extension
Citations are defined via the "normal citation" syntax used in markdown,
with the sole difference that newlines are not allowed between "[...]".
This is for consistency, as org-mode generally disallows newlines
between square brackets.

The extension is turned on by default and can be turned off via the
default syntax-extension mechanism, i.e. by specifying "org-citation" as
the input format.
Move `citeKey` from Readers.Markdown into Parsing

The function can be used by other readers, so it is made accessible for
all parsers.
2014-05-14 15:00:26 +02:00
Albert Krewinkel
2423f9e6b1 Move citeKey from Readers.Markdown to Parsing
The function can be used by other readers, so it is made accessible for
all parsers.
2014-05-14 14:58:05 +02:00
Albert Krewinkel
9df589b9c5 Introduce class HasLastStrPosition, generalize functions
Both `ParserState` and `OrgParserState` keep track of the parser position at
which the last string ended.  This patch introduces a new class
`HasLastStrPosition` and makes the above types instances of that class.  This
enables the generalization of functions updating the state or checking if one
is right after a string.
2014-05-14 14:57:00 +02:00
John MacFarlane
222a51bf99 make_osx_package.sh: Use linker options to ensure OSX 10.6+ compatibility. 2014-05-13 23:34:23 -07:00
Daniel T. Staal
88d8f7428a Code cleanup and debug.
Various cleanups:

- @pkg_info was never used.  Removed.
- Simplified getting the list of files slightly.
- Used list form of system().  This prevents shell interpretation of command and arguments, preventing bugs.  (And solves one.)
- Changed $! (OS_ERROR) to $? (CHILD_ERROR) after system() calls to get the error from the external program.  (Note that $? is the numeric return code from the child program.)
- Allow script to continue after finding some of the files have been removed previously.
- Convert 'warn "…"; exit 1;' to 'die "…";', the more common equivalent idiom.
- Convert 'exit 0;' to 'exit;', to be more clear we are not exiting abnormally.

Signed-off-by: Daniel T. Staal <DStaal@usa.net>
2014-05-13 19:59:20 -04:00
John MacFarlane
dfcc32ac9f Moved make_osx_package.sh back to root. 2014-05-12 20:05:16 -07:00
John MacFarlane
dc8de99e59 Updated changelog. 2014-05-12 20:02:14 -07:00
John MacFarlane
1e8cd2c277 Moved osx package stuff to osx directory; added uninstall script.
Thanks to Daniel T. Staal for an uninstall script from which this
one is modified.
2014-05-12 19:59:44 -07:00
John MacFarlane
77b2589d3f Updated changelog. 2014-05-12 13:07:45 -07:00
John MacFarlane
aa019448d6 LaTeX reader: Support \addbibresource. 2014-05-12 13:06:06 -07:00
John MacFarlane
2348f07b11 Shared addMetaField: if old and new values both lists, concatenate. 2014-05-12 13:05:42 -07:00
John MacFarlane
06edff7402 Added default.icml to data-files so it installs with the package. 2014-05-12 12:30:30 -07:00
John MacFarlane
02b8608aab Version bump to 1.12.4.1. 2014-05-12 12:08:36 -07:00
John MacFarlane
707c74b8db Updated changelog. 2014-05-12 12:08:24 -07:00
John MacFarlane
e52196691b Require highlighting-kate >= 0.5.8.
This fixes a performance regression.
2014-05-12 09:21:16 -07:00
John MacFarlane
a8319d1339 LaTeX reader: set bibliography in metadata from \bibliography cmd. 2014-05-11 22:52:29 -07:00
Albert Krewinkel
113a32daa8 Process: Fix minor typo in pipeProcess' docs
Replace fullstop with comma, adjust capitalisation.
2014-05-11 15:07:01 +02:00
John MacFarlane
0092606476 LaTeX reader: Don't error on "%foo" with no newline. 2014-05-10 23:26:32 -07:00
John MacFarlane
12d0dcffe8 Merge pull request #1290 from tarleb/fix-header-params
Org reader: Fix block parameter reader, relax constraints
2014-05-10 14:57:45 -07:00
Albert Krewinkel
c5fd631b55 Org reader: Fix block parameter reader, relax constraints
The reader produced wrong results for block containing non-letter chars
in their parameter arguments.  This patch relaxes constraints in that it
allows block header arguments to contain any non-space character (except
for ']' for inline blocks).

Thanks to Xiao Hanyu for noticing this.
2014-05-10 11:35:54 +02:00
John MacFarlane
884693fea8 Merge pull request #1288 from tarleb/update-copyright
Update copyright notices for 2014, add missing notices
2014-05-09 09:53:06 -07:00