diff --git a/lua/PandocCLI/Lua.hs b/lua/PandocCLI/Lua.hs --- a/lua/PandocCLI/Lua.hs +++ b/lua/PandocCLI/Lua.hs @@ -3,7 +3,7 @@ Module : PandocCLI.Lua Copyright : © 2022-2024 Albert Krewinkel License : GPL-2.0-or-later - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Functions to run the pandoc Lua scripting engine. -} @@ -41,8 +41,10 @@ where runStandaloneWithHistory histfile = do let settings = Settings - { settingsVersionInfo = "\nEmbedded in pandoc " <> - pandocVersionText + { settingsVersionInfo = + "\nEmbedded in pandoc " <> + pandocVersionText <> + " Copyright (C) 2006-2024 John MacFarlane" , settingsRunner = runner , settingsHistory = Just histfile } diff --git a/man/pandoc-lua.1 b/man/pandoc-lua.1 --- a/man/pandoc-lua.1 +++ b/man/pandoc-lua.1 @@ -1,6 +1,6 @@ -.\" Automatically generated by Pandoc 3.2.1 +.\" Automatically generated by Pandoc 3.3 .\" -.TH "pandoc-lua" "1" "September 22, 2022" "pandoc 3.2.1" "Pandoc User\[cq]s Guide" +.TH "pandoc-lua" "1" "September 22, 2022" "pandoc 3.3" "Pandoc User\[cq]s Guide" .SH SYNOPSIS \f[CR]pandoc\-lua\f[R] [\f[I]options\f[R]] [\f[I]script\f[R] [\f[I]args\f[R]]] diff --git a/man/pandoc-server.1 b/man/pandoc-server.1 --- a/man/pandoc-server.1 +++ b/man/pandoc-server.1 @@ -1,6 +1,6 @@ -.\" Automatically generated by Pandoc 3.2.1 +.\" Automatically generated by Pandoc 3.3 .\" -.TH "pandoc-server" "1" "August 15, 2022" "pandoc 3.2.1" "Pandoc User\[cq]s Guide" +.TH "pandoc-server" "1" "August 15, 2022" "pandoc 3.3" "Pandoc User\[cq]s Guide" .SH SYNOPSIS \f[CR]pandoc\-server\f[R] [\f[I]options\f[R]] .SH DESCRIPTION diff --git a/man/pandoc.1 b/man/pandoc.1 --- a/man/pandoc.1 +++ b/man/pandoc.1 @@ -1,6 +1,6 @@ -.\" Automatically generated by Pandoc 3.2.1 +.\" Automatically generated by Pandoc 3.3 .\" -.TH "pandoc" "1" "June 24, 2024" "pandoc 3.2.1" "Pandoc User\[cq]s Guide" +.TH "pandoc" "1" "July 28, 2024" "pandoc 3.3" "Pandoc User\[cq]s Guide" .SH NAME pandoc - general markup converter .SH SYNOPSIS @@ -1036,6 +1036,10 @@ duplication. .RE .TP +\f[CR]\-\-link\-images[=true|false]\f[R] +Include links to images instead of embedding the images in ODT. +(This option currently only affects ODT output.) +.TP \f[CR]\-\-html\-q\-tags[=true|false]\f[R] Use \f[CR]\f[R] tags for quotes in HTML. (This option only has an effect if the \f[CR]smart\f[R] extension is @@ -1095,7 +1099,7 @@ become \f[CR]\[rs]part{..}\f[R], while second\-level headings remain as their default type. .TP -\f[CR]\-N\f[R], \f[CR]\-\-number\-sections\f[R] +\f[CR]\-N\f[R], \f[CR]\-\-number\-sections=[true|false]\f[R] Number section headings in LaTeX, ConTeXt, HTML, Docx, ms, or EPUB output. By default, sections are not numbered. @@ -3650,17 +3654,17 @@ rather than being parsed. Use this only when you are targeting \f[CR]ipynb\f[R] or a Markdown\-based output format. -.SS Extension: \f[CR]citations\f[R] +.SS Extension: \f[CR]citations\f[R] (org) When the \f[CR]citations\f[R] extension is enabled in \f[CR]org\f[R], org\-cite and org\-ref style citations will be parsed as native pandoc citations. -.PP +.SS Extension: \f[CR]citations\f[R] (docx) When \f[CR]citations\f[R] is enabled in \f[CR]docx\f[R], citations inserted by Zotero or Mendeley or EndNote plugins will be parsed as native pandoc citations. (Otherwise, the formatted citations generated by the bibliographic software will be parsed as regular text.) -.SS Extension: \f[CR]fancy_lists\f[R] +.SS Extension: \f[CR]fancy_lists\f[R] (org) Some aspects of Pandoc\[cq]s Markdown fancy lists are also accepted in \f[CR]org\f[R] input, mimicking the option \f[CR]org\-list\-allow\-alphabetical\f[R] in Emacs. @@ -7801,7 +7805,7 @@ To be safe, you should run all HTML generated from untrusted user input through an HTML sanitizer. .SH AUTHORS -Copyright 2006\[en]2022 John MacFarlane (jgm\[at]berkeley.edu). +Copyright 2006\[en]2024 John MacFarlane (jgm\[at]berkeley.edu). Released under the GPL, version 2 or greater. This software carries no warranty of any kind. (See COPYRIGHT for full copyright and warranty notices.) diff --git a/no-lua/PandocCLI/Lua.hs b/no-lua/PandocCLI/Lua.hs --- a/no-lua/PandocCLI/Lua.hs +++ b/no-lua/PandocCLI/Lua.hs @@ -2,7 +2,7 @@ Module : PandocCLI.Lua Copyright : © 2022-2024 Albert Krewinkel License : GPL-2.0-or-later - Maintainer : Albert Krewinkel + Maintainer : Albert Krewinkel Placeholder values to be used when pandoc is compiled without support for the Lua scripting engine. diff --git a/pandoc-cli.cabal b/pandoc-cli.cabal --- a/pandoc-cli.cabal +++ b/pandoc-cli.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: pandoc-cli -version: 3.2.1 +version: 3.3 build-type: Simple license: GPL-2.0-or-later license-file: COPYING.md @@ -70,7 +70,7 @@ buildable: True -- Note: we always link to an exact version of pandoc, with the -- same version as this package: - build-depends: pandoc == 3.2.1, + build-depends: pandoc == 3.3, text other-modules: PandocCLI.Lua , PandocCLI.Server @@ -89,7 +89,7 @@ if flag(lua) build-depends: hslua-cli >= 1.4.1 && < 1.5, - pandoc-lua-engine >= 0.3 && < 0.4, + pandoc-lua-engine >= 0.3.1 && < 0.4, temporary >= 1.1 && < 1.4 hs-source-dirs: lua else diff --git a/src/pandoc.hs b/src/pandoc.hs --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -20,7 +20,6 @@ import Text.Pandoc.Error (handleError) import System.Exit (exitSuccess) import Data.Monoid (Any(..)) -import Control.Monad (when) import PandocCLI.Lua import PandocCLI.Server import qualified Text.Pandoc.UTF8 as UTF8 @@ -52,16 +51,16 @@ let hasVersion = getAny $ foldMap (\s -> Any (s == "-v" || s == "--version")) (takeWhile (/= "--") rawArgs) - when hasVersion versionInfo + let versionOr action = if hasVersion then versionInfo else action case prg of - "pandoc-server.cgi" -> runCGI - "pandoc-server" -> runServer rawArgs + "pandoc-server.cgi" -> versionOr runCGI + "pandoc-server" -> versionOr $ runServer rawArgs "pandoc-lua" -> runLuaInterpreter prg rawArgs _ -> case rawArgs of "lua" : args -> runLuaInterpreter "pandoc lua" args - "server": args -> runServer args - args -> do + "server": args -> versionOr $ runServer args + args -> versionOr $ do engine <- getEngine res <- parseOptionsFromArgs options defaultOpts prg args case res of