aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-05-19Avoid `import Prelude hiding (catch)`.John MacFarlane2-9/+4
See #1309.
2014-05-19Merge pull request #1309 from michaelt/patch-1John MacFarlane1-1/+0
no need to hide 'catch'
2014-05-18Removed dependency on conduit.John MacFarlane3-14/+16
* http-conduit flag is now https. * Instead of http-conduit, we depend on http-client and http-client-tls.
2014-05-17no need to hide 'catch'Michael Thompson1-1/+0
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-16Windows build script: add -windows to file name.John MacFarlane1-1/+1
2014-05-16make_osx_package: Call zip file pandoc-VERSION-osx.zip.John MacFarlane1-2/+2
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-16Merge pull request #1307 from palday/masterJohn MacFarlane1-2/+2
fixed escape for literal paragraph
2014-05-16Fixed travis build to install alex for GHC 7.8.2.John MacFarlane1-1/+1
2014-05-16travis: Test with ghc 7.8.2 rather than 7.8.1.John MacFarlane2-2/+2
2014-05-16fixed escape for literal paragraphPhillip Alday1-2/+2
2014-05-16Merge pull request #1306 from snoyberg/patch-1John MacFarlane1-1/+1
Allow scientific 0.3
2014-05-16Allow scientific 0.3Michael Snoyman1-1/+1
2014-05-15Require highlighting-kate 0.5.8.1.John MacFarlane1-3/+3
0.5.8 has a serious bug that causes error failure with ocaml and fsharp.
2014-05-15EPUB writer: Fixed regression on cover image.John MacFarlane1-5/+5
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-14Fixed 034cd4bb214a30de3739c756eab428d5fbe617cc.John MacFarlane1-1/+2
Preserve directory structure for pkg.
2014-05-14Updated changelog.John MacFarlane1-3/+21
2014-05-14Bump version to 1.12.4.2.John MacFarlane1-1/+1
2014-05-14osx package: Include uninstall script in zip file.John MacFarlane1-2/+1
Don't put it in $PREFIX/bin as before.
2014-05-14Merge pull request #1293 from tarleb/typoJohn MacFarlane1-2/+1
Process: Fix minor typo in pipeProcess' docs
2014-05-14Merge pull request #1296 from DanStaal/masterJohn MacFarlane1-20/+18
Code cleanup and debug.
2014-05-14Merge pull request #1297 from tarleb/citationsJohn MacFarlane5-40/+118
Org reader: support Pandocs citation extension
2014-05-14Org reader: support Pandocs citation extensionAlbert Krewinkel3-3/+76
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-14Move `citeKey` from Readers.Markdown to ParsingAlbert Krewinkel2-14/+13
The function can be used by other readers, so it is made accessible for all parsers.
2014-05-14Introduce class HasLastStrPosition, generalize functionsAlbert Krewinkel3-24/+30
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-13make_osx_package.sh: Use linker options to ensure OSX 10.6+ compatibility.John MacFarlane1-2/+2
2014-05-13Code cleanup and debug.Daniel T. Staal1-20/+18
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-12Moved make_osx_package.sh back to root.John MacFarlane1-2/+3
2014-05-12Updated changelog.John MacFarlane1-0/+3
2014-05-12Moved osx package stuff to osx directory; added uninstall script.John MacFarlane4-0/+82
Thanks to Daniel T. Staal for an uninstall script from which this one is modified.
2014-05-12Updated changelog.John MacFarlane1-1/+6
2014-05-12LaTeX reader: Support `\addbibresource`.John MacFarlane1-0/+2
2014-05-12Shared addMetaField: if old and new values both lists, concatenate.John MacFarlane1-1/+3
2014-05-12Added default.icml to data-files so it installs with the package.John MacFarlane2-2/+2
2014-05-12Version bump to 1.12.4.1.John MacFarlane1-1/+1
2014-05-12Updated changelog.John MacFarlane1-0/+19
2014-05-12Require highlighting-kate >= 0.5.8.John MacFarlane1-3/+3
This fixes a performance regression.
2014-05-11LaTeX reader: set `bibliography` in metadata from `\bibliography` cmd.John MacFarlane1-1/+6
2014-05-11Process: Fix minor typo in pipeProcess' docsAlbert Krewinkel1-2/+1
Replace fullstop with comma, adjust capitalisation.
2014-05-10LaTeX reader: Don't error on "%foo" with no newline.John MacFarlane1-1/+1
2014-05-10Merge pull request #1290 from tarleb/fix-header-paramsJohn MacFarlane2-6/+25
Org reader: Fix block parameter reader, relax constraints
2014-05-10Org reader: Fix block parameter reader, relax constraintsAlbert Krewinkel2-6/+25
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-09Merge pull request #1288 from tarleb/update-copyrightJohn MacFarlane51-103/+138
Update copyright notices for 2014, add missing notices
2014-05-09Merge pull request #1289 from tarleb/code-block-headersJohn MacFarlane2-69/+140
Org reader: Support code block headers, fix reading of block content
2014-05-09Org reader: Fix parsing of blank lines within blocksAlbert Krewinkel2-6/+11
Blank lines were parsed as two newlines instead of just one. Thanks to Xiao Hanyu (@xiaohanyu) for pointing this out.
2014-05-09Org reader: Support arguments for code blocksAlbert Krewinkel2-42/+70
The general form of source block headers (`#+BEGIN_SRC <language> <switches> <header arguments>`) was not recognized by the reader. This patch adds support for the above form, adds header arguments to the block's key-value pairs and marks the block as a rundoc block if header arguments are present. This closes #1286.
2014-05-09Org reader: refactor #+BEGIN..#+END block parsing codeAlbert Krewinkel1-42/+80
2014-05-09Update copyright notices for 2014, add missing noticesAlbert Krewinkel51-103/+138
2014-05-07OSX package script: cabal init before update.John MacFarlane1-1/+1
2014-05-07Bumped version bound for mtl.John MacFarlane1-1/+1
2014-05-07Require latest texmath.John MacFarlane1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 16:40:37 +0000