diagrams-builder 0.8.0.3 → 0.8.0.4

raw patch · 3 files changed

+43/−19 lines, 3 filesdep ~JuicyPixelsdep ~basedep ~hintPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: JuicyPixels, base, hint, lens

API changes (from Hackage documentation)

Files

• CHANGES.markdown +9/−0
• diagrams-builder.cabal +11/−11
• latex/diagrams-latex.sty +23/−8

@@ -1,3 +1,12 @@+## [v0.8.0.4](https://github.com/diagrams/diagrams-builder/tree/v0.8.0.4) (2019-02-08)++- Bump upper bounds: allow+    - `base-4.12`+    - `lens-4.17`+    - `hint-0.9`+    - `JuicyPixels-3.3`+- New options added to `diagrams-latex.sty`+ ## [v0.8.0.3](https://github.com/diagrams/diagrams-builder/tree/v0.8.0.3) (2018-06-09)  - Bump upper bounds: allow `exceptions-0.10`, `lens-4.16`, `hint-0.8`,

@@ -1,5 +1,5 @@ name:                diagrams-builder-version:             0.8.0.3+version:             0.8.0.4 synopsis:            hint-based build service for the diagrams graphics EDSL.  description:         @diagrams-builder@ provides backend-agnostic tools for@@ -37,7 +37,7 @@ category:            Graphics build-type:          Simple cabal-version:       >=1.10-tested-with:         GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.2+tested-with:         GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1 bug-reports:         https://github.com/diagrams/diagrams-builder/issues Source-repository head   type:     git@@ -48,11 +48,11 @@                        Diagrams.Builder.Opts                        Diagrams.Builder.Modules                        Diagrams.Builder.CmdLine-  build-depends:       base >=4.2 && < 4.12,-                       base-orphans >= 0.3 && < 0.8,+  build-depends:       base >=4.2 && < 4.13,+                       base-orphans >= 0.3 && < 0.9,                        mtl >= 2.1 && < 2.3,                        diagrams-lib >= 1.4 && < 1.5,-                       hint >= 0.4 && < 0.9,+                       hint >= 0.4 && < 0.10,                        directory,                        filepath,                        transformers >= 0.3 && < 0.6,@@ -60,7 +60,7 @@                        haskell-src-exts >= 1.18 && < 1.21,                        haskell-src-exts-simple >= 1.18 && < 1.21,                        cmdargs >= 0.6 && < 0.11,-                       lens >= 4.0 && < 4.17,+                       lens >= 4.0 && < 4.18,                        hashable >= 1.1 && < 1.3,                        exceptions >= 0.3 && < 0.11   hs-source-dirs:      src@@ -118,7 +118,7 @@                        diagrams-lib >= 1.4 && < 1.5,                        diagrams-cairo >= 1.4 && < 1.5,                        cmdargs >= 0.6 && < 0.11,-                       lens >= 4.0 && < 4.17+                       lens >= 4.0 && < 4.18  executable diagrams-builder-svg   main-is:             diagrams-builder-svg.hs@@ -159,7 +159,7 @@                        diagrams-lib >= 1.4 && < 1.5,                        diagrams-postscript >= 1.4 && < 1.5,                        cmdargs >= 0.6 && < 0.11,-                       lens >= 3.8 && < 4.17+                       lens >= 3.8 && < 4.18  executable diagrams-builder-rasterific   main-is:             diagrams-builder-rasterific.hs@@ -179,8 +179,8 @@                        diagrams-lib >= 1.4 && < 1.5,                        diagrams-rasterific >= 1.4 && < 1.5,                        cmdargs >= 0.6 && < 0.11,-                       lens >= 3.8 && < 4.17,-                       JuicyPixels >= 3.1.5 && < 3.3+                       lens >= 3.8 && < 4.18,+                       JuicyPixels >= 3.1.5 && < 3.4  executable diagrams-builder-pgf   main-is:             diagrams-builder-pgf.hs@@ -201,5 +201,5 @@                        diagrams-pgf >= 1.4 && < 1.5,                        bytestring >= 0.10.2 && < 0.11,                        cmdargs >= 0.6 && < 0.11,-                       lens >= 3.8 && < 4.17,+                       lens >= 3.8 && < 4.18,                        texrunner

@@ -9,7 +9,7 @@  %% diagrams-latex.sty %% Copyright (c) 2011-2012, Ryan Yates-%% +%% %% Large portions copied from dot2texi.sty %% %% Copyright (c) 2007-2008, Kjell Magne Fauske@@ -60,6 +60,8 @@ \RequirePackage{xkeyval}[2005/02/22] \RequirePackage{ifthen} +\RequirePackage{graphics}+ \newif\ifdtt@ShellEscape %\newif\ifmiktex \miktexfalse \newif\ifdtt@ForceShellEscape \dtt@ForceShellEscapefalse@@ -72,9 +74,9 @@ \DeclareOptionX{miktex}{} % dummy (for backwards compatability)  % Options for setting output size-\DeclareOptionX{width}[]{\def\dtt@width{-w #1}}+\DeclareOptionX{width}[]{\Gin@defaultbp\foo{#1}\def\dtt@width{-w \foo}} \def\dtt@width{} % default output width-\DeclareOptionX{height}[]{\def\dtt@height{-h #1}}+\DeclareOptionX{height}[]{\Gin@defaultbp\foo{#1}\def\dtt@height{-h \foo}} \def\dtt@height{} % default output height  % Option for setting an output directory@@ -92,6 +94,13 @@ \DeclareOptionX{input}{\dtt@inputtrue} \DeclareOptionX{noinput}{\dtt@inputfalse} +\DeclareOptionX{cmdprefix}[]{\def\dtt@cmdprefix{#1 }}+\def\dtt@cmdprefix{} % default command prefix++\newif\ifdtt@beamer \dtt@beamerfalse+\DeclareOptionX{beamer}{\dtt@beamertrue}+\DeclareOptionX{nobeamer}{\dtt@beamerfalse}+ \ExecuteOptionsX{shell}  \ProcessOptionsX\relax@@ -159,10 +168,12 @@  % Options \define@key{dtt}{width}[]{%-    \def\dtt@width{-w #1}+    \Gin@defaultbp\foo{#1}+    \def\dtt@width{-w \foo} } \define@key{dtt}{height}[]{%-    \def\dtt@height{-h #1}+    \Gin@defaultbp\foo{#1}+    \def\dtt@height{-h \foo} }  \define@key{dtt}{outputdir}[]{%@@ -227,14 +238,18 @@       \immediate\write18{mkdir -p \dtt@outputdir}     \fi     \xdef\diagramslatexCutFile{\dtt@figname.hs}-    \diagramslatexverbatimwrite{\diagramslatexCutFile}}-    {\enddiagramslatexverbatimwrite%+    \diagramslatexverbatimwrite{\diagramslatexCutFile}+    }+    {\ifdtt@beamer\ifdefined\beamer@slideinframe+    \immediate\write\verbatim@out{overlay = \number\beamer@slideinframe\space :: Int}+    \fi\fi+    \enddiagramslatexverbatimwrite%     \diagramslatexgraphicsinclude}  \long\gdef\diagramslatexgraphicsprocess{%     \ifdtt@ShellEscape         \IfFileExists{\dtt@figname.hs}{%-            \immediate\write18{diagrams-builder-\dtt@backend\space -o \dtt@figname.\dtt@extension\space+            \immediate\write18{\dtt@cmdprefix diagrams-builder-\dtt@backend\space -o \dtt@figname.\dtt@extension\space                 \dtt@width\space                 \dtt@height\space                 \dtt@figname.hs\space }%