pandoc-plot 1.3.0 → 1.4.0

raw patch · 28 files changed

+85/−71 lines, 28 filesdep +aesondep ~yamlPVP ok

version bump matches the API change (PVP)

Dependencies added: aeson

Dependency ranges changed: yaml

API changes (from Hackage documentation)

Files

CHANGELOG.md +5/−0
example-config.yml +3/−0
executable/OpenFile.hs +1/−1
pandoc-plot.cabal +5/−4
src/Text/Pandoc/Filter/Plot.hs +1/−1
src/Text/Pandoc/Filter/Plot/Clean.hs +1/−1
src/Text/Pandoc/Filter/Plot/Configuration.hs +47/−42
src/Text/Pandoc/Filter/Plot/Embed.hs +1/−1
src/Text/Pandoc/Filter/Plot/Internal.hs +1/−1
src/Text/Pandoc/Filter/Plot/Monad.hs +1/−1
src/Text/Pandoc/Filter/Plot/Monad/Logging.hs +1/−1
src/Text/Pandoc/Filter/Plot/Monad/Types.hs +1/−1
src/Text/Pandoc/Filter/Plot/Parse.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/Bokeh.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/GGPlot2.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/GNUPlot.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/Graphviz.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/Mathematica.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/Matlab.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/Matplotlib.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/Octave.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/PlantUML.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/PlotlyPython.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/PlotlyR.hs +1/−1
src/Text/Pandoc/Filter/Plot/Renderers/Plotsjl.hs +2/−2
src/Text/Pandoc/Filter/Plot/Renderers/Prelude.hs +1/−1
src/Text/Pandoc/Filter/Plot/Scripting.hs +1/−1

CHANGELOG.md view

@@ -2,6 +2,11 @@ 
 pandoc-plot uses [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## Release 1.4.0
+
+* The executable `pandoc-plot` now uses pandoc 2.17. Pandoc 2.11+ are still supported.
+* Added support for `aeson` 2+.
+
 ## Release 1.3.0
 
 * The executable `pandoc-plot` is now aware of final conversion format.

example-config.yml view

@@ -115,16 +115,19 @@   executable: dot
   command_line_arguments:
 
+# The possible parameters for the Bokeh toolkit using Python
 bokeh:
   # preamble: bokeh.py
   executable: python
   command_line_arguments:
 
+# The possible parameters for the Plots.jl toolkit using Julia
 plotsjl:
   # preamble: plotsjl.jl
   executable: julia
   command_line_arguments:
 
+# The possible parameters for the PlantUML toolkit
 plantuml:
   # preamble: plantuml.txt
   executable: java

executable/OpenFile.hs view

@@ -1,6 +1,6 @@ -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

pandoc-plot.cabal view

@@ -1,12 +1,12 @@ cabal-version:  2.2
 name:           pandoc-plot
-version:        1.3.0
+version:        1.4.0
 synopsis:       A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice.
 description:    A Pandoc filter to include figures generated from code blocks. 
                 Keep the document and code in the same location. Output is 
                 captured and included as a figure.
 category:       Text
-copyright:      (c) 2019-2021 Laurent P. René de Cotret
+copyright:      (c) 2019-present Laurent P. René de Cotret
 homepage:       https://github.com/LaurentRDC/pandoc-plot#readme
 bug-reports:    https://github.com/LaurentRDC/pandoc-plot/issues
 author:         Laurent P. René de Cotret
@@ -85,7 +85,8 @@         -Wall 
         -Wcompat
     build-depends:
-          base               >= 4.11  && <5
+          aeson              >= 2     && <3
+        , base               >= 4.11  && <5
         , bytestring
         , containers
         , data-default  
@@ -99,7 +100,7 @@         , shakespeare        >= 2.0   && < 3
         , tagsoup            >= 0.14  && < 1
         , template-haskell   >  2.7   && < 3
-        , text               >= 1     && < 2
+        , text               >= 1     && < 3
         , typed-process      >= 0.2.1 && < 1
         , yaml               >= 0.8   && < 1
         , mtl                >= 2.2   && < 3

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

@@ -5,7 +5,7 @@ -- |
 -- Module      : $header$
 -- Description : Pandoc filter to create figures from code blocks using your plotting toolkit of choice
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : unstable

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

@@ -3,7 +3,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

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

@@ -3,7 +3,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal
@@ -17,9 +17,10 @@   )
 where
 
