Merge pull request #2294 from daschw/release

New release

.github/workflows/CompatHelper.yml

@@ -0,0 +1,24 @@
+name: CompatHelper
+
+on:
+  schedule:
+    - cron: '00 * * * *'
+
+jobs:
+  CompatHelper:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        julia-version: [1.2.0]
+        julia-arch: [x86]
+        os: [ubuntu-latest]
+    steps:
+      - uses: julia-actions/setup-julia@latest
+        with:
+          version: ${{ matrix.julia-version }}
+      - name: Pkg.add("CompatHelper")
+        run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
+      - name: CompatHelper.main()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: julia -e 'using CompatHelper; CompatHelper.main()'

.travis.yml

@@ -4,12 +4,21 @@ os:
   - linux
   # - osx
 julia:
-  - 1.1
+  - 1
+  - 1.2
   - nightly
-  
+
 matrix:
   allow_failures:
-    - julia: nightly
+  - julia: nightly
+
+addons:
+  apt:
+    packages:
+      - at-spi2-core
+      - libgtk-3-dev
+      - xauth
+      - xvfb
 
 sudo: required
 before_install:
@@ -18,3 +27,8 @@ before_install:
 
 notifications:
   email: true
+
+script:
+  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+  - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
+  - $TESTCMD -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'

NEWS.md

@@ -11,6 +11,53 @@
 ---
 ## (current master)
 
+## 0.26.3
+- fix `vline` with dates
+- fix PyPlot logscale bug
+- avoid annotation clipping for PyPlot
+- allow plotting of Any vectors and 3D plotting again in convertToAnyVector
+- specify legend title font in GR and PyPlot
+- delete `pushtomaster.sh`
+- use `=== nothing`
+
+## 0.26.2
+- improve empty animation build error
+- fix GR axis flip for heatmaps and images
+- fix ribbons specified as tuples
+- add Char recipe
+- fix Plotly plots with single-element series
+- rewrite PlotlyJS backend
+
+## 0.26.1
+- handle `Char`s as input data
+- fix html saving for Plotly
+- expand ~ in paths on UNIX systems
+- convertToAnyVector clean-up
+- fix color_palette grouping issue
+
+## 0.26.0
+- use FFMPEG.jl
+- add missing method for convertToAnyVector
+
+## 0.25.3
+- add areaplot
+- allow missing in z_color arguments
+- more general tuple recipe
+- stephist logscale improvements
+
+## 0.25.2
+- improvements to handle missings
+- pyplot: allow setting the color gradient for z values
+- document :colorbar_entry
+- limit number of automatic bins
+- fix ENV['PLOTS_DEFAULT_BACKEND']
+- don't let aspect_ratio impact subplot size
+- implement arrowstyle for GR
+- fix bug in plotly_convert_to_datetime
+- improve missing support
+- gr: polar heatmaps
+- make sure show returns nothing
+
 ## 0.25.1
 - fix gr_display
 

Project.toml

@@ -1,12 +1,13 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "0.25.1"
+version = "0.28.2"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Contour = "d38c429a-6771-53c6-b99e-75d170b6e991"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
+FFMPEG = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
 FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
 GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
 GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
@@ -30,27 +31,38 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
-FixedPointNumbers = "≥ 0.3.0"
-GR = "≥ 0.31.0"
-PlotThemes = "≥ 0.1.3"
-PlotUtils = "≥ 0.4.1"
-RecipesBase = "≥ 0.6.0"
-StatsBase = "≥ 0.14.0"
-julia = "≥ 1.0.0"
+Contour = "0.5"
+FFMPEG = "0.2"
+FixedPointNumbers = "0.6"
+GR = "0.44"
+GeometryTypes = "0.7"
+JSON = "0.21"
+Measures = "0.3"
+NaNMath = "0.3"
+PlotThemes = "1"
+PlotUtils = "0.6.1"
+RecipesBase = "0.6, 0.7"
+Reexport = "0.2"
+Requires = "0.5"
+Showoff = "0.3.1"
+StatsBase = "0.32"
+julia = "1"
 
 [extras]
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
+GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
+Gtk = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
 ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
 LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
+PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925"
 RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 
 [targets]
-test = ["BinaryProvider", "Pkg", "Test", "Random", "StatsPlots", "VisualRegressionTests", "LaTeXStrings", "Images", "ImageMagick", "RDatasets", "FileIO", "UnicodePlots"]
+test = ["FileIO", "GeometryTypes", "Gtk", "ImageMagick", "Images", "LaTeXStrings", "LibGit2", "PGFPlotsX", "Random", "RDatasets", "StatsPlots", "Test", "UnicodePlots", "VisualRegressionTests"]

README.md

@@ -11,7 +11,7 @@
 
 #### Created by Tom Breloff (@tbreloff)
 
-#### Maintained by the [JuliaPlot members](https://github.com/orgs/JuliaPlots/people)
+#### Maintained by the [JuliaPlots members](https://github.com/orgs/JuliaPlots/people)
 
 Plots is a plotting API and toolset.  My goals with the package are:
 

appveyor.yml

@@ -2,6 +2,7 @@ environment:
   matrix:
   # - julia_version: 0.7
   - julia_version: 1
+  - julia_version: 1.2
   - julia_version: nightly
 
 platform:

deps/generateprecompiles.jl

@@ -0,0 +1,51 @@
+# To figure out what should be precompiled, run this script, then move
+# precompile_Plots.jl in precompiles_path (see below) to src/precompile.jl
+
+# This script works by using SnoopCompile to log compilations that take place
+# while running the examples on the GR backend. So SnoopCompile must be
+# installed, and StatsPlots, RDatasets, and FileIO are also required for
+# certain examples.
+
+# If precompilation fails with an UndefVarError for a module, probably what is
+# happening is that the module appears in the precompile statements, but is
+# only visible to one of Plots' dependencies, and not Plots itself. Adding the
+# module to the blacklist below will remove these precompile statements.
+
+# Anonymous functions may appear in precompile statements as functions with
+# hashes in their name. Those of the form "#something##kw" have to do with
+# compiling functions with keyword arguments, and are named reproducibly, so
+# can be kept. Others generally will not work. Currently, SnoopCompile includes
+# some anonymous functions that not reproducible, but SnoopCompile PR #30
+# (which looks about to be merged) will ensure that anonymous functions are
+# actually defined before attempting to precompile them. Alternatively, we can
+# keep only the keyword argument related anonymous functions by changing the
+# regex that SnoopCompile uses to detect anonymous functions to
+# r"#{1,2}[^\"#]+#{1,2}\d+" (see anonrex in SnoopCompile.jl). To exclude all
+# precompile statements involving anonymous functions, "#" can also be added to
+# the blacklist below.
+
+using SnoopCompile
+
+log_path = joinpath(tempdir(), "compiles.log")
+precompiles_path = joinpath(tempdir(), "precompile")
+
+# run examples with GR backend, logging what needs to be compiled
+SnoopCompile.@snoopc log_path begin
+    using Plots
+    Plots.test_examples(:gr, disp=true)
+end
+
+# precompile calls containing the following strings are dropped
+blacklist = [
+    # functions defined in examples
+    "PlotExampleModule",
+    # the following are not visible to Plots, only its dependencies
+    "CategoricalArrays",
+    "FixedPointNumbers",
+    "SparseArrays",
+    r"#{1,2}[^\"#]+#{1,2}\d+",
+]
+
+data = SnoopCompile.read(log_path)
+pc = SnoopCompile.parcel(reverse!(data[2]), blacklist=blacklist)
+SnoopCompile.write(precompiles_path, pc)

pushtomaster.sh

@@ -1,4 +0,0 @@
-git checkout master
-git merge --ff-only dev
-git push origin master
-git checkout dev

src/Plots.jl

@@ -1,6 +1,6 @@
 module Plots
 
-_current_plots_version = v"0.25.0"
+const _current_plots_version = VersionNumber(split(first(filter(line -> occursin("version", line), readlines(normpath(@__DIR__, "..", "Project.toml")))), "\"")[2])
 
 using Reexport
 
@@ -8,6 +8,8 @@ import GeometryTypes
 using Dates, Printf, Statistics, Base64, LinearAlgebra, Random
 import SparseArrays: findnz
 
+using FFMPEG
+
 @reexport using RecipesBase
 import RecipesBase: plot, plot!, animate
 using Base.Meta
@@ -220,4 +222,7 @@ end
 
 const CURRENT_BACKEND = CurrentBackend(:none)
 
+include("precompile.jl")
+_precompile_()
+
 end # module

src/animation.jl

@@ -60,31 +60,39 @@ end
 
 file_extension(fn) = Base.Filesystem.splitext(fn)[2][2:end]
 
-gif(anim::Animation, fn = giffn(); kw...) = buildanimation(anim.dir, fn; kw...)
-mov(anim::Animation, fn = movfn(); kw...) = buildanimation(anim.dir, fn, false; kw...)
-mp4(anim::Animation, fn = mp4fn(); kw...) = buildanimation(anim.dir, fn, false; kw...)
+gif(anim::Animation, fn = giffn(); kw...) = buildanimation(anim, fn; kw...)
+mov(anim::Animation, fn = movfn(); kw...) = buildanimation(anim, fn, false; kw...)
+mp4(anim::Animation, fn = mp4fn(); kw...) = buildanimation(anim, fn, false; kw...)
 
+ffmpeg_framerate(fps) = "$fps"
+ffmpeg_framerate(fps::Rational) = "$(fps.num)/$(fps.den)"
 
-function buildanimation(animdir::AbstractString, fn::AbstractString,
+function buildanimation(anim::Animation, fn::AbstractString,
                         is_animated_gif::Bool=true;
-                        fps::Integer = 20, loop::Integer = 0,
+                        fps::Real = 20, loop::Integer = 0,
                         variable_palette::Bool=false,
                         show_msg::Bool=true)
-    fn = abspath(fn)
+    if length(anim.frames) == 0
+        throw(ArgumentError("Cannot build empty animations"))
+    end
+
+    fn = abspath(expanduser(fn))
+    animdir = anim.dir
+    framerate = ffmpeg_framerate(fps)
 
     if is_animated_gif
         if variable_palette
             # generate a colorpalette for each frame for highest quality, but larger filesize
             palette="palettegen=stats_mode=single[pal],[0:v][pal]paletteuse=new=1"
-            run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -lavfi "$palette" -y $fn`)
+            ffmpeg_exe(`-v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -lavfi "$palette" -y $fn`)
         else
             # generate a colorpalette first so ffmpeg does not have to guess it
-            run(`ffmpeg -v 0 -i $(animdir)/%06d.png -vf "palettegen=stats_mode=diff" -y "$(animdir)/palette.bmp"`)
+            ffmpeg_exe(`-v 0 -i $(animdir)/%06d.png -vf "palettegen=stats_mode=diff" -y "$(animdir)/palette.bmp"`)
             # then apply the palette to get better results
-            run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -y $fn`)
+            ffmpeg_exe(` -v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -y $fn`)
         end
     else
