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

5469 commits

Author SHA1 Message Date
Alexander Krotov
79592db66c Muse reader: allow links to have empty descriptions 2018-03-25 22:16:45 +03:00
Alexander Krotov
a3f659d2c0 Muse writer: escape ordered list markers 
Also reduced amount of <verbatim> tags in output to avoid escaping every "-" and word that ends in a full stop.
 2018-03-25 19:28:23 +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
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
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
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
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
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
6fdf0c4d9d Removed unnecessary import. 2018-03-18 12:40:05 -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
dfa1dc164a hlint fixes. 2018-03-17 22:00:55 -07:00
Marc Schreiber
155a2ac039 Add support to parse unit string of \SI command (closes #4296). 2018-03-17 20:59:20 -07:00
John MacFarlane
fef484c4d0 Fixed typo introduced in merge. 2018-03-17 20:41:11 -07:00
Francesco Occhipinti
ba965d1736 RST writer: filter out empty inline containers (#4434). 
There is nothing in RST that corresponds to e.g. `Emph []`, so we just filter out elements like this.
 2018-03-17 20:39:26 -07:00
Francesco Occhipinti
e5845f33ad Don't wrap lines in grid tables when --wrap=none (#4320) 
* Annotate gridTable code with comments and abstract small functions
* Don't wrap lines in tables when `--wrap=none`.  Instead, expand cells, even if
   it results in cells that don't respect relative widths or surpass page column width.
* This change affects RST, Markdown, and Haddock writers.
 2018-03-17 20:31:43 -07:00
Francesco Occhipinti
90a705c8af RST writer: separate inline transformation logic from writing logic (#4438) 
This is to help enable solutions  solutions to #4434 and #4368.
 2018-03-17 20:17:55 -07:00
Francesco Occhipinti
65cc909fde RST writer: strip whitespace within inlines, closes #4327 (#4329) 
+ Whitespace is ignored at the beginning and end of emphasis, as per
  <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#inline-markup>.
+ Export `stripLeadingTrailingSpace` from `Text.Pandoc.Writers.Shared`.
 2018-03-17 19:21:27 -07:00
John MacFarlane
605545e024 Work around Monoid/Semigroup-related compiler errors GHC 7.10. 2018-03-17 14:25:05 -07:00
John MacFarlane
2eba15c181 More CSS around DocTable in Haddock reader. 2018-03-17 08:18:15 -07:00
John MacFarlane
fad8d0d67f Allow earlier versions of haddock-library, use CPP. 2018-03-16 23:18:42 -07:00
John MacFarlane
be12ae3bca Better table handling for Haddock. 
In the reader, we use the new Table type in Haddock.
Note that tables with col/rowspans will not translate
well into Pandoc.

In the writer, we now render tables always as grid tables,
since Haddock supports these.
 2018-03-16 22:38:34 -07:00
John MacFarlane
f0b6e0ee49 Monoid/Semiground cleanup relying on custom Prelude. 2018-03-16 12:17:58 -07:00
John MacFarlane
0b5712e69b Class: Semigroup instance for FileTree with base >= 4.9. 2018-03-16 08:23:34 -07:00
John MacFarlane
8360f9dedf Translations: Semigroup instance for Translations with base >= 4.9. 2018-03-16 08:21:52 -07:00
John MacFarlane
0cbb811f3d Extensions: Semigroup instance for Extensions with base >= 4.9. 2018-03-16 08:20:12 -07:00
John MacFarlane
2240c4d80b Semigroup instance for Styles in T.P.Readers.Odt.StyleReader. 2018-03-16 08:17:59 -07:00
John MacFarlane
94d64a63f2 Removed redundant import. 2018-03-16 08:15:09 -07:00
John MacFarlane
07e0981316 Pretty: Semigroup instance for Doc with base >= 4.9. 2018-03-16 08:12:33 -07:00
John MacFarlane
ec1e2c87b7 Semigroup instance for MediaBag with base >= 4.9. 2018-03-16 08:11:10 -07:00
John MacFarlane
df71628d26 Remove redundant import. 2018-03-15 12:23:33 -07:00
John MacFarlane
4eb71693e5 Remove redundant import. 2018-03-15 09:54:02 -07:00