Commit graph

1530 commits

Author SHA1 Message Date
John MacFarlane
9538328c6b Added test case for issue #186 (\$ in latex math). 2012-02-07 19:41:37 -08:00
John MacFarlane
03d69daab6 Added test case for issue #186 (\$ in latex math). 2012-02-07 19:24:09 -08:00
John MacFarlane
66ac842456 LaTeX writer: prevent adjacent hyphens from forming ligatures.
This is important primarily for things like `--option`.
Em and En dashes will produce '---' and '--' in LaTeX, but
hyphens should not otherwise combine into dashes.
2012-02-06 13:48:59 -08:00
John MacFarlane
df3f3ddb6e LaTeX reader: use raw latex as fallback for Cites.
This way you can still get the raw latex back, even if you don't
process with citeproc.  Previously, cites were not visible at all
unless you specified --biblio on the command line and converted
them using citeproc, or used --natbib or --biblatex.
2012-02-06 12:42:12 -08:00
John MacFarlane
acdbdd7da5 Text.Pandoc.PDF: Simplified tex2pdf.
We no longer try to parse the log file to determine whether latex
needs to be rerun. Instead, we run latex twice -- which should be
enough for table of contents and hyperrefs.

Closes #402.
2012-02-06 12:12:23 -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
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
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
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
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
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
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
John MacFarlane
23ca68a5c4 Don't let autolinks create reference links.
Previously we got bad results with -t markdown --reference-links
if the input contained autolinks like <http://yahoo.com>.
2012-01-31 15:25:49 -08:00
John MacFarlane
e9a270d03b Don't include mathml javascript for html5 output.
mathml is supposed to be supported in HTML5.
2012-01-31 10:47:48 -08:00
John MacFarlane
3880828415 Support --mathml flag in docbook. 2012-01-31 10:32:40 -08:00
John MacFarlane
928b1380f3 Change copyright date. 2012-01-31 08:59:19 -08:00
John MacFarlane
8f1bfec7b9 Added --epub-embed-font option.
* This can be repeated for multiple fonts.
* Added parameter for fonts to embed to writeEPUB.
* Added ttf, otf to Mime types in Text.Pandoc.MIME.
2012-01-30 13:09:52 -08:00
John MacFarlane
34801acc69 Added default.beamer template (separate from default.latex). 2012-01-30 11:26:04 -08:00
John MacFarlane
17e70940a0 LaTeX reader: Require non-letter after certain commands.
Previously "\opening" was rendered as "\248pening".
The "\o" should not be parsed as a control sequence.
Partially addresses #393.
2012-01-29 22:27:37 -08:00
John MacFarlane
f437827b0c Remove dependency on old-time. 2012-01-28 16:04:35 -08:00
John MacFarlane
3a0b3df007 Put date in YYYY-MM-DD format if possible for HTML, docx metadata.
Added normalizeDate to Text.Pandoc.Shared.
2012-01-28 15:54:34 -08:00
John MacFarlane
98e5b61703 Removed an unnecessary many spaceChar. 2012-01-28 13:12:52 -08:00
John MacFarlane
0487eae7ee Markdown reader: Fixed bug in code block attribute parser.
Previously the ID attribute got lost if it didn't come first.
Now attributes can come in any order.
2012-01-28 12:36:51 -08:00
John MacFarlane
d1ded4b026 Support github syntax for fenced code blocks.
You can now write

    ```ruby
    x = 2
    ```

instead of

    ~~~ {.ruby}
    x = 2
    ~~~~
2012-01-28 12:25:24 -08:00
John MacFarlane
d0e70cbc29 XML: Added toEntities. 2012-01-28 11:43:27 -08:00
John MacFarlane
8abe08d6d4 Made beamer an output format, removed pdf as output format.
Removed `--beamer` option; instead, use `beamer` as output format.
There is no longer a `pdf` output format; instead, pandoc tries
to produce a pdf if the output file has a `.pdf` extension.
(The output format can be latex -- the default for pdf output,
latex+lhs, or beamer.)

This seems more consistent with the way pandoc currently works
(e.g. we have an `html5` output format, not an `--html5` option).
2012-01-28 11:41:26 -08:00
John MacFarlane
513af8dd1b LaTeX writer: escape # in href URLs. Closes #359. 2012-01-27 13:44:17 -08:00