aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <[email protected]>2025-07-13 22:46:10 -0700
committerJohn MacFarlane <[email protected]>2025-07-13 22:46:10 -0700
commitcff9ace0db3ec62f9c0fc72529e531e1985133b9 (patch)
treebd9c4b6d5421bb8e93d013f5476d2e4d4f22300c
parent2cf9b55421d7026dac8c45730b8538f13e4bbb78 (diff)
Revert "Export `copyrightMessage` from Text.Pandoc.App module."
This reverts commit 2cf9b55421d7026dac8c45730b8538f13e4bbb78.
-rw-r--r--pandoc-cli/src/pandoc.hs9
-rw-r--r--src/Text/Pandoc/App.hs3
-rw-r--r--src/Text/Pandoc/App/CommandLineOptions.hs1
3 files changed, 9 insertions, 4 deletions
diff --git a/pandoc-cli/src/pandoc.hs b/pandoc-cli/src/pandoc.hs
index dd172696a..9e82d02bc 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, copyrightMessage )
+ , parseOptionsFromArgs, handleOptInfo )
import Text.Pandoc.Error (handleError)
import System.Exit (exitSuccess)
import Data.Monoid (Any(..))
@@ -67,6 +67,13 @@ 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 7b1b7ec10..8585fc555 100644
--- a/src/Text/Pandoc/App.hs
+++ b/src/Text/Pandoc/App.hs
@@ -26,7 +26,6 @@ module Text.Pandoc.App (
, parseOptionsFromArgs
, options
, applyFilters
- , copyrightMessage
) where
import qualified Control.Exception as E
import Control.Monad ( (>=>), when, forM, forM_ )
@@ -56,7 +55,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, copyrightMessage)
+ options, handleOptInfo)
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 383ab04a7..db7d5a1ac 100644
--- a/src/Text/Pandoc/App/CommandLineOptions.hs
+++ b/src/Text/Pandoc/App/CommandLineOptions.hs
@@ -21,7 +21,6 @@ module Text.Pandoc.App.CommandLineOptions (
, options
, engines
, setVariable
- , copyrightMessage
) where
import Control.Monad.Trans
import Control.Monad.State.Strict