pandoc-plot 0.6.0.0 → 0.6.1.0
raw patch · 10 files changed
+32/−35 lines, 10 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- CHANGELOG.md +8/−1
- README.md +5/−2
- executable/ExampleConfig.hs +0/−1
- executable/Main.hs +0/−2
- pandoc-plot.cabal +1/−1
- src/Text/Pandoc/Filter/Plot.hs +6/−3
- src/Text/Pandoc/Filter/Plot/Parse.hs +0/−1
- src/Text/Pandoc/Filter/Plot/Scripting.hs +1/−2
- src/Text/Pandoc/Filter/Plot/Types.hs +8/−8
- stack.yaml +3/−14
CHANGELOG.md view
@@ -2,8 +2,15 @@ pandoc-plot uses [Semantic Versioning](http://semver.org/spec/v2.0.0.html) +Release 0.6.1.0 +--------------- + +* Made the functions `availableToolkits` and `unavailableToolkits` public. +* Minor documentation fixes. +* Executables are now built with GHC 8.8.3. + Release 0.6.0.0 --------------- +--------------- New toolkits: * Added support for the Plotly/R plotting library.
README.md view
@@ -7,7 +7,7 @@ ## A Pandoc filter to generate figures from code blocks in documents -[](http://hackage.haskell.org/package/pandoc-plot) [](http://stackage.org/nightly/package/pandoc-plot) [](https://ci.appveyor.com/project/LaurentRDC/pandoc-plot) [](https://dev.azure.com/laurentdecotret/pandoc-plot/_build/latest?definitionId=5&branchName=master) [](https://www.gnu.org/licenses/gpl.html) [](https://anaconda.org/conda-forge/pandoc-plot) +[](http://hackage.haskell.org/package/pandoc-plot) [](http://stackage.org/nightly/package/pandoc-plot) [](https://anaconda.org/conda-forge/pandoc-plot) [](https://www.gnu.org/licenses/gpl.html) `pandoc-plot` turns code blocks present in your documents (Markdown, LaTeX, etc.) into embedded figures, using your plotting toolkit of choice, including Matplotlib, ggplot2, MATLAB, Mathematica, and more. @@ -259,7 +259,7 @@ pandoc-plot - generate figures directly in documents using your plotting toolkit of choice. -Usage: pandoc-plot.exe ([-v|--version] | [--full-version] | [-m|--manual]) +Usage: pandoc-plot.exe [(-v|--version) | --full-version | (-m|--manual)] [COMMAND] [AST] This pandoc filter generates plots from code blocks using a multitude of possible renderers. This allows to keep documentation and figures in perfect @@ -647,6 +647,9 @@ ``` ### From source + +[](https://dev.azure.com/laurentdecotret/pandoc-plot/_build/latest?definitionId=5&branchName=master) Building from source can be done using [`stack`](https://docs.haskellstack.org/en/stable/README/) or
executable/ExampleConfig.hs view
@@ -9,7 +9,6 @@ import Language.Haskell.TH.Syntax -import System.FilePath (FilePath) import System.IO docFile :: FilePath
executable/Main.hs view
@@ -5,11 +5,9 @@ module Main where -import Control.Applicative ((<|>)) import Control.Monad (join, forM_, when, msum) import Data.List (intersperse, (\\)) -import Data.Monoid ((<>)) import Data.Text (unpack) import Data.Version (parseVersion, showVersion)
pandoc-plot.cabal view
@@ -1,5 +1,5 @@ name: pandoc-plot -version: 0.6.0.0 +version: 0.6.1.0 cabal-version: >= 1.12 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.
src/Text/Pandoc/Filter/Plot.hs view
@@ -19,11 +19,13 @@ * @matplotlib@ for matplotlib-based Python plots; * @plotly_python@ for Plotly-based Python plots; +* @plotly_r@ for Plotly-based R plots; * @matlabplot@ for MATLAB plots; * @mathplot@ for Mathematica plots; * @octaveplot@ for GNU Octave plots; * @ggplot2@ for ggplot2-based R plots; * @gnuplot@ for gnuplot plots; +* @graphviz@ for Graphviz graphs. For example, in Markdown: @@ -32,7 +34,7 @@ ```{.matlabplot} figure() - plot([1,2,3,4,5], [1,2,3,4,5], '-k) + plot([1,2,3,4,5], [1,2,3,4,5], '-k') ``` @ @@ -75,13 +77,14 @@ , Configuration(..) , SaveFormat(..) , Script + -- * Determining available plotting toolkits + , availableToolkits + , unavailableToolkits -- * For testing and internal purposes ONLY , make , make' , PandocPlotError(..) , readDoc - , availableToolkits - , unavailableToolkits ) where import Control.Concurrent.Async (mapConcurrently)
src/Text/Pandoc/Filter/Plot/Parse.hs view
@@ -28,7 +28,6 @@ import Data.List (intersperse) import qualified Data.Map.Strict as Map import Data.Maybe (fromMaybe, listToMaybe) -import Data.Monoid ((<>)) import Data.String (fromString) import Data.Text (Text, pack, unpack) import qualified Data.Text.IO as TIO
src/Text/Pandoc/Filter/Plot/Scripting.hs view
@@ -23,14 +23,13 @@ import Data.Hashable (hash) import Data.Maybe (fromMaybe) -import Data.Monoid ((<>)) import qualified Data.Text as T import qualified Data.Text.IO as T import System.Directory (createDirectoryIfMissing, doesFileExist) import System.Exit (ExitCode (..)) -import System.FilePath (FilePath, addExtension, +import System.FilePath (addExtension, normalise, replaceExtension, takeDirectory, (</>)) import System.IO.Temp (getCanonicalTemporaryDirectory)
src/Text/Pandoc/Filter/Plot/Types.hs view
@@ -268,14 +268,14 @@ -- | Generated figure file format supported by pandoc-plot. -- Note that not all formats are supported by all toolkits. data SaveFormat - = PNG - | PDF - | SVG - | JPG - | EPS - | GIF - | TIF - | WEBP + = PNG -- ^ Portable network graphics + | PDF -- ^ Portable document format + | SVG -- ^ Scalable vector graphics + | JPG -- ^ JPEG/JPG compressed image + | EPS -- ^ Encapsulated postscript + | GIF -- ^ GIF format + | TIF -- ^ Tagged image format + | WEBP -- ^ WebP image format deriving (Bounded, Enum, Eq, Show, Generic) instance IsString SaveFormat where
stack.yaml view
@@ -17,8 +17,9 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-14.1 +resolver: lts-15.16 # GHC 8.8.3 + # User packages to be built. # Various formats can be used as shown in the example below. # @@ -38,18 +39,6 @@ # using the same syntax as the packages field. # (e.g., acme-missiles-0.3) extra-deps: -- pandoc-2.9 -- pandoc-types-1.20@sha256:8393b1a73b8a6a1f3feaeb3a6592c176461082c3e4d897f1b316b1a58dd84c39,3999 -- texmath-0.12 -- HsYAML-0.2.1.0@sha256:e4677daeba57f7a1e9a709a1f3022fe937336c91513e893166bd1f023f530d68,5311 -- doclayout-0.2.0.1@sha256:0410e40c4fa8e299b4f5fa03d378111b9d0effdf59134c95882a160637887ba8,2063 -- haddock-library-1.8.0@sha256:9dece2cbca827755fdfc30af5a407b0ca30cf29ec1ee85215b38fd8fc23e7421,3723 -- regex-pcre-builtin-0.95.1.1.8.43@sha256:2d671af361adf1776fde182a687bb6da022b1e5e3b0a064ce264289de63564a5,3088 -- regex-base-0.94.0.0@sha256:d514eab2aa9ba4b9d14900ac40cbdea1993372466a6cc6ffeeab59a1975563c0,2166 -- doctemplates-0.8@sha256:a85670fbc199422ff06b3f511c426a94e72d3ee1f2d165bfdfb64ec6bb48bdc3,3109 -- emojis-0.1@sha256:3cd86b552ad71c118a7822128c97054b6cf22bc4ff5b8f7e3eb0b356202aeecd,1907 -- skylighting-0.8.3@sha256:dbd885fc6be993cb3714b67ab1ba32c110dc889cd96d2a70f4dc2f67518ad5d3,9726 -- skylighting-core-0.8.3@sha256:90cf39790b38f77f13a29a7a64a7c50a8cb0442c2c68f5cd7b44c12a32e8dd37,8056 # Override default flag values for local packages and extra-deps # flags: {} @@ -73,4 +62,4 @@ # extra-lib-dirs: [/path/to/dir] # # Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor +compiler-check: newer-minor