pandoc 2.11.0.1 → 2.11.0.2

raw patch · 25 files changed

+79/−33 lines, 25 filesdep ~citeprocPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: citeproc

API changes (from Hackage documentation)

Files

• cabal.project +1/−1
• changelog.md +15/−2
• man/pandoc.1 +1/−1
• pandoc.cabal +2/−2
• src/Text/Pandoc/Citeproc.hs +1/−4
• src/Text/Pandoc/Citeproc/BibTeX.hs +2/−2
• src/Text/Pandoc/Class/PandocMonad.hs +2/−2
• src/Text/Pandoc/Error.hs +2/−2
• src/Text/Pandoc/Lua/Marshaling/MediaBag.hs +1/−1
• src/Text/Pandoc/Readers/Creole.hs +1/−1
• src/Text/Pandoc/Readers/Odt/Generic/Utils.hs +1/−1
• src/Text/Pandoc/Readers/Org/Blocks.hs +1/−1
• stack.yaml +1/−1
• test/Tests/Lua.hs +1/−1
• test/Tests/Readers/Org/Inline.hs +1/−1
• test/command/6752.md +36/−0
• test/command/biblatex-thesis.md +1/−1
• test/command/yaml-metadata-blocks.md +3/−3
• test/epub/features.epub binary
• test/epub/features.native +1/−1
• test/tables/planets.html4 +1/−1
• test/tables/planets.html5 +1/−1
• test/tables/planets.native +1/−1
• test/textile-reader.native +1/−1
• test/textile-reader.textile +1/−1

@@ -7,4 +7,4 @@ source-repository-package     type: git     location: https://github.com/jgm/citeproc-    tag: 0.1.0.1+    tag: 0.1.0.2

@@ -1,5 +1,18 @@ # Revision history for pandoc +## pandoc 2.11.0.2 (2020-10-15)++  * Fix handling of `xdata` in bibtex/biblatex bibliographies (#6752).++  * Fix some small typos in the API documentation (#6751, Michael Hoffmann).++  * Require citeproc 0.1.0.2.  This fixes a regression from pandoc-citeproc+    involving spacing between components of a reference in certain styles+    (e.g. `cell.csl`).++  * Fix typos in comments, doc strings, error messages, and tests+    (Albert Krewinkel, #6738).+ ## pandoc 2.11.0.1 (2020-10-13)    * LaTeX reader: support more acronym commands (#6746):@@ -33,7 +46,7 @@    * Fix MANUAL.txt CSL JSON conversion examples. -  * Fix spelling errors in chengelog, MANUAL.txt, `doc/org.md` (#6738).+  * Fix spelling errors in changelog, MANUAL.txt, `doc/org.md` (#6738).   ## pandoc 2.11 (2020-10-11)@@ -3369,7 +3382,7 @@   * Man/Ms writers: Don't escape `-` as `\-`. The `\-` gets rendered     in HTML and PDF as a unicode minus sign. -  * Ms writer: Ensure we have a newline after .EN in disply math (#5251).+  * Ms writer: Ensure we have a newline after .EN in display math (#5251).    * RST writer: Don't wrap simple table header lines (#5128). 

@@ -1,7 +1,7 @@ .\"t .\" Automatically generated by Pandoc 2.11.0.1 .\"-.TH "Pandoc User\[cq]s Guide" "" "July 23, 2020" "pandoc 2.11.0.1" ""+.TH "Pandoc User\[cq]s Guide" "" "July 23, 2020" "pandoc 2.11.0.2" "" .hy .SH NAME pandoc - general markup converter

@@ -1,6 +1,6 @@ cabal-version:   2.2 name:            pandoc-version:         2.11.0.1+version:         2.11.0.2 build-type:      Simple license:         GPL-2.0-or-later license-file:    COPYING.md@@ -404,7 +404,7 @@                  blaze-markup          >= 0.8      && < 0.9,                  bytestring            >= 0.9      && < 0.12,                  case-insensitive      >= 1.2      && < 1.3,-                 citeproc              >= 0.1.0.1  && < 0.2,+                 citeproc              >= 0.1.0.2  && < 0.2,                  commonmark            >= 0.1.0.2  && < 0.2,                  commonmark-extensions >= 0.2      && < 0.3,                  commonmark-pandoc     >= 0.2      && < 0.3,

