Switch Options to Text, add Legacy, remove redundant imports elsewhere

author: despresc <[email protected]> 2019-11-05 16:58:20 -0500
committer: despresc <[email protected]> 2019-11-08 15:45:02 -0500
commit: 0b8113c62a65f07ab0bdbbc0fd7bf7e6e5804543 (patch)
tree: 2deceb62d4f492c48f76ea1b0d44c6d7e7fe2a12
parent: db6a63d1ff3f48317cb7e71afcda6ddc8bcf66bc (diff)
93 files changed, 400 insertions, 123 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index 1ca4fd260..5adc0786a 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -556,6 +556,7 @@ library
                    , Text.Pandoc.Legacy.Translations
                    , Text.Pandoc.Legacy.Logging
                    , Text.Pandoc.Legacy.MIME
+                   , Text.Pandoc.Legacy.Options
                    --
   other-modules:   Text.Pandoc.App.CommandLineOptions,
                    Text.Pandoc.App.FormatHeuristics,
diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs
index f90881a71..8d55df87f 100644
--- a/src/Text/Pandoc.hs
+++ b/src/Text/Pandoc.hs
@@ -42,7 +42,8 @@ module Text.Pandoc
                -- * Generics
                , module Text.Pandoc.Generic
                -- * Options
-               , module Text.Pandoc.Options
+               , -- module Text.Pandoc.Options TODO text: restore
+                 module Text.Pandoc.Legacy.Options
                -- * Logging
                , -- module Text.Pandoc.Logging -- TODO text: restore
                  module Text.Pandoc.Legacy.Logging
@@ -65,7 +66,7 @@ import Text.Pandoc.Definition
 import Text.Pandoc.Error
 import Text.Pandoc.Generic
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Readers
 import Text.Pandoc.Legacy.Shared (pandocVersion)
 import Text.Pandoc.Templates
diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs
index 43c75fda1..9a212653d 100644
--- a/src/Text/Pandoc/App.hs
+++ b/src/Text/Pandoc/App.hs
@@ -69,7 +69,7 @@ import System.Posix.Terminal (queryTerminal)
 
 -- TODO text: remove
 import Text.Pandoc hiding (MetaValue(..), lookupMeta, Format(..))
-import Text.Pandoc.Legacy.Builder (lookupMeta, MetaValue(..), pattern MetaString, Format, pattern Format)
+import Text.Pandoc.Legacy.Builder (lookupMeta,  pattern Format)
 --
 
 convertWithOpts :: Opt -> IO ()
diff --git a/src/Text/Pandoc/App/Opt.hs b/src/Text/Pandoc/App/Opt.hs
index ecc99cc72..9cd9030d2 100644
--- a/src/Text/Pandoc/App/Opt.hs
+++ b/src/Text/Pandoc/App/Opt.hs
@@ -28,7 +28,7 @@ import Data.Char (isLower, toLower)
 import GHC.Generics hiding (Meta)
 import Text.Pandoc.Filter (Filter (..))
 import Text.Pandoc.Legacy.Logging (Verbosity (WARNING))
