aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-24Merge pull request #1370 from jkr/fix-zero-indentJohn MacFarlane1-5/+8
Docx reader: Ignore zero (or negative) indent
2014-06-24Docx reader: Ignore zero (or negative) indentJesse Rosenthal1-5/+8
If a block has an indentation less than or equal to zero, it should not be treated as a block quote.
2014-06-24Merge pull request #1368 from jkr/docxCodeJohn MacFarlane8-39/+81
Docx verbatim code formatting
2014-06-24Docx reader: remove T.P.Generic import.Jesse Rosenthal1-1/+0
This marks the removal of the final tree-walk in the code. (Though there is still one in the Lists module.)
2014-06-24Docx reader: pass definition test.Jesse Rosenthal1-8/+13
This commit also fixes a problem with the previous code pushes, which wouldn't allow code blocks to share a div.
2014-06-24Docx Reader: add failing defintion list tests.Jesse Rosenthal3-0/+11
2014-06-24Docx reader: pass code tests.Jesse Rosenthal1-33/+47
2014-06-24Docx reader: add failing tests for inline code and code blocks.Jesse Rosenthal5-0/+13
2014-06-23Merge pull request #1367 from jkr/reducible-copyrightJohn MacFarlane1-0/+31
Add copyright block to T.P.R.Docx.Reducible.
2014-06-23Add copyright block to T.P.R.Docx.Reducible.Jesse Rosenthal1-0/+31
2014-06-23Merge pull request #1366 from jkr/reducible3John MacFarlane7-276/+289
Docx rewrite and cleanup (in terms of Reducible typeclass)
2014-06-23Add test for correctly trimming spaces in formatting.Jesse Rosenthal3-0/+5
This used to be fixed in the tree-walking. We need to make sure we're doing it right now.
2014-06-23Add Reducible to cabal file.Jesse Rosenthal1-0/+1
2014-06-23Use Reducible in docx reader.Jesse Rosenthal1-273/+111
This cleans up them implementation, and cuts down on tree-walking. Anecdotally, I've seen about a 3-fold speedup.
2014-06-23Move some of the clean-up logic into List module.Jesse Rosenthal1-3/+22
This will allow us to get rid of more general functions we no longer need in the main reader.
2014-06-23Add new typeclass, ReducibleJesse Rosenthal1-0/+150
This defines a typeclass `Reducible` which allows us to "reduce" pandoc Inlines and Blocks, like so Emph [Strong [Str "foo", Space]] <++> Strong [Emph [Str "bar"]], Str "baz"] = [Strong [Emph [Str "foo", Space, Str "bar"], Space, Str "baz"]] So adjacent formattings and strings are appropriately grouped. Another set of operators for `(Reducible a) => (Many a)` are also included.
2014-06-23LaTeX writer: Use `\textquotesingle` for `'` in inline code.John MacFarlane2-0/+3
Otherwise we get curly quotes in the PDF output. Closes #1364.
2014-06-23Markdown reader: Combine consecutive latex environments.John MacFarlane1-2/+4
This helps when you have two minipages which can't have blank lines between them. See #690, #1196.
2014-06-21Merge pull request #1363 from jkr/newNormalizeJohn MacFarlane6-12/+74
Improve normalization
2014-06-22Docx reader tests: add tests for normalization deep in blocks.Jesse Rosenthal3-0/+10
2014-06-22Docx reader tests: Correct normalize test.Jesse Rosenthal1-1/+1
2014-06-22Docx reader: Fix spacing in formatting.Jesse Rosenthal1-1/+1
The normalizing tests revealed a problem with unformatted spaces, brought about by `spanTrim`. This fixes by not trimming the spaces out of spans until they are in their final form.
2014-06-22Add normalization test.Jesse Rosenthal3-0/+6
Add torture-test for new normalization functions. One problem that this test demonstrates is that word has a tendency to turn off formatting at a space, and then turn it back on after. I'm not sure yet whether this is something we should fix.
2014-06-22Implement new normalization.Jesse Rosenthal1-11/+57
There were some problems with the old str normalization. This fixes those problems. Also, since it drills down on its own, it only needs to be mapped over the blocks, not walked over the tree.
2014-06-21Fixed compiler warnings.John MacFarlane1-2/+0
2014-06-20Filters: don't print misleading error message.John MacFarlane1-4/+1
Previously pandoc would say that a filter was not found, even in a case where the filter had a syntax error.
2014-06-20Merge pull request #1361 from jkr/testNormalizeJohn MacFarlane1-2/+27
Docx reader tests: Introduce NoNormPandoc type.
2014-06-20Docx reader tests: Introduce NoNormPandoc type.Jesse Rosenthal1-2/+27
This is just a wrapper around Pandoc that doesn't normalize with `toString`. We want to make sure that our own normalization process works. If, in the future, we are able to hook into the builder's normalization, this will be removed.
2014-06-20Markdown reader: Support smallcaps through span.John MacFarlane2-1/+14
`<span style="font-variant:small-caps;">foo</span>` will be parsed as a `SmallCaps` inline, and will work in all output formats that support small caps. Closes #1360.
2014-06-20MediaWiki reader: Tightened up template parsing.John MacFarlane1-0/+1
The opening "{{" must be followed by an alphanumeric or ':'. This prevents the exponential slowdown in #1033. Closes #1033.
2014-06-20MediaWiki reader: Support --trace.John MacFarlane1-1/+10
2014-06-20LaTeX writer: Correctly handle figures in notes.John MacFarlane1-5/+7
Notes can't contain figures in LaTeX, so we fake it to avoid an error. Closes #1053.
2014-06-20Markdown reader: Prevent spurious line breaks after list items.John MacFarlane1-1/+2
When the `hard_line_breaks` option was specified, pandoc would produce a spurious line break after a tight list item. This patch solves the problem. Closes #1137.
2014-06-20ImageSize: Use default instead of failing if image size not foundJohn MacFarlane1-1/+6
in exif header. Closes #1358.
2014-06-20HTML reader: Fix performance issue with malformed HTML tables.John MacFarlane1-0/+2
We let a `</table>` tag close an open `<tr>` or `<td>`. Closes #1167.
2014-06-20Support --trace in HTML reader.John MacFarlane1-1/+10
2014-06-20LaTeX writer: Fixed strikeout + highlighted code. Closes #1294.John MacFarlane2-2/+21
Previously strikeout highlighted code caused an error.
2014-06-20Merge pull request #1357 from jkr/bottomUpStrNormalizeJohn MacFarlane1-5/+5
Make strNormalize go bottomUp.
2014-06-20Make strNormalize go bottomUp.Jesse Rosenthal1-5/+5
This was how it used to be before it was folded into blockNormalize.
2014-06-20Merge pull request #1355 from jkr/normalizeFixesJohn MacFarlane1-9/+15
Docx reader: Fixes to block Normalization
2014-06-20Docx reader: Add a comment explaining strNormalizeJesse Rosenthal1-0/+4
`normalize` from Text.Pandoc.Shared is more general. In tests, though, it more than doubles the run time. `strNormalize` does less, but it does what we need. This comment is added for future maintainability.
2014-06-20Docx Reader: Normalize DefinitionListsJesse Rosenthal1-0/+2
Previously DefinitionList had been left out of `blockNormalize`. Now it is included.
2014-06-20Docx reader: simplify blockNormalizeJesse Rosenthal1-10/+8
Use a function `stripSpaces`, instead of recursion. Makes it a bit easier to read and mantain, and simplify normalizing DefinitionList, which was left out the first time.
2014-06-20Docx reader: Fix hdr handling in block normJesse Rosenthal1-0/+2
`blockNormalize` previously forgot to account for the case in which a Header's inlines did not start with a space.
2014-06-19Docx writer: Use Compact style for empty table cells.John MacFarlane1-1/+3
Otherwise we get overly tall lines when there are empty table cells and the other cells are compact. Closes #1353.
2014-06-19HTML reader: Allow space between `<col>` and `</col>`.John MacFarlane1-0/+1
Test case: ``` <table border="1"> <colgroup> <col> </col> <col></col> </colgroup> <tbody> <tr> <td>X</td> <td>Y</td> </tr> <tr> <td>1</td> <td>2</td> </tr> </tbody> </table> ```
2014-06-19Merge pull request #1354 from jkr/literalTabJohn MacFarlane6-4/+29
Parse literal tabs in docx
2014-06-19Add tabs tests.Jesse Rosenthal3-1/+8
2014-06-19Fix notes test.Jesse Rosenthal1-1/+1
This previously allowed spaces at the beginning of a paragraph.
2014-06-19Introduce blockNormalizeJesse Rosenthal1-1/+14
This will help take care of spaces introduced at the beginning of strings.