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

5515 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
7672997d18 Merge pull request #1540 from jkr/charStyles 
Char styles
 2014-08-16 15:39:56 -07:00
Jesse Rosenthal
9bb0b99981 Docx reader: Remove unnecessary plural functions 
functions like runElemsToInlines and parPartsToInlines are just defined
in terms of concatting and mapping their singular
version (e.g. `runElemToInlines`). Having two functions with almost
identical names makes it easier to introduce errors. It's easy enough to
just concat and map inline, and it makes it clearer what is going on in
the code.
 2014-08-16 15:07:41 -04:00
Jesse Rosenthal
180f5cbe63 Docx reader: Test for character styles. 2014-08-16 14:05:56 -04:00
Jesse Rosenthal
9969b2ebee Docx reader: Fix bug in character styles. 
Style handling has been cleaned up, but introduced a bug here. There
wasn't previously a test to catch it.
 2014-08-16 14:05:19 -04:00
John MacFarlane
b578245650 Merge pull request #1539 from jkr/builderRewrite 
Rewrite Docx.hs and Reducible to use Builder.
 2014-08-16 10:48:27 -07:00
Jesse Rosenthal
0ff9ec2f4e Rewrite Docx.hs and Reducible to use Builder. 
The big news here is a rewrite of Docx to use the builder
functions. As opposed to previous attempts, we now see a significant
speedup -- times are cut in half (or more) in a few informal tests.

Reducible has also been rewritten. It can doubtless be simplified and
clarified further. We can consider this, at the moment, a reference for
correct behavior.
 2014-08-16 10:22:55 -04:00
John MacFarlane
0d9b35a6e3 Minor Makefile tweaks. 2014-08-15 21:07:22 -07:00
John MacFarlane
a004216706 make_osx_package: add -osx suffix to package. 2014-08-15 09:51:59 -07:00
John MacFarlane
2b6e8f4c83 OSX installer improvements. 
* Use new pkgbuild, productbuild instead of deprecated PackageMaker.
* Removed scripts, which are no longer needed.
* Added distribution.xml.
 2014-08-15 00:46:01 -07:00
John MacFarlane
a44650bf97 Fixed typo in changelog. 2014-08-14 22:53:42 -07:00
John MacFarlane
6bea1ad5df make_osx_package: Build man pages. 2014-08-14 22:53:30 -07:00
John MacFarlane
fb8691c2fa make_osx_package: Fix man page installation. 2014-08-14 22:15:15 -07:00
John MacFarlane
a8b6094cec make_osx_package: look in right place for cpphs. 2014-08-14 22:12:44 -07:00
John MacFarlane
4e0fe9001c Updated changelog. 2014-08-14 10:59:27 -07:00
John MacFarlane
8bf39cf6d6 Markdown reader: Better handle quote characters in inline links. 
This was previously failing to be recognized as a link:

    [Test](http://en.wikipedia.org/wiki/Ward's_method)

Closes #1534.
 2014-08-14 10:59:27 -07:00
John MacFarlane
5524b5286b Updated osx certificate ID. 2014-08-14 10:28:14 -07:00
John MacFarlane
66361d9eb7 Updated changelog. 2014-08-14 09:57:46 -07:00
John MacFarlane
16f8a59f8c Small documentation tweak 2014-08-14 09:56:24 -07:00
John MacFarlane
e917bcc124 Make raw_tex extension non-default for textile reader, writer. 
Enable `raw_tex` extension in textile writer.

Closes #1532.
 2014-08-14 09:49:31 -07:00
John MacFarlane
8c1e0543d7 windows, osx package scripts: don't need alex, happy. 2014-08-14 00:23:27 -07:00
John MacFarlane
ea71c9872d Updated release checklist. 2014-08-13 19:52:43 -07:00
John MacFarlane
52a9ccce4f Merge pull request #1531 from jkr/morefonts 
Docx reader: Interpret "Strong" and "Emphasis" run styles.
 2014-08-13 19:47:42 -07:00
John MacFarlane
c8fa545ee4 Added 'dist' target to Makefile that does a sanity check on tarball. 2014-08-13 17:52:34 -07:00
John MacFarlane
6e4c60ea28 EPUB3 template: add epub:type annotation in titlepage. 2014-08-13 16:57:28 -07:00
John MacFarlane
4c8c63d89e Added dokuwiki template to pandoc.cabal. 2014-08-13 16:56:57 -07:00
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
Jesse Rosenthal
6897905602 Docx reader: Interpret "Strong" and Emphasis run styles. 2014-08-13 12:23:03 -04: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