Add finalize_subplot!

_process_userrecipes now calls the correct _process_userrecipe

Project.toml

@@ -34,7 +34,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [compat]
 Contour = "0.5"
 FFMPEG = "0.2, 0.3"
-FixedPointNumbers = "0.6, 0.7"
+FixedPointNumbers = "0.6, 0.7, 0.8"
 GR = "0.46, 0.47, 0.48"
 GeometryTypes = "0.7, 0.8"
 JSON = "0.21"

src/Plots.jl

@@ -18,31 +18,13 @@ using Base.Meta
 import Showoff
 import StatsBase
 import JSON
-import RecipePipeline:
-    _process_userrecipe,
-    _process_plotrecipe,
-    _process_seriesrecipe,
-    _preprocess_args,
-    preprocessArgs!,
-    is_st_supported,
-    finalize_subplot!,
-    recipe_pipeline!,
-    _recipe_init!,
-    _recipe_after_user!,
-    _recipe_after_plot!,
-    _recipe_before_series!,
-    _recipe_finish!,
-    is_st_supported,
-    Formatted,
-    SliceIt,
-    FuncOrFuncs,
-    MaybeNumber,
-    MaybeString,
-    DataPoint,
-    trueOrAllTrue,
-    Surface,
-    AbstractSurface,
-    Volume
+import RecipePipeline: _process_userrecipe, _process_plotrecipe,
+                    _process_seriesrecipe, _preprocess_args,
+                    preprocessArgs!, is_st_supported,
+                    finalize_subplot!, recipe_pipeline!,
+                    _recipe_init!, _recipe_after_user!,
+                    _recipe_after_plot!, _recipe_before_series!,
+                    _recipe_finish!
 
 using Requires
 

src/components.jl

@@ -650,6 +650,23 @@ end
 
 # -----------------------------------------------------------------------
 
+abstract type AbstractSurface end
+
+"represents a contour or surface mesh"
+struct Surface{M<:AMat} <: AbstractSurface
+  surf::M
+end
+
+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...)
+end
+Base.copy(surf::Surface) = Surface(copy(surf.surf))
+Base.eltype(surf::Surface{T}) where {T} = eltype(T)
+
 function expand_extrema!(a::Axis, surf::Surface)
     ex = a[:extrema]
     for vi in surf.surf
@@ -669,6 +686,30 @@ end
 # # I don't want to clash with ValidatedNumerics, but this would be nice:
 # ..(a::T, b::T) = (a,b)
 
+struct Volume{T}
+    v::Array{T,3}
+    x_extents::Tuple{T,T}
+    y_extents::Tuple{T,T}
+    z_extents::Tuple{T,T}
+end
+
+default_extents(::Type{T}) where {T} = (zero(T), one(T))
+
+function Volume(v::Array{T,3},
+                x_extents = default_extents(T),
+                y_extents = default_extents(T),
+                z_extents = default_extents(T)) where T
+    Volume(v, x_extents, y_extents, z_extents)
+end
+
+Base.Array(vol::Volume) = vol.v
+for f in (:length, :size)
+  @eval Base.$f(vol::Volume, args...) = $f(vol.v, args...)
+end
+Base.copy(vol::Volume{T}) where {T} = Volume{T}(copy(vol.v), vol.x_extents, vol.y_extents, vol.z_extents)
+Base.eltype(vol::Volume{T}) where {T} = T
+
+# -----------------------------------------------------------------------
 
 # style is :open or :closed (for now)
 struct Arrow
@@ -730,6 +771,13 @@ function add_arrows(func::Function, x::AVec, y::AVec)
     end
 end
 
+# -----------------------------------------------------------------------
+
+"Represents data values with formatting that should apply to the tick labels."
+struct Formatted{T}
+    data::T
+    formatter::Function
+end
 
 # -----------------------------------------------------------------------
 "create a BezierCurve for plotting"

src/pipeline.jl

@@ -1,3 +1,4 @@
+
 function finalize_subplot!(plt::Plot, st, plotattributes::AKW)
     sp = _prepare_subplot(plt, plotattributes)
     _prepare_annotations(sp, plotattributes)
@@ -6,8 +7,7 @@ function finalize_subplot!(plt::Plot, st, plotattributes::AKW)
     _add_the_series(plt, sp, plotattributes)
 end
 
-# Override the RecipesPipeline `is_st_supported` for Plots.
-is_st_supported(::Plot, st::Symbol) = is_seriestype_supported(st)
+is_st_supported(st::Symbol) = is_seriestype_supported(st)
 # ------------------------------------------------------------------
 # preprocessing
 

src/plot.jl