-        run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
+        ffmpeg_exe(`-v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
     end
 
     show_msg && @info("Saved animation to ", fn)
@@ -96,13 +104,19 @@ end
 # write out html to view the gif
 function Base.show(io::IO, ::MIME"text/html", agif::AnimatedGif)
     ext = file_extension(agif.filename)
-    write(io, if ext == "gif"
-        "<img src=\"$(relpath(agif.filename))\" />"
+    if ext == "gif"
+        html = "<img src=\"data:image/gif;base64," * base64encode(read(agif.filename)) * "\" />"
     elseif ext in ("mov", "mp4")
-        "<video controls><source src=\"$(relpath(agif.filename)) type=\"video/$ext\"></video>"
+        mimetype = ext == "mov" ? "video/quicktime" : "video/mp4"
+        html = "<video controls><source src=\"data:$mimetype;base64," *
+               base64encode(read(agif.filename)) *
+               "\" type = \"$mimetype\"></video>"
     else
         error("Cannot show animation with extension $ext: $agif")
-    end)
+    end
+
+    write(io, html)
+    return nothing
 end
 
 

src/arg_desc.jl

@@ -42,6 +42,7 @@ const _arg_desc = KW(
 :arrow             	=> "nothing (no arrows), Bool (if true, default arrows), Arrow object, or arg(s) that could be style or head length/widths.  Defines arrowheads that should be displayed at the end of path line segments (just before a NaN and the last non-NaN point).  Used in quiverplot, streamplot, or similar.",
 :normalize         	=> "Bool or Symbol. Histogram normalization mode. Possible values are: false/:none (no normalization, default), true/:pdf (normalize to a discrete Probability Density Function, where the total area of the bins is 1), :probability (bin heights sum to 1) and :density (the area of each bin, rather than the height, is equal to the counts - useful for uneven bin sizes).",
 :weights           	=> "AbstractVector. Used in histogram types for weighted counts.",
+:show_empty_bins    => "Bool. Whether empty bins in a 2D histogram are colored as 0 (true), or transparent (the default).",
 :contours          	=> "Bool. Add contours to the side-grids of 3D plots?  Used in surface/wireframe.",
 :contour_labels         => "Bool. Show labels at the contour lines?",
 :match_dimensions  	=> "Bool. For heatmap types... should the first dimension of a matrix (rows) correspond to the first dimension of the plot (x-axis)?  The default is false, which matches the behavior of Matplotlib, Plotly, and others.  Note: when passing a function for z, the function should still map `(x,y) -> z`.",
@@ -49,6 +50,7 @@ const _arg_desc = KW(
 :series_annotations     => "AbstractVector of String or PlotText.  These are annotations which are mapped to data points/positions.",
 :primary                => "Bool.  Does this count as a 'real series'?  For example, you could have a path (primary), and a scatter (secondary) as 2 separate series, maybe with different data (see sticks recipe for an example).  The secondary series will get the same color, etc as the primary.",
 :hover 	        	=> "nothing or vector of strings. Text to display when hovering over each data point.",
+:colorbar_entry   => "Bool.  Include this series in the color bar?  Set to `false` to exclude.",
 
 # plot args
 :plot_title               => "String. Title for the whole plot (not the subplots) (Note: Not currently implemented)",
@@ -94,9 +96,16 @@ const _arg_desc = KW(
 :legendfontvalign         => "Symbol. Font vertical alignment of legend entries: :vcenter, :top, :bottom or :center",
 :legendfontrotation       => "Real. Font rotation of legend entries",
 :legendfontcolor          => "Color Type. Font color of legend entries",
+:legendtitlefontfamily    => "String or Symbol. Font family of the legend title.",
+:legendtitlefontsize           => "Integer. Font pointsize the legend title.",
+:legendtitlefonthalign         => "Symbol. Font horizontal alignment of the legend title: :hcenter, :left, :right or :center",
+:legendtitlefontvalign         => "Symbol. Font vertical alignment of the legend title: :vcenter, :top, :bottom or :center",
+:legendtitlefontrotation       => "Real. Font rotation of the legend title",
+:legendtitlefontcolor          => "Color Type. Font color of the legend title",
 :colorbar                 => "Bool (show the colorbar?) or Symbol (colorbar position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:legend` (matches legend value) (note: only some may be supported in each backend)",
 :clims 					  => "`:auto` or NTuple{2,Number}.  Fixes the limits of the colorbar.",
 :legendfont               => "Font. Font of legend items.",
+:legendtitlefont          => "Font. Font of the legend title.",
 :annotations              => "(x,y,text) tuple(s).  Can be a single tuple or a list of them.  Text can be String or PlotText (created with `text(args...)`)  Add one-off text annotations at the x,y coordinates.",
 :projection               => "Symbol or String.  '3d' or 'polar'",
 :aspect_ratio             => "Symbol (:equal) or Number. Plot area is resized so that 1 y-unit is the same size as `aspect_ratio` x-units.",

src/args.jl

@@ -272,6 +272,7 @@ const _series_defaults = KW(
     :arrow             => nothing,   # allows for adding arrows to line/path... call `arrow(args...)`
     :normalize         => false,     # do we want a normalized histogram?
     :weights           => nothing,   # optional weights for histograms (1D and 2D)
+    :show_empty_bins   => false,     # should empty bins in 2D histogram be colored as zero (otherwise they are transparent)
     :contours          => false,     # add contours to 3d surface and wireframe plots
     :contour_labels    => false,
     :match_dimensions  => false,     # do rows match x (true) or y (false) for heatmap/image/spy? see issue 196
@@ -336,6 +337,12 @@ const _subplot_defaults = KW(
     :legendfontvalign         => :vcenter,
     :legendfontrotation       => 0.0,
     :legendfontcolor          => :match,
+    :legendtitlefontfamily    => :match,
+    :legendtitlefontsize      => 11,
+    :legendtitlefonthalign    => :hcenter,
+    :legendtitlefontvalign    => :vcenter,
+    :legendtitlefontrotation  => 0.0,
+    :legendtitlefontcolor     => :match,
     :annotations              => [],                # annotation tuples... list of (x,y,annotation)
     :projection               => :none,             # can also be :polar or :3d
     :aspect_ratio             => :none,             # choose from :none or :equal
@@ -450,6 +457,7 @@ const _initial_axis_defaults = deepcopy(_axis_defaults)
 # to be able to reset font sizes to initial values
 const _initial_fontsizes = Dict(:titlefontsize  => _subplot_defaults[:titlefontsize],
                                 :legendfontsize => _subplot_defaults[:legendfontsize],
+                                :legendtitlefontsize => _subplot_defaults[:legendtitlefontsize],
                                 :tickfontsize   => _axis_defaults[:tickfontsize],
                                 :guidefontsize  => _axis_defaults[:guidefontsize])
 
@@ -574,6 +582,7 @@ add_aliases(:xerror, :xerr, :xerrorbar)
 add_aliases(:yerror, :yerr, :yerrorbar, :err, :errorbar)
 add_aliases(:quiver, :velocity, :quiver2d, :gradient, :vectorfield)
 add_aliases(:normalize, :norm, :normed, :normalized)
+add_aliases(:show_empty_bins, :showemptybins, :showempty, :show_empty)
 add_aliases(:aspect_ratio, :aspectratio, :axis_ratio, :axisratio, :ratio)
 add_aliases(:match_dimensions, :transpose, :transpose_z)
 add_aliases(:subplot, :sp, :subplt, :splt)
@@ -685,15 +694,15 @@ function processLineArg(plotattributes::KW, arg)
         plotattributes[:linestyle] = arg
 
     elseif typeof(arg) <: Stroke
-        arg.width == nothing || (plotattributes[:linewidth] = arg.width)
-        arg.color == nothing || (plotattributes[:linecolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha == nothing || (plotattributes[:linealpha] = arg.alpha)
-        arg.style == nothing || (plotattributes[:linestyle] = arg.style)
+        arg.width === nothing || (plotattributes[:linewidth] = arg.width)
+        arg.color === nothing || (plotattributes[:linecolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha === nothing || (plotattributes[:linealpha] = arg.alpha)
+        arg.style === nothing || (plotattributes[:linestyle] = arg.style)
 
     elseif typeof(arg) <: Brush
-        arg.size  == nothing || (plotattributes[:fillrange] = arg.size)
-        arg.color == nothing || (plotattributes[:fillcolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha == nothing || (plotattributes[:fillalpha] = arg.alpha)
+        arg.size  === nothing || (plotattributes[:fillrange] = arg.size)
+        arg.color === nothing || (plotattributes[:fillcolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha === nothing || (plotattributes[:fillalpha] = arg.alpha)
 
     elseif typeof(arg) <: Arrow || arg in (:arrow, :arrows)
         plotattributes[:arrow] = arg
@@ -724,15 +733,15 @@ function processMarkerArg(plotattributes::KW, arg)
         plotattributes[:markerstrokestyle] = arg
 
     elseif typeof(arg) <: Stroke
-        arg.width == nothing || (plotattributes[:markerstrokewidth] = arg.width)
-        arg.color == nothing || (plotattributes[:markerstrokecolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha == nothing || (plotattributes[:markerstrokealpha] = arg.alpha)
-        arg.style == nothing || (plotattributes[:markerstrokestyle] = arg.style)
+        arg.width === nothing || (plotattributes[:markerstrokewidth] = arg.width)
+        arg.color === nothing || (plotattributes[:markerstrokecolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha === nothing || (plotattributes[:markerstrokealpha] = arg.alpha)
+        arg.style === nothing || (plotattributes[:markerstrokestyle] = arg.style)
 
     elseif typeof(arg) <: Brush
-        arg.size  == nothing || (plotattributes[:markersize]  = arg.size)
-        arg.color == nothing || (plotattributes[:markercolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha == nothing || (plotattributes[:markeralpha] = arg.alpha)
+        arg.size  === nothing || (plotattributes[:markersize]  = arg.size)
+        arg.color === nothing || (plotattributes[:markercolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha === nothing || (plotattributes[:markeralpha] = arg.alpha)
 
     # linealpha
     elseif allAlphas(arg)
@@ -757,9 +766,9 @@ end
 function processFillArg(plotattributes::KW, arg)
     # fr = get(plotattributes, :fillrange, 0)
     if typeof(arg) <: Brush
-        arg.size  == nothing || (plotattributes[:fillrange] = arg.size)
-        arg.color == nothing || (plotattributes[:fillcolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha == nothing || (plotattributes[:fillalpha] = arg.alpha)
+        arg.size  === nothing || (plotattributes[:fillrange] = arg.size)
+        arg.color === nothing || (plotattributes[:fillcolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha === nothing || (plotattributes[:fillalpha] = arg.alpha)
 
     elseif typeof(arg) <: Bool
         plotattributes[:fillrange] = arg ? 0 : nothing
@@ -793,10 +802,10 @@ function processGridArg!(plotattributes::KW, arg, letter)
         plotattributes[Symbol(letter, :gridstyle)] = arg
 
     elseif typeof(arg) <: Stroke
-        arg.width == nothing || (plotattributes[Symbol(letter, :gridlinewidth)] = arg.width)
-        arg.color == nothing || (plotattributes[Symbol(letter, :foreground_color_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
-        arg.alpha == nothing || (plotattributes[Symbol(letter, :gridalpha)] = arg.alpha)
-        arg.style == nothing || (plotattributes[Symbol(letter, :gridstyle)] = arg.style)
+        arg.width === nothing || (plotattributes[Symbol(letter, :gridlinewidth)] = arg.width)
+        arg.color === nothing || (plotattributes[Symbol(letter, :foreground_color_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
+        arg.alpha === nothing || (plotattributes[Symbol(letter, :gridalpha)] = arg.alpha)
+        arg.style === nothing || (plotattributes[Symbol(letter, :gridstyle)] = arg.style)
 
     # linealpha
     elseif allAlphas(arg)
@@ -822,10 +831,10 @@ function processMinorGridArg!(plotattributes::KW, arg, letter)
         plotattributes[Symbol(letter, :minorgrid)] = true
 
     elseif typeof(arg) <: Stroke
-        arg.width == nothing || (plotattributes[Symbol(letter, :minorgridlinewidth)] = arg.width)
-        arg.color == nothing || (plotattributes[Symbol(letter, :foreground_color_minor_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
-        arg.alpha == nothing || (plotattributes[Symbol(letter, :minorgridalpha)] = arg.alpha)
-        arg.style == nothing || (plotattributes[Symbol(letter, :minorgridstyle)] = arg.style)
+        arg.width === nothing || (plotattributes[Symbol(letter, :minorgridlinewidth)] = arg.width)
+        arg.color === nothing || (plotattributes[Symbol(letter, :foreground_color_minor_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
+        arg.alpha === nothing || (plotattributes[Symbol(letter, :minorgridalpha)] = arg.alpha)
+        arg.style === nothing || (plotattributes[Symbol(letter, :minorgridstyle)] = arg.style)
         plotattributes[Symbol(letter, :minorgrid)] = true
 
     # linealpha
@@ -930,6 +939,15 @@ function preprocessArgs!(plotattributes::KW)
         end
     end
 
+    # vline accesses the y argument but actually maps it to the x axis.
+    # Hence, we have to swap formatters
+    if get(plotattributes, :seriestype, :path) == :vline
+        xformatter = get(plotattributes, :xformatter, :auto)
+        yformatter = get(plotattributes, :yformatter, :auto)
+        plotattributes[:xformatter] = yformatter
+        plotattributes[:yformatter] = xformatter
+    end
+
     # handle grid args common to all axes
     args = pop!(plotattributes, :grid, ())
     for arg in wraptuple(args)
@@ -961,7 +979,7 @@ function preprocessArgs!(plotattributes::KW)
         end
     end
     # fonts
-    for fontname in (:titlefont, :legendfont)
+    for fontname in (:titlefont, :legendfont, :legendtitlefont)
         args = pop!(plotattributes, fontname, ())
         for arg in wraptuple(args)
             processFontArg!(plotattributes, fontname, arg)
@@ -1030,7 +1048,7 @@ function preprocessArgs!(plotattributes::KW)
             arrow()
         elseif a in (false, nothing, :none)
             nothing
-        elseif !(typeof(a) <: Arrow)
+        elseif !(typeof(a) <: Arrow || typeof(a) <: AbstractArray{Arrow})
             arrow(wraptuple(a)...)
         else
             a
@@ -1121,7 +1139,7 @@ end
 
 function _filter_input_data!(plotattributes::KW)
     idxfilter = pop!(plotattributes, :idxfilter, nothing)
-    if idxfilter != nothing
+    if idxfilter !== nothing
         filter_data!(plotattributes, idxfilter)
     end
 end
@@ -1237,7 +1255,7 @@ end
 #     v = plotattributes[k]
 #     plotattributes[k] = if v == :match
 #         match_color
-#     elseif v == nothing
+#     elseif v === nothing
 #         plot_color(RGBA(0,0,0,0))
 #     else
 #         v
@@ -1246,7 +1264,7 @@ end
 
 function color_or_nothing!(plotattributes::KW, k::Symbol)
     v = plotattributes[k]
-    plotattributes[k] = if v == nothing || v == false
+    plotattributes[k] = if v === nothing || v == false
         RGBA{Float64}(0,0,0,0)
     elseif v != :match
         plot_color(v)
@@ -1271,8 +1289,10 @@ const _match_map = KW(
     :bottom_margin => :margin,
     :titlefontfamily          => :fontfamily_subplot,
     :legendfontfamily         => :fontfamily_subplot,
+    :legendtitlefontfamily    => :fontfamily_subplot,
     :titlefontcolor           => :foreground_color_subplot,
     :legendfontcolor          => :foreground_color_subplot,
+    :legendtitlefontcolor     => :foreground_color_subplot,
     :tickfontcolor            => :foreground_color_text,
     :guidefontcolor           => :foreground_color_guide,
 )
@@ -1563,11 +1583,11 @@ function _update_series_attributes!(plotattributes::KW, plt::Plot, sp::Subplot)
 
     # update alphas
     for asym in (:linealpha, :markeralpha, :fillalpha)
-        if plotattributes[asym] == nothing
+        if plotattributes[asym] === nothing
             plotattributes[asym] = plotattributes[:seriesalpha]
         end
     end
-    if plotattributes[:markerstrokealpha] == nothing
+    if plotattributes[:markerstrokealpha] === nothing
         plotattributes[:markerstrokealpha] = plotattributes[:markeralpha]
     end
 
@@ -1602,13 +1622,13 @@ function _update_series_attributes!(plotattributes::KW, plt::Plot, sp::Subplot)
     end
 
     # if marker_z, fill_z or line_z are set, ensure we have a gradient
-    if plotattributes[:marker_z] != nothing
+    if plotattributes[:marker_z] !== nothing
         ensure_gradient!(plotattributes, :markercolor, :markeralpha)
     end
-    if plotattributes[:line_z] != nothing
+    if plotattributes[:line_z] !== nothing
         ensure_gradient!(plotattributes, :linecolor, :linealpha)
     end
-    if plotattributes[:fill_z] != nothing
+    if plotattributes[:fill_z] !== nothing
         ensure_gradient!(plotattributes, :fillcolor, :fillalpha)
     end
 

src/axes.jl

@@ -67,7 +67,7 @@ function process_axis_arg!(plotattributes::KW, arg, letter = "")
     elseif T <: AVec
         plotattributes[Symbol(letter,:ticks)] = arg
 
-    elseif arg == nothing
+    elseif arg === nothing
         plotattributes[Symbol(letter,:ticks)] = []
 
     elseif T <: Bool || arg in _allShowaxisArgs
@@ -152,8 +152,8 @@ scalefunc(scale::Symbol) = x -> get(_scale_funcs, scale, identity)(Float64(x))
 invscalefunc(scale::Symbol) = x -> get(_inv_scale_funcs, scale, identity)(Float64(x))
 labelfunc(scale::Symbol, backend::AbstractBackend) = get(_label_func, scale, string)
 
-function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
-    amin,amax = axis_limits(axis)
+function optimal_ticks_and_labels(sp::Subplot, axis::Axis, ticks = nothing)
+    amin, amax = axis_limits(sp, axis[:letter])
 
     # scale the limits
     scale = axis[:scale]
@@ -166,7 +166,7 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
     # or DateTime) is chosen based on the time span between amin and amax
     # rather than on the input format
     # TODO: maybe: non-trivial scale (:ln, :log2, :log10) for date/datetime
-    if ticks == nothing && scale == :identity
+    if ticks === nothing && scale == :identity
         if axis[:formatter] == dateformatter
             # optimize_datetime_ticks returns ticks and labels(!) based on
             # integers/floats corresponding to the DateTime type. Thus, the axes
@@ -184,7 +184,7 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
     end
 
     # get a list of well-laid-out ticks
-    if ticks == nothing
+    if ticks === nothing
         scaled_ticks = optimize_ticks(
             sf(amin),
             sf(amax);
@@ -218,6 +218,8 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
             map(labelfunc(scale, backend()), Showoff.showoff(scaled_ticks, :plain))
         elseif formatter == :scientific
             Showoff.showoff(unscaled_ticks, :scientific)
+	elseif formatter == :latex
+	    map(x -> string("\$", replace(convert_sci_unicode(x), '×' => "\\times"), "\$"), Showoff.showoff(unscaled_ticks, :auto))
         else
             # there was an override for the formatter... use that on the unscaled ticks
             map(formatter, unscaled_ticks)
@@ -238,7 +240,7 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
 end
 
 # return (continuous_values, discrete_values) for the ticks on this axis
-function get_ticks(axis::Axis)
+function get_ticks(sp::Subplot, axis::Axis)
     ticks = _transform_ticks(axis[:ticks])
     ticks in (:none, nothing, false) && return nothing
 
@@ -261,7 +263,7 @@ function get_ticks(axis::Axis)
             (collect(0:pi/4:7pi/4), string.(0:45:315))
         else
             # compute optimal ticks and labels
-            optimal_ticks_and_labels(axis)
+            optimal_ticks_and_labels(sp, axis)
         end
     elseif typeof(ticks) <: Union{AVec, Int}
         if !isempty(dvals) && typeof(ticks) <: Int
@@ -269,7 +271,7 @@ function get_ticks(axis::Axis)
             axis[:continuous_values][rng], dvals[rng]
         else
             # override ticks, but get the labels
-            optimal_ticks_and_labels(axis, ticks)
+            optimal_ticks_and_labels(sp, axis, ticks)
         end
     elseif typeof(ticks) <: NTuple{2, Any}
         # assuming we're passed (ticks, labels)
@@ -286,16 +288,16 @@ _transform_ticks(ticks) = ticks
 _transform_ticks(ticks::AbstractArray{T}) where T <: Dates.TimeType = Dates.value.(ticks)
 _transform_ticks(ticks::NTuple{2, Any}) = (_transform_ticks(ticks[1]), ticks[2])
 
-function get_minor_ticks(axis,ticks)
+function get_minor_ticks(sp, axis, ticks)
     axis[:minorticks] in (:none, nothing, false) && !axis[:minorgrid] && return nothing
     ticks = ticks[1]
     length(ticks) < 2 && return nothing
 
-    amin, amax = axis_limits(axis)
+    amin, amax = axis_limits(sp, axis[:letter])
     #Add one phantom tick either side of the ticks to ensure minor ticks extend to the axis limits
     if length(ticks) > 2
         ratio = (ticks[3] - ticks[2])/(ticks[2] - ticks[1])
-    elseif axis[:scale] == :none
+    elseif axis[:scale] in (:none, :identity)
         ratio = 1
     else
         return nothing
@@ -382,7 +384,7 @@ function expand_extrema!(sp::Subplot, plotattributes::KW)
                 data = plotattributes[letter] = Surface(Matrix{Float64}(data.surf))
             end
             expand_extrema!(axis, data)
-        elseif data != nothing
+        elseif data !== nothing
             # TODO: need more here... gotta track the discrete reference value
             #       as well as any coord offset (think of boxplot shape coords... they all
             #       correspond to the same x-value)
@@ -399,10 +401,10 @@ function expand_extrema!(sp::Subplot, plotattributes::KW)
 
     # expand for fillrange
     fr = plotattributes[:fillrange]
-    if fr == nothing && plotattributes[:seriestype] == :bar
+    if fr === nothing && plotattributes[:seriestype] == :bar
         fr = 0.0
     end
-    if fr != nothing && !all3D(plotattributes)
+    if fr !== nothing && !all3D(plotattributes)
         axis = sp.attr[vert ? :yaxis : :xaxis]
         if typeof(fr) <: Tuple
             for fri in fr
@@ -419,7 +421,7 @@ function expand_extrema!(sp::Subplot, plotattributes::KW)
         data = plotattributes[dsym]
 
         bw = plotattributes[:bar_width]
-        if bw == nothing
+        if bw === nothing
             bw = plotattributes[:bar_width] = _bar_width * ignorenan_minimum(filter(x->x>0,diff(sort(data))))
         end
         axis = sp.attr[Symbol(dsym, :axis)]
@@ -479,11 +481,13 @@ function round_limits(amin,amax)
 end
 
 # using the axis extrema and limit overrides, return the min/max value for this axis
-function axis_limits(axis::Axis, should_widen::Bool = default_should_widen(axis))
+function axis_limits(sp, letter, should_widen = default_should_widen(sp[Symbol(letter, :axis)]), consider_aspect = true)
+    axis = sp[Symbol(letter, :axis)]
     ex = axis[:extrema]
     amin, amax = ex.emin, ex.emax
     lims = axis[:lims]
-    if (isa(lims, Tuple) || isa(lims, AVec)) && length(lims) == 2
+    has_user_lims = (isa(lims, Tuple) || isa(lims, AVec)) && length(lims) == 2
+    if has_user_lims
         if isfinite(lims[1])
             amin = lims[1]
         end
@@ -497,7 +501,7 @@ function axis_limits(axis::Axis, should_widen::Bool = default_should_widen(axis)
     if !isfinite(amin) && !isfinite(amax)
         amin, amax = 0.0, 1.0
     end
-    if ispolar(axis.sps[1])
+    amin, amax = if ispolar(axis.sps[1])
         if axis[:letter] == :x
             amin, amax = 0, 2pi
         elseif lims == :auto
@@ -513,6 +517,32 @@ function axis_limits(axis::Axis, should_widen::Bool = default_should_widen(axis)
     else
         amin, amax
     end
+
+    if !has_user_lims && consider_aspect && letter in (:x, :y) && !(sp[:aspect_ratio] in (:none, :auto) || is3d(:sp))
+        aspect_ratio = isa(sp[:aspect_ratio], Number) ? sp[:aspect_ratio] : 1
+        plot_ratio = height(plotarea(sp)) / width(plotarea(sp))
+        dist = amax - amin
+
+        if letter == :x
+            yamin, yamax = axis_limits(sp, :y, default_should_widen(sp[:yaxis]), false)
+            ydist = yamax - yamin
+            axis_ratio = aspect_ratio * ydist / dist
+            factor = axis_ratio / plot_ratio
+        else
+            xamin, xamax = axis_limits(sp, :x, default_should_widen(sp[:xaxis]), false)
+            xdist = xamax - xamin
+            axis_ratio = aspect_ratio * dist / xdist
+            factor = plot_ratio / axis_ratio
+        end
+
+        if factor > 1
+            center = (amin + amax) / 2
+            amin = center + factor * (amin - center)
+            amax = center + factor * (amax - center)
+        end
+    end
+
+    return amin, amax
 end
 
 # -------------------------------------------------------------------------
@@ -586,12 +616,12 @@ end
 # compute the line segments which should be drawn for this axis
 function axis_drawing_info(sp::Subplot)
     xaxis, yaxis = sp[:xaxis], sp[:yaxis]
-    xmin, xmax = axis_limits(xaxis)
-    ymin, ymax = axis_limits(yaxis)
-    xticks = get_ticks(xaxis)
-    yticks = get_ticks(yaxis)
-    xminorticks = get_minor_ticks(xaxis,xticks)
-    yminorticks = get_minor_ticks(yaxis,yticks)
+    xmin, xmax = axis_limits(sp, :x)
+    ymin, ymax = axis_limits(sp, :y)
+    xticks = get_ticks(sp, xaxis)
+    yticks = get_ticks(sp, yaxis)
+    xminorticks = get_minor_ticks(sp, xaxis, xticks)
+    yminorticks = get_minor_ticks(sp, yaxis, yticks)
     xaxis_segs = Segments(2)
     yaxis_segs = Segments(2)
     xtick_segs = Segments(2)

src/backends.jl

@@ -37,7 +37,6 @@ macro init_backend(s)
         _backendType[Symbol($str)] = $T
         _backendSymbol[$T] = Symbol($str)
         _backend_packages[Symbol($str)] = Symbol($package_str)
-        # include("backends/" * $str * ".jl")
     end)
 end
 
@@ -75,9 +74,9 @@ end
 text_size(lab::AbstractString, sz::Number, rot::Number = 0) = text_size(length(lab), sz, rot)
 
 # account for the size/length/rotation of tick labels
-function tick_padding(axis::Axis)
-    ticks = get_ticks(axis)
-    if ticks == nothing
+function tick_padding(sp::Subplot, axis::Axis)
+    ticks = get_ticks(sp, axis)
+    if ticks === nothing
         0mm
     else
         vals, labs = ticks
@@ -106,10 +105,10 @@ end
 # to fit ticks, tick labels, guides, colorbars, etc.
 function _update_min_padding!(sp::Subplot)
     # TODO: something different when `is3d(sp) == true`
-    leftpad   = tick_padding(sp[:yaxis]) + sp[:left_margin]   + guide_padding(sp[:yaxis])
+    leftpad   = tick_padding(sp, sp[:yaxis]) + sp[:left_margin]   + guide_padding(sp[:yaxis])
     toppad    = sp[:top_margin]    + title_padding(sp)
     rightpad  = sp[:right_margin]
-    bottompad = tick_padding(sp[:xaxis]) + sp[:bottom_margin] + guide_padding(sp[:xaxis])
+    bottompad = tick_padding(sp, sp[:xaxis]) + sp[:bottom_margin] + guide_padding(sp[:xaxis])
 
     # switch them?
     if sp[:xaxis][:mirror]
@@ -143,12 +142,7 @@ function _pick_default_backend()
     if env_default != ""
         sym = Symbol(lowercase(env_default))
         if sym in _backends
-            if sym in _initialized_backends
-                backend(sym)
-            else
-                @warn("You have set `PLOTS_DEFAULT_BACKEND=$env_default` but `$(backend_package_name(sym))` is not loaded.")
-                _fallback_default_backend()
-            end
+            backend(sym)
         else
             @warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not a valid backend package.  Choose from:\n\t" *
                  join(sort(_backends), "\n\t"))
@@ -234,7 +228,7 @@ const _base_supported_args = [
     :subplot_index,
     :discrete_values,
     :projection,
-
+    :show_empty_bins
 ]
 
 function merge_with_base_supported(v::AVec)
@@ -257,6 +251,7 @@ end
 @init_backend PlotlyJS
 @init_backend GR
 @init_backend PGFPlots
+@init_backend PGFPlotsX
 @init_backend InspectDR
 @init_backend HDF5
 
@@ -301,9 +296,6 @@ end
 
 _initialize_backend(pkg::GRBackend) = nothing
 
-_initialize_backend(pkg::PlotlyBackend) = nothing
-
-
 # ------------------------------------------------------------------------------
 # gr
 
@@ -362,6 +354,16 @@ is_marker_supported(::GRBackend, shape::Shape) = true
 # ------------------------------------------------------------------------------
 # plotly
 
+function _initialize_backend(pkg::PlotlyBackend)
+    try
+        @eval Main begin
+            import ORCA
+        end
+    catch
+        @info "For saving to png with the Plotly backend ORCA has to be installed."
+    end
+end
+
 const _plotly_attr = merge_with_base_supported([
     :annotations,
     :background_color_legend, :background_color_inside, :background_color_outside,
@@ -666,3 +668,57 @@ const _inspectdr_marker = Symbol[
 ]
 
 const _inspectdr_scale = [:identity, :ln, :log2, :log10]
+# ------------------------------------------------------------------------------
+# pgfplotsx
+
+const _pgfplotsx_attr = merge_with_base_supported([
+    :annotations,
+    :background_color_legend, :background_color_inside, :background_color_outside,
+    :foreground_color_legend, :foreground_color_grid, :foreground_color_axis,
+    :foreground_color_text, :foreground_color_border,
+    :label,
+    :seriescolor, :seriesalpha,
+    :linecolor, :linestyle, :linewidth, :linealpha,
+    :markershape, :markercolor, :markersize, :markeralpha,
+    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
+    :fillrange, :fillcolor, :fillalpha,
+    :bins,
+    :layout,
+    :title, :window_title,
+    :guide, :lims, :ticks, :scale, :flip,
+    :match_dimensions,
+    :titlefontfamily, :titlefontsize, :titlefonthalign, :titlefontvalign,
+    :titlefontrotation, :titlefontcolor,
+    :legendfontfamily, :legendfontsize, :legendfonthalign, :legendfontvalign,
+    :legendfontrotation, :legendfontcolor,
+    :tickfontfamily, :tickfontsize, :tickfonthalign, :tickfontvalign,
+    :tickfontrotation, :tickfontcolor,
+    :guidefontfamily, :guidefontsize, :guidefonthalign, :guidefontvalign,
+    :guidefontrotation, :guidefontcolor,
+    :grid, :gridalpha, :gridstyle, :gridlinewidth,
+    :legend, :legendtitle, :colorbar, :colorbar_title, :colorbar_entry,
+    :fill_z, :line_z, :marker_z, :levels,
+    :ribbon, :quiver,
+    :orientation,
+    :overwrite_figure,
+    :polar,
+    :aspect_ratio,
+    :normalize, :weights,
+    :inset_subplots,
+    :bar_width,
+    :arrow,
+    :framestyle,
+    :tick_direction,
+    :camera,
+    :contour_labels,
+])
+const _pgfplotsx_seriestype =
+        [:path,  :scatter, :straightline,
+        :path3d, :scatter3d, :surface, :wireframe,
+        :heatmap, :contour, :contour3d,
+        :shape,
+        :steppre, :stepmid, :steppost,  :ysticks, :xsticks]
+const _pgfplotsx_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
+const _pgfplotsx_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :ltriangle, :rtriangle, :cross, :xcross, :star5, :pentagon, :hline, :vline, Shape]
+const _pgfplotsx_scale = [:identity, :ln, :log2, :log10]
+is_marker_supported(::PGFPlotsXBackend, shape::Shape) = true

src/backends/gr.jl

@@ -84,12 +84,23 @@ gr_set_transparency(c, α) = gr_set_transparency(α)
 gr_set_transparency(c::Colorant, ::Nothing) = gr_set_transparency(c)
 gr_set_transparency(c::Colorant) = GR.settransparency(alpha(c))
 
+const _gr_arrow_map = Dict(
+    :simple => 1,
+    :hollow => 3,
+    :filled => 4,
+    :triangle => 5,
+    :filledtriangle => 6,
+    :closed => 6,
+    :open => 5,
+)
+gr_set_arrowstyle(s::Symbol) = GR.setarrowstyle(get(_gr_arrow_map, s, 1))
+
 # --------------------------------------------------------------------------------------
 
 
 # draw line segments, splitting x/y into contiguous/finite segments
 # note: this can be used for shapes by passing func `GR.fillarea`
-function gr_polyline(x, y, func = GR.polyline; arrowside=:none)
+function gr_polyline(x, y, func = GR.polyline; arrowside = :none, arrowstyle = :simple)
     iend = 0
     n = length(x)
     while iend < n-1
@@ -118,9 +129,11 @@ function gr_polyline(x, y, func = GR.polyline; arrowside=:none)
         if istart > 0 && iend > 0
             func(x[istart:iend], y[istart:iend])
             if arrowside in (:head,:both)
+                gr_set_arrowstyle(arrowstyle)
                 GR.drawarrow(x[iend-1], y[iend-1], x[iend], y[iend])
             end
             if arrowside in (:tail,:both)
+                gr_set_arrowstyle(arrowstyle)
                 GR.drawarrow(x[istart+1], y[istart+1], x[istart], y[istart])
             end
         else
@@ -134,7 +147,7 @@ gr_inqtext(x, y, s::Symbol) = gr_inqtext(x, y, string(s))
 function gr_inqtext(x, y, s)
     if length(s) >= 2 && s[1] == '$' && s[end] == '$'
         GR.inqmathtex(x, y, s[2:end-1])
-    elseif findfirst(isequal('\\'), s) != nothing || occursin("10^{", s)
+    elseif findfirst(isequal('\\'), s) !== nothing || occursin("10^{", s)
         GR.inqtextext(x, y, s)
     else
         GR.inqtext(x, y, s)
@@ -146,7 +159,7 @@ gr_text(x, y, s::Symbol) = gr_text(x, y, string(s))
 function gr_text(x, y, s)
     if length(s) >= 2 && s[1] == '$' && s[end] == '$'
         GR.mathtex(x, y, s[2:end-1])
-    elseif findfirst(isequal('\\'), s) != nothing || occursin("10^{", s)
+    elseif findfirst(isequal('\\'), s) !== nothing || occursin("10^{", s)
         GR.textext(x, y, s)
     else
         GR.text(x, y, s)
@@ -162,7 +175,7 @@ function gr_polaraxes(rmin::Real, rmax::Real, sp::Subplot)
     a = α .+ 90
     sinf = sind.(a)
     cosf = cosd.(a)
-    rtick_values, rtick_labels = get_ticks(yaxis)
+    rtick_values, rtick_labels = get_ticks(sp, yaxis)
     if yaxis[:formatter] in (:scientific, :auto) && yaxis[:ticks] in (:auto, :native)
         rtick_labels = convert_sci_unicode.(rtick_labels)
     end
@@ -218,16 +231,16 @@ end
 
 
 # using the axis extrema and limit overrides, return the min/max value for this axis
-gr_x_axislims(sp::Subplot) = axis_limits(sp[:xaxis])
-gr_y_axislims(sp::Subplot) = axis_limits(sp[:yaxis])
-gr_z_axislims(sp::Subplot) = axis_limits(sp[:zaxis])
+gr_x_axislims(sp::Subplot) = axis_limits(sp, :x)
+gr_y_axislims(sp::Subplot) = axis_limits(sp, :y)
+gr_z_axislims(sp::Subplot) = axis_limits(sp, :z)
 gr_xy_axislims(sp::Subplot) = gr_x_axislims(sp)..., gr_y_axislims(sp)...
 
-function gr_lims(axis::Axis, adjust::Bool, expand = nothing)
-    if expand != nothing
+function gr_lims(sp::Subplot, axis::Axis, adjust::Bool, expand = nothing)
+    if expand !== nothing
         expand_extrema!(axis, expand)
     end
-    lims = axis_limits(axis)
+    lims = axis_limits(sp, axis[:letter])
     if adjust
         GR.adjustrange(lims...)
     else
@@ -247,19 +260,6 @@ function gr_fill_viewport(vp::AVec{Float64}, c)
     GR.restorestate()
 end
 
-
-normalize_zvals(args...) = nothing
-function normalize_zvals(zv::AVec, clims::NTuple{2, <:Real})
-    vmin, vmax = ignorenan_extrema(zv)
-    isfinite(clims[1]) && (vmin = clims[1])
-    isfinite(clims[2]) && (vmax = clims[2])
-    if vmin == vmax
-        zeros(length(zv))
-    else
-        clamp.((zv .- vmin) ./ (vmax .- vmin), 0, 1)
-    end
-end
-
 # ---------------------------------------------------------
 
 # draw ONE Shape
@@ -421,23 +421,20 @@ function gr_set_viewport_polar()
 end
 
 struct GRColorbar
-    gradient::Ref{Union{Series,Nothing}}
-    fill::Ref{Union{Series,Nothing}}
-    lines::Ref{Union{Series,Nothing}}
-    GRColorbar() = new(nothing,nothing,nothing)
+    gradients
+    fills
+    lines
+    GRColorbar() = new([],[],[])
 end
 
 function gr_update_colorbar!(cbar::GRColorbar, series::Series)
     style = colorbar_style(series)
     style === nothing && return
-    ref = style == cbar_gradient ? cbar.gradient :
-          style == cbar_fill ? cbar.fill :
+    list = style == cbar_gradient ? cbar.gradients :
+          style == cbar_fill ? cbar.fills :
           style == cbar_lines ? cbar.lines :
           error("Unknown colorbar style: $style.")
-    if ref[] !== nothing
-        @warn "Overwriting colorbar entry"
-    end
-    ref[] = series
+    push!(list, series)
 end
 
 function gr_contour_levels(series::Series, clims)
@@ -466,6 +463,16 @@ function gr_colorbar_colors(series::Series, clims)
     round.(Int,colors)
 end
 
+
+function _cbar_unique(values, propname)
+    out = last(values)
+    if any(x != out for x in values)
+        @warn "Multiple series with different $propname share a colorbar. " *
+              "Colorbar may not reflect all series correctly."
+    end
+    out
+end
+
 # add the colorbar
 function gr_draw_colorbar(cbar::GRColorbar, sp::Subplot, clims)
     GR.savestate()
@@ -474,16 +481,19 @@ function gr_draw_colorbar(cbar::GRColorbar, sp::Subplot, clims)
     gr_set_viewport_cmap(sp)
     GR.setscale(0)
     GR.setwindow(xmin, xmax, zmin, zmax)
-    if (series = cbar.gradient[]) !== nothing
-        gr_set_gradient(series)
-        gr_set_transparency(get_fillalpha(series))
+    if !isempty(cbar.gradients)
+        series = cbar.gradients
+        gr_set_gradient(_cbar_unique(gr_get_color.(series),"color"))
+        gr_set_transparency(_cbar_unique(get_fillalpha.(series), "fill alpha"))
         GR.cellarray(xmin, xmax, zmax, zmin, 1, 256, 1000:1255)
     end
 
-    if (series = cbar.fill[]) !== nothing
-        gr_set_gradient(series)
+    if !isempty(cbar.fills)
+        series = cbar.fills
         GR.setfillintstyle(GR.INTSTYLE_SOLID)
-        levels = contour_levels(series, clims)
+        gr_set_gradient(_cbar_unique(gr_get_color.(series), "color"))
+        gr_set_transparency(_cbar_unique(get_fillalpha.(series), "fill alpha"))
+        levels = _cbar_unique(contour_levels.(series, Ref(clims)), "levels")
         # GR implicitly uses the maximal z value as the highest level
         if levels[end] < clims[2]
             @warn("GR: highest contour level less than maximal z value is not supported.")
@@ -491,20 +501,22 @@ function gr_draw_colorbar(cbar::GRColorbar, sp::Subplot, clims)
             # promotion in case levels is an integer array
             levels = [levels[1:end-1]; clims[2]]
         end
-        colors = gr_colorbar_colors(series, clims)
+        colors = gr_colorbar_colors(last(series), clims)
         for (from, to, color) in zip(levels[1:end-1], levels[2:end], colors)
             GR.setfillcolorind(color)
-            gr_set_transparency(get_fillalpha(series))
             GR.fillrect( xmin, xmax, from, to )
         end
     end
 
-    if (series = cbar.lines[]) !== nothing
-        gr_set_gradient(series)
-        gr_set_line(get_linewidth(series), get_linestyle(series), get_linecolor(series, clims))
-        gr_set_transparency(get_linealpha(series))
-        levels = contour_levels(series, clims)
-        colors = gr_colorbar_colors(series, clims)
+    if !isempty(cbar.lines)
+        series = cbar.lines
+        gr_set_gradient(_cbar_unique(gr_get_color.(series),"color"))
+        gr_set_line(_cbar_unique(get_linewidth.(series), "line width"),
+                    _cbar_unique(get_linestyle.(series), "line style"),
+                    _cbar_unique(get_linecolor.(series, Ref(clims)), "line color"))
+        gr_set_transparency(_cbar_unique(get_linealpha.(series), "line alpha"))
+        levels = _cbar_unique(contour_levels.(series, Ref(clims)), "levels")
+        colors = gr_colorbar_colors(last(series), clims)
         for (line, color) in zip(levels, colors)
             GR.setlinecolorind(color)
             GR.polyline([xmin,xmax], [line,line] )
@@ -594,17 +606,22 @@ function gr_set_gradient(c)
 end
 
 function gr_set_gradient(series::Series)
+    color = gr_get_color(series)
+    color !== nothing && gr_set_gradient(color)
+end
+
+function gr_get_color(series::Series)
     st = series[:seriestype]
     if st in (:surface, :heatmap) || isfilledcontour(series)
-        gr_set_gradient(series[:fillcolor])
+        series[:fillcolor]
     elseif st in (:contour, :wireframe)
-        gr_set_gradient(series[:linecolor])
-    elseif series[:marker_z] != nothing
-        gr_set_gradient(series[:markercolor])
-    elseif series[:line_z] !=  nothing
-        gr_set_gradient(series[:linecolor])
-    elseif series[:fill_z] != nothing
-        gr_set_gradient(series[:fillcolor])
+        series[:linecolor]
+    elseif series[:marker_z] !== nothing
+        series[:markercolor]
+    elseif series[:line_z] !==  nothing
+        series[:linecolor]
+    elseif series[:fill_z] !== nothing
+        series[:fillcolor]
     end
 end
 
@@ -844,26 +861,21 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
     # has to be done now due to a potential adjustment to the plotarea given an outer legend.
     legendn = 0
     legendw = 0
-    legendi = 0
     if sp[:legend] != :none
         GR.savestate()
         GR.selntran(0)
         GR.setscale(0)
-        gr_set_font(legendfont(sp))
-        if sp[:legendtitle] != nothing
+        if sp[:legendtitle] !== nothing
+            gr_set_font(legendtitlefont(sp))
             tbx, tby = gr_inqtext(0, 0, string(sp[:legendtitle]))
             legendw = tbx[3] - tbx[1]
             legendn += 1
         end
+        gr_set_font(legendfont(sp))
         for series in series_list(sp)
             should_add_to_legend(series) || continue
             legendn += 1
-            if typeof(series[:label]) <: Array
-                legendi += 1
-                lab = series[:label][legendi]
-            else
-                lab = series[:label]
-            end
+            lab = series[:label]
             tbx, tby = gr_inqtext(0, 0, string(lab))
             legendw = max(legendw, tbx[3] - tbx[1])
         end
@@ -895,8 +907,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
     # reduced from before... set some flags based on the series in this subplot
     # TODO: can these be generic flags?
     outside_ticks = false
-    # calculate the colorbar limits once for a subplot
-    clims = get_clims(sp)
     cbar = GRColorbar()
 
     draw_axes = sp[:framestyle] != :none
@@ -910,11 +920,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             outside_ticks = true
             for ax in (sp[:xaxis], sp[:yaxis])
                 v = series[ax[:letter]]
-                if length(v) > 1 && diff(collect(extrema(diff(v))))[1] > 1e-6*std(v)
-                    @warn("GR: heatmap only supported with equally spaced data.")
-                end
             end
-            x, y = heatmap_edges(series[:x], sp[:xaxis][:scale]), heatmap_edges(series[:y], sp[:yaxis][:scale])
+            x, y = heatmap_edges(series[:x], sp[:xaxis][:scale], series[:y], sp[:yaxis][:scale], size(series[:z]))
             xy_lims = x[1], x[end], y[1], y[end]
             expand_extrema!(sp[:xaxis], x)
             expand_extrema!(sp[:yaxis], y)
@@ -972,7 +979,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
     if is3d(sp)
         # TODO do we really need a different clims computation here from the one
         #      computed above using get_clims(sp)?
-        zmin, zmax = gr_lims(zaxis, true)
+        zmin, zmax = gr_lims(sp, zaxis, true)
         clims3d = sp[:clims]
         if is_2tuple(clims3d)
             isfinite(clims3d[1]) && (zmin = clims3d[1])
@@ -1007,7 +1014,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
     elseif ispolar(sp)
         r = gr_set_viewport_polar()
         #rmin, rmax = GR.adjustrange(ignorenan_minimum(r), ignorenan_maximum(r))
-        rmin, rmax = axis_limits(sp[:yaxis])
+        rmin, rmax = axis_limits(sp, :y)
         gr_polaraxes(rmin, rmax, sp)
 
     elseif draw_axes
@@ -1209,6 +1216,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         x, y, z = series[:x], series[:y], series[:z]
         frng = series[:fillrange]
 
+        clims = get_clims(sp, series)
+
         # add custom frame shapes to markershape?
         series_annotations_shapes!(series)
         # -------------------------------------------------------
@@ -1217,7 +1226,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         if typeof(z) <: Surface
             z = vec(transpose_z(series, z.surf, false))
         elseif ispolar(sp)
-            if frng != nothing
+            if frng !== nothing
                 _, frng = convert_to_polar(x, frng, (rmin, rmax))
             end
             x, y = convert_to_polar(x, y, (rmin, rmax))
@@ -1228,11 +1237,11 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         end
 
         if st in (:path, :scatter, :straightline)
-            if x != nothing && length(x) > 1
+            if x !== nothing && length(x) > 1
                 lz = series[:line_z]
                 segments = iter_segments(series)
                 # do area fill
-                if frng != nothing
+                if frng !== nothing
                     GR.setfillintstyle(GR.INTSTYLE_SOLID)
                     fr_from, fr_to = (is_2tuple(frng) ? frng : (y, frng))
                     for (i, rng) in enumerate(segments)
@@ -1250,9 +1259,11 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                     for (i, rng) in enumerate(segments)
                         lc = get_linecolor(series, clims, i)
                         gr_set_line(get_linewidth(series, i), get_linestyle(series, i), lc) #, series[:linealpha])
-                        gr_set_transparency(lc, get_linealpha(series, i))
                         arrowside = isa(series[:arrow], Arrow) ? series[:arrow].side : :none
-                        gr_polyline(x[rng], y[rng]; arrowside = arrowside)
+                        arrowstyle = isa(series[:arrow], Arrow) ? series[:arrow].style : :simple
+                        gr_set_fillcolor(lc)
+                        gr_set_transparency(lc, get_linealpha(series, i))
+                        gr_polyline(x[rng], y[rng]; arrowside = arrowside, arrowstyle = arrowstyle)
                     end
                 end
             end
@@ -1269,7 +1280,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                 plot_color(series[:linecolor]) in (black,[black])
             end
             h = gr_contour_levels(series, clims)
-            if series[:fillrange] != nothing
+            if series[:fillrange] !== nothing
                 if series[:fillcolor] != series[:linecolor] && !is_lc_black
                     @warn("GR: filled contour only supported with black contour lines")
                 end
@@ -1301,21 +1312,34 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             dmin, dmax = GR.gr3.volume(y.v, 0)
 
         elseif st == :heatmap
-            xmin, xmax, ymin, ymax = xy_lims
             zmin, zmax = clims
-            m, n = length(x), length(y)
-            xinds = sort(1:m, rev = xaxis[:flip])
-            yinds = sort(1:n, rev = yaxis[:flip])
-            z = reshape(reshape(z, m, n)[xinds, yinds], m*n)
-            GR.setspace(zmin, zmax, 0, 90)
-            grad = isa(series[:fillcolor], ColorGradient) ? series[:fillcolor] : cgrad()
-            colors = [plot_color(grad[clamp((zi-zmin) / (zmax-zmin), 0, 1)], series[:fillalpha]) for zi=z]
-            rgba = map(c -> UInt32( round(UInt, alpha(c) * 255) << 24 +
-                                    round(UInt,  blue(c) * 255) << 16 +
-                                    round(UInt, green(c) * 255) << 8  +
-                                    round(UInt,   red(c) * 255) ), colors)
-            w, h = length(x), length(y)
-            GR.drawimage(xmin, xmax, ymax, ymin, w, h, rgba)
+            if !ispolar(sp)
+                GR.setspace(zmin, zmax, 0, 90)
+                x, y = heatmap_edges(series[:x], sp[:xaxis][:scale], series[:y], sp[:yaxis][:scale], size(series[:z]))
+                w, h = length(x) - 1, length(y) - 1
+                z_normalized = map(x -> GR.jlgr.normalize_color(x, zmin, zmax), z)
+                z_normalized = map(x -> isnan(x) ? 256/255 : x, z_normalized) # results in color index = 1256 -> transparent
+                colors = Int32[round(Int32, 1000 + _i * 255) for _i in z_normalized]
+                GR.nonuniformcellarray(x, y, w, h, colors)
+            else
+                phimin, phimax = 0.0, 360.0 # nonuniform polar array is not yet supported in GR.jl
+                nx, ny = length(series[:x]), length(series[:y])
+                z_normalized = map(x -> GR.jlgr.normalize_color(x, zmin, zmax), z)
+                colors = Int32[round(Int32, 1000 + _i * 255) for _i in z_normalized]
+                xmin, xmax, ymin, ymax = xy_lims
+                rmax = data_lims[4]
+                GR.setwindow(-rmax, rmax, -rmax, rmax)
+                if ymin > 0
+                    @warn "'ymin[1] > 0' (rmin) is not yet supported."
+                end
+                if series[:y][end] != ny
+                    @warn "Right now only the maximum value of y (r) is taken into account."
+                end
+                # GR.polarcellarray(0, 0, phimin, phimax, ymin, ymax, nx, ny, colors)
+                GR.polarcellarray(0, 0, phimin, phimax, 0, ymax, nx, ny, colors)
+                # Right now only the maximum value of y (r) is taken into account.
+                # This is certainly not perfect but nonuniform polar array is not yet supported in GR.jl
+            end
 
         elseif st in (:path3d, :scatter3d)
             # draw path
@@ -1414,9 +1438,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         elseif st == :image
             z = transpose_z(series, series[:z].surf, true)'
             w, h = size(z)
-            xinds = sort(1:w, rev = xaxis[:flip])
-            yinds = sort(1:h, rev = yaxis[:flip])
-            z = z[xinds, yinds]
             xmin, xmax = ignorenan_extrema(series[:x]); ymin, ymax = ignorenan_extrema(series[:y])
             if eltype(z) <: Colors.AbstractGray
                 grey = round.(UInt8, clamp.(float(z) * 255, 0, 255))
@@ -1441,7 +1462,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
     end
 
     # draw the colorbar
-    hascolorbar(sp) && gr_draw_colorbar(cbar, sp, clims)
+    hascolorbar(sp) && gr_draw_colorbar(cbar, sp, get_clims(sp))
 
     # add the legend
     if sp[:legend] != :none
@@ -1450,7 +1471,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         GR.setscale(0)
         gr_set_font(legendfont(sp))
         w = legendw
-        i = legendi
         n = legendn
         if w > 0
             dy = _gr_point_mult[1] * sp[:legendfontsize] * 1.75
@@ -1462,20 +1482,21 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             gr_set_line(1, :solid, sp[:foreground_color_legend])
             GR.drawrect(xpos - 0.08, xpos + w + 0.02, ypos + dy, ypos - dy * n)
             i = 0
-            if sp[:legendtitle] != nothing
+            if sp[:legendtitle] !== nothing
                 GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_HALF)
-                gr_set_textcolor(sp[:legendfontcolor])
-                gr_set_transparency(sp[:legendfontcolor])
+                gr_set_font(legendtitlefont(sp))
                 gr_text(xpos - 0.03 + 0.5*w, ypos, string(sp[:legendtitle]))
                 ypos -= dy
+                gr_set_font(legendfont(sp))
             end
             for series in series_list(sp)
+                clims = get_clims(sp, series)
                 should_add_to_legend(series) || continue
                 st = series[:seriestype]
                 lc = get_linecolor(series, clims)
                 gr_set_line(get_linewidth(series), get_linestyle(series), lc) #, series[:linealpha])
 
-                if (st == :shape || series[:fillrange] != nothing) && series[:ribbon] == nothing
+                if (st == :shape || series[:fillrange] !== nothing) && series[:ribbon] === nothing
                     fc = get_fillcolor(series, clims)
                     gr_set_fill(fc) #, series[:fillalpha])
                     l, r = xpos-0.07, xpos-0.01
@@ -1492,7 +1513,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
 
                 if st in (:path, :straightline)
                     gr_set_transparency(lc, get_linealpha(series))
-                    if series[:fillrange] == nothing || series[:ribbon] != nothing
+                    if series[:fillrange] === nothing || series[:ribbon] !== nothing
                         GR.polyline([xpos - 0.07, xpos - 0.01], [ypos, ypos])
                     else
                         GR.polyline([xpos - 0.07, xpos - 0.01], [ypos+0.4dy, ypos+0.4dy])
@@ -1503,14 +1524,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                     gr_draw_markers(series, xpos - .035, ypos, clims, 6)
                 end
 
-                if typeof(series[:label]) <: Array
-                    i += 1
-                    lab = series[:label][i]
-                else
-                    lab = series[:label]
-                end
+                lab = series[:label]
                 GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF)
-                gr_set_textcolor(sp[:legendfontcolor])
+                gr_set_textcolor(plot_color(sp[:legendfontcolor]))
                 gr_text(xpos, ypos, string(lab))
                 ypos -= dy
             end

src/backends/inspectdr.jl

@@ -121,9 +121,9 @@ function _create_backend_figure(plt::Plot{InspectDRBackend})
     gplot = _inspectdr_getgui(plt.o)
 
     #:overwrite_figure: want to reuse current figure
-    if plt[:overwrite_figure] && mplot != nothing
+    if plt[:overwrite_figure] && mplot !== nothing
         mplot.subplots = [] #Reset
-        if gplot != nothing #Ensure still references current plot
+        if gplot !== nothing #Ensure still references current plot
             gplot.src = mplot
         end
     else #want new one:
@@ -294,8 +294,8 @@ function _inspectdr_setupsubplot(sp::Subplot{InspectDRBackend})
 
         plot.xscale = _inspectdr_getscale(xaxis[:scale], false)
         strip.yscale = _inspectdr_getscale(yaxis[:scale], true)
-        xmin, xmax  = axis_limits(xaxis)
-        ymin, ymax  = axis_limits(yaxis)
+        xmin, xmax  = axis_limits(sp, :x)
+        ymin, ymax  = axis_limits(sp, :y)
         if ispolar(sp)
             #Plots.jl appears to give (xmin,xmax) ≜ (Θmin,Θmax) & (ymin,ymax) ≜ (rmin,rmax)
             rmax = NaNMath.max(abs(ymin), abs(ymax))

src/backends/orca.jl

@@ -0,0 +1,15 @@
+function plotlybase_syncplot(plt::Plot)
+    plt.o = ORCA.PlotlyBase.Plot()
+    traces = ORCA.PlotlyBase.GenericTrace[]
+    for series_dict in plotly_series(plt)
+        plotly_type = pop!(series_dict, :type)
+        push!(traces, ORCA.PlotlyBase.GenericTrace(plotly_type; series_dict...))
+    end
+    ORCA.PlotlyBase.addtraces!(plt.o, traces...)
+    layout = plotly_layout(plt)
+    w, h = plt[:size]
+    ORCA.PlotlyBase.relayout!(plt.o, layout, width = w, height = h)
+    return plt.o
+end
+
+_show(io::IO, ::MIME{Symbol("image/png")}, plt::Plot{PlotlyBackend}) = ORCA.PlotlyBase.savefig(io, plotlybase_syncplot(plt), format = "png")

src/backends/pgfplots.jl

@@ -96,7 +96,7 @@ pgf_thickness_scaling(series) = pgf_thickness_scaling(series[:subplot])
 function pgf_fillstyle(plotattributes, i = 1)
     cstr,a = pgf_color(get_fillcolor(plotattributes, i))
     fa = get_fillalpha(plotattributes, i)
-    if fa != nothing
+    if fa !== nothing
         a = fa
     end
     "fill = $cstr, fill opacity=$a"
@@ -128,16 +128,18 @@ function pgf_marker(plotattributes, i = 1)
     shape = _cycle(plotattributes[:markershape], i)
     cstr, a = pgf_color(plot_color(get_markercolor(plotattributes, i), get_markeralpha(plotattributes, i)))
     cstr_stroke, a_stroke = pgf_color(plot_color(get_markerstrokecolor(plotattributes, i), get_markerstrokealpha(plotattributes, i)))
-    """
-    mark = $(get(_pgfplots_markers, shape, "*")),
-    mark size = $(pgf_thickness_scaling(plotattributes) * 0.5 * _cycle(plotattributes[:markersize], i)),
-    mark options = {
-        color = $cstr_stroke, draw opacity = $a_stroke,
-        fill = $cstr, fill opacity = $a,
-        line width = $(pgf_thickness_scaling(plotattributes) * _cycle(plotattributes[:markerstrokewidth], i)),
-        rotate = $(shape == :dtriangle ? 180 : 0),
-        $(get(_pgfplots_linestyles, _cycle(plotattributes[:markerstrokestyle], i), "solid"))
-    }"""
+    return string(
+        "mark = $(get(_pgfplots_markers, shape, "*")),\n",
+        "mark size = $(pgf_thickness_scaling(plotattributes) * 0.5 * _cycle(plotattributes[:markersize], i)),\n",
+        plotattributes[:seriestype] == :scatter ? "only marks,\n" : "",
+        "mark options = {
+            color = $cstr_stroke, draw opacity = $a_stroke,
+            fill = $cstr, fill opacity = $a,
+            line width = $(pgf_thickness_scaling(plotattributes) * _cycle(plotattributes[:markerstrokewidth], i)),
+            rotate = $(shape == :dtriangle ? 180 : 0),
+            $(get(_pgfplots_linestyles, _cycle(plotattributes[:markerstrokestyle], i), "solid"))
+        }"
+        )
 end
 
 function pgf_add_annotation!(o, x, y, val, thickness_scaling = 1)
@@ -216,12 +218,12 @@ function pgf_series(sp::Subplot, series::Series)
 
             # add to legend?
             if i == 1 && sp[:legend] != :none && should_add_to_legend(series)
-                if plotattributes[:fillrange] != nothing
+                if plotattributes[:fillrange] !== nothing
                     push!(style, "forget plot")
                     push!(series_collection, pgf_fill_legend_hack(plotattributes, args))
                 else
                     kw[:legendentry] = plotattributes[:label]
-                    if st == :shape # || plotattributes[:fillrange] != nothing
+                    if st == :shape # || plotattributes[:fillrange] !== nothing
                         push!(style, "area legend")
                     end
                 end
@@ -238,7 +240,7 @@ function pgf_series(sp::Subplot, series::Series)
             kw[:style] = join(style, ',')
 
             # add fillrange
-            if series[:fillrange] != nothing && st != :shape
+            if series[:fillrange] !== nothing && st != :shape
                 push!(series_collection, pgf_fillrange_series(series, i, _cycle(series[:fillrange], rng), seg_args...))
             end
 
@@ -361,13 +363,13 @@ function pgf_axis(sp::Subplot, letter)
     # limits
     # TODO: support zlims
     if letter != :z
-        lims = ispolar(sp) && letter == :x ? rad2deg.(axis_limits(axis)) : axis_limits(axis)
+        lims = ispolar(sp) && letter == :x ? rad2deg.(axis_limits(sp, :x)) : axis_limits(sp, letter)
         kw[Symbol(letter,:min)] = lims[1]
         kw[Symbol(letter,:max)] = lims[2]
     end
 
     if !(axis[:ticks] in (nothing, false, :none, :native)) && framestyle != :none
-        ticks = get_ticks(axis)
+        ticks = get_ticks(sp, axis)
         #pgf plot ignores ticks with angle below 90 when xmin = 90 so shift values
         tick_values = ispolar(sp) && letter == :x ? [rad2deg.(ticks[1])[3:end]..., 360, 405] : ticks[1]
         push!(style, string(letter, "tick = {", join(tick_values,","), "}"))
@@ -476,8 +478,18 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
         if haskey(_pgfplots_legend_pos, legpos)
             kw[:legendPos] = _pgfplots_legend_pos[legpos]
         end
-        cstr, a = pgf_color(plot_color(sp[:background_color_legend]))
-        push!(style, string("legend style = {", pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], 1.0, "solid"), ",", "fill = $cstr,", "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)), "}"))
+        cstr, bg_alpha = pgf_color(plot_color(sp[:background_color_legend]))
+        fg_alpha = alpha(plot_color(sp[:foreground_color_legend]))
+
+        push!(style, string(
+            "legend style = {", 
+                pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], fg_alpha, "solid", ), ",", 
+                "fill = $cstr,", 
+                "fill opacity = $bg_alpha,", 
+                "text opacity = $(alpha(plot_color(sp[:legendfontcolor]))),", 
+                "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)), 
+            "}",
+        ))
 
         if any(s[:seriestype] == :contour for s in series_list(sp))
             kw[:view] = "{0}{90}"

src/backends/pgfplotsx.jl

@@ -0,0 +1,845 @@
+using Contour: Contour
+
+Base.@kwdef mutable struct PGFPlotsXPlot
+    is_created::Bool = false
+    was_shown::Bool = false
+    the_plot::PGFPlotsX.TikzDocument = PGFPlotsX.TikzDocument()
+    function PGFPlotsXPlot(is_created, was_shown, the_plot)
+        pgfx_plot = new(is_created, was_shown, the_plot)
+        # tikz libraries
+        PGFPlotsX.push_preamble!(pgfx_plot.the_plot, "\\usetikzlibrary{arrows.meta}")
+        PGFPlotsX.push_preamble!(pgfx_plot.the_plot, "\\usetikzlibrary{backgrounds}")
+        PGFPlotsX.push_preamble!(pgfx_plot.the_plot,
+        """
+        \\pgfkeys{/tikz/.cd,
+          background color/.initial=white,
+          background color/.get=\\backcol,
+          background color/.store in=\\backcol,
+        }
+        \\tikzset{background rectangle/.style={
+            fill=\\backcol,
+          },
+          use background/.style={
+            show background rectangle
+          }
+        }
+        """
+        )
+        # pgfplots libraries
+        PGFPlotsX.push_preamble!(pgfx_plot.the_plot, "\\usepgfplotslibrary{patchplots}")
+        PGFPlotsX.push_preamble!(pgfx_plot.the_plot, "\\usepgfplotslibrary{fillbetween}")
+        pgfx_plot
+    end
+end
+
+## end user utility functions
+function pgfx_axes(pgfx_plot::PGFPlotsXPlot)
+    gp =  pgfx_plot.the_plot.elements[1].elements[1]
+    return gp isa PGFPlotsX.GroupPlot ? gp.contents : gp
+end
+
+function pgfx_preamble(pgfx_plot::Plot{PGFPlotsXBackend})
+    old_flag = pgfx_plot.attr[:tex_output_standalone]
+    pgfx_plot.attr[:tex_output_standalone] = true
+    fulltext = String(repr("application/x-tex", pgfx_plot))
+    preamble = fulltext[1:first(findfirst("\\begin{document}", fulltext)) - 1]
+    pgfx_plot.attr[:tex_output_standalone] = old_flag
+    preamble
+end
+##
+
+function surface_to_vecs(x::AVec, y::AVec, s::Union{AMat, Surface})
+    a = Array(s)
+    xn = Vector{eltype(x)}(undef, length(a))
+    yn = Vector{eltype(y)}(undef, length(a))
+    zn = Vector{eltype(s)}(undef, length(a))
+    for (n, (i, j)) in enumerate(Tuple.(CartesianIndices(a)))
+        xn[n] = x[j]
+        yn[n] = y[i]
+        zn[n] = a[i,j]
+    end
+    return xn, yn, zn
+end
+
+function Base.push!(pgfx_plot::PGFPlotsXPlot, item)
+    push!(pgfx_plot.the_plot, item)
+end
+
+function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
+    if !pgfx_plot.is_created
+        the_plot = PGFPlotsX.TikzPicture(PGFPlotsX.Options())
+        rows, cols = size(plt.layout.grid)
+        bgc = plt.attr[:background_color_outside] == :match ? plt.attr[:background_color] : plt.attr[:background_color_outside]
+        if bgc isa Colors.Colorant
+            cstr = plot_color(bgc)
+            a = alpha(cstr)
+            push!(the_plot.options,
+                "draw opacity" => a,
+                "background color" => cstr,
+                "use background" => nothing,
+            )
+        end
+
+        # the combination of groupplot and polaraxis is broken in pgfplots
+        if !any( sp -> ispolar(sp), plt.subplots )
+            pl_height, pl_width = plt.attr[:size]
+            push!( the_plot, PGFPlotsX.GroupPlot(
+                    PGFPlotsX.Options(
+                        "group style" => PGFPlotsX.Options(
+                            "group size" => string(cols)*" by "*string(rows),
+                            "horizontal sep" => string(maximum(sp -> sp.minpad[1], plt.subplots)),
+                            "vertical sep" => string(maximum(sp -> sp.minpad[2], plt.subplots)),
+                        ),
+                    "height" => pl_height > 0 ? string(pl_height)*"px" : "{}",
+                    "width" => pl_width > 0 ? string(pl_width)*"px" : "{}",
+                    )
+                )
+            )
+        end
+        for sp in plt.subplots
+            bb = bbox(sp)
+            cstr = plot_color(sp[:background_color_legend])
+            a = alpha(cstr)
+            fg_alpha = alpha(plot_color(sp[:foreground_color_legend]))
+            title_cstr = plot_color(sp[:titlefontcolor])
+            title_a = alpha(title_cstr)
+            axis_opt = PGFPlotsX.Options(
+                "height" => string(height(bb)),
+                "width" => string(width(bb)),
+                "title" => sp[:title],
+                "title style" => PGFPlotsX.Options(
+                    "font" => pgfx_font(sp[:titlefontsize], pgfx_thickness_scaling(sp)),
+                    "color" => title_cstr,
+                    "draw opacity" => title_a,
+                    "rotate" => sp[:titlefontrotation]
+                ),
+                "legend style" => PGFPlotsX.Options(
+                    pgfx_linestyle(pgfx_thickness_scaling(sp), sp[:foreground_color_legend], fg_alpha, "solid") => nothing,
+                    "fill" => cstr,
+                    "fill opacity" => a,
+                    "text opacity" => alpha(plot_color(sp[:legendfontcolor])),
+                    "font" => pgfx_font(sp[:legendfontsize], pgfx_thickness_scaling(sp))
+                ),
+                "axis background/.style" => PGFPlotsX.Options(
+                    "fill" => sp[:background_color_inside]
+                )
+            )
+            # legend position
+            if sp[:legend] isa Tuple
+                x, y = sp[:legend]
+                push!(axis_opt["legend style"], "at={($x, $y)}" )
+            else
+                push!(axis_opt, "legend pos" => get(_pgfplotsx_legend_pos, sp[:legend], "outer north east"),
+                )
+            end
+            for letter in (:x, :y, :z)
+                if letter != :z || is3d(sp)
+                    pgfx_axis!(axis_opt, sp, letter)
+                end
+            end
+            # Search series for any gradient. In case one series uses a gradient set
+           # the colorbar and colomap.
+           # The reasoning behind doing this on the axis level is that pgfplots
+           # colorbar seems to only works on axis level and needs the proper colormap for
+           # correctly displaying it.
+           # It's also possible to assign the colormap to the series itself but
+           # then the colormap needs to be added twice, once for the axis and once for the
+           # series.
+           # As it is likely that all series within the same axis use the same
+           # colormap this should not cause any problem.
+           for series in series_list(sp)
+               for col in (:markercolor, :fillcolor, :linecolor)
+                   if typeof(series.plotattributes[col]) == ColorGradient
+                        PGFPlotsX.push_preamble!(pgfx_plot.the_plot, """\\pgfplotsset{
+                            colormap={plots$(sp.attr[:subplot_index])}{$(pgfx_colormap(series.plotattributes[col]))},
+                        }""")
+                        push!(axis_opt,
+                            "colorbar" => nothing,
+                            "colormap name" => "plots$(sp.attr[:subplot_index])",
+                            "colormap access" => "direct",
+                        )
+                       # goto is needed to break out of col and series for
+                       @goto colorbar_end
+                   end
+               end
+           end
+           @label colorbar_end
+
+           push!(axis_opt, "colorbar style" => PGFPlotsX.Options(
+                   "title" => sp[:colorbar_title],
+                   "point meta max" => get_clims(sp)[2],
+                   "point meta min" => get_clims(sp)[1]
+               )
+           )
+           if is3d(sp)
+               azim, elev = sp[:camera]
+               push!( axis_opt, "view" => (azim, elev) )
+           end
+           axisf = if sp[:projection] == :polar
+               # push!(axis_opt, "xmin" => 90)
+               # push!(axis_opt, "xmax" => 450)
+               PGFPlotsX.PolarAxis
+           else
+               PGFPlotsX.Axis
+           end
+           axis = axisf(
+           axis_opt
+           )
+           for (series_index, series) in enumerate(series_list(sp))
+               opt = series.plotattributes
+               st = series[:seriestype]
+               series_opt = PGFPlotsX.Options(
+               "color" => single_color(opt[:linecolor]),
+               )
+               if is3d(series) || st == :heatmap
+                   series_func = PGFPlotsX.Plot3
+               else
+                   series_func = PGFPlotsX.Plot
+               end
+               if series[:fillrange] !== nothing && !isfilledcontour(series) && series[:ribbon] === nothing
+                   push!(series_opt, "area legend" => nothing)
+               end
+               if st == :heatmap
+                   push!(axis.options,
+                   "view" => "{0}{90}",
+                   "shader" => "flat corner",
+                   )
+               end
+               # treat segments
+               segments = if st in (:wireframe, :heatmap, :contour, :surface, :contour3d)
+                   iter_segments(surface_to_vecs(series[:x], series[:y], series[:z])...)
+               else
+                   iter_segments(series)
+               end
+               for (i, rng) in enumerate(segments)
+                   segment_opt = PGFPlotsX.Options()
+                   segment_opt = merge( segment_opt, pgfx_linestyle(opt, i) )
+                   if opt[:markershape] != :none
+                       marker = opt[:markershape]
+                       if marker isa Shape
+                           x = marker.x
+                           y = marker.y
+                           scale_factor = 0.025
+                           mark_size = opt[:markersize] * scale_factor
+                           path = join(["($(x[i] * mark_size), $(y[i] * mark_size))" for i in eachindex(x)], " -- ")
+                           c = get_markercolor(series, i)
+                           a = get_markeralpha(series, i)
+                           PGFPlotsX.push_preamble!(pgfx_plot.the_plot,
+                           """
+                           \\pgfdeclareplotmark{PlotsShape$(series_index)}{
+                           \\filldraw
+                           $path;
+                           }
+                           """
+                           )
+                       end
+                       segment_opt = merge( segment_opt, pgfx_marker(opt, i) )
+                   end
+                   if st == :shape ||
+                       isfilledcontour(series) ||
+                       series[:ribbon] !== nothing
+                       segment_opt = merge( segment_opt, pgfx_fillstyle(opt, i) )
+                   end
+                   # add fillrange
+                   if series[:fillrange] !== nothing && !isfilledcontour(series) && series[:ribbon] === nothing
+                       pgfx_fillrange_series!( axis, series, series_func, i, _cycle(series[:fillrange], rng), rng)
+                       # add to legend?
+                       if i == 1 && opt[:label] != "" && sp[:legend] != :none && should_add_to_legend(series)
+                           io = IOBuffer()
+                           PGFPlotsX.print_tex(io, pgfx_fillstyle(opt, i))
+                           style = strip(String(take!(io)),['[',']', ' '])
+                           push!( segment_opt, "legend image code/.code" => """{
+                           \\draw[##1,/tikz/.cd, $style] (0cm,-0.1cm) rectangle (0.6cm,0.1cm);
+                           }""" )
+                       end
+                   end
+                   # series
+                   coordinates = pgfx_series_coordinates!( sp, series, segment_opt, opt, rng )
+                   segment_plot = series_func(
+                       merge(series_opt, segment_opt),
+                       coordinates,
+                   )
+                   push!(axis, segment_plot)
+                   # add ribbons?
+                   ribbon = series[:ribbon]
+                   if ribbon !== nothing
+                       pgfx_add_ribbons!( axis, series, segment_plot, series_func, series_index )
+                   end
+                   # add to legend?
+                   if i == 1 && opt[:label] != "" && sp[:legend] != :none && should_add_to_legend(series)
+                       legend = PGFPlotsX.LegendEntry(PGFPlotsX.Options(), opt[:label], true)
+                       push!( axis, legend )
+                   end
+                   # add series annotations
+                   anns = series[:series_annotations]
+                   for (xi,yi,str,fnt) in EachAnn(anns, series[:x], series[:y])
+                       pgfx_add_annotation!(axis, xi, yi, PlotText(str, fnt), pgfx_thickness_scaling(series))
+                   end
+               end
+               # add subplot annotations
+               anns = sp.attr[:annotations]
+               for (xi,yi,txt) in anns
+                   pgfx_add_annotation!(axis, xi, yi, txt, pgfx_thickness_scaling(sp))
+               end
+           end
+           if ispolar(sp)
+               axes = the_plot
+           else
+               axes = the_plot.elements[1]
+           end
+           push!( axes, axis )
+           if length(plt.o.the_plot.elements) > 0
+               plt.o.the_plot.elements[1] = the_plot
+           else
+               push!(plt.o, the_plot)
+           end
+       end
+        pgfx_plot.is_created = true
+    end
+    return pgfx_plot
+end
+## seriestype specifics
+@inline function pgfx_series_coordinates!(sp, series, segment_opt, opt, rng)
+    st = series[:seriestype]
+    # function args
+    args =  if st in (:contour, :contour3d)
+        opt[:x], opt[:y], Array(opt[:z])'
+    elseif st in (:heatmap, :surface, :wireframe)
+            surface_to_vecs(opt[:x], opt[:y], opt[:z])
+    elseif is3d(st)
+        opt[:x], opt[:y], opt[:z]
+    elseif st == :straightline
+        straightline_data(series)
+    elseif st == :shape
+        shape_data(series)
+    elseif ispolar(sp)
+        theta, r = opt[:x], opt[:y]
+        rad2deg.(theta), r
+    else
+        opt[:x], opt[:y]
+    end
+    seg_args = if st in (:contour, :contour3d)
+            args
+        else
+            (arg[rng] for arg in args)
+        end
+    if opt[:quiver] !== nothing
+        push!(segment_opt, "quiver" => PGFPlotsX.Options(
+            "u" => "\\thisrow{u}",
+            "v" => "\\thisrow{v}",
+            pgfx_arrow(opt[:arrow]) => nothing
+            ),
+        )
+        x, y = collect(seg_args)
+        return PGFPlotsX.Table([:x => x, :y => y, :u => opt[:quiver][1], :v => opt[:quiver][2]])
+    else
+        if isfilledcontour(series)
+            st = :filledcontour
+        end
+        pgfx_series_coordinates!(Val(st), segment_opt, opt, seg_args)
+    end
+end
+function pgfx_series_coordinates!(st_val::Union{Val{:path}, Val{:path3d}, Val{:straightline}}, segment_opt, opt, args)
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Union{Val{:scatter}, Val{:scatter3d}}, segment_opt, opt, args)
+    push!( segment_opt, "only marks" => nothing )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Val{:heatmap}, segment_opt, opt, args)
+    push!(segment_opt,
+        "surf" => nothing,
+        "mesh/rows" => length(opt[:x]),
+        "mesh/cols" => length(opt[:y]),
+    )
+    return PGFPlotsX.Table(args...)
+end
+
+function pgfx_series_coordinates!(st_val::Val{:steppre}, segment_opt, opt, args)
+    push!( segment_opt, "const plot mark right" => nothing )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Val{:stepmid}, segment_opt, opt, args)
+    push!( segment_opt, "const plot mark mid" => nothing )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Val{:steppost}, segment_opt, opt, args)
+    push!( segment_opt, "const plot" => nothing )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Union{Val{:ysticks},Val{:sticks}}, segment_opt, opt, args)
+    push!( segment_opt, "ycomb" => nothing )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Val{:xsticks}, segment_opt, opt, args)
+    push!( segment_opt, "xcomb" => nothing )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Val{:surface}, segment_opt, opt, args)
+    push!( segment_opt, "surf" => nothing,
+        "mesh/rows" => length(opt[:x]),
+        "mesh/cols" => length(opt[:y]),
+    )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Val{:volume}, segment_opt, opt, args)
+    push!( segment_opt, "patch" => nothing )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Val{:wireframe}, segment_opt, opt, args)
+    push!( segment_opt, "mesh" => nothing,
+        "mesh/rows" => length(opt[:x])
+    )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Val{:shape}, segment_opt, opt, args)
+    push!( segment_opt, "area legend" => nothing )
+    return PGFPlotsX.Coordinates(args...)
+end
+function pgfx_series_coordinates!(st_val::Union{Val{:contour}, Val{:contour3d}}, segment_opt, opt, args)
+    push!(segment_opt,
+        "contour prepared" => PGFPlotsX.Options(
+            "labels" => opt[:contour_labels],
+        ),
+    )
+    return PGFPlotsX.Table(Contour.contours(args..., opt[:levels]))
+end
+function pgfx_series_coordinates!(st_val::Val{:filledcontour}, segment_opt, opt, args)
+    xs, ys, zs = collect(args)
+    push!(segment_opt,
+        "contour filled" => PGFPlotsX.Options(
+            "labels" => opt[:contour_labels],
+        ),
+        "point meta" => "explicit",
+        "shader" => "flat"
+    )
+    if opt[:levels] isa Number
+        push!(segment_opt["contour filled"],
+            "number" => opt[:levels],
+        )
+    elseif opt[:levels] isa AVec
+        push!(segment_opt["contour filled"],
+            "levels" => opt[:levels],
+        )
+    end
+
+    cs = join([
+            join(["($x, $y) [$(zs[j, i])]" for (j, x) in enumerate(xs)], " ") for (i, y) in enumerate(ys)], "\n\n"
+        )
+    """
+        coordinates {
+        $cs
+        };
+    """
+end
+##
+const _pgfplotsx_linestyles = KW(
+    :solid => "solid",
+    :dash => "dashed",
+    :dot => "dotted",
+    :dashdot => "dashdotted",
+    :dashdotdot => "dashdotdotted",
+)
+
+const _pgfplotsx_markers = KW(
+    :none => "none",
+    :cross => "+",
+    :xcross => "x",
+    :+ => "+",
+    :x => "x",
+    :utriangle => "triangle*",
+    :dtriangle => "triangle*",
+    :rtriangle => "triangle*",
+    :ltriangle => "triangle*",
+    :circle => "*",
+    :rect => "square*",
+    :star5 => "star",
+    :star6 => "asterisk",
+    :diamond => "diamond*",
+    :pentagon => "pentagon*",
+    :hline => "-",
+    :vline => "|"
+)
+
+const _pgfplotsx_legend_pos = KW(
+    :bottomleft => "south west",
+    :bottomright => "south east",
+    :topright => "north east",
+    :topleft => "north west",
+    :outertopright => "outer north east",
+)
+
+const _pgfx_framestyles = [:box, :axes, :origin, :zerolines, :grid, :none]
+const _pgfx_framestyle_defaults = Dict(:semi => :box)
+
+# we use the anchors to define orientations for example to align left
+# one needs to use the right edge as anchor
+const _pgfx_annotation_halign = KW(
+    :center => "",
+    :left => "right",
+    :right => "left"
+)
+## --------------------------------------------------------------------------------------
+# Generates a colormap for pgfplots based on a ColorGradient
+pgfx_arrow(::Nothing) = "every arrow/.append style={-}"
+function pgfx_arrow( arr::Arrow )
+    components = String[]
+    head = String[]
+    push!(head, "{stealth[length = $(arr.headlength)pt, width = $(arr.headwidth)pt")
+    if arr.style == :open
+        push!(head, ", open")
+    end
+    push!(head, "]}")
+    head = join(head, "")
+    if arr.side == :both || arr.side == :tail
+        push!( components,  head )
+    end
+    push!(components, "-")
+    if arr.side == :both || arr.side == :head
+        push!( components, head )
+    end
+    components = join( components, "" )
+    return "every arrow/.append style={$(components)}"
+end
+
+function pgfx_colormap(grad::ColorGradient)
+    join(map(grad.colors) do c
+        @sprintf("rgb=(%.8f,%.8f,%.8f)", red(c), green(c), blue(c))
+    end,"\n")
+end
+function pgfx_colormap(grad::Vector{<:Colorant})
+    join(map(grad) do c
+        @sprintf("rgb=(%.8f,%.8f,%.8f)", red(c), green(c), blue(c))
+    end,"\n")
+end
+
+function pgfx_framestyle(style::Symbol)
+    if style in _pgfx_framestyles
+        return style
+    else
+        default_style = get(_pgfx_framestyle_defaults, style, :axes)
+        @warn("Framestyle :$style is not (yet) supported by the PGFPlots backend. :$default_style was cosen instead.")
+        default_style
+    end
+end
+
+pgfx_thickness_scaling(plt::Plot) = plt[:thickness_scaling]
+pgfx_thickness_scaling(sp::Subplot) = pgfx_thickness_scaling(sp.plt)
+pgfx_thickness_scaling(series) = pgfx_thickness_scaling(series[:subplot])
+
+function pgfx_fillstyle(plotattributes, i = 1)
+    cstr = get_fillcolor(plotattributes, i)
+    a = get_fillalpha(plotattributes, i)
+    if a === nothing
+        a = alpha(single_color(cstr))
+    end
+    PGFPlotsX.Options("fill" => cstr, "fill opacity" => a)
+end
+
+function pgfx_linestyle(linewidth::Real, color, α = 1, linestyle = "solid")
+    cstr = plot_color(color, α)
+    a = alpha(cstr)
+    return PGFPlotsX.Options(
+        "color" => cstr,
+        "draw opacity" => a,
+        "line width" => linewidth,
+        get(_pgfplotsx_linestyles, linestyle, "solid") => nothing
+    )
+end
+
+function pgfx_linestyle(plotattributes, i = 1)
+    lw = pgfx_thickness_scaling(plotattributes) * get_linewidth(plotattributes, i)
+    lc = single_color(get_linecolor(plotattributes, i))
+    la = get_linealpha(plotattributes, i)
+    ls = get_linestyle(plotattributes, i)
+    return pgfx_linestyle(lw, lc, la, ls)
+end
+
+function pgfx_font(fontsize, thickness_scaling = 1, font = "\\selectfont")
+    fs = fontsize * thickness_scaling
+    return string("{\\fontsize{", fs, " pt}{", 1.3fs, " pt}", font, "}")
+end
+
+function pgfx_marker(plotattributes, i = 1)
+    shape = _cycle(plotattributes[:markershape], i)
+    cstr = plot_color(get_markercolor(plotattributes, i), get_markeralpha(plotattributes, i))
+    a = alpha(cstr)
+    cstr_stroke = plot_color(get_markerstrokecolor(plotattributes, i), get_markerstrokealpha(plotattributes, i))
+    a_stroke = alpha(cstr_stroke)
+    mark_size = pgfx_thickness_scaling(plotattributes) * 0.5 * _cycle(plotattributes[:markersize], i)
+    return PGFPlotsX.Options(
+        "mark" => shape isa Shape ? "PlotsShape$i" : get(_pgfplotsx_markers, shape, "*"),
+        "mark size" => "$mark_size pt",
+        "mark options" => PGFPlotsX.Options(
+            "color" => cstr_stroke,
+            "draw opacity" => a_stroke,
+            "fill" => cstr,
+            "fill opacity" => a,
+            "line width" => pgfx_thickness_scaling(plotattributes) * _cycle(plotattributes[:markerstrokewidth], i),
+            "rotate" => if shape == :dtriangle
+                            180
+                        elseif shape == :rtriangle
+                            270
+                        elseif shape == :ltriangle
+                            90
+                        else
+                            0
+                        end,
+            get(_pgfplotsx_linestyles, _cycle(plotattributes[:markerstrokestyle], i), "solid") => nothing
+            )
+    )
+end
+
+function pgfx_add_annotation!(o, x, y, val, thickness_scaling = 1)
+    # Construct the style string.
+    cstr = val.font.color
+    a = alpha(cstr)
+    push!(o, ["\\node",
+        PGFPlotsX.Options(
+            get(_pgfx_annotation_halign, val.font.halign, "") => nothing,
+            "color" => cstr,
+            "draw opacity" => convert(Float16, a),
+            "rotate" => val.font.rotation,
+            "font" => pgfx_font(val.font.pointsize, thickness_scaling)
+        ),
+        " at (axis cs:$x, $y) {$(val.str)};"
+    ])
+end
+
+function pgfx_add_ribbons!( axis, series, segment_plot, series_func, series_index )
+    ribbon_y = series[:ribbon]
+    opt = series.plotattributes
+    if ribbon_y isa AVec
+        ribbon_n = length(opt[:y]) ÷ length(ribbon)
+        ribbon_y = repeat(ribbon, outer = ribbon_n)
+    end
+    # upper ribbon
+    ribbon_name_plus = "plots_rib_p$series_index"
+    ribbon_opt_plus = merge(segment_plot.options, PGFPlotsX.Options(
+        "name path" => ribbon_name_plus,
+        "color" => opt[:fillcolor],
+        "draw opacity" => opt[:fillalpha]
+    ))
+    coordinates_plus = PGFPlotsX.Coordinates(opt[:x], opt[:y] .+ ribbon_y)
+    ribbon_plot_plus = series_func(
+        ribbon_opt_plus,
+        coordinates_plus
+    )
+    push!(axis, ribbon_plot_plus)
+    # lower ribbon
+    ribbon_name_minus = "plots_rib_m$series_index"
+    ribbon_opt_minus = merge(segment_plot.options, PGFPlotsX.Options(
+        "name path" => ribbon_name_minus,
+        "color" => opt[:fillcolor],
+        "draw opacity" => opt[:fillalpha]
+    ))
+    coordinates_plus = PGFPlotsX.Coordinates(opt[:x], opt[:y] .- ribbon_y)
+    ribbon_plot_plus = series_func(
+        ribbon_opt_minus,
+        coordinates_plus
+    )
+    push!(axis, ribbon_plot_plus)
+    # fill
+    push!(axis, series_func(
+        pgfx_fillstyle(opt, series_index),
+        "fill between [of=$(ribbon_name_plus) and $(ribbon_name_minus)]"
+    ))
+    return axis
+end
+
+function pgfx_fillrange_series!(axis, series, series_func, i, fillrange, rng)
+    fillrange_opt = PGFPlotsX.Options(
+        "line width" => "0",
+        "draw opacity" => "0",
+    )
+    fillrange_opt = merge( fillrange_opt, pgfx_fillstyle(series, i) )
+    fillrange_opt = merge( fillrange_opt, pgfx_marker(series, i) )
+    push!( fillrange_opt, "forget plot" => nothing )
+    opt = series.plotattributes
+    args = is3d(series) ? (opt[:x][rng], opt[:y][rng], opt[:z][rng]) : (opt[:x][rng], opt[:y][rng])
+    push!(axis, PGFPlotsX.PlotInc(fillrange_opt, pgfx_fillrange_args(fillrange, args...)))
+    return axis
+end
+
+function pgfx_fillrange_args(fillrange, x, y)
+    n = length(x)
+    x_fill = [x; x[n:-1:1]; x[1]]
+    y_fill = [y; _cycle(fillrange, n:-1:1); y[1]]
+    return PGFPlotsX.Coordinates(x_fill, y_fill)
+end
+
+function pgfx_fillrange_args(fillrange, x, y, z)
+    n = length(x)
+    x_fill = [x; x[n:-1:1]; x[1]]
+    y_fill = [y; y[n:-1:1]; x[1]]
+    z_fill = [z; _cycle(fillrange, n:-1:1); z[1]]
+    return PGFPlotsX.Coordiantes(x_fill, y_fill, z_fill)
+end
+# --------------------------------------------------------------------------------------
+function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
+    axis = sp[Symbol(letter,:axis)]
+
+    # turn off scaled ticks
+    push!(opt, "scaled $(letter) ticks" => "false",
+        string(letter,:label) => axis[:guide],
+    )
+
+    # set to supported framestyle
+    framestyle = pgfx_framestyle(sp[:framestyle] == false ? :none : sp[:framestyle])
+
+    # axis label position
+    labelpos = ""
+    if letter == :x && axis[:guide_position] == :top
+        labelpos = "at={(0.5,1)},above,"
+    elseif letter == :y && axis[:guide_position] == :right
+        labelpos = "at={(1,0.5)},below,"
+    end
+
+    # Add label font
+    cstr = plot_color(axis[:guidefontcolor])
+    α = alpha(cstr)
+    push!(opt, string(letter, "label style") => PGFPlotsX.Options(
+        labelpos => nothing,
+        "font" => pgfx_font(axis[:guidefontsize], pgfx_thickness_scaling(sp)),
+        "color" => cstr,
+        "draw opacity" => α,
+        "rotate" => axis[:guidefontrotation],
+        )
+    )
+
+    # flip/reverse?
+    axis[:flip] && push!(opt, "$letter dir" => "reverse")
+
+    # scale
+    scale = axis[:scale]
+    if scale in (:log2, :ln, :log10)
+        push!(opt, string(letter,:mode) => "log")
+        scale == :ln || push!(opt, "log basis $letter" => "$(scale == :log2 ? 2 : 10)")
+    end
+
+    # ticks on or off
+    if axis[:ticks] in (nothing, false, :none) || framestyle == :none
+        push!(opt, "$(letter)majorticks" => "false")
+    end
+
+    # grid on or off
+    if axis[:grid] && framestyle != :none
+        push!(opt, "$(letter)majorgrids" => "true")
+    else
+        push!(opt, "$(letter)majorgrids" => "false")
+    end
+
+    # limits
+    lims = ispolar(sp) && letter == :x ? rad2deg.(axis_limits(sp, :x)) : axis_limits(sp, letter)
+    push!( opt,
+        string(letter,:min) => lims[1],
+        string(letter,:max) => lims[2]
+    )
+
+    if !(axis[:ticks] in (nothing, false, :none, :native)) && framestyle != :none
+        ticks = get_ticks(sp, axis)
+        #pgf plot ignores ticks with angle below 90 when xmin = 90 so shift values
+        tick_values = ispolar(sp) && letter == :x ? [rad2deg.(ticks[1])[3:end]..., 360, 405] : ticks[1]
+        push!(opt, string(letter, "tick") => string("{", join(tick_values,","), "}"))
+        if axis[:showaxis] && axis[:scale] in (:ln, :log2, :log10) && axis[:ticks] == :auto
+            # wrap the power part of label with }
+            tick_labels = Vector{String}(undef, length(ticks[2]))
+            for (i, label) in enumerate(ticks[2])
+                base, power = split(label, "^")
+                power = string("{", power, "}")
+                tick_labels[i] = string(base, "^", power)
+            end
+            push!(opt, string(letter, "ticklabels") => string("{\$", join(tick_labels,"\$,\$"), "\$}"))
+        elseif axis[:showaxis]
+            tick_labels = ispolar(sp) && letter == :x ? [ticks[2][3:end]..., "0", "45"] : ticks[2]
+            if axis[:formatter] in (:scientific, :auto)
+                tick_labels = string.("\$", convert_sci_unicode.(tick_labels), "\$")
+                tick_labels = replace.(tick_labels, Ref("×" => "\\times"))
+            end
+            push!(opt, string(letter, "ticklabels") => string("{", join(tick_labels,","), "}"))
+        else
+            push!(opt, string(letter, "ticklabels") => "{}")
+        end
+        push!(opt, string(letter, "tick align") => (axis[:tick_direction] == :out ? "outside" : "inside"))
+        cstr = plot_color(axis[:tickfontcolor])
+        α = alpha(cstr)
+        push!(opt, string(letter, "ticklabel style") => PGFPlotsX.Options(
+                "font" => pgfx_font(axis[:tickfontsize], pgfx_thickness_scaling(sp)),
+                "color" => cstr,
+                "draw opacity" => α,
+                "rotate" => axis[:tickfontrotation]
+            )
+        )
+        push!(opt, string(letter, " grid style") => pgfx_linestyle(pgfx_thickness_scaling(sp) * axis[:gridlinewidth], axis[:foreground_color_grid], axis[:gridalpha], axis[:gridstyle])
+        )
+    end
+
+    # framestyle
+    if framestyle in (:axes, :origin)
+        axispos = framestyle == :axes ? "left" : "middle"
+        if axis[:draw_arrow]
+            push!(opt, string("axis ", letter, " line") => axispos)
+        else
+            # the * after line disables the arrow at the axis
+            push!(opt, string("axis ", letter, " line*") => axispos)
+        end
+    end
+
+    if framestyle == :zerolines
+        push!(opt, string("extra ", letter, " ticks") => "0")
+        push!(opt, string("extra ", letter, " tick labels") => "")
+        push!(opt, string("extra ", letter, " tick style") => PGFPlotsX.Options(
+                "grid" => "major",
+                "major grid style" => pgfx_linestyle(pgfx_thickness_scaling(sp), axis[:foreground_color_border], 1.0)
+            )
+        )
+    end
+
+    if !axis[:showaxis]
+        push!(opt, "separate axis lines")
+    end
+    if !axis[:showaxis] || framestyle in (:zerolines, :grid, :none)
+        push!(opt, string(letter, " axis line style") => "{draw opacity = 0}")
+    else
+        push!(opt, string(letter, " axis line style") => pgfx_linestyle(pgfx_thickness_scaling(sp), axis[:foreground_color_border], 1.0)
+        )
+    end
+end
+# --------------------------------------------------------------------------------------
+# display calls this and then _display, its called 3 times for plot(1:5)
+# Set the (left, top, right, bottom) minimum padding around the plot area
+# to fit ticks, tick labels, guides, colorbars, etc.
+function _update_min_padding!(sp::Subplot{PGFPlotsXBackend})
+    # TODO: make padding more intelligent
+    # order: right, top, left, bottom
+    sp.minpad = (22mm + sp[:right_margin],
+                 12mm + sp[:top_margin],
+                 2mm + sp[:left_margin],
+                 10mm + sp[:bottom_margin])
+end
+
+function _create_backend_figure(plt::Plot{PGFPlotsXBackend})
+    plt.o = PGFPlotsXPlot()
+end
+
+function _series_added(plt::Plot{PGFPlotsXBackend}, series::Series)
+    plt.o.is_created = false
+end
+
+function _update_plot_object(plt::Plot{PGFPlotsXBackend})
+    plt.o(plt)
+end
+
+for mime in ("application/pdf", "image/png", "image/svg+xml")
+    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{PGFPlotsXBackend})
+        show(io, mime, plt.o.the_plot)
+    end
+end
+
+function _show(io::IO, mime::MIME{Symbol("application/x-tex")}, plt::Plot{PGFPlotsXBackend})
+    PGFPlotsX.print_tex(io, plt.o.the_plot, include_preamble = plt.attr[:tex_output_standalone])
+end
+
+function _display(plt::Plot{PGFPlotsXBackend})
+    display(PGFPlotsX.PGFPlotsXDisplay(), plt.o.the_plot)
+end

src/backends/plotly.jl

@@ -26,7 +26,6 @@ const plotly_remote_file_path = "https://cdn.plot.ly/plotly-latest.min.js"
 # end
 using UUIDs
 
-push!(_initialized_backends, :plotly)
 # ----------------------------------------------------------------
 
 const _plotly_legend_pos = KW(
@@ -114,8 +113,8 @@ function plotly_apply_aspect_ratio(sp::Subplot, plotarea, pcts)
         if aspect_ratio == :equal
             aspect_ratio = 1.0
         end
-        xmin,xmax = axis_limits(sp[:xaxis])
-        ymin,ymax = axis_limits(sp[:yaxis])
+        xmin,xmax = axis_limits(sp, :x)
+        ymin,ymax = axis_limits(sp, :y)
         want_ratio = ((xmax-xmin) / (ymax-ymin)) / aspect_ratio
         parea_ratio = width(plotarea) / height(plotarea)
         if want_ratio > parea_ratio
@@ -174,7 +173,7 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)
 
     ax[:tickangle] = -axis[:rotation]
     ax[:type] = plotly_scale(axis[:scale])
-    lims = axis_limits(axis)
+    lims = axis_limits(sp, letter)
 
     if axis[:ticks] != :native || axis[:lims] != :auto
         ax[:range] = map(scalefunc(axis[:scale]), lims)
@@ -188,7 +187,7 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)
 
         # ticks
         if axis[:ticks] != :native
-            ticks = get_ticks(axis)
+            ticks = get_ticks(sp, axis)
             ttype = ticksType(ticks)
             if ttype == :ticks
                 ax[:tickmode] = "array"
@@ -211,16 +210,16 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)
     ax
 end
 
-function plotly_polaraxis(axis::Axis)
+function plotly_polaraxis(sp::Subplot, axis::Axis)
     ax = KW(
         :visible => axis[:showaxis],
         :showline => axis[:grid],
     )
 
     if axis[:letter] == :x
-        ax[:range] = rad2deg.(axis_limits(axis))
+        ax[:range] = rad2deg.(axis_limits(sp, :x))
     else
-        ax[:range] = axis_limits(axis)
+        ax[:range] = axis_limits(sp, :y)
         ax[:orientation] = -90
     end
 
@@ -283,8 +282,8 @@ function plotly_layout(plt::Plot)
                 ),
             )
         elseif ispolar(sp)
-            plotattributes_out[Symbol("angularaxis$(spidx)")] = plotly_polaraxis(sp[:xaxis])
-            plotattributes_out[Symbol("radialaxis$(spidx)")] = plotly_polaraxis(sp[:yaxis])
+            plotattributes_out[Symbol("angularaxis$(spidx)")] = plotly_polaraxis(sp, sp[:xaxis])
+            plotattributes_out[Symbol("radialaxis$(spidx)")] = plotly_polaraxis(sp, sp[:yaxis])
         else
             plotattributes_out[Symbol("xaxis$(x_idx)")] = plotly_axis(plt, sp[:xaxis], sp)
             # don't allow yaxis to be reupdated/reanchored in a linked subplot
@@ -347,7 +346,7 @@ function plotly_layout(plt::Plot)
 end
 
 function plotly_layout_json(plt::Plot)
-    JSON.json(plotly_layout(plt))
+    JSON.json(plotly_layout(plt), 4)
 end
 
 
@@ -403,7 +402,7 @@ end
 function plotly_data(series::Series, letter::Symbol, data)
     axis = series[:subplot][Symbol(letter, :axis)]
 
-    data = if axis[:ticks] == :native && data != nothing
+    data = if axis[:ticks] == :native && data !== nothing
         plotly_native_data(axis, data)
     else
        data
@@ -415,7 +414,7 @@ function plotly_data(series::Series, letter::Symbol, data)
         plotly_data(data)
     end
 end
-plotly_data(v) = v != nothing ? collect(v) : v
+plotly_data(v) = v !== nothing ? collect(v) : v
 plotly_data(surf::Surface) = surf.surf
 plotly_data(v::AbstractArray{R}) where {R<:Rational} = float(v)
 
@@ -436,7 +435,7 @@ plotly_native_data(axis::Axis, a::Surface) = Surface(plotly_native_data(axis, a.
 
 function plotly_convert_to_datetime(x::AbstractArray, formatter::Function)
     if formatter == datetimeformatter
-        map(xi -> replace(formatter(xi), "T", " "), x)
+        map(xi -> replace(formatter(xi), "T" => " "), x)
     elseif formatter == dateformatter
         map(xi -> string(formatter(xi), " 00:00:00"), x)
     elseif formatter == timeformatter
@@ -454,7 +453,7 @@ function plotly_series(plt::Plot, series::Series)
     st = series[:seriestype]
 
     sp = series[:subplot]
-    clims = get_clims(sp)
+    clims = get_clims(sp, series)
 
     if st == :shape
         return plotly_series_shapes(plt, series, clims)
@@ -469,7 +468,7 @@ function plotly_series(plt::Plot, series::Series)
     plotattributes_out[:showlegend] = should_add_to_legend(series)
 
     if st == :straightline
-        x, y = straightline_data(series)
+        x, y = straightline_data(series, 100)
         z = series[:z]
     else
         x, y, z  = series[:x], series[:y], series[:z]
@@ -529,7 +528,7 @@ function plotly_series(plt::Plot, series::Series)
         else
             plotattributes_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
             plotattributes_out[:opacity] = series[:fillalpha]
-            if series[:fill_z] != nothing
+            if series[:fill_z] !== nothing
                 plotattributes_out[:surfacecolor] = plotly_surface_data(series, series[:fill_z])
             end
             plotattributes_out[:showscale] = hascolorbar(sp)
@@ -584,7 +583,7 @@ function plotly_series_shapes(plt::Plot, series::Series, clims)
     )
 
     x, y = (plotly_data(series, letter, data)
-        for (letter, data) in zip((:x, :y), shape_data(series))
+        for (letter, data) in zip((:x, :y), shape_data(series, 100))
     )
 
     for (i,rng) in enumerate(segments)
@@ -611,11 +610,11 @@ function plotly_series_shapes(plt::Plot, series::Series, clims)
         plotly_hover!(plotattributes_out, _cycle(series[:hover], i))
         plotattributes_outs[i] = plotattributes_out
     end
-    if series[:fill_z] != nothing
+    if series[:fill_z] !== nothing
         push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :fill))
-    elseif series[:line_z] != nothing
+    elseif series[:line_z] !== nothing
         push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :line))
-    elseif series[:marker_z] != nothing
+    elseif series[:marker_z] !== nothing
         push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :marker))
     end
     plotattributes_outs
@@ -631,11 +630,9 @@ function plotly_series_segments(series::Series, plotattributes_base::KW, x, y, z
         (isa(series[:fillrange], AbstractVector) || isa(series[:fillrange], Tuple))
 
     segments = iter_segments(series)
-    plotattributes_outs = Vector{KW}(undef, (hasfillrange ? 2 : 1 ) * length(segments))
+    plotattributes_outs = fill(KW(), (hasfillrange ? 2 : 1 ) * length(segments))
 
     for (i,rng) in enumerate(segments)
-        !isscatter && length(rng) < 2 && continue
-
         plotattributes_out = deepcopy(plotattributes_base)
         plotattributes_out[:showlegend] = i==1 ? should_add_to_legend(series) : false
         plotattributes_out[:legendgroup] = series[:label]
@@ -735,11 +732,11 @@ function plotly_series_segments(series::Series, plotattributes_base::KW, x, y, z
         end
     end
 
-    if series[:line_z] != nothing
+    if series[:line_z] !== nothing
         push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :line))
-    elseif series[:fill_z] != nothing
+    elseif series[:fill_z] !== nothing
         push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :fill))
-    elseif series[:marker_z] != nothing
+    elseif series[:marker_z] !== nothing
         push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :marker))
     end
 
@@ -784,7 +781,7 @@ function plotly_hover!(plotattributes_out::KW, hover)
     # hover text
     if hover in (:none, false)
         plotattributes_out[:hoverinfo] = "none"
-    elseif hover != nothing
+    elseif hover !== nothing
         plotattributes_out[:hoverinfo] = "text"
         plotattributes_out[:text] = hover
     end
@@ -800,13 +797,16 @@ function plotly_series(plt::Plot)
 end
 
 # get json string for a list of dictionaries, each representing the series params
-plotly_series_json(plt::Plot) = JSON.json(plotly_series(plt))
+plotly_series_json(plt::Plot) = JSON.json(plotly_series(plt), 4)
 
 # ----------------------------------------------------------------
 
+html_head(plt::Plot{PlotlyBackend}) = plotly_html_head(plt)
+html_body(plt::Plot{PlotlyBackend}) = plotly_html_body(plt)
+
 const ijulia_initialized = Ref(false)
 
-function html_head(plt::Plot{PlotlyBackend})
+function plotly_html_head(plt::Plot)
     local_file = ("file://" * plotly_local_file_path)
     plotly = use_local_dependencies[] ? local_file : plotly_remote_file_path
     if isijulia() && !ijulia_initialized[]
@@ -822,13 +822,11 @@ function html_head(plt::Plot{PlotlyBackend})
         """)
         ijulia_initialized[] = true
     end
-    # IJulia just needs one initialization
-    isijulia() && return ""
     return "<script src=$(repr(plotly))></script>"
 end
 
-function html_body(plt::Plot{PlotlyBackend}, style = nothing)
-    if style == nothing
+function plotly_html_body(plt, style = nothing)
+    if style === nothing
         w, h = plt[:size]
         style = "width:$(w)px;height:$(h)px;"
     end
@@ -843,17 +841,14 @@ function html_body(plt::Plot{PlotlyBackend}, style = nothing)
     html
 end
 
-function js_body(plt::Plot{PlotlyBackend}, uuid)
+function js_body(plt::Plot, uuid)
     js = """
         PLOT = document.getElementById('$(uuid)');
         Plotly.plot(PLOT, $(plotly_series_json(plt)), $(plotly_layout_json(plt)));
     """
 end
 
-
-# ----------------------------------------------------------------
-
-function _show(io::IO, ::MIME"application/vnd.plotly.v1+json", plot::Plot{PlotlyBackend})
+function plotly_show_js(io::IO, plot::Plot)
     data = []
     for series in plot.series_list
         append!(data, plotly_series(plot, series))
@@ -862,6 +857,17 @@ function _show(io::IO, ::MIME"application/vnd.plotly.v1+json", plot::Plot{Plotly
     JSON.print(io, Dict(:data => data, :layout => layout))
 end
 
+# ----------------------------------------------------------------
+
+function _show(io::IO, ::MIME"application/vnd.plotly.v1+json", plot::Plot{PlotlyBackend})
+    plotly_show_js(io, plot)
+end
+
+
+function _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyBackend})
+    write(io, standalone_html(plt))
+end
+
 
 function _display(plt::Plot{PlotlyBackend})
     standalone_html_window(plt)

src/backends/plotlyjs.jl

@@ -1,78 +1,44 @@
 # https://github.com/sglyon/PlotlyJS.jl
 
-# --------------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
 
-
-function _create_backend_figure(plt::Plot{PlotlyJSBackend})
-    if !isplotnull() && plt[:overwrite_figure] && isa(current().o, PlotlyJS.SyncPlot)
-        PlotlyJS.SyncPlot(PlotlyJS.Plot(), options = current().o.options)
-    else
-        PlotlyJS.plot()
+function plotlyjs_syncplot(plt::Plot{PlotlyJSBackend})
+    plt[:overwrite_figure] && closeall()
+    plt.o = PlotlyJS.plot()
+    traces = PlotlyJS.GenericTrace[]
+    for series_dict in plotly_series(plt)
+        plotly_type = pop!(series_dict, :type)
+        push!(traces, PlotlyJS.GenericTrace(plotly_type; series_dict...))
     end
+    PlotlyJS.addtraces!(plt.o, traces...)
+    layout = plotly_layout(plt)
+    w, h = plt[:size]
+    PlotlyJS.relayout!(plt.o, layout, width = w, height = h)
+    return plt.o
 end
 
+# ------------------------------------------------------------------------------
 
-function _series_added(plt::Plot{PlotlyJSBackend}, series::Series)
-    syncplot = plt.o
-    pdicts = plotly_series(plt, series)
-    for pdict in pdicts
-        typ = pop!(pdict, :type)
-        gt = PlotlyJS.GenericTrace(typ; pdict...)
-        PlotlyJS.addtraces!(syncplot, gt)
-    end
+const _plotlyjs_mimeformats = Dict(
+    "application/pdf" => "pdf",
+    "image/png"       => "png",
+    "image/svg+xml"   => "svg",
+    "image/eps"       => "eps",
+)
+
+for (mime, fmt) in _plotlyjs_mimeformats
+    @eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plotlyjs_syncplot(plt), format = $fmt)
 end
 
-function _series_updated(plt::Plot{PlotlyJSBackend}, series::Series)
-    xsym, ysym = (ispolar(series) ? (:t,:r) : (:x,:y))
-    kw = KW(xsym => (series.plotattributes[:x],), ysym => (series.plotattributes[:y],))
-    z = series[:z]
-    if z != nothing
-        kw[:z] = (isa(z,Surface) ? transpose_z(series, series[:z].surf, false) : z,)
-    end
-    PlotlyJS.restyle!(
-        plt.o,
-        findfirst(isequal(series), plt.series_list),
-        kw
-    )
-end
+# Use the Plotly implementation for json and html:
+_show(io::IO, mime::MIME"application/vnd.plotly.v1+json", plt::Plot{PlotlyJSBackend}) = plotly_show_js(io, plt)
 
+html_head(plt::Plot{PlotlyJSBackend}) = plotly_html_head(plt)
+html_body(plt::Plot{PlotlyJSBackend}) = plotly_html_body(plt)
 
-# ----------------------------------------------------------------
+_show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = write(io, standalone_html(plt))
 
-function _update_plot_object(plt::Plot{PlotlyJSBackend})
-    pdict = plotly_layout(plt)
-    syncplot = plt.o
-    w,h = plt[:size]
-    PlotlyJS.relayout!(syncplot, pdict, width = w, height = h)
-end
-
-
-# ----------------------------------------------------------------
-
-_show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = show(io, MIME("text/html"), plt.o)
-_show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="svg")
-_show(io::IO, ::MIME"image/png", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="png")
-_show(io::IO, ::MIME"application/pdf", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="pdf")
-_show(io::IO, ::MIME"image/eps", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="eps")
-
-function _show(io::IO, m::MIME"application/vnd.plotly.v1+json", plt::Plot{PlotlyJSBackend})
-    show(io, m, plt.o)
-end
-
-
-function write_temp_html(plt::Plot{PlotlyJSBackend})
-    filename = string(tempname(), ".html")
-    savefig(plt, filename)
-    filename
-end
-
-function _display(plt::Plot{PlotlyJSBackend})
-    if get(ENV, "PLOTS_USE_ATOM_PLOTPANE", true) in (true, 1, "1", "true", "yes")
-        display(plt.o)
-    else
-        standalone_html_window(plt)
-    end
-end
+_display(plt::Plot{PlotlyJSBackend}) = display(plotlyjs_syncplot(plt))
 
 @require WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" begin
     function WebIO.render(plt::Plot{PlotlyJSBackend})

src/backends/pyplot.jl

@@ -216,7 +216,7 @@ end
 # ---------------------------------------------------------------------------
 
 function fix_xy_lengths!(plt::Plot{PyPlotBackend}, series::Series)
-    if series[:x] != nothing
+    if series[:x] !== nothing
         x, y = series[:x], series[:y]
         nx, ny = length(x), length(y)
         if !isa(get(series.plotattributes, :z, nothing), Surface) && nx != ny
@@ -399,7 +399,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
 
     # handle zcolor and get c/cmap
     needs_colorbar = hascolorbar(sp)
-    vmin, vmax = clims = get_clims(sp)
+    vmin, vmax = clims = get_clims(sp, series)
 
     # Dict to store extra kwargs
     if st == :wireframe
@@ -434,7 +434,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
         if maximum(series[:linewidth]) > 0
             segments = iter_segments(series)
             # TODO: check LineCollection alternative for speed
-            # if length(segments) > 1 && (any(typeof(series[attr]) <: AbstractVector for attr in (:fillcolor, :fillalpha)) || series[:fill_z] != nothing) && !(typeof(series[:linestyle]) <: AbstractVector)
+            # if length(segments) > 1 && (any(typeof(series[attr]) <: AbstractVector for attr in (:fillcolor, :fillalpha)) || series[:fill_z] !== nothing) && !(typeof(series[:linestyle]) <: AbstractVector)
             #     # multicolored line segments
             #     n = length(segments)
             #     # segments = Array(Any,n)
@@ -467,7 +467,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                     handle = ax."plot"((arg[rng] for arg in xyargs)...;
                         label = i == 1 ? series[:label] : "",
                         zorder = series[:series_plotindex],
-                        color = py_color(get_linecolor(series, clims, i), get_linealpha(series, i)),
+                        color = py_color(single_color(get_linecolor(series, clims, i)), get_linealpha(series, i)),
                         linewidth = py_thickness_scale(plt, get_linewidth(series, i)),
                         linestyle = py_linestyle(st, get_linestyle(series, i)),
                         solid_capstyle = "round",
@@ -478,7 +478,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
             # end
 
             a = series[:arrow]
-            if a != nothing && !is3d(st)  # TODO: handle 3d later
+            if a !== nothing && !is3d(st)  # TODO: handle 3d later
                 if typeof(a) != Arrow
                     @warn("Unexpected type for arrow: $(typeof(a))")
                 else
@@ -508,7 +508,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
     if series[:markershape] != :none && st in (:path, :scatter, :path3d,
                                           :scatter3d, :steppre, :steppost,
                                           :bar)
-        markercolor = if any(typeof(series[arg]) <: AVec for arg in (:markercolor, :markeralpha)) || series[:marker_z] != nothing
+        markercolor = if any(typeof(series[arg]) <: AVec for arg in (:markercolor, :markeralpha)) || series[:marker_z] !== nothing
             # py_color(plot_color.(get_markercolor.(series, clims, eachindex(x)), get_markeralpha.(series, eachindex(x))))
             [py_color(plot_color(get_markercolor(series, clims, i), get_markeralpha(series, i))) for i in eachindex(x)]
         else
@@ -672,7 +672,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
         push!(handles, handle)
 
         # contour fills
-        if series[:fillrange] != nothing
+        if series[:fillrange] !== nothing
             handle = ax."contourf"(x, y, z, levelargs...;
                 label = series[:label],
                 zorder = series[:series_plotindex] + 0.5,
@@ -691,7 +691,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
             end
             z = transpose_z(series, z)
             if st == :surface
-                if series[:fill_z] != nothing
+                if series[:fill_z] !== nothing
                     # the surface colors are different than z-value
                     extrakw[:facecolors] = py_shading(series[:fillcolor], transpose_z(series, series[:fill_z].surf))
                     extrakw[:shade] = false
@@ -756,7 +756,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
             cmap = py_colormap(cgrad([:black, :white])),
             vmin = 0.0,
             vmax = 1.0,
-            extent = (xmin, xmax, ymax, ymin)
+            extent = (xmin-0.5, xmax+0.5, ymax+0.5, ymin-0.5)
         )
         push!(handles, handle)
 
@@ -830,7 +830,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
 
     # handle area filling
     fillrange = series[:fillrange]
-    if fillrange != nothing && st != :contour
+    if fillrange !== nothing && st != :contour
         for (i, rng) in enumerate(iter_segments(series))
             f, dim1, dim2 = if isvertical(series)
                 :fill_between, x[rng], y[rng]
@@ -862,16 +862,16 @@ end
 
 # --------------------------------------------------------------------------
 
-function py_set_lims(ax, axis::Axis)
+function py_set_lims(ax, sp::Subplot, axis::Axis)
     letter = axis[:letter]
-    lfrom, lto = axis_limits(axis)
+    lfrom, lto = axis_limits(sp, letter)
     getproperty(ax, Symbol("set_", letter, "lim"))(lfrom, lto)
 end
 
 function py_set_ticks(ax, ticks, letter)
     ticks == :auto && return
     axis = getproperty(ax, Symbol(letter,"axis"))
-    if ticks == :none || ticks == nothing || ticks == false
+    if ticks == :none || ticks === nothing || ticks == false
         kw = KW()
         for dir in (:top,:bottom,:left,:right)
             kw[dir] = kw[Symbol(:label,dir)] = false
@@ -891,7 +891,7 @@ function py_set_ticks(ax, ticks, letter)
     end
 end
 
-function py_compute_axis_minval(axis::Axis)
+function py_compute_axis_minval(sp::Subplot, axis::Axis)
     # compute the smallest absolute value for the log scale's linear threshold
     minval = 1.0
     sps = axis.sps
@@ -905,13 +905,13 @@ function py_compute_axis_minval(axis::Axis)
     end
 
     # now if the axis limits go to a smaller abs value, use that instead
-    vmin, vmax = axis_limits(axis)
+    vmin, vmax = axis_limits(sp, axis[:letter])
     minval = NaNMath.min(minval, abs(vmin), abs(vmax))
 
     minval
 end
 
-function py_set_scale(ax, axis::Axis)
+function py_set_scale(ax, sp::Subplot, axis::Axis)
     scale = axis[:scale]
     letter = axis[:letter]
     scale in supported_scales() || return @warn("Unhandled scale value in pyplot: $scale")
@@ -927,7 +927,7 @@ function py_set_scale(ax, axis::Axis)
         elseif scale == :log10
             10
         end
-        kw[Symbol(:linthresh,letter)] = NaNMath.min(1e-16, py_compute_axis_minval(axis))
+        kw[Symbol(:linthresh,letter)] = NaNMath.max(1e-16, py_compute_axis_minval(sp, axis))
         "symlog"
     end
     func(arg; kw...)
@@ -978,7 +978,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
     # update subplots
     for sp in plt.subplots
         ax = sp.o
-        if ax == nothing
+        if ax === nothing
             continue
         end
 
@@ -1018,12 +1018,12 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                 kw[:ticks] = locator
                 kw[:format] = formatter
                 kw[:boundaries] = vcat(0, kw[:values] + 0.5)
-            elseif any(colorbar_series[attr] != nothing for attr in (:line_z, :fill_z, :marker_z))
+            elseif any(colorbar_series[attr] !== nothing for attr in (:line_z, :fill_z, :marker_z))
                 cmin, cmax = get_clims(sp)
                 norm = pycolors."Normalize"(vmin = cmin, vmax = cmax)
-                f = if colorbar_series[:line_z] != nothing
+                f = if colorbar_series[:line_z] !== nothing
                     py_linecolormap
-                elseif colorbar_series[:fill_z] != nothing
+                elseif colorbar_series[:fill_z] !== nothing
                     py_fillcolormap
                 else
                     py_markercolormap
@@ -1092,12 +1092,12 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
             if axis[:guide_position] != :auto && letter != :z
                 pyaxis."set_label_position"(axis[:guide_position])
             end
-            py_set_scale(ax, axis)
-            axis[:ticks] != :native ? py_set_lims(ax, axis) : nothing
+            py_set_scale(ax, sp, axis)
+            axis[:ticks] != :native ? py_set_lims(ax, sp, axis) : nothing
             if ispolar(sp) && letter == :y
                 ax."set_rlabel_position"(90)
             end
-            ticks = sp[:framestyle] == :none ? nothing : get_ticks(axis)
+            ticks = sp[:framestyle] == :none ? nothing : get_ticks(sp, axis)
             # don't show the 0 tick label for the origin framestyle
             if sp[:framestyle] == :origin && length(ticks) > 1
                 ticks[2][ticks[1] .== 0] .= ""
@@ -1132,11 +1132,12 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
         # showaxis
         if !sp[:xaxis][:showaxis]
             kw = KW()
+            if ispolar(sp)
+                ax.spines["polar"].set_visible(false)
+            end
             for dir in (:top, :bottom)
-                if ispolar(sp)
-                    ax."spines"."polar"."set_visible"(false)
-                else
-                    getproperty(ax.spines, dir).set_visible(false)
+                if !ispolar(sp)
+                    ax.spines[string(dir)].set_visible(false)
                 end
                 kw[dir] = kw[Symbol(:label,dir)] = false
             end
@@ -1146,7 +1147,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
             kw = KW()
             for dir in (:left, :right)
                 if !ispolar(sp)
-                    getproperty(ax.spines, dir).set_visible(false)
+                    ax.spines[string(dir)].set_visible(false)
                 end
                 kw[dir] = kw[Symbol(:label,dir)] = false
             end
@@ -1185,7 +1186,7 @@ end
 # to fit ticks, tick labels, guides, colorbars, etc.
 function _update_min_padding!(sp::Subplot{PyPlotBackend})
     ax = sp.o
-    ax == nothing && return sp.minpad
+    ax === nothing && return sp.minpad
     plotbb = py_bbox(ax)
 
     # TODO: this should initialize to the margin from sp.attr
@@ -1227,7 +1228,7 @@ end
 
 function py_add_annotations(sp::Subplot{PyPlotBackend}, x, y, val)
     ax = sp.o
-    ax."annotate"(val, xy = (x,y), zorder = 999)
+    ax."annotate"(val, xy = (x,y), zorder = 999, annotation_clip = false)
 end
 
 
@@ -1241,7 +1242,8 @@ function py_add_annotations(sp::Subplot{PyPlotBackend}, x, y, val::PlotText)
         verticalalignment = val.font.valign == :vcenter ? "center" : string(val.font.valign),
         rotation = val.font.rotation,
         size = py_thickness_scale(sp.plt, val.font.pointsize),
-        zorder = 999
+        zorder = 999,
+        annotation_clip = false
     )
 end
 
@@ -1288,29 +1290,29 @@ py_legend_bbox(pos) = pos
 
 function py_add_legend(plt::Plot, sp::Subplot, ax)
     leg = sp[:legend]
-    clims = get_clims(sp)
     if leg != :none
         # gotta do this to ensure both axes are included
         labels = []
         handles = []
         for series in series_list(sp)
             if should_add_to_legend(series)
+                clims = get_clims(sp, series)
                 # add a line/marker and a label
-                push!(handles, if series[:seriestype] == :shape || series[:fillrange] != nothing
+                push!(handles, if series[:seriestype] == :shape || series[:fillrange] !== nothing
                     pypatches."Patch"(
-                        edgecolor = py_color(get_linecolor(series, clims), get_linealpha(series)),
-                        facecolor = py_color(get_fillcolor(series, clims), get_fillalpha(series)),
+                        edgecolor = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
+                        facecolor = py_color(single_color(get_fillcolor(series, clims)), get_fillalpha(series)),
                         linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
                         linestyle = py_linestyle(series[:seriestype], get_linestyle(series))
                     )
                 elseif series[:seriestype] in (:path, :straightline, :scatter)
                     PyPlot.plt."Line2D"((0,1),(0,0),
-                        color = py_color(get_linecolor(series, clims), get_linealpha(series)),
+                        color = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
                         linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
                         linestyle = py_linestyle(:path, get_linestyle(series)),
                         marker = py_marker(first(series[:markershape])),
-                        markeredgecolor = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series)),
-                        markerfacecolor = series[:marker_z] == nothing ? py_color(get_markercolor(series, clims), get_markeralpha(series)) : py_color(series[:markercolor][0.5])
+                        markeredgecolor = py_color(single_color(get_markerstrokecolor(series)), get_markerstrokealpha(series)),
+                        markerfacecolor = py_color(single_color(get_markercolor(series, clims)), get_markeralpha(series))
                     )
                 else
                     series[:serieshandle][1]
@@ -1334,10 +1336,13 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
             frame = leg."get_frame"()
             frame."set_linewidth"(py_thickness_scale(plt, 1))
             leg."set_zorder"(1000)
-            sp[:legendtitle] != nothing && leg."set_title"(sp[:legendtitle])
+            if sp[:legendtitle] !== nothing
+                leg."set_title"(sp[:legendtitle])
+                PyPlot.plt."setp"(leg."get_title"(), color = py_color(sp[:legendtitlefontcolor]), family = sp[:legendtitlefontfamily], fontsize = py_thickness_scale(plt, sp[:legendtitlefontsize]))
+            end
 
             for txt in leg."get_texts"()
-                PyPlot.plt."setp"(txt, color = py_color(sp[:legendfontcolor]), family = sp[:legendfontfamily])
+                PyPlot.plt."setp"(txt, color = py_color(sp[:legendfontcolor]), family = sp[:legendfontfamily], fontsize = py_thickness_scale(plt, sp[:legendfontsize]))
             end
         end
     end
@@ -1351,7 +1356,7 @@ end
 function _update_plot_object(plt::Plot{PyPlotBackend})
     for sp in plt.subplots
         ax = sp.o
-        ax == nothing && return
+        ax === nothing && return
         figw, figh = sp.plt[:size]
         figw, figh = figw*px, figh*px
         pcts = bbox_to_pcts(sp.plotarea, figw, figh)

src/backends/unicodeplots.jl

@@ -27,8 +27,8 @@ function rebuildUnicodePlot!(plt::Plot, width, height)
     for sp in plt.subplots
         xaxis = sp[:xaxis]
         yaxis = sp[:yaxis]
-        xlim =  axis_limits(xaxis)
-        ylim =  axis_limits(yaxis)
+        xlim =  axis_limits(sp, :x)
+        ylim =  axis_limits(sp, :y)
 
         # make vectors
         xlim = [xlim[1], xlim[2]]

src/components.jl

@@ -529,7 +529,7 @@ function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
     # end
 
     # @show msw msh
-    if anns != nothing && anns.baseshape != nothing
+    if anns !== nothing && anns.baseshape !== nothing
         # we use baseshape to overwrite the markershape attribute
         # with a list of custom shapes for each
         msw,msh = anns.scalefactor
@@ -568,7 +568,7 @@ mutable struct EachAnn
 end
 
 function Base.iterate(ea::EachAnn, i = 1)
-    if ea.anns == nothing || isempty(ea.anns.strs) || i > length(ea.y)
+    if ea.anns === nothing || isempty(ea.anns.strs) || i > length(ea.y)
         return nothing
     end
 
@@ -794,7 +794,7 @@ end
 
 @deprecate curve_points coords
 
-coords(curve::BezierCurve, n::Integer = 30; range = [0,1]) = map(curve, range(range..., stop=n, length=50))
+coords(curve::BezierCurve, n::Integer = 30; range = [0,1]) = map(curve, Base.range(range..., length=n))
 
 # build a BezierCurve which leaves point p vertically upwards and arrives point q vertically upwards.
 # may create a loop if necessary.  Assumes the view is [0,1]

src/examples.jl

@@ -165,7 +165,7 @@ PlotExample("Marker types",
 ),
 
 PlotExample("Bar",
-    "x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)",
+    "`x` is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)",
     [:(begin
         bar(randn(99))
     end)]
@@ -238,12 +238,12 @@ build with the method `text(string, attr...)`, which wraps font and color attrib
 """,
     [:(begin
 y = rand(10)
-plot(y, annotations = (3,y[3],text("this is #3",:left)), leg=false)
-annotate!([(5, y[5], text("this is #5",16,:red,:center)),
-          (10, y[10], text("this is #10",:right,20,"courier"))])
+plot(y, annotations = (3,y[3], Plots.text("this is #3",:left)), leg=false)
+annotate!([(5, y[5], Plots.text("this is #5",16,:red,:center)),
+          (10, y[10], Plots.text("this is #10",:right,20,"courier"))])
 scatter!(range(2, stop=8, length=6), rand(6), marker=(50,0.2,:orange),
          series_annotations = ["series","annotations","map","to","series",
-                               text("data",:green)])
+                               Plots.text("data",:green)])
     end)]
 ),
 
@@ -305,7 +305,8 @@ PlotExample("3D",
 
 PlotExample("DataFrames",
     "Plot using DataFrame column symbols.",
-    [:(begin
+    [:(using StatsPlots), # can't be inside begin block because @df gets expanded first
+     :(begin
         import RDatasets
         iris = RDatasets.dataset("datasets", "iris")
         @df iris scatter(:SepalLength, :SepalWidth, group=:Species,
@@ -354,7 +355,8 @@ PlotExample("Layouts, margins, label rotation, title location",
 
 PlotExample("Boxplot and Violin series recipes",
     "",
-    [:(begin
+    [:(using StatsPlots), # can't be inside begin block because @df gets expanded first
+     :(begin
         import RDatasets
         singers = RDatasets.dataset("lattice", "singer")
         @df singers violin(:VoicePart, :Height, line = 0, fill = (0.2, :blue))
@@ -454,6 +456,49 @@ see: http://stackoverflow.com/a/37732384/5075246
     end)]
 ),
 
+PlotExample("Ribbons",
+    """
+    Ribbons can be added to lines via the `ribbon` keyword;
+    you can pass a tuple of arrays (upper and lower bounds),
+    a single Array (for symmetric ribbons), a Function, or a number.
+    """,
+    [:(begin
+        plot(
+            plot(0:10; ribbon = (LinRange(0, 2, 10), LinRange(0, 1, 10))),
+            plot(0:10; ribbon = 0:0.5:5),
+            plot(0:10; ribbon = sqrt),
+            plot(0:10; ribbon = 1),
+        )
+    end)]
+),
+
+PlotExample("Histogram2D (complex values)",
+    "",
+    [:(begin
+        n = 10_000
+        x = exp.(0.1randn(n) .+ randn(n).*(im))
+        histogram2d(x, nbins=(20,40), show_empty_bins=true,
+                    normed=true, aspect_ratio=1)
+    end)]
+),
+
+PlotExample("Unconnected lines using `missing` or `NaN`",
+"""
+Missing values and non-finite values, including `NaN`, are not plotted.
+Instead, lines are separated into segments at these values.
+""",
+    [:(begin
+        x,y = [1,2,2,1,1], [1,2,1,2,1]
+        plot(
+              plot([rand(5); NaN; rand(5); NaN; rand(5)]),
+              plot([1,missing,2,3], marker=true),
+              plot([x; NaN; x.+2], [y; NaN; y.+1], arrow=2),
+              plot([1, 2+3im, Inf, 4im, 3, -Inf*im, 0, 3+3im], marker=true),
+              legend=false
+        )
+    end)]
+),
+
 ]
 
 # Some constants for PlotDocs and PlotReferenceImages
@@ -461,7 +506,7 @@ _animation_examples = [2, 30]
 _backend_skips = Dict(
     :gr => [25, 30],
     :pyplot => [25, 30],
-    :plotlyjs => [2, 21, 25, 30, 31],
+    :plotlyjs => [2, 21, 24, 25, 30, 31],
     :pgfplots => [2, 5, 6, 10, 16, 20, 22, 23, 25, 28, 30],
 )
 
@@ -475,7 +520,12 @@ function test_examples(pkgname::Symbol, idx::Int; debug = false, disp = true)
   @info("Testing plot: $pkgname:$idx:$(_examples[idx].header)")
   backend(pkgname)
   backend()
-  map(eval, _examples[idx].exprs)
+
+  # prevent leaking variables (esp. functions) directly into Plots namespace
+  m = Module(:PlotExampleModule)
+  Base.eval(m, :(using Plots))
+  map(exprs -> Base.eval(m, exprs), _examples[idx].exprs)
+
   plt = current()
   if disp
     gui(plt)
@@ -496,7 +546,7 @@ function test_examples(pkgname::Symbol; debug = false, disp = true, sleep = noth
   Plots._debugMode.on = debug
   plts = Dict()
   for i in 1:length(_examples)
-    only != nothing && !(i in only) && continue
+    only !== nothing && !(i in only) && continue
     i in skip && continue
     try
       plt = test_examples(pkgname, i, debug=debug, disp=disp)
@@ -505,7 +555,7 @@ function test_examples(pkgname::Symbol; debug = false, disp = true, sleep = noth
       # TODO: put error info into markdown?
       @warn("Example $pkgname:$i:$(_examples[i].header) failed with: $ex")
     end
-    if sleep != nothing
+    if sleep !== nothing
         Base.sleep(sleep)
     end
   end

src/ijulia.jl

@@ -20,7 +20,10 @@ frontends like jupyterlab and nteract.
 _ijulia__extra_mime_info!(plt::Plot, out::Dict) = out
 
 function _ijulia__extra_mime_info!(plt::Plot{PlotlyJSBackend}, out::Dict)
-    out["application/vnd.plotly.v1+json"] = JSON.lower(plt.o)
+    out["application/vnd.plotly.v1+json"] = Dict(
+        :data => plotly_series(plt),
+        :layout => plotly_layout(plt)
+    )
     out
 end
 

src/init.jl

@@ -28,12 +28,53 @@ function __init__()
         insert!(Base.Multimedia.displays, findlast(x -> x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1, PlotsDisplay())
     end)
 
-    @require HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" include(joinpath(@__DIR__, "backends", "hdf5.jl"))
-    @require InspectDR = "d0351b0e-4b05-5898-87b3-e2a8edfddd1d" include(joinpath(@__DIR__, "backends", "inspectdr.jl"))
-    @require PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa" include(joinpath(@__DIR__, "backends", "pgfplots.jl"))
-    @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include(joinpath(@__DIR__, "backends", "plotlyjs.jl"))
-    @require PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" include(joinpath(@__DIR__, "backends", "pyplot.jl"))
-    @require UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" include(joinpath(@__DIR__, "backends", "unicodeplots.jl"))
+    @require HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" begin
+        fn = joinpath(@__DIR__, "backends", "hdf5.jl")
+        include(fn)
+        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
+    end
+
+    @require InspectDR = "d0351b0e-4b05-5898-87b3-e2a8edfddd1d" begin
+        fn = joinpath(@__DIR__, "backends", "inspectdr.jl")
+        include(fn)
+        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
+    end
+
+    @require PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa" begin
+        fn = joinpath(@__DIR__, "backends", "pgfplots.jl")
+        include(fn)
+        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
+    end
+
+    @require ORCA = "47be7bcc-f1a6-5447-8b36-7eeeff7534fd" begin
+        fn = joinpath(@__DIR__, "backends", "orca.jl")
+        include(fn)
+        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
+    end
+
+    @require PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925" begin
+        fn = joinpath(@__DIR__, "backends", "pgfplotsx.jl")
+        include(fn)
+        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
+    end
+
+    @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" begin
+        fn = joinpath(@__DIR__, "backends", "plotlyjs.jl")
+        include(fn)
+        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
+    end
+
+    @require PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" begin
+        fn = joinpath(@__DIR__, "backends", "pyplot.jl")
+        include(fn)
+        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
+    end
+
+    @require UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" begin
+        fn = joinpath(@__DIR__, "backends", "unicodeplots.jl")
+        include(fn)
+        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
+    end
 
     @require IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" begin
         if IJulia.inited

src/layouts.jl

@@ -107,11 +107,10 @@ function resolve_mixed(mix::MixedMeasures, sp::Subplot, letter::Symbol)
     if mix.len != 0mm
         f = (letter == :x ? width : height)
         totlen = f(plotarea(sp))
-        @show totlen
         pct += mix.len / totlen
     end
     if pct != 0
-        amin, amax = axis_limits(sp[Symbol(letter,:axis)])
+        amin, amax = axis_limits(sp, letter)
         xy += pct * (amax-amin)
     end
     xy
@@ -218,6 +217,7 @@ bottompad(layout::AbstractLayout) = 0mm
 # this is the parent of the top-level layout
 struct RootLayout <: AbstractLayout end
 
+Base.show(io::IO, layout::RootLayout) = Base.show_default(io, layout)
 Base.parent(::RootLayout) = nothing
 parent_bbox(::RootLayout) = defaultbox
 bbox(::RootLayout) = defaultbox

src/output.jl

@@ -72,6 +72,7 @@ const _savemap = Dict(
     "eps" => eps,
     "tex" => tex,
     "html" => html,
+    "tikz" => tex,
   )
 
 function getExtension(fn::AbstractString)
@@ -103,7 +104,7 @@ type is inferred from the file extension. All backends support png and pdf
 file types, some also support svg, ps, eps, html and tex.
 """
 function savefig(plt::Plot, fn::AbstractString)
-
+  fn = abspath(expanduser(fn))
   # get the extension
   local ext
   try
@@ -197,9 +198,12 @@ for mime in ("text/plain", "text/html", "image/png", "image/eps", "image/svg+xml
           prepare_output(plt)
           _show(io, m, plt)
         end
+        return nothing
     end
 end
 
+Base.show(io::IO, m::MIME"application/prs.juno.plotpane+html", plt::Plot) = showjuno(io, MIME("text/html"), plt)
+
 # default text/plain for all backends
 _show(io::IO, ::MIME{Symbol("text/plain")}, plt::Plot) = show(io, plt)
 
@@ -228,15 +232,16 @@ closeall() = closeall(backend())
 # Atom PlotPane
 # ---------------------------------------------------------
 function showjuno(io::IO, m, plt)
-    sz = plt[:size]
+    sz = collect(plt[:size])
     dpi = plt[:dpi]
     thickness_scaling = plt[:thickness_scaling]
 
     jsize = get(io, :juno_plotsize, [400, 500])
+    jratio = get(io, :juno_dpi_ratio, 1)
 
     scale = minimum(jsize[i] / sz[i] for i in 1:2)
-    plt[:size] = (s * scale for s in sz)
-    plt[:dpi] = Plots.DPI
+    plt[:size] = [s * scale for s in sz]
+    plt[:dpi] = jratio*Plots.DPI
     plt[:thickness_scaling] *= scale
 
     prepare_output(plt)
@@ -257,4 +262,6 @@ function _showjuno(io::IO, m::MIME"image/svg+xml", plt)
   end
 end
 
+Base.showable(::MIME"application/prs.juno.plotpane+html", plt::Plot) = showable(MIME"text/html"(), plt)
+
 _showjuno(io::IO, m, plt) = _show(io, m, plt)

src/pipeline.jl

@@ -126,7 +126,7 @@ function _preprocess_userrecipe(kw::KW)
     end
 
     # convert a ribbon into a fillrange
-    if get(kw, :ribbon, nothing) != nothing
+    if get(kw, :ribbon, nothing) !== nothing
         make_fillrange_from_ribbon(kw)
     end
     return
@@ -136,7 +136,7 @@ function _add_errorbar_kw(kw_list::Vector{KW}, kw::KW)
     # handle error bars by creating new recipedata data... these will have
     # the same recipedata index as the recipedata they are copied from
     for esym in (:xerror, :yerror)
-        if get(kw, esym, nothing) != nothing
+        if get(kw, esym, nothing) !== nothing
             # we make a copy of the KW and apply an errorbar recipe
             errkw = copy(kw)
             errkw[:seriestype] = esym
@@ -227,7 +227,7 @@ function _plot_setup(plt::Plot, plotattributes::KW, kw_list::Vector{KW})
 
     # handle inset subplots
     insets = plt[:inset_subplots]
-    if insets != nothing
+    if insets !== nothing
         if !(typeof(insets) <: AVec)
             insets = [insets]
         end

src/plot.jl

@@ -4,7 +4,7 @@ mutable struct CurrentPlot
 end
 const CURRENT_PLOT = CurrentPlot(nothing)
 
-isplotnull() = CURRENT_PLOT.nullableplot == nothing
+isplotnull() = CURRENT_PLOT.nullableplot === nothing
 
 """
     current()

src/precompile.jl

@@ -1,3 +1,873 @@
 function _precompile_()
     ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
+    precompile(Tuple{typeof(Plots.gr_draw_marker), Float64, Float64, Int64, Plots.Shape})
+    precompile(Tuple{typeof(Plots.gr_display), Plots.Subplot{Plots.GRBackend}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.legendtitlefont), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.shape_data), Plots.Series, Int64})
+    precompile(Tuple{typeof(Plots.preprocessArgs!), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.replaceAlias!), Base.Dict{Symbol, Any}, Symbol, Base.Dict{Symbol, Symbol}})
+    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Float64, Int64, Plots.Shape})
+    precompile(Tuple{typeof(Plots.preprocessArgs!), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.warnOnUnsupported), Plots.GRBackend, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.legendtitlefont), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.layout_args), Base.Dict{Symbol, Any}, Int64})
+    precompile(Tuple{typeof(Plots.contour_levels), Plots.Series, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{typeof(Base.log), Int64}})
+    precompile(Tuple{typeof(Plots.color_or_nothing!), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.warnOnUnsupported_args), Plots.GRBackend, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.gr_display), Plots.Subplot{Plots.GRBackend}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.get_minor_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Tuple{Array{Float64, 1}, Array{Any, 1}}})
+    precompile(Tuple{typeof(Plots.gr_text), Float64, Float64, String})
+    precompile(Tuple{typeof(Plots._update_subplot_colors), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}})
+    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64, Array{Plots.Plot{T} where T<:RecipesBase.AbstractBackend, 1}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Float64, Float64, Plots.Shape})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.axis_drawing_info), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Int64}})
+    precompile(Tuple{typeof(Plots.get_markercolor), Plots.Series, Float64, Float64, Int64})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{}})
+    precompile(Tuple{typeof(Plots.gr_xaxis_height), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.layout_args), Base.Dict{Symbol, Any}, Int64})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Array{T, 1} where T, 1}}})
+    precompile(Tuple{typeof(Plots.iscontour), Plots.Series})
+    precompile(Tuple{typeof(Plots.__init__)})
+    precompile(Tuple{typeof(Plots.gr_set_gradient), PlotUtils.ColorGradient})
+    precompile(Tuple{typeof(Plots.get_clims), Plots.Series})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}})
+    precompile(Tuple{typeof(Plots.gr_draw_colorbar), Plots.GRColorbar, Plots.Subplot{Plots.GRBackend}, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64, Array{Plots.Plot{T} where T<:RecipesBase.AbstractBackend, 1}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
+    precompile(Tuple{typeof(Plots.get_minor_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Tuple{Array{Float64, 1}, Array{String, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.Spy}})
+    precompile(Tuple{typeof(Plots.default_should_widen), Plots.Axis})
+    precompile(Tuple{typeof(Plots.add_layout_pct!), Base.Dict{Symbol, Any}, Expr, Int64, Int64})
+    precompile(Tuple{typeof(Plots.gr_set_linecolor), PlotUtils.ColorGradient})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}})
+    precompile(Tuple{typeof(Plots.getxy), Plots.Plot{Plots.GRBackend}, Int64})
+    precompile(Tuple{typeof(Plots.recompute_lengths), Array{Measures.Measure, 1}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}})
+    precompile(Tuple{typeof(Plots.has_attribute_segments), Plots.Series})
+    precompile(Tuple{typeof(Plots.gr_set_viewport_cmap), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.gr_polaraxes), Int64, Float64, Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Float64})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{}})
+    precompile(Tuple{typeof(Plots.is_attr_supported), Symbol})
+    precompile(Tuple{typeof(Plots._backend_instance), Symbol})
+    precompile(Tuple{typeof(Plots.axis_drawing_info), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._backend_instance), Symbol})
+    precompile(Tuple{typeof(Plots._plots_defaults)})
+    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Int64, 1}}})
+    precompile(Tuple{typeof(Plots.pie_labels), Plots.Subplot{Plots.GRBackend}, Plots.Series})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._preprocess_barlike), Base.Dict{Symbol, Any}, Array{Int64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.link_axes!), Plots.Axis, Plots.Axis})
+    precompile(Tuple{typeof(Plots.showaxis), Symbol, Symbol})
+    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, Base.StepRange{Int64, Int64}, Symbol})
+    precompile(Tuple{typeof(Plots._heatmap_edges), Array{Float64, 1}, Bool})
+    precompile(Tuple{typeof(Plots.convertToAnyVector), Int64, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.gr_get_color), Plots.Series})
+    precompile(Tuple{typeof(Plots._cbar_unique), Array{Int64, 1}, String})
+    precompile(Tuple{typeof(Plots.gr_viewport_from_bbox), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
+    precompile(Tuple{typeof(Plots.ensure_gradient!), Base.Dict{Symbol, Any}, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots._cbar_unique), Array{Nothing, 1}, String})
+    precompile(Tuple{typeof(Plots.isvertical), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.hasgrid), Symbol, Symbol})
+    precompile(Tuple{typeof(Plots._cbar_unique), Array{Symbol, 1}, String})
+    precompile(Tuple{typeof(Plots.titlefont), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.gr_set_yticks_font), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.GRBackend}, Symbol, Bool, Bool})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Plots.Surface{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy}})
+    precompile(Tuple{typeof(Plots.series_annotations_shapes!), Plots.Series, Symbol})
+    precompile(Tuple{typeof(Plots.aliasesAndAutopick), Base.Dict{Symbol, Any}, Symbol, Base.Dict{Symbol, Symbol}, Array{Symbol, 1}, Int64})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}})
+    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Char})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, typeof(Base.log), Int64}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}})
+    precompile(Tuple{typeof(Plots.default_should_widen), Plots.Axis})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy}})
+    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, String, Symbol})
+    precompile(Tuple{typeof(Plots.warnOnUnsupported_scales), Plots.GRBackend, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._update_series_attributes!), Base.Dict{Symbol, Any}, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._plot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Function, 1}, Int64}})
+    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, String})
+    precompile(Tuple{typeof(Plots.get_minor_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Tuple{Array{Float64, 1}, Array{String, 1}}})
+    precompile(Tuple{typeof(Plots.iscontour), Plots.Series})
+    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, Tuple{Int64, Int64}, Symbol})
+    precompile(Tuple{typeof(Plots.gr_display), Plots.Plot{Plots.GRBackend}, String})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{String, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.reset_extrema!), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.gr_inqtext), Int64, Int64, String})
+    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._cbar_unique), Array{PlotUtils.ColorGradient, 1}, String})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Int64}})
+    precompile(Tuple{typeof(Plots.convert_to_polar), Array{Float64, 1}, Array{Float64, 1}, Tuple{Int64, Float64}})
+    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.GridLayout})
+    precompile(Tuple{typeof(Plots._process_seriesrecipe), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Function, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.ispolar), Plots.Series})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.gr_xaxis_height), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{typeof(Base.log), Int64}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.UnitRange{Int64}, Array{Float64, 1}, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Int64})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.process_annotation), Plots.Subplot{Plots.GRBackend}, Int64, Float64, Plots.PlotText, Plots.Font})
+    precompile(Tuple{typeof(Plots._add_defaults!), Base.Dict{Symbol, Any}, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Int64})
+    precompile(Tuple{typeof(Plots.gr_get_ticks_size), Tuple{Array{Float64, 1}, Array{Any, 1}}, Int64})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}})
+    precompile(Tuple{typeof(Plots.colorbar_style), Plots.Series})
+    precompile(Tuple{typeof(Plots._process_seriesrecipe), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._add_markershape), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.make_steps), Array{Float64, 1}, Symbol})
+    precompile(Tuple{typeof(Plots.wraptuple), Int64})
+    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{Union{Base.Missing, Int64}, 1}})
+    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{Array{T, 1} where T, 1}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._bin_centers), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.gr_yaxis_width), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._pick_default_backend)})
+    precompile(Tuple{typeof(Plots.gr_legend_pos), Plots.Subplot{Plots.GRBackend}, Float64, Float64})
+    precompile(Tuple{typeof(Plots.get_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis})
+    precompile(Tuple{typeof(Plots.get_clims), Plots.Series})
+    precompile(Tuple{typeof(Plots.gr_draw_marker), Float64, Float64, Int64, Symbol})
+    precompile(Tuple{typeof(Plots._hist_edges), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Tuple{Int64, Int64}})
+    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Float64, Int64, Symbol})
+    precompile(Tuple{typeof(Plots.straightline_data), Plots.Series, Int64})
+    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}})
+    precompile(Tuple{typeof(Plots.is_marker_supported), Symbol})
+    precompile(Tuple{typeof(Plots.straightline_data), Tuple{Int64, Int64}, Tuple{Float64, Float64}, Array{Float64, 1}, Array{Float64, 1}, Int64})
+    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.get_markerstrokecolor), Plots.Series, Int64})
+    precompile(Tuple{typeof(Plots._preprocess_userrecipe), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Int64})
+    precompile(Tuple{typeof(Plots.is_seriestype_supported), Plots.GRBackend, Symbol})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}})
+    precompile(Tuple{typeof(Plots._update_subplot_periphery), Plots.Subplot{Plots.GRBackend}, Array{Any, 1}})
+    precompile(Tuple{typeof(Plots.gr_set_line), Float64, Symbol, ColorTypes.RGBA{Float64}})
+    precompile(Tuple{typeof(Plots.make_steps), Array{Int64, 1}, Symbol})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{Function, 1}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.filter_data), Base.UnitRange{Int64}, Array{Int64, 1}})
+    precompile(Tuple{typeof(Plots.is3d), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots._update_series_attributes!), Base.Dict{Symbol, Any}, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Float64, Int64, Bool})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Float64})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Plots.Spy}})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
+    precompile(Tuple{typeof(Plots.recompute_lengths), Array{Measures.Measure, 1}})
+    precompile(Tuple{typeof(Plots._preprocess_barlike), Base.Dict{Symbol, Any}, Array{Float64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Int64})
+    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Plots.OHLC{T} where T<:Real, 1}}})
+    precompile(Tuple{typeof(Plots.create_grid_curly), Expr})
+    precompile(Tuple{typeof(Plots._replace_linewidth), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._cbar_unique), Array{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, 1}, String})
+    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.ignorenan_extrema), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.frame), Plots.Animation})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{}})
+    precompile(Tuple{typeof(Plots.xlims), Int64})
+    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Base.StepRange{Int64, Int64}})
+    precompile(Tuple{typeof(Plots._prepare_subplot), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.get_fillcolor), Plots.Series, Float64, Float64, Int64})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Base.Dict{Symbol, Any}, Int64, Bool})
+    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.GRBackend}, Symbol, Bool, Bool})
+    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Array{Any, 1}})
+    precompile(Tuple{typeof(Plots.filter_data), Array{Float64, 1}, Array{Int64, 1}})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.gr_lims), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Bool, Nothing})
+    precompile(Tuple{typeof(Plots.make_steps), Base.UnitRange{Int64}, Symbol})
+    precompile(Tuple{typeof(Plots.reset_extrema!), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
+    precompile(Tuple{typeof(Plots.gr_set_markercolor), ColorTypes.RGBA{Float64}})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Array{Any, 1}, Int64, Bool})
+    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Float64, Float64, Int64})
+    precompile(Tuple{typeof(Plots.gr_inqtext), Int64, Int64, String})
+    precompile(Tuple{typeof(Plots._add_errorbar_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.GRBackend}, Bool})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Plots.PortfolioComposition}})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Nothing, Int64, Bool})
+    precompile(Tuple{typeof(Plots.get_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis})
+    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Base.UnitRange{Int64}})
+    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.gr_set_line), Int64, Symbol, ColorTypes.RGBA{Float64}})
+    precompile(Tuple{typeof(Plots.gr_get_color), Plots.Series})
+    precompile(Tuple{typeof(Plots.fg_color), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{Array{Float64, 1}, 1}})
+    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Int64, Int64, Plots.Shape})
+    precompile(Tuple{typeof(Plots.shape_data), Plots.Series, Int64})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.UnitRange{Int64}})
+    precompile(Tuple{typeof(Plots._prepare_annotations), Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.should_add_to_legend), Plots.Series})
+    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.is_scale_supported), Plots.GRBackend, Symbol})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout, Array{Measures.Length{:mm, Float64}, 1}})
+    precompile(Tuple{typeof(Plots._series_index), Base.Dict{Symbol, Any}, Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._process_plotrecipe), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}, Array{Base.Dict{Symbol, Any}, 1}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Base.Complex{Float64}, 1}}})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Tuple{Int64, Int64}, Int64, Bool})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.Spy}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.warnOnUnsupported_args), Plots.GRBackend, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Union{Base.Missing, Int64}, 1}}})
+    precompile(Tuple{typeof(Plots.backend), Symbol})
+    precompile(Tuple{typeof(Plots.ignorenan_extrema), Base.StepRange{Int64, Int64}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Float64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
+    precompile(Tuple{typeof(Plots.is_marker_supported), Plots.GRBackend, Symbol})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.convert_sci_unicode), String})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Measures.Length{:mm, Float64}, Int64, Bool})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Int64, Int64, Bool})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.UnitRange{Int64}}})
+    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots.build_layout), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
+    precompile(Tuple{typeof(Plots._cycle), Array{String, 1}, Int64})
+    precompile(Tuple{typeof(Plots.ensure_gradient!), Base.Dict{Symbol, Any}, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots.make_fillrange_side), Array{Float64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.setxy!), Plots.Plot{Plots.GRBackend}, Tuple{Array{Float64, 1}, Array{Float64, 1}}, Int64})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Bool, Int64, Bool})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.link_subplots), Array{RecipesBase.AbstractLayout, 1}, Symbol})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Symbol, Int64, Bool})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, String, Int64, Bool})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol, Bool})
+    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{Function, 1}})
+    precompile(Tuple{typeof(Plots._update_subplot_periphery), Plots.Subplot{Plots.GRBackend}, Array{Any, 1}})
+    precompile(Tuple{typeof(Plots.ignorenan_extrema), Array{Float64, 2}})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Int64})
+    precompile(Tuple{typeof(Plots.process_fillrange), Int64, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.make_fillrange_side), Array{Float64, 1}, Int64})
+    precompile(Tuple{typeof(Plots.iter_segments), Plots.Series})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}})
+    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.GridLayout})
+    precompile(Tuple{typeof(Plots.like_histogram), Symbol})
+    precompile(Tuple{typeof(Plots.get_series_color), ColorTypes.RGBA{Float64}, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots._replace_linewidth), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.get_markercolor), Plots.Series, Float64, Float64, Int64})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.update_inset_bboxes!), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Float64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
+    precompile(Tuple{typeof(Plots.gr_text_size), String})
+    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Function, 1}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
+    precompile(Tuple{typeof(Plots._process_seriesrecipe), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}})
+    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout, Array{Measures.Length{:mm, Float64}, 1}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{typeof(Base.log), Int64}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.slice_arg), ColorTypes.RGBA{Float64}, Int64})
+    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Int64, Bool})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}})
+    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Float64, Float64, Int64})
+    precompile(Tuple{typeof(Plots._cycle), Base.StepRange{Int64, Int64}, Int64})
+    precompile(Tuple{typeof(Plots.ignorenan_maximum), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.warnOnUnsupported), Plots.GRBackend, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Float64, Int64, Bool})
+    precompile(Tuple{typeof(Plots.isvertical), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.warnOnUnsupported_scales), Plots.GRBackend, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Base.Missing})
+    precompile(Tuple{typeof(Plots.gr_fill_viewport), Array{Float64, 1}, ColorTypes.RGBA{Float64}})
+    precompile(Tuple{typeof(Plots._process_plotrecipe), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}, Array{Base.Dict{Symbol, Any}, 1}})
+    precompile(Tuple{typeof(Plots.create_grid_curly), Expr})
+    precompile(Tuple{typeof(Plots._add_markershape), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._add_defaults!), Base.Dict{Symbol, Any}, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Int64})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Bool})
+    precompile(Tuple{typeof(Plots._add_smooth_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.title!), String})
+    precompile(Tuple{typeof(Plots.prepare_output), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Float64})
+    precompile(Tuple{typeof(Plots.has_attribute_segments), Plots.Series})
+    precompile(Tuple{typeof(Plots.supported_markers)})
+    isdefined(Plots, Symbol("#kw##histogram2d")) && precompile(Tuple{getfield(Plots, Symbol("#kw##histogram2d")), NamedTuple{(:nbins, :show_empty_bins, :normed, :aspect_ratio), Tuple{Tuple{Int64, Int64}, Bool, Bool, Int64}}, typeof(Plots.histogram2d), Array{Base.Complex{Float64}, 1}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}})
+    precompile(Tuple{typeof(Plots.tickfont), Plots.Axis})
+    precompile(Tuple{typeof(Plots.gr_get_ticks_size), Tuple{Array{Float64, 1}, Array{String, 1}}, Int64})
+    precompile(Tuple{typeof(Plots._update_clims), Float64, Float64, Int64, Int64})
+    precompile(Tuple{typeof(Plots.wand_edges), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Plots.Surface{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Int64, Bool})
+    precompile(Tuple{typeof(Plots._preprocess_userrecipe), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{typeof(Base.log), Int64}})
+    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.GRBackend}, Symbol})
+    precompile(Tuple{typeof(Plots.is_marker_supported), Symbol})
+    precompile(Tuple{typeof(Plots._update_axis), Plots.Axis, Base.Dict{Symbol, Any}, Symbol, Int64})
+    precompile(Tuple{typeof(Plots._subplot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Plots.Stroke})
+    precompile(Tuple{typeof(Plots.calc_num_subplots), Plots.GridLayout})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.extendSeriesData), Array{Float64, 1}, Float64})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, ColorTypes.RGBA{Float64}})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Int64, Int64, Bool})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Plots.Shape})
+    precompile(Tuple{typeof(Plots.is_style_supported), Plots.GRBackend, Symbol})
+    precompile(Tuple{typeof(Plots.compute_gridsize), Int64, Int64, Int64})
+    precompile(Tuple{typeof(Plots.gr_set_fill), ColorTypes.RGBA{Float64}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}})
+    precompile(Tuple{typeof(Plots._subplot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
+    precompile(Tuple{typeof(Plots.compute_xyz), Array{String, 1}, Array{Float64, 1}, Nothing})
+    precompile(Tuple{typeof(Plots.is3d), Symbol})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Symbol, Int64, Bool})
+    precompile(Tuple{typeof(Plots._update_axis_links), Plots.Plot{Plots.GRBackend}, Plots.Axis, Symbol})
+    precompile(Tuple{typeof(Plots._update_series_attributes!), Base.Dict{Symbol, Any}, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.xlims), Int64})
+    precompile(Tuple{typeof(Plots._preprocess_binlike), Base.Dict{Symbol, Any}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Array{String, 1}, Int64})
+    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.GRBackend}, Symbol})
+    precompile(Tuple{typeof(Plots.supported_styles)})
+    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Function, 1}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._cycle), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int64})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Array{Int64, 1}, Int64})
+    precompile(Tuple{typeof(Plots._add_errorbar_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Nothing})
+    precompile(Tuple{typeof(Plots.arrow), Int64})
+    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{String, 1}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{}})
+    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Int64})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.filter_data!), Base.Dict{Symbol, Any}, Array{Int64, 1}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Float64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots.add_layout_pct!), Base.Dict{Symbol, Any}, Expr, Int64, Int64})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{}})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Array{Any, 1}, Int64, Bool})
+    precompile(Tuple{typeof(Plots.gr_get_ticks_size), Tuple{Array{Float64, 1}, Array{String, 1}}, Int64})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Base.Dict{Symbol, Any}, Int64, Bool})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, String, Int64, Bool})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Int64, 1}})
+    precompile(Tuple{typeof(Plots.iter_segments), Array{Float64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.gr_set_yticks_font), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.gr_viewport_from_bbox), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.like_surface), Symbol})
+    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64})
+    precompile(Tuple{typeof(Plots._prepare_subplot), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.convertLegendValue), Bool})
+    precompile(Tuple{typeof(Plots.get_series_color), Symbol, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Measures.Length{:mm, Float64}, Int64, Bool})
+    precompile(Tuple{typeof(Plots.get_series_color), PlotUtils.ColorGradient, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Bool, Int64, Bool})
+    precompile(Tuple{typeof(Plots.link_axes!), Plots.GridLayout, Symbol})
+    precompile(Tuple{typeof(Plots.process_ribbon), Int64, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Tuple{Int64, Int64}, Int64, Bool})
+    precompile(Tuple{typeof(Plots._update_axis_colors), Plots.Axis})
+    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Nothing, Int64, Bool})
+    precompile(Tuple{typeof(Plots.gr_text), Float64, Float64, String})
+    precompile(Tuple{typeof(Plots.update_inset_bboxes!), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.backend)})
+    precompile(Tuple{typeof(Plots.get_series_color), ColorTypes.RGBA{Float64}, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots._add_the_series), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._pick_default_backend)})
+    precompile(Tuple{typeof(Plots.trueOrAllTrue), typeof(identity), Array{Symbol, 2}})
+    precompile(Tuple{typeof(Plots.nanappend!), Array{Float64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Int64}})
+    precompile(Tuple{typeof(Plots.get_linealpha), Plots.Series, Int64})
+    precompile(Tuple{typeof(Plots.get_xy), Plots.OHLC{Float64}, Int64, Float64})
+    precompile(Tuple{typeof(Plots.tickfont), Plots.Axis})
+    precompile(Tuple{typeof(Plots.legendfont), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.all3D), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.get_series_color), Symbol, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots.fakedata), Int64, Int64})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Int64, Bool})
+    precompile(Tuple{typeof(Plots.get_series_color), ColorTypes.RGBA{Float64}, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots.get_series_color), PlotUtils.ColorGradient, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots.convertLegendValue), Symbol})
+    precompile(Tuple{typeof(Plots.gr_yaxis_width), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Bool})
+    precompile(Tuple{typeof(Plots.link_axes!), Plots.Axis, Plots.Axis})
+    precompile(Tuple{typeof(Plots.gr_set_transparency), ColorTypes.RGBA{Float64}, Float64})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Bool, Symbol})
+    precompile(Tuple{typeof(Plots.should_add_to_legend), Plots.Series})
+    precompile(Tuple{typeof(Plots.gr_set_xticks_font), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.guidefont), Plots.Axis})
+    precompile(Tuple{typeof(Plots.gr_set_textcolor), ColorTypes.RGBA{Float64}})
+    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Float64, Symbol})
+    isdefined(Plots, Symbol("#kw##scatter!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter!")), NamedTuple{(:zcolor, :m, :ms, :lab), Tuple{Array{Float64, 1}, Tuple{Symbol, Float64, Plots.Stroke}, Array{Float64, 1}, String}}, typeof(Plots.scatter!), Array{Float64, 1}})
+    isdefined(Plots, Symbol("#kw##gr_set_font")) && precompile(Tuple{getfield(Plots, Symbol("#kw##gr_set_font")), NamedTuple{(:halign, :valign, :rotation), Tuple{Symbol, Symbol, Int64}}, typeof(Plots.gr_set_font), Plots.Font})
+    precompile(Tuple{typeof(Plots.backend), Symbol})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
+    isdefined(Plots, Symbol("#kw##contour")) && precompile(Tuple{getfield(Plots, Symbol("#kw##contour")), NamedTuple{(:fill,), Tuple{Bool}}, typeof(Plots.contour), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
+    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Array{T, 1} where T, 1}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.iter_segments), Base.UnitRange{Int64}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.allAlphas), Int64})
+    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Int64})
+    precompile(Tuple{typeof(Plots.is_marker_supported), Plots.Shape})
+    precompile(Tuple{typeof(Plots.series_annotations), Array{Any, 1}})
+    precompile(Tuple{typeof(Plots.gr_set_fillcolor), ColorTypes.RGBA{Float64}})
+    precompile(Tuple{typeof(Plots.colorbar_style), Plots.Series})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol, Array{Float64, 1}, Symbol, Tuple{Int64, Int64}})
+    isdefined(Plots, Symbol("#kw##hline!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##hline!")), NamedTuple{(:line,), Tuple{Tuple{Int64, Symbol, Float64, Array{Symbol, 2}}}}, typeof(Plots.hline!), Array{Float64, 2}})
+    precompile(Tuple{typeof(Plots._display), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.font), String, Int})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.gr_polyline), Array{Float64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.isijulia)})
+    precompile(Tuple{typeof(Plots.gr_colorbar_colors), Plots.Series, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots.iter_segments), Array{Float64, 1}, Array{Float64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.plotarea!), Plots.GridLayout, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Array{Symbol, 2}, Int64})
+    precompile(Tuple{typeof(Plots._transform_ticks), Base.StepRange{Int64, Int64}})
+    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Float64})
+    precompile(Tuple{typeof(Plots.compute_xyz), Nothing, Nothing, Nothing})
+    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64})
+    precompile(Tuple{typeof(Plots.command_idx), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._plot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.yaxis!), String, Symbol})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.gr_set_xticks_font), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._hist_edges), Tuple{Array{Float64, 1}}, Symbol})
+    precompile(Tuple{typeof(Plots.rowsize), Expr})
+    isdefined(Plots, Symbol("#kw##pie")) && precompile(Tuple{getfield(Plots, Symbol("#kw##pie")), NamedTuple{(:title, :l), Tuple{String, Float64}}, typeof(Plots.pie), Array{String, 1}, Int})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.ohlc), Array{Plots.OHLC{T} where T<:Real, 1}})
+    precompile(Tuple{typeof(Plots.get_fillalpha), Plots.Series, Int64})
+    precompile(Tuple{typeof(Plots._add_smooth_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._cycle), Int64, Base.StepRange{Int64, Int64}})
+    precompile(Tuple{typeof(Plots.create_grid), Symbol})
+    precompile(Tuple{typeof(Plots.gr_text_size), String, Int64})
+    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, typeof(identity)})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Array{Float64, 1}, 1}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.gr_text_size), String, Int64})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Array{Symbol, 2}, Symbol})
+    precompile(Tuple{typeof(Plots.compute_xyz), Nothing, Array{Union{Base.Missing, Float64}, 1}, Nothing})
+    precompile(Tuple{typeof(Plots.gr_contour_levels), Plots.Series, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.slice_arg), Tuple{Int64, Int64}, Int64})
+    precompile(Tuple{typeof(Plots.straightline_data), Plots.Series, Int64})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.UnitRange{Int64}, Array{Float64, 1}, Tuple{Float64, Float64}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, typeof(identity), Nothing})
+    precompile(Tuple{typeof(Plots.compute_xyz), Array{String, 1}, Array{String, 1}, Plots.Surface{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.layout_args), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Int64, 1}, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Nothing})
+    precompile(Tuple{typeof(Plots.layout_args), Tuple{Int64, Int64}})
+    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.GRBackend}, Bool})
+    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, Array{Float64, 1}, Nothing})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.stroke), Int64, Int})
+    precompile(Tuple{typeof(Plots.slice_arg), Array{Symbol, 2}, Int64})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Float64})
+    isdefined(Plots, Symbol("#kw##heatmap")) && precompile(Tuple{getfield(Plots, Symbol("#kw##heatmap")), NamedTuple{(:aspect_ratio,), Tuple{Int64}}, typeof(Plots.heatmap), Array{String, 1}, Int})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, String, Int64})
+    precompile(Tuple{typeof(Plots.is3d), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}})
+    precompile(Tuple{typeof(Plots.wraptuple), Nothing})
+    precompile(Tuple{typeof(Plots.gr_set_viewport_polar)})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.wrap_surfaces), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._update_axis_links), Plots.Plot{Plots.GRBackend}, Plots.Axis, Symbol})
+    precompile(Tuple{typeof(Plots._show), Base.IOStream, Base.Multimedia.MIME{Symbol("image/png")}, Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Int64}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.is_marker_supported), Plots.Stroke})
+    precompile(Tuple{typeof(Plots.inline), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.UnitRange{Int64}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
+    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.get_xy), Array{Plots.OHLC{T} where T<:Real, 1}, Base.UnitRange{Int64}})
+    precompile(Tuple{typeof(Plots._update_clims), Float64, Float64, Float64, Float64})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
+    precompile(Tuple{typeof(Plots._update_subplot_colors), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Float64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots._override_seriestype_check), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.get_minor_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Nothing})
+    precompile(Tuple{typeof(Plots.process_ribbon), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.gr_update_colorbar!), Plots.GRColorbar, Plots.Series})
+    precompile(Tuple{typeof(Plots.is_attr_supported), Plots.GRBackend, Symbol})
+    precompile(Tuple{typeof(Plots.autopick), Array{ColorTypes.RGBA{Float64}, 1}, Int64})
+    precompile(Tuple{typeof(Plots.ensure_gradient!), Base.Dict{Symbol, Any}, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots._expand_subplot_extrema), Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.Spy}})
+    precompile(Tuple{typeof(Plots._cycle), Array{Plots.Subplot{T} where T<:RecipesBase.AbstractBackend, 1}, Int64})
+    isdefined(Plots, Symbol("#kw##scatter")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter")), NamedTuple{(:framestyle, :title, :color, :layout, :label, :markerstrokewidth, :ticks), Tuple{Array{Symbol, 2}, Array{String, 2}, Base.ReshapedArray{Int64, 2, Base.UnitRange{Int64}, Tuple{}}, Int64, String, Int64, Base.UnitRange{Int64}}}, typeof(Plots.scatter), Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}})
+    precompile(Tuple{typeof(Plots._update_axis), Plots.Axis, Base.Dict{Symbol, Any}, Symbol, Int64})
+    precompile(Tuple{typeof(Plots.frame), Plots.Animation, Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.get_markeralpha), Plots.Series, Int64})
+    precompile(Tuple{typeof(Plots._binbarlike_baseline), Float64, Symbol})
+    precompile(Tuple{typeof(Plots._cycle), Array{Any, 1}, Int64})
+    precompile(Tuple{typeof(Plots._add_the_series), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.GRBackend}, Plots.Series})
+    precompile(Tuple{typeof(Plots._transform_ticks), Base.UnitRange{Int64}})
+    precompile(Tuple{typeof(Plots.create_grid_vcat), Expr})
+    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Bool})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Float64, Float64, Tuple{Float64, Float64}, Int64})
+    precompile(Tuple{typeof(Plots.ylims), Int64})
+    precompile(Tuple{typeof(Plots.fg_color), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.slice_arg), Base.StepRange{Int64, Int64}, Int64})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots._hist_edges), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Int64})
+    precompile(Tuple{typeof(Plots.extractGroupArgs), Array{String, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.get_linestyle), Plots.Series})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
+    isdefined(Plots, Symbol("#kw##gr_polyline")) && precompile(Tuple{getfield(Plots, Symbol("#kw##gr_polyline")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Array{Float64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Int64})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Plots.Plot{Plots.GRBackend}, Int64})
+    precompile(Tuple{typeof(Plots.get_linealpha), Plots.Series})
+    precompile(Tuple{typeof(Plots.slice_arg), Tuple{Int64, Float64}, Int64})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}})
+    precompile(Tuple{typeof(Plots.gr_set_gradient), Plots.Series})
+    precompile(Tuple{typeof(Plots.get_markerstrokealpha), Plots.Series, Int64})
+    precompile(Tuple{typeof(Plots._hist_edge), Tuple{Array{Float64, 1}}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots._display), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.allStyles), Int64})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:lims,), Tuple{Tuple{Int64, Float64}}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.get_series_color), Int64, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}})
+    precompile(Tuple{typeof(Plots.addExtension), String, String})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.color_or_nothing!), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.xlims), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.gr_set_transparency), ColorTypes.RGBA{Float64}})
+    precompile(Tuple{typeof(Plots.guidefont), Plots.Axis})
+    precompile(Tuple{typeof(Plots.bottom), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
+    precompile(Tuple{typeof(Plots.is_2tuple), Int64})
+    precompile(Tuple{typeof(Plots.unzip), Array{Tuple{Float64, Float64, Float64}, 1}})
+    precompile(Tuple{typeof(Plots.prepare_output), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.png), Plots.Plot{Plots.GRBackend}, String})
+    isdefined(Plots, Symbol("#kw##gr_set_font")) && precompile(Tuple{getfield(Plots, Symbol("#kw##gr_set_font")), NamedTuple{(:halign, :valign, :rotation), Tuple{Symbol, Symbol, Int64}}, typeof(Plots.gr_set_font), Plots.Font})
+    precompile(Tuple{typeof(Plots.compute_xyz), Nothing, Array{Float64, 1}, Nothing})
+    precompile(Tuple{typeof(Plots.slice_arg), Array{Measures.Length{:mm, Float64}, 2}, Int64})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots._update_axis_colors), Plots.Axis})
+    precompile(Tuple{typeof(Plots.iter_segments), Array{Int64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.ispolar), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, ColorTypes.RGBA{Float64}, Symbol})
+    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Float64})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}})
+    precompile(Tuple{typeof(Plots.wraptuple), Float64})
+    precompile(Tuple{typeof(Plots.process_fillrange), Nothing, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._replace_markershape), Array{Symbol, 2}})
+    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, Array{Float64, 1}, Plots.Surface{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.replaceAliases!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Symbol}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}})
+    precompile(Tuple{typeof(Plots.vline!), Array{Int64, 1}})
+    precompile(Tuple{typeof(Plots.get_linewidth), Plots.Series})
+    precompile(Tuple{typeof(Plots.series_annotations), Nothing})
+    precompile(Tuple{typeof(Plots.ignorenan_maximum), Base.UnitRange{Int64}})
+    precompile(Tuple{typeof(Plots.gr_polyline), Array{Float64, 1}, Array{Float64, 1}, typeof(identity)})
+    precompile(Tuple{typeof(Plots.is_seriestype_supported), Symbol})
+    precompile(Tuple{typeof(Plots.ignorenan_minimum), Base.UnitRange{Int64}})
+    precompile(Tuple{typeof(Plots.slice_arg), Array{ColorTypes.RGBA{Float64}, 2}, Int64})
+    precompile(Tuple{typeof(Plots.gr_set_font), Plots.Font})
+    precompile(Tuple{typeof(Plots.convert_sci_unicode), String})
+    precompile(Tuple{typeof(Plots.get_linewidth), Plots.Series, Int64})
+    isdefined(Plots, Symbol("#kw##scatter!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter!")), NamedTuple{(:markersize, :c), Tuple{Int64, Symbol}}, typeof(Plots.scatter!), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.process_ribbon), typeof(identity), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.is_2tuple), Tuple{Int64, Int64}})
+    precompile(Tuple{typeof(Plots.slice_arg), Int64, Int64})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Plots.GridLayout, Int64})
+    precompile(Tuple{typeof(Plots.is_2tuple), Tuple{Int64, Float64}})
+    precompile(Tuple{typeof(Plots.slice_arg), Symbol, Int64})
+    precompile(Tuple{typeof(Plots._cycle), Float64, Int64})
+    precompile(Tuple{typeof(Plots.attr), Plots.EmptyLayout, Symbol})
+    precompile(Tuple{typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots._prepare_subplot), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.process_ribbon), Nothing, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.bbox!), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
+    precompile(Tuple{typeof(Plots.create_grid), Expr})
+    isdefined(Plots, Symbol("#kw##histogram2d")) && precompile(Tuple{getfield(Plots, Symbol("#kw##histogram2d")), NamedTuple{(:nbins,), Tuple{Int64}}, typeof(Plots.histogram2d), Array{Float64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.right), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
+    precompile(Tuple{typeof(Plots.slice_arg), String, Int64})
+    precompile(Tuple{typeof(Plots.prepareSeriesData), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Symbol, Int64, Symbol, Float64}})
+    precompile(Tuple{typeof(Plots.get_fillcolor), Plots.Series, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots.legendfont), Plots.Subplot{Plots.GRBackend}})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid, :ticks), Tuple{Bool, Nothing}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Plots.Spy}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.aliasesAndAutopick), Base.Dict{Symbol, Any}, Symbol, Base.Dict{Symbol, Symbol}, Array{Symbol, 1}, Int64})
+    precompile(Tuple{typeof(Plots.slice_arg), Bool, Int64})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.titlefont), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.link_axes!), Plots.GridLayout, Symbol})
+    precompile(Tuple{typeof(Plots.slice_arg), Float64, Int64})
+    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Symbol, Int64})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:scale, :guide), Tuple{Symbol, String}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.GRBackend}})
+    isdefined(Plots, Symbol("#kw##scatter!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter!")), NamedTuple{(:marker, :series_annotations), Tuple{Tuple{Int64, Float64, Symbol}, Array{Any, 1}}}, typeof(Plots.scatter!), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
+    precompile(Tuple{typeof(Plots._preprocess_barlike), Base.Dict{Symbol, Any}, Base.UnitRange{Int64}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, Array{Float64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.gr_lims), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Bool, Nothing})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Array{Symbol, 2}, Int64, Float64, Plots.Stroke}})
+    precompile(Tuple{typeof(Plots.process_annotation), Plots.Subplot{Plots.GRBackend}, Int64, Float64, Plots.PlotText})
+    isdefined(Plots, Symbol("#kw##portfoliocomposition")) && precompile(Tuple{getfield(Plots, Symbol("#kw##portfoliocomposition")), NamedTuple{(:labels,), Tuple{Array{String, 2}}}, typeof(Plots.portfoliocomposition), Array{Float64, 2}, Int})
+    precompile(Tuple{typeof(Plots.plotarea!), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
+    precompile(Tuple{typeof(Plots.autopick_ignore_none_auto), Array{Symbol, 1}, Int64})
+    isdefined(Plots, Symbol("#kw##scatter")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter")), NamedTuple{(:m, :lab, :bg, :xlim, :ylim), Tuple{Tuple{Int64, Symbol}, Array{String, 2}, Symbol, Tuple{Int64, Int64}, Tuple{Int64, Int64}}}, typeof(Plots.scatter), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
+    precompile(Tuple{typeof(Plots.get_axis), Plots.Subplot{Plots.GRBackend}, Symbol})
+    precompile(Tuple{typeof(Plots.ylims), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.labelfunc), Symbol, Plots.GRBackend})
+    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Plots.Shape, Symbol})
+    precompile(Tuple{typeof(Plots.attr), Plots.EmptyLayout, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots.bbox!), Plots.GridLayout, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
+    precompile(Tuple{typeof(Plots.series_annotations_shapes!), Plots.Series, Symbol})
+    precompile(Tuple{typeof(Plots.widen), Float64, Float64, Symbol})
+    precompile(Tuple{typeof(Plots.link_axes!), Array{RecipesBase.AbstractLayout, 1}, Symbol})
+    precompile(Tuple{typeof(Plots.filter_data), Nothing, Array{Int64, 1}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.annotate!), Array{Tuple{Int64, Float64, Plots.PlotText}, 1}})
+    precompile(Tuple{typeof(Plots._prepare_annotations), Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Array{String, 1}})
+    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Int64, 1}, Tuple{Float64, Float64}, Int64})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Int64}})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:foreground_color_grid, :grid, :gridalpha, :gridstyle, :gridlinewidth), Tuple{ColorTypes.RGBA{Float64}, Bool, Float64, Symbol, Int64}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots._update_subplot_colors), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.nobigs), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.slice_arg), Base.UnitRange{Int64}, Int64})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, ColorTypes.RGB{Float64}, Int64})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol, Bool})
+    precompile(Tuple{typeof(Plots.locate_annotation), Plots.Subplot{Plots.GRBackend}, Int64, Float64, Plots.PlotText})
+    precompile(Tuple{typeof(Plots.tovec), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Float64, Symbol}})
+    precompile(Tuple{typeof(Plots._cycle), ColorTypes.RGBA{Float64}, Int64})
+    precompile(Tuple{typeof(Plots.is_seriestype_supported), Symbol})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Symbol, Float64, Array{Symbol, 2}}})
+    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Tuple{Float64, Float64}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Float64, Array{Symbol, 2}, Int64}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Symbol, Symbol, Int64, Float64}})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:lims,), Tuple{Tuple{Int64, Int64}}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, typeof(identity), Nothing})
+    precompile(Tuple{typeof(Plots._filter_input_data!), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Union{Base.Missing, Number}, 1}})
+    precompile(Tuple{typeof(Plots.supported_markers), Plots.GRBackend})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.iter_segments), Plots.Series})
+    precompile(Tuple{typeof(Plots.wraptuple), Bool})
+    precompile(Tuple{typeof(Plots.text), String, Int64, Symbol, Symbol})
+    precompile(Tuple{typeof(Plots.rightpad), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Int32, 1}})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:lims,), Tuple{Tuple{Int64, Int64}}}, typeof(Plots.attr!), Plots.Axis})
+    isdefined(Plots, Symbol("#@layout")) && precompile(Tuple{getfield(Plots, Symbol("#@layout")), LineNumberNode, Module, Expr})
+    precompile(Tuple{typeof(Plots.gr_set_transparency), ColorTypes.RGBA{Float64}, Nothing})
+    precompile(Tuple{typeof(Plots.get_linestyle), Plots.Series, Int64})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:lims, :flip, :ticks, :guide), Tuple{Tuple{Int64, Int64}, Bool, Base.StepRange{Int64, Int64}, String}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.leftpad), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.xgrid!), Plots.Plot{Plots.GRBackend}, Symbol, Int})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:guide,), Tuple{String}}, typeof(Plots.attr!), Plots.Axis})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:formatter,), Tuple{Symbol}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Int64, 1}})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:rotation,), Tuple{Int64}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.text), String, Symbol, Int64, Int})
+    precompile(Tuple{typeof(Plots.supported_styles), Plots.GRBackend})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:flip,), Tuple{Bool}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Int64, 1}})
+    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{String, Tuple{Int64, Int64}, Base.StepRange{Int64, Int64}, Symbol}})
+    precompile(Tuple{typeof(Plots.is_2tuple), Tuple{Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots.bottompad), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.slice_arg), Base.ReshapedArray{Int64, 2, Base.UnitRange{Int64}, Tuple{}}, Int64})
+    precompile(Tuple{typeof(Plots.contour), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
+    precompile(Tuple{typeof(Plots.ignorenan_extrema), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
+    precompile(Tuple{typeof(Plots.font), String, Int})
+    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
+    precompile(Tuple{typeof(Plots.prepare_output), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Base.UnitRange{Int64}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{String, Symbol}})
+    precompile(Tuple{typeof(Plots.calc_num_subplots), Plots.EmptyLayout})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Symbol}})
+    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Float64, Float64, Symbol})
+    precompile(Tuple{typeof(Plots.gr_set_line), Int64, Symbol, PlotUtils.ColorGradient})
+    precompile(Tuple{typeof(Plots._scale_adjusted_values), Type{Float64}, Array{Float64, 1}, Symbol})
+    precompile(Tuple{typeof(Plots._process_userrecipe), Plots.Plot{Plots.GRBackend}, Array{Base.Dict{Symbol, Any}, 1}, RecipesBase.RecipeData})
+    precompile(Tuple{typeof(Plots.layout_args), Int64})
+    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.GRBackend}, Symbol})
+    precompile(Tuple{typeof(Plots.toppad), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots._expand_subplot_extrema), Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Symbol})
+    precompile(Tuple{typeof(Plots.trueOrAllTrue), typeof(Plots.is3d), Symbol})
+    precompile(Tuple{typeof(Plots.gui), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Float64, Symbol, Plots.Stroke}})
+    precompile(Tuple{typeof(Plots.ylims), Int64})
+    precompile(Tuple{typeof(Plots._cycle), Plots.Shape, Int64})
+    precompile(Tuple{typeof(Plots.rowsize), Symbol})
+    precompile(Tuple{typeof(Plots.create_grid_vcat), Expr})
+    precompile(Tuple{typeof(Plots.gr_update_colorbar!), Plots.GRColorbar, Plots.Series})
+    precompile(Tuple{typeof(Plots.font), Symbol, Int})
+    precompile(Tuple{typeof(Plots._transform_ticks), Nothing})
+    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Array{Int64, 1}})
+    precompile(Tuple{typeof(Plots.get_fillalpha), Plots.Series})
+    precompile(Tuple{typeof(Plots.wraptuple), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.fakedata), Int64, Int64})
+    precompile(Tuple{typeof(Plots.wraptuple), Plots.SeriesAnnotations})
+    precompile(Tuple{typeof(Plots.ignorenan_extrema), Plots.Axis})
+    precompile(Tuple{typeof(Plots.slice_arg), Nothing, Int64})
+    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.GRBackend}, Plots.Series})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Bool})
+    precompile(Tuple{typeof(Plots.gr_set_gradient), Plots.Series})
+    precompile(Tuple{typeof(Plots.prepareSeriesData), Base.LinRange{Float64}})
+    precompile(Tuple{typeof(Plots.font), Int64, Int})
+    precompile(Tuple{typeof(Plots.hascolorbar), Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.gr_display), Plots.Plot{Plots.GRBackend}, String})
+    precompile(Tuple{typeof(Plots.gr_set_font), Plots.Font})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Float64, Plots.Stroke}})
+    precompile(Tuple{typeof(Plots.slice_arg), Array{String, 2}, Int64})
+    precompile(Tuple{typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.wraptuple), Array{Any, 1}})
+    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout})
+    precompile(Tuple{typeof(Plots._cycle), Nothing, Int64})
+    precompile(Tuple{typeof(Plots._replace_markershape), Plots.Shape})
+    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Array{Symbol, 2}, Symbol})
+    precompile(Tuple{typeof(Plots.transpose_z), Plots.Series, Array{Float64, 2}, Bool})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Array{Symbol, 2}}})
+    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Array{Symbol, 2}, Symbol})
+    precompile(Tuple{typeof(Plots._cycle), Int64, Int64})
+    precompile(Tuple{typeof(Plots.create_grid), Expr})
+    precompile(Tuple{typeof(Plots.get_series_color), Symbol, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
+    precompile(Tuple{typeof(Plots.is_2tuple), Symbol})
+    precompile(Tuple{typeof(Plots._create_backend_figure), Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{}})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid,), Tuple{Bool}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots._cycle), Symbol, Int64})
+    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.Subplot{Plots.GRBackend}, Array{Measures.Length{:mm, Float64}, 1}})
+    precompile(Tuple{typeof(Plots.text), String, Symbol})
+    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Array{Union{Base.Missing, Float64}, 1}})
+    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Tuple{Float64, Float64}, Int64})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid, :lims), Tuple{Bool, Tuple{Int64, Int64}}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.link_axes!), Plots.Subplot{Plots.GRBackend}, Symbol})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Bool})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Int64, Int64})
+    precompile(Tuple{typeof(Plots.series_annotations), Plots.SeriesAnnotations})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Symbol, Symbol}})
+    precompile(Tuple{typeof(Plots.get_subplot), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Plots.Shape, Int64, ColorTypes.RGBA{Float64}}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Float64, Symbol}})
+    precompile(Tuple{typeof(Plots.make_steps), Nothing, Symbol})
+    precompile(Tuple{typeof(Plots.annotations), Array{Any, 1}})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Tuple{Int64, Int64}})
+    precompile(Tuple{typeof(Plots.bar), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Array{Symbol, 2}, Int64}})
+    precompile(Tuple{typeof(Plots._transform_ticks), Symbol})
+    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Array{Float64, 1}, Array{Float64, 1}}})
+    precompile(Tuple{typeof(Plots._show), Base.IOStream, Base.Multimedia.MIME{Symbol("image/png")}, Plots.Plot{Plots.GRBackend}})
+    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Union{Base.Missing, Number}, 1}})
+    precompile(Tuple{typeof(Plots.link_axes!), Array{RecipesBase.AbstractLayout, 1}, Symbol})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid, :lims, :flip), Tuple{Bool, Tuple{Int64, Int64}, Bool}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Float64, Int64})
+    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout})
+    precompile(Tuple{typeof(Plots.process_ribbon), Tuple{Base.LinRange{Float64}, Base.LinRange{Float64}}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Symbol, Int64})
+    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Float64, 2}, Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.get_fillcolor), Plots.Series, Tuple{Float64, Float64}, Int64})
+    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.GRBackend}, Symbol})
+    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.UnitRange{Int64}})
+    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Symbol, Int64})
+    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Int64, Int64, Symbol})
+    precompile(Tuple{typeof(Plots.default), Symbol})
+    precompile(Tuple{typeof(Plots.layout_args), Plots.GridLayout})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:ticks,), Tuple{Base.UnitRange{Int64}}}, typeof(Plots.attr!), Plots.Axis})
+    precompile(Tuple{typeof(Plots.make_fillrange_from_ribbon), Base.Dict{Symbol, Any}})
+    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Union{Base.Missing, Int64}, 1}})
+    precompile(Tuple{typeof(Plots.hascolorbar), Plots.Subplot{Plots.GRBackend}})
+    isdefined(Plots, Symbol("#kw##_make_hist")) && precompile(Tuple{getfield(Plots, Symbol("#kw##_make_hist")), NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Int64})
+    precompile(Tuple{typeof(Plots.ignorenan_minimum), Array{Int64, 1}})
+    isdefined(Plots, Symbol("#kw##gr_polyline")) && precompile(Tuple{getfield(Plots, Symbol("#kw##gr_polyline")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Base.UnitRange{Int64}, Array{Float64, 1}})
+    isdefined(Plots, Symbol("#kw##histogram")) && precompile(Tuple{getfield(Plots, Symbol("#kw##histogram")), NamedTuple{(:bins, :weights), Tuple{Symbol, Array{Int64, 1}}}, typeof(Plots.histogram), Array{Float64, 1}})
+    isdefined(Plots, Symbol("#kw##_make_hist")) && precompile(Tuple{getfield(Plots, Symbol("#kw##_make_hist")), NamedTuple{(:normed, :weights), Tuple{Bool, Array{Int64, 1}}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}}, Symbol})
+    precompile(Tuple{typeof(Plots.ignorenan_extrema), Plots.Axis})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid,), Tuple{Bool}}, typeof(Plots.attr!), Plots.Axis})
+    isdefined(Plots, Symbol("#kw##gr_polyline")) && precompile(Tuple{getfield(Plots, Symbol("#kw##gr_polyline")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Array{Int64, 1}, Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots._cycle), Base.UnitRange{Int64}, Array{Int64, 1}})
+    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:ticks,), Tuple{Nothing}}, typeof(Plots.attr!), Plots.Axis})
+    isdefined(Plots, Symbol("#kw##_make_hist")) && precompile(Tuple{getfield(Plots, Symbol("#kw##_make_hist")), NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Tuple{Int64, Int64}})
+    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Float64, 2}})
+    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Float64, 1}})
+    precompile(Tuple{typeof(Plots._process_userrecipe), Plots.Plot{Plots.GRBackend}, Array{Base.Dict{Symbol, Any}, 1}, RecipesBase.RecipeData})
+    precompile(Tuple{typeof(Plots.build_layout), Base.Dict{Symbol, Any}})
+    isdefined(Plots, Symbol("#kw##test_examples")) && precompile(Tuple{getfield(Plots, Symbol("#kw##test_examples")), NamedTuple{(:disp,), Tuple{Bool}}, typeof(Plots.test_examples), Symbol})
+    isdefined(Plots, Symbol("#kw##_make_hist")) && precompile(Tuple{getfield(Plots, Symbol("#kw##_make_hist")), NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}}, Symbol})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol})
+    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Base.StepRange{Int64, Int64}})
+    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Tuple{Float64, Float64}, Int64})
+    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.GRBackend}, Symbol})
+    precompile(Tuple{typeof(Plots.allStyles), Symbol})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol})
+    precompile(Tuple{typeof(Plots.get_axis), Plots.Subplot{Plots.GRBackend}, Symbol})
+    precompile(Tuple{typeof(Plots.backend)})
+    precompile(Tuple{typeof(Plots.backend), Plots.GRBackend})
+    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol})
 end

