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

5339 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
670441a5a4 Included Tests.Writers.Docbook in test modules. 2014-08-13 16:46:00 -07:00
John MacFarlane
80a610b73c Added new Makefile targets. 2014-08-13 14:00:03 -07:00
John MacFarlane
17b2fd567b Fixed haddock comment. 2014-08-13 13:59:50 -07:00
John MacFarlane
3b7d276ab0 Added make-pandoc-man-pages flag 
Previously we built this by default, but most users won't need
to build it, since we include built man pages with the package.
 2014-08-13 13:52:46 -07:00
John MacFarlane
a0e795fc40 Added Makefile to rebuild man pages. 
This should only be needed by developers.
 2014-08-13 12:31:19 -07:00
John MacFarlane
76d14bcc11 Old tests: better path for test program. 2014-08-13 12:20:25 -07:00
John MacFarlane
0492ab868b Setup.hs: ensure make-man-pages not installed in bindir. 2014-08-13 12:20:01 -07:00
John MacFarlane
fc17b3bd41 Make options work with test-pandoc. 2014-08-13 12:19:42 -07:00
John MacFarlane
05b7fd8dee Removed unneeded import. 2014-08-13 11:35:09 -07:00
John MacFarlane
40e67b8737 Revised tests directory. 
Renamed some tests, introducing subsidiary directories
for fb2, docx, epub.

Cleaned up tests in cabal file.

Combined dokuwiki-writer and dokuwiki_inline_formatting tests.
 2014-08-13 11:16:50 -07:00
John MacFarlane
fa71a08ed3 Simplified Setup.hs. 
It no longer builds and installs man pages.

All it does is hook the hsb preprocessor.

This should make the build process more robust over Cabal API
changes.  We'll add a Makefile to generate man pages.
 2014-08-13 10:18:46 -07:00
