diff options
-rw-r--r-- | changelog | 74 | ||||
-rw-r--r-- | deb/stack.yaml | 2 | ||||
-rw-r--r-- | osx/stack.yaml | 2 | ||||
-rw-r--r-- | src/Text/Pandoc/Options.hs | 21 |
4 files changed, 51 insertions, 48 deletions
@@ -110,46 +110,53 @@ pandoc (1.15.2) Otherwise some browsers display the table with the columns separated far apart. - * Updated dzslides template from source (Andrew Dunning). - - * Asciidoc template: Fixed `author` and `date`; added `keywords`, + * AsciiDoc template: Fix `author` and `date`; add `keywords`, `abstract` (Andrew Dunning). - * HTML-based templates: + * HTML-based templates (Andrew Dunning): - + Use en dash instead of hypehn between title prefix & title - (Andrew Dunning.) - + Added `keywords` and fixed alignment (Andrew Dunning). - + Added `lang`, `dir`, `quotes` (Andrew Dunning). - + Always make author and date display conditional (Andrew Dunning). + + Use en dash instead of hyphen between title prefix and title. + + Add `keywords` to metadata. + + Add `lang`, `dir`, `quotes` where missing. + + Always make author and date display conditional. + + Updated dzslides template from source. * Man template: make "generated by" comment conditional. - * LaTeX template: + * LaTeX, Beamer templates: - + Simplify hyperref usage (Andrew Dunning, #139). - + Improved formatting of conditionals. - + `$for$` is always provided where the user might want to use - multiple options (does not change existing functionality). - + `hyperref` link rendering revised: - - the `hidelinks` option is now effectively the default (and has - been removed as a separate option), rather than setting all links to - black; - - link colours can be enabled more easily (using a slightly darker - version of the old Pandoc defaults) using a new `colorlinks` variable - - `pdfborder={0 0 0}` is automatically enabled in `hyperref` when - `colorlinks` is enabled, and is now only applied. + + Add `babel-otherlangs` for language divs/spans; `babel-newcommands`, + filled by commands that make babel understand the polyglossia-style + language directives (mb21, #137). + + Improved formatting of conditionals; `$for$` is always provided to allow + multiple options (Andrew Dunning, #141). + + Use `Ligatures=TeX` rather than `Mapping=tex-text` with `fontspec` + to improve support for LuaTeX (Andrew Dunning, #135). + + Revise `hyperref` usage (Andrew Dunning, #139, #141): + - use same options for all LaTeX engines; + - add `subtitle` and `keywords` to PDF metadata; + - do not override `hyperref` link coloring without user input, effectively making + the `hidelinks` option the default (removed as a separate variable); + - link colors can be enabled (using a slightly darker version of the old + defaults) using a new `colorlinks` variable, automatically used by + the LaTeX writer when custom colors are specified; + - `pdfborder={0 0 0}` is automatically set by `hyperref` with + `colorlinks`, and is only applied if `colorlinks` is disabled. * ConTeXt template (Andrew Dunning): - + Default link color to black. - + Define all sections. - + microtype applied to both regular text and small caps. - + `indenting` variable added. - + Renamed `style` to `linkstyle` for consistency. - + Separated `linkcontrastcolor` from `linkcolor`. - + Matching LaTeX `hyperref` usage, only disable link styling rather - than providing a specific setting. + + New variables for controlling styles: `linkstyle`, `linkcolor`, + `linkcontrastcolor`, `layout`, `pagenumbering`, `whitespace`, `indenting`, + `interlinespace`, `headertext`, `footertext`, `mainfont`, `sansfont`, + `monofont`, `mathfont`, `fontsize`. + + Default template no longer supports MkII. + + Improve writing of title block (suppressing numbering of first page). + + Add `title` `subtitle`, `author`, `date`, `keywords` to PDF metadata. + + Support `subtitle`, `abstract`. + + Support list of figures (`lof`), list of tables (`lot`). + + Disable link styling by default. + + Define styles for all section types. + + Enable microtype. + Improved formatting of conditionals. * Beamer template: added code to prevent slide breaks inside paragraphs @@ -157,11 +164,6 @@ pandoc (1.15.2) `allowframebreaks` is used. It is especially helpful for bibliography slides. - * Updated latex, beamer templates to support language divs/spans. - This adds a template variable that can be filled - by commands that make babel understand the polyglossia-style - language directives. Thanks to mb21. - * Restored Text.Pandoc.Compat.Monoid. * Do not export (<>) from custom Prelude. The Prelude now matches @@ -396,7 +398,7 @@ pandoc (1.15.1) Move HTML5 shiv after CSS and fix URL (Andrew Dunning). Add dir attribute in html5 (Andrew Dunning). + reveal.js: Add `controls`, `progress` variables (Grégoire Pineau, #127). - Add `width`, `height` variables (Anrew Dunning). Update template + Add `width`, `height` variables (Andrew Dunning). Update template from 3.1 source (Andrew Dunning). All configuration options are now available as variables, but are only be included if set (reveal.js uses defaults otherwise). diff --git a/deb/stack.yaml b/deb/stack.yaml index dcc76b61c..b4ee36157 100644 --- a/deb/stack.yaml +++ b/deb/stack.yaml @@ -13,5 +13,5 @@ flags: debug: false packages: - '..' -- 'https://hackage.haskell.org/package/pandoc-citeproc-0.8.1.1/pandoc-citeproc-0.8.1.1.tar.gz' +- 'https://hackage.haskell.org/package/pandoc-citeproc-0.8.1.3/pandoc-citeproc-0.8.1.3.tar.gz' resolver: lts-3.13 diff --git a/osx/stack.yaml b/osx/stack.yaml index ec85fb775..71af73661 100644 --- a/osx/stack.yaml +++ b/osx/stack.yaml @@ -16,5 +16,5 @@ ghc-options: highlighting-kate: '-pgmP cpphs -optP--cpp' packages: - '..' -- 'https://hackage.haskell.org/package/pandoc-citeproc-0.8.1.1/pandoc-citeproc-0.8.1.1.tar.gz' +- 'https://hackage.haskell.org/package/pandoc-citeproc-0.8.1.3/pandoc-citeproc-0.8.1.3.tar.gz' resolver: lts-3.13 diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs index b7d268a65..158303acd 100644 --- a/src/Text/Pandoc/Options.hs +++ b/src/Text/Pandoc/Options.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-} {- Copyright (C) 2012-2015 John MacFarlane <jgm@berkeley.edu> @@ -54,6 +54,7 @@ import Text.Pandoc.Highlighting (Style, pygments) import Text.Pandoc.MediaBag (MediaBag) import Data.Data (Data) import Data.Typeable (Typeable) +import GHC.Generics (Generic) -- | Individually selectable syntax extensions. data Extension = @@ -114,7 +115,7 @@ data Extension = | Ext_line_blocks -- ^ RST style line blocks | Ext_epub_html_exts -- ^ Recognise the EPUB extended version of HTML | Ext_shortcut_reference_links -- ^ Shortcut reference links - deriving (Show, Read, Enum, Eq, Ord, Bounded, Data, Typeable) + deriving (Show, Read, Enum, Eq, Ord, Bounded, Data, Typeable, Generic) pandocExtensions :: Set Extension pandocExtensions = Set.fromList @@ -258,7 +259,7 @@ data ReaderOptions = ReaderOptions{ , readerDefaultImageExtension :: String -- ^ Default extension for images , readerTrace :: Bool -- ^ Print debugging info , readerTrackChanges :: TrackChanges -} deriving (Show, Read, Data, Typeable) +} deriving (Show, Read, Data, Typeable, Generic) instance Default ReaderOptions where def = ReaderOptions{ @@ -280,7 +281,7 @@ instance Default ReaderOptions -- Writer options -- -data EPUBVersion = EPUB2 | EPUB3 deriving (Eq, Show, Read, Data, Typeable) +data EPUBVersion = EPUB2 | EPUB3 deriving (Eq, Show, Read, Data, Typeable, Generic) data HTMLMathMethod = PlainMath | LaTeXMathML (Maybe String) -- url of LaTeXMathML.js @@ -290,18 +291,18 @@ data HTMLMathMethod = PlainMath | MathML (Maybe String) -- url of MathMLinHTML.js | MathJax String -- url of MathJax.js | KaTeX String String -- url of stylesheet and katex.js - deriving (Show, Read, Eq, Data, Typeable) + deriving (Show, Read, Eq, Data, Typeable, Generic) data CiteMethod = Citeproc -- use citeproc to render them | Natbib -- output natbib cite commands | Biblatex -- output biblatex cite commands - deriving (Show, Read, Eq, Data, Typeable) + deriving (Show, Read, Eq, Data, Typeable, Generic) -- | Methods for obfuscating email addresses in HTML. data ObfuscationMethod = NoObfuscation | ReferenceObfuscation | JavascriptObfuscation - deriving (Show, Read, Eq, Data, Typeable) + deriving (Show, Read, Eq, Data, Typeable, Generic) -- | Varieties of HTML slide shows. data HTMLSlideVariant = S5Slides @@ -310,13 +311,13 @@ data HTMLSlideVariant = S5Slides | DZSlides | RevealJsSlides | NoSlides - deriving (Show, Read, Eq, Data, Typeable) + deriving (Show, Read, Eq, Data, Typeable, Generic) -- | Options for accepting or rejecting MS Word track-changes. data TrackChanges = AcceptChanges | RejectChanges | AllChanges - deriving (Show, Read, Eq, Data, Typeable) + deriving (Show, Read, Eq, Data, Typeable, Generic) -- | Options for writers data WriterOptions = WriterOptions @@ -363,7 +364,7 @@ data WriterOptions = WriterOptions , writerMediaBag :: MediaBag -- ^ Media collected by docx or epub reader , writerVerbose :: Bool -- ^ Verbose debugging output , writerLaTeXArgs :: [String] -- ^ Flags to pass to latex-engine - } deriving (Show, Data, Typeable) + } deriving (Show, Data, Typeable, Generic) instance Default WriterOptions where def = WriterOptions { writerStandalone = False |