src/recipes.jl

@@ -96,19 +96,6 @@ const POTENTIAL_VECTOR_ARGUMENTS = [
 end
 @deps line path
 
-
-function hvline_limits(axis::Axis)
-    vmin, vmax = axis_limits(axis)
-    if vmin >= vmax
-        if isfinite(vmin)
-            vmax = vmin + 1
-        else
-            vmin, vmax = 0.0, 1.1
-        end
-    end
-    vmin, vmax
-end
-
 @recipe function f(::Type{Val{:hline}}, x, y, z)
     n = length(y)
     newx = repeat(Float64[-1, 1, NaN], n)
@@ -252,12 +239,13 @@ end
 @recipe function f(::Type{Val{:sticks}}, x, y, z)
     n = length(x)
     fr = plotattributes[:fillrange]
-    if fr == nothing
-        yaxis = plotattributes[:subplot][:yaxis]
+    if fr === nothing
+        sp = plotattributes[:subplot]
+        yaxis = sp[:yaxis]
         fr = if yaxis[:scale] == :identity
             0.0
         else
-            NaNMath.min(axis_limits(yaxis)[1], ignorenan_minimum(y))
+            NaNMath.min(axis_limits(sp, :y)[1], ignorenan_minimum(y))
         end
     end
     newx, newy = zeros(3n), zeros(3n)
@@ -303,13 +291,13 @@ end
 
 # create segmented bezier curves in place of line segments
 @recipe function f(::Type{Val{:curves}}, x, y, z; npoints = 30)
-    args = z != nothing ? (x,y,z) : (x,y)
+    args = z !== nothing ? (x,y,z) : (x,y)
     newx, newy = zeros(0), zeros(0)
     fr = plotattributes[:fillrange]
-    newfr = fr != nothing ? zeros(0) : nothing
-    newz = z != nothing ? zeros(0) : nothing
+    newfr = fr !== nothing ? zeros(0) : nothing
+    newz = z !== nothing ? zeros(0) : nothing
     # lz = plotattributes[:line_z]
-    # newlz = lz != nothing ? zeros(0) : nothing
+    # newlz = lz !== nothing ? zeros(0) : nothing
 
     # for each line segment (point series with no NaNs), convert it into a bezier curve
     # where the points are the control points of the curve
@@ -318,13 +306,13 @@ end
         ts = range(0, stop = 1, length = npoints)
         nanappend!(newx, map(t -> bezier_value(_cycle(x,rng), t), ts))
         nanappend!(newy, map(t -> bezier_value(_cycle(y,rng), t), ts))
-        if z != nothing
+        if z !== nothing
             nanappend!(newz, map(t -> bezier_value(_cycle(z,rng), t), ts))
         end
-        if fr != nothing
+        if fr !== nothing
             nanappend!(newfr, map(t -> bezier_value(_cycle(fr,rng), t), ts))
         end
-        # if lz != nothing
+        # if lz !== nothing
         #     lzrng = _cycle(lz, rng) # the line_z's for this segment
         #     push!(newlz, 0.0)
         #     append!(newlz, map(t -> lzrng[1+floor(Int, t * (length(rng)-1))], ts))
@@ -333,16 +321,16 @@ end
 
     x := newx
     y := newy
-    if z == nothing
+    if z === nothing
         seriestype := :path
     else
         seriestype := :path3d
         z := newz
     end
-    if fr != nothing
+    if fr !== nothing
         fillrange := newfr
     end
-    # if lz != nothing
+    # if lz !== nothing
     #     # line_z := newlz
     #     linecolor := (isa(plotattributes[:linecolor], ColorGradient) ? plotattributes[:linecolor] : cgrad())
     # end
@@ -369,7 +357,7 @@ end
 
     # compute half-width of bars
     bw = plotattributes[:bar_width]
-    hw = if bw == nothing
+    hw = if bw === nothing
         if nx > 1
             0.5*_bar_width*ignorenan_minimum(filter(x->x>0, diff(procx)))
         else
@@ -381,7 +369,7 @@ end
 
     # make fillto a vector... default fills to 0
     fillto = plotattributes[:fillrange]
-    if fillto == nothing
+    if fillto === nothing
         fillto = 0
     end
     if (yscale in _logScales) && !all(_is_positive, fillto)
@@ -503,7 +491,7 @@ end
 
 @recipe function f(::Type{Val{:barbins}}, x, y, z)
     edge, weights, xscale, yscale, baseline = _preprocess_binlike(plotattributes, x, y)
-    if (plotattributes[:bar_width] == nothing)
+    if (plotattributes[:bar_width] === nothing)
         bar_width := diff(edge)
     end
     x := _bin_centers(edge)
@@ -545,18 +533,20 @@ function _stepbins_path(edge, weights, baseline::Real, xscale::Symbol, yscale::S
 
     last_w = eltype(weights)(NaN)
 
-    while it_tuple_e != nothing && it_tuple_w != nothing
+    while it_tuple_e !== nothing && it_tuple_w !== nothing
         b, it_state_e = it_tuple_e
         w, it_state_w = it_tuple_w
 
         if (log_scale_x && a ≈ 0)
-            a = b/_logScaleBases[xscale]^3
+            a = oftype(a, b/_logScaleBases[xscale]^3)
         end
 
         if isnan(w)
             if !isnan(last_w)
                 push!(x, a)
                 push!(y, baseline)
+                push!(x, NaN)
+                push!(y, NaN)
             end
         else
             if isnan(last_w)
@@ -569,8 +559,8 @@ function _stepbins_path(edge, weights, baseline::Real, xscale::Symbol, yscale::S
             push!(y, w)
         end
 
-        a = b
-        last_w = w
+        a = oftype(a, b)
+        last_w = oftype(last_w, w)
 
         it_tuple_e = iterate(edge, it_state_e)
         it_tuple_w = iterate(weights, it_state_w)
@@ -620,7 +610,8 @@ Plots.@deps stepbins path
 wand_edges(x...) = (@warn("Load the StatsPlots package in order to use :wand bins. Defaulting to :auto", once = true); :auto)
 
 function _auto_binning_nbins(vs::NTuple{N,AbstractVector}, dim::Integer; mode::Symbol = :auto) where N
-    _cl(x) = ceil(Int, max(x, one(x)))
+    max_bins = 10_000
+    _cl(x) = min(ceil(Int, max(x, one(x))), max_bins)
     _iqr(v) = (q = quantile(v, 0.75) - quantile(v, 0.25); q > 0 ? q : oftype(q, 1))
     _span(v) = maximum(v) - minimum(v)
 
@@ -647,7 +638,7 @@ function _auto_binning_nbins(vs::NTuple{N,AbstractVector}, dim::Integer; mode::S
     elseif mode == :fd  # Freedman–Diaconis rule
         _cl(_span(v) / (2 * _iqr(v) / nd))
     elseif mode == :wand
-        wand_edges(v)  # this makes this function not type stable, but the type instability does not propagate
+        _cl(wand_edges(v))  # this makes this function not type stable, but the type instability does not propagate
     else
         error("Unknown auto-binning mode $mode")
     end
@@ -676,7 +667,7 @@ end
 function _make_hist(vs::NTuple{N,AbstractVector}, binning; normed = false, weights = nothing) where N
     localvs = _filternans(vs)
     edges = _hist_edges(localvs, binning)
-    h = float( weights == nothing ?
+    h = float( weights === nothing ?
         StatsBase.fit(StatsBase.Histogram, localvs, edges, closed = :left) :
         StatsBase.fit(StatsBase.Histogram, localvs, StatsBase.Weights(weights), edges, closed = :left)
     )
@@ -755,12 +746,14 @@ end
     edge_x, edge_y, weights = x, y, z.surf
 
     float_weights = float(weights)
-    if float_weights === weights
-        float_weights = deepcopy(float_weights)
-    end
-    for (i, c) in enumerate(float_weights)
-        if c == 0
-            float_weights[i] = NaN
+    if !plotattributes[:show_empty_bins]
+        if float_weights === weights
+            float_weights = deepcopy(float_weights)
+        end
+        for (i, c) in enumerate(float_weights)
+            if c == 0
+                float_weights[i] = NaN
+            end
         end
     end
 
@@ -1108,6 +1101,12 @@ timeformatter(t) = string(Dates.Time(Dates.Nanosecond(t)))
 @recipe f(::Type{Date}, dt::Date) = (dt -> Dates.value(dt), dateformatter)
 @recipe f(::Type{DateTime}, dt::DateTime) = (dt -> Dates.value(dt), datetimeformatter)
 @recipe f(::Type{Dates.Time}, t::Dates.Time) = (t -> Dates.value(t), timeformatter)
+@recipe f(::Type{P}, t::P) where P <: Dates.Period = (t -> Dates.value(t), t -> string(P(t)))
+
+# -------------------------------------------------
+# Characters
+
+@recipe f(::Type{<:AbstractChar}, ::AbstractChar) = (string, string)
 
 # -------------------------------------------------
 # Complex Numbers
@@ -1192,3 +1191,27 @@ end
         @series Plots.isvertical(plotattributes) ? (sx, sy) : (sy, sx)
     end
 end
+
+"""
+    areaplot([x,] y)
+    areaplot!([x,] y)
+
+Draw a stacked area plot of the matrix y.
+# Examples
+```julia-repl
+julia> areaplot(1:3, [1 2 3; 7 8 9; 4 5 6], seriescolor = [:red :green :blue], fillalpha = [0.2 0.3 0.4])
+```
+"""
+@userplot AreaPlot
+
+@recipe function f(a::AreaPlot)
+    data = cumsum(a.args[end], dims=2)
+    x = length(a.args) == 1 ? (1:size(data, 1)) : a.args[1]
+    seriestype := :line
+    for i in 1:size(data, 2)
+        @series begin
+            fillrange := i > 1 ? data[:,i-1] : 0
+            x, data[:,i]
+        end
+    end
+end

src/series.jl

@@ -7,73 +7,64 @@
 # note: returns meta information... mainly for use with automatic labeling from DataFrames for now
 
 const FuncOrFuncs{F} = Union{F, Vector{F}, Matrix{F}}
+const MaybeNumber = Union{Number, Missing}
+const MaybeString = Union{AbstractString, Missing}
+const DataPoint = Union{MaybeNumber, MaybeString}
 
-all3D(plotattributes::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image, :plots_heatmap), get(plotattributes, :seriestype, :none))
+prepareSeriesData(x) = error("Cannot convert $(typeof(x)) to series data for plotting")
+prepareSeriesData(::Nothing) = nothing
+prepareSeriesData(f::Function) = f
+prepareSeriesData(a::AbstractArray{<:MaybeNumber}) = replace!(
+                                    x -> ismissing(x) || isinf(x) ? NaN : x,
+                                    map(float,a))
+prepareSeriesData(a::AbstractArray{<:MaybeString}) = replace(x -> ismissing(x) ? "" : x, a)
+prepareSeriesData(s::Surface{<:AMat{<:MaybeNumber}}) = Surface(prepareSeriesData(s.surf))
+prepareSeriesData(s::Surface) = s  # non-numeric Surface, such as an image
+prepareSeriesData(v::Volume) = Volume(prepareSeriesData(v.v), v.x_extents, v.y_extents, v.z_extents)
 
-# unknown
-convertToAnyVector(x, plotattributes::KW) = error("No user recipe defined for $(typeof(x))")
-
-# missing
-convertToAnyVector(v::Nothing, plotattributes::KW) = Any[nothing], nothing
+# default: assume x represents a single series
+convertToAnyVector(x, plotattributes) = Any[prepareSeriesData(x)]
 
 # fixed number of blank series
-convertToAnyVector(n::Integer, plotattributes::KW) = Any[zeros(0) for i in 1:n], nothing
+convertToAnyVector(n::Integer, plotattributes) = Any[zeros(0) for i in 1:n]
 
-# numeric vector
-convertToAnyVector(v::AVec{T}, plotattributes::KW) where {T<:Number} = Any[v], nothing
-convertToAnyVector(v::AVec{Union{Missing, T}}, plotattributes::KW) where {T<:Number} = Any[replace(v, missing => NaN)], nothing
-
-# string vector
-convertToAnyVector(v::AVec{T}, plotattributes::KW) where {T<:AbstractString} = Any[v], nothing
-convertToAnyVector(v::AVec{Union{Missing, T}}, plotattributes::KW) where {T<:AbstractString} = Any[replace(v, missing => "")], nothing
-
-function convertToAnyVector(v::AMat, plotattributes::KW)
-    v = handlemissings(v)
-    if all3D(plotattributes)
-        Any[Surface(v)]
-    else
-        Any[v[:,i] for i in 1:size(v,2)]
-    end, nothing
-end
-
-handlemissings(v::AMat) = v
-handlemissings(v::AMat{T}) where T <: Number = replace(v, missing => NaN)
-handlemissings(v::AMat{T}) where T <: String = replace(v, missing => "")
-
-# function
-convertToAnyVector(f::Function, plotattributes::KW) = Any[f], nothing
-
-# surface
-convertToAnyVector(s::Surface, plotattributes::KW) = Any[s], nothing
-
-# volume
-convertToAnyVector(v::Volume, plotattributes::KW) = Any[v], nothing
-
-# # vector of OHLC
-# convertToAnyVector(v::AVec{OHLC}, plotattributes::KW) = Any[v], nothing
-
-# # dates
-convertToAnyVector(dts::AVec{D}, plotattributes::KW) where {D<:Union{Date,DateTime}} = Any[dts], nothing
+# vector of data points is a single series
+convertToAnyVector(v::AVec{<:DataPoint}, plotattributes) = Any[prepareSeriesData(v)]
 
 # list of things (maybe other vectors, functions, or something else)
-function convertToAnyVector(v::AVec, plotattributes::KW)
-    if all(x -> typeof(x) <: Number, v)
-        # all real numbers wrap the whole vector as one item
-        Any[convert(Vector{Float64}, v)], nothing
+function convertToAnyVector(v::AVec, plotattributes)
+    if all(x -> x isa MaybeNumber, v)
+        convertToAnyVector(Vector{MaybeNumber}(v), plotattributes)
+    elseif all(x -> x isa MaybeString, v)
+        convertToAnyVector(Vector{MaybeString}(v), plotattributes)
     else
-        # something else... treat each element as an item
-        vcat(Any[convertToAnyVector(vi, plotattributes)[1] for vi in v]...), nothing
-        # Any[vi for vi in v], nothing
+        vcat((convertToAnyVector(vi, plotattributes) for vi in v)...)
     end
 end
 
-convertToAnyVector(t::Tuple, plotattributes::KW) = Any[t], nothing
-
-
-function convertToAnyVector(args...)
-    error("In convertToAnyVector, could not handle the argument types: $(map(typeof, args[1:end-1]))")
+# Matrix is split into columns
+function convertToAnyVector(v::AMat{<:DataPoint}, plotattributes)
+    if all3D(plotattributes)
+        Any[prepareSeriesData(Surface(v))]
+    else
+        Any[prepareSeriesData(v[:, i]) for i in 1:size(v, 2)]
+    end
 end
 
+# --------------------------------------------------------------------
+# Fillranges & ribbons
+
+
+process_fillrange(range::Number, plotattributes) = [range]
+process_fillrange(range, plotattributes) = convertToAnyVector(range, plotattributes)
+
+process_ribbon(ribbon::Number, plotattributes) = [ribbon]
+process_ribbon(ribbon, plotattributes) = convertToAnyVector(ribbon, plotattributes)
+# ribbon as a tuple: (lower_ribbons, upper_ribbons)
+process_ribbon(ribbon::Tuple{Any,Any}, plotattributes) = collect(zip(convertToAnyVector(ribbon[1], plotattributes),
+                                                     convertToAnyVector(ribbon[2], plotattributes)))
+
+
 # --------------------------------------------------------------------
 
 # TODO: can we avoid the copy here?  one error that crops up is that mapping functions over the same array
@@ -135,24 +126,17 @@ struct SliceIt end
         z = z.data
     end
 
-    xs, _ = convertToAnyVector(x, plotattributes)
-    ys, _ = convertToAnyVector(y, plotattributes)
-    zs, _ = convertToAnyVector(z, plotattributes)
+    xs = convertToAnyVector(x, plotattributes)
+    ys = convertToAnyVector(y, plotattributes)
+    zs = convertToAnyVector(z, plotattributes)
+
 
     fr = pop!(plotattributes, :fillrange, nothing)
-    fillranges, _ = if typeof(fr) <: Number
-        ([fr],nothing)
-    else
-        convertToAnyVector(fr, plotattributes)
-    end
+    fillranges = process_fillrange(fr, plotattributes)
     mf = length(fillranges)
 
     rib = pop!(plotattributes, :ribbon, nothing)
-    ribbons, _ = if typeof(rib) <: Number
-        ([fr],nothing)
-    else
-        convertToAnyVector(rib, plotattributes)
-    end
+    ribbons = process_ribbon(rib, plotattributes)
     mr = length(ribbons)
 
     # @show zs
@@ -193,8 +177,9 @@ _apply_type_recipe(plotattributes, v) = RecipesBase.apply_recipe(plotattributes,
 # This sort of recipe should return a pair of functions... one to convert to number,
 # and one to format tick values.
 function _apply_type_recipe(plotattributes, v::AbstractArray)
-    isempty(v) && return Float64[]
-    args = RecipesBase.apply_recipe(plotattributes, typeof(v[1]), v[1])[1].args
+    isempty(skipmissing(v)) && return Float64[]
+    x = first(skipmissing(v))
+    args = RecipesBase.apply_recipe(plotattributes, typeof(x), x)[1].args
     if length(args) == 2 && typeof(args[1]) <: Function && typeof(args[2]) <: Function
         numfunc, formatter = args
         Formatted(map(numfunc, v), formatter)
@@ -292,8 +277,10 @@ end
 
 @recipe f(n::Integer) = is3d(get(plotattributes,:seriestype,:path)) ? (SliceIt, n, n, n) : (SliceIt, n, n, nothing)
 
+all3D(plotattributes::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image, :plots_heatmap), get(plotattributes, :seriestype, :none))
+
 # return a surface if this is a 3d plot, otherwise let it be sliced up
-@recipe function f(mat::AMat{T}) where T<:Union{Integer,AbstractFloat}
+@recipe function f(mat::AMat{T}) where T<:Union{Integer,AbstractFloat,Missing}
     if all3D(plotattributes)
         n,m = size(mat)
         wrap_surfaces(plotattributes)
@@ -316,7 +303,7 @@ end
 end
 
 # assume this is a Volume, so construct one
-@recipe function f(vol::AbstractArray{T,3}, args...) where T<:Number
+@recipe function f(vol::AbstractArray{T,3}, args...) where T<:Union{Number,Missing}
     seriestype := :volume
     SliceIt, nothing, Volume(vol, args...), nothing
 end
@@ -384,18 +371,24 @@ end
     end
 end
 
+# Dicts: each entry is a data point (x,y)=(key,value)
 
+@recipe f(d::AbstractDict) = collect(keys(d)), collect(values(d))
 
 # function without range... use the current range of the x-axis
 
 @recipe function f(f::FuncOrFuncs{F}) where F<:Function
     plt = plotattributes[:plot_object]
-    xmin, xmax = try
-        axis_limits(plt[1][:xaxis])
-    catch
-        xinv = invscalefunc(get(plotattributes, :xscale, :identity))
-        xm = tryrange(f, xinv.([-5,-1,0,0.01]))
-        xm, tryrange(f, filter(x->x>xm, xinv.([5,1,0.99, 0, -0.01])))
+    xmin, xmax = if haskey(plotattributes, :xlims)
+        plotattributes[:xlims]
+    else
+        try
+            axis_limits(plt[1], :x)
+        catch
+            xinv = invscalefunc(get(plotattributes, :xscale, :identity))
+            xm = tryrange(f, xinv.([-5,-1,0,0.01]))
+            xm, tryrange(f, filter(x->x>xm, xinv.([5,1,0.99, 0, -0.01])))
+        end
     end
 
     f, xmin, xmax
@@ -526,20 +519,25 @@ end
 # # special handling... xmin/xmax with parametric function(s)
 @recipe function f(f::Function, xmin::Number, xmax::Number)
     xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
-    xs = _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
-    xs, f
+    _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
 end
 @recipe function f(fs::AbstractArray{F}, xmin::Number, xmax::Number) where F<:Function
     xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
-    xs = Any[_scaled_adapted_grid(f, xscale, yscale, xmin, xmax) for f in fs]
-    xs, fs
+    xs = Array{Any}(undef, length(fs))
+    ys = Array{Any}(undef, length(fs))
+    for (i, (x, y)) in enumerate(_scaled_adapted_grid(f, xscale, yscale, xmin, xmax) for f in fs)
+        xs[i] = x
+    	ys[i] = y
+    end
+    xs, ys
 end
 @recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, u::AVec) where {F<:Function,G<:Function}  = mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u)
 @recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, umin::Number, umax::Number, n = 200) where {F<:Function,G<:Function} = fx, fy, range(umin, stop = umax, length = n)
 
 function _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
     (xf, xinv), (yf, yinv) =  ((scalefunc(s),invscalefunc(s)) for s in (xscale,yscale))
-    xinv.(adapted_grid(yf∘f∘xinv, xf.((xmin, xmax))))
+    xs, ys = adapted_grid(yf∘f∘xinv, xf.((xmin, xmax)))
+    xinv.(xs), yinv.(ys)
 end
 
 #
@@ -557,33 +555,14 @@ end
 # # Lists of tuples and GeometryTypes.Points
 # # --------------------------------------------------------------------
 #
-# # if we get an unhandled tuple, just splat it in
-@recipe f(tup::Tuple) = tup
 
-#
-# # (x,y) tuples
-@recipe f(xy::AVec{Tuple{R1,R2}}) where {R1<:Number,R2<:Number} = unzip(xy)
-@recipe f(xy::Tuple{R1,R2}) where {R1<:Number,R2<:Number}       = [xy[1]], [xy[2]]
+@recipe f(v::AVec{<:Tuple})               = unzip(v)
+@recipe f(v::AVec{<:GeometryTypes.Point}) = unzip(v)
+@recipe f(tup::Tuple)             = [tup]
+@recipe f(p::GeometryTypes.Point) = [p]
 
-#
-# # (x,y,z) tuples
-@recipe f(xyz::AVec{Tuple{R1,R2,R3}}) where {R1<:Number,R2<:Number,R3<:Number} = unzip(xyz)
-@recipe f(xyz::Tuple{R1,R2,R3}) where {R1<:Number,R2<:Number,R3<:Number}       = [xyz[1]], [xyz[2]], [xyz[3]]
-
-# these might be points+velocity, or OHLC or something else
-@recipe f(xyuv::AVec{Tuple{R1,R2,R3,R4}}) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number} = get(plotattributes,:seriestype,:path)==:ohlc ? OHLC[OHLC(t...) for t in xyuv] : unzip(xyuv)
-@recipe f(xyuv::Tuple{R1,R2,R3,R4}) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number}       = [xyuv[1]], [xyuv[2]], [xyuv[3]], [xyuv[4]]
-
-
-#
-# # 2D Points
-@recipe f(xy::AVec{GeometryTypes.Point{2,T}}) where {T<:Number} = unzip(xy)
-@recipe f(xy::GeometryTypes.Point{2,T}) where {T<:Number}       = [xy[1]], [xy[2]]
-
-#
-# # 3D Points
-@recipe f(xyz::AVec{GeometryTypes.Point{3,T}}) where {T<:Number} = unzip(xyz)
-@recipe f(xyz::GeometryTypes.Point{3,T}) where {T<:Number}       = [xyz[1]], [xyz[2]], [xyz[3]]
+# Special case for 4-tuples in :ohlc series
+@recipe f(xyuv::AVec{<:Tuple{R1,R2,R3,R4}}) where {R1,R2,R3,R4} = get(plotattributes,:seriestype,:path)==:ohlc ? OHLC[OHLC(t...) for t in xyuv] : unzip(xyuv)
 
 #
 # # --------------------------------------------------------------------
