0.6 fixes

inline docs for plot
starting no-conditional reorg; replaced FixedSizeArrays with StaticArrays
2017-02-21 12:10:38 -05:00 · 2017-01-18 13:45:02 -05:00 · 2017-01-18 12:08:20 -05:00
67 changed files with 9168 additions and 12908 deletions
@@ -1,24 +0,0 @@
-name: CompatHelper
-
-on:
-  schedule:
-    - cron: '00 * * * *'
-
-jobs:
-  CompatHelper:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        julia-version: [1.2.0]
-        julia-arch: [x86]
-        os: [ubuntu-latest]
-    steps:
-      - uses: julia-actions/setup-julia@latest
-        with:
-          version: ${{ matrix.julia-version }}
-      - name: Pkg.add("CompatHelper")
-        run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
-      - name: CompatHelper.main()
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: julia -e 'using CompatHelper; CompatHelper.main()'
@@ -1,11 +0,0 @@
-name: TagBot
-on:
-  schedule:
-    - cron: 0 * * * *
-jobs:
-  TagBot:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: JuliaRegistries/TagBot@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
@@ -5,6 +5,3 @@
 examples/.ipynb_checkpoints/*
 examples/meetup/.ipynb_checkpoints/*
 deps/plotly-latest.min.js
-deps/build.log
-deps/deps.jl
-Manifest.toml
@@ -4,35 +4,56 @@ os:
  - linux
  # - osx
 julia:
-  - 1
-  - 1.3
-  - nightly
-
+  - 0.5
 matrix:
  allow_failures:
-  - julia: nightly
+    - julia: nightly

-addons:
-  apt:
-    packages:
-      - at-spi2-core
-      - libgtk-3-dev
-      - xauth
-      - xvfb
+# # before install:
+# #   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
+# #   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install wkhtmltopdf; fi

-cache:
-  directories:
-  - $HOME/.julia/artifacts
+# ref: http://askubuntu.com/a/556672 for the wkhtmltopdf apt repository info

 sudo: required
 before_install:
  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pwd ; fi
  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./test/install_wkhtmltoimage.sh ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  sudo add-apt-repository -y ppa:pov/wkhtmltopdf  ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  sudo apt-get -qq update                      ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  sudo apt-get install -y wkhtmltopdf          ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  wkhtmltopdf -V                               ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  wkhtmltoimage -V                             ; fi
+#   echo 'exec xvfb-run -a -s "-screen 0 640x480x16" wkhtmltopdf "$@"' | sudo tee /usr/local/bin/wkhtmltopdf.sh >/dev/null
+# sudo chmod a+x /usr/local/bin/wkhtmltopdf.sh
+
+# # borrowed from Blink.jl's travis file
+# matrix:
+#   include:
+#     - os: linux
+#       julia: 0.4
+#       env: TESTCMD="xvfb-run julia"
+#     - os: osx
+#       julia: 0.4
+#       env: TESTCMD="julia"
+
+

 notifications:
  email: true
-
+# uncomment the following lines to override the default test script
 script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
-  - $TESTCMD -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
+ - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+ - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots")'
+ - julia test/travis_commands.jl
+ # - julia -e 'Pkg.clone("ImageMagick"); Pkg.build("ImageMagick")'
+ # - julia -e 'Pkg.clone("GR"); Pkg.build("GR")'
+ # # - julia -e 'Pkg.clone("https://github.com/tbreloff/ImageMagick.jl.git"); Pkg.checkout("ImageMagick","tb_write"); Pkg.build("ImageMagick")'
+ # - julia -e 'Pkg.clone("https://github.com/tbreloff/ExamplePlots.jl.git");'
+ # # - julia -e 'Pkg.clone("https://github.com/JunoLab/Blink.jl.git"); Pkg.build("Blink"); import Blink; Blink.AtomShell.install()'
+ # # - julia -e 'Pkg.clone("https://github.com/spencerlyon2/PlotlyJS.jl.git")'
+ # - julia -e 'ENV["PYTHON"] = ""; Pkg.add("PyPlot"); Pkg.build("PyPlot")'
+ #
+ # # - $TESTCMD -e 'Pkg.test("Plots"; coverage=false)'
+ # - julia -e 'Pkg.test("Plots"; coverage=false)'
+ # # - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
@@ -3,439 +3,21 @@

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

-## (current master)
+- All new development should target 0.9!
+- Minor version 0.8 is the last one to support Julia 0.4!!
+	- Critical bugfixes only
+    - `backports` branch is for Julia 0.4

-## 0.28.3
- support generalized array interface
- save to pdf, svg and eps in plotlyjs
- fix for clims in line_z
- optimize heatmap logic in gr
-
-## 0.26.3
- fix `vline` with dates
- fix PyPlot logscale bug
- avoid annotation clipping for PyPlot
- allow plotting of Any vectors and 3D plotting again in convertToAnyVector
- specify legend title font in GR and PyPlot
- delete `pushtomaster.sh`
- use `=== nothing`
-
-## 0.26.2
- improve empty animation build error
- fix GR axis flip for heatmaps and images
- fix ribbons specified as tuples
- add Char recipe
- fix Plotly plots with single-element series
- rewrite PlotlyJS backend
-
-## 0.26.1
- handle `Char`s as input data
- fix html saving for Plotly
- expand ~ in paths on UNIX systems
- convertToAnyVector clean-up
- fix color_palette grouping issue
-
-## 0.26.0
- use FFMPEG.jl
- add missing method for convertToAnyVector
-
-## 0.25.3
- add areaplot
- allow missing in z_color arguments
- more general tuple recipe
- stephist logscale improvements
-
-## 0.25.2
- improvements to handle missings
- pyplot: allow setting the color gradient for z values
- document :colorbar_entry
- limit number of automatic bins
- fix ENV['PLOTS_DEFAULT_BACKEND']
- don't let aspect_ratio impact subplot size
- implement arrowstyle for GR
- fix bug in plotly_convert_to_datetime
- improve missing support
- gr: polar heatmaps
- make sure show returns nothing
-
-## 0.25.1
- fix gr_display
-
-## 0.25.0
- Replace StaticArrays with GeometryTypes
- Contour fixes for GR
-
-## 0.24.0
- Update to the new PyCall and PyPlot API
- fix drawing of ticks
- fix y label position with GR
-
-## 0.23.2
- pyplot fixes
- Add option :tex_output_standalone to set the 'include_preamble' argument in the PGFPlots backend.
- fix ticks
- support plotly json mime
- fix image axis limits
- default to radius 0 at center for polar plots
-
-## 0.23.1
- slightly faster load time
- fixed errant MethodError
- fix bar plots with unicodeplots
- better colorbars for contour
- add volume seriestype for GR
- fix passing a tuple to custom ticks
- add vline to pgfplots
- add tex output for pyplot
- better 3d axis labels for GR
-
-## 0.23.0
- compatible with StatPlots -> StatsPlots name shift
- fix histograms for vectors with NaN and Inf
- change gif behaviour (remove cache-busting)
- improved docstrings for shorthands functions
- fix font rotation for pyplot
- fix greyscale images for pyplot
- clamp greyscale images with values outside 0,1
- support keyword argument for font options
- allow vector of markers for pyplot scatter
-
-## 0.22.5
- improve behaviour of plotlyjs backend
-
-## 0.22.4
- Add support for discrete contourf plots with GR
-
-## 0.22.3
- Fix the `showtheme` function
-
-## 0.22.2
- Allow annotations to accept a Tuple instead of the result of a text call (making it possible to specify font characteristics in recipes). E.g. `annotations = (2, 4, ("test", :right, 8, :red))` is the same as `annotations = (2, 4, text("test", :right, 8, :red))`
-
-## 0.22.1
- push PlotsDisplay just after REPLDisplay
-
-## 0.22.0
- deprecate GLVisualize
- allow 1-row and 1-column heatmaps
- add portfoliodecomposition recipe from PlotRecipes
- solve Shape bug
- simplify PyPlot backend installation
- fix wireframe bug in PyPlot
- fix color bug in PyPlot
- minor bug fixes in gr and pyplot
-
-## 0.21.0
- Compatibility with StaticArrays 0.9.0
- Up GR min version to 0.35
- fix :mirror
-
-## 0.20.6
- fixes for PlotDocs.jl
- fix gr axis color argument
- Shapes for inspectdr
- don't load plotly js file by default
-
-## 0.20.5
- fix precompilation issue when depending on Plots
-
-## 0.20.4
- honour `html_output_format` in Juno
-
-## 0.20.3
- implement guide position in gr, pyplot and pgfplots
- inspectdr fixes
- default appveyor
- rudimentary missings support
- deprecation fixes for PGFPlots
-
-## 0.20.0
-Many updates, min julia 1.0
- change display type to use PlotsDisplay (fixes Juno integration)
- change all internal uses of `d` to `plotattributes` (no user change)
- change spy implementation to use `scatter` not `heatmap`
- sort x axes when passing a vector of strings as x
- improve performance of marker_z
- update CI to 1.0
- minor depwarn ifixes
- only draw one colorbar with GR
- add colorbar_title to GR and pgfplots
- fix savefig with latexstrings for PyPlot
- fix NamedTuple integration
- don't export `P2` and `P3`
- make it possible to use 2-argument function as argument to marker_z
- make `plotattr` work again
-
-## 0.19.3
- fix some julia 0.7 deprecations
- fix 32-bit OS functionality
-
-## 0.19.2
- several small fixes for 1.0 compatibility
-
-## 0.19.1
- don't broadcast plot_color
-
-## 0.19.0
- Refactor conditional loading to use Requires
- Many fixes for 1.0 compatibility
-
-## 0.18.0
- update minor version to 0.7
-
-## 0.17.4
- fix thickness_scaling for pyplot
-
-## 0.17.3
- Log-scale heatmap edge computation
- Fix size and dpi for GR and PyPlot
- Fix fillrange with line segments on PyPlot and Plotly
- fix flip for heatmap and image on GR
- New attributes for PGFPlots
- Widen axes for most series types and log scales
- Plotly: fix log scale with no ticks
- Fix axis flip on Plotly
- Fix hover and zcolor interaction in Plotly
- WebIO integration for PlotlyJS backend
-
-## 0.17.2
- fix single subplot in plotly
- implement `(xyz)lims = :round`
- PyPlot: fix bg_legend = invisible()
- set fallback tick specification for axes with discrete values
- restructure of show methods
-
-## 0.17.1
- Fix contour for PGFPlots
- 32Bit fix: Int64 -> Int
- Make series of shapes and segments toggle together in Plotly(JS)
- Fix marker arguments
- Fix processing order of series recipes
- Fix Plotly(JS) ribbon
- Contour plots with x,y in grid form on PyPlot
-
-## 0.17.0
- Add GR dependency to make it the default backend
- Improve histogram2d bin estimation
- Allow vector arguments for certain series attributes and support line_z and fill_z on GR, PyPlot, Plotly(JS) and PGFPlots
- Automatic scientific notation for tick labels
- Allow to set the theme in PLOTS_DEFAULTS
- Implement plots_heatmap seriestype providing a Plots recipe for heatmaps
-
-## 0.16.0
- fix 3D plotting in PyPlot
- Infinite objects
-
-## 0.15.1
-
- fix scientific notation for labels in GR
- fix labels with logscale
- fix image cropping with GR
- fix grouping of annotations
- fix annotations in Plotly
- allow saving notebook with plots as pdf from IJulia
- fix fillrange and ribbon for step recipes
- implement native ticks that respond to zoom
- fix bar plot with one bar
- contour labels and colorbar fixes
- interactive linked axis for PyPlot
- add `NamedTuple` syntax to group with named legend
- use bar recipe in Plotly
- implement categorical ticks
-
-## 0.15.0
-
- improve resolution of png output of GR with savefig()
- add check for ticks=nothing
- allow transparency in heatmaps
- fix line_z for GR
- fix legendcolor for pyplot
- fix pyplot ignoring alpha values of images
- don't let `abline!` change subplot limits
- update showtheme recipe
-
-## 0.14.2
-
- fix plotly bar lines bug
- allow passing multiple series to `ribbon`
- add a new example for `line_z`
-
-## 0.14.1
-
- Add linestyle argument to the legend
- Plotly: bar_width and stroke_width support for bar plots
- abline! does not change axis limits
- Fix default log scale ticks in GR backend
- Use the :fontsize keys so the scalefontsizes command works
- Prepare support for new PlotTheme type in PlotThemes
-
-## 0.14.0
-
- remove use of imagemagick; saving gifs now requires ffmpeg
- improvements to ffmpeg gif quality and speed
- overhaul of fonts, allows setting fonts in recipes and with magic arguments
- added `camera` attribute to control camera position for 3d plots
- added `showaxis` attribute to control which axes to display
- improvements of polar plots axes, and better backend consistency
- changed the 'spy' recipe back to using heatmap
- added `scatterpath` seriestype
- allow plotlyjs to save svg
- add `reset_defaults()` function to reset plot defaults
- update syntax to 0.6
- make `fill = true` fill to 0 rather than to 1
- use new `@df` syntax in StatsPlots examples
- allow changing the color of legend box
- implement `title_location` for gr
- add `hline` marker to pgfplots - fixes errorbars
- pyplot legends now show marker types
- pyplot colorbars take font style from y axis
- pyplot tickmarks color the same as axis color
- allow setting linewidth for contour in gr
- allow legend to be outside plot area for pgfplots
- expand axis extrema for heatmap
- extendg grid lines to axis limits
- fix `line_z` for pyplot and gr
- fixed colorbar problem for flipped axes with gr
- fix marker_z for 3d plots in gr
- fix `weights` functionality for histograms
- fix gr annotations with colorbar
- fix aspect ratio in gr
- fix "hidden window" problem after savefig in gr
- fix pgfplots logscale ticks error
- fix pgfplots legends symbols
- fix axis linking for plotlyjs
- fix plotting of grayscale images
-
-## 0.13.1
-
- fix a bug when passing a vector of functions with no bounds (e.g. `plot([sin, cos])`)
- export `pct` and `px` from Plots.PlotMeasures
-
-## 0.13.0
-
- support `plotattributes` rather than `d` in recipes
- no longer export `w`, `h` and names from Measures.jl; use `using Plots.PlotMeasures` to get these names back
- `bar_width` now depends on the minimum distance between bars, not the mean
- better automatic x axis limits for plotting Functions
- `tick_direction` attribute now allows ticks to be on the inside of the plot border
- removed a bug where `p1 = plot(randn(10)); plot(p1, p2)` made `display(p1)` impossible
- allow `plot([])` to generate an empty plot
- add `origin` framestyle
- ensure finite bin number on histograms with only one unique value
- better automatic histogram bins for 2d histograms
- more informative error message on passing unsupported seriestype in a recipe
- allow grouping in user recipes
- GR now has `line_z` and `fill_z` attributes for determining the color of shapes and lines
- change GR default view angle for 3D plots to match that of PyPlot
- fix `clims` on GR
- fix `marker_z` for plotly backend
- implement `framestyle` for plotly
- fix logscale bug error for values < 1e-16 on pyplot
- fix an issue on pyplot where >1 colorbar would be shown if there was >1 series
- fix `writemime` for eps
-
-## 0.12.4
-
- added a new `framestyle` argument with choices: :box, :semi, :axes, :grid and :none
- changed the default bar width to 0.8
- added working ribbon to plotly backend
- ensure that automatic ticks always generate 4 to 8 ticks
- group now groups keyword arguments of the same length as the input
- allow passing DateTime objects as ticks
- allow specifying the number of ticks as an integre
- fix bug on errorbars in gr
- fixed some but not all world age issues
- better margin with room for text
- added a `match` option for linecolor
- better error message un unsupported series types
- add a 'stride' keyword for the pyplot backend
-
-## 0.12.3
-
- new grid line style defaults
- `grid` is now an axis attribute and a magic argument: it is now possible to modify the grid line style, alpha and line width
- Enforce plot order in user recipes
- import `plot!` from RecipesBase
- GR no longer automatically handles _ and ^ in texts
- fix GR colorbar for scatter plots
-
-#### 0.12.2
-
- fix an issue with Juno/PlotlyJS compatibility on new installations
- fix markers not showing up in seriesrecipes using :scatter
- don't use pywrap in the pyplot backend
- improve the bottom margin for the gr backend
-
-#### 0.12.1
-
- fix deprecation warnings
- switch from FixedSizeArrays to StaticArrays.FixedSizeArrays
- drop FactCheck in tests
- remove julia 0.5 compliant uses of transpose operator
- fix GR heatmap bugs
- fix GR guide padding
- improve legend markers in GR
- add surface alpha for Plotly(JS)
- add fillrange to Plotly(JS)
- allow usage of Matplotlib 1.5 with PyPlot
- fix GLVisualize for julia 0.6
- conform to changes in InspectDR
-
-#### 0.12.0
-
- 0.6 only
-
-#### 0.11.3
-
- add HDF5 backend
- GR replaces PyPlot as first-choice backend
- support for legend position in GR
- smaller markers in GR
- better viewport size in GR
- fix glvisualize support
- remove bug with three-argument method of `text`
- `legendtitle` attribute added
- add test for `spy`
-
-#### 0.11.0
-
- julia 0.6 compatibility
- matplotlib 2.0 compatibility
- add inspectdr backend
- improved histogram functionality:
- added a `:stephist` and `:scatterhist` series type as well as ``:barhist` (the default)
- support for log scale axes with histograms
- support for plotting `StatsBase.Histogram`
- allowing bins to be specified as `:sturges`, `:rice`, `:scott` or :fd
- allow `normalization` to be specified as :density (for unequal bins) or :pdf (sum to 1)
- add a `plotattr` function to access documentation for Plots attribute
- add `fill_z` attribute for pyplot
- add colorbar_title to plotlyjs
- enable standalone window for plotlyjs
- improved support for pgfplots, ticks rotation, clims, series_annotations
- restore colorbars for GR
- better axis labels for heatmap in GR
- better marker sizes in GR
- fix color representation in GR
- update GR legend
- fix image bug on GR
- fix glvisualize dependencies
- set dotted grid lines for pyplot
- several improvements to inspectdr
- improved tick positions for TimeType x axes
- support for improved color gradient capability in PlotUtils
- add a showlibrary recipe to display color libraries
- add a showgradient recipe to display color gradients
- add `vectorfield` as an alias for `quiver`
- use `PlotUtils.adaptedgrid` for functions
+---

+## 0.9 (current master/dev)

 #### 0.9.5

 - added dependency on PlotThemes
 - set_theme --> theme
 - remove Compat from REQUIRE
- warning for DataFrames without StatsPlots
+- warning for DataFrames without StatPlots
 - closeall exported and implemented for gr/pyplot
 - fix DateTime recipe
 - reset theme with theme(:none)
@@ -557,8 +139,8 @@ Many updates, min julia 1.0
 #### 0.8.0

 - added dependency on PlotUtils
- BREAKING: removed DataFrames support (now in StatsPlots.jl)
- BREAKING: removed boxplot/violin/density recipes (now in StatsPlots.jl)
+- BREAKING: removed DataFrames support (now in StatPlots.jl)
+- BREAKING: removed boxplot/violin/density recipes (now in StatPlots.jl)
 - GR:
    - inline iterm2 support
    - trisurface support
@@ -749,7 +331,7 @@ Many updates, min julia 1.0
 - z-axis keywords
 - 3D indexing overhaul: `push!`, `append!` support
 - matplotlib colormap constants (`:inferno` is the new default colormap for Plots)
- `const KW = Dict{Symbol,Any}` used in place of splatting in many places
+- `typealias KW Dict{Symbol,Any}` used in place of splatting in many places
 - png generation for plotly backend using wkhtmltoimage
 - `normalize` and `weights` keywords
 - background/foreground subcategories for fine-tuning of looks
@@ -1,69 +0,0 @@
-name = "Plots"
-uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-author = ["Tom Breloff (@tbreloff)"]
-version = "0.29.6"
-
-[deps]
-Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
-Contour = "d38c429a-6771-53c6-b99e-75d170b6e991"
-Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
-FFMPEG = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
-FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
-GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
-JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
-NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
-PlotThemes = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a"
-PlotUtils = "995b91a9-d308-5afd-9ec6-746e21dbc043"
-Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
-Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
-Requires = "ae029012-a4dd-5104-9daa-d747884805df"
-Showoff = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
-SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
-Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
-StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
-
-[compat]
-Contour = "0.5"
-FFMPEG = "0.2, 0.3"
-FixedPointNumbers = "0.6, 0.7, 0.8"
-GR = "0.46, 0.47"
-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"
-Reexport = "0.2"
-Requires = "0.5, 1.0"
-Showoff = "0.3.1"
-StatsBase = "0.32"
-julia = "1"
-
-[extras]
-FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
-Gtk = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
-ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
-Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
-LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
-LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
-PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925"
-RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
-Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
-VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"
-
-[targets]
-test = ["FileIO", "GeometryTypes", "Gtk", "ImageMagick", "Images", "LaTeXStrings", "LibGit2", "PGFPlotsX", "Random", "RDatasets", "StatsPlots", "Test", "UnicodePlots", "VisualRegressionTests"]
@@ -1,29 +1,13 @@
 # Plots

-[travis-img]: https://img.shields.io/travis/JuliaPlots/Plots.jl?logo=travis
-[travis-url]: https://travis-ci.org/JuliaPlots/Plots.jl
+[![Build Status](https://travis-ci.org/tbreloff/Plots.jl.svg?branch=master)](https://travis-ci.org/tbreloff/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)
+<!-- [![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) -->

-[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]
-
-#### Created by Tom Breloff (@tbreloff)
-
-#### Maintained by the [JuliaPlots members](https://github.com/orgs/JuliaPlots/people)
+#### Author: Thomas Breloff (@tbreloff)

 Plots is a plotting API and toolset.  My goals with the package are:

@@ -34,3 +18,5 @@ Plots is a plotting API and toolset.  My goals with the package are:
 - **Consistent**.  Don't commit to one graphics package, use the same code everywhere.
 - **Lightweight**.  Very few dependencies.
 - **Smart**. Attempts to figure out what you **want** it to do... not just what you **tell** it.
+
+View the [full documentation](http://juliaplots.github.io).
@@ -0,0 +1,9 @@
+julia 0.5
+
+RecipesBase
+PlotUtils
+PlotThemes
+Reexport
+Measures
+Showoff
+StaticArrays
@@ -1,27 +1,9 @@
 environment:
  matrix:
-  # - julia_version: 0.7
-  - julia_version: 1
-  - julia_version: 1.3
-  - julia_version: nightly
-
-platform:
-  - x86 # 32-bit
-  - x64 # 64-bit
-
-# # Uncomment the following lines to allow failures on nightly julia
-# # (tests will run but not make your overall status red)
-matrix:
-  allow_failures:
-  - julia_version: nightly
-
-branches:
-  only:
-    - master
-    - /release-.*/
-
-cache:
-  - '%USERPROFILE%\.julia\artifacts'
+  - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
+  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
+  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"

 notifications:
  - provider: Email
@@ -30,18 +12,21 @@ notifications:
    on_build_status_changed: false

 install:
-  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
+# If there's a newer build queued for the same PR, cancel this one
+  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+        throw "There are newer queued builds for this pull request, failing early." }
+# Download most recent Julia Windows binary
+  - ps: (new-object net.webclient).DownloadFile($("http://s3.amazonaws.com/"+$env:JULIAVERSION), "C:\projects\julia-binary.exe")
+# Run installer silently, output to C:\projects\julia
+  - C:\projects\julia-binary.exe /S /D=C:\projects\julia

 build_script:
-  - echo "%JL_BUILD_SCRIPT%"
-  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
+# Need to convert from shallow to complete for Pkg.clone to work
+  - IF EXIST .git\shallow (git fetch --unshallow)
+  - C:\projects\julia\bin\julia -e "versioninfo(); Pkg.clone(pwd(), \"Plots\"); Pkg.build(\"Plots\")"

 test_script:
-  - echo "%JL_TEST_SCRIPT%"
-  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
-
-# # Uncomment to support code coverage upload. Should only be enabled for packages
-# # which would have coverage gaps without running on Windows
-# on_success:
-#   - echo "%JL_CODECOV_SCRIPT%"
-#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
+  # - C:\projects\julia\bin\julia -e "Pkg.test(\"Plots\")"
+  - C:\projects\julia\bin\julia -e "include(Pkg.dir(\"Plots\", \"test\", \"travis_commands.jl\"))"
@@ -1,18 +1,8 @@

 #TODO: download https://cdn.plot.ly/plotly-latest.min.js to deps/ if it doesn't exist
-file_path = ""
-if get(ENV, "PLOTS_HOST_DEPENDENCY_LOCAL", "false") == "true"
-    global file_path
-    local_fn = joinpath(dirname(@__FILE__), "plotly-latest.min.js")
-    if !isfile(local_fn)
-        @info("Cannot find deps/plotly-latest.min.js... downloading latest version.")
-        download("https://cdn.plot.ly/plotly-latest.min.js", local_fn)
-        isfile(local_fn) && (file_path = local_fn)
-    else
-        file_path = local_fn
-    end
-end

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

-const _current_plots_version = VersionNumber(split(first(filter(line -> occursin("version", line), readlines(normpath(@__DIR__, "..", "Project.toml")))), "\"")[2])
-
 using Reexport
-
-import GeometryTypes
-using Dates, Printf, Statistics, Base64, LinearAlgebra, Random
-import SparseArrays: findnz
-
-using FFMPEG
-
+using StaticArrays
@reexport using RecipesBase
-import RecipesBase: plot, plot!, animate, is_explicit
 using Base.Meta
@reexport using PlotUtils
@reexport using PlotThemes
 import Showoff
-import StatsBase
-import JSON
-
-using Requires
-
-if isfile(joinpath(@__DIR__, "..", "deps", "deps.jl"))
-    include(joinpath(@__DIR__, "..", "deps", "deps.jl"))
-else
-    # This is a bit dirty, but I don't really see why anyone should be forced
-    # to build Plots, while it will just include exactly the below line
-    # as long as `ENV["PLOTS_HOST_DEPENDENCY_LOCAL"] = "true"` is not set.
-    # If the above env is set + `plotly_local_file_path == ""``,
-    # it will warn in the __init__ function to run build
-    const plotly_local_file_path = ""
-end

 export
    grid,
@@ -51,6 +29,9 @@ export
    with,
    twinx,

+    @userplot,
+    @shorthands,
+
    pie,
    pie!,
    plot3d,
@@ -69,8 +50,6 @@ export
    yflip!,
    xaxis!,
    yaxis!,
-    xgrid!,
-    ygrid!,

    xlims,
    ylims,
@@ -86,6 +65,7 @@ export
    backends,
    backend_name,
    backend_object,
+    add_backend,
    aliases,

    Shape,
@@ -117,50 +97,17 @@ export
    rotate,
    rotate!,
    center,
-    BezierCurve,
-
-    plotattr
+    P2,
+    P3,
+    BezierCurve

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

-import NaNMath # define functions that ignores NaNs. To overcome the destructive effects of https://github.com/JuliaLang/julia/pull/12563
-ignorenan_minimum(x::AbstractArray{F}) where {F<:AbstractFloat} = NaNMath.minimum(x)
-ignorenan_minimum(x) = Base.minimum(x)
-ignorenan_maximum(x::AbstractArray{F}) where {F<:AbstractFloat} = NaNMath.maximum(x)
-ignorenan_maximum(x) = Base.maximum(x)
-ignorenan_mean(x::AbstractArray{F}) where {F<:AbstractFloat} = NaNMath.mean(x)
-ignorenan_mean(x) = Statistics.mean(x)
-ignorenan_extrema(x::AbstractArray{F}) where {F<:AbstractFloat} = NaNMath.extrema(x)
-ignorenan_extrema(x) = Base.extrema(x)
-
-# ---------------------------------------------------------
-
-# to cater for block matrices, Base.transpose is recursive.
-# This makes it impossible to create row vectors of String and Symbol with the transpose operator.
-# This solves this issue, internally in Plots at least.
-
-
-# commented out on the insistence of the METADATA maintainers
-
-#Base.transpose(x::Symbol) = x
-#Base.transpose(x::String) = x
-
-# ---------------------------------------------------------
-
-import Measures
-module PlotMeasures
 import Measures
 import Measures: Length, AbsoluteLength, Measure, BoundingBox, mm, cm, inch, pt, width, height, w, h
-const BBox = Measures.Absolute2DBox
+typealias BBox Measures.Absolute2DBox
+export BBox, BoundingBox, mm, cm, inch, pt, px, pct, w, h

-# allow pixels and percentages
-const px = AbsoluteLength(0.254)
-const pct = Length{:pct, Float64}(1.0)
-export BBox, BoundingBox, mm, cm, inch, px, pct, pt, w, h
-end
-
-using .PlotMeasures
-import .PlotMeasures: Length, AbsoluteLength, Measure, width, height
 # ---------------------------------------------------------

 include("types.jl")
@@ -168,6 +115,7 @@ include("utils.jl")
 include("components.jl")
 include("axes.jl")
 include("args.jl")
+include("backends.jl")
 include("themes.jl")
 include("plot.jl")
 include("pipeline.jl")
@@ -176,45 +124,97 @@ include("layouts.jl")
 include("subplots.jl")
 include("recipes.jl")
 include("animation.jl")
+include("output.jl")
 include("examples.jl")
 include("arg_desc.jl")
-include("plotattr.jl")
-include("backends.jl")
-include("output.jl")
-include("ijulia.jl")
-include("fileio.jl")
-include("init.jl")

-include("backends/plotly.jl")
-include("backends/gr.jl")
-include("backends/web.jl")

-include("shorthands.jl")
+# ---------------------------------------------------------
+
+# define and export shorthand plotting method definitions
+macro shorthands(funcname::Symbol)
+    funcname2 = Symbol(funcname, "!")
+    esc(quote
+        export $funcname, $funcname2
+        $funcname(args...; kw...) = plot(args...; kw..., seriestype = $(quot(funcname)))
+        $funcname2(args...; kw...) = plot!(args...; kw..., seriestype = $(quot(funcname)))
+    end)
+end
+
+@shorthands scatter
+@shorthands bar
+@shorthands barh
+@shorthands histogram
+@shorthands histogram2d
+@shorthands density
+@shorthands heatmap
+@shorthands hexbin
+@shorthands sticks
+@shorthands hline
+@shorthands vline
+@shorthands ohlc
+@shorthands contour
+@shorthands contourf
+@shorthands contour3d
+@shorthands surface
+@shorthands wireframe
+@shorthands path3d
+@shorthands scatter3d
+@shorthands boxplot
+@shorthands violin
+@shorthands quiver
+@shorthands curves
+
+pie(args...; kw...)        = plot(args...; kw...,  seriestype = :pie, aspect_ratio = :equal, grid=false, xticks=nothing, yticks=nothing)
+pie!(args...; kw...)       = plot!(args...; kw..., seriestype = :pie, aspect_ratio = :equal, grid=false, xticks=nothing, yticks=nothing)
+plot3d(args...; kw...)     = plot(args...; kw...,  seriestype = :path3d)
+plot3d!(args...; kw...)    = plot!(args...; kw..., seriestype = :path3d)
+
+
+title!(s::AbstractString; kw...)                 = plot!(; title = s, kw...)
+xlabel!(s::AbstractString; kw...)                = plot!(; xlabel = s, kw...)
+ylabel!(s::AbstractString; kw...)                = plot!(; ylabel = s, kw...)
+xlims!{T<:Real,S<:Real}(lims::Tuple{T,S}; kw...) = plot!(; xlims = lims, kw...)
+ylims!{T<:Real,S<:Real}(lims::Tuple{T,S}; kw...) = plot!(; ylims = lims, kw...)
+zlims!{T<:Real,S<:Real}(lims::Tuple{T,S}; kw...) = plot!(; zlims = lims, kw...)
+xlims!(xmin::Real, xmax::Real; kw...)                     = plot!(; xlims = (xmin,xmax), kw...)
+ylims!(ymin::Real, ymax::Real; kw...)                     = plot!(; ylims = (ymin,ymax), kw...)
+zlims!(zmin::Real, zmax::Real; kw...)                     = plot!(; zlims = (zmin,zmax), kw...)
+xticks!{T<:Real}(v::AVec{T}; kw...)                       = plot!(; xticks = v, kw...)
+yticks!{T<:Real}(v::AVec{T}; kw...)                       = plot!(; yticks = v, kw...)
+xticks!{T<:Real,S<:AbstractString}(
+              ticks::AVec{T}, labels::AVec{S}; kw...)     = plot!(; xticks = (ticks,labels), kw...)
+yticks!{T<:Real,S<:AbstractString}(
+              ticks::AVec{T}, labels::AVec{S}; kw...)     = plot!(; yticks = (ticks,labels), kw...)
+annotate!(anns...; kw...)                                 = plot!(; annotation = anns, kw...)
+annotate!{T<:Tuple}(anns::AVec{T}; kw...)                 = plot!(; annotation = anns, kw...)
+xflip!(flip::Bool = true; kw...)                          = plot!(; xflip = flip, kw...)
+yflip!(flip::Bool = true; kw...)                          = plot!(; yflip = flip, kw...)
+xaxis!(args...; kw...)                                    = plot!(; xaxis = args, kw...)
+yaxis!(args...; kw...)                                    = plot!(; yaxis = args, kw...)

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


@@ -222,7 +222,17 @@ end

 const CURRENT_BACKEND = CurrentBackend(:none)

-include("precompile.jl")
-_precompile_()
+function __init__()
+    setup_ijulia()
+    setup_atom()
+
+    if isdefined(Main, :PLOTS_DEFAULTS)
+        for (k,v) in Main.PLOTS_DEFAULTS
+            default(k, v)
+        end
+    end
+end
+
+# ---------------------------------------------------------

 end # module
@@ -1,5 +1,5 @@
-"Represents an animation object"
-struct Animation
+
+immutable Animation
    dir::String
    frames::Vector{String}
 end
@@ -9,12 +9,7 @@ function Animation()
    Animation(tmpdir, String[])
 end

-"""
-    frame(animation[, plot])
-
-Add a plot (the current plot if not specified) to an existing animation
-"""
-function frame(anim::Animation, plt::P=current()) where P<:AbstractPlot
+function frame{P<:AbstractPlot}(anim::Animation, plt::P=current())
    i = length(anim.frames) + 1
    filename = @sprintf("%06d.png", i)
    png(plt, joinpath(anim.dir, filename))
@@ -25,7 +20,7 @@ giffn() = (isijulia() ? "tmp.gif" : tempname()*".gif")
 movfn() = (isijulia() ? "tmp.mov" : tempname()*".mov")
 mp4fn() = (isijulia() ? "tmp.mp4" : tempname()*".mp4")

-mutable struct FrameIterator
+type FrameIterator
    itr
    every::Int
    kw
@@ -54,77 +49,61 @@ end
 # -----------------------------------------------

 "Wraps the location of an animated gif so that it can be displayed"
-struct AnimatedGif
+immutable AnimatedGif
    filename::String
 end

 file_extension(fn) = Base.Filesystem.splitext(fn)[2][2:end]

-gif(anim::Animation, fn = giffn(); kw...) = buildanimation(anim, fn; kw...)
-mov(anim::Animation, fn = movfn(); kw...) = buildanimation(anim, fn, false; kw...)
-mp4(anim::Animation, fn = mp4fn(); kw...) = buildanimation(anim, fn, false; kw...)
+gif(anim::Animation, fn = giffn(); kw...) = buildanimation(anim.dir, fn; kw...)
+mov(anim::Animation, fn = movfn(); kw...) = buildanimation(anim.dir, fn; kw...)
+mp4(anim::Animation, fn = mp4fn(); kw...) = buildanimation(anim.dir, fn; kw...)

-ffmpeg_framerate(fps) = "$fps"
-ffmpeg_framerate(fps::Rational) = "$(fps.num)/$(fps.den)"
+const _imagemagick_initialized = Ref(false)

-function buildanimation(anim::Animation, fn::AbstractString,
-                        is_animated_gif::Bool=true;
-                        fps::Real = 20, loop::Integer = 0,
-                        variable_palette::Bool=false,
-                        show_msg::Bool=true)
-    if length(anim.frames) == 0
-        throw(ArgumentError("Cannot build empty animations"))
-    end
-
-    fn = abspath(expanduser(fn))
-    animdir = anim.dir
-    framerate = ffmpeg_framerate(fps)
-
-    if is_animated_gif
-        if variable_palette
-            # generate a colorpalette for each frame for highest quality, but larger filesize
-            palette="palettegen=stats_mode=single[pal],[0:v][pal]paletteuse=new=1"
-            ffmpeg_exe(`-v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -lavfi "$palette" -y $fn`)
-        else
-            # generate a colorpalette first so ffmpeg does not have to guess it
-            ffmpeg_exe(`-v 0 -i $(animdir)/%06d.png -vf "palettegen=stats_mode=diff" -y "$(animdir)/palette.bmp"`)
-            # then apply the palette to get better results
-            ffmpeg_exe(` -v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -y $fn`)
+function buildanimation(animdir::AbstractString, fn::AbstractString;
+                        fps::Integer = 20, loop::Integer = 0)
+    fn = abspath(fn)
+    try
+        if !_imagemagick_initialized[]
+            file = joinpath(Pkg.dir("ImageMagick"), "deps","deps.jl")
+            if isfile(file) && !haskey(ENV, "MAGICK_CONFIGURE_PATH")
+                include(file)
+            end
+            _imagemagick_initialized[] = true
        end
-    else
-        ffmpeg_exe(`-v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
+
+        # prefix = get(ENV, "MAGICK_CONFIGURE_PATH", "")
+        # high quality
+        speed = round(Int, 100 / fps)
+        run(`convert -delay $speed -loop $loop $(joinpath(animdir, "*.png")) -alpha off $fn`)
+
+    catch err
+        warn("""Tried to create gif using convert (ImageMagick), but got error: $err
+            ImageMagick can be installed by executing `Pkg.add("ImageMagick")`
+            Will try ffmpeg, but it's lower quality...)""")
+
+        # low quality
+        run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -y $fn`)
+        # run(`ffmpeg -v warning -i  "fps=$fps,scale=320:-1:flags=lanczos"`)
    end

-    show_msg && @info("Saved animation to ", fn)
+    info("Saved animation to ", fn)
    AnimatedGif(fn)
 end



-# write out html to view the gif
+# write out html to view the gif... note the rand call which is a hack so the image doesn't get cached
 function Base.show(io::IO, ::MIME"text/html", agif::AnimatedGif)
    ext = file_extension(agif.filename)
-    if ext == "gif"
-        html = "<img src=\"data:image/gif;base64," * base64encode(read(agif.filename)) * "\" />"
+    write(io, if ext == "gif"
+        "<img src=\"$(relpath(agif.filename))?$(rand())>\" />"
    elseif ext in ("mov", "mp4")
-        mimetype = ext == "mov" ? "video/quicktime" : "video/mp4"
-        html = "<video controls><source src=\"data:$mimetype;base64," *
-               base64encode(read(agif.filename)) *
-               "\" type = \"$mimetype\"></video>"
+        "<video controls><source src=\"$(relpath(agif.filename))?$(rand())>\" type=\"video/$ext\"></video>"
    else
        error("Cannot show animation with extension $ext: $agif")
-    end
-
-    write(io, html)
-    return nothing
-end
-
-
-# Only gifs can be shown via image/gif
-Base.showable(::MIME"image/gif", agif::AnimatedGif) = file_extension(agif.filename) == "gif"
-
-function Base.show(io::IO, ::MIME"image/gif", agif::AnimatedGif)
-    open(fio-> write(io, fio), agif.filename)
+    end)
 end


@@ -138,7 +117,6 @@ function _animate(forloop::Expr, args...; callgif = false)
  # add the call to frame to the end of each iteration
  animsym = gensym("anim")
  countersym = gensym("counter")
-  freqassert = :()
  block = forloop.args[2]

  # create filter
@@ -151,7 +129,7 @@ function _animate(forloop::Expr, args...; callgif = false)
    # filter every `freq` frames (starting with the first frame)
    @assert n == 2
    freq = args[2]
-    freqassert = :(@assert isa($freq, Integer) && $freq > 0)
+    @assert isa(freq, Integer) && freq > 0
    :(mod1($countersym, $freq) == 1)

  elseif args[1] == :when
@@ -163,17 +141,16 @@ function _animate(forloop::Expr, args...; callgif = false)
    error("Unsupported animate filter: $args")
  end

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

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

  # full expression:
  esc(quote
-    $freqassert             # if filtering, check frequency is an Integer > 0
-    $animsym = Plots.Animation()  # init animation object
-    global $countersym = 1         # init iteration counter
+    $animsym = Animation()  # init animation object
+    $countersym = 1         # init iteration counter
    $forloop                # for loop, saving a frame after each iteration
    $retval                 # return the animation object, or the gif
  end)
@@ -2,7 +2,7 @@
 const _arg_desc = KW(

 # series args
-:label 			=> "String type. The label for a series, which appears in a legend.  If empty, no legend entry is added.",
+:label 				=> "String type. The label for a series, which appears in a legend.  If empty, no legend entry is added.",
 :seriescolor 		=> "Color Type. The base color for this series.  `:auto` (the default) will select a color from the subplot's `color_palette`, based on the order it was added to the subplot",
 :seriesalpha 		=> "Number in [0,1]. The alpha/opacity override for the series.  `nothing` (the default) means it will take the alpha value of the color.",
 :seriestype 		=> "Symbol. This is the identifier of the type of visualization for this series. Choose from $(_allTypes) or any series recipes which are defined.",
@@ -10,7 +10,7 @@ const _arg_desc = KW(
 :linewidth         	=> "Number. Width of the line (in pixels)",
 :linecolor         	=> "Color Type. Color of the line (for path and bar stroke).  `:match` will take the value from `:seriescolor`, (though histogram/bar types use `:black` as a default).",
 :linealpha         	=> "Number in [0,1]. The alpha/opacity override for the line.  `nothing` (the default) means it will take the alpha value of linecolor.",
-:fillrange         	=> "Number or AbstractVector.  Fills area between fillrange and y for line-types, sets the base for bar/stick types, and similar for other types.",
+:fillrange         	=> "Number or AbstractVector.  Fills area from this to y for line-types, sets the base for bar/stick types, and similar for other types.",
 :fillcolor         	=> "Color Type. Color of the filled area of path or bar types.  `:match` will take the value from `:seriescolor`.",
 :fillalpha         	=> "Number in [0,1]. The alpha/opacity override for the fill area.  `nothing` (the default) means it will take the alpha value of fillcolor.",
 :markershape       	=> "Symbol, Shape, or AbstractVector. Choose from $(_allMarkers).",
@@ -21,36 +21,33 @@ const _arg_desc = KW(
 :markerstrokewidth 	=> "Number. Width of the marker stroke (border. in pixels)",
 :markerstrokecolor 	=> "Color Type. Color of the marker stroke (border).  `:match` will take the value from `:foreground_color_subplot`.",
 :markerstrokealpha 	=> "Number in [0,1]. The alpha/opacity override for the marker stroke (border).  `nothing` (the default) means it will take the alpha value of markerstrokecolor.",
-:bins              	=> "Integer, NTuple{2,Integer}, AbstractVector or Symbol. Default is :auto (the Freedman-Diaconis rule). For histogram-types, defines the approximate number of bins to aim for, or the auto-binning algorithm to use (:sturges, :sqrt, :rice, :scott or :fd). For fine-grained control pass a Vector of break values, e.g. `range(minimum(x), stop = maximum(x), length = 25)`",
+:bins              	=> "Integer, NTuple{2,Integer}, AbstractVector. For histogram-types, defines the number of bins, or the edges, of the histogram.",
 :smooth            	=> "Bool.  Add a regression line?",
 :group             	=> "AbstractVector. Data is split into a separate series, one for each unique value in `group`.",
 :x                 	=> "Various. Input data. First Dimension",
 :y                 	=> "Various. Input data. Second Dimension",
 :z                 	=> "Various. Input data. Third Dimension. May be wrapped by a `Surface` for surface and heatmap types.",
-:marker_z          	=> "AbstractVector, Function `f(x,y,z) -> z_value`, or Function `f(x,y) -> z_value`, or nothing. z-values for each series data point, which correspond to the color to be used from a markercolor gradient.",
-:line_z          	=> "AbstractVector, Function `f(x,y,z) -> z_value`, or Function `f(x,y) -> z_value`, or nothing. z-values for each series line segment, which correspond to the color to be used from a linecolor gradient.  Note that for N points, only the first N-1 values are used (one per line-segment).",
-:fill_z                 => "Matrix{Float64} of the same size as z matrix, which specifies the color of the 3D surface; the default value is `nothing`.",
-:levels            	=> "Integer, NTuple{2,Integer}, or AbstractVector. Levels or number of levels (or x-levels/y-levels) for a contour type.",
+:marker_z          	=> "AbstractVector, Function `f(x,y,z) -> z_value`, or nothing. z-values for each series data point, which correspond to the color to be used from a markercolor gradient.",
+:line_z          	=> "AbstractVector, Function `f(x,y,z) -> z_value`, or nothing. z-values for each series line segment, which correspond to the color to be used from a linecolor gradient.  Note that for N points, only the first N-1 values are used (one per line-segment).",
+:fill_z           => "Matrix{Float64} of the same size as z matrix, which specifies the color of the 3D surface; the default value is `nothing`.",
+:levels            	=> "Integer, NTuple{2,Integer}. Number of levels (or x-levels/y-levels) for a contour type.",
 :orientation       	=> "Symbol.  Horizontal or vertical orientation for bar types.  Values `:h`, `:hor`, `:horizontal` correspond to horizontal (sideways, anchored to y-axis), and `:v`, `:vert`, and `:vertical` correspond to vertical (the default).",
 :bar_position      	=> "Symbol.  Choose from `:overlay` (default), `:stack`.  (warning: May not be implemented fully)",
-:bar_width              => "nothing or Number. Width of bars in data coordinates. When nothing, chooses based on x (or y when `orientation = :h`).",
-:bar_edges              => "Bool.  Align bars to edges (true), or centers (the default)?",
-:xerror                 => "AbstractVector or 2-Tuple of Vectors. x (horizontal) error relative to x-value.  If 2-tuple of vectors, the first vector corresponds to the left error (and the second to the right)",
+:bar_width         	=> "nothing or Number. Width of bars in data coordinates. When nothing, chooses based on x (or y when `orientation = :h`).",
+:bar_edges         	=> "Bool.  Align bars to edges (true), or centers (the default)?",
+:xerror            	=> "AbstractVector or 2-Tuple of Vectors. x (horizontal) error relative to x-value.  If 2-tuple of vectors, the first vector corresponds to the left error (and the second to the right)",
 :yerror            	=> "AbstractVector or 2-Tuple of Vectors. y (vertical) error relative to y-value.  If 2-tuple of vectors, the first vector corresponds to the bottom error (and the second to the top)",
 :ribbon            	=> "Number or AbstractVector.  Creates a fillrange around the data points.",
 :quiver            	=> "AbstractVector or 2-Tuple of vectors.  The directional vectors U,V which specify velocity/gradient vectors for a quiver plot.",
 :arrow             	=> "nothing (no arrows), Bool (if true, default arrows), Arrow object, or arg(s) that could be style or head length/widths.  Defines arrowheads that should be displayed at the end of path line segments (just before a NaN and the last non-NaN point).  Used in quiverplot, streamplot, or similar.",
-:normalize         	=> "Bool or Symbol. Histogram normalization mode. Possible values are: false/:none (no normalization, default), true/:pdf (normalize to a discrete Probability Density Function, where the total area of the bins is 1), :probability (bin heights sum to 1) and :density (the area of each bin, rather than the height, is equal to the counts - useful for uneven bin sizes).",
+:normalize         	=> "Bool. Should normalize histogram types?  Trying for area == 1.",
 :weights           	=> "AbstractVector. Used in histogram types for weighted counts.",
-:show_empty_bins    => "Bool. Whether empty bins in a 2D histogram are colored as 0 (true), or transparent (the default).",
 :contours          	=> "Bool. Add contours to the side-grids of 3D plots?  Used in surface/wireframe.",
-:contour_labels         => "Bool. Show labels at the contour lines?",
 :match_dimensions  	=> "Bool. For heatmap types... should the first dimension of a matrix (rows) correspond to the first dimension of the plot (x-axis)?  The default is false, which matches the behavior of Matplotlib, Plotly, and others.  Note: when passing a function for z, the function should still map `(x,y) -> z`.",
 :subplot           	=> "Integer (subplot index) or Subplot object.  The subplot that this series belongs to.",
-:series_annotations     => "AbstractVector of String or PlotText.  These are annotations which are mapped to data points/positions.",
-:primary                => "Bool.  Does this count as a 'real series'?  For example, you could have a path (primary), and a scatter (secondary) as 2 separate series, maybe with different data (see sticks recipe for an example).  The secondary series will get the same color, etc as the primary.",
-:hover 	        	=> "nothing or vector of strings. Text to display when hovering over each data point.",
-:colorbar_entry   => "Bool.  Include this series in the color bar?  Set to `false` to exclude.",
+:series_annotations => "AbstractVector of String or PlotText.  These are annotations which are mapped to data points/positions.",
+:primary            => "Bool.  Does this count as a 'real series'?  For example, you could have a path (primary), and a scatter (secondary) as 2 separate series, maybe with different data (see sticks recipe for an example).  The secondary series will get the same color, etc as the primary.",
+:hover 				=> "nothing or vector of strings. Text to display when hovering over each data point.",

 # plot args
 :plot_title               => "String. Title for the whole plot (not the subplots) (Note: Not currently implemented)",
@@ -65,50 +62,31 @@ const _arg_desc = KW(
 :link                     => "Symbol.  How/whether to link axis limits between subplots. Values: `:none`, `:x` (x axes are linked by columns), `:y` (y axes are linked by rows), `:both` (x and y are linked), `:all` (every subplot is linked together regardless of layout position).",
 :overwrite_figure         => "Bool.  Should we reuse the same GUI window/figure when plotting (true) or open a new one (false).",
 :html_output_format       => "Symbol.  When writing html output, what is the format?  `:png` and `:svg` are currently supported.",
-:tex_output_standalone    => "Bool. When writing tex output, should the source include a preamble for a standalone document class.",
-:inset_subplots           => "nothing or vector of 2-tuple (parent,bbox).  optionally pass a vector of (parent,bbox) tuples which are the parent layout and the relative bounding box of inset subplots",
-:dpi 			  => "Number.  Dots Per Inch of output figures",
-:thickness_scaling        => "Number. Scale for the thickness of all line elements like lines, borders, axes, grid lines, ... defaults to 1.",
-:display_type             => "Symbol (`:auto`, `:gui`, or `:inline`).  When supported, `display` will either open a GUI window or plot inline.",
-:extra_kwargs 	          => "KW (Dict{Symbol,Any}).  Pass a map of extra keyword args which may be specific to a backend.",
-:fontfamily               => "String or Symbol.  Default font family for title, legend entries, tick labels and guides",
+:inset_subplots 		  => "nothing or vector of 2-tuple (parent,bbox).  optionally pass a vector of (parent,bbox) tuples which are the parent layout and the relative bounding box of inset subplots",
+:dpi 					  => "Number.  Dots Per Inch of output figures",
+:display_type 			  => "Symbol (`:auto`, `:gui`, or `:inline`).  When supported, `display` will either open a GUI window or plot inline.",
+:extra_kwargs 			  => "KW (Dict{Symbol,Any}).  Pass a map of extra keyword args which may be specific to a backend.",

 # subplot args
 :title                    => "String. Subplot title.",
 :title_location           => "Symbol. Position of subplot title. Values: `:left`, `:center`, `:right`",
-:titlefontfamily          => "String or Symbol. Font family of subplot title.",
-:titlefontsize            => "Integer. Font pointsize of subplot title.",
-:titlefonthalign          => "Symbol. Font horizontal alignment of subplot title: :hcenter, :left, :right or :center",
-:titlefontvalign          => "Symbol. Font vertical alignment of subplot title: :vcenter, :top, :bottom or :center",
-:titlefontrotation        => "Real. Font rotation of subplot title",
-:titlefontcolor           => "Color Type. Font color of subplot title",
+:titlefont                => "Font. Font of subplot title.",
 :background_color_subplot => "Color Type or `:match` (matches `:background_color`).  Base background color of the subplot.",
 :background_color_legend  => "Color Type or `:match` (matches `:background_color_subplot`).  Background color of the legend.",
 :background_color_inside  => "Color Type or `:match` (matches `:background_color_subplot`).  Background color inside the plot area (under the grid).",
 :foreground_color_subplot => "Color Type or `:match` (matches `:foreground_color`).  Base foreground color of the subplot.",
 :foreground_color_legend  => "Color Type or `:match` (matches `:foreground_color_subplot`).  Foreground color of the legend.",
+:foreground_color_grid    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of grid lines.",
 :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)",
-: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",
-:legendfontvalign         => "Symbol. Font vertical alignment of legend entries: :vcenter, :top, :bottom or :center",
-:legendfontrotation       => "Real. Font rotation of legend entries",
-:legendfontcolor          => "Color Type. Font color of legend entries",
-:legendtitlefontfamily    => "String or Symbol. Font family of the legend title.",
-:legendtitlefontsize           => "Integer. Font pointsize the legend title.",
-:legendtitlefonthalign         => "Symbol. Font horizontal alignment of the legend title: :hcenter, :left, :right or :center",
-:legendtitlefontvalign         => "Symbol. Font vertical alignment of the legend title: :vcenter, :top, :bottom or :center",
-:legendtitlefontrotation       => "Real. Font rotation of the legend title",
-:legendtitlefontcolor          => "Color Type. Font color of the legend title",
 :colorbar                 => "Bool (show the colorbar?) or Symbol (colorbar position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:legend` (matches legend value) (note: only some may be supported in each backend)",
 :clims 					  => "`:auto` or NTuple{2,Number}.  Fixes the limits of the colorbar.",
 :legendfont               => "Font. Font of legend items.",
-:legendtitlefont          => "Font. Font of the legend title.",
+:grid                     => "Bool. Show the grid lines?",
 :annotations              => "(x,y,text) tuple(s).  Can be a single tuple or a list of them.  Text can be String or PlotText (created with `text(args...)`)  Add one-off text annotations at the x,y coordinates.",
 :projection               => "Symbol or String.  '3d' or 'polar'",
-:aspect_ratio             => "Symbol (:equal) or Number. Plot area is resized so that 1 y-unit is the same size as `aspect_ratio` x-units.",
+:aspect_ratio             => "Symbol (:equal) or Number. Plot area is resized so that 1 y-unit is the same size as `apect_ratio` x-units.",
 :margin                   => "Measure (multiply by `mm`, `px`, etc). Base for individual margins... not directly used.  Specifies the extra padding around subplots.",
 :left_margin              => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding to the left of the subplot.",
 :top_margin               => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding on the top of the subplot.",
@@ -116,48 +94,21 @@ const _arg_desc = KW(
 :bottom_margin            => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding on the bottom of the subplot.",
 :subplot_index            => "Integer.  Internal (not set by user).  Specifies the index of this subplot in the Plot's `plt.subplot` list.",
 :colorbar_title           => "String.  Title of colorbar.",
-:framestyle               => "Symbol.  Style of the axes frame. Choose from $(_allFramestyles)",
-:camera                   => "NTuple{2, Real}. Sets the view angle (azimuthal, elevation) for 3D plots",

 # axis args
-:guide     		  => "String. Axis guide (label).",
-:guide_position		  => "Symbol. Position of axis guides: :top, :bottom, :left or :right",
-:lims      		  => "NTuple{2,Number} or Symbol. Force axis limits.  Only finite values are used (you can set only the right limit with `xlims = (-Inf, 2)` for example). `:round` widens the limit to the nearest round number ie. [0.1,3.6]=>[0.0,4.0]",
-:ticks     		  => "Vector of numbers (set the tick values), Tuple of (tickvalues, ticklabels), or `:auto`",
-:scale     		  => "Symbol. Scale of the axis: `:none`, `:ln`, `:log2`, `:log10`",
-:rotation  		  => "Number. Degrees rotation of tick labels.",
-:flip      		  => "Bool.  Should we flip (reverse) the axis?",
-:formatter                => "Function, :scientific, :plain or :auto. A method which converts a number to a string for tick labeling.",
-:tickfontfamily           => "String or Symbol. Font family of tick labels.",
-:tickfontsize             => "Integer. Font pointsize of tick labels.",
-:tickfonthalign           => "Symbol. Font horizontal alignment of tick labels: :hcenter, :left, :right or :center",
-:tickfontvalign           => "Symbol. Font vertical alignment of tick labels: :vcenter, :top, :bottom or :center",
-:tickfontrotation         => "Real. Font rotation of tick labels",
-:tickfontcolor            => "Color Type. Font color of tick labels",
-:guidefontfamily          => "String or Symbol. Font family of axes guides.",
-:guidefontsize            => "Integer. Font pointsize of axes guides.",
-:guidefonthalign          => "Symbol. Font horizontal alignment of axes guides: :hcenter, :left, :right or :center",
-:guidefontvalign          => "Symbol. Font vertical alignment of axes guides: :vcenter, :top, :bottom or :center",
-:guidefontrotation        => "Real. Font rotation of axes guides",
-:guidefontcolor           => "Color Type. Font color of axes guides",
+:guide     				  => "String. Axis guide (label).",
+:lims      				  => "NTuple{2,Number}. Force axis limits.  Only finite values are used (you can set only the right limit with `xlims = (-Inf, 2)` for example).",
+:ticks     				  => "Vector of numbers (set the tick values), Tuple of (tickvalues, ticklabels), or `:auto`",
+:scale     				  => "Symbol. Scale of the axis: `:none`, `:ln`, `:log2`, `:log10`",
+:rotation  				  => "Number. Degrees rotation of tick labels.",
+:flip      				  => "Bool.  Should we flip (reverse) the axis?",
+:formatter 				  => "Function, :scientific, or :auto. A method which converts a number to a string for tick labeling.",
+:tickfont  				  => "Font. Font of axis tick labels.",
+:guidefont 				  => "Font. Font of axis guide (label).",
 :foreground_color_axis    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of axis ticks.",
 :foreground_color_border  => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of plot area border (spines).",
 :foreground_color_text    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of tick labels.",
 :foreground_color_guide   => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of axis guides (axis labels).",
 :mirror                   => "Bool.  Switch the side of the tick labels (right or top).",
-:grid                     => "Bool, Symbol, String or `nothing`. Show the grid lines? `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:none`, `:off`",
-:foreground_color_grid    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of grid lines.",
-:gridalpha                => "Number in [0,1]. The alpha/opacity override for the grid lines.",
-:gridstyle                => "Symbol. Style of the grid lines. Choose from $(_allStyles)",
-:gridlinewidth            => "Number. Width of the grid lines (in pixels)",
-:foreground_color_minor_grid => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of minor grid lines.",
-:minorgrid                => "Bool. Adds minor grid lines and ticks to the plot. Set minorticks to change number of gridlines",
-:minorticks               => "Integer. Intervals to divide the gap between major ticks into",
-:minorgridalpha           => "Number in [0,1]. The alpha/opacity override for the minorgrid lines.",
-:minorgridstyle           => "Symbol. Style of the minor grid lines. Choose from $(_allStyles)",
-:minorgridlinewidth       => "Number. Width of the minor grid lines (in pixels)",
-:tick_direction           => "Symbol.  Direction of the ticks. `:in` or `:out`",
-:showaxis                 => "Bool, Symbol or String.  Show the axis. `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:off`",
-:widen                    => "Bool. Widen the axis limits by a small factor to avoid cut-off markers and lines at the borders. Defaults to `true`.",
-:draw_arrow               => "Bool. Draw arrow at the end of the axis.",
+
 )
@@ -1,50 +1,44 @@
-using Pkg

-struct NoBackend <: AbstractBackend end
+immutable NoBackend <: AbstractBackend end

 const _backendType = Dict{Symbol, DataType}(:none => NoBackend)
 const _backendSymbol = Dict{DataType, Symbol}(NoBackend => :none)
 const _backends = Symbol[]
 const _initialized_backends = Set{Symbol}()
-const _default_backends = (:none, :gr, :plotly)

-const _backend_packages = Dict{Symbol, Symbol}()
-
-"Returns a list of supported backends"
 backends() = _backends
-
-"Returns the name of the current backend"
 backend_name() = CURRENT_BACKEND.sym
-
-function _backend_instance(sym::Symbol)::AbstractBackend
-    haskey(_backendType, sym) ? _backendType[sym]() : error("Unsupported backend $sym")
-end
-
-backend_package_name(sym::Symbol) = _backend_packages[sym]
+_backend_instance(sym::Symbol) = haskey(_backendType, sym) ? _backendType[sym]() : error("Unsupported backend $sym")

 macro init_backend(s)
-    package_str = string(s)
-    str = lowercase(package_str)
+    str = lowercase(string(s))
    sym = Symbol(str)
    T = Symbol(string(s) * "Backend")
    esc(quote
-        struct $T <: AbstractBackend end
+        immutable $T <: AbstractBackend end
        export $sym
-        $sym(; kw...) = (default(; kw...); backend($T()))
+        $sym(; kw...) = (default(; kw...); backend(Symbol($str)))
        backend_name(::$T) = Symbol($str)
-        backend_package_name(pkg::$T) = backend_package_name(Symbol($str))
+        backend_package_name(::$T) = Symbol("Plots", $(string(s)))
        push!(_backends, Symbol($str))
        _backendType[Symbol($str)] = $T
        _backendSymbol[$T] = Symbol($str)
-        _backend_packages[Symbol($str)] = Symbol($package_str)
+        # include("backends/" * $str * ".jl")
    end)
 end

-# include("backends/web.jl")
+include("backends/web.jl")
 # include("backends/supported.jl")

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

+function add_backend(pkg::Symbol)
+    info("To do a standard install of $pkg, copy and run this:\n\n")
+    println(add_backend_string(_backend_instance(pkg)))
+    println()
+end
+add_backend_string(b::AbstractBackend) = warn("No custom install defined for $(backend_name(b))")
+
 # don't do anything as a default
 _create_backend_figure(plt::Plot) = nothing
 _prepare_plot_object(plt::Plot) = nothing
@@ -55,8 +49,8 @@ _series_updated(plt::Plot, series::Series) = nothing

 _before_layout_calcs(plt::Plot) = nothing

-title_padding(sp::Subplot) = sp[:title] == "" ? 0mm : sp[:titlefontsize] * pt
-guide_padding(axis::Axis) = axis[:guide] == "" ? 0mm : axis[:guidefontsize] * pt
+title_padding(sp::Subplot) = sp[:title] == "" ? 0mm : sp[:titlefont].pointsize * pt
+guide_padding(axis::Axis) = axis[:guide] == "" ? 0mm : axis[:guidefont].pointsize * pt

 "Returns the (width,height) of a text label."
 function text_size(lablen::Int, sz::Number, rot::Number = 0)
@@ -74,9 +68,9 @@ end
 text_size(lab::AbstractString, sz::Number, rot::Number = 0) = text_size(length(lab), sz, rot)

 # account for the size/length/rotation of tick labels
-function tick_padding(sp::Subplot, axis::Axis)
-    ticks = get_ticks(sp, axis)
-    if ticks === nothing
+function tick_padding(axis::Axis)
+    ticks = get_ticks(axis)
+    if ticks == nothing
        0mm
    else
        vals, labs = ticks
@@ -97,7 +91,7 @@ function tick_padding(sp::Subplot, axis::Axis)
        # hgt

        # get the height of the rotated label
-        text_size(longest_label, axis[:tickfontsize], rot)[2]
+        text_size(longest_label, axis[:tickfont].pointsize, rot)[2]
    end
 end

@@ -105,10 +99,10 @@ end
 # to fit ticks, tick labels, guides, colorbars, etc.
 function _update_min_padding!(sp::Subplot)
    # TODO: something different when `is3d(sp) == true`
-    leftpad   = tick_padding(sp, sp[:yaxis]) + sp[:left_margin]   + guide_padding(sp[:yaxis])
+    leftpad   = tick_padding(sp[:yaxis]) + sp[:left_margin]   + guide_padding(sp[:yaxis])
    toppad    = sp[:top_margin]    + title_padding(sp)
    rightpad  = sp[:right_margin]
-    bottompad = tick_padding(sp, sp[:xaxis]) + sp[:bottom_margin] + guide_padding(sp[:xaxis])
+    bottompad = tick_padding(sp[:xaxis]) + sp[:bottom_margin] + guide_padding(sp[:xaxis])

    # switch them?
    if sp[:xaxis][:mirror]
@@ -127,7 +121,7 @@ _update_plot_object(plt::Plot) = nothing
 # ---------------------------------------------------------


-mutable struct CurrentBackend
+type CurrentBackend
  sym::Symbol
  pkg::AbstractBackend
 end
@@ -135,22 +129,34 @@ CurrentBackend(sym::Symbol) = CurrentBackend(sym, _backend_instance(sym))

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

-_fallback_default_backend() = backend(GRBackend())
-
-function _pick_default_backend()
+function pickDefaultBackend()
    env_default = get(ENV, "PLOTS_DEFAULT_BACKEND", "")
    if env_default != ""
-        sym = Symbol(lowercase(env_default))
-        if sym in _backends
-            backend(sym)
-        else
-            @warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not a valid backend package.  Choose from:\n\t" *
-                 join(sort(_backends), "\n\t"))
-            _fallback_default_backend()
+        try
+            Pkg.installed(env_default)  # this will error if not installed
+            sym = Symbol(lowercase(env_default))
+            if haskey(_backendType, sym)
+                return backend(sym)
+            else
+                warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not a valid backend package.  Choose from:\n\t",
+                     join(sort(_backends), "\n\t"))
+            end
+        catch
+            warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not installed.")
        end
-    else
-        _fallback_default_backend()
    end
+
+    # the ordering/inclusion of this package list is my semi-arbitrary guess at
+    # which one someone will want to use if they have the package installed...accounting for
+    # features, speed, and robustness
+    for pkgstr in ("GR", "PlotlyJS", "PyPlot", "UnicodePlots")
+        if Pkg.installed(pkgstr) != nothing
+            return backend(Symbol(lowercase(pkgstr)))
+        end
+    end
+
+    # the default if nothing else is installed
+    backend(:plotly)
 end


@@ -160,41 +166,55 @@ end
 Returns the current plotting package name.  Initializes package on first call.
 """
 function backend()
-    if CURRENT_BACKEND.sym == :none
-        _pick_default_backend()
+
+  global CURRENT_BACKEND
+  if CURRENT_BACKEND.sym == :none
+    pickDefaultBackend()
+  end
+
+  sym = CURRENT_BACKEND.sym
+  if !(sym in _initialized_backends)
+
+    # # initialize
+    # println("[Plots.jl] Initializing backend: ", sym)
+
+    inst = _backend_instance(sym)
+    try
+      _initialize_backend(inst)
+    catch err
+      warn("Couldn't initialize $sym.  (might need to install it?)")
+      add_backend(sym)
+      rethrow(err)
    end

-    CURRENT_BACKEND.pkg
+    push!(_initialized_backends, sym)
+
+  end
+  CURRENT_BACKEND.pkg
 end

 """
 Set the plot backend.
 """
 function backend(pkg::AbstractBackend)
-    sym = backend_name(pkg)
-    if !(sym in _initialized_backends)
-        _initialize_backend(pkg)
-        push!(_initialized_backends, sym)
-    end
-    CURRENT_BACKEND.sym = sym
+    CURRENT_BACKEND.sym = backend_name(pkg)
+    warn_on_deprecated_backend(CURRENT_BACKEND.sym)
    CURRENT_BACKEND.pkg = pkg
-    pkg
+    backend()
 end

-function backend(sym::Symbol)
-    if sym in _backends
-        backend(_backend_instance(sym))
-    else
-        @warn("`:$sym` is not a supported backend.")
-        backend()
-    end
+function backend(modname::Symbol)
+    warn_on_deprecated_backend(modname)
+    CURRENT_BACKEND.sym = modname
+    CURRENT_BACKEND.pkg = _backend_instance(modname)
+    backend()
 end

-const _deprecated_backends = [:qwt, :winston, :bokeh, :gadfly, :immerse, :glvisualize]
+const _deprecated_backends = [:qwt, :winston, :bokeh, :gadfly, :immerse]

 function warn_on_deprecated_backend(bsym::Symbol)
    if bsym in _deprecated_backends
-        @warn("Backend $bsym has been deprecated.")
+        warn("Backend $bsym has been deprecated.  It may not work as originally intended.")
    end
 end

@@ -228,7 +248,7 @@ const _base_supported_args = [
    :subplot_index,
    :discrete_values,
    :projection,
-    :show_empty_bins
+
 ]

 function merge_with_base_supported(v::AVec)
@@ -244,19 +264,32 @@ function merge_with_base_supported(v::AVec)
 end


-
-@init_backend PyPlot
-@init_backend UnicodePlots
+# @init_backend PyPlot
+# @init_backend UnicodePlots
@init_backend Plotly
-@init_backend PlotlyJS
+# @init_backend PlotlyJS
@init_backend GR
-@init_backend PGFPlots
-@init_backend PGFPlotsX
-@init_backend InspectDR
-@init_backend HDF5
+# @init_backend GLVisualize
+# @init_backend PGFPlots
+# @init_backend InspectDR
+
+_initialize_backend(::PlotlyBackend) = include("backends/plotly.jl")
+
+function _initialize_backend(b::AbstractBackend)
+    bname = backend_name(b)
+    @eval import $(backend_package_name(b))
+end

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

+const _attr = KW()
+const _seriestype = KW()
+const _marker = KW()
+const _style = KW()
+const _scale = KW()
+
+using Base.Meta
+
 # create the various `is_xxx_supported` and `supported_xxxs` methods
 # by default they pass through to checking membership in `_gr_xxx`
 for s in (:attr, :seriestype, :marker, :style, :scale)
@@ -271,532 +304,38 @@ for s in (:attr, :seriestype, :marker, :style, :scale)

    for bend in backends()
        bend_type = typeof(_backend_instance(bend))
-        v = Symbol("_", bend, "_", s)
+        # v = Symbol("_", bend, "_", s)
+        v = Symbol("_", s)
        @eval begin
-            $f(::$bend_type, $s::Symbol) = $s in $v
-            $f2(::$bend_type) = $v
+            $f(::$bend_type, $s::Symbol) = $s in $v[$(quot(bend))]
+            $f2(::$bend_type) = $v[$(quot(bend))]
        end
    end
 end

-# is_subplot_supported(::AbstractBackend) = false
-# is_subplot_supported() = is_subplot_supported(backend())
+# ---------------------------------------------------------

-
-################################################################################
-# initialize the backends
-
-function _initialize_backend(pkg::AbstractBackend)
-    sym = backend_package_name(pkg)
-    @eval Main begin
-        import $sym
-        export $sym
-    end
-end
-
-_initialize_backend(pkg::GRBackend) = nothing
-
-# ------------------------------------------------------------------------------
-# gr
-
-const _gr_attr = merge_with_base_supported([
-    :annotations,
-    :background_color_legend, :background_color_inside, :background_color_outside,
-    :foreground_color_legend, :foreground_color_grid, :foreground_color_axis,
-    :foreground_color_text, :foreground_color_border,
-    :label,
-    :seriescolor, :seriesalpha,
-    :linecolor, :linestyle, :linewidth, :linealpha,
-    :markershape, :markercolor, :markersize, :markeralpha,
-    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
-    :fillrange, :fillcolor, :fillalpha,
-    :bins,
-    :layout,
-    :title, :window_title,
-    :guide, :lims, :ticks, :scale, :flip,
-    :match_dimensions,
-    :titlefontfamily, :titlefontsize, :titlefonthalign, :titlefontvalign,
-    :titlefontrotation, :titlefontcolor,
-    :legendfontfamily, :legendfontsize, :legendfonthalign, :legendfontvalign,
-    :legendfontrotation, :legendfontcolor,
-    :tickfontfamily, :tickfontsize, :tickfonthalign, :tickfontvalign,
-    :tickfontrotation, :tickfontcolor,
-    :guidefontfamily, :guidefontsize, :guidefonthalign, :guidefontvalign,
-    :guidefontrotation, :guidefontcolor,
-    :grid, :gridalpha, :gridstyle, :gridlinewidth,
-    :legend, :legendtitle, :colorbar, :colorbar_title, :colorbar_entry,
-    :fill_z, :line_z, :marker_z, :levels,
-    :ribbon, :quiver,
-    :orientation,
-    :overwrite_figure,
-    :polar,
-    :aspect_ratio,
-    :normalize, :weights,
-    :inset_subplots,
-    :bar_width,
-    :arrow,
-    :framestyle,
-    :tick_direction,
-    :camera,
-    :contour_labels,
-])
-const _gr_seriestype = [
-    :path, :scatter, :straightline,
-    :heatmap, :pie, :image,
-    :contour, :path3d, :scatter3d, :surface, :wireframe, :volume,
-    :shape
-]
-const _gr_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
-const _gr_marker = _allMarkers
-const _gr_scale = [:identity, :log10]
-is_marker_supported(::GRBackend, shape::Shape) = true
-
-# ------------------------------------------------------------------------------
-# plotly
-
-function _initialize_backend(pkg::PlotlyBackend)
-    try
-        @eval Main begin
-            import ORCA
-        end
-    catch
-        @info "For saving to png with the Plotly backend ORCA has to be installed."
-    end
-end
-
-const _plotly_attr = merge_with_base_supported([
-    :annotations,
-    :background_color_legend, :background_color_inside, :background_color_outside,
-    :foreground_color_legend, :foreground_color_guide,
-    :foreground_color_grid, :foreground_color_axis,
-    :foreground_color_text, :foreground_color_border,
-    :foreground_color_title,
-    :label,
-    :seriescolor, :seriesalpha,
-    :linecolor, :linestyle, :linewidth, :linealpha,
-    :markershape, :markercolor, :markersize, :markeralpha,
-    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha, :markerstrokestyle,
-    :fillrange, :fillcolor, :fillalpha,
-    :bins,
-    :title, :title_location,
-    :titlefontfamily, :titlefontsize, :titlefonthalign, :titlefontvalign,
-    :titlefontcolor,
-    :legendfontfamily, :legendfontsize, :legendfontcolor,
-    :tickfontfamily, :tickfontsize, :tickfontcolor,
-    :guidefontfamily, :guidefontsize, :guidefontcolor,
-    :window_title,
-    :guide, :lims, :ticks, :scale, :flip, :rotation,
-    :tickfont, :guidefont, :legendfont,
-    :grid, :gridalpha, :gridlinewidth,
-    :legend, :colorbar, :colorbar_title, :colorbar_entry,
-    :marker_z, :fill_z, :line_z, :levels,
-    :ribbon, :quiver,
-    :orientation,
-    # :overwrite_figure,
-    :polar,
-    :normalize, :weights,
-    # :contours,
-    :aspect_ratio,
-    :hover,
-    :inset_subplots,
-    :bar_width,
-    :clims,
-    :framestyle,
-    :tick_direction,
-    :camera,
-    :contour_labels,
-  ])
-
-const _plotly_seriestype = [
-    :path, :scatter, :pie, :heatmap,
-    :contour, :surface, :wireframe, :path3d, :scatter3d, :shape, :scattergl,
-    :straightline
-]
-const _plotly_style = [:auto, :solid, :dash, :dot, :dashdot]
-const _plotly_marker = [
-    :none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle,
-    :cross, :xcross, :pentagon, :hexagon, :octagon, :vline, :hline
-]
-const _plotly_scale = [:identity, :log10]
-
-defaultOutputFormat(plt::Plot{Plots.PlotlyBackend}) = "html"
-
-# ------------------------------------------------------------------------------
-# pgfplots
-
-const _pgfplots_attr = merge_with_base_supported([
-    :annotations,
-    :background_color_legend,
-    :background_color_inside,
-    # :background_color_outside,
-    # :foreground_color_legend,
-    :foreground_color_grid, :foreground_color_axis,
-    :foreground_color_text, :foreground_color_border,
-    :label,
-    :seriescolor, :seriesalpha,
-    :linecolor, :linestyle, :linewidth, :linealpha,
-    :markershape, :markercolor, :markersize, :markeralpha,
-    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha, :markerstrokestyle,
-    :fillrange, :fillcolor, :fillalpha,
-    :bins,
-    # :bar_width, :bar_edges,
-    :title,
-    # :window_title,
-    :guide, :guide_position, :lims, :ticks, :scale, :flip, :rotation,
-    :tickfont, :guidefont, :legendfont,
-    :grid, :legend,
-    :colorbar, :colorbar_title,
-    :fill_z, :line_z, :marker_z, :levels,
-    # :ribbon, :quiver, :arrow,
-    # :orientation,
-    # :overwrite_figure,
-    :polar,
-    # :normalize, :weights, :contours,
-    :aspect_ratio,
-    # :match_dimensions,
-    :tick_direction,
-    :framestyle,
-    :camera,
-    :contour_labels,
-])
-const _pgfplots_seriestype = [:path, :path3d, :scatter, :steppre, :stepmid, :steppost, :histogram2d, :ysticks, :xsticks, :contour, :shape, :straightline,]
-const _pgfplots_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
-const _pgfplots_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :pentagon, :hline, :vline] #vcat(_allMarkers, Shape)
-const _pgfplots_scale = [:identity, :ln, :log2, :log10]
-
-# ------------------------------------------------------------------------------
-# plotlyjs
-
-function _initialize_backend(pkg::PlotlyJSBackend)
-    @eval Main begin
-        import PlotlyJS, ORCA
-        export PlotlyJS
-    end
-end
-
-const _plotlyjs_attr        = _plotly_attr
-const _plotlyjs_seriestype  = _plotly_seriestype
-const _plotlyjs_style       = _plotly_style
-const _plotlyjs_marker      = _plotly_marker
-const _plotlyjs_scale       = _plotly_scale
-
-# ------------------------------------------------------------------------------
-# pyplot
-
-function _initialize_backend(::PyPlotBackend)
-    @eval Main begin
-        import PyPlot
-
-        export PyPlot
-
-        # we don't want every command to update the figure
-        PyPlot.ioff()
-    end
-end
-
-const _pyplot_attr = merge_with_base_supported([
-    :annotations,
-    :background_color_legend, :background_color_inside, :background_color_outside,
-    :foreground_color_grid, :foreground_color_legend, :foreground_color_title,
-    :foreground_color_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text,
-    :label,
-    :linecolor, :linestyle, :linewidth, :linealpha,
-    :markershape, :markercolor, :markersize, :markeralpha,
-    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
-    :fillrange, :fillcolor, :fillalpha,
-    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :title_location, :titlefont,
-    :window_title,
-    :guide, :guide_position, :lims, :ticks, :scale, :flip, :rotation,
-    :titlefontfamily, :titlefontsize, :titlefontcolor,
-    :legendfontfamily, :legendfontsize, :legendfontcolor,
-    :tickfontfamily, :tickfontsize, :tickfontcolor,
-    :guidefontfamily, :guidefontsize, :guidefontcolor,
-    :grid, :gridalpha, :gridstyle, :gridlinewidth,
-    :legend, :legendtitle, :colorbar, :colorbar_title, :colorbar_entry,
-    :marker_z, :line_z, :fill_z,
-    :levels,
-    :ribbon, :quiver, :arrow,
-    :orientation,
-    :overwrite_figure,
-    :polar,
-    :normalize, :weights,
-    :contours, :aspect_ratio,
-    :match_dimensions,
-    :clims,
-    :inset_subplots,
-    :dpi,
-    :stride,
-    :framestyle,
-    :tick_direction,
-    :camera,
-    :contour_labels,
-  ])
-const _pyplot_seriestype = [
-        :path, :steppre, :steppost, :shape, :straightline,
-        :scatter, :hexbin, #:histogram2d, :histogram,
-        # :bar,
-        :heatmap, :pie, :image,
-        :contour, :contour3d, :path3d, :scatter3d, :surface, :wireframe
-    ]
-const _pyplot_style = [:auto, :solid, :dash, :dot, :dashdot]
-const _pyplot_marker = vcat(_allMarkers, :pixel)
-const _pyplot_scale = [:identity, :ln, :log2, :log10]
-
-# ------------------------------------------------------------------------------
-# unicodeplots
-
-const _unicodeplots_attr = merge_with_base_supported([
-    :label,
-    :legend,
-    :seriescolor,
-    :seriesalpha,
-    :linestyle,
-    :markershape,
-    :bins,
-    :title,
-    :guide, :lims,
-  ])
-const _unicodeplots_seriestype = [
-    :path, :scatter, :straightline,
-    # :bar,
-    :shape,
-    :histogram2d,
-    :spy
-]
-const _unicodeplots_style = [:auto, :solid]
-const _unicodeplots_marker = [:none, :auto, :circle]
-const _unicodeplots_scale = [:identity]
-
-# ------------------------------------------------------------------------------
-# hdf5
-
-const _hdf5_attr = merge_with_base_supported([
-    :annotations,
-    :background_color_legend, :background_color_inside, :background_color_outside,
-    :foreground_color_grid, :foreground_color_legend, :foreground_color_title,
-    :foreground_color_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text,
-    :label,
-    :linecolor, :linestyle, :linewidth, :linealpha,
-    :markershape, :markercolor, :markersize, :markeralpha,
-    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
-    :fillrange, :fillcolor, :fillalpha,
-    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :title_location, :titlefont,
-    :window_title,
-    :guide, :lims, :ticks, :scale, :flip, :rotation,
-    :tickfont, :guidefont, :legendfont,
-    :grid, :legend, :colorbar,
-    :marker_z, :line_z, :fill_z,
-    :levels,
-    :ribbon, :quiver, :arrow,
-    :orientation,
-    :overwrite_figure,
-    :polar,
-    :normalize, :weights,
-    :contours, :aspect_ratio,
-    :match_dimensions,
-    :clims,
-    :inset_subplots,
-    :dpi,
-    :colorbar_title,
-  ])
-const _hdf5_seriestype = [
-        :path, :steppre, :steppost, :shape, :straightline,
-        :scatter, :hexbin, #:histogram2d, :histogram,
-        # :bar,
-        :heatmap, :pie, :image,
-        :contour, :contour3d, :path3d, :scatter3d, :surface, :wireframe
-    ]
-const _hdf5_style = [:auto, :solid, :dash, :dot, :dashdot]
-const _hdf5_marker = vcat(_allMarkers, :pixel)
-const _hdf5_scale = [:identity, :ln, :log2, :log10]
-
-# ------------------------------------------------------------------------------
-# inspectdr
-
-const _inspectdr_attr = merge_with_base_supported([
-    :annotations,
-    :background_color_legend, :background_color_inside, :background_color_outside,
-    # :foreground_color_grid,
-    :foreground_color_legend, :foreground_color_title,
-    :foreground_color_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text,
-    :label,
-    :seriescolor, :seriesalpha,
-    :linecolor, :linestyle, :linewidth, :linealpha,
-    :markershape, :markercolor, :markersize, :markeralpha,
-    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
-    :markerstrokestyle, #Causes warning not to have it... what is this?
-    :fillcolor, :fillalpha, #:fillrange,
-#    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :title_location,
-    :window_title,
-    :guide, :lims, :scale, #:ticks, :flip, :rotation,
-    :titlefontfamily, :titlefontsize, :titlefontcolor,
-    :legendfontfamily, :legendfontsize, :legendfontcolor,
-    :tickfontfamily, :tickfontsize, :tickfontcolor,
-    :guidefontfamily, :guidefontsize, :guidefontcolor,
-    :grid, :legend, #:colorbar,
-#    :marker_z,
-#    :line_z,
-#    :levels,
- #   :ribbon, :quiver, :arrow,
-#    :orientation,
-    :overwrite_figure,
-    :polar,
-#    :normalize, :weights,
-#    :contours, :aspect_ratio,
-    :match_dimensions,
-#    :clims,
-#    :inset_subplots,
-    :dpi,
-#    :colorbar_title,
-  ])
-const _inspectdr_style = [:auto, :solid, :dash, :dot, :dashdot]
-const _inspectdr_seriestype = [
-        :path, :scatter, :shape, :straightline, #, :steppre, :steppost
-    ]
-#see: _allMarkers, _shape_keys
-const _inspectdr_marker = Symbol[
-    :none, :auto,
-    :circle, :rect, :diamond,
-    :cross, :xcross,
-    :utriangle, :dtriangle, :rtriangle, :ltriangle,
-    :pentagon, :hexagon, :heptagon, :octagon,
-    :star4, :star5, :star6, :star7, :star8,
-    :vline, :hline, :+, :x,
-]
-
-const _inspectdr_scale = [:identity, :ln, :log2, :log10]
-# ------------------------------------------------------------------------------
-# pgfplotsx
-
-const _pgfplotsx_attr = merge_with_base_supported([
-    :annotations,
-    :background_color_legend,
-    :background_color_inside,
-    :background_color_outside,
-    :foreground_color_legend,
-    :foreground_color_grid,
-    :foreground_color_axis,
-    :foreground_color_text,
-    :foreground_color_border,
-    :label,
-    :seriescolor,
-    :seriesalpha,
-    :linecolor,
-    :linestyle,
-    :linewidth,
-    :linealpha,
-    :markershape,
-    :markercolor,
-    :markersize,
-    :markeralpha,
-    :markerstrokewidth,
-    :markerstrokecolor,
-    :markerstrokealpha,
-    :fillrange,
-    :fillcolor,
-    :fillalpha,
-    :bins,
-    :layout,
-    :title,
-    :window_title,
-    :guide,
-    :lims,
-    :ticks,
-    :scale,
-    :flip,
-    :match_dimensions,
-    :titlefontfamily,
-    :titlefontsize,
-    :titlefonthalign,
-    :titlefontvalign,
-    :titlefontrotation,
-    :titlefontcolor,
-    :legendfontfamily,
-    :legendfontsize,
-    :legendfonthalign,
-    :legendfontvalign,
-    :legendfontrotation,
-    :legendfontcolor,
-    :tickfontfamily,
-    :tickfontsize,
-    :tickfonthalign,
-    :tickfontvalign,
-    :tickfontrotation,
-    :tickfontcolor,
-    :guidefontfamily,
-    :guidefontsize,
-    :guidefonthalign,
-    :guidefontvalign,
-    :guidefontrotation,
-    :guidefontcolor,
-    :grid,
-    :gridalpha,
-    :gridstyle,
-    :gridlinewidth,
-    :legend,
-    :legendtitle,
-    :colorbar,
-    :colorbar_title,
-    :colorbar_entry,
-    :fill_z,
-    :line_z,
-    :marker_z,
-    :levels,
-    :ribbon,
-    :quiver,
-    :orientation,
-    :overwrite_figure,
-    :polar,
-    :aspect_ratio,
-    :normalize,
-    :weights,
-    :inset_subplots,
-    :bar_width,
-    :arrow,
-    :framestyle,
-    :tick_direction,
-    :camera,
-    :contour_labels,
-])
-const _pgfplotsx_seriestype = [
-    :path,
-    :scatter,
-    :straightline,
-    :path3d,
-    :scatter3d,
-    :surface,
-    :wireframe,
-    :heatmap,
-    :contour,
-    :contour3d,
-    :shape,
-    :steppre,
-    :stepmid,
-    :steppost,
-    :ysticks,
-    :xsticks,
-]
-const _pgfplotsx_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
-const _pgfplotsx_marker = [
-    :none,
-    :auto,
-    :circle,
-    :rect,
-    :diamond,
-    :utriangle,
-    :dtriangle,
-    :ltriangle,
-    :rtriangle,
-    :cross,
-    :xcross,
-    :star5,
-    :pentagon,
-    :hline,
-    :vline,
-    Shape,
-]
-const _pgfplotsx_scale = [:identity, :ln, :log2, :log10]
-is_marker_supported(::PGFPlotsXBackend, shape::Shape) = true
+# # create the various `is_xxx_supported` and `supported_xxxs` methods
+# # by default they pass through to checking membership in `_gr_xxx`
+# for s in (:attr, :seriestype, :marker, :style, :scale)
+#     f = Symbol("is_", s, "_supported")
+#     f2 = Symbol("supported_", s, "s")
+#     @eval begin
+#         $f(::AbstractBackend, $s) = false
+#         $f(bend::AbstractBackend, $s::AbstractVector) = all(v -> $f(bend, v), $s)
+#         $f($s) = $f(backend(), $s)
+#         $f2() = $f2(backend())
+#     end
+#
+#     for bend in backends()
+#         bend_type = typeof(_backend_instance(bend))
+#         v = Symbol("_", bend, "_", s)
+#         @eval begin
+#             $f(::$bend_type, $s::Symbol) = $s in $v
+#             $f2(::$bend_type) = $v
+#         end
+#     end
+# end
+#
+# # is_subplot_supported(::AbstractBackend) = false
+# # is_subplot_supported() = is_subplot_supported(backend())
@@ -1,637 +0,0 @@
-#HDF5 Plots: Save/replay plots to/from HDF5
-#-------------------------------------------------------------------------------
-
-#==Usage
-===============================================================================
-Write to .hdf5 file using:
-    p = plot(...)
-   Plots.hdf5plot_write(p, "plotsave.hdf5")
-
-Read from .hdf5 file using:
-    pyplot() #Must first select backend
-    pread = Plots.hdf5plot_read("plotsave.hdf5")
-    display(pread)
-==#
-
-
-#==TODO
-===============================================================================
- 1. Support more features.
-    - GridLayout known not to be working.
- 2. Improve error handling.
-    - Will likely crash if file format is off.
- 3. Save data in a folder parallel to "plot".
-    - Will make it easier for users to locate data.
-    - Use HDF5 reference to link data?
- 4. Develop an actual versioned file format.
-    - Should have some form of backward compatibility.
-    - Should be reliable for archival purposes.
- 5. Fix construction of plot object with hdf5plot_read.
-    - Not building object correctly when backends do not natively support
-      a certain feature (ex: :steppre)
-==#
-
-import FixedPointNumbers: N0f8 #In core Julia
-
-#Dispatch types:
-struct HDF5PlotNative; end #Indentifies a data element that can natively be handled by HDF5
-struct HDF5CTuple; end #Identifies a "complex" tuple structure
-
-mutable struct HDF5Plot_PlotRef
-	ref::Union{Plot, Nothing}
-end
-
-
-#==Useful constants
-===============================================================================#
-const _hdf5_nullable{T} = Union{T, Nothing}
-const _hdf5_plotroot = "plot"
-const _hdf5_dataroot = "data" #TODO: Eventually move data to different root (easier to locate)?
-const _hdf5plot_datatypeid = "TYPE" #Attribute identifying type
-const _hdf5plot_countid = "COUNT" #Attribute for storing count
-
-#Dict has problems using "Types" as keys.  Initialize in "_initialize_backend":
-const HDF5PLOT_MAP_STR2TELEM = Dict{String, Type}()
-const HDF5PLOT_MAP_TELEM2STR = Dict{Type, String}()
-
-#Don't really like this global variable... Very hacky
-const HDF5PLOT_PLOTREF = HDF5Plot_PlotRef(nothing)
-
-#Simple sub-structures that can just be written out using _hdf5plot_gwritefields:
-const HDF5PLOT_SIMPLESUBSTRUCT = Union{Font, BoundingBox,
-	GridLayout, RootLayout, ColorGradient, SeriesAnnotations, PlotText,
-	Shape,
-}
-
-
-#==
-===============================================================================#
-is_marker_supported(::HDF5Backend, shape::Shape) = true
-
-if length(HDF5PLOT_MAP_TELEM2STR) < 1
-    #Possible element types of high-level data types:
-    telem2str = Dict{String, Type}(
-        "NATIVE" => HDF5PlotNative,
-        "VOID" => Nothing,
-        "BOOL" => Bool,
-        "SYMBOL" => Symbol,
-        "TUPLE" => Tuple,
-        "CTUPLE" => HDF5CTuple, #Tuple of complex structures
-        "RGBA" => ARGB{N0f8},
-        "EXTREMA" => Extrema,
-        "LENGTH" => Length,
-        "ARRAY" => Array, #Dict won't allow Array to be key in HDF5PLOT_MAP_TELEM2STR
-
-        #Sub-structure types:
-        "FONT" => Font,
-        "BOUNDINGBOX" => BoundingBox,
-        "GRIDLAYOUT" => GridLayout,
-        "ROOTLAYOUT" => RootLayout,
-        "SERIESANNOTATIONS" => SeriesAnnotations,
-        "PLOTTEXT" => PlotText,
-        "SHAPE" => Shape,
-        "COLORGRADIENT" => ColorGradient,
-        "AXIS" => Axis,
-        "SURFACE" => Surface,
-        "SUBPLOT" => Subplot,
-        "NULLABLE" => _hdf5_nullable,
-    )
-    merge!(HDF5PLOT_MAP_STR2TELEM, telem2str)
-    merge!(HDF5PLOT_MAP_TELEM2STR, Dict{Type, String}(v=>k for (k,v) in HDF5PLOT_MAP_STR2TELEM))
-end
-
-
-#==Helper functions
-===============================================================================#
-
-_hdf5_plotelempath(subpath::String) = "$_hdf5_plotroot/$subpath"
-_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, src)
-    for (k, v) in src
-        if isa(v, Axis)
-            _hdf5_merge!(dest[k].plotattributes, v.plotattributes)
-        else
-            dest[k] = v
-        end
-    end
-    return
-end
-
-
-#==
-===============================================================================#
-
-
-# Create the window/figure for this backend.
-function _create_backend_figure(plt::Plot{HDF5Backend})
-    #Do nothing
-end
-
-# ---------------------------------------------------------------------------
-
-# # this is called early in the pipeline, use it to make the plot current or something
-# function _prepare_plot_object(plt::Plot{HDF5Backend})
-# end
-
-# ---------------------------------------------------------------------------
-
-# Set up the subplot within the backend object.
-function _initialize_subplot(plt::Plot{HDF5Backend}, sp::Subplot{HDF5Backend})
-    #Do nothing
-end
-
-# ---------------------------------------------------------------------------
-
-# Add one series to the underlying backend object.
-# Called once per series
-# NOTE: Seems to be called when user calls plot()... even if backend
-#       plot, sp.o has not yet been constructed...
-function _series_added(plt::Plot{HDF5Backend}, series::Series)
-    #Do nothing
-end
-
-# ---------------------------------------------------------------------------
-
-# When series data is added/changed, this callback can do dynamic updates to the backend object.
-# note: if the backend rebuilds the plot from scratch on display, then you might not do anything here.
-function _series_updated(plt::Plot{HDF5Backend}, series::Series)
-    #Do nothing
-end
-
-# ---------------------------------------------------------------------------
-
-# called just before updating layout bounding boxes... in case you need to prep
-# for the calcs
-function _before_layout_calcs(plt::Plot{HDF5Backend})
-    #Do nothing
-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{HDF5Backend})
-    #Do nothing
-end
-
-# ----------------------------------------------------------------
-
-# Override this to update plot items (title, xlabel, etc), and add annotations (plotattributes[:annotations])
-function _update_plot_object(plt::Plot{HDF5Backend})
-    #Do nothing
-end
-
-# ----------------------------------------------------------------
-
-# Display/show the plot (open a GUI window, or browser page, for example).
-function _display(plt::Plot{HDF5Backend})
-    msg = "HDF5 interface does not support `display()` function."
-    msg *= "\nUse `Plots.hdf5plot_write(::String)` method to write to .HDF5 \"plot\" file instead."
-    @warn(msg)
-    return
-end
-
-
-#==HDF5 write functions
-===============================================================================#
-
-function _hdf5plot_writetype(grp, k::String, tstr::Array{String})
-    d = HDF5.d_open(grp, k)
-    HDF5.a_write(d, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writetype(grp, k::String, T::Type)
-    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    d = HDF5.d_open(grp, k)
-    HDF5.a_write(d, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_overwritetype(grp, k::String, T::Type)
-    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    d = HDF5.d_open(grp, k)
-    HDF5.a_delete(d, _hdf5plot_datatypeid)
-    HDF5.a_write(d, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writetype(grp, T::Type) #Write directly to group
-    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_overwritetype(grp, T::Type) #Write directly to group
-    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    HDF5.a_delete(grp, _hdf5plot_datatypeid)
-    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writetype(grp, ::Type{Array{T}}) where T<:Any
-    tstr = HDF5PLOT_MAP_TELEM2STR[Array] #ANY
-    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writetype(grp, ::Type{T}) where T<:BoundingBox
-    tstr = HDF5PLOT_MAP_TELEM2STR[BoundingBox]
-    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writecount(grp, n::Int) #Write directly to group
-    HDF5.a_write(grp, _hdf5plot_countid, n)
-end
-function _hdf5plot_gwritefields(grp, k::String, v)
-    grp = HDF5.g_create(grp, k)
-    for _k in fieldnames(typeof(v))
-        _v = getfield(v, _k)
-        kstr = string(_k)
-        _hdf5plot_gwrite(grp, kstr, _v)
-    end
-    _hdf5plot_writetype(grp, typeof(v))
-    return
-end
-
-# Write data
-# ----------------------------------------------------------------
-
-function _hdf5plot_gwrite(grp, k::String, v) #Default
-    T = typeof(v)
-    if !(T <: Number || T <: String)
-        tstr = string(T)
-        path = HDF5.name(grp) * "/" * k
-        @info("Type not supported: $tstr\npath: $path")
-#        @show v
-        return
-    end
-    grp[k] = v
-    _hdf5plot_writetype(grp, k, HDF5PlotNative)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Array{T}) where T<:Number #Default for arrays
-    grp[k] = v
-    _hdf5plot_writetype(grp, k, HDF5PlotNative)
-end
-#=
-function _hdf5plot_gwrite(grp, k::String, v::Array{Any})
-#    @show grp, k
-    @warn("Cannot write Array: $k=$v")
-end
-=#
-function _hdf5plot_gwrite(grp, k::String, v::Nothing)
-    grp[k] = 0
-    _hdf5plot_writetype(grp, k, Nothing)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Bool)
-    grp[k] = Int(v)
-    _hdf5plot_writetype(grp, k, Bool)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Symbol)
-    grp[k] = string(v)
-    _hdf5plot_writetype(grp, k, Symbol)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Tuple)
-    varr = [v...]
-    elt = eltype(varr)
-#    if isleaftype(elt)
-
-    _hdf5plot_gwrite(grp, k, varr)
-    if elt <: Number
-        #We just wrote a simple dataset
-        _hdf5plot_overwritetype(grp, k, Tuple)
-    else #Used a more complex scheme (using subgroups):
-        _hdf5plot_overwritetype(grp[k], HDF5CTuple)
-    end
-    #NOTE: _hdf5plot_overwritetype overwrites "Array" type with "Tuple".
-end
-function _hdf5plot_gwrite(grp, k::String, plotattributes::AKW)
-#    @warn("Cannot write dict: $k=$plotattributes")
-end
-function _hdf5plot_gwrite(grp, k::String, v::AbstractRange)
-    _hdf5plot_gwrite(grp, k, collect(v)) #For now
-end
-function _hdf5plot_gwrite(grp, k::String, v::ARGB{N0f8})
-    grp[k] = [v.r.i, v.g.i, v.b.i, v.alpha.i]
-    _hdf5plot_writetype(grp, k, ARGB{N0f8})
-end
-function _hdf5plot_gwrite(grp, k::String, v::Colorant)
-    _hdf5plot_gwrite(grp, k, ARGB{N0f8}(v))
-end
-#Custom vector (when not using simple numeric type):
-function _hdf5plot_gwritearray(grp, k::String, v::Array{T}) where T
-    vgrp = HDF5.g_create(grp, k)
-    _hdf5plot_writetype(vgrp, Array) #ANY
-    sz = size(v)
-    lidx = LinearIndices(sz)
-
-    for iter in eachindex(v)
-        coord = lidx[iter]
-        elem = v[iter]
-        idxstr = join(coord, "_")
-        _hdf5plot_gwrite(vgrp, "v$idxstr", elem)
-    end
-
-    _hdf5plot_gwrite(vgrp, "dim", [sz...])
-    return
-end
-_hdf5plot_gwrite(grp, k::String, v::Array) =
-	_hdf5plot_gwritearray(grp, k, v)
-function _hdf5plot_gwrite(grp, k::String, v::Extrema)
-    grp[k] = [v.emin, v.emax]
-    _hdf5plot_writetype(grp, k, Extrema)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Length{T}) where T
-    grp[k] = v.value
-    _hdf5plot_writetype(grp, k, [HDF5PLOT_MAP_TELEM2STR[Length], string(T)])
-end
-
-# Write more complex structures:
-# ----------------------------------------------------------------
-
-function _hdf5plot_gwrite(grp, k::String, v::Plot)
-    #Don't write plot references
-end
-function _hdf5plot_gwrite(grp, k::String, v::HDF5PLOT_SIMPLESUBSTRUCT)
-    _hdf5plot_gwritefields(grp, k, v)
-    return
-end
-function _hdf5plot_gwrite(grp, k::String, v::Axis)
-    grp = HDF5.g_create(grp, k)
-    for (_k, _v) in v.plotattributes
-        kstr = string(_k)
-        _hdf5plot_gwrite(grp, kstr, _v)
-    end
-    _hdf5plot_writetype(grp, Axis)
-    return
-end
-function _hdf5plot_gwrite(grp, k::String, v::Surface)
-	grp = HDF5.g_create(grp, k)
-	_hdf5plot_gwrite(grp, "data2d", v.surf)
-	_hdf5plot_writetype(grp, Surface)
-end
-# #TODO: "Properly" support Nullable using _hdf5plot_writetype?
-# function _hdf5plot_gwrite(grp, k::String, v::_hdf5_nullable)
-#     if isnull(v)
-#         _hdf5plot_gwrite(grp, k, nothing)
-#     else
-#         _hdf5plot_gwrite(grp, k, v.value)
-#     end
-#     return
-# end
-
-function _hdf5plot_gwrite(grp, k::String, v::Subplot)
-    grp = HDF5.g_create(grp, k)
-    _hdf5plot_gwrite(grp, "index", v[:subplot_index])
-    _hdf5plot_writetype(grp, Subplot)
-    return
-end
-function _hdf5plot_write(grp, plotattributes::AKW)
-    for (k, v) in plotattributes
-        kstr = string(k)
-        _hdf5plot_gwrite(grp, kstr, v)
-    end
-    return
-end
-
-# Write main plot structures:
-# ----------------------------------------------------------------
-
-function _hdf5plot_write(sp::Subplot{HDF5Backend}, subpath::String, f)
-    f = f::HDF5.HDF5File #Assert
-    grp = HDF5.g_create(f, _hdf5_plotelempath("$subpath/attr"))
-    _hdf5plot_write(grp, sp.attr)
-    grp = HDF5.g_create(f, _hdf5_plotelempath("$subpath/series_list"))
-    _hdf5plot_writecount(grp, length(sp.series_list))
-    for (i, series) in enumerate(sp.series_list)
-        grp = HDF5.g_create(f, _hdf5_plotelempath("$subpath/series_list/series$i"))
-        _hdf5plot_write(grp, series.plotattributes)
-    end
-
-    return
-end
-
-function _hdf5plot_write(plt::Plot{HDF5Backend}, f)
-    f = f::HDF5.HDF5File #Assert
-
-    grp = HDF5.g_create(f, _hdf5_plotelempath("attr"))
-    _hdf5plot_write(grp, plt.attr)
-
-    grp = HDF5.g_create(f, _hdf5_plotelempath("subplots"))
-    _hdf5plot_writecount(grp, length(plt.subplots))
-
-    for (i, sp) in enumerate(plt.subplots)
-        _hdf5plot_write(sp, "subplots/subplot$i", f)
-    end
-
-    return
-end
-function hdf5plot_write(plt::Plot{HDF5Backend}, path::AbstractString)
-    HDF5.h5open(path, "w") do file
-        _hdf5plot_write(plt, file)
-    end
-end
-hdf5plot_write(path::AbstractString) = hdf5plot_write(current(), path)
-
-
-#==HDF5 playback (read) functions
-===============================================================================#
-
-function _hdf5plot_readcount(grp) #Read directly from group
-    return HDF5.a_read(grp, _hdf5plot_countid)
-end
-
-_hdf5plot_convert(T::Type{HDF5PlotNative}, v) = v
-_hdf5plot_convert(T::Type{Nothing}, v) = nothing
-_hdf5plot_convert(T::Type{Bool}, v) = (v!=0)
-_hdf5plot_convert(T::Type{Symbol}, v) = Symbol(v)
-_hdf5plot_convert(T::Type{Tuple}, v) = tuple(v...) #With Vector{T<:Number}
-function _hdf5plot_convert(T::Type{ARGB{N0f8}}, v)
-    r, g, b, a = reinterpret(N0f8, v)
-    return Colors.ARGB{N0f8}(r, g, b, a)
-end
-_hdf5plot_convert(T::Type{Extrema}, v) = Extrema(v[1], v[2])
-
-# Read data structures:
-# ----------------------------------------------------------------
-
-function _hdf5plot_read(grp, k::String, T::Type, dtid)
-    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)
-    grp = HDF5.g_open(grp, k)
-
-    family = _hdf5plot_read(grp, "family")
-    pointsize = _hdf5plot_read(grp, "pointsize")
-    halign = _hdf5plot_read(grp, "halign")
-    valign = _hdf5plot_read(grp, "valign")
-    rotation = _hdf5plot_read(grp, "rotation")
-    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
-    grp = HDF5.g_open(grp, k)
-    sz = _hdf5plot_read(grp, "dim")
-    if [0] == sz; return []; end
-    sz = tuple(sz...)
-    result = Array{Any}(undef, sz)
-    lidx = LinearIndices(sz)
-
-    for iter in eachindex(result)
-        coord = lidx[iter]
-        idxstr = join(coord, "_")
-        result[iter] = _hdf5plot_read(grp, "v$idxstr")
-    end
-
-    #Hack: Implicitly make Julia detect element type.
-    #      (Should probably write it explicitly to file)
-    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)
-    return tuple(v...)
-end
-function _hdf5plot_read(grp, k::String, T::Type{PlotText}, dtid)
-    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)
-    grp = HDF5.g_open(grp, k)
-
-    strs = _hdf5plot_read(grp, "strs")
-    font = _hdf5plot_read(grp, "font")
-    baseshape = _hdf5plot_read(grp, "baseshape")
-    scalefactor = _hdf5plot_read(grp, "scalefactor")
-    return SeriesAnnotations(strs, font, baseshape, scalefactor)
-end
-function _hdf5plot_read(grp, k::String, T::Type{Shape}, dtid)
-    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)
-    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)
-    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)
-    grp = HDF5.g_open(grp, k)
-
-#    parent = _hdf5plot_read(grp, "parent")
-parent = RootLayout()
-    minpad = _hdf5plot_read(grp, "minpad")
-    bbox = _hdf5plot_read(grp, "bbox")
-    grid = _hdf5plot_read(grp, "grid")
-    widths = _hdf5plot_read(grp, "widths")
-    heights = _hdf5plot_read(grp, "heights")
-    attr = KW() #TODO support attr: _hdf5plot_read(grp, "attr")
-
-    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)
-end
-function _hdf5plot_read(grp, k::String, T::Type{Surface}, dtid)
-    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)
-    grp = HDF5.g_open(grp, k)
-    idx = _hdf5plot_read(grp, "index")
-    return HDF5PLOT_PLOTREF.ref.subplots[idx]
-end
-function _hdf5plot_read(grp, k::String)
-    dtid = HDF5.a_read(grp[k], _hdf5plot_datatypeid)
-    T = _hdf5_map_str2telem(dtid) #expect exception
-    return _hdf5plot_read(grp, k, T, dtid)
-end
-
-#Read in values in group to populate plotattributes:
-function _hdf5plot_read(grp, plotattributes::AKW)
-    gnames = names(grp)
-    for k in gnames
-        try
-            v = _hdf5plot_read(grp, k)
-            plotattributes[Symbol(k)] = v
-        catch e
-            @show e
-            @show grp
-            @warn("Could not read field $k")
-        end
-    end
-    return
-end
-
-# Read main plot structures:
-# ----------------------------------------------------------------
-
-function _hdf5plot_read(sp::Subplot, subpath::String, f)
-    f = f::HDF5.HDF5File #Assert
-
-    grp = HDF5.g_open(f, _hdf5_plotelempath("$subpath/series_list"))
-    nseries = _hdf5plot_readcount(grp)
-
-    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)
-    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)
-
-    return
-end
-
-function _hdf5plot_read(plt::Plot, f)
-    f = f::HDF5.HDF5File #Assert
-    #Assumpltion: subplots are already allocated (plt.subplots)
-
-    HDF5PLOT_PLOTREF.ref = plt #Used when reading "layout"
-    grp = HDF5.g_open(f, _hdf5_plotelempath("attr"))
-    _hdf5plot_read(grp, plt.attr)
-
-    for (i, sp) in enumerate(plt.subplots)
-        _hdf5plot_read(sp, "subplots/subplot$i", f)
-    end
-
-    return
-end
-
-function hdf5plot_read(path::AbstractString)
-    plt = nothing
-    HDF5.h5open(path, "r") do file
-        grp = HDF5.g_open(file, _hdf5_plotelempath("subplots"))
-        n = _hdf5plot_readcount(grp)
-        plt = plot(layout=n) #Get reference to a new plot
-        _hdf5plot_read(plt, file)
-    end
-    return plt
-end
-
-#Last line
@@ -14,12 +14,58 @@ Add in functionality to Plots.jl:
 =#

 # ---------------------------------------------------------------------------
+#TODO: remove features
+const _inspectdr_attr = merge_with_base_supported([
+    :annotations,
+    :background_color_legend, :background_color_inside, :background_color_outside,
+    :foreground_color_grid, :foreground_color_legend, :foreground_color_title,
+    :foreground_color_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text,
+    :label,
+    :linecolor, :linestyle, :linewidth, :linealpha,
+    :markershape, :markercolor, :markersize, :markeralpha,
+    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
+    :markerstrokestyle, #Causes warning not to have it... what is this?
+    :fillcolor, :fillalpha, #:fillrange,
+#    :bins, :bar_width, :bar_edges, :bar_position,
+    :title, :title_location, :titlefont,
+    :window_title,
+    :guide, :lims, :scale, #:ticks, :flip, :rotation,
+    :tickfont, :guidefont, :legendfont,
+    :grid, :legend, #:colorbar,
+#    :marker_z,
+#    :line_z,
+#    :levels,
+ #   :ribbon, :quiver, :arrow,
+#    :orientation,
+    :overwrite_figure,
+#    :polar,
+#    :normalize, :weights,
+#    :contours, :aspect_ratio,
+    :match_dimensions,
+#    :clims,
+#    :inset_subplots,
+    :dpi,
+#    :colorbar_title,
+  ])
+const _inspectdr_style = [:auto, :solid, :dash, :dot, :dashdot]
+const _inspectdr_seriestype = [
+        :path, :scatter, :shape #, :steppre, :steppost
+    ]
+#see: _allMarkers, _shape_keys
+const _inspectdr_marker = Symbol[
+    :none, :auto,
+    :circle, :rect, :diamond,
+    :cross, :xcross,
+    :utriangle, :dtriangle, :rtriangle, :ltriangle,
+    :pentagon, :hexagon, :heptagon, :octagon,
+    :star4, :star5, :star6, :star7, :star8,
+    :vline, :hline, :+, :x,
+]
+
+const _inspectdr_scale = [:identity, :ln, :log2, :log10]

 is_marker_supported(::InspectDRBackend, shape::Shape) = true

-_inspectdr_to_pixels(bb::BoundingBox) =
-    InspectDR.BoundingBox(to_pixels(left(bb)), to_pixels(right(bb)), to_pixels(top(bb)), to_pixels(bottom(bb)))
-
 #Do we avoid Map to avoid possible pre-comile issues?
 function _inspectdr_mapglyph(s::Symbol)
    s == :rect && return :square
@@ -33,24 +79,24 @@ end

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

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

 _inspectdr_mapcolor(v::Colorant) = v
 function _inspectdr_mapcolor(g::PlotUtils.ColorGradient)
-    @warn("Color gradients are currently unsupported in InspectDR.")
+    warn("Color gradients are currently unsupported in InspectDR.")
    #Pick middle color:
    _inspectdr_mapcolor(g.colors[div(1+end,2)])
 end
 function _inspectdr_mapcolor(v::AVec)
-    @warn("Vectors of colors are currently unsupported in InspectDR.")
+    warn("Vectors of colors are currently unsupported in InspectDR.")
    #Pick middle color:
    _inspectdr_mapcolor(v[div(1+end,2)])
 end
@@ -79,39 +125,52 @@ end

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

-function _inspectdr_getscale(s::Symbol, yaxis::Bool)
+function _inspectdr_getscale(s::Symbol)
 #TODO: Support :asinh, :sqrt
-    kwargs = yaxis ? (:tgtmajor=>8, :tgtminor=>2) : () #More grid lines on y-axis
    if :log2 == s
-        return InspectDR.AxisScale(:log2; kwargs...)
+        return InspectDR.AxisScale(:log2)
    elseif :log10 == s
-        return InspectDR.AxisScale(:log10; kwargs...)
+        return InspectDR.AxisScale(:log10)
    elseif :ln == s
-        return InspectDR.AxisScale(:ln; kwargs...)
+        return InspectDR.AxisScale(:ln)
    else #identity
-        return InspectDR.AxisScale(:lin; kwargs...)
+        return InspectDR.AxisScale(:lin)
    end
 end

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

-#Glyph used when plotting "Shape"s:
-INSPECTDR_GLYPH_SHAPE = InspectDR.GlyphPolyline(
-    2*InspectDR.GLYPH_SQUARE.x, InspectDR.GLYPH_SQUARE.y
-)
-
-mutable struct InspecDRPlotRef
-    mplot::Union{Nothing, InspectDR.Multiplot}
-    gui::Union{Nothing, InspectDR.GtkPlot}
+function add_backend_string(::InspectDRBackend)
+    """
+    if !Plots.is_installed("InspectDR")
+        Pkg.add("InspectDR")
+    end
+    """
 end

-_inspectdr_getmplot(::Any) = nothing
-_inspectdr_getmplot(r::InspecDRPlotRef) = r.mplot
+function _initialize_backend(::InspectDRBackend; kw...)
+    @eval begin
+        import InspectDR
+        export InspectDR

-_inspectdr_getgui(::Any) = nothing
-_inspectdr_getgui(gplot::InspectDR.GtkPlot) = (gplot.destroyed ? nothing : gplot)
-_inspectdr_getgui(r::InspecDRPlotRef) = _inspectdr_getgui(r.gui)
-push!(_initialized_backends, :inspectdr)
+        #Glyph used when plotting "Shape"s:
+        const INSPECTDR_GLYPH_SHAPE = InspectDR.GlyphPolyline(
+            2*InspectDR.GLYPH_SQUARE.x, InspectDR.GLYPH_SQUARE.y
+        )
+
+        type InspecDRPlotRef
+            mplot::Union{Void, InspectDR.Multiplot}
+            gui::Union{Void, InspectDR.GtkPlot}
+        end
+
+        _inspectdr_getmplot(::Any) = nothing
+        _inspectdr_getmplot(r::InspecDRPlotRef) = r.mplot
+
+        _inspectdr_getgui(::Any) = nothing
+        _inspectdr_getgui(gplot::InspectDR.GtkPlot) = (gplot.destroyed? nothing: gplot)
+        _inspectdr_getgui(r::InspecDRPlotRef) = _inspectdr_getgui(r.gui)
+    end
+end

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

@@ -121,9 +180,9 @@ function _create_backend_figure(plt::Plot{InspectDRBackend})
    gplot = _inspectdr_getgui(plt.o)

    #:overwrite_figure: want to reuse current figure
-    if plt[:overwrite_figure] && mplot !== nothing
+    if plt[:overwrite_figure] && mplot != nothing
        mplot.subplots = [] #Reset
-        if gplot !== nothing #Ensure still references current plot
+        if gplot != nothing #Ensure still references current plot
            gplot.src = mplot
        end
    else #want new one:
@@ -150,10 +209,14 @@ end
 # Set up the subplot within the backend object.
 function _initialize_subplot(plt::Plot{InspectDRBackend}, sp::Subplot{InspectDRBackend})
    plot = sp.o
+
    #Don't do anything without a "subplot" object:  Will process later.
    if nothing == plot; return; end
    plot.data = []
-    plot.userannot = [] #Clear old markers/text annotation/polyline "annotation"
+    plot.markers = [] #Clear old markers
+    plot.atext = [] #Clear old annotation
+    plot.apline = [] #Clear old poly lines
+
    return plot
 end

@@ -171,18 +234,8 @@ function _series_added(plt::Plot{InspectDRBackend}, series::Series)
    #Don't do anything without a "subplot" object:  Will process later.
    if nothing == plot; return; end

-    _vectorize(v) = isa(v, Vector) ? v : collect(v) #InspectDR only supports vectors
-    x, y = if st == :straightline
-        straightline_data(series)
-    else
-        _vectorize(series[:x]), _vectorize(series[:y])
-    end
-
-    #No support for polar grid... but can still perform polar transformation:
-    if ispolar(sp)
-        Θ = x; r = y
-        x = r.*cos.(Θ); y = r.*sin.(Θ)
-    end
+    _vectorize(v) = isa(v, Vector)? v: collect(v) #InspectDR only supports vectors
+    x = _vectorize(series[:x]); y = _vectorize(series[:y])

    # doesn't handle mismatched x/y - wrap data (pyplot behaviour):
    nx = length(x); ny = length(y)
@@ -201,33 +254,28 @@ For st in :shape:
 =#

    if st in (:shape,)
-        x, y = shape_data(series)
        nmax = 0
        for (i,rng) in enumerate(iter_segments(x, y))
            nmax = i
            if length(rng) > 1
                linewidth = series[:linewidth]
-                c = plot_color(get_linecolor(series), get_linealpha(series))
-                linecolor = _inspectdr_mapcolor(_cycle(c, i))
-                c = plot_color(get_fillcolor(series), get_fillalpha(series))
-                fillcolor = _inspectdr_mapcolor(_cycle(c, i))
+                linecolor = _inspectdr_mapcolor(cycle(series[:linecolor], i))
+                fillcolor = _inspectdr_mapcolor(cycle(series[:fillcolor], i))
                line = InspectDR.line(
                    style=:solid, width=linewidth, color=linecolor
                )
                apline = InspectDR.PolylineAnnotation(
                    x[rng], y[rng], line=line, fillcolor=fillcolor
                )
-                InspectDR.add(plot, apline)
+                push!(plot.apline, apline)
            end
        end

-        i = (nmax >= 2 ? div(nmax, 2) : nmax) #Must pick one set of colors for legend
+        i = (nmax >= 2? div(nmax, 2): nmax) #Must pick one set of colors for legend
        if i > 1 #Add dummy waveform for legend entry:
            linewidth = series[:linewidth]
-            c = plot_color(get_linecolor(series), get_linealpha(series))
-            linecolor = _inspectdr_mapcolor(_cycle(c, i))
-            c = plot_color(get_fillcolor(series), get_fillalpha(series))
-            fillcolor = _inspectdr_mapcolor(_cycle(c, i))
+            linecolor = _inspectdr_mapcolor(cycle(series[:linecolor], i))
+            fillcolor = _inspectdr_mapcolor(cycle(series[:fillcolor], i))
            wfrm = InspectDR.add(plot, Float64[], Float64[], id=series[:label])
            wfrm.line = InspectDR.line(
                style=:none, width=linewidth, #linewidth affects glyph
@@ -237,16 +285,16 @@ For st in :shape:
                color = linecolor, fillcolor = fillcolor
            )
        end
-   elseif st in (:path, :scatter, :straightline) #, :steppre, :steppost)
+   elseif st in (:path, :scatter) #, :steppre, :steppost)
        #NOTE: In Plots.jl, :scatter plots have 0-linewidths (I think).
        linewidth = series[:linewidth]
        #More efficient & allows some support for markerstrokewidth:
-        _style = (0==linewidth ? :none : series[:linestyle])
+        _style = (0==linewidth? :none: series[:linestyle])
        wfrm = InspectDR.add(plot, x, y, id=series[:label])
        wfrm.line = InspectDR.line(
            style = _style,
            width = series[:linewidth],
-            color = plot_color(get_linecolor(series), get_linealpha(series)),
+            color = series[:linecolor],
        )
        #InspectDR does not control markerstrokewidth independently.
        if :none == _style
@@ -256,8 +304,8 @@ For st in :shape:
        wfrm.glyph = InspectDR.glyph(
            shape = _inspectdr_mapglyph(series[:markershape]),
            size = _inspectdr_mapglyphsize(series[:markersize]),
-            color = _inspectdr_mapcolor(plot_color(series[:markerstrokecolor], series[:markerstrokealpha])),
-            fillcolor = _inspectdr_mapcolor(plot_color(series[:markercolor], series[:markeralpha])),
+            color = _inspectdr_mapcolor(series[:markerstrokecolor]),
+            fillcolor = _inspectdr_mapcolor(series[:markercolor]),
        )
    end

@@ -280,75 +328,56 @@ end
 # ---------------------------------------------------------------------------

 function _inspectdr_setupsubplot(sp::Subplot{InspectDRBackend})
-    plot = sp.o
-    strip = plot.strips[1] #Only 1 strip supported with Plots.jl
+    const gridon = InspectDR.grid(vmajor=true, hmajor=true)
+    const gridoff = InspectDR.grid()
+    const plot = sp.o

    xaxis = sp[:xaxis]; yaxis = sp[:yaxis]
-    xgrid_show = xaxis[:grid]
-    ygrid_show = yaxis[:grid]
-
-    strip.grid = InspectDR.GridRect(
-    	vmajor=xgrid_show, # vminor=xgrid_show,
-    	hmajor=ygrid_show, # hminor=ygrid_show,
-    )
-
-        plot.xscale = _inspectdr_getscale(xaxis[:scale], false)
-        strip.yscale = _inspectdr_getscale(yaxis[:scale], true)
-        xmin, xmax  = axis_limits(sp, :x)
-        ymin, ymax  = axis_limits(sp, :y)
-        if ispolar(sp)
-            #Plots.jl appears to give (xmin,xmax) ≜ (Θmin,Θmax) & (ymin,ymax) ≜ (rmin,rmax)
-            rmax = NaNMath.max(abs(ymin), abs(ymax))
-            xmin, xmax = -rmax, rmax
-            ymin, ymax = -rmax, rmax
-        end
-        plot.xext = InspectDR.PExtents1D() #reset
-        strip.yext = InspectDR.PExtents1D() #reset
-        plot.xext_full = InspectDR.PExtents1D(xmin, xmax)
-        strip.yext_full = InspectDR.PExtents1D(ymin, ymax)
+        xscale = _inspectdr_getscale(xaxis[:scale])
+        yscale = _inspectdr_getscale(yaxis[:scale])
+        plot.axes = InspectDR.AxesRect(xscale, yscale)
+        xmin, xmax  = axis_limits(xaxis)
+        ymin, ymax  = axis_limits(yaxis)
+        plot.ext = InspectDR.PExtents2D() #reset
+        plot.ext_full = InspectDR.PExtents2D(xmin, xmax, ymin, ymax)
    a = plot.annotation
        a.title = sp[:title]
-        a.xlabel = xaxis[:guide]; a.ylabels = [yaxis[:guide]]
+        a.xlabel = xaxis[:guide]; a.ylabel = yaxis[:guide]

    l = plot.layout
-        l[:frame_canvas].fillcolor = _inspectdr_mapcolor(sp[:background_color_subplot])
-        l[:frame_data].fillcolor = _inspectdr_mapcolor(sp[:background_color_inside])
-        l[:frame_data].line.color = _inspectdr_mapcolor(xaxis[:foreground_color_axis])
-        l[:font_title] = InspectDR.Font(sp[:titlefontfamily],
-            _inspectdr_mapptsize(sp[:titlefontsize]),
-            color = _inspectdr_mapcolor(sp[:titlefontcolor])
+        l.framedata.fillcolor = _inspectdr_mapcolor(sp[:background_color_inside])
+        l.framedata.line.color = _inspectdr_mapcolor(xaxis[:foreground_color_axis])
+        l.fnttitle = InspectDR.Font(sp[:titlefont].family,
+            _inspectdr_mapptsize(sp[:titlefont].pointsize),
+            color = _inspectdr_mapcolor(sp[:foreground_color_title])
        )
        #Cannot independently control fonts of axes with InspectDR:
-        l[:font_axislabel] = InspectDR.Font(xaxis[:guidefontfamily],
-            _inspectdr_mapptsize(xaxis[:guidefontsize]),
-            color = _inspectdr_mapcolor(xaxis[:guidefontcolor])
+        l.fntaxlabel = InspectDR.Font(xaxis[:guidefont].family,
+            _inspectdr_mapptsize(xaxis[:guidefont].pointsize),
+            color = _inspectdr_mapcolor(xaxis[:foreground_color_guide])
        )
-        l[:font_ticklabel] = InspectDR.Font(xaxis[:tickfontfamily],
-            _inspectdr_mapptsize(xaxis[:tickfontsize]),
-            color = _inspectdr_mapcolor(xaxis[:tickfontcolor])
+        l.fntticklabel = InspectDR.Font(xaxis[:tickfont].family,
+            _inspectdr_mapptsize(xaxis[:tickfont].pointsize),
+            color = _inspectdr_mapcolor(xaxis[:foreground_color_text])
        )
-        l[:enable_legend] = (sp[:legend] != :none)
-        #l[:halloc_legend] = 150 #TODO: compute???
-        l[:font_legend] = InspectDR.Font(sp[:legendfontfamily],
-            _inspectdr_mapptsize(sp[:legendfontsize]),
-            color = _inspectdr_mapcolor(sp[:legendfontcolor])
+        #No independent control of grid???
+        l.grid = sp[:grid]? gridon: gridoff
+    leg = l.legend
+        leg.enabled = (sp[:legend] != :none)
+        #leg.width = 150 #TODO: compute???
+        leg.font = InspectDR.Font(sp[:legendfont].family,
+            _inspectdr_mapptsize(sp[:legendfont].pointsize),
+            color = _inspectdr_mapcolor(sp[:foreground_color_legend])
        )
-        l[:frame_legend].fillcolor = _inspectdr_mapcolor(sp[:background_color_legend])
+        leg.frame.fillcolor = _inspectdr_mapcolor(sp[:background_color_legend])
 end

 # called just before updating layout bounding boxes... in case you need to prep
 # for the calcs
 function _before_layout_calcs(plt::Plot{InspectDRBackend})
-    mplot = _inspectdr_getmplot(plt.o)
+    const mplot = _inspectdr_getmplot(plt.o)
    if nothing == mplot; return; end

-    mplot.title = plt[:plot_title]
-    if "" == mplot.title
-        #Don't use window_title... probably not what you want.
-        #mplot.title = plt[:window_title]
-    end
-    mplot.layout[:frame].fillcolor = _inspectdr_mapcolor(plt[:background_color_outside])
-
    resize!(mplot.subplots, length(plt.subplots))
    nsubplots = length(plt.subplots)
    for (i, sp) in enumerate(plt.subplots)
@@ -356,28 +385,30 @@ function _before_layout_calcs(plt::Plot{InspectDRBackend})
            mplot.subplots[i] = InspectDR.Plot2D()
        end
        sp.o = mplot.subplots[i]
-        plot = sp.o
        _initialize_subplot(plt, sp)
        _inspectdr_setupsubplot(sp)

+            sp.o.layout.frame.fillcolor =
+                _inspectdr_mapcolor(plt[:background_color_outside])
+
        # add the annotations
        for ann in sp[:annotations]
-            _inspectdr_add_annotations(plot, ann...)
+            _inspectdr_add_annotations(mplot.subplots[i], ann...)
        end
    end

    #Do not yet support absolute plot positionning.
    #Just try to make things look more-or less ok:
    if nsubplots <= 1
-        mplot.layout[:ncolumns] = 1
+        mplot.ncolumns = 1
    elseif nsubplots <= 4
-        mplot.layout[:ncolumns] = 2
+        mplot.ncolumns = 2
    elseif nsubplots <= 6
-        mplot.layout[:ncolumns] = 3
+        mplot.ncolumns = 3
    elseif nsubplots <= 12
-        mplot.layout[:ncolumns] = 4
+        mplot.ncolumns = 4
    else
-        mplot.layout[:ncolumns] = 5
+        mplot.ncolumns = 5
    end

    for series in plt.series_list
@@ -391,34 +422,16 @@ 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{InspectDRBackend})
-    plot = sp.o
-    if !isa(plot, InspectDR.Plot2D); return sp.minpad; end
-    #Computing plotbounds with 0-BoundingBox returns required padding:
-    bb = InspectDR.plotbounds(plot.layout.values, InspectDR.BoundingBox(0,0,0,0))
-    #NOTE: plotbounds always pads for titles, legends, etc. even if not in use.
-    #TODO: possibly zero-out items not in use??
-
-    # add in the user-specified margin to InspectDR padding:
-    leftpad   = abs(bb.xmin)*px + sp[:left_margin]
-    toppad    = abs(bb.ymin)*px + sp[:top_margin]
-    rightpad  = abs(bb.xmax)*px + sp[:right_margin]
-    bottompad = abs(bb.ymax)*px + sp[:bottom_margin]
-    sp.minpad = (leftpad, toppad, rightpad, bottompad)
+    sp.minpad = (20mm, 5mm, 2mm, 10mm)
+    #TODO: Add support for padding.
 end

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

-# Override this to update plot items (title, xlabel, etc), and add annotations (plotattributes[:annotations])
+# Override this to update plot items (title, xlabel, etc), and add annotations (d[:annotations])
 function _update_plot_object(plt::Plot{InspectDRBackend})
    mplot = _inspectdr_getmplot(plt.o)
    if nothing == mplot; return; end
-
-    for (i, sp) in enumerate(plt.subplots)
-        graphbb = _inspectdr_to_pixels(plotarea(sp))
-        plot = mplot.subplots[i]
-        plot.plotbb = InspectDR.plotbounds(plot.layout.values, graphbb)
-    end
-
    gplot = _inspectdr_getgui(plt.o)
    if nothing == gplot; return; end

@@ -439,23 +452,22 @@ const _inspectdr_mimeformats_nodpi = Dict(
 #    "application/postscript"  => "ps", #TODO: support once Cairo supports PSSurface
    "application/pdf"         => "pdf"
 )
-_inspectdr_show(io::IO, mime::MIME, ::Nothing, w, h) =
+_inspectdr_show(io::IO, mime::MIME, ::Void) =
    throw(ErrorException("Cannot show(::IO, ...) plot - not yet generated"))
-function _inspectdr_show(io::IO, mime::MIME, mplot, w, h)
-    InspectDR._show(io, mime, mplot, Float64(w), Float64(h))
-end
+_inspectdr_show(io::IO, mime::MIME, mplot) = show(io, mime, mplot)

 for (mime, fmt) in _inspectdr_mimeformats_dpi
    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
        dpi = plt[:dpi]#TODO: support
-        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
+        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o))
    end
 end
 for (mime, fmt) in _inspectdr_mimeformats_nodpi
    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
-        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
+        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o))
    end
 end
+_show(io::IO, mime::MIME"text/plain", plt::Plot{InspectDRBackend}) = nothing #Don't show

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

@@ -1,24 +0,0 @@
-function plotlybase_syncplot(plt::Plot)
-    plt.o = ORCA.PlotlyBase.Plot()
-    traces = ORCA.PlotlyBase.GenericTrace[]
-    for series_dict in plotly_series(plt)
-        plotly_type = pop!(series_dict, :type)
-        push!(traces, ORCA.PlotlyBase.GenericTrace(plotly_type; series_dict...))
-    end
-    ORCA.PlotlyBase.addtraces!(plt.o, traces...)
-    layout = plotly_layout(plt)
-    w, h = plt[:size]
-    ORCA.PlotlyBase.relayout!(plt.o, layout, width = w, height = h)
-    return plt.o
-end
-
-const _orca_mimeformats = Dict(
-    "application/pdf" => "pdf",
-    "image/png"       => "png",
-    "image/svg+xml"   => "svg",
-    "image/eps"       => "eps",
-)
-
-for (mime, fmt) in _orca_mimeformats
-    @eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyBackend}) = ORCA.PlotlyBase.savefig(io, plotlybase_syncplot(plt), format = $fmt)
-end
@@ -2,6 +2,59 @@

 # significant contributions by: @pkofod

+const _pgfplots_attr = merge_with_base_supported([
+    # :annotations,
+    # :background_color_legend,
+    :background_color_inside,
+    # :background_color_outside,
+    # :foreground_color_legend, :foreground_color_grid, :foreground_color_axis,
+    #     :foreground_color_text, :foreground_color_border,
+    :label,
+    :seriescolor, :seriesalpha,
+    :linecolor, :linestyle, :linewidth, :linealpha,
+    :markershape, :markercolor, :markersize, :markeralpha,
+    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha, :markerstrokestyle,
+    :fillrange, :fillcolor, :fillalpha,
+    :bins,
+    # :bar_width, :bar_edges,
+    :title,
+    # :window_title,
+    :guide, :lims, :ticks, :scale, :flip, :rotation,
+    :tickfont, :guidefont, :legendfont,
+    :grid, :legend,
+    # :colorbar,
+    # :marker_z, :levels,
+    # :ribbon, :quiver, :arrow,
+    # :orientation,
+    # :overwrite_figure,
+    # :polar,
+    # :normalize, :weights, :contours,
+    :aspect_ratio,
+    # :match_dimensions,
+  ])
+const _pgfplots_seriestype = [:path, :path3d, :scatter, :steppre, :stepmid, :steppost, :histogram2d, :ysticks, :xsticks, :contour]
+const _pgfplots_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
+const _pgfplots_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :pentagon] #vcat(_allMarkers, Shape)
+const _pgfplots_scale = [:identity, :ln, :log2, :log10]
+
+
+# --------------------------------------------------------------------------------------
+
+function add_backend_string(::PGFPlotsBackend)
+    """
+    Pkg.add("PGFPlots")
+    Pkg.build("PGFPlots")
+    """
+end
+
+function _initialize_backend(::PGFPlotsBackend; kw...)
+    @eval begin
+        import PGFPlots
+        export PGFPlots
+    end
+end
+
+
 # --------------------------------------------------------------------------------------

 const _pgfplots_linestyles = KW(
@@ -26,8 +79,6 @@ const _pgfplots_markers = KW(
    :star6 => "asterisk",
    :diamond => "diamond*",
    :pentagon => "pentagon*",
-    :hline => "-",
-    :vline => "|"
 )

 const _pgfplots_legend_pos = KW(
@@ -35,7 +86,6 @@ const _pgfplots_legend_pos = KW(
    :bottomright => "south east",
    :topright => "north east",
    :topleft => "north west",
-    :outertopright => "outer north east",
 )


@@ -48,268 +98,109 @@ const _pgf_series_extrastyle = KW(
    :xsticks => "xcomb",
 )

-# PGFPlots uses the anchors to define orientations for example to align left
-# one needs to use the right edge as anchor
-const _pgf_annotation_halign = KW(
-    :center => "",
-    :left => "right",
-    :right => "left"
-)
-
-const _pgf_framestyles = [:box, :axes, :origin, :zerolines, :grid, :none]
-const _pgf_framestyle_defaults = Dict(:semi => :box)
-function pgf_framestyle(style::Symbol)
-    if style in _pgf_framestyles
-        return style
-    else
-        default_style = get(_pgf_framestyle_defaults, style, :axes)
-        @warn("Framestyle :$style is not (yet) supported by the PGFPlots backend. :$default_style was cosen instead.")
-        default_style
-    end
-end
-
 # --------------------------------------------------------------------------------------

 # takes in color,alpha, and returns color and alpha appropriate for pgf style
-function pgf_color(c::Colorant)
+function pgf_color(c)
    cstr = @sprintf("{rgb,1:red,%.8f;green,%.8f;blue,%.8f}", red(c), green(c), blue(c))
    cstr, alpha(c)
 end

-function pgf_color(grad::ColorGradient)
-    # Can't handle ColorGradient here, fallback to defaults.
-    cstr = @sprintf("{rgb,1:red,%.8f;green,%.8f;blue,%.8f}", 0.0, 0.60560316,0.97868012)
-    cstr, 1
-end
-
-# Generates a colormap for pgfplots based on a ColorGradient
-function pgf_colormap(grad::ColorGradient)
-    join(map(grad.colors) do c
-        @sprintf("rgb=(%.8f,%.8f,%.8f)", red(c), green(c),blue(c))
-    end,", ")
-end
-
-pgf_thickness_scaling(plt::Plot) = plt[:thickness_scaling]
-pgf_thickness_scaling(sp::Subplot) = pgf_thickness_scaling(sp.plt)
-pgf_thickness_scaling(series) = pgf_thickness_scaling(series[:subplot])
-
-function pgf_fillstyle(plotattributes, i = 1)
-    cstr,a = pgf_color(get_fillcolor(plotattributes, i))
-    fa = get_fillalpha(plotattributes, i)
-    if fa !== nothing
-        a = fa
-    end
+function pgf_fillstyle(d::KW)
+    cstr,a = pgf_color(d[:fillcolor])
    "fill = $cstr, fill opacity=$a"
 end

-function pgf_linestyle(linewidth::Real, color, α = 1, linestyle = "solid")
-    cstr, a = pgf_color(plot_color(color, α))
+function pgf_linestyle(d::KW)
+    cstr,a = pgf_color(d[:linecolor])
    """
    color = $cstr,
-    draw opacity = $a,
-    line width = $linewidth,
-    $(get(_pgfplots_linestyles, linestyle, "solid"))"""
+    draw opacity=$a,
+    line width=$(d[:linewidth]),
+    $(get(_pgfplots_linestyles, d[:linestyle], "solid"))"""
 end

-function pgf_linestyle(plotattributes, i = 1)
-    lw = pgf_thickness_scaling(plotattributes) * get_linewidth(plotattributes, i)
-    lc = get_linecolor(plotattributes, i)
-    la = get_linealpha(plotattributes, i)
-    ls = get_linestyle(plotattributes, i)
-    return pgf_linestyle(lw, lc, la, ls)
-end
-
-function pgf_font(fontsize, thickness_scaling = 1, font = "\\selectfont")
-    fs = fontsize * thickness_scaling
-    return string("{\\fontsize{", fs, " pt}{", 1.3fs, " pt}", font, "}")
-end
-
-function pgf_marker(plotattributes, i = 1)
-    shape = _cycle(plotattributes[:markershape], i)
-    cstr, a = pgf_color(plot_color(get_markercolor(plotattributes, i), get_markeralpha(plotattributes, i)))
-    cstr_stroke, a_stroke = pgf_color(plot_color(get_markerstrokecolor(plotattributes, i), get_markerstrokealpha(plotattributes, i)))
-    return string(
-        "mark = $(get(_pgfplots_markers, shape, "*")),\n",
-        "mark size = $(pgf_thickness_scaling(plotattributes) * 0.5 * _cycle(plotattributes[:markersize], i)),\n",
-        plotattributes[:seriestype] == :scatter ? "only marks,\n" : "",
-        "mark options = {
-            color = $cstr_stroke, draw opacity = $a_stroke,
-            fill = $cstr, fill opacity = $a,
-            line width = $(pgf_thickness_scaling(plotattributes) * _cycle(plotattributes[:markerstrokewidth], i)),
-            rotate = $(shape == :dtriangle ? 180 : 0),
-            $(get(_pgfplots_linestyles, _cycle(plotattributes[:markerstrokestyle], i), "solid"))
-        }"
-        )
-end
-
-function pgf_add_annotation!(o, x, y, val, thickness_scaling = 1)
-    # Construct the style string.
-    # Currently supports color and orientation
-    cstr,a = pgf_color(val.font.color)
-    push!(o, PGFPlots.Plots.Node(val.str, # Annotation Text
-        x, y,
-        style="""
-        $(get(_pgf_annotation_halign,val.font.halign,"")),
-        color=$cstr, draw opacity=$(convert(Float16,a)),
-        rotate=$(val.font.rotation),
-        font=$(pgf_font(val.font.pointsize, thickness_scaling))
-        """))
+function pgf_marker(d::KW)
+    shape = d[:markershape]
+    cstr, a = pgf_color(d[:markercolor])
+    cstr_stroke, a_stroke = pgf_color(d[:markerstrokecolor])
+    """
+    mark = $(get(_pgfplots_markers, shape, "*")),
+    mark size = $(0.5 * d[:markersize]),
+    mark options = {
+        color = $cstr_stroke, draw opacity = $a_stroke,
+        fill = $cstr, fill opacity = $a,
+        line width = $(d[:markerstrokewidth]),
+        rotate = $(shape == :dtriangle ? 180 : 0),
+        $(get(_pgfplots_linestyles, d[:markerstrokestyle], "solid"))
+    }"""
 end

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

 function pgf_series(sp::Subplot, series::Series)
-    plotattributes = series.plotattributes
-    st = plotattributes[:seriestype]
-    series_collection = PGFPlots.Plot[]
+    d = series.d
+    st = d[:seriestype]
+    style = []
+    kw = KW()
+
+    push!(style, pgf_linestyle(d))
+    push!(style, pgf_marker(d))
+
+    if d[:fillrange] != nothing
+        push!(style, pgf_fillstyle(d))
+    end
+
+    # add to legend?
+    if sp[:legend] != :none && should_add_to_legend(series)
+        kw[:legendentry] = d[:label]
+    else
+        push!(style, "forget plot")
+    end

    # function args
-    args = if st == :contour
-        plotattributes[:z].surf, plotattributes[:x], plotattributes[:y]
+    args = if st  == :contour
+        d[:z].surf, d[:x], d[:y]
    elseif is3d(st)
-        plotattributes[:x], plotattributes[:y], plotattributes[:z]
-    elseif st == :straightline
-        straightline_data(series)
-    elseif st == :shape
-        shape_data(series)
-    elseif ispolar(sp)
-        theta, r = plotattributes[:x], plotattributes[:y]
-        rad2deg.(theta), r
+        d[:x], d[:y], d[:z]
    else
-        plotattributes[:x], plotattributes[:y]
+        d[:x], d[:y]
    end

    # PGFPlots can't handle non-Vector?
-    # args = map(a -> if typeof(a) <: AbstractVector && typeof(a) != Vector
-    #         collect(a)
-    #     else
-    #         a
-    #     end, args)
-
-    if st in (:contour, :histogram2d)
-        style = []
-        kw = KW()
-        push!(style, pgf_linestyle(plotattributes))
-        push!(style, pgf_marker(plotattributes))
-        push!(style, "forget plot")
-
-        kw[:style] = join(style, ',')
-        func = if st == :histogram2d
-            PGFPlots.Histogram2
+    args = map(a -> if typeof(a) <: AbstractVector && typeof(a) != Vector
+            collect(a)
        else
-            kw[:labels] = series[:contour_labels]
-            kw[:levels] = series[:levels]
-            PGFPlots.Contour
-        end
-        push!(series_collection, func(args...; kw...))
+            a
+        end, args)
+    # for (i,a) in enumerate(args)
+    #     if typeof(a) <: AbstractVector && typeof(a) != Vector
+    #         args[i] = collect(a)
+    #     end
+    # end

-    else
-        # series segments
-        segments = iter_segments(series)
-        for (i, rng) in enumerate(segments)
-            style = []
-            kw = KW()
-            push!(style, pgf_linestyle(plotattributes, i))
-            push!(style, pgf_marker(plotattributes, i))
-
-            if st == :shape
-                push!(style, pgf_fillstyle(plotattributes, i))
-            end
-
-            # add to legend?
-            if i == 1 && sp[:legend] != :none && should_add_to_legend(series)
-                if plotattributes[:fillrange] !== nothing
-                    push!(style, "forget plot")
-                    push!(series_collection, pgf_fill_legend_hack(plotattributes, args))
-                else
-                    kw[:legendentry] = plotattributes[:label]
-                    if st == :shape # || plotattributes[:fillrange] !== nothing
-                        push!(style, "area legend")
-                    end
-                end
-            else
-                push!(style, "forget plot")
-            end
-
-            seg_args = (arg[rng] for arg in args)
-
-            # include additional style, then add to the kw
-            if haskey(_pgf_series_extrastyle, st)
-                push!(style, _pgf_series_extrastyle[st])
-            end
-            kw[:style] = join(style, ',')
-
-            # add fillrange
-            if series[:fillrange] !== nothing && st != :shape
-                push!(series_collection, pgf_fillrange_series(series, i, _cycle(series[:fillrange], rng), seg_args...))
-            end
-
-            # build/return the series object
-            func = if st == :path3d
-                PGFPlots.Linear3
-            elseif st == :scatter
-                PGFPlots.Scatter
-            else
-                PGFPlots.Linear
-            end
-            push!(series_collection, func(seg_args...; kw...))
-        end
-    end
-    series_collection
-end
-
-function pgf_fillrange_series(series, i, fillrange, args...)
-    st = series[:seriestype]
-    style = []
-    kw = KW()
-    push!(style, "line width = 0")
-    push!(style, "draw opacity = 0")
-    push!(style, pgf_fillstyle(series, i))
-    push!(style, pgf_marker(series, i))
-    push!(style, "forget plot")
+    # include additional style, then add to the kw
    if haskey(_pgf_series_extrastyle, st)
        push!(style, _pgf_series_extrastyle[st])
    end
    kw[:style] = join(style, ',')
-    func = is3d(series) ? PGFPlots.Linear3 : PGFPlots.Linear
-    return func(pgf_fillrange_args(fillrange, args...)...; kw...)
-end

-function pgf_fillrange_args(fillrange, x, y)
-    n = length(x)
-    x_fill = [x; x[n:-1:1]; x[1]]
-    y_fill = [y; _cycle(fillrange, n:-1:1); y[1]]
-    return x_fill, y_fill
-end
-
-function pgf_fillrange_args(fillrange, x, y, z)
-    n = length(x)
-    x_fill = [x; x[n:-1:1]; x[1]]
-    y_fill = [y; y[n:-1:1]; x[1]]
-    z_fill = [z; _cycle(fillrange, n:-1:1); z[1]]
-    return x_fill, y_fill, z_fill
-end
-
-function pgf_fill_legend_hack(plotattributes, args)
-    style = []
-    kw = KW()
-    push!(style, pgf_linestyle(plotattributes, 1))
-    push!(style, pgf_marker(plotattributes, 1))
-    push!(style, pgf_fillstyle(plotattributes, 1))
-    push!(style, "area legend")
-    kw[:legendentry] = plotattributes[:label]
-    kw[:style] = join(style, ',')
-    st = plotattributes[:seriestype]
+    # build/return the series object
    func = if st == :path3d
        PGFPlots.Linear3
    elseif st == :scatter
        PGFPlots.Scatter
+    elseif st == :histogram2d
+        PGFPlots.Histogram2
+    elseif st == :contour
+        PGFPlots.Contour
    else
        PGFPlots.Linear
    end
-    return func(([arg[1]] for arg in args)...; kw...)
+    func(args...; kw...)
 end

+
 # ----------------------------------------------------------------

 function pgf_axis(sp::Subplot, letter)
@@ -317,27 +208,9 @@ function pgf_axis(sp::Subplot, letter)
    style = []
    kw = KW()

-    # turn off scaled ticks
-    push!(style, "scaled $(letter) ticks = false")
-
-    # set to supported framestyle
-    framestyle = pgf_framestyle(sp[:framestyle])
-
    # axis guide
    kw[Symbol(letter,:label)] = axis[:guide]

-    # axis label position
-    labelpos = ""
-    if letter == :x && axis[:guide_position] == :top
-        labelpos = "at={(0.5,1)},above,"
-    elseif letter == :y && axis[:guide_position] == :right
-        labelpos = "at={(1,0.5)},below,"
-    end
-
-    # Add label font
-    cstr, α = pgf_color(plot_color(axis[:guidefontcolor]))
-    push!(style, string(letter, "label style = {", labelpos ,"font = ", pgf_font(axis[:guidefontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", axis[:guidefontrotation], "}"))
-
    # flip/reverse?
    axis[:flip] && push!(style, "$letter dir=reverse")

@@ -349,79 +222,22 @@ function pgf_axis(sp::Subplot, letter)
    end

    # ticks on or off
-    if axis[:ticks] in (nothing, false, :none) || framestyle == :none
+    if axis[:ticks] in (nothing, false)
        push!(style, "$(letter)majorticks=false")
    end

-    # grid on or off
-    if axis[:grid] && framestyle != :none
-        push!(style, "$(letter)majorgrids = true")
-    else
-        push!(style, "$(letter)majorgrids = false")
-    end
-
    # limits
    # TODO: support zlims
    if letter != :z
-        lims = ispolar(sp) && letter == :x ? rad2deg.(axis_limits(sp, :x)) : axis_limits(sp, letter)
+        lims = axis_limits(axis)
        kw[Symbol(letter,:min)] = lims[1]
        kw[Symbol(letter,:max)] = lims[2]
    end

-    if !(axis[:ticks] in (nothing, false, :none, :native)) && framestyle != :none
-        ticks = get_ticks(sp, axis)
-        #pgf plot ignores ticks with angle below 90 when xmin = 90 so shift values
-        tick_values = ispolar(sp) && letter == :x ? [rad2deg.(ticks[1])[3:end]..., 360, 405] : ticks[1]
-        push!(style, string(letter, "tick = {", join(tick_values,","), "}"))
-        if axis[:showaxis] && axis[:scale] in (:ln, :log2, :log10) && axis[:ticks] == :auto
-            # wrap the power part of label with }
-            tick_labels = Vector{String}(undef, length(ticks[2]))
-            for (i, label) in enumerate(ticks[2])
-                base, power = split(label, "^")
-                power = string("{", power, "}")
-                tick_labels[i] = string(base, "^", power)
-            end
-            push!(style, string(letter, "ticklabels = {\$", join(tick_labels,"\$,\$"), "\$}"))
-        elseif axis[:showaxis]
-            tick_labels = ispolar(sp) && letter == :x ? [ticks[2][3:end]..., "0", "45"] : ticks[2]
-            if axis[:formatter] in (:scientific, :auto)
-                tick_labels = string.("\$", convert_sci_unicode.(tick_labels), "\$")
-                tick_labels = replace.(tick_labels, Ref("×" => "\\times"))
-            end
-            push!(style, string(letter, "ticklabels = {", join(tick_labels,","), "}"))
-        else
-            push!(style, string(letter, "ticklabels = {}"))
-        end
-        push!(style, string(letter, "tick align = ", (axis[:tick_direction] == :out ? "outside" : "inside")))
-        cstr, α = pgf_color(plot_color(axis[:tickfontcolor]))
-        push!(style, string(letter, "ticklabel style = {font = ", pgf_font(axis[:tickfontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", axis[:tickfontrotation], "}"))
-        push!(style, string(letter, " grid style = {", pgf_linestyle(pgf_thickness_scaling(sp) * axis[:gridlinewidth], axis[:foreground_color_grid], axis[:gridalpha], axis[:gridstyle]), "}"))
-    end
-
-    # framestyle
-    if framestyle in (:axes, :origin)
-        axispos = framestyle == :axes ? "left" : "middle"
-        if axis[:draw_arrow]
-            push!(style, string("axis ", letter, " line = ", axispos))
-        else
-            # the * after line disables the arrow at the axis
-            push!(style, string("axis ", letter, " line* = ", axispos))
-        end
-    end
-
-    if framestyle == :zerolines
-        push!(style, string("extra ", letter, " ticks = 0"))
-        push!(style, string("extra ", letter, " tick labels = "))
-        push!(style, string("extra ", letter, " tick style = {grid = major, major grid style = {", pgf_linestyle(pgf_thickness_scaling(sp), axis[:foreground_color_border], 1.0), "}}"))
-    end
-
-    if !axis[:showaxis]
-        push!(style, "separate axis lines")
-    end
-    if !axis[:showaxis] || framestyle in (:zerolines, :grid, :none)
-        push!(style, string(letter, " axis line style = {draw opacity = 0}"))
-    else
-        push!(style, string(letter, " axis line style = {", pgf_linestyle(pgf_thickness_scaling(sp), axis[:foreground_color_border], 1.0), "}"))
+    if !(axis[:ticks] in (nothing, false, :none, :auto))
+        ticks = get_ticks(axis)
+        push!(style, string(letter, "tick = {", join(ticks[1],","), "}"))
+        push!(style, string(letter, "ticklabels = {", join(ticks[2],","), "}"))
    end

    # return the style list and KW args
@@ -433,12 +249,8 @@ end

 function _update_plot_object(plt::Plot{PGFPlotsBackend})
    plt.o = PGFPlots.Axis[]
-    # Obtain the total height of the plot by extracting the maximal bottom
-    # coordinate from the bounding box.
-    total_height = bottom(bbox(plt.layout))
-
    for sp in plt.subplots
-       # first build the PGFPlots.Axis object
+        # first build the PGFPlots.Axis object
        style = ["unbounded coords=jump"]
        kw = KW()

@@ -453,12 +265,10 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})

        # bounding box values are in mm
        # note: bb origin is top-left, pgf is bottom-left
-        # A round on 2 decimal places should be enough precision for 300 dpi
-        # plots.
        bb = bbox(sp)
        push!(style, """
            xshift = $(left(bb).value)mm,
-            yshift = $(round((total_height - (bottom(bb))).value, digits=2))mm,
+            yshift = $((height(bb) - (bottom(bb))).value)mm,
            axis background/.style={fill=$(pgf_color(sp[:background_color_inside])[1])}
        """)
        kw[:width] = "$(width(bb).value)mm"
@@ -466,11 +276,10 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})

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

-        if get_aspect_ratio(sp) in (1, :equal)
+        sp[:grid] && push!(style, "grid = major")
+        if sp[:aspect_ratio] in (1, :equal)
            kw[:axisEqual] = "true"
        end

@@ -478,87 +287,20 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
        if haskey(_pgfplots_legend_pos, legpos)
            kw[:legendPos] = _pgfplots_legend_pos[legpos]
        end
-        cstr, bg_alpha = pgf_color(plot_color(sp[:background_color_legend]))
-        fg_alpha = alpha(plot_color(sp[:foreground_color_legend]))

-        push!(style, string(
-            "legend style = {",
-                pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], fg_alpha, "solid", ), ",",
-                "fill = $cstr,",
-                "fill opacity = $bg_alpha,",
-                "text opacity = $(alpha(plot_color(sp[:legendfontcolor]))),",
-                "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)),
-            "}",
-        ))
-
-        if any(s[:seriestype] == :contour for s in series_list(sp))
-            kw[:view] = "{0}{90}"
-            kw[:colorbar] = !(sp[:colorbar] in (:none, :off, :hide, false))
-        elseif is3d(sp)
-            azim, elev = sp[:camera]
-            kw[:view] = "{$(azim)}{$(elev)}"
-        end
-
-        axisf = PGFPlots.Axis
-        if sp[:projection] == :polar
-            axisf = PGFPlots.PolarAxis
-            #make radial axis vertical
-            kw[:xmin] = 90
-            kw[:xmax] = 450
-        end
-
-        # Search series for any gradient. In case one series uses a gradient set
-        # the colorbar and colomap.
-        # The reasoning behind doing this on the axis level is that pgfplots
-        # colorbar seems to only works on axis level and needs the proper colormap for
-        # correctly displaying it.
-        # It's also possible to assign the colormap to the series itself but
-        # then the colormap needs to be added twice, once for the axis and once for the
-        # series.
-        # As it is likely that all series within the same axis use the same
-        # colormap this should not cause any problem.
-        for series in series_list(sp)
-            for col in (:markercolor, :fillcolor, :linecolor)
-                if typeof(series.plotattributes[col]) == ColorGradient
-                    push!(style,"colormap={plots}{$(pgf_colormap(series.plotattributes[col]))}")
-
-                    if sp[:colorbar] == :none
-                        kw[:colorbar] = "false"
-                    else
-                        kw[:colorbar] = "true"
-                    end
-                    # goto is needed to break out of col and series for
-                    @goto colorbar_end
-                end
-            end
-        end
-        @label colorbar_end
-
-        push!(style, "colorbar style={title=$(sp[:colorbar_title])}")
-        o = axisf(; style = join(style, ","), kw...)
+        o = PGFPlots.Axis(; style = style, kw...)

        # add the series object to the PGFPlots.Axis
        for series in series_list(sp)
-            push!.(Ref(o), pgf_series(sp, series))
-
-            # add series annotations
-            anns = series[:series_annotations]
-            for (xi,yi,str,fnt) in EachAnn(anns, series[:x], series[:y])
-                pgf_add_annotation!(o, xi, yi, PlotText(str, fnt), pgf_thickness_scaling(series))
-            end
+            push!(o, pgf_series(sp, series))
        end

-        # add the annotations
-        for ann in sp[:annotations]
-            pgf_add_annotation!(o, locate_annotation(sp, ann...)..., pgf_thickness_scaling(sp))
-        end
-
-
        # add the PGFPlots.Axis to the list
        push!(plt.o, o)
    end
 end

+
 function _show(io::IO, mime::MIME"image/svg+xml", plt::Plot{PGFPlotsBackend})
    show(io, mime, plt.o)
 end
@@ -572,7 +314,7 @@ function _show(io::IO, mime::MIME"application/pdf", plt::Plot{PGFPlotsBackend})
    PGFPlots.save(PGFPlots.PDF(fn), pgfplt)

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

    # cleanup
    PGFPlots.cleanup(plt.o)
@@ -580,8 +322,8 @@ end

 function _show(io::IO, mime::MIME"application/x-tex", plt::Plot{PGFPlotsBackend})
    fn = tempname()*".tex"
-    PGFPlots.save(fn, backend_object(plt), include_preamble=plt.attr[:tex_output_standalone])
-    write(io, read(open(fn), String))
+    PGFPlots.save(fn, backend_object(plt), include_preamble=false)
+    write(io, readstring(open(fn)))
 end

 function _display(plt::Plot{PGFPlotsBackend})
@@ -1,56 +1,114 @@
-# https://github.com/sglyon/PlotlyJS.jl

-# ------------------------------------------------------------------------------
+# https://github.com/spencerlyon2/PlotlyJS.jl

-function plotlyjs_syncplot(plt::Plot{PlotlyJSBackend})
-    plt[:overwrite_figure] && closeall()
-    plt.o = PlotlyJS.plot()
-    traces = PlotlyJS.GenericTrace[]
-    for series_dict in plotly_series(plt)
-        plotly_type = pop!(series_dict, :type)
-        push!(traces, PlotlyJS.GenericTrace(plotly_type; series_dict...))
+const _plotlyjs_attr        = _plotly_attr
+const _plotlyjs_seriestype  = _plotly_seriestype
+const _plotlyjs_style       = _plotly_style
+const _plotlyjs_marker      = _plotly_marker
+const _plotlyjs_scale       = _plotly_scale
+
+# --------------------------------------------------------------------------------------
+
+
+function add_backend_string(::PlotlyJSBackend)
+    """
+    if !Plots.is_installed("PlotlyJS")
+        Pkg.add("PlotlyJS")
    end
-    PlotlyJS.addtraces!(plt.o, traces...)
-    layout = plotly_layout(plt)
-    w, h = plt[:size]
-    PlotlyJS.relayout!(plt.o, layout, width = w, height = h)
-    return plt.o
+    if !Plots.is_installed("Rsvg")
+        Pkg.add("Rsvg")
+    end
+    import Blink
+    Blink.AtomShell.install()
+    """
 end

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

-const _plotlyjs_mimeformats = Dict(
-    "application/pdf" => "pdf",
-    "image/png"       => "png",
-    "image/svg+xml"   => "svg",
-    "image/eps"       => "eps",
-)
+function _initialize_backend(::PlotlyJSBackend; kw...)
+    @eval begin
+        import PlotlyJS
+        export PlotlyJS
+    end

-for (mime, fmt) in _plotlyjs_mimeformats
-    @eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plotlyjs_syncplot(plt), format = $fmt)
+    # # override IJulia inline display
+    # if isijulia()
+    #     IJulia.display_dict(plt::AbstractPlot{PlotlyJSBackend}) = IJulia.display_dict(plt.o)
+    # end
 end

-# Use the Plotly implementation for json and html:
-_show(io::IO, mime::MIME"application/vnd.plotly.v1+json", plt::Plot{PlotlyJSBackend}) = plotly_show_js(io, plt)
+# ---------------------------------------------------------------------------

-html_head(plt::Plot{PlotlyJSBackend}) = plotly_html_head(plt)
-html_body(plt::Plot{PlotlyJSBackend}) = plotly_html_body(plt)

-_show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = write(io, standalone_html(plt))
-
-_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)
+function _create_backend_figure(plt::Plot{PlotlyJSBackend})
+    if !isplotnull() && plt[:overwrite_figure] && isa(current().o, PlotlyJS.SyncPlot)
+        PlotlyJS.SyncPlot(PlotlyJS.Plot(), current().o.view)
+    else
+        PlotlyJS.plot()
    end
 end

+
+function _series_added(plt::Plot{PlotlyJSBackend}, series::Series)
+    syncplot = plt.o
+    pdicts = plotly_series(plt, series)
+    for pdict in pdicts
+        typ = pop!(pdict, :type)
+        gt = PlotlyJS.GenericTrace(typ; pdict...)
+        PlotlyJS.addtraces!(syncplot, gt)
+    end
+end
+
+function _series_updated(plt::Plot{PlotlyJSBackend}, series::Series)
+    xsym, ysym = (ispolar(series) ? (:t,:r) : (:x,:y))
+    kw = KW(xsym => (series.d[:x],), ysym => (series.d[:y],))
+    z = series[:z]
+    if z != nothing
+        kw[:z] = (isa(z,Surface) ? transpose_z(series, series[:z].surf, false) : z,)
+    end
+    PlotlyJS.restyle!(
+        plt.o,
+        findfirst(plt.series_list, series),
+        kw
+    )
+end
+
+
+# ----------------------------------------------------------------
+
+function _update_plot_object(plt::Plot{PlotlyJSBackend})
+    pdict = plotly_layout(plt)
+    syncplot = plt.o
+    w,h = plt[:size]
+    PlotlyJS.relayout!(syncplot, pdict, width = w, height = h)
+end
+
+
+# ----------------------------------------------------------------
+
+function _show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend})
+    if isijulia() && !_use_remote[]
+        write(io, PlotlyJS.html_body(PlotlyJS.JupyterPlot(plt.o)))
+    else
+        show(io, MIME("text/html"), plt.o)
+    end
+end
+
+function plotlyjs_save_hack(io::IO, plt::Plot{PlotlyJSBackend}, ext::String)
+    tmpfn = tempname() * "." * ext
+    PlotlyJS.savefig(plt.o, tmpfn)
+    write(io, read(open(tmpfn)))
+end
+_show(io::IO, ::MIME"image/png", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "png")
+_show(io::IO, ::MIME"application/pdf", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "pdf")
+_show(io::IO, ::MIME"image/eps", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "eps")
+
+function _display(plt::Plot{PlotlyJSBackend})
+    display(plt.o)
+end
+
+
 function closeall(::PlotlyJSBackend)
    if !isplotnull() && isa(current().o, PlotlyJS.SyncPlot)
        close(current().o)
    end
 end
-
-Base.showable(::MIME"application/prs.juno.plotpane+html", plt::Plot{PlotlyJSBackend}) = true
@@ -3,9 +3,14 @@

 # [ADD BACKEND WEBSITE]

-import [PkgName]
-export [PkgName]
-push!(_initialized_backends, [pgkname]::Symbol)
+function _initialize_backend(::[PkgName]Backend; kw...)
+    @eval begin
+        import [PkgName]
+        export [PkgName]
+        # todo: other initialization that needs to be eval-ed
+    end
+    # todo: other initialization
+end

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

@@ -49,7 +54,7 @@ end

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

-# Override this to update plot items (title, xlabel, etc), and add annotations (plotattributes[:annotations])
+# Override this to update plot items (title, xlabel, etc), and add annotations (d[:annotations])
 function _update_plot_object(plt::Plot{[PkgName]Backend})
 end

@@ -1,12 +1,50 @@

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

+const _unicodeplots_attr = merge_with_base_supported([
+    :label,
+    :legend,
+    :seriescolor,
+    :seriesalpha,
+    :linestyle,
+    :markershape,
+    :bins,
+    :title,
+    :guide, :lims,
+  ])
+const _unicodeplots_seriestype = [
+    :path, :scatter,
+    # :bar,
+    :shape,
+    :histogram2d,
+    :spy
+]
+const _unicodeplots_style = [:auto, :solid]
+const _unicodeplots_marker = [:none, :auto, :circle]
+const _unicodeplots_scale = [:identity]
+

 # don't warn on unsupported... there's just too many warnings!!
-warnOnUnsupported_args(::UnicodePlotsBackend, plotattributes::KW) = nothing
+warnOnUnsupported_args(::UnicodePlotsBackend, d::KW) = nothing

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

+function add_backend_string(::UnicodePlotsBackend)
+    """
+    Pkg.add("UnicodePlots")
+    Pkg.build("UnicodePlots")
+    """
+end
+
+function _initialize_backend(::UnicodePlotsBackend; kw...)
+    @eval begin
+        import UnicodePlots
+        export UnicodePlots
+    end
+end
+
+# -------------------------------
+
 const _canvas_type = Ref(:auto)

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

        # make vectors
        xlim = [xlim[1], xlim[2]]
@@ -82,7 +120,7 @@ function rebuildUnicodePlot!(plt::Plot, width, height)

        # now use the ! functions to add to the plot
        for series in series_list(sp)
-            addUnicodeSeries!(o, series.plotattributes, sp[:legend] != :none, xlim, ylim)
+            addUnicodeSeries!(o, series.d, sp[:legend] != :none, xlim, ylim)
        end

        # save the object
@@ -92,17 +130,17 @@ end


 # add a single series
-function addUnicodeSeries!(o, plotattributes, addlegend::Bool, xlim, ylim)
+function addUnicodeSeries!(o, d::KW, addlegend::Bool, xlim, ylim)
    # get the function, or special handling for step/bar/hist
-    st = plotattributes[:seriestype]
+    st = d[:seriestype]
    if st == :histogram2d
-        UnicodePlots.densityplot!(o, plotattributes[:x], plotattributes[:y])
+        UnicodePlots.densityplot!(o, d[:x], d[:y])
        return
    end

-    if st in (:path, :straightline)
+    if st == :path
        func = UnicodePlots.lineplot!
-    elseif st == :scatter || plotattributes[:markershape] != :none
+    elseif st == :scatter || d[:markershape] != :none
        func = UnicodePlots.scatterplot!
    # elseif st == :bar
    #     func = UnicodePlots.barplot!
@@ -113,20 +151,14 @@ function addUnicodeSeries!(o, plotattributes, addlegend::Bool, xlim, ylim)
    end

    # get the series data and label
-    x, y = if st == :straightline
-        straightline_data(plotattributes)
-    elseif st == :shape
-        shape_data(plotattributes)
-    else
-        [collect(float(plotattributes[s])) for s in (:x, :y)]
-    end
-    label = addlegend ? plotattributes[:label] : ""
+    x, y = [collect(float(d[s])) for s in (:x, :y)]
+    label = addlegend ? d[:label] : ""

    # if we happen to pass in allowed color symbols, great... otherwise let UnicodePlots decide
-    color = plotattributes[:linecolor] in UnicodePlots.color_cycle ? plotattributes[:linecolor] : :auto
+    color = d[:linecolor] in UnicodePlots.color_cycle ? d[:linecolor] : :auto

    # add the series
-    x, y = Plots.unzip(collect(Base.Iterators.filter(xy->isfinite(xy[1])&&isfinite(xy[2]), zip(x,y))))
+    x, y = Plots.unzip(collect(filter(xy->isfinite(xy[1])&&isfinite(xy[2]), zip(x,y))))
    func(o, x, y; color = color, name = label)
 end

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

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

        # wait while the plot gets drawn
@@ -170,7 +202,7 @@ end

 function _show(io::IO, ::MIME"text/plain", plt::Plot{UnicodePlotsBackend})
    unicodeplots_rebuild(plt)
-    foreach(x -> show(io, x), plt.o)
+    map(show, plt.o)
    nothing
 end

@@ -3,13 +3,13 @@

 # CREDIT: parts of this implementation were inspired by @joshday's PlotlyLocal.jl

+
 function standalone_html(plt::AbstractPlot; title::AbstractString = get(plt.attr, :window_title, "Plots.jl"))
    """
    <!DOCTYPE html>
    <html>
        <head>
            <title>$title</title>
-            <meta http-equiv="content-type" content="text/html; charset=UTF-8">
            $(html_head(plt))
        </head>
        <body>
@@ -20,16 +20,16 @@ function standalone_html(plt::AbstractPlot; title::AbstractString = get(plt.attr
 end

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

 function write_temp_html(plt::AbstractPlot)
@@ -42,14 +42,8 @@ function write_temp_html(plt::AbstractPlot)
 end

 function standalone_html_window(plt::AbstractPlot)
-    old = use_local_dependencies[] # save state to restore afterwards
-    # if we open a browser ourself, we can host local files, so
-    # when we have a local plotly downloaded this is the way to go!
-    use_local_dependencies[] = isfile(plotly_local_file_path)
    filename = write_temp_html(plt)
    open_browser_window(filename)
-    # restore for other backends
-    use_local_dependencies[] = old
 end

 # uses wkhtmltopdf/wkhtmltoimage: http://wkhtmltopdf.org/downloads.html
@@ -1,17 +1,17 @@


-const P2 = GeometryTypes.Point2{Float64}
-const P3 = GeometryTypes.Point3{Float64}
+typealias P2 StaticArrays.SVector{2,Float64}
+typealias P3 StaticArrays.SVector{3,Float64}

 nanpush!(a::AbstractVector{P2}, b) = (push!(a, P2(NaN,NaN)); push!(a, b))
 nanappend!(a::AbstractVector{P2}, b) = (push!(a, P2(NaN,NaN)); append!(a, b))
 nanpush!(a::AbstractVector{P3}, b) = (push!(a, P3(NaN,NaN,NaN)); push!(a, b))
 nanappend!(a::AbstractVector{P3}, b) = (push!(a, P3(NaN,NaN,NaN)); append!(a, b))
-compute_angle(v::P2) = (angle = atan(v[2], v[1]); angle < 0 ? 2π - angle : angle)
+compute_angle(v::P2) = (angle = atan2(v[2], v[1]); angle < 0 ? 2π - angle : angle)

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

-struct Shape
+immutable Shape
    x::Vector{Float64}
    y::Vector{Float64}
    # function Shape(x::AVec, y::AVec)
@@ -22,13 +22,6 @@ struct Shape
    #     end
    # end
 end
-
-"""
-    Shape(x, y)
-    Shape(vertices)
-
-Construct a polygon to be plotted
-"""
 Shape(verts::AVec) = Shape(unzip(verts)...)
 Shape(s::Shape) = deepcopy(s)

@@ -39,7 +32,6 @@ vertices(shape::Shape) = collect(zip(shape.x, shape.y))
 #deprecated
@deprecate shape_coords coords

-"return the vertex points from a Shape or Segments object"
 function coords(shape::Shape)
    shape.x, shape.y
 end
@@ -58,7 +50,7 @@ end

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

 "interleave 2 vectors into each other (like a zipper's teeth)"
@@ -68,8 +60,7 @@ function weave(x,y; ordering = Vector[x,y])
  while !done
    for o in ordering
      try
-          push!(ret, popfirst!(o))
-      catch
+          push!(ret, shift!(o))
      end
    end
    done = isempty(x) && isempty(y)
@@ -165,7 +156,6 @@ Shape(k::Symbol) = deepcopy(_shapes[k])


 # uses the centroid calculation from https://en.wikipedia.org/wiki/Centroid#Centroid_of_polygon
-"return the centroid of a Shape"
 function center(shape::Shape)
    x, y = coords(shape)
    n = length(x)
@@ -184,10 +174,10 @@ function center(shape::Shape)
    Cx / 6A, Cy / 6A
 end

-function scale!(shape::Shape, x::Real, y::Real = x, c = center(shape))
+function Base.scale!(shape::Shape, x::Real, y::Real = x, c = center(shape))
    sx, sy = coords(shape)
    cx, cy = c
-    for i=eachindex(sx)
+    for i=1:length(sx)
        sx[i] = (sx[i] - cx) * x + cx
        sy[i] = (sy[i] - cy) * y + cy
    end
@@ -199,10 +189,9 @@ function scale(shape::Shape, x::Real, y::Real = x, c = center(shape))
    scale!(shapecopy, x, y, c)
 end

-"translate a Shape in space"
 function translate!(shape::Shape, x::Real, y::Real = x)
    sx, sy = coords(shape)
-    for i=eachindex(sx)
+    for i=1:length(sx)
        sx[i] += x
        sy[i] += y
    end
@@ -230,7 +219,7 @@ end
 function rotate!(shape::Shape, Θ::Real, c = center(shape))
    x, y = coords(shape)
    cx, cy = c
-    for i=eachindex(x)
+    for i=1:length(x)
        xi = rotate_x(x[i], y[i], Θ, cx, cy)
        yi = rotate_y(x[i], y[i], Θ, cx, cy)
        x[i], y[i] = xi, yi
@@ -238,7 +227,6 @@ function rotate!(shape::Shape, Θ::Real, c = center(shape))
    shape
 end

-"rotate an object in space"
 function rotate(shape::Shape, Θ::Real, c = center(shape))
    shapecopy = deepcopy(shape)
    rotate!(shapecopy, Θ, c)
@@ -247,7 +235,7 @@ end
 # -----------------------------------------------------------------------


-mutable struct Font
+type Font
  family::AbstractString
  pointsize::Int
  halign::Symbol
@@ -256,24 +244,8 @@ mutable struct Font
  color::Colorant
 end

-"""
-    font(args...)
-Create a Font from a list of features. Values may be specified either as
-arguments (which are distinguished by type/value) or as keyword arguments.
-# Arguments
- `family`: AbstractString. "serif" or "sans-serif" or "monospace"
- `pointsize`: Integer. Size of font in points
- `halign`: Symbol. Horizontal alignment (:hcenter, :left, or :right)
- `valign`: Symbol. Vertical aligment (:vcenter, :top, or :bottom)
- `rotation`: Real. Angle of rotation for text in degrees (use a non-integer type)
- `color`: Colorant or Symbol
-# Examples
-```julia-repl
-julia> font(8)
-julia> font(family="serif",halign=:center,rotation=45.0)
-```
-"""
-function font(args...;kw...)
+"Create a Font from a list of unordered features"
+function font(args...)

  # defaults
  family = "sans-serif"
@@ -313,33 +285,7 @@ function font(args...;kw...)
    elseif typeof(arg) <: Real
      rotation = convert(Float64, arg)
    else
-      @warn("Unused font arg: $arg ($(typeof(arg)))")
-    end
-  end
-
-  for symbol in keys(kw)
-    if symbol == :family
-      family = kw[:family]
-    elseif symbol == :pointsize
-      pointsize = kw[:pointsize]
-    elseif symbol == :halign
-      halign = kw[:halign]
-      if halign == :center
-        halign = :hcenter
-      end
-      @assert halign in (:hcenter, :left, :right)
-    elseif symbol == :valign
-      valign = kw[:valign]
-      if valign == :center
-        valign = :vcenter
-      end
-      @assert valign in (:vcenter, :top, :bottom)
-    elseif symbol == :rotation
-      rotation = kw[:rotation]
-    elseif symbol == :color
-      color = parse(Colorant, kw[:color])
-    else
-      @warn("Unused font kwarg: $symbol")
+      warn("Unused font arg: $arg ($(typeof(arg)))")
    end
  end

@@ -348,54 +294,26 @@ end

 function scalefontsize(k::Symbol, factor::Number)
    f = default(k)
-    f = round(Int, factor * f)
+    f.pointsize = round(Int, factor * f.pointsize)
    default(k, f)
 end
-
-"""
-    scalefontsizes(factor::Number)
-
-Scales all **current** font sizes by `factor`. For example `scalefontsizes(1.1)` increases all current font sizes by 10%. To reset to initial sizes, use `scalefontsizes()`
-"""
 function scalefontsizes(factor::Number)
-    for k in (:titlefontsize, :guidefontsize, :tickfontsize, :legendfontsize)
+    for k in (:titlefont, :guidefont, :tickfont, :legendfont)
        scalefontsize(k, factor)
    end
 end

-"""
-    scalefontsizes()
-
-Resets font sizes to initial default values.
-"""
-function scalefontsizes()
-  for k in (:titlefontsize, :guidefontsize, :tickfontsize, :legendfontsize)
-      f = default(k)
-      if k in keys(_initial_fontsizes)
-        factor = f / _initial_fontsizes[k]
-        scalefontsize(k, 1.0/factor)
-      end
-  end
-end
-
 "Wrap a string with font info"
-struct PlotText
+immutable PlotText
  str::AbstractString
  font::Font
 end
 PlotText(str) = PlotText(string(str), font())

-"""
-    text(string, args...; kw...)
-
-Create a PlotText object wrapping a string with font info, for plot annotations.
-`args` and `kw` are passed to `font`.
-"""
 text(t::PlotText) = t
-text(t::PlotText, font::Font) = PlotText(t.str, font)
 text(str::AbstractString, f::Font) = PlotText(str, f)
-function text(str, args...;kw...)
-  PlotText(string(str), font(args...;kw...))
+function text(str, args...)
+  PlotText(string(str), font(args...))
 end

 Base.length(t::PlotText) = length(t.str)
@@ -404,18 +322,13 @@ Base.length(t::PlotText) = length(t.str)

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

-struct Stroke
+immutable Stroke
  width
  color
  alpha
  style
 end

-"""
-    stroke(args...; alpha = nothing)
-
-Define the properties of the stroke used in plotting lines
-"""
 function stroke(args...; alpha = nothing)
  width = 1
  color = :black
@@ -432,14 +345,13 @@ function stroke(args...; alpha = nothing)
    elseif T <: Symbol || T <: AbstractString
      try
        color = parse(Colorant, string(arg))
-      catch
      end
    elseif allAlphas(arg)
      alpha = arg
    elseif allReals(arg)
      width = arg
    else
-      @warn("Unused stroke arg: $arg ($(typeof(arg)))")
+      warn("Unused stroke arg: $arg ($(typeof(arg)))")
    end
  end

@@ -447,7 +359,7 @@ function stroke(args...; alpha = nothing)
 end


-struct Brush
+immutable Brush
  size  # fillrange, markersize, or any other sizey attribute
  color
  alpha
@@ -465,14 +377,13 @@ function brush(args...; alpha = nothing)
    elseif T <: Symbol || T <: AbstractString
      try
        color = parse(Colorant, string(arg))
-      catch
      end
    elseif allAlphas(arg)
      alpha = arg
    elseif allReals(arg)
      size = arg
    else
-      @warn("Unused brush arg: $arg ($(typeof(arg)))")
+      warn("Unused brush arg: $arg ($(typeof(arg)))")
    end
  end

@@ -481,19 +392,19 @@ end

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

-mutable struct SeriesAnnotations
+type SeriesAnnotations
    strs::AbstractVector  # the labels/names
    font::Font
-    baseshape::Union{Shape, AbstractVector{Shape}, Nothing}
+    baseshape::Nullable
    scalefactor::Tuple
 end
 function series_annotations(strs::AbstractVector, args...)
    fnt = font()
-    shp = nothing
+    shp = Nullable{Any}()
    scalefactor = (1,1)
    for arg in args
        if isa(arg, Shape) || (isa(arg, AbstractVector) && eltype(arg) == Shape)
-            shp = arg
+            shp = Nullable(arg)
        elseif isa(arg, Font)
            fnt = arg
        elseif isa(arg, Symbol) && haskey(_shapes, arg)
@@ -503,7 +414,7 @@ function series_annotations(strs::AbstractVector, args...)
        elseif is_2tuple(arg)
            scalefactor = arg
        else
-            @warn("Unused SeriesAnnotations arg: $arg ($(typeof(arg)))")
+            warn("Unused SeriesAnnotations arg: $arg ($(typeof(arg)))")
        end
    end
    # if scalefactor != 1
@@ -514,7 +425,7 @@ function series_annotations(strs::AbstractVector, args...)
    SeriesAnnotations(strs, fnt, shp, scalefactor)
 end
 series_annotations(anns::SeriesAnnotations) = anns
-series_annotations(::Nothing) = nothing
+series_annotations(::Void) = nothing

 function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
    anns = series[:series_annotations]
@@ -529,14 +440,13 @@ function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
    # end

    # @show msw msh
-    if anns !== nothing && anns.baseshape !== nothing
+    if anns != nothing && !isnull(anns.baseshape)
        # we use baseshape to overwrite the markershape attribute
        # with a list of custom shapes for each
        msw,msh = anns.scalefactor
        msize = Float64[]
-        shapes = Vector{Shape}(undef, length(anns.strs))
-        for i in eachindex(anns.strs)
-            str = _cycle(anns.strs,i)
+        shapes = Shape[begin
+            str = cycle(anns.strs,i)

            # get the width and height of the string (in mm)
            sw, sh = text_size(str, anns.font.pointsize)
@@ -552,108 +462,55 @@ function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
            # and then re-scale a copy of baseshape to match the w/h ratio
            maxscale = max(xscale, yscale)
            push!(msize, maxscale)
-            baseshape = _cycle(anns.baseshape, i)
-            shapes[i] = scale(baseshape, msw*xscale/maxscale, msh*yscale/maxscale, (0,0))
-        end
+            baseshape = cycle(get(anns.baseshape),i)
+            shape = scale(baseshape, msw*xscale/maxscale, msh*yscale/maxscale, (0,0))
+        end for i=1:length(anns.strs)]
        series[:markershape] = shapes
        series[:markersize] = msize
    end
    return
 end

-mutable struct EachAnn
+type EachAnn
    anns
    x
    y
 end
-
-function Base.iterate(ea::EachAnn, i = 1)
-    if ea.anns === nothing || isempty(ea.anns.strs) || i > length(ea.y)
-        return nothing
-    end
-
-    tmp = _cycle(ea.anns.strs,i)
+Base.start(ea::EachAnn) = 1
+Base.done(ea::EachAnn, i) = ea.anns == nothing || isempty(ea.anns.strs) || i > length(ea.y)
+function Base.next(ea::EachAnn, i)
+    tmp = cycle(ea.anns.strs,i)
    str,fnt = if isa(tmp, PlotText)
        tmp.str, tmp.font
    else
        tmp, ea.anns.font
    end
-    ((_cycle(ea.x,i), _cycle(ea.y,i), str, fnt), i+1)
+    ((cycle(ea.x,i), cycle(ea.y,i), str, fnt), i+1)
 end

-annotations(::Nothing) = []
+annotations(::Void) = []
 annotations(anns::AVec) = anns
 annotations(anns) = Any[anns]
 annotations(sa::SeriesAnnotations) = sa

-# Expand arrays of coordinates, positions and labels into induvidual annotations
-# and make sure labels are of type PlotText
-function process_annotation(sp::Subplot, xs, ys, labs, font = font())
-    anns = []
-    labs = makevec(labs)
-    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)
-        if lab == :auto
-            alphabet = "abcdefghijklmnopqrstuvwxyz"
-            push!(anns, (x, y, text(string("(", alphabet[sp[:subplot_index]], ")"), font)))
-        else
-            push!(anns, (x, y, isa(lab, PlotText) ? lab : isa(lab, Tuple) ? text(lab...) : text(lab, font)))
-        end
-    end
-    anns
-end
-function process_annotation(sp::Subplot, positions::Union{AVec{Symbol},Symbol}, labs, font = font())
-    anns = []
-    positions, labs = makevec(positions), makevec(labs)
-    for i in 1:max(length(positions), length(labs))
-        pos, lab = _cycle(positions, i), _cycle(labs, i)
-        pos = get(_positionAliases, pos, pos)
-        if lab == :auto
-            alphabet = "abcdefghijklmnopqrstuvwxyz"
-            push!(anns, (pos, text(string("(", alphabet[sp[:subplot_index]], ")"), font)))
-        else
-            push!(anns, (pos, isa(lab, PlotText) ? lab : isa(lab, Tuple) ? text(lab...) : text(lab, font)))
-        end
-    end
-    anns
-end
-
-# Give each annotation coordinates based on specified position
-function locate_annotation(sp::Subplot, pos::Symbol, lab::PlotText)
-    position_multiplier = Dict{Symbol, Tuple{Float64,Float64}}(
-        :topleft       => (0.1, 0.9),
-        :topcenter     => (0.5, 0.9),
-        :topright      => (0.9, 0.9),
-        :bottomleft    => (0.1, 0.1),
-        :bottomcenter  => (0.5, 0.1),
-        :bottomright   => (0.9, 0.1),
-    )
-    xmin, xmax = ignorenan_extrema(sp[:xaxis])
-    ymin, ymax = ignorenan_extrema(sp[:yaxis])
-    x, y = (xmin, ymin).+ position_multiplier[pos].* (xmax - xmin, ymax - ymin)
-    (x, y, lab)
-end
-locate_annotation(sp::Subplot, x, y, label::PlotText) = (x, y, label)
 # -----------------------------------------------------------------------

 "type which represents z-values for colors and sizes (and anything else that might come up)"
-struct ZValues
+immutable ZValues
  values::Vector{Float64}
  zrange::Tuple{Float64,Float64}
 end

-function zvalues(values::AVec{T}, zrange::Tuple{T,T} = (ignorenan_minimum(values), ignorenan_maximum(values))) where T<:Real
+function zvalues{T<:Real}(values::AVec{T}, zrange::Tuple{T,T} = (minimum(values), maximum(values)))
  ZValues(collect(float(values)), map(Float64, zrange))
 end

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

-abstract type AbstractSurface end
+abstract AbstractSurface

 "represents a contour or surface mesh"
-struct Surface{M<:AMat} <: AbstractSurface
+immutable Surface{M<:AMat} <: AbstractSurface
  surf::M
 end

@@ -664,8 +521,8 @@ 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)
+Base.copy(surf::Surface) = Surface{typeof(surf.surf)}(copy(surf.surf))
+Base.eltype{T}(surf::Surface{T}) = eltype(T)

 function expand_extrema!(a::Axis, surf::Surface)
    ex = a[:extrema]
@@ -676,7 +533,7 @@ function expand_extrema!(a::Axis, surf::Surface)
 end

 "For the case of representing a surface as a function of x/y... can possibly avoid allocations."
-struct SurfaceFunction <: AbstractSurface
+immutable SurfaceFunction <: AbstractSurface
    f::Function
 end

@@ -686,19 +543,19 @@ end
 # # I don't want to clash with ValidatedNumerics, but this would be nice:
 # ..(a::T, b::T) = (a,b)

-struct Volume{T}
+immutable 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))
+default_extents{T}(::Type{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
+function Volume{T}(v::Array{T,3},
+                   x_extents = default_extents(T),
+                   y_extents = default_extents(T),
+                   z_extents = default_extents(T))
    Volume(v, x_extents, y_extents, z_extents)
 end

@@ -706,25 +563,19 @@ 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
+Base.copy{T}(vol::Volume{T}) = Volume{T}(copy(vol.v), vol.x_extents, vol.y_extents, vol.z_extents)
+Base.eltype{T}(vol::Volume{T}) = T

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

 # style is :open or :closed (for now)
-struct Arrow
+immutable Arrow
    style::Symbol
    side::Symbol  # :head (default), :tail, or :both
    headlength::Float64
    headwidth::Float64
 end

-"""
-    arrow(args...)
-
-Define arrowheads to apply to lines - args are `style` (`:open` or `:closed`),
-`side` (`:head`, `:tail` or `:both`), `headlength` and `headwidth`
-"""
 function arrow(args...)
    style = :simple
    side = :head
@@ -749,7 +600,7 @@ function arrow(args...)
        elseif T <: Tuple && length(arg) == 2
            headlength, headwidth = Float64(arg[1]), Float64(arg[2])
        else
-            @warn("Skipped arrow arg $arg")
+            warn("Skipped arrow arg $arg")
        end
    end
    Arrow(style, side, headlength, headwidth)
@@ -774,14 +625,14 @@ end
 # -----------------------------------------------------------------------

 "Represents data values with formatting that should apply to the tick labels."
-struct Formatted{T}
+immutable Formatted{T}
    data::T
    formatter::Function
 end

 # -----------------------------------------------------------------------
-"create a BezierCurve for plotting"
-mutable struct BezierCurve{T <: GeometryTypes.Point}
+
+type BezierCurve{T <: StaticArrays.SVector}
    control_points::Vector{T}
 end

@@ -794,9 +645,12 @@ function (bc::BezierCurve)(t::Real)
    p
 end

+Base.mean(x::Real, y::Real) = 0.5*(x+y)
+Base.mean{N,T<:Real}(ps::StaticArrays.SVector{N,T}...) = sum(ps) / length(ps)
+
@deprecate curve_points coords

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

 # build a BezierCurve which leaves point p vertically upwards and arrives point q vertically upwards.
 # may create a loop if necessary.  Assumes the view is [0,1]
@@ -805,7 +659,7 @@ function directed_curve(args...; kw...)
 end

 function extrema_plus_buffer(v, buffmult = 0.2)
-    vmin,vmax = ignorenan_extrema(v)
+    vmin,vmax = extrema(v)
    vdiff = vmax-vmin
    buffer = vdiff * buffmult
    vmin - buffer, vmax + buffer
@@ -0,0 +1,208 @@
+
+# https://github.com/bokeh/Bokeh.jl
+
+
+supported_attrs(::BokehBackend) = merge_with_base_supported([
+    # :annotations,
+    # :axis,
+    # :background_color,
+    :linecolor,
+    # :color_palette,
+    # :fillrange,
+    # :fillcolor,
+    # :fillalpha,
+    # :foreground_color,
+    :group,
+    # :label,
+    # :layout,
+    # :legend,
+    :seriescolor, :seriesalpha,
+    :linestyle,
+    :seriestype,
+    :linewidth,
+    # :linealpha,
+    :markershape,
+    :markercolor,
+    :markersize,
+    # :markeralpha,
+    # :markerstrokewidth,
+    # :markerstrokecolor,
+    # :markerstrokestyle,
+    # :n,
+    # :bins,
+    # :nc,
+    # :nr,
+    # :pos,
+    # :smooth,
+    # :show,
+    :size,
+    :title,
+    # :window_title,
+    :x,
+    # :xguide,
+    # :xlims,
+    # :xticks,
+    :y,
+    # :yguide,
+    # :ylims,
+    # :yrightlabel,
+    # :yticks,
+    # :xscale,
+    # :yscale,
+    # :xflip,
+    # :yflip,
+    # :z,
+    # :tickfont,
+    # :guidefont,
+    # :legendfont,
+    # :grid,
+    # :surface,
+    # :levels,
+  ])
+supported_types(::BokehBackend) = [:path, :scatter]
+supported_styles(::BokehBackend) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
+supported_markers(::BokehBackend) = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5]
+supported_scales(::BokehBackend) = [:identity, :ln]
+is_subplot_supported(::BokehBackend) = false
+
+
+# --------------------------------------------------------------------------------------
+
+
+
+function _initialize_backend(::BokehBackend; kw...)
+  @eval begin
+    warn("Bokeh is no longer supported... many features will likely be broken.")
+    import Bokeh
+    export Bokeh
+  end
+end
+
+
+const _glyphtypes = KW(
+    :circle    => :Circle,
+    :rect       => :Square,
+    :diamond    => :Diamond,
+    :utriangle  => :Triangle,
+    :dtriangle  => :InvertedTriangle,
+    # :pentagon   =>
+    # :hexagon    =>
+    # :heptagon   =>
+    # :octagon    =>
+    :cross      => :Cross,
+    :xcross     => :X,
+    :star5      => :Asterisk,
+  )
+
+
+function bokeh_glyph_type(d::KW)
+  st = d[:seriestype]
+  mt = d[:markershape]
+  if st == :scatter && mt == :none
+    mt = :circle
+  end
+
+  # if we have a marker, use that
+  if st == :scatter || mt != :none
+    return _glyphtypes[mt]
+  end
+
+  # otherwise return a line
+  return :Line
+end
+
+function get_stroke_vector(linestyle::Symbol)
+  dash = 12
+  dot = 3
+  gap = 2
+  linestyle == :solid && return Int[]
+  linestyle == :dash && return Int[dash, gap]
+  linestyle == :dot && return Int[dot, gap]
+  linestyle == :dashdot && return Int[dash, gap, dot, gap]
+  linestyle == :dashdotdot && return Int[dash, gap, dot, gap, dot, gap]
+  error("unsupported linestyle: ", linestyle)
+end
+
+# ---------------------------------------------------------------------------
+
+# function _create_plot(pkg::BokehBackend, d::KW)
+function _create_backend_figure(plt::Plot{BokehBackend})
+  # TODO: create the window/canvas/context that is the plot within the backend (call it `o`)
+  # TODO: initialize the plot... title, xlabel, bgcolor, etc
+
+  datacolumns = Bokeh.BokehDataSet[]
+  tools = Bokeh.tools()
+  filename = tempname() * ".html"
+  title = plt.attr[:title]
+  w, h = plt.attr[:size]
+  xaxis_type = plt.attr[:xscale] == :log10 ? :log : :auto
+  yaxis_type = plt.attr[:yscale] == :log10 ? :log : :auto
+  # legend = plt.attr[:legend] ? xxxx : nothing
+  legend = nothing
+  extra_args = KW()  # TODO: we'll put extra settings (xlim, etc) here
+  Bokeh.Plot(datacolumns, tools, filename, title, w, h, xaxis_type, yaxis_type, legend) #, extra_args)
+
+  # Plot(bplt, pkg, 0, d, KW[])
+end
+
+
+# function _series_added(::BokehBackend, plt::Plot, d::KW)
+function _series_added(plt::Plot{BokehBackend}, series::Series)
+  bdata = Dict{Symbol, Vector}(:x => collect(series.d[:x]), :y => collect(series.d[:y]))
+
+  glyph = Bokeh.Bokehjs.Glyph(
+      glyphtype = bokeh_glyph_type(d),
+      linecolor = webcolor(d[:linecolor]),  # shape's stroke or line color
+      linewidth = d[:linewidth],          # shape's stroke width or line width
+      fillcolor = webcolor(d[:markercolor]),
+      size      = ceil(Int, d[:markersize] * 2.5),  # magic number 2.5 to keep in same scale as other backends
+      dash      = get_stroke_vector(d[:linestyle])
+    )
+
+  legend = nothing  # TODO
+  push!(plt.o.datacolumns, Bokeh.BokehDataSet(bdata, glyph, legend))
+
+  # push!(plt.seriesargs, d)
+  # plt
+end
+
+# ----------------------------------------------------------------
+
+# TODO: override this to update plot items (title, xlabel, etc) after creation
+function _update_plot_object(plt::Plot{BokehBackend}, d::KW)
+end
+
+# ----------------------------------------------------------------
+
+# accessors for x/y data
+
+# function getxy(plt::Plot{BokehBackend}, i::Int)
+#   series = plt.o.datacolumns[i].data
+#   series[:x], series[:y]
+# end
+#
+# function setxy!(plt::Plot{BokehBackend}, xy::Tuple{X,Y}, i::Integer)
+#   series = plt.o.datacolumns[i].data
+#   series[:x], series[:y] = xy
+#   plt
+# end
+
+
+
+# ----------------------------------------------------------------
+
+
+# ----------------------------------------------------------------
+
+function Base.show(io::IO, ::MIME"image/png", plt::AbstractPlot{BokehBackend})
+  # TODO: write a png to io
+  warn("mime png not implemented")
+end
+
+function Base.display(::PlotsDisplay, plt::Plot{BokehBackend})
+  Bokeh.showplot(plt.o)
+end
+
+# function Base.display(::PlotsDisplay, plt::Subplot{BokehBackend})
+#   # TODO: display/show the subplot
+# end
@@ -0,0 +1,744 @@
+
+# https://github.com/dcjones/Gadfly.jl
+
+
+supported_attrs(::GadflyBackend) = merge_with_base_supported([
+    :annotations,
+    :background_color, :foreground_color, :color_palette,
+    :group, :label, :seriestype,
+    :seriescolor, :seriesalpha,
+    :linecolor, :linestyle, :linewidth, :linealpha,
+    :markershape, :markercolor, :markersize, :markeralpha,
+    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
+    :fillrange, :fillcolor, :fillalpha,
+    :bins, :n, :nc, :nr, :layout, :smooth,
+    :title, :window_title, :show, :size,
+    :x, :xguide, :xlims, :xticks, :xscale, :xflip,
+    :y, :yguide, :ylims, :yticks, :yscale, :yflip,
+    :z,
+    :tickfont, :guidefont, :legendfont,
+    :grid, :legend, :colorbar,
+    :marker_z, :levels,
+    :xerror, :yerror,
+    :ribbon, :quiver,
+    :orientation,
+  ])
+supported_types(::GadflyBackend) = [
+        :path,
+        :scatter, :hexbin,
+        :bar,
+        :contour, :shape
+    ]
+supported_styles(::GadflyBackend) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
+supported_markers(::GadflyBackend) = vcat(_allMarkers, Shape)
+supported_scales(::GadflyBackend) = [:identity, :ln, :log2, :log10, :asinh, :sqrt]
+is_subplot_supported(::GadflyBackend) = true
+
+
+# --------------------------------------------------------------------------------------
+
+function _initialize_backend(::GadflyBackend; kw...)
+    @eval begin
+        import Gadfly, Compose
+        export Gadfly, Compose
+        include(joinpath(dirname(@__FILE__), "gadfly_shapes.jl"))
+    end
+end
+
+# ---------------------------------------------------------------------------
+
+# immutable MissingVec <: AbstractVector{Float64} end
+# Base.size(v::MissingVec) = (1,)
+# Base.getindex(v::MissingVec, i::Integer) = 0.0
+
+function createGadflyPlotObject(d::KW)
+    gplt = Gadfly.Plot()
+    gplt.mapping = Dict()
+    gplt.data_source = Gadfly.DataFrames.DataFrame()
+    # gplt.layers = gplt.layers[1:0]
+    gplt.layers = [Gadfly.layer(Gadfly.Geom.point(tag=:remove), x=zeros(1), y=zeros(1));] # x=MissingVec(), y=MissingVec());]
+    gplt.guides = Gadfly.GuideElement[Gadfly.Guide.xlabel(d[:xguide]),
+                                   Gadfly.Guide.ylabel(d[:yguide]),
+                                   Gadfly.Guide.title(d[:title])]
+    gplt
+end
+
+# ---------------------------------------------------------------------------
+
+
+function getLineGeom(d::KW)
+    st = d[:seriestype]
+    xbins, ybins = maketuple(d[:bins])
+    if st == :hexb
+        Gadfly.Geom.hexbin(xbincount = xbins, ybincount = ybins)
+    elseif st == :histogram2d
+        Gadfly.Geom.histogram2d(xbincount = xbins, ybincount = ybins)
+    elseif st == :histogram
+        Gadfly.Geom.histogram(bincount = xbins,
+                              orientation = isvertical(d) ? :vertical : :horizontal,
+                              position = d[:bar_position] == :stack ? :stack : :dodge)
+    elseif st == :path
+        Gadfly.Geom.path
+    elseif st in (:bar, :sticks)
+        Gadfly.Geom.bar
+    elseif st == :steppost
+        Gadfly.Geom.step
+    elseif st == :steppre
+        Gadfly.Geom.step(direction = :vh)
+    elseif st == :hline
+        Gadfly.Geom.hline
+    elseif st == :vline
+        Gadfly.Geom.vline
+    elseif st == :contour
+        Gadfly.Geom.contour(levels = d[:levels])
+    # elseif st == :shape
+    #     Gadfly.Geom.polygon(fill = true, preserve_order = true)
+    else
+        nothing
+    end
+end
+
+function get_extra_theme_args(d::KW, k::Symbol)
+    # gracefully handles old Gadfly versions
+    extra_theme_args = KW()
+    try
+        extra_theme_args[:line_style] = Gadfly.get_stroke_vector(d[k])
+    catch err
+        if string(err) == "UndefVarError(:get_stroke_vector)"
+            Base.warn_once("Gadfly.get_stroke_vector failed... do you have an old version of Gadfly?")
+        else
+            rethrow()
+        end
+    end
+    extra_theme_args
+end
+
+function getGadflyLineTheme(d::KW)
+    st = d[:seriestype]
+    lc = convertColor(getColor(d[:linecolor]), d[:linealpha])
+    fc = convertColor(getColor(d[:fillcolor]), d[:fillalpha])
+
+    Gadfly.Theme(;
+        default_color = (st in (:histogram,:histogram2d,:hexbin,:bar,:sticks) ? fc : lc),
+        line_width = (st == :sticks ? 1 : d[:linewidth]) * Gadfly.px,
+        # line_style = Gadfly.get_stroke_vector(d[:linestyle]),
+        lowlight_color = x->RGB(fc),  # fill/ribbon
+        lowlight_opacity = alpha(fc), # fill/ribbon
+        bar_highlight = RGB(lc),      # bars
+        get_extra_theme_args(d, :linestyle)...
+    )
+end
+
+# add a line as a new layer
+function addGadflyLine!(plt::Plot, numlayers::Int, d::KW, geoms...)
+    gplt = getGadflyContext(plt)
+    gfargs = vcat(geoms..., getGadflyLineTheme(d))
+    kwargs = KW()
+    st = d[:seriestype]
+
+    # add a fill?
+    if d[:fillrange] != nothing && st != :contour
+        fillmin, fillmax = map(makevec, maketuple(d[:fillrange]))
+        nmin, nmax = length(fillmin), length(fillmax)
+        kwargs[:ymin] = Float64[min(y, fillmin[mod1(i, nmin)], fillmax[mod1(i, nmax)]) for (i,y) in enumerate(d[:y])]
+        kwargs[:ymax] = Float64[max(y, fillmin[mod1(i, nmin)], fillmax[mod1(i, nmax)]) for (i,y) in enumerate(d[:y])]
+        push!(gfargs, Gadfly.Geom.ribbon)
+    end
+
+    if st in (:hline, :vline)
+        kwargs[st == :hline ? :yintercept : :xintercept] = d[:y]
+
+    else
+        if st == :sticks
+            w = 0.01 * mean(diff(d[:x]))
+            kwargs[:xmin] = d[:x] - w
+            kwargs[:xmax] = d[:x] + w
+        elseif st == :contour
+            kwargs[:z] = d[:z].surf
+            addGadflyContColorScale(plt, d[:linecolor])
+        end
+
+        kwargs[:x] = d[st == :histogram ? :y : :x]
+        kwargs[:y] = d[:y]
+
+    end
+
+    # # add the layer
+    Gadfly.layer(gfargs...; order=numlayers, kwargs...)
+end
+
+
+# ---------------------------------------------------------------------------
+
+get_shape(sym::Symbol) = _shapes[sym]
+get_shape(shape::Shape) = shape
+
+# extract the underlying ShapeGeometry object(s)
+getMarkerGeom(shapes::AVec) = gadflyshape(map(get_shape, shapes))
+getMarkerGeom(other) = gadflyshape(get_shape(other))
+
+# getMarkerGeom(shape::Shape) = gadflyshape(shape)
+# getMarkerGeom(shape::Symbol) = gadflyshape(_shapes[shape])
+# getMarkerGeom(shapes::AVec) = gadflyshape(map(gadflyshape, shapes)) # map(getMarkerGeom, shapes)
+function getMarkerGeom(d::KW)
+    if d[:seriestype] == :shape
+        Gadfly.Geom.polygon(fill = true, preserve_order = true)
+    else
+        getMarkerGeom(d[:markershape])
+    end
+end
+
+function getGadflyMarkerTheme(d::KW, attr::KW)
+    c = getColor(d[:markercolor])
+    α = d[:markeralpha]
+    if α != nothing
+        c = RGBA(RGB(c), α)
+    end
+
+    ms = d[:markersize]
+    ms = if typeof(ms) <: AVec
+        warn("Gadfly doesn't support variable marker sizes... using the average: $(mean(ms))")
+        mean(ms) * Gadfly.px
+    else
+        ms * Gadfly.px
+    end
+
+    Gadfly.Theme(;
+        default_color = c,
+        default_point_size = ms,
+        discrete_highlight_color = c -> RGB(getColor(d[:markerstrokecolor])),
+        highlight_width = d[:markerstrokewidth] * Gadfly.px,
+        line_width = d[:markerstrokewidth] * Gadfly.px,
+        # get_extra_theme_args(d, :markerstrokestyle)...
+    )
+end
+
+function addGadflyContColorScale(plt::Plot{GadflyBackend}, c)
+    plt.attr[:colorbar] == :none && return
+    if !isa(c, ColorGradient)
+        c = default_gradient()
+    end
+    push!(getGadflyContext(plt).scales, Gadfly.Scale.ContinuousColorScale(p -> RGB(getColorZ(c, p))))
+end
+
+function addGadflyMarker!(plt::Plot, numlayers::Int, d::KW, attr::KW, geoms...)
+    gfargs = vcat(geoms..., getGadflyMarkerTheme(d, attr), getMarkerGeom(d))
+    kwargs = KW()
+
+    # handle continuous color scales for the markers
+    zcolor = d[:marker_z]
+    if zcolor != nothing && typeof(zcolor) <: AVec
+        kwargs[:color] = zcolor
+        addGadflyContColorScale(plt, d[:markercolor])
+    end
+
+    Gadfly.layer(gfargs...; x = d[:x], y = d[:y], order=numlayers, kwargs...)
+end
+
+
+# ---------------------------------------------------------------------------
+
+function addToGadflyLegend(plt::Plot, d::KW)
+    if plt.attr[:legend] != :none && d[:label] != ""
+        gplt = getGadflyContext(plt)
+
+        # add the legend if needed
+        if all(g -> !isa(g, Gadfly.Guide.ManualColorKey), gplt.guides)
+            unshift!(gplt.guides, Gadfly.Guide.manual_color_key("", AbstractString[], Color[]))
+        end
+
+        # now add the series to the legend
+        for guide in gplt.guides
+            if isa(guide, Gadfly.Guide.ManualColorKey)
+                # TODO: there's a BUG in gadfly if you pass in the same color more than once,
+                # since gadfly will call unique(colors), but doesn't also merge the rows that match
+                # Should ensure from this side that colors which are the same are merged together
+
+                c = getColor(d[d[:markershape] == :none ? :linecolor : :markercolor])
+                foundit = false
+
+                # extend the label if we found this color
+                for i in 1:length(guide.colors)
+                    if RGB(c) == guide.colors[i]
+                        guide.labels[i] *= ", " * d[:label]
+                        foundit = true
+                    end
+                end
+
+                # didn't find the color, so add a new entry into the legend
+                if !foundit
+                    push!(guide.labels, d[:label])
+                    push!(guide.colors, c)
+                end
+            end
+        end
+    end
+end
+
+getGadflySmoothing(smooth::Bool) = smooth ? [Gadfly.Geom.smooth(method=:lm)] : Any[]
+getGadflySmoothing(smooth::Real) = [Gadfly.Geom.smooth(method=:loess, smoothing=float(smooth))]
+
+
+function addGadflySeries!(plt::Plot, d::KW)
+    layers = Gadfly.Layer[]
+    gplt = getGadflyContext(plt)
+
+    # add a regression line?
+    # TODO: make more flexible
+    smooth = getGadflySmoothing(d[:smooth])
+
+    # lines
+    geom = getLineGeom(d)
+    if geom != nothing
+        prepend!(layers, addGadflyLine!(plt, length(gplt.layers), d, geom, smooth...))
+        smooth = Any[] # don't add a regression for markers too
+    end
+
+    # special handling for ohlc and scatter
+    st = d[:seriestype]
+    # if st == :ohlc
+    #     error("Haven't re-implemented after refactoring")
+    if st in (:histogram2d, :hexbin) && (isa(d[:fillcolor], ColorGradient) || isa(d[:fillcolor], ColorFunction))
+        push!(gplt.scales, Gadfly.Scale.ContinuousColorScale(p -> RGB(getColorZ(d[:fillcolor], p))))
+    elseif st == :scatter && d[:markershape] == :none
+        d[:markershape] = :circle
+    end
+
+    # markers
+    if d[:markershape] != :none || st == :shape
+        prepend!(layers, addGadflyMarker!(plt, length(gplt.layers), d, plt.attr, smooth...))
+    end
+
+    st in (:histogram2d, :hexbin, :contour) || addToGadflyLegend(plt, d)
+
+    # now save the layers that apply to this series
+    d[:gadflylayers] = layers
+    prepend!(gplt.layers, layers)
+end
+
+
+# ---------------------------------------------------------------------------
+
+# NOTE: I'm leaving this here and commented out just in case I want to implement again... it was hacky code to create multi-colored line segments
+
+#   # colorgroup
+#   z = d[:z]
+
+#   # handle line segments of different colors
+#   cscheme = d[:linecolor]
+#   if isa(cscheme, ColorVector)
+#     # create a color scale, and set the color group to the index of the color
+#     push!(gplt.scales, Gadfly.Scale.color_discrete_manual(cscheme.v...))
+
+#     # this is super weird, but... oh well... for some reason this creates n separate line segments...
+#     # create a list of vertices that go: [x1,x2,x2,x3,x3, ... ,xi,xi, ... xn,xn] (same for y)
+#     # then the vector passed to the "color" keyword should be a vector: [1,1,2,2,3,3,4,4, ..., i,i, ... , n,n]
+#     csindices = Int[mod1(i,length(cscheme.v)) for i in 1:length(d[:y])]
+#     cs = collect(repmat(csindices', 2, 1))[1:end-1]
+#     grp = collect(repmat((1:length(d[:y]))', 2, 1))[1:end-1]
+#     d[:x], d[:y] = map(createSegments, (d[:x], d[:y]))
+#     colorgroup = [(:linecolor, cs), (:group, grp)]
+
+
+# ---------------------------------------------------------------------------
+
+
+function addGadflyTicksGuide(gplt, ticks, isx::Bool)
+    ticks == :auto && return
+
+    # remove the ticks?
+    if ticks in (:none, false, nothing)
+        return addOrReplace(gplt.guides, isx ? Gadfly.Guide.xticks : Gadfly.Guide.yticks; label=false)
+    end
+
+    ttype = ticksType(ticks)
+
+    # just the values... put ticks here, but use standard labels
+    if ttype == :ticks
+        gtype = isx ? Gadfly.Guide.xticks : Gadfly.Guide.yticks
+        replaceType(gplt.guides, gtype(ticks = collect(ticks)))
+
+    # set the ticks and the labels
+    # Note: this is pretty convoluted, but I think it works.  We set the ticks using Gadfly.Guide,
+    #   and then set the label function (wraps a dict lookup) through a continuous Gadfly.Scale.
+    elseif ttype == :ticks_and_labels
+        gtype = isx ? Gadfly.Guide.xticks : Gadfly.Guide.yticks
+        replaceType(gplt.guides, gtype(ticks = collect(ticks[1])))
+
+        # # TODO add xtick_label function (given tick, return label??)
+        # # Scale.x_discrete(; labels=nothing, levels=nothing, order=nothing)
+        # filterGadflyScale(gplt, isx)
+        # gfunc = isx ? Gadfly.Scale.x_discrete : Gadfly.Scale.y_discrete
+        # labelmap = Dict(zip(ticks...))
+        # labelfunc = val -> labelmap[val]
+        # push!(gplt.scales, gfunc(levels = collect(ticks[1]), labels = labelfunc))
+
+        filterGadflyScale(gplt, isx)
+        gfunc = isx ? Gadfly.Scale.x_continuous : Gadfly.Scale.y_continuous
+        labelmap = Dict(zip(ticks...))
+        labelfunc = val -> labelmap[val]
+        push!(gplt.scales, gfunc(labels = labelfunc))
+
+    else
+        error("Invalid input for $(isx ? "xticks" : "yticks"): ", ticks)
+    end
+end
+
+continuousAndSameAxis(scale, isx::Bool) = isa(scale, Gadfly.Scale.ContinuousScale) && scale.vars[1] == (isx ? :x : :y)
+filterGadflyScale(gplt, isx::Bool) = filter!(scale -> !continuousAndSameAxis(scale, isx), gplt.scales)
+
+
+function getGadflyScaleFunction(d::KW, isx::Bool)
+    scalekey = isx ? :xscale : :yscale
+    hasScaleKey = haskey(d, scalekey)
+    if hasScaleKey
+        scale = d[scalekey]
+        scale == :ln && return isx ? Gadfly.Scale.x_log : Gadfly.Scale.y_log, hasScaleKey, log
+        scale == :log2 && return isx ? Gadfly.Scale.x_log2 : Gadfly.Scale.y_log2, hasScaleKey, log2
+        scale == :log10 && return isx ? Gadfly.Scale.x_log10 : Gadfly.Scale.y_log10, hasScaleKey, log10
+        scale == :asinh && return isx ? Gadfly.Scale.x_asinh : Gadfly.Scale.y_asinh, hasScaleKey, asinh
+        scale == :sqrt && return isx ? Gadfly.Scale.x_sqrt : Gadfly.Scale.y_sqrt, hasScaleKey, sqrt
+    end
+    isx ? Gadfly.Scale.x_continuous : Gadfly.Scale.y_continuous, hasScaleKey, identity
+end
+
+
+function addGadflyLimitsScale(gplt, d::KW, isx::Bool)
+    gfunc, hasScaleKey, func = getGadflyScaleFunction(d, isx)
+
+    # do we want to add min/max limits for the axis?
+    limsym = isx ? :xlims : :ylims
+    limargs = Any[]
+
+    # map :auto to nothing, otherwise add to limargs
+    lims = get(d, limsym, :auto)
+    if lims == :auto
+        lims = nothing
+    else
+        if limsType(lims) == :limits
+            push!(limargs, (:minvalue, min(lims...)))
+            push!(limargs, (:maxvalue, max(lims...)))
+        else
+            error("Invalid input for $(isx ? "xlims" : "ylims"): ", lims)
+        end
+    end
+
+    # replace any current scales with this one
+    if hasScaleKey || !isempty(limargs)
+        filterGadflyScale(gplt, isx)
+        push!(gplt.scales, gfunc(; limargs...))
+    end
+
+    lims, func
+end
+
+function updateGadflyAxisFlips(gplt, d::KW, xlims, ylims, xfunc, yfunc)
+    if isa(gplt.coord, Gadfly.Coord.Cartesian)
+        gplt.coord = Gadfly.Coord.cartesian(
+            gplt.coord.xvars,
+            gplt.coord.yvars;
+            xmin = xlims == nothing ? gplt.coord.xmin : xfunc(minimum(xlims)),
+            xmax = xlims == nothing ? gplt.coord.xmax : xfunc(maximum(xlims)),
+            ymin = ylims == nothing ? gplt.coord.ymin : yfunc(minimum(ylims)),
+            ymax = ylims == nothing ? gplt.coord.ymax : yfunc(maximum(ylims)),
+            xflip = get(d, :xflip, gplt.coord.xflip),
+            yflip = get(d, :yflip, gplt.coord.yflip),
+            fixed = gplt.coord.fixed,
+            aspect_ratio = gplt.coord.aspect_ratio,
+            raster = gplt.coord.raster
+        )
+    else
+        gplt.coord = Gadfly.Coord.Cartesian(
+            xflip = get(d, :xflip, false),
+            yflip = get(d, :yflip, false)
+        )
+    end
+end
+
+
+function findGuideAndSet(gplt, t::DataType, args...; kw...)
+    for (i,guide) in enumerate(gplt.guides)
+        if isa(guide, t)
+            gplt.guides[i] = t(args...; kw...)
+        end
+    end
+end
+
+function updateGadflyGuides(plt::Plot, d::KW)
+    gplt = getGadflyContext(plt)
+    haskey(d, :title) && findGuideAndSet(gplt, Gadfly.Guide.title, string(d[:title]))
+    haskey(d, :xguide) && findGuideAndSet(gplt, Gadfly.Guide.xlabel, string(d[:xguide]))
+    haskey(d, :yguide) && findGuideAndSet(gplt, Gadfly.Guide.ylabel, string(d[:yguide]))
+
+    xlims, xfunc = addGadflyLimitsScale(gplt, d, true)
+    ylims, yfunc = addGadflyLimitsScale(gplt, d, false)
+
+    ticks = get(d, :xticks, :auto)
+    if ticks == :none
+        _remove_axis(plt, true)
+    else
+        addGadflyTicksGuide(gplt, ticks, true)
+    end
+    ticks = get(d, :yticks, :auto)
+    if ticks == :none
+        _remove_axis(plt, false)
+    else
+        addGadflyTicksGuide(gplt, ticks, false)
+    end
+
+    updateGadflyAxisFlips(gplt, d, xlims, ylims, xfunc, yfunc)
+end
+
+function updateGadflyPlotTheme(plt::Plot, d::KW)
+    kwargs = KW()
+
+    # colors
+    insidecolor, gridcolor, textcolor, guidecolor, legendcolor =
+        map(s -> getColor(d[s]), (
+            :background_color_inside,
+            :foreground_color_grid,
+            :foreground_color_text,
+            :foreground_color_guide,
+            :foreground_color_legend
+        ))
+
+    # # hide the legend?
+    leg = d[d[:legend] == :none ? :colorbar : :legend]
+    if leg != :best
+        kwargs[:key_position] = leg == :inside ? :right : leg
+    end
+
+    if !get(d, :grid, true)
+        kwargs[:grid_color] = gridcolor
+    end
+
+    # fonts
+    tfont, gfont, lfont = d[:tickfont], d[:guidefont], d[:legendfont]
+
+    getGadflyContext(plt).theme = Gadfly.Theme(;
+        background_color = insidecolor,
+        minor_label_color = textcolor,
+        minor_label_font = tfont.family,
+        minor_label_font_size = tfont.pointsize * Gadfly.pt,
+        major_label_color = guidecolor,
+        major_label_font = gfont.family,
+        major_label_font_size = gfont.pointsize * Gadfly.pt,
+        key_title_color = guidecolor,
+        key_title_font = gfont.family,
+        key_title_font_size = gfont.pointsize * Gadfly.pt,
+        key_label_color = legendcolor,
+        key_label_font = lfont.family,
+        key_label_font_size = lfont.pointsize * Gadfly.pt,
+        plot_padding = 1 * Gadfly.mm,
+        kwargs...
+    )
+end
+
+# ----------------------------------------------------------------
+
+
+function createGadflyAnnotationObject(x, y, val::AbstractString)
+    Gadfly.Guide.annotation(Compose.compose(
+                              Compose.context(),
+                              Compose.text(x, y, val)
+                            ))
+end
+
+function createGadflyAnnotationObject(x, y, txt::PlotText)
+    halign = (txt.font.halign == :hcenter ? Compose.hcenter : (txt.font.halign == :left ? Compose.hleft : Compose.hright))
+    valign = (txt.font.valign == :vcenter ? Compose.vcenter : (txt.font.valign == :top ? Compose.vtop : Compose.vbottom))
+    rotations = (txt.font.rotation == 0.0 ? [] : [Compose.Rotation(txt.font.rotation, Compose.Point(Compose.x_measure(x), Compose.y_measure(y)))])
+    Gadfly.Guide.annotation(Compose.compose(
+                              Compose.context(),
+                              Compose.text(x, y, txt.str, halign, valign, rotations...),
+                              Compose.font(string(txt.font.family)),
+                              Compose.fontsize(txt.font.pointsize * Gadfly.pt),
+                              Compose.stroke(txt.font.color),
+                              Compose.fill(txt.font.color)
+                            ))
+end
+
+function _add_annotations{X,Y,V}(plt::Plot{GadflyBackend}, anns::AVec{Tuple{X,Y,V}})
+    for ann in anns
+        push!(plt.o.guides, createGadflyAnnotationObject(ann...))
+    end
+end
+
+
+# ---------------------------------------------------------------------------
+
+# create a blank Gadfly.Plot object
+# function _create_plot(pkg::GadflyBackend, d::KW)
+#     gplt = createGadflyPlotObject(d)
+#     Plot(gplt, pkg, 0, d, KW[])
+# end
+function _create_backend_figure(plt::Plot{GadflyBackend})
+    createGadflyPlotObject(plt.attr)
+end
+
+
+# plot one data series
+# function _series_added(::GadflyBackend, plt::Plot, d::KW)
+function _series_added(plt::Plot{GadflyBackend}, series::Series)
+    # first clear out the temporary layer
+    gplt = getGadflyContext(plt)
+    if gplt.layers[1].geom.tag == :remove
+        gplt.layers = gplt.layers[2:end]
+    end
+
+    addGadflySeries!(plt, series.d)
+    # push!(plt.seriesargs, d)
+    # plt
+end
+
+
+
+function _update_plot_object(plt::Plot{GadflyBackend}, d::KW)
+    updateGadflyGuides(plt, d)
+    updateGadflyPlotTheme(plt, d)
+end
+
+
+# ----------------------------------------------------------------
+
+# accessors for x/y data
+
+# TODO: need to save all the layer indices which apply to this series
+function getGadflyMappings(plt::Plot, i::Integer)
+    @assert i > 0 && i <= plt.n
+    mappings = [l.mapping for l in plt.seriesargs[i][:gadflylayers]]
+end
+
+function getxy(plt::Plot{GadflyBackend}, i::Integer)
+    mapping = getGadflyMappings(plt, i)[1]
+    mapping[:x], mapping[:y]
+end
+
+function setxy!{X,Y}(plt::Plot{GadflyBackend}, xy::Tuple{X,Y}, i::Integer)
+    for mapping in getGadflyMappings(plt, i)
+        mapping[:x], mapping[:y] = xy
+    end
+    plt
+end
+
+# ----------------------------------------------------------------
+
+
+# # create the underlying object (each backend will do this differently)
+# function _create_subplot(subplt::Subplot{GadflyBackend}, isbefore::Bool)
+#     isbefore && return false # wait until after plotting to create the subplots
+#     subplt.o = nothing
+#     true
+# end
+
+
+function _remove_axis(plt::Plot{GadflyBackend}, isx::Bool)
+    gplt = getGadflyContext(plt)
+    addOrReplace(gplt.guides, isx ? Gadfly.Guide.xticks : Gadfly.Guide.yticks; label=false)
+    addOrReplace(gplt.guides, isx ? Gadfly.Guide.xlabel : Gadfly.Guide.ylabel, "")
+end
+
+function _expand_limits(lims, plt::Plot{GadflyBackend}, isx::Bool)
+    for l in getGadflyContext(plt).layers
+        _expand_limits(lims, l.mapping[isx ? :x : :y])
+    end
+end
+
+
+# ----------------------------------------------------------------
+
+
+getGadflyContext(plt::Plot{GadflyBackend}) = plt.o
+# getGadflyContext(subplt::Subplot{GadflyBackend}) = buildGadflySubplotContext(subplt)
+
+# # create my Compose.Context grid by hstacking and vstacking the Gadfly.Plot objects
+# function buildGadflySubplotContext(subplt::Subplot)
+#     rows = Any[]
+#     row = Any[]
+#     for (i,(r,c)) in enumerate(subplt.layout)
+#
+#         # add the Plot object to the row
+#         push!(row, getGadflyContext(subplt.plts[i]))
+#
+#         # add the row
+#         if c == ncols(subplt.layout, r)
+#             push!(rows, Gadfly.hstack(row...))
+#             row = Any[]
+#         end
+#     end
+#
+#     # stack the rows
+#     Gadfly.vstack(rows...)
+# end
+
+setGadflyDisplaySize(w,h) = Compose.set_default_graphic_size(w * Compose.px, h * Compose.px)
+setGadflyDisplaySize(plt::Plot) = setGadflyDisplaySize(plt.attr[:size]...)
+# setGadflyDisplaySize(subplt::Subplot) = setGadflyDisplaySize(getattr(subplt, 1)[:size]...)
+# -------------------------------------------------------------------------
+
+
+function doshow{P<:Union{GadflyBackend,ImmerseBackend}}(io::IO, func, plt::AbstractPlot{P})
+    gplt = getGadflyContext(plt)
+    setGadflyDisplaySize(plt)
+    Gadfly.draw(func(io, Compose.default_graphic_width, Compose.default_graphic_height), gplt)
+end
+
+getGadflyWriteFunc(::MIME"image/png") = Gadfly.PNG
+getGadflyWriteFunc(::MIME"image/svg+xml") = Gadfly.SVG
+# getGadflyWriteFunc(::MIME"text/html") = Gadfly.SVGJS
+getGadflyWriteFunc(::MIME"application/pdf") = Gadfly.PDF
+getGadflyWriteFunc(::MIME"application/postscript") = Gadfly.PS
+getGadflyWriteFunc(::MIME"application/x-tex") = Gadfly.PGF
+getGadflyWriteFunc(m::MIME) = error("Unsupported in Gadfly/Immerse: ", m)
+
+for mime in (MIME"image/png", MIME"image/svg+xml", MIME"application/pdf", MIME"application/postscript", MIME"application/x-tex")
+    @eval function Base.show{P<:Union{GadflyBackend,ImmerseBackend}}(io::IO, ::$mime, plt::AbstractPlot{P})
+        func = getGadflyWriteFunc($mime())
+        doshow(io, func, plt)
+    end
+end
+
+
+
+function Base.display(::PlotsDisplay, plt::Plot{GadflyBackend})
+    setGadflyDisplaySize(plt.attr[:size]...)
+    display(plt.o)
+end
+
+
+# function Base.display(::PlotsDisplay, subplt::Subplot{GadflyBackend})
+#     setGadflyDisplaySize(getattr(subplt,1)[:size]...)
+#     ctx = buildGadflySubplotContext(subplt)
+#
+#     # taken from Gadfly since I couldn't figure out how to do it directly
+#
+#     filename = string(Gadfly.tempname(), ".html")
+#     output = open(filename, "w")
+#
+#     plot_output = IOBuffer()
+#     Gadfly.draw(Gadfly.SVGJS(plot_output, Compose.default_graphic_width,
+#              Compose.default_graphic_height, false), ctx)
+#     plotsvg = takebuf_string(plot_output)
+#
+#     write(output,
+#       """
+#       <!DOCTYPE html>
+#       <html>
+#         <head>
+#           <title>Gadfly Plot</title>
+#           <meta charset="utf-8">
+#         </head>
+#           <body>
+#           <script charset="utf-8">
+#               $(readall(Compose.snapsvgjs))
+#           </script>
+#           <script charset="utf-8">
+#               $(readall(Gadfly.gadflyjs))
+#           </script>
+#           $(plotsvg)
+#         </body>
+#       </html>
+#       """)
+#     close(output)
+#     Gadfly.open_file(filename)
+# end
@@ -0,0 +1,93 @@
+
+
+# Geometry which displays arbitrary shapes at given (x, y) positions.
+# note: vertices is a list of shapes
+immutable ShapeGeometry <: Gadfly.GeometryElement
+    vertices::AbstractVector #{Tuple{Float64,Float64}}
+    tag::Symbol
+
+    function ShapeGeometry(shape; tag::Symbol=Gadfly.Geom.empty_tag)
+        new(shape, tag)
+    end
+end
+
+# TODO: add for PR
+# const shape = ShapeGeometry
+
+
+function Gadfly.element_aesthetics(::ShapeGeometry)
+    [:x, :y, :size, :color]
+end
+
+
+# Generate a form for a shape geometry.
+#
+# Args:
+#   geom: shape geometry.
+#   theme: the plot's theme.
+#   aes: aesthetics.
+#
+# Returns:
+#   A compose Form.
+#
+function Gadfly.render(geom::ShapeGeometry, theme::Gadfly.Theme, aes::Gadfly.Aesthetics)
+
+    # TODO: add for PR
+    # Gadfly.assert_aesthetics_defined("Geom.shape", aes, :x, :y)
+    # Gadfly.assert_aesthetics_equal_length("Geom.shape", aes,
+    #                                       element_aesthetics(geom)...)
+
+    default_aes = Gadfly.Aesthetics()
+    default_aes.color = Gadfly.DataFrames.PooledDataArray(RGBA{Float32}[theme.default_color])
+    default_aes.size = Compose.Measure[theme.default_point_size]
+    aes = Gadfly.inherit(aes, default_aes)
+
+    lw_hover_scale = 10
+    lw_ratio = theme.line_width / aes.size[1]
+
+    aes_x, aes_y = Gadfly.concretize(aes.x, aes.y)
+
+    ctx = Compose.compose!(
+        Compose.context(),
+        make_polygon(geom, aes.x, aes.y, aes.size),
+        Compose.fill(aes.color),
+        Compose.linewidth(theme.highlight_width))
+
+    if aes.color_key_continuous != nothing && aes.color_key_continuous
+        Compose.compose!(ctx,
+            Compose.stroke(map(theme.continuous_highlight_color, aes.color)))
+    else
+        Compose.compose!(ctx,
+            Compose.stroke(map(theme.discrete_highlight_color, aes.color)),
+            Compose.svgclass([Gadfly.svg_color_class_from_label(Gadfly.escape_id(aes.color_label([c])[1]))
+                      for c in aes.color]))
+    end
+
+    return Compose.compose!(Compose.context(order=4), Compose.svgclass("geometry"), ctx)
+end
+
+function gadflyshape(sv::Shape)
+  ShapeGeometry(Any[vertices(sv)])
+end
+
+function gadflyshape(sv::AVec{Shape})
+    ShapeGeometry(Any[vertices(s) for s in sv])
+end
+
+
+# create a Compose context given a ShapeGeometry and the xs/ys/sizes
+function make_polygon(geom::ShapeGeometry, xs::AbstractArray, ys::AbstractArray, rs::AbstractArray)
+  n = max(length(xs), length(ys), length(rs))
+  T = Tuple{Compose.Measure, Compose.Measure}
+  polys = Array(Vector{T}, n)
+  for i in 1:n
+    x = Compose.x_measure(xs[mod1(i, length(xs))])
+    y = Compose.y_measure(ys[mod1(i, length(ys))])
+    r = rs[mod1(i, length(rs))]
+    polys[i] = T[(x + r * sx, y + r * sy) for (sx,sy) in cycle(geom.vertices, i)]
+  end
+  Gadfly.polygon(polys, geom.tag)
+end
+
+
+# ---------------------------------------------------------------------------------------------
@@ -0,0 +1,186 @@
+
+# https://github.com/JuliaGraphics/Immerse.jl
+
+supported_attrs(::ImmerseBackend) = supported_attrs(GadflyBackend())
+supported_types(::ImmerseBackend) = supported_types(GadflyBackend())
+supported_styles(::ImmerseBackend) = supported_styles(GadflyBackend())
+supported_markers(::ImmerseBackend) = supported_markers(GadflyBackend())
+supported_scales(::ImmerseBackend) = supported_scales(GadflyBackend())
+is_subplot_supported(::ImmerseBackend) = true
+
+# --------------------------------------------------------------------------------------
+
+function _initialize_backend(::ImmerseBackend; kw...)
+  @eval begin
+    import Immerse, Gadfly, Compose, Gtk
+    export Immerse, Gadfly, Compose, Gtk
+    include(joinpath(dirname(@__FILE__), "gadfly_shapes.jl"))
+  end
+end
+
+function createImmerseFigure(d::KW)
+  w,h = d[:size]
+  figidx = Immerse.figure(; name = d[:window_title], width = w, height = h)
+  Immerse.Figure(figidx)
+end
+
+# ----------------------------------------------------------------
+
+
+# create a blank Gadfly.Plot object
+# function _create_plot(pkg::ImmerseBackend, d::KW)
+#   # create the underlying Gadfly.Plot object
+#   gplt = createGadflyPlotObject(d)
+#
+#   # save both the Immerse.Figure and the Gadfly.Plot
+#   Plot((nothing,gplt), pkg, 0, d, KW[])
+# end
+function _create_backend_figure(plt::Plot{ImmerseBackend})
+    (nothing, createGadflyPlotObject(plt.attr))
+end
+
+
+# # plot one data series
+# function _series_added(::ImmerseBackend, plt::Plot, d::KW)
+#   addGadflySeries!(plt, d)
+#   push!(plt.seriesargs, d)
+#   plt
+# end
+
+function _series_added(plt::Plot{ImmerseBackend}, series::Series)
+    addGadflySeries!(plt, series.d)
+end
+
+
+function _update_plot_object(plt::Plot{ImmerseBackend}, d::KW)
+  updateGadflyGuides(plt, d)
+  updateGadflyPlotTheme(plt, d)
+end
+
+
+
+# ----------------------------------------------------------------
+
+function _add_annotations{X,Y,V}(plt::Plot{ImmerseBackend}, anns::AVec{Tuple{X,Y,V}})
+  for ann in anns
+    push!(getGadflyContext(plt).guides, createGadflyAnnotationObject(ann...))
+  end
+end
+
+# ----------------------------------------------------------------
+
+# accessors for x/y data
+
+function getxy(plt::Plot{ImmerseBackend}, i::Integer)
+  mapping = getGadflyMappings(plt, i)[1]
+  mapping[:x], mapping[:y]
+end
+
+function setxy!{X,Y}(plt::Plot{ImmerseBackend}, xy::Tuple{X,Y}, i::Integer)
+  for mapping in getGadflyMappings(plt, i)
+    mapping[:x], mapping[:y] = xy
+  end
+  plt
+end
+
+
+# ----------------------------------------------------------------
+
+
+# function _create_subplot(subplt::Subplot{ImmerseBackend}, isbefore::Bool)
+#   return false
+#   # isbefore && return false
+# end
+#
+# function showSubplotObject(subplt::Subplot{ImmerseBackend})
+#   # create the Gtk window with vertical box vsep
+#   d = getattr(subplt,1)
+#   w,h = d[:size]
+#   vsep = Gtk.GtkBoxLeaf(:v)
+#   win = Gtk.GtkWindowLeaf(vsep, d[:window_title], w, h)
+#
+#   figindices = []
+#   row = Gtk.GtkBoxLeaf(:h)
+#   push!(vsep, row)
+#   for (i,(r,c)) in enumerate(subplt.layout)
+#     plt = subplt.plts[i]
+#
+#     # get the components... box is the main plot GtkBox, and canvas is the GtkCanvas where it's plotted
+#     box, toolbar, canvas = Immerse.createPlotGuiComponents()
+#
+#     # add the plot's box to the row
+#     push!(row, box)
+#
+#     # create the figure and store the index returned for destruction later
+#     figidx = Immerse.figure(canvas)
+#     push!(figindices, figidx)
+#
+#     fig = Immerse.figure(figidx)
+#     plt.o = (fig, plt.o[2])
+#
+#     # add the row
+#     if c == ncols(subplt.layout, r)
+#       row = Gtk.GtkBoxLeaf(:h)
+#       push!(vsep, row)
+#     end
+#
+#   end
+#
+#   # destructor... clean up plots
+#   Gtk.on_signal_destroy((x...) -> ([Immerse.dropfig(Immerse._display,i) for i in figindices]; subplt.o = nothing), win)
+#
+#   subplt.o = win
+#   true
+# end
+
+
+function _remove_axis(plt::Plot{ImmerseBackend}, isx::Bool)
+  gplt = getGadflyContext(plt)
+  addOrReplace(gplt.guides, isx ? Gadfly.Guide.xticks : Gadfly.Guide.yticks; label=false)
+  addOrReplace(gplt.guides, isx ? Gadfly.Guide.xlabel : Gadfly.Guide.ylabel, "")
+end
+
+function _expand_limits(lims, plt::Plot{ImmerseBackend}, isx::Bool)
+  for l in getGadflyContext(plt).layers
+    _expand_limits(lims, l.mapping[isx ? :x : :y])
+  end
+end
+
+
+# ----------------------------------------------------------------
+
+getGadflyContext(plt::Plot{ImmerseBackend}) = plt.o[2]
+# getGadflyContext(subplt::Subplot{ImmerseBackend}) = buildGadflySubplotContext(subplt)
+
+
+function Base.display(::PlotsDisplay, plt::Plot{ImmerseBackend})
+
+  fig, gplt = plt.o
+  if fig == nothing
+    fig = createImmerseFigure(plt.attr)
+    Gtk.on_signal_destroy((x...) -> (Immerse.dropfig(Immerse._display, fig.figno); plt.o = (nothing,gplt)), fig.canvas)
+    plt.o = (fig, gplt)
+  end
+
+  Immerse.figure(fig.figno; displayfig = false)
+  display(gplt)
+end
+
+
+# function Base.display(::PlotsDisplay, subplt::Subplot{ImmerseBackend})
+#
+#   # if we haven't created the window yet, do it
+#   if subplt.o == nothing
+#     showSubplotObject(subplt)
+#   end
+#
+#   # display the plots by creating a fresh Immerse.Figure object from the GtkCanvas and Gadfly.Plot
+#   for plt in subplt.plts
+#     fig, gplt = plt.o
+#     Immerse.figure(fig.figno; displayfig = false)
+#     display(gplt)
+#   end
+#
+#   # o is the window... show it
+#   showall(subplt.o)
+# end
@@ -0,0 +1,308 @@
+
+# https://github.com/tbreloff/Qwt.jl
+
+
+supported_attrs(::QwtBackend) = merge_with_base_supported([
+    :annotations,
+    :linecolor,
+    :fillrange,
+    :fillcolor,
+    :label,
+    :legend,
+    :seriescolor, :seriesalpha,
+    :linestyle,
+    :linewidth,
+    :markershape,
+    :markercolor,
+    :markersize,
+    :bins,
+    :pos,
+    :title,
+    :window_title,
+    :guide, :lims, :ticks, :scale,
+  ])
+supported_types(::QwtBackend) = [:path, :scatter, :hexbin, :bar]
+supported_markers(::QwtBackend) = [:none, :auto, :rect, :circle, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :star8, :hexagon]
+supported_scales(::QwtBackend) = [:identity, :log10]
+is_subplot_supported(::QwtBackend) = true
+
+
+# --------------------------------------------------------------------------------------
+
+function _initialize_backend(::QwtBackend; kw...)
+  @eval begin
+    warn("Qwt is no longer supported... many features will likely be broken.")
+    import Qwt
+    export Qwt
+  end
+end
+
+# -------------------------------
+
+const _qwtAliases = KW(
+    :bins => :heatmap_n,
+    :fillrange => :fillto,
+    :linewidth => :width,
+    :markershape => :marker,
+    :hexbin => :heatmap,
+    :path => :line,
+    :steppost => :step,
+    :steppre => :stepinverted,
+    :star5 => :star1,
+    :star8 => :star2,
+  )
+
+function fixcolors(d::KW)
+  for (k,v) in d
+    if typeof(v) <: ColorScheme
+      d[k] = getColor(v)
+    end
+  end
+end
+
+function replaceQwtAliases(d, s)
+  if haskey(_qwtAliases, d[s])
+    d[s] = _qwtAliases[d[s]]
+  end
+end
+
+function adjustQwtKeywords(plt::Plot{QwtBackend}, iscreating::Bool; kw...)
+  d = KW(kw)
+  st = d[:seriestype]
+  if st == :scatter
+    d[:seriestype] = :none
+    if d[:markershape] == :none
+      d[:markershape] = :circle
+    end
+
+  elseif st in (:hline, :vline)
+    addLineMarker(plt, d)
+    d[:seriestype] = :none
+    d[:markershape] = :circle
+    d[:markersize] = 1
+    if st == :vline
+      d[:x], d[:y] = d[:y], d[:x]
+    end
+
+  elseif !iscreating && st == :bar
+    d = barHack(; kw...)
+  elseif !iscreating && st == :histogram
+    d = barHack(; histogramHack(; kw...)...)
+  end
+
+  replaceQwtAliases(d, :seriestype)
+  replaceQwtAliases(d, :markershape)
+
+  for k in keys(d)
+    if haskey(_qwtAliases, k)
+      d[_qwtAliases[k]] = d[k]
+    end
+  end
+
+  d[:x] = collect(d[:x])
+  d[:y] = collect(d[:y])
+
+  d
+end
+
+# function _create_plot(pkg::QwtBackend, d::KW)
+function _create_backend_figure(plt::Plot{QwtBackend})
+  fixcolors(plt.attr)
+  dumpdict(plt.attr,"\n\n!!! plot")
+  o = Qwt.plot(zeros(0,0); plt.attr..., show=false)
+  # plt = Plot(o, pkg, 0, d, KW[])
+  # plt
+end
+
+# function _series_added(::QwtBackend, plt::Plot, d::KW)
+function _series_added(plt::Plot{QwtBackend}, series::Series)
+  d = adjustQwtKeywords(plt, false; series.d...)
+  fixcolors(d)
+  dumpdict(d,"\n\n!!! plot!")
+  Qwt.oplot(plt.o; d...)
+  # push!(plt.seriesargs, d)
+  # plt
+end
+
+
+# ----------------------------------------------------------------
+
+function updateLimsAndTicks(plt::Plot{QwtBackend}, d::KW, isx::Bool)
+  lims = get(d, isx ? :xlims : :ylims, nothing)
+  ticks = get(d, isx ? :xticks : :yticks, nothing)
+  w = plt.o.widget
+  axisid = Qwt.QWT.QwtPlot[isx ? :xBottom : :yLeft]
+
+  if typeof(lims) <: Union{Tuple,AVec} && length(lims) == 2
+    if isx
+      plt.o.autoscale_x = false
+    else
+      plt.o.autoscale_y = false
+    end
+    w[:setAxisScale](axisid, lims...)
+  end
+
+  if typeof(ticks) <: Range
+    if isx
+      plt.o.autoscale_x = false
+    else
+      plt.o.autoscale_y = false
+    end
+    w[:setAxisScale](axisid, float(minimum(ticks)), float(maximum(ticks)), float(step(ticks)))
+  elseif !(ticks in (nothing, :none, :auto))
+    warn("Only Range types are supported for Qwt xticks/yticks. typeof(ticks)=$(typeof(ticks))")
+  end
+
+  # change the scale
+  scalesym = isx ? :xscale : :yscale
+  if haskey(d, scalesym)
+    scaletype = d[scalesym]
+    scaletype == :identity  && w[:setAxisScaleEngine](axisid, Qwt.QWT.QwtLinearScaleEngine())
+    # scaletype == :log       && w[:setAxisScaleEngine](axisid, Qwt.QWT.QwtLogScaleEngine(e))
+    # scaletype == :log2      && w[:setAxisScaleEngine](axisid, Qwt.QWT.QwtLogScaleEngine(2))
+    scaletype == :log10     && w[:setAxisScaleEngine](axisid, Qwt.QWT.QwtLog10ScaleEngine())
+    scaletype in supported_scales() || warn("Unsupported scale type: ", scaletype)
+  end
+
+end
+
+
+function _update_plot_object(plt::Plot{QwtBackend}, d::KW)
+  haskey(d, :title) && Qwt.title(plt.o, d[:title])
+  haskey(d, :xguide) && Qwt.xlabel(plt.o, d[:xguide])
+  haskey(d, :yguide) && Qwt.ylabel(plt.o, d[:yguide])
+  updateLimsAndTicks(plt, d, true)
+  updateLimsAndTicks(plt, d, false)
+end
+
+function _update_plot_pos_size(plt::AbstractPlot{QwtBackend}, d::KW)
+  haskey(d, :size) && Qwt.resizewidget(plt.o, d[:size]...)
+  haskey(d, :pos) && Qwt.movewidget(plt.o, d[:pos]...)
+end
+
+
+# ----------------------------------------------------------------
+
+        # curve.setPen(Qt.QPen(Qt.QColor(color), linewidth, self.getLineStyle(linestyle)))
+function addLineMarker(plt::Plot{QwtBackend}, d::KW)
+  for yi in d[:y]
+    marker = Qwt.QWT.QwtPlotMarker()
+    ishorizontal = (d[:seriestype] == :hline)
+    marker[:setLineStyle](ishorizontal ? 1 : 2)
+    marker[ishorizontal ? :setYValue : :setXValue](yi)
+    qcolor = Qwt.convertRGBToQColor(getColor(d[:linecolor]))
+    linestyle = plt.o.widget[:getLineStyle](string(d[:linestyle]))
+    marker[:setLinePen](Qwt.QT.QPen(qcolor, d[:linewidth], linestyle))
+    marker[:attach](plt.o.widget)
+  end
+
+  # marker[:setValue](x, y)
+  # marker[:setLabel](Qwt.QWT.QwtText(val))
+  # marker[:attach](plt.o.widget)
+end
+
+function createQwtAnnotation(plt::Plot, x, y, val::PlotText)
+  marker = Qwt.QWT.QwtPlotMarker()
+  marker[:setValue](x, y)
+  qwttext = Qwt.QWT.QwtText(val.str)
+  qwttext[:setFont](Qwt.QT.QFont(val.font.family, val.font.pointsize))
+  qwttext[:setColor](Qwt.convertRGBToQColor(getColor(val.font.color)))
+  marker[:setLabel](qwttext)
+  marker[:attach](plt.o.widget)
+end
+
+function createQwtAnnotation(plt::Plot, x, y, val::AbstractString)
+  marker = Qwt.QWT.QwtPlotMarker()
+  marker[:setValue](x, y)
+  marker[:setLabel](Qwt.QWT.QwtText(val))
+  marker[:attach](plt.o.widget)
+end
+
+function _add_annotations{X,Y,V}(plt::Plot{QwtBackend}, anns::AVec{Tuple{X,Y,V}})
+  for ann in anns
+    createQwtAnnotation(plt, ann...)
+  end
+end
+
+# ----------------------------------------------------------------
+
+# accessors for x/y data
+
+function getxy(plt::Plot{QwtBackend}, i::Int)
+  series = plt.o.lines[i]
+  series.x, series.y
+end
+
+function setxy!{X,Y}(plt::Plot{QwtBackend}, xy::Tuple{X,Y}, i::Integer)
+  series = plt.o.lines[i]
+  series.x, series.y = xy
+  plt
+end
+
+
+# -------------------------------
+
+# -------------------------------
+
+# # create the underlying object (each backend will do this differently)
+# function _create_subplot(subplt::Subplot{QwtBackend}, isbefore::Bool)
+#   isbefore && return false
+#   i = 0
+#   rows = Any[]
+#   row = Any[]
+#   for (i,(r,c)) in enumerate(subplt.layout)
+#     push!(row, subplt.plts[i].o)
+#     if c == ncols(subplt.layout, r)
+#       push!(rows, Qwt.hsplitter(row...))
+#       row = Any[]
+#     end
+#   end
+#   # for rowcnt in subplt.layout.rowcounts
+#   #   push!(rows, Qwt.hsplitter([plt.o for plt in subplt.plts[(1:rowcnt) + i]]...))
+#   #   i += rowcnt
+#   # end
+#   subplt.o = Qwt.vsplitter(rows...)
+#   # Qwt.resizewidget(subplt.o, getattr(subplt,1)[:size]...)
+#   # Qwt.moveToLastScreen(subplt.o)  # hack so it goes to my center monitor... sorry
+#   true
+# end
+
+function _expand_limits(lims, plt::Plot{QwtBackend}, isx::Bool)
+  for series in plt.o.lines
+    _expand_limits(lims, isx ? series.x : series.y)
+  end
+end
+
+
+function _remove_axis(plt::Plot{QwtBackend}, isx::Bool)
+end
+
+
+# ----------------------------------------------------------------
+
+function Base.show(io::IO, ::MIME"image/png", plt::Plot{QwtBackend})
+  Qwt.refresh(plt.o)
+  Qwt.savepng(plt.o, "/tmp/dfskjdhfkh.png")
+  write(io, readall("/tmp/dfskjdhfkh.png"))
+end
+
+# function Base.show(io::IO, ::MIME"image/png", subplt::Subplot{QwtBackend})
+#   for plt in subplt.plts
+#     Qwt.refresh(plt.o)
+#   end
+#   Qwt.savepng(subplt.o, "/tmp/dfskjdhfkh.png")
+#   write(io, readall("/tmp/dfskjdhfkh.png"))
+# end
+
+
+function Base.display(::PlotsDisplay, plt::Plot{QwtBackend})
+  Qwt.refresh(plt.o)
+  Qwt.showwidget(plt.o)
+end
+
+# function Base.display(::PlotsDisplay, subplt::Subplot{QwtBackend})
+#   for plt in subplt.plts
+#     Qwt.refresh(plt.o)
+#   end
+#   Qwt.showwidget(subplt.o)
+# end
@@ -0,0 +1,272 @@
+
+# https://github.com/nolta/Winston.jl
+
+# credit goes to https://github.com/jverzani for contributing to the first draft of this backend implementation
+
+supported_attrs(::WinstonBackend) = merge_with_base_supported([
+    :annotations,
+    :linecolor,
+    :fillrange,
+    :fillcolor,
+    :label,
+    :legend,
+    :seriescolor, :seriesalpha,
+    :linestyle,
+    :linewidth,
+    :markershape,
+    :markercolor,
+    :markersize,
+    :bins,
+    :title,
+    :window_title,
+    :guide, :lims, :scale,
+  ])
+supported_types(::WinstonBackend) = [:path, :scatter, :bar]
+supported_styles(::WinstonBackend) = [:auto, :solid, :dash, :dot, :dashdot]
+supported_markers(::WinstonBackend) = [:none, :auto, :rect, :circle, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5]
+supported_scales(::WinstonBackend) = [:identity, :log10]
+is_subplot_supported(::WinstonBackend) = false
+
+
+# --------------------------------------------------------------------------------------
+
+
+function _initialize_backend(::WinstonBackend; kw...)
+  @eval begin
+    # ENV["WINSTON_OUTPUT"] = "gtk"
+    warn("Winston is no longer supported... many features will likely be broken.")
+    import Winston, Gtk
+    export Winston, Gtk
+  end
+end
+
+# ---------------------------------------------------------------------------
+
+
+## dictionaries for conversion of Plots.jl names to Winston ones.
+const winston_linestyle =  KW(:solid=>"solid",
+                                :dash=>"dash",
+                                :dot=>"dotted",
+                                :dashdot=>"dotdashed"
+                               )
+
+const winston_marker = KW(:none=>".",
+                            :rect => "square",
+                            :circle=>"circle",
+                            :diamond=>"diamond",
+                            :utriangle=>"triangle",
+                            :dtriangle=>"down-triangle",
+                            :cross => "plus",
+                            :xcross => "cross",
+                            :star5 => "asterisk"
+                           )
+
+function _before_update(plt::Plot{WinstonBackend})
+  Winston.ghf(plt.o)
+end
+
+# ---------------------------------------------------------------------------
+
+function _create_backend_figure(plt::Plot{WinstonBackend})
+    Winston.FramedPlot(
+        title = plt.attr[:title],
+        xlabel = plt.attr[:xguide],
+        ylabel = plt.attr[:yguide]
+    )
+end
+
+copy_remove(d::KW, s::Symbol) = delete!(copy(d), s)
+
+function addRegressionLineWinston(d::KW, wplt)
+  xs, ys = regressionXY(d[:x], d[:y])
+  Winston.add(wplt, Winston.Curve(xs, ys, kind="dotted"))
+end
+
+function getWinstonItems(plt::Plot)
+  if isa(plt.o, Winston.FramedPlot)
+    wplt = plt.o
+    window, canvas = nothing, nothing
+  else
+    window, canvas, wplt = plt.o
+  end
+  window, canvas, wplt
+end
+
+function _series_added(plt::Plot{WinstonBackend}, series::Series)
+    d = series.d
+  window, canvas, wplt = getWinstonItems(plt)
+
+  # until we call it normally, do the hack
+  if d[:seriestype] == :bar
+    d = barHack(;d...)
+  end
+
+
+  e = KW()
+  e[:color] = getColor(d[:linecolor])
+  e[:linewidth] = d[:linewidth]
+  e[:kind] = winston_linestyle[d[:linestyle]]
+  e[:symbolkind] = winston_marker[d[:markershape]]
+  # markercolor     # same choices as `color`, or :match will set the color to be the same as `color`
+  e[:symbolsize] = d[:markersize] / 5
+
+  # pos             # (Int,Int), move the enclosing window to this position
+  # screen          # Integer, move enclosing window to this screen number (for multiscreen desktops)
+
+
+
+  ## lintype :path, :step, :stepinverted, :sticks, :dots, :none, :histogram2d, :hexbin, :histogram, :bar
+  if d[:seriestype] == :none
+    Winston.add(wplt, Winston.Points(d[:x], d[:y]; copy_remove(e, :kind)..., color=getColor(d[:markercolor])))
+
+  elseif d[:seriestype] == :path
+    x, y = d[:x], d[:y]
+    Winston.add(wplt, Winston.Curve(x, y; e...))
+
+    fillrange = d[:fillrange]
+    if fillrange != nothing
+      if isa(fillrange, AbstractVector)
+        y2 = fillrange
+      else
+        y2 = Float64[fillrange for yi in y]
+      end
+      Winston.add(wplt, Winston.FillBetween(x, y, x, y2, fillcolor=getColor(d[:fillcolor])))
+    end
+
+  elseif d[:seriestype] == :scatter
+    if d[:markershape] == :none
+      d[:markershape] = :circle
+    end
+
+  # elseif d[:seriestype] == :step
+  #     fn = Winston.XXX
+
+  # elseif d[:seriestype] == :stepinverted
+  #     fn = Winston.XXX
+
+  elseif d[:seriestype] == :sticks
+      Winston.add(wplt, Winston.Stems(d[:x], d[:y]; e...))
+
+  # elseif d[:seriestype] == :dots
+  #     fn = Winston.XXX
+
+  # elseif d[:seriestype] == :histogram2d
+  #     fn = Winston.XXX
+
+  # elseif d[:seriestype] == :hexbin
+  #     fn = Winston.XXX
+
+  elseif d[:seriestype] == :histogram
+      hst = hist(d[:y], d[:bins])
+      Winston.add(wplt, Winston.Histogram(hst...; copy_remove(e, :bins)...))
+
+  # elseif d[:seriestype] == :bar
+  #     # fn = Winston.XXX
+
+  else
+    error("seriestype $(d[:seriestype]) not supported by Winston.")
+
+  end
+
+
+  # markershape
+  if d[:markershape] != :none
+    Winston.add(wplt, Winston.Points(d[:x], d[:y]; copy_remove(e, :kind)..., color=getColor(d[:markercolor])))
+  end
+
+
+  # optionally add a regression line
+  d[:smooth] && d[:seriestype] != :histogram && addRegressionLineWinston(d, wplt)
+
+  # push!(plt.seriesargs, d)
+  # plt
+end
+
+
+# ----------------------------------------------------------------
+
+const _winstonNames = KW(
+    :xlims => :xrange,
+    :ylims => :yrange,
+    :xscale => :xlog,
+    :yscale => :ylog,
+  )
+
+function _update_plot_object(plt::Plot{WinstonBackend}, d::KW)
+  window, canvas, wplt = getWinstonItems(plt)
+  for k in (:xguide, :yguide, :title, :xlims, :ylims)
+    if haskey(d, k)
+      Winston.setattr(wplt, string(get(_winstonNames, k, k)), d[k])
+    end
+  end
+
+  for k in (:xscale, :yscale)
+    if haskey(d, k)
+      islogscale = d[k] == :log10
+      Winston.setattr(wplt, (k == :xscale ? :xlog : :ylog), islogscale)
+    end
+  end
+
+end
+
+
+
+# ----------------------------------------------------------------
+
+function createWinstonAnnotationObject(plt::Plot{WinstonBackend}, x, y, val::AbstractString)
+  Winston.text(x, y, val)
+end
+
+function _add_annotations{X,Y,V}(plt::Plot{WinstonBackend}, anns::AVec{Tuple{X,Y,V}})
+  for ann in anns
+    createWinstonAnnotationObject(plt, ann...)
+  end
+end
+
+
+# ----------------------------------------------------------------
+
+# function _create_subplot(subplt::Subplot{WinstonBackend}, isbefore::Bool)
+#   # TODO: build the underlying Subplot object.  this is where you might layout the panes within a GUI window, for example
+# end
+
+# ----------------------------------------------------------------
+
+function addWinstonLegend(plt::Plot, wplt)
+  if plt.attr[:legend] != :none
+    Winston.legend(wplt, [sd[:label] for sd in plt.seriesargs])
+  end
+end
+
+function Base.show(io::IO, ::MIME"image/png", plt::AbstractPlot{WinstonBackend})
+  window, canvas, wplt = getWinstonItems(plt)
+  addWinstonLegend(plt, wplt)
+  show(io, "image/png", wplt)
+end
+
+
+function Base.display(::PlotsDisplay, plt::Plot{WinstonBackend})
+
+  window, canvas, wplt = getWinstonItems(plt)
+
+  if window == nothing
+    if Winston.output_surface != :gtk
+      error("Gtk is the only supported display for Winston in Plots.  Set `output_surface = gtk` in src/Winston.ini")
+    end
+    # initialize window
+    w,h = plt.attr[:size]
+    canvas = Gtk.GtkCanvasLeaf()
+    window = Gtk.GtkWindowLeaf(canvas, plt.attr[:window_title], w, h)
+    plt.o = (window, canvas, wplt)
+  end
+
+  addWinstonLegend(plt, wplt)
+
+  Winston.display(canvas, wplt)
+  Gtk.showall(window)
+end
+
+
+# function Base.display(::PlotsDisplay, subplt::Subplot{WinstonBackend})
+#   # TODO: display/show the Subplot object
+# end
@@ -0,0 +1,415 @@
+
+abstract ColorScheme
+
+Base.getindex(scheme::ColorScheme, i::Integer) = getColor(scheme, i)
+
+export
+    cgrad
+
+cgrad() = default_gradient()
+
+function cgrad(arg, values = nothing; alpha = nothing, scale = :identity)
+    colors = ColorGradient(arg, alpha=alpha).colors
+    values = if values != nothing
+        values
+    elseif scale in (:log, :log10)
+        log10(linspace(1,10,30))
+    elseif scale == :log2
+        log2(linspace(1,2,30))
+    elseif scale == :ln
+        log(linspace(1,pi,30))
+    elseif scale in (:exp, :exp10)
+        (exp10(linspace(0,1,30)) - 1) / 9
+    else
+        linspace(0, 1, length(colors))
+    end
+    ColorGradient(colors, values)
+end
+
+# --------------------------------------------------------------
+
+getColor(scheme::ColorScheme) = getColor(scheme, 1)
+getColorVector(scheme::ColorScheme) = [getColor(scheme)]
+
+colorscheme(scheme::ColorScheme) = scheme
+colorscheme(s::AbstractString; kw...) = colorscheme(Symbol(s); kw...)
+colorscheme(s::Symbol; kw...) = haskey(_gradients, s) ? ColorGradient(s; kw...) : ColorWrapper(convertColor(s); kw...)
+colorscheme{T<:Real}(s::Symbol, vals::AVec{T}; kw...) = ColorGradient(s, vals; kw...)
+colorscheme(cs::AVec, vs::AVec; kw...) = ColorGradient(cs, vs; kw...)
+colorscheme{T<:Colorant}(cs::AVec{T}; kw...) = ColorGradient(cs; kw...)
+colorscheme(f::Function; kw...) = ColorFunction(f; kw...)
+colorscheme(v::AVec; kw...) = ColorVector(v; kw...)
+colorscheme(m::AMat; kw...) = size(m,1) == 1 ? map(c->colorscheme(c; kw...), m) : [colorscheme(m[:,i]; kw...) for i in 1:size(m,2)]'
+colorscheme(c::Colorant; kw...) = ColorWrapper(c; kw...)
+
+
+# --------------------------------------------------------------
+
+
+convertColor(c::AbstractString) = parse(Colorant, c)
+convertColor(c::Symbol) = parse(Colorant, string(c))
+convertColor(c::Colorant) = c
+convertColor(cvec::AbstractVector) = map(convertColor, cvec)
+convertColor(c::ColorScheme) = c
+convertColor(v::Void) = RGBA(0,0,0,0)
+convertColor(b::Bool) = b ? RGBA(0,0,0,1) : RGBA(0,0,0,0)
+
+function convertColor(c, α::Real)
+  c = convertColor(c)
+  RGBA(RGB(getColor(c)), α)
+end
+convertColor(cs::AVec, α::Real) = map(c -> convertColor(c, α), cs)
+convertColor(c, α::Void) = convertColor(c)
+
+# backup... try to convert
+getColor(c) = convertColor(c)
+
+# --------------------------------------------------------------
+
+function darken(c, v=0.1)
+    rgba = convert(RGBA, c)
+    r = max(0, min(rgba.r - v, 1))
+    g = max(0, min(rgba.g - v, 1))
+    b = max(0, min(rgba.b - v, 1))
+    RGBA(r,g,b,rgba.alpha)
+end
+function lighten(c, v=0.3)
+    darken(c, -v)
+end
+
+# --------------------------------------------------------------
+
+const _rainbowColors = [colorant"purple", colorant"blue", colorant"green", colorant"orange", colorant"red"]
+const _testColors = [colorant"darkblue", colorant"blueviolet",  colorant"darkcyan",colorant"green",
+                     darken(colorant"yellow",0.3), colorant"orange", darken(colorant"red",0.2)]
+
+const _gradients = KW(
+    :blues        => [colorant"lightblue", colorant"darkblue"],
+    :reds         => [colorant"lightpink", colorant"darkred"],
+    :greens       => [colorant"lightgreen", colorant"darkgreen"],
+    :redsblues    => [colorant"darkred", RGB(0.8,0.85,0.8), colorant"darkblue"],
+    :bluesreds    => [colorant"darkblue", RGB(0.8,0.85,0.8), colorant"darkred"],
+    :heat         => [colorant"lightyellow", colorant"orange", colorant"darkred"],
+    :grays        => [RGB(.95,.95,.95),RGB(.05,.05,.05)],
+    :rainbow      => _rainbowColors,
+    :lightrainbow => map(lighten, _rainbowColors),
+    :darkrainbow  => map(darken, _rainbowColors),
+    :darktest     => _testColors,
+    :lighttest    => map(c -> lighten(c, 0.3), _testColors),
+  )
+
+function register_gradient_colors{C<:Colorant}(name::Symbol, colors::AVec{C})
+    _gradients[name] = colors
+end
+
+include("color_gradients.jl")
+
+default_gradient() = ColorGradient(:inferno)
+
+# --------------------------------------------------------------
+
+"Continuous gradient between values.  Wraps a list of bounding colors and the values they represent."
+immutable ColorGradient <: ColorScheme
+  colors::Vector
+  values::Vector
+
+  function ColorGradient{S<:Real}(cs::AVec, vals::AVec{S} = linspace(0, 1, length(cs)); alpha = nothing)
+    if length(cs) == length(vals)
+      return new(convertColor(cs,alpha), collect(vals))
+    end
+
+    # # otherwise interpolate evenly between the minval and maxval
+    # minval, maxval = minimum(vals), maximum(vals)
+    # vs = Float64[interpolate(minval, maxval, w) for w in linspace(0, 1, length(cs))]
+    # new(convertColor(cs,alpha), vs)
+
+    # interpolate the colors for each value
+    vals = merge(linspace(0, 1, length(cs)), vals)
+    grad = ColorGradient(cs)
+    cs = [getColorZ(grad, z) for z in linspace(0, 1, length(vals))]
+    new(convertColor(cs, alpha), vals)
+  end
+end
+
+
+
+Base.getindex(cs::ColorGradient, i::Integer) = getColor(cs, i)
+Base.getindex(cs::ColorGradient, z::Number) = getColorZ(cs, z)
+
+
+# create a gradient from a symbol (blues, reds, etc) and vector of boundary values
+function ColorGradient{T<:Real}(s::Symbol, vals::AVec{T} = 0:0; kw...)
+  haskey(_gradients, s) || error("Invalid gradient symbol.  Choose from: ", sort(collect(keys(_gradients))))
+  cs = _gradients[s]
+  if vals == 0:0
+    vals = linspace(0, 1, length(cs))
+  end
+  ColorGradient(cs, vals; kw...)
+end
+
+# function ColorGradient{T<:Real}(cs::AVec, vals::AVec{T} = linspace(0, 1, length(cs)); kw...)
+#   ColorGradient(map(convertColor, cs), vals; kw...)
+# end
+
+function ColorGradient(grad::ColorGradient; alpha = nothing)
+  ColorGradient(convertColor(grad.colors, alpha), grad.values)
+end
+
+# anything else just gets the default gradient
+function ColorGradient(cw; alpha=nothing)
+    ColorGradient(default_gradient(), alpha=alpha)
+end
+
+getColor(gradient::ColorGradient, idx::Int) = gradient.colors[mod1(idx, length(gradient.colors))]
+
+function getColorZ(gradient::ColorGradient, z::Real)
+  cs = gradient.colors
+  vs = gradient.values
+  n = length(cs)
+  @assert n > 0 && n == length(vs)
+
+  # can we just return the first color?
+  if z <= vs[1] || n == 1
+    return cs[1]
+  end
+
+  # find the bounding colors and interpolate
+  for i in 2:n
+    if z <= vs[i]
+      return interpolate_rgb(cs[i-1], cs[i], (z - vs[i-1]) / (vs[i] - vs[i-1]))
+    end
+  end
+
+  # if we get here, return the last color
+  cs[end]
+end
+
+getColorVector(gradient::ColorGradient) = gradient.colors
+
+# for 0.3
+Colors.RGBA(c::Colorant) = RGBA(red(c), green(c), blue(c), alpha(c))
+Colors.RGB(c::Colorant) = RGB(red(c), green(c), blue(c))
+
+function interpolate_rgb(c1::Colorant, c2::Colorant, w::Real)
+  rgb1 = RGBA(c1)
+  rgb2 = RGBA(c2)
+  r = interpolate(rgb1.r, rgb2.r, w)
+  g = interpolate(rgb1.g, rgb2.g, w)
+  b = interpolate(rgb1.b, rgb2.b, w)
+  a = interpolate(rgb1.alpha, rgb2.alpha, w)
+  RGBA(r, g, b, a)
+end
+
+
+function interpolate(v1::Real, v2::Real, w::Real)
+  (1-w) * v1 + w * v2
+end
+
+# --------------------------------------------------------------
+
+"Wraps a function, taking an index and returning a Colorant"
+immutable ColorFunction <: ColorScheme
+  f::Function
+end
+
+getColor(scheme::ColorFunction, idx::Int) = scheme.f(idx)
+
+# --------------------------------------------------------------
+
+"Wraps a function, taking an z-value and returning a Colorant"
+immutable ColorZFunction <: ColorScheme
+  f::Function
+end
+
+getColorZ(scheme::ColorZFunction, z::Real) = scheme.f(z)
+
+# --------------------------------------------------------------
+
+"Wraps a vector of colors... may be vector of Symbol/String/Colorant"
+immutable ColorVector <: ColorScheme
+  v::Vector{Colorant}
+  ColorVector(v::AVec; alpha = nothing) = new(convertColor(v,alpha))
+end
+
+getColor(scheme::ColorVector, idx::Int) = convertColor(scheme.v[mod1(idx, length(scheme.v))])
+getColorVector(scheme::ColorVector) = scheme.v
+
+
+# --------------------------------------------------------------
+
+"Wraps a single color"
+immutable ColorWrapper <: ColorScheme
+  c::RGBA
+  ColorWrapper(c::Colorant; alpha = nothing) = new(convertColor(c, alpha))
+end
+
+ColorWrapper(s::Symbol; alpha = nothing) = ColorWrapper(convertColor(parse(Colorant, s), alpha))
+
+getColor(scheme::ColorWrapper, idx::Int) = scheme.c
+getColorZ(scheme::ColorWrapper, z::Real) = scheme.c
+convertColor(c::ColorWrapper, α::Void) = c.c
+
+# --------------------------------------------------------------
+
+
+isbackgrounddark(bgcolor::Color) = Lab(bgcolor).l < 0.5
+
+# move closer to lighter/darker depending on background value
+function adjustAway(val, bgval, vmin=0., vmax=100.)
+  if bgval < 0.5 * (vmax+vmin)
+    tmp = max(val, bgval)
+    return 0.5 * (tmp + max(tmp, vmax))
+  else
+    tmp = min(val, bgval)
+    return 0.5 * (tmp + min(tmp, vmin))
+  end
+end
+
+# borrowed from http://stackoverflow.com/a/1855903:
+lightnessLevel(c::Colorant) = 0.299 * red(c) + 0.587 * green(c) + 0.114 * blue(c)
+
+isdark(c::Colorant) = lightnessLevel(c) < 0.5
+islight(c::Colorant) = !isdark(c)
+
+function convertHexToRGB(h::Unsigned)
+  mask = 0x0000FF
+  RGB([(x & mask) / 0xFF for x in  (h >> 16, h >> 8, h)]...)
+end
+
+# note: I found this list of hex values in a comment by Tatarize here: http://stackoverflow.com/a/12224359
+const _masterColorList = [
+    0xFFFFFF, 0x000000, 0x0000FF, 0x00FF00, 0xFF0000, 0x01FFFE, 0xFFA6FE, 0xFFDB66, 0x006401, 0x010067,
+    0x95003A, 0x007DB5, 0xFF00F6, 0xFFEEE8, 0x774D00, 0x90FB92, 0x0076FF, 0xD5FF00, 0xFF937E, 0x6A826C,
+    0xFF029D, 0xFE8900, 0x7A4782, 0x7E2DD2, 0x85A900, 0xFF0056, 0xA42400, 0x00AE7E, 0x683D3B, 0xBDC6FF,
+    0x263400, 0xBDD393, 0x00B917, 0x9E008E, 0x001544, 0xC28C9F, 0xFF74A3, 0x01D0FF, 0x004754, 0xE56FFE,
+    0x788231, 0x0E4CA1, 0x91D0CB, 0xBE9970, 0x968AE8, 0xBB8800, 0x43002C, 0xDEFF74, 0x00FFC6, 0xFFE502,
+    0x620E00, 0x008F9C, 0x98FF52, 0x7544B1, 0xB500FF, 0x00FF78, 0xFF6E41, 0x005F39, 0x6B6882, 0x5FAD4E,
+    0xA75740, 0xA5FFD2, 0xFFB167, 0x009BFF, 0xE85EBE
+  ]
+const _allColors = map(convertHexToRGB, _masterColorList)
+const _darkColors = filter(isdark, _allColors)
+const _lightColors = filter(islight, _allColors)
+const _sortedColorsForDarkBackground = vcat(_lightColors, reverse(_darkColors[2:end]))
+const _sortedColorsForLightBackground = vcat(_darkColors, reverse(_lightColors[2:end]))
+
+const _defaultNumColors = 17
+
+# --------------------------------------------------------------
+
+# Methods to automatically generate gradients for color selection based on
+# background color and a short list of seed colors
+
+# here are some magic constants that could be changed if you really want
+const _lightness_darkbg = [80.0]
+const _lightness_lightbg = [60.0]
+const _lch_c_const = [60]
+
+function adjust_lch(color, l, c)
+    lch = convert(LCHab, color)
+    convert(RGB, LCHab(l, c, lch.h))
+end
+
+function lightness_from_background(bgcolor)
+  bglight = convert(LCHab, bgcolor).l
+  bglight < 50.0 ? _lightness_darkbg[1] : _lightness_lightbg[1]
+end
+
+function gradient_from_list(cs)
+    zvalues = Plots.get_zvalues(length(cs))
+    indices = sortperm(zvalues)
+    sorted_colors = map(RGBA, cs[indices])
+    sorted_zvalues = zvalues[indices]
+    ColorGradient(sorted_colors, sorted_zvalues)
+end
+
+function generate_colorgradient(bgcolor = colorant"white";
+                               color_bases = color_bases=[colorant"steelblue",colorant"orangered"],
+                               lightness = lightness_from_background(bgcolor),
+                               chroma = _lch_c_const[1],
+                               n = _defaultNumColors)
+  seed_colors = vcat(bgcolor, map(c -> adjust_lch(c, lightness, chroma), color_bases))
+  colors = distinguishable_colors(n,
+      seed_colors,
+      lchoices=Float64[lightness],
+      cchoices=Float64[chroma],
+      hchoices=linspace(0, 340, 20)
+    )[2:end]
+  gradient_from_list(colors)
+end
+
+function get_color_palette(palette, bgcolor::Union{Colorant,ColorWrapper}, numcolors::Integer)
+  grad = if palette == :auto
+    generate_colorgradient(bgcolor)
+  else
+    ColorGradient(palette)
+  end
+  zrng = get_zvalues(numcolors)
+  RGBA[getColorZ(grad, z) for z in zrng]
+end
+
+function get_color_palette{C<:Colorant}(palette::Vector{C},
+            bgcolor::Union{Colorant,ColorWrapper}, numcolors::Integer)
+  palette
+end
+
+# ----------------------------------------------------------------------------------
+
+
+function getpctrange(n::Int)
+    n > 0 || error()
+    n == 1 && return zeros(1)
+    zs = [0.0, 1.0]
+    for i in 3:n
+        sorted = sort(zs)
+        diffs = diff(sorted)
+        widestj = 0
+        widest = 0.0
+        for (j,d) in enumerate(diffs)
+            if d > widest
+                widest = d
+                widestj = j
+            end
+        end
+        push!(zs, sorted[widestj] + 0.5 * diffs[widestj])
+    end
+    zs
+end
+
+function get_zvalues(n::Int)
+    offsets = getpctrange(ceil(Int,n/4)+1)/4
+    offsets = vcat(offsets[1], offsets[3:end])
+    zvalues = Float64[]
+    for offset in offsets
+        append!(zvalues, offset + [0.0, 0.5, 0.25, 0.75])
+    end
+    vcat(zvalues[1], 1.0, zvalues[2:n-1])
+end
+
+# ----------------------------------------------------------------------------------
+
+
+make255(x) = round(Int, 255 * x)
+
+function webcolor(c::Color)
+    @sprintf("rgb(%d, %d, %d)", [make255(f(c)) for f in [red,green,blue]]...)
+end
+function webcolor(c::TransparentColor)
+    @sprintf("rgba(%d, %d, %d, %1.3f)", [make255(f(c)) for f in [red,green,blue]]..., alpha(c))
+end
+webcolor(cs::ColorScheme) = webcolor(getColor(cs))
+webcolor(c) = webcolor(convertColor(c))
+webcolor(c, α) = webcolor(convertColor(getColor(c), α))
+
+# ----------------------------------------------------------------------------------
+
+
+# converts a symbol or string into a colorant (Colors.RGB), and assigns a color automatically
+function getSeriesRGBColor(c, sp::Subplot, n::Int)
+
+  if c == :auto
+    c = autopick(sp[:color_palette], n)
+  end
+
+  # c should now be a subtype of ColorScheme
+  colorscheme(c)
+end
@@ -0,0 +1,63 @@
+
+
+# TODO:
+"""
+- load Contours.jl similar to DataFrames
+- method to build grid from x/y/z vectors
+- method to wrap contours creation
+- method to plot contours as custom shapes (TODO: create Stroke and Fill types and add markerstroke/markerfill args)
+
+"""
+
+
+
+# # ----------------------------------------------------------
+# # ----------------------------------------------------------
+
+
+# immutable Vertex
+#   x::Float64
+#   y::Float64
+#   z::Float64
+# end
+
+# immutable Edge
+#   v::Vertex
+#   u::Vertex
+# end
+
+# # ----------------------------------------------------------
+
+# # one rectangle's z-values and the center vertex
+# # z is ordered: topleft, topright, bottomright, bottomleft
+# immutable GridRect
+#   z::Vector{Float64}
+#   center::Vertex
+#   data::Vector{Vertex}
+# end
+
+
+
+# type Grid
+#   xs::Vector{Float64}
+#   ys::Vector{Float64}
+#   rects::Matrix{GridRect}
+# end
+
+# function splitDataEvenly(v::AbstractVector{Float64}, n::Int)
+#   vs = sort(v)
+  
+# end
+
+# # the goal here is to create the vertical and horizontal partitions
+# # which define the grid, so that the data is somewhat evenly split
+# function bucketData(x, y, z)
+
+# end
+
+
+# function buildGrid(x, y, z)
+#   # create 
+# end
+
+
@@ -0,0 +1,99 @@
+
+# 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
+
+typealias FuncOrFuncs @compat(Union{Function, AVec{Function}})
+
+all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image), get(d, :seriestype, :none))
+
+# missing
+convertToAnyVector(v::@compat(Void), d::KW) = Any[nothing], nothing
+
+# fixed number of blank series
+convertToAnyVector(n::Integer, d::KW) = Any[zeros(0) for i in 1:n], nothing
+
+# numeric vector
+convertToAnyVector{T<:Number}(v::AVec{T}, d::KW) = Any[v], nothing
+
+# string vector
+convertToAnyVector{T<:@compat(AbstractString)}(v::AVec{T}, d::KW) = Any[v], nothing
+
+function convertToAnyVector(v::AMat, d::KW)
+    if all3D(d)
+        Any[Surface(v)]
+    else
+        Any[v[:,i] for i in 1:size(v,2)]
+    end, nothing
+end
+
+# function
+convertToAnyVector(f::Function, d::KW) = Any[f], nothing
+
+# surface
+convertToAnyVector(s::Surface, d::KW) = Any[s], nothing
+
+# # vector of OHLC
+# convertToAnyVector(v::AVec{OHLC}, d::KW) = Any[v], nothing
+
+# dates
+convertToAnyVector{D<:Union{Date,DateTime}}(dts::AVec{D}, d::KW) = Any[dts], nothing
+
+# list of things (maybe other vectors, functions, or something else)
+function convertToAnyVector(v::AVec, d::KW)
+    if all(x -> typeof(x) <: Number, v)
+        # all real numbers wrap the whole vector as one item
+        Any[convert(Vector{Float64}, v)], nothing
+    else
+        # something else... treat each element as an item
+        vcat(Any[convertToAnyVector(vi, d)[1] for vi in v]...), nothing
+        # Any[vi for vi in v], nothing
+    end
+end
+
+convertToAnyVector(t::Tuple, d::KW) = Any[t], nothing
+
+
+function convertToAnyVector(args...)
+    error("In convertToAnyVector, could not handle the argument types: $(map(typeof, args[1:end-1]))")
+end
+
+# --------------------------------------------------------------------
+
+# TODO: can we avoid the copy here?  one error that crops up is that mapping functions over the same array
+#       result in that array being shared.  push!, etc will add too many items to that array
+
+compute_x(x::Void, y::Void, z)      = 1:size(z,1)
+compute_x(x::Void, y, z)            = 1:size(y,1)
+compute_x(x::Function, y, z)        = map(x, y)
+compute_x(x, y, z)                  = copy(x)
+
+# compute_y(x::Void, y::Function, z)  = error()
+compute_y(x::Void, y::Void, z)      = 1:size(z,2)
+compute_y(x, y::Function, z)        = map(y, x)
+compute_y(x, y, z)                  = copy(y)
+
+compute_z(x, y, z::Function)        = map(z, x, y)
+compute_z(x, y, z::AbstractMatrix)  = Surface(z)
+compute_z(x, y, z::Void)            = nothing
+compute_z(x, y, z)                  = copy(z)
+
+nobigs(v::AVec{BigFloat}) = map(Float64, v)
+nobigs(v::AVec{BigInt}) = map(Int64, v)
+nobigs(v) = v
+
+@noinline function compute_xyz(x, y, z)
+    x = compute_x(x,y,z)
+    y = compute_y(x,y,z)
+    z = compute_z(x,y,z)
+    nobigs(x), nobigs(y), nobigs(z)
+end
+
+# not allowed
+compute_xyz(x::Void, y::FuncOrFuncs, z)       = error("If you want to plot the function `$y`, you need to define the x values!")
+compute_xyz(x::Void, y::Void, z::FuncOrFuncs) = error("If you want to plot the function `$z`, you need to define x and y values!")
+compute_xyz(x::Void, y::Void, z::Void)        = error("x/y/z are all nothing!")
+
+# --------------------------------------------------------------------
@@ -1,24 +0,0 @@
-# ---------------------------------------------------------
-# A backup, if no PNG generation is defined, is to try to make a PDF and use FileIO to convert
-
-_fileio_load(@nospecialize(filename::AbstractString)) = FileIO.load(filename::AbstractString)
-_fileio_save(@nospecialize(filename::AbstractString), @nospecialize(x)) = FileIO.save(filename::AbstractString, x)
-
-function _show_pdfbackends(io::IO, ::MIME"image/png", plt::Plot)
-    fn = tempname()
-
-    # first save a pdf file
-    pdf(plt, fn)
-
-    # load that pdf into a FileIO Stream
-    s = _fileio_load(fn * ".pdf")
-
-    # save a png
-    pngfn = fn * ".png"
-    _fileio_save(pngfn, s)
-
-    # now write from the file
-    write(io, read(open(pngfn), String))
-end
-
-const PDFBackends = Union{PGFPlotsBackend,PlotlyJSBackend,PyPlotBackend,InspectDRBackend,GRBackend}
@@ -1,62 +0,0 @@
-const use_local_dependencies = Ref(false)
-const use_local_plotlyjs = Ref(false)
-
-
-function _init_ijulia_plotting()
-    # IJulia is more stable with local file
-    use_local_plotlyjs[] = isfile(plotly_local_file_path)
-
-    ENV["MPLBACKEND"] = "Agg"
-end
-
-
-"""
-Add extra jupyter mimetypes to display_dict based on the plot backed.
-
-The default is nothing, except for plotly based backends, where it
-adds data for `application/vnd.plotly.v1+json` that is used in
-frontends like jupyterlab and nteract.
-"""
-_ijulia__extra_mime_info!(plt::Plot, out::Dict) = out
-
-function _ijulia__extra_mime_info!(plt::Plot{PlotlyJSBackend}, out::Dict)
-    out["application/vnd.plotly.v1+json"] = Dict(
-        :data => plotly_series(plt),
-        :layout => plotly_layout(plt)
-    )
-    out
-end
-
-function _ijulia__extra_mime_info!(plt::Plot{PlotlyBackend}, out::Dict)
-    out["application/vnd.plotly.v1+json"] = Dict(
-        :data => plotly_series(plt),
-        :layout => plotly_layout(plt)
-    )
-    out
-end
-
-
-function _ijulia_display_dict(plt::Plot)
-    output_type = Symbol(plt.attr[:html_output_format])
-    if output_type == :auto
-        output_type = get(_best_html_output_type, backend_name(plt.backend), :svg)
-    end
-    out = Dict()
-    if output_type == :txt
-        mime = "text/plain"
-        out[mime] = sprint(show, MIME(mime), plt)
-    elseif output_type == :png
-        mime = "image/png"
-        out[mime] = base64encode(show, MIME(mime), plt)
-    elseif output_type == :svg
-        mime = "image/svg+xml"
-        out[mime] = sprint(show, MIME(mime), plt)
-    elseif output_type == :html
-        mime = "text/html"
-        out[mime] = sprint(show, MIME(mime), plt)
-    else
-        error("Unsupported output type $output_type")
-    end
-    _ijulia__extra_mime_info!(plt, out)
-    out
-end
@@ -1,101 +0,0 @@
-using REPL
-
-
-function _plots_defaults()
-    if isdefined(Main, :PLOTS_DEFAULTS)
-        Dict{Symbol,Any}(Main.PLOTS_DEFAULTS)
-    else
-        Dict{Symbol,Any}()
-    end
-end
-
-
-function __init__()
-    user_defaults = _plots_defaults()
-    if haskey(user_defaults, :theme)
-        theme(user_defaults[:theme])
-    end
-    for (k,v) in user_defaults
-        k == :theme || default(k, v)
-    end
-
-    insert!(Base.Multimedia.displays, findlast(x -> x isa Base.TextDisplay || x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1, PlotsDisplay())
-
-    atreplinit(i -> begin
-        while PlotsDisplay() in Base.Multimedia.displays
-            popdisplay(PlotsDisplay())
-        end
-        insert!(Base.Multimedia.displays, findlast(x -> x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1, PlotsDisplay())
-    end)
-
-    @require HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" begin
-        fn = joinpath(@__DIR__, "backends", "hdf5.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require InspectDR = "d0351b0e-4b05-5898-87b3-e2a8edfddd1d" begin
-        fn = joinpath(@__DIR__, "backends", "inspectdr.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa" begin
-        fn = joinpath(@__DIR__, "backends", "pgfplots.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require ORCA = "47be7bcc-f1a6-5447-8b36-7eeeff7534fd" begin
-        fn = joinpath(@__DIR__, "backends", "orca.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925" begin
-        fn = joinpath(@__DIR__, "backends", "pgfplotsx.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" begin
-        fn = joinpath(@__DIR__, "backends", "plotlyjs.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" begin
-        fn = joinpath(@__DIR__, "backends", "pyplot.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" begin
-        fn = joinpath(@__DIR__, "backends", "unicodeplots.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" begin
-        if IJulia.inited
-            _init_ijulia_plotting()
-
-            IJulia.display_dict(plt::Plot) = _ijulia_display_dict(plt)
-        end
-    end
-
-    if haskey(ENV, "PLOTS_HOST_DEPENDENCY_LOCAL")
-        use_local_plotlyjs[] = ENV["PLOTS_HOST_DEPENDENCY_LOCAL"] == "true"
-        use_local_dependencies[] = isfile(plotly_local_file_path) && use_local_plotlyjs[]
-        if use_local_plotlyjs[] && !isfile(plotly_local_file_path)
-            @warn("PLOTS_HOST_DEPENDENCY_LOCAL is set to true, but no local plotly file found. run Pkg.build(\"Plots\") and make sure PLOTS_HOST_DEPENDENCY_LOCAL is set to true")
-        end
-    else
-        use_local_dependencies[] = use_local_plotlyjs[]
-    end
-
-
-    @require FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" begin
-        _show(io::IO, mime::MIME"image/png", plt::Plot{<:PDFBackends}) = _show_pdfbackends(io, mime, plt)
-    end
-end
@@ -1,19 +1,23 @@

 # NOTE: (0,0) is the top-left !!!

+# allow pixels and percentages
+const px = AbsoluteLength(0.254)
+const pct = Length{:pct, Float64}(1.0)
+
 to_pixels(m::AbsoluteLength) = m.value / 0.254

 const _cbar_width = 5mm

-#Base.broadcast(::typeof(Base.:.*), m::Measure, n::Number) = m * n
-#Base.broadcast(::typeof(Base.:.*), m::Number, n::Measure) = m * n
+Base.:.*(m::Measure, n::Number) = m * n
+Base.:.*(n::Number, m::Measure) = m * n
 Base.:-(m::Measure, a::AbstractArray) = map(ai -> m - ai, a)
 Base.:-(a::AbstractArray, m::Measure) = map(ai -> ai - m, a)
 Base.zero(::Type{typeof(mm)}) = 0mm
 Base.one(::Type{typeof(mm)}) = 1mm
 Base.typemin(::typeof(mm)) = -Inf*mm
 Base.typemax(::typeof(mm)) = Inf*mm
-Base.convert(::Type{F}, l::AbsoluteLength) where {F<:AbstractFloat} = convert(F, l.value)
+Base.convert{F<:AbstractFloat}(::Type{F}, l::AbsoluteLength) = convert(F, l.value)

 # TODO: these are unintuitive and may cause tricky bugs
 # Base.:+(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value * (1 + m2.value))
@@ -95,7 +99,7 @@ end
 # -----------------------------------------------------------

 # points combined by x/y, pct, and length
-mutable struct MixedMeasures
+type MixedMeasures
    xy::Float64
    pct::Float64
    len::AbsoluteLength
@@ -107,10 +111,11 @@ function resolve_mixed(mix::MixedMeasures, sp::Subplot, letter::Symbol)
    if mix.len != 0mm
        f = (letter == :x ? width : height)
        totlen = f(plotarea(sp))
+        @show totlen
        pct += mix.len / totlen
    end
    if pct != 0
-        amin, amax = axis_limits(sp, letter)
+        amin, amax = axis_limits(sp[Symbol(letter,:axis)])
        xy += pct * (amax-amin)
    end
    xy
@@ -128,12 +133,7 @@ make_measure_hor(m::Measure) = m
 make_measure_vert(n::Number) = n * h
 make_measure_vert(m::Measure) = m

-"""
-    bbox(x, y, w, h [,originargs...])
-    bbox(layout)

-Create a bounding box for plotting
-"""
 function bbox(x, y, w, h, oarg1::Symbol, originargs::Symbol...)
    oargs = vcat(oarg1, originargs...)
    orighor = :left
@@ -146,7 +146,7 @@ function bbox(x, y, w, h, oarg1::Symbol, originargs::Symbol...)
        elseif oarg in (:top, :bottom, :vcenter)
            origver = oarg
        else
-            @warn("Unused origin arg in bbox construction: $oarg")
+            warn("Unused origin arg in bbox construction: $oarg")
        end
    end
    bbox(x, y, w, h; h_anchor = orighor, v_anchor = origver)
@@ -215,9 +215,8 @@ bottompad(layout::AbstractLayout) = 0mm
 # RootLayout

 # this is the parent of the top-level layout
-struct RootLayout <: AbstractLayout end
+immutable RootLayout <: AbstractLayout end

-Base.show(io::IO, layout::RootLayout) = Base.show_default(io, layout)
 Base.parent(::RootLayout) = nothing
 parent_bbox(::RootLayout) = defaultbox
 bbox(::RootLayout) = defaultbox
@@ -226,7 +225,7 @@ bbox(::RootLayout) = defaultbox
 # EmptyLayout

 # contains blank space
-mutable struct EmptyLayout <: AbstractLayout
+type EmptyLayout <: AbstractLayout
    parent::AbstractLayout
    bbox::BoundingBox
    attr::KW  # store label, width, and height for initialization
@@ -244,7 +243,7 @@ _update_min_padding!(layout::EmptyLayout) = nothing
 # GridLayout

 # nested, gridded layout with optional size percentages
-mutable struct GridLayout <: AbstractLayout
+type GridLayout <: AbstractLayout
    parent::AbstractLayout
    minpad::Tuple # leftpad, toppad, rightpad, bottompad
    bbox::BoundingBox
@@ -254,13 +253,6 @@ mutable struct GridLayout <: AbstractLayout
    attr::KW
 end

-"""
-    grid(args...; kw...)
-
-Create a grid layout for subplots. `args` specify the dimensions, e.g.
-`grid(3,2, widths = (0.6,04))` creates a grid with three rows and two
-columns of different width.
-"""
 grid(args...; kw...) = GridLayout(args...; kw...)

 function GridLayout(dims...;
@@ -268,7 +260,7 @@ function GridLayout(dims...;
                    widths = zeros(dims[2]),
                    heights = zeros(dims[1]),
                    kw...)
-    grid = Matrix{AbstractLayout}(undef, dims...)
+    grid = Matrix{AbstractLayout}(dims...)
    layout = GridLayout(
        parent,
        (20mm, 5mm, 2mm, 10mm),
@@ -357,10 +349,10 @@ function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm,0mm,0
    # get the max horizontal (left and right) padding over columns,
    # and max vertical (bottom and top) padding over rows
    # TODO: add extra padding here
-    pad_left   = maximum(minpad_left,   dims = 1)
-    pad_top    = maximum(minpad_top,    dims = 2)
-    pad_right  = maximum(minpad_right,  dims = 1)
-    pad_bottom = maximum(minpad_bottom, dims = 2)
+    pad_left   = maximum(minpad_left,   1)
+    pad_top    = maximum(minpad_top,    2)
+    pad_right  = maximum(minpad_right,  1)
+    pad_bottom = maximum(minpad_bottom, 2)

    # make sure the perimeter match the parent
    pad_left[1]     = max(pad_left[1], minimum_perimeter[1])
@@ -464,12 +456,12 @@ end
 # constructors

 # pass the layout arg through
-function layout_args(plotattributes::AKW)
-    layout_args(plotattributes[:layout])
+function layout_args(d::KW)
+    layout_args(get(d, :layout, default(:layout)))
 end

-function layout_args(plotattributes::AKW, n_override::Integer)
-    layout, n = layout_args(n_override, get(plotattributes, :layout, n_override))
+function layout_args(d::KW, n_override::Integer)
+    layout, n = layout_args(get(d, :layout, n_override))
    if n != n_override
        error("When doing layout, n ($n) != n_override ($(n_override)).  You're probably trying to force existing plots into a layout that doesn't fit them.")
    end
@@ -481,27 +473,12 @@ function layout_args(n::Integer)
    GridLayout(nr, nc), n
 end

-function layout_args(sztup::NTuple{2, Integer})
+function layout_args{I<:Integer}(sztup::NTuple{2,I})
    nr, nc = sztup
    GridLayout(nr, nc), nr*nc
 end

-layout_args(n_override::Integer, n::Integer) = layout_args(n)
-layout_args(n, sztup::NTuple{2, Integer}) = layout_args(sztup)
-
-function layout_args(n, sztup::Tuple{Colon, Integer})
-    nc = sztup[2]
-    nr = ceil(Int, n / nc)
-    GridLayout(nr, nc), n
-end
-
-function layout_args(n, sztup::Tuple{Integer, Colon})
-    nr = sztup[1]
-    nc = ceil(Int, n / nr)
-    GridLayout(nr, nc), n
-end
-
-function layout_args(sztup::NTuple{3, Integer})
+function layout_args{I<:Integer}(sztup::NTuple{3,I})
    n, nr, nc = sztup
    nr, nc = compute_gridsize(n, nr, nc)
    GridLayout(nr, nc), n
@@ -514,8 +491,6 @@ function layout_args(layout::GridLayout)
    layout, n
 end

-layout_args(n_override::Integer, layout::GridLayout) = layout_args(layout)
-
 layout_args(huh) = error("unhandled layout type $(typeof(huh)): $huh")


@@ -583,7 +558,7 @@ function build_layout(layout::GridLayout, numsp::Integer, plts::AVec{Plot})
    for r=1:nr, c=1:nc
        l = layout[r,c]
        if isa(l, EmptyLayout) && !get(l.attr, :blank, false)
-            plt = popfirst!(plts)  # grab the first plot out of the list
+            plt = shift!(plts)  # grab the first plot out of the list
            layout[r,c] = plt.layout
            append!(subplots, plt.subplots)
            merge!(spmap, plt.spmap)
@@ -616,7 +591,7 @@ end
 # ----------------------------------------------------------------------
 # @layout macro

-function add_layout_pct!(kw::AKW, v::Expr, idx::Integer, nidx::Integer)
+function add_layout_pct!(kw::KW, v::Expr, idx::Integer, nidx::Integer)
    # dump(v)
    # something like {0.2w}?
    if v.head == :call && v.args[1] == :*
@@ -637,7 +612,7 @@ function add_layout_pct!(kw::AKW, v::Expr, idx::Integer, nidx::Integer)
    error("Couldn't match layout curly (idx=$idx): $v")
 end

-function add_layout_pct!(kw::AKW, v::Number, idx::Integer)
+function add_layout_pct!(kw::KW, v::Number, idx::Integer)
    # kw[idx == 1 ? :w : :h] = v*pct
    idx == 1 && (kw[:w] = v*pct)
    (idx == 2 || nidx == 1) && (kw[:h] = v*pct)
@@ -729,7 +704,7 @@ function link_axes!(axes::Axis...)
    a1 = axes[1]
    for i=2:length(axes)
        a2 = axes[i]
-        expand_extrema!(a1, ignorenan_extrema(a2))
+        expand_extrema!(a1, extrema(a2))
        for k in (:extrema, :discrete_values, :continuous_values, :discrete_map)
            a2[k] = a1[k]
        end
@@ -39,7 +39,7 @@ ps(fn::AbstractString) = ps(current(), fn)
 function eps(plt::Plot, fn::AbstractString)
  fn = addExtension(fn, "eps")
  io = open(fn, "w")
-  show(io, MIME("image/eps"), plt)
+  writemime(io, MIME("image/eps"), plt)
  close(io)
 end
 eps(fn::AbstractString) = eps(current(), fn)
@@ -55,18 +55,13 @@ tex(fn::AbstractString) = tex(current(), fn)
 function html(plt::Plot, fn::AbstractString)
    fn = addExtension(fn, "html")
    io = open(fn, "w")
+    _use_remote[] = true
    show(io, MIME("text/html"), plt)
+    _use_remote[] = false
    close(io)
 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)

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

@@ -79,8 +74,6 @@ const _savemap = Dict(
    "eps" => eps,
    "tex" => tex,
    "html" => html,
-    "tikz" => tex,
-    "txt" => txt,
  )

 function getExtension(fn::AbstractString)
@@ -104,15 +97,8 @@ function addExtension(fn::AbstractString, ext::AbstractString)
  end
 end

-"""
-    savefig([plot,] filename)
-
-Save a Plot (the current plot if `plot` is not passed) to file. The file
-type is inferred from the file extension. All backends support png and pdf
-file types, some also support svg, ps, eps, html and tex.
-"""
 function savefig(plt::Plot, fn::AbstractString)
-  fn = abspath(expanduser(fn))
+
  # get the extension
  local ext
  try
@@ -133,11 +119,7 @@ savefig(fn::AbstractString) = savefig(current(), fn)


 # ---------------------------------------------------------
-"""
-    gui([plot])

-Display a plot using the backends' gui window
-"""
 gui(plt::Plot = current()) = display(PlotsDisplay(), plt)

 # IJulia only... inline display
@@ -152,6 +134,10 @@ function Base.display(::PlotsDisplay, plt::Plot)
    _display(plt)
 end

+# override the REPL display to open a gui window
+Base.display(::Base.REPL.REPLDisplay, ::MIME"text/plain", plt::Plot) = gui(plt)
+
+
 _do_plot_show(plt, showval::Bool) = showval && gui(plt)
 function _do_plot_show(plt, showval::Symbol)
    showval == :gui && gui(plt)
@@ -160,65 +146,88 @@ end

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

+const _mimeformats = Dict(
+    "application/eps"         => "eps",
+    "image/eps"               => "eps",
+    "application/pdf"         => "pdf",
+    "image/png"               => "png",
+    "application/postscript"  => "ps",
+    "image/svg+xml"           => "svg",
+    "text/plain"              => "txt",
+    "application/x-tex"       => "tex",
+)
+
 const _best_html_output_type = KW(
    :pyplot => :png,
    :unicodeplots => :txt,
-    :plotlyjs => :html,
-    :plotly => :html
+    :glvisualize => :png
 )

 # a backup for html... passes to svg or png depending on the html_output_format arg
-function _show(io::IO, ::MIME"text/html", plt::Plot)
+function Base.show(io::IO, ::MIME"text/html", plt::Plot)
    output_type = Symbol(plt.attr[:html_output_format])
    if output_type == :auto
        output_type = get(_best_html_output_type, backend_name(plt.backend), :svg)
    end
    if output_type == :png
-        # @info("writing png to html output")
+        # info("writing png to html output")
        print(io, "<img src=\"data:image/png;base64,", base64encode(show, MIME("image/png"), plt), "\" />")
    elseif output_type == :svg
-        # @info("writing svg to html output")
+        # info("writing svg to html output")
        show(io, MIME("image/svg+xml"), plt)
    elseif output_type == :txt
        show(io, MIME("text/plain"), plt)
    else
-        error("only png or svg allowed. got: $(repr(output_type))")
+        error("only png or svg allowed. got: $output_type")
    end
 end

-# delegate showable to _show instead
-function Base.showable(m::M, plt::P) where {M<:MIME, P<:Plot}
-    return hasmethod(_show, Tuple{IO, M, P})
+function _show{B}(io::IO, m, plt::Plot{B})
+    # Base.show_backtrace(STDOUT, backtrace())
+    warn("_show is not defined for this backend. m=", string(m))
 end
-
 function _display(plt::Plot)
-    @warn("_display is not defined for this backend.")
+    warn("_display is not defined for this backend.")
 end

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

-Base.show(io::IO, m::MIME"application/prs.juno.plotpane+html", plt::Plot) = showjuno(io, MIME("text/html"), plt)
-
-# default text/plain for all backends
-_show(io::IO, ::MIME{Symbol("text/plain")}, plt::Plot) = show(io, plt)
-
-"Close all open gui windows of the current backend"
 closeall() = closeall(backend())


+# ---------------------------------------------------------
+# A backup, if no PNG generation is defined, is to try to make a PDF and use FileIO to convert
+
+if is_installed("FileIO")
+    @eval import FileIO
+    function _show(io::IO, ::MIME"image/png", plt::Plot)
+        fn = tempname()
+
+        # first save a pdf file
+        pdf(plt, fn)
+
+        # load that pdf into a FileIO Stream
+        s = FileIO.load(fn * ".pdf")
+
+        # save a png
+        pngfn = fn * ".png"
+        FileIO.save(pngfn, s)
+
+        # now write from the file
+        write(io, readall(open(pngfn)))
+    end
+end
+
+
+
+
+
 # function html_output_format(fmt)
 #     if fmt == "png"
 #         @eval function Base.show(io::IO, ::MIME"text/html", plt::Plot)
@@ -235,41 +244,84 @@ closeall() = closeall(backend())
 #
 # html_output_format("svg")

+# ---------------------------------------------------------
+# IJulia
+# ---------------------------------------------------------
+
+const _ijulia_output = String["text/html"]
+
+function setup_ijulia()
+    # override IJulia inline display
+    if isijulia()
+        @eval begin
+            import IJulia
+            export set_ijulia_output
+            function set_ijulia_output(mimestr::AbstractString)
+                # info("Setting IJulia output format to $mimestr")
+                global _ijulia_output
+                _ijulia_output[1] = mimestr
+            end
+            function IJulia.display_dict(plt::Plot)
+                global _ijulia_output
+                Dict{String, String}(_ijulia_output[1] => sprint(show, _ijulia_output[1], plt))
+            end
+
+            # default text/plain passes to html... handles Interact issues
+            function Base.show(io::IO, m::MIME"text/plain", plt::Plot)
+                show(io, MIME("text/html"), plt)
+            end
+        end
+        set_ijulia_output("text/html")
+    end
+end

 # ---------------------------------------------------------
 # Atom PlotPane
 # ---------------------------------------------------------
-function showjuno(io::IO, m, plt)
-    sz = collect(plt[:size])
-    dpi = plt[:dpi]
-    thickness_scaling = plt[:thickness_scaling]

-    jsize = get(io, :juno_plotsize, [400, 500])
-    jratio = get(io, :juno_dpi_ratio, 1)
+function setup_atom()
+    if isatom()
+        @eval import Atom, Media
+        Media.media(Plot, Media.Plot)

-    scale = minimum(jsize[i] / sz[i] for i in 1:2)
-    plt[:size] = [s * scale for s in sz]
-    plt[:dpi] = jratio*Plots.DPI
-    plt[:thickness_scaling] *= scale
+        # default text/plain so it doesn't complain
+        function Base.show{B}(io::IO, ::MIME"text/plain", plt::Plot{B})
+            print(io, "Plot{$B}()")
+        end

-    prepare_output(plt)
-    try
-      _showjuno(io, m, plt)
-    finally
-      plt[:size] = sz
-      plt[:dpi] = dpi
-      plt[:thickness_scaling] = thickness_scaling
+        function Media.render(e::Atom.Editor, plt::Plot)
+            Media.render(e, nothing)
+        end
+
+        if get(ENV, "PLOTS_USE_ATOM_PLOTPANE", true) in (true, 1, "1", "true", "yes")
+            # this is like "display"... sends an html div with the plot to the PlotPane
+            function Media.render(pane::Atom.PlotPane, plt::Plot)
+                # temporarily overwrite size to be Atom.plotsize
+                sz = plt[:size]
+                plt[:size] = Juno.plotsize()
+                Media.render(pane, Atom.div(".fill", Atom.HTML(stringmime(MIME("text/html"), plt))))
+                plt[:size] = sz
+            end
+        else
+            #
+            function Media.render(pane::Atom.PlotPane, plt::Plot)
+                display(Plots.PlotsDisplay(), plt)
+                s = "PlotPane turned off.  Unset ENV[\"PLOTS_USE_ATOM_PLOTPANE\"] and restart Julia to enable it."
+                Media.render(pane, Atom.div(Atom.HTML(s)))
+            end
+        end
+
+        # special handling for plotly... use PlotsDisplay
+        function Media.render(pane::Atom.PlotPane, plt::Plot{PlotlyBackend})
+            display(Plots.PlotsDisplay(), plt)
+            s = "PlotPane turned off.  The plotly and plotlyjs backends cannot render in the PlotPane due to javascript issues."
+            Media.render(pane, Atom.div(Atom.HTML(s)))
+        end
+
+        # special handling for PlotlyJS to pass through to that render method
+        function Media.render(pane::Atom.PlotPane, plt::Plot{PlotlyJSBackend})
+            Plots.prepare_output(plt)
+            Media.render(pane, plt.o)
+        end
    end
 end
-
-function _showjuno(io::IO, m::MIME"image/svg+xml", plt)
-  if Symbol(plt.attr[:html_output_format]) ≠ :svg
-    throw(MethodError(show, (typeof(m), typeof(plt))))
-  else
-    _show(io, m, plt)
-  end
-end
-
-Base.showable(::MIME"application/prs.juno.plotpane+html", plt::Plot) = false
-
-_showjuno(io::IO, m, plt) = _show(io, m, plt)
@@ -3,50 +3,46 @@
 # ------------------------------------------------------------------
 # preprocessing

-function series_idx(kw_list::AVec{KW}, kw::AKW)
+function command_idx(kw_list::AVec{KW}, kw::KW)
    Int(kw[:series_plotindex]) - Int(kw_list[1][:series_plotindex]) + 1
 end

-function _expand_seriestype_array(plotattributes::AKW, args)
-    sts = get(plotattributes, :seriestype, :path)
+function _expand_seriestype_array(d::KW, args)
+    sts = get(d, :seriestype, :path)
    if typeof(sts) <: AbstractArray
-        reset_kw!(plotattributes, :seriestype)
-        rd = Vector{RecipeData}(undef, size(sts, 1))
-        for r in axes(sts, 1)
-            dc = copy(plotattributes)
+        delete!(d, :seriestype)
+        RecipeData[begin
+            dc = copy(d)
            dc[:seriestype] = sts[r:r,:]
-            rd[r] = RecipeData(dc, args)
-        end
-        rd
+            RecipeData(dc, args)
+        end for r=1:size(sts,1)]
    else
-        RecipeData[RecipeData(copy(plotattributes), args)]
+        RecipeData[RecipeData(copy(d), args)]
    end
 end

-function _preprocess_args(plotattributes::AKW, args, still_to_process::Vector{RecipeData})
+function _preprocess_args(d::KW, args, still_to_process::Vector{RecipeData})
    # the grouping mechanism is a recipe on a GroupBy object
    # we simply add the GroupBy object to the front of the args list to allow
    # the recipe to be applied
-    if haskey(plotattributes, :group)
-        args = (extractGroupArgs(plotattributes[:group], args...), args...)
+    if haskey(d, :group)
+        args = (extractGroupArgs(d[:group], args...), args...)
    end

    # if we were passed a vector/matrix of seriestypes and there's more than one row,
    # we want to duplicate the inputs, once for each seriestype row.
    if !isempty(args)
-        append!(still_to_process, _expand_seriestype_array(plotattributes, args))
+        append!(still_to_process, _expand_seriestype_array(d, args))
    end

-    # remove subplot and axis args from plotattributes... they will be passed through in the kw_list
+    # remove subplot and axis args from d... they will be passed through in the kw_list
    if !isempty(args)
-        for (k,v) in plotattributes
+        for (k,v) in d
            for defdict in (_subplot_defaults,
                            _axis_defaults,
-                            _axis_defaults_byletter[:x],
-                            _axis_defaults_byletter[:y],
-                            _axis_defaults_byletter[:z])
+                            _axis_defaults_byletter)
                if haskey(defdict, k)
-                    reset_kw!(plotattributes, k)
+                    delete!(d, k)
                end
            end
        end
@@ -59,43 +55,46 @@ end
 # user recipes


-function _process_userrecipes(plt::Plot, plotattributes::AKW, args)
+function _process_userrecipes(plt::Plot, d::KW, args)
    still_to_process = RecipeData[]
-    args = _preprocess_args(plotattributes, args, still_to_process)
+    args = _preprocess_args(d, args, still_to_process)

    # for plotting recipes, swap out the args and update the parameter dictionary
-    # we are keeping a stack of series that still need to be processed.
+    # we are keeping a queue of series that still need to be processed.
    # each pass through the loop, we pop one off and apply the recipe.
    # the recipe will return a list a Series objects... the ones that are
-    # finished (no more args) get added to the kw_list, the ones that are not
-    # are placed on top of the stack and are then processed further.
+    # finished (no more args) get added to the kw_list, and the rest go into the queue
+    # for processing.
    kw_list = KW[]
    while !isempty(still_to_process)
-        # grab the first in line to be processed and either add it to the kw_list or
-        # pass it through apply_recipe to generate a list of RecipeData objects (data + attributes)
-        # for further processing.
-        next_series = popfirst!(still_to_process)
-        # recipedata should be of type RecipeData.  if it's not then the inputs must not have been fully processed by recipes
-        if !(typeof(next_series) <: RecipeData)
-            error("Inputs couldn't be processed... expected RecipeData but got: $next_series")
-        end
-        if isempty(next_series.args)
-            _process_userrecipe(plt, kw_list, next_series)
-        else
-            rd_list = RecipesBase.apply_recipe(next_series.plotattributes, next_series.args...)
-            prepend!(still_to_process,rd_list)
+        # grab the first in line to be processed and pass it through apply_recipe
+        # to generate a list of RecipeData objects (data + attributes)
+        next_series = shift!(still_to_process)
+        rd_list = RecipesBase.apply_recipe(next_series.d, next_series.args...)
+        for recipedata in rd_list
+            # recipedata should be of type RecipeData.  if it's not then the inputs must not have been fully processed by recipes
+            if !(typeof(recipedata) <: RecipeData)
+                error("Inputs couldn't be processed... expected RecipeData but got: $recipedata")
+            end
+
+            if isempty(recipedata.args)
+                _process_userrecipe(plt, kw_list, recipedata)
+            else
+                # args are non-empty, so there's still processing to do... add it back to the queue
+                push!(still_to_process, recipedata)
+            end
        end
    end

    # don't allow something else to handle it
-    plotattributes[:smooth] = false
+    d[:smooth] = false
    kw_list
 end

 function _process_userrecipe(plt::Plot, kw_list::Vector{KW}, recipedata::RecipeData)
    # when the arg tuple is empty, that means there's nothing left to recursively
    # process... finish up and add to the kw_list
-    kw = recipedata.plotattributes
+    kw = recipedata.d
    preprocessArgs!(kw)
    _preprocess_userrecipe(kw)
    warnOnUnsupported_scales(plt.backend, kw)
@@ -110,7 +109,7 @@ function _process_userrecipe(plt::Plot, kw_list::Vector{KW}, recipedata::RecipeD
    return
 end

-function _preprocess_userrecipe(kw::AKW)
+function _preprocess_userrecipe(kw::KW)
    _add_markershape(kw)

    # if there was a grouping, filter the data here
@@ -119,26 +118,26 @@ function _preprocess_userrecipe(kw::AKW)
    # map marker_z if it's a Function
    if isa(get(kw, :marker_z, nothing), Function)
        # TODO: should this take y and/or z as arguments?
-        kw[:marker_z] = isa(kw[:z], Nothing) ? map(kw[:marker_z], kw[:x], kw[:y]) : map(kw[:marker_z], kw[:x], kw[:y], kw[:z])
+        kw[:marker_z] = map(kw[:marker_z], kw[:x], kw[:y], kw[:z])
    end

    # map line_z if it's a Function
    if isa(get(kw, :line_z, nothing), Function)
-        kw[:line_z] = isa(kw[:z], Nothing) ? map(kw[:line_z], kw[:x], kw[:y]) : map(kw[:line_z], kw[:x], kw[:y], kw[:z])
+        kw[:line_z] = map(kw[:line_z], kw[:x], kw[:y], kw[:z])
    end

    # convert a ribbon into a fillrange
-    if get(kw, :ribbon, nothing) !== nothing
+    if get(kw, :ribbon, nothing) != nothing
        make_fillrange_from_ribbon(kw)
    end
    return
 end

-function _add_errorbar_kw(kw_list::Vector{KW}, kw::AKW)
+function _add_errorbar_kw(kw_list::Vector{KW}, kw::KW)
    # handle error bars by creating new recipedata data... these will have
    # the same recipedata index as the recipedata they are copied from
    for esym in (:xerror, :yerror)
-        if get(kw, esym, nothing) !== nothing
+        if get(kw, esym, nothing) != nothing
            # we make a copy of the KW and apply an errorbar recipe
            errkw = copy(kw)
            errkw[:seriestype] = esym
@@ -149,13 +148,13 @@ function _add_errorbar_kw(kw_list::Vector{KW}, kw::AKW)
    end
 end

-function _add_smooth_kw(kw_list::Vector{KW}, kw::AKW)
+function _add_smooth_kw(kw_list::Vector{KW}, kw::KW)
    # handle smoothing by adding a new series
    if get(kw, :smooth, false)
        x, y = kw[:x], kw[:y]
        β, α = convert(Matrix{Float64}, [x ones(length(x))]) \ convert(Vector{Float64}, y)
-        sx = [ignorenan_minimum(x), ignorenan_maximum(x)]
-        sy = β .* sx .+ α
+        sx = [minimum(x), maximum(x)]
+        sy = β * sx + α
        push!(kw_list, merge(copy(kw), KW(
            :seriestype => :path,
            :x => sx,
@@ -174,7 +173,7 @@ end
 # to generate a list of RecipeData objects (data + attributes).
 # If we applied a "plot recipe" without error, then add the returned datalist's KWs,
 # otherwise we just add the original KW.
-function _process_plotrecipe(plt::Plot, kw::AKW, kw_list::Vector{KW}, still_to_process::Vector{KW})
+function _process_plotrecipe(plt::Plot, kw::KW, kw_list::Vector{KW}, still_to_process::Vector{KW})
    if !isa(get(kw, :seriestype, nothing), Symbol)
        # seriestype was never set, or it's not a Symbol, so it can't be a plot recipe
        push!(kw_list, kw)
@@ -185,11 +184,11 @@ function _process_plotrecipe(plt::Plot, kw::AKW, kw_list::Vector{KW}, still_to_p
        st = kw[:seriestype] = get(_typeAliases, st, st)
        datalist = RecipesBase.apply_recipe(kw, Val{st}, plt)
        for data in datalist
-            preprocessArgs!(data.plotattributes)
-            if data.plotattributes[:seriestype] == st
-                error("Plot recipe $st returned the same seriestype: $(data.plotattributes)")
+            preprocessArgs!(data.d)
+            if data.d[:seriestype] == st
+                error("Plot recipe $st returned the same seriestype: $(data.d)")
            end
-            push!(still_to_process, data.plotattributes)
+            push!(still_to_process, data.d)
        end
    catch err
        if isa(err, MethodError)
@@ -205,16 +204,16 @@ end
 # ------------------------------------------------------------------
 # setup plot and subplot

-function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
+function _plot_setup(plt::Plot, d::KW, kw_list::Vector{KW})
    # merge in anything meant for the Plot
    for kw in kw_list, (k,v) in kw
-        haskey(_plot_defaults, k) && (plotattributes[k] = pop!(kw, k))
+        haskey(_plot_defaults, k) && (d[k] = pop!(kw, k))
    end

    # TODO: init subplots here
-    _update_plot_args(plt, plotattributes)
+    _update_plot_args(plt, d)
    if !plt.init
-        plt.o = Base.invokelatest(_create_backend_figure, plt)
+        plt.o = _create_backend_figure(plt)

        # create the layout and subplots from the inputs
        plt.layout, plt.subplots, plt.spmap = build_layout(plt.attr)
@@ -229,7 +228,7 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})

    # handle inset subplots
    insets = plt[:inset_subplots]
-    if insets !== nothing
+    if insets != nothing
        if !(typeof(insets) <: AVec)
            insets = [insets]
        end
@@ -254,7 +253,7 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
    plt[:inset_subplots] = nothing
 end

-function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
+function _subplot_setup(plt::Plot, d::KW, kw_list::Vector{KW})
    # we'll keep a map of subplot to an attribute override dict.
    # Subplot/Axis attributes set by a user/series recipe apply only to the
    # Subplot object which they belong to.
@@ -263,36 +262,29 @@ function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
    for kw in kw_list
        # get the Subplot object to which the series belongs.
        sps = get(kw, :subplot, :auto)
-        sp = get_subplot(plt, _cycle(sps == :auto ? plt.subplots : plt.subplots[sps], series_idx(kw_list,kw)))
+        sp = get_subplot(plt, cycle(sps == :auto ? plt.subplots : plt.subplots[sps], command_idx(kw_list,kw)))
        kw[:subplot] = sp

        # extract subplot/axis attributes from kw and add to sp_attr
        attr = KW()
-        for (k,v) in collect(kw)
-            if is_subplot_attr(k) || is_axis_attr(k)
+        for (k,v) in kw
+            if haskey(_subplot_defaults, k) || haskey(_axis_defaults_byletter, k)
                attr[k] = pop!(kw, k)
            end
-            if is_axis_attr_noletter(k)
+            if haskey(_axis_defaults, k)
                v = pop!(kw, k)
                for letter in (:x,:y,:z)
                    attr[Symbol(letter,k)] = v
                end
            end
-            for k in (:scale,), letter in (:x,:y,:z)
-                # Series recipes may need access to this information
-                lk = Symbol(letter,k)
-                if haskey(attr, lk)
-                    kw[lk] = attr[lk]
-                end
-            end
        end
        sp_attrs[sp] = attr
    end

    # override subplot/axis args.  `sp_attrs` take precendence
    for (idx,sp) in enumerate(plt.subplots)
-        attr = if !haskey(plotattributes, :subplot) || plotattributes[:subplot] == idx
-            merge(plotattributes, get(sp_attrs, sp, KW()))
+        attr = if !haskey(d, :subplot) || d[:subplot] == idx
+            merge(d, get(sp_attrs, sp, KW()))
        else
            get(sp_attrs, sp, KW())
        end
@@ -305,13 +297,13 @@ end

 # getting ready to add the series... last update to subplot from anything
 # that might have been added during series recipes
-function _prepare_subplot(plt::Plot{T}, plotattributes::AKW) where T
-    st::Symbol = plotattributes[:seriestype]
-    sp::Subplot{T} = plotattributes[:subplot]
+function _prepare_subplot{T}(plt::Plot{T}, d::KW)
+    st::Symbol = d[:seriestype]
+    sp::Subplot{T} = d[:subplot]
    sp_idx = get_subplot_index(plt, sp)
-    _update_subplot_args(plt, sp, plotattributes, sp_idx, true)
+    _update_subplot_args(plt, sp, d, sp_idx, true)

-    st = _override_seriestype_check(plotattributes, st)
+    st = _override_seriestype_check(d, st)

    # change to a 3d projection for this subplot?
    if is3d(st)
@@ -329,28 +321,28 @@ end
 # ------------------------------------------------------------------
 # series types

-function _override_seriestype_check(plotattributes::AKW, st::Symbol)
+function _override_seriestype_check(d::KW, st::Symbol)
    # do we want to override the series type?
-    if !is3d(st) && !(st in (:contour,:contour3d))
-        z = plotattributes[:z]
-        if !isa(z, Nothing) && (size(plotattributes[:x]) == size(plotattributes[:y]) == size(z))
+    if !is3d(st)
+        z = d[:z]
+        if !isa(z, Void) && (size(d[:x]) == size(d[:y]) == size(z))
            st = (st == :scatter ? :scatter3d : :path3d)
-            plotattributes[:seriestype] = st
+            d[:seriestype] = st
        end
    end
    st
 end

-function _prepare_annotations(sp::Subplot, plotattributes::AKW)
+function _prepare_annotations(sp::Subplot, d::KW)
    # strip out series annotations (those which are based on series x/y coords)
    # and add them to the subplot attr
    sp_anns = annotations(sp[:annotations])
-    # series_anns = annotations(pop!(plotattributes, :series_annotations, []))
+    # series_anns = annotations(pop!(d, :series_annotations, []))
    # if isa(series_anns, SeriesAnnotations)
-    #     series_anns.x = plotattributes[:x]
-    #     series_anns.y = plotattributes[:y]
+    #     series_anns.x = d[:x]
+    #     series_anns.y = d[:y]
    # elseif length(series_anns) > 0
-    #     x, y = plotattributes[:x], plotattributes[:y]
+    #     x, y = d[:x], d[:y]
    #     nx, ny, na = map(length, (x,y,series_anns))
    #     n = max(nx, ny, na)
    #     series_anns = [(x[mod1(i,nx)], y[mod1(i,ny)], text(series_anns[mod1(i,na)])) for i=1:n]
@@ -358,26 +350,22 @@ function _prepare_annotations(sp::Subplot, plotattributes::AKW)
    # sp.attr[:annotations] = vcat(sp_anns, series_anns)
 end

-function _expand_subplot_extrema(sp::Subplot, plotattributes::AKW, st::Symbol)
+function _expand_subplot_extrema(sp::Subplot, d::KW, st::Symbol)
    # adjust extrema and discrete info
    if st == :image
-        xmin, xmax = ignorenan_extrema(plotattributes[:x]); ymin, ymax = ignorenan_extrema(plotattributes[:y])
-        expand_extrema!(sp[:xaxis], (xmin, xmax))
-        expand_extrema!(sp[:yaxis], (ymin, ymax))
-    elseif !(st in (:pie, :histogram, :bins2d, :histogram2d))
-        expand_extrema!(sp, plotattributes)
-    end
-    # expand for zerolines (axes through origin)
-    if sp[:framestyle] in (:origin, :zerolines)
-        expand_extrema!(sp[:xaxis], 0.0)
-        expand_extrema!(sp[:yaxis], 0.0)
+        w, h = size(d[:z])
+        expand_extrema!(sp[:xaxis], (0,w))
+        expand_extrema!(sp[:yaxis], (0,h))
+        sp[:yaxis].d[:flip] = true
+    elseif !(st in (:pie, :histogram, :histogram2d))
+        expand_extrema!(sp, d)
    end
 end

-function _add_the_series(plt, sp, plotattributes)
-    warnOnUnsupported_args(plt.backend, plotattributes)
-    warnOnUnsupported(plt.backend, plotattributes)
-    series = Series(plotattributes)
+function _add_the_series(plt, sp, d)
+    warnOnUnsupported_args(plt.backend, d)
+    warnOnUnsupported(plt.backend, d)
+    series = Series(d)
    push!(plt.series_list, series)
    push!(sp.series_list, series)
    _series_added(plt, series)
@@ -387,39 +375,37 @@ end

 # this method recursively applies series recipes when the seriestype is not supported
 # natively by the backend
-function _process_seriesrecipe(plt::Plot, plotattributes::AKW)
-    #println("process $(typeof(plotattributes))")
+function _process_seriesrecipe(plt::Plot, d::KW)
    # replace seriestype aliases
-    st = Symbol(plotattributes[:seriestype])
-    st = plotattributes[:seriestype] = get(_typeAliases, st, st)
+    st = Symbol(d[:seriestype])
+    st = d[:seriestype] = get(_typeAliases, st, st)

    # shapes shouldn't have fillrange set
-    if plotattributes[:seriestype] == :shape
-        plotattributes[:fillrange] = nothing
+    if d[:seriestype] == :shape
+        d[:fillrange] = nothing
    end

    # if it's natively supported, finalize processing and pass along to the backend, otherwise recurse
    if is_seriestype_supported(st)
-        sp = _prepare_subplot(plt, plotattributes)
-        _prepare_annotations(sp, plotattributes)
-        _expand_subplot_extrema(sp, plotattributes, st)
-        _update_series_attributes!(plotattributes, plt, sp)
-        _add_the_series(plt, sp, plotattributes)
+        sp = _prepare_subplot(plt, d)
+        _prepare_annotations(sp, d)
+        _expand_subplot_extrema(sp, d, st)
+        _add_the_series(plt, sp, d)

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

        # assuming there was no error, recursively apply the series recipes
        for data in datalist
            if isa(data, RecipeData)
-                preprocessArgs!(data.plotattributes)
-                if data.plotattributes[:seriestype] == st
+                preprocessArgs!(data.d)
+                if data.d[:seriestype] == st
                    error("The seriestype didn't change in series recipe $st.  This will cause a StackOverflow.")
                end
-                _process_seriesrecipe(plt, data.plotattributes)
+                _process_seriesrecipe(plt, data.d)
            else
-                @warn("Unhandled recipe: $(data)")
+                warn("Unhandled recipe: $(data)")
                break
            end
        end
@@ -1,22 +1,18 @@

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

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

-"""
-    current()
-Returns the Plot object for the current plot
-"""
 function current()
    if isplotnull()
        error("No current plot/subplot")
    end
-    CURRENT_PLOT.nullableplot
+    get(CURRENT_PLOT.nullableplot)
 end
-current(plot::AbstractPlot) = (CURRENT_PLOT.nullableplot = plot)
+current(plot::AbstractPlot) = (CURRENT_PLOT.nullableplot = Nullable(plot))

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

@@ -33,46 +29,45 @@ convertSeriesIndex(plt::Plot, n::Int) = n


 """
-The main plot command. Use `plot` to create a new plot object, and `plot!` to add to an existing one:
+The main plot command.  Use `plot` to create a new plot object, and `plot!` to mutate an existing one:

 ```
-    plot(args...; kw...)                  # creates a new plot window, and sets it to be the current
-    plot!(args...; kw...)                 # adds to the `current`
-    plot!(plotobj, args...; kw...)        # adds to the plot `plotobj`
+    plot(args...; kw...)                  # creates a new Plot, and sets it to be the current
+    plot!(args...; kw...)                 # adds to the `current` Plot
+    plot!(plotobj, args...; kw...)        # adds to the Plot `plotobj`
 ```

 There are lots of ways to pass in data, and lots of keyword arguments... just try it and it will likely work as expected.
-When you pass in matrices, it splits by columns. To see the list of available attributes, use the `plotattr([attr])`
-function, where `attr` is the symbol `:Series:`, `:Subplot:`, `:Plot` or `:Axis`. Pass any attribute to `plotattr`
-as a String to look up its docstring; e.g. `plotattr("seriestype")`.
+When you pass in matrices, it splits by columns.  See the documentation for more info.
 """
+
+# this creates a new plot with args/kw and sets it to be the current plot
 function plot(args...; kw...)
-    # this creates a new plot with args/kw and sets it to be the current plot
-    plotattributes = KW(kw)
-    preprocessArgs!(plotattributes)
+    d = KW(kw)
+    preprocessArgs!(d)

    # create an empty Plot then process
    plt = Plot()
-    # plt.user_attr = plotattributes
-    _plot!(plt, plotattributes, args)
+    # plt.user_attr = d
+    _plot!(plt, d, args)
 end

 # build a new plot from existing plots
 # note: we split into plt1 and plts_tail so we can dispatch correctly
 function plot(plt1::Plot, plts_tail::Plot...; kw...)
-    plotattributes = KW(kw)
-    preprocessArgs!(plotattributes)
+    d = KW(kw)
+    preprocessArgs!(d)

    # build our plot vector from the args
    n = length(plts_tail) + 1
-    plts = Array{Plot}(undef, n)
+    plts = Array(Plot, n)
    plts[1] = plt1
    for (i,plt) in enumerate(plts_tail)
        plts[i+1] = plt
    end

    # compute the layout
-    layout = layout_args(plotattributes, n)[1]
+    layout = layout_args(d, n)[1]
    num_sp = sum([length(p.subplots) for p in plts])

    # create a new plot object, with subplot list/map made of existing subplots.
@@ -83,31 +78,26 @@ function plot(plt1::Plot, plts_tail::Plot...; kw...)
    # TODO: build the user_attr dict by creating "Any matrices" for the args of each subplot

    # TODO: replace this with proper processing from a merged user_attr KW
-    # update plot args, first with existing plots, then override with plotattributes
+    # update plot args, first with existing plots, then override with d
    for p in plts
-        _update_plot_args(plt, copy(p.attr))
+        _update_plot_args(plt, p.attr)
        plt.n += p.n
    end
-    _update_plot_args(plt, plotattributes)
+    _update_plot_args(plt, d)

    # pass new plot to the backend
    plt.o = _create_backend_figure(plt)
    plt.init = true

    series_attr = KW()
-    for (k,v) in plotattributes
-        if is_series_attr(k)
-            series_attr[k] = pop!(plotattributes,k)
+    for (k,v) in d
+        if haskey(_series_defaults, k)
+            series_attr[k] = pop!(d,k)
        end
    end

-    # create the layout
+    # create the layout and initialize the subplots
    plt.layout, plt.subplots, plt.spmap = build_layout(layout, num_sp, copy(plts))
-
-    # do we need to link any axes together?
-    link_axes!(plt.layout, plt[:link])
-
-    # initialize the subplots
    cmdidx = 1
    for (idx, sp) in enumerate(plt.subplots)
        _initialize_subplot(plt, sp)
@@ -118,8 +108,8 @@ function plot(plt1::Plot, plts_tail::Plot...; kw...)
        sp.plt = plt
        sp.attr[:subplot_index] = idx
        for series in serieslist
-            merge!(series.plotattributes, series_attr)
-            _slice_series_args!(series.plotattributes, plt, sp, cmdidx)
+            merge!(series.d, series_attr)
+            _add_defaults!(series.d, plt, sp, cmdidx)
            push!(plt.series_list, series)
            _series_added(plt, series)
            cmdidx += 1
@@ -128,12 +118,15 @@ function plot(plt1::Plot, plts_tail::Plot...; kw...)

    # first apply any args for the subplots
    for (idx,sp) in enumerate(plt.subplots)
-        _update_subplot_args(plt, sp, plotattributes, idx, false)
+        _update_subplot_args(plt, sp, d, idx, false)
    end

+    # do we need to link any axes together?
+    link_axes!(plt.layout, plt[:link])
+
    # finish up
    current(plt)
-    _do_plot_show(plt, get(plotattributes, :show, default(:show)))
+    _do_plot_show(plt, get(d, :show, default(:show)))
    plt
 end

@@ -152,10 +145,10 @@ end

 # this adds to a specific plot... most plot commands will flow through here
 function plot!(plt::Plot, args...; kw...)
-    plotattributes = KW(kw)
-    preprocessArgs!(plotattributes)
-    # merge!(plt.user_attr, plotattributes)
-    _plot!(plt, plotattributes, args)
+    d = KW(kw)
+    preprocessArgs!(d)
+    # merge!(plt.user_attr, d)
+    _plot!(plt, d, args)
 end

 # -------------------------------------------------------------------------------
@@ -163,21 +156,21 @@ end
 # this is the core plotting function.  recursively apply recipes to build
 # a list of series KW dicts.
 # note: at entry, we only have those preprocessed args which were passed in... no default values yet
-function _plot!(plt::Plot, plotattributes::AKW, args::Tuple)
-    plotattributes[:plot_object] = plt
+function _plot!(plt::Plot, d::KW, args::Tuple)
+    d[:plot_object] = plt

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

    # --------------------------------
    # "USER RECIPES"
    # --------------------------------

-    kw_list = _process_userrecipes(plt, plotattributes, args)
+    kw_list = _process_userrecipes(plt, d, args)

-    # @info(1)
+    # info(1)
    # map(DD, kw_list)


@@ -192,18 +185,18 @@ function _plot!(plt::Plot, plotattributes::AKW, args::Tuple)
    still_to_process = kw_list
    kw_list = KW[]
    while !isempty(still_to_process)
-        next_kw = popfirst!(still_to_process)
+        next_kw = shift!(still_to_process)
        _process_plotrecipe(plt, next_kw, kw_list, still_to_process)
    end

-    # @info(2)
+    # info(2)
    # map(DD, kw_list)

    # --------------------------------
    # Plot/Subplot/Layout setup
    # --------------------------------
-    _plot_setup(plt, plotattributes, kw_list)
-    _subplot_setup(plt, plotattributes, kw_list)
+    _plot_setup(plt, d, kw_list)
+    _subplot_setup(plt, d, kw_list)

    # !!! note: At this point, kw_list is fully decomposed into individual series... one KW per series.          !!!
    # !!!       The next step is to recursively apply series recipes until the backend supports that series type !!!
@@ -212,25 +205,26 @@ function _plot!(plt::Plot, plotattributes::AKW, args::Tuple)
    # "SERIES RECIPES"
    # --------------------------------

-    # @info(3)
+    # info(3)
    # map(DD, kw_list)

    for kw in kw_list
        sp::Subplot = kw[:subplot]
+        # idx = get_subplot_index(plt, sp)

-        # in series attributes given as vector with one element per series,
-        # select the value for current series
-        _slice_series_args!(kw, plt, sp, series_idx(kw_list,kw))
+        # # we update subplot args in case something like the color palatte is part of the recipe
+        # _update_subplot_args(plt, sp, kw, idx, true)

+        # set default values, select from attribute cycles, and generally set the final attributes
+        _add_defaults!(kw, plt, sp, command_idx(kw_list,kw))

-        series_attr = Attr(kw, _series_defaults)
        # now we have a fully specified series, with colors chosen.   we must recursively handle
        # series recipes, which dispatch on seriestype.  If a backend does not natively support a seriestype,
        # we check for a recipe that will convert that series type into one made up of lower-level components.
        # For example, a histogram is just a bar plot with binned data, a bar plot is really a filled step plot,
        # and a step plot is really just a path.  So any backend that supports drawing a path will implicitly
        # be able to support step, bar, and histogram plots (and any recipes that use those components).
-        _process_seriesrecipe(plt, series_attr)
+        _process_seriesrecipe(plt, kw)
    end

    # --------------------------------
@@ -282,11 +276,11 @@ end

 function plot(sp::Subplot, args...; kw...)
    plt = sp.plt
-    plot(plt, args...; kw..., subplot = findfirst(isequal(sp), plt.subplots))
+    plot(plt, args...; kw..., subplot = findfirst(plt.subplots, sp))
 end
 function plot!(sp::Subplot, args...; kw...)
    plt = sp.plt
-    plot!(plt, args...; kw..., subplot = findfirst(isequal(sp), plt.subplots))
+    plot!(plt, args...; kw..., subplot = findfirst(plt.subplots, sp))
 end

 # --------------------------------------------------------------------
@@ -1,70 +0,0 @@
-
-const _attribute_defaults =  Dict(:Series => _series_defaults,
-                        :Subplot => _subplot_defaults,
-                        :Plot => _plot_defaults,
-                        :Axis => _axis_defaults)
-
-attrtypes() = join(keys(_attribute_defaults), ", ")
-attributes(attrtype::Symbol) = sort(collect(keys(_attribute_defaults[attrtype])))
-
-function lookup_aliases(attrtype, attribute)
-    attribute = Symbol(attribute)
-    attribute = in(attribute, keys(_keyAliases)) ? _keyAliases[attribute] : attribute
-    in(attribute, keys(_attribute_defaults[attrtype])) && return attribute
-    error("There is no attribute named $attribute in $attrtype")
-end
-
-"""
-    plotattr([attr])
-
-Look up the properties of a Plots attribute, or specify an attribute type. Call `plotattr()` for options.
-The information is the same as that given on https://docs.juliaplots.org/latest/attributes/.
-"""
-function plotattr()
-    println("Specify an attribute type to get a list of supported attributes. Options are $(attrtypes())")
-end
-
-function plotattr(attrtype::Symbol)
-    in(attrtype, keys(_attribute_defaults)) || error("Viable options are $(attrtypes())")
-    println("Defined $attrtype attributes are:\n$(join(attributes(attrtype), ", "))")
-end
-
-function plotattr(attribute::AbstractString)
-    attribute = Symbol(attribute)
-    attribute = in(attribute, keys(_keyAliases)) ? _keyAliases[attribute] : attribute
-    for (k, v) in _attribute_defaults
-        if in(attribute, keys(v))
-            return plotattr(k, "$attribute")
-        end
-    end
-    error("There is no attribute named $attribute")
-end
-
-printnothing(x) = x
-printnothing(x::Nothing) = "nothing"
-
-function plotattr(attrtype::Symbol, attribute::AbstractString)
-    in(attrtype, keys(_attribute_defaults)) || ArgumentError("`attrtype` must match one of $(attrtypes())")
-
-    attribute = Symbol(lookup_aliases(attrtype, attribute))
-
-    desc = get(_arg_desc, attribute, "")
-    first_period_idx = findfirst(isequal('.'), desc)
-    if isnothing(first_period_idx) 
-        typedesc = ""
-        desc = strip(desc)
-    else
-        typedesc = desc[1:first_period_idx-1]
-        desc = strip(desc[first_period_idx+1:end])
-    end
-    als = keys(filter(x->x[2]==attribute, _keyAliases)) |> collect |> sort
-    als = join(map(string,als), ", ")
-    def = _attribute_defaults[attrtype][attribute]
-
-
-    # Looks up the different elements and plots them
-    println("$(printnothing(attribute)) ", typedesc == "" ? "" : "{$(printnothing(typedesc))}", "\n",
-        als == "" ? "" : "$(printnothing(als))\n",
-        "\n$(printnothing(desc))\n",
-        "$(printnothing(attrtype)) attribute, ", def == "" ? "" : " default: $(printnothing(def))")
-end
@@ -1,788 +1,3 @@
 function _precompile_()
    ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
-    isdefined(Plots, Symbol("#@layout")) && precompile(Tuple{getfield(Plots, Symbol("#@layout")), LineNumberNode, Module, Expr})
-    isdefined(Plots, Symbol("#kw##_make_hist")) && precompile(Tuple{getfield(Plots, Symbol("#kw##_make_hist")), NamedTuple{(:normed, :weights), Tuple{Bool, Array{Int64, 1}}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}}, Symbol})
-    isdefined(Plots, Symbol("#kw##_make_hist")) && precompile(Tuple{getfield(Plots, Symbol("#kw##_make_hist")), NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Int64})
-    isdefined(Plots, Symbol("#kw##_make_hist")) && precompile(Tuple{getfield(Plots, Symbol("#kw##_make_hist")), NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Tuple{Int64, Int64}})
-    isdefined(Plots, Symbol("#kw##_make_hist")) && precompile(Tuple{getfield(Plots, Symbol("#kw##_make_hist")), NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}}, Symbol})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:flip,), Tuple{Bool}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:foreground_color_grid, :grid, :gridalpha, :gridstyle, :gridlinewidth), Tuple{ColorTypes.RGBA{Float64}, Bool, Float64, Symbol, Int64}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:formatter,), Tuple{Symbol}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid, :lims), Tuple{Bool, Tuple{Int64, Int64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid, :lims, :flip), Tuple{Bool, Tuple{Int64, Int64}, Bool}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid, :ticks), Tuple{Bool, Nothing}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid,), Tuple{Bool}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:grid,), Tuple{Bool}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:guide,), Tuple{String}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:lims, :flip, :ticks, :guide), Tuple{Tuple{Int64, Int64}, Bool, Base.StepRange{Int64, Int64}, String}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:lims,), Tuple{Tuple{Int64, Float64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:lims,), Tuple{Tuple{Int64, Int64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:lims,), Tuple{Tuple{Int64, Int64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:rotation,), Tuple{Int64}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:scale, :guide), Tuple{Symbol, String}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:ticks,), Tuple{Base.UnitRange{Int64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##attr!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##attr!")), NamedTuple{(:ticks,), Tuple{Nothing}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#kw##contour")) && precompile(Tuple{getfield(Plots, Symbol("#kw##contour")), NamedTuple{(:fill,), Tuple{Bool}}, typeof(Plots.contour), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
-    isdefined(Plots, Symbol("#kw##gr_polyline")) && precompile(Tuple{getfield(Plots, Symbol("#kw##gr_polyline")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Array{Float64, 1}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#kw##gr_polyline")) && precompile(Tuple{getfield(Plots, Symbol("#kw##gr_polyline")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Array{Int64, 1}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#kw##gr_polyline")) && precompile(Tuple{getfield(Plots, Symbol("#kw##gr_polyline")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Base.UnitRange{Int64}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#kw##gr_set_font")) && precompile(Tuple{getfield(Plots, Symbol("#kw##gr_set_font")), NamedTuple{(:halign, :valign, :rotation), Tuple{Symbol, Symbol, Int64}}, typeof(Plots.gr_set_font), Plots.Font})
-    isdefined(Plots, Symbol("#kw##heatmap")) && precompile(Tuple{getfield(Plots, Symbol("#kw##heatmap")), NamedTuple{(:aspect_ratio,), Tuple{Int64}}, typeof(Plots.heatmap), Array{String, 1}, Int})
-    isdefined(Plots, Symbol("#kw##histogram")) && precompile(Tuple{getfield(Plots, Symbol("#kw##histogram")), NamedTuple{(:bins, :weights), Tuple{Symbol, Array{Int64, 1}}}, typeof(Plots.histogram), Array{Float64, 1}})
-    isdefined(Plots, Symbol("#kw##histogram2d")) && precompile(Tuple{getfield(Plots, Symbol("#kw##histogram2d")), NamedTuple{(:nbins, :show_empty_bins, :normed, :aspect_ratio), Tuple{Tuple{Int64, Int64}, Bool, Bool, Int64}}, typeof(Plots.histogram2d), Array{Base.Complex{Float64}, 1}})
-    isdefined(Plots, Symbol("#kw##histogram2d")) && precompile(Tuple{getfield(Plots, Symbol("#kw##histogram2d")), NamedTuple{(:nbins,), Tuple{Int64}}, typeof(Plots.histogram2d), Array{Float64, 1}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#kw##hline!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##hline!")), NamedTuple{(:line,), Tuple{Tuple{Int64, Symbol, Float64, Array{Symbol, 2}}}}, typeof(Plots.hline!), Array{Float64, 2}})
-    isdefined(Plots, Symbol("#kw##pie")) && precompile(Tuple{getfield(Plots, Symbol("#kw##pie")), NamedTuple{(:title, :l), Tuple{String, Float64}}, typeof(Plots.pie), Array{String, 1}, Int})
-    isdefined(Plots, Symbol("#kw##portfoliocomposition")) && precompile(Tuple{getfield(Plots, Symbol("#kw##portfoliocomposition")), NamedTuple{(:labels,), Tuple{Array{String, 2}}}, typeof(Plots.portfoliocomposition), Array{Float64, 2}, Int})
-    isdefined(Plots, Symbol("#kw##scatter!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter!")), NamedTuple{(:marker, :series_annotations), Tuple{Tuple{Int64, Float64, Symbol}, Array{Any, 1}}}, typeof(Plots.scatter!), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
-    isdefined(Plots, Symbol("#kw##scatter!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter!")), NamedTuple{(:markersize, :c), Tuple{Int64, Symbol}}, typeof(Plots.scatter!), Array{Float64, 1}})
-    isdefined(Plots, Symbol("#kw##scatter!")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter!")), NamedTuple{(:zcolor, :m, :ms, :lab), Tuple{Array{Float64, 1}, Tuple{Symbol, Float64, Plots.Stroke}, Array{Float64, 1}, String}}, typeof(Plots.scatter!), Array{Float64, 1}})
-    isdefined(Plots, Symbol("#kw##scatter")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter")), NamedTuple{(:framestyle, :title, :color, :layout, :label, :markerstrokewidth, :ticks), Tuple{Array{Symbol, 2}, Array{String, 2}, Base.ReshapedArray{Int64, 2, Base.UnitRange{Int64}, Tuple{}}, Int64, String, Int64, Base.UnitRange{Int64}}}, typeof(Plots.scatter), Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}})
-    isdefined(Plots, Symbol("#kw##scatter")) && precompile(Tuple{getfield(Plots, Symbol("#kw##scatter")), NamedTuple{(:m, :lab, :bg, :xlim, :ylim), Tuple{Tuple{Int64, Symbol}, Array{String, 2}, Symbol, Tuple{Int64, Int64}, Tuple{Int64, Int64}}}, typeof(Plots.scatter), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
-    isdefined(Plots, Symbol("#kw##test_examples")) && precompile(Tuple{getfield(Plots, Symbol("#kw##test_examples")), NamedTuple{(:disp,), Tuple{Bool}}, typeof(Plots.test_examples), Symbol})
-    precompile(Tuple{typeof(Plots.__init__)})
-    precompile(Tuple{typeof(Plots._add_errorbar_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._add_errorbar_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._add_markershape), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._add_markershape), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._add_smooth_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._add_smooth_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._add_the_series), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._add_the_series), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{Array{Float64, 1}, 1}})
-    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{Array{T, 1} where T, 1}})
-    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{Function, 1}})
-    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{String, 1}})
-    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, Array{Union{Base.Missing, Int64}, 1}})
-    precompile(Tuple{typeof(Plots._apply_type_recipe), Base.Dict{Symbol, Any}, typeof(identity)})
-    precompile(Tuple{typeof(Plots._backend_instance), Symbol})
-    precompile(Tuple{typeof(Plots._backend_instance), Symbol})
-    precompile(Tuple{typeof(Plots._bin_centers), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._binbarlike_baseline), Float64, Symbol})
-    precompile(Tuple{typeof(Plots._cbar_unique), Array{Nothing, 1}, String})
-    precompile(Tuple{typeof(Plots._cbar_unique), Array{PlotUtils.ColorGradient, 1}, String})
-    precompile(Tuple{typeof(Plots._create_backend_figure), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._cycle), Array{Any, 1}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Array{Plots.Subplot{T} where T<:RecipesBase.AbstractBackend, 1}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Array{String, 1}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Base.OneTo{Int64}, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots._cycle), Base.StepRange{Int64, Int64}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), ColorTypes.RGBA{Float64}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Float64, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Int64, Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots._cycle), Int64, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Nothing, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Plots.Shape, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Symbol, Int64})
-    precompile(Tuple{typeof(Plots._display), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._display), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Int64}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Array{T, 1} where T, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Base.Complex{Float64}, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Function, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Function, 1}, Int64}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Int64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Plots.OHLC{T} where T<:Real, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{String, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Array{Union{Base.Missing, Int64}, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Plots.PortfolioComposition}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, Plots.Spy}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy, typeof(Base.log), Int64}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.GroupBy}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{Plots.Spy}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{typeof(Base.log), Int64}})
-    precompile(Tuple{typeof(Plots._expand_seriestype_array), Base.Dict{Symbol, Any}, Tuple{}})
-    precompile(Tuple{typeof(Plots._expand_subplot_extrema), Plots.Subplot{Plots.GRBackend}, Plots.Attr, Symbol})
-    precompile(Tuple{typeof(Plots._expand_subplot_extrema), Plots.Subplot{Plots.GRBackend}, Plots.Attr, Symbol})
-    precompile(Tuple{typeof(Plots._filter_input_data!), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._heatmap_edges), Array{Float64, 1}, Bool})
-    precompile(Tuple{typeof(Plots._hist_edge), Tuple{Array{Float64, 1}}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots._hist_edges), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Int64})
-    precompile(Tuple{typeof(Plots._hist_edges), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Tuple{Int64, Int64}})
-    precompile(Tuple{typeof(Plots._hist_edges), Tuple{Array{Float64, 1}}, Symbol})
-    precompile(Tuple{typeof(Plots._override_seriestype_check), Plots.Attr, Symbol})
-    precompile(Tuple{typeof(Plots._pick_default_backend)})
-    precompile(Tuple{typeof(Plots._pick_default_backend)})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Int64}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.Spy}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{typeof(Base.log), Int64}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{}})
-    precompile(Tuple{typeof(Plots._plot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._plot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._plots_defaults)})
-    precompile(Tuple{typeof(Plots._prepare_annotations), Plots.Subplot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._prepare_annotations), Plots.Subplot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._prepare_subplot), Plots.Plot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._prepare_subplot), Plots.Plot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Int64}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{Plots.Spy}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{typeof(Base.log), Int64}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_args), Base.Dict{Symbol, Any}, Tuple{}, Array{RecipesBase.RecipeData, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_barlike), Plots.Attr, Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_barlike), Plots.Attr, Array{Int64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_barlike), Plots.Attr, Base.OneTo{Int64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_binlike), Plots.Attr, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_userrecipe), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._preprocess_userrecipe), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._process_plotrecipe), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._process_plotrecipe), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._process_seriesrecipe), Plots.Plot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._process_seriesrecipe), Plots.Plot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._process_seriesrecipe), Plots.Plot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._process_userrecipe), Plots.Plot{Plots.GRBackend}, Array{Base.Dict{Symbol, Any}, 1}, RecipesBase.RecipeData})
-    precompile(Tuple{typeof(Plots._process_userrecipe), Plots.Plot{Plots.GRBackend}, Array{Base.Dict{Symbol, Any}, 1}, RecipesBase.RecipeData})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Int64}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.Spy}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{typeof(Base.log), Int64}})
-    precompile(Tuple{typeof(Plots._process_userrecipes), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{}})
-    precompile(Tuple{typeof(Plots._replace_linewidth), Plots.Attr})
-    precompile(Tuple{typeof(Plots._replace_linewidth), Plots.Attr})
-    precompile(Tuple{typeof(Plots._replace_markershape), Array{Symbol, 2}})
-    precompile(Tuple{typeof(Plots._replace_markershape), Plots.Shape})
-    precompile(Tuple{typeof(Plots._scale_adjusted_values), Type{Float64}, Array{Float64, 1}, Symbol})
-    precompile(Tuple{typeof(Plots._series_index), Plots.Attr, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._show), Base.IOStream, Base.Multimedia.MIME{Symbol("image/png")}, Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._slice_series_args!), Base.Dict{Symbol, Any}, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Int64})
-    precompile(Tuple{typeof(Plots._slice_series_args!), Base.Dict{Symbol, Any}, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Int64})
-    precompile(Tuple{typeof(Plots._subplot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._subplot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._transform_ticks), Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots._transform_ticks), Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots._transform_ticks), Nothing})
-    precompile(Tuple{typeof(Plots._transform_ticks), Symbol})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Axis, Base.Dict{Symbol, Any}, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Axis, Base.Dict{Symbol, Any}, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Axis, Plots.Attr, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Axis, Plots.Attr, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Plots.Attr, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Plots.Attr, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis_colors), Plots.Axis})
-    precompile(Tuple{typeof(Plots._update_axis_colors), Plots.Axis})
-    precompile(Tuple{typeof(Plots._update_axis_links), Plots.Plot{Plots.GRBackend}, Plots.Axis, Symbol})
-    precompile(Tuple{typeof(Plots._update_axis_links), Plots.Plot{Plots.GRBackend}, Plots.Axis, Symbol})
-    precompile(Tuple{typeof(Plots._update_clims), Float64, Float64, Float64, Float64})
-    precompile(Tuple{typeof(Plots._update_clims), Float64, Float64, Int64, Int64})
-    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.GridLayout})
-    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots._update_series_attributes!), Plots.Attr, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_series_attributes!), Plots.Attr, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_series_attributes!), Plots.Attr, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Int64, Bool})
-    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Int64, Bool})
-    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Plots.Attr, Int64, Bool})
-    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Plots.Attr, Int64, Bool})
-    precompile(Tuple{typeof(Plots._update_subplot_colors), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_subplot_colors), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_subplot_periphery), Plots.Subplot{Plots.GRBackend}, Array{Any, 1}})
-    precompile(Tuple{typeof(Plots._update_subplot_periphery), Plots.Subplot{Plots.GRBackend}, Array{Any, 1}})
-    precompile(Tuple{typeof(Plots.addExtension), String, String})
-    precompile(Tuple{typeof(Plots.add_layout_pct!), Base.Dict{Symbol, Any}, Expr, Int64, Int64})
-    precompile(Tuple{typeof(Plots.add_layout_pct!), Base.Dict{Symbol, Any}, Expr, Int64, Int64})
-    precompile(Tuple{typeof(Plots.aliasesAndAutopick), Plots.Attr, Symbol, Base.Dict{Symbol, Symbol}, Array{Symbol, 1}, Int64})
-    precompile(Tuple{typeof(Plots.aliasesAndAutopick), Plots.Attr, Symbol, Base.Dict{Symbol, Symbol}, Array{Symbol, 1}, Int64})
-    precompile(Tuple{typeof(Plots.all3D), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.all3D), Plots.Attr})
-    precompile(Tuple{typeof(Plots.allAlphas), Int64})
-    precompile(Tuple{typeof(Plots.allReals), Int64})
-    precompile(Tuple{typeof(Plots.allStyles), Int64})
-    precompile(Tuple{typeof(Plots.allStyles), Symbol})
-    precompile(Tuple{typeof(Plots.annotate!), Array{Tuple{Int64, Float64, Plots.PlotText}, 1}})
-    precompile(Tuple{typeof(Plots.annotations), Array{Any, 1}})
-    precompile(Tuple{typeof(Plots.arrow), Int64})
-    precompile(Tuple{typeof(Plots.attr!), Plots.Axis})
-    precompile(Tuple{typeof(Plots.attr!), Plots.Axis})
-    precompile(Tuple{typeof(Plots.attr), Plots.EmptyLayout, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.attr), Plots.EmptyLayout, Symbol})
-    precompile(Tuple{typeof(Plots.autopick), Array{ColorTypes.RGBA{Float64}, 1}, Int64})
-    precompile(Tuple{typeof(Plots.autopick_ignore_none_auto), Array{Symbol, 1}, Int64})
-    precompile(Tuple{typeof(Plots.axis_drawing_info), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.axis_drawing_info_3d), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.GRBackend}, Symbol, Bool, Bool})
-    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.backend), Plots.GRBackend})
-    precompile(Tuple{typeof(Plots.backend), Symbol})
-    precompile(Tuple{typeof(Plots.backend), Symbol})
-    precompile(Tuple{typeof(Plots.backend)})
-    precompile(Tuple{typeof(Plots.backend)})
-    precompile(Tuple{typeof(Plots.bar), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.bbox!), Plots.GridLayout, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.bbox!), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.bottom), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.bottompad), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.build_layout), Plots.Attr})
-    precompile(Tuple{typeof(Plots.build_layout), Plots.Attr})
-    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64, Array{Plots.Plot{T} where T<:RecipesBase.AbstractBackend, 1}})
-    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64, Array{Plots.Plot{T} where T<:RecipesBase.AbstractBackend, 1}})
-    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64})
-    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64})
-    precompile(Tuple{typeof(Plots.calc_num_subplots), Plots.EmptyLayout})
-    precompile(Tuple{typeof(Plots.calc_num_subplots), Plots.GridLayout})
-    precompile(Tuple{typeof(Plots.color_or_nothing!), Plots.Attr, Symbol})
-    precompile(Tuple{typeof(Plots.color_or_nothing!), Plots.Attr, Symbol})
-    precompile(Tuple{typeof(Plots.colorbar_style), Plots.Series})
-    precompile(Tuple{typeof(Plots.compute_gridsize), Int64, Int64, Int64})
-    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, Array{Float64, 1}, Nothing})
-    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, Array{Float64, 1}, Plots.Surface{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, typeof(identity), Nothing})
-    precompile(Tuple{typeof(Plots.compute_xyz), Array{Float64, 1}, typeof(identity), Nothing})
-    precompile(Tuple{typeof(Plots.compute_xyz), Array{String, 1}, Array{Float64, 1}, Nothing})
-    precompile(Tuple{typeof(Plots.compute_xyz), Array{String, 1}, Array{String, 1}, Plots.Surface{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots.compute_xyz), Nothing, Array{Float64, 1}, Nothing})
-    precompile(Tuple{typeof(Plots.compute_xyz), Nothing, Array{Union{Base.Missing, Float64}, 1}, Nothing})
-    precompile(Tuple{typeof(Plots.compute_xyz), Nothing, Nothing, Nothing})
-    precompile(Tuple{typeof(Plots.contour), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
-    precompile(Tuple{typeof(Plots.contour_levels), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.convertLegendValue), Bool})
-    precompile(Tuple{typeof(Plots.convertLegendValue), Symbol})
-    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Array{Float64, 1}, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Array{T, 1} where T, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Float64, 2}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Function, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.convertToAnyVector), Array{Function, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.convertToAnyVector), Int64, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.convert_sci_unicode), String})
-    precompile(Tuple{typeof(Plots.convert_to_polar), Array{Float64, 1}, Array{Float64, 1}, Tuple{Int64, Float64}})
-    precompile(Tuple{typeof(Plots.create_grid), Expr})
-    precompile(Tuple{typeof(Plots.create_grid), Expr})
-    precompile(Tuple{typeof(Plots.create_grid), Symbol})
-    precompile(Tuple{typeof(Plots.create_grid_curly), Expr})
-    precompile(Tuple{typeof(Plots.create_grid_curly), Expr})
-    precompile(Tuple{typeof(Plots.create_grid_vcat), Expr})
-    precompile(Tuple{typeof(Plots.create_grid_vcat), Expr})
-    precompile(Tuple{typeof(Plots.default), Symbol})
-    precompile(Tuple{typeof(Plots.default_should_widen), Plots.Axis})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Array{String, 1}})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Array{Union{Base.Missing, Float64}, 1}})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Base.Missing})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Char})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, String})
-    precompile(Tuple{typeof(Plots.ensure_gradient!), Plots.Attr, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.ensure_gradient!), Plots.Attr, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.ensure_gradient!), Plots.Attr, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Float64})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Int64})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Int64})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Plots.Surface{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Plots.Surface{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Subplot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Subplot{Plots.GRBackend}, Plots.Attr})
-    precompile(Tuple{typeof(Plots.extendSeriesData), Array{Float64, 1}, Float64})
-    precompile(Tuple{typeof(Plots.extractGroupArgs), Array{String, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.fakedata), Int64, Int64})
-    precompile(Tuple{typeof(Plots.fakedata), Int64, Int64})
-    precompile(Tuple{typeof(Plots.fg_color), Plots.Attr})
-    precompile(Tuple{typeof(Plots.fg_color), Plots.Attr})
-    precompile(Tuple{typeof(Plots.filter_data!), Base.Dict{Symbol, Any}, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.filter_data), Array{Float64, 1}, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.filter_data), Base.OneTo{Int64}, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.filter_data), Nothing, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.font), Int64, Int})
-    precompile(Tuple{typeof(Plots.font), String, Int})
-    precompile(Tuple{typeof(Plots.font), Symbol, Int})
-    precompile(Tuple{typeof(Plots.frame), Plots.Animation, Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.frame), Plots.Animation})
-    precompile(Tuple{typeof(Plots.get_axis), Plots.Subplot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.get_axis), Plots.Subplot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.get_clims), Plots.Series})
-    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.GRBackend}, Plots.Series})
-    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.get_fillalpha), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_fillalpha), Plots.Series})
-    precompile(Tuple{typeof(Plots.get_fillcolor), Plots.Series, Float64, Float64, Int64})
-    precompile(Tuple{typeof(Plots.get_fillcolor), Plots.Series, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.get_fillcolor), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.get_linealpha), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Float64, Float64, Int64})
-    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.get_linestyle), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_linewidth), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_markeralpha), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_markercolor), Plots.Series, Float64, Float64, Int64})
-    precompile(Tuple{typeof(Plots.get_markerstrokealpha), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_markerstrokecolor), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_minor_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Tuple{Array{Float64, 1}, Array{Any, 1}}})
-    precompile(Tuple{typeof(Plots.get_minor_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Tuple{Array{Float64, 1}, Array{String, 1}}})
-    precompile(Tuple{typeof(Plots.get_series_color), ColorTypes.RGBA{Float64}, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), Int64, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), PlotUtils.ColorGradient, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), Symbol, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), Symbol, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_subplot), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.get_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.get_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.get_xy), Array{Plots.OHLC{T} where T<:Real, 1}, Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.get_xy), Plots.OHLC{Float64}, Int64, Float64})
-    precompile(Tuple{typeof(Plots.getxy), Plots.Plot{Plots.GRBackend}, Int64})
-    precompile(Tuple{typeof(Plots.gr_axis_height), Plots.Subplot{Plots.GRBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.gr_axis_width), Plots.Subplot{Plots.GRBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.gr_color), ColorTypes.RGBA{Float64}, Type{ColorTypes.RGB{Float64}}})
-    precompile(Tuple{typeof(Plots.gr_colorbar_colors), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_contour_levels), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_display), Plots.Plot{Plots.GRBackend}, String})
-    precompile(Tuple{typeof(Plots.gr_display), Plots.Plot{Plots.GRBackend}, String})
-    precompile(Tuple{typeof(Plots.gr_display), Plots.Subplot{Plots.GRBackend}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.gr_draw_colorbar), Plots.GRColorbar, Plots.Subplot{Plots.GRBackend}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Float64, Float64, Int64, Plots.Shape})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Float64, Float64, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Float64, Float64, Plots.Shape})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Float64, Float64, Symbol})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Float64, Int64, Plots.Shape})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Int64, Float64, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Float64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Float64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.OneTo{Int64}, Array{Float64, 1}, Tuple{Float64, Float64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.OneTo{Int64}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.OneTo{Int64}, Array{Float64, 1}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Float64, Float64, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_fill_viewport), Array{Float64, 1}, ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_get_color), Plots.Series})
-    precompile(Tuple{typeof(Plots.gr_get_ticks_size), Tuple{Array{Float64, 1}, Array{Any, 1}}, Int64})
-    precompile(Tuple{typeof(Plots.gr_get_ticks_size), Tuple{Array{Float64, 1}, Array{String, 1}}, Int64})
-    precompile(Tuple{typeof(Plots.gr_inqtext), Int64, Int64, String})
-    precompile(Tuple{typeof(Plots.gr_legend_pos), Plots.Subplot{Plots.GRBackend}, Float64, Float64})
-    precompile(Tuple{typeof(Plots.gr_polaraxes), Int64, Float64, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_polyline), Array{Float64, 1}, Array{Float64, 1}, typeof(identity)})
-    precompile(Tuple{typeof(Plots.gr_polyline), Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.gr_set_fill), ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_fillcolor), ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_font), Plots.Font})
-    precompile(Tuple{typeof(Plots.gr_set_font), Plots.Font})
-    precompile(Tuple{typeof(Plots.gr_set_gradient), PlotUtils.ColorGradient})
-    precompile(Tuple{typeof(Plots.gr_set_gradient), Plots.Series})
-    precompile(Tuple{typeof(Plots.gr_set_line), Float64, Symbol, ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_line), Int64, Symbol, ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_line), Int64, Symbol, PlotUtils.ColorGradient})
-    precompile(Tuple{typeof(Plots.gr_set_linecolor), PlotUtils.ColorGradient})
-    precompile(Tuple{typeof(Plots.gr_set_markercolor), ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_textcolor), ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_transparency), ColorTypes.RGBA{Float64}, Float64})
-    precompile(Tuple{typeof(Plots.gr_set_transparency), ColorTypes.RGBA{Float64}, Nothing})
-    precompile(Tuple{typeof(Plots.gr_set_viewport_cmap), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_set_viewport_polar)})
-    precompile(Tuple{typeof(Plots.gr_set_xticks_font), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_set_xticks_font), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_set_yticks_font), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_set_yticks_font), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_text), Float64, Float64, String})
-    precompile(Tuple{typeof(Plots.gr_text_size), String, Int64})
-    precompile(Tuple{typeof(Plots.gr_text_size), String})
-    precompile(Tuple{typeof(Plots.gr_update_colorbar!), Plots.GRColorbar, Plots.Series})
-    precompile(Tuple{typeof(Plots.gr_viewport_from_bbox), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.gr_w3tondc), Float64, Float64, Float64})
-    precompile(Tuple{typeof(Plots.gui), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.guidefont), Plots.Axis})
-    precompile(Tuple{typeof(Plots.guidefont), Plots.Axis})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Array{Symbol, 2}, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Array{Symbol, 2}, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Array{Symbol, 2}, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, ColorTypes.RGBA{Float64}, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Plots.Shape, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.has_attribute_segments), Plots.Series})
-    precompile(Tuple{typeof(Plots.hascolorbar), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.hasgrid), Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol, Array{Float64, 1}, Symbol, Tuple{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol, Bool})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Tuple{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Bool})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Bool})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol})
-    precompile(Tuple{typeof(Plots.ignorenan_extrema), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.ignorenan_extrema), Array{Float64, 2}})
-    precompile(Tuple{typeof(Plots.ignorenan_extrema), Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.ignorenan_extrema), Plots.Axis})
-    precompile(Tuple{typeof(Plots.ignorenan_maximum), Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.ignorenan_minimum), Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.ignorenan_minimum), Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.inline), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.is3d), Plots.Attr})
-    precompile(Tuple{typeof(Plots.is3d), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.is3d), Symbol})
-    precompile(Tuple{typeof(Plots.is_2tuple), Int64})
-    precompile(Tuple{typeof(Plots.is_2tuple), Symbol})
-    precompile(Tuple{typeof(Plots.is_axis_attr), Symbol})
-    precompile(Tuple{typeof(Plots.is_marker_supported), Plots.GRBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_marker_supported), Plots.Shape})
-    precompile(Tuple{typeof(Plots.is_marker_supported), Symbol})
-    precompile(Tuple{typeof(Plots.is_marker_supported), Symbol})
-    precompile(Tuple{typeof(Plots.is_scale_supported), Plots.GRBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_seriestype_supported), Plots.GRBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_seriestype_supported), Symbol})
-    precompile(Tuple{typeof(Plots.is_seriestype_supported), Symbol})
-    precompile(Tuple{typeof(Plots.is_style_supported), Plots.GRBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_uniformly_spaced), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iscontour), Plots.Series})
-    precompile(Tuple{typeof(Plots.isijulia)})
-    precompile(Tuple{typeof(Plots.ispolar), Plots.Series})
-    precompile(Tuple{typeof(Plots.ispolar), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.isvertical), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.isvertical), Plots.Attr})
-    precompile(Tuple{typeof(Plots.isvertical), Plots.Attr})
-    precompile(Tuple{typeof(Plots.iter_segments), Array{Float64, 1}, Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Array{Int64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Base.OneTo{Int64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Base.UnitRange{Int64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Plots.Series})
-    precompile(Tuple{typeof(Plots.labelfunc), Symbol, Plots.GRBackend})
-    precompile(Tuple{typeof(Plots.layout_args), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.layout_args), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.layout_args), Int64, Int64})
-    precompile(Tuple{typeof(Plots.layout_args), Int64, Plots.GridLayout})
-    precompile(Tuple{typeof(Plots.layout_args), Int64})
-    precompile(Tuple{typeof(Plots.layout_args), Plots.Attr})
-    precompile(Tuple{typeof(Plots.layout_args), Plots.GridLayout})
-    precompile(Tuple{typeof(Plots.leftpad), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.legendfont), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.legendtitlefont), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.like_histogram), Symbol})
-    precompile(Tuple{typeof(Plots.like_surface), Symbol})
-    precompile(Tuple{typeof(Plots.link_axes!), Array{RecipesBase.AbstractLayout, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.link_axes!), Array{RecipesBase.AbstractLayout, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.Axis, Plots.Axis})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.Axis, Plots.Axis})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.GridLayout, Symbol})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.GridLayout, Symbol})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.Subplot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.link_subplots), Array{RecipesBase.AbstractLayout, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.locate_annotation), Plots.Subplot{Plots.GRBackend}, Int64, Float64, Plots.PlotText})
-    precompile(Tuple{typeof(Plots.make_fillrange_from_ribbon), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.make_fillrange_side), Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.make_fillrange_side), Array{Float64, 1}, Int64})
-    precompile(Tuple{typeof(Plots.make_steps), Array{Float64, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.make_steps), Array{Int64, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.make_steps), Base.OneTo{Int64}, Symbol})
-    precompile(Tuple{typeof(Plots.make_steps), Nothing, Symbol})
-    precompile(Tuple{typeof(Plots.nanappend!), Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.nobigs), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.ohlc), Array{Plots.OHLC{T} where T<:Real, 1}})
-    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Nothing})
-    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Nothing})
-    precompile(Tuple{typeof(Plots.parse_axis_kw), Symbol})
-    precompile(Tuple{typeof(Plots.pie_labels), Plots.Subplot{Plots.GRBackend}, Plots.Series})
-    precompile(Tuple{typeof(Plots.plotarea!), Plots.GridLayout, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.plotarea!), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.png), Plots.Plot{Plots.GRBackend}, String})
-    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Float64, 2}})
-    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Int32, 1}})
-    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Union{Base.Missing, Int64}, 1}})
-    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Union{Base.Missing, Number}, 1}})
-    precompile(Tuple{typeof(Plots.prepareSeriesData), Array{Union{Base.Missing, Number}, 1}})
-    precompile(Tuple{typeof(Plots.prepareSeriesData), Base.LinRange{Float64}})
-    precompile(Tuple{typeof(Plots.prepareSeriesData), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    precompile(Tuple{typeof(Plots.prepare_output), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.prepare_output), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.preprocessArgs!), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.preprocessArgs!), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.preprocessArgs!), Plots.Attr})
-    precompile(Tuple{typeof(Plots.preprocessArgs!), Plots.Attr})
-    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Bool})
-    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Float64})
-    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Bool, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Float64, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), Plots.Attr, Bool, Symbol})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Float64})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Bool})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Float64})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Float64})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Plots.Shape})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Plots.Stroke})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.process_annotation), Plots.Subplot{Plots.GRBackend}, Int64, Float64, Plots.PlotText, Plots.Font})
-    precompile(Tuple{typeof(Plots.process_annotation), Plots.Subplot{Plots.GRBackend}, Int64, Float64, Plots.PlotText})
-    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, Base.StepRange{Int64, Int64}, Symbol})
-    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, String, Symbol})
-    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, Tuple{Int64, Int64}, Symbol})
-    precompile(Tuple{typeof(Plots.process_fillrange), Int64, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.process_fillrange), Nothing, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.process_ribbon), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.process_ribbon), Int64, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.process_ribbon), Nothing, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.process_ribbon), Tuple{Base.LinRange{Float64}, Base.LinRange{Float64}}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.process_ribbon), typeof(identity), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.recompute_lengths), Array{Measures.Measure, 1}})
-    precompile(Tuple{typeof(Plots.replaceAlias!), Base.Dict{Symbol, Any}, Symbol, Base.Dict{Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.replaceAlias!), Plots.Attr, Symbol, Base.Dict{Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.replaceAliases!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.replaceAliases!), Plots.Attr, Base.Dict{Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.reset_axis_defaults_byletter!)})
-    precompile(Tuple{typeof(Plots.reset_extrema!), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.right), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.rightpad), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.rowsize), Expr})
-    precompile(Tuple{typeof(Plots.rowsize), Symbol})
-    precompile(Tuple{typeof(Plots.series_annotations), Array{Any, 1}})
-    precompile(Tuple{typeof(Plots.series_annotations), Plots.SeriesAnnotations})
-    precompile(Tuple{typeof(Plots.series_annotations_shapes!), Plots.Series, Symbol})
-    precompile(Tuple{typeof(Plots.series_idx), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.setxy!), Plots.Plot{Plots.GRBackend}, Tuple{Array{Float64, 1}, Array{Float64, 1}}, Int64})
-    precompile(Tuple{typeof(Plots.shape_data), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.should_add_to_legend), Plots.Series})
-    precompile(Tuple{typeof(Plots.showaxis), Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Int64, Bool})
-    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Int64, Bool})
-    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Plots.Attr, Symbol, Int64, Bool})
-    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Plots.Attr, Symbol, Int64, Bool})
-    precompile(Tuple{typeof(Plots.slice_arg!), Plots.Attr, Plots.Attr, Symbol, Int64, Bool})
-    precompile(Tuple{typeof(Plots.slice_arg!), Plots.Attr, Plots.Attr, Symbol, Int64, Bool})
-    precompile(Tuple{typeof(Plots.slice_arg), Array{ColorTypes.RGBA{Float64}, 2}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Array{Measures.Length{:mm, Float64}, 2}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Array{String, 2}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Array{Symbol, 2}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Base.ReshapedArray{Int64, 2, Base.UnitRange{Int64}, Tuple{}}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Base.StepRange{Int64, Int64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Base.UnitRange{Int64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Bool, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), ColorTypes.RGBA{Float64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Float64, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Int64, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Nothing, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), String, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Symbol, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Tuple{Int64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Tuple{Int64, Int64}, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Array{Int64, 1}, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Array{String, 1}, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Array{Symbol, 2}, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, ColorTypes.RGB{Float64}, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Float64, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Int64, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Plots.GridLayout, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Plots.Plot{Plots.GRBackend}, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, String, Int64})
-    precompile(Tuple{typeof(Plots.splittable_kw), Symbol, Symbol, Int64})
-    precompile(Tuple{typeof(Plots.straightline_data), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.straightline_data), Tuple{Int64, Int64}, Tuple{Float64, Float64}, Array{Float64, 1}, Array{Float64, 1}, Int64})
-    precompile(Tuple{typeof(Plots.stroke), Int64, Int64})
-    precompile(Tuple{typeof(Plots.stroke), Int64, Int})
-    precompile(Tuple{typeof(Plots.supported_markers), Plots.GRBackend})
-    precompile(Tuple{typeof(Plots.supported_markers)})
-    precompile(Tuple{typeof(Plots.supported_styles), Plots.GRBackend})
-    precompile(Tuple{typeof(Plots.supported_styles)})
-    precompile(Tuple{typeof(Plots.text), String, Int64, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.text), String, Symbol, Int64, Int})
-    precompile(Tuple{typeof(Plots.text), String, Symbol})
-    precompile(Tuple{typeof(Plots.tickfont), Plots.Axis})
-    precompile(Tuple{typeof(Plots.tickfont), Plots.Axis})
-    precompile(Tuple{typeof(Plots.title!), String})
-    precompile(Tuple{typeof(Plots.titlefont), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.titlefont), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.toppad), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.tovec), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.transpose_z), Plots.Series, Array{Float64, 2}, Bool})
-    precompile(Tuple{typeof(Plots.trueOrAllTrue), typeof(Plots.is3d), Symbol})
-    precompile(Tuple{typeof(Plots.trueOrAllTrue), typeof(identity), Array{Symbol, 2}})
-    precompile(Tuple{typeof(Plots.unzip), Array{Tuple{Float64, Float64, Float64}, 1}})
-    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout, Array{Measures.Length{:mm, Float64}, 1}})
-    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout, Array{Measures.Length{:mm, Float64}, 1}})
-    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout})
-    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout})
-    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.Subplot{Plots.GRBackend}, Array{Measures.Length{:mm, Float64}, 1}})
-    precompile(Tuple{typeof(Plots.update_inset_bboxes!), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.update_inset_bboxes!), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.vline!), Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.wand_edges), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.warnOnUnsupported), Plots.GRBackend, Plots.Attr})
-    precompile(Tuple{typeof(Plots.warnOnUnsupported), Plots.GRBackend, Plots.Attr})
-    precompile(Tuple{typeof(Plots.warnOnUnsupported_args), Plots.GRBackend, Plots.Attr})
-    precompile(Tuple{typeof(Plots.warnOnUnsupported_args), Plots.GRBackend, Plots.Attr})
-    precompile(Tuple{typeof(Plots.warnOnUnsupported_scales), Plots.GRBackend, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.warnOnUnsupported_scales), Plots.GRBackend, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.widen), Float64, Float64, Symbol})
-    precompile(Tuple{typeof(Plots.wrap_surfaces), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.wraptuple), Array{Any, 1}})
-    precompile(Tuple{typeof(Plots.wraptuple), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.wraptuple), Bool})
-    precompile(Tuple{typeof(Plots.wraptuple), Float64})
-    precompile(Tuple{typeof(Plots.wraptuple), Int64})
-    precompile(Tuple{typeof(Plots.wraptuple), Nothing})
-    precompile(Tuple{typeof(Plots.wraptuple), Plots.SeriesAnnotations})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Array{Symbol, 2}, Int64, Float64, Plots.Stroke}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Array{Symbol, 2}, Int64}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Float64, Array{Symbol, 2}, Int64}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Float64, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Array{Symbol, 2}}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Float64, Symbol, Plots.Stroke}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Float64, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Symbol, Float64, Array{Symbol, 2}}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Plots.Shape, Int64, ColorTypes.RGBA{Float64}}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{String, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{String, Tuple{Int64, Int64}, Base.StepRange{Int64, Int64}, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Float64, Plots.Stroke}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Int64}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Symbol, Symbol, Int64, Float64}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{}})
-    precompile(Tuple{typeof(Plots.xlims), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.yaxis!), String, Symbol})
-    precompile(Tuple{typeof(Plots.ylims), Plots.Subplot{Plots.GRBackend}})
 end
@@ -6,84 +6,82 @@
 # 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}
+typealias FuncOrFuncs{F} Union{F, Vector{F}, Matrix{F}}

-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)
+all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image), get(d, :seriestype, :none))

-# default: assume x represents a single series
-convertToAnyVector(x, plotattributes) = Any[prepareSeriesData(x)]
+# missing
+convertToAnyVector(v::Void, d::KW) = Any[nothing], nothing

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

-# vector of data points is a single series
-convertToAnyVector(v::AVec{<:DataPoint}, plotattributes) = Any[prepareSeriesData(v)]
+# numeric vector
+convertToAnyVector{T<:Number}(v::AVec{T}, d::KW) = Any[v], nothing
+
+# string vector
+convertToAnyVector{T<:AbstractString}(v::AVec{T}, d::KW) = Any[v], nothing
+
+function convertToAnyVector(v::AMat, d::KW)
+    if all3D(d)
+        Any[Surface(v)]
+    else
+        Any[v[:,i] for i in 1:size(v,2)]
+    end, nothing
+end
+
+# function
+convertToAnyVector(f::Function, d::KW) = Any[f], nothing
+
+# surface
+convertToAnyVector(s::Surface, d::KW) = Any[s], nothing
+
+# volume
+convertToAnyVector(v::Volume, d::KW) = Any[v], nothing
+
+# # vector of OHLC
+# convertToAnyVector(v::AVec{OHLC}, d::KW) = Any[v], nothing
+
+# # dates
+# convertToAnyVector{D<:Union{Date,DateTime}}(dts::AVec{D}, d::KW) = Any[dts], nothing

 # 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)
+function convertToAnyVector(v::AVec, d::KW)
+    if all(x -> typeof(x) <: Number, v)
+        # all real numbers wrap the whole vector as one item
+        Any[convert(Vector{Float64}, v)], nothing
    else
-        vcat((convertToAnyVector(vi, plotattributes) for vi in v)...)
+        # something else... treat each element as an item
+        vcat(Any[convertToAnyVector(vi, d)[1] for vi in v]...), nothing
+        # Any[vi for vi in v], nothing
    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
+convertToAnyVector(t::Tuple, d::KW) = Any[t], nothing
+
+
+function convertToAnyVector(args...)
+    error("In convertToAnyVector, could not handle the argument types: $(map(typeof, args[1:end-1]))")
 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
 #       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::Void, y::Void, z)      = 1:size(z,1)
+compute_x(x::Void, y, z)            = 1:size(y,1)
 compute_x(x::Function, y, z)        = map(x, y)
 compute_x(x, y, z)                  = copy(x)

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

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

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

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

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

@@ -108,7 +106,7 @@ 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
+immutable SliceIt end

 # the catch-all recipes
@recipe function f(::Type{SliceIt}, x, y, z)
@@ -127,19 +125,18 @@ struct SliceIt end
        z = z.data
    end

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

-
-    fr = pop!(plotattributes, :fillrange, nothing)
-    fillranges = process_fillrange(fr, plotattributes)
+    fr = pop!(d, :fillrange, nothing)
+    fillranges, _ = if typeof(fr) <: Number
+        ([fr],nothing)
+    else
+        convertToAnyVector(fr, d)
+    end
    mf = length(fillranges)

-    rib = pop!(plotattributes, :ribbon, nothing)
-    ribbons = process_ribbon(rib, plotattributes)
-    mr = length(ribbons)
-
    # @show zs

    mx = length(xs)
@@ -148,7 +145,7 @@ struct SliceIt end
    if mx > 0 && my > 0 && mz > 0
        for i in 1:max(mx, my, mz)
            # add a new series
-            di = copy(plotattributes)
+            di = copy(d)
            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)

@@ -156,10 +153,6 @@ struct SliceIt end
            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
@@ -167,20 +160,18 @@ struct SliceIt end
 end

 # this is the default "type recipe"... just pass the object through
-@recipe f(::Type{T}, v::T) where {T<:Any} = v
+@recipe f{T<:Any}(::Type{T}, v::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.")
+@recipe f{V<:Val}(::Type{V}, x, y, z) = 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]
+_apply_type_recipe(d, v) = RecipesBase.apply_recipe(d, typeof(v), v)[1].args[1]

 # 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
+function _apply_type_recipe(d, v::AbstractArray)
+    args = RecipesBase.apply_recipe(d, typeof(v[1]), v[1])[1].args
    if length(args) == 2 && typeof(args[1]) <: Function && typeof(args[2]) <: Function
        numfunc, formatter = args
        Formatted(map(numfunc, v), formatter)
@@ -190,13 +181,13 @@ function _apply_type_recipe(plotattributes, v::AbstractArray)
 end

 # # special handling for Surface... need to properly unwrap and re-wrap
-# function _apply_type_recipe(plotattributes, v::Surface)
+# function _apply_type_recipe(d, v::Surface)
 #     T = eltype(v.surf)
 #     @show T
 #     if T <: Integer || T <: AbstractFloat
 #         v
 #     else
-#         ret = _apply_type_recipe(plotattributes, v.surf)
+#         ret = _apply_type_recipe(d, v.surf)
 #         if typeof(ret) <: Formatted
 #             Formatted(Surface(ret.data), ret.formatter)
 #         else
@@ -206,16 +197,16 @@ end
 # end

 # don't do anything for ints or floats
-_apply_type_recipe(plotattributes, v::AbstractArray{T}) where {T<:Union{Integer,AbstractFloat}} = v
+_apply_type_recipe{T<:Union{Integer,AbstractFloat}}(d, v::AbstractArray{T}) = v

 # handle "type recipes" by converting inputs, and then either re-calling or slicing
@recipe function f(x, y, z)
    did_replace = false
-    newx = _apply_type_recipe(plotattributes, x)
+    newx = _apply_type_recipe(d, x)
    x === newx || (did_replace = true)
-    newy = _apply_type_recipe(plotattributes, y)
+    newy = _apply_type_recipe(d, y)
    y === newy || (did_replace = true)
-    newz = _apply_type_recipe(plotattributes, z)
+    newz = _apply_type_recipe(d, z)
    z === newz || (did_replace = true)
    if did_replace
        newx, newy, newz
@@ -225,9 +216,9 @@ _apply_type_recipe(plotattributes, v::AbstractArray{T}) where {T<:Union{Integer,
 end
@recipe function f(x, y)
    did_replace = false
-    newx = _apply_type_recipe(plotattributes, x)
+    newx = _apply_type_recipe(d, x)
    x === newx || (did_replace = true)
-    newy = _apply_type_recipe(plotattributes, y)
+    newy = _apply_type_recipe(d, y)
    y === newy || (did_replace = true)
    if did_replace
        newx, newy
@@ -236,7 +227,7 @@ end
    end
 end
@recipe function f(y)
-    newy = _apply_type_recipe(plotattributes, y)
+    newy = _apply_type_recipe(d, y)
    if y !== newy
        newy
    else
@@ -249,7 +240,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(d, v)
        if newv !== v
            did_replace = true
        end
@@ -267,89 +258,74 @@ end
 # # --------------------------------------------------------------------

 # helper function to ensure relevant attributes are wrapped by Surface
-function wrap_surfaces(plotattributes::AKW)
-    if haskey(plotattributes, :fill_z)
-        v = plotattributes[:fill_z]
+function wrap_surfaces(d::KW)
+    if haskey(d, :fill_z)
+        v = d[:fill_z]
        if !isa(v, Surface)
-            plotattributes[:fill_z] = Surface(v)
+            d[:fill_z] = Surface(v)
        end
    end
 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))
+@recipe f(n::Integer) = is3d(get(d,:seriestype,:path)) ? (SliceIt, n, n, n) : (SliceIt, n, n, nothing)

 # 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}
-    if all3D(plotattributes)
-        n,m = axes(mat)
-        wrap_surfaces(plotattributes)
-        SliceIt, m, n, Surface(mat)
+@recipe function f{T<:Union{Integer,AbstractFloat}}(mat::AMat{T})
+    if all3D(d)
+        n,m = size(mat)
+        wrap_surfaces(d)
+        SliceIt, 1:m, 1:n, Surface(mat)
    else
        SliceIt, 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
-    if all3D(plotattributes)
+@recipe function f{T<:AbstractMatrix}(fmt::Formatted{T})
+    if all3D(d)
        mat = fmt.data
-        n,m = axes(mat)
-        wrap_surfaces(plotattributes)
-        SliceIt, m, n, Formatted(Surface(mat), fmt.formatter)
+        n,m = size(mat)
+        wrap_surfaces(d)
+        SliceIt, 1:m, 1:n, Formatted(Surface(mat), fmt.formatter)
    else
        SliceIt, 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{T<:Number}(vol::AbstractArray{T,3}, args...)
    seriestype := :volume
    SliceIt, nothing, Volume(vol, args...), nothing
 end


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

-@recipe function f(mat::AMat{T}) where T<:Gray
-    n, m = axes(mat)
+@recipe function f{T<:Gray}(mat::AMat{T})
    if is_seriestype_supported(:image)
        seriestype := :image
-        yflip --> true
-        SliceIt, m, n, Surface(clamp_greys!(mat))
+        n, m = size(mat)
+        SliceIt, 1:m, 1:n, Surface(mat)
    else
        seriestype := :heatmap
        yflip --> true
-        cbar --> false
        fillcolor --> ColorGradient([:black, :white])
-        SliceIt, m, n, Surface(clamp!(convert(Matrix{Float64}, mat), 0., 1.))
+        SliceIt, 1:m, 1:n, Surface(convert(Matrix{Float64}, mat))
    end
 end

 # # images - colors

-@recipe function f(mat::AMat{T}) where T<:Colorant
-	n, m = axes(mat)
-
+@recipe function f{T<:Colorant}(mat::AMat{T})
    if is_seriestype_supported(:image)
        seriestype := :image
-        yflip --> true
-        SliceIt, m, n, Surface(mat)
+        n, m = size(mat)
+        SliceIt, 1:m, 1:n, Surface(mat)
    else
        seriestype := :heatmap
        yflip --> true
-        cbar --> false
-        aspect_ratio --> :equal
-        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
-        SliceIt, m, n, Surface(z)
+        z, d[:fillcolor] = replace_image_with_heatmap(mat)
+        SliceIt, 1:m, 1:n, Surface(z)
    end
 end

@@ -368,52 +344,25 @@ end

@recipe function f(shapes::AMat{Shape})
    seriestype --> :shape
-    for j in axes(shapes,2)
+    for j in 1:size(shapes,2)
        @series coords(vec(shapes[:,j]))
    end
 end

-# Dicts: each entry is a data point (x,y)=(key,value)

-@recipe f(d::AbstractDict) = collect(keys(d)), collect(values(d))

 # function without range... use the current range of the x-axis

-@recipe function f(f::FuncOrFuncs{F}) where F<:Function
-    plt = plotattributes[:plot_object]
-    xmin, xmax = if haskey(plotattributes, :xlims)
-        plotattributes[:xlims]
-    else
-        try
-            axis_limits(plt[1], :x)
-        catch
-            xinv = invscalefunc(get(plotattributes, :xscale, :identity))
-            xm = tryrange(f, xinv.([-5,-1,0,0.01]))
-            xm, tryrange(f, filter(x->x>xm, xinv.([5,1,0.99, 0, -0.01])))
-        end
+@recipe function f{F<:Function}(f::FuncOrFuncs{F})
+    plt = d[:plot_object]
+    xmin, xmax = try
+        axis_limits(plt[1][:xaxis])
+    catch
+        -5, 5
    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
@@ -423,7 +372,7 @@ end
 # # 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
+@recipe function f{F<:Function}(f::FuncOrFuncs{F}, x)
    F2 = typeof(x)
    @assert !(F2 <: Function || (F2 <: AbstractArray && F2.parameters[1] <: Function))  # otherwise we'd hit infinite recursion here
    x, f
@@ -438,23 +387,23 @@ end
 # # 3d line or scatter

@recipe function f(x::AVec, y::AVec, z::AVec)
-    # st = get(plotattributes, :seriestype, :none)
+    # st = get(d, :seriestype, :none)
    # if st == :scatter
-    #     plotattributes[:seriestype] = :scatter3d
+    #     d[:seriestype] = :scatter3d
    # elseif !is3d(st)
-    #     plotattributes[:seriestype] = :path3d
+    #     d[:seriestype] = :path3d
    # end
    SliceIt, x, y, z
 end

@recipe function f(x::AMat, y::AMat, z::AMat)
-    # st = get(plotattributes, :seriestype, :none)
+    # st = get(d, :seriestype, :none)
    # if size(x) == size(y) == size(z)
    #     if !is3d(st)
    #         seriestype := :path3d
    #     end
    # end
-    wrap_surfaces(plotattributes)
+    wrap_surfaces(d)
    SliceIt, x, y, z
 end

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

@@ -472,45 +421,13 @@ end
 # # surface-like... matrix grid

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

-# # images - grays
-
-@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where T<:Gray
-    if is_seriestype_supported(:image)
-        seriestype := :image
-        yflip --> true
-        SliceIt, x, y, Surface(mat)
-    else
-        seriestype := :heatmap
-        yflip --> true
-        cbar --> false
-        fillcolor --> ColorGradient([:black, :white])
-        SliceIt, x, y, Surface(convert(Matrix{Float64}, mat))
-    end
-end
-
-# # images - colors
-
-@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where T<:Colorant
-    if is_seriestype_supported(:image)
-        seriestype := :image
-        yflip --> true
-        SliceIt, x, y, Surface(mat)
-    else
-        seriestype := :heatmap
-        yflip --> true
-        cbar --> false
-        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
-        SliceIt, x, y, Surface(z)
-    end
-end
-
 #
 #
 # # --------------------------------------------------------------------
@@ -520,51 +437,58 @@ end
 #
 # # special handling... xmin/xmax with parametric function(s)
@recipe function f(f::Function, xmin::Number, xmax::Number)
-    xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
-    _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
+    xs = adapted_grid(f, (xmin, xmax))
+    xs, f
 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
-end
-@recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, u::AVec) where {F<:Function,G<:Function}  = mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u)
-@recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, umin::Number, umax::Number, n = 200) where {F<:Function,G<:Function} = fx, fy, range(umin, stop = umax, length = n)
-
-function _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
-    (xf, xinv), (yf, yinv) =  ((scalefunc(s),invscalefunc(s)) for s in (xscale,yscale))
-    xs, ys = adapted_grid(yf∘f∘xinv, xf.((xmin, xmax)))
-    xinv.(xs), yinv.(ys)
+@recipe function f{F<:Function}(fs::AbstractArray{F}, xmin::Number, xmax::Number)
+    xs = Any[adapted_grid(f, (xmin, xmax)) for f in fs]
+    xs, fs
 end
+@recipe f{F<:Function,G<:Function}(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, u::AVec)  = mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u)
+@recipe f{F<:Function,G<:Function}(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, umin::Number, umax::Number, n = 200) = fx, fy, linspace(umin, umax, n)

 #
 # # 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}
+@recipe function f{F<:Function,G<:Function,H<:Function}(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, u::AVec)
    mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u), mapFuncOrFuncs(fz, u)
 end
-@recipe function f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, umin::Number, umax::Number, numPoints = 200) where {F<:Function,G<:Function,H<:Function}
-    fx, fy, fz, range(umin, stop = umax, length = numPoints)
+@recipe function f{F<:Function,G<:Function,H<:Function}(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, umin::Number, umax::Number, numPoints = 200)
+    fx, fy, fz, linspace(umin, umax, numPoints)
 end

 #
 #
 # # --------------------------------------------------------------------
-# # Lists of tuples and GeometryTypes.Points
+# # Lists of tuples and FixedSizeArrays
 # # --------------------------------------------------------------------
 #
+# # if we get an unhandled tuple, just splat it in
+@recipe f(tup::Tuple) = tup

-@recipe f(v::AVec{<:Tuple})               = unzip(v)
-@recipe f(v::AVec{<:GeometryTypes.Point}) = unzip(v)
-@recipe f(tup::Tuple)             = [tup]
-@recipe f(p::GeometryTypes.Point) = [p]
+#
+# # (x,y) tuples
+@recipe f{R1<:Number,R2<:Number}(xy::AVec{Tuple{R1,R2}}) = unzip(xy)
+@recipe f{R1<:Number,R2<:Number}(xy::Tuple{R1,R2})       = [xy[1]], [xy[2]]

-# 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)
+#
+# # (x,y,z) tuples
+@recipe f{R1<:Number,R2<:Number,R3<:Number}(xyz::AVec{Tuple{R1,R2,R3}}) = unzip(xyz)
+@recipe f{R1<:Number,R2<:Number,R3<:Number}(xyz::Tuple{R1,R2,R3})       = [xyz[1]], [xyz[2]], [xyz[3]]
+
+# these might be points+velocity, or OHLC or something else
+@recipe f{R1<:Number,R2<:Number,R3<:Number,R4<:Number}(xyuv::AVec{Tuple{R1,R2,R3,R4}}) = get(d,:seriestype,:path)==:ohlc ? OHLC[OHLC(t...) for t in xyuv] : unzip(xyuv)
+@recipe f{R1<:Number,R2<:Number,R3<:Number,R4<:Number}(xyuv::Tuple{R1,R2,R3,R4})       = [xyuv[1]], [xyuv[2]], [xyuv[3]], [xyuv[4]]
+
+
+#
+# # 2D FixedSizeArrays
+@recipe f{T<:Number}(xy::AVec{StaticArrays.SVector{2,T}}) = unzip(xy)
+@recipe f{T<:Number}(xy::StaticArrays.SVector{2,T})       = [xy[1]], [xy[2]]
+
+#
+# # 3D FixedSizeArrays
+@recipe f{T<:Number}(xyz::AVec{StaticArrays.SVector{3,T}}) = unzip(xyz)
+@recipe f{T<:Number}(xyz::StaticArrays.SVector{3,T})       = [xyz[1]], [xyz[2]], [xyz[3]]

 #
 # # --------------------------------------------------------------------
@@ -576,7 +500,7 @@ end
 #         # 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)
+#         di = copy(d)
 #         get!(di, :label, string(glab))
 #         get!(di, :idxfilter, groupby.groupIds[i])
 #         push!(series_list, RecipeData(di, args))
@@ -584,69 +508,13 @@ end
 #     nothing
 # end

-splittable_kw(key, val, lengthGroup) = false
-splittable_kw(key, val::AbstractArray, lengthGroup) = !(key in (:group, :color_palette)) && length(axes(val,1)) == lengthGroup
-splittable_kw(key, val::Tuple, lengthGroup) = all(splittable_kw.(key, val, lengthGroup))
-splittable_kw(key, val::SeriesAnnotations, lengthGroup) = splittable_kw(key, val.strs, lengthGroup)
-
-split_kw(key, val::AbstractArray, indices) = val[indices, fill(Colon(), ndims(val)-1)...]
-split_kw(key, val::Tuple, indices) = Tuple(split_kw(key, v, indices) for v in val)
-function split_kw(key, val::SeriesAnnotations, indices)
-    split_strs = split_kw(key, val.strs, indices)
-    return SeriesAnnotations(split_strs, val.font, val.baseshape, val.scalefactor)
-end
-
-function groupedvec2mat(x_ind, x, y::AbstractArray, groupby, def_val = y[1])
-    y_mat = Array{promote_type(eltype(y), typeof(def_val))}(undef, length(keys(x_ind)), length(groupby.groupLabels))
-    fill!(y_mat, def_val)
-    for i in eachindex(groupby.groupLabels)
-        xi = x[groupby.groupIds[i]]
-        yi = y[groupby.groupIds[i]]
-        y_mat[getindex.(Ref(x_ind), xi), i] = yi
-    end
-    return y_mat
-end
-
-groupedvec2mat(x_ind, x, y::Tuple, groupby) = Tuple(groupedvec2mat(x_ind, x, v, groupby) for v in y)
-
-group_as_matrix(t) = false
-
 # split the group into 1 series per group, and set the label and idxfilter for each
@recipe function f(groupby::GroupBy, args...)
-    lengthGroup = maximum(union(groupby.groupIds...))
-    if !(group_as_matrix(args[1]))
-        for (i,glab) in enumerate(groupby.groupLabels)
-            @series begin
-                label     --> string(glab)
-                idxfilter --> groupby.groupIds[i]
-                for (key,val) in plotattributes
-                    if splittable_kw(key, val, lengthGroup)
-                        :($key) := split_kw(key, val, groupby.groupIds[i])
-                    end
-                end
-                args
-            end
+    for (i,glab) in enumerate(groupby.groupLabels)
+        @series begin
+            label     --> string(glab)
+            idxfilter --> groupby.groupIds[i]
+            args
        end
-    else
-        g = args[1]
-        if length(g.args) == 1
-            x = zeros(Int, lengthGroup)
-            for indexes in groupby.groupIds
-                x[indexes] = eachindex(indexes)
-            end
-            last_args = g.args
-        else
-            x = g.args[1]
-            last_args = g.args[2:end]
-        end
-        x_u = unique(sort(x))
-        x_ind = Dict(zip(x_u, eachindex(x_u)))
-        for (key,val) in plotattributes
-            if splittable_kw(key, val, lengthGroup)
-                :($key) := groupedvec2mat(x_ind, x, val, groupby)
-            end
-        end
-        label --> reshape(groupby.groupLabels, 1, :)
-        typeof(g)((x_u, (groupedvec2mat(x_ind, x, arg, groupby, NaN) for arg in last_args)...))
    end
 end
@@ -1,455 +0,0 @@
-"""
-    scatter(x,y)
-    scatter!(x,y)
-
-Make a scatter plot of y vs x.
-
-# Examples
-```julia-repl
-julia> scatter([1,2,3],[4,5,6],markersize=[3,4,5],markercolor=[:red,:green,:blue])
-julia> scatter([(1,4),(2,5),(3,6)])
-```
-"""
-@shorthands scatter
-
-"""
-    bar(x,y)
-    bar!(x,y)
-
-Make a bar plot of y vs x.
-
-# Arguments
-
- $(_document_argument("bar_position"))
- $(_document_argument("bar_width"))
- $(_document_argument("bar_edges"))
- $(_document_argument("orientation"))
-
-# Examples
-```julia-repl
-julia> bar([1,2,3],[4,5,6],fillcolor=[:red,:green,:blue],fillalpha=[0.2,0.4,0.6])
-julia> bar([(1,4),(2,5),(3,6)])
-```
-"""
-@shorthands bar
-
-@shorthands barh
-
-"""
-    histogram(x)
-    histogram!(x)
-
-Plot a histogram.
-
-# Arguments
-
- `x`: AbstractVector of values to be binned
- $(_document_argument("bins"))
- `weights`: Vector of weights for the values in `x`, for weighted bin counts
- $(_document_argument("normalize"))
- $(_document_argument("bar_position"))
- $(_document_argument("bar_width"))
- $(_document_argument("bar_edges"))
- $(_document_argument("orientation"))
-
-# Example
-```julia-repl
-julia> histogram([1,2,1,1,4,3,8],bins=0:8)
-```
-"""
-@shorthands histogram
-
-"""
-    barhist(x)
-    barhist!(x)
-
-Make a histogram bar plot. See `histogram`.
-"""
-@shorthands barhist
-
-"""
-    stephist(x)
-    stephist(x)
-
-Make a histogram step plot (bin counts are represented using horizontal lines
-instead of bars). See `histogram`.
-"""
-@shorthands stephist
-
-"""
-    scatterhist(x)
-    scatterhist!(x)
-
-Make a histogram scatter plot (bin counts are represented using points
-instead of bars). See `histogram`.
-"""
-@shorthands scatterhist
-
-"""
-    histogram2d(x,y)
-    histogram2d!(x,y)
-
-Plot a two-dimensional histogram.
-
-# Arguments
-
- `bins`: Number of bins (if an `Integer`) or bin edges (if an `AbtractVector`)
- `weights`: Vector of weights for the values in `x`. Each entry of x contributes
-             its weight to the height of its bin.
-
-# Example
-```julia-repl
-julia> histogram2d(randn(10_000),randn(10_000))
-```
-"""
-@shorthands histogram2d
-
-"""
-    density(x)
-    density!(x)
-
-Make a line plot of a kernel density estimate of x.
-
-# Arguments
-
- `x`: AbstractVector of samples for probability density estimation
-
-# Example
-```julia-repl
-julia> using StatsPlots
-julia> density(randn(100_000))
-```
-"""
-@shorthands density
-
-"""
-    heatmap(x,y,z)
-    heatmap!(x,y,z)
-
-Plot a heatmap of the rectangular array `z`.
-
-# Example
-```julia-repl
-julia> heatmap(randn(10,10))
-```
-"""
-@shorthands heatmap
-@shorthands plots_heatmap
-
-"""
-    hexbin(x,y)
-    hexbin!(x,y)
-
-Make a hexagonal binning plot (a histogram of the observations `(x[i],y[i])`
-with hexagonal bins)
-
-# Example
-```julia-repl
-julia> hexbin(randn(10_000), randn(10_000))
-```
-"""
-@shorthands hexbin
-
-"""
-    sticks(x,y)
-    sticks!(x,y)
-
-Draw a stick plot of y vs x.
-
-# Example
-```julia-repl
-julia> sticks(1:10)
-```
-"""
-@shorthands sticks
-
-"""
-    hline(y)
-    hline!(y)
-
-Draw horizontal lines at positions specified by the values in
-the AbstractVector `y`
-
-# Example
-```julia-repl
-julia> hline([-1,0,2])
-```
-"""
-@shorthands hline
-
-"""
-    vline(x)
-    vline!(x)
-
-Draw vertical lines at positions specified by the values in
-the AbstractVector `x`
-
-# Example
-```julia-repl
-julia> vline([-1,0,2])
-```
-"""
-@shorthands vline
-
-"""
-    hspan(y)
-
-Draw a rectangle between the horizontal line at position `y[1]`
-and the horizontal line at position `y[2]`. If `length(y) ≥ 4`,
-then further rectangles are drawn between `y[3]` and `y[4]`,
-`y[5]` and `y[6]`, and so on. If `length(y)` is odd, then the
-last entry of `y` is ignored.
-# Example
-```julia-repl
-julia> hspan(1:6)
-```
-"""
-@shorthands hspan
-
-"""
-    vspan(x)
-
-Draw a rectangle between the vertical line at position `x[1]`
-and the vertical line at position `x[2]`. If `length(x) ≥ 4`,
-then further rectangles are drawn between `x[3]` and `x[4]`,
-`x[5]` and `x[6]`, and so on. If `length(x)` is odd, then the
-last entry of `x` is ignored.
-# Example
-```julia-repl
-julia> vspan(1:6)
-```
-"""
-@shorthands vspan
-
-"""
-    ohlc(x,y::Vector{OHLC})
-    ohlc!(x,y::Vector{OHLC})
-
-Make open-high-low-close plot. Each entry of y is represented by a vertical
-segment extending from the low value to the high value, with short horizontal
-segments on the left and right indicating the open and close values, respectively.
-
-# Example
-```julia-repl
-julia> meanprices = cumsum(randn(100))
-julia> y = OHLC[(p+rand(),p+1,p-1,p+rand()) for p in meanprices]
-julia> ohlc(y)
-```
-"""
-@shorthands ohlc
-
-
-"""
-    contour(x,y,z)
-    contour!(x,y,z)
-
-Draw contour lines of the `Surface` z.
-
-# Arguments
- `levels`: Contour levels (if `AbstractVector`) or number of levels (if `Integer`)
- `fill`: Bool. Fill area between contours or draw contours only (false by default)
-
-# Example
-```julia-repl
-julia> x = y = range(-20, 20, length = 100)
-julia> contour(x, y, (x, y) -> x^2 + y^2)
-```
-"""
-@shorthands contour
-
-"An alias for `contour` with fill = true."
-@shorthands contourf
-
-
-@shorthands contour3d
-
-"""
-    surface(x,y,z)
-    surface!(x,y,z)
-
-Draw a 3D surface plot.
-
-# Example
-```julia-repl
-julia> x = y = range(-3, 3, length = 100)
-julia> surface(x, y, (x, y) -> sinc(norm([x, y])))
-```
-"""
-@shorthands surface
-
-"""
-    wireframe(x,y,z)
-    wireframe!(x,y,z)
-
-Draw a 3D wireframe plot.
-
-# Example
-```julia-repl
-julia> wireframe(1:10,1:10,randn(10,10))
-```
-"""
-@shorthands wireframe
-
-"""
-    path3d(x,y,z)
-    path3d!(x,y,z)
-
-Plot a 3D path from `(x[1],y[1],z[1])` to `(x[2],y[2],z[2])`,
-..., to `(x[end],y[end],z[end])`.
-
-# Example
-```julia-repl
-julia> path3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
-```
-"""
-@shorthands path3d
-
-"""
-    scatter3d(x,y,z)
-    scatter3d!(x,y,z)
-
-Make a 3D scatter plot.
-
-# Example
-```julia-repl
-julia> scatter3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
-```
-"""
-@shorthands scatter3d
-
-"""
-    boxplot(x, y)
-    boxplot!(x, y)
-
-Make a box and whisker plot.
-
-# Keyword arguments
- `notch`: Bool. Notch the box plot? (false)
- `range`: Real. Values more than range*IQR below the first quartile
-           or above the third quartile are shown as outliers (1.5)
- `outliers`: Bool. Show outliers? (true)
- `whisker_width`: Real or Symbol. Length of whiskers (:match)
-
-# Example
-```julia-repl
-julia> using StatsPlots
-julia> boxplot(repeat([1,2,3],outer=100),randn(300))
-```
-"""
-@shorthands boxplot
-
-"""
-    violin(x,y,z)
-    violin!(x,y,z)
-
-Make a violin plot.
-
-# Example
-```julia-repl
-julia> violin(repeat([1,2,3],outer=100),randn(300))
-```
-"""
-@shorthands violin
-
-"""
-    quiver(x,y,quiver=(u,v))
-    quiver!(x,y,quiver=(u,v))
-
-Make a quiver (vector field) plot. The `i`th vector extends
-from `(x[i],y[i])` to `(x[i] + u[i], y[i] + v[i])`.
-
-# Example
-```julia-repl
-julia> quiver([1,2,3],[3,2,1],quiver=([1,1,1],[1,2,3]))
-```
-"""
-@shorthands quiver
-
-"""
-    curves(x,y)
-    curves!(x,y)
-
-Draw a Bezier curve from `(x[1],y[1])` to `(x[end],y[end])`
-with control points `(x[2],y[2]), ..., (x[end-1],y[end]-1)`
-
-# Example
-```julia-repl
-julia> curves([1,2,3,4],[1,1,2,4])
-```
-"""
-@shorthands curves
-
-"Plot a pie diagram"
-pie(args...; kw...)        = plot(args...; kw...,  seriestype = :pie, aspect_ratio = :equal, grid=false, xticks=nothing, yticks=nothing)
-pie!(args...; kw...)       = plot!(args...; kw..., seriestype = :pie, aspect_ratio = :equal, grid=false, xticks=nothing, yticks=nothing)
-
-"Plot with seriestype :path3d"
-plot3d(args...; kw...)     = plot(args...; kw...,  seriestype = :path3d)
-plot3d!(args...; kw...)    = plot!(args...; kw..., seriestype = :path3d)
-
-"Add title to an existing plot"
-title!(s::AbstractString; kw...)                 = plot!(; title = s, kw...)
-
-"Add xlabel to an existing plot"
-xlabel!(s::AbstractString; kw...)                = plot!(; xlabel = s, kw...)
-
-"Add ylabel to an existing plot"
-ylabel!(s::AbstractString; kw...)                = plot!(; ylabel = s, kw...)
-
-"Set xlims for an existing plot"
-xlims!(lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real} = plot!(; xlims = lims, kw...)
-
-"Set ylims for an existing plot"
-ylims!(lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real} = plot!(; ylims = lims, kw...)
-
-"Set zlims for an existing plot"
-zlims!(lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real} = plot!(; zlims = lims, kw...)
-
-xlims!(xmin::Real, xmax::Real; kw...)                     = plot!(; xlims = (xmin,xmax), kw...)
-ylims!(ymin::Real, ymax::Real; kw...)                     = plot!(; ylims = (ymin,ymax), kw...)
-zlims!(zmin::Real, zmax::Real; kw...)                     = plot!(; zlims = (zmin,zmax), kw...)
-
-
-"Set xticks for an existing plot"
-xticks!(v::TicksArgs; kw...) where {T<:Real}                       = plot!(; xticks = v, kw...)
-
-"Set yticks for an existing plot"
-yticks!(v::TicksArgs; kw...) where {T<:Real}                       = plot!(; yticks = v, kw...)
-
-xticks!(
-ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(; xticks = (ticks,labels), kw...)
-yticks!(
-ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(; yticks = (ticks,labels), kw...)
-
-"""
-    annotate!(anns...)
-
-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
-
-# Example
-```julia-repl
-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::AVec{T}; kw...) where {T<:Tuple}                 = plot!(; annotation = anns, kw...)
-
-"Flip the current plots' x axis"
-xflip!(flip::Bool = true; kw...)                          = plot!(; xflip = flip, kw...)
-
-"Flip the current plots' y axis"
-yflip!(flip::Bool = true; kw...)                          = plot!(; yflip = flip, kw...)
-
-"Specify x axis attributes for an existing plot"
-xaxis!(args...; kw...)                                    = plot!(; xaxis = args, kw...)
-
-"Specify y axis attributes for an existing plot"
-yaxis!(args...; kw...)                                    = plot!(; yaxis = args, kw...)
-xgrid!(args...; kw...)                                    = plot!(; xgrid = args, kw...)
-ygrid!(args...; kw...)                                    = plot!(; ygrid = args, kw...)
@@ -1,23 +1,18 @@


-function Subplot(::T; parent = RootLayout()) where T<:AbstractBackend
+function Subplot{T<:AbstractBackend}(::T; parent = RootLayout())
    Subplot{T}(
        parent,
        Series[],
        (20mm, 5mm, 2mm, 10mm),
        defaultbox,
        defaultbox,
-        Attr(KW(), _subplot_defaults),
+        KW(),
        nothing,
        nothing
    )
 end

-"""
-    plotarea(subplot)
-
-Return the bounding box of a subplot
-"""
 plotarea(sp::Subplot) = sp.plotarea
 plotarea!(sp::Subplot, bbox::BoundingBox) = (sp.plotarea = bbox)

@@ -34,17 +29,17 @@ bottompad(sp::Subplot) = sp.minpad[4]
 get_subplot(plt::Plot, sp::Subplot) = sp
 get_subplot(plt::Plot, i::Integer) = plt.subplots[i]
 get_subplot(plt::Plot, k) = plt.spmap[k]
-get_subplot(series::Series) = series.plotattributes[:subplot]
+get_subplot(series::Series) = series.d[:subplot]

 get_subplot_index(plt::Plot, idx::Integer) = Int(idx)
-get_subplot_index(plt::Plot, sp::Subplot) = findfirst(x -> x === sp, plt.subplots)
+get_subplot_index(plt::Plot, sp::Subplot) = findfirst(_ -> _ === sp, plt.subplots)

-series_list(sp::Subplot) = sp.series_list # filter(series -> series.plotattributes[:subplot] === sp, sp.plt.series_list)
+series_list(sp::Subplot) = sp.series_list # filter(series -> series.d[:subplot] === sp, sp.plt.series_list)

 function should_add_to_legend(series::Series)
-    series.plotattributes[:primary] && series.plotattributes[:label] != "" &&
-        !(series.plotattributes[:seriestype] in (
-            :hexbin,:bins2d,:histogram2d,:hline,:vline,
+    series.d[:primary] && series.d[:label] != "" &&
+        !(series.d[:seriestype] in (
+            :hexbin,:histogram2d,:hline,:vline,
            :contour,:contourf,:contour3d,:surface,:wireframe,
            :heatmap, :pie, :image
        ))
@@ -1,151 +1,40 @@
-"""
-    theme(s::Symbol)

-Specify the colour theme for plots.
-"""
 function theme(s::Symbol; kw...)
-    defaults = copy(PlotThemes._themes[s].defaults)
-    _theme(s, defaults; kw...)
-end
-
-function _theme(s::Symbol, defaults::AKW; kw...)
-    # Reset to defaults to overwrite active theme
-    reset_defaults()
-
-    # Set the theme's gradient as default
-    if haskey(defaults, :colorgradient)
-        PlotUtils.clibrary(:misc)
-        PlotUtils.default_cgrad(default = :sequential, sequential = PlotThemes.gradient_name(s))
-        pop!(defaults, :colorgradient)
-    else
-        PlotUtils.clibrary(:Plots)
-        PlotUtils.default_cgrad(default = :sequential, sequential = :inferno)
+    # reset?
+    if s == :none || s == :default
+        PlotUtils._default_gradient[] = :inferno
+        default(;
+            bg        = :white,
+            bglegend  = :match,
+            bginside  = :match,
+            bgoutside = :match,
+            fg        = :auto,
+            fglegend  = :match,
+            fggrid    = :match,
+            fgaxis    = :match,
+            fgtext    = :match,
+            fgborder  = :match,
+            fgguide   = :match,
+            palette   = :auto
+        )
+        return
    end

-    # maybe overwrite the theme's gradient
-    kw = KW(kw)
-    if haskey(kw, :colorgradient)
-        kwgrad = pop!(kw, :colorgradient)
-        for clib in clibraries()
-            if kwgrad in cgradients(clib)
-                PlotUtils.clibrary(clib)
-                PlotUtils.default_cgrad(default = :sequential, sequential = kwgrad)
-                break
-            end
-        end
+    # update the default gradient and other defaults
+    thm = PlotThemes._themes[s]
+    if thm.gradient != nothing
+        PlotUtils._default_gradient[] = PlotThemes.gradient_name(s)
    end
-
-    # Set the theme's defaults
-    default(; defaults..., kw...)
-    return
+    default(;
+        bg       = thm.bg_secondary,
+        bginside = thm.bg_primary,
+        fg       = thm.lines,
+        fgtext   = thm.text,
+        fgguide  = thm.text,
+        fglegend = thm.text,
+        palette  = thm.palette,
+        kw...
+    )
 end

@deprecate set_theme(s) theme(s)
-
-@userplot ShowTheme
-
-_color_functions = KW(
-    :protanopic => protanopic,
-    :deuteranopic => deuteranopic,
-    :tritanopic => tritanopic,
-)
-_get_showtheme_args(thm::Symbol) = thm, identity
-_get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func, identity)
-
-@recipe function showtheme(st::ShowTheme)
-    thm, cfunc = _get_showtheme_args(st.args...)
-    defaults = PlotThemes._themes[thm].defaults
-
-    # get the gradient
-    gradient_colors = get(defaults, :colorgradient, cgrad(:inferno).colors)
-    colorgradient = cgrad(cfunc.(RGB.(gradient_colors)))
-
-    # get the palette
-    palette = get(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17))
-    palette = cfunc.(RGB.(palette))
-
-    # apply the theme
-    for k in keys(defaults)
-        k in (:colorgradient, :palette) && continue
-        def = defaults[k]
-        arg = get(_keyAliases, k, k)
-        plotattributes[arg] = if typeof(def) <: Colorant
-            cfunc(RGB(def))
-        elseif eltype(def) <: Colorant
-            cfunc.(RGB.(def))
-        elseif occursin("color", string(arg))
-            cfunc.(RGB.(plot_color.(def)))
-        else
-            def
-        end
-    end
-
-    Random.seed!(1)
-
-    label := ""
-    colorbar := false
-    layout := (2, 3)
-
-    for j in 1:4
-        @series begin
-            subplot := 1
-            palette := palette
-            seriestype := :path
-            cumsum(randn(50))
-        end
-
-        @series begin
-            subplot := 2
-            seriestype := :scatter
-            palette := palette
-            marker := (:circle, :diamond, :star5, :square)[j]
-            randn(10), randn(10)
-        end
-    end
-
-    @series begin
-        subplot := 3
-        seriestype := :histogram
-        palette := palette
-        randn(1000) .+ (0:2:4)'
-    end
-
-    f(r) = sin(r) / r
-    _norm(x, y) = norm([x, y])
-    x = y = range(-3π, stop = 3π, length = 30)
-    z = f.(_norm.(x, y'))
-    wi = 2:3:30
-
-    @series begin
-        subplot := 4
-        seriestype := :heatmap
-        seriescolor := colorgradient
-        xticks := (-2π:2π:2π, string.(-2:2:2, "π"))
-        yticks := (-2π:2π:2π, string.(-2:2:2, "π"))
-        x, y, z
-    end
-
-    @series begin
-        subplot := 5
-        seriestype := :surface
-        seriescolor := colorgradient
-        xticks := (-2π:2π:2π, string.(-2:2:2, "π"))
-        yticks := (-2π:2π:2π, string.(-2:2:2, "π"))
-        x, y, z
-    end
-
-    n = 100
-    ts = range(0, stop = 10π, length = n)
-    x = (0.1ts) .* cos.(ts)
-    y = (0.1ts) .* sin.(ts)
-    z = 1:n
-
-    @series begin
-        subplot := 6
-        seriescolor := colorgradient
-        linewidth := 3
-        line_z := z
-        x, y, z
-    end
-
-end
@@ -2,95 +2,44 @@
 # TODO: I declare lots of types here because of the lacking ability to do forward declarations in current Julia
 # I should move these to the relevant files when something like "extern" is implemented

-const AVec = AbstractVector
-const AMat = AbstractMatrix
-const KW = Dict{Symbol,Any}
-const AKW = AbstractDict{Symbol,Any}
-const TicksArgs = Union{AVec{T}, Tuple{AVec{T}, AVec{S}}, Symbol} where {T<:Real, S<:AbstractString}
+typealias AVec AbstractVector
+typealias AMat AbstractMatrix
+typealias KW Dict{Symbol,Any}

-struct PlotsDisplay <: AbstractDisplay end
+immutable PlotsDisplay <: Display end
+
+abstract AbstractBackend
+abstract AbstractPlot{T<:AbstractBackend}
+abstract AbstractLayout

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

-struct InputWrapper{T}
+immutable InputWrapper{T}
    obj::T
 end
-wrap(obj::T) where {T} = InputWrapper{T}(obj)
+wrap{T}(obj::T) = InputWrapper{T}(obj)
 Base.isempty(wrapper::InputWrapper) = false


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

-struct Attr <: AbstractDict{Symbol,Any}
-    explicit::KW
-    defaults::KW
+type Series
+    d::KW
 end

-Base.getindex(attr::Attr, k) = haskey(attr.explicit,k) ?
-                                     attr.explicit[k] : attr.defaults[k]
-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)
-    v = if haskey(attr, k)
-        attr[k]
-    else
-        attr.defaults[k] = default
-    end
-    return v
-end
-function Base.delete!(attr::Attr, k)
-    haskey(attr.explicit, k) && delete!(attr.explicit, k)
-    haskey(attr.defaults, k) && delete!(attr.defaults, k)
-end 
-Base.length(attr::Attr) = length(union(keys(attr.explicit), keys(attr.defaults)))
-function Base.iterate(attr::Attr)
-    exp_keys = keys(attr.explicit)
-    def_keys = setdiff(keys(attr.defaults), exp_keys)
-    key_list = collect(Iterators.flatten((exp_keys, def_keys)))
-    iterate(attr, (key_list, 1))
-end
-function Base.iterate(attr::Attr, (key_list, i))
-    i > length(key_list) && return nothing
-    k = key_list[i]
-    (k=>attr[k], (key_list, i+1))
-end
-
-Base.copy(attr::Attr) = Attr(copy(attr.explicit), attr.defaults)
-
-RecipesBase.is_explicit(attr::Attr, k) = haskey(attr.explicit,k)
-isdefault(attr::Attr, k) = !is_explicit(attr,k) && haskey(attr.defaults,k)
-
-Base.setindex!(attr::Attr, v, k) = attr.explicit[k] = v
-
-# Reset to default value and return dict
-reset_kw!(attr::Attr, k) = is_explicit(attr, k) ? delete!(attr.explicit, k) : attr
-# Reset to default value and return old value
-pop_kw!(attr::Attr, k) = is_explicit(attr, k) ? pop!(attr.explicit, k) : attr.defaults[k]
-pop_kw!(attr::Attr, k, default) = is_explicit(attr, k) ? pop!(attr.explicit, k) : get(attr.defaults, k, default)
-# Fallbacks for dicts without defaults
-reset_kw!(d::AKW, k) = delete!(d, k)
-pop_kw!(d::AKW, k) = pop!(d, k)
-pop_kw!(d::AKW, k, default) = pop!(d, k, default)
-
-# -----------------------------------------------------------
-
-mutable struct Series
-    plotattributes::Attr
-end
-
-attr(series::Series, k::Symbol) = series.plotattributes[k]
-attr!(series::Series, v, k::Symbol) = (series.plotattributes[k] = v)
+attr(series::Series, k::Symbol) = series.d[k]
+attr!(series::Series, v, k::Symbol) = (series.d[k] = v)

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

 # a single subplot
-mutable struct Subplot{T<:AbstractBackend} <: AbstractLayout
+type Subplot{T<:AbstractBackend} <: AbstractLayout
    parent::AbstractLayout
    series_list::Vector{Series}  # arguments for each series
    minpad::Tuple # leftpad, toppad, rightpad, bottompad
    bbox::BoundingBox  # the canvas area which is available to this subplot
    plotarea::BoundingBox  # the part where the data goes
-    attr::Attr  # args specific to this subplot
+    attr::KW  # args specific to this subplot
    o  # can store backend-specific data... like a pyplot ax
    plt  # the enclosing Plot object (can't give it a type because of no forward declarations)
 end
@@ -100,12 +49,12 @@ Base.show(io::IO, sp::Subplot) = print(io, "Subplot{$(sp[:subplot_index])}")
 # -----------------------------------------------------------

 # simple wrapper around a KW so we can hold all attributes pertaining to the axis in one place
-mutable struct Axis
+type Axis
    sps::Vector{Subplot}
-    plotattributes::Attr
+    d::KW
 end

-mutable struct Extrema
+type Extrema
    emin::Float64
    emax::Float64
 end
@@ -113,15 +62,16 @@ Extrema() = Extrema(Inf, -Inf)

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

-const SubplotMap = Dict{Any, Subplot}
+typealias SubplotMap Dict{Any, Subplot}

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


-mutable struct Plot{T<:AbstractBackend} <: AbstractPlot{T}
+type Plot{T<:AbstractBackend} <: AbstractPlot{T}
    backend::T                   # the backend type
    n::Int                       # number of series
-    attr::Attr            # arguments for the whole plot
+    attr::KW                     # arguments for the whole plot
+    user_attr::KW                # raw arg inputs (after aliases).  these are used as the input dict in `_plot!`
    series_list::Vector{Series}  # arguments for each series
    o                            # the backend's plot object
    subplots::Vector{Subplot}
@@ -132,7 +82,7 @@ mutable struct Plot{T<:AbstractBackend} <: AbstractPlot{T}
 end

 function Plot()
-    Plot(backend(), 0, Attr(KW(), _plot_defaults), Series[], nothing,
+    Plot(backend(), 0, KW(), KW(), Series[], nothing,
         Subplot[], SubplotMap(), EmptyLayout(),
         Subplot[], false)
 end
@@ -141,7 +91,7 @@ end

 Base.getindex(plt::Plot, i::Integer) = plt.subplots[i]
 Base.length(plt::Plot) = length(plt.subplots)
-Base.lastindex(plt::Plot) = length(plt)
+Base.endof(plt::Plot) = length(plt)

 Base.getindex(plt::Plot, r::Integer, c::Integer) = plt.layout[r,c]
 Base.size(plt::Plot) = size(plt.layout)
@@ -152,6 +102,6 @@ Base.ndims(plt::Plot) = 2
 # attr!(plt::Plot, v, k::Symbol) = (plt.attr[k] = v)

 Base.getindex(sp::Subplot, i::Integer) = series_list(sp)[i]
-Base.lastindex(sp::Subplot) = length(series_list(sp))
+Base.endof(sp::Subplot) = length(series_list(sp))

 # -----------------------------------------------------------------------
@@ -1 +0,0 @@
-reference_images
@@ -0,0 +1,10 @@
+StatPlots
+FactCheck
+Images
+ImageMagick
+@osx QuartzImageIO
+GR
+RDatasets
+VisualRegressionTests
+UnicodePlots
+Glob
@@ -1,31 +1,93 @@
-import Plots._current_plots_version

-function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = !is_ci(), sigma = [1,1], tol = 1e-2)
+using VisualRegressionTests
+# using ExamplePlots
+
+import DataFrames, RDatasets
+
+# don't let pyplot use a gui... it'll crash
+# note: Agg will set gui -> :none in PyPlot
+ENV["MPLBACKEND"] = "Agg"
+try
+  @eval import PyPlot
+  info("Matplotlib version: $(PyPlot.matplotlib[:__version__])")
+end
+
+
+using Plots
+using StatPlots
+using FactCheck
+using Glob
+
+default(size=(500,300))
+
+
+# TODO: use julia's Condition type and the wait() and notify() functions to initialize a Window, then wait() on a condition that
+#       is referenced in a button press callback (the button clicked callback will call notify() on that condition)
+
+const _current_plots_version = v"0.9.6"
+
+
+function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], eps = 1e-2)
    Plots._debugMode.on = debug
    example = Plots._examples[idx]
-    Plots.theme(:default)
-    @info("Testing plot: $pkg:$idx:$(example.header)")
+    info("Testing plot: $pkg:$idx:$(example.header)")
    backend(pkg)
    backend()
-    default(size=(500,300))
-    # ensure consistent results
-    Random.seed!(1234)

+    # ensure consistent results
+    srand(1234)
+
+    # reference image directory setup
+    # refdir = joinpath(Pkg.dir("ExamplePlots"), "test", "refimg", string(pkg))
+    refdir = Pkg.dir("PlotReferenceImages", "Plots", string(pkg))
    fn = "ref$idx.png"
-    reffn = reference_file(pkg, idx, _current_plots_version)
-    newfn = joinpath(reference_path(pkg, _current_plots_version), fn)
+
+    # firgure out version info
+    G = glob(joinpath(relpath(refdir), "*"))
+    # @show refdir fn G
+    slash = (@static is_windows() ? "\\" : "/")
+    versions = map(fn -> VersionNumber(split(fn, slash)[end]), G)
+    versions = reverse(sort(versions))
+    versions = filter(v -> v <= _current_plots_version, versions)
+    # @show refdir fn versions
+
+    newdir = joinpath(refdir, string(_current_plots_version))
+    newfn = joinpath(newdir, fn)
+
+    # figure out which reference file we should compare to, by finding the highest versioned file
+    reffn = nothing
+    for v in versions
+        tmpfn = joinpath(refdir, string(v), fn)
+        if isfile(tmpfn)
+            reffn = tmpfn
+            break
+        end
+    end
+
+    # now we have the fn (if any)... do the comparison
+    # @show reffn
+    if reffn == nothing
+        reffn = newfn
+    end
+    # @show reffn
+    # return

    # test function
    func = (fn, idx) -> begin
-        expr = Expr(:block)
-        append!(expr.args, example.exprs)
-        eval(expr)
+        map(eval, example.exprs)
        png(fn)
    end

+    # try
+    #     run(`mkdir -p $newdir`)
+    # catch err
+    #     display(err)
+    # end
+    # # reffn = joinpath(refdir, "ref$idx.png")
+
    # the test
    vtest = VisualTest(func, reffn, idx)
-    test_images(vtest, popup=popup, sigma=sigma, tol=tol, newfn = newfn)
+    test_images(vtest, popup=popup, sigma=sigma, eps=eps, newfn = newfn)
 end

 function image_comparison_facts(pkg::Symbol;
@@ -33,11 +95,11 @@ function image_comparison_facts(pkg::Symbol;
                                only = nothing, # limit to these examples (int index)
                                debug = false,  # print debug information?
                                sigma = [1,1],  # number of pixels to "blur"
-                                tol = 1e-2)     # acceptable error (percent)
+                                eps = 1e-2)     # acceptable error (percent)
  for i in 1:length(Plots._examples)
    i in skip && continue
-    if only === nothing || i in only
-      @test image_comparison_tests(pkg, i, debug=debug, sigma=sigma, tol=tol) |> success == true
+    if only == nothing || i in only
+      @fact image_comparison_tests(pkg, i, debug=debug, sigma=sigma, eps=eps) |> success --> true
    end
  end
 end
@@ -5,11 +5,9 @@ set -ex
 sudo apt-get -qq update
 # sudo apt-get install -y wkhtmltopdf

-sudo apt-get install -y xfonts-75dpi xfonts-base
-wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.2.1/wkhtmltox-0.12.2.1_linux-precise-amd64.deb
-sudo dpkg -i wkhtmltox-0.12.2.1_linux-precise-amd64.deb
-# wget http://download.gna.org/wkhtmltopdf/0.12/0.12.2/wkhtmltox-0.12.2_linux-trusty-amd64.deb
-# sudo dpkg -i wkhtmltox-0.12.2_linux-trusty-amd64.deb
+sudo apt-get install -y xfonts-75dpi
+wget http://download.gna.org/wkhtmltopdf/0.12/0.12.2/wkhtmltox-0.12.2_linux-trusty-amd64.deb
+sudo dpkg -i wkhtmltox-0.12.2_linux-trusty-amd64.deb
 wkhtmltoimage http://www.google.com test.png
 ls

@@ -1,177 +1,131 @@
-import ImageMagick
-using VisualRegressionTests
-using Plots
-using Random
-using Test
-using FileIO
-using Gtk
-using LibGit2
-using GeometryTypes
-using Dates
-
-include("test_pgfplotsx.jl")
-
-reference_dir(args...) = joinpath(homedir(), ".julia", "dev", "PlotReferenceImages", args...)
-
-function reference_file(backend, i, version)
-    refdir = reference_dir("Plots", string(backend))
-    fn = "ref$i.png"
-    versions = sort(VersionNumber.(readdir(refdir)), rev = true)
-
-    reffn = joinpath(refdir, string(version), fn)
-    for v in versions
-        tmpfn = joinpath(refdir, string(v), fn)
-        if isfile(tmpfn)
-            reffn = tmpfn
-            break
-        end
-    end
-
-    return reffn
-end
-
-reference_path(backend, version) = reference_dir("Plots", string(backend), string(version))
-
-if !isdir(reference_dir())
-    mkpath(reference_dir())
-    LibGit2.clone("https://github.com/JuliaPlots/PlotReferenceImages.jl.git", reference_dir())
-end
+module PlotsTests

 include("imgcomp.jl")
+
 # don't actually show the plots
-Random.seed!(1234)
+srand(1234)
 default(show=false, reuse=true)
-is_ci() = get(ENV, "CI", "false") == "true"
-img_tol = is_ci() ? 1e-2 : 1e-3
+img_eps = isinteractive() ? 1e-2 : 10e-2

-## Uncomment the following lines to update reference images for different backends
+# facts("Gadfly") do
+#     @fact gadfly() --> Plots.GadflyBackend()
+#     @fact backend() --> Plots.GadflyBackend()
+#
+#     @fact typeof(plot(1:10)) --> Plots.Plot{Plots.GadflyBackend}
+#     @fact plot(Int[1,2,3], rand(3)) --> not(nothing)
+#     @fact plot(sort(rand(10)), rand(Int, 10, 3)) --> not(nothing)
+#     @fact plot!(rand(10,3), rand(10,3)) --> not(nothing)
+#
+#     image_comparison_facts(:gadfly, skip=[4,6,23,24,27], eps=img_eps)
+# end

-#=
-@testset "GR" begin
-    image_comparison_facts(:gr, tol=img_tol, skip = Plots._backend_skips[:gr])
+facts("PyPlot") do
+    @fact pyplot() --> Plots.PyPlotBackend()
+    @fact backend() --> Plots.PyPlotBackend()
+
+    image_comparison_facts(:pyplot, skip=[25,30], eps=img_eps)
 end

-plotly()
-@testset "Plotly" begin
-    image_comparison_facts(:plotly, tol=img_tol, skip = Plots._backend_skips[:plotlyjs])
-end
+facts("GR") do
+    @fact gr() --> Plots.GRBackend()
+    @fact backend() --> Plots.GRBackend()

-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
-
-    @testset "GR" begin
-        ENV["PLOTS_TEST"] = "true"
-        ENV["GKSwstype"] = "100"
-        @test gr() == Plots.GRBackend()
-        @test backend() == Plots.GRBackend()
-
-        @static if Sys.islinux()
-            image_comparison_facts(:gr, tol=img_tol, skip = Plots._backend_skips[:gr])
-        end
+    if is_linux() && isinteractive()
+        image_comparison_facts(:gr, skip=[2,25,30], eps=img_eps)
    end
-
-    @testset "UnicodePlots" begin
-        @test unicodeplots() == Plots.UnicodePlotsBackend()
-        @test backend() == Plots.UnicodePlotsBackend()
-
-        # lets just make sure it runs without error
-        p = plot(rand(10))
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-        p = bar(randn(10))
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-        p = plot([1, 2], [3, 4])
-        annotate!(p, [(1.5, 3.2, Plots.text("Test", :red, :center))])
-        hline!(p, [3.1])
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-        p = plot([Dates.Date(2019, 1, 1), Dates.Date(2019, 2, 1)], [3, 4])
-        hline!(p, [3.1])
-        annotate!(p, [(Dates.Date(2019, 1, 15), 3.2, Plots.text("Test", :red, :center))])
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-        p = plot([Dates.Date(2019, 1, 1), Dates.Date(2019, 2, 1)], [3, 4])
-        annotate!(p, [(Dates.Date(2019, 1, 15), 3.2, Plots.text("Test", :red, :center))])
-        hline!(p, [3.1])
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-    end
-
 end

-@testset "Axes" begin
+facts("Plotly") do
+    @fact plotly() --> Plots.PlotlyBackend()
+    @fact backend() --> Plots.PlotlyBackend()
+
+    # # until png generation is reliable on OSX, just test on linux
+    # @static is_linux() && image_comparison_facts(:plotly, only=[1,3,4,7,8,9,10,11,12,14,15,20,22,23,27], eps=img_eps)
+end
+
+
+# facts("Immerse") do
+#     @fact immerse() --> Plots.ImmerseBackend()
+#     @fact backend() --> Plots.ImmerseBackend()
+#
+#     # as long as we can plot anything without error, it should be the same as Gadfly
+#     image_comparison_facts(:immerse, only=[1], eps=img_eps)
+# end
+
+
+# facts("PlotlyJS") do
+#     @fact plotlyjs() --> Plots.PlotlyJSBackend()
+#     @fact backend() --> Plots.PlotlyJSBackend()
+#
+#     # as long as we can plot anything without error, it should be the same as Plotly
+#     image_comparison_facts(:plotlyjs, only=[1], eps=img_eps)
+# end
+
+
+facts("UnicodePlots") do
+    @fact unicodeplots() --> Plots.UnicodePlotsBackend()
+    @fact backend() --> Plots.UnicodePlotsBackend()
+
+    # lets just make sure it runs without error
+    @fact isa(plot(rand(10)), Plots.Plot) --> true
+end
+
+
+
+facts("Axes") do
    p = plot()
    axis = p.subplots[1][:xaxis]
-    @test typeof(axis) == Plots.Axis
-    @test Plots.discrete_value!(axis, "HI") == (0.5, 1)
-    @test Plots.discrete_value!(axis, :yo) == (1.5, 2)
-    @test Plots.ignorenan_extrema(axis) == (0.5,1.5)
-    @test axis[:discrete_map] == Dict{Any,Any}(:yo  => 2, "HI" => 1)
+    @fact typeof(axis) --> Plots.Axis
+    @fact Plots.discrete_value!(axis, "HI") --> (0.5, 1)
+    @fact Plots.discrete_value!(axis, :yo) --> (1.5, 2)
+    @fact extrema(axis) --> (0.5,1.5)
+    @fact axis[:discrete_map] --> Dict{Any,Any}(:yo  => 2, "HI" => 1)

    Plots.discrete_value!(axis, ["x$i" for i=1:5])
    Plots.discrete_value!(axis, ["x$i" for i=0:2])
-    @test Plots.ignorenan_extrema(axis) == (0.5, 7.5)
+    @fact extrema(axis) --> (0.5, 7.5)
 end

-@testset "NoFail" begin
-    plots = [histogram([1, 0, 0, 0, 0, 0]),
-             plot([missing]),
-             plot([missing; 1:4]),
-             plot([fill(missing,10); 1:4]),
-             plot([1 1; 1 missing]),
-             plot(["a" "b"; missing "d"], [1 2; 3 4])]
-    for plt in plots
-        display(plt)
-    end
-    @test_nowarn plot(x->x^2,0,2)
-end

-@testset "EmptyAnim" begin
-    anim = @animate for i in []
-    end
+# tests for preprocessing recipes

-    @test_throws ArgumentError gif(anim)
-end
+# facts("recipes") do

-@testset "Segments" begin
-    function segments(args...)
-        segs = UnitRange{Int}[]
-        for seg in iter_segments(args...)
-            push!(segs,seg)
-        end
-        segs
-    end
+    # user recipe

-    nan10 = fill(NaN,10)
-    @test segments(11:20) == [1:10]
-    @test segments([NaN]) == []
-    @test segments(nan10) == []
-    @test segments([nan10; 1:5]) == [11:15]
-    @test segments([1:5;nan10]) == [1:5]
-    @test segments([nan10; 1:5; nan10; 1:5; nan10]) == [11:15, 26:30]
-    @test segments([NaN; 1], 1:10) == [2:2, 4:4, 6:6, 8:8, 10:10]
-    @test segments([nan10; 1:15], [1:15; nan10]) == [11:15]
-end
+    # type T end
+    # @recipe function f(::T)
+    #     line := (3,0.3,:red)
+    #     marker := (20,0.5,:blue,:o)
+    #     bg := :yellow
+    #     rand(10)
+    # end
+    # plot(T())

-@testset "Utils" begin
-    zipped = ([(1,2)], [("a","b")], [(1,"a"),(2,"b")],
-              [(1,2),(3,4)], [(1,2,3),(3,4,5)], [(1,2,3,4),(3,4,5,6)],
-              [(1,2.0),(missing,missing)], [(1,missing),(missing,"a")],
-              [(missing,missing)], [(missing,missing,missing),("a","b","c")])
-    for z in zipped
-        @test isequal(collect(zip(Plots.unzip(z)...)), z)
-        @test isequal(collect(zip(Plots.unzip(GeometryTypes.Point.(z))...)), z)
-    end
-end
+    # plot recipe
+
+    # @recipe function f(::Type{Val{:hiplt}},plt::Plot)
+    #     line := (3,0.3,:red)
+    #     marker := (20,0.5,:blue,:o)
+    #     t := :path
+    #     bg:=:green
+    #     ()
+    # end
+    # plot(rand(10),t=:hiplt)
+
+    # series recipe
+
+    # @recipe function f(::Type{Val{:hi}},x,y,z)
+    #     line := (3,0.3,:red)
+    #     marker := (20,0.5,:blue,:o)
+    #     t := :path
+    #     ()
+    # end
+    # plot(rand(10),t=:hiplt)
+
+# end
+
+
+
+FactCheck.exitstatus()
+end # module
@@ -0,0 +1,36 @@
+import SnoopCompile
+
+### Log the compiles
+# This only needs to be run once (to generate "/tmp/plots_compiles.csv")
+
+# SnoopCompile.@snoop "/tmp/plots_compiles.csv" begin
+#     include(joinpath(dirname(@__FILE__), "runtests.jl"))
+# end
+
+# ----------------------------------------------------------
+
+### Parse the compiles and generate precompilation scripts
+# This can be run repeatedly to tweak the scripts
+
+# IMPORTANT: we must have the module(s) defined for the parcelation
+# step, otherwise we will get no precompiles for the Plots module
+using Plots
+
+data = SnoopCompile.read("/tmp/plots_compiles.csv")
+
+# The Plots tests are run inside a module PlotsTest, so all
+# the precompiles get credited to PlotsTest. Credit them to Plots instead.
+subst = Dict("PlotsTests"=>"Plots")
+
+# Blacklist helps fix problems:
+# - MIME uses type-parameters with symbols like :image/png, which is
+#   not parseable
+blacklist = ["MIME"]
+
+# Use these two lines if you want to create precompile functions for
+# individual packages
+pc, discards = SnoopCompile.parcel(data[end:-1:1,2], subst=subst, blacklist=blacklist)
+SnoopCompile.write("/tmp/precompile", pc)
+
+pdir = joinpath(dirname(@__FILE__), "..")
+run(`cp /tmp/precompile/precompile_Plots.jl $pdir/src/precompile.jl`)
@@ -1,166 +0,0 @@
-using Plots, Test
-pgfplotsx()
-
-function create_plot( args...; kwargs... )
-    pgfx_plot = plot(args...; kwargs...)
-    return pgfx_plot, repr("application/x-tex", pgfx_plot)
-end
-
-function create_plot!( args...; kwargs... )
-    pgfx_plot = plot!(args...; kwargs...)
-    return pgfx_plot, repr("application/x-tex", pgfx_plot)
-end
-
-@testset "PGFPlotsX" begin
-    pgfx_plot = plot(1:5)
-    Plots._update_plot_object(pgfx_plot)
-    @test pgfx_plot.o.the_plot isa PGFPlotsX.TikzDocument
-    @test pgfx_plot.series_list[1].plotattributes[:quiver] === nothing
-    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
-
-        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
@@ -0,0 +1,28 @@
+# Pkg.clone("ImageMagick")
+# Pkg.build("ImageMagick")
+
+# Pkg.clone("GR")
+# Pkg.build("GR")
+
+Pkg.clone("https://github.com/JuliaPlots/PlotReferenceImages.jl.git")
+
+# Pkg.clone("https://github.com/JuliaStats/KernelDensity.jl.git")
+
+Pkg.clone("StatPlots")
+Pkg.checkout("PlotUtils")
+
+# Pkg.clone("https://github.com/JunoLab/Blink.jl.git")
+# Pkg.build("Blink")
+# import Blink
+# Blink.AtomShell.install()
+# Pkg.clone("https://github.com/spencerlyon2/PlotlyJS.jl.git")
+
+# Pkg.checkout("RecipesBase")
+# Pkg.clone("VisualRegressionTests")
+
+# need this to use Conda
+ENV["PYTHON"] = ""
+Pkg.add("PyPlot")
+Pkg.build("PyPlot")
+
+Pkg.test("Plots"; coverage=false)
Author	SHA1	Message	Date
Tom Breloff	25bf71aff2	0.6 fixes	2017-02-21 12:10:38 -05:00
Tom Breloff	33d6c3426a	inline docs for plot	2017-01-18 13:45:02 -05:00
Tom Breloff	9d038ea05e	starting no-conditional reorg; replaced FixedSizeArrays with StaticArrays	2017-01-18 12:08:20 -05:00