aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-10-18Merge pull request #3165 from hubertp-lshift/feature/odt-imageJohn MacFarlane8-40/+158
[odt] images parser
2016-10-18Better fix for the problem with ghc 7.8.John MacFarlane1-1/+3
2016-10-18Try to fix build error on ghc 7.8.John MacFarlane1-1/+1
@tarleb this is an interesting one, see the build log in https://travis-ci.org/jgm/pandoc/jobs/168612017 It only failed on ghc 7.8; I think this must have to do with the change making Monad a superclass of Applicative, hence this change.
2016-10-18Setup.hs - removed some unneeded imports.John MacFarlane1-5/+1
2016-10-18Added pandoc-citeproc back to extra-deps in stack.yaml.John MacFarlane3-0/+3
Otherwise we can't set flags.
2016-10-18Use lts-7.4 resolver.John MacFarlane5-12/+5
2016-10-18stack.yaml - use latest pandoc-types.John MacFarlane4-4/+4
2016-10-18Issue 3143: Don't duplicate text for anchorsHubert Plociniczak3-4/+3
When creating an anchor element we were adding its representation as well as the original content, leading to text duplication.
2016-10-18Allow latest HUnit.John MacFarlane1-1/+1
2016-10-18Travis tweaks.John MacFarlane1-3/+3
Disable optimizations. Make sure we don't change flag on aeson.
2016-10-17Org writer: drop space before footnote markersAlbert Krewinkel2-5/+5
The writer no longer adds an extra space before footnote markers. Fixes: #3162
2016-10-17Use bind function instead of pattern matchingHubert Plociniczak1-4/+1
2016-10-17Minor refactoringHubert Plociniczak1-10/+6
2016-10-17Infer caption from the text following the imgHubert Plociniczak5-22/+54
Frame can contain other frames with the text boxes. This is something that has not been considered before and meant that the whole construction of images was broken in those cases. Also the captions were fixed/ignored.
2016-10-17RST reader: Add test for space-before-note.Jesse Rosenthal1-0/+9
2016-10-17RST reader: skip whitespace before note.Jesse Rosenthal1-2/+3
RST requires a space before a footnote marker. We discard those spaces so that footnotes will be adjacent to the text that comes before it. This is in line with what rst2latex does. rst2html does not discard the space, but its html output is different than pandoc's, so this seems the most semantically correct approach. Closes #3163
2016-10-17Bump pandoc-types versions to 1.17.0.3 in stack.yaml.John MacFarlane4-4/+4
2016-10-17Use pandoc-types 1.17.0.2 in stack.yaml.John MacFarlane4-7/+4
2016-10-17Try travis build with latest dev pandoc-types.John MacFarlane1-1/+4
2016-10-17BUmp pandoc-types version in stack.yamls.John MacFarlane4-4/+4
2016-10-16Update stack.yamls to use pandoc-types 1.17 release.John MacFarlane4-6/+4
2016-10-16Travis: fixed --flag argument in stack.John MacFarlane1-2/+2
2016-10-15Travis: Use fast flag for aeson.John MacFarlane1-3/+3
This dramatically speeds up the build, according to the aeson changelog.
2016-10-14Org reader: allow figure with empty captionAlbert Krewinkel2-3/+7
A `#+CAPTION` attribute before an image is enough to turn an image into a figure. This wasn't the case because the `parseFromString` function, which processes the caption value, would fail on empty values. Adding a newline character to the caption value fixes this. Fixes: #3161
2016-10-14Remove Tests.ArbitraryJesse Rosenthal19-212/+17
Use exported Arbitrary instances from pandoc-types instead.
2016-10-14Merge pull request #3146 from hubertp-lshift/feature/odt-list-start-valueJohn MacFarlane8-16/+24
[ODT Parser] Include list's starting value
2016-10-14Added tests and a corner case for starting numberHubert Plociniczak7-3/+4
Review revealed that we didn't handle the case when the starting point is an empty string. While this is not a valid .odt file, we simply added a special case to deal with it. Also added tests for the new feature.
2016-10-14Travis: test with lts-7 not lts-6.John MacFarlane2-21/+5
2016-10-13Use latest pandoc-types in windows/stack.yaml.John MacFarlane1-1/+1
2016-10-13Use newest pandoc-types from repo.John MacFarlane1-1/+1
2016-10-13Markdown writer: Abstract out note/ref function.Jesse Rosenthal1-28/+22
We do basically the same thing every time we insert notes, so let's cut down on code duplication.
2016-10-13Use latest pandoc-citeproc in stack.yamls.John MacFarlane3-3/+3
2016-10-13Update stack.yaml files.John MacFarlane5-12/+4
2016-10-13Allow http-client 0.4.30, which is the version in stackage lts.John MacFarlane2-18/+2
Previously we required 0.5. Remove CPP conditionals for earlier versions.
2016-10-13Revert "Remove http-client CPP conditionals."John MacFarlane1-1/+10
This reverts commit 3f82471355286d33f2d73329c29a51c47bf76ad7. We might want to revert the requirement of http-client 0.5, as this is not yet in Stackage and that is starting to cause problems. I can't recall why it is there.
2016-10-13Document `biblio-title` variable in MANUAL.txt.John MacFarlane1-2/+4
Cloess #258.
2016-10-13Updated stack.yaml and windows/stack.yaml to use latest pandoc-types.John MacFarlane2-2/+10
2016-10-13Merge pull request #3072 from tarleb/lineblockJohn MacFarlane35-61/+157
Read and write LineBlock elements
2016-10-13Bump required pandoc-types version to 1.17Albert Krewinkel1-5/+5
2016-10-13Allow empty lines when parsing line blocksAlbert Krewinkel1-2/+5
Line blocks are allowed to contain empty lines and should be parsed as a single block in that case. Previously an empty (line block) line would have terminated parsing of the line block element.
2016-10-13Parse line-oriented markup as LineBlockAlbert Krewinkel8-26/+34
Markup-features focusing on lines as distinctive part of the markup are read into `LineBlock` elements. This currently means line blocks in reStructuredText and Markdown (the latter only if the `line_block` extension is enabled), the `linegroup`/`line` combination from the Docbook 5.1 working draft, and Org-mode `VERSE` blocks.
2016-10-13Add support for the LineBlock element to writersAlbert Krewinkel24-28/+102
The following markup features are used to output the lines of the `LineBlock` element: - AsciiDoc: a `[verse]` block, - ConTeXt: text surrounded by `\startlines` and `\endlines`, - HTML: `div` with an per-element style setting to interpret the content as pre-wrapped, - Markdown: line blocks if the `line_blocks` extension is enabled, a simple paragraph with hard linebreaks otherwise, - Org: VERSE block, - RST: a line block, and - all other formats: a paragraph, containing hard linebreaks between lines. Custom lua writers should be updated to use the `LineBlock` element.
2016-10-13Shared: add function combining lines using LineBreakAlbert Krewinkel1-0/+11
The `linesToBlock` function takes a list of lines and combines them by appending a hard `LineBreak` to each line and concatenating the result, putting the result it into a `Para`. This is most useful when dealing when converting `LineBlock` elements.
2016-10-12[ODT Parser] Include list's starting valueHubert Plociniczak2-13/+20
Previously the starting value of the lists' items has been hardcoded to 1. In reality ODT's list style definition can provide a new starting value in one of its attributes. Writers already handle the modified start value so no need to change anything in that area.
2016-10-12Basic support for images in ODT documentsHubert Plociniczak4-38/+131
Highly influenced by the docx support, refactored some code to avoid DRY.
2016-10-12MANUAL: Made formatting of arguments with several options consistent.John MacFarlane1-2/+2
2016-10-12Note on --reference-links about --reference-location.John MacFarlane1-1/+3
2016-10-12Merge pull request #3159 from jkr/refsJohn MacFarlane5-87/+313
Specify location for footnotes (and reference links) in MD output
2016-10-11MANUAL.txt: document --reference-location.Jesse Rosenthal1-0/+7
2016-10-11Markdown writer: add test for note placement.Jesse Rosenthal1-2/+138