-import Text.Pandoc.Options (TopLevelDivision (TopLevelDefault),
+import Text.Pandoc.Legacy.Options (TopLevelDivision (TopLevelDefault),
                             TrackChanges (AcceptChanges),
                             WrapOption (WrapAuto), HTMLMathMethod (PlainMath),
                             ReferenceLocation (EndOfDocument),
diff --git a/src/Text/Pandoc/BCP47.hs b/src/Text/Pandoc/BCP47.hs
index ea7754068..b877eb56f 100644
--- a/src/Text/Pandoc/BCP47.hs
+++ b/src/Text/Pandoc/BCP47.hs
@@ -24,7 +24,7 @@ import Data.Char (isAlphaNum, isAscii, isLetter, isLower, isUpper, toLower,
                   toUpper)
 import Data.List (intercalate)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocTemplates (FromContext(..))
 import qualified Data.Text as T
 import qualified Text.Parsec as P
diff --git a/src/Text/Pandoc/Filter.hs b/src/Text/Pandoc/Filter.hs
index adea0d5e2..8bc68bb55 100644
--- a/src/Text/Pandoc/Filter.hs
+++ b/src/Text/Pandoc/Filter.hs
@@ -24,7 +24,7 @@ import Data.Aeson.TH (deriveJSON, defaultOptions)
 import GHC.Generics (Generic)
 import Text.Pandoc.Class (PandocIO)
 import Text.Pandoc.Definition (Pandoc)
-import Text.Pandoc.Options (ReaderOptions)
+import Text.Pandoc.Legacy.Options (ReaderOptions)
 import qualified Text.Pandoc.Filter.JSON as JSONFilter
 import qualified Text.Pandoc.Filter.Lua as LuaFilter
 import qualified Text.Pandoc.Filter.Path as Path
diff --git a/src/Text/Pandoc/Filter/JSON.hs b/src/Text/Pandoc/Filter/JSON.hs
index 9fc2b50c1..5f0c3f788 100644
--- a/src/Text/Pandoc/Filter/JSON.hs
+++ b/src/Text/Pandoc/Filter/JSON.hs
@@ -26,7 +26,7 @@ import System.FilePath ((</>), takeExtension)
 import Text.Pandoc.Class (PandocIO)
 import Text.Pandoc.Error (PandocError (PandocFilterError))
 import Text.Pandoc.Definition (Pandoc)
-import Text.Pandoc.Options (ReaderOptions)
+import Text.Pandoc.Legacy.Options (ReaderOptions)
 import Text.Pandoc.Process (pipeProcess)
 import Text.Pandoc.Legacy.Shared (pandocVersion)
 import qualified Control.Exception as E
diff --git a/src/Text/Pandoc/Filter/Lua.hs b/src/Text/Pandoc/Filter/Lua.hs
index afe525ab1..824c1843e 100644
--- a/src/Text/Pandoc/Filter/Lua.hs
+++ b/src/Text/Pandoc/Filter/Lua.hs
@@ -20,7 +20,7 @@ import Text.Pandoc.Definition (Pandoc)
 import Text.Pandoc.Error (PandocError (PandocFilterError))
 import Text.Pandoc.Lua (Global (..), LuaException (..),
                         runLua, runFilterFile, setGlobals)
-import Text.Pandoc.Options (ReaderOptions)
+import Text.Pandoc.Legacy.Options (ReaderOptions)
 
 -- | Run the Lua filter in @filterPath@ for a transformation to the
 -- target format (first element in args). Pandoc uses Lua init files to
diff --git a/src/Text/Pandoc/ImageSize.hs b/src/Text/Pandoc/ImageSize.hs
index df35e8db1..20767d395 100644
--- a/src/Text/Pandoc/ImageSize.hs
+++ b/src/Text/Pandoc/ImageSize.hs
@@ -45,7 +45,7 @@ import Text.Pandoc.Legacy.Shared (safeRead) -- TODO text: remove Legacy
 import Data.Default (Default)
 import Numeric (showFFloat)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import qualified Text.Pandoc.UTF8 as UTF8
 import qualified Text.XML.Light as Xml
 import qualified Data.Map as M
diff --git a/src/Text/Pandoc/Legacy/Options.hs b/src/Text/Pandoc/Legacy/Options.hs
new file mode 100644
index 000000000..6dd58b7f7
--- /dev/null
+++ b/src/Text/Pandoc/Legacy/Options.hs
@@ -0,0 +1,217 @@
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE PatternSynonyms #-}
+{-# LANGUAGE ViewPatterns #-}
+
+module Text.Pandoc.Legacy.Options
+  ( module Text.Pandoc.Legacy.Extensions
+  , TP.ReaderOptions
+  , pattern ReaderOptions
+  , readerExtensions
+  , readerStandalone
+  , readerColumns
+  , readerTabStop
+  , readerIndentedCodeClasses
+  , readerAbbreviations
+  , readerDefaultImageExtension
+  , readerTrackChanges
+  , readerStripComments
+  , TP.HTMLMathMethod ( TP.PlainMath, TP.GladTeX, TP.MathML )
+  , pattern WebTeX
+  , pattern MathJax
+  , pattern KaTeX
+  , TP.CiteMethod(..)
+  , TP.ObfuscationMethod(..)
+  , TP.HTMLSlideVariant (..)
+  , TP.EPUBVersion (..)
+  , TP.WrapOption (..)
+  , TP.TopLevelDivision (..)
+  , TP.WriterOptions
+  , pattern WriterOptions
+  , writerTemplate
+  , writerVariables
+  , writerTabStop
+  , writerTableOfContents
+  , writerIncremental
+  , writerHTMLMathMethod
+  , writerNumberSections
+  , writerNumberOffset
+  , writerSectionDivs
+  , writerExtensions
+  , writerReferenceLinks
+  , writerDpi
+  , writerWrapText
+  , writerColumns
+  , writerEmailObfuscation
+  , writerIdentifierPrefix
+  , writerCiteMethod
+  , writerHtmlQTags
+  , writerSlideLevel
+  , writerTopLevelDivision
+  , writerListings
+  , writerHighlightStyle
+  , writerSetextHeaders
+  , writerEpubSubdirectory
+  , writerEpubMetadata
+  , writerEpubFonts
+  , writerEpubChapterLevel
+  , writerTOCDepth
+  , writerReferenceDoc
+  , writerReferenceLocation
+  , writerSyntaxMap
+  , writerPreferAscii
+  , TP.TrackChanges (..)
+  , TP.ReferenceLocation (..)
+  , TP.def
+  , TP.isEnabled
+  , defaultMathJaxURL
+  , defaultKaTeXURL
+  ) where
+
+import Text.Pandoc.Highlighting (Style)
+import Skylighting (SyntaxMap)
+import Text.DocTemplates (Template, Context)
+import Data.Text (Text)
+import qualified Data.Set as Set
+import qualified Text.Pandoc.Options as TP
+import qualified Data.Text as T
+import Text.Pandoc.Legacy.Extensions
+
+pattern ReaderOptions :: TP.Extensions -> Bool -> Int -> Int -> [String] -> Set.Set String -> String -> TP.TrackChanges -> Bool -> TP.ReaderOptions
+pattern ReaderOptions {
+         readerExtensions
+       , readerStandalone
+       , readerColumns
+       , readerTabStop
+       , readerIndentedCodeClasses
+       , readerAbbreviations
+       , readerDefaultImageExtension
+       , readerTrackChanges
+       , readerStripComments } <- TP.ReaderOptions readerExtensions readerStandalone readerColumns readerTabStop (map T.unpack -> readerIndentedCodeClasses) (Set.map T.unpack -> readerAbbreviations) (T.unpack -> readerDefaultImageExtension) readerTrackChanges readerStripComments
+  where
+    ReaderOptions a b c d e f = TP.ReaderOptions a b c d (map T.pack e) (Set.map T.pack f) . T.pack
+
+pattern WebTeX :: String -> TP.HTMLMathMethod
+pattern WebTeX x <- TP.WebTeX (T.unpack -> x)
+  where
+    WebTeX = TP.WebTeX . T.pack
+
+pattern MathJax :: String -> TP.HTMLMathMethod
+pattern MathJax x <- TP.MathJax (T.unpack -> x)
+  where
+    MathJax = TP.MathJax . T.pack
+
+pattern KaTeX :: String -> TP.HTMLMathMethod
+pattern KaTeX x <- TP.KaTeX (T.unpack -> x)
+  where
+    KaTeX = TP.KaTeX . T.pack
+
+pattern WriterOptions
+  :: Maybe (Template Text)
+  -> Context Text
+  -> Int
+  -> Bool
+  -> Bool
+  -> TP.HTMLMathMethod
+  -> Bool
+  -> [Int]
+  -> Bool
+  -> TP.Extensions
+  -> Bool
+  -> Int
+  -> TP.WrapOption
+  -> Int
+  -> TP.ObfuscationMethod
+  -> String
+  -> TP.CiteMethod
+  -> Bool
+  -> Maybe Int
+  -> TP.TopLevelDivision
+  -> Bool
+  -> Maybe Style
+  -> Bool
+  -> String
+  -> Maybe String
+  -> [FilePath]
+  -> Int
+  -> Int
+  -> Maybe FilePath
+  -> TP.ReferenceLocation
+  -> SyntaxMap
+  -> Bool
+  -> TP.WriterOptions
+pattern WriterOptions
+  { writerTemplate
+  , writerVariables
+  , writerTabStop
+  , writerTableOfContents
+  , writerIncremental
+  , writerHTMLMathMethod
+  , writerNumberSections
+  , writerNumberOffset
+  , writerSectionDivs
+  , writerExtensions
+  , writerReferenceLinks
+  , writerDpi
+  , writerWrapText
+  , writerColumns
+  , writerEmailObfuscation
+  , writerIdentifierPrefix
+  , writerCiteMethod
+  , writerHtmlQTags
+  , writerSlideLevel
+  , writerTopLevelDivision
+  , writerListings
+  , writerHighlightStyle
+  , writerSetextHeaders
+  , writerEpubSubdirectory
+  , writerEpubMetadata
+  , writerEpubFonts
+  , writerEpubChapterLevel
+  , writerTOCDepth
+  , writerReferenceDoc
+  , writerReferenceLocation
+  , writerSyntaxMap
+  , writerPreferAscii } <- TP.WriterOptions
+                           writerTemplate
+                           writerVariables
+                           writerTabStop
+                           writerTableOfContents
+                           writerIncremental
+                           writerHTMLMathMethod
+                           writerNumberSections
+                           writerNumberOffset
+                           writerSectionDivs
+                           writerExtensions
+                           writerReferenceLinks
+                           writerDpi
+                           writerWrapText
+                           writerColumns
+                           writerEmailObfuscation
+                           (T.unpack -> writerIdentifierPrefix)
+                           writerCiteMethod
+                           writerHtmlQTags
+                           writerSlideLevel
+                           writerTopLevelDivision
+                           writerListings
+                           writerHighlightStyle
+                           writerSetextHeaders
+                           (T.unpack -> writerEpubSubdirectory)
+                           (fmap T.unpack -> writerEpubMetadata)
+                           writerEpubFonts
+                           writerEpubChapterLevel
+                           writerTOCDepth
+                           writerReferenceDoc
+                           writerReferenceLocation
+                           writerSyntaxMap
+                           writerPreferAscii
+  where
+    WriterOptions a b c d e f g h i j k l m n o p q r s t u v w x
+      = TP.WriterOptions a b c d e f g h i j k l m n o (T.pack p) q r s t u v w (T.pack x) . fmap T.pack
+
+defaultMathJaxURL :: String
+defaultMathJaxURL = T.unpack TP.defaultMathJaxURL
+
+defaultKaTeXURL :: String
+defaultKaTeXURL = T.unpack TP.defaultKaTeXURL
+
+
diff --git a/src/Text/Pandoc/Lua/Global.hs b/src/Text/Pandoc/Lua/Global.hs
index b9b6c9cd9..82ebb3964 100644
--- a/src/Text/Pandoc/Lua/Global.hs
+++ b/src/Text/Pandoc/Lua/Global.hs
@@ -25,7 +25,7 @@ import Text.Pandoc.Class (CommonState)
 import Text.Pandoc.Definition (Pandoc (Pandoc), pandocTypesVersion)
 import Text.Pandoc.Lua.Marshaling ()
 import Text.Pandoc.Lua.Util (addFunction)
-import Text.Pandoc.Options (ReaderOptions)
+import Text.Pandoc.Legacy.Options (ReaderOptions)
 
 import qualified Foreign.Lua as Lua
 
diff --git a/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs b/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs
index 5395f6fc8..f53f0a4ae 100644
--- a/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs
+++ b/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs
@@ -22,12 +22,16 @@ import Foreign.Lua (Lua, Pushable)
 import Text.Pandoc.Extensions (Extensions)
 import Text.Pandoc.Lua.Marshaling.AnyValue (AnyValue (..))
 import Text.Pandoc.Lua.Marshaling.CommonState ()
-import Text.Pandoc.Options (ReaderOptions (..), TrackChanges)
+-- import Text.Pandoc.Options (ReaderOptions (..), TrackChanges) TODO text: restore
 
 import qualified Data.Set as Set
 import qualified Foreign.Lua as Lua
 import qualified Text.Pandoc.Lua.Util as LuaUtil
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 --
 -- Reader Options
 --
diff --git a/src/Text/Pandoc/Lua/Module/Pandoc.hs b/src/Text/Pandoc/Lua/Module/Pandoc.hs
index 182008da7..8a1064d44 100644
--- a/src/Text/Pandoc/Lua/Module/Pandoc.hs
+++ b/src/Text/Pandoc/Lua/Module/Pandoc.hs
@@ -27,10 +27,14 @@ import Text.Pandoc.Definition (Block, Inline)
 import Text.Pandoc.Lua.Filter (walkInlines, walkBlocks, LuaFilter, SingletonsList (..))
 import Text.Pandoc.Lua.Marshaling ()
 import Text.Pandoc.Walk (Walkable)
-import Text.Pandoc.Options (ReaderOptions (readerExtensions))
+-- import Text.Pandoc.Options (ReaderOptions (readerExtensions)) TODO text: restore
 import Text.Pandoc.Process (pipeProcess)
 import Text.Pandoc.Readers (Reader (..), getReader)
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 import qualified Data.ByteString.Lazy as BL
 import qualified Data.ByteString.Lazy.Char8 as BSL
 import qualified Foreign.Lua as Lua
diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs
index 80ee56056..9fe1cf993 100644
--- a/src/Text/Pandoc/Options.hs
+++ b/src/Text/Pandoc/Options.hs
@@ -16,7 +16,7 @@
 Data structures and functions for representing parser and writer
 options.
 -}
-module Text.Pandoc.Options ( module Text.Pandoc.Legacy.Extensions -- TODO text: remove Legacy
+module Text.Pandoc.Options ( module Text.Pandoc.Extensions
                            , ReaderOptions(..)
                            , HTMLMathMethod (..)
                            , CiteMethod (..)
@@ -36,17 +36,18 @@ module Text.Pandoc.Options ( module Text.Pandoc.Legacy.Extensions -- TODO text:
 import Prelude
 import Control.Applicative ((<|>))
 import Data.Char (toLower)
+import Data.Maybe (fromMaybe)
 import Data.Data (Data)
 import Data.Default
-import Data.Text (Text, unpack)
+import Data.Text (Text)
 import Text.DocTemplates (Context(..))
 import qualified Data.Set as Set
 import Data.Typeable (Typeable)
 import GHC.Generics (Generic)
 import Skylighting (SyntaxMap, defaultSyntaxMap)
-import Text.Pandoc.Legacy.Extensions -- TODO text: remove Legacy
-import Text.Pandoc.Legacy.Highlighting (Style, pygments)
-import Text.Pandoc.Legacy.Shared (camelCaseToHyphenated)
+import Text.Pandoc.Extensions
+import Text.Pandoc.Highlighting (Style, pygments)
+import Text.Pandoc.Shared (camelCaseToHyphenated)
 import Text.DocTemplates (Template)
 import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..),
                       SumEncoding(..))
@@ -60,10 +61,10 @@ data ReaderOptions = ReaderOptions{
        , readerStandalone            :: Bool -- ^ Standalone document with header
        , readerColumns               :: Int  -- ^ Number of columns in terminal
        , readerTabStop               :: Int  -- ^ Tab stop
-       , readerIndentedCodeClasses   :: [String] -- ^ Default classes for
+       , readerIndentedCodeClasses   :: [Text] -- ^ Default classes for
                                        -- indented code blocks
-       , readerAbbreviations         :: Set.Set String -- ^ Strings to treat as abbreviations
-       , readerDefaultImageExtension :: String -- ^ Default extension for images
+       , readerAbbreviations         :: Set.Set Text -- ^ Strings to treat as abbreviations
+       , readerDefaultImageExtension :: Text -- ^ Default extension for images
        , readerTrackChanges          :: TrackChanges -- ^ Track changes setting for docx
        , readerStripComments         :: Bool -- ^ Strip HTML comments instead of parsing as raw HTML
 } deriving (Show, Read, Data, Typeable, Generic)
@@ -84,7 +85,7 @@ instance Default ReaderOptions
                , readerStripComments         = False
                }
 
-defaultAbbrevs :: Set.Set String
+defaultAbbrevs :: Set.Set Text
 defaultAbbrevs = Set.fromList
                  [ "Mr.", "Mrs.", "Ms.", "Capt.", "Dr.", "Prof.",
                    "Gen.", "Gov.", "e.g.", "i.e.", "Sgt.", "St.",
@@ -99,11 +100,11 @@ defaultAbbrevs = Set.fromList
 data EPUBVersion = EPUB2 | EPUB3 deriving (Eq, Show, Read, Data, Typeable, Generic)
 
 data HTMLMathMethod = PlainMath
-                    | WebTeX String               -- url of TeX->image script.
+                    | WebTeX Text               -- url of TeX->image script.
                     | GladTeX
                     | MathML
-                    | MathJax String              -- url of MathJax.js
-                    | KaTeX String                -- url of KaTeX files
+                    | MathJax Text              -- url of MathJax.js
+                    | KaTeX Text                -- url of KaTeX files
                     deriving (Show, Read, Eq, Data, Typeable, Generic)
 
 instance FromYAML HTMLMathMethod where
@@ -111,18 +112,18 @@ instance FromYAML HTMLMathMethod where
      (withMap "HTMLMathMethod" $ \m -> do
         method <- m .: "method"
         mburl <- m .:? "url"
-        case unpack method of
+        case method :: Text of
           "plain" -> return PlainMath
-          "webtex" -> return $ WebTeX $ maybe "" unpack mburl
+          "webtex" -> return $ WebTeX $ fromMaybe "" mburl
           "gladtex" -> return GladTeX
           "mathml" -> return MathML
           "mathjax" -> return $ MathJax $
-                         maybe defaultMathJaxURL unpack mburl
+                         fromMaybe defaultMathJaxURL mburl
           "katex" -> return $ KaTeX $
-                         maybe defaultKaTeXURL unpack mburl
+                         fromMaybe defaultKaTeXURL mburl
           _ -> fail $ "Unknown HTML math method " ++ show method) node
        <|> (withStr "HTMLMathMethod" $ \method ->
-             case unpack method of
+             case method of
                "plain" -> return PlainMath
                "webtex" -> return $ WebTeX ""
                "gladtex" -> return GladTeX
@@ -246,7 +247,7 @@ data WriterOptions = WriterOptions
   , writerWrapText          :: WrapOption  -- ^ Option for wrapping text
   , writerColumns           :: Int    -- ^ Characters in a line (for text wrapping)
   , writerEmailObfuscation  :: ObfuscationMethod -- ^ How to obfuscate emails
-  , writerIdentifierPrefix  :: String -- ^ Prefix for section & note ids in HTML
+  , writerIdentifierPrefix  :: Text -- ^ Prefix for section & note ids in HTML
                                      -- and for footnote marks in markdown
   , writerCiteMethod        :: CiteMethod -- ^ How to print cites
   , writerHtmlQTags         :: Bool       -- ^ Use @<q>@ tags for quotes in HTML
@@ -256,8 +257,8 @@ data WriterOptions = WriterOptions
   , writerHighlightStyle    :: Maybe Style  -- ^ Style to use for highlighting
                                            -- (Nothing = no highlighting)
   , writerSetextHeaders     :: Bool       -- ^ Use setext headers for levels 1-2 in markdown
-  , writerEpubSubdirectory  :: String       -- ^ Subdir for epub in OCF
-  , writerEpubMetadata      :: Maybe String -- ^ Metadata to include in EPUB
+  , writerEpubSubdirectory  :: Text       -- ^ Subdir for epub in OCF
+  , writerEpubMetadata      :: Maybe Text -- ^ Metadata to include in EPUB
   , writerEpubFonts         :: [FilePath] -- ^ Paths to fonts to embed
   , writerEpubChapterLevel  :: Int            -- ^ Header level for chapters (separate files)
   , writerTOCDepth          :: Int            -- ^ Number of levels to include in TOC
@@ -309,10 +310,10 @@ instance HasSyntaxExtensions WriterOptions where
 isEnabled :: HasSyntaxExtensions a => Extension -> a -> Bool
 isEnabled ext opts = ext `extensionEnabled` getExtensions opts
 
-defaultMathJaxURL :: String
+defaultMathJaxURL :: Text
 defaultMathJaxURL = "https://cdn.jsdelivr.net/npm/mathjax@3/es5/"
 
-defaultKaTeXURL :: String
+defaultKaTeXURL :: Text
 defaultKaTeXURL = "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.11.1/"
 
 $(deriveJSON defaultOptions ''ReaderOptions)
diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs
index 0752c3809..0d649529d 100644
--- a/src/Text/Pandoc/PDF.hs
+++ b/src/Text/Pandoc/PDF.hs
@@ -43,7 +43,7 @@ import Text.DocLayout (literal)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Error (PandocError (PandocPDFProgramNotFoundError))
 import Text.Pandoc.Legacy.MIME (getMimeType)
-import Text.Pandoc.Options (HTMLMathMethod (..), WriterOptions (..))
+-- import Text.Pandoc.Options (HTMLMathMethod (..), WriterOptions (..)) TODO text: restore
 import Text.Pandoc.Process (pipeProcess)
 import System.Process (readProcessWithExitCode)
 import Text.Pandoc.Legacy.Shared (inDirectory, stringify)
@@ -59,6 +59,10 @@ import Text.Pandoc.Class (PandocIO, extractMedia, fillMediaBag, getCommonState,
                           runIOorExplode, setVerbosity)
 import Text.Pandoc.Legacy.Logging
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 #ifdef _WINDOWS
 changePathSeparators :: FilePath -> FilePath
 changePathSeparators = intercalate "/" . splitDirectories
diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs
index ab447ed9a..7d5b3cfd6 100644
--- a/src/Text/Pandoc/Parsing.hs
+++ b/src/Text/Pandoc/Parsing.hs
@@ -196,7 +196,7 @@ import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad, readFileFromDirs, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Readers.LaTeX.Types (Macro)
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import qualified Text.Pandoc.UTF8 as UTF8 (putStrLn)
diff --git a/src/Text/Pandoc/Readers.hs b/src/Text/Pandoc/Readers.hs
index cba2253d1..8bc0c26e3 100644
--- a/src/Text/Pandoc/Readers.hs
+++ b/src/Text/Pandoc/Readers.hs
@@ -65,7 +65,7 @@ import Text.Pandoc.Class
 import Text.Pandoc.Definition
 import Text.Pandoc.Error
 import Text.Pandoc.Legacy.Extensions -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Readers.CommonMark
 import Text.Pandoc.Readers.Creole
 import Text.Pandoc.Readers.DocBook
diff --git a/src/Text/Pandoc/Readers/CommonMark.hs b/src/Text/Pandoc/Readers/CommonMark.hs
index aa0d892d4..f63d2bbb5 100644
--- a/src/Text/Pandoc/Readers/CommonMark.hs
+++ b/src/Text/Pandoc/Readers/CommonMark.hs
@@ -24,7 +24,7 @@ import Data.Text (Text, unpack)
 import Text.Pandoc.Class (PandocMonad)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Emoji (emojiToInline)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared (uniqueIdent, taskListItemFromAscii) -- TODO text: remove Legacy
 import Text.Pandoc.Walk (walkM)
 
diff --git a/src/Text/Pandoc/Readers/Creole.hs b/src/Text/Pandoc/Readers/Creole.hs
index bbe525885..ccb82e400 100644
--- a/src/Text/Pandoc/Readers/Creole.hs
+++ b/src/Text/Pandoc/Readers/Creole.hs
@@ -22,7 +22,7 @@ import Data.Text (Text)
 import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad (..))
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (enclosed)
 import Text.Pandoc.Legacy.Shared (crFilter)
 
diff --git a/src/Text/Pandoc/Readers/DocBook.hs b/src/Text/Pandoc/Readers/DocBook.hs
index 1aaa53e8c..ba824d62e 100644
--- a/src/Text/Pandoc/Readers/DocBook.hs
+++ b/src/Text/Pandoc/Readers/DocBook.hs
@@ -25,7 +25,7 @@ import qualified Data.Text as T
 import Text.HTML.TagSoup.Entity (lookupEntity)
 import Text.Pandoc.Legacy.Builder -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad, report)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 -- import Text.Pandoc.Logging (LogMessage(..)) -- TODO text: restore
 import Text.Pandoc.Legacy.Shared (crFilter, safeRead) -- TODO text: remove Legacy
 -- import Text.TeXMath (readMathML, writeTeX) -- TODO text: restore
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs
index c91cc9cc9..0920132b3 100644
--- a/src/Text/Pandoc/Readers/Docx.hs
+++ b/src/Text/Pandoc/Readers/Docx.hs
@@ -76,7 +76,7 @@ import qualified Data.Set as Set
 import Text.Pandoc.Legacy.Builder -- TODO text: remove Legacy
 -- import Text.Pandoc.Definition
 import Text.Pandoc.MediaBag (MediaBag)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Readers.Docx.Combine
 import Text.Pandoc.Readers.Docx.Lists
 import Text.Pandoc.Readers.Docx.Parse
diff --git a/src/Text/Pandoc/Readers/Docx/Lists.hs b/src/Text/Pandoc/Readers/Docx/Lists.hs
index 570ddb181..521f6f351 100644
--- a/src/Text/Pandoc/Readers/Docx/Lists.hs
+++ b/src/Text/Pandoc/Readers/Docx/Lists.hs
@@ -28,7 +28,7 @@ import Text.Pandoc.Readers.Docx.Parse (ParaStyleName)
 import Text.Pandoc.Legacy.Shared (trim, safeRead) -- TODO text: remove Legacy
 
 -- TODO text: remove
-import qualified Text.Pandoc.JSON as TP
+-- import qualified Text.Pandoc.JSON as TP
 import Text.Pandoc.Legacy.Definition
 --
 
diff --git a/src/Text/Pandoc/Readers/DokuWiki.hs b/src/Text/Pandoc/Readers/DokuWiki.hs
index 2591a0673..05586e503 100644
--- a/src/Text/Pandoc/Readers/DokuWiki.hs
+++ b/src/Text/Pandoc/Readers/DokuWiki.hs
@@ -29,7 +29,7 @@ import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad (..))
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Error (PandocError (PandocParsecError))
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (enclosed, nested)
 import Text.Pandoc.Legacy.Shared (crFilter, trim, underlineSpan)
 
diff --git a/src/Text/Pandoc/Readers/EPUB.hs b/src/Text/Pandoc/Readers/EPUB.hs
index 8503aae03..6f90179ba 100644
--- a/src/Text/Pandoc/Readers/EPUB.hs
+++ b/src/Text/Pandoc/Readers/EPUB.hs
@@ -38,13 +38,17 @@ import Text.Pandoc.Legacy.Definition hiding (Attr) -- TODO text: remove Legacy
 import Text.Pandoc.Error
 import Text.Pandoc.Extensions (Extension (Ext_raw_html), enableExtension)
 import Text.Pandoc.Legacy.MIME (MimeType)
-import Text.Pandoc.Options (ReaderOptions (..))
+-- import Text.Pandoc.Options (ReaderOptions (..)) TODO text: restore
 import Text.Pandoc.Readers.HTML (readHtml)
 import Text.Pandoc.Legacy.Shared (addMetaField, collapseFilePath, escapeURI)
 import qualified Text.Pandoc.UTF8 as UTF8 (toStringLazy)
 import Text.Pandoc.Walk (query, walk)
 import Text.XML.Light
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 type Items = M.Map String (FilePath, MimeType)
 
 readEPUB :: PandocMonad m => ReaderOptions -> BL.ByteString -> m Pandoc
diff --git a/src/Text/Pandoc/Readers/FB2.hs b/src/Text/Pandoc/Readers/FB2.hs
index c4911d9f3..86b601190 100644
--- a/src/Text/Pandoc/Readers/FB2.hs
+++ b/src/Text/Pandoc/Readers/FB2.hs
@@ -40,7 +40,7 @@ import Text.Pandoc.Legacy.Builder -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad, insertMedia, report)
 import Text.Pandoc.Error
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared (crFilter)
 import Text.XML.Light
 