-import Data.Text (Text, pack, unpack)
+import Data.Aeson ( (.:?), (.!=), Key, Value(Object, Null), FromJSON(parseJSON) )
+import Data.String (IsString(..))
+import Data.Text (Text, unpack)
 import qualified Data.Text.IO as TIO
-import Data.Yaml (FromJSON (parseJSON), Value (Null, Object), (.!=), (.:?))
 import Data.Yaml.Config (ignoreEnv, loadYamlSettings)
 import System.FilePath (normalise)
 import Text.Pandoc.Definition (Format (..), Inline (..), MetaValue (..), Pandoc (..), lookupMeta)
@@ -217,85 +218,91 @@       <*> v .:? "filepath"
   parseJSON _ = fail $ mconcat ["Could not parse logging configuration. "]
 
+asKey :: InclusionKey -> Key 
+asKey = fromString . show
+
 instance FromJSON MatplotlibPrecursor where
   parseJSON (Object v) =
     MatplotlibPrecursor
-      <$> v .:? tshow PreambleK
-      <*> v .:? tshow MatplotlibTightBBoxK .!= matplotlibTightBBox defaultConfiguration
-      <*> v .:? tshow MatplotlibTransparentK .!= matplotlibTransparent defaultConfiguration
-      <*> v .:? tshow ExecutableK .!= matplotlibExe defaultConfiguration
-      <*> v .:? tshow CommandLineArgsK .!= matplotlibCmdArgs defaultConfiguration
+      <$> v .:? asKey PreambleK
+      <*> v .:? asKey MatplotlibTightBBoxK .!= matplotlibTightBBox defaultConfiguration
+      <*> v .:? asKey MatplotlibTransparentK .!= matplotlibTransparent defaultConfiguration
+      <*> v .:? asKey ExecutableK .!= matplotlibExe defaultConfiguration
+      <*> v .:? asKey CommandLineArgsK .!= matplotlibCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show Matplotlib, " configuration."]
 
 instance FromJSON MatlabPrecursor where
-  parseJSON (Object v) = MatlabPrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= matlabExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= matlabCmdArgs defaultConfiguration
+  parseJSON (Object v) = MatlabPrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= matlabExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= matlabCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show Matlab, " configuration."]
 
 instance FromJSON PlotlyPythonPrecursor where
-  parseJSON (Object v) = PlotlyPythonPrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= plotlyPythonExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= plotlyPythonCmdArgs defaultConfiguration
+  parseJSON (Object v) = PlotlyPythonPrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= plotlyPythonExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= plotlyPythonCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show PlotlyPython, " configuration."]
 
 instance FromJSON PlotlyRPrecursor where
-  parseJSON (Object v) = PlotlyRPrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= plotlyRExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= plotlyRCmdArgs defaultConfiguration
+  parseJSON (Object v) = PlotlyRPrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= plotlyRExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= plotlyRCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show PlotlyR, " configuration."]
 
 instance FromJSON MathematicaPrecursor where
-  parseJSON (Object v) = MathematicaPrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= mathematicaExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= mathematicaCmdArgs defaultConfiguration
+  parseJSON (Object v) = MathematicaPrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= mathematicaExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= mathematicaCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show Mathematica, " configuration."]
 
 instance FromJSON OctavePrecursor where
-  parseJSON (Object v) = OctavePrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= octaveExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= octaveCmdArgs defaultConfiguration
+  parseJSON (Object v) = OctavePrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= octaveExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= octaveCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show Octave, " configuration."]
 
 instance FromJSON GGPlot2Precursor where
-  parseJSON (Object v) = GGPlot2Precursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= ggplot2Exe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= ggplot2CmdArgs defaultConfiguration
+  parseJSON (Object v) = GGPlot2Precursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= ggplot2Exe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= ggplot2CmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show GGPlot2, " configuration."]
 
 instance FromJSON GNUPlotPrecursor where
-  parseJSON (Object v) = GNUPlotPrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= gnuplotExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= gnuplotCmdArgs defaultConfiguration
+  parseJSON (Object v) = GNUPlotPrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= gnuplotExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= gnuplotCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show GNUPlot, " configuration."]
 
 instance FromJSON GraphvizPrecursor where
-  parseJSON (Object v) = GraphvizPrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= graphvizExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= graphvizCmdArgs defaultConfiguration
+  parseJSON (Object v) = GraphvizPrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= graphvizExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= graphvizCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show Graphviz, " configuration."]
 
 instance FromJSON BokehPrecursor where
