Commit graph

2975 commits

Author SHA1 Message Date
John MacFarlane
880e5677e0 Updated changelog. 2012-02-05 23:39:12 -08:00
John MacFarlane
0e85ac299a Bump version to 1.9.0.2. 2012-02-05 23:38:15 -08:00
John MacFarlane
8173625059 Allow json 0.4.
Otherwise we can't compile on ghc 6.12.
2012-02-05 23:37:45 -08:00
John MacFarlane
b63f924787 Fixed bug in fromEntities: require semicolon to process as entity. 2012-02-05 23:02:01 -08:00
John MacFarlane
521e90e839 Parsing: Make characterReference fail if entity not found. 2012-02-05 23:01:35 -08:00
John MacFarlane
e2c157f86f Removed module Text.Pandoc.CharacterReferences.
Moved characterReference parser to Text.Pandoc.Parsing.
decodeCharacterReferences is now replaced by fromEntities
in Text.Pandoc.XML.
2012-02-05 22:52:00 -08:00
John MacFarlane
9bf6e665ea Removed outdated comment in LaTeX reader. 2012-02-05 22:51:42 -08:00
John MacFarlane
0a89f124e6 Removed 'nohl' variants of tests from pandoc.cabal. 2012-02-05 22:23:48 -08:00
John MacFarlane
8a2db77de2 Tightened version bounds for pandoc-types, json. 2012-02-05 22:22:10 -08:00
John MacFarlane
228699fc07 Edits to changelog. 2012-02-05 22:15:59 -08:00
John MacFarlane
b5c811402e changelog - note updated for ghc 7.4.1. 2012-02-05 20:09:27 -08:00
John MacFarlane
bec945518c Fixed Pretty so it uses Data.Monoid's <> w/ GHC 7.4.
Note:  changed fixity to infixr 6.
2012-02-05 19:57:59 -08:00
John MacFarlane
857524353e pandoc-setup.iss: Removed markdown2pdf. 2012-02-05 19:01:28 -08:00
John MacFarlane
819f815a6b Fixed template name in windows installer. 2012-02-05 18:59:57 -08:00
John MacFarlane
2ea45c345b Revert "Fixed some paths on windows installer script."
This reverts commit 4ee779c768.
2012-02-05 18:29:55 -08:00
John MacFarlane
4ee779c768 Fixed some paths on windows installer script. 2012-02-05 18:27:44 -08:00
John MacFarlane
7824be024f Documented \include in changelog. 2012-02-05 18:24:33 -08:00
John MacFarlane
607b9db58c Tweaks to make_osx_package. 2012-02-05 18:15:33 -08:00
John MacFarlane
9acb5e4d69 Tweaks to pandoc-setup for windows. 2012-02-05 18:14:48 -08:00
John MacFarlane
6c449b5cf0 Bump highlighting-kate version. 2012-02-05 17:35:56 -08:00
John MacFarlane
bec9485d93 Re-added the --ascii option.
Now it is implemented in pandoc.hs, not in the HTML writer.
2012-02-05 14:58:55 -08:00
John MacFarlane
550b931c3c Text.Pandoc.XML: Export fromEntities.
Remove old 'deEntities' from pandoc.hs.
2012-02-05 14:37:33 -08:00
John MacFarlane
4dec972cfe Remove dependency on dlist.
Use sequence in Pretty instead.
2012-02-05 14:25:12 -08:00
John MacFarlane
eed87d7755 Normalize date in EPUB metadata. 2012-02-05 14:05:30 -08:00
John MacFarlane
6cb7c688d8 Updated changelog. 2012-02-05 13:58:15 -08:00
John MacFarlane
ff18deae44 Added 6.12.1 to list of tested-with ghc versions. 2012-02-05 13:27:06 -08:00
John MacFarlane
1f20f77712 Changed infix level of testing combinators.
This avoids clash with (<>), which is defined in Data.Monoid
as having infix 6.
2012-02-05 13:23:06 -08:00
John MacFarlane
9bf32a7554 Don't use -rtsopts unless ghc >= 7.0.1. 2012-02-05 12:14:34 -08:00
John MacFarlane
ce9f5f36c8 pandoc: Treat html5+lhs as an html format. 2012-02-05 09:58:16 -08:00
John MacFarlane
f97391c7de Support \frametitle, \framesubtitle. 2012-02-05 09:28:56 -08:00
John MacFarlane
922469bbb2 LaTeX reader: Fixed bug in authors. 2012-02-05 09:06:34 -08:00
John MacFarlane
bae3b49a5a LaTeX reader: Support \TeX, \LaTeX. 2012-02-05 08:50:25 -08:00
John MacFarlane
c54c3d50b0 LaTeX reader: Skip everything after \end{document}. 2012-02-05 08:46:04 -08:00
John MacFarlane
79f1594470 Added \vspace and \hspace to latex ignored block commands. 2012-02-04 23:19:09 -08:00
John MacFarlane
e16d747d82 make-windows-installer: We no longer need wrappers, highlighting flags. 2012-02-04 22:32:22 -08:00
John MacFarlane
be8bddcaf3 Improvements to LaTeX reader:
* Handle \ps
* Ignore ignorable commands in a uniform way.
* Handle \P
* handleIncludes skips \verb commands.
2012-02-04 22:28:16 -08:00
John MacFarlane
4257b9aff5 Handle \address and \signature in letter environment. Closes #393. 2012-02-04 20:02:00 -08:00
John MacFarlane
1fc57ed250 Depend on parsec 3 - for applicative instances used in LaTeX reader.
This is okay now that parsec 3 is the standard version in the Haskell
platform, and the speed issues have been addressed.
2012-02-04 19:38:51 -08:00
John MacFarlane
800d5cdb07 LaTeX reader: support macron accents \=o. 2012-02-04 19:36:05 -08:00
John MacFarlane
80505bc490 LaTeX reader: support \. dot accent. 2012-02-04 19:31:01 -08:00
John MacFarlane
0ec953793d handleIncludes: read file as UTF8, allow multiples separated by commas.
e.g. \usepackage{a,b}
2012-02-04 15:56:55 -08:00
John MacFarlane
93dad75a48 Don't print warnings for not-found packages, includes. 2012-02-04 13:31:21 -08:00
John MacFarlane
3f87c43640 Revert "LaTeX reader: Use kpsewhich to find paths for handleIncludes."
This reverts commit 1f90c6d7e0.
2012-02-04 13:20:36 -08:00
John MacFarlane
1f90c6d7e0 LaTeX reader: Use kpsewhich to find paths for handleIncludes.
Fall back without an error if kpsewhich is not available.
2012-02-04 13:10:48 -08:00
John MacFarlane
253a9e32aa Have handleIncludes look for local .sty files from \usepackage. 2012-02-04 13:01:00 -08:00
John MacFarlane
1e772aa59c LaTeX reader: small bug fixes. 2012-02-04 12:51:27 -08:00
John MacFarlane
e58d5bf087 Minor formatting change 2012-02-04 12:27:37 -08:00
John MacFarlane
47eb69a7e1 LaTeX reader: Factored out rawEnv 2012-02-04 12:27:24 -08:00
John MacFarlane
ade08f6330 Small improvements in latex table parser. 2012-02-04 11:50:06 -08:00
John MacFarlane
75485c2f11 Complete rewrite of LaTeX reader.
* The new reader is more robust, accurate, and extensible.
  It is still quite incomplete, but it should be easier
  now to add features.

* Text.Pandoc.Parsing: Added withRaw combinator.

* Markdown reader: do escapedChar before raw latex inline.
  Otherwise we capture commands like \{.

* Fixed latex citation tests for new citeproc.

* Handle \include{} commands in latex.
  This is done in pandoc.hs, not the (pure) latex reader.
  But the reader exports the needed function, handleIncludes.

* Moved err and warn from pandoc.hs to Shared.

* Fixed tests - raw tex should sometimes have trailing space.

* Updated lhs-test for highlighting-kate changes.
2012-02-04 09:56:43 -08:00