@@ -604,7 +583,7 @@ end
 # end
 
 splittable_kw(key, val, lengthGroup) = false
-splittable_kw(key, val::AbstractArray, lengthGroup) = (key != :group) && size(val,1) == lengthGroup
+splittable_kw(key, val::AbstractArray, lengthGroup) = !(key in (:group, :color_palette)) && size(val,1) == lengthGroup
 splittable_kw(key, val::Tuple, lengthGroup) = all(splittable_kw.(key, val, lengthGroup))
 splittable_kw(key, val::SeriesAnnotations, lengthGroup) = splittable_kw(key, val.strs, lengthGroup)
 

src/shorthands.jl

@@ -2,10 +2,10 @@
     scatter(x,y)
     scatter!(x,y)
 
-Make a scatter plot of y vs x. 
+Make a scatter plot of y vs x.
 
 # Examples
-```julia-repl 
+```julia-repl
 julia> scatter([1,2,3],[4,5,6],markersize=[3,4,5],markercolor=[:red,:green,:blue])
 julia> scatter([(1,4),(2,5),(3,6)])
 ```
@@ -16,9 +16,9 @@ julia> scatter([(1,4),(2,5),(3,6)])
     bar(x,y)
     bar!(x,y)
 
-Make a bar plot of y vs x. 
+Make a bar plot of y vs x.
 
-# Arguments 
+# Arguments
 
 - $(_document_argument("bar_position"))
 - $(_document_argument("bar_width"))
@@ -26,7 +26,7 @@ Make a bar plot of y vs x.
 - $(_document_argument("orientation"))
 
 # Examples
-```julia-repl 
+```julia-repl
 julia> bar([1,2,3],[4,5,6],fillcolor=[:red,:green,:blue],fillalpha=[0.2,0.4,0.6])
 julia> bar([(1,4),(2,5),(3,6)])
 ```