diff --git a/src/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs
index 500138bf9..39813ddb8 100644
--- a/src/Text/Pandoc/Readers/HTML.hs
+++ b/src/Text/Pandoc/Readers/HTML.hs
@@ -55,11 +55,11 @@ import Text.Pandoc.Readers.LaTeX (rawLaTeXInline)
 import Text.Pandoc.Readers.LaTeX.Types (Macro)
 import Text.Pandoc.Error
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options (
-    Extension (Ext_epub_html_exts, Ext_empty_paragraphs, Ext_native_divs,
-               Ext_native_spans, Ext_raw_html, Ext_line_blocks, Ext_raw_tex),
-    ReaderOptions (readerExtensions, readerStripComments),
-    extensionEnabled)
+-- import Text.Pandoc.Options (
+--     Extension (Ext_epub_html_exts, Ext_empty_paragraphs, Ext_native_divs,
+--                Ext_native_spans, Ext_raw_html, Ext_line_blocks, Ext_raw_tex),
+--     ReaderOptions (readerExtensions, readerStripComments),
+--     extensionEnabled) TODO text: restore
 import Text.Pandoc.Parsing hiding ((<|>))
 import Text.Pandoc.Legacy.Shared (addMetaField, blocksToInlines', crFilter, escapeURI,
                            extractSpaces, htmlSpanLikeElements,
@@ -69,6 +69,7 @@ import Text.Parsec.Error
 -- import Text.TeXMath (readMathML, writeTeX) TODO text: restore
 
 -- TODO text: remove
+import Text.Pandoc.Legacy.Options
 import qualified Text.TeXMath as TM
 
 readMathML :: String -> Either String [TM.Exp]
diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs
index 3fdee1d99..55e3404f1 100644
--- a/src/Text/Pandoc/Readers/Haddock.hs
+++ b/src/Text/Pandoc/Readers/Haddock.hs
@@ -27,7 +27,7 @@ import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad)
 import Text.Pandoc.Definition
 import Text.Pandoc.Error
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared (crFilter, splitBy, trim) -- TODO text: remove Legacy
 
 
diff --git a/src/Text/Pandoc/Readers/Ipynb.hs b/src/Text/Pandoc/Readers/Ipynb.hs
index 979fce63c..162297016 100644
--- a/src/Text/Pandoc/Readers/Ipynb.hs
+++ b/src/Text/Pandoc/Readers/Ipynb.hs
@@ -22,7 +22,7 @@ import Data.Char (isDigit)
 import Data.List (isPrefixOf)
 import Data.Maybe (fromMaybe)
 import Data.Digest.Pure.SHA (sha1, showDigest)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import qualified Data.Scientific as Scientific
 import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
