Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
10709 commits 2 branches 0 tags 65 MiB
Commit graph

10709 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Krotov
c24c9efd98 Muse writer: enable --wrap=preserve for all tests by default 2018-03-25 18:31:28 +03:00
Alexander Krotov
c6232d0f7d Muse reader: require block <literal> tags to be on separate lines 2018-03-25 18:31:28 +03:00
Jesse Rosenthal
2582de5384 Powerpoint writer: code cleanup. 2018-03-25 10:22:37 -04:00
Alexander Krotov
4a8993f9b0 Muse writer: improve span writing 
Test more cases when span has or hasn't anchor, class and contents in different combinations.
 2018-03-25 01:18:33 +03:00
Alexander Krotov
d58b961a6d Muse writer: do not join Span's doing normalization 
Separate spans may have different semantics, for example if spans indicate syllables in a word.
 2018-03-25 00:30:05 +03:00
Jesse Rosenthal
8b533f9c38 Powerpoint writer: simplify code with ParseXml 
There were some artifact code blocks around from before
`reference-doc` functionality was implemented. This led to ignoring
the reference-doc in places. Though I fixed this, I kept the old
hacked-up functions instead of replacing them with
`parseXml` (imported from Writers.OOXML) which does this in a
consistent manner. This commit corrects that oversight.
 2018-03-24 16:07:14 -04:00
John MacFarlane
6285c047c4 Don't depend on latest haddock-library in stack.yaml. 
For now.  Because of a bug in the library, it must be
rebuilt every time we do 'stack install.

See #4482.
 2018-03-24 11:00:29 -07:00
Jesse Rosenthal
a295fed873 Update powerpoint golden tests: 
Some internal changes in templating produced slightly different
xml. All have been checked, are not corrupt, and have output as expected.
 2018-03-24 11:07:47 -04:00
Jesse Rosenthal
f7fb102aae Powerpoint writer: Allow fallback options when looking for placeholder type. 2018-03-24 11:02:45 -04:00
Jesse Rosenthal
8932604649 Revert "Powerpoint writer: Remove spPr tag from non-body layouts" 
This reverts commit 99fa850a37.
 2018-03-24 10:16:55 -04:00
Jesse Rosenthal
187fa4e444 Powerpoint reader: Check reference-doc for all layouts. 
There were a few layouts where we were still just checking the built
in pptx doc, instead of the supplied reference doc.
 2018-03-24 10:14:19 -04:00
Jesse Rosenthal
99fa850a37 Powerpoint writer: Remove spPr tag from non-body layouts 
This was causing headers to be misaligned when some templates were used.
 2018-03-23 16:29:29 -04:00
John MacFarlane
2ae0c0d433 PDF: with xelatex, don't compress images til the last run. 
This saves time for image-heavy documents.  Closes #4484.
 2018-03-23 12:58:05 -07:00
John MacFarlane
db596a5b12 EPUB writer: ensure that pagetitle is always set... 
even when structured titles are used.
This prevents spurious warnings about empty title elements.

Closes #4486.
 2018-03-23 12:09:53 -07:00
Jesse Rosenthal
435b1829b1 Powepoint writer: Simplify speaker notes 
We now pull the filtered blocks and speaker notes out at the top of
the `blocksToSlide` function, and then make SpeakerNotes into a
parameter of the `blocksToSlide'` subfunction. The output is the same,
but the logic should be easier to follow now.
 2018-03-23 14:22:35 -04:00
Jesse Rosenthal
3b7611a7c7 Powerpoint writer: change notes state to a simpler per-slide value 
We used to keep a map of the slideId-to-notes for each slide. Since we
now extract them at the slide level, this is overcomplicated, and we
can just extract them before converting a slide and then clear the
state after.
 2018-03-23 13:58:22 -04:00
Jesse Rosenthal
59f3997069 Powerpoint writer: Remove Maybe from SpeakerNotes in Slide. 
Previously, we had treated it as a `Maybe`. But there is no difference
between not having speaker notes and having empty speaker notes. So we
make the SpeakerNotes newtype into a monoid, and test for memptiness
instead of testing for Just/Nothing.
 2018-03-23 13:00:30 -04:00