@@ -197,7 +197,7 @@   case formatFromExtension fp of     Just f -> getRefs locale f idpred (Just fp) raw     Nothing -> throwError $ PandocAppError $-                 "Could not deterine bibliography format for " <> t+                 "Could not determine bibliography format for " <> t  getRefs :: PandocMonad m         => Locale@@ -532,6 +532,3 @@   case lastMay ils of     Just (Str ".") -> initSafe ils     _              -> ils---

@@ -61,7 +61,8 @@ readBibtexString variant locale idpred contents = do   case runParser (((resolveCrossRefs variant <$> bibEntries) <* eof) >>=                    mapM (itemToReference locale variant) .-                      filter (idpred . identifier))+                      filter (\item -> idpred (identifier item) &&+                                        entryType item /= "xdata"))            (fromMaybe defaultLang $ localeLanguage locale, Map.empty)            "" contents of           Left err -> Left err@@ -1058,7 +1059,6 @@ getTypeAndGenre = do   lang <- gets localeLang   et <- asks entryType-  guard $ et /= "xdata"   reftype' <- resolveKey' lang <$> getRawField "type"          <|> return mempty   st <- getRawField "entrysubtype" <|> return mempty

@@ -160,7 +160,7 @@ getVerbosity :: PandocMonad m => m Verbosity getVerbosity = getsCommonState stVerbosity --- | Get the accomulated log messages (in temporal order).+-- | Get the accumulated log messages (in temporal order). getLog :: PandocMonad m => m [LogMessage] getLog = reverse <$> getsCommonState stLog @@ -600,7 +600,7 @@         go (_:as) ".." = as         go as     x    = x : as --- | Trys to run an action on a file: for each directory given, a+-- | Tries to run an action on a file: for each directory given, a -- filepath is created from the given filename, and the action is run on -- that filepath. Returns the result of the first successful execution -- of the action, or throws a @PandocResourceNotFound@ exception if the

