diff options
| -rw-r--r-- | pandoc-cli/src/pandoc.hs | 9 | ||||
| -rw-r--r-- | src/Text/Pandoc/App.hs | 3 | ||||
| -rw-r--r-- | src/Text/Pandoc/App/CommandLineOptions.hs | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/pandoc-cli/src/pandoc.hs b/pandoc-cli/src/pandoc.hs index 9e82d02bc..dd172696a 100644 --- a/pandoc-cli/src/pandoc.hs +++ b/pandoc-cli/src/pandoc.hs @@ -16,7 +16,7 @@ module Main where import qualified Control.Exception as E import System.Environment (getArgs, getProgName) import Text.Pandoc.App ( convertWithOpts, defaultOpts, options - , parseOptionsFromArgs, handleOptInfo ) + , parseOptionsFromArgs, handleOptInfo, copyrightMessage ) import Text.Pandoc.Error (handleError) import System.Exit (exitSuccess) import Data.Monoid (Any(..)) @@ -67,13 +67,6 @@ main = E.handle (handleError . Left) $ do Left e -> handleOptInfo engine e Right opts -> convertWithOpts engine opts -copyrightMessage :: String -copyrightMessage = - "Copyright (C) 2006-2024 John MacFarlane. Web: https://pandoc.org\n" - ++ - "This is free software; see the source for copying conditions. There is no\n" - ++ - "warranty, not even for merchantability or fitness for a particular purpose." flagSettings :: String flagSettings = "Features: " ++ diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs index 8585fc555..7b1b7ec10 100644 --- a/src/Text/Pandoc/App.hs +++ b/src/Text/Pandoc/App.hs @@ -26,6 +26,7 @@ module Text.Pandoc.App ( , parseOptionsFromArgs , options , applyFilters + , copyrightMessage ) where import qualified Control.Exception as E import Control.Monad ( (>=>), when, forM, forM_ ) @@ -55,7 +56,7 @@ import Text.Pandoc.Image (svgToPng) import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), defaultOpts, IpynbOutput (..), OptInfo(..)) import Text.Pandoc.App.CommandLineOptions (parseOptions, parseOptionsFromArgs, - options, handleOptInfo) + options, handleOptInfo, copyrightMessage) import Text.Pandoc.App.Input (InputParameters (..), readInput) import Text.Pandoc.App.OutputSettings (OutputSettings (..), optToOutputSettings, sandbox') diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs index db7d5a1ac..383ab04a7 100644 --- a/src/Text/Pandoc/App/CommandLineOptions.hs +++ b/src/Text/Pandoc/App/CommandLineOptions.hs @@ -21,6 +21,7 @@ module Text.Pandoc.App.CommandLineOptions ( , options , engines , setVariable + , copyrightMessage ) where import Control.Monad.Trans import Control.Monad.State.Strict |