John MacFarlane
1d6e1cf9f3 Removed special testHook from Setup. 
This was just too fragile and dependent on a changing Cabal API
(see #1526).

Instead of passing the bulid directory to the test program, we
now let the test program find itself (using executable-path)
and then find the pandoc executable relative to itself.
 2014-08-13 08:12:07 -07:00
John MacFarlane
22ab3367c6 Removed unneeded CPP. 2014-08-12 22:50:51 -07:00
John MacFarlane
095d9dc6be Merge pull request #1529 from jkr/dunning-fixes 
Fixes from contributed document
 2014-08-12 21:51:21 -07:00
Jesse Rosenthal
a1320a76f9 Docx: Reducible forgot about smallcaps 2014-08-13 00:09:40 -04:00
Jesse Rosenthal
dca55630e6 Docx Reader: Trim line breaks from the beginning and end of Section 
Headers.

We might also want to do this elsewhere (for pars, for example).
 2014-08-12 23:42:01 -04:00
Jesse Rosenthal
378a795eaa Docx: More robust handling of multiple bookmarks in header. 2014-08-12 23:41:57 -04:00
Jesse Rosenthal
85579052b5 Docx reader: Check for null-id'd anchors too. 
Otherwise they get left dangling in the document.
 2014-08-12 23:33:03 -04:00
Jesse Rosenthal
194ed88852 Docx reader: accept explicit "Italic" and "Bold" rStyles. 
Note that "Italic" can be on, and, from the last commit, `<w:i>` can be
present, but be turned off. In that case, the turned-off tag takes
precedence. So, we have to distinguish between something being off and
something not being there. Hence, isItalic, isBold, isStrike, and
isSmallCaps have become Maybes.
 2014-08-12 22:39:18 -04:00
Jesse Rosenthal
aae71ad595 Docx reader: Add "BlockQuotation" to divs list. 2014-08-12 22:08:30 -04:00
Jesse Rosenthal
d4748038d7 Docx Reader: Fix font style parsing. 
Before we just checked for the existence of a tag. Now, we make sure to
check for its on/off value.
 2014-08-12 22:04:07 -04:00
John MacFarlane
5b1d841a6f epub3 template: Put title page in section with epub:type titlepage. 2014-08-12 17:07:12 -07:00
John MacFarlane
e883ef4eb9 Merge pull request #1527 from mpickering/juicypixels 
Attempts to convert gif, tiff and bmp to png in pdf writer
 2014-08-12 16:57:22 -07:00
John MacFarlane
7684b24959 Merge pull request #1528 from mpickering/epubtitlepage 
EPUB Reader: Ignores titlepage attribute
 2014-08-12 16:56:38 -07:00
Matthew Pickering
2b31df32de LaTeX Writer: Added missing closing braces to hyperdef commands 2014-08-13 00:37:18 +01:00
Matthew Pickering
57bebe26df PDF Writer: Attempts to convert images to pdf renderable formats 
Now depends on the JuicyPixels library.

Will attempt to convert an image (gif, tiff, bmp) to png when converting
to pdf.
 2014-08-13 00:37:18 +01:00
Matthew Pickering
063ba81622 EPUB Tests: Added wasteland test 
This epub contains many epub:type elements including footnotes and
titlepage.
 2014-08-13 00:25:18 +01:00
John MacFarlane
52c58175ca Updated changelog. 2014-08-12 15:52:18 -07:00
John MacFarlane
81157c7cc6 HTML writer: use 'uri' or 'email' class for autolinks. 
This allows them to be styled specially.

Closes #1501.
 2014-08-12 15:49:43 -07:00
John MacFarlane
da507dcb84 ConTeXt writer: improved autolink detection. 
It previously failed in some cases with escaped special characters.
 2014-08-12 15:49:20 -07:00
Matthew Pickering
34cf016251 EPUB Reader: Ignore title pages 2014-08-12 23:03:24 +01:00
John MacFarlane
60cf6e1dae Updated changelog. 2014-08-12 14:12:28 -07:00
John MacFarlane
3653018a70 Added mathml tests for docbook reader. 2014-08-12 14:10:52 -07:00
John MacFarlane
f16dd1bfdf DocBook: Support equations with mathml. 
equation, informalequation, inlineequation and mml:math elements.
 2014-08-12 14:00:46 -07:00
John MacFarlane
22cf6209a6 Minor changelog reformatting. 2014-08-12 13:08:32 -07:00
John MacFarlane
c0df6ae45f Updated changelog. 2014-08-12 13:05:11 -07:00
John MacFarlane
5c5d60a438 Reorganized changelog. 2014-08-12 12:59:56 -07:00
John MacFarlane
d6f0973128 Merge pull request #1524 from jkr/dropCap3 
Docx reader: move dropcap combining logic to Reducible
 2014-08-12 11:13:27 -07:00
John MacFarlane
f97ec6db2c Markdown reader: Improved parsing of indented code in list items. 
Indented code at the beginning of a list item must be indented eight
spaces from the margin (or from the edge of the container), or four
spaces past the list marker, whichever is farther.

Some examples in `tests/markdown-reader-more.txt`.
 2014-08-12 11:10:48 -07:00
John MacFarlane
ab75e1d3bd Beamer: Use \footnote<.->{..} for notes. 
This ensures that the footnotes will not appear before the
overlays in which their corresponding note markers appear.

Closes #1525.
 2014-08-12 10:56:57 -07:00
Jesse Rosenthal
9d0b390d48 Docx reader: move combining logic to Reducible 
Introduces a new function in Reducibles, concatR.  The idea is that if we
have two list of Reducibles (blocks or inlines), we can combine them and
just perform the reduction on the joining parts (the last element of the
first list, the first element of the second list). This is useful in cases
where the two lists are already reduced, and we're only worried about the
joining elements.

This actually improves the efficiency a bit further, because concatR can be
smart about empty lists.
 2014-08-12 10:26:49 -04:00
John MacFarlane
712ae610e0 Merge pull request #1523 from jkr/dropCap2 
Docx reader: Make dropcap combining more efficient.
 2014-08-12 07:16:38 -07:00
Jesse Rosenthal
e4a8e4a636 Docx reader: Make dropcap combining more efficient. 
Before, we had to run reduceList on the whole combined paragraph, which
was redundant, and could take some time for long paragraphs. We only
need to combine the drop cap with the first inline of the next
paragraph.
 2014-08-12 09:00:53 -04:00
John MacFarlane
4c88e64894 Merge pull request #1522 from jkr/dropCap 
Drop cap
 2014-08-11 20:38:23 -07:00
Jesse Rosenthal
45ec035e93 Docx reader: combine inlines properly in dropcaps. 
Make sure that adjacent inlines are combined properly in dropcaps. This
updates the test results as well.
 2014-08-11 23:31:16 -04:00
Jesse Rosenthal
0808449547 Docx: Add dropcap tests. 2014-08-11 23:10:50 -04:00
Jesse Rosenthal
3e32cd5bb1 Docx reader: Use dropcap state. 
If we get to a dropcap, we keep hold the inlines until the next
paragraph, and combine it there.
 2014-08-11 23:08:33 -04:00
Jesse Rosenthal
bca74a2bd0 Add dropCap to paragraph style. 2014-08-11 21:42:02 -04:00
John MacFarlane
86d4da994a EPUB reader: use walk instead of bottomUp. 
This should be more efficient.
 2014-08-11 14:48:42 -07:00
John MacFarlane
31811657fa Merge pull request #1521 from jkr/emptyEmph 
Discard empty formatters
 2014-08-11 14:44:08 -07:00