diff --git a/MANUAL.txt b/MANUAL.txt --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1,7 +1,7 @@ --- title: Pandoc User's Guide author: John MacFarlane -date: July 23, 2020 +date: October 20, 2020 --- # Synopsis @@ -2364,7 +2364,7 @@ ... `indent` -: uses document class settings for indentation (the default LaTeX template +: if true, pandoc will use document class settings for indentation (the default LaTeX template otherwise removes indentation and adds space between paragraphs) `linestretch` @@ -2861,7 +2861,7 @@ for the following formats (in addition to `markdown`): input formats - : `latex`, `org`, `textile`, `html` (environments, `\ref`, and + : `latex`, `textile`, `html` (environments, `\ref`, and `\eqref` only), `ipynb` output formats diff --git a/cabal.project b/cabal.project --- a/cabal.project +++ b/cabal.project @@ -7,4 +7,5 @@ source-repository-package type: git location: https://github.com/jgm/citeproc - tag: 0.1.0.2 + tag: 3230fb6fa1beff3e27389be20217a31d3c1207e9 + diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,45 @@ # Revision history for pandoc +## pandoc 2.11.0.3 (2020-10-20) + + * Use latest citeproc (closes #6765). This fixes a problem with + author-in-text citations for references including both an author + and an editor. Previously, both were included in the text, but only + the author should be. + + * With `--citeproc`, ensure that the final period is removed when + citations that occur in notes in note-based styles get put in + parentheses. See jgm/citeproc#20. + + * Normalize rewritten image paths with `--extract-media` (#6761). + This change will avoid mixed paths like this one when + `--extract-media` is used with a Word file: + `![](C:\Git\TIJ4\Markdown/media/image30.wmf)`. Instead we'll get + `![](C:\Git\TIJ4\Markdown`media`image30.wmf)`. + + * Modify `--version` output. Use space more efficiently and report the + citeproc and ipynb versions, along with skylighting, texmath, and + pandoc-types. Drop the word default before "user data directory." + + * DocBook reader: bibliomisc and anchor support (#6754, Nils Carlson). + Also ensure that bibliodiv without a title no longer results in + an empty Header. + + * ConTeXt template: adds `\setupinterlinespace` to fonts larger + than normal (#6763, Denis Maier). + + * LaTeX template: Do not load amssymb if not needed (#6469, Angelo Peronio). + See . + + * Relax upper bound on hslua, allow hslua-1.3.* (Albert Krewinkel). + + * MANUAL: + + + Improve explanation of "indent" variable (#6767, Cyrus Yip). + + Remove org from list of input formats supporting raw_tex (#6753, + Nick Fleisher). + + ## pandoc 2.11.0.2 (2020-10-15) * Fix handling of `xdata` in bibtex/biblatex bibliographies (#6752). diff --git a/data/templates/default.context b/data/templates/default.context --- a/data/templates/default.context +++ b/data/templates/default.context @@ -72,9 +72,9 @@ \setupinterlinespace[$for(interlinespace)$$interlinespace$$sep$,$endfor$] $endif$ -\setuphead[chapter] [style=\tfd,header=empty] -\setuphead[section] [style=\tfc] -\setuphead[subsection] [style=\tfb] +\setuphead[chapter] [style=\tfd\setupinterlinespace,header=empty] +\setuphead[section] [style=\tfc\setupinterlinespace] +\setuphead[subsection] [style=\tfb\setupinterlinespace] \setuphead[subsubsection] [style=\bf] \setuphead[subsubsubsection] [style=\sc] \setuphead[subsubsubsubsection][style=\it] diff --git a/data/templates/default.latex b/data/templates/default.latex --- a/data/templates/default.latex +++ b/data/templates/default.latex @@ -97,15 +97,17 @@ $if(linestretch)$ \usepackage{setspace} $endif$ -\usepackage{amssymb,amsmath} +\usepackage{amsmath} \usepackage{ifxetex,ifluatex} \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provide euro and other symbols + \usepackage{amssymb} \else % if luatex or xetex $if(mathspec)$ \ifxetex + \usepackage{amssymb} \usepackage{mathspec} \else \usepackage{unicode-math} diff --git a/man/pandoc.1 b/man/pandoc.1 --- a/man/pandoc.1 +++ b/man/pandoc.1 @@ -1,7 +1,7 @@ .\"t -.\" Automatically generated by Pandoc 2.11.0.1 +.\" Automatically generated by Pandoc 2.11.0.2 .\" -.TH "Pandoc User\[cq]s Guide" "" "July 23, 2020" "pandoc 2.11.0.2" "" +.TH "Pandoc User\[cq]s Guide" "" "October 20, 2020" "pandoc 2.11.0.3" "" .hy .SH NAME pandoc - general markup converter @@ -2664,8 +2664,9 @@ .RE .TP \f[B]\f[CB]indent\f[B]\f[R] -uses document class settings for indentation (the default LaTeX template -otherwise removes indentation and adds space between paragraphs) +if true, pandoc will use document class settings for indentation (the +default LaTeX template otherwise removes indentation and adds space +between paragraphs) .TP \f[B]\f[CB]linestretch\f[B]\f[R] adjusts line spacing using the \f[C]setspace\f[R] package, @@ -3218,9 +3219,8 @@ .RS 2 .TP input formats -\f[C]latex\f[R], \f[C]org\f[R], \f[C]textile\f[R], \f[C]html\f[R] -(environments, \f[C]\[rs]ref\f[R], and \f[C]\[rs]eqref\f[R] only), -\f[C]ipynb\f[R] +\f[C]latex\f[R], \f[C]textile\f[R], \f[C]html\f[R] (environments, +\f[C]\[rs]ref\f[R], and \f[C]\[rs]eqref\f[R] only), \f[C]ipynb\f[R] .TP output formats \f[C]textile\f[R], \f[C]commonmark\f[R] diff --git a/pandoc.cabal b/pandoc.cabal --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: pandoc -version: 2.11.0.2 +version: 2.11.0.3 build-type: Simple license: GPL-2.0-or-later license-file: COPYING.md @@ -420,7 +420,7 @@ file-embed >= 0.0 && < 0.1, filepath >= 1.1 && < 1.5, haddock-library >= 1.8 && < 1.10, - hslua >= 1.1 && < 1.3, + hslua >= 1.1 && < 1.4, hslua-module-system >= 0.2 && < 0.3, hslua-module-text >= 0.2.1 && < 0.4, http-client >= 0.4.30 && < 0.8, @@ -771,7 +771,7 @@ exceptions >= 0.8 && < 0.11, executable-path >= 0.0 && < 0.1, filepath >= 1.1 && < 1.5, - hslua >= 1.1 && < 1.3, + hslua >= 1.1 && < 1.4, mtl >= 2.2 && < 2.3, pandoc-types >= 1.22 && < 1.23, process >= 1.2.3 && < 1.7, diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs --- a/src/Text/Pandoc/App/CommandLineOptions.hs +++ b/src/Text/Pandoc/App/CommandLineOptions.hs @@ -913,7 +913,8 @@ prg <- getProgName defaultDatadirs <- defaultUserDataDirs UTF8.hPutStrLn stdout (prg ++ " " ++ T.unpack pandocVersion ++ - compileInfo ++ "\nDefault user data directory: " ++ + compileInfo ++ + "\nUser data directory: " ++ intercalate " or " defaultDatadirs ++ ('\n':copyrightMessage)) exitSuccess )) @@ -944,16 +945,16 @@ copyrightMessage :: String copyrightMessage = intercalate "\n" [ - "Copyright (C) 2006-2020 John MacFarlane", - "Web: https://pandoc.org", - "This is free software; see the source for copying conditions.", - "There is no warranty, not even for merchantability or fitness", - "for a particular purpose." ] + "Copyright (C) 2006-2020 John MacFarlane. Web: https://pandoc.org", + "This is free software; see the source for copying conditions. There is no", + "warranty, not even for merchantability or fitness for a particular purpose." ] compileInfo :: String compileInfo = - "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++ ", texmath " ++ - VERSION_texmath ++ ", skylighting " ++ VERSION_skylighting + "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++ + ", texmath " ++ VERSION_texmath ++ ", skylighting " ++ + VERSION_skylighting ++ ",\nciteproc " ++ VERSION_citeproc ++ + ", ipynb " ++ VERSION_ipynb handleUnrecognizedOption :: String -> [String] -> [String] handleUnrecognizedOption "--smart" = diff --git a/src/Text/Pandoc/Citeproc.hs b/src/Text/Pandoc/Citeproc.hs --- a/src/Text/Pandoc/Citeproc.hs +++ b/src/Text/Pandoc/Citeproc.hs @@ -524,11 +524,14 @@ go x = x deNote x = x --- Note: we can't use dropTextWhileEnd because this would --- remove the final period on abbreviations like Ibid. --- But removing a final Str "." is safe. +-- Note: we can't use dropTextWhileEnd indiscriminately, +-- because this would remove the final period on abbreviations like Ibid. +-- But it turns out that when the note citation ends with Ibid. +-- (or Ed. etc.), the last inline will be Str "" as a result of +-- the punctuation-fixing mechanism that removes the double '.'. removeFinalPeriod :: [Inline] -> [Inline] removeFinalPeriod ils = case lastMay ils of - Just (Str ".") -> initSafe ils - _ -> ils + Just (Str t) + | T.takeEnd 1 t == "." -> initSafe ils ++ [Str (T.dropEnd 1 t)] + _ -> ils diff --git a/src/Text/Pandoc/Class/IO.hs b/src/Text/Pandoc/Class/IO.hs --- a/src/Text/Pandoc/Class/IO.hs +++ b/src/Text/Pandoc/Class/IO.hs @@ -227,5 +227,6 @@ -- returns the element unchanged otherwise. adjustImagePath :: FilePath -> [FilePath] -> Inline -> Inline adjustImagePath dir paths (Image attr lab (src, tit)) - | unpack src `elem` paths = Image attr lab (pack dir <> "/" <> src, tit) + | unpack src `elem` paths + = Image attr lab (pack (normalise $ dir unpack src), tit) adjustImagePath _ _ x = x diff --git a/src/Text/Pandoc/Readers/DocBook.hs b/src/Text/Pandoc/Readers/DocBook.hs --- a/src/Text/Pandoc/Readers/DocBook.hs +++ b/src/Text/Pandoc/Readers/DocBook.hs @@ -44,7 +44,7 @@ [o] address - A real-world address, generally a postal address [ ] affiliation - The institutional affiliation of an individual [ ] alt - Text representation for a graphical element -[o] anchor - A spot in the document +[x] anchor - A spot in the document [x] answer - An answer to a question posed in a QandASet [x] appendix - An appendix in a Book or Article [x] appendixinfo - Meta-information for an Appendix @@ -72,7 +72,7 @@ [ ] bibliographyinfo - Meta-information for a Bibliography [ ] biblioid - An identifier for a document [o] bibliolist - A wrapper for a set of bibliography entries -[ ] bibliomisc - Untyped bibliographic information +[x] bibliomisc - Untyped bibliographic information [x] bibliomixed - An entry in a Bibliography [ ] bibliomset - A cooked container for related bibliographic information [ ] biblioref - A cross reference to a bibliographic entry @@ -644,6 +644,7 @@ , "bibliodiv" , "biblioentry" , "bibliography" + , "bibliomisc" , "bibliomixed" , "blockquote" , "book" @@ -793,8 +794,13 @@ "titleabbrev" -> skip "authorinitials" -> skip "bibliography" -> sect 0 - "bibliodiv" -> sect 1 + "bibliodiv" -> do + tit <- case filterChild (named "title") e of + Just _ -> sect 1 + Nothing -> return mempty + (tit <>) <$> parseMixed para (elContent e) "biblioentry" -> parseMixed para (elContent e) + "bibliomisc" -> parseMixed para (elContent e) "bibliomixed" -> parseMixed para (elContent e) "equation" -> para <$> equation e displayMath "informalequation" -> para <$> equation e displayMath @@ -1061,6 +1067,8 @@ return $ text $ maybe (T.toUpper $ T.pack ref) T.pack $ lookupEntity ref parseInline (Elem e) = case qName (elName e) of + "anchor" -> do + return $ spanWith (attrValue "id" e, [], []) mempty "phrase" -> do let ident = attrValue "id" e let classes = T.words $ attrValue "class" e diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -22,7 +22,8 @@ - commonmark-0.1.0.2 - commonmark-extensions-0.2.0.1 - commonmark-pandoc-0.2.0.1 -- citeproc-0.1.0.2 +- git: https://github.com/jgm/citeproc + commit: 3230fb6fa1beff3e27389be20217a31d3c1207e9 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules diff --git a/test/command/6765.md b/test/command/6765.md new file mode 100644 --- /dev/null +++ b/test/command/6765.md @@ -0,0 +1,31 @@ +``` +% pandoc --citeproc -t plain +@book_chapter_1 [55] says blah. + +--- +csl: command/chicago-fullnote-bibliography.csl +references: +- id: book_chapter_1 + author: + - family: Author + given: Ann + container-title: A book + editor: + - family: Editor + given: Edward + issued: 2014 + page: 48-67 + publisher: A publisher + publisher-place: A place + title: A book chapter + type: chapter +... +^D +Ann Author[1] says blah. + +Author, Ann. “A Book Chapter.” In A Book, edited by Edward Editor, +48–67. A place: A publisher, 2014. + +[1] “A Book Chapter,” in A Book, ed. Edward Editor (A place: A +publisher, 2014), 55. +``` diff --git a/test/command/citeproc-20.md b/test/command/citeproc-20.md new file mode 100644 --- /dev/null +++ b/test/command/citeproc-20.md @@ -0,0 +1,25 @@ +``` +% pandoc --citeproc -t plain +Lorem ipsum dolor sit amet^[Consectetur adipisicing elit: «sed do eiusmod tempor incididunt» [@doe_1989, 15].]. + +--- +csl: command/chicago-fullnote-bibliography.csl +suppress-bibliography: true +references: +- id: doe_1989 + author: + - family: Doe + given: John + issued: + - year: 1989 + publisher: ABC + publisher-place: New York + title: Tempor + type: book +... +^D +Lorem ipsum dolor sit amet[1]. + +[1] Consectetur adipisicing elit: «sed do eiusmod tempor incididunt» +(John Doe, Tempor (New York: ABC, 1989), 15). +``` diff --git a/test/lhs-test.latex b/test/lhs-test.latex --- a/test/lhs-test.latex +++ b/test/lhs-test.latex @@ -5,12 +5,13 @@ \documentclass[ ]{article} \usepackage{lmodern} -\usepackage{amssymb,amsmath} +\usepackage{amsmath} \usepackage{ifxetex,ifluatex} \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provide euro and other symbols + \usepackage{amssymb} \else % if luatex or xetex \usepackage{unicode-math} \defaultfontfeatures{Scale=MatchLowercase} diff --git a/test/lhs-test.latex+lhs b/test/lhs-test.latex+lhs --- a/test/lhs-test.latex+lhs +++ b/test/lhs-test.latex+lhs @@ -5,12 +5,13 @@ \documentclass[ ]{article} \usepackage{lmodern} -\usepackage{amssymb,amsmath} +\usepackage{amsmath} \usepackage{ifxetex,ifluatex} \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provide euro and other symbols + \usepackage{amssymb} \else % if luatex or xetex \usepackage{unicode-math} \defaultfontfeatures{Scale=MatchLowercase} diff --git a/test/writer.context b/test/writer.context --- a/test/writer.context +++ b/test/writer.context @@ -32,9 +32,9 @@ \setupwhitespace[medium] -\setuphead[chapter] [style=\tfd,header=empty] -\setuphead[section] [style=\tfc] -\setuphead[subsection] [style=\tfb] +\setuphead[chapter] [style=\tfd\setupinterlinespace,header=empty] +\setuphead[section] [style=\tfc\setupinterlinespace] +\setuphead[subsection] [style=\tfb\setupinterlinespace] \setuphead[subsubsection] [style=\bf] \setuphead[subsubsubsection] [style=\sc] \setuphead[subsubsubsubsection][style=\it] diff --git a/test/writer.latex b/test/writer.latex --- a/test/writer.latex +++ b/test/writer.latex @@ -5,12 +5,13 @@ \documentclass[ ]{article} \usepackage{lmodern} -\usepackage{amssymb,amsmath} +\usepackage{amsmath} \usepackage{ifxetex,ifluatex} \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provide euro and other symbols + \usepackage{amssymb} \else % if luatex or xetex \usepackage{unicode-math} \defaultfontfeatures{Scale=MatchLowercase} diff --git a/test/writers-lang-and-dir.context b/test/writers-lang-and-dir.context --- a/test/writers-lang-and-dir.context +++ b/test/writers-lang-and-dir.context @@ -30,9 +30,9 @@ \setupwhitespace[medium] -\setuphead[chapter] [style=\tfd,header=empty] -\setuphead[section] [style=\tfc] -\setuphead[subsection] [style=\tfb] +\setuphead[chapter] [style=\tfd\setupinterlinespace,header=empty] +\setuphead[section] [style=\tfc\setupinterlinespace] +\setuphead[subsection] [style=\tfb\setupinterlinespace] \setuphead[subsubsection] [style=\bf] \setuphead[subsubsubsection] [style=\sc] \setuphead[subsubsubsubsection][style=\it] diff --git a/test/writers-lang-and-dir.latex b/test/writers-lang-and-dir.latex --- a/test/writers-lang-and-dir.latex +++ b/test/writers-lang-and-dir.latex @@ -6,12 +6,13 @@ english, ]{article} \usepackage{lmodern} -\usepackage{amssymb,amsmath} +\usepackage{amsmath} \usepackage{ifxetex,ifluatex} \ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provide euro and other symbols + \usepackage{amssymb} \else % if luatex or xetex \usepackage{unicode-math} \defaultfontfeatures{Scale=MatchLowercase}