@@ -10,8 +10,8 @@    Stability   : alpha    Portability : portable -This module provides a standard way to deal with possible errors encounted-during parsing.+This module provides a standard way to deal with possible errors+encountered during parsing.  -} module Text.Pandoc.Error (

@@ -34,7 +34,7 @@   peek = peekMediaItems  -- | Push an iterator triple to be used with Lua's @for@ loop construct.--- Each iterator invokation returns a tripple consisting of an item's+-- Each iterator invocation returns a triple containing the item's -- filename, MIME type, and content. pushIterator :: MediaBag -> Lua NumResults pushIterator mb = do

@@ -252,7 +252,7 @@     end = try $ string "}}}" >> lookAhead (noneOf "}")  placeholder :: PandocMonad m => CRLParser m B.Inlines--- The semantics of the placeholder is basicallly implementation+-- The semantics of the placeholder is basically implementation -- dependent, so there is no way to DTRT for all cases. -- So for now we just drop them. placeholder = B.text <$> try (string "<<<" >> manyTill anyChar (string ">>>")

@@ -41,7 +41,7 @@ -- > foldr (.) id -- where '(.)' are 'id' are the ones from "Control.Category" -- and 'foldr' is the one from "Data.Foldable".--- The noun-form was chosen to be consistend with 'sum', 'product' etc+-- The noun-form was chosen to be consistent with 'sum', 'product' etc -- based on the discussion at -- <https://groups.google.com/forum/#!topic/haskell-cafe/VkOZM1zaHOI> -- (that I was not part of)

@@ -289,7 +289,7 @@      return (trimInlinesF $ pure nbspIndent <> line)  -- | Read a code block and the associated results block if present.  Which of--- boths blocks is included in the output is determined using the "exports"+-- the blocks is included in the output is determined using the "exports" -- argument in the block header. codeBlock :: PandocMonad m => BlockAttributes -> Text -> OrgParser m (F Blocks) codeBlock blockAttrs blockType = do

@@ -22,7 +22,7 @@ - commonmark-0.1.0.2 - commonmark-extensions-0.2.0.1 - commonmark-pandoc-0.2.0.1-- citeproc-0.1.0.1+- citeproc-0.1.0.2  ghc-options:    "$locals": -fhide-source-paths -Wno-missing-home-modules

@@ -179,7 +179,7 @@       (doc $ para (str . T.pack $ "lua" </> "require-file.lua"))    , testCase "Allow singleton inline in constructors" . runLuaTest $ do-      Lua.liftIO . assertEqual "Not the exptected Emph" (Emph [Str "test"])+      Lua.liftIO . assertEqual "Not the expected Emph" (Emph [Str "test"])         =<< Lua.callFunc "pandoc.Emph" (Str "test")       Lua.liftIO . assertEqual "Unexpected element" (Para [Str "test"])         =<< Lua.callFunc "pandoc.Para" ("test" :: String)

@@ -369,7 +369,7 @@                 ] =?>       para (emph "Hello, World") -  , "Macro repeting its argument" =:+  , "Macro duplicating its argument" =:       T.unlines [ "#+MACRO: HELLO $1$1"                 , "{{{HELLO(moin)}}}"                 ] =?>

@@ -0,0 +1,36 @@+```+% pandoc -f biblatex -t csljson+@xdata{XDPubAlfredAKnopf,+    publisher   = {Alfred A.~Knopf},+    address     = {New York, NY}+}+@book{Klinkenborg2012,+    author      = {Verlyn Klinkenborg},+    title       = {Several short sentences about writing},+    date        = {2012},+    xdata       = {XDPubAlfredAKnopf},+}+^D+[+  {+    "author": [+      {+        "family": "Klinkenborg",+        "given": "Verlyn"+      }+    ],+    "id": "Klinkenborg2012",+    "issued": {+      "date-parts": [+        [+          2012+        ]+      ]+    },+    "publisher": "Alfred A. Knopf",+    "publisher-place": "New York, NY",+    "title": "Several short sentences about writing",+    "type": "book"+  }+]+```

@@ -2,7 +2,7 @@ % pandoc -f biblatex -t markdown -s @comment{excerpted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib -TODO: Uppercase letters follwing hyphens need to be converted to lowercase, too (e.g., "r" in "High-Resolution". -- Same for citeproc when doing title-case conversion!)+TODO: Uppercase letters following hyphens need to be converted to lowercase, too (e.g., "r" in "High-Resolution". -- Same for citeproc when doing title-case conversion!) }  @thesis{geer,

@@ -21,18 +21,18 @@ bool: true more: False nothing: null-emtpy: []+empty: [] nested:   int: 8   float: 2.5   bool: true   more: False   nothing: null-  emtpy: []+  empty: []   scientific: 3.7e-5 --- ^D-Pandoc (Meta {unMeta = fromList [("bool",MetaBool True),("emtpy",MetaList []),("float",MetaInlines [Str "1.5"]),("int",MetaInlines [Str "7"]),("more",MetaBool False),("nested",MetaMap (fromList [("bool",MetaBool True),("emtpy",MetaList []),("float",MetaInlines [Str "2.5"]),("int",MetaInlines [Str "8"]),("more",MetaBool False),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])])),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])]})+Pandoc (Meta {unMeta = fromList [("bool",MetaBool True),("empty",MetaList []),("float",MetaInlines [Str "1.5"]),("int",MetaInlines [Str "7"]),("more",MetaBool False),("nested",MetaMap (fromList [("bool",MetaBool True),("empty",MetaList []),("float",MetaInlines [Str "2.5"]),("int",MetaInlines [Str "8"]),("more",MetaBool False),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])])),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])]}) [] ``` ```

binary file changed (66370 → 66371 bytes)

@@ -64,7 +64,7 @@   ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Str "."]]  ,Div ("content-mathml-001.xhtml#mathml-025",["section","ctest"],[])   [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-025"],Str "Testing",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "rowspan",Space,Str "attributes,",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "fonts"]-  ,Para [Str "Tests",Space,Str "whether",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "mspace",Space,Str "attributes",Space,Str "(colum",Space,Str "and",Space,Str "row",Space,Str "spanning)",Space,Str "are",Space,Str "supported;",Space,Str "uses",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "alphabets."]+  ,Para [Str "Tests",Space,Str "whether",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "mspace",Space,Str "attributes",Space,Str "(column",Space,Str "and",Space,Str "row",Space,Str "spanning)",Space,Str "are",Space,Str "supported;",Space,Str "uses",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "alphabets."]   ,Plain [Math DisplayMath "\\begin{matrix}\n & {\\operatorname{cov}\\left( \\mathcal{L} \\right)} & \\longrightarrow & {\\operatorname{non}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cof}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cof}\\left( \\mathcal{L} \\right)} & \\longrightarrow & 2^{\\aleph_{0}} \\\\\n & \\uparrow & & \\uparrow & & \\uparrow & & \\uparrow & & \\\\\n & {\\mathfrak{b}} & \\longrightarrow & {\\mathfrak{d}} & & & & & & \\\\\n & \\uparrow & & \\uparrow & & & & & & \\\\\n\\aleph_{1} & \\longrightarrow & {\\operatorname{add}\\left( \\mathcal{L} \\right)} & \\longrightarrow & {\\operatorname{add}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cov}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{non}\\left( \\mathcal{L} \\right)} & \\\\\n\\end{matrix}"]   ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Link ("",[],[]) [Str "Cicho\324's",Space,Str "Diagram"] ("http://en.wikipedia.org/wiki/Cicho%C5%84's_diagram",""),Str ":",Space,Str "."]]  ,Div ("content-mathml-001.xhtml#mathml-026",["section","ctest"],[])

