summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* LaTeX writer: Fixed strikeout + highlighted code. Closes #1294.John MacFarlane2014-06-20
| | | | Previously strikeout highlighted code caused an error.
* Merge pull request #1357 from jkr/bottomUpStrNormalizeJohn MacFarlane2014-06-20
|\ | | | | Make strNormalize go bottomUp.
| * Make strNormalize go bottomUp.Jesse Rosenthal2014-06-20
|/ | | | This was how it used to be before it was folded into blockNormalize.
* Merge pull request #1355 from jkr/normalizeFixesJohn MacFarlane2014-06-20
|\ | | | | Docx reader: Fixes to block Normalization
| * Docx reader: Add a comment explaining strNormalizeJesse Rosenthal2014-06-20
| | | | | | | | | | | | `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.
| * Docx Reader: Normalize DefinitionListsJesse Rosenthal2014-06-20
| | | | | | | | | | Previously DefinitionList had been left out of `blockNormalize`. Now it is included.
| * Docx reader: simplify blockNormalizeJesse Rosenthal2014-06-20
| | | | | | | | | | | | 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.
| * Docx reader: Fix hdr handling in block normJesse Rosenthal2014-06-20
|/ | | | | `blockNormalize` previously forgot to account for the case in which a Header's inlines did not start with a space.
* Docx writer: Use Compact style for empty table cells.John MacFarlane2014-06-19
| | | | | | | Otherwise we get overly tall lines when there are empty table cells and the other cells are compact. Closes #1353.
* HTML reader: Allow space between `<col>` and `</col>`.John MacFarlane2014-06-19
| | | | | | | | | | | | | | | | | | | | | | | | 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> ```
* Merge pull request #1354 from jkr/literalTabJohn MacFarlane2014-06-19
|\ | | | | Parse literal tabs in docx
| * Add tabs tests.Jesse Rosenthal2014-06-19
| |
| * Fix notes test.Jesse Rosenthal2014-06-19
| | | | | | | | This previously allowed spaces at the beginning of a paragraph.
| * Introduce blockNormalizeJesse Rosenthal2014-06-19
| | | | | | | | This will help take care of spaces introduced at the beginning of strings.
| * Have Docx reader properly interpret tabs.Jesse Rosenthal2014-06-19
| |
| * Add literal tabs to parser.Jesse Rosenthal2014-06-19
| |
* | ImageSize: ignore unknown exif header tag rather than crashing.John MacFarlane2014-06-19
| | | | | | | | | | Some images seem to have tag type of 256, which was causing a runtime error.
* | Require highlighting-kate >= 0.5.8.3.John MacFarlane2014-06-19
|/ | | | | This change to highlighting-kate means that PHP fragments no longer need to start with `<?php`. Closes #1271.
* Merge pull request #1351 from jkr/testWithOptionsJohn MacFarlane2014-06-19
|\ | | | | Add ReaderOptions to the docx tests
| * Add ReaderOptions to the docx testsJesse Rosenthal2014-06-19
|/ | | | | This will allow for testing different media embedding (in addition to any other applicable options.)
* Haddock writer: Use _____ for hrule.John MacFarlane2014-06-19
| | | | Avoids interpretation as list.
* Updated haddock writer tests.John MacFarlane2014-06-18
|
* Haddock writer: Only use Decimal list style.John MacFarlane2014-06-18
|
* Small fix to haddock "tables".John MacFarlane2014-06-18
|
* Revised haddock reader tests for changes in reader.John MacFarlane2014-06-18
|
* Added haddock writer tests.John MacFarlane2014-06-18
|
* More polish on Haddock reader/writer.John MacFarlane2014-06-18
|
* Added haddock template.John MacFarlane2014-06-18
|
* Finished first draft of Haddock writer.John MacFarlane2014-06-18
|
* Rewrote haddock reader to use haddock-library.John MacFarlane2014-06-18
| | | | | | | | | | This brings pandoc's rendering of haddock markup in line with the new haddock. Note that we preserve line breaks in `@` code blocks, unlike the earlier version. Modified tests pass. More tests would be good.
* Travis: don't need alex, happy.John MacFarlane2014-06-18
|
* Removed old haddock reader code. Add dependency on haddock-library.John MacFarlane2014-06-18
| | | | This also removes the dependency on alex and happy.
* Highlighting: Let .numberLines work even if no language given.John MacFarlane2014-06-17
| | | | Closes #1287, jgm/highlighting-kate#40.
* DocBook reader: Support <?asciidoc-br?>.John MacFarlane2014-06-17
| | | | | | | | | Closes #1236. Note, this is a bit of a kludge, to work around the fact that xml-light doesn't parse `<?asciidoc-br?>` correctly. We preprocess the input, replacing that instruction with `<br/>`, and then parse that as a line break. Other XML instructions are simply removed from the input stream.
* LaTeX reader: Correctly handle table rows with too few cells.John MacFarlane2014-06-17
| | | | | LaTeX seems to treat them as if they have empty cells at the end. Closes #241.
* Fixed compiler warning.John MacFarlane2014-06-16
|
* Naming: Use Docx instead of DocX.John MacFarlane2014-06-16
| | | | For consistency with the existing writer.
* Bump version to 1.13John MacFarlane2014-06-16
|
* Merge branch 'docx' of https://github.com/jkr/pandoc into jkr-docxJohn MacFarlane2014-06-16
|\
| * Updated README to reflect docx reader.Jesse Rosenthal2014-06-16
| |
| * Add DocX tests to test-pandoc.hsJesse Rosenthal2014-06-16
| |
| * Reference new DocX tests in cabal file.Jesse Rosenthal2014-06-16
| |
| * Add DocX automated tests.Jesse Rosenthal2014-06-16
| | | | | | | | Note this makes use of input and output files in the tests/ dir.
| * Integrated the docx reader into the main pandoc program.mpickering2014-06-16
| | | | | | | | | | Changes also include generalising the types of reader allowed. The mechanism now mimics the more general output mechanism.
| * Add files to cabal.Jesse Rosenthal2014-06-16
| | | | | | | | | | Note there is a build warning for unused `makeImagesSelfContained` function, since there isn't yet a command-line-option to make use of it.
| * Add DocX files to tree.Jesse Rosenthal2014-06-16
| | | | | | | | This introduces Text.Pandoc.DocX, and its exported `readDocX` function.
* | Org reader: make tildes create inline code.John MacFarlane2014-06-16
| | | | | | | | | | | | | | | | | | | | Closes #1345. Also relabeled 'code' and 'verbatim' parsers to accord with the org-mode manual. I'm not sure what the distinction between code and verbatim is supposed to be, but I'm pretty sure both should be represented as Code inlines in pandoc. The previous behavior resulted in the text not appearing in any output format.
* | Small improvement to fix to #1333.John MacFarlane2014-06-16
| | | | | | | | This allows blank lines at end of multiline headers.
* | Markdown reader: fixed #1333 (table parsing bug).John MacFarlane2014-06-16
| |
* | LaTeX reader: handle leading/trailing spaces in emph better.John MacFarlane2014-06-16
| | | | | | | | | | | | | | | | | | | | | | `\emph{ hi }` gets parsed as `[Space, Emph [Str "hi"], Space]` so that we don't get things like `* hi *` in markdown output. Also applies to textbf and some other constructions. Closes #1146. (`--normalize` isn't touched by this, but normalization should not generally be necessary with the changes to the readers.)