Merge pull request #1615 from pfitzseb/sp/junodisplay

Fix display on Juno 0.7
fix display on Juno 0.7
2018-08-04 06:05:00 +02:00 · 2018-08-03 12:37:12 +02:00 · 2018-08-01 13:12:48 +02:00 · 2018-07-28 08:53:03 +02:00 · 2018-07-26 16:43:05 +02:00 · 2018-07-25 23:39:55 +02:00
41 changed files with 652 additions and 425 deletions
@@ -4,10 +4,11 @@ os:
  - linux
  # - osx
 julia:
-  - 0.6
-matrix:
-  allow_failures:
-    - julia: nightly
+  # - 0.7
+  - nightly
+# matrix:
+#   allow_failures:
+#     - julia: nightly

 # # before install:
 # #   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
@@ -44,7 +45,7 @@ notifications:
 # uncomment the following lines to override the default test script
 script:
 - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots")'
+ - julia -e 'using Pkg; Pkg.add(pwd()); Pkg.build("Plots")'
 - julia test/travis_commands.jl
 # - julia -e 'Pkg.clone("ImageMagick"); Pkg.build("ImageMagick")'
 # - julia -e 'Pkg.clone("GR"); Pkg.build("GR")'
@@ -3,13 +3,29 @@

 #### notes on release changes, ongoing development, and future planned work

- All new development should target 0.15!
+- Minor version 0.17 is the last one to support Julia 0.6!!
 - Minor version 0.11 is the last one to support Julia 0.5!!
 	- Critical bugfixes only
    - `backports` branch is for Julia 0.5

 ---
 ## (current master)
+- All new development should target Julia 0.7!
+
+## 0.17.4
+- fix thickness_scaling for pyplot
+
+## 0.17.3
+- Log-scale heatmap edge computation
+- Fix size and dpi for GR and PyPlot
+- Fix fillrange with line segments on PyPlot and Plotly
+- fix flip for heatmap and image on GR
+- New attributes for PGFPlots
+- Widen axes for most series types and log scales
+- Plotly: fix log scale with no ticks
+- Fix axis flip on Plotly
+- Fix hover and zcolor interaction in Plotly
+- WebIO integration for PlotlyJS backend

 ## 0.17.2
 - fix single subplot in plotly
@@ -1,4 +1,4 @@
-julia 0.6
+julia 0.7-alpha

 RecipesBase 0.2.3
 PlotUtils 0.4.1
@@ -1,15 +1,14 @@
 environment:
  matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  # - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
+  # - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"

-matrix:
-  allow_failures:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe" #check and address
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+# matrix:
+#   allow_failures:
+#   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
+#   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"

 notifications:
  - provider: Email
@@ -3,6 +3,6 @@

 local_fn = joinpath(dirname(@__FILE__), "plotly-latest.min.js")
 if !isfile(local_fn)
-	info("Cannot find deps/plotly-latest.min.js... downloading latest version.")
+	@info("Cannot find deps/plotly-latest.min.js... downloading latest version.")
 	download("https://cdn.plot.ly/plotly-latest.min.js", local_fn)
 end
@@ -6,6 +6,7 @@ using Reexport

 import StaticArrays
 using StaticArrays.FixedSizeArrays
+using Dates, Printf, Statistics, Base64, LinearAlgebra

@reexport using RecipesBase
 import RecipesBase: plot, plot!, animate