@@ -41,7 +41,7 @@ julia> bar([(1,4),(2,5),(3,6)])
 
 Plot a histogram.
 
-# Arguments 
+# Arguments
 
 - `x`: AbstractVector of values to be binned
 - $(_document_argument("bins"))
@@ -53,7 +53,7 @@ Plot a histogram.
 - $(_document_argument("orientation"))
 
 # Example
-```julia-repl 
+```julia-repl
 julia> histogram([1,2,1,1,4,3,8],bins=0:8)
 ```
 """
@@ -63,7 +63,7 @@ julia> histogram([1,2,1,1,4,3,8],bins=0:8)
     barhist(x)
     barhist!(x)
 
-Make a histogram bar plot. See `histogram`. 
+Make a histogram bar plot. See `histogram`.
 """
 @shorthands barhist
 
@@ -72,7 +72,7 @@ Make a histogram bar plot. See `histogram`.
     stephist(x)
 
 Make a histogram step plot (bin counts are represented using horizontal lines
-instead of bars). See `histogram`. 
+instead of bars). See `histogram`.
 """
 @shorthands stephist
 
@@ -80,8 +80,8 @@ instead of bars). See `histogram`.
     scatterhist(x)
     scatterhist!(x)
 
-Make a histogram scatter plot (bin counts are represented using points 
-instead of bars). See `histogram`. 
+Make a histogram scatter plot (bin counts are represented using points
+instead of bars). See `histogram`.
 """
 @shorthands scatterhist
 
@@ -91,14 +91,14 @@ instead of bars). See `histogram`.
 
 Plot a two-dimensional histogram.
 
-# Arguments 
+# Arguments
 
-- `bins`: Number of bins (if an `Integer`) or bin edges (if an `AbtractVector`) 
-- `weights`: Vector of weights for the values in `x`. Each entry of x contributes 
-             its weight to the height of its bin. 
+- `bins`: Number of bins (if an `Integer`) or bin edges (if an `AbtractVector`)
+- `weights`: Vector of weights for the values in `x`. Each entry of x contributes
+             its weight to the height of its bin.
 
 # Example
-```julia-repl 
+```julia-repl
 julia> histogram2d(randn(10_000),randn(10_000))
 ```
 """
@@ -108,14 +108,14 @@ julia> histogram2d(randn(10_000),randn(10_000))
     density(x)
     density!(x)
 
-Make a line plot of a kernel density estimate of x. 
+Make a line plot of a kernel density estimate of x.
 
 # Arguments
 
-- `x`: AbstractVector of samples for probability density estimation 
+- `x`: AbstractVector of samples for probability density estimation
 
 # Example
-```julia-repl 
+```julia-repl
 julia> using StatsPlots
 julia> density(randn(100_000))
 ```
@@ -126,10 +126,10 @@ julia> density(randn(100_000))
     heatmap(x,y,z)
     heatmap!(x,y,z)
 
-Plot a heatmap of the rectangular array `z`. 
+Plot a heatmap of the rectangular array `z`.
 
 # Example
-```julia-repl 
+```julia-repl
 julia> heatmap(randn(10,10))
 ```
 """