@@ -182,11 +182,6 @@ function _recipe_after_plot!(plt::Plot, plotattributes::AKW, kw_list::Vector{KW}
     _subplot_setup(plt, plotattributes, kw_list)
 end
 
-function _recipe_after_user!(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
-    # don't allow something else to handle it
-    plotattributes[:smooth] = false
-end
-
 function _recipe_before_series!(plt::Plot, kw, kw_list)
     sp::Subplot = kw[:subplot]
 

src/series.jl

@@ -1,4 +1,71 @@
 
+
+# create a new "build_series_args" which converts all inputs into xs = Any[xitems], ys = Any[yitems].
+# Special handling for: no args, xmin/xmax, parametric, dataframes
+# Then once inputs have been converted, build the series args, map functions, etc.
+# This should cut down on boilerplate code and allow more focused dispatch on type
+# note: returns meta information... mainly for use with automatic labeling from DataFrames for now
+
+const FuncOrFuncs{F} = Union{F, Vector{F}, Matrix{F}}
+const MaybeNumber = Union{Number, Missing}
+const MaybeString = Union{AbstractString, Missing}
+const DataPoint = Union{MaybeNumber, MaybeString}
+
+prepareSeriesData(x) = error("Cannot convert $(typeof(x)) to series data for plotting")
+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(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)]
+
+# fixed number of blank series
+convertToAnyVector(n::Integer, plotattributes) = Any[zeros(0) for i in 1:n]
+
+# vector of data points is a single series
+convertToAnyVector(v::AVec{<:DataPoint}, plotattributes) = Any[prepareSeriesData(v)]
+
+# list of things (maybe other vectors, functions, or something else)
+function convertToAnyVector(v::AVec, plotattributes)
+    if all(x -> x isa MaybeNumber, v)
+        convertToAnyVector(Vector{MaybeNumber}(v), plotattributes)
+    elseif all(x -> x isa MaybeString, v)
+        convertToAnyVector(Vector{MaybeString}(v), plotattributes)
+    else
+        vcat((convertToAnyVector(vi, plotattributes) for vi in v)...)
+    end
+end
+
+# Matrix is split into columns
+function convertToAnyVector(v::AMat{<:DataPoint}, plotattributes)
+    if all3D(plotattributes)
+        Any[prepareSeriesData(Surface(v))]
+    else
+        Any[prepareSeriesData(v[:, i]) for i in axes(v, 2)]
+    end
+end
+
+# --------------------------------------------------------------------
+# Fillranges & ribbons
+
+
+process_fillrange(range::Number, plotattributes) = [range]
+process_fillrange(range, plotattributes) = convertToAnyVector(range, plotattributes)
+
+process_ribbon(ribbon::Number, plotattributes) = [ribbon]
+process_ribbon(ribbon, plotattributes) = convertToAnyVector(ribbon, plotattributes)
+# ribbon as a tuple: (lower_ribbons, upper_ribbons)
+process_ribbon(ribbon::Tuple{Any,Any}, plotattributes) = collect(zip(convertToAnyVector(ribbon[1], plotattributes),
+                                                     convertToAnyVector(ribbon[2], plotattributes)))
+
+
 # --------------------------------------------------------------------
 
 # TODO: can we avoid the copy here?  one error that crops up is that mapping functions over the same array
@@ -40,6 +107,70 @@ 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
 
+# ensure we dispatch to the slicer
+struct SliceIt end
+
+# the catch-all recipes
+@recipe function f(::Type{SliceIt}, x, y, z)
+
+    # handle data with formatting attached
+    if typeof(x) <: Formatted
+        xformatter := x.formatter
+        x = x.data
+    end
+    if typeof(y) <: Formatted
+        yformatter := y.formatter
+        y = y.data
+    end
+    if typeof(z) <: Formatted
+        zformatter := z.formatter
+        z = z.data
+    end
+
+    xs = convertToAnyVector(x, plotattributes)
+    ys = convertToAnyVector(y, plotattributes)
+    zs = convertToAnyVector(z, plotattributes)
+
+
+    fr = pop!(plotattributes, :fillrange, nothing)
+    fillranges = process_fillrange(fr, plotattributes)
+    mf = length(fillranges)
+
+    rib = pop!(plotattributes, :ribbon, nothing)
+    ribbons = process_ribbon(rib, plotattributes)
+    mr = length(ribbons)
+
+    # @show zs
+
+    mx = length(xs)
+    my = length(ys)
+    mz = length(zs)
+    if mx > 0 && my > 0 && mz > 0
+        for i in 1:max(mx, my, mz)
+            # add a new series
+            di = copy(plotattributes)
+            xi, yi, zi = xs[mod1(i,mx)], ys[mod1(i,my)], zs[mod1(i,mz)]
+            di[:x], di[:y], di[:z] = compute_xyz(xi, yi, zi)
+
+            # handle fillrange
+            fr = fillranges[mod1(i,mf)]
+            di[:fillrange] = isa(fr, Function) ? map(fr, di[:x]) : fr
+
+            # handle ribbons
+            rib = ribbons[mod1(i,mr)]
+            di[:ribbon] = isa(rib, Function) ? map(rib, di[:x]) : rib
+
+            push!(series_list, RecipeData(di, ()))
+        end
+    end
+    nothing  # don't add a series for the main block
+end
+
+# this is the default "type recipe"... just pass the object through
+@recipe f(::Type{T}, v::T) where {T<:Any} = 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]
 
@@ -147,6 +278,7 @@ end
 
 @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))
 
 # 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}

src/utils.jl

@@ -717,6 +717,9 @@ makekw(; kw...) = KW(kw)
 wraptuple(x::Tuple) = x
 wraptuple(x) = (x,)
 
+trueOrAllTrue(f::Function, x::AbstractArray) = all(f, x)
+trueOrAllTrue(f::Function, x) = f(x)
+
 allLineTypes(arg)   = trueOrAllTrue(a -> get(_typeAliases, a, a) in _allTypes, arg)
 allStyles(arg)      = trueOrAllTrue(a -> get(_styleAliases, a, a) in _allStyles, arg)
 allShapes(arg)      = trueOrAllTrue(a -> is_marker_supported(get(_markerAliases, a, a)), arg) ||

test/test_pgfplotsx.jl

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