Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
4643 commits 2 branches 0 tags 65 MiB
Commit graph

4643 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
aeec883e0e Merge pull request #1260 from joehillen/tabs-in-cabalfile 
change tabs to spaces in pandoc.cabal
 2014-04-24 16:48:02 -07:00
John MacFarlane
e6333a9d7c Markdown writer: Use proper escapes to avoid unwanted lists. 
Previously we used 0-width spaces, an ugly hack.

Closes #980.
 2014-04-24 16:44:49 -07:00
John MacFarlane
58c9946cda Bumped upper bounds for http-conduit and network. 2014-04-24 13:16:10 -07:00
John MacFarlane
b08de8fe35 Require aeson >= 0.7. 2014-04-24 11:55:20 -07:00
John MacFarlane
d16775e1c7 Render numbers in YAML metadata without decimals when possible. 
The change to aeson > 0.7 caused numbers to be rendered with
decimals.  This change causes them to be rendered without decimals
wehn possible.
 2014-04-24 11:09:07 -07:00
John MacFarlane
e0688711fd EPUB writer: include extension in epub ids. 
This fixes a problem with duplicate extensions for fonts and
images with the same base name but different extensions.

Closes #1254.
 2014-04-23 10:23:02 -07:00
Joe Hillenbrand
8b0279b4ac change tabs to spaces in pandoc.cabal 2014-04-22 10:50:22 -07:00
John MacFarlane
bf0c725647 Merge pull request #1257 from tarleb/mathmlinhtml-deprecation-warning 
MathMLinHTML: Fix deprecation warning
 2014-04-21 12:32:57 -07:00
gwern
17d105a8a4 MathMLinHTML: Fix deprecation warning 
The use of `nodeValue` on `Attr` objects causes a deprecation warning in
Firefox since version 7.  This patch causes calls to `value` instead of
`nodeValue` for all `Attr` objects.

This closes #362.
 2014-04-20 08:53:59 +02:00
John MacFarlane
6a2361c457 Merge pull request #1256 from tarleb/org-reader-improvements 
Org reader improvements
 2014-04-19 20:35:41 -07:00
Albert Krewinkel
d44815c79b Add license statement for org reader files 
This adds a brief note to the COPYRIGHT file, declaring the code in the
org-reader files to be licensed under the GPL.
 2014-04-19 15:26:59 +02:00
Albert Krewinkel
8276449520 Org reader: Allow for compact definition lists 
Use `Text.Pandoc.Shared.compactify'DL` to allow for compact definition
lists.
 2014-04-19 15:13:16 +02:00
Albert Krewinkel
efebade38b Move compactify'DL from Markdown reader into Shared 
The function `compactify'DL`, used to change the final definition item of a
definition list into a `Plain` iff all other items are `Plain`s as well, is
useful in many parsers and hence moved into Text.Pandoc.Shared.
 2014-04-19 15:03:33 +02:00
Albert Krewinkel
8e91d362a3 Org reader: Fix parsing of footnotes 
Footnotes can consist of multiple blocks and end only at a header or at
the beginning of another footnote.  This fixes the previous behavior,
which restricted notes to a single paragraph.
 2014-04-19 14:40:46 +02:00
Albert Krewinkel
a69416091b Org reader: Fix distinction of images and normal links 
Fixed a false assumption about the precedence of (&&) vs (||).
 2014-04-19 11:25:39 +02:00
Albert Krewinkel
6ded3d41d9 Org reader: Apply captions to code blocks and tables 
The `Table` blocktype already takes the caption as an argument, while code
blocks are wrapped in a `Div` block together with a labelling `Span`.
 2014-04-19 10:41:45 +02:00
Albert Krewinkel
09441b65a8 Org reader: Add support for plain LaTeX fragments 
This adds support for LaTeX fragments like the following:

```
\begin{equation}
\int fg \mathrm{d}x
\end{equation}
```
 2014-04-18 10:22:54 +02:00
Albert Krewinkel
f19d7233d8 Org reader: Fix parsing of loose lists 
Loose lists (i.e. lists with blankline separated items), were parsed as
multiple lists, each containing a single item.  This patch fixes this
issue.
 2014-04-18 08:34:06 +02:00
Albert Krewinkel
6d6724cf2c Org reader: Support more types of '#+BEGIN_<type>' blocks 
Support for standard org-blocks is improved.  The parser now handles
"HTML", "LATEX", "ASCII", "EXAMPLE", "QUOTE" and "VERSE" blocks in a
sensible fashion.
 2014-04-17 18:33:39 +02:00
Albert Krewinkel
0672f58a44 Org reader: Support footnotes 2014-04-17 13:23:14 +02:00
Albert Krewinkel
92582c6272 Org reader: introduce Reader environment around Blocks/Inlines 
This introduces a Reader environment in the style of
Text.Pandoc.Parsing.F, but adapted to the Org reader parser.
 2014-04-16 13:38:50 +02:00
Albert Krewinkel
5fc252270c Org reader: Fix code for subexpression parsing 2014-04-16 13:26:32 +02:00
Albert Krewinkel
346bcea713 Org reader: Better module description, minor style changes 
Use module description analogous to the markdown reader's.
Use (<$) where it makes sense.
 2014-04-16 13:23:30 +02:00
John MacFarlane
7f036c0b57 Shared: Fixed bug in toRomanNumeral. 
9 and numbers ending in 9 would end with "IXIV."
Thanks to Jesse Rosenthal.  Closes #1249.
 2014-04-15 19:53:58 -07:00