@@ -264,29 +265,29 @@ xgrid!(args...; kw...)                                    = plot!(; xgrid = args
 ygrid!(args...; kw...)                                    = plot!(; ygrid = args, kw...)

 let PlotOrSubplot = Union{Plot, Subplot}
-    title!(plt::PlotOrSubplot, s::AbstractString; kw...)                  = plot!(plt; title = s, kw...)
-    xlabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; xlabel = s, kw...)
-    ylabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; ylabel = s, kw...)
-    xlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; xlims = lims, kw...)
-    ylims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; ylims = lims, kw...)
-    zlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; zlims = lims, kw...)
-    xlims!(plt::PlotOrSubplot, xmin::Real, xmax::Real; kw...)             = plot!(plt; xlims = (xmin,xmax), kw...)
-    ylims!(plt::PlotOrSubplot, ymin::Real, ymax::Real; kw...)             = plot!(plt; ylims = (ymin,ymax), kw...)
-    zlims!(plt::PlotOrSubplot, zmin::Real, zmax::Real; kw...)             = plot!(plt; zlims = (zmin,zmax), kw...)
-    xticks!(plt::PlotOrSubplot, ticks::AVec{T}; kw...) where {T<:Real}           = plot!(plt; xticks = ticks, kw...)
-    yticks!(plt::PlotOrSubplot, ticks::AVec{T}; kw...) where {T<:Real}           = plot!(plt; yticks = ticks, kw...)
-    xticks!(plt::PlotOrSubplot,
+    global title!(plt::PlotOrSubplot, s::AbstractString; kw...)                  = plot!(plt; title = s, kw...)
+    global xlabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; xlabel = s, kw...)
+    global ylabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; ylabel = s, kw...)
+    global xlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; xlims = lims, kw...)
+    global ylims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; ylims = lims, kw...)
+    global zlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; zlims = lims, kw...)
+    global xlims!(plt::PlotOrSubplot, xmin::Real, xmax::Real; kw...)             = plot!(plt; xlims = (xmin,xmax), kw...)
+    global ylims!(plt::PlotOrSubplot, ymin::Real, ymax::Real; kw...)             = plot!(plt; ylims = (ymin,ymax), kw...)
+    global zlims!(plt::PlotOrSubplot, zmin::Real, zmax::Real; kw...)             = plot!(plt; zlims = (zmin,zmax), kw...)
+    global xticks!(plt::PlotOrSubplot, ticks::AVec{T}; kw...) where {T<:Real}           = plot!(plt; xticks = ticks, kw...)
+    global yticks!(plt::PlotOrSubplot, ticks::AVec{T}; kw...) where {T<:Real}           = plot!(plt; yticks = ticks, kw...)
+    global xticks!(plt::PlotOrSubplot,
   ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(plt; xticks = (ticks,labels), kw...)
-    yticks!(plt::PlotOrSubplot,
+    global yticks!(plt::PlotOrSubplot,
   ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(plt; yticks = (ticks,labels), kw...)
-    xgrid!(plt::PlotOrSubplot, args...; kw...)                  = plot!(plt; xgrid = args, kw...)
-    ygrid!(plt::PlotOrSubplot, args...; kw...)                  = plot!(plt; ygrid = args, kw...)
-    annotate!(plt::PlotOrSubplot, anns...; kw...)                         = plot!(plt; annotation = anns, kw...)
-    annotate!(plt::PlotOrSubplot, anns::AVec{T}; kw...) where {T<:Tuple}         = plot!(plt; annotation = anns, kw...)
-    xflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                  = plot!(plt; xflip = flip, kw...)
-    yflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                  = plot!(plt; yflip = flip, kw...)
-    xaxis!(plt::PlotOrSubplot, args...; kw...)                            = plot!(plt; xaxis = args, kw...)
-    yaxis!(plt::PlotOrSubplot, args...; kw...)                            = plot!(plt; yaxis = args, kw...)
+    global xgrid!(plt::PlotOrSubplot, args...; kw...)                  = plot!(plt; xgrid = args, kw...)
+    global ygrid!(plt::PlotOrSubplot, args...; kw...)                  = plot!(plt; ygrid = args, kw...)
+    global annotate!(plt::PlotOrSubplot, anns...; kw...)                         = plot!(plt; annotation = anns, kw...)
+    global annotate!(plt::PlotOrSubplot, anns::AVec{T}; kw...) where {T<:Tuple}         = plot!(plt; annotation = anns, kw...)
+    global xflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                  = plot!(plt; xflip = flip, kw...)
+    global yflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                  = plot!(plt; yflip = flip, kw...)
+    global xaxis!(plt::PlotOrSubplot, args...; kw...)                            = plot!(plt; xaxis = args, kw...)
+    global yaxis!(plt::PlotOrSubplot, args...; kw...)                            = plot!(plt; yaxis = args, kw...)
 end


@@ -65,6 +65,7 @@ const _arg_desc = KW(
 :html_output_format       => "Symbol.  When writing html output, what is the format?  `:png` and `:svg` are currently supported.",
 :inset_subplots 		  => "nothing or vector of 2-tuple (parent,bbox).  optionally pass a vector of (parent,bbox) tuples which are the parent layout and the relative bounding box of inset subplots",
 :dpi 					  => "Number.  Dots Per Inch of output figures",
+:thickness_scaling        => "Number. Scale for the thickness of all line elements like lines, borders, axes, grid lines, ... defaults to 1.",
 :display_type 			  => "Symbol (`:auto`, `:gui`, or `:inline`).  When supported, `display` will either open a GUI window or plot inline.",
 :extra_kwargs 			  => "KW (Dict{Symbol,Any}).  Pass a map of extra keyword args which may be specific to a backend.",
 :fontfamily               => "String or Symbol.  Default font family for title, legend entries, tick labels and guides",
@@ -138,6 +139,13 @@ const _arg_desc = KW(
 :gridalpha                => "Number in [0,1]. The alpha/opacity override for the grid lines.",
 :gridstyle                => "Symbol. Style of the grid lines. Choose from $(_allStyles)",
 :gridlinewidth            => "Number. Width of the grid lines (in pixels)",
+:foreground_color_minor_grid => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of minor grid lines.",
+:minorgrid                => "Bool. Adds minor grid lines and ticks to the plot. Set minorticks to change number of gridlines",
+:minorticks               => "Integer. Intervals to divide the gap between major ticks into",
+:minorgridalpha           => "Number in [0,1]. The alpha/opacity override for the minorgrid lines.",
+:minorgridstyle           => "Symbol. Style of the minor grid lines. Choose from $(_allStyles)",
+:minorgridlinewidth       => "Number. Width of the minor grid lines (in pixels)",
 :tick_direction           => "Symbol.  Direction of the ticks. `:in` or `:out`",
-:showaxis                 => "Bool, Symbol or String.  Show the axis. `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:off`"
+:showaxis                 => "Bool, Symbol or String.  Show the axis. `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:off`",
+:widen                    => "Bool. Widen the axis limits by a small factor to avoid cut-off markers and lines at the borders. Defaults to `true`.",
 )
@@ -15,7 +15,7 @@ function add_non_underscore_aliases!(aliases::Dict{Symbol,Symbol})
    for (k,v) in aliases
        s = string(k)
        if '_' in s
-            aliases[Symbol(replace(s, "_", ""))] = v
+            aliases[Symbol(replace(s, "_" => ""))] = v
        end
    end
 end
@@ -176,7 +176,7 @@ const _positionAliases = Dict{Symbol,Symbol}(

 const _allScales = [:identity, :ln, :log2, :log10, :asinh, :sqrt]
 const _logScales = [:ln, :log2, :log10]
-const _logScaleBases = Dict(:ln => e, :log2 => 2.0, :log10 => 10.0)
+const _logScaleBases = Dict(:ln => ℯ, :log2 => 2.0, :log10 => 10.0)
 const _scaleAliases = Dict{Symbol,Symbol}(
    :none => :identity,
    :log  => :log10,
@@ -188,11 +188,11 @@ const _allGridSyms = [:x, :y, :z,
                    :all, :both, :on, :yes, :show,
                    :none, :off, :no, :hide]
 const _allGridArgs = [_allGridSyms; string.(_allGridSyms); nothing]
-hasgrid(arg::Void, letter) = false
+hasgrid(arg::Nothing, letter) = false
 hasgrid(arg::Bool, letter) = arg
 function hasgrid(arg::Symbol, letter)
    if arg in _allGridSyms
-        arg in (:all, :both, :on) || contains(string(arg), string(letter))
+        arg in (:all, :both, :on) || occursin(string(letter), string(arg))
    else
        warn("Unknown grid argument $arg; $(Symbol(letter, :grid)) was set to `true` instead.")
        true
@@ -206,11 +206,11 @@ const _allShowaxisSyms = [:x, :y, :z,
                    :all, :both, :on, :yes, :show,
                    :off, :no, :hide]
 const _allShowaxisArgs = [_allGridSyms; string.(_allGridSyms)]
-showaxis(arg::Void, letter) = false
+showaxis(arg::Nothing, letter) = false
 showaxis(arg::Bool, letter) = arg
 function showaxis(arg::Symbol, letter)
    if arg in _allGridSyms
-        arg in (:all, :both, :on, :yes) || contains(string(arg), string(letter))
+        arg in (:all, :both, :on, :yes) || occursin(string(letter), string(arg))
    else
        warn("Unknown showaxis argument $arg; $(Symbol(letter, :showaxis)) was set to `true` instead.")
        true
@@ -301,6 +301,7 @@ const _plot_defaults = KW(
    :inset_subplots              => nothing,   # optionally pass a vector of (parent,bbox) tuples which are
                                               # the parent layout and the relative bounding box of inset subplots
    :dpi                         => DPI,        # dots per inch for images, etc
+    :thickness_scaling           => 1,
    :display_type                => :auto,
    :extra_kwargs                => KW(),
 )
@@ -379,8 +380,15 @@ const _axis_defaults = KW(
    :gridalpha                => 0.1,
    :gridstyle                => :solid,
    :gridlinewidth            => 0.5,
+    :foreground_color_minor_grid => :match,            # grid color
+    :minorgridalpha           => 0.05,
+    :minorgridstyle           => :solid,
+    :minorgridlinewidth       => 0.5,
    :tick_direction           => :in,
+    :minorticks               => false,
+    :minorgrid                => false,
    :showaxis                 => true,
+    :widen                    => true,
 )

 const _suppress_warnings = Set{Symbol}([
@@ -496,6 +504,8 @@ add_aliases(:foreground_color_subplot, :fg_subplot, :fgsubplot, :fgcolor_subplot
                            :foreground_colour_subplot, :fgcolour_subplot, :fg_colour_subplot)
 add_aliases(:foreground_color_grid, :fg_grid, :fggrid, :fgcolor_grid, :fg_color_grid, :foreground_grid,
                            :foreground_colour_grid, :fgcolour_grid, :fg_colour_grid, :gridcolor)
+add_aliases(:foreground_color_minor_grid, :fg_minor_grid, :fgminorgrid, :fgcolor_minorgrid, :fg_color_minorgrid, :foreground_minorgrid,
+                            :foreground_colour_minor_grid, :fgcolour_minorgrid, :fg_colour_minor_grid, :minorgridcolor)
 add_aliases(:foreground_color_title, :fg_title, :fgtitle, :fgcolor_title, :fg_color_title, :foreground_title,
                            :foreground_colour_title, :fgcolour_title, :fg_colour_title, :titlecolor)
 add_aliases(:foreground_color_axis, :fg_axis, :fgaxis, :fgcolor_axis, :fg_color_axis, :foreground_axis,
@@ -572,6 +582,8 @@ add_aliases(:inset_subplots, :inset, :floating)
 add_aliases(:stride, :wirefame_stride, :surface_stride, :surf_str, :str)
 add_aliases(:gridlinewidth, :gridwidth, :grid_linewidth, :grid_width, :gridlw, :grid_lw)
 add_aliases(:gridstyle, :grid_style, :gridlinestyle, :grid_linestyle, :grid_ls, :gridls)
+add_aliases(:minorgridlinewidth, :minorgridwidth, :minorgrid_linewidth, :minorgrid_width, :minorgridlw, :minorgrid_lw)
+add_aliases(:minorgridstyle, :minorgrid_style, :minorgridlinestyle, :minorgrid_linestyle, :minorgrid_ls, :minorgridls)
 add_aliases(:framestyle, :frame_style, :frame, :axesstyle, :axes_style, :boxstyle, :box_style, :box, :borderstyle, :border_style, :border)
 add_aliases(:tick_direction, :tickdirection, :tick_dir, :tickdir, :tick_orientation, :tickorientation, :tick_or, :tickor)
 add_aliases(:camera, :cam, :viewangle, :view_angle)
@@ -652,6 +664,7 @@ function handleColors!(d::KW, arg, csym::Symbol)
            d[csym] = c
        end
        return true
+    catch
    end
    false
 end
@@ -792,6 +805,39 @@ function processGridArg!(d::KW, arg, letter)
    end
 end

+function processMinorGridArg!(d::KW, arg, letter)
+    if arg in _allGridArgs || isa(arg, Bool)
+        d[Symbol(letter, :minorgrid)] = hasgrid(arg, letter)
+
+    elseif allStyles(arg)
+        d[Symbol(letter, :minorgridstyle)] = arg
+        d[Symbol(letter, :minorgrid)] = true
+
+    elseif typeof(arg) <: Stroke
+        arg.width == nothing || (d[Symbol(letter, :minorgridlinewidth)] = arg.width)
+        arg.color == nothing || (d[Symbol(letter, :foreground_color_minor_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
+        arg.alpha == nothing || (d[Symbol(letter, :minorgridalpha)] = arg.alpha)
+        arg.style == nothing || (d[Symbol(letter, :minorgridstyle)] = arg.style)
+        d[Symbol(letter, :minorgrid)] = true
+
+    # linealpha
+    elseif allAlphas(arg)
+        d[Symbol(letter, :minorgridalpha)] = arg
+        d[Symbol(letter, :minorgrid)] = true
+
+    # linewidth
+    elseif allReals(arg)
+        d[Symbol(letter, :minorgridlinewidth)] = arg
+        d[Symbol(letter, :minorgrid)] = true
+
+    # color
+    elseif handleColors!(d, arg, Symbol(letter, :foreground_color_minor_grid))
+        d[Symbol(letter, :minorgrid)] = true
+    else
+        warn("Skipped grid arg $arg.")
+    end
+end
+
 function processFontArg!(d::KW, fontname::Symbol, arg)
    T = typeof(arg)
    if T <: Font
@@ -891,7 +937,21 @@ function preprocessArgs!(d::KW)
            processGridArg!(d, arg, letter)
        end
    end
-
+    # handle minor grid args common to all axes
+    args = pop!(d, :minorgrid, ())
+    for arg in wraptuple(args)
+        for letter in (:x, :y, :z)
+            processMinorGridArg!(d, arg, letter)
+        end
+    end
+    # handle individual axes grid args
+    for letter in (:x, :y, :z)
+        gridsym = Symbol(letter, :minorgrid)
+        args = pop!(d, gridsym, ())
+        for arg in wraptuple(args)
+            processMinorGridArg!(d, arg, letter)
+        end
+    end
    # fonts
    for fontname in (:titlefont, :legendfont)
        args = pop!(d, fontname, ())
@@ -1026,7 +1086,7 @@ function extractGroupArgs(vs::Tuple, args...)
 end

 # allow passing NamedTuples for a named legend entry
-@require NamedTuples begin
+@require NamedTuples = "73a701b4-84e1-5df0-88ff-1968ee2ee8dc" begin
    legendEntryFromTuple(ns::NamedTuples.NamedTuple) =
        join(["$k = $v" for (k, v) in zip(keys(ns), values(ns))], ", ")

@@ -1129,7 +1189,7 @@ function convertLegendValue(val::Symbol)
    end
 end
 convertLegendValue(val::Bool) = val ? :best : :none
-convertLegendValue(val::Void) = :none
+convertLegendValue(val::Nothing) = :none
 convertLegendValue(v::Tuple{S,T}) where {S<:Real, T<:Real} = v
 convertLegendValue(v::AbstractArray) = map(convertLegendValue, v)

@@ -1219,6 +1279,7 @@ const _match_map2 = KW(
    :foreground_color_axis    => :foreground_color_subplot,
    :foreground_color_border  => :foreground_color_subplot,
    :foreground_color_grid    => :foreground_color_subplot,
+    :foreground_color_minor_grid=> :foreground_color_subplot,
    :foreground_color_guide   => :foreground_color_subplot,
    :foreground_color_text    => :foreground_color_subplot,
    :fontfamily_subplot       => :fontfamily,
@@ -1406,6 +1467,7 @@ function _update_axis_colors(axis::Axis)
    color_or_nothing!(axis.d, :foreground_color_guide)
    color_or_nothing!(axis.d, :foreground_color_text)
    color_or_nothing!(axis.d, :foreground_color_grid)
+    color_or_nothing!(axis.d, :foreground_color_minor_grid)
    return
 end

@@ -1501,7 +1563,7 @@ function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot)
    end

    # update series color
-    d[:seriescolor] = getSeriesRGBColor.(d[:seriescolor], sp, plotIndex)
+    d[:seriescolor] = getSeriesRGBColor.(d[:seriescolor], Ref(sp), plotIndex)

    # update other colors
    for s in (:line, :marker, :fill)
@@ -1515,7 +1577,7 @@ function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot)
        elseif d[csym] == :match
            plot_color.(d[:seriescolor])
        else
-            getSeriesRGBColor.(d[csym], sp, plotIndex)
+            getSeriesRGBColor.(d[csym], Ref(sp), plotIndex)
        end
    end

@@ -1523,9 +1585,9 @@ function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot)
    d[:markerstrokecolor] = if d[:markerstrokecolor] == :match
        plot_color(sp[:foreground_color_subplot])
    elseif d[:markerstrokecolor] == :auto
-        getSeriesRGBColor.(d[:markercolor], sp, plotIndex)
+        getSeriesRGBColor.(d[:markercolor], Ref(sp), plotIndex)
    else
-        getSeriesRGBColor.(d[:markerstrokecolor], sp, plotIndex)
+        getSeriesRGBColor.(d[:markerstrokecolor], Ref(sp), plotIndex)
    end

    # if marker_z, fill_z or line_z are set, ensure we have a gradient
@@ -251,7 +251,7 @@ function get_ticks(axis::Axis)
            # discrete ticks...
            n = length(dvals)
            rng = if ticks == :auto
-                Int[round(Int,i) for i in linspace(1, n, 15)]
+                Int[round(Int,i) for i in range(1, stop=n, length=15)]
            else # if ticks == :all
                1:n
            end
@@ -265,7 +265,7 @@ function get_ticks(axis::Axis)
        end
    elseif typeof(ticks) <: Union{AVec, Int}
        if !isempty(dvals) && typeof(ticks) <: Int
-            rng = Int[round(Int,i) for i in linspace(1, length(dvals), ticks)]
+            rng = Int[round(Int,i) for i in range(1, stop=length(dvals), length=ticks)]
            axis[:continuous_values][rng], dvals[rng]
        else
            # override ticks, but get the labels
@@ -286,6 +286,34 @@ _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)
+    axis[:minorticks] in (nothing, false) && !axis[:minorgrid] && return nothing
+    ticks = ticks[1]
+    length(ticks) < 2 && return nothing
+    
+    amin, amax = axis_limits(axis)
+    #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
+        ratio = 1
+    else
+        return nothing
+    end
+    first_step = ticks[2] - ticks[1]
+    last_step = ticks[end] - ticks[end-1]
+    ticks =  [ticks[1] - first_step/ratio; ticks; ticks[end] + last_step*ratio]
+
+    #Default to 5 intervals between major ticks
+    n = typeof(axis[:minorticks]) <: Integer && axis[:minorticks] > 1 ? axis[:minorticks] : 5
+    minorticks = typeof(ticks[1])[]
+    for (i,hi) in enumerate(ticks[2:end])
+        lo = ticks[i]
+        append!(minorticks,collect(lo + (hi-lo)/n :(hi-lo)/n: hi - (hi-lo)/2n))
+    end
+    minorticks[amin .<= minorticks .<= amax]
+end
+
 # -------------------------------------------------------------------------


@@ -310,7 +338,7 @@ function expand_extrema!(axis::Axis, v::Number)
 end

 # these shouldn't impact the extrema
-expand_extrema!(axis::Axis, ::Void) = axis[:extrema]
+expand_extrema!(axis::Axis, ::Nothing) = axis[:extrema]
 expand_extrema!(axis::Axis, ::Bool) = axis[:extrema]


@@ -418,21 +446,23 @@ end
 # -------------------------------------------------------------------------

 # push the limits out slightly
-function widen(lmin, lmax)
-    span = lmax - lmin
+function widen(lmin, lmax, scale = :identity)
+    f, invf = scalefunc(scale), invscalefunc(scale)
+    span = f(lmax) - f(lmin)
    # eps = NaNMath.max(1e-16, min(1e-2span, 1e-10))
    eps = NaNMath.max(1e-16, 0.03span)
-    lmin-eps, lmax+eps
+    invf(f(lmin)-eps), invf(f(lmax)+eps)
 end

-# figure out if widening is a good idea.  if there's a scale set it's too tricky,
-# so lazy out and don't widen
+# figure out if widening is a good idea.
+const _widen_seriestypes = (:line, :path, :steppre, :steppost, :sticks, :scatter, :barbins, :barhist, :histogram, :scatterbins, :scatterhist, :stepbins, :stephist, :bins2d, :histogram2d, :bar, :shape, :path3d, :scatter3d)
+
 function default_should_widen(axis::Axis)
    should_widen = false
-    if axis[:scale] == :identity && !is_2tuple(axis[:lims])
+    if !is_2tuple(axis[:lims])
        for sp in axis.sps
            for series in series_list(sp)
-                if series.d[:seriestype] in (:scatter,) || series.d[:markershape] != :none
+                if series.d[:seriestype] in _widen_seriestypes
                    should_widen = true
                end
            end
@@ -476,8 +506,8 @@ function axis_limits(axis::Axis, should_widen::Bool = default_should_widen(axis)
        else
            amin, amax
        end
-    elseif should_widen
-        widen(amin, amax)
+    elseif should_widen && axis[:widen]
+        widen(amin, amax, axis[:scale])
    elseif lims == :round
        round_limits(amin,amax)
    else
@@ -560,12 +590,16 @@ function axis_drawing_info(sp::Subplot)
    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)
    xaxis_segs = Segments(2)
    yaxis_segs = Segments(2)
    xtick_segs = Segments(2)
    ytick_segs = Segments(2)
    xgrid_segs = Segments(2)
    ygrid_segs = Segments(2)
+    xminorgrid_segs = Segments(2)
+    yminorgrid_segs = Segments(2)
    xborder_segs = Segments(2)
    yborder_segs = Segments(2)

@@ -608,6 +642,28 @@ function axis_drawing_info(sp::Subplot)
                xaxis[:grid] && push!(xgrid_segs, (xtick, ymin), (xtick, ymax)) # vertical grid
            end
        end
+        if !(xaxis[:minorticks] in (nothing, false)) || xaxis[:minorgrid]
+            f = scalefunc(yaxis[:scale])
+            invf = invscalefunc(yaxis[:scale])
+            ticks_in = xaxis[:tick_direction] == :out ? -1 : 1
+            t1 = invf(f(ymin) + 0.01 * (f(ymax) - f(ymin)) * ticks_in)
+            t2 = invf(f(ymax) - 0.01 * (f(ymax) - f(ymin)) * ticks_in)
+            t3 = invf(f(0) + 0.01 * (f(ymax) - f(ymin)) * ticks_in)
+
+            for xminortick in xminorticks
+                if xaxis[:showaxis]
+                    tick_start, tick_stop = if sp[:framestyle] == :origin
+                        (0, t3)
+                    else
+                        xor(xaxis[:mirror], yaxis[:flip]) ? (ymax, t2) : (ymin, t1)
+                    end
+                    push!(xtick_segs, (xminortick, tick_start), (xminortick, tick_stop)) # bottom tick
+                end
+                # sp[:draw_axes_border] && push!(xaxis_segs, (xtick, ymax), (xtick, t2)) # top tick
+                xaxis[:minorgrid] && push!(xminorgrid_segs, (xminortick, ymin), (xminortick, ymax)) # vertical grid
+            end
+        end
+

        # yaxis
        if yaxis[:showaxis]
@@ -647,7 +703,28 @@ function axis_drawing_info(sp::Subplot)
                yaxis[:grid] && push!(ygrid_segs, (xmin, ytick), (xmax, ytick)) # horizontal grid
            end
        end
+        if !(yaxis[:minorticks] in (nothing, false)) || yaxis[:minorgrid]
+            f = scalefunc(xaxis[:scale])
+            invf = invscalefunc(xaxis[:scale])
+            ticks_in = yaxis[:tick_direction] == :out ? -1 : 1
+            t1 = invf(f(xmin) + 0.01 * (f(xmax) - f(xmin)) * ticks_in)
+            t2 = invf(f(xmax) - 0.01 * (f(xmax) - f(xmin)) * ticks_in)
+            t3 = invf(f(0) + 0.01 * (f(xmax) - f(xmin)) * ticks_in)
+
+            for ytick in yminorticks
+                if yaxis[:showaxis]
+                    tick_start, tick_stop = if sp[:framestyle] == :origin
+                        (0, t3)
+                    else
+                        xor(yaxis[:mirror], xaxis[:flip]) ? (xmax, t2) : (xmin, t1)
+                    end
+                    push!(ytick_segs, (tick_start, ytick), (tick_stop, ytick)) # left tick
+                end
+                # sp[:draw_axes_border] && push!(yaxis_segs, (xmax, ytick), (t2, ytick)) # right tick
+                yaxis[:minorgrid] && push!(yminorgrid_segs, (xmin, ytick), (xmax, ytick)) # horizontal grid
+            end
+        end
    end

-    xticks, yticks, xaxis_segs, yaxis_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xborder_segs, yborder_segs
+    xticks, yticks, xaxis_segs, yaxis_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xminorgrid_segs, yminorgrid_segs, xborder_segs, yborder_segs
 end
@@ -1,3 +1,4 @@
+using Pkg

 struct NoBackend <: AbstractBackend end

@@ -134,8 +135,7 @@ CurrentBackend(sym::Symbol) = CurrentBackend(sym, _backend_instance(sym))
 function pickDefaultBackend()
    env_default = get(ENV, "PLOTS_DEFAULT_BACKEND", "")
    if env_default != ""
-        try
-            Pkg.installed(env_default)  # this will error if not installed
+        if env_default in keys(Pkg.installed())
            sym = Symbol(lowercase(env_default))
            if haskey(_backendType, sym)
                return backend(sym)
@@ -143,7 +143,7 @@ function pickDefaultBackend()
                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"))
            end
-        catch
+        else
            warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not installed.")
        end
    end
@@ -152,7 +152,7 @@ function pickDefaultBackend()
    # which one someone will want to use if they have the package installed...accounting for
    # features, speed, and robustness
    for pkgstr in ("GR", "PyPlot", "PlotlyJS", "PGFPlots", "UnicodePlots", "InspectDR", "GLVisualize")
-        if Pkg.installed(pkgstr) != nothing
+        if pkgstr in keys(Pkg.installed())
            return backend(Symbol(lowercase(pkgstr)))
        end
    end
@@ -9,7 +9,7 @@ TODO
    * fix units in all visuals (e.g dotted lines, marker scale, surfaces)
 =#

-@require Revise begin
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "glvisualize.jl"))
 end

@@ -80,7 +80,7 @@ function _initialize_backend(::GLVisualizeBackend; kw...)
        is_marker_supported(::GLVisualizeBackend, shape::GLVisualize.AllPrimitives) = true
        is_marker_supported(::GLVisualizeBackend, shape::Union{Vector{Matrix{C}}, Matrix{C}}) where {C<:Colorant} = true
        is_marker_supported(::GLVisualizeBackend, shape::Shape) = true
-        const GL = Plots
+        GL = Plots
    end
 end

@@ -397,7 +397,7 @@ function gappy(x, ps)
    return last(ps) - x
 end
 function ticks(points, resolution)
-    Float16[gappy(x, points) for x = linspace(first(points),last(points), resolution)]
+    Float16[gappy(x, points) for x = range(first(points), stop=last(points), length=resolution)]
 end


@@ -696,7 +696,7 @@ function text_model(font, pivot)
    end
 end
 function gl_draw_axes_2d(sp::Plots.Subplot{Plots.GLVisualizeBackend}, model, area)
-    xticks, yticks, xspine_segs, yspine_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xborder_segs, yborder_segs = Plots.axis_drawing_info(sp)
+    xticks, yticks, xspine_segs, yspine_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xminorgrid_segs, yminorgrid_segs, xborder_segs, yborder_segs = Plots.axis_drawing_info(sp)
    xaxis = sp[:xaxis]; yaxis = sp[:yaxis]

    xgc = Colors.color(Plots.gl_color(xaxis[:foreground_color_grid]))
@@ -710,6 +710,14 @@ function gl_draw_axes_2d(sp::Plots.Subplot{Plots.GLVisualizeBackend}, model, are
        grid = draw_grid_lines(sp, ygrid_segs, yaxis[:gridlinewidth], yaxis[:gridstyle], model, RGBA(ygc, yaxis[:gridalpha]))
        push!(axis_vis, grid)
    end
+    if xaxis[:minorgrid]
+        minorgrid = draw_minorgrid_lines(sp, xminorgrid_segs, xaxis[:minorgridlinewidth], xaxis[:minorgridstyle], model, RGBA(xgc, xaxis[:minorgridalpha]))
+        push!(axis_vis, minorgrid)
+    end
+    if yaxis[:minorgrid]
+        minorgrid = draw_minorgrid_lines(sp, yminorgrid_segs, yaxis[:minorgridlinewidth], yaxis[:minorgridstyle], model, RGBA(ygc, yaxis[:minorgridalpha]))
+        push!(axis_vis, minorgrid)
+    end

    xac = Colors.color(Plots.gl_color(xaxis[:foreground_color_axis]))
    yac = Colors.color(Plots.gl_color(yaxis[:foreground_color_axis]))
@@ -901,12 +909,12 @@ function gl_boxplot(d, kw_args)
        # filter y
        values = y[filter(i -> _cycle(x,i) == glabel, 1:length(y))]
        # compute quantiles
-        q1,q2,q3,q4,q5 = quantile(values, linspace(0,1,5))
+        q1,q2,q3,q4,q5 = quantile(values, range(0, stop=1, length=5))
        # notch
        n = Plots.notch_width(q2, q4, length(values))
        # warn on inverted notches?
        if notch && !warning && ( (q2>(q3-n)) || (q4<(q3+n)) )
-            warn("Boxplot's notch went outside hinges. Set notch to false.")
+            @warn("Boxplot's notch went outside hinges. Set notch to false.")
            warning = true # Show the warning only one time
        end

@@ -1005,7 +1013,7 @@ end

 function scale_for_annotations!(series::Series, scaletype::Symbol = :pixels)
    anns = series[:series_annotations]
-    if anns != nothing && !isnull(anns.baseshape)
+    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
@@ -1331,7 +1339,7 @@ end


 function gl_surface(x,y,z, kw_args)
-    if isa(x, Range) && isa(y, Range)
+    if isa(x, AbstractRange) && isa(y, AbstractRange)
        main = z
        kw_args[:ranges] = (x, y)
    else
@@ -1347,7 +1355,7 @@ function gl_surface(x,y,z, kw_args)
        if get(kw_args, :wireframe, false)
            points = map(Point3f0, zip(vec(x), vec(y), vec(z)))
            faces = Cuint[]
-            idx = (i,j) -> sub2ind(size(z), i, j) - 1
+            idx = (i,j) -> CartesianIndices(size(z), i, j) - 1
            for i=1:size(z,1), j=1:size(z,2)

                i < size(z,1) && push!(faces, idx(i, j), idx(i+1, j))
@@ -3,7 +3,7 @@

 # significant contributions by @jheinen

-@require Revise begin
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "gr.jl"))
 end

@@ -144,7 +144,7 @@ gr_set_fillcolor(c)   = GR.setfillcolorind(gr_getcolorind(_cycle(c,1)))
 gr_set_markercolor(c) = GR.setmarkercolorind(gr_getcolorind(_cycle(c,1)))
 gr_set_textcolor(c)   = GR.settextcolorind(gr_getcolorind(_cycle(c,1)))
 gr_set_transparency(α::Real) = GR.settransparency(clamp(α, 0, 1))
-function gr_set_transparency(::Void) end
+function gr_set_transparency(::Nothing) end

 # --------------------------------------------------------------------------------------

@@ -195,8 +195,8 @@ 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.inqtextext(x, y, s[2:end-1])
-    elseif search(s, '\\') != 0 || contains(s, "10^{")
+        GR.inqmathtex(x, y, s[2:end-1])
+    elseif findfirst(isequal('\\'), s) != nothing || occursin("10^{", s)
        GR.inqtextext(x, y, s)
    else
        GR.inqtext(x, y, s)
@@ -208,7 +208,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 search(s, '\\') != 0 || contains(s, "10^{")
+    elseif findfirst(isequal('\\'), s) != nothing || occursin("10^{", s)
        GR.textext(x, y, s)
    else
        GR.text(x, y, s)
@@ -317,7 +317,7 @@ function normalize_zvals(zv::AVec, clims::NTuple{2, <:Real})
    if vmin == vmax
        zeros(length(zv))
    else
-        clamp.((zv - vmin) ./ (vmax - vmin), 0, 1)
+        clamp.((zv .- vmin) ./ (vmax .- vmin), 0, 1)
    end
 end

@@ -383,7 +383,7 @@ end
 function gr_set_line(lw, style, c) #, a)
    GR.setlinetype(gr_linetype[style])
    w, h = gr_plot_size
-    GR.setlinewidth(max(0, lw / ((w + h) * 0.001)))
+    GR.setlinewidth(_gr_thickness_scaling[1] * max(0, lw / ((w + h) * 0.001)))
    gr_set_linecolor(c) #, a)
 end

@@ -396,6 +396,7 @@ end

 # this stores the conversion from a font pointsize to "percentage of window height" (which is what GR uses)
 const _gr_point_mult = 0.0018 * ones(1)
+const _gr_thickness_scaling = ones(1)

 # set the font attributes... assumes _gr_point_mult has been populated already
 function gr_set_font(f::Font; halign = f.halign, valign = f.valign,
@@ -484,7 +485,7 @@ function gr_colorbar(sp::Subplot, clims)
    xmin, xmax = gr_xy_axislims(sp)[1:2]
    gr_set_viewport_cmap(sp)
    l = zeros(Int32, 1, 256)
-    l[1,:] = Int[round(Int, _i) for _i in linspace(1000, 1255, 256)]
+    l[1,:] = Int[round(Int, _i) for _i in range(1000, stop=1255, length=256)]
    GR.setscale(0)
    GR.setwindow(xmin, xmax, clims[1], clims[2])
    GR.cellarray(xmin, xmax, clims[2], clims[1], 1, length(l), l)
@@ -501,16 +502,16 @@ function gr_legend_pos(s::Symbol,w,h)
    if str == "best"
        str = "topright"
    end
-    if contains(str,"right")
+    if occursin("right", str)
        xpos = viewport_plotarea[2] - 0.05 - w
-    elseif contains(str,"left")
+    elseif occursin("left", str)
        xpos = viewport_plotarea[1] + 0.11
    else
        xpos = (viewport_plotarea[2]-viewport_plotarea[1])/2 - w/2 +.04
    end
-    if contains(str,"top")
+    if occursin("top", str)
        ypos = viewport_plotarea[4] - 0.06
-    elseif contains(str,"bottom")
+    elseif occursin("bottom", str)
        ypos = viewport_plotarea[3] + h + 0.06
    else
        ypos = (viewport_plotarea[4]-viewport_plotarea[3])/2 + h/2
@@ -530,7 +531,7 @@ const _gr_gradient_alpha = ones(256)

 function gr_set_gradient(c)
    grad = isa(c, ColorGradient) ? c : cgrad()
-    for (i,z) in enumerate(linspace(0, 1, 256))
+    for (i,z) in enumerate(range(0, stop=1, length=256))
        c = grad[z]
        GR.setcolorrep(999+i, red(c), green(c), blue(c))
        _gr_gradient_alpha[i] = alpha(c)
@@ -542,6 +543,9 @@ end
 function gr_display(plt::Plot, fmt="")
    GR.clearws()

+    _gr_thickness_scaling[1] = plt[:thickness_scaling]
+    dpi_factor = plt[:dpi] / Plots.DPI
+
    # collect some monitor/display sizes in meters and pixels
    display_width_meters, display_height_meters, display_width_px, display_height_px = GR.inqdspsize()
    display_width_ratio = display_width_meters / display_width_px
@@ -550,14 +554,6 @@ function gr_display(plt::Plot, fmt="")
    # compute the viewport_canvas, normalized to the larger dimension
    viewport_canvas = Float64[0,1,0,1]
    w, h = plt[:size]
-    if !haskey(ENV, "PLOTS_TEST")
-        dpi_factor = plt[:dpi] / DPI
-        if fmt == "png"
-            dpi_factor *= 6
-        end
-    else
-        dpi_factor = 1
-    end
    gr_plot_size[:] = [w, h]
    if w > h
        ratio = float(h) / w
@@ -580,7 +576,7 @@ function gr_display(plt::Plot, fmt="")

    # update point mult
    px_per_pt = px / pt
-    _gr_point_mult[1] = 1.5 * px_per_pt / max(h,w)
+    _gr_point_mult[1] = 1.5 * _gr_thickness_scaling[1] * px_per_pt / max(h,w)

    # subplots:
    for sp in plt.subplots
@@ -626,13 +622,14 @@ function gr_get_ticks_size(ticks, i)
 end

 function _update_min_padding!(sp::Subplot{GRBackend})
+    dpi = sp.plt[:thickness_scaling]
    if !haskey(ENV, "GKSwstype")
-        if isijulia() || (isdefined(Main, :Juno) && Juno.isactive())
+        if isijulia()
            ENV["GKSwstype"] = "svg"
        end
    end
    # Add margin given by the user
-    leftpad   = 2mm  + sp[:left_margin]
+    leftpad   = 4mm  + sp[:left_margin]
    toppad    = 2mm  + sp[:top_margin]
    rightpad  = 4mm  + sp[:right_margin]
    bottompad = 2mm  + sp[:bottom_margin]
@@ -668,7 +665,7 @@ function _update_min_padding!(sp::Subplot{GRBackend})
    if sp[:yaxis][:guide] != ""
        leftpad += 4mm
    end
-    sp.minpad = (leftpad, toppad, rightpad, bottompad)
+    sp.minpad = Tuple(dpi * [leftpad, toppad, rightpad, bottompad])
 end

 function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
@@ -718,6 +715,12 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
        end
        if st == :heatmap
            outside_ticks = true
+            for ax in (sp[:xaxis], sp[:yaxis])
+                v = series[ax[:letter]]
+                if 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])
            xy_lims = x[1], x[end], y[1], y[end]
            expand_extrema!(sp[:xaxis], x)
@@ -769,7 +772,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)

    # draw the axes
    gr_set_font(tickfont(xaxis))
-    GR.setlinewidth(1)
+    GR.setlinewidth(sp.plt[:thickness_scaling])

    if is3d(sp)
        zmin, zmax = gr_lims(zaxis, true)
@@ -815,7 +818,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            GR.setwindow(xmin, xmax, ymin, ymax)
        end

-        xticks, yticks, xspine_segs, yspine_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xborder_segs, yborder_segs = axis_drawing_info(sp)
+        xticks, yticks, xspine_segs, yspine_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xminorgrid_segs, yminorgrid_segs, xborder_segs, yborder_segs = axis_drawing_info(sp)
        # @show xticks yticks #spine_segs grid_segs

        # draw the grid lines
@@ -831,6 +834,18 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            gr_set_transparency(yaxis[:gridalpha])
            gr_polyline(coords(ygrid_segs)...)
        end
+        if xaxis[:minorgrid]
+            # gr_set_linecolor(sp[:foreground_color_grid])
+            # GR.grid(xtick, ytick, 0, 0, majorx, majory)
+            gr_set_line(xaxis[:minorgridlinewidth], xaxis[:minorgridstyle], xaxis[:foreground_color_minor_grid])
+            gr_set_transparency(xaxis[:minorgridalpha])
+            gr_polyline(coords(xminorgrid_segs)...)
+        end
+        if yaxis[:minorgrid]
+            gr_set_line(yaxis[:minorgridlinewidth], yaxis[:minorgridstyle], yaxis[:foreground_color_minor_grid])
+            gr_set_transparency(yaxis[:minorgridalpha])
+            gr_polyline(coords(yminorgrid_segs)...)
+        end
        gr_set_transparency(1.0)

        # axis lines
@@ -1048,7 +1063,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            if typeof(series[:levels]) <: AbstractArray
                h = series[:levels]
            else
-                h = series[:levels] > 1 ? linspace(zmin, zmax, series[:levels]) : [(zmin + zmax) / 2]
+                h = series[:levels] > 1 ? range(zmin, stop=zmax, length=series[:levels]) : [(zmin + zmax) / 2]
            end
            if series[:fillrange] != nothing
                GR.surface(x, y, z, GR.OPTION_CELL_ARRAY)
@@ -1066,7 +1081,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            if cmap
                gr_set_line(1, :solid, yaxis[:foreground_color_axis])
                gr_set_viewport_cmap(sp)
-                l = (length(h) > 1) ? round.(Int32, 1000 + (h - ignorenan_minimum(h)) / (ignorenan_maximum(h) - ignorenan_minimum(h)) * 255) : Int32[1000, 1255]
+                l = (length(h) > 1) ? round.(Int32, 1000 .+ (h .- ignorenan_minimum(h)) ./ (ignorenan_maximum(h) - ignorenan_minimum(h)) .* 255) : Int32[1000, 1255]
                GR.setwindow(xmin, xmax, zmin, zmax)
                GR.cellarray(xmin, xmax, zmax, zmin, 1, length(l), l)
                ztick = 0.5 * GR.tick(zmin, zmax)
@@ -1089,6 +1104,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
        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]
@@ -1192,7 +1211,10 @@ 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)
+            w, h = length(x), length(y)
+            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, float(z) * 255)
@@ -1348,10 +1370,10 @@ const _gr_mimeformats = Dict(
    "image/svg+xml"           => "svg",
 )

-const _gr_wstype_default = @static if is_linux()
+const _gr_wstype_default = @static if Sys.islinux()
    "x11"
    # "cairox11"
-elseif is_apple()
+elseif Sys.isapple()
    "quartz"
 else
    "use_default"
@@ -1369,7 +1391,7 @@ for (mime, fmt) in _gr_mimeformats
        ENV["GKS_FILEPATH"] = filepath
        gr_display(plt, $fmt)
        GR.emergencyclosegks()
-        write(io, readstring(filepath))
+        write(io, read(filepath, String))
        rm(filepath)
        if env != "0"
            ENV["GKSwstype"] = env
@@ -28,7 +28,7 @@ Read from .hdf5 file using:
    - Should be reliable for archival purposes.
 ==#

-@require Revise begin
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "hdf5.jl"))
 end