@@ -140,7 +140,7 @@ julia> heatmap(randn(10,10))
     hexbin(x,y)
     hexbin!(x,y)
 
-Make a hexagonal binning plot (a histogram of the observations `(x[i],y[i])` 
+Make a hexagonal binning plot (a histogram of the observations `(x[i],y[i])`
 with hexagonal bins)
 
 # Example
@@ -154,11 +154,11 @@ julia> hexbin(randn(10_000), randn(10_000))
     sticks(x,y)
     sticks!(x,y)
 
-Draw a stick plot of y vs x. 
+Draw a stick plot of y vs x.
 
 # Example
 ```julia-repl
-julia> sticks(1:10) 
+julia> sticks(1:10)
 ```
 """
 @shorthands sticks
@@ -167,11 +167,11 @@ julia> sticks(1:10)
     hline(y)
     hline!(y)
 
-Draw horizontal lines at positions specified by the values in 
+Draw horizontal lines at positions specified by the values in
 the AbstractVector `y`
 
 # Example
-```julia-repl 
+```julia-repl
 julia> hline([-1,0,2])
 ```
 """
@@ -181,11 +181,11 @@ julia> hline([-1,0,2])
     vline(x)
     vline!(x)
 
-Draw vertical lines at positions specified by the values in 
+Draw vertical lines at positions specified by the values in
 the AbstractVector `x`
 
 # Example
-```julia-repl 
+```julia-repl
 julia> vline([-1,0,2])
 ```
 """
@@ -194,13 +194,13 @@ julia> vline([-1,0,2])
 """
     hspan(y)
 
-Draw a rectangle between the horizontal line at position `y[1]` 
-and the horizontal line at position `y[2]`. If `length(y) ≥ 4`, 
-then further rectangles are drawn between `y[3]` and `y[4]`, 
-`y[5]` and `y[6]`, and so on. If `length(y)` is odd, then the 
-last entry of `y` is ignored. 
+Draw a rectangle between the horizontal line at position `y[1]`
+and the horizontal line at position `y[2]`. If `length(y) ≥ 4`,
+then further rectangles are drawn between `y[3]` and `y[4]`,
+`y[5]` and `y[6]`, and so on. If `length(y)` is odd, then the
+last entry of `y` is ignored.
 # Example
-```julia-repl 
+```julia-repl
 julia> hspan(1:6)
 ```
 """
@@ -209,13 +209,13 @@ julia> hspan(1:6)
 """
     vspan(x)
 
-Draw a rectangle between the vertical line at position `x[1]` 
-and the vertical line at position `x[2]`. If `length(x) ≥ 4`, 
-then further rectangles are drawn between `x[3]` and `x[4]`, 
-`x[5]` and `x[6]`, and so on. If `length(x)` is odd, then the 
-last entry of `x` is ignored. 
+Draw a rectangle between the vertical line at position `x[1]`
+and the vertical line at position `x[2]`. If `length(x) ≥ 4`,
+then further rectangles are drawn between `x[3]` and `x[4]`,
+`x[5]` and `x[6]`, and so on. If `length(x)` is odd, then the
+last entry of `x` is ignored.
 # Example
-```julia-repl 
+```julia-repl
 julia> vspan(1:6)
 ```
 """
@@ -225,9 +225,9 @@ julia> vspan(1:6)
     ohlc(x,y::Vector{OHLC})
     ohlc!(x,y::Vector{OHLC})
 
-Make open-high-low-close plot. Each entry of y is represented by a vertical 
-segment extending from the low value to the high value, with short horizontal 
-segments on the left and right indicating the open and close values, respectively. 
+Make open-high-low-close plot. Each entry of y is represented by a vertical
+segment extending from the low value to the high value, with short horizontal
+segments on the left and right indicating the open and close values, respectively.
 
 # Example
 ```julia-repl
@@ -240,16 +240,16 @@ julia> ohlc(y)
 
 
 """
-    contour(x,y,z) 
-    contour!(x,y,z) 
+    contour(x,y,z)
+    contour!(x,y,z)
 
-Draw contour lines of the `Surface` z. 
+Draw contour lines of the `Surface` z.
 
 # Arguments
 - `levels`: Contour levels (if `AbstractVector`) or number of levels (if `Integer`)
 - `fill`: Bool. Fill area between contours or draw contours only (false by default)
 
-# Example 
+# Example
 ```julia-repl
 julia> x = y = range(-20, 20, length = 100)
 julia> contour(x, y, (x, y) -> x^2 + y^2)
@@ -267,10 +267,10 @@ julia> contour(x, y, (x, y) -> x^2 + y^2)
     surface(x,y,z)
     surface!(x,y,z)
 
-Draw a 3D surface plot. 
+Draw a 3D surface plot.
 
 # Example
-```julia-repl 
+```julia-repl
 julia> x = y = range(-3, 3, length = 100)
 julia> surface(x, y, (x, y) -> sinc(norm([x, y])))
 ```
@@ -281,10 +281,10 @@ julia> surface(x, y, (x, y) -> sinc(norm([x, y])))
     wireframe(x,y,z)
     wireframe!(x,y,z)
 
-Draw a 3D wireframe plot. 
+Draw a 3D wireframe plot.
 
 # Example
-```julia-repl 
+```julia-repl
 julia> wireframe(1:10,1:10,randn(10,10))
 ```
 """
@@ -295,10 +295,10 @@ julia> wireframe(1:10,1:10,randn(10,10))
     path3d!(x,y,z)
 
 Plot a 3D path from `(x[1],y[1],z[1])` to `(x[2],y[2],z[2])`,
-..., to `(x[end],y[end],z[end])`. 
+..., to `(x[end],y[end],z[end])`.
 
 # Example
-```julia-repl 
+```julia-repl
 julia> path3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
 ```
 """
@@ -308,10 +308,10 @@ julia> path3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
     scatter3d(x,y,z)
     scatter3d!(x,y,z)
 
-Make a 3D scatter plot. 
+Make a 3D scatter plot.
 
 # Example
-```julia-repl 
+```julia-repl
 julia> scatter3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
 ```
 """
@@ -321,17 +321,17 @@ julia> scatter3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
     boxplot(x, y)
     boxplot!(x, y)
 
-Make a box and whisker plot. 
+Make a box and whisker plot.
 
 # Keyword arguments
 - `notch`: Bool. Notch the box plot? (false)
 - `range`: Real. Values more than range*IQR below the first quartile
-           or above the third quartile are shown as outliers (1.5) 
-- `outliers`: Bool. Show outliers? (true) 
-- `whisker_width`: Real or Symbol. Length of whiskers (:match) 
+           or above the third quartile are shown as outliers (1.5)
+- `outliers`: Bool. Show outliers? (true)
+- `whisker_width`: Real or Symbol. Length of whiskers (:match)
 
 # Example
-```julia-repl 
+```julia-repl
 julia> using StatsPlots
 julia> boxplot(repeat([1,2,3],outer=100),randn(300))
 ```
@@ -342,10 +342,10 @@ julia> boxplot(repeat([1,2,3],outer=100),randn(300))
     violin(x,y,z)
     violin!(x,y,z)
 
-Make a violin plot. 
+Make a violin plot.
 
 # Example
-```julia-repl 
+```julia-repl
 julia> violin(repeat([1,2,3],outer=100),randn(300))
 ```
 """
@@ -355,11 +355,11 @@ julia> violin(repeat([1,2,3],outer=100),randn(300))
     quiver(x,y,quiver=(u,v))
     quiver!(x,y,quiver=(u,v))
 
-Make a quiver (vector field) plot. The `i`th vector extends 
-from `(x[i],y[i])` to `(x[i] + u[i], y[i] + v[i])`. 
+Make a quiver (vector field) plot. The `i`th vector extends
+from `(x[i],y[i])` to `(x[i] + u[i], y[i] + v[i])`.
 
 # Example
-```julia-repl 
+```julia-repl
 julia> quiver([1,2,3],[3,2,1],quiver=([1,1,1],[1,2,3]))
 ```
 """
@@ -369,11 +369,11 @@ julia> quiver([1,2,3],[3,2,1],quiver=([1,1,1],[1,2,3]))
     curves(x,y)
     curves!(x,y)
 
-Draw a Bezier curve from `(x[1],y[1])` to `(x[end],y[end])` 
+Draw a Bezier curve from `(x[1],y[1])` to `(x[end],y[end])`
 with control points `(x[2],y[2]), ..., (x[end-1],y[end]-1)`
 
 # Example
-```julia-repl 
+```julia-repl
 julia> curves([1,2,3,4],[1,1,2,4])
 ```
 """
@@ -424,9 +424,9 @@ ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     =
 """
     annotate!(anns...)
 
-Add annotations to an existing plot. 
+Add annotations to an existing plot.
 
-# Arguments 
+# Arguments
 
 - `anns`: An `AbstractVector` of tuples of the form (x,y,text). The text object
           can be an String or PlotText

src/themes.jl

@@ -4,39 +4,19 @@
 Specify the colour theme for plots.
 """
 function theme(s::Symbol; kw...)
-    defaults = _get_defaults(s)
+    defaults = PlotThemes._themes[s].defaults
     _theme(s, defaults; kw...)
 end
 
-function _get_defaults(s::Symbol)
-    thm = PlotThemes._themes[s]
-    if :defaults in fieldnames(typeof(thm))
-        return thm.defaults
-    else # old PlotTheme type
-        defaults = KW(
-            :bg       => thm.bg_secondary,
-            :bginside => thm.bg_primary,
-            :fg       => thm.lines,
-            :fgtext   => thm.text,
-            :fgguide  => thm.text,
-            :fglegend => thm.text,
-            :palette  => thm.palette,
-        )
-        if thm.gradient != nothing
-            push!(defaults, :gradient => thm.gradient)
-        end
-        return defaults
-    end
-end
-
 function _theme(s::Symbol, defaults::KW; kw...)
     # Reset to defaults to overwrite active theme
     reset_defaults()
 
     # Set the theme's gradient as default
-    if haskey(defaults, :gradient)
+    if haskey(defaults, :colorgradient)
         PlotUtils.clibrary(:misc)
         PlotUtils.default_cgrad(default = :sequential, sequential = PlotThemes.gradient_name(s))
+        pop!(defaults, :colorgradient)
     else
         PlotUtils.clibrary(:Plots)
         PlotUtils.default_cgrad(default = :sequential, sequential = :inferno)
@@ -44,8 +24,8 @@ function _theme(s::Symbol, defaults::KW; kw...)
 
     # maybe overwrite the theme's gradient
     kw = KW(kw)
-    if haskey(kw, :gradient)
-        kwgrad = pop!(kw, :gradient)
+    if haskey(kw, :colorgradient)
+        kwgrad = pop!(kw, :colorgradient)
         for clib in clibraries()
             if kwgrad in cgradients(clib)
                 PlotUtils.clibrary(clib)
@@ -74,11 +54,11 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
 
 @recipe function showtheme(st::ShowTheme)
     thm, cfunc = _get_showtheme_args(st.args...)
-    defaults = _get_defaults(thm)
+    defaults = PlotThemes._themes[thm].defaults
 
     # get the gradient
-    gradient_colors = get(defaults, :gradient, cgrad(:inferno).colors)
-    gradient = cgrad(cfunc.(RGB.(gradient_colors)))
+    gradient_colors = get(defaults, :colorgradient, cgrad(:inferno).colors)
+    colorgradient = cgrad(cfunc.(RGB.(gradient_colors)))
 
     # get the palette
     palette = get(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17))
@@ -86,7 +66,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
 
     # apply the theme
     for k in keys(defaults)
-        k in (:gradient, :palette) && continue
+        k in (:colorgradient, :palette) && continue
         def = defaults[k]
         arg = get(_keyAliases, k, k)
         plotattributes[arg] = if typeof(def) <: Colorant
@@ -139,7 +119,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
     @series begin
         subplot := 4
         seriestype := :heatmap
-        seriescolor := gradient
+        seriescolor := colorgradient
         ticks := -5:5:5
         x, y, z
     end
@@ -147,7 +127,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
     @series begin
         subplot := 5
         seriestype := :surface
-        seriescolor := gradient
+        seriescolor := colorgradient
         x, y, z
     end
 
@@ -159,7 +139,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
 
     @series begin
         subplot := 6
-        seriescolor := gradient
+        seriescolor := colorgradient
         linewidth := 3
         line_z := z
         x, y, z

src/utils.jl

@@ -26,7 +26,7 @@ function histogramHack(; kw...)
   plotattributes[:x] = midpoints
   plotattributes[:y] = float(counts)
   plotattributes[:seriestype] = :bar
-  plotattributes[:fillrange] = plotattributes[:fillrange] == nothing ? 0.0 : plotattributes[:fillrange]
+  plotattributes[:fillrange] = plotattributes[:fillrange] === nothing ? 0.0 : plotattributes[:fillrange]
   plotattributes
 end
 
@@ -38,7 +38,7 @@ function barHack(; kw...)
   plotattributes = KW(kw)
   midpoints = plotattributes[:x]
   heights = plotattributes[:y]
-  fillrange = plotattributes[:fillrange] == nothing ? 0.0 : plotattributes[:fillrange]
+  fillrange = plotattributes[:fillrange] === nothing ? 0.0 : plotattributes[:fillrange]
 
   # estimate the edges
   dists = diff(midpoints) * 0.5
@@ -81,7 +81,7 @@ function sticksHack(; kw...)
   # these are the line vertices
   x = Float64[]
   y = Float64[]
-  fillrange = plotattributesLine[:fillrange] == nothing ? 0.0 : plotattributesLine[:fillrange]
+  fillrange = plotattributesLine[:fillrange] === nothing ? 0.0 : plotattributesLine[:fillrange]
 
   # calculate the vertices
   yScatter = plotattributesScatter[:y]
@@ -115,7 +115,6 @@ function regressionXY(x, y)
 end
 
 function replace_image_with_heatmap(z::Array{T}) where T<:Colorant
-    @show T, size(z)
     n, m = size(z)
     # idx = 0
     colors = ColorGradient(vec(z))
@@ -194,7 +193,7 @@ end
 
 function iter_segments(series::Series)
     x, y, z = series[:x], series[:y], series[:z]
-    if x == nothing
+    if x === nothing
         return UnitRange{Int}[]
     elseif has_attribute_segments(series)
         if series[:seriestype] in (:scatter, :scatter3d)
@@ -214,36 +213,19 @@ end
 
 # helpers to figure out if there are NaN values in a list of array types
 anynan(i::Int, args::Tuple) = any(a -> try isnan(_cycle(a,i)) catch MethodError false end, args)
-anynan(istart::Int, iend::Int, args::Tuple) = any(i -> anynan(i, args), istart:iend)
-allnan(istart::Int, iend::Int, args::Tuple) = all(i -> anynan(i, args), istart:iend)
+anynan(args::Tuple) = i -> anynan(i,args)
+anynan(istart::Int, iend::Int, args::Tuple) = any(anynan(args), istart:iend)
+allnan(istart::Int, iend::Int, args::Tuple) = all(anynan(args), istart:iend)
 
 function Base.iterate(itr::SegmentsIterator, nextidx::Int = 1)
-    nextidx > itr.n && return nothing
-    if nextidx == 1 && !any(isempty,itr.args) && anynan(1, itr.args)
-        nextidx = 2
-    end
+    i = findfirst(!anynan(itr.args), nextidx:itr.n)
+    i === nothing && return nothing
+    nextval = nextidx + i - 1
 
-    i = istart = iend = nextidx
+    j = findfirst(anynan(itr.args), nextval:itr.n)
+    nextnan = j === nothing ? itr.n + 1 : nextval + j - 1
 
-    # find the next NaN, and iend is the one before
-    while i <= itr.n + 1
-        if i > itr.n || anynan(i, itr.args)
-            # done... array end or found NaN
-            iend = i-1
-            break
-        end
-        i += 1
-    end
-
-    # find the next non-NaN, and set nextidx
-    while i <= itr.n
-        if !anynan(i, itr.args)
-            break
-        end
-        i += 1
-    end
-
-    istart:iend, i
+    nextval:nextnan-1, nextnan
 end
 
 # Find minimal type that can contain NaN and x
@@ -288,18 +270,17 @@ maketuple(x::Tuple{T,S}) where {T,S} = x
 mapFuncOrFuncs(f::Function, u::AVec)        = map(f, u)
 mapFuncOrFuncs(fs::AVec{F}, u::AVec) where {F<:Function} = [map(f, u) for f in fs]
 
-unzip(xy::AVec{Tuple{X,Y}}) where {X,Y}              = [t[1] for t in xy], [t[2] for t in xy]
-unzip(xyz::AVec{Tuple{X,Y,Z}}) where {X,Y,Z}         = [t[1] for t in xyz], [t[2] for t in xyz], [t[3] for t in xyz]
-unzip(xyuv::AVec{Tuple{X,Y,U,V}}) where {X,Y,U,V}    = [t[1] for t in xyuv], [t[2] for t in xyuv], [t[3] for t in xyuv], [t[4] for t in xyuv]
+for i in 2:4
+  @eval begin
+    unzip(v::Union{AVec{<:Tuple{Vararg{T,$i} where T}},
+                   AVec{<:GeometryTypes.Point{$i}}}) = $(Expr(:tuple, (:([t[$j] for t in v]) for j=1:i)...))
+  end
+end
 
-unzip(xy::AVec{GeometryTypes.Point{2,T}}) where {T}  = T[t[1] for t in xy], T[t[2] for t in xy]
-unzip(xy::GeometryTypes.Point{2,T}) where {T}        = T[xy[1]], T[xy[2]]
-
-unzip(xyz::AVec{GeometryTypes.Point{3,T}}) where {T} = T[t[1] for t in xyz], T[t[2] for t in xyz], T[t[3] for t in xyz]
-unzip(xyz::GeometryTypes.Point{3,T}) where {T}       = T[xyz[1]], T[xyz[2]], T[xyz[3]]
-
-unzip(xyuv::AVec{GeometryTypes.Point{4,T}}) where {T} = T[t[1] for t in xyuv], T[t[2] for t in xyuv], T[t[3] for t in xyuv], T[t[4] for t in xyuv]
-unzip(xyuv::GeometryTypes.Point{4,T}) where {T}       = T[xyuv[1]], T[xyuv[2]], T[xyuv[3]], T[xyuv[4]]
+unzip(v::Union{AVec{<:GeometryTypes.Point{N}},
+               AVec{<:Tuple{Vararg{T,N} where T}}}) where N = error("$N-dimensional unzip not implemented.")
+unzip(v::Union{AVec{<:GeometryTypes.Point},
+               AVec{<:Tuple}}) = error("Can't unzip points of different dimensions.")
 
 # given 2-element lims and a vector of data x, widen lims to account for the extrema of x
 function _expand_limits(lims, x)
@@ -361,8 +342,11 @@ const _scale_base = Dict{Symbol, Real}(
     :ln => ℯ,
 )
 
-function _heatmap_edges(v::AVec)
+function _heatmap_edges(v::AVec, isedges::Bool = false)
   length(v) == 1 && return v[1] .+ [-0.5, 0.5]
+  if isedges return v end 
+  # `isedges = true` means that v is a vector which already describes edges 
+  # and does not need to be extended.
   vmin, vmax = ignorenan_extrema(v)
   extra_min = (v[2] - v[1]) / 2
   extra_max = (v[end] - v[end - 1]) / 2
@@ -370,9 +354,25 @@ function _heatmap_edges(v::AVec)
 end
 
 "create an (n+1) list of the outsides of heatmap rectangles"
-function heatmap_edges(v::AVec, scale::Symbol = :identity)
+function heatmap_edges(v::AVec, scale::Symbol = :identity, isedges::Bool = false)
   f, invf = scalefunc(scale), invscalefunc(scale)
-  map(invf, _heatmap_edges(map(f,v)))
+  map(invf, _heatmap_edges(map(f,v), isedges))
+end
+
+function heatmap_edges(x::AVec, xscale::Symbol, y::AVec, yscale::Symbol, z_size::Tuple{Int, Int})
+    nx, ny = length(x), length(y)
+    # ismidpoints = z_size == (ny, nx) # This fails some tests, but would actually be 
+    # the correct check, since (4, 3) != (3, 4) and a missleading plot is produced.
+    ismidpoints = prod(z_size) == (ny * nx) 
+    isedges = z_size == (ny - 1, nx - 1)
+    if !ismidpoints && !isedges
+        error("""Length of x & y does not match the size of z. 
+                Must be either `size(z) == (length(y), length(x))` (x & y define midpoints)
+                or `size(z) == (length(y)+1, length(x)+1))` (x & y define edges).""")
+    end
+    x, y = heatmap_edges(x, xscale, isedges), 
+           heatmap_edges(y, yscale, isedges)
+    return x, y
 end
 
 function convert_to_polar(theta, r, r_extrema = ignorenan_extrema(r))
@@ -496,7 +496,7 @@ function make_fillrange_from_ribbon(kw::KW)
     rib1, rib2 = -first(rib), last(rib)
     # kw[:ribbon] = nothing
     kw[:fillrange] = make_fillrange_side(y, rib1), make_fillrange_side(y, rib2)
-    (get(kw, :fillalpha, nothing) == nothing) && (kw[:fillalpha] = 0.5)
+    (get(kw, :fillalpha, nothing) === nothing) && (kw[:fillalpha] = 0.5)
 end
 
 #turn tuple of fillranges to one path
@@ -508,7 +508,7 @@ function concatenate_fillrange(x,y::Tuple)
 end
 
 function get_sp_lims(sp::Subplot, letter::Symbol)
-    axis_limits(sp[Symbol(letter, :axis)])
+    axis_limits(sp, letter)
 end
 
 """
@@ -542,14 +542,9 @@ zlims(sp_idx::Int = 1) = zlims(current(), sp_idx)
 
 function get_clims(sp::Subplot)
     zmin, zmax = Inf, -Inf
-    z_colored_series = (:contour, :contour3d, :heatmap, :histogram2d, :surface)
     for series in series_list(sp)
-        for vals in (series[:seriestype] in z_colored_series ? series[:z] : nothing, series[:line_z], series[:marker_z], series[:fill_z])
-            if (typeof(vals) <: AbstractSurface) && (eltype(vals.surf) <: Real)
-                zmin, zmax = _update_clims(zmin, zmax, ignorenan_extrema(vals.surf)...)
-            elseif (vals != nothing) && (eltype(vals) <: Real)
-                zmin, zmax = _update_clims(zmin, zmax, ignorenan_extrema(vals)...)
-            end
+        if series[:colorbar_entry]
+            zmin, zmax = _update_clims(zmin, zmax, get_clims(series)...)
         end
     end
     clims = sp[:clims]
@@ -560,6 +555,33 @@ function get_clims(sp::Subplot)
     return zmin < zmax ? (zmin, zmax) : (-0.1, 0.1)
 end
 
+function get_clims(sp::Subplot, series::Series)
+    zmin, zmax = if series[:colorbar_entry]
+        get_clims(sp)
+    else
+        get_clims(series)
+    end
+    clims = sp[:clims]
+    if is_2tuple(clims)
+        isfinite(clims[1]) && (zmin = clims[1])
+        isfinite(clims[2]) && (zmax = clims[2])
+    end
+    return zmin < zmax ? (zmin, zmax) : (-0.1, 0.1)
+end
+
+function get_clims(series::Series)
+    zmin, zmax = Inf, -Inf
+    z_colored_series = (:contour, :contour3d, :heatmap, :histogram2d, :surface)
+    for vals in (series[:seriestype] in z_colored_series ? series[:z] : nothing, series[:line_z], series[:marker_z], series[:fill_z])
+        if (typeof(vals) <: AbstractSurface) && (eltype(vals.surf) <: Union{Missing, Real})
+            zmin, zmax = _update_clims(zmin, zmax, ignorenan_extrema(vals.surf)...)
+        elseif (vals !== nothing) && (eltype(vals) <: Union{Missing, Real})
+            zmin, zmax = _update_clims(zmin, zmax, ignorenan_extrema(vals)...)
+        end
+    end
+    return zmin < zmax ? (zmin, zmax) : (-0.1, 0.1)
+end
+
 _update_clims(zmin, zmax, emin, emax) = min(zmin, emin), max(zmax, emax)
 
 @enum ColorbarStyle cbar_gradient cbar_fill cbar_lines
@@ -620,7 +642,7 @@ for comp in (:line, :fill, :marker)
         function $get_compcolor(series, cmin::Real, cmax::Real, i::Int = 1)
             c = series[$Symbol($compcolor)]
             z = series[$Symbol($comp_z)]
-            if z == nothing
+            if z === nothing
                 isa(c, ColorGradient) ? c : plot_color(_cycle(c, i))
             else
                 grad = isa(c, ColorGradient) ? c : cgrad()
@@ -631,7 +653,7 @@ for comp in (:line, :fill, :marker)
         $get_compcolor(series, clims, i::Int = 1) = $get_compcolor(series, clims[1], clims[2], i)
 
         function $get_compcolor(series, i::Int = 1)
-            if series[$Symbol($comp_z)] == nothing
+            if series[$Symbol($comp_z)] === nothing
                 $get_compcolor(series, 0, 1, i)
             else
                 $get_compcolor(series, get_clims(series[:subplot]), i)
@@ -642,6 +664,9 @@ for comp in (:line, :fill, :marker)
     end
 end
 
+single_color(c, v = 0.5) = c
+single_color(grad::ColorGradient, v = 0.5) = grad[v]
+
 function get_linewidth(series, i::Int = 1)
     _cycle(series[:linewidth], i)
 end
@@ -665,11 +690,11 @@ function has_attribute_segments(series::Series)
     for letter in (:x, :y, :z)
         # If we have NaNs in the data they define the segments and
         # SegmentsIterator is used
-        series[letter] != nothing && NaN in collect(series[letter]) && return false
+        series[letter] !== nothing && NaN in collect(series[letter]) && return false
     end
     series[:seriestype] == :shape && return false
     # ... else we check relevant attributes if they have multiple inputs
-    return any((typeof(series[attr]) <: AbstractVector && length(series[attr]) > 1) for attr in [:seriescolor, :seriesalpha, :linecolor, :linealpha, :linewidth, :fillcolor, :fillalpha, :markercolor, :markeralpha, :markerstrokecolor, :markerstrokealpha]) || any(typeof(series[attr]) <: AbstractArray{<:Real} for attr in (:line_z, :fill_z, :marker_z))
+    return any((typeof(series[attr]) <: AbstractVector && length(series[attr]) > 1) for attr in [:seriescolor, :seriesalpha, :linecolor, :linealpha, :linewidth, :linestyle, :fillcolor, :fillalpha, :markercolor, :markeralpha, :markerstrokecolor, :markerstrokealpha]) || any(typeof(series[attr]) <: AbstractArray for attr in (:line_z, :fill_z, :marker_z))
 end
 
 # ---------------------------------------------------------------
@@ -1075,6 +1100,15 @@ legendfont(sp::Subplot) = font(
     sp[:legendfontcolor],
 )
 
+legendtitlefont(sp::Subplot) = font(
+    sp[:legendtitlefontfamily],
+    sp[:legendtitlefontsize],
+    sp[:legendtitlefontvalign],
+    sp[:legendtitlefonthalign],
+    sp[:legendtitlefontrotation],
+    sp[:legendtitlefontcolor],
+)
+
 tickfont(ax::Axis) = font(
     ax[:tickfontfamily],
     ax[:tickfontsize],
@@ -1121,20 +1155,20 @@ function convert_sci_unicode(label::AbstractString)
     label
 end
 
-function straightline_data(series)
+function straightline_data(series, expansion_factor = 1)
     sp = series[:subplot]
     xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp))
     x, y = series[:x], series[:y]
     n = length(x)
     if n == 2