diff --git a/src/Text/Pandoc/Readers/JATS.hs b/src/Text/Pandoc/Readers/JATS.hs
index bd595a6b8..78fdc0799 100644
--- a/src/Text/Pandoc/Readers/JATS.hs
+++ b/src/Text/Pandoc/Readers/JATS.hs
@@ -26,7 +26,7 @@ import qualified Data.Text as T
 import Text.HTML.TagSoup.Entity (lookupEntity)
 import Text.Pandoc.Legacy.Builder -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared (underlineSpan, crFilter, safeRead) -- TODO text: remove Legacy
 -- import Text.TeXMath (readMathML, writeTeX) TODO text: restore
 import Text.XML.Light
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index 665efea0c..4101b6b11 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -48,7 +48,7 @@ import Text.Pandoc.Error (PandocError ( PandocParseError, PandocParsecError))
 import Text.Pandoc.Legacy.Highlighting (fromListingsLanguage, languagesByExtension)
 import Text.Pandoc.ImageSize (numUnit, showFl)
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (blankline, many, mathDisplay, mathInline,
                             optional, space, spaces, withRaw, (<|>))
 import Text.Pandoc.Readers.LaTeX.Types (ExpansionPoint (..), Macro (..),
diff --git a/src/Text/Pandoc/Readers/LaTeX/Parsing.hs b/src/Text/Pandoc/Readers/LaTeX/Parsing.hs
index 604118670..063daee43 100644
--- a/src/Text/Pandoc/Readers/LaTeX/Parsing.hs
+++ b/src/Text/Pandoc/Readers/LaTeX/Parsing.hs
@@ -85,7 +85,7 @@ import Text.Pandoc.Legacy.Builder -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Error (PandocError (PandocMacroLoop))
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (blankline, many, mathDisplay, mathInline,
                             space, spaces, withRaw, (<|>))
 import Text.Pandoc.Readers.LaTeX.Types (ExpansionPoint (..), Macro (..),
diff --git a/src/Text/Pandoc/Readers/Man.hs b/src/Text/Pandoc/Readers/Man.hs
index f39e9f69f..1d55dfed1 100644
--- a/src/Text/Pandoc/Readers/Man.hs
+++ b/src/Text/Pandoc/Readers/Man.hs
@@ -26,7 +26,7 @@ import qualified Data.Text as T
 import Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Error (PandocError (PandocParsecError))
 -- import Text.Pandoc.Logging (LogMessage(..)) TODO text: restore
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing
 import Text.Pandoc.Walk (query)
 import Text.Pandoc.Legacy.Shared (crFilter, mapLeft)
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index d1727ac4f..8e8b6b950 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -38,7 +38,7 @@ import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Emoji (emojiToInline)
 import Text.Pandoc.Error
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (tableWith)
 import Text.Pandoc.Readers.HTML (htmlInBalanced, htmlTag, isBlockTag,
                                  isCommentTag, isInlineTag, isTextTag)
diff --git a/src/Text/Pandoc/Readers/MediaWiki.hs b/src/Text/Pandoc/Readers/MediaWiki.hs
index d8315985d..fc78bf86b 100644
--- a/src/Text/Pandoc/Readers/MediaWiki.hs
+++ b/src/Text/Pandoc/Readers/MediaWiki.hs
@@ -35,7 +35,7 @@ import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad (..))
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (nested)
 import Text.Pandoc.Readers.HTML (htmlTag, isBlockTag, isCommentTag)
 import Text.Pandoc.Legacy.Shared (crFilter, safeRead, stringify, stripTrailingNewlines,
diff --git a/src/Text/Pandoc/Readers/Muse.hs b/src/Text/Pandoc/Readers/Muse.hs
index 7ee27223d..78b1bb204 100644
--- a/src/Text/Pandoc/Readers/Muse.hs
+++ b/src/Text/Pandoc/Readers/Muse.hs
@@ -36,7 +36,7 @@ import Text.Pandoc.Class (PandocMonad (..))
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Error (PandocError (PandocParsecError))
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (F)
 import Text.Pandoc.Legacy.Shared (crFilter, trimr, underlineSpan)
 
diff --git a/src/Text/Pandoc/Readers/Native.hs b/src/Text/Pandoc/Readers/Native.hs
index 9a8598f70..f4e270577 100644
--- a/src/Text/Pandoc/Readers/Native.hs
+++ b/src/Text/Pandoc/Readers/Native.hs
@@ -15,7 +15,7 @@ module Text.Pandoc.Readers.Native ( readNative ) where
 
 import Prelude
 import Text.Pandoc.Definition
-import Text.Pandoc.Options (ReaderOptions)
+import Text.Pandoc.Legacy.Options (ReaderOptions)
 import Text.Pandoc.Legacy.Shared (safeRead)
 
 import Control.Monad.Except (throwError)
diff --git a/src/Text/Pandoc/Readers/OPML.hs b/src/Text/Pandoc/Readers/OPML.hs
index 4cdf0b3c8..6d3cb5e45 100644
--- a/src/Text/Pandoc/Readers/OPML.hs
+++ b/src/Text/Pandoc/Readers/OPML.hs
@@ -22,7 +22,7 @@ import Data.Text (Text, pack, unpack)
 import Text.HTML.TagSoup.Entity (lookupEntity)
 import Text.Pandoc.Legacy.Builder -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Readers.HTML (readHtml)
 import Text.Pandoc.Readers.Markdown (readMarkdown)
 import Text.Pandoc.Legacy.Shared (crFilter, blocksToInlines')
diff --git a/src/Text/Pandoc/Readers/Odt.hs b/src/Text/Pandoc/Readers/Odt.hs
index f96d0209f..981e1f8ee 100644
--- a/src/Text/Pandoc/Readers/Odt.hs
+++ b/src/Text/Pandoc/Readers/Odt.hs
@@ -29,7 +29,7 @@ import qualified Text.Pandoc.Class as P
 import Text.Pandoc.Definition
 import Text.Pandoc.Error
 import Text.Pandoc.MediaBag
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import qualified Text.Pandoc.UTF8 as UTF8
 
 import Text.Pandoc.Readers.Odt.ContentReader
diff --git a/src/Text/Pandoc/Readers/Org.hs b/src/Text/Pandoc/Readers/Org.hs
index 461cab22b..8401aed62 100644
--- a/src/Text/Pandoc/Readers/Org.hs
+++ b/src/Text/Pandoc/Readers/Org.hs
@@ -18,7 +18,7 @@ import Text.Pandoc.Readers.Org.Parsing (OrgParser, readWithM)
 import Text.Pandoc.Class (PandocMonad)
 import Text.Pandoc.Definition
 import Text.Pandoc.Error
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing (reportLogMessages)
 import Text.Pandoc.Legacy.Shared (crFilter)
 
diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs
index 007de60ff..f37ecca81 100644
--- a/src/Text/Pandoc/Readers/Org/Blocks.hs
+++ b/src/Text/Pandoc/Readers/Org/Blocks.hs
@@ -29,7 +29,7 @@ import Text.Pandoc.Readers.Org.Shared (cleanLinkString, isImageFilename,
 import Text.Pandoc.Builder (Blocks, Inlines)
 import Text.Pandoc.Class (PandocMonad)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared (compactify, compactifyDL, safeRead)
 
 import Control.Monad (foldM, guard, mzero, void)
diff --git a/src/Text/Pandoc/Readers/Org/Inlines.hs b/src/Text/Pandoc/Readers/Org/Inlines.hs
index e121badce..85a022d90 100644
--- a/src/Text/Pandoc/Readers/Org/Inlines.hs
+++ b/src/Text/Pandoc/Readers/Org/Inlines.hs
@@ -27,7 +27,7 @@ import Text.Pandoc.Builder (Inlines)
 import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Readers.LaTeX (inlineCommand, rawLaTeXInline)
 import Text.Pandoc.Legacy.Shared (underlineSpan)
 -- import Text.TeXMath (DisplayType (..), readTeX, writePandoc) -- TODO text: restore
diff --git a/src/Text/Pandoc/Readers/Org/ParserState.hs b/src/Text/Pandoc/Readers/Org/ParserState.hs
index 0b51007f0..ed3c4e247 100644
--- a/src/Text/Pandoc/Readers/Org/ParserState.hs
+++ b/src/Text/Pandoc/Readers/Org/ParserState.hs
@@ -49,7 +49,7 @@ import Data.Text (Text)
 import Text.Pandoc.Builder (Blocks)
 import Text.Pandoc.Definition (Meta (..), nullMeta)
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options (ReaderOptions (..))
+-- import Text.Pandoc.Legacy.Options (ReaderOptions (..)) TODO text: restore
 import Text.Pandoc.Parsing (Future, HasIdentifierList (..),
                             HasIncludeFiles (..), HasLastStrPosition (..),
                             HasLogMessages (..), HasMacros (..),
@@ -58,6 +58,10 @@ import Text.Pandoc.Parsing (Future, HasIdentifierList (..),
                             askF, asksF, returnF, runF, trimInlinesF)
 import Text.Pandoc.Readers.LaTeX.Types (Macro)
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options (ReaderOptions)
+--
+
 -- | This is used to delay evaluation until all relevant information has been
 -- parsed and made available in the parser state.
 type F = Future OrgParserState
diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs
index d1124daf0..e6eadc3ad 100644
--- a/src/Text/Pandoc/Readers/RST.hs
+++ b/src/Text/Pandoc/Readers/RST.hs
@@ -35,7 +35,7 @@ import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Error
 import Text.Pandoc.ImageSize (lengthToDim, scaleDimension)
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import qualified Text.Pandoc.UTF8 as UTF8
diff --git a/src/Text/Pandoc/Readers/Roff.hs b/src/Text/Pandoc/Readers/Roff.hs
index a7356574c..ed429b9b8 100644
--- a/src/Text/Pandoc/Readers/Roff.hs
+++ b/src/Text/Pandoc/Readers/Roff.hs
@@ -39,7 +39,7 @@ import qualified Data.Map as M
 import Data.List (intercalate)
 import qualified Data.Text as T
 -- import Text.Pandoc.Logging (LogMessage(..)) TODO text: restore
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing
 import Text.Pandoc.Legacy.Shared (safeRead, substitute)
 import Text.Parsec hiding (tokenPrim)
diff --git a/src/Text/Pandoc/Readers/TWiki.hs b/src/Text/Pandoc/Readers/TWiki.hs
index 06f3fff8b..35b3dc921 100644
--- a/src/Text/Pandoc/Readers/TWiki.hs
+++ b/src/Text/Pandoc/Readers/TWiki.hs
@@ -28,7 +28,7 @@ import Text.HTML.TagSoup
 import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad (..))
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (enclosed, nested)
 import Text.Pandoc.Readers.HTML (htmlTag, isCommentTag)
 import Text.Pandoc.Legacy.Shared (crFilter)
diff --git a/src/Text/Pandoc/Readers/Textile.hs b/src/Text/Pandoc/Readers/Textile.hs
index fb98d9d25..5cd2c8cc3 100644
--- a/src/Text/Pandoc/Readers/Textile.hs
+++ b/src/Text/Pandoc/Readers/Textile.hs
@@ -48,7 +48,7 @@ import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad (..))
 import Text.Pandoc.CSS
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing
 import Text.Pandoc.Readers.HTML (htmlTag, isBlockTag, isInlineTag)
 import Text.Pandoc.Readers.LaTeX (rawLaTeXBlock, rawLaTeXInline)
diff --git a/src/Text/Pandoc/Readers/TikiWiki.hs b/src/Text/Pandoc/Readers/TikiWiki.hs
index 9a888f59d..890aa9eca 100644
--- a/src/Text/Pandoc/Readers/TikiWiki.hs
+++ b/src/Text/Pandoc/Readers/TikiWiki.hs
@@ -30,7 +30,7 @@ import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (CommonState (..), PandocMonad (..))
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging (Verbosity (..))
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (enclosed, nested)
 import Text.Pandoc.Legacy.Shared (crFilter, safeRead) -- TODO text: remove Legacy
 import Text.Pandoc.XML (fromEntities)
diff --git a/src/Text/Pandoc/Readers/Txt2Tags.hs b/src/Text/Pandoc/Readers/Txt2Tags.hs
index 5ef247192..b6288f3c1 100644
--- a/src/Text/Pandoc/Readers/Txt2Tags.hs
+++ b/src/Text/Pandoc/Readers/Txt2Tags.hs
@@ -31,7 +31,7 @@ import Text.Pandoc.Class (PandocMonad)
 import qualified Text.Pandoc.Class as P
 import Data.Time (defaultTimeLocale)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (space, spaces, uri)
 import Text.Pandoc.Legacy.Shared (compactify, compactifyDL, crFilter, escapeURI,
                            underlineSpan) -- TODO text: remove Legacy
diff --git a/src/Text/Pandoc/Readers/Vimwiki.hs b/src/Text/Pandoc/Readers/Vimwiki.hs
index eaa10fa34..a2d3364f2 100644
--- a/src/Text/Pandoc/Readers/Vimwiki.hs
+++ b/src/Text/Pandoc/Readers/Vimwiki.hs
@@ -69,7 +69,7 @@ import Text.Pandoc.Legacy.Definition (Attr, Block (BulletList, OrderedList),
                                Inline (Space), ListNumberDelim (..),
                                ListNumberStyle (..), Pandoc (..),
                                nullMeta) -- TODO text: remove Legacy
-import Text.Pandoc.Options (ReaderOptions)
+import Text.Pandoc.Legacy.Options (ReaderOptions)
 import Text.Pandoc.Parsing (ParserState, ParserT, blanklines, emailAddress,
                             many1Till, orderedListMarker, readWithM,
                             registerHeader, spaceChar, stateMeta,
diff --git a/src/Text/Pandoc/Writers.hs b/src/Text/Pandoc/Writers.hs
index c88f860bb..38913b758 100644
--- a/src/Text/Pandoc/Writers.hs
+++ b/src/Text/Pandoc/Writers.hs
@@ -78,7 +78,7 @@ import Data.List (intercalate)
 import Data.Text (Text)
 import Text.Pandoc.Class
 import Text.Pandoc.Definition
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import qualified Text.Pandoc.UTF8 as UTF8
 import Text.Pandoc.Error
 import Text.Pandoc.Writers.AsciiDoc
diff --git a/src/Text/Pandoc/Writers/AsciiDoc.hs b/src/Text/Pandoc/Writers/AsciiDoc.hs
index ceac46a94..d40d8f9f5 100644
--- a/src/Text/Pandoc/Writers/AsciiDoc.hs
+++ b/src/Text/Pandoc/Writers/AsciiDoc.hs
@@ -32,7 +32,7 @@ import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (blankline, space)
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
diff --git a/src/Text/Pandoc/Writers/CommonMark.hs b/src/Text/Pandoc/Writers/CommonMark.hs
index 69d004868..96d2043f5 100644
--- a/src/Text/Pandoc/Writers/CommonMark.hs
+++ b/src/Text/Pandoc/Writers/CommonMark.hs
@@ -26,7 +26,7 @@ import qualified Data.Text as T
 import Network.HTTP (urlEncode)
 import Text.Pandoc.Class (PandocMonad)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared (capitalize, isHeaderBlock, isTightList,
     linesToPara, onlySimpleTableCells, substitute, taskListItemToAscii)
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/ConTeXt.hs b/src/Text/Pandoc/Writers/ConTeXt.hs
index 2aed07590..55d5e5f2f 100644
--- a/src/Text/Pandoc/Writers/ConTeXt.hs
+++ b/src/Text/Pandoc/Writers/ConTeXt.hs
@@ -26,7 +26,7 @@ import Text.Pandoc.Class (PandocMonad, report, toLang)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Custom.hs b/src/Text/Pandoc/Writers/Custom.hs
index fa5558af6..f5aea3a39 100644
--- a/src/Text/Pandoc/Writers/Custom.hs
+++ b/src/Text/Pandoc/Writers/Custom.hs
@@ -29,7 +29,7 @@ import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Lua (Global (..), LuaException (LuaException),
                         runLua, setGlobals)
 import Text.Pandoc.Lua.Util (addField, dofileWithTraceback)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Templates (renderTemplate)
 import qualified Text.Pandoc.UTF8 as UTF8
 import Text.Pandoc.Writers.Shared
diff --git a/src/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs
index aa287898e..ec8da159a 100644
--- a/src/Text/Pandoc/Writers/Docbook.hs
+++ b/src/Text/Pandoc/Writers/Docbook.hs
@@ -27,7 +27,7 @@ import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Highlighting (languages, languagesByExtension)
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 8936cc1c3..1ca1a5469 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -49,7 +49,7 @@ import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
 import Text.Pandoc.Legacy.MIME (MimeType, extensionFromMimeType, getMimeType,
                          getMimeTypeDef)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Writers.Docx.StyleMap
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Walk
diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs
index 0df546340..884893aab 100644
--- a/src/Text/Pandoc/Writers/DokuWiki.hs
+++ b/src/Text/Pandoc/Writers/DokuWiki.hs
@@ -33,13 +33,17 @@ import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options (WrapOption (..), WriterOptions (writerTableOfContents, writerTemplate, writerWrapText))
+-- import Text.Pandoc.Options (WrapOption (..), WriterOptions (writerTableOfContents, writerTemplate, writerWrapText)) TODO text: restore
 import Text.Pandoc.Legacy.Shared (camelCaseToHyphenated, escapeURI, isURI, linesToPara,
                            removeFormatting, substitute, trimr) -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
 import Text.DocLayout (render, literal)
 import Text.Pandoc.Writers.Shared (defField, metaToContext)
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 data WriterState = WriterState {
   }
 
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs
index 75061403a..40646a6cc 100644
--- a/src/Text/Pandoc/Writers/EPUB.hs
+++ b/src/Text/Pandoc/Writers/EPUB.hs
@@ -45,9 +45,9 @@ import Text.Pandoc.Error
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
 import Text.Pandoc.Legacy.MIME (MimeType, extensionFromMimeType, getMimeType)
-import Text.Pandoc.Options (EPUBVersion (..), HTMLMathMethod (..),
-                            ObfuscationMethod (NoObfuscation), WrapOption (..),
-                            WriterOptions (..))
+-- import Text.Pandoc.Options (EPUBVersion (..), HTMLMathMethod (..),
+--                             ObfuscationMethod (NoObfuscation), WrapOption (..),
+--                             WriterOptions (..)) TODO text: restore
 import Text.Pandoc.Legacy.Shared (makeSections, normalizeDate, renderTags',
                            safeRead, stringify, trim, uniqueIdent) -- TODO text: remove Legacy
 import qualified Text.Pandoc.UTF8 as UTF8
@@ -62,6 +62,10 @@ import Text.Pandoc.XML (escapeStringForXML)
 import Text.DocTemplates (FromContext(lookupContext), Context(..),
                           ToContext(toVal), Val(..))
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 -- A Chapter includes a list of blocks.
 data Chapter = Chapter [Block]
   deriving (Show)
diff --git a/src/Text/Pandoc/Writers/FB2.hs b/src/Text/Pandoc/Writers/FB2.hs
index f41bcc622..18ac002b5 100644
--- a/src/Text/Pandoc/Writers/FB2.hs
+++ b/src/Text/Pandoc/Writers/FB2.hs
@@ -38,11 +38,15 @@ import Text.Pandoc.Class (PandocMonad, report)
 import qualified Text.Pandoc.Class as P
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options (HTMLMathMethod (..), WriterOptions (..), def)
+-- import Text.Pandoc.Options (HTMLMathMethod (..), WriterOptions (..), def) TODO text: restore
 import Text.Pandoc.Legacy.Shared (capitalize, isURI, orderedListMarkers,
                            makeSections) -- TODO text: remove Legacy
 import Text.Pandoc.Writers.Shared (lookupMetaString)
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 -- | Data to be written at the end of the document:
 -- (foot)notes, URLs, references, images.
 data FbRenderState = FbRenderState
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 370133ddb..6c1b34a25 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -56,7 +56,7 @@ import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Highlighting (formatHtmlBlock, formatHtmlInline, highlight,
                                  styleToCss)
 import Text.Pandoc.ImageSize
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Slides
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Haddock.hs b/src/Text/Pandoc/Writers/Haddock.hs
index ad15f2027..e540032b3 100644
--- a/src/Text/Pandoc/Writers/Haddock.hs
+++ b/src/Text/Pandoc/Writers/Haddock.hs
@@ -22,7 +22,7 @@ import Data.Text (Text)
 import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/ICML.hs b/src/Text/Pandoc/Writers/ICML.hs
index 8b78c864e..30bc7e810 100644
--- a/src/Text/Pandoc/Writers/ICML.hs
+++ b/src/Text/Pandoc/Writers/ICML.hs
@@ -30,7 +30,7 @@ import qualified Text.Pandoc.Class as P
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy (isURI, linesToPara, splitBy)
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Ipynb.hs b/src/Text/Pandoc/Writers/Ipynb.hs
index 2b74ba67b..1da8e7b3f 100644
--- a/src/Text/Pandoc/Writers/Ipynb.hs
+++ b/src/Text/Pandoc/Writers/Ipynb.hs
@@ -21,7 +21,7 @@ import Control.Monad.State
 import qualified Data.Map as M
 import Data.Char (toLower)
 import Data.Maybe (catMaybes, fromMaybe)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Data.Ipynb as Ipynb
 import Text.Pandoc.Walk (walkM)
diff --git a/src/Text/Pandoc/Writers/JATS.hs b/src/Text/Pandoc/Writers/JATS.hs
index 6afa5cf9f..14bfacaac 100644
--- a/src/Text/Pandoc/Writers/JATS.hs
+++ b/src/Text/Pandoc/Writers/JATS.hs
@@ -32,7 +32,7 @@ import Text.Pandoc.Legacy.Highlighting (languages, languagesByExtension)
 import Text.Pandoc.Legacy.Logging
 import Text.Pandoc.Legacy.MIME (getMimeType)
 import Text.Pandoc.Walk (walk)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Jira.hs b/src/Text/Pandoc/Writers/Jira.hs
index 93e83257b..3fd89130f 100644
--- a/src/Text/Pandoc/Writers/Jira.hs
+++ b/src/Text/Pandoc/Writers/Jira.hs
@@ -23,7 +23,7 @@ import Data.Text (Text, pack)
 import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging (LogMessage (BlockNotRendered, InlineNotRendered))
-import Text.Pandoc.Options (WriterOptions (writerTemplate))
+-- import Text.Pandoc.Options (WriterOptions (writerTemplate)) TODO text: restore
 import Text.Pandoc.Legacy.Shared (blocksToInlines, linesToPara)
 import Text.Pandoc.Templates (renderTemplate)
 import Text.Pandoc.Writers.Math (texMathToInlines)
@@ -31,6 +31,10 @@ import Text.Pandoc.Writers.Shared (metaToContext, defField)
 import qualified Data.Text as T
 import Text.DocLayout (literal, render)
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 data WriterState = WriterState
   { stNotes     :: [Text]      -- Footnotes
   , stListLevel :: Text        -- String at beginning of list items, e.g. "**"
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
index 6adde032f..cf4d77366 100644
--- a/src/Text/Pandoc/Writers/LaTeX.hs
+++ b/src/Text/Pandoc/Writers/LaTeX.hs
@@ -38,7 +38,7 @@ import Text.Pandoc.Legacy.Highlighting (formatLaTeXBlock, formatLaTeXInline, hig
                                  styleToLaTeX, toListingsLanguage)
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Slides
diff --git a/src/Text/Pandoc/Writers/Man.hs b/src/Text/Pandoc/Writers/Man.hs
index e91316601..daf1e1109 100644
--- a/src/Text/Pandoc/Writers/Man.hs
+++ b/src/Text/Pandoc/Writers/Man.hs
@@ -23,7 +23,7 @@ import Text.Pandoc.Builder (deleteMeta)
 import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Walk (walk)
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
index 0f4c5518a..c3f116133 100644
--- a/src/Text/Pandoc/Writers/Markdown.hs
+++ b/src/Text/Pandoc/Writers/Markdown.hs
@@ -35,7 +35,7 @@ import Text.HTML.TagSoup (Tag (..), isTagText, parseTags)
 import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Parsing hiding (blankline, blanklines, char, space)
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
diff --git a/src/Text/Pandoc/Writers/Math.hs b/src/Text/Pandoc/Writers/Math.hs
index 7ec4791ba..fd877599d 100644
--- a/src/Text/Pandoc/Writers/Math.hs
+++ b/src/Text/Pandoc/Writers/Math.hs
@@ -13,7 +13,7 @@ import Text.Pandoc.Class
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
 -- import Text.TeXMath (DisplayType (..), Exp, readTeX, writePandoc) TODO text: restore
-import Text.Pandoc.Options (defaultMathJaxURL, defaultKaTeXURL)
+import Text.Pandoc.Legacy.Options (defaultMathJaxURL, defaultKaTeXURL)
 
 -- TODO text: remove
 import qualified Text.TeXMath as TM
diff --git a/src/Text/Pandoc/Writers/MediaWiki.hs b/src/Text/Pandoc/Writers/MediaWiki.hs
index bff0c3511..5bdeafccb 100644
--- a/src/Text/Pandoc/Writers/MediaWiki.hs
+++ b/src/Text/Pandoc/Writers/MediaWiki.hs
@@ -23,7 +23,7 @@ import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout (render, literal)
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Ms.hs b/src/Text/Pandoc/Writers/Ms.hs
index 44cdfdbf4..9ff863886 100644
--- a/src/Text/Pandoc/Writers/Ms.hs
+++ b/src/Text/Pandoc/Writers/Ms.hs
@@ -36,7 +36,7 @@ import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Highlighting
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs
index 53f03655e..a458eea6e 100644
--- a/src/Text/Pandoc/Writers/Muse.hs
+++ b/src/Text/Pandoc/Writers/Muse.hs
@@ -40,7 +40,7 @@ import Text.Pandoc.Class (PandocMonad)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Error
 import Text.Pandoc.ImageSize
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Native.hs b/src/Text/Pandoc/Writers/Native.hs
index 8040bd787..dcc27c52d 100644
--- a/src/Text/Pandoc/Writers/Native.hs
+++ b/src/Text/Pandoc/Writers/Native.hs
@@ -18,9 +18,13 @@ import Data.List (intersperse)
 import Data.Text (Text)
 import Text.Pandoc.Class (PandocMonad)
 import Text.Pandoc.Definition
-import Text.Pandoc.Options (WrapOption (..), WriterOptions (..))
+-- import Text.Pandoc.Options (WrapOption (..), WriterOptions (..)) TODO text: restore
 import Text.DocLayout
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 prettyList :: [Doc Text] -> Doc Text
 prettyList ds =
   "[" <>
diff --git a/src/Text/Pandoc/Writers/ODT.hs b/src/Text/Pandoc/Writers/ODT.hs
index bc9526ebb..71d711efd 100644
--- a/src/Text/Pandoc/Writers/ODT.hs
+++ b/src/Text/Pandoc/Writers/ODT.hs
@@ -31,7 +31,7 @@ import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
 import Text.Pandoc.Legacy.MIME (extensionFromMimeType, getMimeType)
-import Text.Pandoc.Options (WrapOption (..), WriterOptions (..))
+-- import Text.Pandoc.Options (WrapOption (..), WriterOptions (..)) TODO text: restore
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy (stringify, pandocVersion)
 import Text.Pandoc.Writers.Shared (lookupMetaString, lookupMetaBlocks,
@@ -44,6 +44,7 @@ import Text.Pandoc.XML
 import Text.XML.Light
 
 -- TODO text: remove
+import Text.Pandoc.Legacy.Options
 import qualified Text.TeXMath as TM
 import Text.TeXMath (DisplayType(..), writeMathML)
 import qualified Data.Text as T
diff --git a/src/Text/Pandoc/Writers/OPML.hs b/src/Text/Pandoc/Writers/OPML.hs
index 6985f89a2..3f75e4355 100644
--- a/src/Text/Pandoc/Writers/OPML.hs
+++ b/src/Text/Pandoc/Writers/OPML.hs
@@ -19,7 +19,7 @@ import qualified Text.Pandoc.Legacy.Builder as B -- TODO text: remove Legacy
 import Text.Pandoc.Class (PandocMonad)
 import Data.Time
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs
index 4dc80f633..273235ec3 100644
--- a/src/Text/Pandoc/Writers/OpenDocument.hs
+++ b/src/Text/Pandoc/Writers/OpenDocument.hs
@@ -29,7 +29,7 @@ import Text.Pandoc.Class (PandocMonad, report, translateTerm,
                           setTranslations, toLang)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared (linesToPara)
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Org.hs b/src/Text/Pandoc/Writers/Org.hs
index ff7298712..2eb8e31bc 100644
--- a/src/Text/Pandoc/Writers/Org.hs
+++ b/src/Text/Pandoc/Writers/Org.hs
@@ -24,7 +24,7 @@ import Data.Text (Text)
 import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Powerpoint.hs b/src/Text/Pandoc/Writers/Powerpoint.hs
index 51347a1e4..9d6c2fc13 100644
--- a/src/Text/Pandoc/Writers/Powerpoint.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint.hs
@@ -27,7 +27,7 @@ import Codec.Archive.Zip
 import Text.Pandoc.Definition
 import Text.Pandoc.Walk
 import Text.Pandoc.Class (PandocMonad, report)
-import Text.Pandoc.Options (WriterOptions)
+import Text.Pandoc.Legacy.Options (WriterOptions)
 import Text.Pandoc.Writers.Shared (fixDisplayMath)
 import Text.Pandoc.Writers.Powerpoint.Presentation (documentToPresentation)
 import Text.Pandoc.Writers.Powerpoint.Output (presentationToArchive)
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
index 86a0f9dd9..2127ab41c 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs
@@ -36,7 +36,7 @@ import qualified Text.Pandoc.UTF8 as UTF8
 import Text.Pandoc.Class (PandocMonad)
 import Text.Pandoc.Error (PandocError(..))
 import qualified Text.Pandoc.Class as P
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.MIME
 import qualified Data.ByteString.Lazy as BL
 import Text.Pandoc.Writers.OOXML
diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
index e003a4abe..7bd0098fa 100644
--- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
+++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs
@@ -49,7 +49,7 @@ import Data.Default
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Slides (getSlideLevel)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Logging
 import Text.Pandoc.Walk
 import Data.Time (UTCTime)
diff --git a/src/Text/Pandoc/Writers/RST.hs b/src/Text/Pandoc/Writers/RST.hs
index f44d60142..49e35a6ca 100644
--- a/src/Text/Pandoc/Writers/RST.hs
+++ b/src/Text/Pandoc/Writers/RST.hs
@@ -26,7 +26,7 @@ import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/RTF.hs b/src/Text/Pandoc/Writers/RTF.hs
index 4d15a1f81..6fab8ab24 100644
--- a/src/Text/Pandoc/Writers/RTF.hs
+++ b/src/Text/Pandoc/Writers/RTF.hs
@@ -29,7 +29,7 @@ import qualified Text.Pandoc.Class as P
 import Text.Pandoc.Error
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
 import Text.DocLayout (render, literal)
diff --git a/src/Text/Pandoc/Writers/Shared.hs b/src/Text/Pandoc/Writers/Shared.hs
index 568fe8d3e..10d93dc38 100644
--- a/src/Text/Pandoc/Writers/Shared.hs
+++ b/src/Text/Pandoc/Writers/Shared.hs
@@ -50,7 +50,7 @@ import qualified Data.Map as M
 import qualified Data.Text as T
 import qualified Text.Pandoc.Legacy.Builder as Builder -- TODO text: remove legacy
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared (stringify, makeSections, deNote, deLink) -- TODO text: remove Legacy
 import Text.Pandoc.Walk (walk)
diff --git a/src/Text/Pandoc/Writers/TEI.hs b/src/Text/Pandoc/Writers/TEI.hs
index ae6082222..53b9062bc 100644
--- a/src/Text/Pandoc/Writers/TEI.hs
+++ b/src/Text/Pandoc/Writers/TEI.hs
@@ -22,7 +22,7 @@ import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Highlighting (languages, languagesByExtension)
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Texinfo.hs b/src/Text/Pandoc/Writers/Texinfo.hs
index 500ad0208..2efa97b1e 100644
--- a/src/Text/Pandoc/Writers/Texinfo.hs
+++ b/src/Text/Pandoc/Writers/Texinfo.hs
@@ -29,7 +29,7 @@ import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Error
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/Textile.hs b/src/Text/Pandoc/Writers/Textile.hs
index 21cb93dbf..9e383329c 100644
--- a/src/Text/Pandoc/Writers/Textile.hs
+++ b/src/Text/Pandoc/Writers/Textile.hs
@@ -22,7 +22,7 @@ import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.DocLayout (render, literal)
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
diff --git a/src/Text/Pandoc/Writers/XWiki.hs b/src/Text/Pandoc/Writers/XWiki.hs
index d54c319e8..e338c7e4a 100644
--- a/src/Text/Pandoc/Writers/XWiki.hs
+++ b/src/Text/Pandoc/Writers/XWiki.hs
@@ -42,7 +42,7 @@ import Data.Text (Text, intercalate, pack, replace, split)
 import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared -- TODO text: remove Legacy (escapeURI, isURI, linesToPara)
 import Text.Pandoc.Writers.MediaWiki (highlightingLangs)
 
diff --git a/src/Text/Pandoc/Writers/ZimWiki.hs b/src/Text/Pandoc/Writers/ZimWiki.hs
index 64a449739..9e71d78be 100644
--- a/src/Text/Pandoc/Writers/ZimWiki.hs
+++ b/src/Text/Pandoc/Writers/ZimWiki.hs
@@ -27,14 +27,18 @@ import Text.Pandoc.Class (PandocMonad, report)
 import Text.Pandoc.Legacy.Definition -- TODO text: remove Legacy
 import Text.Pandoc.ImageSize
 import Text.Pandoc.Legacy.Logging
-import Text.Pandoc.Options (WrapOption (..),
-           WriterOptions (writerTableOfContents, writerTemplate,
-                          writerWrapText))
+-- import Text.Pandoc.Options (WrapOption (..),
+--            WriterOptions (writerTableOfContents, writerTemplate,
+--                           writerWrapText)) -- TODO text: restore
 import Text.Pandoc.Legacy.Shared (escapeURI, isURI, linesToPara, removeFormatting,
                            substitute, trimr) -- TODO text: remove Legacy
 import Text.Pandoc.Templates (renderTemplate)
 import Text.Pandoc.Writers.Shared (defField, metaToContext)
 
+-- TODO text: remove
+import Text.Pandoc.Legacy.Options
+--
+
 data WriterState = WriterState {
     stIndent  :: String,         -- Indent after the marker at the beginning of list items
     stInTable :: Bool,           -- Inside a table
diff --git a/test/Tests/Helpers.hs b/test/Tests/Helpers.hs
index b7796873e..0a46c1027 100644
--- a/test/Tests/Helpers.hs
+++ b/test/Tests/Helpers.hs
@@ -37,7 +37,7 @@ import Test.Tasty.HUnit
 import Text.Pandoc.Builder (Blocks, Inlines, doc, plain)
 import Text.Pandoc.Class
 import Text.Pandoc.Definition
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Legacy.Shared (trimr)
 import Text.Pandoc.Writers.Native (writeNative)
 import Text.Printf
diff --git a/test/Tests/Lua.hs b/test/Tests/Lua.hs
index a8518416a..996e7c46d 100644
--- a/test/Tests/Lua.hs
+++ b/test/Tests/Lua.hs
@@ -29,7 +29,7 @@ import Text.Pandoc.Class (runIOorExplode, setUserDataDir)
 --                                Attr, Meta, Pandoc, pandocTypesVersion) -- TODO text: restore
 import Text.Pandoc.Filter (Filter (LuaFilter), applyFilters)
 import Text.Pandoc.Lua (runLua)
-import Text.Pandoc.Options (def)
+import Text.Pandoc.Legacy.Options (def)
 import Text.Pandoc.Legacy.Shared (pandocVersion)
 
 import qualified Foreign.Lua as Lua
diff --git a/test/Tests/Readers/EPUB.hs b/test/Tests/Readers/EPUB.hs
index f917668ef..cb70441db 100644
--- a/test/Tests/Readers/EPUB.hs
+++ b/test/Tests/Readers/EPUB.hs
@@ -18,7 +18,7 @@ import Test.Tasty
 import Test.Tasty.HUnit
 import qualified Text.Pandoc.Class as P
 import Text.Pandoc.MediaBag (MediaBag, mediaDirectory)
-import Text.Pandoc.Options
+import Text.Pandoc.Legacy.Options
 import Text.Pandoc.Readers.EPUB
 
 getMediaBag :: FilePath -> IO MediaBag
diff --git a/test/Tests/Readers/Org/Inline/Smart.hs b/test/Tests/Readers/Org/Inline/Smart.hs
index 7202adc97..ef34cbf79 100644
--- a/test/Tests/Readers/Org/Inline/Smart.hs
+++ b/test/Tests/Readers/Org/Inline/Smart.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE PatternSynonyms #-} -- TODO text: remove
 {- |
    Module      : Tests.Readers.Org.Inline.Smart
    Copyright   : © 2014-2019 Albert Krewinkel
@@ -17,10 +18,16 @@ import Prelude
 import Data.Text (Text)
 import Test.Tasty (TestTree)
 import Tests.Helpers ((=?>), purely, test)
-import Text.Pandoc (ReaderOptions (readerExtensions),
+-- import Text.Pandoc (ReaderOptions (readerExtensions),
+--                     Extension (Ext_smart), def, enableExtension,
+--                     getDefaultExtensions, readOrg) TODO text: restore
+import Text.Pandoc.Builder
+
+-- TODO text: remove
+import Text.Pandoc (ReaderOptions, readerExtensions,
                     Extension (Ext_smart), def, enableExtension,
                     getDefaultExtensions, readOrg)
-import Text.Pandoc.Builder
+--
 
 orgSmart :: Text -> Pandoc
 orgSmart = purely $
diff --git a/test/Tests/Readers/Org/Shared.hs b/test/Tests/Readers/Org/Shared.hs
index cf1c1273b..b1b00836c 100644
--- a/test/Tests/Readers/Org/Shared.hs
+++ b/test/Tests/Readers/Org/Shared.hs
@@ -22,10 +22,14 @@ import Data.List (intersperse)
 import Data.Text (Text)
 import Tests.Helpers (ToString, purely, test)
 import Test.Tasty (TestTree)
-import Text.Pandoc (Pandoc, ReaderOptions (readerExtensions),
-                    def, getDefaultExtensions, readOrg)
+-- import Text.Pandoc (Pandoc, ReaderOptions (readerExtensions),
+--                     def, getDefaultExtensions, readOrg) TODO text: restore
 import Text.Pandoc.Legacy.Builder (Inlines, smallcaps, space, spanWith, str) -- TODO text: remove Legacy
 
+-- TODO text: remove
+import Text.Pandoc
+--
+
 org :: Text -> Pandoc
 org = purely $ readOrg def{ readerExtensions = getDefaultExtensions "org" }
author	despresc <[email protected]>	2019-11-05 16:58:20 -0500
committer	despresc <[email protected]>	2019-11-08 15:45:02 -0500
commit	0b8113c62a65f07ab0bdbbc0fd7bf7e6e5804543 (patch)
tree	2deceb62d4f492c48f76ea1b0d44c6d7e7fe2a12
parent	db6a63d1ff3f48317cb7e71afcda6ddc8bcf66bc (diff)