-  parseJSON (Object v) = BokehPrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= bokehExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= bokehCmdArgs defaultConfiguration
+  parseJSON (Object v) = BokehPrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= bokehExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= bokehCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show Bokeh, " configuration."]
 
 instance FromJSON PlotsjlPrecursor where
-  parseJSON (Object v) = PlotsjlPrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= plotsjlExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= plotsjlCmdArgs defaultConfiguration
+  parseJSON (Object v) = PlotsjlPrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= plotsjlExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= plotsjlCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show Plotsjl, " configuration."]
 
 instance FromJSON PlantUMLPrecursor where
-  parseJSON (Object v) = PlantUMLPrecursor <$> v .:? tshow PreambleK <*> v .:? tshow ExecutableK .!= plantumlExe defaultConfiguration <*> v .:? tshow CommandLineArgsK .!= plantumlCmdArgs defaultConfiguration
+  parseJSON (Object v) = PlantUMLPrecursor <$> v .:? asKey PreambleK <*> v .:? asKey ExecutableK .!= plantumlExe defaultConfiguration <*> v .:? asKey CommandLineArgsK .!= plantumlCmdArgs defaultConfiguration
   parseJSON _ = fail $ mconcat ["Could not parse ", show PlantUML, " configuration."]
 
+toolkitAsKey :: Toolkit -> Key 
+toolkitAsKey = fromString . unpack . cls
+
 instance FromJSON ConfigPrecursor where
   parseJSON Null = return defaultConfigPrecursor -- In case of empty file
   parseJSON (Object v) = do
-    _defaultDirectory <- v .:? tshow DirectoryK .!= _defaultDirectory defaultConfigPrecursor
-    _defaultWithSource <- v .:? tshow WithSourceK .!= _defaultWithSource defaultConfigPrecursor
-    _defaultDPI <- v .:? tshow DpiK .!= _defaultDPI defaultConfigPrecursor
-    _defaultSaveFormat <- v .:? tshow SaveFormatK .!= _defaultSaveFormat defaultConfigPrecursor
-    _defaultDependencies <- v .:? tshow DependenciesK .!= _defaultDependencies defaultConfigPrecursor
-    _captionFormat <- v .:? tshow CaptionFormatK .!= _captionFormat defaultConfigPrecursor
-    _sourceCodeLabel <- v .:? tshow SourceCodeLabelK .!= _sourceCodeLabel defaultConfigPrecursor
-    _strictMode <- v .:? tshow StrictModeK .!= _strictMode defaultConfigPrecursor
+    _defaultDirectory <- v .:? asKey DirectoryK .!= _defaultDirectory defaultConfigPrecursor
+    _defaultWithSource <- v .:? asKey WithSourceK .!= _defaultWithSource defaultConfigPrecursor
+    _defaultDPI <- v .:? asKey DpiK .!= _defaultDPI defaultConfigPrecursor
+    _defaultSaveFormat <- v .:? asKey SaveFormatK .!= _defaultSaveFormat defaultConfigPrecursor
+    _defaultDependencies <- v .:? asKey DependenciesK .!= _defaultDependencies defaultConfigPrecursor
+    _captionFormat <- v .:? asKey CaptionFormatK .!= _captionFormat defaultConfigPrecursor
+    _sourceCodeLabel <- v .:? asKey SourceCodeLabelK .!= _sourceCodeLabel defaultConfigPrecursor
+    _strictMode <- v .:? asKey StrictModeK .!= _strictMode defaultConfigPrecursor
     _logPrec <- v .:? "logging" .!= _logPrec defaultConfigPrecursor
 
