aboutsummaryrefslogtreecommitdiff
path: root/pandoc.cabal
AgeCommit message (Collapse)AuthorFilesLines
2021-09-16pptx: Support specifying slide background imagesEmily Bourke1-0/+2
In the reveal-js output, it’s possible to use reveal’s `data-background-image` class on a slide’s title to specify a background image for the slide. With this commit, it’s possible to use `background-image` in the same way for pptx output. Only the “stretch” mode is supported, and the background image is centred around the slide in the image’s larger axis, matching the observed default behaviour of PowerPoint. - Support `background-image` per slide. - Add tests. - Update manual.
2021-09-15pptx: Add support for incremental listsEmily Bourke1-0/+4
- Support -i option - Support incremental/noincremental divs - Support older block quote syntax - Add tests One thing not clear from the manual is what should happen when the input uses a combination of these things. For example, what should the following produce? ```md ::: {.incremental .nonincremental} - are - these - incremental? ::: ::: incremental ::::: nonincremental - or - these? ::::: ::: ::: nonincremental > - how > - about > - these? ::: ``` In this commit I’ve taken the following approach, matching the observed behaviour for beamer and reveal.js output: - if a div with both classes, incremental wins - the innermost incremental/nonincremental div is the one which takes effect - a block quote containing a list as its first element inverts whether the list is incremental, whether or not the quote is inside an incremental/non-incremental div I’ve added some tests to verify this behaviour. This commit closes issue #5689 (https://github.com/jgm/pandoc/issues/5689).
2021-09-13pptx: Fix logic for choosing Comparison layoutEmily Bourke1-2/+4
There was a mistake in the logic used to choose between the Comparison and Two Content layouts: if one column contained only non-text (an image or a table) and the other contained only text, the Comparison layout was chosen instead of the desired Two Content layout. This commit fixes that logic: > If either column contains text followed by non-text, use Comparison. Otherwise, use Two Content. It also adds a test asserting this behaviour.
2021-09-01pptx: Add support for more layoutsEmily Bourke1-8/+22
Until now, the pptx writer only supported four slide layouts: “Title Slide” (used for the automatically generated metadata slide), “Section Header” (used for headings above the slide level), “Two Column” (used when there’s a columns div containing at least two column divs), and “Title and Content” (used for all other slides). This commit adds support for three more layouts: Comparison, Content with Caption, and Blank. - Support “Comparison” slide layout This layout is used when a slide contains at least two columns, at least one of which contains some text followed by some non-text (e.g. an image or table). The text in each column is inserted into the “body” placeholder for that column, and the non-text is inserted into the ObjType placeholder. Any extra content after the non-text is overlaid on top of the preceding content, rather than dropping it completely (as currently happens for the two-column layout). + Accept straightforward test changes Adding the new layout means the “-deleted-layouts” tests have an additional layout added to the master and master rels. + Add new tests for the comparison layout + Add new tests to pandoc.cabal - Support “Content with Caption” slide layout This layout is used when a slide’s body contains some text, followed by non-text (e.g. and image or a table). Before now, in this case the image or table would break onto a new slide: to get that output again, users can add a horizontal rule before the image or table. + Accept straightforward tests The “-deleted-layouts” tests all have an extra layout and relationship in the master for the Content with Caption layout. + Accept remove-empty-slides test Empty slides are still removed, but the Content with Caption layout is now used. + Change slide-level-0/h1-h2-with-text description This test now triggers the content with caption layout, giving a different (but still correct) result. + Add new tests for the new layout + Add new tests to the cabal file - Support “Blank” slide layout This layout is used when a slide contains only blank content (e.g. non-breaking spaces). No content is inserted into any placeholders in the layout. Fixes #5097. + Accept straightforward test changes Blank layout now copied over from reference doc as well, when layouts have been deleted. + Add some new tests A slide should use the blank layout if: - It contains only speaker notes - It contains only an empty heading with a body of nbsps - It contains only a heading containing only nbsps - Change ContentType -> Placeholder This type was starting to have a constructor for each placeholder on each slide (e.g. `ComparisonUpperLeftContent`). I’ve changed it instead to identify a placeholder by type and index, as I think that’s clearer and less redundant. - Describe layout-choosing logic in manual
2021-09-01pptx: Restructure testsEmily Bourke1-1/+54
- Use dashes consistently rather than underscores - Make a folder for each set of tests - List test files explicitly (Cabal doesn’t support ** until version 2.4)
2021-08-28Add `--sandbox` option.John MacFarlane1-0/+1
+ Add sandbox feature for readers. When this option is used, readers and writers only have access to input files (and other files specified directly on command line). This restriction is enforced in the type system. + Filters, PDF production, custom writers are unaffected. This feature only insulates the actual readers and writers, not the pipeline around them in Text.Pandoc.App. + Note that when `--sandboxed` is specified, readers won't have access to the resource path, nor will anything have access to the user data directory. + Add module Text.Pandoc.Class.Sandbox, defining `sandbox`. Exported via Text.Pandoc.Class. [API change] Closes #5045.
2021-08-21LaTeX-parser: restrict \endinput to current fileSimon Schuster1-0/+1
2021-08-20Bump to 2.14.2, update changelog.John MacFarlane1-1/+1
2021-08-17Use released citeproc 0.5.John MacFarlane1-1/+1
2021-08-13Convert Quoted in bib entries to special Spans...John MacFarlane1-1/+1
before passing them off to citeproc. This ensures that we get proper localization and flipflopping if, e.g., quotes are used in titles. Closes jgm/citeproc#87.
2021-08-12Bump base-compat version so we get compatibility with base 4.12.John MacFarlane1-1/+1
2021-08-12Use Prelude from base-compat for ghc 8.4 too.John MacFarlane1-1/+1
We were having trouble building on ghc 8.4 because of the lack of a Foldable instance for (Alt Maybe) in base < 4.12. Mystery: for some reason our builds were failing for gitit but not in the pandoc CI.
2021-08-10Add RTF reader.John MacFarlane1-0/+4
- `rtf` is now supported as an input format as well as output. - New module Text.Pandoc.Readers.RTF (exporting `readRTF`). [API change] Closes #3982.
2021-08-03Stop using the HTTP package. (#7456)mt_caret1-1/+1
We only depend on the urlEncode function in the package, which is also provided by http-types. The HTTP package also depends on the network package, which has difficulty building on ghcjs. Add internal module Text.Pandoc.Network.HTTP, exporting `urlEncode`.
2021-07-18Bump to 2.14.1, update changelog and man page.John MacFarlane1-2/+2
2021-07-18Use doctemplates 0.4.1 and citeproc 0.10.John MacFarlane1-2/+2
2021-07-17Use skylighting 0.11.John MacFarlane1-2/+2
2021-07-09RST reader: fix regression with code includes.John MacFarlane1-0/+1
With the recent changes to include infrastructure, included code blocks were getting an extra newline. Closes #7436. Added regression test.
2021-06-28Require commonmark-pandoc >= 0.2.2.1.John MacFarlane1-1/+1
This fixes task lists with multiple paragraphs.
2021-06-20Bump to 2.14.0.3, update changelog, require latest skylighting.John MacFarlane1-3/+3
2021-06-20Require commonmark 0.2.1.John MacFarlane1-1/+1
2021-06-10Bump to 2.14.0.2, update chaneglog and manual.John MacFarlane1-1/+1
2021-06-05Require citeproc 0.4.0.1.John MacFarlane1-1/+1
This fixes a bug which led to doubled "et al." in some (rare) circumstances.
2021-05-31Bump to 2.14.0.1; update changelog and man page.John MacFarlane1-1/+1
2021-05-29Use commonmark-extensions 0.2.1.2John MacFarlane1-1/+1
2021-05-29Replace biblatex-exmaples.bib with shorter averroes.bib in tests.John MacFarlane1-1/+1
2021-05-28Use latest commonmark.John MacFarlane1-3/+3
2021-05-27Add `rebase_relative_paths` extension.John MacFarlane1-0/+4
- Add manual entry for (non-default) extension `rebase_relative_paths`. - Add constructor `Ext_rebase_relative_paths` to `Extensions` in Text.Pandoc.Extensions [API change]. When enabled, this extension rewrites relative image and link paths by prepending the (relative) directory of the containing file. - Make Markdown reader sensitive to the new extension. - Add tests for #3752. Closes #3752. NB. currently the extension applies to markdown and associated readers but not commonmark/gfm.
2021-05-25CI: test with GHC 9.0.1Albert Krewinkel1-1/+1
2021-05-25Use haddock-library-1.10.0Albert Krewinkel1-1/+1
2021-05-25Jira: add support for "smart" linksAlbert Krewinkel1-1/+1
Support has been added for the new `[alias|https://example.com|smart-card]` syntax.
2021-05-24Use jira-wiki-markup 1.3.5Albert Krewinkel1-1/+1
* Allow spaces and most unicode characters in attachment links. * No longer require a newline character after `{noformat}`. * Only allow URI path segment characters in bare links. * The `file:` schema is no longer allowed in bare links; these rarely make sense. Closes: #7218
2021-05-21Bump upper-bounds for network-uri, time.John MacFarlane1-3/+3
Change stack.yaml to use lts-17.12.
2021-05-13Bump to 2.14 and update changelog.John MacFarlane1-1/+1
2021-05-12Use texmath 0.12.3.John MacFarlane1-1/+1
2021-05-09Change reader types, allowing better tracking of source positions.John MacFarlane1-0/+1
Previously, when multiple file arguments were provided, pandoc simply concatenated them and passed the contents to the readers, which took a Text argument. As a result, the readers had no way of knowing which file was the source of any particular bit of text. This meant that we couldn't report accurate source positions on errors or include accurate source positions as attributes in the AST. More seriously, it meant that we couldn't resolve resource paths relative to the files containing them (see e.g. #5501, #6632, #6384, #3752). Add Text.Pandoc.Sources (exported module), with a `Sources` type and a `ToSources` class. A `Sources` wraps a list of `(SourcePos, Text)` pairs. [API change] A parsec `Stream` instance is provided for `Sources`. The module also exports versions of parsec's `satisfy` and other Char parsers that track source positions accurately from a `Sources` stream (or any instance of the new `UpdateSourcePos` class). Text.Pandoc.Parsing now exports these modified Char parsers instead of the ones parsec provides. Modified parsers to use a `Sources` as stream [API change]. The readers that previously took a `Text` argument have been modified to take any instance of `ToSources`. So, they may still be used with a `Text`, but they can also be used with a `Sources` object. In Text.Pandoc.Error, modified the constructor PandocParsecError to take a `Sources` rather than a `Text` as first argument, so parse error locations can be accurately reported. T.P.Error: showPos, do not print "-" as source name.
2021-05-01Add new internal module Text.Pandoc.Writers.GridTableAlbert Krewinkel1-0/+2
2021-04-25Use dev texmath, citeproc.John MacFarlane1-1/+1
2021-04-20Docx writer: extract Table handling into separate moduleAlbert Krewinkel1-0/+2
2021-04-18Use lastest unicode-collation.John MacFarlane1-1/+1
2021-04-17Remove Text.Pandoc.BCP47 module.John MacFarlane1-1/+0
[API change] Use Lang from UnicodeCollation.Lang instead. This is a richer implementation of BCP 47.
2021-04-17Move getLang from BCP47 -> T.P.Writers.Shared.John MacFarlane1-0/+1
[API change]
2021-04-15Use latest xml-conduit.John MacFarlane1-1/+1
2021-03-31Require text for trypandoc (#7193)Roman Beránek1-1/+1
2021-03-24Allow attoparsec 0.14.x.John MacFarlane1-1/+1
2021-03-22Require latest skylighting (fixes a bug in XML syntax highlighting).John MacFarlane1-2/+2
2021-03-20Bump to 2.13, update changelogJohn MacFarlane1-1/+1
2021-03-19Tests: Use getExecutablePath from base...John MacFarlane1-1/+0
avoiding the need to depend on the executable-path package.
2021-03-19Narrow version bounds for skylighting, citeproc, and texmath.John MacFarlane1-4/+4
This reduces the chance that tests will fail due to behavior changes in one of these dependencies. (See e.g. #7163)
2021-03-19Use skylighting 0.10.5.John MacFarlane1-2/+2
This fixes a bad regression in Haskell syntax highlighting.