Formatting using ormolu 0.7

Author: LaurentRDC

executable/Main.hs

@@ -61,11 +61,11 @@ import Text.Pandoc.Filter.Plot.Internal
     cls,
     configurationPathMeta,
     executable,
+    pathToExe,
     readDoc,
     runPlotM,
     supportedSaveFormats,
-    toolkits, 
-    pathToExe
+    toolkits,
   )
 import Text.Pandoc.JSON (toJSONFilter)
 import Text.ParserCombinators.ReadP (readP_to_S)
@@ -105,10 +105,12 @@ main = do
                   ]
               )
             <> header (mconcat ["pandoc-plot ", V.showVersion pandocPlotVersion, " - generate figures directly in documents"])
-            <> footerDoc ( Just $ P.vsep 
-                                [ "More information can be found via the manual (pandoc-plot --manual) or the"
-                                , "repository README, located at https://github.com/LaurentRDC/pandoc-plot"
-                                ]
+            <> footerDoc
+              ( Just $
+                  P.vsep
+                    [ "More information can be found via the manual (pandoc-plot --manual) or the",
+                      "repository README, located at https://github.com/LaurentRDC/pandoc-plot"
+                    ]
               )
         )
 

src/Text/Pandoc/Filter/Plot.hs

@@ -22,7 +22,7 @@
 --
 -- @
 -- This is a paragraph.
--- 
+--
 -- ```{.matlabplot}
 -- figure()
 -- plot([1,2,3,4,5], [1,2,3,4,5], '-k')
@@ -34,7 +34,7 @@
 -- @
 -- ```{.gnuplot format=png caption="Sinusoidal function" source=true}
 -- sin(x)
