Commit Graph
10211 Commits
Author SHA1 Message Date
Artyom Kazak 6a34cd3ddf Update Reader.EPUB to use MimeType. 2014-08-17 21:00:55 +04:00
Artyom Kazak cca9e8feb4 MIME cleanup.
* Create a type synonym for MIME type (instead of `String`).
  * Add `getMimeTypeDef` function.
  * Avoid recreating MIME type `Map`s every time.
  * Move “Formula-...” case handling into `getMimeType`.
2014-08-17 21:00:50 +04:00
John MacFarlane eab5fbb4fd Fixed typo in templates README. 2014-08-17 09:57:41 -07:00
John MacFarlane ecb769cb7b Typo: duel->dual. (#13) 2014-08-17 09:57:11 -07:00
Jesse Rosenthal b8f1658c36 Alias string and runStyle to CharStyle type. 2014-08-17 11:30:22 -04:00
Jesse Rosenthal c4871ac790 Docx Style parser: Basic one now just takes a parent style.
This will make it easier to build the style map from the bottom up (to
avoid any infinite references).
2014-08-17 10:19:48 -04:00
Jesse Rosenthal 75eec0a6b8 Docx reader: work with new rStyle.
Just discards info at the moment, so at least it works the same.
2014-08-17 09:22:25 -04:00
Jesse Rosenthal ea85a797c2 Parser: Framework for parsing styles.
We want to be able to read user-defined styles. Eventually we'll be able
to figure out styles in terms of inheritance as well. The actual
cascading will happen in the docx reader.
2014-08-17 09:22:21 -04:00
Jesse Rosenthal dc5b0ba09b Docx reader: Change behavior of Super/Subscript
In docx, super- and subscript are attributes of Vertalign. It makes more
sense to follow this, and have different possible values of Vertalign in
runStyle. This is mainly a preparatory step for real style parsing,
since it can distinguish between vertical align being explicitly turned
off and it not being set.

In addition, it makes parsing a bit clearer, and makes sure we don't do
docx-impossible things like being simultaneously super and sub.
2014-08-17 08:20:00 -04:00
John MacFarlane 9d52ecdd42 HTML reader: Parse appropriately styled span as SmallCaps. 2014-08-16 22:57:00 -07:00
Viktor Kronvall 753e47194c Simplify row width calculation. 2014-08-17 03:24:44 +02:00
Christoffer Ackelman 9f3c34841b Include row width in table rows.
Added a property to all table rows where the sum of column widths
is specified in pct (fraction of 5000).
2014-08-17 03:24:44 +02:00
John MacFarlane cb4ae6112e Markdown writer: don't escape $, ^, ~ when extensions are deactivated.
`tex_math_dollars`, `superscript`, and `subscript` extensions,
respectively.

Closes #1127.
2014-08-16 17:14:51 -07:00
John MacFarlane fd8ad0413b Makefile: Added 'quick' target. 2014-08-16 17:14:33 -07:00
John MacFarlane 118cdad8e8 Updated README in templates to indicate templates license.
The templates are duel licensed, BSD3 and GPL2+.
2014-08-16 16:48:46 -07:00
John MacFarlane 950b54c55c Indicate that the templates are duel licensed, GPLv2+ and BSD3.
Closes #13.
2014-08-16 16:47:16 -07:00
John MacFarlane acde31585b Release checklist: No longer need to compile pandoc-dingus.
trypandoc is used.
2014-08-16 16:03:52 -07:00
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. 1.13 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