-        return straightline_data(xl, yl, x, y)
+        return straightline_data(xl, yl, x, y, expansion_factor)
     else
         k, r = divrem(n, 3)
         if r == 0
             xdata, ydata = fill(NaN, n), fill(NaN, n)
             for i in 1:k
                 inds = (3 * i - 2):(3 * i - 1)
-                xdata[inds], ydata[inds] = straightline_data(xl, yl, x[inds], y[inds])
+                xdata[inds], ydata[inds] = straightline_data(xl, yl, x[inds], y[inds], expansion_factor)
             end
             return xdata, ydata
         else
@@ -1143,7 +1177,7 @@ function straightline_data(series)
     end
 end
 
-function straightline_data(xl, yl, x, y)
+function straightline_data(xl, yl, x, y, expansion_factor = 1)
     x_vals, y_vals = if y[1] == y[2]
         if x[1] == x[2]
             error("Two identical points cannot be used to describe a straight line.")
@@ -1164,29 +1198,28 @@ function straightline_data(xl, yl, x, y)
     end
     # expand the data outside the axis limits, by a certain factor too improve
     # plotly(js) and interactive behaviour
-    factor = 100
-    x_vals = x_vals .+ (x_vals[2] - x_vals[1]) .* factor .* [-1, 1]
-    y_vals = y_vals .+ (y_vals[2] - y_vals[1]) .* factor .* [-1, 1]
+    x_vals = x_vals .+ (x_vals[2] - x_vals[1]) .* expansion_factor .* [-1, 1]
+    y_vals = y_vals .+ (y_vals[2] - y_vals[1]) .* expansion_factor .* [-1, 1]
     return x_vals, y_vals
 end
 