--- 
+--
 -- set xlabel "x"
 -- set ylabel "y"
 -- ```
@@ -63,8 +63,7 @@
 --       code block will be ignored. This path should be specified with respect to the current working
 --       directory, and not with respect to the document.
 --
--- All attributes are described in the online documentation, linked on the home page. 
-
+-- All attributes are described in the online documentation, linked on the home page.
 module Text.Pandoc.Filter.Plot
   ( -- * Operating on whole Pandoc documents
     plotFilter,
@@ -106,7 +105,7 @@ import Data.Map (singleton)
 import Data.Text (Text, pack, unpack)
 import Data.Version (Version)
 import Paths_pandoc_plot (version)
-import Text.Pandoc.Definition (Block, Meta (..), Format, MetaValue (..), Pandoc (..))
+import Text.Pandoc.Definition (Block, Format, Meta (..), MetaValue (..), Pandoc (..))
 import Text.Pandoc.Filter.Plot.Internal
   ( Configuration (..),
     FigureSpec,
@@ -175,19 +174,20 @@ plotFilter conf mfmt (Pandoc meta blocks) = do
 -- on documents without having all necessary toolkits installed. In this case, error
 -- messages are printed to stderr, and blocks are left unchanged.
 --
--- __Note that this function is DEPRECATED in favour of @plotFilter@. It will be 
+-- __Note that this function is DEPRECATED in favour of @plotFilter@. It will be
 -- removed in the next major update (v2+).__
 plotTransform ::
   -- | Configuration for default values
   Configuration ->
   -- | Input document
   Pandoc ->
   IO Pandoc
-{-# DEPRECATED plotTransform
-  [ "plotTransform has been deprecated in favour of plotFilter, which is aware of conversion format."
-  , "plotTransform will be removed in an upcoming major update."
-  ] 
-#-}
+{-# DEPRECATED
+  plotTransform
+  [ "plotTransform has been deprecated in favour of plotFilter, which is aware of conversion format.",
+    "plotTransform will be removed in an upcoming major update."
+  ]
+  #-}
 plotTransform conf = plotFilter conf Nothing
 
 -- | The version of the pandoc-plot package.
@@ -197,7 +197,7 @@ pandocPlotVersion :: Version
 pandocPlotVersion = version
 
 -- | Try to process the block with `pandoc-plot`. If a failure happens (or the block)
--- was not meant to become a figure, return the block as-is unless running in strict mode. 
+-- was not meant to become a figure, return the block as-is unless running in strict mode.
 -- In strict mode, any failure (for example, due to a missing plotting toolkit) will halt execution.
 --
 -- New in version 1.2.0: this function will detect nested code blocks, for example in @Div@ blocks.
@@ -208,7 +208,7 @@ make = walkM $ \blk -> either (onError blk) return =<< makeEither blk
     onError b e = do
       whenStrict $ throwStrictError (pack . show $ e)
       return b
-    
+
     whenStrict f = asksConfig strictMode >>= \s -> when s f
 
 -- | Try to process the block with `pandoc-plot`, documenting the error.
@@ -239,4 +239,4 @@ instance Show PandocPlotError where
   show (ScriptRuntimeError _ exitcode) = "ERROR (pandoc-plot) The script failed with exit code " <> show exitcode <> "."
   show (ScriptChecksFailedError msg) = "ERROR (pandoc-plot) A script check failed with message: " <> unpack msg <> "."
   show (ToolkitNotInstalledError tk) = "ERROR (pandoc-plot) The " <> show tk <> " toolkit is required but not installed."
-  show (IncompatibleSaveFormatError tk sv) = "ERROR (pandoc-plot) Save format " <> show sv <> " not supported by the " <> show tk <> " toolkit." 
+  show (IncompatibleSaveFormatError tk sv) = "ERROR (pandoc-plot) Save format " <> show sv <> " not supported by the " <> show tk <> " toolkit."

src/Text/Pandoc/Filter/Plot/Clean.hs

@@ -31,9 +31,9 @@ import System.FilePath (takeExtension)
 import Text.Pandoc.Class (runIO)
 import Text.Pandoc.Definition (Block, Pandoc)
 import Text.Pandoc.Error (handleError)
-import Text.Pandoc.Format (FlavoredFormat(..))
 import Text.Pandoc.Filter.Plot.Monad
 import Text.Pandoc.Filter.Plot.Parse
+import Text.Pandoc.Format (FlavoredFormat (..))
 import qualified Text.Pandoc.Options as P
 import qualified Text.Pandoc.Readers as P
 import Text.Pandoc.Walk (Walkable, query)
@@ -44,7 +44,7 @@ import Text.Pandoc.Walk (Walkable, query)
 --
 -- The cleaned directories are returned.
 cleanOutputDirs ::
-  Walkable Block b =>
+  (Walkable Block b) =>
   Configuration ->
   b ->
   IO [FilePath]
@@ -59,7 +59,7 @@ cleanOutputDirs conf doc = do
 
 -- | Analyze a document to determine where would the pandoc-plot output directories be.
 outputDirs ::
-  Walkable Block b =>
+  (Walkable Block b) =>
   b ->
   PlotM [FilePath]
 outputDirs = fmap (nub . catMaybes) . sequence . query (\b -> [hasDirectory <$> parseFigureSpec b])
@@ -70,7 +70,7 @@ outputDirs = fmap (nub . catMaybes) . sequence . query (\b -> [hasDirectory <$>
 
 -- | PlotM version of @cleanOutputDirs@
 cleanOutputDirsM ::
-  Walkable Block b =>
+  (Walkable Block b) =>
   b ->
   PlotM [FilePath]
 cleanOutputDirsM doc = do

src/Text/Pandoc/Filter/Plot/Configuration.hs

@@ -17,8 +17,8 @@ module Text.Pandoc.Filter.Plot.Configuration
   )
 where
 
-import Data.Aeson ( (.:?), (.!=), Key, Value(Object, Null), FromJSON(parseJSON) )
-import Data.String (IsString(..))
+import Data.Aeson (FromJSON (parseJSON), Key, Value (Null, Object), (.!=), (.:?))
+import Data.String (IsString (..))
 import Data.Text (Text, unpack)
 import qualified Data.Text.IO as TIO
 import Data.Yaml.Config (ignoreEnv, loadYamlSettings)
@@ -228,11 +228,12 @@ data D2Precursor = D2Precursor {_d2Preamble :: !(Maybe FilePath), _d2Exe :: !Fil
 
 instance FromJSON LoggingPrecursor where
   parseJSON (Object v) =
-    LoggingPrecursor <$> v .:? "verbosity" .!= logVerbosity defaultConfiguration
+    LoggingPrecursor
+      <$> v .:? "verbosity" .!= logVerbosity defaultConfiguration
       <*> v .:? "filepath"
   parseJSON _ = fail $ mconcat ["Could not parse logging configuration. "]
 
-asKey :: InclusionKey -> Key 
+asKey :: InclusionKey -> Key
 asKey = fromString . show
 
 instance FromJSON MatplotlibPrecursor where
@@ -297,7 +298,7 @@ instance FromJSON D2Precursor where
   parseJSON (Object v) = D2Precursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= d2Exe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= d2CmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show SageMath, " configuration."]
 
-toolkitAsKey :: Toolkit -> Key 
+toolkitAsKey :: Toolkit -> Key
 toolkitAsKey = fromString . unpack . cls
 
 instance FromJSON ConfigPrecursor where
@@ -396,4 +397,3 @@ renderConfig ConfigPrecursor {..} = do
   return Configuration {..}
   where
     readPreamble = maybe mempty TIO.readFile
-

src/Text/Pandoc/Filter/Plot/Embed.hs

@@ -32,15 +32,15 @@ import Text.HTML.TagSoup
   )
 import Text.Pandoc.Builder as Builder
   ( Inlines,
-    fromList,
     figureWith,
+    fromList,
     imageWith,
-    plain,
     link,
-    str,
+    plain,
     simpleCaption,
+    str,
     toList,
-  ) 
+  )
 import Text.Pandoc.Class (runPure)
 import Text.Pandoc.Definition (Attr, Block (..), Format, Pandoc (..))
 import Text.Pandoc.Error (handleError)
@@ -84,7 +84,9 @@ figure as fp caption' =
   return . head . toList $
     -- We want the attributes both on the Figure element and the contained Image element
     -- so that pandoc-plot plays nice with pandoc-crossref and other filters
-    figureWith as (simpleCaption (plain caption')) $ plain $ imageWith mempty (pack fp) mempty caption'
+    figureWith as (simpleCaption (plain caption')) $
+      plain $
+        imageWith mempty (pack fp) mempty caption'
 
 -- TODO: also add the case where SVG plots can be
 --       embedded in HTML output
@@ -172,11 +174,11 @@ extractPlot :: Text -> Text
 extractPlot t =
   let tags = canonicalizeTags $ parseTagsOptions parseOptionsFast t
       extracted = headScripts tags <> [inside "body" tags]
-      -- In the past (e.g. commit 8417b011ccb20263427822c7447840ab4a30a41e), we used to
-      -- make all JS scripts 'deferred'. This turned out to be problematic for plotly 
+   in -- In the past (e.g. commit 8417b011ccb20263427822c7447840ab4a30a41e), we used to
+      -- make all JS scripts 'deferred'. This turned out to be problematic for plotly
       -- specifically (see issue #39). In the future, we may want to defer scripts for
       -- certain toolkits, but that's a testing nightmare...
-   in mconcat $ renderTags <$> extracted
+      mconcat $ renderTags <$> extracted
   where
     headScripts = partitions (~== ("<script>" :: String)) . inside "head"
 
@@ -185,4 +187,4 @@ extractPlot t =
 inside :: Text -> [Tag Text] -> [Tag Text]
 inside t = init . tail . tgs
   where
-    tgs = takeWhile (~/= TagClose t) . dropWhile (~/= TagOpen t [])
+    tgs = takeWhile (~/= TagClose t) . dropWhile (~/= TagOpen t [])

src/Text/Pandoc/Filter/Plot/Monad.hs

@@ -149,7 +149,7 @@ runPlotM fmt conf v = do
     \logger -> runReaderT (evalStateT v st) (RuntimeEnv fmt conf logger cwd sem)
 
 -- | maps a function, performing at most @N@ actions concurrently.
-mapConcurrentlyN :: Traversable t => Int -> (a -> PlotM b) -> t a -> PlotM (t b)
+mapConcurrentlyN :: (Traversable t) => Int -> (a -> PlotM b) -> t a -> PlotM (t b)
 mapConcurrentlyN n f xs = do
   -- Emulating a pool of processes with locked access
   sem <- liftIO $ newQSemN n

src/Text/Pandoc/Filter/Plot/Monad/Logging.hs

@@ -76,7 +76,7 @@ data Command
   = LogMessage Text
   | EndLogging
 
-class Monad m => MonadLogger m where
+class (Monad m) => MonadLogger m where
   askLogger :: m Logger
 
 -- | Ensure that all log messages are flushed, and stop logging

src/Text/Pandoc/Filter/Plot/Monad/Types.hs

@@ -13,7 +13,7 @@
 module Text.Pandoc.Filter.Plot.Monad.Types
   ( Toolkit (..),
     Renderer (..),
-    AvailabilityCheck(..),
+    AvailabilityCheck (..),
     Script,
     CheckResult (..),
     InclusionKey (..),
@@ -36,9 +36,9 @@ import Data.Char (toLower)
 import Data.List (intersperse)
 import Data.String (IsString (..))
 import Data.Text (Text, pack, unpack)
-import Data.Yaml (FromJSON(..), ToJSON (toJSON), withText)
+import Data.Yaml (FromJSON (..), ToJSON (toJSON), withText)
 import GHC.Generics (Generic)
-import System.FilePath (splitFileName, (</>), isAbsolute)
+import System.FilePath (isAbsolute, splitFileName, (</>))
 import System.Info (os)
 import Text.Pandoc.Definition (Attr)
 
@@ -99,19 +99,20 @@ cls SageMath = "sageplot"
 cls D2 = "d2"
 
 -- | Executable program, and sometimes the directory where it can be found.
-data Executable 
+data Executable
   = AbsExe FilePath Text
   | RelExe Text
 
 exeFromPath :: FilePath -> Executable
 exeFromPath fp
-  | isAbsolute fp = let (dir, name) = splitFileName fp
-                     in AbsExe dir (pack name)
-  | otherwise     = RelExe (pack fp) 
+  | isAbsolute fp =
+      let (dir, name) = splitFileName fp
+       in AbsExe dir (pack name)
+  | otherwise = RelExe (pack fp)
 
 pathToExe :: Executable -> FilePath
-pathToExe (AbsExe dir name) = dir </> unpack name 
-pathToExe (RelExe name)            = unpack name
+pathToExe (AbsExe dir name) = dir </> unpack name
+pathToExe (RelExe name) = unpack name
 
 -- | Source context for plotting scripts
 type Script = Text
@@ -241,13 +242,13 @@ instance IsString SaveFormat where
     | s `elem` ["html", "HTML", ".html"] = HTML
     | s `elem` ["latex", "LaTeX", ".tex"] = LaTeX
     | otherwise =
-      errorWithoutStackTrace $
-        mconcat
-          [ s,
-            " is not one of the valid save formats : ",
-            mconcat $ intersperse ", " $ show <$> saveFormats,
-            " (and lowercase variations). "
-          ]
+        errorWithoutStackTrace $
+          mconcat
+            [ s,
+              " is not one of the valid save formats : ",
+              mconcat $ intersperse ", " $ show <$> saveFormats,
+              " (and lowercase variations). "
+            ]
     where
       saveFormats = enumFromTo minBound maxBound :: [SaveFormat]