Mauro Bieg
0987aa2a54 MANUAL.txt fix raw content example (#4479) 2018-03-21 17:08:39 -07:00
John MacFarlane
e190912302 Parsing: Fix romanNumeral parser. 
We previously accepted 'DDC' as 1100.  Closes #4480.
 2018-03-21 16:49:55 -07:00
Alexander Krotov
6f50733691 Muse writer: don't align ordered list items 
It leads to problems with round-trip test,
because aligned line blocks can't be read back.
 2018-03-21 17:33:27 +03:00
Jesse Rosenthal
f12348cab5 Powerpoint writer: add tests for improved speaker notes. 
Tests speaker notes appearing after (and inside of) separating blocks.

Output checked on Windows10 (archlinux virtualbox), PowerPoint
2013. Not corrupted, and output as expected.
 2018-03-21 10:07:07 -04:00
Jesse Rosenthal
ab184a519c Powerpoint writer: handle speaker notes earlier in the conversion process 
Internal change: We were getting bad results with the empty text box
created by the conversion of notes into an empty paragraph. So we now
convert the notes at the `blocksToSlide` stage, by `walkM`ing a
function over the blocks that returns `()`, and then filters the notes
out. This avoids the need to have a return value for speaker notes,
and thus avoids the empty TextBox.

Together with the previous commit (256f14c5a), closes #4477.
 2018-03-21 10:07:07 -04:00
Jesse Rosenthal
cb1ee07c98 Powerpoint writer: Keep notes with related blocks 
Some blocks automatically split slides (imgs, tables, `column`
divs). We assume that any speaker notes immediately following these
are connected to these elements, and keep them with the related
blocks, splitting after them.
 2018-03-21 10:07:07 -04:00
John MacFarlane
532cfcc59f Update stack.yaml to work with stackage nightly. 
We now compile on nightly.
 2018-03-20 08:53:47 -07:00
Alexander Krotov
81afcdfaf8 Muse writer: escape "]" in image title 2018-03-20 15:01:53 +03:00
Alexander Krotov
bc0025d944 Muse writer: remove key-value pairs from attributes before normalization 2018-03-20 14:51:39 +03:00
Alexander Krotov
268c73c873 Muse writer: escape ";" to avoid accidental comments 2018-03-20 12:16:34 +03:00
Alexander Krotov
d63bba3066 Muse writer: escape "]" brackets in URLs as "%5D" 2018-03-20 12:16:34 +03:00
John MacFarlane
43677682d8 Use pandoc-citeproc 0.14.3. 2018-03-19 23:45:55 -07:00
HeirOfNorton
f5b89b5adb Fix example in lua-filters docs. Fixes #4459 (#4476) 2018-03-19 21:43:43 -07:00
John MacFarlane
904f82176d MANUAL: specify that you use html for raw output in epub. 2018-03-19 16:00:49 -07:00
John MacFarlane
a8359c69de Removed old lib directory. 
This was used for something long ago, but plays no role now.
 2018-03-19 11:57:59 -07:00
John MacFarlane
2c2cd31806 Small improvement of doc change in #4472. 
Mention other formats as well where a different
name is needed.
 2018-03-19 09:22:41 -07:00
Tristan Stenner
24faccdf5d Add examples for raw docx blocks (#4472) 
The documentation states that the target format name should match the output format, which isn't the case for `docx`/`openxml`.

This PR adds a remark and a frequently requested example (inserting a pagebreak in docx output) to the documentation.
 2018-03-19 09:20:16 -07:00
John MacFarlane
d6f9715230 Bumped some versions in stack.yaml. 2018-03-18 15:25:55 -07:00
John MacFarlane
735a3ed096 Fixed duplicate entry in stack.lts9.yaml. 2018-03-18 15:19:01 -07:00
John MacFarlane
3d21c184d4 Ms writer: don't escape hyphens. 
Previously we escaped hyphens as `\-`, but that's a minus sign.
Closes #4467.

Updated changelog.
 2018-03-18 14:52:03 -07:00
John MacFarlane
0ef56657ed Comment out Muse reader round-trip test. 
It fails too often.  Perhaps a separate test program should
be used to hunt for round-trip bugs.
 2018-03-18 12:43:36 -07:00
John MacFarlane
6fdf0c4d9d Removed unnecessary import. 2018-03-18 12:40:05 -07:00
John MacFarlane
b9bb2be3be Update changelog. 2018-03-18 11:58:34 -07:00
John MacFarlane
9dac007228 Make 'weigh-pandoc' into a benchmark program. 
Remove 'weigh-pandoc' flag.  This is now built (and run)
automatically when you build (and run) benchmarks.
 2018-03-18 11:52:40 -07:00
John MacFarlane
48f0e73c55 Added Prelude imports to sources in benchmark and trypandoc. 2018-03-18 11:52:40 -07:00
Björn Buckwalter
daef5530b4 Missing backticks (#4462) 2018-03-18 11:35:32 -07:00
Mauro Bieg
ec47079d3e EPUB writer: remove notes from TOC in nav.xhtml (#4463) 
fixes #4453
 2018-03-18 11:34:34 -07:00
John MacFarlane
937bec95a9 Removed old-locale flag and Text.Pandoc.Compat.Time. 
This is no longer necessary since we no longer support ghc 7.8.
 2018-03-18 11:24:29 -07:00
John MacFarlane
7e389cb3db Use NoImplicitPrelude and explicitly import Prelude. 
This seems to be necessary if we are to use our custom Prelude
with ghci.

Closes #4464.
 2018-03-18 10:46:28 -07:00
John MacFarlane
daf731a001 pandoc.cabal: fix up other-extensions and language fields. 
language is now consistently Haskell2010, and other-extensions
is consistently NoImplicitPrelude. Everything else to be specified
in the module header as needed.
 2018-03-18 10:45:32 -07:00
John MacFarlane
82ff503210 Fix what was missing in last commit. 2018-03-18 09:47:38 -07:00
John MacFarlane
dd53545154 New approach to custom Prelude. 
We use no custom Prelude with the latest ghc version (8.4.1),
so we don't have problems with ghci.

See https://ghc.haskell.org/trac/ghc/ticket/10920
https://www.reddit.com/r/haskell/comments/3ryf2p/how_can_you_use_a_custom_prelude_with_ghci/

This may help with #4464.
 2018-03-18 09:20:21 -07:00
John MacFarlane
09a32de173 Man page update. 2018-03-18 09:20:14 -07:00