@@ -39,7 +39,7 @@ struct HDF5PlotNative; end #Indentifies a data element that can natively be hand
 struct HDF5CTuple; end #Identifies a "complex" tuple structure

 mutable struct HDF5Plot_PlotRef
-	ref::Union{Plot, Void}
+	ref::Union{Plot, Nothing}
 end


@@ -146,9 +146,9 @@ function _initialize_backend(::HDF5Backend)
        export HDF5
        if length(HDF5PLOT_MAP_TELEM2STR) < 1
            #Possible element types of high-level data types:
-            const telem2str = Dict{String, Type}(
+            telem2str = Dict{String, Type}(
                "NATIVE" => HDF5PlotNative,
-                "VOID" => Void,
+                "VOID" => Nothing,
                "BOOL" => Bool,
                "SYMBOL" => Symbol,
                "TUPLE" => Tuple,
@@ -315,9 +315,9 @@ function _hdf5plot_gwrite(grp, k::String, v::Array{Any})
    warn("Cannot write Array: $k=$v")
 end
 =#
-function _hdf5plot_gwrite(grp, k::String, v::Void)
+function _hdf5plot_gwrite(grp, k::String, v::Nothing)
    grp[k] = 0
-    _hdf5plot_writetype(grp, k, Void)
+    _hdf5plot_writetype(grp, k, Nothing)
 end
 function _hdf5plot_gwrite(grp, k::String, v::Bool)
    grp[k] = Int(v)
@@ -344,7 +344,7 @@ end
 function _hdf5plot_gwrite(grp, k::String, d::Dict)
 #    warn("Cannot write dict: $k=$d")
 end
-function _hdf5plot_gwrite(grp, k::String, v::Range)
+function _hdf5plot_gwrite(grp, k::String, v::AbstractRange)
    _hdf5plot_gwrite(grp, k, collect(v)) #For now
 end
 function _hdf5plot_gwrite(grp, k::String, v::ARGB{N0f8})
@@ -365,7 +365,7 @@ function _hdf5plot_gwritearray(grp, k::String, v::Array{T}) where T
    sz = size(v)

    for iter in eachindex(v)
-        coord = ind2sub(sz, iter)
+        coord = LinearIndices(sz, iter)
        elem = v[iter]
        idxstr = join(coord, "_")
        _hdf5plot_gwrite(vgrp, "v$idxstr", v[iter])
@@ -409,15 +409,15 @@ function _hdf5plot_gwrite(grp, k::String, v::Surface)
 	_hdf5plot_gwrite(grp, "data2d", v.surf)
 	_hdf5plot_writetype(grp, Surface)
 end
-#TODO: "Properly" support Nullable using _hdf5plot_writetype?
-function _hdf5plot_gwrite(grp, k::String, v::Nullable)
-    if isnull(v)
-        _hdf5plot_gwrite(grp, k, nothing)
-    else
-        _hdf5plot_gwrite(grp, k, v.value)
-    end
-    return
-end
+# #TODO: "Properly" support Nullable using _hdf5plot_writetype?
+# function _hdf5plot_gwrite(grp, k::String, v::Nullable)
+#     if isnull(v)
+#         _hdf5plot_gwrite(grp, k, nothing)
+#     else
+#         _hdf5plot_gwrite(grp, k, v.value)
+#     end
+#     return
+# end

 function _hdf5plot_gwrite(grp, k::String, v::SeriesAnnotations)
    #Currently no support for SeriesAnnotations
@@ -485,7 +485,7 @@ function _hdf5plot_readcount(grp) #Read directly from group
 end

 _hdf5plot_convert(T::Type{HDF5PlotNative}, v) = v
-_hdf5plot_convert(T::Type{Void}, v) = nothing
+_hdf5plot_convert(T::Type{Nothing}, v) = nothing
 _hdf5plot_convert(T::Type{Bool}, v) = (v!=0)
 _hdf5plot_convert(T::Type{Symbol}, v) = Symbol(v)
 _hdf5plot_convert(T::Type{Tuple}, v) = tuple(v...) #With Vector{T<:Number}
@@ -530,7 +530,7 @@ function _hdf5plot_read(grp, k::String, T::Type{Array}, dtid) #ANY
    result = Array{Any}(sz)

    for iter in eachindex(result)
-        coord = ind2sub(sz, iter)
+        coord = LinearIndices(sz, iter)
        idxstr = join(coord, "_")
        result[iter] = _hdf5plot_read(grp, "v$idxstr")
    end
@@ -13,7 +13,7 @@ Add in functionality to Plots.jl:
    :aspect_ratio,
 =#

-@require Revise begin
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "inspectdr.jl"))
 end

@@ -90,24 +90,24 @@ end

 # py_marker(markers::AVec) = map(py_marker, markers)
 function _inspectdr_mapglyph(markers::AVec)
-    warn("Vectors of markers are currently unsupported in InspectDR.")
+    @warn("Vectors of markers are currently unsupported in InspectDR.")
    _inspectdr_mapglyph(markers[1])
 end

 _inspectdr_mapglyphsize(v::Real) = v
 function _inspectdr_mapglyphsize(v::Vector)
-    warn("Vectors of marker sizes are currently unsupported in InspectDR.")
+    @warn("Vectors of marker sizes are currently unsupported in InspectDR.")
    _inspectdr_mapglyphsize(v[1])
 end

 _inspectdr_mapcolor(v::Colorant) = v
 function _inspectdr_mapcolor(g::PlotUtils.ColorGradient)
-    warn("Color gradients are currently unsupported in InspectDR.")
+    @warn("Color gradients are currently unsupported in InspectDR.")
    #Pick middle color:
    _inspectdr_mapcolor(g.colors[div(1+end,2)])
 end
 function _inspectdr_mapcolor(v::AVec)
-    warn("Vectors of colors are currently unsupported in InspectDR.")
+    @warn("Vectors of colors are currently unsupported in InspectDR.")
    #Pick middle color:
    _inspectdr_mapcolor(v[div(1+end,2)])
 end
@@ -166,13 +166,13 @@ function _initialize_backend(::InspectDRBackend; kw...)
        export InspectDR

        #Glyph used when plotting "Shape"s:
-        const INSPECTDR_GLYPH_SHAPE = InspectDR.GlyphPolyline(
+        INSPECTDR_GLYPH_SHAPE = InspectDR.GlyphPolyline(
            2*InspectDR.GLYPH_SQUARE.x, InspectDR.GLYPH_SQUARE.y
        )

        mutable struct InspecDRPlotRef
-            mplot::Union{Void, InspectDR.Multiplot}
-            gui::Union{Void, InspectDR.GtkPlot}
+            mplot::Union{Nothing, InspectDR.Multiplot}
+            gui::Union{Nothing, InspectDR.GtkPlot}
        end

        _inspectdr_getmplot(::Any) = nothing
@@ -347,8 +347,8 @@ end
 # ---------------------------------------------------------------------------

 function _inspectdr_setupsubplot(sp::Subplot{InspectDRBackend})
-    const plot = sp.o
-    const strip = plot.strips[1] #Only 1 strip supported with Plots.jl
+    plot = sp.o
+    strip = plot.strips[1] #Only 1 strip supported with Plots.jl

    xaxis = sp[:xaxis]; yaxis = sp[:yaxis]
    xgrid_show = xaxis[:grid]
@@ -406,7 +406,7 @@ end
 # called just before updating layout bounding boxes... in case you need to prep
 # for the calcs
 function _before_layout_calcs(plt::Plot{InspectDRBackend})
-    const mplot = _inspectdr_getmplot(plt.o)
+    mplot = _inspectdr_getmplot(plt.o)
    if nothing == mplot; return; end

    mplot.title = plt[:plot_title]
@@ -506,7 +506,7 @@ const _inspectdr_mimeformats_nodpi = Dict(
 #    "application/postscript"  => "ps", #TODO: support once Cairo supports PSSurface
    "application/pdf"         => "pdf"
 )
-_inspectdr_show(io::IO, mime::MIME, ::Void, w, h) =
+_inspectdr_show(io::IO, mime::MIME, ::Nothing, w, h) =
    throw(ErrorException("Cannot show(::IO, ...) plot - not yet generated"))
 function _inspectdr_show(io::IO, mime::MIME, mplot, w, h)
    InspectDR._show(io, mime, mplot, Float64(w), Float64(h))
@@ -2,17 +2,18 @@

 # significant contributions by: @pkofod

-@require Revise begin
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "pgfplots.jl"))
 end

 const _pgfplots_attr = merge_with_base_supported([
    :annotations,
-    # :background_color_legend,
+    :background_color_legend,
    :background_color_inside,
    # :background_color_outside,
-    # :foreground_color_legend, :foreground_color_grid, :foreground_color_axis,
-    #     :foreground_color_text, :foreground_color_border,
+    # :foreground_color_legend,
+    :foreground_color_grid, :foreground_color_axis,
+    :foreground_color_text, :foreground_color_border,
    :label,
    :seriescolor, :seriesalpha,
    :linecolor, :linestyle, :linewidth, :linealpha,
@@ -149,6 +150,10 @@ function pgf_colormap(grad::ColorGradient)
    end,", ")
 end

+pgf_thickness_scaling(plt::Plot) = plt[:thickness_scaling]
+pgf_thickness_scaling(sp::Subplot) = pgf_thickness_scaling(sp.plt)
+pgf_thickness_scaling(series) = pgf_thickness_scaling(series[:subplot])
+
 function pgf_fillstyle(d, i = 1)
    cstr,a = pgf_color(get_fillcolor(d, i))
    fa = get_fillalpha(d, i)
@@ -158,17 +163,26 @@ function pgf_fillstyle(d, i = 1)
    "fill = $cstr, fill opacity=$a"
 end

-function pgf_linestyle(d, i = 1)
-    cstr,a = pgf_color(get_linecolor(d, i))
-    la = get_linealpha(d, i)
-    if la != nothing
-        a = la
-    end
+function pgf_linestyle(linewidth::Real, color, α = 1, linestyle = "solid")
+    cstr, a = pgf_color(plot_color(color, α))
    """
    color = $cstr,
-    draw opacity=$a,
-    line width=$(get_linewidth(d, i)),
-    $(get(_pgfplots_linestyles, get_linestyle(d, i), "solid"))"""
+    draw opacity = $a,
+    line width = $linewidth,
+    $(get(_pgfplots_linestyles, linestyle, "solid"))"""
+end
+
+function pgf_linestyle(d, i = 1)
+    lw = pgf_thickness_scaling(d) * get_linewidth(d, i)
+    lc = get_linecolor(d, i)
+    la = get_linealpha(d, i)
+    ls = get_linestyle(d, i)
+    return pgf_linestyle(lw, lc, la, ls)
+end
+
+function pgf_font(fontsize, thickness_scaling = 1, font = "\\selectfont")
+    fs = fontsize * thickness_scaling
+    return string("{\\fontsize{", fs, " pt}{", 1.3fs, " pt}", font, "}")
 end

 function pgf_marker(d, i = 1)
@@ -177,27 +191,28 @@ function pgf_marker(d, i = 1)
    cstr_stroke, a_stroke = pgf_color(plot_color(get_markerstrokecolor(d, i), get_markerstrokealpha(d, i)))
    """
    mark = $(get(_pgfplots_markers, shape, "*")),
-    mark size = $(0.5 * _cycle(d[:markersize], i)),
+    mark size = $(pgf_thickness_scaling(d) * 0.5 * _cycle(d[:markersize], i)),
    mark options = {
        color = $cstr_stroke, draw opacity = $a_stroke,
        fill = $cstr, fill opacity = $a,
-        line width = $(_cycle(d[:markerstrokewidth], i)),
+        line width = $(pgf_thickness_scaling(d) * _cycle(d[:markerstrokewidth], i)),
        rotate = $(shape == :dtriangle ? 180 : 0),
        $(get(_pgfplots_linestyles, _cycle(d[:markerstrokestyle], i), "solid"))
    }"""
 end

-function pgf_add_annotation!(o,x,y,val)
+function pgf_add_annotation!(o, x, y, val, thickness_scaling = 1)
    # Construct the style string.
    # Currently supports color and orientation
    cstr,a = pgf_color(val.font.color)
    push!(o, PGFPlots.Plots.Node(val.str, # Annotation Text
-                                 x, y,
-                                 style="""
-                                 $(get(_pgf_annotation_halign,val.font.halign,"")),
-                                 color=$cstr, draw opacity=$(convert(Float16,a)),
-                                 rotate=$(val.font.rotation)
-                                 """))
+        x, y,
+        style="""
+        $(get(_pgf_annotation_halign,val.font.halign,"")),
+        color=$cstr, draw opacity=$(convert(Float16,a)),
+        rotate=$(val.font.rotation),
+        font=$(pgf_font(val.font.pointsize, thickness_scaling))
+        """))
 end

 # --------------------------------------------------------------------------------------
@@ -370,8 +385,9 @@ function pgf_axis(sp::Subplot, letter)
    # axis guide
    kw[Symbol(letter,:label)] = axis[:guide]

-    # Add ticklabel rotations
-    push!(style, "$(letter)ticklabel style={rotate = $(axis[:rotation])}")
+    # Add label font
+    cstr, α = pgf_color(plot_color(axis[:guidefontcolor]))
+    push!(style, string(letter, "label style = {font = ", pgf_font(axis[:guidefontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", axis[:guidefontrotation], "}"))

    # flip/reverse?
    axis[:flip] && push!(style, "$letter dir=reverse")
@@ -410,11 +426,12 @@ function pgf_axis(sp::Subplot, letter)
        push!(style, string(letter, "tick = {", join(tick_values,","), "}"))
        if axis[:showaxis] && axis[:scale] in (:ln, :log2, :log10) && axis[:ticks] == :auto
            # wrap the power part of label with }
-            tick_labels = String[begin
+            tick_labels = Vector{String}(length(ticks[2]))
+            for (i, label) in enumerate(ticks[2])
                base, power = split(label, "^")
                power = string("{", power, "}")
-                string(base, "^", power)
-            end for label in ticks[2]]
+                tick_labels[i] = string(base, "^", power)
+            end
            push!(style, string(letter, "ticklabels = {\$", join(tick_labels,"\$,\$"), "\$}"))
        elseif axis[:showaxis]
            tick_labels = ispolar(sp) && letter == :x ? [ticks[2][3:end]..., "0", "45"] : ticks[2]
@@ -427,6 +444,9 @@ function pgf_axis(sp::Subplot, letter)
            push!(style, string(letter, "ticklabels = {}"))
        end
        push!(style, string(letter, "tick align = ", (axis[:tick_direction] == :out ? "outside" : "inside")))
+        cstr, α = pgf_color(plot_color(axis[:tickfontcolor]))
+        push!(style, string(letter, "ticklabel style = {font = ", pgf_font(axis[:tickfontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", axis[:tickfontrotation], "}"))
+        push!(style, string(letter, " grid style = {", pgf_linestyle(pgf_thickness_scaling(sp) * axis[:gridlinewidth], axis[:foreground_color_grid], axis[:gridalpha], axis[:gridstyle]), "}"))
    end

    # framestyle
@@ -439,7 +459,7 @@ function pgf_axis(sp::Subplot, letter)
    if framestyle == :zerolines
        push!(style, string("extra ", letter, " ticks = 0"))
        push!(style, string("extra ", letter, " tick labels = "))
-        push!(style, string("extra ", letter, " tick style = {grid = major, major grid style = {color = black, draw opacity=1.0, line width=0.5), solid}}"))
+        push!(style, string("extra ", letter, " tick style = {grid = major, major grid style = {", pgf_linestyle(pgf_thickness_scaling(sp), axis[:foreground_color_axis], 1.0), "}}"))
    end

    if !axis[:showaxis]
@@ -447,6 +467,8 @@ function pgf_axis(sp::Subplot, letter)
    end
    if !axis[:showaxis] || framestyle in (:zerolines, :grid, :none)
        push!(style, string(letter, " axis line style = {draw opacity = 0}"))
+    else
+        push!(style, string(letter, " axis line style = {", pgf_linestyle(pgf_thickness_scaling(sp), axis[:foreground_color_axis], 1.0), "}"))
    end

    # return the style list and KW args
@@ -483,7 +505,7 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
        bb = bbox(sp)
        push!(style, """
            xshift = $(left(bb).value)mm,
-            yshift = $(round((total_height - (bottom(bb))).value,2))mm,
+            yshift = $(round((total_height - (bottom(bb))).value, digits=2))mm,
            axis background/.style={fill=$(pgf_color(sp[:background_color_inside])[1])}
        """)
        kw[:width] = "$(width(bb).value)mm"
@@ -491,6 +513,8 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})

        if sp[:title] != ""
            kw[:title] = "$(sp[:title])"
+            cstr, α = pgf_color(plot_color(sp[:titlefontcolor]))
+            push!(style, string("title style = {font = ", pgf_font(sp[:titlefontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", sp[:titlefontrotation], "}"))
        end

        if sp[:aspect_ratio] in (1, :equal)
@@ -501,6 +525,8 @@ 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)), "}"))

        if any(s[:seriestype] == :contour for s in series_list(sp))
            kw[:view] = "{0}{90}"
@@ -554,13 +580,13 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
            # add series annotations
            anns = series[:series_annotations]
            for (xi,yi,str,fnt) in EachAnn(anns, series[:x], series[:y])
-                pgf_add_annotation!(o, xi, yi, PlotText(str, fnt))
+                pgf_add_annotation!(o, xi, yi, PlotText(str, fnt), pgf_thickness_scaling(series))
            end
        end

        # add the annotations
        for ann in sp[:annotations]
-            pgf_add_annotation!(o, locate_annotation(sp, ann...)...)
+            pgf_add_annotation!(o, locate_annotation(sp, ann...)..., pgf_thickness_scaling(sp))
        end


@@ -582,7 +608,7 @@ function _show(io::IO, mime::MIME"application/pdf", plt::Plot{PGFPlotsBackend})
    PGFPlots.save(PGFPlots.PDF(fn), pgfplt)

    # read it into io
-    write(io, readstring(open(fn)))
+    write(io, read(open(fn), String))

    # cleanup
    PGFPlots.cleanup(plt.o)
@@ -591,7 +617,7 @@ end
 function _show(io::IO, mime::MIME"application/x-tex", plt::Plot{PGFPlotsBackend})
    fn = tempname()*".tex"
    PGFPlots.save(fn, backend_object(plt), include_preamble=false)
-    write(io, readstring(open(fn)))
+    write(io, read(open(fn), String))
 end

 function _display(plt::Plot{PGFPlotsBackend})
@@ -1,7 +1,7 @@

 # https://plot.ly/javascript/getting-started

-@require Revise begin
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "plotly.jl"))
 end

@@ -263,6 +263,7 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)
    end

    ax[:tickangle] = -axis[:rotation]
+    ax[:type] = plotly_scale(axis[:scale])
    lims = axis_limits(axis)

    if axis[:ticks] != :native || axis[:lims] != :auto
@@ -271,14 +272,13 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)

    if !(axis[:ticks] in (nothing, :none, false))
        ax[:titlefont] = plotly_font(guidefont(axis))
-        ax[:type] = plotly_scale(axis[:scale])
        ax[:tickfont] = plotly_font(tickfont(axis))
        ax[:tickcolor] = framestyle in (:zerolines, :grid) || !axis[:showaxis] ? rgba_string(invisible()) : rgb_string(axis[:foreground_color_axis])
        ax[:linecolor] = rgba_string(axis[:foreground_color_axis])

        # flip
        if axis[:flip]
-            ax[:autorange] = "reversed"
+            ax[:range] = reverse(ax[:range])
        end

        # ticks
@@ -332,7 +332,7 @@ function plotly_layout(plt::Plot)

    for sp in plt.subplots
        spidx = multiple_subplots ? sp[:subplot_index] : ""
-        x_idx, y_idx = multiple_subplots ? plotly_link_indicies(plt, sp) : ("", "") 
+        x_idx, y_idx = multiple_subplots ? plotly_link_indicies(plt, sp) : ("", "")
        # add an annotation for the title... positioned horizontally relative to plotarea,
        # but vertically just below the top of the subplot bounding box
        if sp[:title] != ""
@@ -450,7 +450,7 @@ function plotly_colorscale(c::AbstractVector{<:RGBA}, α)
    if length(c) == 1
        return [[0.0, rgba_string(plot_color(c[1], α))], [1.0, rgba_string(plot_color(c[1], α))]]
    else
-        vals = linspace(0.0, 1.0, length(c))
+        vals = range(0.0, stop=1.0, length=length(c))
        return [[vals[i], rgba_string(plot_color(c[i], α))] for i in eachindex(c)]
    end
 end
@@ -587,6 +587,8 @@ function plotly_series(plt::Plot, series::Series)
        return plotly_series_segments(series, d_out, x, y, z)

    elseif st == :heatmap
+        x = heatmap_edges(x, sp[:xaxis][:scale])
+        y = heatmap_edges(y, sp[:yaxis][:scale])
        d_out[:type] = "heatmap"
        d_out[:x], d_out[:y], d_out[:z] = x, y, z
        d_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
@@ -787,7 +789,7 @@ function plotly_series_segments(series::Series, d_base::KW, x, y, z)
        end

        plotly_polar!(d_out, series)
-        plotly_hover!(d_out, series[:hover])
+        plotly_hover!(d_out, _cycle(series[:hover], rng))

        if hasfillrange
            # if hasfillrange is true, return two dictionaries (one for original
@@ -803,7 +805,7 @@ function plotly_series_segments(series::Series, d_base::KW, x, y, z)
                series[:fillrange] = (f1, f2)
            end
            if isa(series[:fillrange], AbstractVector)
-                d_out_fillrange[:y] = series[:fillrange]
+                d_out_fillrange[:y] = series[:fillrange][rng]
                delete!(d_out_fillrange, :fill)
                delete!(d_out_fillrange, :fillcolor)
            else
@@ -838,6 +840,7 @@ function plotly_colorbar_hack(series::Series, d_base::KW, sym::Symbol)
    cmin, cmax = get_clims(series[:subplot])
    d_out[:showlegend] = false
    d_out[:type] = is3d(series) ? :scatter3d : :scatter
+    d_out[:hoverinfo] = :none
    d_out[:mode] = :markers
    d_out[:x], d_out[:y] = [series[:x][1]], [series[:y][1]]
    if is3d(series)
@@ -846,6 +849,7 @@ function plotly_colorbar_hack(series::Series, d_base::KW, sym::Symbol)
    # zrange = zmax == zmin ? 1 : zmax - zmin # if all marker_z values are the same, plot all markers same color (avoids division by zero in next line)
    d_out[:marker] = KW(
        :size => 0,
+        :opacity => 0,
        :color => [0.5],
        :cmin => cmin,
        :cmax => cmax,
@@ -1,4 +1,4 @@
-@require Revise begin
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "plotlyjs.jl"))
 end

@@ -120,6 +120,12 @@ function _display(plt::Plot{PlotlyJSBackend})
    end
 end

+@require WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" begin
+    function WebIO.render(plt::Plot{PlotlyJSBackend})
+        prepare_output(plt)
+        WebIO.render(plt.o)
+    end
+end

 function closeall(::PlotlyJSBackend)
    if !isplotnull() && isa(current().o, PlotlyJS.SyncPlot)
@@ -1,7 +1,7 @@

 # https://github.com/stevengj/PyPlot.jl

-@require Revise begin
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "pyplot.jl"))
 end

@@ -82,21 +82,21 @@ function _initialize_backend(::PyPlotBackend)
        append!(Base.Multimedia.displays, otherdisplays)

        export PyPlot
-        const pycolors = PyPlot.pyimport("matplotlib.colors")
-        const pypath = PyPlot.pyimport("matplotlib.path")
-        const mplot3d = PyPlot.pyimport("mpl_toolkits.mplot3d")
-        const pypatches = PyPlot.pyimport("matplotlib.patches")
-        const pyfont = PyPlot.pyimport("matplotlib.font_manager")
-        const pyticker = PyPlot.pyimport("matplotlib.ticker")
-        const pycmap = PyPlot.pyimport("matplotlib.cm")
-        const pynp = PyPlot.pyimport("numpy")
+        pycolors = PyPlot.pyimport("matplotlib.colors")
+        pypath = PyPlot.pyimport("matplotlib.path")
+        mplot3d = PyPlot.pyimport("mpl_toolkits.mplot3d")
+        pypatches = PyPlot.pyimport("matplotlib.patches")
+        pyfont = PyPlot.pyimport("matplotlib.font_manager")
+        pyticker = PyPlot.pyimport("matplotlib.ticker")
+        pycmap = PyPlot.pyimport("matplotlib.cm")
+        pynp = PyPlot.pyimport("numpy")
        pynp["seterr"](invalid="ignore")
-        const pytransforms = PyPlot.pyimport("matplotlib.transforms")
-        const pycollections = PyPlot.pyimport("matplotlib.collections")
-        const pyart3d = PyPlot.art3D
+        pytransforms = PyPlot.pyimport("matplotlib.transforms")
+        pycollections = PyPlot.pyimport("matplotlib.collections")
+        pyart3d = PyPlot.art3D

        # "support" matplotlib v1.5
-        const set_facecolor_sym = if PyPlot.version < v"2"
+        set_facecolor_sym = if PyPlot.version < v"2"
            warn("You are using Matplotlib $(PyPlot.version), which is no longer officialy supported by the Plots community. To ensure smooth Plots.jl integration update your Matplotlib library to a version >= 2.0.0")
            :set_axis_bgcolor
        else
@@ -394,15 +394,15 @@ function py_bbox_title(ax)
    bb
 end

-function py_dpi_scale(plt::Plot{PyPlotBackend}, ptsz)
-    ptsz * plt[:dpi] / DPI
+function py_thickness_scale(plt::Plot{PyPlotBackend}, ptsz)
+    ptsz * plt[:thickness_scaling]
 end

 # ---------------------------------------------------------------------------

 # Create the window/figure for this backend.
 function _create_backend_figure(plt::Plot{PyPlotBackend})
-    w,h = map(px2inch, plt[:size])
+    w,h = map(px2inch, Tuple(s * plt[:dpi] / Plots.DPI for s in plt[:size]))

    # # reuse the current figure?
    fig = if plt[:overwrite_figure]
@@ -505,7 +505,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            #         :label => series[:label],
            #         :zorder => plt.n,
            #         :cmap => py_linecolormap(series),
-            #         :linewidths => py_dpi_scale(plt, get_linewidth.(series, 1:n)),
+            #         :linewidths => py_thickness_scale(plt, get_linewidth.(series, 1:n)),
            #         :linestyle => py_linestyle(st, get_linestyle.(series)),
            #         :norm => pycolors["Normalize"](; extrakw...)
            #     )
@@ -530,7 +530,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                        label = i == 1 ? series[:label] : "",
                        zorder = series[:series_plotindex],
                        color = py_color(get_linecolor(series, i), get_linealpha(series, i)),
-                        linewidth = py_dpi_scale(plt, get_linewidth(series, i)),
+                        linewidth = py_thickness_scale(plt, get_linewidth(series, i)),
                        linestyle = py_linestyle(st, get_linestyle(series, i)),
                        solid_capstyle = "round",
                        drawstyle = py_stepstyle(st)
@@ -550,7 +550,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                        :shrinkB => 0,
                        :edgecolor => py_linecolor(series),
                        :facecolor => py_linecolor(series),
-                        :linewidth => py_dpi_scale(plt, get_linewidth(series)),
+                        :linewidth => py_thickness_scale(plt, get_linewidth(series)),
                        :linestyle => py_linestyle(st, get_linestyle(series)),
                    )
                    add_arrows(x, y) do xyprev, xy
@@ -589,7 +589,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            x,y = xyargs
            shapes = series[:markershape]
            msc = py_markerstrokecolor(series)
-            lw = py_dpi_scale(plt, series[:markerstrokewidth])
+            lw = py_thickness_scale(plt, series[:markerstrokewidth])
            for i=1:length(y)
                extrakw[:c] = _cycle(markercolor, i)

@@ -597,7 +597,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                    label = series[:label],
                    zorder = series[:series_plotindex] + 0.5,
                    marker = py_marker(_cycle(shapes,i)),
-                    s =  py_dpi_scale(plt, _cycle(series[:markersize],i) .^ 2),
+                    s =  py_thickness_scale(plt, _cycle(series[:markersize],i) .^ 2),
                    edgecolors = msc,
                    linewidths = lw,
                    extrakw...
@@ -610,9 +610,9 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                label = series[:label],
                zorder = series[:series_plotindex] + 0.5,
                marker = py_marker(series[:markershape]),
-                s = py_dpi_scale(plt, series[:markersize] .^ 2),
+                s = py_thickness_scale(plt, series[:markersize] .^ 2),
                edgecolors = py_markerstrokecolor(series),
-                linewidths = py_dpi_scale(plt, series[:markerstrokewidth]),
+                linewidths = py_thickness_scale(plt, series[:markerstrokewidth]),
                extrakw...
            )
            push!(handles, handle)
@@ -624,7 +624,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            label = series[:label],
            zorder = series[:series_plotindex],
            gridsize = series[:bins],
-            linewidths = py_dpi_scale(plt, series[:linewidth]),
+            linewidths = py_thickness_scale(plt, series[:linewidth]),
            edgecolors = py_linecolor(series),
            cmap = py_fillcolormap(series),  # applies to the pcolorfast object
            extrakw...
@@ -655,7 +655,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
        handle = ax[:contour](x, y, z, levelargs...;
            label = series[:label],
            zorder = series[:series_plotindex],
-            linewidths = py_dpi_scale(plt, series[:linewidth]),
+            linewidths = py_thickness_scale(plt, series[:linewidth]),
            linestyles = py_linestyle(st, series[:linestyle]),
            extrakw...
        )
@@ -679,8 +679,8 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
        if typeof(z) <: AbstractMatrix || typeof(z) <: Surface
            x, y, z = map(Array, (x,y,z))
            if !ismatrix(x) || !ismatrix(y)
-                x = repmat(x', length(y), 1)
-                y = repmat(y, 1, length(series[:x]))
+                x = repeat(x', length(y), 1)
+                y = repeat(y, 1, length(series[:x]))
            end
            z = transpose_z(series, z)
            if st == :surface
@@ -697,7 +697,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                zorder = series[:series_plotindex],
                rstride = series[:stride][1],
                cstride = series[:stride][2],
-                linewidth = py_dpi_scale(plt, series[:linewidth]),
+                linewidth = py_thickness_scale(plt, series[:linewidth]),
                edgecolor = py_linecolor(series),
                extrakw...
            )
@@ -728,7 +728,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                label = series[:label],
                zorder = series[:series_plotindex],
                cmap = py_fillcolormap(series),
-                linewidth = py_dpi_scale(plt, series[:linewidth]),
+                linewidth = py_thickness_scale(plt, series[:linewidth]),
                edgecolor = py_linecolor(series),
                extrakw...
            )
@@ -796,7 +796,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                    zorder = series[:series_plotindex],
                    edgecolor = py_color(get_linecolor(series, i), get_linealpha(series, i)),
                    facecolor = py_color(get_fillcolor(series, i), get_fillalpha(series, i)),
-                    linewidth = py_dpi_scale(plt, get_linewidth(series, i)),
+                    linewidth = py_thickness_scale(plt, get_linewidth(series, i)),
                    linestyle = py_linestyle(st, get_linestyle(series, i)),
                    fill = true
                )
@@ -837,9 +837,9 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            end
            n = length(dim1)
            args = if typeof(fillrange) <: Union{Real, AVec}
-                dim1, expand_data(fillrange, n), dim2
+                dim1, _cycle(fillrange, rng), dim2
            elseif is_2tuple(fillrange)
-                dim1, expand_data(fillrange[1], n), expand_data(fillrange[2], n)
+                dim1, _cycle(fillrange[1], rng), _cycle(fillrange[2], rng)
            end

            handle = ax[f](args..., trues(n), false, py_fillstepstyle(st);
@@ -919,7 +919,7 @@ function py_set_scale(ax, axis::Axis)
        "linear"
    else
        kw[Symbol(:base,letter)] = if scale == :ln
-            e
+            ℯ
        elseif scale == :log2
            2
        elseif scale == :log10
@@ -956,9 +956,9 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
    fig = plt.o
    fig[:clear]()
    dpi = plt[:dpi]
-    fig[:set_size_inches](w/dpi, h/dpi, forward = true)
+    fig[:set_size_inches](w/DPI, h/DPI, forward = true)
    fig[set_facecolor_sym](py_color(plt[:background_color_outside]))
-    fig[:set_dpi](dpi)
+    fig[:set_dpi](plt[:dpi])

    # resize the window
    PyPlot.plt[:get_current_fig_manager]()[:resize](w, h)
@@ -996,7 +996,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                :title
            end
            ax[func][:set_text](sp[:title])
-            ax[func][:set_fontsize](py_dpi_scale(plt, sp[:titlefontsize]))
+            ax[func][:set_fontsize](py_thickness_scale(plt, sp[:titlefontsize]))
            ax[func][:set_family](sp[:titlefontfamily])
            ax[func][:set_color](py_color(sp[:titlefontcolor]))
            # ax[:set_title](sp[:title], loc = loc)
@@ -1036,9 +1036,9 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
            fig = plt.o
            cbax = fig[:add_axes]([0.8,0.1,0.03,0.8], label = string(gensym()))
            cb = fig[:colorbar](handle; cax = cbax, kw...)
-            cb[:set_label](sp[:colorbar_title],size=py_dpi_scale(plt, sp[:yaxis][:guidefontsize]),family=sp[:yaxis][:guidefontfamily], color = py_color(sp[:yaxis][:guidefontcolor]))
+            cb[:set_label](sp[:colorbar_title],size=py_thickness_scale(plt, sp[:yaxis][:guidefontsize]),family=sp[:yaxis][:guidefontfamily], color = py_color(sp[:yaxis][:guidefontcolor]))
            for lab in cb[:ax][:yaxis][:get_ticklabels]()
-                  lab[:set_fontsize](py_dpi_scale(plt, sp[:yaxis][:tickfontsize]))
+                  lab[:set_fontsize](py_thickness_scale(plt, sp[:yaxis][:tickfontsize]))
                  lab[:set_family](sp[:yaxis][:tickfontfamily])
                  lab[:set_color](py_color(sp[:yaxis][:tickfontcolor]))
            end
@@ -1048,12 +1048,14 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})

        # framestyle
        if !ispolar(sp) && !is3d(sp)
+            ax[:spines]["left"][:set_linewidth](py_thickness_scale(plt, 1))
+            ax[:spines]["bottom"][:set_linewidth](py_thickness_scale(plt, 1))
            if sp[:framestyle] == :semi
                intensity = 0.5
                ax[:spines]["right"][:set_alpha](intensity)
                ax[:spines]["top"][:set_alpha](intensity)
-                ax[:spines]["right"][:set_linewidth](intensity)
-                ax[:spines]["top"][:set_linewidth](intensity)
+                ax[:spines]["right"][:set_linewidth](py_thickness_scale(plt, intensity))
+                ax[:spines]["top"][:set_linewidth](py_thickness_scale(plt, intensity))
            elseif sp[:framestyle] in (:axes, :origin)
                ax[:spines]["right"][:set_visible](false)
                ax[:spines]["top"][:set_visible](false)
@@ -1066,8 +1068,8 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                    spine[:set_visible](false)
                end
                if sp[:framestyle] == :zerolines
-                    ax[:axhline](y = 0, color = py_color(sp[:xaxis][:foreground_color_axis]), lw = 0.75)
-                    ax[:axvline](x = 0, color = py_color(sp[:yaxis][:foreground_color_axis]), lw = 0.75)
+                    ax[:axhline](y = 0, color = py_color(sp[:xaxis][:foreground_color_axis]), lw = py_thickness_scale(plt, 0.75))
+                    ax[:axvline](x = 0, color = py_color(sp[:yaxis][:foreground_color_axis]), lw = py_thickness_scale(plt, 0.75))
                end
            end
        end
@@ -1100,10 +1102,10 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
            if get(axis.d, :flip, false)
                ax[Symbol("invert_", letter, "axis")]()
            end
-            pyaxis[:label][:set_fontsize](py_dpi_scale(plt, axis[:guidefontsize]))
+            pyaxis[:label][:set_fontsize](py_thickness_scale(plt, axis[:guidefontsize]))
            pyaxis[:label][:set_family](axis[:guidefontfamily])
            for lab in ax[Symbol("get_", letter, "ticklabels")]()
-                lab[:set_fontsize](py_dpi_scale(plt, axis[:tickfontsize]))
+                lab[:set_fontsize](py_thickness_scale(plt, axis[:tickfontsize]))
                lab[:set_family](axis[:tickfontfamily])
                lab[:set_rotation](axis[:rotation])
            end
@@ -1112,7 +1114,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                pyaxis[:grid](true,
                    color = fgcolor,
                    linestyle = py_linestyle(:line, axis[:gridstyle]),
-                    linewidth = axis[:gridlinewidth],
+                    linewidth = py_thickness_scale(plt, axis[:gridlinewidth]),
                    alpha = axis[:gridalpha])
                ax[:set_axisbelow](true)
            else
@@ -1209,7 +1211,9 @@ function _update_min_padding!(sp::Subplot{PyPlotBackend})
    rightpad  += sp[:right_margin]
    bottompad += sp[:bottom_margin]

-    sp.minpad = (leftpad, toppad, rightpad, bottompad)
+    dpi_factor = Plots.DPI / sp.plt[:dpi]
+
+    sp.minpad = Tuple(dpi_factor .* [leftpad, toppad, rightpad, bottompad])
 end


@@ -1230,7 +1234,7 @@ function py_add_annotations(sp::Subplot{PyPlotBackend}, x, y, val::PlotText)
        horizontalalignment = val.font.halign == :hcenter ? "center" : string(val.font.halign),
        verticalalignment = val.font.valign == :vcenter ? "center" : string(val.font.valign),
        rotation = val.font.rotation * 180 / π,
-        size = py_dpi_scale(sp.plt, val.font.pointsize),
+        size = py_thickness_scale(sp.plt, val.font.pointsize),
        zorder = 999
    )
 end
@@ -1261,17 +1265,17 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                    pypatches[:Patch](
                        edgecolor = py_color(get_linecolor(series), get_linealpha(series)),
                        facecolor = py_color(get_fillcolor(series), get_fillalpha(series)),
-                        linewidth = py_dpi_scale(plt, clamp(get_linewidth(series), 0, 5)),
+                        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)
                    PyPlot.plt[:Line2D]((0,1),(0,0),
                        color = py_color(get_linecolor(series), get_linealpha(series)),
-                        linewidth = py_dpi_scale(plt, clamp(get_linewidth(series), 0, 5)),
+                        linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
                        linestyle = py_linestyle(:path, get_linestyle(series)),
                        marker = py_marker(series[:markershape]),
-                        markeredgecolor = py_markerstrokecolor(series),
-                        markerfacecolor = series[:marker_z] == nothing ? py_markercolor(series) : py_color(series[:markercolor][0.5])
+                        markeredgecolor = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series)),
+                        markerfacecolor = series[:marker_z] == nothing ? py_color(get_markercolor(series), get_markeralpha(series)) : py_color(series[:markercolor][0.5])
                    )
                else
                    series[:serieshandle][1]
@@ -1286,11 +1290,13 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                labels,
                loc = get(_pyplot_legend_pos, leg, "best"),
                scatterpoints = 1,
-                fontsize = py_dpi_scale(plt, sp[:legendfontsize]),
+                fontsize = py_thickness_scale(plt, sp[:legendfontsize]),
                facecolor = py_color(sp[:background_color_legend]),
                edgecolor = py_color(sp[:foreground_color_legend]),
                framealpha = alpha(plot_color(sp[:background_color_legend])),
            )
+            frame = leg[:get_frame]()
+            frame[:set_linewidth](py_thickness_scale(plt, 1))
            leg[:set_zorder](1000)
            sp[:legendtitle] != nothing && leg[:set_title](sp[:legendtitle])

@@ -1,7 +1,7 @@

 # https://github.com/Evizero/UnicodePlots.jl

-@require Revise begin
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "unicodeplots.jl"))
 end

@@ -183,7 +183,7 @@ function png(plt::AbstractPlot{UnicodePlotsBackend}, fn::AbstractString)
    gui(plt)

    # @osx_only begin
-    @static if is_apple()
+    @static if Sys.isapple()
        # BEGIN HACK

        # wait while the plot gets drawn
@@ -2,8 +2,8 @@
 # NOTE:  backend should implement `html_body` and `html_head`

 # CREDIT: parts of this implementation were inspired by @joshday's PlotlyLocal.jl
-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "web.jl")) 
+@require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
+    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "web.jl"))
 end

 function standalone_html(plt::AbstractPlot; title::AbstractString = get(plt.attr, :window_title, "Plots.jl"))
@@ -23,16 +23,16 @@ function standalone_html(plt::AbstractPlot; title::AbstractString = get(plt.attr
 end

 function open_browser_window(filename::AbstractString)
-    @static if is_apple()
+    @static if Sys.isapple()
        return run(`open $(filename)`)
    end
-    @static if is_linux() || is_bsd()    # is_bsd() addition is as yet untested, but based on suggestion in https://github.com/JuliaPlots/Plots.jl/issues/681
+    @static if Sys.islinux() || Sys.isbsd()    # Sys.isbsd() addition is as yet untested, but based on suggestion in https://github.com/JuliaPlots/Plots.jl/issues/681
        return run(`xdg-open $(filename)`)
    end
-    @static if is_windows()
+    @static if Sys.iswindows()
        return run(`$(ENV["COMSPEC"]) /c start "" "$(filename)"`)
    end
-    warn("Unknown OS... cannot open browser window.")
+    @warn("Unknown OS... cannot open browser window.")
 end

 function write_temp_html(plt::AbstractPlot)
@@ -58,7 +58,7 @@ end

 "get an array of tuples of points on a circle with radius `r`"
 function partialcircle(start_θ, end_θ, n = 20, r=1)
-    Tuple{Float64,Float64}[(r*cos(u),r*sin(u)) for u in linspace(start_θ, end_θ, n)]
+    Tuple{Float64,Float64}[(r*cos(u),r*sin(u)) for u in range(start_θ, stop=end_θ, length=n)]
 end

 "interleave 2 vectors into each other (like a zipper's teeth)"
@@ -68,7 +68,8 @@ function weave(x,y; ordering = Vector[x,y])
  while !done
    for o in ordering
      try
-          push!(ret, shift!(o))
+          push!(ret, popfirst!(o))
+      catch
      end
    end
    done = isempty(x) && isempty(y)
@@ -388,6 +389,7 @@ function stroke(args...; alpha = nothing)
    elseif T <: Symbol || T <: AbstractString
      try
        color = parse(Colorant, string(arg))
+      catch
      end
    elseif allAlphas(arg)
      alpha = arg
@@ -420,6 +422,7 @@ function brush(args...; alpha = nothing)
    elseif T <: Symbol || T <: AbstractString
      try
        color = parse(Colorant, string(arg))
+      catch
      end
    elseif allAlphas(arg)
      alpha = arg
@@ -438,16 +441,16 @@ end
 mutable struct SeriesAnnotations
    strs::AbstractVector  # the labels/names
    font::Font
-    baseshape::Nullable
+    baseshape::Union{Shape, AbstractVector{Shape}, Nothing}
    scalefactor::Tuple
 end
 function series_annotations(strs::AbstractVector, args...)
    fnt = font()
-    shp = Nullable{Any}()
+    shp = nothing
    scalefactor = (1,1)
    for arg in args
        if isa(arg, Shape) || (isa(arg, AbstractVector) && eltype(arg) == Shape)
-            shp = Nullable(arg)
+            shp = arg
        elseif isa(arg, Font)
            fnt = arg
        elseif isa(arg, Symbol) && haskey(_shapes, arg)
@@ -468,7 +471,7 @@ function series_annotations(strs::AbstractVector, args...)
    SeriesAnnotations(strs, fnt, shp, scalefactor)
 end
 series_annotations(anns::SeriesAnnotations) = anns
-series_annotations(::Void) = nothing
+series_annotations(::Nothing) = nothing

 function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
    anns = series[:series_annotations]
@@ -483,12 +486,13 @@ function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
    # end

    # @show msw msh
-    if anns != nothing && !isnull(anns.baseshape)
+    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
        msize = Float64[]
-        shapes = Shape[begin
+        shapes = Vector{Shape}(length(anns.strs))
+        for i in eachindex(anns.strs)
            str = _cycle(anns.strs,i)

            # get the width and height of the string (in mm)
@@ -506,8 +510,8 @@ function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
            maxscale = max(xscale, yscale)
            push!(msize, maxscale)
            baseshape = _cycle(get(anns.baseshape),i)
-            shape = scale(baseshape, msw*xscale/maxscale, msh*yscale/maxscale, (0,0))
-        end for i=1:length(anns.strs)]
+            shapes[i] = scale(baseshape, msw*xscale/maxscale, msh*yscale/maxscale, (0,0))
+        end
        series[:markershape] = shapes
        series[:markersize] = msize
    end
@@ -531,7 +535,7 @@ function Base.next(ea::EachAnn, i)
    ((_cycle(ea.x,i), _cycle(ea.y,i), str, fnt), i+1)
 end

-annotations(::Void) = []
+annotations(::Nothing) = []
 annotations(anns::AVec) = anns
 annotations(anns) = Any[anns]
 annotations(sa::SeriesAnnotations) = sa
@@ -747,7 +751,7 @@ end

@deprecate curve_points coords

-coords(curve::BezierCurve, n::Integer = 30; range = [0,1]) = map(curve, linspace(range..., n))
+coords(curve::BezierCurve, n::Integer = 30; range = [0,1]) = map(curve, range(range..., stop=n, length=50))

 # 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]
@@ -72,7 +72,7 @@ is_subplot_supported(::BokehBackend) = false

 function _initialize_backend(::BokehBackend; kw...)
  @eval begin
-    warn("Bokeh is no longer supported... many features will likely be broken.")
+    @warn("Bokeh is no longer supported... many features will likely be broken.")
    import Bokeh
    export Bokeh
  end
@@ -196,7 +196,7 @@ end

 function Base.show(io::IO, ::MIME"image/png", plt::AbstractPlot{BokehBackend})
  # TODO: write a png to io
-  warn("mime png not implemented")
+  @warn("mime png not implemented")
 end

 function Base.display(::PlotsDisplay, plt::Plot{BokehBackend})
@@ -244,7 +244,7 @@ function addToGadflyLegend(plt::Plot, d::KW)

        # add the legend if needed
        if all(g -> !isa(g, Gadfly.Guide.ManualColorKey), gplt.guides)
-            unshift!(gplt.guides, Gadfly.Guide.manual_color_key("", AbstractString[], Color[]))
+            pushfirst!(gplt.guides, Gadfly.Guide.manual_color_key("", AbstractString[], Color[]))
        end

        # now add the series to the legend
@@ -334,8 +334,8 @@ end
 #     # create a list of vertices that go: [x1,x2,x2,x3,x3, ... ,xi,xi, ... xn,xn] (same for y)
 #     # then the vector passed to the "color" keyword should be a vector: [1,1,2,2,3,3,4,4, ..., i,i, ... , n,n]
 #     csindices = Int[mod1(i,length(cscheme.v)) for i in 1:length(d[:y])]
-#     cs = collect(repmat(csindices', 2, 1))[1:end-1]
-#     grp = collect(repmat((1:length(d[:y]))', 2, 1))[1:end-1]
+#     cs = collect(repeat(csindices', 2, 1))[1:end-1]
+#     grp = collect(repeat((1:length(d[:y]))', 2, 1))[1:end-1]
 #     d[:x], d[:y] = map(createSegments, (d[:x], d[:y]))
 #     colorgroup = [(:linecolor, cs), (:group, grp)]

@@ -31,7 +31,7 @@ is_subplot_supported(::QwtBackend) = true

 function _initialize_backend(::QwtBackend; kw...)
  @eval begin
-    warn("Qwt is no longer supported... many features will likely be broken.")
+    @warn("Qwt is no longer supported... many features will likely be broken.")
    import Qwt
    export Qwt
  end
@@ -142,7 +142,7 @@ function updateLimsAndTicks(plt::Plot{QwtBackend}, d::KW, isx::Bool)
    w[:setAxisScale](axisid, lims...)
  end

-  if typeof(ticks) <: Range
+  if typeof(ticks) <: AbstractRange
    if isx
      plt.o.autoscale_x = false
    else
@@ -34,7 +34,7 @@ is_subplot_supported(::WinstonBackend) = false
 function _initialize_backend(::WinstonBackend; kw...)
  @eval begin
    # ENV["WINSTON_OUTPUT"] = "gtk"
-    warn("Winston is no longer supported... many features will likely be broken.")
+    @warn("Winston is no longer supported... many features will likely be broken.")
    import Winston, Gtk
    export Winston, Gtk
  end
@@ -19,7 +19,7 @@
    # work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

 function sample_evenly(v::AVec, n::Integer = length(v))
-    idx = Int[round(Int, x) for x in linspace(1, length(v), n)]
+    idx = Int[round(Int, x) for x in range(1, stop=length(v), length=n)]
    v[idx]
 end

@@ -13,15 +13,15 @@ function cgrad(arg, values = nothing; alpha = nothing, scale = :identity)
    values = if values != nothing
        values
    elseif scale in (:log, :log10)
-        log10(linspace(1,10,30))
+        log10(range(1, stop=10, length=30))
    elseif scale == :log2
-        log2(linspace(1,2,30))
+        log2(range(1, stop=2, length=30))
    elseif scale == :ln
-        log(linspace(1,pi,30))
+        log(range(1, stop=pi, length=30))
    elseif scale in (:exp, :exp10)
-        (exp10(linspace(0,1,30)) - 1) / 9
+        (exp10(range(0, stop=1, length=30)) - 1) / 9
    else
-        linspace(0, 1, length(colors))
+        range(0, stop=1, length=length(colors))
    end
    ColorGradient(colors, values)
 end
@@ -51,7 +51,7 @@ convertColor(c::Symbol) = parse(Colorant, string(c))
 convertColor(c::Colorant) = c
 convertColor(cvec::AbstractVector) = map(convertColor, cvec)
 convertColor(c::ColorScheme) = c
-convertColor(v::Void) = RGBA(0,0,0,0)
+convertColor(v::Nothing) = RGBA(0,0,0,0)
 convertColor(b::Bool) = b ? RGBA(0,0,0,1) : RGBA(0,0,0,0)

 function convertColor(c, α::Real)
@@ -59,7 +59,7 @@ function convertColor(c, α::Real)
  RGBA(RGB(getColor(c)), α)
 end
 convertColor(cs::AVec, α::Real) = map(c -> convertColor(c, α), cs)
-convertColor(c, α::Void) = convertColor(c)
+convertColor(c, α::Nothing) = convertColor(c)

 # backup... try to convert
 getColor(c) = convertColor(c)
@@ -113,7 +113,7 @@ struct ColorGradient <: ColorScheme
  colors::Vector
  values::Vector

-  function ColorGradient(cs::AVec, vals::AVec{S} = linspace(0, 1, length(cs)); alpha = nothing) where S<:Real
+  function ColorGradient(cs::AVec, vals::AVec{S} = range(0, stop=1, length=length(cs)); alpha = nothing) where S<:Real
    if length(cs) == length(vals)
      return new(convertColor(cs,alpha), collect(vals))
    end
@@ -124,9 +124,9 @@ struct ColorGradient <: ColorScheme
    # new(convertColor(cs,alpha), vs)

    # interpolate the colors for each value
-    vals = merge(linspace(0, 1, length(cs)), vals)
+    vals = merge(range(0, stop=1, length=length(cs)), vals)
    grad = ColorGradient(cs)
-    cs = [getColorZ(grad, z) for z in linspace(0, 1, length(vals))]
+    cs = [getColorZ(grad, z) for z in range(0, stop=1, length=length(vals))]
    new(convertColor(cs, alpha), vals)
  end
 end
@@ -142,7 +142,7 @@ function ColorGradient(s::Symbol, vals::AVec{T} = 0:0; kw...) where T<:Real
  haskey(_gradients, s) || error("Invalid gradient symbol.  Choose from: ", sort(collect(keys(_gradients))))
  cs = _gradients[s]
  if vals == 0:0
-    vals = linspace(0, 1, length(cs))
+    vals = range(0, stop=1, length=length(cs))
  end
  ColorGradient(cs, vals; kw...)
 end
@@ -247,7 +247,7 @@ ColorWrapper(s::Symbol; alpha = nothing) = ColorWrapper(convertColor(parse(Color

 getColor(scheme::ColorWrapper, idx::Int) = scheme.c
 getColorZ(scheme::ColorWrapper, z::Real) = scheme.c
-convertColor(c::ColorWrapper, α::Void) = c.c
+convertColor(c::ColorWrapper, α::Nothing) = c.c

 # --------------------------------------------------------------

@@ -332,7 +332,7 @@ function generate_colorgradient(bgcolor = colorant"white";
      seed_colors,
      lchoices=Float64[lightness],
      cchoices=Float64[chroma],
-      hchoices=linspace(0, 340, 20)
+      hchoices=range(0, stop=340, length=20)
    )[2:end]
  gradient_from_list(colors)
 end
@@ -10,7 +10,7 @@ const FuncOrFuncs = Union{Function, AVec{Function}}
 all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image), get(d, :seriestype, :none))

 # missing
-convertToAnyVector(v::Void, d::KW) = Any[nothing], nothing
+convertToAnyVector(v::Nothing, d::KW) = Any[nothing], nothing

 # fixed number of blank series
 convertToAnyVector(n::Integer, d::KW) = Any[zeros(0) for i in 1:n], nothing
@@ -65,19 +65,19 @@ end
 # TODO: can we avoid the copy here?  one error that crops up is that mapping functions over the same array
 #       result in that array being shared.  push!, etc will add too many items to that array

-compute_x(x::Void, y::Void, z)      = 1:size(z,1)
-compute_x(x::Void, y, z)            = 1:size(y,1)
+compute_x(x::Nothing, y::Nothing, z)      = 1:size(z,1)
+compute_x(x::Nothing, y, z)            = 1:size(y,1)
 compute_x(x::Function, y, z)        = map(x, y)
 compute_x(x, y, z)                  = copy(x)

 # compute_y(x::Void, y::Function, z)  = error()
-compute_y(x::Void, y::Void, z)      = 1:size(z,2)
+compute_y(x::Nothing, y::Nothing, z)      = 1:size(z,2)
 compute_y(x, y::Function, z)        = map(y, x)
 compute_y(x, y, z)                  = copy(y)

 compute_z(x, y, z::Function)        = map(z, x, y)
 compute_z(x, y, z::AbstractMatrix)  = Surface(z)
-compute_z(x, y, z::Void)            = nothing
+compute_z(x, y, z::Nothing)            = nothing
 compute_z(x, y, z)                  = copy(z)

 nobigs(v::AVec{BigFloat}) = map(Float64, v)
@@ -92,8 +92,8 @@ nobigs(v) = v
 end

 # not allowed
-compute_xyz(x::Void, y::FuncOrFuncs, z)       = error("If you want to plot the function `$y`, you need to define the x values!")
-compute_xyz(x::Void, y::Void, z::FuncOrFuncs) = error("If you want to plot the function `$z`, you need to define x and y values!")
-compute_xyz(x::Void, y::Void, z::Void)        = error("x/y/z are all nothing!")
+compute_xyz(x::Nothing, y::FuncOrFuncs, z)       = error("If you want to plot the function `$y`, you need to define the x values!")
+compute_xyz(x::Nothing, y::Nothing, z::FuncOrFuncs) = error("If you want to plot the function `$z`, you need to define x and y values!")
+compute_xyz(x::Nothing, y::Nothing, z::Nothing)        = error("x/y/z are all nothing!")

 # --------------------------------------------------------------------
@@ -29,7 +29,7 @@ animation.
    [:(begin
        p = plot([sin,cos], zeros(0), leg=false)
        anim = Animation()
-        for x in linspace(0, 10π, 100)
+        for x in range(0, stop=10π, length=100)
            push!(p, x, Float64[sin(x), cos(x)])
            frame(anim)
        end
@@ -52,7 +52,7 @@ the `z` argument to turn on series gradients.
    [:(begin
 y = rand(100)
 plot(0:10:100,rand(11,4),lab="lines",w=3,palette=:grays,fill=0, α=0.6)
-scatter!(y, zcolor=abs.(y-.5), m=(:heat,0.8,stroke(1,:green)), ms=10*abs.(y-0.5)+4,
+scatter!(y, zcolor=abs.(y.-0.5), m=(:heat,0.8,stroke(1,:green)), ms=10*abs.(y.-0.5).+4,
         lab="grad")
    end)]
 ),
@@ -69,7 +69,7 @@ the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`
 y = rand(20,3)
 plot(y, xaxis=("XLABEL",(-5,30),0:2:20,:flip), background_color = RGB(0.2,0.2,0.2),
     leg=false)
-hline!(mean(y,1)+rand(1,3), line=(4,:dash,0.6,[:lightgreen :green :darkgreen]))
+hline!(mean(y, dims = 1)+rand(1,3), line=(4,:dash,0.6,[:lightgreen :green :darkgreen]))
 vline!([5,10])
 title!("TITLE")
 yaxis!("YLABEL", :log10)
@@ -145,7 +145,7 @@ styles = filter(s -> s in Plots.supported_styles(),
                [:solid, :dash, :dot, :dashdot, :dashdotdot])
 styles = reshape(styles, 1, length(styles)) # Julia 0.6 unfortunately gives an error when transposing symbol vectors
 n = length(styles)
-y = cumsum(randn(20,n),1)
+y = cumsum(randn(20,n), dims = 1)
 plot(y, line = (5, styles), label = map(string,styles), legendtitle = "linestyle")
             end)]
 ),
@@ -156,8 +156,8 @@ PlotExample("Marker types",
        markers = filter(m -> m in Plots.supported_markers(), Plots._shape_keys)
        markers = reshape(markers, 1, length(markers))
        n = length(markers)
-        x = linspace(0,10,n+2)[2:end-1]
-        y = repmat(reshape(reverse(x),1,:), n, 1)
+        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)]
 ),
@@ -202,7 +202,7 @@ plot(Plots.fakedata(100,10), layout=4, palette=[:grays :blues :heat :lightrainbo
 PlotExample("",
    "",
    [:(begin
-        srand(111)
+        Random.srand(111)
        plot!(Plots.fakedata(100,10))
    end)]
 ),
@@ -215,7 +215,7 @@ subsequently create a :path series with the appropriate line segments.
 """,
    [:(begin
 n=20
-hgt=rand(n)+1
+hgt=rand(n).+1
 bot=randn(n)
 openpct=rand(n)
 closepct=rand(n)
@@ -238,7 +238,7 @@ 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"))])
-scatter!(linspace(2,8,6), rand(6), marker=(50,0.2,:orange),
+scatter!(range(2, stop=8, length=6), rand(6), marker=(50,0.2,:orange),
         series_annotations = ["series","annotations","map","to","series",
                               text("data",:green)])
    end)]
@@ -254,7 +254,7 @@ 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.7rand(5)+0.15
+y = 0.7rand(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)]
@@ -269,8 +269,8 @@ unfilled contour from a matrix.
        x = 1:0.5:20
        y = 1:0.5:10
        f(x,y) = (3x+y^2)*abs(sin(x)+cos(y))
-        X = repmat(reshape(x,1,:), length(y), 1)
-        Y = repmat(y, 1, length(x))
+        X = repeat(reshape(x,1,:), length(y), 1)
+        Y = repeat(y, 1, length(x))
        Z = map(f, X, Y)
        p1 = contour(x, y, f, fill=true)
        p2 = contour(x, y, Z)
@@ -291,7 +291,7 @@ PlotExample("3D",
    "",
    [:(begin
        n = 100
-        ts = linspace(0,8π,n)
+        ts = range(0, stop=8π, length=n)
        x = ts .* map(cos,ts)
        y = 0.1ts .* map(sin,ts)
        z = 1:n
@@ -323,7 +323,7 @@ PlotExample("Groups and Subplots",
 PlotExample("Polar Plots",
    "",
    [:(begin
-        Θ = linspace(0,1.5π,100)
+        Θ = range(0, stop=1.5π, length=100)
        r = abs.(0.1randn(100)+sin.(3Θ))
        plot(Θ, r, proj=:polar, m=2)
    end)]
@@ -368,7 +368,7 @@ PlotExample("Animation with subplots",
        plot(log,1,xlims=(1,10π),ylims=(0,5),leg=false),layout=l)

        anim = Animation()
-        for x = linspace(1,10π,100)
+        for x = range(1, stop=10π, length=100)
          plot(push!(p,x,Float64[sin(x),cos(x),atan(x),cos(x),log(x)]))
          frame(anim)
        end
@@ -377,8 +377,8 @@ PlotExample("Animation with subplots",

 PlotExample("Spy",
 """
-For a matrix `mat` with unique nonzeros `spy(mat)` returns a colorless plot. If `mat` has 
-various different nonzero values, a colorbar is added. The colorbar can be disabled with 
+For a matrix `mat` with unique nonzeros `spy(mat)` returns a colorless plot. If `mat` has
+various different nonzero values, a colorbar is added. The colorbar can be disabled with
 `legend = nothing`.
 """,
    [:(begin
@@ -419,10 +419,10 @@ attribute. The default framestyle is `:axes`.
 PlotExample("Lines and markers with varying colors",
 """
 You can use the `line_z` and `marker_z` properties to associate a color with
-each line segment or marker in the plot. 
+each line segment or marker in the plot.
 """,
    [:(begin
-        t = linspace(0, 1, 100)
+        t = range(0, stop=1, length=100)
        θ = 6π .* t
        x = t .* cos.(θ)
        y = t .* sin.(θ)
@@ -439,7 +439,7 @@ each line segment or marker in the plot.
 # make and display one plot
 function test_examples(pkgname::Symbol, idx::Int; debug = false, disp = true)
  Plots._debugMode.on = debug
-  info("Testing plot: $pkgname:$idx:$(_examples[idx].header)")
+  @info("Testing plot: $pkgname:$idx:$(_examples[idx].header)")
  backend(pkgname)
  backend()
  map(eval, _examples[idx].exprs)
@@ -268,7 +268,7 @@ function GridLayout(dims...;
                    widths = zeros(dims[2]),
                    heights = zeros(dims[1]),
                    kw...)
-    grid = Matrix{AbstractLayout}(dims...)
+    grid = Matrix{AbstractLayout}(undef, dims...)
    layout = GridLayout(
        parent,
        (20mm, 5mm, 2mm, 10mm),
@@ -357,10 +357,10 @@ function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm,0mm,0
    # get the max horizontal (left and right) padding over columns,
    # and max vertical (bottom and top) padding over rows
    # TODO: add extra padding here
-    pad_left   = maximum(minpad_left,   1)
-    pad_top    = maximum(minpad_top,    2)
-    pad_right  = maximum(minpad_right,  1)
-    pad_bottom = maximum(minpad_bottom, 2)
+    pad_left   = maximum(minpad_left,   dims = 1)
+    pad_top    = maximum(minpad_top,    dims = 2)
+    pad_right  = maximum(minpad_right,  dims = 1)
+    pad_bottom = maximum(minpad_bottom, dims = 2)

    # make sure the perimeter match the parent
    pad_left[1]     = max(pad_left[1], minimum_perimeter[1])
@@ -566,7 +566,7 @@ function build_layout(layout::GridLayout, numsp::Integer, plts::AVec{Plot})
    for r=1:nr, c=1:nc
        l = layout[r,c]
        if isa(l, EmptyLayout) && !get(l.attr, :blank, false)
-            plt = shift!(plts)  # grab the first plot out of the list
+            plt = popfirst!(plts)  # grab the first plot out of the list
            layout[r,c] = plt.layout
            append!(subplots, plt.subplots)
            merge!(spmap, plt.spmap)
@@ -146,7 +146,8 @@ function Base.display(::PlotsDisplay, plt::Plot)
 end

 # override the REPL display to open a gui window
-Base.display(::Base.REPL.REPLDisplay, ::MIME"text/plain", plt::Plot) = gui(plt)
+using REPL
+Base.display(::REPL.REPLDisplay, ::MIME"text/plain", plt::Plot) = gui(plt)


 _do_plot_show(plt, showval::Bool) = showval && gui(plt)
@@ -186,11 +187,11 @@ end

 # delegate mimewritable (showable on julia 0.7) to _show instead
 function Base.mimewritable(m::M, plt::P) where {M<:MIME, P<:Plot}
-    return method_exists(_show, Tuple{IO, M, P})
+    return hasmethod(_show, Tuple{IO, M, P})
 end

 function _display(plt::Plot)
-    warn("_display is not defined for this backend.")
+    @warn("_display is not defined for this backend.")
 end

 # for writing to io streams... first prepare, then callback
@@ -198,8 +199,12 @@ for mime in ("text/plain", "text/html", "image/png", "image/eps", "image/svg+xml
             "application/eps", "application/pdf", "application/postscript",
             "application/x-tex")
    @eval function Base.show(io::IO, m::MIME{Symbol($mime)}, plt::Plot)
-        prepare_output(plt)
-        _show(io, m, plt)
+        if haskey(io, :juno_plotsize)
+          showjuno(io, m, plt)
+        else
+          prepare_output(plt)
+          _show(io, m, plt)
+        end
    end
 end

@@ -230,7 +235,7 @@ if is_installed("FileIO")
        FileIO.save(pngfn, s)

        # now write from the file
-        write(io, readstring(open(pngfn)))
+        write(io, read(open(pngfn), String))
    end
 end

@@ -254,7 +259,7 @@ end
 # IJulia
 # ---------------------------------------------------------

-@require IJulia begin
+@require IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" begin
    if IJulia.inited

        """
@@ -310,45 +315,22 @@ end
 # ---------------------------------------------------------
 # Atom PlotPane
 # ---------------------------------------------------------
-@require Juno begin
-    import Hiccup, Media
+function showjuno(io::IO, m, plt)
+    sz = plt[:size]
+    dpi = plt[:dpi]
+    thickness_scaling = plt[:thickness_scaling]

-    if Juno.isactive()
-        Media.media(Plot, Media.Plot)
+    jsize = get(io, :juno_plotsize, [400, 500])

-        function Juno.render(e::Juno.Editor, plt::Plot)
-            Juno.render(e, nothing)
-        end
+    scale = minimum(jsize[i] / sz[i] for i in 1:2)
+    plt[:size] = (s * scale for s in sz)
+    plt[:dpi] = Plots.DPI
+    plt[:thickness_scaling] *= scale

-        if get(ENV, "PLOTS_USE_ATOM_PLOTPANE", true) in (true, 1, "1", "true", "yes")
-            function Juno.render(pane::Juno.PlotPane, plt::Plot)
-                # temporarily overwrite size to be Atom.plotsize
-                sz = plt[:size]
-                jsize = Juno.plotsize()
-                jsize[1] == 0 && (jsize[1] = 400)
-                jsize[2] == 0 && (jsize[2] = 500)
+    prepare_output(plt)
+    _show(io, m, plt)

-                plt[:size] = jsize
-                Juno.render(pane, HTML(stringmime(MIME("text/html"), plt)))
-                plt[:size] = sz
-            end
-            # special handling for PlotlyJS
-            function Juno.render(pane::Juno.PlotPane, plt::Plot{PlotlyJSBackend})
-                display(Plots.PlotsDisplay(), plt)
-            end
-        else
-            function Juno.render(pane::Juno.PlotPane, plt::Plot)
-                display(Plots.PlotsDisplay(), plt)
-                s = "PlotPane turned off.  Unset ENV[\"PLOTS_USE_ATOM_PLOTPANE\"] and restart Julia to enable it."
-                Juno.render(pane, HTML(s))
-            end
-        end
-
-        # special handling for plotly... use PlotsDisplay
-        function Juno.render(pane::Juno.PlotPane, plt::Plot{PlotlyBackend})
-            display(Plots.PlotsDisplay(), plt)
-            s = "PlotPane turned off.  The plotly backend cannot render in the PlotPane due to javascript issues. Plotlyjs is similar to plotly and is compatible with the plot pane."
-            Juno.render(pane, HTML(s))
-        end
-    end
+    plt[:size] = sz
+    plt[:dpi] = dpi
+    plt[:thickness_scaling] = thickness_scaling
 end
@@ -11,11 +11,13 @@ function _expand_seriestype_array(d::KW, args)
    sts = get(d, :seriestype, :path)
    if typeof(sts) <: AbstractArray
        delete!(d, :seriestype)
-        RecipeData[begin
+        rd = Vector{RecipeData}(undef, size(sts, 1))
+        for r in 1:size(sts, 1)
            dc = copy(d)
            dc[:seriestype] = sts[r:r,:]
-            RecipeData(dc, args)
-        end for r=1:size(sts,1)]
+            rd[r] = RecipeData(dc, args)
+        end
+        rd
    else
        RecipeData[RecipeData(copy(d), args)]
    end
@@ -70,7 +72,7 @@ function _process_userrecipes(plt::Plot, d::KW, args)
        # grab the first in line to be processed and either add it to the kw_list or
        # pass it through apply_recipe to generate a list of RecipeData objects (data + attributes)
        # for further processing.
-        next_series = shift!(still_to_process)
+        next_series = popfirst!(still_to_process)
        # recipedata should be of type RecipeData.  if it's not then the inputs must not have been fully processed by recipes
        if !(typeof(next_series) <: RecipeData)
            error("Inputs couldn't be processed... expected RecipeData but got: $next_series")
@@ -151,7 +153,7 @@ function _add_smooth_kw(kw_list::Vector{KW}, kw::KW)
        x, y = kw[:x], kw[:y]
        β, α = convert(Matrix{Float64}, [x ones(length(x))]) \ convert(Vector{Float64}, y)
        sx = [ignorenan_minimum(x), ignorenan_maximum(x)]
-        sy = β * sx + α
+        sy = β .* sx .+ α
        push!(kw_list, merge(copy(kw), KW(
            :seriestype => :path,
            :x => sx,
@@ -329,7 +331,7 @@ function _override_seriestype_check(d::KW, st::Symbol)
    # do we want to override the series type?
    if !is3d(st) && !(st in (:contour,:contour3d))
        z = d[:z]
-        if !isa(z, Void) && (size(d[:x]) == size(d[:y]) == size(z))
+        if !isa(z, Nothing) && (size(d[:x]) == size(d[:y]) == size(z))
            st = (st == :scatter ? :scatter3d : :path3d)
            d[:seriestype] = st
        end
@@ -1,10 +1,10 @@

 mutable struct CurrentPlot
-    nullableplot::Nullable{AbstractPlot}
+    nullableplot::Union{AbstractPlot, Nothing}
 end
-const CURRENT_PLOT = CurrentPlot(Nullable{AbstractPlot}())
+const CURRENT_PLOT = CurrentPlot(nothing)

-isplotnull() = isnull(CURRENT_PLOT.nullableplot)
+isplotnull() = CURRENT_PLOT.nullableplot == nothing

 """
    current()
@@ -14,9 +14,9 @@ function current()
    if isplotnull()
        error("No current plot/subplot")
    end
-    get(CURRENT_PLOT.nullableplot)
+    CURRENT_PLOT.nullableplot
 end
-current(plot::AbstractPlot) = (CURRENT_PLOT.nullableplot = Nullable(plot))
+current(plot::AbstractPlot) = (CURRENT_PLOT.nullableplot = plot)

 # ---------------------------------------------------------

@@ -46,9 +46,8 @@ When you pass in matrices, it splits by columns. To see the list of available at
 function, where `attr` is the symbol `:Series:`, `:Subplot:`, `:Plot` or `:Axis`. Pass any attribute to `plotattr`
 as a String to look up its docstring; e.g. `plotattr("seriestype")`.
 """
-
-# this creates a new plot with args/kw and sets it to be the current plot
 function plot(args...; kw...)
+    # this creates a new plot with args/kw and sets it to be the current plot
    d = KW(kw)
    preprocessArgs!(d)

@@ -66,7 +65,7 @@ function plot(plt1::Plot, plts_tail::Plot...; kw...)

    # build our plot vector from the args
    n = length(plts_tail) + 1
-    plts = Array{Plot}(n)
+    plts = Array{Plot}(undef, n)
    plts[1] = plt1
    for (i,plt) in enumerate(plts_tail)
        plts[i+1] = plt
@@ -169,7 +168,7 @@ function _plot!(plt::Plot, d::KW, args::Tuple)

    if !isempty(args) && !isdefined(Main, :StatPlots) &&
            first(split(string(typeof(args[1])), ".")) == "DataFrames"
-        warn("You're trying to plot a DataFrame, but this functionality is provided by StatPlots")
+        @warn("You're trying to plot a DataFrame, but this functionality is provided by StatPlots")
    end

    # --------------------------------
@@ -193,7 +192,7 @@ function _plot!(plt::Plot, d::KW, args::Tuple)
    still_to_process = kw_list
    kw_list = KW[]
    while !isempty(still_to_process)
-        next_kw = shift!(still_to_process)
+        next_kw = popfirst!(still_to_process)
        _process_plotrecipe(plt, next_kw, kw_list, still_to_process)
    end

@@ -80,7 +80,7 @@ end

@recipe function f(::Type{Val{:hline}}, x, y, z)
    n = length(y)
-    newx = repmat(Float64[-1, 1, NaN], n)
+    newx = repeat(Float64[-1, 1, NaN], n)
    newy = vec(Float64[yi for i=1:3,yi=y])
    x := newx
    y := newy
@@ -92,7 +92,7 @@ end
@recipe function f(::Type{Val{:vline}}, x, y, z)
    n = length(y)
    newx = vec(Float64[yi for i=1:3,yi=y])
-    newy = repmat(Float64[-1, 1, NaN], n)
+    newy = repeat(Float64[-1, 1, NaN], n)
    x := newx
    y := newy
    seriestype := :straightline
@@ -413,6 +413,7 @@ end
    z := nothing
    seriestype := :shape
    label := ""
+    widen --> false
    ()
 end
@deps plots_heatmap shape
@@ -585,7 +586,7 @@ function _auto_binning_nbins(vs::NTuple{N,AbstractVector}, dim::Integer; mode::S
    _iqr(v) = (q = quantile(v, 0.75) - quantile(v, 0.25); q > 0 ? q : oftype(q, 1))
    _span(v) = ignorenan_maximum(v) - ignorenan_minimum(v)

-    n_samples = length(linearindices(first(vs)))
+    n_samples = length(LinearIndices(first(vs)))

    # The nd estimator is the key to most automatic binning methods, and is modified for twodimensional histograms to include correlation
    nd = n_samples^(1/(2+N))
@@ -619,10 +620,10 @@ _hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::Symbol) where {N
 _hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::AbstractVector) where {N} = binning

 _hist_edges(vs::NTuple{N,AbstractVector}, binning::NTuple{N}) where {N} =
-    map(dim -> _hist_edge(vs, dim, binning[dim]), (1:N...))
+    map(dim -> _hist_edge(vs, dim, binning[dim]), (1:N...,))

 _hist_edges(vs::NTuple{N,AbstractVector}, binning::Union{Integer, Symbol, AbstractVector}) where {N} =
-    map(dim -> _hist_edge(vs, dim, binning), (1:N...))
+    map(dim -> _hist_edge(vs, dim, binning), (1:N...,))

 _hist_norm_mode(mode::Symbol) = mode
 _hist_norm_mode(mode::Bool) = mode ? :pdf : :none
@@ -791,7 +792,7 @@ end

 function error_coords(xorig, yorig, ebar)
    # init empty x/y, and zip errors if passed Tuple{Vector,Vector}
-    x, y = Array{float_extended_type(xorig)}(0), Array{Float64}(0)
+    x, y = Array{float_extended_type(xorig)}(undef, 0), Array{Float64}(undef, 0)
    # for each point, create a line segment from the bottom to the top of the errorbar
    for i = 1:max(length(xorig), length(yorig))
        xi = _cycle(xorig, i)
@@ -14,7 +14,7 @@ all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surfac
 convertToAnyVector(x, d::KW) = error("No user recipe defined for $(typeof(x))")

 # missing
-convertToAnyVector(v::Void, d::KW) = Any[nothing], nothing
+convertToAnyVector(v::Nothing, d::KW) = Any[nothing], nothing

 # fixed number of blank series
 convertToAnyVector(n::Integer, d::KW) = Any[zeros(0) for i in 1:n], nothing
@@ -46,7 +46,7 @@ convertToAnyVector(v::Volume, d::KW) = Any[v], nothing
 # convertToAnyVector(v::AVec{OHLC}, d::KW) = Any[v], nothing

 # # dates
-convertToAnyVector{D<:Union{Date,DateTime}}(dts::AVec{D}, d::KW) = Any[dts], nothing
+convertToAnyVector(dts::AVec{D}, d::KW) where {D<:Union{Date,DateTime}} = Any[dts], nothing

 # list of things (maybe other vectors, functions, or something else)
 function convertToAnyVector(v::AVec, d::KW)
@@ -72,19 +72,19 @@ end
 # TODO: can we avoid the copy here?  one error that crops up is that mapping functions over the same array
 #       result in that array being shared.  push!, etc will add too many items to that array

-compute_x(x::Void, y::Void, z)      = 1:size(z,1)
-compute_x(x::Void, y, z)            = 1:size(y,1)
+compute_x(x::Nothing, y::Nothing, z)      = 1:size(z,1)
+compute_x(x::Nothing, y, z)            = 1:size(y,1)
 compute_x(x::Function, y, z)        = map(x, y)
 compute_x(x, y, z)                  = copy(x)

 # compute_y(x::Void, y::Function, z)  = error()
-compute_y(x::Void, y::Void, z)      = 1:size(z,2)
+compute_y(x::Nothing, y::Nothing, z)      = 1:size(z,2)
 compute_y(x, y::Function, z)        = map(y, x)
 compute_y(x, y, z)                  = copy(y)

 compute_z(x, y, z::Function)        = map(z, x, y)
 compute_z(x, y, z::AbstractMatrix)  = Surface(z)
-compute_z(x, y, z::Void)            = nothing
+compute_z(x, y, z::Nothing)            = nothing
 compute_z(x, y, z)                  = copy(z)

 nobigs(v::AVec{BigFloat}) = map(Float64, v)
@@ -99,9 +99,9 @@ nobigs(v) = v
 end

 # not allowed
-compute_xyz(x::Void, y::FuncOrFuncs{F}, z) where {F<:Function}       = error("If you want to plot the function `$y`, you need to define the x values!")
-compute_xyz(x::Void, y::Void, z::FuncOrFuncs{F}) where {F<:Function} = error("If you want to plot the function `$z`, you need to define x and y values!")
-compute_xyz(x::Void, y::Void, z::Void)        = error("x/y/z are all nothing!")
+compute_xyz(x::Nothing, y::FuncOrFuncs{F}, z) where {F<:Function}       = error("If you want to plot the function `$y`, you need to define the x values!")
+compute_xyz(x::Nothing, y::Nothing, z::FuncOrFuncs{F}) where {F<:Function} = error("If you want to plot the function `$z`, you need to define x and y values!")
+compute_xyz(x::Nothing, y::Nothing, z::Nothing)        = error("x/y/z are all nothing!")

 # --------------------------------------------------------------------

@@ -93,7 +93,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
            cfunc(RGB(def))
        elseif eltype(def) <: Colorant
            cfunc.(RGB.(def))
-        elseif contains(string(arg), "color")
+        elseif occursin("color", string(arg))
            cfunc.(RGB.(plot_color.(def)))
        else
            def
@@ -6,7 +6,7 @@ const AVec = AbstractVector
 const AMat = AbstractMatrix
 const KW = Dict{Symbol,Any}

-struct PlotsDisplay <: Display end
+struct PlotsDisplay <: AbstractDisplay end

 # -----------------------------------------------------------

@@ -4,7 +4,7 @@ calcMidpoints(edges::AbstractVector) = Float64[0.5 * (edges[i] + edges[i+1]) for
 "Make histogram-like bins of data"
 function binData(data, nbins)
  lo, hi = ignorenan_extrema(data)
-  edges = collect(linspace(lo, hi, nbins+1))
+  edges = collect(range(lo, stop=hi, length=nbins+1))
  midpoints = calcMidpoints(edges)
  buckets = Int[max(2, min(searchsortedfirst(edges, x), length(edges)))-1 for x in data]
  counts = zeros(Int, length(midpoints))
@@ -119,7 +119,7 @@ function replace_image_with_heatmap(z::Array{T}) where T<:Colorant
    n, m = size(z)
    # idx = 0
    colors = ColorGradient(vec(z))
-    newz = reshape(linspace(0, 1, n*m), n, m)
+    newz = reshape(range(0, stop=1, length=n*m), n, m)
    newz, colors
    # newz = zeros(n, m)
    # for i=1:n, j=1:m
@@ -259,7 +259,7 @@ float_extended_type(x::AbstractArray{T}) where {T<:Real} = Float64
 nop() = nothing
 notimpl() = error("This has not been implemented yet")

-isnothing(x::Void) = true
+isnothing(x::Nothing) = true
 isnothing(x) = false

 _cycle(wrapper::InputWrapper, idx::Int) = wrapper.obj
@@ -307,6 +307,7 @@ function _expand_limits(lims, x)
    lims[2] = NaNMath.max(lims[2], e2)
  # catch err
  #   warn(err)
+  catch
  end
  nothing
 end
@@ -343,7 +344,7 @@ function replaceAliases!(d::KW, aliases::Dict{Symbol,Symbol})
  end
 end

-createSegments(z) = collect(repmat(reshape(z,1,:),2,1))[2:end]
+createSegments(z) = collect(repeat(reshape(z,1,:),2,1))[2:end]

 Base.first(c::Colorant) = c
 Base.first(x::Symbol) = x
@@ -355,22 +356,21 @@ sortedkeys(d::Dict) = sort(collect(keys(d)))
 const _scale_base = Dict{Symbol, Real}(
    :log10 => 10,
    :log2 => 2,
-    :ln => e,
+    :ln => ℯ,
 )

-"create an (n+1) list of the outsides of heatmap rectangles"
-function heatmap_edges(v::AVec, scale::Symbol = :identity)
+function _heatmap_edges(v::AVec)
  vmin, vmax = ignorenan_extrema(v)
-  extra_min = extra_max = 0.5 * (vmax-vmin) / (length(v)-1)
-  if scale in _logScales
-      vmin > 0 || error("The axis values must be positive for a $scale scale")
-      while vmin - extra_min <= 0
-          extra_min /= _scale_base[scale]
-      end
-  end
+  extra_min = (v[2] - v[1]) / 2
+  extra_max = (v[end] - v[end - 1]) / 2
  vcat(vmin-extra_min, 0.5 * (v[1:end-1] + v[2:end]), vmax+extra_max)
 end

+"create an (n+1) list of the outsides of heatmap rectangles"
+function heatmap_edges(v::AVec, scale::Symbol = :identity)
+  f, invf = scalefunc(scale), invscalefunc(scale)
+  map(invf, _heatmap_edges(map(f,v)))
+end

 function calc_r_extrema(x, y)
    xmin, xmax = ignorenan_extrema(x)
@@ -382,7 +382,7 @@ end
 function convert_to_polar(x, y, r_extrema = calc_r_extrema(x, y))
    rmin, rmax = r_extrema
    theta, r = filter_radial_data(x, y, r_extrema)
-    r = (r - rmin) / (rmax - rmin)
+    r = (r .- rmin) ./ (rmax .- rmin)
    x = r.*cos.(theta)
    y = r.*sin.(theta)
    x, y
@@ -451,8 +451,8 @@ limsType(lims)                                          = :invalid
 # axis_Symbol(letter, postfix) = Symbol(letter * postfix)
 # axis_symbols(letter, postfix...) = map(s -> axis_Symbol(letter, s), postfix)

-Base.convert(::Type{Vector{T}}, rng::Range{T}) where {T<:Real}         = T[x for x in rng]
-Base.convert(::Type{Vector{T}}, rng::Range{S}) where {T<:Real,S<:Real} = T[x for x in rng]
+Base.convert(::Type{Vector{T}}, rng::AbstractRange{T}) where {T<:Real}         = T[x for x in rng]
+Base.convert(::Type{Vector{T}}, rng::AbstractRange{S}) where {T<:Real,S<:Real} = T[x for x in rng]

 Base.merge(a::AbstractVector, b::AbstractVector) = sort(unique(vcat(a,b)))

@@ -847,8 +847,8 @@ end

 extendSeriesByOne(v::UnitRange{Int}, n::Int = 1) = isempty(v) ? (1:n) : (minimum(v):maximum(v)+n)
 extendSeriesByOne(v::AVec, n::Integer = 1)       = isempty(v) ? (1:n) : vcat(v, (1:n) + ignorenan_maximum(v))
-extendSeriesData(v::Range{T}, z::Real) where {T}        = extendSeriesData(float(collect(v)), z)
-extendSeriesData(v::Range{T}, z::AVec) where {T}        = extendSeriesData(float(collect(v)), z)
+extendSeriesData(v::AbstractRange{T}, z::Real) where {T}        = extendSeriesData(float(collect(v)), z)
+extendSeriesData(v::AbstractRange{T}, z::AVec) where {T}        = extendSeriesData(float(collect(v)), z)
 extendSeriesData(v::AVec{T}, z::Real) where {T}         = (push!(v, convert(T, z)); v)
 extendSeriesData(v::AVec{T}, z::AVec) where {T}         = (append!(v, convert(Vector{T}, z)); v)

@@ -857,7 +857,7 @@ extendSeriesData(v::AVec{T}, z::AVec) where {T}         = (append!(v, convert(Ve
 # NOTE: backends should implement the following methods to get/set the x/y/z data objects

 tovec(v::AbstractVector) = v
-tovec(v::Void) = zeros(0)
+tovec(v::Nothing) = zeros(0)

 function getxy(plt::Plot, i::Integer)
    d = plt.series_list[i].d
@@ -1139,9 +1139,9 @@ function convert_sci_unicode(label::AbstractString)
    "×10" => "×10^{",
    )
    for key in keys(unicode_dict)
-        label = replace(label, key, unicode_dict[key])
+        label = replace(label, key => unicode_dict[key])
    end
-    if contains(label, "10^{")
+    if occursin("10^{", label)
        label = string(label, "}")
    end
    label
@@ -2,20 +2,20 @@
 using VisualRegressionTests
 # using ExamplePlots

-import DataFrames, RDatasets
+# import DataFrames, RDatasets

 # don't let pyplot use a gui... it'll crash
 # note: Agg will set gui -> :none in PyPlot
-ENV["MPLBACKEND"] = "Agg"
-try
-  @eval import PyPlot
-  info("Matplotlib version: $(PyPlot.matplotlib[:__version__])")
-end
+# ENV["MPLBACKEND"] = "Agg"
+# try
+#   @eval import PyPlot
+#   info("Matplotlib version: $(PyPlot.matplotlib[:__version__])")
+# end


 using Plots
-using StatPlots
-using Base.Test
+# using StatPlots
+using Test

 default(size=(500,300))

@@ -23,7 +23,7 @@ default(size=(500,300))
 # TODO: use julia's Condition type and the wait() and notify() functions to initialize a Window, then wait() on a condition that
 #       is referenced in a button press callback (the button clicked callback will call notify() on that condition)

-const _current_plots_version = v"0.17.2"
+const _current_plots_version = v"0.17.4"


 function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], eps = 1e-2)
@@ -13,7 +13,7 @@ img_eps = isinteractive() ? 1e-2 : 10e-2
    @test gr() == Plots.GRBackend()
    @test backend() == Plots.GRBackend()

-    image_comparison_facts(:gr, eps=img_eps)
+    image_comparison_facts(:gr, eps=img_eps, skip = [25, 30])
 end


@@ -39,7 +39,7 @@ end
 #     @test plotlyjs() == Plots.PlotlyJSBackend()
 #     @test backend() == Plots.PlotlyJSBackend()
 #
-#     if is_linux() && isinteractive()
+#     if Sys.islinux() && isinteractive()
 #         image_comparison_facts(:plotlyjs,
 #             skip=[
 #                 2,  # animation (skipped for speed)
@@ -79,7 +79,7 @@ end
 #     @test backend() == Plots.PlotlyBackend()
 #
 #     # # until png generation is reliable on OSX, just test on linux
-#     # @static is_linux() && image_comparison_facts(:plotly, only=[1,3,4,7,8,9,10,11,12,14,15,20,22,23,27], eps=img_eps)
+#     # @static Sys.islinux() && image_comparison_facts(:plotly, only=[1,3,4,7,8,9,10,11,12,14,15,20,22,23,27], eps=img_eps)
 # end


@@ -1,15 +1,18 @@
+using Pkg
+
 Pkg.add("ImageMagick")
 Pkg.build("ImageMagick")

 # Pkg.clone("GR")
 # Pkg.build("GR")

-Pkg.clone("https://github.com/JuliaPlots/PlotReferenceImages.jl.git")
+Pkg.checkout("https://github.com/JuliaPlots/PlotReferenceImages.jl.git")

 # Pkg.clone("https://github.com/JuliaStats/KernelDensity.jl.git")

-Pkg.clone("StatPlots")
+# Pkg.add("StatPlots")
 Pkg.checkout("PlotUtils")
+Pkg.checkout("RecipesBase")

 # Pkg.clone("Blink")
 # Pkg.build("Blink")
@@ -22,9 +25,9 @@ Pkg.checkout("PlotUtils")
 # Pkg.clone("VisualRegressionTests")

 # need this to use Conda
-ENV["PYTHON"] = ""
-Pkg.add("PyPlot")
-Pkg.build("PyPlot")
+# ENV["PYTHON"] = ""
+# Pkg.add("PyPlot")
+# Pkg.build("PyPlot")

 # Pkg.add("InspectDR")
Author	SHA1	Message	Date
Daniel Schwabeneder	4860bf3f19	Merge pull request #1615 from pfitzseb/sp/junodisplay Fix display on Juno 0.7	2018-08-04 06:05:00 +02:00
Sebastian Pfitzner	adf2af82b4	fix display on Juno 0.7	2018-08-03 12:37:12 +02:00
Josef Heinen	8d16563014	Update gr.jl	2018-08-01 13:12:48 +02:00
Daniel Schwabeneder	da765a5eec	Merge pull request #1610 from daschw/pyplot-thickness fix pyplot thickness_scaling (fix #1606)	2018-07-28 08:53:03 +02:00
Daniel Schwabeneder	72c4962e97	prepare backports release	2018-07-26 16:43:05 +02:00
Daniel Schwabeneder	789cf1d66b	fix legend frame	2018-07-25 23:39:55 +02:00
Daniel Schwabeneder	64ec922d7f	fix thickness_scaling in pyplot	2018-07-25 23:32:02 +02:00
Daniel Schwabeneder	de85983247	Merge pull request #1596 from wfrgra/minorgrid Minorgrid and minor ticks	2018-07-17 17:54:38 +02:00
Will Grant	7eaae3a6d5	Add full keyword control of minor grid	2018-07-16 17:37:19 +10:00
Will Grant	403b57c076	extend ticks beyond major grid, to axis limits	2018-07-11 17:59:47 +10:00
Will Grant	dd434b89d2	add minor grid and tick marks. Works, but doesn't extend beyond major ticks	2018-07-11 17:17:45 +10:00
Daniel Schwabeneder	1a3d58e09b	Merge pull request #1594 from fredrikekre/fe/0.72 additional fixes	2018-07-05 09:01:26 +02:00
Fredrik Ekre	89ae239743	adjust CI scripts	2018-07-05 08:46:17 +02:00
Fredrik Ekre	c785d1509b	additional fixes	2018-07-05 08:33:14 +02:00
Daniel Schwabeneder	9e412555bb	Merge pull request #1585 from JuliaPlots/julia0.7 Switch to 0.7 on master	2018-07-05 08:14:03 +02:00
Daniel Schwabeneder	0717805773	more deprecation fixes	2018-07-04 22:33:51 +02:00
Daniel Schwabeneder	d045c5a390	Merge pull request #1592 from JuliaPlots/revert-1591-fbot/deps Revert "Fix deprecations"	2018-07-04 21:10:31 +02:00
Daniel Schwabeneder	3cc0d0c735	Revert "Fix deprecations"	2018-07-04 21:10:08 +02:00
Daniel Schwabeneder	9a3c727532	Merge pull request #1591 from JuliaPlots/fbot/deps Fix deprecations	2018-07-04 21:08:10 +02:00
Daniel Schwabeneder	a7f2484d45	fix some deprecation warnings	2018-07-04 20:56:13 +02:00
Daniel Schwabeneder	96d97699a0	Merge pull request #1588 from daschw/julia0.7 fix Pkg.installed	2018-07-03 20:02:22 +02:00
Daniel Schwabeneder	e92e832258	fix Pkg.installed	2018-07-03 19:59:03 +02:00
femtocleaner[bot]	3a769549d8	Fix deprecations	2018-07-02 20:33:16 +00:00
Daniel Schwabeneder	0eab0dc680	Merge pull request #1583 from daschw/release prepare release	2018-07-01 10:11:07 +02:00
Daniel Schwabeneder	2b48f50de4	prepare release	2018-07-01 10:06:49 +02:00
Daniel Schwabeneder	fa60eacfc5	Merge pull request #1572 from daschw/widen Widen axes for most series types and log scales	2018-07-01 09:52:29 +02:00
Daniel Schwabeneder	d2a4136d4f	Merge pull request #1582 from daschw/test don't checkout PlotUtils in tests	2018-07-01 09:33:19 +02:00
Daniel Schwabeneder	7d88a746ea	don't checkout PlotUtils in tests	2018-07-01 09:27:11 +02:00
Daniel Schwabeneder	7f4537bdc6	Merge pull request #1577 from JuliaPlots/pv/webio WebIO integration for PlotlyJS backend	2018-07-01 08:44:40 +02:00
femtocleaner[bot]	d68829820b	Fix deprecations	2018-06-30 23:15:27 +00:00
Daniel Schwabeneder	9cf3036ab5	Merge pull request #1587 from daschw/julia0.7 remove StatPlots from tests	2018-07-02 00:28:22 +02:00
Daniel Schwabeneder	2467eb71c1	remove StatPlots from tests	2018-07-02 00:26:23 +02:00
Daniel Schwabeneder	345bb5d1aa	Merge pull request #1586 from daschw/julia0.7 use Pkg in travis commands	2018-07-02 00:19:54 +02:00
Daniel Schwabeneder	8d50828998	Merge branch 'julia0.7' into julia0.7	2018-07-02 00:03:27 +02:00
Daniel Schwabeneder	201de82baf	fix some things in tests	2018-07-02 00:00:40 +02:00
Daniel Schwabeneder	99519ac3da	use Pkg in travis commands	2018-07-01 23:48:56 +02:00
Daniel Schwabeneder	a575ab7c74	Merge branch 'master' into julia0.7	2018-07-01 23:30:40 +02:00
Daniel Schwabeneder	c4f79814df	Merge pull request #1584 from daschw/julia0.7 julia 0.7 fixes	2018-07-01 23:24:38 +02:00
Daniel Schwabeneder	6135f6271c	julia 0.7 fixes	2018-07-01 21:40:48 +02:00
Andrew Palugniok	8ef70f07f0	Merge pull request #1576 from apalugniok/hover-zcolor Fix hover and zcolor interaction in Plotly (Fixes #1567)	2018-06-28 08:28:42 +01:00
Andrew Palugniok	17b7e37885	Merge pull request #1575 from apalugniok/flip-plotly Fix axis flip on Plotly (Fixes #1556)	2018-06-28 08:28:01 +01:00
Pietro Vertechi	35c17044e1	prepare output	2018-06-27 15:39:54 +01:00
Pietro Vertechi	7085d98f41	webio integration	2018-06-27 15:24:50 +01:00
Andrew Palugniok	ee73e32b0e	Fix hover and zcolor interaction in Plotly.	2018-06-26 18:26:13 +01:00
Andrew Palugniok	371430c172	Fix axis flip on Plotly.	2018-06-26 12:18:22 +01:00
Daniel Schwabeneder	495753b517	Merge pull request #1573 from yha/plotly-log-noticks Plotly: fix log scale with no ticks	2018-06-25 15:59:12 +02:00
yharel	211be0a863	Setting axis scale regardless of ticks	2018-06-25 00:42:36 +03:00
Daniel Schwabeneder	12c9a8e6c3	plots_heatmap	2018-06-24 19:01:06 +02:00
Daniel Schwabeneder	fb5d9e0c01	Merge pull request #1571 from daschw/pgf_dpi New attributes for PGFPlots	2018-06-24 18:05:14 +02:00
Daniel Schwabeneder	61a2d962c0	widen most seriestypes including logscales	2018-06-24 11:03:56 +02:00
Daniel Schwabeneder	440622830a	disregard dpi for pgfplots	2018-06-24 00:34:11 +02:00
Daniel Schwabeneder	2652990432	annotations	2018-06-23 23:44:43 +02:00
Daniel Schwabeneder	652e2f27b6	implement font rotation	2018-06-23 23:38:38 +02:00
Daniel Schwabeneder	77a82eaa6a	implent font size and colors	2018-06-23 23:24:09 +02:00
Daniel Schwabeneder	624a181b23	implement axis and grid arguments and corresponding thickness_scaling	2018-06-23 21:47:01 +02:00
Daniel Schwabeneder	865ac52442	pgf_thickness_scaling for series linewidths and markers	2018-06-23 19:39:25 +02:00
Daniel Schwabeneder	4f064d7c02	Merge pull request #1561 from daschw/size Fix size and dpi for GR and PyPlot	2018-06-23 09:14:52 +02:00
Daniel Schwabeneder	facb67e94e	Merge pull request #1570 from daschw/flip fix flip for heatmap and image on GR (fix #1491)	2018-06-23 07:34:24 +02:00
Daniel Schwabeneder	124c838e06	fix flip for heatmap and image on GR	2018-06-22 22:07:00 +02:00
Daniel Schwabeneder	026e894e1d	Merge pull request #1565 from daschw/fillrange Fix fillrange with line segments on PyPlot and Plotly (fix #1563)	2018-06-18 21:58:36 +02:00
Daniel Schwabeneder	2ed0f1661a	fix plotly fillrange	2018-06-18 19:55:09 +02:00
Daniel Schwabeneder	00f285cba3	fix pyplot fillrange	2018-06-18 19:45:43 +02:00
Daniel Schwabeneder	ddf5bf472f	Merge pull request #1562 from daschw/py_marker fix markercolor as vector on pyplot (fix #1494)	2018-06-18 09:22:13 +02:00
Daniel Schwabeneder	534c7799e5	fix markercolor as vector on pyplot	2018-06-17 22:20:20 +02:00
Daniel Schwabeneder	b254aaa081	Merge pull request #1559 from yha/log-heatmap Log-scale heatmap edge computation	2018-06-16 21:24:23 +02:00
Daniel Schwabeneder	76f2860c74	fix gr	2018-06-16 20:38:46 +02:00
Daniel Schwabeneder	5ebcb77d0d	rename _gr_dpi_scale to _gr_thickness_scaling	2018-06-16 19:29:28 +02:00
Daniel Schwabeneder	4847752ef4	make dpi change plot size	2018-06-16 19:24:58 +02:00
Daniel Schwabeneder	84ec8d61ae	fix thickness_scaling in pyplot	2018-06-16 17:14:19 +02:00
Daniel Schwabeneder	0f13551b6d	fix margins on gr	2018-06-16 16:57:07 +02:00
Daniel Schwabeneder	3e66c6cce4	change DPI value back	2018-06-16 11:51:49 +02:00
yha	09de3a5e7a	GR heatmap: warning for non-equal spacing	2018-06-16 04:14:27 +03:00
yha	00483d4c0d	GR heatmap: warning for non-equal spacing	2018-06-16 04:07:21 +03:00
yha	1e3d10ad31	GR heatmap: warning for non-equal spacing	2018-06-16 03:13:13 +03:00
yha	dc31cd7103	A better heuristic for outer heatmap edges	2018-06-16 03:10:48 +03:00
yharel	cffb670f72	Merge branch 'master' of https://github.com/JuliaPlots/Plots.jl	2018-06-14 04:06:08 +03:00
yharel	781fea7431	Heatmap log scale fix	2018-06-14 02:59:04 +03:00
Michael K. Borregaard	5b0ba79a35	Update Travis commands for 0.7	2018-05-04 10:53:21 +02:00
Michael Krabbe Borregaard	173c7b2aec	Update julia version to 0.7 Isn't working yet.	2018-05-03 20:46:32 +02:00