Merge pull request #2548 from daschw/surface

Implement zerror and surface type recipe fixes
bump version
2020-04-07 17:50:32 +02:00 · 2020-04-07 16:27:33 +02:00 · 2020-04-07 16:27:02 +02:00 · 2020-04-07 16:06:12 +02:00 · 2020-04-07 13:51:10 +02:00 · 2020-04-07 13:50:55 +02:00
34 changed files with 3421 additions and 1946 deletions
@@ -8,3 +8,5 @@ deps/plotly-latest.min.js
 deps/build.log
 deps/deps.jl
 Manifest.toml
+dev/
+test/tmpplotsave.hdf5
@@ -4,8 +4,8 @@ os:
  - linux
  # - osx
 julia:
+  - 1.0
  - 1
-  - 1.3
  - nightly

 matrix:
@@ -20,6 +20,13 @@ addons:
      - xauth
      - xvfb

+env:
+  - GKS_ENCODING="utf8"
+
+cache:
+  directories:
+  - $HOME/.julia/artifacts
+
 sudo: required
 before_install:
  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pwd ; fi
@@ -28,6 +35,9 @@ before_install:
 notifications:
  email: true

+after_success:
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
+
 script:
  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
  - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
@@ -1,7 +1,7 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "0.29.1"
+version = "1.0.4"

 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -32,17 +32,17 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

 [compat]
 Contour = "0.5"
-FFMPEG = "0.2"
+FFMPEG = "0.2, 0.3"
 FixedPointNumbers = "0.6, 0.7, 0.8"
-GR = "0.46"
-GeometryTypes = "0.7"
+GR = "0.46, 0.47, 0.48"
+GeometryTypes = "0.7, 0.8"
 JSON = "0.21"
 Measures = "0.3"
 NaNMath = "0.3"
 PGFPlotsX = "1.2.0"
 PlotThemes = "1"
-PlotUtils = "0.6.1"
-RecipesBase = "0.8"
+PlotUtils = "0.6.5"
+RecipesBase = "1"
 Reexport = "0.2"
 Requires = "0.5, 1.0"
 Showoff = "0.3.1"
@@ -53,17 +53,19 @@ julia = "1"
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
 Gtk = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
+HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
-LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
 LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
+OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925"
 RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"

 [targets]
-test = ["FileIO", "GeometryTypes", "Gtk", "ImageMagick", "Images", "LaTeXStrings", "LibGit2", "PGFPlotsX", "Random", "RDatasets", "StatsPlots", "Test", "UnicodePlots", "VisualRegressionTests"]
+test = ["FileIO", "GeometryTypes", "Gtk", "ImageMagick", "Images", "LibGit2", "OffsetArrays", "PGFPlotsX", "HDF5", "Random", "RDatasets", "StaticArrays", "StatsPlots", "Test", "UnicodePlots", "VisualRegressionTests"]
@@ -1,13 +1,26 @@
 # Plots