-    _matplotlibPrec <- v .:? cls Matplotlib .!= _matplotlibPrec defaultConfigPrecursor
-    _matlabPrec <- v .:? cls Matlab .!= _matlabPrec defaultConfigPrecursor
-    _plotlyPythonPrec <- v .:? cls PlotlyPython .!= _plotlyPythonPrec defaultConfigPrecursor
-    _plotlyRPrec <- v .:? cls PlotlyR .!= _plotlyRPrec defaultConfigPrecursor
-    _mathematicaPrec <- v .:? cls Mathematica .!= _mathematicaPrec defaultConfigPrecursor
-    _octavePrec <- v .:? cls Octave .!= _octavePrec defaultConfigPrecursor
-    _ggplot2Prec <- v .:? cls GGPlot2 .!= _ggplot2Prec defaultConfigPrecursor
-    _gnuplotPrec <- v .:? cls GNUPlot .!= _gnuplotPrec defaultConfigPrecursor
-    _graphvizPrec <- v .:? cls Graphviz .!= _graphvizPrec defaultConfigPrecursor
-    _bokehPrec <- v .:? cls Bokeh .!= _bokehPrec defaultConfigPrecursor
-    _plotsjlPrec <- v .:? cls Plotsjl .!= _plotsjlPrec defaultConfigPrecursor
-    _plantumlPrec <- v .:? cls PlantUML .!= _plantumlPrec defaultConfigPrecursor
+    _matplotlibPrec <- v .:? toolkitAsKey Matplotlib .!= _matplotlibPrec defaultConfigPrecursor
+    _matlabPrec <- v .:? toolkitAsKey Matlab .!= _matlabPrec defaultConfigPrecursor
+    _plotlyPythonPrec <- v .:? toolkitAsKey PlotlyPython .!= _plotlyPythonPrec defaultConfigPrecursor
+    _plotlyRPrec <- v .:? toolkitAsKey PlotlyR .!= _plotlyRPrec defaultConfigPrecursor
+    _mathematicaPrec <- v .:? toolkitAsKey Mathematica .!= _mathematicaPrec defaultConfigPrecursor
+    _octavePrec <- v .:? toolkitAsKey Octave .!= _octavePrec defaultConfigPrecursor
+    _ggplot2Prec <- v .:? toolkitAsKey GGPlot2 .!= _ggplot2Prec defaultConfigPrecursor
+    _gnuplotPrec <- v .:? toolkitAsKey GNUPlot .!= _gnuplotPrec defaultConfigPrecursor
+    _graphvizPrec <- v .:? toolkitAsKey Graphviz .!= _graphvizPrec defaultConfigPrecursor
+    _bokehPrec <- v .:? toolkitAsKey Bokeh .!= _bokehPrec defaultConfigPrecursor
+    _plotsjlPrec <- v .:? toolkitAsKey Plotsjl .!= _plotsjlPrec defaultConfigPrecursor
+    _plantumlPrec <- v .:? toolkitAsKey PlantUML .!= _plantumlPrec defaultConfigPrecursor
 
     return $ ConfigPrecursor {..}
   parseJSON _ = fail "Could not parse configuration."
@@ -358,7 +365,5 @@ 
   return Configuration {..}
   where
-    readPreamble fp = maybe mempty TIO.readFile fp
+    readPreamble = maybe mempty TIO.readFile
 
-tshow :: Show a => a -> Text
-tshow = pack . show

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

@@ -3,7 +3,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Internal.hs view

@@ -1,6 +1,6 @@ -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

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

@@ -4,7 +4,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

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

@@ -4,7 +4,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

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

@@ -4,7 +4,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Parse.hs view

@@ -3,7 +3,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers.hs view

@@ -3,7 +3,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/Bokeh.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/GGPlot2.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/GNUPlot.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/Graphviz.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/Mathematica.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/Matlab.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/Matplotlib.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/Octave.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/PlantUML.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/PlotlyPython.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/PlotlyR.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Renderers/Plotsjl.hs view

@@ -5,7 +5,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal
@@ -49,7 +49,7 @@ plotsjlSupportedSaveFormats = [PNG, SVG, PDF]
 
 plotsjlCommand :: Text -> Text -> OutputSpec -> Text
-plotsjlCommand cmdargs exe OutputSpec {..} = [st|#{exe} #{cmdargs} "#{oScriptPath}"|]
+plotsjlCommand cmdargs exe OutputSpec {..} = [st|#{exe} #{cmdargs} -- "#{oScriptPath}"|]
 
 plotsjlAvailable :: PlotM Bool
 plotsjlAvailable = do

src/Text/Pandoc/Filter/Plot/Renderers/Prelude.hs view

@@ -2,7 +2,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal

src/Text/Pandoc/Filter/Plot/Scripting.hs view

@@ -4,7 +4,7 @@ 
 -- |
 -- Module      : $header$
--- Copyright   : (c) Laurent P René de Cotret, 2019 - 2021
+-- Copyright   : (c) Laurent P René de Cotret, 2019 - present
 -- License     : GNU GPL, version 2 or above
 -- Maintainer  : laurent.decotret@outlook.com
 -- Stability   : internal