John MacFarlane
d8d4ede4d6 Require yaml >= 0.8.8.2. 
Otherwise we have problems with integers being rendered with
decimal points.
 2014-04-14 17:06:38 -07:00
John MacFarlane
714d4707b5 Require tagsoup 0.13.1. 
This fixes a bug in parsing of script tags.
See #1248.
 2014-04-14 17:05:20 -07:00
John MacFarlane
857fcff7d6 Merge pull request #1240 from neilmayhew/master 
Docbook output of Line Blocks
 2014-04-13 14:37:28 -07:00
John MacFarlane
86b4da9dec Merge pull request #1239 from tarleb/org-linebreak 
Org linebreaks
 2014-04-13 14:04:48 -07:00
John MacFarlane
d5d4227ea5 Merge pull request #1238 from tarleb/org-figures 
Org reader: Add support for figures
 2014-04-13 14:03:15 -07:00
John MacFarlane
d4c1cd456c Org reader: Removed ANN pragma. 
This relies on Template Haskell, which causes problems in Windows
due to libraries with C dependencies.  We need to avoid using TH
in pandoc code.
 2014-04-12 21:44:54 -07:00
Neil Mayhew
f22ce4ff28 Add some unit tests for Writers.Docbook 
These are primarily aimed at testing the new treatment of line breaks,
but hopefully other tests can be added more easily now as features
and changes are implemented in the writer.

Adapted from Tests.Writers.HTML.tests.
 2014-04-12 09:18:09 -06:00
Neil Mayhew
464d7a8e49 Improve handling of hard line breaks in Docbook writer 
* Use a <literallayout> for the entire paragraph, not just for the
   newline character
 * Don't let LineBreaks inside footnotes influence the enclosing
   paragraph
 2014-04-12 09:16:07 -06:00
Albert Krewinkel
67051b6e5d Fix editorconfig for test files 
Test output files should be exactly as defined with regard to trailing
whitespace.  This keeps editorconfig from breaking those files.
 2014-04-12 12:22:09 +02:00
Albert Krewinkel
82d4160bdc Org reader: Read linebreaks 
Linebreaks are marked by the string `\\` at the end of a line.
 2014-04-12 11:07:38 +02:00
Albert Krewinkel
36066699c3 Org writer: Fix output for linebreaks 
Hard linebreaks in Org mode are represented by the string "\\" as the
last characters in a line.  Adds this feature to the Org-mode writer.
 2014-04-12 10:47:49 +02:00
Albert Krewinkel
ae4280fba5 Org reader: Add support for figures 
Support for figures (images with name and caption) is added.
 2014-04-12 10:31:45 +02:00
John MacFarlane
8bc09ce6c7 Beamer template: Consistent styles for figure and table captions 
Thanks to aaronwolen.
 2014-04-11 11:12:13 -07:00
John MacFarlane
a6b6ec7be3 Beamer template: Adjust widths correctly for oversized images. 
Thanks to Garrick Aden-Buie for the patch.
 2014-04-11 10:52:26 -07:00
John MacFarlane
8699071ec2 HTML reader: Treat processing instructions & declarations as block. 
Previously these were treated as inline, and included in paragraph
tags in HTML or DocBook output, which is generally not what is wanted.

Closes #1233.
 2014-04-11 10:10:54 -07:00
John MacFarlane
2304e9cb94 Merge pull request #1231 from tarleb/org-fix-subexpr 
Org reader: Fix parsing of sub-/superscript expressions
 2014-04-11 07:37:57 -07:00
Albert Krewinkel
6f19be7d40 Org reader: Fix parsing of sub-/superscript expressions 
This fixes the org-reader's handling of sub- and superscript
expressions.  Simple expressions (like `2^+10`), expressions in
parentheses (`a_(n+1)`) and nested sexp (like `a_(nested()parens)`) are
now read correctly.
 2014-04-11 11:05:42 +02:00
John MacFarlane
ca40acea5b MediaWiki reader: Handle table rows containing just an HTML comment. 
Closes #1230.
 2014-04-10 16:52:30 -07:00
John MacFarlane
f48b564ac7 Updated GHC versions in tested-with field. 2014-04-10 11:04:05 -07:00
John MacFarlane
3e147199b8 Merge pull request #1229 from tarleb/org-math-improved 
Org reader: Support more inline/display math variants
 2014-04-10 11:02:01 -07:00
Albert Krewinkel
ace8837cd6 Org reader: Improve code by following HLint recommendations 
HLint's recommendations for better code are applied to the Org-mode
reader code.
 2014-04-10 19:17:58 +02:00
Albert Krewinkel
1715d7cee0 Org reader: Support more inline/display math variants 
Support all of the following variants as valid ways to define inline or
display math inlines:

  - `\[..\]` (display)
  - `$$..$$` (display)
  - `\(..\)` (inline)
  - `$..$`   (inline)

This closes #1223.  Again.
 2014-04-10 15:32:02 +02:00
John MacFarlane
a9eb0caabb Fixed cabal path in travis config. 2014-04-09 17:33:51 -07:00
John MacFarlane
a67b221d4d More travis tweaks. 2014-04-09 17:18:10 -07:00
John MacFarlane
1fd5ca48c1 Travis: gave up trying to test the sdist. 
For some reason hsb2hs was not found, even though it was built.
 2014-04-09 16:38:15 -07:00
John MacFarlane
f31f5924b3 More travis tweaks. 2014-04-09 15:07:36 -07:00