@@ -17,7 +17,7 @@ </thead> <tbody> <tr class="odd">-<th align="center" colspan="2" rowspan="4">Terrestial planets</th>+<th align="center" colspan="2" rowspan="4">Terrestrial planets</th> <th>Mercury</th> <td align="right">0.330</td> <td align="right">4,879</td>

@@ -17,7 +17,7 @@ </thead> <tbody> <tr class="odd">-<th style="text-align: center;" colspan="2" rowspan="4">Terrestial planets</th>+<th style="text-align: center;" colspan="2" rowspan="4">Terrestrial planets</th> <th>Mercury</th> <td style="text-align: right;">0.330</td> <td style="text-align: right;">4,879</td>

@@ -29,7 +29,7 @@  [(TableBody ("",[],[]) (RowHeadColumns 3)   []   [Row ("",[],[])-   [Cell ("",[],[]) AlignDefault (RowSpan 4) (ColSpan 2) [Plain [Str "Terrestial planets"]]+   [Cell ("",[],[]) AlignDefault (RowSpan 4) (ColSpan 2) [Plain [Str "Terrestrial planets"]]    ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Mercury"]]    ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "0.330"]]    ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "4,879"]]

@@ -90,7 +90,7 @@ ,Para [Emph [Strong [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]],LineBreak,Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Space,Str "and",Space,Emph [Strong [Str "that",Space,Str "one"]],Str ".",LineBreak,Strikeout [Str "This",Space,Str "is",Space,Str "strikeout",Space,Str "and",Space,Strong [Str "strong"]]] ,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Space,Superscript [Strong [Str "hello"]],Space,Str "a",Superscript [Str "hello",Space,Str "there"],Str ".",LineBreak,Str "Subscripts:",Space,Subscript [Str "here"],Space,Str "H",Space,Subscript [Str "2"],Str "O,",Space,Str "H",Space,Subscript [Str "23"],Str "O,",Space,Str "H",Space,Subscript [Str "many",Space,Str "of",Space,Str "them"],Str "O."] ,Para [Str "Dashes",Space,Str ":",Space,Str "How",Space,Str "cool",Space,Str "\8212",Space,Str "automatic",Space,Str "dashes."]-,Para [Str "Elipses",Space,Str ":",Space,Str "He",Space,Str "thought",Space,Str "and",Space,Str "thought",Space,Str "\8230",Space,Str "and",Space,Str "then",Space,Str "thought",Space,Str "some",Space,Str "more."]+,Para [Str "Ellipses",Space,Str ":",Space,Str "He",Space,Str "thought",Space,Str "and",Space,Str "thought",Space,Str "\8230",Space,Str "and",Space,Str "then",Space,Str "thought",Space,Str "some",Space,Str "more."] ,Para [Str "Quotes",Space,Str "and",Space,Str "apostrophes",Space,Str ":",Space,Quoted DoubleQuote [Str "I\8217d",Space,Str "like",Space,Str "to",Space,Str "thank",Space,Str "you"],Space,Str "for",Space,Str "example."] ,Header 1 ("links",[],[]) [Str "Links"] ,Header 2 ("explicit",[],[]) [Str "Explicit"]

@@ -162,7 +162,7 @@  Dashes : How cool -- automatic dashes. -Elipses : He thought and thought ... and then thought some more.+Ellipses : He thought and thought ... and then thought some more.  Quotes and apostrophes : "I'd like to thank you" for example.