-function shape_data(series)
+function shape_data(series, expansion_factor = 1)
     sp = series[:subplot]
     xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp))
     x, y = series[:x], series[:y]
     factor = 100
     for i in eachindex(x)
         if x[i] == -Inf
-            x[i] = xl[1] - factor * (xl[2] - xl[1])
+            x[i] = xl[1] - expansion_factor * (xl[2] - xl[1])
         elseif x[i] == Inf
-            x[i] = xl[2] + factor * (xl[2] - xl[1])
+            x[i] = xl[2] + expansion_factor * (xl[2] - xl[1])
         end
     end
     for i in eachindex(y)
         if y[i] == -Inf
-            y[i] = yl[1] - factor * (yl[2] - yl[1])
+            y[i] = yl[1] - expansion_factor * (yl[2] - yl[1])
         elseif y[i] == Inf
-            y[i] = yl[2] + factor * (yl[2] - yl[1])
+            y[i] = yl[2] + expansion_factor * (yl[2] - yl[1])
         end
     end
     return x, y

test/imgcomp.jl

@@ -1,34 +1,6 @@
 import Plots._current_plots_version
 
-# Taken from MakieGallery
-"""
-Downloads the reference images from ReferenceImages for a specific version
-"""
-function download_reference(version = v"0.0.1")
-    download_dir = abspath(@__DIR__, "reference_images")
-    isdir(download_dir) || mkpath(download_dir)
-    tarfile = joinpath(download_dir, "reference_images.zip")
-    url = "https://github.com/JuliaPlots/PlotReferenceImages.jl/archive/v$(version).tar.gz"
-    refpath = joinpath(download_dir, "PlotReferenceImages.jl-$(version)")
-    if !isdir(refpath) # if not yet downloaded
-        @info "downloading reference images for version $version"
-        download(url, tarfile)
-        BinaryProvider.unpack(tarfile, download_dir)
-        # check again after download
-        if !isdir(refpath)
-            error("Something went wrong while downloading reference images. Plots can't be compared to references")
-        else
-            rm(tarfile, force = true)
-        end
-    else
-        @info "using reference images for version $version (already downloaded)"
-    end
-    refpath
-end
-
-const ref_image_dir = download_reference()
-
-function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], tol = 1e-2)
+function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = !is_ci(), sigma = [1,1], tol = 1e-2)
     Plots._debugMode.on = debug
     example = Plots._examples[idx]
     Plots.theme(:default)
@@ -39,36 +11,9 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is
     # ensure consistent results
     Random.seed!(1234)
 
-    # reference image directory setup
-    refdir = joinpath(ref_image_dir, "Plots", string(pkg))
     fn = "ref$idx.png"
-
-    # firgure out version info
-    vns = filter(x->x[1] != '.', readdir(refdir))
-    versions = sort(VersionNumber.(vns), rev = true)
-    versions = filter(v -> v <= _current_plots_version, versions)
-    # @show refdir fn versions
-
-    newdir = joinpath(refdir, string(_current_plots_version))
-    newfn = joinpath(newdir, fn)
-
-    # figure out which reference file we should compare to, by finding the highest versioned file
-    reffn = nothing
-    for v in versions
-        tmpfn = joinpath(refdir, string(v), fn)
-        if isfile(tmpfn)
-            reffn = tmpfn
-            break
-        end
-    end
-
-    # now we have the fn (if any)... do the comparison
-    # @show reffn
-    if reffn == nothing
-        reffn = newfn
-    end
-    # @show reffn
-    # return
+    reffn = reference_file(pkg, idx, _current_plots_version)
+    newfn = joinpath(reference_path(pkg, _current_plots_version), fn)
 
     # test function
     func = (fn, idx) -> begin
@@ -78,13 +23,6 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is
         png(fn)
     end
 
-    # try
-    #     run(`mkdir -p $newdir`)
-    # catch err
-    #     display(err)
-    # end
-    # # reffn = joinpath(refdir, "ref$idx.png")
-
     # the test
     vtest = VisualTest(func, reffn, idx)
     test_images(vtest, popup=popup, sigma=sigma, tol=tol, newfn = newfn)
@@ -98,7 +36,7 @@ function image_comparison_facts(pkg::Symbol;
                                 tol = 1e-2)     # acceptable error (percent)
   for i in 1:length(Plots._examples)
     i in skip && continue
-    if only == nothing || i in only
+    if only === nothing || i in only
       @test image_comparison_tests(pkg, i, debug=debug, sigma=sigma, tol=tol) |> success == true
     end
   end

test/runtests.jl

@@ -1,39 +1,74 @@
+import ImageMagick
 using VisualRegressionTests
 using Plots
 using Random
-using BinaryProvider
 using Test
 using FileIO
+using Gtk
+using LibGit2
+using GeometryTypes
+
+include("test_pgfplotsx.jl")
+
+reference_dir(args...) = joinpath(homedir(), ".julia", "dev", "PlotReferenceImages", args...)
+
+function reference_file(backend, i, version)
+    refdir = reference_dir("Plots", string(backend))
+    fn = "ref$i.png"
+    versions = sort(VersionNumber.(readdir(refdir)), rev = true)
+
+    reffn = joinpath(refdir, string(version), fn)
+    for v in versions
+        tmpfn = joinpath(refdir, string(v), fn)
+        if isfile(tmpfn)
+            reffn = tmpfn
+            break
+        end
+    end
+
+    return reffn
+end
+
+reference_path(backend, version) = reference_dir("Plots", string(backend), string(version))
+
+if !isdir(reference_dir())
+    mkpath(reference_dir())
+    LibGit2.clone("https://github.com/JuliaPlots/PlotReferenceImages.jl.git", reference_dir())
+end
 
 include("imgcomp.jl")
 # don't actually show the plots
 Random.seed!(1234)
 default(show=false, reuse=true)
-img_tol = isinteractive() ? 1e-2 : 10e-2
+is_ci() = get(ENV, "CI", "false") == "true"
+img_tol = is_ci() ? 10e-2 : 10e-2
 
-@testset "GR" begin
-    ENV["PLOTS_TEST"] = "true"
-    ENV["GKSwstype"] = "100"
-    @test gr() == Plots.GRBackend()
-    @test backend() == Plots.GRBackend()
+@testset "Backends" begin
 
-    @static if Sys.islinux()
-        image_comparison_facts(:gr, tol=img_tol, skip = [25, 30])
+    @testset "GR" begin
+        ENV["PLOTS_TEST"] = "true"
+        ENV["GKSwstype"] = "100"
+        @test gr() == Plots.GRBackend()
+        @test backend() == Plots.GRBackend()
+
+        @static if Sys.islinux()
+            image_comparison_facts(:gr, tol=img_tol, skip = Plots._backend_skips[:gr])
+        end
     end
-end
 
+    @testset "UnicodePlots" begin
+        @test unicodeplots() == Plots.UnicodePlotsBackend()
+        @test backend() == Plots.UnicodePlotsBackend()
 
-@testset "UnicodePlots" begin
-    @test unicodeplots() == Plots.UnicodePlotsBackend()
-    @test backend() == Plots.UnicodePlotsBackend()
+        # lets just make sure it runs without error
+        p = plot(rand(10))
+        @test isa(p, Plots.Plot) == true
+        @test isa(display(p), Nothing) == true
+        p = bar(randn(10))
+        @test isa(p, Plots.Plot) == true
+        @test isa(display(p), Nothing) == true
+    end
 
-    # lets just make sure it runs without error
-    p = plot(rand(10))
-    @test isa(p, Plots.Plot) == true
-    @test isa(display(p), Nothing) == true
-    p = bar(randn(10))
-    @test isa(p, Plots.Plot) == true
-    @test isa(display(p), Nothing) == true
 end
 
 @testset "Axes" begin
@@ -51,5 +86,52 @@ end
 end
 
 @testset "NoFail" begin
-    histogram([1, 0, 0, 0, 0, 0])
+    plots = [histogram([1, 0, 0, 0, 0, 0]),
+             plot([missing]),
+             plot([missing; 1:4]),
+             plot([fill(missing,10); 1:4]),
+             plot([1 1; 1 missing]),
+             plot(["a" "b"; missing "d"], [1 2; 3 4])]
+    for plt in plots
+        display(plt)
+    end
+    @test_nowarn plot(x->x^2,0,2)
+end
+
+@testset "EmptyAnim" begin
+    anim = @animate for i in []
+    end
+
+    @test_throws ArgumentError gif(anim)
+end
+
+@testset "Segments" begin
+    function segments(args...)
+        segs = UnitRange{Int}[]
+        for seg in iter_segments(args...)
+            push!(segs,seg)
+        end
+        segs
+    end
+
+    nan10 = fill(NaN,10)
+    @test segments(11:20) == [1:10]
+    @test segments([NaN]) == []
+    @test segments(nan10) == []
+    @test segments([nan10; 1:5]) == [11:15]
+    @test segments([1:5;nan10]) == [1:5]
+    @test segments([nan10; 1:5; nan10; 1:5; nan10]) == [11:15, 26:30]
+    @test segments([NaN; 1], 1:10) == [2:2, 4:4, 6:6, 8:8, 10:10]
+    @test segments([nan10; 1:15], [1:15; nan10]) == [11:15]
+end
+
+@testset "Utils" begin
+    zipped = ([(1,2)], [("a","b")], [(1,"a"),(2,"b")],
+              [(1,2),(3,4)], [(1,2,3),(3,4,5)], [(1,2,3,4),(3,4,5,6)],
+              [(1,2.0),(missing,missing)], [(1,missing),(missing,"a")],
+              [(missing,missing)], [(missing,missing,missing),("a","b","c")])
+    for z in zipped
+        @test isequal(collect(zip(Plots.unzip(z)...)), z)
+        @test isequal(collect(zip(Plots.unzip(GeometryTypes.Point.(z))...)), z)
+    end
 end

test/test_pgfplotsx.jl

@@ -0,0 +1,136 @@
+using Plots, Test
+pgfplotsx()
+
+function create_plot( args...; kwargs... )
+    pgfx_plot = plot(args...; kwargs...)
+    return pgfx_plot, repr("application/x-tex", pgfx_plot)
+end
+
+function create_plot!( args...; kwargs... )
+    pgfx_plot = plot!(args...; kwargs...)
+    return pgfx_plot, repr("application/x-tex", pgfx_plot)
+end
+
+@testset "PGFPlotsX" begin
+    pgfx_plot = plot(1:5)
+    Plots._update_plot_object(pgfx_plot)
+    @test pgfx_plot.o.the_plot isa PGFPlotsX.TikzDocument
+    @test pgfx_plot.series_list[1].plotattributes[:quiver] === nothing
+
+    @testset "3D docs example" begin
+        n = 100
+        ts = range(0, stop=8π, length=n)
+        x = ts .* map(cos, ts)
+        y = (0.1ts) .* map(sin, ts)
+        z = 1:n
+        pl = plot(x, y, z, zcolor=reverse(z), m=(10, 0.8, :blues, Plots.stroke(0)), leg=false, cbar=true, w=5)
+        pgfx_plot = plot!(pl, zeros(n), zeros(n), 1:n, w=10)
+        Plots._update_plot_object(pgfx_plot)
+        if @test_nowarn(haskey(Plots.pgfx_axes(pgfx_plot.o)[1].options.dict, "colorbar") == true)
+            @test Plots.pgfx_axes(pgfx_plot.o)[1]["colorbar"] === nothing
+        end
+     end # testset
+     @testset "Color docs example" begin
+        y = rand(100)
+        plot(0:10:100, rand(11, 4), lab="lines", w=3, palette=:grays, fill=0, α=0.6)
+        pl = scatter!(y, zcolor=abs.(y .- 0.5), m=(:heat, 0.8, Plots.stroke(1, :green)), ms=10 * abs.(y .- 0.5) .+ 4, lab="grad")
+        Plots._update_plot_object(pl)
+        axis = Plots.pgfx_axes(pl.o)[1]
+        @test count( x->x isa PGFPlotsX.LegendEntry, axis.contents ) == 5
+        @test count( x->x isa PGFPlotsX.Plot, axis.contents ) == 108 # each marker is its own plot, fillranges create 2 plot-objects
+        marker = axis.contents[15]
+        @test marker isa PGFPlotsX.Plot
+        @test marker.options["mark"] == "*"
+        @test marker.options["mark options"]["color"] == RGBA{Float64}( colorant"green", 0.8)
+        @test marker.options["mark options"]["line width"] == 1
+     end # testset
+     @testset "Plot in pieces" begin
+        plot(rand(100) / 3, reg=true, fill=(0, :green))
+        scatter!(rand(100), markersize=6, c=:orange)
+     end # testset
+     @testset "Marker types" begin
+        markers = filter((m->begin
+           m in Plots.supported_markers()
+           end), Plots._shape_keys)
+        markers = reshape(markers, 1, length(markers))
+        n = length(markers)
+        x = (range(0, stop=10, length=n + 2))[2:end - 1]
+        y = repeat(reshape(reverse(x), 1, :), n, 1)
+        scatter(x, y, m=(8, :auto), lab=map(string, markers), bg=:linen, xlim=(0, 10), ylim=(0, 10))
+     end # testset
+     @testset "Layout" begin
+        plot(Plots.fakedata(100, 10), layout=4, palette=[:grays :blues :heat :lightrainbow], bg_inside=[:orange :pink :darkblue :black])
+     end # testset
+     @testset "Polar plots" begin
+        Θ = range(0, stop=1.5π, length=100)
+        r = abs.(0.1 * randn(100) + sin.(3Θ))
+        plot(Θ, r, proj=:polar, m=2)
+     end # testset
+     @testset "Drawing shapes" begin
+        verts = [(-1.0, 1.0), (-1.28, 0.6), (-0.2, -1.4), (0.2, -1.4), (1.28, 0.6), (1.0, 1.0), (-1.0, 1.0), (-0.2, -0.6), (0.0, -0.2), (-0.4, 0.6), (1.28, 0.6), (0.2, -1.4), (-0.2, -1.4), (0.6, 0.2), (-0.2, 0.2), (0.0, -0.2), (0.2, 0.2), (-0.2, -0.6)]
+         x = 0.1:0.2:0.9
+         y = 0.7 * rand(5) .+ 0.15
+         plot(x, y, line=(3, :dash, :lightblue), marker=(Shape(verts), 30, RGBA(0, 0, 0, 0.2)), bg=:pink, fg=:darkblue, xlim=(0, 1), ylim=(0, 1), leg=false)
+     end # testset
+     @testset "Histogram 2D" begin
+        histogram2d(randn(10000), randn(10000), nbins=20)
+     end # testset
+     @testset "Heatmap-like" begin
+        xs = [string("x", i) for i = 1:10]
+        ys = [string("y", i) for i = 1:4]
+        z = float((1:4) * reshape(1:10, 1, :))
+        pgfx_plot = heatmap(xs, ys, z, aspect_ratio=1)
+        Plots._update_plot_object(pgfx_plot)
+        if @test_nowarn(haskey(Plots.pgfx_axes(pgfx_plot.o)[1].options.dict, "colorbar") == true)
+           @test Plots.pgfx_axes(pgfx_plot.o)[1]["colorbar"] === nothing
+           @test Plots.pgfx_axes(pgfx_plot.o)[1]["colormap name"] == "plots1"
+        end
+
+        pgfx_plot = wireframe(xs, ys, z, aspect_ratio=1)
+        # TODO: clims are wrong
+     end # testset
+     @testset "Contours" begin
+        x = 1:0.5:20
+        y = 1:0.5:10
+        f(x, y) = begin
+           (3x + y ^ 2) * abs(sin(x) + cos(y))
+        end
+        X = repeat(reshape(x, 1, :), length(y), 1)
+        Y = repeat(y, 1, length(x))
+        Z = map(f, X, Y)
+        p2 = contour(x, y, Z)
+        p1 = contour(x, y, f, fill=true)
+        plot(p1, p2)
+        # TODO: colorbar for filled contours
+     end # testset
+     @testset "Varying colors" begin
+        t = range(0, stop=1, length=100)
+         θ = (6π) .* t
+         x = t .* cos.(θ)
+         y = t .* sin.(θ)
+         p1 = plot(x, y, line_z=t, linewidth=3, legend=false)
+         p2 = scatter(x, y, marker_z=((x, y)->begin
+                             x + y
+                         end), color=:bluesreds, legend=false)
+         plot(p1, p2)
+     end # testset
+     @testset "Framestyles" begin
+        scatter(fill(randn(10), 6), fill(randn(10), 6), framestyle=[:box :semi :origin :zerolines :grid :none], title=[":box" ":semi" ":origin" ":zerolines" ":grid" ":none"], color=permutedims(1:6), layout=6, label="", markerstrokewidth=0, ticks=-2:2)
+        # TODO: support :semi
+     end # testset
+     @testset "Quiver" begin
+        x = -2pi:0.2:2*pi
+        y = sin.(x)
+
+        u = ones(length(x))
+        v = cos.(x)
+        plot( x, y, quiver = (u, v), arrow = true )
+        # TODO: could adjust limits to fit arrows if too long, but how?
+     end # testset
+     @testset "Annotations" begin
+        y = rand(10)
+        plot(y, annotations=(3, y[3], Plots.text("this is \\#3", :left)), leg=false)
+        annotate!([(5, y[5], Plots.text("this is \\#5", 16, :red, :center)), (10, y[10], Plots.text("this is \\#10", :right, 20, "courier"))])
+        scatter!(range(2, stop=8, length=6), rand(6), marker=(50, 0.2, :orange), series_annotations=["series", "annotations", "map", "to", "series", Plots.text("data", :green)])
+     end # testset
+end # testset