-[![Build Status](https://travis-ci.org/JuliaPlots/Plots.jl.svg?branch=master)](https://travis-ci.org/JuliaPlots/Plots.jl)
-[![Build status](https://ci.appveyor.com/api/projects/status/github/juliaplots/plots.jl?branch=master&svg=true)](https://ci.appveyor.com/project/mkborregaard/plots-jl)
-[![Join the chat at https://gitter.im/tbreloff/Plots.jl](https://badges.gitter.im/tbreloff/Plots.jl.svg)](https://gitter.im/tbreloff/Plots.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-<a href="http://docs.juliaplots.org/latest/" target="_blank"><img src="https://img.shields.io/badge/docs-latest-blue.svg" alt="Latest documentation"></a>
-<!-- [![Plots](http://pkg.julialang.org/badges/Plots_0.3.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.3) -->
-<!-- [![Plots](http://pkg.julialang.org/badges/Plots_0.4.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.4) -->
-<!-- [![Coverage Status](https://coveralls.io/repos/tbreloff/Plots.jl/badge.svg?branch=master)](https://coveralls.io/r/tbreloff/Plots.jl?branch=master) -->
-<!-- [![codecov.io](http://codecov.io/github/tbreloff/Plots.jl/coverage.svg?branch=master)](http://codecov.io/github/tbreloff/Plots.jl?branch=master) -->
+[travis-img]: https://img.shields.io/travis/JuliaPlots/Plots.jl?logo=travis
+[travis-url]: https://travis-ci.org/JuliaPlots/Plots.jl
+
+[appveyor-img]: https://ci.appveyor.com/api/projects/status/github/juliaplots/plots.jl?branch=master&svg=true
+[appveyor-url]: https://ci.appveyor.com/project/mkborregaard/plots-jl
+
+[pkgeval-img]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/P/Plots.svg
+[pkgeval-url]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/report.html
+
+[gitter-img]: https://badges.gitter.im/tbreloff/Plots.jl.svg
+[gitter-url]: https://gitter.im/tbreloff/Plots.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
+[docs-img]: https://img.shields.io/badge/docs-stable-blue.svg
+[docs-url]: http://docs.juliaplots.org/latest/
+
+[![][travis-img]][travis-url]
+[![][appveyor-img]][appveyor-url]
+[![][pkgeval-img]][pkgeval-url]
+[![][gitter-img]][gitter-url]
+[![][docs-img]][docs-url]
+[![Codecov](https://codecov.io/gh/JuliaPlots/Plots.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaPlots/Plots.jl)

 #### Created by Tom Breloff (@tbreloff)

@@ -1,8 +1,7 @@
 environment:
  matrix:
-  # - julia_version: 0.7
+  - julia_version: 1.0
  - julia_version: 1
-  - julia_version: 1.3
  - julia_version: nightly

 platform:
@@ -20,6 +19,9 @@ branches:
    - master
    - /release-.*/

+cache:
+  - '%USERPROFILE%\.julia\artifacts'
+
 notifications:
  - provider: Email
    on_build_success: false
@@ -30,7 +32,7 @@ install:
  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))

 build_script:
-  - echo "%JL_BUILD_SCRIPT%"
+  - echo "%JL_TEST_SCRIPT%"
  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

 test_script:
@@ -0,0 +1,10 @@
+ignore:
+  - "src/backends/inspectdr.jl"
+  - "src/backends/orca.jl"
+  - "src/backends/pgfplots.jl"
+  - "src/backends/plotly.jl"
+  - "src/backends/plotlyjs.jl"
+  - "src/backends/pyplot.jl"
+  - "src/backends/web.jl"
+  - "src/fileio.jl"
+  - "src/ijulia.jl"
@@ -26,13 +26,15 @@

 using SnoopCompile

+project_flag = string("--project=", joinpath(homedir(), ".julia", "dev", "Plots"))
 log_path = joinpath(tempdir(), "compiles.log")
 precompiles_path = joinpath(tempdir(), "precompile")

 # run examples with GR backend, logging what needs to be compiled
-SnoopCompile.@snoopc log_path begin
+SnoopCompile.@snoopc project_flag log_path begin
    using Plots
-    Plots.test_examples(:gr, disp=true)
+    Plots.test_examples(:gr)
+    Plots.test_examples(:plotly, skip = Plots._backend_skips[:plotly])
 end

 # precompile calls containing the following strings are dropped
@@ -1,5 +1,9 @@
 module Plots

+if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@optlevel"))
+    @eval Base.Experimental.@optlevel 1
+end
+
 const _current_plots_version = VersionNumber(split(first(filter(line -> occursin("version", line), readlines(normpath(@__DIR__, "..", "Project.toml")))), "\"")[2])

 using Reexport
@@ -71,6 +71,7 @@ function buildanimation(anim::Animation, fn::AbstractString,
                        is_animated_gif::Bool=true;
                        fps::Real = 20, loop::Integer = 0,
                        variable_palette::Bool=false,
+                        verbose=false,
                        show_msg::Bool=true)
    if length(anim.frames) == 0
        throw(ArgumentError("Cannot build empty animations"))
@@ -79,20 +80,23 @@ function buildanimation(anim::Animation, fn::AbstractString,
    fn = abspath(expanduser(fn))
    animdir = anim.dir
    framerate = ffmpeg_framerate(fps)
+    verbose_level = (verbose isa Int ? verbose :
+                        verbose ? 32  # "info"
+                                : 16) # "error"

    if is_animated_gif
        if variable_palette
            # generate a colorpalette for each frame for highest quality, but larger filesize
            palette="palettegen=stats_mode=single[pal],[0:v][pal]paletteuse=new=1"
-            ffmpeg_exe(`-v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -lavfi "$palette" -y $fn`)
+            ffmpeg_exe(`-v $verbose_level -framerate $framerate -loop $loop -i $(animdir)/%06d.png -lavfi "$palette" -y $fn`)
        else
            # generate a colorpalette first so ffmpeg does not have to guess it
-            ffmpeg_exe(`-v 0 -i $(animdir)/%06d.png -vf "palettegen=stats_mode=diff" -y "$(animdir)/palette.bmp"`)
+            ffmpeg_exe(`-v $verbose_level -i $(animdir)/%06d.png -vf "palettegen=stats_mode=diff" -y "$(animdir)/palette.bmp"`)
            # then apply the palette to get better results
-            ffmpeg_exe(` -v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -y $fn`)
+            ffmpeg_exe(`-v $verbose_level -framerate $framerate -loop $loop -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -y $fn`)
        end
    else
-        ffmpeg_exe(`-v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
+        ffmpeg_exe(`-v $verbose_level -framerate $framerate -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
    end

    show_msg && @info("Saved animation to ", fn)
@@ -163,16 +167,16 @@ function _animate(forloop::Expr, args...; callgif = false)
    error("Unsupported animate filter: $args")
  end

-  push!(block.args, :(if $filterexpr; frame($animsym); end))
+  push!(block.args, :(if $filterexpr; Plots.frame($animsym); end))
  push!(block.args, :(global $countersym += 1))

  # add a final call to `gif(anim)`?
-  retval = callgif ? :(gif($animsym)) : animsym
+  retval = callgif ? :(Plots.gif($animsym)) : animsym

  # full expression:
  esc(quote
    $freqassert             # if filtering, check frequency is an Integer > 0
-    $animsym = Animation()  # init animation object
+    $animsym = Plots.Animation()  # init animation object
    global $countersym = 1         # init iteration counter
    $forloop                # for loop, saving a frame after each iteration
    $retval                 # return the animation object, or the gif
@@ -89,7 +89,7 @@ const _arg_desc = KW(
 :foreground_color_legend  => "Color Type or `:match` (matches `:foreground_color_subplot`).  Foreground color of the legend.",
 :foreground_color_title   => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of subplot title.",
 :color_palette            => "Vector of colors (cycle through) or color gradient (generate list from gradient) or `:auto` (generate a color list using `Colors.distiguishable_colors` and custom seed colors chosen to contrast with the background).  The color palette is a color list from which series colors are automatically chosen.",
-:legend                   => "Bool (show the legend?) or Symbol (legend position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:inside`, `:legend`, `:topright`, `:topleft`, `:bottomleft`, `:bottomright` (note: only some may be supported in each backend)",
+:legend                   => "Bool (show the legend?) or Symbol (legend position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:inside`, `:legend`, `:topright`, `:topleft`, `:bottomleft`, `:bottomright` , `:inline` (note: only some may be supported in each backend)",
 :legendfontfamily         => "String or Symbol. Font family of legend entries.",
 :legendfontsize           => "Integer. Font pointsize of legend entries.",
 :legendfonthalign         => "Symbol. Font horizontal alignment of legend entries: :hcenter, :left, :right or :center",
@@ -267,6 +267,7 @@ const _series_defaults = KW(
    :bar_edges         => false,
    :xerror            => nothing,
    :yerror            => nothing,
+    :zerror            => nothing,
    :ribbon            => nothing,
    :quiver            => nothing,
    :arrow             => nothing,   # allows for adding arrows to line/path... call `arrow(args...)`
@@ -345,7 +346,7 @@ const _subplot_defaults = KW(
    :legendtitlefontcolor     => :match,
    :annotations              => [],                # annotation tuples... list of (x,y,annotation)
    :projection               => :none,             # can also be :polar or :3d
-    :aspect_ratio             => :none,             # choose from :none or :equal
+    :aspect_ratio             => :auto,             # choose from :none or :equal
    :margin                   => 1mm,
    :left_margin              => :match,
    :top_margin               => :match,
@@ -450,15 +451,33 @@ const _initial_fontsizes = Dict(:titlefontsize  => _subplot_defaults[:titlefonts
                                :tickfontsize   => _axis_defaults[:tickfontsize],
                                :guidefontsize  => _axis_defaults[:guidefontsize])

-const _all_args = sort(collect(union(map(keys, _all_defaults)...)))
+const _internal_args =
+    [:plot_object, :series_plotindex, :markershape_to_add, :letter, :idxfilter]

-is_subplot_attr(k) = haskey(_subplot_defaults, k)
-is_series_attr(k) = haskey(_series_defaults, k)
-#is_axis_attr(k) = haskey(_axis_defaults_byletter, k)
-is_axis_attr(k) = haskey(_axis_defaults, Symbol(chop(string(k); head=1, tail=0)))
-is_axis_attr_noletter(k) = haskey(_axis_defaults, k)
+const _axis_args = sort(union(collect(keys(_axis_defaults))))
+const _series_args = sort(union(collect(keys(_series_defaults))))
+const _subplot_args = sort(union(collect(keys(_subplot_defaults))))
+const _plot_args = sort(union(collect(keys(_plot_defaults))))
+
+const _magic_axis_args = [:axis, :tickfont, :guidefont, :grid, :minorgrid]
+const _magic_subplot_args = [:titlefont, :legendfont, :legendtitlefont, ]
+const _magic_series_args = [:line, :marker, :fill]
+
+const _all_axis_args = sort(union([_axis_args; _magic_axis_args]))
+const _all_subplot_args = sort(union([_subplot_args; _magic_subplot_args]))
+const _all_series_args = sort(union([_series_args; _magic_series_args]))
+const _all_plot_args = _plot_args
+
+const _all_args =
+    sort([_all_axis_args; _all_subplot_args; _all_series_args; _all_plot_args])
+
+is_subplot_attr(k) = k in _all_subplot_args
+is_series_attr(k) = k in _all_series_args
+is_axis_attr(k) = Symbol(chop(string(k); head=1, tail=0)) in _all_axis_args
+is_axis_attr_noletter(k) = k in _all_axis_args

 RecipesBase.is_key_supported(k::Symbol) = is_attr_supported(k)
+is_default_attribute(k) = k in _internal_args || k in _all_args || is_axis_attr_noletter(k)

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

@@ -550,17 +569,18 @@ add_aliases(:bins, :bin, :nbin, :nbins, :nb)
 add_aliases(:ribbon, :rib)
 add_aliases(:annotations, :ann, :anns, :annotate, :annotation)
 add_aliases(:xguide, :xlabel, :xlab, :xl)
-add_aliases(:xlims, :xlim, :xlimit, :xlimits)
+add_aliases(:xlims, :xlim, :xlimit, :xlimits, :xrange)
 add_aliases(:xticks, :xtick)
 add_aliases(:xrotation, :xrot, :xr)
 add_aliases(:yguide, :ylabel, :ylab, :yl)
-add_aliases(:ylims, :ylim, :ylimit, :ylimits)
+add_aliases(:ylims, :ylim, :ylimit, :ylimits, :yrange)
 add_aliases(:yticks, :ytick)
 add_aliases(:yrotation, :yrot, :yr)
 add_aliases(:zguide, :zlabel, :zlab, :zl)
 add_aliases(:zlims, :zlim, :zlimit, :zlimits)
 add_aliases(:zticks, :ztick)
 add_aliases(:zrotation, :zrot, :zr)
+add_aliases(:guidefontsize, :labelfontsize)
 add_aliases(:fill_z, :fillz, :fz, :surfacecolor, :surfacecolour, :sc, :surfcolor, :surfcolour)
 add_aliases(:legend, :leg, :key)
 add_aliases(:legendtitle, :legend_title, :labeltitle, :label_title, :leg_title, :key_title)
@@ -575,6 +595,7 @@ add_aliases(:color_palette, :palette)
 add_aliases(:overwrite_figure, :clf, :clearfig, :overwrite, :reuse)
 add_aliases(:xerror, :xerr, :xerrorbar)
 add_aliases(:yerror, :yerr, :yerrorbar, :err, :errorbar)
+add_aliases(:zerror, :zerr, :zerrorbar)
 add_aliases(:quiver, :velocity, :quiver2d, :gradient, :vectorfield)
 add_aliases(:normalize, :norm, :normed, :normalized)
 add_aliases(:show_empty_bins, :showemptybins, :showempty, :show_empty)
@@ -638,6 +659,7 @@ function default(k::Symbol)
        letter, key = axis_k
        return _axis_defaults_byletter[letter][key]
    end
+    k == :letter && return k # for type recipe processing
    k in _suppress_warnings || error("Unknown key: ", k)
 end

@@ -919,22 +941,6 @@ end
 function preprocessArgs!(plotattributes::AKW)
    replaceAliases!(plotattributes, _keyAliases)

-    # clear all axis stuff
-    # if haskey(plotattributes, :axis) && plotattributes[:axis] in (:none, nothing, false)
-    #     plotattributes[:ticks] = nothing
-    #     plotattributes[:foreground_color_border] = RGBA(0,0,0,0)
-    #     plotattributes[:foreground_color_axis] = RGBA(0,0,0,0)
-    #     plotattributes[:grid] = false
-    #     delete!(plotattributes, :axis)
-    # end
-    # for letter in (:x, :y, :z)
-    #     asym = Symbol(letter, :axis)
-    #     if haskey(plotattributes, asym) || plotattributes[asym] in (:none, nothing, false)
-    #         plotattributes[Symbol(letter, :ticks)] = nothing
-    #         plotattributes[Symbol(letter, :foreground_color_border)] = RGBA(0,0,0,0)
-    #     end
-    # end
-
    # handle axis args common to all axis
    args = pop_kw!(plotattributes, :axis, ())
    for arg in wraptuple(args)
@@ -992,13 +998,6 @@ function preprocessArgs!(plotattributes::AKW)
            processMinorGridArg!(plotattributes, arg, letter)
        end
    end
-    # fonts
-    for fontname in (:titlefont, :legendfont, :legendtitlefont)
-        args = pop_kw!(plotattributes, fontname, ())
-        for arg in wraptuple(args)
-            processFontArg!(plotattributes, fontname, arg)
-        end
-    end
    # handle font args common to all axes
    for fontname in (:tickfont, :guidefont)
        args = pop_kw!(plotattributes, fontname, ())
@@ -1017,6 +1016,26 @@ function preprocessArgs!(plotattributes::AKW)
            end
        end
    end
+    # handle axes args
+    for k in _axis_args
+        if haskey(plotattributes, k) && k !== :link
+            v = plotattributes[k]
+            for letter in (:x, :y, :z)
+                lk = Symbol(letter, k)
+                if !is_explicit(plotattributes, lk)
+                    plotattributes[lk] = v
+                end
+            end
+        end
+    end
+
+    # fonts
+    for fontname in (:titlefont, :legendfont, :legendtitlefont)
+        args = pop_kw!(plotattributes, fontname, ())
+        for arg in wraptuple(args)
+            processFontArg!(plotattributes, fontname, arg)
+        end
+    end

    # handle line args
    for arg in wraptuple(pop_kw!(plotattributes, :line, ()))
@@ -1219,7 +1238,7 @@ function convertLegendValue(val::Symbol)
        :best
    elseif val in (:no, :none)
        :none
-    elseif val in (:right, :left, :top, :bottom, :inside, :best, :legend, :topright, :topleft, :bottomleft, :bottomright, :outertopright, :outertopleft, :outertop, :outerright, :outerleft, :outerbottomright, :outerbottomleft, :outerbottom)
+    elseif val in (:right, :left, :top, :bottom, :inside, :best, :legend, :topright, :topleft, :bottomleft, :bottomright, :outertopright, :outertopleft, :outertop, :outerright, :outerleft, :outerbottomright, :outerbottomleft, :outerbottom, :inline)
        val
    else
        error("Invalid symbol for legend: $val")
@@ -1471,12 +1490,9 @@ function _update_axis(plt::Plot, sp::Subplot, plotattributes_in::AKW, letter::Sy
 end

 function _update_axis(axis::Axis, plotattributes_in::AKW, letter::Symbol, subplot_index::Int)
-    # grab magic args (for example `xaxis = (:flip, :log)`)
-    args = wraptuple(get(plotattributes_in, Symbol(letter, :axis), ()))
-
    # build the KW of arguments from the letter version (i.e. xticks --> ticks)
    kw = KW()
-    for k in keys(_axis_defaults)
+    for k in _all_axis_args
        # first get the args without the letter: `tickfont = font(10)`
        # note: we don't pop because we want this to apply to all axes! (delete after all have finished)
        if haskey(plotattributes_in, k)
@@ -1491,7 +1507,7 @@ function _update_axis(axis::Axis, plotattributes_in::AKW, letter::Symbol, subplo
    end

    # update the axis
-    attr!(axis, args...; kw...)
+    attr!(axis; kw...)
    return
 end

@@ -84,6 +84,9 @@ function attr!(axis::Axis, args...; kw...)
        process_axis_arg!(plotattributes, arg)
    end

+    # then preprocess keyword arguments
+    preprocessArgs!(KW(kw))
+
    # then override for any keywords... only those keywords that already exists in plotattributes
    for (k,v) in kw
        if haskey(plotattributes, k)
@@ -211,7 +211,7 @@ const _base_supported_args = [
    :seriestype,
    :seriescolor, :seriesalpha,
    :smooth,
-    :xerror, :yerror,
+    :xerror, :yerror, :zerror,
    :subplot,
    :x, :y, :z,
    :show, :size,
@@ -673,37 +673,86 @@ const _inspectdr_scale = [:identity, :ln, :log2, :log10]

 const _pgfplotsx_attr = merge_with_base_supported([
    :annotations,
-    :background_color_legend, :background_color_inside, :background_color_outside,
-    :foreground_color_legend, :foreground_color_grid, :foreground_color_axis,
-    :foreground_color_text, :foreground_color_border,
+    :background_color_legend,
+    :background_color_inside,
+    :background_color_outside,
+    :foreground_color_legend,
+    :foreground_color_grid,
+    :foreground_color_axis,
+    :foreground_color_text,
+    :foreground_color_border,
    :label,
-    :seriescolor, :seriesalpha,
-    :linecolor, :linestyle, :linewidth, :linealpha,
-    :markershape, :markercolor, :markersize, :markeralpha,
-    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
-    :fillrange, :fillcolor, :fillalpha,
+    :seriescolor,
+    :seriesalpha,
+    :linecolor,
+    :linestyle,
+    :linewidth,
+    :linealpha,
+    :markershape,
+    :markercolor,
+    :markersize,
+    :markeralpha,
+    :markerstrokewidth,
+    :markerstrokecolor,
+    :markerstrokealpha,
+    :fillrange,
+    :fillcolor,
+    :fillalpha,
    :bins,
    :layout,
-    :title, :window_title,
-    :guide, :lims, :ticks, :scale, :flip,
+    :title,
+    :window_title,
+    :guide,
+    :lims,
+    :ticks,
+    :scale,
+    :flip,
    :match_dimensions,
-    :titlefontfamily, :titlefontsize, :titlefonthalign, :titlefontvalign,
-    :titlefontrotation, :titlefontcolor,
-    :legendfontfamily, :legendfontsize, :legendfonthalign, :legendfontvalign,
-    :legendfontrotation, :legendfontcolor,
-    :tickfontfamily, :tickfontsize, :tickfonthalign, :tickfontvalign,
-    :tickfontrotation, :tickfontcolor,
-    :guidefontfamily, :guidefontsize, :guidefonthalign, :guidefontvalign,
-    :guidefontrotation, :guidefontcolor,
-    :grid, :gridalpha, :gridstyle, :gridlinewidth,
-    :legend, :legendtitle, :colorbar, :colorbar_title, :colorbar_entry,
-    :fill_z, :line_z, :marker_z, :levels,
-    :ribbon, :quiver,
+    :titlefontfamily,
+    :titlefontsize,
+    :titlefonthalign,
+    :titlefontvalign,
+    :titlefontrotation,
+    :titlefontcolor,
+    :legendfontfamily,
+    :legendfontsize,
+    :legendfonthalign,
+    :legendfontvalign,
+    :legendfontrotation,
+    :legendfontcolor,
+    :tickfontfamily,
+    :tickfontsize,
+    :tickfonthalign,
+    :tickfontvalign,
+    :tickfontrotation,
+    :tickfontcolor,
+    :guidefontfamily,
+    :guidefontsize,
+    :guidefonthalign,
+    :guidefontvalign,
+    :guidefontrotation,
+    :guidefontcolor,
+    :grid,
+    :gridalpha,
+    :gridstyle,
+    :gridlinewidth,
+    :legend,
+    :legendtitle,
+    :colorbar,
+    :colorbar_title,
+    :colorbar_entry,
+    :fill_z,
+    :line_z,
+    :marker_z,
+    :levels,
+    :ribbon,
+    :quiver,
    :orientation,
    :overwrite_figure,
    :polar,
    :aspect_ratio,
-    :normalize, :weights,
+    :normalize,
+    :weights,
    :inset_subplots,
    :bar_width,
    :arrow,
@@ -712,13 +761,42 @@ const _pgfplotsx_attr = merge_with_base_supported([
    :camera,
    :contour_labels,
 ])
-const _pgfplotsx_seriestype =
-        [:path,  :scatter, :straightline,
-        :path3d, :scatter3d, :surface, :wireframe,
-        :heatmap, :contour, :contour3d,
-        :shape,
-        :steppre, :stepmid, :steppost,  :ysticks, :xsticks]
+const _pgfplotsx_seriestype = [
+    :path,
+    :scatter,
+    :straightline,
+    :path3d,
+    :scatter3d,
+    :surface,
+    :wireframe,
+    :heatmap,
+    :contour,
+    :contour3d,
+    :shape,
+    :steppre,
+    :stepmid,
+    :steppost,
+    :ysticks,
+    :xsticks,
+]
 const _pgfplotsx_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
-const _pgfplotsx_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :ltriangle, :rtriangle, :cross, :xcross, :star5, :pentagon, :hline, :vline, Shape]
+const _pgfplotsx_marker = [
+    :none,
+    :auto,
+    :circle,
+    :rect,
+    :diamond,
+    :utriangle,
+    :dtriangle,
+    :ltriangle,
+    :rtriangle,
+    :cross,
+    :xcross,
+    :star5,
+    :pentagon,
+    :hline,
+    :vline,
+    Shape,
+]
 const _pgfplotsx_scale = [:identity, :ln, :log2, :log10]
 is_marker_supported(::PGFPlotsXBackend, shape::Shape) = true
@@ -232,9 +232,7 @@ function gr_polaraxes(rmin::Real, rmax::Real, sp::Subplot)
    sinf = sind.(a)
    cosf = cosd.(a)
    rtick_values, rtick_labels = get_ticks(sp, yaxis)
-    if yaxis[:formatter] in (:scientific, :auto) && yaxis[:ticks] in (:auto, :native)
-        rtick_labels = convert_sci_unicode.(rtick_labels)
-    end
+    rtick_labels = gr_tick_label.((yaxis,), rtick_labels)

    #draw angular grid
    if xaxis[:grid]
@@ -307,15 +305,27 @@ end
 # ---------------------------------------------------------

 # draw ONE Shape
-function gr_draw_marker(xi, yi, msize, shape::Shape)
+function gr_draw_marker(series, xi, yi, clims, i, msize, shape::Shape)
    sx, sy = coords(shape)
    # convert to ndc coords (percentages of window)
    GR.selntran(0)
    w, h = gr_plot_size
    f = msize / (w + h)
    xi, yi = GR.wctondc(xi, yi)
-    GR.fillarea(xi .+ sx .* f,
-                yi .+ sy .* f)
+    xs = xi .+ sx .* f
+    ys = yi .+ sy .* f
+
+    # draw the interior
+    mc = get_markercolor(series, clims, i)
+    gr_set_fill(mc)
+    gr_set_transparency(mc, get_markeralpha(series, i))
+    GR.fillarea(xs, ys)
+
+    # draw the shapes
+    msc = get_markerstrokecolor(series, i)
+    gr_set_line(get_markerstrokewidth(series, i), :solid, msc)
+    gr_set_transparency(msc, get_markerstrokealpha(series, i))
+    GR.polyline(xs, ys)
    GR.selntran(1)
 end

@@ -325,7 +335,11 @@ function nominal_size()
 end

 # draw ONE symbol marker
-function gr_draw_marker(xi, yi, msize::Number, shape::Symbol)
+function gr_draw_marker(series, xi, yi, clims, i, msize::Number, shape::Symbol)
+    GR.setborderwidth(series[:markerstrokewidth]);
+    gr_set_bordercolor(get_markerstrokecolor(series, i));
+    gr_set_markercolor(get_markercolor(series, clims, i));
+    gr_set_transparency(get_markeralpha(series, i))
    GR.setmarkertype(gr_markertype[shape])
    GR.setmarkersize(0.3msize / nominal_size())
    GR.polymarker([xi], [yi])
@@ -343,13 +357,7 @@ function gr_draw_markers(series::Series, x, y, clims, msize = series[:markersize
        for i=eachindex(x)
            msi = _cycle(msize, i)
            shape = _cycle(shapes, i)
-i
-            GR.setborderwidth(series[:markerstrokewidth]);
-            gr_set_bordercolor(get_markerstrokecolor(series, i));
-            gr_set_markercolor(get_markercolor(series, clims, i));
-            gr_set_transparency(get_markeralpha(series, i))
-
-            gr_draw_marker(x[i], y[i], msi, shape)
+            gr_draw_marker(series, x[i], y[i], clims, i, msi, shape)
        end
    end
 end
@@ -770,6 +778,19 @@ function gr_get_ticks_size(ticks, rot)
    return w, h
 end

+gr_tick_label(axis,label) = (axis[:formatter] in (:scientific, :auto)) ?
+                                gr_convert_sci_tick_label(label) :
+                                label
+
+function gr_convert_sci_tick_label(label)
+    caret_split = split(label,'^')
+    if length(caret_split) == 2
+        base, exponent = caret_split
+        label = "$base^{$exponent}"
+    end
+    convert_sci_unicode(label)
+end
+
 function gr_axis_height(sp, axis)
    ticks = get_ticks(sp, axis)
    gr_set_font(tickfont(axis))
@@ -960,7 +981,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
    data_lims = gr_xy_axislims(sp)
    xy_lims = data_lims

-    ratio = sp[:aspect_ratio]
+    ratio = get_aspect_ratio(sp)
    if ratio != :none
        if ratio == :equal
            ratio = 1
@@ -1022,6 +1043,13 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            viewport_plotarea[3] += legendh + 0.04
        end
    end
+    if sp[:legend] == :inline
+        if sp[:yaxis][:mirror]
+            viewport_plotarea[1] += legendw
+        else
+            viewport_plotarea[2] -= legendw
+        end
+    end

    # fill in the plot area background
    bg = plot_color(sp[:background_color_inside])
@@ -1039,11 +1067,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
        if st == :pie
            draw_axes = false
        end
-        if st == :heatmap
+        if st in (:heatmap, :image)
            outside_ticks = true
-            for ax in (sp[:xaxis], sp[:yaxis])
-                v = series[ax[:letter]]
-            end
            x, y = heatmap_edges(series[:x], sp[:xaxis][:scale], series[:y], sp[:yaxis][:scale], size(series[:z]))
            xy_lims = x[1], x[end], y[1], y[end]
            expand_extrema!(sp[:xaxis], x)
@@ -1223,18 +1248,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            end
            for (cv, dv) in zip(xticks...)
                xi, yi = gr_w3tondc(cv, yt, zt)
-                if xaxis[:ticks] in (:auto, :native)
-                    if xaxis[:formatter] in (:scientific, :auto)
-                        # ensure correct dispatch in gr_text for automatic log ticks
-                        if xaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
                xi += (yaxis[:mirror] ? 1 : -1) * 1e-2 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0)
                yi += (xaxis[:mirror] ? 1 : -1) * 5e-3 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0)
-                gr_text(xi, yi, string(dv))
+                gr_text(xi, yi, gr_tick_label(xaxis, dv))
            end
        end

@@ -1262,16 +1278,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            end
            for (cv, dv) in zip(yticks...)
                xi, yi = gr_w3tondc(xt, cv, zt)
-                if yaxis[:ticks] in (:auto, :native)
-                    if xaxis[:formatter] in (:scientific, :auto)
-                        # ensure correct dispatch in gr_text for automatic log ticks
-                        if yaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
-                gr_text(xi + (yaxis[:mirror] ? -1 : 1) * 1e-2 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0), yi + (yaxis[:mirror] ? 1 : -1) * 5e-3 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0), string(dv))
+                gr_text(xi + (yaxis[:mirror] ? -1 : 1) * 1e-2 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        yi + (yaxis[:mirror] ? 1 : -1) * 5e-3 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        gr_tick_label(yaxis, dv))
            end
        end

@@ -1299,16 +1308,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            end
            for (cv, dv) in zip(zticks...)
                xi, yi = gr_w3tondc(xt, yt, cv)
-                if zaxis[:ticks] in (:auto, :native)
-                    if zaxis[:formatter] in (:scientific, :auto)
-                        # ensure correct dispatch in gr_text for automatic log ticks
-                        if zaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
-                gr_text(xi + (zaxis[:mirror] ? 1 : -1) * 1e-2 * (zaxis[:tick_direction] == :out ? 1.5 : 1.0), yi, string(dv))
+                gr_text(xi + (zaxis[:mirror] ? 1 : -1) * 1e-2 * (zaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        yi, gr_tick_label(zaxis, dv))
            end
        end
        #
@@ -1405,19 +1406,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            # x labels
            flip, mirror = gr_set_xticks_font(sp)
            for (cv, dv) in zip(xticks...)
-                # use xor ($) to get the right y coords
                xi, yi = GR.wctondc(cv, sp[:framestyle] == :origin ? 0 : xor(flip, mirror) ? ymax : ymin)
-                # @show cv dv ymin xi yi flip mirror (flip $ mirror)
-                if xaxis[:ticks] in (:auto, :native)
-                    # ensure correct dispatch in gr_text for automatic log ticks
-                    if xaxis[:formatter] in (:scientific, :auto)
-                        if xaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
-                gr_text(xi, yi + (mirror ? 1 : -1) * 5e-3 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0), string(dv))
+                gr_text(xi, yi + (mirror ? 1 : -1) * 5e-3 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        gr_tick_label(xaxis, dv))
            end
        end

@@ -1425,19 +1416,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            # y labels
            flip, mirror = gr_set_yticks_font(sp)
            for (cv, dv) in zip(yticks...)
-                # use xor ($) to get the right y coords
                xi, yi = GR.wctondc(sp[:framestyle] == :origin ? 0 : xor(flip, mirror) ? xmax : xmin, cv)
-                # @show cv dv xmin xi yi
-                if yaxis[:ticks] in (:auto, :native)
-                    # ensure correct dispatch in gr_text for automatic log ticks
-                    if yaxis[:formatter] in (:scientific, :auto)
-                        if yaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
-                gr_text(xi + (mirror ? 1 : -1) * 1e-2 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0), yi, string(dv))
+                gr_text(xi + (mirror ? 1 : -1) * 1e-2 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        yi,
+                        gr_tick_label(yaxis, dv))
            end
        end

@@ -1808,8 +1790,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)

        elseif st == :image
            z = transpose_z(series, series[:z].surf, true)'
+            x, y = heatmap_edges(series[:x], sp[:xaxis][:scale], series[:y], sp[:yaxis][:scale], size(z))
            w, h = size(z)
-            xmin, xmax = ignorenan_extrema(series[:x]); ymin, ymax = ignorenan_extrema(series[:y])
+            xmin, xmax = ignorenan_extrema(x)
+            ymin, ymax = ignorenan_extrema(y)
            rgba = gr_color.(z)
            GR.drawimage(xmin, xmax, ymax, ymin, w, h, rgba)
        end
@@ -1821,6 +1805,21 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            gr_text(GR.wctondc(xi, yi)..., str)
        end

+        if sp[:legend] == :inline && should_add_to_legend(series)
+            gr_set_font(legendfont(sp))
+            gr_set_textcolor(plot_color(sp[:legendfontcolor]))
+            if sp[:yaxis][:mirror] 
+                (_,i) = sp[:xaxis][:flip] ? findmax(x) : findmin(x)
+                GR.settextalign(GR.TEXT_HALIGN_RIGHT, GR.TEXT_VALIGN_HALF)
+                offset = -0.01
+            else
+                (_,i) = sp[:xaxis][:flip] ? findmin(x) : findmax(x)
+                GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF)
+                offset = 0.01
+            end
+            (x_l,y_l) = GR.wctondc(x[i],y[i])
+            gr_text(x_l+offset,y_l,series[:label])
+        end
        GR.restorestate()
    end

@@ -1828,7 +1827,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
    hascolorbar(sp) && gr_draw_colorbar(cbar, sp, get_clims(sp))

    # add the legend
-    if sp[:legend] != :none
+    if !(sp[:legend] in(:none, :inline)) 
        GR.savestate()
        GR.selntran(0)
        GR.setscale(0)
@@ -83,6 +83,7 @@ if length(HDF5PLOT_MAP_TELEM2STR) < 1
        "ARRAY" => Array, #Dict won't allow Array to be key in HDF5PLOT_MAP_TELEM2STR

        #Sub-structure types:
+        "ATTR" => Attr,
        "FONT" => Font,
        "BOUNDINGBOX" => BoundingBox,
        "GRIDLAYOUT" => GridLayout,
@@ -109,7 +110,7 @@ _hdf5_datapath(subpath::String) = "$_hdf5_dataroot/$subpath"
 _hdf5_map_str2telem(k::String) = HDF5PLOT_MAP_STR2TELEM[k]
 _hdf5_map_str2telem(v::Vector) = HDF5PLOT_MAP_STR2TELEM[v[1]]

-function _hdf5_merge!(dest::Dict, src::Dict)
+function _hdf5_merge!(dest::AKW, src::AKW)
    for (k, v) in src
        if isa(v, Axis)
            _hdf5_merge!(dest[k].plotattributes, v.plotattributes)
@@ -263,6 +264,15 @@ function _hdf5plot_gwrite(grp, k::String, v::Array{T}) where T<:Number #Default
    grp[k] = v
    _hdf5plot_writetype(grp, k, HDF5PlotNative)
 end
+function _hdf5plot_gwrite(grp, k::String, v::Dict)
+#=
+	tstr = string(Dict)
+	path = HDF5.name(grp) * "/" * k
+	@info("Type not supported: $tstr\npath: $path")
+=#
+	#No support for structures with Dicts different than KW (plotattributes)
+end
+
 #=
 function _hdf5plot_gwrite(grp, k::String, v::Array{Any})
 #    @show grp, k
@@ -295,7 +305,8 @@ function _hdf5plot_gwrite(grp, k::String, v::Tuple)
    end
    #NOTE: _hdf5plot_overwritetype overwrites "Array" type with "Tuple".
 end
-function _hdf5plot_gwrite(grp, k::String, plotattributes::Dict)
+function _hdf5plot_gwrite(grp, k::String, plotattributes::KW)
+	#NOTE: Can only write directly to group, not a subi-item
 #    @warn("Cannot write dict: $k=$plotattributes")
 end
 function _hdf5plot_gwrite(grp, k::String, v::AbstractRange)
@@ -376,13 +387,22 @@ function _hdf5plot_gwrite(grp, k::String, v::Subplot)
    _hdf5plot_writetype(grp, Subplot)
    return
 end
-function _hdf5plot_write(grp, plotattributes::Dict)
+
+function _hdf5plot_write(grp, plotattributes::KW)
    for (k, v) in plotattributes
        kstr = string(k)
        _hdf5plot_gwrite(grp, kstr, v)
    end
    return
 end
+function _hdf5plot_write(grp, plotattributes::Attr)
+    for (k, v) in plotattributes
+        kstr = string(k)
+        _hdf5plot_gwrite(grp, kstr, v)
+    end
+	_hdf5plot_writetype(grp, Attr)
+end
+

 # Write main plot structures:
 # ----------------------------------------------------------------
@@ -445,20 +465,14 @@ _hdf5plot_convert(T::Type{Extrema}, v) = Extrema(v[1], v[2])
 # Read data structures:
 # ----------------------------------------------------------------

-function _hdf5plot_read(grp, k::String, T::Type, dtid)
+function _hdf5plot_read(grp, k::String, T::Type)
    v = HDF5.d_read(grp, k)
    return _hdf5plot_convert(T, v)
 end
-function _hdf5plot_read(grp, k::String, T::Type{Length}, dtid::Vector)
-    v = HDF5.d_read(grp, k)
-    TU = Symbol(dtid[2])
-    T = typeof(v)
-    return Length{TU,T}(v)
-end

 # Read more complex data structures:
 # ----------------------------------------------------------------
-function _hdf5plot_read(grp, k::String, T::Type{Font}, dtid)
+function _hdf5plot_read(grp, k::String, T::Type{Font})
    grp = HDF5.g_open(grp, k)

    family = _hdf5plot_read(grp, "family")
@@ -469,7 +483,7 @@ function _hdf5plot_read(grp, k::String, T::Type{Font}, dtid)
    color = _hdf5plot_read(grp, "color")
    return Font(family, pointsize, halign, valign, rotation, color)
 end
-function _hdf5plot_read(grp, k::String, T::Type{Array}, dtid) #ANY
+function _hdf5plot_read(grp, k::String, T::Type{Array}) #ANY
    grp = HDF5.g_open(grp, k)
    sz = _hdf5plot_read(grp, "dim")
    if [0] == sz; return []; end
@@ -488,18 +502,18 @@ function _hdf5plot_read(grp, k::String, T::Type{Array}, dtid) #ANY
    result = [result[iter] for iter in eachindex(result)] #Potentially make more specific
    return reshape(result, sz)
 end
-function _hdf5plot_read(grp, k::String, T::Type{HDF5CTuple}, dtid)
-    v = _hdf5plot_read(grp, k, Array, dtid)
+function _hdf5plot_read(grp, k::String, T::Type{HDF5CTuple})
+    v = _hdf5plot_read(grp, k, Array)
    return tuple(v...)
 end
-function _hdf5plot_read(grp, k::String, T::Type{PlotText}, dtid)
+function _hdf5plot_read(grp, k::String, T::Type{PlotText})
    grp = HDF5.g_open(grp, k)

    str = _hdf5plot_read(grp, "str")
    font = _hdf5plot_read(grp, "font")
    return PlotText(str, font)
 end
-function _hdf5plot_read(grp, k::String, T::Type{SeriesAnnotations}, dtid)
+function _hdf5plot_read(grp, k::String, T::Type{SeriesAnnotations})
    grp = HDF5.g_open(grp, k)

    strs = _hdf5plot_read(grp, "strs")
@@ -508,29 +522,29 @@ function _hdf5plot_read(grp, k::String, T::Type{SeriesAnnotations}, dtid)
    scalefactor = _hdf5plot_read(grp, "scalefactor")
    return SeriesAnnotations(strs, font, baseshape, scalefactor)
 end
-function _hdf5plot_read(grp, k::String, T::Type{Shape}, dtid)
+function _hdf5plot_read(grp, k::String, T::Type{Shape})
    grp = HDF5.g_open(grp, k)

    x = _hdf5plot_read(grp, "x")
    y = _hdf5plot_read(grp, "y")
    return Shape(x, y)
 end
-function _hdf5plot_read(grp, k::String, T::Type{ColorGradient}, dtid)
+function _hdf5plot_read(grp, k::String, T::Type{ColorGradient})
    grp = HDF5.g_open(grp, k)

    colors = _hdf5plot_read(grp, "colors")
    values = _hdf5plot_read(grp, "values")
    return ColorGradient(colors, values)
 end
-function _hdf5plot_read(grp, k::String, T::Type{BoundingBox}, dtid)
+function _hdf5plot_read(grp, k::String, T::Type{BoundingBox})
    grp = HDF5.g_open(grp, k)

    x0 = _hdf5plot_read(grp, "x0")
    a = _hdf5plot_read(grp, "a")
    return BoundingBox(x0, a)
 end
-_hdf5plot_read(grp, k::String, T::Type{RootLayout}, dtid) = RootLayout()
-function _hdf5plot_read(grp, k::String, T::Type{GridLayout}, dtid)
+_hdf5plot_read(grp, k::String, T::Type{RootLayout}) = RootLayout()
+function _hdf5plot_read(grp, k::String, T::Type{GridLayout})
    grp = HDF5.g_open(grp, k)

 #    parent = _hdf5plot_read(grp, "parent")
@@ -544,22 +558,36 @@ parent = RootLayout()

    return GridLayout(parent, minpad, bbox, grid, widths, heights, attr)
 end
-function _hdf5plot_read(grp, k::String, T::Type{Axis}, dtid)
-    grp = HDF5.g_open(grp, k)
-    kwlist = KW()
-    _hdf5plot_read(grp, kwlist)
-    return Axis([], kwlist)
+function _hdf5plot_read(grp, T::Type{Attr})
+    attr = Attr(KW(), _plot_defaults)
+    v = _hdf5plot_read(grp, attr)
+    return attr
 end
-function _hdf5plot_read(grp, k::String, T::Type{Surface}, dtid)
+function _hdf5plot_read(grp, k::String, T::Type{Axis})
+    grp = HDF5.g_open(grp, k)
+    plotattributes = Attr(KW(), _plot_defaults)
+    _hdf5plot_read(grp, plotattributes)
+    return Axis([], plotattributes)
+end
+function _hdf5plot_read(grp, k::String, T::Type{Surface})
    grp = HDF5.g_open(grp, k)
    data2d = _hdf5plot_read(grp, "data2d")
    return Surface(data2d)
 end
-function _hdf5plot_read(grp, k::String, T::Type{Subplot}, dtid)
+function _hdf5plot_read(grp, k::String, T::Type{Subplot})
    grp = HDF5.g_open(grp, k)
    idx = _hdf5plot_read(grp, "index")
    return HDF5PLOT_PLOTREF.ref.subplots[idx]
 end
+
+#Most types don't need dtid for read!!:
+_hdf5plot_read(grp, k::String, T::Type, dtid) = _hdf5plot_read(grp, k, T)
+function _hdf5plot_read(grp, k::String, T::Type{Length}, dtid::Vector)
+    v = HDF5.d_read(grp, k)
+    TU = Symbol(dtid[2])
+    T = typeof(v)
+    return Length{TU,T}(v)
+end
 function _hdf5plot_read(grp, k::String)
    dtid = HDF5.a_read(grp[k], _hdf5plot_datatypeid)
    T = _hdf5_map_str2telem(dtid) #expect exception
@@ -567,7 +595,7 @@ function _hdf5plot_read(grp, k::String)
 end

 #Read in values in group to populate plotattributes:
-function _hdf5plot_read(grp, plotattributes::Dict)
+function _hdf5plot_readattr(grp, plotattributes::AbstractDict)
    gnames = names(grp)
    for k in gnames
        try
@@ -581,6 +609,8 @@ function _hdf5plot_read(grp, plotattributes::Dict)
    end
    return
 end
+_hdf5plot_read(grp, plotattributes::KW) = _hdf5plot_readattr(grp, plotattributes)
+_hdf5plot_read(grp, plotattributes::Attr) = _hdf5plot_readattr(grp, plotattributes)

 # Read main plot structures:
 # ----------------------------------------------------------------
@@ -593,17 +623,17 @@ function _hdf5plot_read(sp::Subplot, subpath::String, f)

    for i in 1:nseries
        grp = HDF5.g_open(f, _hdf5_plotelempath("$subpath/series_list/series$i"))
-        kwlist = KW()
-        _hdf5plot_read(grp, kwlist)
-        plot!(sp, kwlist[:x], kwlist[:y]) #Add data & create data structures
-        _hdf5_merge!(sp.series_list[end].plotattributes, kwlist)
+        seriesinfo = Attr(KW(), _plot_defaults)
+        _hdf5plot_read(grp, seriesinfo)
+        plot!(sp, seriesinfo[:x], seriesinfo[:y]) #Add data & create data structures
+        _hdf5_merge!(sp.series_list[end].plotattributes, seriesinfo)
    end

    #Perform after adding series... otherwise values get overwritten:
    grp = HDF5.g_open(f, _hdf5_plotelempath("$subpath/attr"))
-    kwlist = KW()
-    _hdf5plot_read(grp, kwlist)
-    _hdf5_merge!(sp.attr, kwlist)
+    attr = Attr(KW(), _plot_defaults)
+    _hdf5plot_read(grp, attr)
+    _hdf5_merge!(sp.attr, attr)

    return
 end
@@ -470,7 +470,7 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
            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)
+        if get_aspect_ratio(sp) in (1, :equal)
            kw[:axisEqual] = "true"
        end

@@ -482,12 +482,12 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
        fg_alpha = alpha(plot_color(sp[:foreground_color_legend]))

        push!(style, string(
-            "legend style = {", 
-                pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], fg_alpha, "solid", ), ",", 
-                "fill = $cstr,", 
-                "fill opacity = $bg_alpha,", 
-                "text opacity = $(alpha(plot_color(sp[:legendfontcolor]))),", 
-                "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)), 
+            "legend style = {",
+                pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], fg_alpha, "solid", ), ",",
+                "fill = $cstr,",
+                "fill opacity = $bg_alpha,",
+                "text opacity = $(alpha(plot_color(sp[:legendfontcolor]))),",
+                "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)),
            "}",
        ))

@@ -29,11 +29,20 @@ Base.@kwdef mutable struct PGFPlotsXPlot
        PGFPlotsX.push_preamble!(
            pgfx_plot.the_plot,
            raw"""
-            \pgfplotsset{
-            /pgfplots/layers/axis on top/.define layer set={
-            background, axis background,pre main,main,axis grid,axis ticks,axis lines,axis tick labels,
-            axis descriptions,axis foreground
-            }{/pgfplots/layers/standard},
+            \pgfplotsset{%
+            layers/standard/.define layer set={%
+                background,axis background,axis grid,axis ticks,axis lines,axis tick labels,pre main,main,axis descriptions,axis foreground%
+            }{grid style= {/pgfplots/on layer=axis grid},%
+                tick style= {/pgfplots/on layer=axis ticks},%
+                axis line style= {/pgfplots/on layer=axis lines},%
+                label style= {/pgfplots/on layer=axis descriptions},%
+                legend style= {/pgfplots/on layer=axis descriptions},%
+                title style= {/pgfplots/on layer=axis descriptions},%
+                colorbar style= {/pgfplots/on layer=axis descriptions},%
+                ticklabel style= {/pgfplots/on layer=axis tick labels},%
+                axis background@ style={/pgfplots/on layer=axis background},%
+                3d box foreground style={/pgfplots/on layer=axis foreground},%
+                },
            }
            """,
        )
@@ -51,7 +60,7 @@ function pgfx_preamble(pgfx_plot::Plot{PGFPlotsXBackend})
    old_flag = pgfx_plot.attr[:tex_output_standalone]
    pgfx_plot.attr[:tex_output_standalone] = true
    fulltext = String(repr("application/x-tex", pgfx_plot))
-    preamble = fulltext[1:first(findfirst("\\begin{document}", fulltext))-1]
+    preamble = fulltext[1:(first(findfirst("\\begin{document}", fulltext)) - 1)]
    pgfx_plot.attr[:tex_output_standalone] = old_flag
    preamble
 end
@@ -75,10 +84,11 @@ function Base.push!(pgfx_plot::PGFPlotsXPlot, item)
 end

 function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
-    if !pgfx_plot.is_created
+    if !pgfx_plot.is_created || pgfx_plot.was_shown
+        pgfx_sanitize_plot!(plt)
        the_plot = PGFPlotsX.TikzPicture(PGFPlotsX.Options())
        bgc = plt.attr[:background_color_outside] == :match ?
-              plt.attr[:background_color] : plt.attr[:background_color_outside]
+            plt.attr[:background_color] : plt.attr[:background_color_outside]
        if bgc isa Colors.Colorant
            cstr = plot_color(bgc)
            a = alpha(cstr)
@@ -94,27 +104,43 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
        end

        for sp in plt.subplots
-            bb = bbox(sp)
-            sp_width = width(bb)
-            sp_height = height(bb)
-            dx, dy = bb.x0
-           # TODO: does this hold at every scale?
-            if sp[:legend] in (:outertopright, nothing)
-                dx *= 1.2
-            end
+            bb1 = sp.plotarea
+            bb2 = bbox(sp)
+            sp_width = width(bb2)
+            sp_height = height(bb2)
+            dx, dy = bb2.x0
+            lpad = leftpad(sp) + sp[:left_margin]
+            rpad = rightpad(sp) + sp[:right_margin]
+            tpad = toppad(sp) + sp[:top_margin]
+            bpad = bottompad(sp) + sp[:bottom_margin]
+            dx += lpad
+            dy += tpad
+            axis_height = sp_height - (tpad + bpad)
+            axis_width = sp_width - (rpad + lpad)
+
            cstr = plot_color(sp[:background_color_legend])
            a = alpha(cstr)
            fg_alpha = alpha(plot_color(sp[:foreground_color_legend]))
            title_cstr = plot_color(sp[:titlefontcolor])
            title_a = alpha(title_cstr)
+            title_loc = sp[:title_location]
            bgc_inside = plot_color(sp[:background_color_inside])
            bgc_inside_a = alpha(bgc_inside)
            axis_opt = PGFPlotsX.Options(
                "title" => sp[:title],
                "title style" => PGFPlotsX.Options(
-                    "font" => pgfx_font(
-                        sp[:titlefontsize],
-                        pgfx_thickness_scaling(sp),
+                        "at" => if title_loc == :left
+                            "{(0,1)}"
+                        elseif title_loc == :right
+                            "{(1,1)}"
+                        elseif title_loc isa Tuple
+                            "{$(string(title_loc))}"
+                        else
+                            "{(0.5,1)}"
+                        end,
+                        "font" => pgfx_font(
+                            sp[:titlefontsize],
+                            pgfx_thickness_scaling(sp),
                    ),
                    "color" => title_cstr,
                    "draw opacity" => title_a,
@@ -129,7 +155,7 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                    ) => nothing,
                    "fill" => cstr,
                    "fill opacity" => a,
-                    "text opacity" => alpha(plot_color(sp[:legendfontcolor])),
+                    "text opacity" =>     alpha(plot_color(sp[:legendfontcolor])),
                    "font" => pgfx_font(
                        sp[:legendfontsize],
                        pgfx_thickness_scaling(sp),
@@ -139,16 +165,14 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                    "fill" => bgc_inside,
                    "opacity" => bgc_inside_a,
                ),
-                "axis on top" => nothing,
-                # "framed" => nothing,
                # These are for layouting
                "anchor" => "north west",
                "xshift" => string(dx),
                "yshift" => string(-dy),
            )
-            sp_width > 0 * mm ? push!(axis_opt, "width" => string(sp_width)) :
+            sp_width > 0 * mm ? push!(axis_opt, "width" => string(axis_width)) :
            nothing
-            sp_height > 0 * mm ? push!(axis_opt, "height" => string(sp_height)) :
+            sp_height > 0 * mm ? push!(axis_opt, "height" => string(axis_height)) :
            nothing
            # legend position
            if sp[:legend] isa Tuple
@@ -157,11 +181,8 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
            else
                push!(
                    axis_opt,
-                    "legend pos" => get(
-                        _pgfplotsx_legend_pos,
-                        sp[:legend],
-                        "outer north east",
-                    ),
+                    "legend pos" =>
+                        get(_pgfplotsx_legend_pos, sp[:legend], "outer north east"),
                )
            end
            for letter in (:x, :y, :z)
@@ -185,8 +206,8 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                        PGFPlotsX.push_preamble!(
                            pgfx_plot.the_plot,
                            """\\pgfplotsset{
-    colormap={plots$(sp.attr[:subplot_index])}{$(pgfx_colormap(series.plotattributes[col]))},
-}""",
+                            colormap={plots$(sp.attr[:subplot_index])}{$(pgfx_colormap(series.plotattributes[col]))},
+                            }""",
                        )
                        push!(
                            axis_opt,
@@ -213,8 +234,8 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                push!(axis_opt, "view" => (azim, elev))
            end
            axisf = if sp[:projection] == :polar
-               # push!(axis_opt, "xmin" => 90)
-               # push!(axis_opt, "xmax" => 450)
+                # push!(axis_opt, "xmin" => 90)
+                # push!(axis_opt, "xmax" => 450)
                PGFPlotsX.PolarAxis
            else
                PGFPlotsX.Axis
@@ -229,20 +250,21 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                sf = series[:fillrange]
                series_opt = PGFPlotsX.Options(
                    "color" => single_color(opt[:linecolor]),
-                    "name path" => string(series_id)
+                    "name path" => string(series_id),
                )
                if is3d(series) || st == :heatmap
                    series_func = PGFPlotsX.Plot3
                else
                    series_func = PGFPlotsX.Plot
                end
-                if sf !== nothing && !isfilledcontour(series) && series[:ribbon] === nothing
+                if sf !== nothing &&
+                   !isfilledcontour(series) && series[:ribbon] === nothing
                    push!(series_opt, "area legend" => nothing)
                end
                if st == :heatmap
                    push!(axis.options, "view" => "{0}{90}")
                end
-               # treat segments
+                # treat segments
                segments =
                    if st in (:wireframe, :heatmap, :contour, :surface, :contour3d)
                        iter_segments(surface_to_vecs(
@@ -261,10 +283,13 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                        if marker isa Shape
                            x = marker.x
                            y = marker.y
-                            scale_factor = 0.025
+                            scale_factor = 0.00125
                            mark_size = opt[:markersize] * scale_factor
                            path = join(
-                                ["($(x[i] * mark_size), $(y[i] * mark_size))" for i in eachindex(x)],
+                                [
+                                    "($(x[i] * mark_size), $(y[i] * mark_size))"
+                                    for i in eachindex(x)
+                                ],
                                " -- ",
                            )
                            c = get_markercolor(series, i)
@@ -285,38 +310,44 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                        segment_opt = merge(segment_opt, pgfx_fillstyle(opt, i))
                    end
                    # add fillrange
-                    if sf !== nothing && !isfilledcontour(series) && series[:ribbon] === nothing
+                    if sf !== nothing &&
+                       !isfilledcontour(series) && series[:ribbon] === nothing
                        if sf isa Number || sf isa AVec
-                            pgfx_fillrange_series!( axis, series, series_func, i, _cycle(sf, rng), rng)
+                            pgfx_fillrange_series!(
+                                axis,
+                                series,
+                                series_func,
+                                i,
+                                _cycle(sf, rng),
+                                rng,
+                            )
                        end
-                        if i == 1 && opt[:label] != "" && sp[:legend] != :none && should_add_to_legend(series)
+                        if i == 1 &&
+                           sp[:legend] != :none && pgfx_should_add_to_legend(series)
                            pgfx_filllegend!(series_opt, opt)
                        end
                    end
-                   # series
-                   #
-                    coordinates = pgfx_series_coordinates!(
-                        sp,
-                        series,
-                        segment_opt,
-                        opt,
-                        rng,
-                    )
-                    segment_plot = series_func(
-                        merge(series_opt, segment_opt),
-                        coordinates,
-                    )
+                    coordinates =
+                        pgfx_series_coordinates!(sp, series, segment_opt, opt, rng)
+                    segment_plot =
+                        series_func(merge(series_opt, segment_opt), coordinates)
                    push!(axis, segment_plot)
                    # fill between functions
                    if sf isa Tuple && series[:ribbon] === nothing
                        sf1, sf2 = sf
                        @assert sf1 == series_index "First index of the tuple has to match the current series index."
-                        push!(axis, series_func(
-                            merge(pgfx_fillstyle(opt, series_index), PGFPlotsX.Options("forget plot" => nothing)),
-                            "fill between [of=$series_id and $(_pgfplotsx_series_ids[Symbol(string(sf2))])]"
-                        ))
+                        push!(
+                            axis,
+                            series_func(
+                                merge(
+                                    pgfx_fillstyle(opt, series_index),
+                                    PGFPlotsX.Options("forget plot" => nothing),
+                                ),
+                                "fill between [of=$series_id and $(_pgfplotsx_series_ids[Symbol(string(sf2))])]",
+                            ),
+                        )
                    end
-                   # add ribbons?
+                    # add ribbons?
                    ribbon = series[:ribbon]
                    if ribbon !== nothing
                        pgfx_add_ribbons!(
@@ -327,34 +358,51 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                            series_index,
                        )
                    end
-                   # add to legend?
-                    if i == 1 &&
-                       opt[:label] != "" &&
-                       sp[:legend] != :none && should_add_to_legend(series)
-                        leg_opt = PGFPlotsX.Options()
-                        if ribbon !== nothing
-                            pgfx_filllegend!(axis.contents[end-3].options, opt)
+                    # add to legend?
+                    if sp[:legend] != :none
+                        leg_entry = if opt[:label] isa AVec
+                            get(opt[:label], i, "")
+                        elseif opt[:label] isa AbstractString
+                            if i == 1
+                                get(opt, :label, "")
+                            else
+                                ""
+                            end
+                        else
+                            throw(ArgumentError("Malformed label. label = $(opt[:label])"))
+                        end
+                        if leg_entry == "" || !pgfx_should_add_to_legend(series)
+                            push!(axis.contents[end].options, "forget plot" => nothing)
+                        else
+                            leg_opt = PGFPlotsX.Options()
+                            if ribbon !== nothing
+                                pgfx_filllegend!(axis.contents[end - 3].options, opt)
+                            end
+                            legend = PGFPlotsX.LegendEntry(leg_opt, leg_entry, false)
+                            push!(axis, legend)
                        end
-                        legend = PGFPlotsX.LegendEntry(leg_opt, opt[:label], false)
-                        push!(axis, legend)
                    end
-                   # add series annotations
-                    anns = series[:series_annotations]
-                    for (xi, yi, str, fnt) in EachAnn(anns, series[:x], series[:y])
-                        pgfx_add_annotation!(
-                            axis,
-                            xi,
-                            yi,
-                            PlotText(str, fnt),
-                            pgfx_thickness_scaling(series),
-                        )
-                    end
-                end
-                # add subplot annotations
-                for ann in sp[:annotations]
-                    pgfx_add_annotation!(axis, locate_annotation(sp, ann...)..., pgfx_thickness_scaling(sp))
+                end # for segments
+                # add series annotations
+                anns = series[:series_annotations]
+                for (xi, yi, str, fnt) in EachAnn(anns, series[:x], series[:y])
+                    pgfx_add_annotation!(
+                        axis,
+                        xi,
+                        yi,
+                        PlotText(str, fnt),
+                        pgfx_thickness_scaling(series),
+                    )
                end
            end # for series
+            # add subplot annotations
+            for ann in sp[:annotations]
+                pgfx_add_annotation!(
+                    axis,
+                    locate_annotation(sp, ann...)...,
+                    pgfx_thickness_scaling(sp),
+                )
+            end
            push!(the_plot, axis)
            if length(plt.o.the_plot.elements) > 0
                plt.o.the_plot.elements[1] = the_plot
@@ -363,6 +411,7 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
            end
        end # for subplots
        pgfx_plot.is_created = true
+        pgfx_plot.was_shown = false
    end # if
    return pgfx_plot
 end
@@ -495,7 +544,7 @@ function pgfx_series_coordinates!(
 )
    push!(
        segment_opt,
-        "contour prepared" => PGFPlotsX.Options("labels" => opt[:contour_labels],),
+        "contour prepared" => PGFPlotsX.Options("labels" => opt[:contour_labels]),
    )
    return PGFPlotsX.Table(Contour.contours(args..., opt[:levels]))
 end
@@ -508,7 +557,7 @@ function pgfx_series_coordinates!(
    xs, ys, zs = collect(args)
    push!(
        segment_opt,
-        "contour filled" => PGFPlotsX.Options("labels" => opt[:contour_labels],),
+        "contour filled" => PGFPlotsX.Options("labels" => opt[:contour_labels]),
        "point meta" => "explicit",
        "shader" => "flat",
    )
@@ -519,10 +568,9 @@ function pgfx_series_coordinates!(
    end

    cs = join(
-        [join(["($x, $y) [$(zs[j, i])]" for (j, x) in enumerate(xs)], " ") for (
-            i,
-            y,
-        ) in enumerate(ys)],
+        [
+            join(["($x, $y) [$(zs[j, i])]" for (j, x) in enumerate(xs)], " ") for (i, y) in enumerate(ys)
+        ],
        "\n\n",
    )
    """
@@ -563,11 +611,22 @@ const _pgfplotsx_markers = KW(
 )

 const _pgfplotsx_legend_pos = KW(
+    :top => "north",
+    :bottom => "south",
+    :left => "west",
+    :right => "east",
    :bottomleft => "south west",
    :bottomright => "south east",
    :topright => "north east",
    :topleft => "north west",
+    :outertop => "north",
+    :outerbottom => "outer south",
+    :outerleft => "outer west",
+    :outerright => "outer east",
+    :outerbottomleft => "outer south west",
+    :outerbottomright => "outer south east",
    :outertopright => "outer north east",
+    :outertopleft => "outer north west",
 )

 const _pgfx_framestyles = [:box, :axes, :origin, :zerolines, :grid, :none]
@@ -575,11 +634,8 @@ const _pgfx_framestyle_defaults = Dict(:semi => :box)

 # we use the anchors to define orientations for example to align left
 # one needs to use the right edge as anchor
-const _pgfx_annotation_halign = KW(
-    :center => "",
-    :left => "right",
-    :right => "left",
-)
+const _pgfx_annotation_halign =
+    KW(:center => "", :left => "right", :right => "left")
 ## --------------------------------------------------------------------------------------
 # Generates a colormap for pgfplots based on a ColorGradient
 pgfx_arrow(::Nothing) = "every arrow/.append style={-}"
@@ -607,12 +663,9 @@ function pgfx_filllegend!(series_opt, opt)
    io = IOBuffer()
    PGFPlotsX.print_tex(io, pgfx_fillstyle(opt))
    style = strip(String(take!(io)), ['[', ']', ' '])
-    push!(
-        series_opt,
-        "legend image code/.code" => """{
-\\draw[$style] (0cm,-0.1cm) rectangle (0.6cm,0.1cm);
-}""",
-    )
+    push!(series_opt, "legend image code/.code" => """{
+              \\draw[$style] (0cm,-0.1cm) rectangle (0.6cm,0.1cm);
+              }""")
 end

 function pgfx_colormap(grad::ColorGradient)
@@ -631,9 +684,7 @@ function pgfx_framestyle(style::Symbol)
        return style
    else
        default_style = get(_pgfx_framestyle_defaults, style, :axes)
-        @warn(
-            "Framestyle :$style is not (yet) supported by the PGFPlotsX backend. :$default_style was cosen instead.",
-        )
+        @warn( "Framestyle :$style is not (yet) supported by the PGFPlotsX backend. :$default_style was cosen instead.",)
        default_style
    end
 end
@@ -675,6 +726,25 @@ function pgfx_font(fontsize, thickness_scaling = 1, font = "\\selectfont")
    return string("{\\fontsize{", fs, " pt}{", 1.3fs, " pt}", font, "}")
 end

+function pgfx_should_add_to_legend(series::Series)
+    series.plotattributes[:primary] &&
+    !(
+        series.plotattributes[:seriestype] in (
+            :hexbin,
+            :bins2d,
+            :histogram2d,
+            :hline,
+            :vline,
+            :contour,
+            :contourf,
+            :contour3d,
+            :heatmap,
+            :pie,
+            :image,
+        )
+    )
+end
+
 function pgfx_marker(plotattributes, i = 1)
    shape = _cycle(plotattributes[:markershape], i)
    cstr = plot_color(
@@ -687,19 +757,22 @@ function pgfx_marker(plotattributes, i = 1)
        get_markerstrokealpha(plotattributes, i),
    )
    a_stroke = alpha(cstr_stroke)
-    mark_size = pgfx_thickness_scaling(plotattributes) * 0.5 *
-                _cycle(plotattributes[:markersize], i)
+    mark_size =
+        pgfx_thickness_scaling(plotattributes) *
+        0.5 *
+        _cycle(plotattributes[:markersize], i)
    return PGFPlotsX.Options(
-        "mark" => shape isa Shape ? "PlotsShape$i" :
-                  get(_pgfplotsx_markers, shape, "*"),
+        "mark" =>
+            shape isa Shape ? "PlotsShape$i" : get(_pgfplotsx_markers, shape, "*"),
        "mark size" => "$mark_size pt",
        "mark options" => PGFPlotsX.Options(
            "color" => cstr_stroke,
            "draw opacity" => a_stroke,
            "fill" => cstr,
            "fill opacity" => a,
-            "line width" => pgfx_thickness_scaling(plotattributes) *
-                            _cycle(plotattributes[:markerstrokewidth], i),
+            "line width" =>
+                pgfx_thickness_scaling(plotattributes) *
+                _cycle(plotattributes[:markerstrokewidth], i),
            "rotate" => if shape == :dtriangle
                180
            elseif shape == :rtriangle
@@ -725,15 +798,15 @@ function pgfx_add_annotation!(o, x, y, val, thickness_scaling = 1)
    push!(
        o,
        [
-         "\\node",
-         PGFPlotsX.Options(
-             get(_pgfx_annotation_halign, val.font.halign, "") => nothing,
-             "color" => cstr,
-             "draw opacity" => convert(Float16, a),
-             "rotate" => val.font.rotation,
-             "font" => pgfx_font(val.font.pointsize, thickness_scaling),
-         ),
-         " at (axis cs:$x, $y) {$(val.str)};",
+            "\\node",
+            PGFPlotsX.Options(
+                get(_pgfx_annotation_halign, val.font.halign, "") => nothing,
+                "color" => cstr,
+                "draw opacity" => convert(Float16, a),
+                "rotate" => val.font.rotation,
+                "font" => pgfx_font(val.font.pointsize, thickness_scaling),
+            ),
+            " at (axis cs:$x, $y) {$(val.str)};",
        ],
    )
 end
@@ -803,7 +876,7 @@ function pgfx_fillrange_series!(axis, series, series_func, i, fillrange, rng)
    push!(fillrange_opt, "forget plot" => nothing)
    opt = series.plotattributes
    args = is3d(series) ? (opt[:x][rng], opt[:y][rng], opt[:z][rng]) :
-           (opt[:x][rng], opt[:y][rng])
+        (opt[:x][rng], opt[:y][rng])
    push!(
        axis,
        PGFPlotsX.PlotInc(fillrange_opt, pgfx_fillrange_args(fillrange, args...)),
@@ -825,6 +898,57 @@ function pgfx_fillrange_args(fillrange, x, y, z)
    z_fill = [z; _cycle(fillrange, n:-1:1); z[1]]
    return PGFPlotsX.Coordiantes(x_fill, y_fill, z_fill)
 end
+
+function pgfx_sanitize_string(p::PlotText)
+    PlotText(pgfx_sanitize_string(p.str), p.font)
+end
+function pgfx_sanitize_string(s::AbstractString)
+    s = replace(s, r"\\?\#" => "\\#")
+    s = replace(s, r"\\?\%" => "\\%")
+    s = replace(s, r"\\?\_" => "\\_")
+    s = replace(s, r"\\?\&" => "\\&")
+    s = replace(s, r"\\?\{" => "\\{")
+    s = replace(s, r"\\?\}" => "\\}")
+end
+@require LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" begin
+    using LaTeXStrings
+    function pgfx_sanitize_string(s::LaTeXString)
+        s = replace(s, r"\\?\#" => "\\#")
+        s = replace(s, r"\\?\%" => "\\%")
+    end
+end
+function pgfx_sanitize_plot!(plt)
+        for (key, value) in plt.attr
+            if value isa Union{AbstractString, AbstractVector{<:AbstractString}}
+                plt.attr[key] = pgfx_sanitize_string.(value)
+            end
+        end
+        for subplot in plt.subplots
+            for (key, value) in subplot.attr
+                if key == :annotations && subplot.attr[:annotations] !== nothing
+                    old_ann = subplot.attr[key]
+                    for i in eachindex(old_ann)
+                        subplot.attr[key][i] = (old_ann[i][1], old_ann[i][2], pgfx_sanitize_string(old_ann[i][3]))
+                    end
+                elseif value isa Union{AbstractString, AbstractVector{<:AbstractString}}
+                    subplot.attr[key] = pgfx_sanitize_string.(value)
+                end
+            end
+        end
+        for series in plt.series_list
+            for (key, value) in series.plotattributes
+                if key == :series_annotations && series.plotattributes[:series_annotations] !== nothing
+                    old_ann = series.plotattributes[key].strs
+                    for i in eachindex(old_ann)
+                        series.plotattributes[key].strs[i] = pgfx_sanitize_string(old_ann[i])
+                    end
+                elseif value isa Union{AbstractString, AbstractVector{<:AbstractString}}
+                    series.plotattributes[key] = pgfx_sanitize_string.(value)
+                end
+            end
+        end
+        ##
+end
 # --------------------------------------------------------------------------------------
 function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
    axis = sp[Symbol(letter, :axis)]
@@ -835,6 +959,21 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
        "scaled $(letter) ticks" => "false",
        string(letter, :label) => axis[:guide],
    )
+    tick_color = plot_color(axis[:foreground_color_axis])
+    push!(opt,
+        "$(letter) tick style" => PGFPlotsX.Options(
+            "color" => color(tick_color),
+            "opacity" => alpha(tick_color),
+        ),
+    )
+    tick_label_color = plot_color(axis[:tickfontcolor])
+    push!(opt,
+        "$(letter) tick label style" => PGFPlotsX.Options(
+            "color" => color(tick_color),
+            "opacity" => alpha(tick_color),
+            "rotate" => axis[:rotation]
+        ),
+    )

    # set to supported framestyle
    framestyle = pgfx_framestyle(sp[:framestyle] == false ? :none : sp[:framestyle])
@@ -854,7 +993,7 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
        opt,
        string(letter, "label style") => PGFPlotsX.Options(
            labelpos => nothing,
-            "font" => pgfx_font(axis[:guidefontsize], pgfx_thickness_scaling(sp)),
+            "font" =>     pgfx_font(axis[:guidefontsize], pgfx_thickness_scaling(sp)),
            "color" => cstr,
            "draw opacity" => α,
            "rotate" => axis[:guidefontrotation],
@@ -868,10 +1007,8 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
    scale = axis[:scale]
    if scale in (:log2, :ln, :log10)
        push!(opt, string(letter, :mode) => "log")
-        scale == :ln || push!(
-            opt,
-            "log basis $letter" => "$(scale == :log2 ? 2 : 10)",
-        )
+        scale == :ln ||
+        push!(opt, "log basis $letter" => "$(scale == :log2 ? 2 : 10)")
    end

    # ticks on or off
@@ -888,14 +1025,15 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)

    # limits
    lims = ispolar(sp) && letter == :x ? rad2deg.(axis_limits(sp, :x)) :
-           axis_limits(sp, letter)
+        axis_limits(sp, letter)
    push!(opt, string(letter, :min) => lims[1], string(letter, :max) => lims[2])

    if !(axis[:ticks] in (nothing, false, :none, :native)) && framestyle != :none
        ticks = get_ticks(sp, axis)
        #pgf plot ignores ticks with angle below 90 when xmin = 90 so shift values
-        tick_values = ispolar(sp) && letter == :x ?
-                      [rad2deg.(ticks[1])[3:end]..., 360, 405] : ticks[1]
+        tick_values =
+            ispolar(sp) && letter == :x ? [rad2deg.(ticks[1])[3:end]..., 360, 405] :
+            ticks[1]
        push!(
            opt,
            string(letter, "tick") => string("{", join(tick_values, ","), "}"),
@@ -911,44 +1049,37 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
            end
            push!(
                opt,
-                string(letter, "ticklabels") => string(
-                    "{\$",
-                    join(tick_labels, "\$,\$"),
-                    "\$}",
-                ),
+                string(letter, "ticklabels") =>
+                    string("{\$", join(tick_labels, "\$,\$"), "\$}"),
            )
        elseif axis[:showaxis]
-            tick_labels = ispolar(sp) && letter == :x ?
-                          [ticks[2][3:end]..., "0", "45"] : ticks[2]
+            tick_labels =
+                ispolar(sp) && letter == :x ? [ticks[2][3:end]..., "0", "45"] :
+                ticks[2]
            if axis[:formatter] in (:scientific, :auto)
                tick_labels = string.("\$", convert_sci_unicode.(tick_labels), "\$")
                tick_labels = replace.(tick_labels, Ref("×" => "\\times"))
            end
            push!(
                opt,
-                string(letter, "ticklabels") => string(
-                    "{",
-                    join(tick_labels, ","),
-                    "}",
-                ),
+                string(letter, "ticklabels") =>
+                    string("{", join(tick_labels, ","), "}"),
            )
        else
            push!(opt, string(letter, "ticklabels") => "{}")
        end
        push!(
            opt,
-            string(letter, "tick align") => (axis[:tick_direction] == :out ?
-                                             "outside" : "inside"),
+            string(letter, "tick align") =>
+                (axis[:tick_direction] == :out ? "outside" : "inside"),
        )
        cstr = plot_color(axis[:tickfontcolor])
        α = alpha(cstr)
        push!(
            opt,
            string(letter, "ticklabel style") => PGFPlotsX.Options(
-                "font" => pgfx_font(
-                    axis[:tickfontsize],
-                    pgfx_thickness_scaling(sp),
-                ),
+                "font" =>
+                    pgfx_font(axis[:tickfontsize], pgfx_thickness_scaling(sp)),
                "color" => cstr,
                "draw opacity" => α,
                "rotate" => axis[:tickfontrotation],
@@ -967,7 +1098,8 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)

    # framestyle
    if framestyle in (:axes, :origin)
-        axispos = framestyle == :axes ? "left" : "middle"
+        axispos = axis[:mirror] ? "right" : framestyle == :axes ? "left" : "middle"
+
        if axis[:draw_arrow]
            push!(opt, string("axis ", letter, " line") => axispos)
        else
@@ -1013,12 +1145,12 @@ end
 # Set the (left, top, right, bottom) minimum padding around the plot area
 # to fit ticks, tick labels, guides, colorbars, etc.
 function _update_min_padding!(sp::Subplot{PGFPlotsXBackend})
-    # TODO: make padding more intelligent
-    # TODO: how to include margins properly?
-    # sp.minpad = (50mm + sp[:left_margin],
-    #              0mm + sp[:top_margin],
-    #              50mm + sp[:right_margin],
-    #              0mm + sp[:bottom_margin])
+    leg = sp[:legend]
+    if leg in (:best, :outertopright, :outerright, :outerbottomright) || (leg isa Tuple && leg[1] >= 1)
+        sp.minpad = (0mm, 0mm, 5mm, 0mm)
+    else
+        sp.minpad = (0mm, 0mm, 0mm, 0mm)
+    end
 end

 function _create_backend_figure(plt::Plot{PGFPlotsXBackend})
@@ -1039,6 +1171,7 @@ for mime in ("application/pdf", "image/png", "image/svg+xml")
        mime::MIME{Symbol($mime)},
        plt::Plot{PGFPlotsXBackend},
    )
+        plt.o.was_shown = true
        show(io, mime, plt.o.the_plot)
    end
 end
@@ -1048,6 +1181,7 @@ function _show(
    mime::MIME{Symbol("application/x-tex")},
    plt::Plot{PGFPlotsXBackend},
 )
+    plt.o.was_shown = true
    PGFPlotsX.print_tex(
        io,
        plt.o.the_plot,
@@ -1056,5 +1190,6 @@ function _show(
 end

 function _display(plt::Plot{PGFPlotsXBackend})
+    plt.o.was_shown = true
    display(PGFPlotsX.PGFPlotsXDisplay(), plt.o.the_plot)
 end
@@ -108,7 +108,7 @@ function shrink_by(lo, sz, ratio)
 end

 function plotly_apply_aspect_ratio(sp::Subplot, plotarea, pcts)
-    aspect_ratio = sp[:aspect_ratio]
+    aspect_ratio = get_aspect_ratio(sp)
    if aspect_ratio != :none
        if aspect_ratio == :equal
            aspect_ratio = 1.0
@@ -42,8 +42,8 @@ _display(plt::Plot{PlotlyJSBackend}) = display(plotlyjs_syncplot(plt))

@require WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" begin
    function WebIO.render(plt::Plot{PlotlyJSBackend})
-        prepare_output(plt)
-        WebIO.render(plt.o)
+        plt_html = sprint(show, MIME("text/html"), plt)
+        return WebIO.render(dom"div"(innerHTML=plt_html))
    end
 end

@@ -1155,7 +1155,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
        end

        # aspect ratio
-        aratio = sp[:aspect_ratio]
+        aratio = get_aspect_ratio(sp)
        if aratio != :none
            ax."set_aspect"(isa(aratio, Symbol) ? string(aratio) : aratio, anchor = "C")
        end
@@ -594,7 +594,9 @@ function process_annotation(sp::Subplot, xs, ys, labs, font = font())
    xlength = length(methods(length, (typeof(xs),))) == 0 ? 1 : length(xs)
    ylength = length(methods(length, (typeof(ys),))) == 0 ? 1 : length(ys)
    for i in 1:max(xlength, ylength, length(labs))
-        x, y, lab = _cycle(xs, i), _cycle(ys, i), _cycle(labs, i)
+      x, y, lab = _cycle(xs, i), _cycle(ys, i), _cycle(labs, i)
+        x = typeof(x) <: TimeType ? Dates.value(x) : x  
+        y = typeof(y) <: TimeType ? Dates.value(y) : y  
        if lab == :auto
            alphabet = "abcdefghijklmnopqrstuvwxyz"
            push!(anns, (x, y, text(string("(", alphabet[sp[:subplot_index]], ")"), font)))
@@ -661,8 +663,8 @@ Surface(f::Function, x, y) = Surface(Float64[f(xi,yi) for yi in y, xi in x])

 Base.Array(surf::Surface) = surf.surf

-for f in (:length, :size)
-  @eval Base.$f(surf::Surface, args...) = $f(surf.surf, args...)
+for f in (:length, :size, :axes)
+    @eval Base.$f(surf::Surface, args...) = $f(surf.surf, args...)
 end
 Base.copy(surf::Surface) = Surface(copy(surf.surf))
 Base.eltype(surf::Surface{T}) where {T} = eltype(T)
@@ -52,6 +52,14 @@ function tex(plt::Plot, fn::AbstractString)
 end
 tex(fn::AbstractString) = tex(current(), fn)

+function json(plt::Plot, fn::AbstractString)
+    fn = addExtension(fn, "json")
+    io = open(fn, "w")
+    show(io, MIME("application/vnd.plotly.v1+json"), plt)
+    close(io)
+end
+json(fn::AbstractString) = json(current(), fn)
+
 function html(plt::Plot, fn::AbstractString)
    fn = addExtension(fn, "html")
    io = open(fn, "w")
@@ -60,6 +68,13 @@ function html(plt::Plot, fn::AbstractString)
 end
 html(fn::AbstractString) = html(current(), fn)

+function txt(plt::Plot, fn::AbstractString)
+  fn = addExtension(fn, "txt")
+  io = open(fn, "w")
+  show(io, MIME("text/plain"), plt)
+  close(io)
+end
+txt(fn::AbstractString) = txt(current(), fn)

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

@@ -71,8 +86,10 @@ const _savemap = Dict(
    "ps"  => ps,
    "eps" => eps,
    "tex" => tex,
+    "json" => json,
    "html" => html,
    "tikz" => tex,
+    "txt" => txt,
  )

 function getExtension(fn::AbstractString)
@@ -1,4 +1,28 @@
+# Error for aliases used in recipes
+function warn_on_recipe_aliases!(plotattributes, recipe_type, args...)
+    for k in keys(plotattributes)
+        if !is_default_attribute(k)
+            dk = get(_keyAliases, k, k)
+            if k !== dk
+                @warn "Attribute alias `$k` detected in the $recipe_type recipe defined for the signature $(signature_string(Val{recipe_type}, args...)). To ensure expected behavior it is recommended to use the default attribute `$dk`."
+            end
+            plotattributes[dk] = pop_kw!(plotattributes, k)
+        end
+    end
+end
+function warn_on_recipe_aliases!(v::AbstractVector, recipe_type, args...)
+    foreach(x -> warn_on_recipe_aliases!(x, recipe_type, args...), v)
+end
+function warn_on_recipe_aliases!(rd::RecipeData, recipe_type, args...)
+    warn_on_recipe_aliases!(rd.plotattributes, recipe_type, args...)
+end

+function signature_string(::Type{Val{:user}}, args...)
+    return string("(::", join(string.(typeof.(args)), ", ::"), ")")
+end
+signature_string(::Type{Val{:type}}, T) = "(::Type{$T}, ::$T)"
+signature_string(::Type{Val{:plot}}, st) = "(::Type{Val{:$st}}, ::AbstractPlot)"
+signature_string(::Type{Val{:series}}, st) = "(::Type{Val{:$st}}, x, y, z)"

 # ------------------------------------------------------------------
 # preprocessing
@@ -40,14 +64,8 @@ function _preprocess_args(plotattributes::AKW, args, still_to_process::Vector{Re
    # remove subplot and axis args from plotattributes... they will be passed through in the kw_list
    if !isempty(args)
        for (k,v) in plotattributes
-            for defdict in (_subplot_defaults,
-                            _axis_defaults,
-                            _axis_defaults_byletter[:x],
-                            _axis_defaults_byletter[:y],
-                            _axis_defaults_byletter[:z])
-                if haskey(defdict, k)
-                    reset_kw!(plotattributes, k)
-                end
+            if k in _all_subplot_args || k in _all_axis_args
+                reset_kw!(plotattributes, k)
            end
        end
    end
@@ -82,7 +100,11 @@ function _process_userrecipes(plt::Plot, plotattributes::AKW, args)
        if isempty(next_series.args)
            _process_userrecipe(plt, kw_list, next_series)
        else
-            rd_list = RecipesBase.apply_recipe(next_series.plotattributes, next_series.args...)
+            rd_list = RecipesBase.apply_recipe(
+                next_series.plotattributes,
+                next_series.args...
+            )
+            warn_on_recipe_aliases!(rd_list, :user, next_series.args...)
            prepend!(still_to_process,rd_list)
        end
    end
@@ -137,7 +159,7 @@ end
 function _add_errorbar_kw(kw_list::Vector{KW}, kw::AKW)
    # handle error bars by creating new recipedata data... these will have
    # the same recipedata index as the recipedata they are copied from
-    for esym in (:xerror, :yerror)
+    for esym in (:xerror, :yerror, :zerror)
        if get(kw, esym, nothing) !== nothing
            # we make a copy of the KW and apply an errorbar recipe
            errkw = copy(kw)
@@ -184,6 +206,7 @@ function _process_plotrecipe(plt::Plot, kw::AKW, kw_list::Vector{KW}, still_to_p
        st = kw[:seriestype]
        st = kw[:seriestype] = get(_typeAliases, st, st)
        datalist = RecipesBase.apply_recipe(kw, Val{st}, plt)
+        warn_on_recipe_aliases!(datalist, :plot, st)
        for data in datalist
            preprocessArgs!(data.plotattributes)
            if data.plotattributes[:seriestype] == st
@@ -408,7 +431,9 @@ function _process_seriesrecipe(plt::Plot, plotattributes::AKW)

    else
        # get a sub list of series for this seriestype
-        datalist = RecipesBase.apply_recipe(plotattributes, Val{st}, plotattributes[:x], plotattributes[:y], plotattributes[:z])
+        x, y, z = plotattributes[:x], plotattributes[:y], plotattributes[:z]
+        datalist = RecipesBase.apply_recipe(plotattributes, Val{st}, x, y, z)
+        warn_on_recipe_aliases!(datalist, :series, st)

        # assuming there was no error, recursively apply the series recipes
        for data in datalist
@@ -44,7 +44,7 @@ end

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

-num_series(x::AMat) = size(x,2)
+num_series(x::AMat) = size(x, 2)
 num_series(x) = 1

 RecipesBase.apply_recipe(plotattributes::AKW, ::Type{T}, plt::AbstractPlot) where {T} = throw(MethodError(T, "Unmatched plot recipe: $T"))
@@ -55,13 +55,26 @@ RecipesBase.apply_recipe(plotattributes::AKW, ::Type{T}, plt::AbstractPlot) wher
 # for seriestype `line`, need to sort by x values

 const POTENTIAL_VECTOR_ARGUMENTS = [
-    :seriescolor, :seriesalpha,
-    :linecolor, :linealpha, :linewidth, :linestyle, :line_z,
-    :fillcolor, :fillalpha, :fill_z,
-    :markercolor, :markeralpha, :markershape, :marker_z,
-    :markerstrokecolor, :markerstrokealpha,
-    :yerror, :yerror,
-    :series_annotations, :fillrange
+    :seriescolor,
+    :seriesalpha,
+    :linecolor,
+    :linealpha,
+    :linewidth,
+    :linestyle,
+    :line_z,
+    :fillcolor,
+    :fillalpha,
+    :fill_z,
+    :markercolor,
+    :markeralpha,
+    :markershape,
+    :marker_z,
+    :markerstrokecolor,
+    :markerstrokealpha,
+    :yerror,
+    :yerror,
+    :series_annotations,
+    :fillrange,
 ]

@recipe function f(::Type{Val{:line}}, x, y, z)
@@ -99,7 +112,7 @@ end
@recipe function f(::Type{Val{:hline}}, x, y, z)
    n = length(y)
    newx = repeat(Float64[-1, 1, NaN], n)
-    newy = vec(Float64[yi for i=1:3,yi=y])
+    newy = vec(Float64[yi for i = 1:3, yi in y])
    x := newx
    y := newy
    seriestype := :straightline
@@ -109,7 +122,7 @@ end

@recipe function f(::Type{Val{:vline}}, x, y, z)
    n = length(y)
-    newx = vec(Float64[yi for i=1:3,yi=y])
+    newx = vec(Float64[yi for i = 1:3, yi in y])
    newy = repeat(Float64[-1, 1, NaN], n)
    x := newx
    y := newy
@@ -121,7 +134,7 @@ end
@recipe function f(::Type{Val{:hspan}}, x, y, z)
    n = div(length(y), 2)
    newx = repeat([-Inf, Inf, Inf, -Inf, NaN], outer = n)
-    newy = vcat([[y[2i-1], y[2i-1], y[2i], y[2i], NaN] for i in 1:n]...)
+    newy = vcat([[y[2i - 1], y[2i - 1], y[2i], y[2i], NaN] for i = 1:n]...)
    linewidth --> 0
    x := newx
    y := newy
@@ -132,7 +145,7 @@ end

@recipe function f(::Type{Val{:vspan}}, x, y, z)
    n = div(length(y), 2)
-    newx = vcat([[y[2i-1], y[2i-1], y[2i], y[2i], NaN] for i in 1:n]...)
+    newx = vcat([[y[2i - 1], y[2i - 1], y[2i], y[2i], NaN] for i = 1:n]...)
    newy = repeat([-Inf, Inf, Inf, -Inf, NaN], outer = n)
    linewidth --> 0
    x := newx
@@ -156,7 +169,7 @@ end
        primary := false
        ()
    end
-()
+    ()
 end
@deps scatterpath path scatter

@@ -169,7 +182,7 @@ function make_steps(x::AbstractArray, st)
    n = length(x)
    n == 0 && return zeros(0)
    newx = zeros(2n - 1)
-    for i in 1:n
+    for i = 1:n
        idx = 2i - 1
        newx[idx] = x[i]
        if i > 1
@@ -249,10 +262,10 @@ end
        end
    end
    newx, newy = zeros(3n), zeros(3n)
-    for i=1:n
-        rng = 3i-2:3i
+    for i = 1:n
+        rng = (3i - 2):(3i)
        newx[rng] = [x[i], x[i], NaN]
-        newy[rng] = [_cycle(fr,i), y[i], NaN]
+        newy[rng] = [_cycle(fr, i), y[i], NaN]
    end
    x := newx
    y := newy
@@ -282,16 +295,16 @@ end
 # get the value of the curve point at position t
 function bezier_value(pts::AVec, t::Real)
    val = 0.0
-    n = length(pts)-1
-    for (i,p) in enumerate(pts)
-        val += p * binomial(n, i-1) * (1-t)^(n-i+1) * t^(i-1)
+    n = length(pts) - 1
+    for (i, p) in enumerate(pts)
+        val += p * binomial(n, i - 1) * (1 - t)^(n - i + 1) * t^(i - 1)
    end
    val
 end

 # create segmented bezier curves in place of line segments
@recipe function f(::Type{Val{:curves}}, x, y, z; npoints = 30)
-    args = z !== nothing ? (x,y,z) : (x,y)
+    args = z !== nothing ? (x, y, z) : (x, y)
    newx, newy = zeros(0), zeros(0)
    fr = plotattributes[:fillrange]
    newfr = fr !== nothing ? zeros(0) : nothing
@@ -304,13 +317,13 @@ end
    for rng in iter_segments(args...)
        length(rng) < 2 && continue
        ts = range(0, stop = 1, length = npoints)
-        nanappend!(newx, map(t -> bezier_value(_cycle(x,rng), t), ts))
-        nanappend!(newy, map(t -> bezier_value(_cycle(y,rng), t), ts))
+        nanappend!(newx, map(t -> bezier_value(_cycle(x, rng), t), ts))
+        nanappend!(newy, map(t -> bezier_value(_cycle(y, rng), t), ts))
        if z !== nothing
-            nanappend!(newz, map(t -> bezier_value(_cycle(z,rng), t), ts))
+            nanappend!(newz, map(t -> bezier_value(_cycle(z, rng), t), ts))
        end
        if fr !== nothing
-            nanappend!(newfr, map(t -> bezier_value(_cycle(fr,rng), t), ts))
+            nanappend!(newfr, map(t -> bezier_value(_cycle(fr, rng), t), ts))
        end
        # if lz !== nothing
        #     lzrng = _cycle(lz, rng) # the line_z's for this segment
@@ -343,14 +356,15 @@ end

 # create a bar plot as a filled step function
@recipe function f(::Type{Val{:bar}}, x, y, z)
-    procx, procy, xscale, yscale, baseline = _preprocess_barlike(plotattributes, x, y)
+    procx, procy, xscale, yscale, baseline =
+        _preprocess_barlike(plotattributes, x, y)
    nx, ny = length(procx), length(procy)
    axis = plotattributes[:subplot][isvertical(plotattributes) ? :xaxis : :yaxis]
-    cv = [discrete_value!(axis, xi)[1] for xi=procx]
+    cv = [discrete_value!(axis, xi)[1] for xi in procx]
    procx = if nx == ny
        cv
    elseif nx == ny + 1
-        0.5diff(cv) + cv[1:end-1]
+        0.5 * diff(cv) + cv[1:(end - 1)]
    else
        error("bar recipe: x must be same length as y (centers), or one more than y (edges).\n\t\tlength(x)=$(length(x)), length(y)=$(length(y))")
    end
@@ -359,12 +373,12 @@ end
    bw = plotattributes[:bar_width]
    hw = if bw === nothing
        if nx > 1
-            0.5*_bar_width*ignorenan_minimum(filter(x->x>0, diff(procx)))
+            0.5 * _bar_width * ignorenan_minimum(filter(x -> x > 0, diff(procx)))
        else
            0.5 * _bar_width
        end
    else
-        Float64[0.5_cycle(bw,i) for i=eachindex(procx)]
+        Float64[0.5 * _cycle(bw, i) for i in eachindex(procx)]
    end

    # make fillto a vector... default fills to 0
@@ -378,13 +392,20 @@ end

    # create the bar shapes by adding x/y segments
    xseg, yseg = Segments(), Segments()
-    for i=1:ny
+    for i = 1:ny
        yi = procy[i]
        if !isnan(yi)
            center = procx[i]
-            hwi = _cycle(hw,i)
-            fi = _cycle(fillto,i)
-            push!(xseg, center-hwi, center-hwi, center+hwi, center+hwi, center-hwi)
+            hwi = _cycle(hw, i)
+            fi = _cycle(fillto, i)
+            push!(
+                xseg,
+                center - hwi,
+                center - hwi,
+                center + hwi,
+                center + hwi,
+                center - hwi,
+            )
            push!(yseg, yi, fi, fi, yi, yi)
        end
    end
@@ -415,8 +436,8 @@ end
    m, n = size(z.surf)
    x_pts, y_pts = fill(NaN, 6 * m * n), fill(NaN, 6 * m * n)
    fz = zeros(m * n)
-    for i in 1:m # y
-        for j in 1:n # x
+    for i = 1:m # y
+        for j = 1:n # x
            k = (j - 1) * m + i
            inds = (6 * (k - 1) + 1):(6 * k - 1)
            x_pts[inds] .= [xe[j], xe[j + 1], xe[j + 1], xe[j], xe[j]]
@@ -440,13 +461,17 @@ end
 # ---------------------------------------------------------------------------
 # Histograms

-_bin_centers(v::AVec) = (v[1:end-1] + v[2:end]) / 2
+_bin_centers(v::AVec) = (v[1:(end - 1)] + v[2:end]) / 2

 _is_positive(x) = (x > 0) && !(x ≈ 0)

 _positive_else_nan(::Type{T}, x::Real) where {T} = _is_positive(x) ? T(x) : T(NaN)

-function _scale_adjusted_values(::Type{T}, V::AbstractVector, scale::Symbol) where T<:AbstractFloat
+function _scale_adjusted_values(
+    ::Type{T},
+    V::AbstractVector,
+    scale::Symbol,
+) where {T<:AbstractFloat}
    if scale in _logScales
        [_positive_else_nan(T, x) for x in V]
    else
@@ -455,7 +480,7 @@ function _scale_adjusted_values(::Type{T}, V::AbstractVector, scale::Symbol) whe
 end


-function _binbarlike_baseline(min_value::T, scale::Symbol) where T<:Real
+function _binbarlike_baseline(min_value::T, scale::Symbol) where {T<:Real}
    if (scale in _logScales)
        !isnan(min_value) ? min_value / T(_logScaleBases[scale]^log10(2)) : T(1E-3)
    else
@@ -464,7 +489,11 @@ function _binbarlike_baseline(min_value::T, scale::Symbol) where T<:Real
 end


-function _preprocess_binbarlike_weights(::Type{T}, w, wscale::Symbol) where T<:AbstractFloat
+function _preprocess_binbarlike_weights(
+    ::Type{T},
+    w,
+    wscale::Symbol,
+) where {T<:AbstractFloat}
    w_adj = _scale_adjusted_values(T, w, wscale)
    w_min = ignorenan_minimum(w_adj)
    w_max = ignorenan_maximum(w_adj)
@@ -490,7 +519,8 @@ end


@recipe function f(::Type{Val{:barbins}}, x, y, z)
-    edge, weights, xscale, yscale, baseline = _preprocess_binlike(plotattributes, x, y)
+    edge, weights, xscale, yscale, baseline =
+        _preprocess_binlike(plotattributes, x, y)
    if (plotattributes[:bar_width] === nothing)
        bar_width := diff(edge)
    end
@@ -503,8 +533,9 @@ end


@recipe function f(::Type{Val{:scatterbins}}, x, y, z)
-    edge, weights, xscale, yscale, baseline = _preprocess_binlike(plotattributes, x, y)
-    xerror := diff(edge)/2
+    edge, weights, xscale, yscale, baseline =
+        _preprocess_binlike(plotattributes, x, y)
+    xerror := diff(edge) / 2
    x := _bin_centers(edge)
    y := weights
    seriestype := :scatter
@@ -513,7 +544,13 @@ end
@deps scatterbins scatter


-function _stepbins_path(edge, weights, baseline::Real, xscale::Symbol, yscale::Symbol)
+function _stepbins_path(
+    edge,
+    weights,
+    baseline::Real,
+    xscale::Symbol,
+    yscale::Symbol,
+)
    log_scale_x = xscale in _logScales
    log_scale_y = yscale in _logScales

@@ -538,7 +575,7 @@ function _stepbins_path(edge, weights, baseline::Real, xscale::Symbol, yscale::S
        w, it_state_w = it_tuple_w

        if (log_scale_x && a ≈ 0)
-            a = oftype(a, b/_logScaleBases[xscale]^3)
+            a = oftype(a, b / _logScaleBases[xscale]^3)
        end

        if isnan(w)
@@ -575,9 +612,11 @@ end


@recipe function f(::Type{Val{:stepbins}}, x, y, z)
-    axis = plotattributes[:subplot][Plots.isvertical(plotattributes) ? :xaxis : :yaxis]
+    axis =
+        plotattributes[:subplot][Plots.isvertical(plotattributes) ? :xaxis : :yaxis]

-    edge, weights, xscale, yscale, baseline = _preprocess_binlike(plotattributes, x, y)
+    edge, weights, xscale, yscale, baseline =
+        _preprocess_binlike(plotattributes, x, y)

    xpts, ypts = _stepbins_path(edge, weights, baseline, xscale, yscale)
    if !isvertical(plotattributes)
@@ -607,9 +646,19 @@ end
 end
 Plots.@deps stepbins path

-wand_edges(x...) = (@warn("Load the StatsPlots package in order to use :wand bins. Defaulting to :auto", once = true); :auto)
+wand_edges(x...) = (
+    @warn(
+        "Load the StatsPlots package in order to use :wand bins. Defaulting to :auto",
+        once = true
+    );
+    :auto
+)

-function _auto_binning_nbins(vs::NTuple{N,AbstractVector}, dim::Integer; mode::Symbol = :auto) where N
+function _auto_binning_nbins(
+    vs::NTuple{N,AbstractVector},
+    dim::Integer;
+    mode::Symbol = :auto,
+) where {N}
    max_bins = 10_000
    _cl(x) = min(ceil(Int, max(x, one(x))), max_bins)
    _iqr(v) = (q = quantile(v, 0.75) - quantile(v, 0.25); q > 0 ? q : oftype(q, 1))
@@ -618,8 +667,13 @@ function _auto_binning_nbins(vs::NTuple{N,AbstractVector}, dim::Integer; mode::S
    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))
-    nd = N == 2 ? min(n_samples^(1/(2+N)), nd / (1-cor(first(vs), last(vs))^2)^(3//8)) : nd # the >2-dimensional case does not have a nice solution to correlations
+    nd = n_samples^(1 / (2 + N))
+    nd = N == 2 ?
+        min(
+        n_samples^(1 / (2 + N)),
+        nd / (1 - cor(first(vs), last(vs))^2)^(3 // 8),
+    ) :
+        nd # the >2-dimensional case does not have a nice solution to correlations

    v = vs[dim]

@@ -644,32 +698,52 @@ function _auto_binning_nbins(vs::NTuple{N,AbstractVector}, dim::Integer; mode::S
    end
 end

-_hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::Integer) where {N} = StatsBase.histrange(vs[dim], binning, :left)
-_hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::Symbol) where {N} = _hist_edge(vs, dim, _auto_binning_nbins(vs, dim, mode = binning))
-_hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::AbstractVector) where {N} = binning
+_hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::Integer) where {N} =
+    StatsBase.histrange(vs[dim], binning, :left)
+_hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::Symbol) where {N} =
+    _hist_edge(vs, dim, _auto_binning_nbins(vs, dim, mode = binning))
+_hist_edge(
+    vs::NTuple{N,AbstractVector},
+    dim::Integer,
+    binning::AbstractVector,
+) where {N} = binning

-_hist_edges(vs::NTuple{N,AbstractVector}, binning::NTuple{N, Any}) where {N} =
+_hist_edges(vs::NTuple{N,AbstractVector}, binning::NTuple{N,Any}) where {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...,))
+_hist_edges(
+    vs::NTuple{N,AbstractVector},
+    binning::Union{Integer,Symbol,AbstractVector},
+) where {N} = map(dim -> _hist_edge(vs, dim, binning), (1:N...,))

 _hist_norm_mode(mode::Symbol) = mode
 _hist_norm_mode(mode::Bool) = mode ? :pdf : :none

 _filternans(vs::NTuple{1,AbstractVector}) = filter!.(isfinite, vs)
-function _filternans(vs::NTuple{N,AbstractVector}) where N
-    _invertedindex(v, not) = [j for (i,j) in enumerate(v) if !(i ∈ not)]
+function _filternans(vs::NTuple{N,AbstractVector}) where {N}
+    _invertedindex(v, not) = [j for (i, j) in enumerate(v) if !(i ∈ not)]
    nots = union(Set.(findall.(!isfinite, vs))...)
    _invertedindex.(vs, Ref(nots))
 end

-function _make_hist(vs::NTuple{N,AbstractVector}, binning; normed = false, weights = nothing) where N
+function _make_hist(
+    vs::NTuple{N,AbstractVector},
+    binning;
+    normed = false,
+    weights = nothing,
+) where {N}
    localvs = _filternans(vs)
    edges = _hist_edges(localvs, binning)
-    h = float( weights === nothing ?
-        StatsBase.fit(StatsBase.Histogram, localvs, edges, closed = :left) :
-        StatsBase.fit(StatsBase.Histogram, localvs, StatsBase.Weights(weights), edges, closed = :left)
+    h = float(
+        weights === nothing ?
+            StatsBase.fit(StatsBase.Histogram, localvs, edges, closed = :left) :
+            StatsBase.fit(
+            StatsBase.Histogram,
+            localvs,
+            StatsBase.Weights(weights),
+            edges,
+            closed = :left,
+        ),
    )
    normalize!(h, mode = _hist_norm_mode(normed))
 end
@@ -682,7 +756,12 @@ end
@deps histogram barhist

@recipe function f(::Type{Val{:barhist}}, x, y, z)
-    h = _make_hist((y,), plotattributes[:bins], normed = plotattributes[:normalize], weights = plotattributes[:weights])
+    h = _make_hist(
+        (y,),
+        plotattributes[:bins],
+        normed = plotattributes[:normalize],
+        weights = plotattributes[:weights],
+    )
    x := h.edges[1]
    y := h.weights
    seriestype := :barbins
@@ -691,7 +770,12 @@ end
@deps barhist barbins

@recipe function f(::Type{Val{:stephist}}, x, y, z)
-    h = _make_hist((y,), plotattributes[:bins], normed = plotattributes[:normalize], weights = plotattributes[:weights])
+    h = _make_hist(
+        (y,),
+        plotattributes[:bins],
+        normed = plotattributes[:normalize],
+        weights = plotattributes[:weights],
+    )
    x := h.edges[1]
    y := h.weights
    seriestype := :stepbins
@@ -700,7 +784,12 @@ end
@deps stephist stepbins

@recipe function f(::Type{Val{:scatterhist}}, x, y, z)
-    h = _make_hist((y,), plotattributes[:bins], normed = plotattributes[:normalize], weights = plotattributes[:weights])
+    h = _make_hist(
+        (y,),
+        plotattributes[:bins],
+        normed = plotattributes[:normalize],
+        weights = plotattributes[:weights],
+    )
    x := h.edges[1]
    y := h.weights
    seriestype := :scatterbins
@@ -709,19 +798,23 @@ end
@deps scatterhist scatterbins


-@recipe function f(h::StatsBase.Histogram{T, 1, E}) where {T, E}
+@recipe function f(h::StatsBase.Histogram{T,1,E}) where {T,E}
    seriestype --> :barbins

    st_map = Dict(
-        :bar => :barbins, :scatter => :scatterbins, :step => :stepbins,
-        :steppost => :stepbins # :step can be mapped to :steppost in pre-processing
+        :bar => :barbins,
+        :scatter => :scatterbins,
+        :step => :stepbins,
+        :steppost => :stepbins, # :step can be mapped to :steppost in pre-processing
    )
-    seriestype := get(st_map, plotattributes[:seriestype], plotattributes[:seriestype])
+    seriestype :=
+        get(st_map, plotattributes[:seriestype], plotattributes[:seriestype])

    if plotattributes[:seriestype] == :scatterbins
        # Workaround, error bars currently not set correctly by scatterbins
-        edge, weights, xscale, yscale, baseline = _preprocess_binlike(plotattributes, h.edges[1], h.weights)
-        xerror --> diff(h.edges[1])/2
+        edge, weights, xscale, yscale, baseline =
+            _preprocess_binlike(plotattributes, h.edges[1], h.weights)
+        xerror --> diff(h.edges[1]) / 2
        seriestype := :scatter
        (Plots._bin_centers(edge), weights)
    else
@@ -730,7 +823,7 @@ end
 end


-@recipe function f(hv::AbstractVector{H}) where H <: StatsBase.Histogram
+@recipe function f(hv::AbstractVector{H}) where {H<:StatsBase.Histogram}
    for h in hv
        @series begin
            h
@@ -769,7 +862,12 @@ Plots.@deps bins2d heatmap


@recipe function f(::Type{Val{:histogram2d}}, x, y, z)
-    h = _make_hist((x, y), plotattributes[:bins], normed = plotattributes[:normalize], weights = plotattributes[:weights])
+    h = _make_hist(
+        (x, y),
+        plotattributes[:bins],
+        normed = plotattributes[:normalize],
+        weights = plotattributes[:weights],
+    )
    x := h.edges[1]
    y := h.edges[2]
    z := Surface(h.weights)
@@ -779,7 +877,7 @@ end
@deps histogram2d bins2d


-@recipe function f(h::StatsBase.Histogram{T, 2, E}) where {T, E}
+@recipe function f(h::StatsBase.Histogram{T,2,E}) where {T,E}
    seriestype --> :bins2d
    (h.edges[1], h.edges[2], Surface(h.weights))
 end
@@ -801,6 +899,91 @@ end
 # note: don't add dependencies because this really isn't a drop-in replacement


+# ---------------------------------------------------------------------------
+# lens! - magnify a region of a plot
+lens!(args...;kwargs...) = plot!(args...; seriestype=:lens, kwargs...)
+export lens!
+@recipe function f(::Type{Val{:lens}}, plt::AbstractPlot)
+    sp_index, inset_bbox = plotattributes[:inset_subplots]
+    if !(width(inset_bbox) isa Measures.Length{:w,<:Real})
+        throw(ArgumentError("Inset bounding box needs to in relative coordinates."))
+    end
+    sp = plt.subplots[sp_index]
+    xl1, xl2 = xlims(plt.subplots[sp_index])
+    bbx1 = xl1 + left(inset_bbox).value * (xl2 - xl1)
+    bbx2 = bbx1 + width(inset_bbox).value * (xl2 - xl1)
+    yl1, yl2 = ylims(plt.subplots[sp_index])
+    bby1 = yl1 + (1 - bottom(inset_bbox).value) * (yl2 - yl1)
+    bby2 = bby1 + height(inset_bbox).value * (yl2 - yl1)
+    bbx = bbx1 + width(inset_bbox).value * (xl2 - xl1) / 2
+    bby = bby1 + height(inset_bbox).value * (yl2 - yl1) / 2
+    lens_index = last(plt.subplots)[:subplot_index] + 1
+    x1, x2 = plotattributes[:x]
+    y1, y2 = plotattributes[:y]
+    seriestype := :path
+    label := ""
+    linecolor := :lightgray
+    bbx_mag = (x1 + x2) / 2
+    bby_mag = (y1 + y2) / 2
+    xi_lens, yi_lens = intersection_point(bbx_mag, bby_mag, bbx, bby, abs(bby2 - bby1), abs(bbx2 - bbx1))
+    xi_mag, yi_mag = intersection_point(bbx, bby, bbx_mag, bby_mag, abs(y2 - y1), abs(x2 - x1))
+    # add lines
+    if xl1 < xi_lens < xl2 &&
+        yl1 < yi_lens < yl2
+        @series begin
+            subplot := sp_index
+            x := [xi_mag, xi_lens]
+            y := [yi_mag, yi_lens]
+            ()
+        end
+    end
+    # add magnification shape
+    @series begin
+        subplot := sp_index
+        x := [x1, x1, x2, x2, x1]
+        y := [y1, y2, y2, y1, y1]
+        ()
+    end
+    # add subplot
+    for series in sp.series_list
+        @series begin
+            plotattributes = merge(plotattributes, copy(series.plotattributes))
+            subplot := lens_index
+            label := ""
+            xlims := (x1, x2)
+            ylims := (y1, y2)
+            ()
+        end
+    end
+    backup = copy(plotattributes)
+    empty!(plotattributes)
+    seriestype := :path
+    series_plotindex := backup[:series_plotindex]
+end
+
+function intersection_point(xA, yA, xB, yB, h, w)
+    s = (yA - yB) / (xA - xB)
+    hh = h / 2
+    hw = w / 2
+    # left or right?
+    if -hh <= s * hw <= hh
+        if xA > xB
+            # right
+            return xB + hw, yB + s * hw
+        else # left
+            return xB - hw, yB - s * hw
+        end
+    # top or bot?
+    elseif -hw <= hh/s <= hw
+        if yA > yB
+            # top
+            return xB + hh/s, yB + hh
+        else
+            # bottom
+            return xB - hh/s, yB - hh
+        end
+    end
+end
 # ---------------------------------------------------------------------------
 # contourf - filled contours

@@ -829,41 +1012,62 @@ function error_zipit(ebar)
    end
 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)}(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)
-        yi = _cycle(yorig, i)
-        ebi = _cycle(ebar, i)
-        nanappend!(x, [xi, xi])
-        e1, e2 = if istuple(ebi)
-            first(ebi), last(ebi)
-        elseif isscalar(ebi)
-            ebi, ebi
-        else
-            error("unexpected ebi type $(typeof(ebi)) for errorbar: $ebi")
+error_tuple(x) = x, x
+error_tuple(x::Tuple) = x
+
+function error_coords(errorbar, errordata, otherdata...)
+    ed = Vector{float_extended_type(errordata)}(undef, 0)
+    od = [Float64[] for _ in otherdata]
+    for (i, edi) in enumerate(errordata)
+        for (j, odj) in enumerate(otherdata)
+            odi = _cycle(odj, i)
+            nanappend!(od[j], [odi, odi])
        end
-        nanappend!(y, [yi - e1, yi + e2])
+        e1, e2 = error_tuple(_cycle(errorbar, i))
+        nanappend!(ed, [edi - e1, edi + e2])
    end
-    x, y
+    return (ed, od...)
 end

 # we will create a series of path segments, where each point represents one
 # side of an errorbar
-@recipe function f(::Type{Val{:yerror}}, x, y, z)
-    error_style!(plotattributes)
-    markershape := :hline
-    plotattributes[:x], plotattributes[:y] = error_coords(plotattributes[:x], plotattributes[:y], error_zipit(plotattributes[:yerror]))
-    ()
-end
-@deps yerror path

@recipe function f(::Type{Val{:xerror}}, x, y, z)
    error_style!(plotattributes)
    markershape := :vline
-    plotattributes[:y], plotattributes[:x] = error_coords(plotattributes[:y], plotattributes[:x], error_zipit(plotattributes[:xerror]))
+    xerr = error_zipit(plotattributes[:xerror])
+    if z === nothing
+        plotattributes[:x], plotattributes[:y] = error_coords(xerr, x, y)
+    else
+        plotattributes[:x], plotattributes[:y], plotattributes[:z] =
+            error_coords(xerr, x, y, z)
+    end
+    ()
+end
+@deps xerror path
+
+@recipe function f(::Type{Val{:yerror}}, x, y, z)
+    error_style!(plotattributes)
+    markershape := :hline
+    yerr = error_zipit(plotattributes[:yerror])
+    if z === nothing
+        plotattributes[:y], plotattributes[:x] = error_coords(yerr, y, x)
+    else
+        plotattributes[:y], plotattributes[:x], plotattributes[:z] =
+            error_coords(yerr, y, x, z)
+    end
+    ()
+end
+@deps yerror path
+
+@recipe function f(::Type{Val{:zerror}}, x, y, z)
+    error_style!(plotattributes)
+    markershape := :hline
+    if z !== nothing
+        zerr = error_zipit(plotattributes[:zerror])
+        plotattributes[:z], plotattributes[:x], plotattributes[:y] =
+            error_coords(zerr, z, x, y)
+    end
    ()
 end
@deps xerror path
@@ -898,15 +1102,15 @@ function quiver_using_arrows(plotattributes::AKW)
            first(vi), last(vi)
        elseif isscalar(vi)
            vi, vi
-        elseif isa(vi,Function)
+        elseif isa(vi, Function)
            vi(xi, yi)
        else
            error("unexpected vi type $(typeof(vi)) for quiver: $vi")
        end

        # add the points
-        nanappend!(x, [xi, xi+vx, NaN])
-        nanappend!(y, [yi, yi+vy, NaN])
+        nanappend!(x, [xi, xi + vx, NaN])
+        nanappend!(y, [yi, yi + vy, NaN])
    end

    plotattributes[:x], plotattributes[:y] = x, y
@@ -936,7 +1140,7 @@ function quiver_using_hack(plotattributes::AKW)
            first(vi), last(vi)
        elseif isscalar(vi)
            vi, vi
-        elseif isa(vi,Function)
+        elseif isa(vi, Function)
            vi(xi, yi)
        else
            error("unexpected vi type $(typeof(vi)) for quiver: $vi")
@@ -951,8 +1155,11 @@ function quiver_using_hack(plotattributes::AKW)
        U1 *= arrow_h
        U2 *= arrow_w

-        ppv = p+v
-        nanappend!(pts, P2[p, ppv-U1, ppv-U1+U2, ppv, ppv-U1-U2, ppv-U1])
+        ppv = p + v
+        nanappend!(
+            pts,
+            P2[p, ppv - U1, ppv - U1 + U2, ppv, ppv - U1 - U2, ppv - U1],
+        )
    end

    plotattributes[:x], plotattributes[:y] = Plots.unzip(pts[2:end])
@@ -977,32 +1184,28 @@ end

 "Represent Open High Low Close data (used in finance)"
 mutable struct OHLC{T<:Real}
-  open::T
-  high::T
-  low::T
-  close::T
+    open::T
+    high::T
+    low::T
+    close::T
 end
 Base.convert(::Type{OHLC}, tup::Tuple) = OHLC(tup...)
 # Base.tuple(ohlc::OHLC) = (ohlc.open, ohlc.high, ohlc.low, ohlc.close)

 # get one OHLC path
 function get_xy(o::OHLC, x, xdiff)
-    xl, xm, xr = x-xdiff, x, x+xdiff
-    ox = [xl, xm, NaN,
-          xm, xm, NaN,
-          xm, xr]
-    oy = [o.open, o.open, NaN,
-          o.low, o.high, NaN,
-          o.close, o.close]
+    xl, xm, xr = x - xdiff, x, x + xdiff
+    ox = [xl, xm, NaN, xm, xm, NaN, xm, xr]
+    oy = [o.open, o.open, NaN, o.low, o.high, NaN, o.close, o.close]
    ox, oy
 end

 # get the joined vector
 function get_xy(v::AVec{OHLC}, x = eachindex(v))
-    xdiff = 0.3ignorenan_mean(abs.(diff(x)))
+    xdiff = 0.3 * ignorenan_mean(abs.(diff(x)))
    x_out, y_out = zeros(0), zeros(0)
-    for (i,ohlc) in enumerate(v)
-        ox,oy = get_xy(ohlc, x[i], xdiff)
+    for (i, ohlc) in enumerate(v)
+        ox, oy = get_xy(ohlc, x[i], xdiff)
        nanappend!(x_out, ox)
        nanappend!(y_out, oy)
    end
@@ -1015,10 +1218,17 @@ end

 # to squash ambiguity warnings...
@recipe f(x::AVec{Function}, v::AVec{OHLC}) = error()
-@recipe f(x::AVec{Function}, v::AVec{Tuple{R1,R2,R3,R4}}) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number} = error()
+@recipe f(
+    x::AVec{Function},
+    v::AVec{Tuple{R1,R2,R3,R4}},
+) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number} = error()

 # this must be OHLC?
-@recipe f(x::AVec, ohlc::AVec{Tuple{R1,R2,R3,R4}}) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number} = x, OHLC[OHLC(t...) for t in ohlc]
+@recipe f(
+    x::AVec,
+    ohlc::AVec{Tuple{R1,R2,R3,R4}},
+) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number} =
+    x, OHLC[OHLC(t...) for t in ohlc]

@recipe function f(x::AVec, v::AVec{OHLC})
    seriestype := :path
@@ -1056,16 +1266,16 @@ end
    @assert length(g.args) == 1 && typeof(g.args[1]) <: AbstractMatrix
    seriestype := :spy
    mat = g.args[1]
-    n,m = axes(mat)
+    n, m = axes(mat)
    Plots.SliceIt, m, n, Surface(mat)
 end

-@recipe function f(::Type{Val{:spy}}, x,y,z)
+@recipe function f(::Type{Val{:spy}}, x, y, z)
    yflip := true
    aspect_ratio := 1
    rs, cs, zs = findnz(z.surf)
-    xlim := ignorenan_extrema(cs)
-    ylim := ignorenan_extrema(rs)
+    xlims := ignorenan_extrema(cs)
+    ylims := ignorenan_extrema(rs)
    if plotattributes[:markershape] == :none
        markershape := :circle
    end
@@ -1086,7 +1296,8 @@ end
 # -------------------------------------------------

 "Adds ax+b... straight line over the current plot, without changing the axis limits"
-abline!(plt::Plot, a, b; kw...) = plot!(plt, [0, 1], [b, b+a]; seriestype = :straightline, kw...)
+abline!(plt::Plot, a, b; kw...) =
+    plot!(plt, [0, 1], [b, b + a]; seriestype = :straightline, kw...)

 abline!(args...; kw...) = abline!(current(), args...; kw...)

@@ -1099,9 +1310,11 @@ datetimeformatter(dt) = string(DateTime(Dates.UTM(dt)))
 timeformatter(t) = string(Dates.Time(Dates.Nanosecond(t)))

@recipe f(::Type{Date}, dt::Date) = (dt -> Dates.value(dt), dateformatter)
-@recipe f(::Type{DateTime}, dt::DateTime) = (dt -> Dates.value(dt), datetimeformatter)
+@recipe f(::Type{DateTime}, dt::DateTime) =
+    (dt -> Dates.value(dt), datetimeformatter)
@recipe f(::Type{Dates.Time}, t::Dates.Time) = (t -> Dates.value(t), timeformatter)
-@recipe f(::Type{P}, t::P) where P <: Dates.Period = (t -> Dates.value(t), t -> string(P(t)))
+@recipe f(::Type{P}, t::P) where {P<:Dates.Period} =
+    (t -> Dates.value(t), t -> string(P(t)))

 # -------------------------------------------------
 # Characters
@@ -1111,7 +1324,7 @@ timeformatter(t) = string(Dates.Time(Dates.Nanosecond(t)))
 # -------------------------------------------------
 # Complex Numbers

-@recipe function f(A::Array{Complex{T}}) where T<:Number
+@recipe function f(A::Array{Complex{T}}) where {T<:Number}
    xguide --> "Re(x)"
    yguide --> "Im(x)"
    real.(A), imag.(A)
@@ -1120,10 +1333,10 @@ end
 # Splits a complex matrix to its real and complex parts
 # Reals defaults solid, imaginary defaults dashed
 # Label defaults are changed to match the real-imaginary reference / indexing
-@recipe function f(x::AbstractArray{T},y::Array{Complex{T2}}) where {T<:Real,T2}
-  ylabel --> "Re(y)"
-  zlabel --> "Im(y)"
-  x,real.(y),imag.(y)
+@recipe function f(x::AbstractArray{T}, y::Array{Complex{T2}}) where {T<:Real,T2}
+    ylabel --> "Re(y)"
+    zlabel --> "Im(y)"
+    x, real.(y), imag.(y)
 end


@@ -1137,7 +1350,7 @@ end
    end

    library = PlotUtils.color_libraries[cl.args[1]]
-    z = sqrt.((1:15)*reshape(1:20,1,:))
+    z = sqrt.((1:15) * reshape(1:20, 1, :))

    seriestype := :heatmap
    ticks := nothing
@@ -1161,7 +1374,7 @@ end
    if !(length(grad.args) == 1 && isa(grad.args[1], Symbol))
        error("showgradient takes the name of a color gradient as a Symbol")
    end
-    z = sqrt.((1:15)*reshape(1:20,1,:))
+    z = sqrt.((1:15) * reshape(1:20, 1, :))
    seriestype := :heatmap
    ticks := nothing
    legend := false
@@ -1184,9 +1397,9 @@ end
    weights = cumsum(weights, dims = 2)
    seriestype := :shape

-	# create a filled polygon for each item
-    for c=axes(weights,2)
-        sx = vcat(weights[:,c], c==1 ? zeros(n) : reverse(weights[:,c-1]))
+    # create a filled polygon for each item
+    for c in axes(weights, 2)
+        sx = vcat(weights[:, c], c == 1 ? zeros(n) : reverse(weights[:, c - 1]))
        sy = vcat(returns, reverse(returns))
        @series Plots.isvertical(plotattributes) ? (sx, sy) : (sy, sx)
    end
@@ -1205,13 +1418,13 @@ julia> areaplot(1:3, [1 2 3; 7 8 9; 4 5 6], seriescolor = [:red :green :blue], f
@userplot AreaPlot

@recipe function f(a::AreaPlot)
-    data = cumsum(a.args[end], dims=2)
+    data = cumsum(a.args[end], dims = 2)
    x = length(a.args) == 1 ? (axes(data, 1)) : a.args[1]
    seriestype := :line
    for i in axes(data, 2)
        @series begin
-            fillrange := i > 1 ? data[:,i-1] : 0
-            x, data[:,i]
+            fillrange := i > 1 ? data[:, i - 1] : 0
+            x, data[:, i]
        end
    end
 end
@@ -15,40 +15,43 @@ prepareSeriesData(x) = error("Cannot convert $(typeof(x)) to series data for plo
 prepareSeriesData(::Nothing) = nothing
 prepareSeriesData(t::Tuple{T, T}) where {T<:Number} = t
 prepareSeriesData(f::Function) = f
-prepareSeriesData(a::AbstractArray{<:MaybeNumber}) = replace!(
-                                    x -> ismissing(x) || isinf(x) ? NaN : x,
-                                    map(float,a))
+prepareSeriesData(ar::AbstractRange{<:Number}) = ar
+function prepareSeriesData(a::AbstractArray{<:MaybeNumber})
+    f = isimmutable(a) ? replace : replace!
+    a = f(x -> ismissing(x) || isinf(x) ? NaN : x, map(float, a))
+end
+prepareSeriesData(a::AbstractArray{<:Missing}) = fill(NaN, axes(a))
 prepareSeriesData(a::AbstractArray{<:MaybeString}) = replace(x -> ismissing(x) ? "" : x, a)
 prepareSeriesData(s::Surface{<:AMat{<:MaybeNumber}}) = Surface(prepareSeriesData(s.surf))
 prepareSeriesData(s::Surface) = s  # non-numeric Surface, such as an image
 prepareSeriesData(v::Volume) = Volume(prepareSeriesData(v.v), v.x_extents, v.y_extents, v.z_extents)

 # default: assume x represents a single series
-convertToAnyVector(x, plotattributes) = Any[prepareSeriesData(x)]
+series_vector(x, plotattributes) = [prepareSeriesData(x)]

 # fixed number of blank series
-convertToAnyVector(n::Integer, plotattributes) = Any[zeros(0) for i in 1:n]
+series_vector(n::Integer, plotattributes) = [zeros(0) for i in 1:n]

 # vector of data points is a single series
-convertToAnyVector(v::AVec{<:DataPoint}, plotattributes) = Any[prepareSeriesData(v)]
+series_vector(v::AVec{<:DataPoint}, plotattributes) = [prepareSeriesData(v)]

 # list of things (maybe other vectors, functions, or something else)
-function convertToAnyVector(v::AVec, plotattributes)
+function series_vector(v::AVec, plotattributes)
    if all(x -> x isa MaybeNumber, v)
-        convertToAnyVector(Vector{MaybeNumber}(v), plotattributes)
+        series_vector(Vector{MaybeNumber}(v), plotattributes)
    elseif all(x -> x isa MaybeString, v)
-        convertToAnyVector(Vector{MaybeString}(v), plotattributes)
+        series_vector(Vector{MaybeString}(v), plotattributes)
    else
-        vcat((convertToAnyVector(vi, plotattributes) for vi in v)...)
+        vcat((series_vector(vi, plotattributes) for vi in v)...)
    end
 end

 # Matrix is split into columns
-function convertToAnyVector(v::AMat{<:DataPoint}, plotattributes)
+function series_vector(v::AMat{<:DataPoint}, plotattributes)
    if all3D(plotattributes)
-        Any[prepareSeriesData(Surface(v))]
+        [prepareSeriesData(Surface(v))]
    else
-        Any[prepareSeriesData(v[:, i]) for i in axes(v, 2)]
+        [prepareSeriesData(v[:, i]) for i in axes(v, 2)]
    end
 end

@@ -57,34 +60,32 @@ end


 process_fillrange(range::Number, plotattributes) = [range]
-process_fillrange(range, plotattributes) = convertToAnyVector(range, plotattributes)
+process_fillrange(range, plotattributes) = series_vector(range, plotattributes)

 process_ribbon(ribbon::Number, plotattributes) = [ribbon]
-process_ribbon(ribbon, plotattributes) = convertToAnyVector(ribbon, plotattributes)
+process_ribbon(ribbon, plotattributes) = series_vector(ribbon, plotattributes)
 # ribbon as a tuple: (lower_ribbons, upper_ribbons)
-process_ribbon(ribbon::Tuple{Any,Any}, plotattributes) = collect(zip(convertToAnyVector(ribbon[1], plotattributes),
-                                                     convertToAnyVector(ribbon[2], plotattributes)))
+process_ribbon(ribbon::Tuple{S, T}, plotattributes) where {S, T} = collect(zip(
+    series_vector(ribbon[1], plotattributes),
+    series_vector(ribbon[2], plotattributes),
+))


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

-# 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::Nothing, y::Nothing, z)    = axes(z,1)
+compute_x(x::Nothing, y, z)             = axes(y,1)
+compute_x(x::Function, y, z)            = map(x, y)
+compute_x(x, y, z)                      = x

-compute_x(x::Nothing, y::Nothing, z)      = axes(z,1)
-compute_x(x::Nothing, y, z)            = axes(y,1)
-compute_x(x::Function, y, z)        = map(x, y)
-compute_x(x, y, z)                  = copy(x)
+compute_y(x::Nothing, y::Nothing, z)    = axes(z,2)
+compute_y(x, y::Function, z)            = map(y, x)
+compute_y(x, y, z)                      = y

-# compute_y(x::Void, y::Function, z)  = error()
-compute_y(x::Nothing, y::Nothing, z)      = axes(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::Nothing)            = nothing
-compute_z(x, y, z)                  = copy(z)
+compute_z(x, y, z::Function)            = map(z, x, y)
+compute_z(x, y, z::AbstractMatrix)      = Surface(z)
+compute_z(x, y, z::Nothing)             = nothing
+compute_z(x, y, z)                      = z

 nobigs(v::AVec{BigFloat}) = map(Float64, v)
 nobigs(v::AVec{BigInt}) = map(Int64, v)
@@ -107,10 +108,16 @@ compute_xyz(x::Nothing, y::Nothing, z::Nothing)        = error("x/y/z are all no

 # we are going to build recipes to do the processing and splitting of the args

+# --------------------------------------------------------------------
+# The catch-all SliceIt recipe
+# --------------------------------------------------------------------
+
 # ensure we dispatch to the slicer
 struct SliceIt end

-# the catch-all recipes
+# The `SliceIt` recipe finishes user and type recipe processing.
+# It splits processed data into individual series data, stores in copied `plotattributes`
+# for each series and returns no arguments.
@recipe function f(::Type{SliceIt}, x, y, z)

    # handle data with formatting attached
@@ -127,10 +134,9 @@ struct SliceIt end
        z = z.data
    end

-    xs = convertToAnyVector(x, plotattributes)
-    ys = convertToAnyVector(y, plotattributes)
-    zs = convertToAnyVector(z, plotattributes)
-
+    xs = series_vector(x, plotattributes)
+    ys = series_vector(y, plotattributes)
+    zs = series_vector(z, plotattributes)

    fr = pop!(plotattributes, :fillrange, nothing)
    fillranges = process_fillrange(fr, plotattributes)
@@ -140,8 +146,6 @@ struct SliceIt end
    ribbons = process_ribbon(rib, plotattributes)
    mr = length(ribbons)

-    # @show zs
-
    mx = length(xs)
    my = length(ys)
    mz = length(zs)
@@ -166,56 +170,119 @@ struct SliceIt end
    nothing  # don't add a series for the main block
 end

+
+# --------------------------------------------------------------------
+# Apply type recipes
+# --------------------------------------------------------------------
+
 # this is the default "type recipe"... just pass the object through
-@recipe f(::Type{T}, v::T) where {T<:Any} = v
+@recipe f(::Type{T}, v::T) where T = v

 # this should catch unhandled "series recipes" and error with a nice message
@recipe f(::Type{V}, x, y, z) where {V<:Val} = error("The backend must not support the series type $V, and there isn't a series recipe defined.")

-_apply_type_recipe(plotattributes, v) = RecipesBase.apply_recipe(plotattributes, typeof(v), v)[1].args[1]
+function _apply_type_recipe(plotattributes, v, letter)
+    _preprocess_axis_args!(plotattributes, letter)
+    rdvec = RecipesBase.apply_recipe(plotattributes, typeof(v), v)
+    warn_on_recipe_aliases!(plotattributes, :type, typeof(v))
+    _postprocess_axis_args!(plotattributes, letter)
+    return rdvec[1].args[1]
+end

 # Handle type recipes when the recipe is defined on the elements.
 # This sort of recipe should return a pair of functions... one to convert to number,
 # and one to format tick values.
-function _apply_type_recipe(plotattributes, v::AbstractArray)
-    isempty(skipmissing(v)) && return Float64[]
-    x = first(skipmissing(v))
-    args = RecipesBase.apply_recipe(plotattributes, typeof(x), x)[1].args
-    if length(args) == 2 && typeof(args[1]) <: Function && typeof(args[2]) <: Function
-        numfunc, formatter = args
-        Formatted(map(numfunc, v), formatter)
+function _apply_type_recipe(plotattributes, v::AbstractArray, letter)
+    _preprocess_axis_args!(plotattributes, letter)
+    # First we try to apply an array type recipe.
+    w = RecipesBase.apply_recipe(plotattributes, typeof(v), v)[1].args[1]
+    warn_on_recipe_aliases!(plotattributes, :type, typeof(v))
+    # If the type did not change try it element-wise
+    if typeof(v) == typeof(w)
+        isempty(skipmissing(v)) && return Float64[]
+        x = first(skipmissing(v))
+        args = RecipesBase.apply_recipe(plotattributes, typeof(x), x)[1].args
+        warn_on_recipe_aliases!(plotattributes, :type, typeof(x))
+        _postprocess_axis_args!(plotattributes, letter)
+        if length(args) == 2 && all(arg -> arg isa Function, args)
+            numfunc, formatter = args
+             return Formatted(map(numfunc, v), formatter)
+         else
+             return v
+        end
+    end
+    _postprocess_axis_args!(plotattributes, letter)
+    return w
+end
+
+# special handling for Surface... need to properly unwrap and re-wrap
+_apply_type_recipe(
+    plotattributes,
+    v::Surface{<:AMat{<:Union{AbstractFloat, Integer, AbstractString, Missing}}},
+    letter,
+) = v
+function _apply_type_recipe(plotattributes, v::Surface, letter)
+    ret = _apply_type_recipe(plotattributes, v.surf, letter)
+    if typeof(ret) <: Formatted
+        Formatted(Surface(ret.data), ret.formatter)
    else
-        v
+        Surface(ret)
    end
 end

-# # special handling for Surface... need to properly unwrap and re-wrap
-# function _apply_type_recipe(plotattributes, v::Surface)
-#     T = eltype(v.surf)
-#     @show T
-#     if T <: Integer || T <: AbstractFloat
-#         v
-#     else
-#         ret = _apply_type_recipe(plotattributes, v.surf)
-#         if typeof(ret) <: Formatted
-#             Formatted(Surface(ret.data), ret.formatter)
-#         else
-#             v
-#         end
-#     end
-# end
+# don't do anything vectors of datapoints and for nothing
+_apply_type_recipe(plotattributes, v::Nothing, letter) = v
+_apply_type_recipe(
+    plotattributes,
+    v::AbstractArray{<:Union{AbstractFloat, Integer, AbstractString, Missing}},
+    letter,
+) = v

-# don't do anything for ints or floats
-_apply_type_recipe(plotattributes, v::AbstractArray{T}) where {T<:Union{Integer,AbstractFloat}} = v
+# axis args before type recipes should still be mapped to all axes
+function _preprocess_axis_args!(plotattributes)
+    for (k, v) in plotattributes
+        if is_axis_attr_noletter(k)
+            pop!(plotattributes, k)
+            for l in (:x, :y, :z)
+                lk = Symbol(l, k)
+                haskey(plotattributes, lk) || (plotattributes[lk] = v)
+            end
+        end
+    end
+end
+function _preprocess_axis_args!(plotattributes, letter)
+    plotattributes[:letter] = letter
+    _preprocess_axis_args!(plotattributes)
+end
+
+# axis args in type recipes should only be applied to the current axis
+function _postprocess_axis_args!(plotattributes, letter)
+    pop!(plotattributes, :letter)
+    if letter in (:x, :y, :z)
+        for (k, v) in plotattributes
+            if is_axis_attr_noletter(k)
+                pop!(plotattributes, k)
+                lk = Symbol(letter, k)
+                haskey(plotattributes, lk) || (plotattributes[lk] = v)
+            end
+        end
+    end
+end
+
+
+# --------------------------------------------------------------------
+# Fallback user recipes calling type recipes
+# --------------------------------------------------------------------

 # handle "type recipes" by converting inputs, and then either re-calling or slicing
@recipe function f(x, y, z)
+    wrap_surfaces!(plotattributes, x, y, z)
    did_replace = false
-    newx = _apply_type_recipe(plotattributes, x)
+    newx = _apply_type_recipe(plotattributes, x, :x)
    x === newx || (did_replace = true)
-    newy = _apply_type_recipe(plotattributes, y)
+    newy = _apply_type_recipe(plotattributes, y, :y)
    y === newy || (did_replace = true)
-    newz = _apply_type_recipe(plotattributes, z)
+    newz = _apply_type_recipe(plotattributes, z, :z)
    z === newz || (did_replace = true)
    if did_replace
        newx, newy, newz
@@ -224,10 +291,11 @@ _apply_type_recipe(plotattributes, v::AbstractArray{T}) where {T<:Union{Integer,
    end
 end
@recipe function f(x, y)
+    wrap_surfaces!(plotattributes, x, y)
    did_replace = false
-    newx = _apply_type_recipe(plotattributes, x)
+    newx = _apply_type_recipe(plotattributes, x, :x)
    x === newx || (did_replace = true)
-    newy = _apply_type_recipe(plotattributes, y)
+    newy = _apply_type_recipe(plotattributes, y, :y)
    y === newy || (did_replace = true)
    if did_replace
        newx, newy
@@ -236,7 +304,8 @@ end
    end
 end
@recipe function f(y)
-    newy = _apply_type_recipe(plotattributes, y)
+    wrap_surfaces!(plotattributes, y)
+    newy = _apply_type_recipe(plotattributes, y, :y)
    if y !== newy
        newy
    else
@@ -249,7 +318,7 @@ end
@recipe function f(v1, v2, v3, v4, vrest...)
    did_replace = false
    newargs = map(v -> begin
-        newv = _apply_type_recipe(plotattributes, v)
+        newv = _apply_type_recipe(plotattributes, v, :unknown)
        if newv !== v
            did_replace = true
        end
@@ -262,12 +331,14 @@ end
 end


-# # --------------------------------------------------------------------
-# # 1 argument
-# # --------------------------------------------------------------------
-
 # helper function to ensure relevant attributes are wrapped by Surface
-function wrap_surfaces(plotattributes::AKW)
+function wrap_surfaces!(plotattributes, args...) end
+wrap_surfaces!(plotattributes, x::AMat, y::AMat, z::AMat) = wrap_surfaces!(plotattributes)
+wrap_surfaces!(plotattributes, x::AVec, y::AVec, z::AMat) = wrap_surfaces!(plotattributes)
+function wrap_surfaces!(plotattributes, x::AVec, y::AVec, z::Surface)
+    wrap_surfaces!(plotattributes)
+end
+function wrap_surfaces!(plotattributes)
    if haskey(plotattributes, :fill_z)
        v = plotattributes[:fill_z]
        if !isa(v, Surface)
@@ -276,42 +347,57 @@ function wrap_surfaces(plotattributes::AKW)
    end
 end

+
+# --------------------------------------------------------------------
+# 1 argument
+# --------------------------------------------------------------------
+
@recipe f(n::Integer) = is3d(get(plotattributes,:seriestype,:path)) ? (SliceIt, n, n, n) : (SliceIt, n, n, nothing)

-all3D(plotattributes) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image, :plots_heatmap), get(plotattributes, :seriestype, :none))
+all3D(plotattributes) = trueOrAllTrue(
+    st -> st in (
+        :contour,
+        :contourf,
+        :heatmap,
+        :surface,
+        :wireframe,
+        :contour3d,
+        :image,
+        :plots_heatmap,
+    ),
+    get(plotattributes, :seriestype, :none),
+)

 # return a surface if this is a 3d plot, otherwise let it be sliced up
-@recipe function f(mat::AMat{T}) where T<:Union{Integer,AbstractFloat,Missing}
+@recipe function f(mat::AMat)
    if all3D(plotattributes)
-        n,m = axes(mat)
-        wrap_surfaces(plotattributes)
-        SliceIt, m, n, Surface(mat)
+        n, m = axes(mat)
+        m, n, Surface(mat)
    else
-        SliceIt, nothing, mat, nothing
+        nothing, mat, nothing
    end
 end

 # if a matrix is wrapped by Formatted, do similar logic, but wrap data with Surface
-@recipe function f(fmt::Formatted{T}) where T<:AbstractMatrix
+@recipe function f(fmt::Formatted{<:AMat})
    if all3D(plotattributes)
        mat = fmt.data
-        n,m = axes(mat)
-        wrap_surfaces(plotattributes)
-        SliceIt, m, n, Formatted(Surface(mat), fmt.formatter)
+        n, m = axes(mat)
+        m, n, Formatted(Surface(mat), fmt.formatter)
    else
-        SliceIt, nothing, fmt, nothing
+        nothing, fmt, nothing
    end
 end

 # assume this is a Volume, so construct one
-@recipe function f(vol::AbstractArray{T,3}, args...) where T<:Union{Number,Missing}
+@recipe function f(vol::AbstractArray{<:MaybeNumber, 3}, args...)
    seriestype := :volume
    SliceIt, nothing, Volume(vol, args...), nothing
 end


-# # images - grays
-function clamp_greys!(mat::AMat{T}) where T<:Gray
+# images - grays
+function clamp_greys!(mat::AMat{<:Gray})
    for i in eachindex(mat)
        mat[i].val < 0 && (mat[i] = Gray(0))
        mat[i].val > 1 && (mat[i] = Gray(1))
@@ -319,7 +405,7 @@ function clamp_greys!(mat::AMat{T}) where T<:Gray
    mat
 end

-@recipe function f(mat::AMat{T}) where T<:Gray
+@recipe function f(mat::AMat{<:Gray})
    n, m = axes(mat)
    if is_seriestype_supported(:image)
        seriestype := :image
@@ -334,8 +420,7 @@ end
    end
 end

-# # images - colors
-
+# images - colors
@recipe function f(mat::AMat{T}) where T<:Colorant
 	n, m = axes(mat)

@@ -347,13 +432,13 @@ end
        seriestype := :heatmap
        yflip --> true
        cbar --> false
+        aspect_ratio --> :equal
        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
        SliceIt, m, n, Surface(z)
    end
 end

-#
-# # plotting arbitrary shapes/polygons
+# plotting arbitrary shapes/polygons

@recipe function f(shape::Shape)
    seriestype --> :shape
@@ -387,40 +472,21 @@ end
            axis_limits(plt[1], :x)
        catch
            xinv = invscalefunc(get(plotattributes, :xscale, :identity))
-            xm = tryrange(f, xinv.([-5,-1,0,0.01]))
-            xm, tryrange(f, filter(x->x>xm, xinv.([5,1,0.99, 0, -0.01])))
+            xm = PlotUtils.tryrange(f, xinv.([-5,-1,0,0.01]))
+            xm, PlotUtils.tryrange(f, filter(x->x>xm, xinv.([5,1,0.99, 0, -0.01])))
        end
    end

    f, xmin, xmax
 end

-# try some intervals over which the function may be defined
-function tryrange(F::AbstractArray, vec)
-    rets = [tryrange(f, vec) for f in F] # get the preferred for each
-    maxind = maximum(indexin(rets, vec)) # get the last attempt that succeeded (most likely to fit all)
-    rets .= [tryrange(f, vec[maxind:maxind]) for f in F] # ensure that all functions compute there
-    rets[1]
-end

-function tryrange(F, vec)
-    for v in vec
-        try
-            tmp = F(v)
-            return v
-        catch
-        end
-    end
-    error("$F is not a Function, or is not defined at any of the values $vec")
-end
-#
-# # --------------------------------------------------------------------
-# # 2 arguments
-# # --------------------------------------------------------------------
-#
-#
-# # if functions come first, just swap the order (not to be confused with parametric functions...
-# # as there would be more than one function passed in)
+# --------------------------------------------------------------------
+# 2 arguments
+# --------------------------------------------------------------------
+
+# if functions come first, just swap the order (not to be confused with parametric
+# functions... as there would be more than one function passed in)

@recipe function f(f::FuncOrFuncs{F}, x) where F<:Function
    F2 = typeof(x)
@@ -428,58 +494,25 @@ end
    x, f
 end

-#
-# # --------------------------------------------------------------------
-# # 3 arguments
-# # --------------------------------------------------------------------
-#
-#
-# # 3d line or scatter

-@recipe function f(x::AVec, y::AVec, z::AVec)
-    # st = get(plotattributes, :seriestype, :none)
-    # if st == :scatter
-    #     plotattributes[:seriestype] = :scatter3d
-    # elseif !is3d(st)
-    #     plotattributes[:seriestype] = :path3d
-    # end
-    SliceIt, x, y, z
-end
-
-@recipe function f(x::AMat, y::AMat, z::AMat)
-    # st = get(plotattributes, :seriestype, :none)
-    # if size(x) == size(y) == size(z)
-    #     if !is3d(st)
-    #         seriestype := :path3d
-    #     end
-    # end
-    wrap_surfaces(plotattributes)
-    SliceIt, x, y, z
-end
-
-#
-# # surface-like... function
+# --------------------------------------------------------------------
+# 3 arguments
+# --------------------------------------------------------------------

+# surface-like... function
@recipe function f(x::AVec, y::AVec, zf::Function)
-    # x = X <: Number ? sort(x) : x
-    # y = Y <: Number ? sort(y) : y
-    wrap_surfaces(plotattributes)
-    SliceIt, x, y, Surface(zf, x, y)  # TODO: replace with SurfaceFunction when supported
+    x, y, Surface(zf, x, y)  # TODO: replace with SurfaceFunction when supported
 end

-#
-# # surface-like... matrix grid
-
+# surface-like... matrix grid
@recipe function f(x::AVec, y::AVec, z::AMat)
    if !like_surface(get(plotattributes, :seriestype, :none))
        plotattributes[:seriestype] = :contour
    end
-    wrap_surfaces(plotattributes)
-    SliceIt, x, y, Surface(z)
+    x, y, Surface(z)
 end

-# # images - grays
-
+# images - grays
@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where T<:Gray
    if is_seriestype_supported(:image)
        seriestype := :image
@@ -494,8 +527,7 @@ end
    end
 end

-# # images - colors
-
+# images - colors
@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where T<:Colorant
    if is_seriestype_supported(:image)
        seriestype := :image
@@ -510,27 +542,19 @@ end
    end
 end

-#
-#
-# # --------------------------------------------------------------------
-# # Parametric functions
-# # --------------------------------------------------------------------

-#
-# # special handling... xmin/xmax with parametric function(s)
+# --------------------------------------------------------------------
+# Parametric functions
+# --------------------------------------------------------------------
+
+# special handling... xmin/xmax with parametric function(s)
@recipe function f(f::Function, xmin::Number, xmax::Number)
    xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
    _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
 end
@recipe function f(fs::AbstractArray{F}, xmin::Number, xmax::Number) where F<:Function
    xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
-    xs = Array{Any}(undef, length(fs))
-    ys = Array{Any}(undef, length(fs))
-    for (i, (x, y)) in enumerate(_scaled_adapted_grid(f, xscale, yscale, xmin, xmax) for f in fs)
-        xs[i] = x
-    	ys[i] = y
-    end
-    xs, ys
+    unzip(_scaled_adapted_grid.(fs, xscale, yscale, xmin, xmax))
 end
@recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, u::AVec) where {F<:Function,G<:Function}  = mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u)
@recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, umin::Number, umax::Number, n = 200) where {F<:Function,G<:Function} = fx, fy, range(umin, stop = umax, length = n)
@@ -541,8 +565,7 @@ function _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
    xinv.(xs), yinv.(ys)
 end

-#
-# # special handling... 3D parametric function(s)
+# special handling... 3D parametric function(s)
@recipe function f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, u::AVec) where {F<:Function,G<:Function,H<:Function}
    mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u), mapFuncOrFuncs(fz, u)
 end
@@ -550,12 +573,10 @@ end
    fx, fy, fz, range(umin, stop = umax, length = numPoints)
 end

-#
-#
-# # --------------------------------------------------------------------
-# # Lists of tuples and GeometryTypes.Points
-# # --------------------------------------------------------------------
-#
+
+# --------------------------------------------------------------------
+# Lists of tuples and GeometryTypes.Points
+# --------------------------------------------------------------------

@recipe f(v::AVec{<:Tuple})               = unzip(v)
@recipe f(v::AVec{<:GeometryTypes.Point}) = unzip(v)
@@ -565,23 +586,10 @@ end
 # Special case for 4-tuples in :ohlc series
@recipe f(xyuv::AVec{<:Tuple{R1,R2,R3,R4}}) where {R1,R2,R3,R4} = get(plotattributes,:seriestype,:path)==:ohlc ? OHLC[OHLC(t...) for t in xyuv] : unzip(xyuv)

-#
-# # --------------------------------------------------------------------
-# # handle grouping
-# # --------------------------------------------------------------------

-# @recipe function f(groupby::GroupBy, args...)
-#     for (i,glab) in enumerate(groupby.groupLabels)
-#         # create a new series, with the label of the group, and an idxfilter (to be applied in slice_and_dice)
-#         # TODO: use @series instead
-#         @show i, glab, groupby.groupIds[i]
-#         di = copy(plotattributes)
-#         get!(di, :label, string(glab))
-#         get!(di, :idxfilter, groupby.groupIds[i])
-#         push!(series_list, RecipeData(di, args))
-#     end
-#     nothing
-# end
+# --------------------------------------------------------------------
+# handle grouping
+# --------------------------------------------------------------------

 splittable_kw(key, val, lengthGroup) = false
 splittable_kw(key, val::AbstractArray, lengthGroup) = !(key in (:group, :color_palette)) && length(axes(val,1)) == lengthGroup
@@ -271,6 +271,7 @@ Draw a 3D surface plot.

 # Example
 ```julia-repl
+julia> using LinearAlgebra
 julia> x = y = range(-3, 3, length = 100)
 julia> surface(x, y, (x, y) -> sinc(norm([x, y])))
 ```
@@ -428,8 +429,8 @@ Add annotations to an existing plot.

 # Arguments

- `anns`: An `AbstractVector` of tuples of the form (x,y,text). The text object
-          can be an String or PlotText
+- `anns`: An `AbstractVector` of tuples of the form `(x,y,text)`. The `text` object
+          can be a `String` or `PlotText`.

 # Example
 ```julia-repl
@@ -437,7 +438,7 @@ julia> plot(1:10)
 julia> annotate!([(7,3,"(7,3)"),(3,7,text("hey", 14, :left, :top, :green))])
 ```
 """
-annotate!(anns...; kw...)                                        = plot!(; annotation = anns, kw...)
+annotate!(anns...; kw...)                                        = plot!(; annotation = collect(anns), kw...)
 annotate!(anns::AVec{T}; kw...) where {T<:Tuple}                 = plot!(; annotation = anns, kw...)

 "Flip the current plots' x axis"
@@ -26,8 +26,9 @@ struct Attr <: AbstractDict{Symbol,Any}
    defaults::KW
 end

-Base.getindex(attr::Attr, k) = haskey(attr.explicit,k) ?
-                                     attr.explicit[k] : attr.defaults[k]
+function Base.getindex(attr::Attr, k)
+    return haskey(attr.explicit, k) ? attr.explicit[k] : attr.defaults[k]
+end
 Base.haskey(attr::Attr, k) = haskey(attr.explicit,k) || haskey(attr.defaults,k)
 Base.get(attr::Attr, k, default) = haskey(attr, k) ? attr[k] : default
 function Base.get!(attr::Attr, k, default)
@@ -41,7 +42,7 @@ end
 function Base.delete!(attr::Attr, k)
    haskey(attr.explicit, k) && delete!(attr.explicit, k)
    haskey(attr.defaults, k) && delete!(attr.defaults, k)
-end 
+end
 Base.length(attr::Attr) = length(union(keys(attr.explicit), keys(attr.defaults)))
 function Base.iterate(attr::Attr)
    exp_keys = keys(attr.explicit)
@@ -1,139 +1,11 @@

-calcMidpoints(edges::AbstractVector) = Float64[0.5 * (edges[i] + edges[i+1]) for i in 1:length(edges)-1]
-
-"Make histogram-like bins of data"
-function binData(data, nbins)
-  lo, hi = ignorenan_extrema(data)
-  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))
-  for b in buckets
-    counts[b] += 1
-  end
-  edges, midpoints, buckets, counts
-end
-
-"""
-A hacky replacement for a histogram when the backend doesn't support histograms directly.
-Convert it into a bar chart with the appropriate x/y values.
-"""
-function histogramHack(; kw...)
-  plotattributes = KW(kw)
-
-  # we assume that the y kwarg is set with the data to be binned, and nbins is also defined
-  edges, midpoints, buckets, counts = binData(plotattributes[:y], plotattributes[:bins])
-  plotattributes[:x] = midpoints
-  plotattributes[:y] = float(counts)
-  plotattributes[:seriestype] = :bar
-  plotattributes[:fillrange] = plotattributes[:fillrange] === nothing ? 0.0 : plotattributes[:fillrange]
-  plotattributes
-end
-
-"""
-A hacky replacement for a bar graph when the backend doesn't support bars directly.
-Convert it into a line chart with fillrange set.
-"""
-function barHack(; kw...)
-  plotattributes = KW(kw)
-  midpoints = plotattributes[:x]
-  heights = plotattributes[:y]
-  fillrange = plotattributes[:fillrange] === nothing ? 0.0 : plotattributes[:fillrange]
-
-  # estimate the edges
-  dists = diff(midpoints) * 0.5
-  edges = zeros(length(midpoints)+1)
-  for i in eachindex(edges)
-    if i == 1
-      edge = midpoints[1] - dists[1]
-    elseif i == length(edges)
-      edge = midpoints[i-1] + dists[i-2]
-    else
-      edge = midpoints[i-1] + dists[i-1]
-    end
-    edges[i] = edge
-  end
-
-  x = Float64[]
-  y = Float64[]
-  for i in eachindex(heights)
-    e1, e2 = edges[i:i+1]
-    append!(x, [e1, e1, e2, e2])
-    append!(y, [fillrange, heights[i], heights[i], fillrange])
-  end
-
-  plotattributes[:x] = x
-  plotattributes[:y] = y
-  plotattributes[:seriestype] = :path
-  plotattributes[:fillrange] = fillrange
-  plotattributes
-end
-
-
-"""
-A hacky replacement for a sticks graph when the backend doesn't support sticks directly.
-Convert it into a line chart that traces the sticks, and a scatter that sets markers at the points.
-"""
-function sticksHack(; kw...)
-  plotattributesLine = KW(kw)
-  plotattributesScatter = copy(plotattributesLine)
-
-  # these are the line vertices
-  x = Float64[]
-  y = Float64[]
-  fillrange = plotattributesLine[:fillrange] === nothing ? 0.0 : plotattributesLine[:fillrange]
-
-  # calculate the vertices
-  yScatter = plotattributesScatter[:y]
-  for (i,xi) in enumerate(plotattributesScatter[:x])
-    yi = yScatter[i]
-    for j in 1:3 push!(x, xi) end
-    append!(y, [fillrange, yScatter[i], fillrange])
-  end
-
-  # change the line args
-  plotattributesLine[:x] = x
-  plotattributesLine[:y] = y
-  plotattributesLine[:seriestype] = :path
-  plotattributesLine[:markershape] = :none
-  plotattributesLine[:fillrange] = nothing
-
-  # change the scatter args
-  plotattributesScatter[:seriestype] = :none
-
-  plotattributesLine, plotattributesScatter
-end
-
-function regressionXY(x, y)
-  # regress
-  β, α = convert(Matrix{Float64}, [x ones(length(x))]) \ convert(Vector{Float64}, y)
-
-  # make a line segment
-  regx = [ignorenan_minimum(x), ignorenan_maximum(x)]
-  regy = β * regx + α
-  regx, regy
-end
-
 function replace_image_with_heatmap(z::Array{T}) where T<:Colorant
    n, m = size(z)
-    # idx = 0
    colors = ColorGradient(vec(z))
    newz = reshape(range(0, stop=1, length=n*m), n, m)
    newz, colors
-    # newz = zeros(n, m)
-    # for i=1:n, j=1:m
-    #     push!(colors, T(z[i,j]...))
-    #     newz[i,j] = idx / (n*m-1)
-    #     idx += 1
-    # end
-    # newz, ColorGradient(colors)
 end

-function imageHack(plotattributes::AKW)
-    is_seriestype_supported(:heatmap) || error("Neither :image or :heatmap are supported!")
-    plotattributes[:seriestype] = :heatmap
-    plotattributes[:z], plotattributes[:fillcolor] = replace_image_with_heatmap(plotattributes[:z].surf)
-end
 # ---------------------------------------------------------------

 "Build line segments for plotting"
@@ -275,10 +147,10 @@ mapFuncOrFuncs(f::Function, u::AVec)        = map(f, u)
 mapFuncOrFuncs(fs::AVec{F}, u::AVec) where {F<:Function} = [map(f, u) for f in fs]

 for i in 2:4
-  @eval begin
-    unzip(v::Union{AVec{<:Tuple{Vararg{T,$i} where T}},
+    @eval begin
+        unzip(v::Union{AVec{<:Tuple{Vararg{T,$i} where T}},
                   AVec{<:GeometryTypes.Point{$i}}}) = $(Expr(:tuple, (:([t[$j] for t in v]) for j=1:i)...))
-  end
+    end
 end

 unzip(v::Union{AVec{<:GeometryTypes.Point{N}},
@@ -288,15 +160,13 @@ unzip(v::Union{AVec{<:GeometryTypes.Point},

 # given 2-element lims and a vector of data x, widen lims to account for the extrema of x
 function _expand_limits(lims, x)
-  try
-    e1, e2 = ignorenan_extrema(x)
-    lims[1] = NaNMath.min(lims[1], e1)
-    lims[2] = NaNMath.max(lims[2], e2)
-  # catch err
-  #   @warn(err)
-  catch
-  end
-  nothing
+    try
+        e1, e2 = ignorenan_extrema(x)
+        lims[1] = NaNMath.min(lims[1], e1)
+        lims[2] = NaNMath.max(lims[2], e2)
+    catch
+    end
+    nothing
 end

 expand_data(v, n::Integer) = [_cycle(v, i) for i=1:n]
@@ -314,21 +184,21 @@ function addOrReplace(v::AbstractVector, t::DataType, args...; kw...)
 end

 function replaceType(vec, val)
-  filter!(x -> !isa(x, typeof(val)), vec)
-  push!(vec, val)
+    filter!(x -> !isa(x, typeof(val)), vec)
+    push!(vec, val)
 end

 function replaceAlias!(plotattributes::AKW, k::Symbol, aliases::Dict{Symbol,Symbol})
-  if haskey(aliases, k)
-    plotattributes[aliases[k]] = pop_kw!(plotattributes, k)
-  end
+    if haskey(aliases, k)
+        plotattributes[aliases[k]] = pop_kw!(plotattributes, k)
+    end
 end

 function replaceAliases!(plotattributes::AKW, aliases::Dict{Symbol,Symbol})
-  ks = collect(keys(plotattributes))
-  for k in ks
-      replaceAlias!(plotattributes, k, aliases)
-  end
+    ks = collect(keys(plotattributes))
+    for k in ks
+        replaceAlias!(plotattributes, k, aliases)
+    end
 end

 createSegments(z) = collect(repeat(reshape(z,1,:),2,1))[2:end]
@@ -347,20 +217,20 @@ const _scale_base = Dict{Symbol, Real}(
 )

 function _heatmap_edges(v::AVec, isedges::Bool = false)
-  length(v) == 1 && return v[1] .+ [-0.5, 0.5]
-  if isedges return v end
-  # `isedges = true` means that v is a vector which already describes edges
-  # and does not need to be extended.
-  vmin, vmax = ignorenan_extrema(v)
-  extra_min = (v[2] - v[1]) / 2
-  extra_max = (v[end] - v[end - 1]) / 2
-  vcat(vmin-extra_min, 0.5 * (v[1:end-1] + v[2:end]), vmax+extra_max)
+    length(v) == 1 && return v[1] .+ [-0.5, 0.5]
+    if isedges return v end
+    # `isedges = true` means that v is a vector which already describes edges
+    # and does not need to be extended.
+    vmin, vmax = ignorenan_extrema(v)
+    extra_min = (v[2] - v[1]) / 2
+    extra_max = (v[end] - v[end - 1]) / 2
+    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, isedges::Bool = false)
-  f, invf = scalefunc(scale), invscalefunc(scale)
-  map(invf, _heatmap_edges(map(f,v), isedges))
+    f, invf = scalefunc(scale), invscalefunc(scale)
+    map(invf, _heatmap_edges(map(f,v), isedges))
 end

 function heatmap_edges(x::AVec, xscale::Symbol, y::AVec, yscale::Symbol, z_size::Tuple{Int, Int})
@@ -380,8 +250,8 @@ function heatmap_edges(x::AVec, xscale::Symbol, y::AVec, yscale::Symbol, z_size:
 end

 function is_uniformly_spaced(v; tol=1e-6)
-  dv = diff(v)
-  maximum(dv) - minimum(dv) < tol * mean(abs.(dv))
+    dv = diff(v)
+    maximum(dv) - minimum(dv) < tol * mean(abs.(dv))
 end

 function convert_to_polar(theta, r, r_extrema = ignorenan_extrema(r))
@@ -393,11 +263,11 @@ function convert_to_polar(theta, r, r_extrema = ignorenan_extrema(r))
 end

 function fakedata(sz...)
-  y = zeros(sz...)
-  for r in 2:size(y,1)
-    y[r,:] = 0.95 * vec(y[r-1,:]) + randn(size(y,2))
-  end
-  y
+    y = zeros(sz...)
+    for r in 2:size(y,1)
+        y[r,:] = 0.95 * vec(y[r-1,:]) + randn(size(y,2))
+    end
+    y
 end

 isijulia() = :IJulia in nameof.(collect(values(Base.loaded_modules)))
@@ -693,6 +563,10 @@ function get_markerstrokealpha(series, i::Int = 1)
    _cycle(series[:markerstrokealpha], i)
 end

+function get_markerstrokewidth(series, i::Int = 1)
+    _cycle(series[:markerstrokewidth], i)
+end
+
 function has_attribute_segments(series::Series)
    # we want to check if a series needs to be split into segments just because
    # of its attributes
@@ -706,6 +580,19 @@ function has_attribute_segments(series::Series)
    return any((typeof(series[attr]) <: AbstractVector && length(series[attr]) > 1) for attr in [:seriescolor, :seriesalpha, :linecolor, :linealpha, :linewidth, :linestyle, :fillcolor, :fillalpha, :markercolor, :markeralpha, :markerstrokecolor, :markerstrokealpha]) || any(typeof(series[attr]) <: AbstractArray for attr in (:line_z, :fill_z, :marker_z))
 end

+function get_aspect_ratio(sp)
+    aspect_ratio = sp[:aspect_ratio]
+    if aspect_ratio == :auto
+        aspect_ratio = :none
+        for series in series_list(sp)
+            if series[:seriestype] == :image
+                aspect_ratio = :equal
+            end
+        end
+    end
+    return aspect_ratio
+end
+
 # ---------------------------------------------------------------

 makekw(; kw...) = KW(kw)
@@ -748,119 +635,107 @@ function with(f::Function, args...; kw...)
        newdefs[:legend] = false
    end

-  # dict to store old and new keyword args for anything that changes
-  olddefs = KW()
-  for k in keys(newdefs)
-    olddefs[k] = default(k)
-  end
-
-  # save the backend
-  if CURRENT_BACKEND.sym == :none
-    _pick_default_backend()
-  end
-  oldbackend = CURRENT_BACKEND.sym
-
-  for arg in args
-
-    # change backend?
-    if arg in backends()
-      backend(arg)
+    # dict to store old and new keyword args for anything that changes
+    olddefs = KW()
+    for k in keys(newdefs)
+        olddefs[k] = default(k)
    end

-    # # TODO: generalize this strategy to allow args as much as possible
-    # #       as in:  with(:gr, :scatter, :legend, :grid) do; ...; end
-    # # TODO: can we generalize this enough to also do something similar in the plot commands??
+    # save the backend
+    if CURRENT_BACKEND.sym == :none
+        _pick_default_backend()
+    end
+    oldbackend = CURRENT_BACKEND.sym

-    # k = :seriestype
-    # if arg in _allTypes
-    #   olddefs[k] = default(k)
-    #   newdefs[k] = arg
-    # elseif haskey(_typeAliases, arg)
-    #   olddefs[k] = default(k)
-    #   newdefs[k] = _typeAliases[arg]
-    # end
+    for arg in args

-    k = :legend
-    if arg in (k, :leg)
-      olddefs[k] = default(k)
-      newdefs[k] = true
+        # change backend?
+        if arg in backends()
+            backend(arg)
+        end
+
+        # TODO: generalize this strategy to allow args as much as possible
+        #       as in:  with(:gr, :scatter, :legend, :grid) do; ...; end
+        # TODO: can we generalize this enough to also do something similar in the plot commands??
+
+        # k = :seriestype
+        # if arg in _allTypes
+        #     olddefs[k] = default(k)
+        #     newdefs[k] = arg
+        # elseif haskey(_typeAliases, arg)
+        #     olddefs[k] = default(k)
+        #     newdefs[k] = _typeAliases[arg]
+        # end
+
+        k = :legend
+        if arg in (k, :leg)
+            olddefs[k] = default(k)
+            newdefs[k] = true
+        end
+
+        k = :grid
+        if arg == k
+            olddefs[k] = default(k)
+            newdefs[k] = true
+        end
    end

-    k = :grid
-    if arg == k
-      olddefs[k] = default(k)
-      newdefs[k] = true
+    # display(olddefs)
+    # display(newdefs)
+
+    # now set all those defaults
+    default(; newdefs...)
+
+    # call the function
+    ret = f()
+
+    # put the defaults back
+    default(; olddefs...)
+
+    # revert the backend
+    if CURRENT_BACKEND.sym != oldbackend
+        backend(oldbackend)
    end
-  end

-  # display(olddefs)
-  # display(newdefs)
-
-  # now set all those defaults
-  default(; newdefs...)
-
-  # call the function
-  ret = f()
-
-  # put the defaults back
-  default(; olddefs...)
-
-  # revert the backend
-  if CURRENT_BACKEND.sym != oldbackend
-    backend(oldbackend)
-  end
-
-  # return the result of the function
-  ret
+    # return the result of the function
+    ret
 end

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

 mutable struct DebugMode
-  on::Bool
+    on::Bool
 end
 const _debugMode = DebugMode(false)

 function debugplots(on = true)
-  _debugMode.on = on
+    _debugMode.on = on
 end

 debugshow(io, x) = show(io, x)
 debugshow(io, x::AbstractArray) = print(io, summary(x))

 function dumpdict(io::IO, plotattributes::AKW, prefix = "", alwaysshow = false)
-  _debugMode.on || alwaysshow || return
-  println(io)
-  if prefix != ""
-    println(io, prefix, ":")
-  end
-  for k in sort(collect(keys(plotattributes)))
-    @printf("%14s: ", k)
-    debugshow(io, plotattributes[k])
+    _debugMode.on || alwaysshow || return
+    println(io)
+    if prefix != ""
+        println(io, prefix, ":")
+    end
+    for k in sort(collect(keys(plotattributes)))
+        @printf("%14s: ", k)
+        debugshow(io, plotattributes[k])
+        println(io)
+    end
    println(io)
-  end
-  println(io)
 end
 DD(io::IO, plotattributes::AKW, prefix = "") = dumpdict(io, plotattributes, prefix, true)
 DD(plotattributes::AKW, prefix = "") = DD(stdout, plotattributes, prefix)

 function dumpcallstack()
-  error()  # well... you wanted the stacktrace, didn't you?!?
+    error()  # well... you wanted the stacktrace, didn't you?!?
 end

-# ---------------------------------------------------------------
-# ---------------------------------------------------------------
-# used in updating an existing series
-
-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::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)
-
-
 # -------------------------------------------------------
 # NOTE: backends should implement the following methods to get/set the x/y/z data objects

@@ -904,33 +779,60 @@ Base.setindex!(plt::Plot, xy::Tuple{X,Y}, i::Integer) where {X,Y} = (setxy!(plt,
 Base.setindex!(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer) where {X,Y,Z} = (setxyz!(plt, xyz, i); plt)

 # -------------------------------------------------------
-
 # operate on individual series

-function push_x!(series::Series, xi)
-    push!(series[:x], xi)
-    expand_extrema!(series[:subplot][:xaxis], xi)
-    return
-end
-function push_y!(series::Series, yi)
-    push!(series[:y], yi)
-    expand_extrema!(series[:subplot][:yaxis], yi)
-    return
-end
-function push_z!(series::Series, zi)
-    push!(series[:z], zi)
-    expand_extrema!(series[:subplot][:zaxis], zi)
-    return
+Base.push!(series::Series, args...) = extend_series!(series, args...)
+Base.append!(series::Series, args...) = extend_series!(series, args...)
+
+function extend_series!(series::Series, yi)
+    y = extend_series_data!(series, yi, :y)
+    x = extend_to_length!(series[:x], length(y))
+    expand_extrema!(series[:subplot][:xaxis], x)
+    return x, y
 end

-function Base.push!(series::Series, yi)
-    x = extendSeriesByOne(series[:x])
-    expand_extrema!(series[:subplot][:xaxis], x[end])
-    series[:x] = x
-    push_y!(series, yi)
+function extend_series!(series::Series, xi, yi)
+    x = extend_series_data!(series, xi, :x)
+    y = extend_series_data!(series, yi, :y)
+    return x, y
+end
+
+function extend_series!(series::Series, xi, yi, zi)
+    x = extend_series_data!(series, xi, :x)
+    y = extend_series_data!(series, yi, :y)
+    z = extend_series_data!(series, zi, :z)
+    return x, y, z
+end
+
+function extend_series_data!(series::Series, v, letter)
+    copy_series!(series, letter)
+    d = extend_by_data!(series[letter], v)
+    expand_extrema!(series[:subplot][Symbol(letter, :axis)], d)
+    return d
+end
+
+function copy_series!(series, letter)
+    plt = series[:plot_object]
+    for s in plt.series_list
+        for l in (:x, :y, :z)
+            if s !== series || l !== letter
+                if s[l] === series[letter]
+                    series[letter] = copy(series[letter])
+                end
+            end
+        end
+    end
+end
+
+extend_to_length!(v::AbstractRange, n) = range(first(v), step = step(v), length = n)
+function extend_to_length!(v::AbstractVector, n)
+    vmax = isempty(v) ? 0 : ignorenan_maximum(v)
+    extend_by_data!(v, vmax .+ (1:(n - length(v))))
+end
+extend_by_data!(v::AbstractVector, x) = isimmutable(v) ? vcat(v, x) : push!(v, x)
+function extend_by_data!(v::AbstractVector, x::AbstractVector)
+    isimmutable(v) ? vcat(v, x) : append!(v, x)
 end
-Base.push!(series::Series, xi, yi) = (push_x!(series,xi); push_y!(series,yi))
-Base.push!(series::Series, xi, yi, zi) = (push_x!(series,xi); push_y!(series,yi); push_z!(series,zi))

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

@@ -964,59 +866,16 @@ end
 # -------------------------------------------------------
 # push/append for one series

-# push value to first series
-Base.push!(plt::Plot, y::Real) = push!(plt, 1, y)
-Base.push!(plt::Plot, x::Real, y::Real) = push!(plt, 1, x, y)
-Base.push!(plt::Plot, x::Real, y::Real, z::Real) = push!(plt, 1, x, y, z)
-
-# y only
-function Base.push!(plt::Plot, i::Integer, y::Real)
-    xdata, ydata = getxy(plt, i)
-    setxy!(plt, (extendSeriesByOne(xdata), extendSeriesData(ydata, y)), i)
-    plt
-end
-function Base.append!(plt::Plot, i::Integer, y::AVec)
-    xdata, ydata = plt[i]
-    if !isa(xdata, UnitRange{Int})
-        error("Expected x is a UnitRange since you're trying to push a y value only")
-    end
-    plt[i] = (extendSeriesByOne(xdata, length(y)), extendSeriesData(ydata, y))
-    plt
-end
-
-# x and y
-function Base.push!(plt::Plot, i::Integer, x::Real, y::Real)
-    xdata, ydata = getxy(plt, i)
-    setxy!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y)), i)
-    plt
-end
-function Base.append!(plt::Plot, i::Integer, x::AVec, y::AVec)
-    @assert length(x) == length(y)
-    xdata, ydata = getxy(plt, i)
-    setxy!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y)), i)
-    plt
-end
-
-# x, y, and z
-function Base.push!(plt::Plot, i::Integer, x::Real, y::Real, z::Real)
-    # @show i, x, y, z
-    xdata, ydata, zdata = getxyz(plt, i)
-    # @show xdata, ydata, zdata
-    setxyz!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y), extendSeriesData(zdata, z)), i)
-    plt
-end
-function Base.append!(plt::Plot, i::Integer, x::AVec, y::AVec, z::AVec)
-    @assert length(x) == length(y) == length(z)
-    xdata, ydata, zdata = getxyz(plt, i)
-    setxyz!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y), extendSeriesData(zdata, z)), i)
-    plt
-end
+Base.push!(plt::Plot, args::Real...) = push!(plt, 1, args...)
+Base.push!(plt::Plot, i::Integer, args::Real...) = push!(plt.series_list[i], args...)
+Base.append!(plt::Plot, args::AbstractVector...) = append!(plt, 1, args...)
+Base.append!(plt::Plot, i::Integer, args::Real...) = append!(plt.series_list[i], args...)

 # tuples
-Base.push!(plt::Plot, xy::Tuple{X,Y}) where {X,Y}                  = push!(plt, 1, xy...)
-Base.push!(plt::Plot, xyz::Tuple{X,Y,Z}) where {X,Y,Z}             = push!(plt, 1, xyz...)
-Base.push!(plt::Plot, i::Integer, xy::Tuple{X,Y}) where {X,Y}      = push!(plt, i, xy...)
-Base.push!(plt::Plot, i::Integer, xyz::Tuple{X,Y,Z}) where {X,Y,Z} = push!(plt, i, xyz...)
+Base.push!(plt::Plot, t::Tuple) = push!(plt, 1, t...)
+Base.push!(plt::Plot, i::Integer, t::Tuple) = push!(plt, i, t...)
+Base.append!(plt::Plot, t::Tuple) = append!(plt, 1, t...)
+Base.append!(plt::Plot, i::Integer, t::Tuple) = append!(plt, i, t...)

 # -------------------------------------------------------
 # push/append for all series
@@ -1158,7 +1017,7 @@ function convert_sci_unicode(label::AbstractString)
    for key in keys(unicode_dict)
        label = replace(label, key => unicode_dict[key])
    end
-    if occursin("10^{", label)
+    if occursin("×10^{", label)
        label = string(label, "}")
    end
    label
@@ -9,6 +9,7 @@ using LibGit2
 using GeometryTypes
 using Dates

+include("test_hdf5plots.jl")
 include("test_pgfplotsx.jl")

 reference_dir(args...) = joinpath(homedir(), ".julia", "dev", "PlotReferenceImages", args...)
@@ -42,7 +43,31 @@ include("imgcomp.jl")
 Random.seed!(1234)
 default(show=false, reuse=true)
 is_ci() = get(ENV, "CI", "false") == "true"
-img_tol = is_ci() ? 10e-2 : 10e-2
+img_tol = is_ci() ? 1e-2 : Sys.islinux() ? 1e-3 : 0.1
+
+## Uncomment the following lines to update reference images for different backends
+
+#=
+@testset "GR" begin
+    image_comparison_facts(:gr, tol=img_tol, skip = Plots._backend_skips[:gr])
+end
+
+plotly()
+@testset "Plotly" begin
+    image_comparison_facts(:plotly, tol=img_tol, skip = Plots._backend_skips[:plotlyjs])
+end
+
+pyplot()
+@testset "PyPlot" begin
+    image_comparison_facts(:pyplot, tol=img_tol, skip = Plots._backend_skips[:pyplot])
+end
+
+pgfplots()
+@testset "PGFPlots" begin
+    image_comparison_facts(:pgfplots, tol=img_tol, skip = Plots._backend_skips[:pgfplots])
+end
+=#
+##

@testset "Backends" begin

@@ -52,7 +77,9 @@ img_tol = is_ci() ? 10e-2 : 10e-2
        @test gr() == Plots.GRBackend()
        @test backend() == Plots.GRBackend()

-        @static if Sys.islinux()
+        @static if haskey(ENV, "APPVEYOR")
+            @info "Skipping GR image comparison tests on AppVeyor"
+        else
            image_comparison_facts(:gr, tol=img_tol, skip = Plots._backend_skips[:gr])
        end
    end
@@ -0,0 +1,21 @@
+using Plots, HDF5
+
+
+@testset "HDF5_Plots" begin
+	fname = "tmpplotsave.hdf5"
+	hdf5()
+
+	x = 1:10
+	psrc=plot(x, x.*x); #Create some plot
+	Plots.hdf5plot_write(psrc, fname)
+
+	#Read back file:
+	gr() #Choose some fast backend likely to work in test environment.
+	pread = Plots.hdf5plot_read(fname)
+
+	#Make sure data made it through:
+	@test psrc.subplots[1].series_list[1][:x] == pread.subplots[1].series_list[1][:x]
+	@test psrc.subplots[1].series_list[1][:y] == pread.subplots[1].series_list[1][:y]
+
+	#display(pread) #Don't display. Regression env might not support
+end #testset
@@ -1,166 +1,328 @@
 using Plots, Test
 pgfplotsx()

-function create_plot( args...; kwargs... )
-    pgfx_plot = plot(args...; kwargs...)
-    return pgfx_plot, repr("application/x-tex", pgfx_plot)
+function create_plot(args...; kwargs...)
+   pgfx_plot = plot(args...; kwargs...)
+   return pgfx_plot, repr("application/x-tex", pgfx_plot)
 end

-function create_plot!( args...; kwargs... )
-    pgfx_plot = plot!(args...; kwargs...)
-    return pgfx_plot, repr("application/x-tex", pgfx_plot)
+function create_plot!(args...; kwargs...)
+   pgfx_plot = plot!(args...; kwargs...)
+   return pgfx_plot, repr("application/x-tex", pgfx_plot)
 end

@testset "PGFPlotsX" begin
-    pgfx_plot = plot(1:5)
-    Plots._update_plot_object(pgfx_plot)
-    @test pgfx_plot.o.the_plot isa PGFPlotsX.TikzDocument
-    @test pgfx_plot.series_list[1].plotattributes[:quiver] === nothing
-    axis = Plots.pgfx_axes(pgfx_plot.o)[1]
-    @test count( x-> x isa PGFPlotsX.Plot, axis.contents ) == 1
-    @test !haskey(axis.contents[1].options.dict, "fill")
+   pgfx_plot = plot(1:5)
+   Plots._update_plot_object(pgfx_plot)
+   @test pgfx_plot.o.the_plot isa PGFPlotsX.TikzDocument
+   @test pgfx_plot.series_list[1].plotattributes[:quiver] === nothing
+   axis = Plots.pgfx_axes(pgfx_plot.o)[1]
+   @test count(x -> x isa PGFPlotsX.Plot, axis.contents) == 1
+   @test !haskey(axis.contents[1].options.dict, "fill")

-    @testset "3D docs example" begin
-        n = 100
-        ts = range(0, stop=8π, length=n)
-        x = ts .* map(cos, ts)
-        y = (0.1ts) .* map(sin, ts)
-        z = 1:n
-        pl = plot(x, y, z, zcolor=reverse(z), m=(10, 0.8, :blues, Plots.stroke(0)), leg=false, cbar=true, w=5)
-        pgfx_plot = plot!(pl, zeros(n), zeros(n), 1:n, w=10)
-        Plots._update_plot_object(pgfx_plot)
-        if @test_nowarn(haskey(Plots.pgfx_axes(pgfx_plot.o)[1].options.dict, "colorbar") == true)
-            @test Plots.pgfx_axes(pgfx_plot.o)[1]["colorbar"] === nothing
-        end
-     end # testset
-     @testset "Color docs example" begin
-        y = rand(100)
-        plot(0:10:100, rand(11, 4), lab="lines", w=3, palette=:grays, fill=0, α=0.6)
-        pl = scatter!(y, zcolor=abs.(y .- 0.5), m=(:heat, 0.8, Plots.stroke(1, :green)), ms=10 * abs.(y .- 0.5) .+ 4, lab="grad")
-        Plots._update_plot_object(pl)
-        axis = Plots.pgfx_axes(pl.o)[1]
-        @test count( x->x isa PGFPlotsX.LegendEntry, axis.contents ) == 5
-        @test count( x->x isa PGFPlotsX.Plot, axis.contents ) == 108 # each marker is its own plot, fillranges create 2 plot-objects
-        marker = axis.contents[15]
-        @test marker isa PGFPlotsX.Plot
-        @test marker.options["mark"] == "*"
-        @test marker.options["mark options"]["color"] == RGBA{Float64}( colorant"green", 0.8)
-        @test marker.options["mark options"]["line width"] == 1
-     end # testset
-     @testset "Plot in pieces" begin
-        plot(rand(100) / 3, reg=true, fill=(0, :green))
-        scatter!(rand(100), markersize=6, c=:orange)
-     end # testset
-     @testset "Marker types" begin
-        markers = filter((m->begin
-           m in Plots.supported_markers()
-           end), Plots._shape_keys)
-        markers = reshape(markers, 1, length(markers))
-        n = length(markers)
-        x = (range(0, stop=10, length=n + 2))[2:end - 1]
-        y = repeat(reshape(reverse(x), 1, :), n, 1)
-        scatter(x, y, m=(8, :auto), lab=map(string, markers), bg=:linen, xlim=(0, 10), ylim=(0, 10))
-     end # testset
-     @testset "Layout" begin
-        plot(Plots.fakedata(100, 10), layout=4, palette=[:grays :blues :heat :lightrainbow], bg_inside=[:orange :pink :darkblue :black])
-     end # testset
-     @testset "Polar plots" begin
-        Θ = range(0, stop=1.5π, length=100)
-        r = abs.(0.1 * randn(100) + sin.(3Θ))
-        plot(Θ, r, proj=:polar, m=2)
-     end # testset
-     @testset "Drawing shapes" begin
-        verts = [(-1.0, 1.0), (-1.28, 0.6), (-0.2, -1.4), (0.2, -1.4), (1.28, 0.6), (1.0, 1.0), (-1.0, 1.0), (-0.2, -0.6), (0.0, -0.2), (-0.4, 0.6), (1.28, 0.6), (0.2, -1.4), (-0.2, -1.4), (0.6, 0.2), (-0.2, 0.2), (0.0, -0.2), (0.2, 0.2), (-0.2, -0.6)]
-         x = 0.1:0.2:0.9
-         y = 0.7 * rand(5) .+ 0.15
-         plot(x, y, line=(3, :dash, :lightblue), marker=(Shape(verts), 30, RGBA(0, 0, 0, 0.2)), bg=:pink, fg=:darkblue, xlim=(0, 1), ylim=(0, 1), leg=false)
-     end # testset
-     @testset "Histogram 2D" begin
-        histogram2d(randn(10000), randn(10000), nbins=20)
-     end # testset
-     @testset "Heatmap-like" begin
-        xs = [string("x", i) for i = 1:10]
-        ys = [string("y", i) for i = 1:4]
-        z = float((1:4) * reshape(1:10, 1, :))
-        pgfx_plot = heatmap(xs, ys, z, aspect_ratio=1)
-        Plots._update_plot_object(pgfx_plot)
-        if @test_nowarn(haskey(Plots.pgfx_axes(pgfx_plot.o)[1].options.dict, "colorbar") == true)
-           @test Plots.pgfx_axes(pgfx_plot.o)[1]["colorbar"] === nothing
-           @test Plots.pgfx_axes(pgfx_plot.o)[1]["colormap name"] == "plots1"
-        end
+   @testset "Legends" begin
+      legends_plot =  plot( rand(5,2), lab = ["1" ""] )
+      scatter!(legends_plot, rand(5) )
+      Plots._update_plot_object(legends_plot)
+      axis_contents = Plots.pgfx_axes(legends_plot.o)[1].contents
+      leg_entries = filter( x -> x isa PGFPlotsX.LegendEntry, axis_contents )
+      series = filter( x -> x isa PGFPlotsX.Plot, axis_contents )
+      @test length(leg_entries) == 2
+      @test !haskey(series[1].options.dict, "forget plot")
+      @test haskey(series[2].options.dict, "forget plot")
+      @test !haskey(series[3].options.dict, "forget plot")
+   end # testset

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

-        u = ones(length(x))
-        v = cos.(x)
-        arrow_plot = plot( x, y, quiver = (u, v), arrow = true )
-        # TODO: could adjust limits to fit arrows if too long, but how?
-        # TODO: get latex available on CI
-        # mktempdir() do path
-        #    @test_nowarn savefig(arrow_plot, path*"arrow.pdf")
-        # end
-     end # testset
-     @testset "Annotations" begin
-        y = rand(10)
-        plot(y, annotations=(3, y[3], Plots.text("this is \\#3", :left)), leg=false)
-        annotate!([(5, y[5], Plots.text("this is \\#5", 16, :red, :center)), (10, y[10], Plots.text("this is \\#10", :right, 20, "courier"))])
-        annotation_plot = scatter!(range(2, stop=8, length=6), rand(6), marker=(50, 0.2, :orange), series_annotations=["series", "annotations", "map", "to", "series", Plots.text("data", :green)])
-        # mktempdir() do path
-        #    @test_nowarn savefig(annotation_plot, path*"annotation.pdf")
-        # end
-     end # testset
-     @testset "Ribbon" begin
-        aa = rand(10)
-        bb = rand(10)
-        cc = rand(10)
-        conf = [aa-cc bb-cc]
-        ribbon_plot = plot(collect(1:10),fill(1,10), ribbon=(conf[:,1],conf[:,2]))
-        Plots._update_plot_object(ribbon_plot)
-        axis = Plots.pgfx_axes(ribbon_plot.o)[1]
-        plots = filter(x->x isa PGFPlotsX.Plot, axis.contents)
-        @test length(plots) == 4
-        @test !haskey(plots[1].options.dict, "fill")
-        @test !haskey(plots[2].options.dict, "fill")
-        @test !haskey(plots[3].options.dict, "fill")
-        @test haskey(plots[4].options.dict, "fill")
-        @test ribbon_plot.o !== nothing
-        @test ribbon_plot.o.the_plot !== nothing
-     #    mktempdir() do path
-     #       @test_nowarn savefig(ribbon_plot, path*"ribbon.svg")
-     #    end
-     end # testset
-  end # testset
+      pgfx_plot = wireframe(xs, ys, z, aspect_ratio = 1)
+      # TODO: clims are wrong
+   end # testset
+   @testset "Contours" begin
+      x = 1:0.5:20
+      y = 1:0.5:10
+      f(x, y) = begin
+         (3x + y^2) * abs(sin(x) + cos(y))
+      end
+      X = repeat(reshape(x, 1, :), length(y), 1)
+      Y = repeat(y, 1, length(x))
+      Z = map(f, X, Y)
+      p2 = contour(x, y, Z)
+      p1 = contour(x, y, f, fill = true)
+      plot(p1, p2)
+      # TODO: colorbar for filled contours
+   end # testset
+   @testset "Varying colors" begin
+      t = range(0, stop = 1, length = 100)
+      θ = (6π) .* t
+      x = t .* cos.(θ)
+      y = t .* sin.(θ)
+      p1 = plot(x, y, line_z = t, linewidth = 3, legend = false)
+      p2 = scatter(
+         x,
+         y,
+         marker_z = ((x, y) -> begin
+            x + y
+         end),
+         color = :bluesreds,
+         legend = false,
+      )
+      plot(p1, p2)
+   end # testset
+   @testset "Framestyles" begin
+      scatter(
+         fill(randn(10), 6),
+         fill(randn(10), 6),
+         framestyle = [:box :semi :origin :zerolines :grid :none],
+         title = [":box" ":semi" ":origin" ":zerolines" ":grid" ":none"],
+         color = permutedims(1:6),
+         layout = 6,
+         label = "",
+         markerstrokewidth = 0,
+         ticks = -2:2,
+      )
+      # TODO: support :semi
+   end # testset
+   @testset "Quiver" begin
+      x = (-2pi):0.2:(2 * pi)
+      y = sin.(x)
+
+      u = ones(length(x))
+      v = cos.(x)
+      arrow_plot = plot(x, y, quiver = (u, v), arrow = true)
+      # TODO: could adjust limits to fit arrows if too long, but how?
+      # TODO: get latex available on CI
+      # mktempdir() do path
+      #    @test_nowarn savefig(arrow_plot, path*"arrow.pdf")
+      # end
+   end # testset
+   @testset "Annotations" begin
+      y = rand(10)
+      pgfx_plot = plot(
+         y,
+         annotations = (3, y[3], Plots.text("this is \\#3", :left)),
+         leg = false,
+      )
+      Plots._update_plot_object(pgfx_plot)
+      axis_content = Plots.pgfx_axes(pgfx_plot.o)[1].contents
+      nodes = filter(x -> !isa(x, PGFPlotsX.Plot), axis_content)
+      @test length(nodes) == 1
+      mktempdir() do path
+         file_path =joinpath(path,"annotations.tex")
+         @test_nowarn savefig(pgfx_plot, file_path)
+         open(file_path) do io
+            lines = readlines(io)
+            @test count(s -> occursin("node", s), lines) == 1
+         end
+      end
+      annotate!([
+         (5, y[5], Plots.text("this is \\#5", 16, :red, :center)),
+         (10, y[10], Plots.text("this is \\#10", :right, 20, "courier")),
+      ])
+      Plots._update_plot_object(pgfx_plot)
+      axis_content = Plots.pgfx_axes(pgfx_plot.o)[1].contents
+      nodes = filter(x -> !isa(x, PGFPlotsX.Plot), axis_content)
+      @test length(nodes) == 3
+      mktempdir() do path
+         file_path =joinpath(path,"annotations.tex")
+         @test_nowarn savefig(pgfx_plot, file_path)
+         open(file_path) do io
+            lines = readlines(io)
+            @test count(s -> occursin("node", s), lines) == 3
+         end
+      end
+      annotation_plot = scatter!(
+         range(2, stop = 8, length = 6),
+         rand(6),
+         marker = (50, 0.2, :orange),
+         series_annotations = [
+            "series",
+            "annotations",
+            "map",
+            "to",
+            "series",
+            Plots.text("data", :green),
+         ],
+      )
+      Plots._update_plot_object(annotation_plot)
+      axis_content = Plots.pgfx_axes(annotation_plot.o)[1].contents
+      nodes = filter(x -> !isa(x, PGFPlotsX.Plot), axis_content)
+      @test length(nodes) == 9
+      mktempdir() do path
+         file_path =joinpath(path,"annotations.tex")
+         @test_nowarn savefig(annotation_plot, file_path)
+         open(file_path) do io
+            lines = readlines(io)
+            @test count(s -> occursin("node", s), lines) == 9
+         end
+      end
+   end # testset
+   @testset "Ribbon" begin
+      aa = rand(10)
+      bb = rand(10)
+      cc = rand(10)
+      conf = [aa - cc bb - cc]
+      ribbon_plot =
+         plot(collect(1:10), fill(1, 10), ribbon = (conf[:, 1], conf[:, 2]))
+      Plots._update_plot_object(ribbon_plot)
+      axis = Plots.pgfx_axes(ribbon_plot.o)[1]
+      plots = filter(x -> x isa PGFPlotsX.Plot, axis.contents)
+      @test length(plots) == 4
+      @test !haskey(plots[1].options.dict, "fill")
+      @test !haskey(plots[2].options.dict, "fill")
+      @test !haskey(plots[3].options.dict, "fill")
+      @test haskey(plots[4].options.dict, "fill")
+      @test ribbon_plot.o !== nothing
+      @test ribbon_plot.o.the_plot !== nothing
+      #    mktempdir() do path
+      #       @test_nowarn savefig(ribbon_plot, path*"ribbon.svg")
+      #    end
+   end # testset
+end # testset