aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-08-18Merge pull request #1547 from jkr/styleparseJohn MacFarlane2-36/+110
Docx reader: parsing styles
2014-08-18HTML reader: improved handling of tags that can be block or inline.John MacFarlane1-5/+13
Previously a section like this would be enclosed in a paragraph, with RawInline for the video tags (since video is a tag that can be either block or inline): <video controls="controls"> <source src="../videos/test.mp4" type="video/mp4" /> <source src="../videos/test.webm" type="video/webm" /> <p> The videos can not be played back on your system.<br/> Try viewing on Youtube (requires Internet connection): <a href="http://youtu.be/etE5urBps_w">Relative Velocity on Youtube</a>. </p> </video> This change will cause the video and source tags to be parsed as RawBlock instead, giving better output. The general change is this: when we're parsing a "plain" sequence of inlines, we don't parse anything that COULD be a block-level tag.
2014-08-17Improved osx build procedure.John MacFarlane1-4/+2
2014-08-17Docx reader: whitespace fix.Jesse Rosenthal1-6/+6
2014-08-17Updated release checklist.John MacFarlane1-1/+2
2014-08-17Added tables.dokuwiki and tables.icml to extra-source-files.John MacFarlane1-0/+2
2014-08-17Updated changelogJohn MacFarlane1-1/+4
2014-08-17Makefile: include trypandoc flag in main build target.John MacFarlane1-1/+1
2014-08-17Added trypandoc flag to build trypandoc cgi executable.John MacFarlane4-0/+269
Supporting files are in trypandoc/.
2014-08-17Docx reader: remove emph styles and strong styles list.Jesse Rosenthal1-6/+0
We no longer need the explicit lists since we're deriving them from the ground up.
2014-08-17Docx reader: Add "Hyperlink" to blacklisted styles.Jesse Rosenthal1-2/+2
This is the only one so far. We'll add others as they show up.
2014-08-17Docx reader: Use style resolver.Jesse Rosenthal1-23/+9
We now no longer check against explicit styles.
2014-08-17Docx Reader: Introduce function for resolving dependent run styles.Jesse Rosenthal1-0/+31
We always favor an explicit positive or negative in a style in a descendent, and only turn to the ancestor if nothing is set. We also introduce an (empty) list of styles that are black-listed. We won't check them. (Think underlines in hyperlinks).
2014-08-17Makefile: added osxpkg target.John MacFarlane1-1/+4
2014-08-17Bump version to 1.13.0.1.John MacFarlane1-1/+1
2014-08-17Updated changelog.John MacFarlane1-0/+29
2014-08-17Merge pull request #1536 from considerate/masterJohn MacFarlane1-0/+3
Add row width to tables in Docx XML
2014-08-17Merge pull request #1543 from jkr/superSubVertJohn MacFarlane2-16/+17
Docx reader: Change behavior of Super/Subscript
2014-08-17Docx writer: Fixed regression, bungled list numbering.John MacFarlane1-3/+10
In pandoc 1.13, all lists come out as basic ordered lists. This fixes that bad regression. Closes #1544.
2014-08-17Docx Parse: build a bottom-up style tree.Jesse Rosenthal1-6/+31
Two points here: (1) We're going bottom-up, from styles not based on anything, to avoid circular dependencies or any other sort of maliciousness/incompetence. And (2) each style points to its parent. That way, we don't need the whole tree to pass a style over to Docx.hs
2014-08-17Remove an unnecessary import.Artyom Kazak1-1/+1
2014-08-17Removed check for PATH variable in running filters.John MacFarlane1-6/+9
This cause problems on Windows 8, where the variable is called `Path`. Instead, simply trap the exception that will be raised by `findExecutable` if path is not set. This should fix #1542.
2014-08-17Update Reader.EPUB to use `MimeType`.Artyom Kazak1-8/+7
2014-08-17MIME cleanup.Artyom Kazak7-42/+59
* 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-17Fixed typo in templates README.John MacFarlane1-7/+5
2014-08-17Alias string and runStyle to CharStyle type.Jesse Rosenthal1-7/+10
2014-08-17Docx Style parser: Basic one now just takes a parent style.Jesse Rosenthal1-13/+15
This will make it easier to build the style map from the bottom up (to avoid any infinite references).
2014-08-17Docx reader: work with new rStyle.Jesse Rosenthal1-4/+4
Just discards info at the moment, so at least it works the same.
2014-08-17Parser: Framework for parsing styles.Jesse Rosenthal1-11/+44
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-17Docx reader: Change behavior of Super/SubscriptJesse Rosenthal2-16/+17
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-16HTML reader: Parse appropriately styled span as SmallCaps.John MacFarlane3-1/+8
2014-08-17Simplify row width calculation.Viktor Kronvall1-2/+2
2014-08-17Include row width in table rows.Christoffer Ackelman1-0/+3
Added a property to all table rows where the sum of column widths is specified in pct (fraction of 5000).
2014-08-16Markdown writer: don't escape $, ^, ~ when extensions are deactivated.John MacFarlane1-5/+16
`tex_math_dollars`, `superscript`, and `subscript` extensions, respectively. Closes #1127.
2014-08-16Makefile: Added 'quick' target.John MacFarlane1-0/+4
2014-08-16Updated README in templates to indicate templates license.John MacFarlane1-5/+7
The templates are duel licensed, BSD3 and GPL2+.
2014-08-16Release checklist: No longer need to compile pandoc-dingus.John MacFarlane1-2/+0
trypandoc is used.
2014-08-16Merge pull request #1540 from jkr/charStylesJohn MacFarlane4-13/+15
Char styles
2014-08-16Docx reader: Remove unnecessary plural functionsJesse Rosenthal1-11/+5
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-16Docx reader: Test for character styles.Jesse Rosenthal3-0/+8
2014-08-16Docx reader: Fix bug in character styles.Jesse Rosenthal1-2/+2
Style handling has been cleaned up, but introduced a bug here. There wasn't previously a test to catch it.
2014-08-16Merge pull request #1539 from jkr/builderRewriteJohn MacFarlane2-415/+368
Rewrite Docx.hs and Reducible to use Builder.
2014-08-16Rewrite Docx.hs and Reducible to use Builder.Jesse Rosenthal2-415/+368
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-15Minor Makefile tweaks.John MacFarlane1-3/+2
2014-08-15make_osx_package: add -osx suffix to package.John MacFarlane1-2/+2
2014-08-15OSX installer improvements.John MacFarlane4-51/+44
* Use new pkgbuild, productbuild instead of deprecated PackageMaker. * Removed scripts, which are no longer needed. * Added distribution.xml.
2014-08-14Fixed typo in changelog.John MacFarlane1-1/+1
2014-08-14make_osx_package: Build man pages.John MacFarlane1-1/+3
2014-08-14make_osx_package: Fix man page installation.John MacFarlane1-5/+3
2014-08-14make_osx_package: look in right place for cpphs.John MacFarlane1-2/+3