diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,15 @@ # Revision history for pandoc +## pandoc 2.17.1.1 (2022-01-31) + + * Fix regression in 2.17.1 which caused problems finding + default files in the default user data directory. (Reverts + the item "logic bug in `fullDefaultsPath`", which was + misguided.) + + * Sample custom writer: use single quotes for strings (#7487, + Albert Krewinkel). + ## pandoc 2.17.1 (2022-01-30) * Support `pagedjs-cli` as pdf engine (#7838, Albert Krewinkel). diff --git a/data/sample.lua b/data/sample.lua --- a/data/sample.lua +++ b/data/sample.lua @@ -14,7 +14,7 @@ -- syntax errors. local pipe = pandoc.pipe -local stringify = (require "pandoc.utils").stringify +local stringify = (require 'pandoc.utils').stringify -- The global variable PANDOC_DOCUMENT contains the full AST of -- the document which is going to be written. It can be used to @@ -25,19 +25,19 @@ -- `image_format` meta value. local image_format = meta.image_format and stringify(meta.image_format) - or "png" + or 'png' local image_mime_type = ({ - jpeg = "image/jpeg", - jpg = "image/jpeg", - gif = "image/gif", - png = "image/png", - svg = "image/svg+xml", + jpeg = 'image/jpeg', + jpg = 'image/jpeg', + gif = 'image/gif', + png = 'image/png', + svg = 'image/svg+xml', })[image_format] - or error("unsupported image format `" .. image_format .. "`") + or error('unsupported image format `' .. image_format .. '`') -- Character escaping local function escape(s, in_attribute) - return s:gsub("[<>&\"']", + return s:gsub('[<>&"\']', function(x) if x == '<' then return '<' @@ -60,7 +60,7 @@ local function attributes(attr) local attr_table = {} for x,y in pairs(attr) do - if y and y ~= "" then + if y and y ~= '' then table.insert(attr_table, ' ' .. x .. '="' .. escape(y,true) .. '"') end end @@ -72,7 +72,7 @@ -- Blocksep is used to separate block elements. function Blocksep() - return "\n\n" + return '\n\n' end -- This function is called once for the whole document. Parameters: @@ -106,31 +106,31 @@ end function Space() - return " " + return ' ' end function SoftBreak() - return "\n" + return '\n' end function LineBreak() - return "
" + return '
' end function Emph(s) - return "" .. s .. "" + return '' .. s .. '' end function Strong(s) - return "" .. s .. "" + return '' .. s .. '' end function Subscript(s) - return "" .. s .. "" + return '' .. s .. '' end function Superscript(s) - return "" .. s .. "" + return '' .. s .. '' end function SmallCaps(s) @@ -142,33 +142,33 @@ end function Link(s, tgt, tit, attr) - return "" .. s .. "" + return '' .. s .. '' end function Image(s, src, tit, attr) - return "" + return '' end function Code(s, attr) - return "" .. escape(s) .. "" + return '' .. escape(s) .. '' end function InlineMath(s) - return "\\(" .. escape(s) .. "\\)" + return '\\(' .. escape(s) .. '\\)' end function DisplayMath(s) - return "\\[" .. escape(s) .. "\\]" + return '\\[' .. escape(s) .. '\\]' end function SingleQuoted(s) - return "‘" .. s .. "’" + return '‘' .. s .. '’' end function DoubleQuoted(s) - return "“" .. s .. "”" + return '“' .. s .. '”' end function Note(s) @@ -184,11 +184,11 @@ end function Span(s, attr) - return "" .. s .. "" + return '' .. s .. '' end function RawInline(format, str) - if format == "html" then + if format == 'html' then return str else return '' @@ -200,8 +200,8 @@ for _,cit in ipairs(cs) do table.insert(ids, cit.citationId) end - return "" .. s .. "" + return '' .. s .. '' end function Plain(s) @@ -209,16 +209,16 @@ end function Para(s) - return "

" .. s .. "

" + return '

' .. s .. '

