From 2461f244e34022e6eb23cc0261b1692e53afc987 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 30 Nov 2013 20:52:53 -0800 Subject: Updated changelog. --- changelog | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) (limited to 'changelog') diff --git a/changelog b/changelog index 44e2e3dee..8bb15052b 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,163 @@ +pandoc (1.12.2) + + * Metadata may now be included in YAML blocks in a markdown document. + For example, + + --- + title: + - type: main + text: My Book + - type: subtitle + text: An investigation of metadata + creator: + - role: author + text: John Smith + - role: editor + text: Sarah Jones + identifier: + - scheme: DOI + text: doi:10.234234.234/33 + publisher: My Press + rights: (c) 2007 John Smith, CC BY-NC + cover-image: img/mypic.jpg + ... + + Metadata may still be provided using `--epub-metadata`; it will + be merged with the metadata in YAML blocks. + + * EPUB writer: + + + `meta` tags are now used instead of `opf` attributes for EPUB3. + + Insert "svg" property as needed in opf (EPUB 3). + + Simplify `imageTypeOf` using `getMimeType`. + + Add properties attribute to `cover-image` item for EPUB 3. + + Don't include node for `cover.xhtml` if no cover! + + Ensure that same identifier is used throughout (#1044). + If an identifier is given in metadata, we use that; otherwise + we generate a random uuid. + + Add cover reference to guide element (EPUB 2) (Shaun Attfield). + Fixes an issue with Calibre putting the cover at the end of the book + if the spine has `linear="no"`. Apparently this is best practice + for other converters as well: + . + + * Markdown writer: Fix rendering of tight sublists (#1050). + Previously a spurious blank line was included after a tight sublist. + + * ODT writer: Add `draw:name` attribute to `draw:frame` elements (#1069). + This is reported to be necessary to avoid an error from recent + versions of Libre Office when files contain more than one image + Thanks to wmanley for reporting and diagnosing the problem. + + * ConTeXt writer: Don't hardcode figure/table placement and numbering. + Instead, let this be set in the template, using `\setupfloat`. + Thanks to on4aa and Aditya Mahajan for the suggestion (#1067). + + * Implemented CSL flipflopping spans in DOCX, LaTeX, and HTML writers. + + * Fixed bug with markdown intraword emphasis. Closes #1066. + + * Docbook writer: Hierarchicalize block content in metadata. + Previously headers just disappeared from block-level metadata + when it was used in templates. Now we apply the 'hierarchicalize' + transformation. Note that a block headed by a level-2 header will + turn into a `` element. + + * OpenDocument writer: Skip raw HTML (#1035). + Previously it was erroneously included as verbatim text. + + * HTML/EPUB writer, footnotes: Put `` tag inside `` tags. + This allows better control of formatting, since the `` + tags have a distinguishing class (#1049). + + * Docx writer: + + + Use mime type info returned by fetchItem. + + Fixed core metadata (#1046). + Don't create empty date nodes if no date given. + Don't create multiple `dc:creator` nodes; instead separate by + semicolons. + + Fix URL for core-properties in `_rels/.rels` (#1046). + + * Plain writer: don't print `` tags. + + * LaTeX writer: + + + Fix definition lists with internal links in terms (#1032). + This fix puts braces around a term that contains an internal + link, to avoid problems with square brackets. + + Properly escape pdftitle, pdfauthor (#1059). + + * Updated beamer template. Now references should work properly + (in a slide) when `--biblatex` or `--natbib` is used. + + * LaTeX reader: + + + Parse contents of curly quotes or matched `"` as quotes. + + Support `\textnormal` as span with class `nodecor`. + This is needed for pandoc-citeproc. + + Improved citation parsing. This fixes a run-time error that occured + with `\citet{}` (empty list of keys). It also ensures that empty keys + don't get produced. + + * MediaWiki reader: Add automatic header identifiers. + + * HTML reader: + + + Use pandoc `Div` and `Span` for raw `
`, `` when + `--parse-raw`. + + Recognize `svg` tags as block level content (thanks to MinRK). + + * Markdown reader: + + + Yaml block must start immediately after `---`. If there's a blank + line after `---`, we interpreted it as a horizontal rule. + + Correctly handle empty bullet list items. + + * Slides: Preserve `
` in references slide. + + * `Text.Pandoc.Writer.Shared`: fixed bug in `tagWithAttrs`. + A space was omitted before key-value attributes, leading + to invalid HTML. + + * DocBook reader: Handle numerical attributes starting with decimal. + Also use `safeRead` instead of `read`. + + * `Text.Pandoc.Parsing`: Generalized type of `registerHeader`, + using new type classes `HasReadeOptions`, `HasIdentifierList`, + `HasHeaderMap`. These allow certain common functions to be reused + even in parsers that use custom state (instead of `ParserState`), + such as the MediaWiki reader. + + * `Text.Pandoc.Shared`: Fixed bug in `openURL` with `data:` URIs. + Previously the base-64 encoded bytestring was returned. + We now decode it so it's a proper image! + + * `Text.Pandoc.Readers.TexMath`: Export `readTeXMath'`, which attends + to display/inline. Deprecate `readTeXMath`, and use `readTeXMath'` + in all the writers. Require `texmath >= 0.6.5.2`. + + * `Text.Pandoc.MIME`: + + + Add entry for `jfif`. + + In looking up extensions, drop the encoding info. + E.g. for 'image/jpg;base64' we should lookup 'image/jpg'. + + * Templates: Changed how array variables are resolved. Previously if + `foo` is an array (which might be because multiple values were set on + the command line), `$foo$` would resolve to the concatenation of the + elements of foo. This is rarely useful behavior. It has been changed + so that the first value is rendered. Of course, you can still iterate + over the values using `$for(foo)$`. This has the result that you can + override earlier settings using `-V` by putting new values later on the + command line, which is useful for many purposes. + + * Allow "epub2" as synonym for "epub", "html4" for "html". + + * Don't look for slidy files in data files with `--self-contained`. + + * Fixed `make_osx_package.sh` so data files embedded in `pandoc-citeproc`. + pandoc (1.12.1) * `Text.Pandoc.Definition`: Changed default JSON serialization format. -- cgit v1.2.3 From 06d1ec828a0c6ef5d8549b14c7b2101a34606ce0 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 7 Dec 2013 11:57:53 -0800 Subject: Updated changelog. --- changelog | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) (limited to 'changelog') diff --git a/changelog b/changelog index 8bb15052b..0da606c75 100644 --- a/changelog +++ b/changelog @@ -40,6 +40,8 @@ pandoc (1.12.2) if the spine has `linear="no"`. Apparently this is best practice for other converters as well: . + + Allow `stylesheet` in metadata. The value is a path to the stylesheet. + + Allow partial dates: `YYYY`, `YYYY-MM`. * Markdown writer: Fix rendering of tight sublists (#1050). Previously a spurious blank line was included after a tight sublist. @@ -87,6 +89,7 @@ pandoc (1.12.2) This fix puts braces around a term that contains an internal link, to avoid problems with square brackets. + Properly escape pdftitle, pdfauthor (#1059). + + Use booktabs package for tables (thanks to Jose Luis Duran). * Updated beamer template. Now references should work properly (in a slide) when `--biblatex` or `--natbib` is used. @@ -107,31 +110,40 @@ pandoc (1.12.2) + Use pandoc `Div` and `Span` for raw `
`, `` when `--parse-raw`. + Recognize `svg` tags as block level content (thanks to MinRK). + + Parse LaTeX math if appropriate options are set. * Markdown reader: + Yaml block must start immediately after `---`. If there's a blank line after `---`, we interpreted it as a horizontal rule. + Correctly handle empty bullet list items. + + Stop parsing "list lines" when we hit a block tag. + This fixes exponential slowdown in certain input, e.g. + a series of lists followed by `
`. * Slides: Preserve `
` in references slide. - * `Text.Pandoc.Writer.Shared`: fixed bug in `tagWithAttrs`. - A space was omitted before key-value attributes, leading - to invalid HTML. + * `Text.Pandoc.Writer.Shared`: + + + Fixed bug in `tagWithAttrs`. A space was omitted before key-value + attributes, leading to invalid HTML. + + `normalizeDate`: Allow dates with year only (thanks to Shaun Attfield). + + Fixed bug in `openURL` with `data:` URIs. Previously the base-64 + encoded bytestring was returned. We now decode it so it's a proper + image! * DocBook reader: Handle numerical attributes starting with decimal. Also use `safeRead` instead of `read`. - * `Text.Pandoc.Parsing`: Generalized type of `registerHeader`, - using new type classes `HasReadeOptions`, `HasIdentifierList`, - `HasHeaderMap`. These allow certain common functions to be reused - even in parsers that use custom state (instead of `ParserState`), - such as the MediaWiki reader. + * `Text.Pandoc.Parsing`: - * `Text.Pandoc.Shared`: Fixed bug in `openURL` with `data:` URIs. - Previously the base-64 encoded bytestring was returned. - We now decode it so it's a proper image! + + Generalized type of `registerHeader`, using new type classes + `HasReadeOptions`, `HasIdentifierList`, `HasHeaderMap`. + These allow certain common functions to be reused + even in parsers that use custom state (instead of `ParserState`), + such as the MediaWiki reader. + + Moved inlineMath, displayMath from Markdown reader to Parsing. + Generalize their types and export them from Parsing. (API change.) * `Text.Pandoc.Readers.TexMath`: Export `readTeXMath'`, which attends to display/inline. Deprecate `readTeXMath`, and use `readTeXMath'` @@ -151,11 +163,15 @@ pandoc (1.12.2) over the values using `$for(foo)$`. This has the result that you can override earlier settings using `-V` by putting new values later on the command line, which is useful for many purposes. + + * `Text.Pandoc`: Don't default to `pandocExtensions` for all writers. * Allow "epub2" as synonym for "epub", "html4" for "html". * Don't look for slidy files in data files with `--self-contained`. + * Allow `https:` command line arguments to be downloaded. + * Fixed `make_osx_package.sh` so data files embedded in `pandoc-citeproc`. pandoc (1.12.1) @@ -3700,7 +3716,7 @@ pandoc (1.5.1.1) [ John MacFarlane ] - * Fixed uniqueIdent in Shared so that header identifiers work as + * Fixed uniqueIdent in Shared so that header identifiers work as advertized in the README and are are valid XHTML names. pandoc (1.5.1) -- cgit v1.2.3 From 1818fefda45903a217df9516229b8bd52f59fee1 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 8 Dec 2013 14:35:51 -0800 Subject: Updated changelog. --- changelog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'changelog') diff --git a/changelog b/changelog index 0da606c75..89b75189e 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,8 @@ +pandoc (1.12.2.1) + + * Markdown reader: Fixed regression in list parser, involving + continuation lines containing raw HTML (or even verbatim raw HTML). + pandoc (1.12.2) * Metadata may now be included in YAML blocks in a markdown document. -- cgit v1.2.3 From 47a24f9821aa87770bacf9f04956addd59a648ce Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 7 Jan 2014 22:32:28 -0800 Subject: Updated changelog. --- changelog | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) (limited to 'changelog') diff --git a/changelog b/changelog index 89b75189e..2b73c0ae8 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,100 @@ + * The `--bibliography` option now sets the `biblio-files` variable. + So, if you're using `--natbib` or `--biblatex`, you can just use + `--bibliography=foo.bib` instead of `-V bibliofiles=foo`. + + * Don't run pandoc-citeproc filter if `--bibliography` is + used together with `--natbib` or `--biblatex` (Florian Eitel). + + * Template changes: + + + Updated beamer template to include booktabs. + + Added `abstract` variable to LaTeX template. + + Put `header-includes` after `title` in LaTeX template (#908). + + Allow use of `\includegraphics[size]` in beamer. + This just required porting a macro definition from the default + LaTeX template to the default beamer template. + + * `reference.docx`: Include `FootnoteText` style. + Otherwise Word ignores the style, even when specified in the `pPr`. + (#901) + + * `reference.odt`: Tidied `styles.xml`. + + * Relaxed version bounds for dependencies. + + * Added `withSocketsDo` around http conduit code in `openURL`, + so it works on Windows (#1080). + + * Added `Cite` function to `sample.lua`. + + * Markdown reader: Fixed regression in title blocks (#1089). + If author field was empty, date was being ignored. + + * LaTeX reader: + + + Add support for `Verb` macro (jrnold) (#1090). + + Support babel-style quoting: `` "`..."' ``. + + * Properly handle script blocks in strict mode. (That is, + `markdown-markdown_in_html_blocks`.) Previously a spurious + `

` tag was being added (#1093). + + * Docbook reader: Avoid failure if `tbody` contains no `tr` or `row` + elements. + + * LaTeX writer: + + + Factored out function for table cell creation. + + Better treatment of footnotes in tables. + Notes now appear in the regular sequence, rather than in the + table cell. (This was a regression in 1.10.) + + * HTML reader: Parse name/content pairs from meta tags as metadata. + Closes #1106. + + * Moved `fixDisplayMath` from Docx writer to `Writer.Shared`. + + * OpenDocument writer: Fixed `RawInline`, `RawBlock` so they don't escape. + + * ODT writer: Use mathml for proper rendering of formulas. + Note: LibreOffice's support for this seems a bit buggy. But + it should be better than what we had before. + + * RST writer: Ensure no blank line after def in definition list (#992). + + * Markdown writer: Don't use tilde code blocks with braced attributes in + `markdown_github` output. A consequence of this change is that the + backtick form will be preferred in general if both are enabled. That + is good, as it is much more widespread than the tilde form. (#1084) + + * Docx writer: Fixed problem with some modified reference docx files. + Include `word/_rels/settings.xml.rels` if it exists, as well as other + `rels` files besides the ones pandoc generates explicitly. + + * HTML writer: + + + With `--toc`, headers no longer link to themselves (#1081). + + Omit footnotes from TOC entries. Otherwise we get doubled + footnotes when headers have notes! + + * EPUB writer: + + + Avoid duplicate notes when headings contain notes. + This arose because the headings are copied into the metadata + "title" field, and the note gets rendered twice. We strip the + note now before putting the heading in "title". + + Strip out footnotes from toc entries. + + Fixed bug with `--epub-stylesheet`. Now the contents of + `writerEpubStylesheet` (set by `--epub-stylesheet`) + should again work, and take precedence over a stylesheet specified + in the metadata. + + * `Text.Pandoc.Pretty`: Added `nestle`. API change. + + * `Text.Pandoc.MIME`: Added `wmf`, `emf`. + + * Removed old `MarkdownTest_1.0.3` directory (#1104). + pandoc (1.12.2.1) * Markdown reader: Fixed regression in list parser, involving -- cgit v1.2.3 From 3c63d943244d32cedc8c6edbacc54dbdb6c474ae Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 7 Jan 2014 23:41:19 -0800 Subject: Updated changelog. --- changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'changelog') diff --git a/changelog b/changelog index 2b73c0ae8..755b60b5a 100644 --- a/changelog +++ b/changelog @@ -27,8 +27,12 @@ * Added `Cite` function to `sample.lua`. - * Markdown reader: Fixed regression in title blocks (#1089). - If author field was empty, date was being ignored. + * Markdown reader: + + + Fixed regression in title blocks (#1089). + If author field was empty, date was being ignored. + + Allow backslash-newline hard line breaks in grid and + multiline table cells. * LaTeX reader: -- cgit v1.2.3 From c1c525758923c1678ebede77e7a7908ad6e27898 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 9 Jan 2014 22:54:32 -0800 Subject: Updated changelog. --- changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'changelog') diff --git a/changelog b/changelog index 755b60b5a..838353a22 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,5 @@ +pandoc (1.12.3) + * The `--bibliography` option now sets the `biblio-files` variable. So, if you're using `--natbib` or `--biblatex`, you can just use `--bibliography=foo.bib` instead of `-V bibliofiles=foo`. @@ -97,6 +99,13 @@ * `Text.Pandoc.MIME`: Added `wmf`, `emf`. + * `Text.Pandoc.Shared`: `fetchItem` now handles image URLs beginning + with `//`. + + * `Text.Pandoc.ImageSize`: Parse EXIF format JPEGs. Previously + we could only get size information for JFIF format, which led + to squished images in Word documents. Closes #976. + * Removed old `MarkdownTest_1.0.3` directory (#1104). pandoc (1.12.2.1) @@ -223,6 +232,8 @@ pandoc (1.12.2) + Yaml block must start immediately after `---`. If there's a blank line after `---`, we interpreted it as a horizontal rule. + Correctly handle empty bullet list items. + + Citation keys may now start with underscores, and may contain + underscores adjacent to internal punctuation. + Stop parsing "list lines" when we hit a block tag. This fixes exponential slowdown in certain input, e.g. a series of lists followed by `

`. -- cgit v1.2.3 From 2c86b71af8907d6f006f624a7690f81e1a42e054 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 10 Jan 2014 11:40:09 -0800 Subject: Fixed bug in changelog (item was put under wrong release). --- changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'changelog') diff --git a/changelog b/changelog index 838353a22..4cbc60388 100644 --- a/changelog +++ b/changelog @@ -35,6 +35,8 @@ pandoc (1.12.3) If author field was empty, date was being ignored. + Allow backslash-newline hard line breaks in grid and multiline table cells. + + Citation keys may now start with underscores, and may contain + underscores adjacent to internal punctuation. * LaTeX reader: @@ -232,8 +234,6 @@ pandoc (1.12.2) + Yaml block must start immediately after `---`. If there's a blank line after `---`, we interpreted it as a horizontal rule. + Correctly handle empty bullet list items. - + Citation keys may now start with underscores, and may contain - underscores adjacent to internal punctuation. + Stop parsing "list lines" when we hit a block tag. This fixes exponential slowdown in certain input, e.g. a series of lists followed by `
`. -- cgit v1.2.3 From a1abb3eeea2321654a8450725ff6c0d1a18ee0c7 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 14 Jan 2014 10:12:33 -0800 Subject: Allow binary 0.5. Version bump to 1.12.3.1. --- changelog | 4 ++++ pandoc.cabal | 4 ++-- src/Text/Pandoc/ImageSize.hs | 9 ++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'changelog') diff --git a/changelog b/changelog index 4cbc60388..fde6873ec 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ +pandoc (1.12.3.1) + + * Relaxed version constraint on binary, allowing the use of binary 0.5. + pandoc (1.12.3) * The `--bibliography` option now sets the `biblio-files` variable. diff --git a/pandoc.cabal b/pandoc.cabal index c8ff9738a..0199996be 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,5 +1,5 @@ Name: pandoc -Version: 1.12.3 +Version: 1.12.3.1 Cabal-Version: >= 1.10 Build-Type: Custom License: GPL @@ -233,7 +233,7 @@ Library yaml >= 0.8.3 && < 0.9, vector >= 0.10 && < 0.11, hslua >= 0.3 && < 0.4, - binary >= 0.6 && < 0.8 + binary >= 0.5 && < 0.8 Build-Tools: alex, happy if flag(http-conduit) Build-Depends: http-conduit >= 1.9 && < 2.1, diff --git a/src/Text/Pandoc/ImageSize.hs b/src/Text/Pandoc/ImageSize.hs index d1aacff1c..14575244d 100644 --- a/src/Text/Pandoc/ImageSize.hs +++ b/src/Text/Pandoc/ImageSize.hs @@ -182,9 +182,12 @@ findJfifSize bs = do Nothing -> fail "Did not find length record" exifSize :: ByteString -> Maybe ImageSize -exifSize = -- runGet ((Just <$> exifHeader) `mplus` return Nothing) . - runGet (Just <$> exifHeader) . - BL.fromChunks . (:[]) +exifSize = runGet (Just <$> exifHeader) . BL.fromChunks . (:[]) +-- NOTE: It would be nicer to do +-- runGet ((Just <$> exifHeader) <|> return Nothing) +-- which would prevent pandoc from raising an error when an exif header can't +-- be parsed. But we only get an Alternative instance for Get in binary 0.6, +-- and binary 0.5 ships with ghc 7.6. exifHeader :: Get ImageSize exifHeader = do -- cgit v1.2.3 From e18b3053843dc99b50b260dd133ffecca93580fd Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 3 Feb 2014 13:32:44 -0800 Subject: Updated changelog. --- changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'changelog') diff --git a/changelog b/changelog index fde6873ec..dc8a8f6af 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,17 @@ +pandoc (1.12.3.2) + + * Bumped version bounds for blaze-html, blaze-markup. + + * ImageSize: Avoid use of lookAhead, which is not in binary >= 0.6 + (#1124). + + * Fixed mediawiki ordered list parsing (#1122). + + * HTML reader: Fixed bug reading inline math with `$$` (#225). + + * Added support for LaTeX style literate Haskell code blocks in rST + (Merijn Verstraaten). + pandoc (1.12.3.1) * Relaxed version constraint on binary, allowing the use of binary 0.5. -- cgit v1.2.3 From 4a84e9691e5a177811b0c8771bc07790e0543e37 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 3 Feb 2014 14:08:13 -0800 Subject: Version bump to 1.12.3.3. No changes to source: just to regenerate tarball with latest alex, happy, to satisfy GHC 7.8. --- changelog | 5 +++++ pandoc.cabal | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'changelog') diff --git a/changelog b/changelog index dc8a8f6af..90a34c2e4 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,8 @@ +pandoc (1.12.3.3) + + * To changes to source; recompiled tarball with latest alex and + happy, so they will work with GHC 7.8. + pandoc (1.12.3.2) * Bumped version bounds for blaze-html, blaze-markup. diff --git a/pandoc.cabal b/pandoc.cabal index 8662d9bee..b99eb5420 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,5 +1,5 @@ Name: pandoc -Version: 1.12.3.2 +Version: 1.12.3.3 Cabal-Version: >= 1.10 Build-Type: Custom License: GPL -- cgit v1.2.3