' end -- lev is an integer, the header level. function Header(lev, s, attr) - return "" .. s .. "" + return '' .. s .. '' end function BlockQuote(s) - return "
\n" .. s .. "\n
" + return '
\n' .. s .. '\n
' end function HorizontalRule() @@ -234,39 +234,39 @@ -- If code block has class 'dot', pipe the contents through dot -- and base64, and include the base64-encoded png as a data: URL. if attr.class and string.match(' ' .. attr.class .. ' ',' dot ') then - local img = pipe("base64", {}, pipe("dot", {"-T" .. image_format}, s)) + local img = pipe('base64', {}, pipe('dot', {'-T' .. image_format}, s)) return '' -- otherwise treat as code (one could pipe through a highlighter) else - return "
" .. escape(s) ..
-           "
" + return '
' .. escape(s) ..
+           '
' end end function BulletList(items) local buffer = {} for _, item in pairs(items) do - table.insert(buffer, "
  • " .. item .. "
    • ") + table.insert(buffer, '
  • ' .. item .. '
    • ') end - return "
      \n" .. table.concat(buffer, "\n") .. "\n
    " + return '
      \n' .. table.concat(buffer, '\n') .. '\n
    ' end function OrderedList(items) local buffer = {} for _, item in pairs(items) do - table.insert(buffer, "
  • " .. item .. "
    • ") + table.insert(buffer, '
  • ' .. item .. '
    • ') end - return "
      \n" .. table.concat(buffer, "\n") .. "\n
    " + return '
      \n' .. table.concat(buffer, '\n') .. '\n
    ' end function DefinitionList(items) local buffer = {} for _,item in pairs(items) do local k, v = next(item) - table.insert(buffer, "
    " .. k .. "
    \n
    " .. - table.concat(v, "
    \n
    ") .. "
    ") + table.insert(buffer, '
    ' .. k .. '
    \n
    ' .. + table.concat(v, '
    \n
    ') .. '
    ') end - return "
    \n" .. table.concat(buffer, "\n") .. "\n
    " + return '
    \n' .. table.concat(buffer, '\n') .. '\n
    ' end -- Convert pandoc alignment to something HTML can use. @@ -303,13 +303,13 @@ local function add(s) table.insert(buffer, s) end - add("") - if caption ~= "" then - add("") + add('
    " .. escape(caption) .. "
    ') + if caption ~= '' then + add('') end if widths and widths[1] ~= 0 then for _, w in pairs(widths) do - add('') + add('') end end local header_row = {} @@ -317,7 +317,7 @@ for i, h in pairs(headers) do local align = html_align(aligns[i]) table.insert(header_row,'') - empty_header = empty_header and h == "" + empty_header = empty_header and h == '' end if not empty_header then add('') @@ -326,9 +326,9 @@ end add('') end - local class = "even" + local class = 'even' for _, row in pairs(rows) do - class = (class == "even" and "odd") or "even" + class = (class == 'even' and 'odd') or 'even' add('') for i,c in pairs(row) do add('') @@ -340,7 +340,7 @@ end function RawBlock(format, str) - if format == "html" then + if format == 'html' then return str else return '' @@ -348,7 +348,7 @@ end function Div(s, attr) - return "\n" .. s .. "" + return '\n' .. s .. '' end -- The following code will produce runtime warnings when you haven't defined @@ -358,6 +358,6 @@ meta.__index = function(_, key) io.stderr:write(string.format("WARNING: Undefined function '%s'\n",key)) - return function() return "" end + return function() return '' end end setmetatable(_G, meta) diff --git a/man/pandoc.1 b/man/pandoc.1 --- a/man/pandoc.1 +++ b/man/pandoc.1 @@ -1,5 +1,5 @@ '\" t -.\" Automatically generated by Pandoc 2.17.0.1 +.\" Automatically generated by Pandoc 2.17.1 .\" .\" Define V font for inline verbatim, using C font in formats .\" that render this, and otherwise B font. @@ -15,7 +15,7 @@ . ftr VB CB . ftr VBI CBI .\} -.TH "Pandoc User\[cq]s Guide" "" "January 30, 2022" "pandoc 2.17.1" "" +.TH "Pandoc User\[cq]s Guide" "" "January 30, 2022" "pandoc 2.17.1.1" "" .hy .SH NAME pandoc - general markup converter diff --git a/pandoc.cabal b/pandoc.cabal --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: pandoc -version: 2.17.1 +version: 2.17.1.1 build-type: Simple license: GPL-2.0-or-later license-file: COPYING.md diff --git a/src/Text/Pandoc/App/Opt.hs b/src/Text/Pandoc/App/Opt.hs --- a/src/Text/Pandoc/App/Opt.hs +++ b/src/Text/Pandoc/App/Opt.hs @@ -707,10 +707,9 @@ let fp = if null (takeExtension file) then addExtension file "yaml" else file - let searchpath = fp : case dataDir of - Nothing -> [] - Just d -> [d "defaults" fp] - fromMaybe fp <$> findM fileExists searchpath + defaultDataDir <- liftIO defaultUserDataDir + let defaultFp = fromMaybe defaultDataDir dataDir "defaults" fp + fromMaybe fp <$> findM fileExists [fp, defaultFp] -- | In a list of lists, append another list in front of every list which -- starts with specific element. diff --git a/test/writer.custom b/test/writer.custom --- a/test/writer.custom +++ b/test/writer.custom @@ -5,7 +5,7 @@

    Headers

    - +

    Level 3 with emphasis

    @@ -525,7 +525,7 @@

    This is strong, and so is this.

    -

    An emphasized link.

    +

    An emphasized link.

    This is strong and em.

    @@ -560,7 +560,7 @@

    ‘He said, “I want to go.”’ Were you alive in the 70’s?

    -

    Here is some quoted ‘code’ and a “quoted link”.

    +

    Here is some quoted ‘code’ and a “quoted link”.

    Some dashes: one—two — three—four — five.

    @@ -660,70 +660,70 @@

    Explicit

    -

    Just a URL.

    +

    Just a URL.

    -

    URL and title.

    +

    URL and title.

    -

    URL and title.

    +

    URL and title.

    -

    URL and title.

    +

    URL and title.

    -

    URL and title

    +

    URL and title

    -

    URL and title

    +

    URL and title

    -

    with_underscore

    +

    with_underscore

    -

    Email link

    +

    Email link

    -

    Empty.

    +

    Empty.

    Reference

    -

    Foo bar.

    +

    Foo bar.

    -

    With embedded [brackets].

    +

    With embedded [brackets].

    -

    b by itself should be a link.

    +

    b by itself should be a link.

    -

    Indented once.

    +

    Indented once.

    -

    Indented twice.

    +

    Indented twice.

    -

    Indented thrice.

    +

    Indented thrice.

    This should [not][] be a link.

    [not]: /url
    -

    Foo bar.

    +

    Foo bar.

    -

    Foo biz.

    +

    Foo biz.

    With ampersands

    -

    Here’s a link with an ampersand in the URL.

    +

    Here’s a link with an ampersand in the URL.

    -

    Here’s a link with an amersand in the link text: AT&T.

    +

    Here’s a link with an amersand in the link text: AT&T.

    -

    Here’s an inline link.

    +

    Here’s an inline link.

    -

    Here’s an inline link in pointy braces.

    +

    Here’s an inline link in pointy braces.

    -

    With an ampersand: http://example.com/?foo=1&bar=2

    +

    With an ampersand: http://example.com/?foo=1&bar=2

    -

    An e-mail address:

    +

    An e-mail address:

    -

    Blockquoted: http://example.com/

    +

    Blockquoted: http://example.com/

    Auto-links should not occur here: <http://example.com/>

    @@ -740,7 +740,7 @@ lalune
    lalune
    -

    Here is a movie icon.

    +

    Here is a movie icon.

    @@ -774,7 +774,7 @@ lazy and just indent the first line of each block. ↩

  • This is easier to type. Inline notes may contain -links and ] verbatim characters, +links and ] verbatim characters, as well as [bracketed text]. ↩

  • In quote. ↩

  • In list. ↩

    • ' .. escape(caption) .. '
    ' .. h .. '
    ' .. c .. '