_canvas_type in unicodeplots

Implemented legend position in plotly

.gitignore

@@ -4,3 +4,4 @@
 .DS_Store
 examples/.ipynb_checkpoints/*
 examples/meetup/.ipynb_checkpoints/*
+deps/plotly-latest.min.js

.travis.yml

@@ -2,19 +2,58 @@
 language: julia
 os:
   - linux
-  - osx
+  # - osx
 julia:
-  - 0.4
-  #- nightly
+  - 0.5
+matrix:
+  allow_failures:
+    - julia: nightly
+
+# # before install:
+# #   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
+# #   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install wkhtmltopdf; fi
+
+# 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
- - julia -e 'Pkg.clone("https://github.com/tbreloff/Images.jl.git"); Pkg.checkout("Images","tom_imgcompare");'
- - julia -e 'Pkg.clone("ImageMagick"); Pkg.build("ImageMagick")'
- - julia -e 'Pkg.clone("Cairo"); Pkg.build("Cairo")'
- - julia -e 'ENV["PYTHON"] = ""; Pkg.clone("PyPlot"); Pkg.build("PyPlot")'
  - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots")'
- - 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())'
+ - 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())'

NEWS.md

@@ -0,0 +1,406 @@
+
+# Plots.jl NEWS
+
+#### notes on release changes, ongoing development, and future planned work
+
+- 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.9 (current master/dev)
+
+#### 0.9.5
+
+- added dependency on PlotThemes
+- set_theme --> theme
+- remove Compat from REQUIRE
+- warning for DataFrames without StatPlots
+- closeall exported and implemented for gr/pyplot
+- fix DateTime recipe
+- reset theme with theme(:none)
+- fix link_axes! for nested subplots
+- fix plotly lims for log scale
+
+#### 0.9.4
+
+- optimizations surrounding Subplot.series_list
+- better Atom support, support plotlyjs
+- gr:
+    - gks_wstype defaults and gr_set_output
+    - heatmap uses GR.drawimage
+- histogram2d puts NaN for zeros
+- improved support of NaN in heatmaps
+- rebuilt spy recipes to output scatters with marker_z set
+- deprecate png support in plotly... point to plotlyjs
+- fixes:
+    - axis widen with lims set
+    - reset_extrema, setxyz
+    - bar plot widen
+    - better tick padding
+    - consistent tick rotation
+    - consistent aspect_ratio
+    - pyplot dpi
+    - plotly horizontal bars
+    - handle series attributes when combining subplots
+    - gr images transposed
+    - converted Date/DateTime to new type recipe approach for arrays
+- issues closed include: #505 #513 #479 #523 #526 #529
+
+#### 0.9.3
+
+- support pdf and eps in plotlyjs backend
+- allow curly after grid: `@layout [a b; grid(4,4){0.8h}]`
+- add_backend redesign
+
+#### 0.9.2
+
+- glvisualize backend (@SimonDanisch)
+    - too much to list! ready for alpha testing
+- Volume and volume seriestype
+- Atom: support for PlotPane and proper gui display
+- gr:
+    - clims
+    - aspect ratio
+- pgfplots:
+    - fixes for ticks, axes, and more
+- pyplot:
+    - font families
+    - colorbar guide
+    - pixel marker
+- unicodeplots
+    - basic support for shapes
+- improved add_backend
+- refactor of is_supported methods
+- element-wise type recipes (see https://github.com/tbreloff/Plots.jl/issues/460#issuecomment-248428908)
+- several other fixes/improvements
+
+#### 0.9.1
+
+- Pkg.dir --> dirname (@tkelman)
+- `axis = nothing` magic
+- fixes:
+    - clim for line_z
+    - sticks default range for log scale
+    - rotate method
+    - pyplot heatmap
+    - spurious scale warnings
+    - gr image/alpha
+    - plotly.js path
+    - orientation extrema
+    - bar, reset orientation
+- switch transpose_z to use permutedims
+- skinny x/+ markers
+- ticks in pgfplots
+- eps in savefig (@anriseth)
+- add_backend convenience
+- type recipes for Date/DateTime (@maximsch2)
+- mirror attribute and twinx convenience
+- Axis.sp --> Axis.sps
+- recipe postprocessing for allowing aliases and magic args in recipe bodies
+
+
+
+#### 0.9.0
+
+- fixes to cycle
+- add back single function recipe: `plot!(cos)`
+- new axis formatter attribute... accepts functions to convert numbers to strings
+- fix for inset plots
+- GR:
+	- fillrange fix
+	- annotations fix
+	- force double buffering in display
+
+---
+
+## 0.8
+
+#### 0.8.2 (backported bug fixes for julia 0.4)
+
+- plotly ticks fix
+- unicodeplots size fix
+- remove mkdir call in tests
+
+#### 0.8.1
+
+- manual drawing of axes/ticks/labels
+- get_ticks uses optimize_ticks and Showoff
+- changed PLOTS_DEFAULTS to be a global variable, not ENV key
+- parameterized Segments for pushing tuples
+- fix to axis extrema for Bool/nothing
+- GR:
+	- manually draw 2D axes... fixes several issues and missing features
+	- fontsize fix
+- PGFPlots: pass axis syle
+
+#### 0.8.0
+
+- added dependency on PlotUtils
+- BREAKING: removed DataFrames support (now in StatPlots.jl)
+- BREAKING: removed boxplot/violin/density recipes (now in StatPlots.jl)
+- GR:
+    - inline iterm2 support
+    - trisurface support
+    - heatmap fix
+- PyPlot:
+    - ijulia display fix
+- GLVisualize:
+    - first try with shapes
+- iter_segments improvements
+- bar_width support
+- horizontal bars
+- improve tick display
+- better shape handling in pyplot, plotly
+- improved padding calcs
+- internal reorg of _plots method, add pipeline.jl
+
+---
+
+## 0.7
+
+#### 0.7.5
+
+- GR: LaTeX support
+- Changed docs url to juliaplots.github.io
+- added `contourf` seriestype
+- allow `plt[1]` to return first Subplot
+- allow `sp[1]` to return the first Series of the Subplot
+- `series[k]` now passes through to `series.d[k]`
+- allow calling `plot!(sp, ...)` to update a target Subplot
+- PyPlot: zorder fix
+- new DataFrames logic/recipe: more flexible/robust and allow Symbols for:
+	- `(:fillrange, :line_z, :marker_z, :markersize, :ribbon, :weights, :xerror, :yerror)`
+- new `display_type` and `extra_kwargs` plot attributes
+- surface fix
+
+#### 0.7.4
+
+- added snooped precompiles, but left commented out
+- GR fixes: markersize, shapes, legends
+- fixes to recipes
+- turned on Appveyor
+
+#### 0.7.3
+
+- rebuild violin and boxplot recipes
+- "plot recipes"
+- `cgrad` method for easy color gradient creation
+- improvements to inset subplots
+- Segments and iter_segments for NaN-separated vectors
+- `bar` recipe now creates a `shape` series
+- writemime fix for Interact.jl
+- `link = :square` option
+- !!! set `shape` attributes with line/fill, NOT marker/markerstroke !!!
+- basic DPI support
+- moved chorddiagram to PlotRecipes
+- GR:
+	- use temp files for img output
+	- basic support for marker strokes and other marker fixes
+- PyPlot:
+	- Switch to recipes for bar, histogram, histogram2d
+- GLVisualize
+	- subplots
+	- path/scatter and path3d/scatter3d
+	- initial drawing of axes
+- many smaller fixes and improvements
+
+#### 0.7.2
+
+- line_z arg for multicolored line segments
+- pyplot
+	- line_z (2d and 3d)
+	- pushed all fig updates into display pipeline
+	- remove native sticks/hline/vline in favor of recipes
+- unicodeplots cleanup, ijulia fixes, ascii canvas
+- `curves` series type
+- `iter_segments` iterator
+- moved arcdiagram out and into PlotRecipes (thanks @diegozea)
+- several other fixes/checks
+
+#### 0.7.1
+
+- inset (floating) subplots
+- change: when setting subplot/axis args from user recipes, they should apply only to their own subplot
+- trim for violin/boxplot
+- scatter3d recipe
+- removed plotly.js in favor of build.jl download
+- improvements/fixes to pgfplots backend
+- improvements/fixes to plotly/plotlyjs backends
+	- titles are annotations and properly placed with title_position
+	- hover attribute
+	- shapes (almost)
+	- scattergl
+- minimum perimeter logic in layout calc... fixed misaligned subplots
+- new clims attribute
+- more options for test_examples
+- GR refactor
+	- added transparency
+	- moved axis/grid logic out of series loop
+	- generalized 3d and polar projections
+- renamed get_mod to Base.cycle
+- pyplot log scale fixes
+- PLOTS_DEFAULTS environment var processing
+- rename :ellipse to :circle, :ellipse is now an alias
+- supported args/types cleanup
+- seriestype dependency methods and `@deps` macro
+- bbox `h_anchor`/`v_anchor`
+- new axis arg: `:link` is a list of subplots to link axes with
+- cleanup/simplification of glvisualize backend
+
+
+#### 0.7.0
+
+- Check out [the summary](http://juliaplots.github.io/plots_v0.7/)
+- Revamped and simplified internals
+- [Recipes, recipes, recipes](https://github.com/JuliaPlots/RecipesBase.jl/issues/6)
+- [Layouts and Subplots](https://github.com/tbreloff/Plots.jl/issues/60)
+- DataFrames is loaded automatically when installed
+- Overhaul to GroupBy mechanic (now offloads to a recipe)
+- Replaced much of the argument processing with recipes
+- Added series recipes, and began to strip down un-needed backend code.  Some recipes:
+	- line, step, sticks, bar, histogram, histogram2d, boxplot, violin, quiver, errorbars, density, ohlc
+- Added `@shorthands` and `@userplot` macros for recipe convenience
+- Better handling of errorbars and ribbons
+- New Axis type
+	- Tracks extrema and discrete values
+	- New `link_axes` functionality
+- `linetype` has been renamed `seriestype` (the alias is reversed)
+- Many fixes and huge cleanup in GR
+- Brand new subplot layout mechanics:
+	- `@layout` macro
+	- AbstractLayout, Subplot, GridLayout, and everything related
+	- Added dependency on Measures.jl
+	- Computations of axis/guide sizes and precise positioning
+- Refactored and compartmentalized default dictionaries for attributes
+- Deprecated Gadfly and Immerse backends
+- Added `series_annotations` attribute (previously that functionality was merged with `annotations`, which are not series-specific)
+- Removed `axis` attribute... currently not supporting twin (right) y axes
+- Check for `ENV["PLOTS_USE_ATOM_PLOTPANE"]` and default to false
+- Improved backend interface to reduce redundant code.  Template updated.
+- Added `html_output_format`, primarily for choosing between png and svg output in IJulia.
+- Partial support of Julia v0.5
+- Switched testing to dump reference images to JuliaPlots/PlotReferenceImages.jl
+- Moved docs-specific code to new JuliaPlots/PlotDocs.jl
+- Moved example list from ExamplePlots into Plots.
+- Added several examples and improved others.
+- Many other smaller changes and bug fixes.
+
+
+---
+
+## Version 0.6
+
+#### 0.6.2
+
+- `linewidth` fixes
+- `markershape` fix
+- converted center calc to centroid for shapes
+- new dependency on [RecipesBase](https://github.com/JuliaPlots/RecipesBase.jl)
+- REQUIRE upper limit for RecipesBase: 0.0.1
+- GR fixes/improvements (@jheinen)
+  - support `zlims`, `bins`
+  - allow Plots colormaps
+  - other bug fixes
+  - native image support
+- PGFPlots fixes/improvements (@pkofod)
+- DataFrames are handled by recipes
+- Plotly: zaxis, tick rotation, 3d axis fix
+- Improvements in handling discrete data
+- Support for image display
+- `arrow` keyword and support for adding arrows to paths
+- changed quiver recipe to use arrows
+- Bug fixes for boxplots, heatmaps, and more
+
+#### 0.6.1
+
+- `rotation` keyword
+- improved supported graphs
+- subplot bug fix
+
+#### 0.6.0
+
+- `apply_series_recipe` framework for built-in recipes
+- [boxplot/violin recipes](https://github.com/tbreloff/ExamplePlots.jl/blob/master/notebooks/boxplot.ipynb)
+- [errorbar/ribbon recipes](https://github.com/tbreloff/ExamplePlots.jl/blob/master/notebooks/errorbars.ipynb)
+- [quiver recipe](https://github.com/tbreloff/ExamplePlots.jl/blob/master/notebooks/quiver.ipynb)
+- `polar` coordinates
+- better support for shapes and custom polygons (see [batman](https://github.com/tbreloff/ExamplePlots.jl/blob/master/notebooks/batman.ipynb))
+- z-axis keywords
+- 3D indexing overhaul: `push!`, `append!` support
+- matplotlib colormap constants (`:inferno` is the new default colormap for Plots)
+- `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
+- `add_theme`/`set_theme` and ggplot2 theme (see [this issue](https://github.com/tbreloff/Plots.jl/issues/201))
+- `PLOTS_DEFAULT_BACKEND` environment variable
+- `barh` linetype
+- support for non-gridded surfaces with pyplot's trisurface
+- pyplot surface zcolor
+- internal refactor of supported.jl
+- `wrap` method to bypass input processing
+- `translate`, `scale` and `rotate` methods for coordinates and shapes
+- and many more minor fixes and improvements
+
+---
+
+## Version 0.5
+
+#### 0.5.4
+
+- old heatmaps have been renamed to hist2d, and true heatmaps implemented (see https://github.com/tbreloff/Plots.jl/issues/147)
+- lots of reorganization and redesign of the internals
+- lots of renaming to keep to conventions: AbstractPlot, AbstractBackend, etc
+- initial redesign of layouts
+- integration with Atom PlotPane
+- arc diagram and chord diagram (thanks to @diegozea: see https://github.com/tbreloff/Plots.jl/issues/163)
+- work on GR, GLVisualize, and PGFPlots backends (thanks @jheinen @dlfivefifty @pkofod)
+- improvements to Plotly setup (thanks @spencerlyon2)
+- overhaul to series creation logic and groupby mechanic
+- replace Dict with `typealias KW Dict{Symbol,Any}` in many places, also replacing keyword arg splatting
+- new `shape` linetype for plotting polygons in plot-coordinates (see https://github.com/tbreloff/ExamplePlots.jl/blob/master/notebooks/batman.ipynb)
+- many other fixes
+
+#### 0.5.3
+
+- `@gif` macro with `every`/`when` syntax
+- bezier curves and other graph drawing helpers
+- added FixedSizeArrays dependency with relevant functionality
+- merged lots of improvements to GR (thanks @jheinen)
+- `overwrite_figure`/`reuse` arg for reusing the same figure window
+- deprecated Qwt, Winston, and Bokeh backends
+- improved handling of 3D inputs (call `z=rand(10,10); surface(z)` for example)
+- fix IJulia display issue
+- lots of progress on PlotlyJS backend
+- and many other changes and fixes...
+
+#### 0.5.2
+
+- Added [GR.jl](https://github.com/jheinen/GR.jl) as a backend (unfinished but functional) All credit to @jheinen
+- Set defaults within backend calls (i.e. `gadfly(legend=false)`)
+- `abline!`; also extrema allows plotting functions without giving x (i.e. `plot(cos, 0, 10); plot!(sin)`) @pkofod @joshday
+- Integration with [PlotlyJS.jl](https://github.com/spencerlyon2/PlotlyJS.jl) for using Plotly inside a Blink window @spencerlyon2
+- The Plotly backend has been split into my built-in version (`plotly()`) and @spencerlyon2's backend (`plotlyjs()`)
+- Revamped backend setup code for easily adding new backends
+- New docs (WIP) at http://juliaplots.github.io/
+- Overhaul to `:legend` keyword (see https://github.com/tbreloff/Plots.jl/issues/135)
+- New dependency on Requires, allows auto-loading of DataFrames support
+- Support for plotting lists of Tuples and FixedSizeArrays
+- new `@animate` macro for super simple animations (see https://github.com/tbreloff/Plots.jl/issues/111#issuecomment-181515616)
+- allow Function for `:fillrange` and `zcolor` arguments (for example: `scatter(sin, 0:10, marker=15, fill=(cos,0.4), zcolor=sin)`)
+- allow vectors of PlotText without x/y coords (for example: `scatter(rand(10), m=20, ann=map(text, 1:10))`)
+- Lots and lots of fixes
+
+#### 0.5.1
+
+#### 0.5.0
+
+- `with` function for temporary defaults
+- contours
+- basic 3D plotting
+- preliminary support for Bokeh
+- `stroke` and `brush` for more fine-tuned control over visuals
+- smarter "magic" arguments: `line`, `marker`

README.md

@@ -1,8 +1,9 @@
 # Plots
 
 [![Build Status](https://travis-ci.org/tbreloff/Plots.jl.svg?branch=master)](https://travis-ci.org/tbreloff/Plots.jl)
-[![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)
+[![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) -->
 
@@ -10,397 +11,12 @@
 
 Plots is a plotting API and toolset.  My goals with the package are:
 
-- **Intuitive**.  Start generating complex plots without reading volumes of documentation.  Commands should "just work".
+- **Powerful**.  Do more with less.  Complex visualizations become easy.
+- **Intuitive**.  Stop reading so much documentation.  Commands should "just work".
 - **Concise**.  Less code means fewer mistakes and more efficient development/analysis.
 - **Flexible**.  Produce your favorite plots from your favorite package, but quicker and simpler.
-- **Consistent**.  Don't commit to one graphics package.  Use the same code and access the strengths of all backends.
-- **Lightweight**.  Very few dependencies, since backends are loaded and initialized dynamically.
-
-Use the preprocessing pipeline in Plots to fully describe your visualization before it calls the backend code.  This maintains modularity and allows for efficient separation of front end code, algorithms, and backend graphics.  New graphical backends can be added with minimal effort.
-
-Check out the [summary graphs](https://github.com/tbreloff/ExamplePlots.jl/tree/master/img/supported/supported.md) for the features that each backend supports.
-
-Please add wishlist items, bugs, or any other comments/questions to the issues list.
-
-## Examples for each implemented backend:
-
-- [Gadfly.jl/Immerse.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/gadfly_examples.md)
-- [PyPlot.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/pyplot_examples.md)
-- [UnicodePlots.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/unicodeplots_examples.md)
-- [Qwt.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/qwt_examples.md)
-
-Also check out the many [IJulia notebooks](http://nbviewer.ipython.org/github/tbreloff/ExamplePlots.jl/tree/master/examples/) with many examples.
-
-## Installation
-
-First, add the package
-
-```julia
-Pkg.add("Plots")
-
-# if you want the latest features:
-Pkg.checkout("Plots")
-
-# or for the bleeding edge:
-Pkg.checkout("Plots", "dev")
-```
-
-then get any plotting packages you need (obviously, you should get at least one backend).
-
-```julia
-Pkg.add("Gadfly")
-Pkg.add("Immerse")
-Pkg.add("PyPlot")
-Pkg.add("UnicodePlots")
-Pkg.clone("https://github.com/tbreloff/Qwt.jl.git")
-```
-
-## Use
-
-Load it in.  The underlying plotting backends are not imported until `backend()` is called (which happens
-on your first call to `plot` or `subplot`).  This means that you don't need any backends to be installed when you call `using Plots`.
-
-Plots will try to figure out a good default backend for you automatically based on what backends are installed.
-
-```julia
-using Plots
-```
-
-Do a plot in Gadfly (inspired by [this example](http://gadflyjl.org/geom_point.html)), then save a png:
-
-```julia
-gadfly()        # switch to Gadfly as a backend
-dataframes()    # turn on support for DataFrames inputs
-
-# load some data
-using RDatasets
-iris = dataset("datasets", "iris");
-
-# This will bring up a browser window with the plot. Add a semicolon at the end to skip display. 
-scatter(iris, :SepalLength, :SepalWidth, group=:Species, m=([:+ :d :s], 12), smooth=0.99, bg=:black)
-
-# save a png (equivalent to png("gadfly1.png") and savefig("gadfly1.png"))
-png("gadfly1")
-```
-
-![gadfly_plt](img/gadfly1.png)
-
-## API
-
-Call `backend(backend::Symbol)` or the shorthands (`gadfly()`, `qwt()`, `unicodeplots()`, etc) to set the current plotting backend.
-Subsequent commands are converted into the relevant plotting commands for that package:
-
-```julia
-gadfly()
-plot(1:10)    # this effectively calls `y = 1:10; Gadfly.plot(x=1:length(y), y=y)`
-qwt()
-plot(1:10)    # this effectively calls `Qwt.plot(1:10)`
-```
-
-Use `plot` to create a new plot object, and `plot!` to add to an existing one:
-
-```julia
-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`
-```
-
-Now that you know which plot object you're updating (new, current, or other), I'll leave it off for simplicity.
-There are many ways to pass in data to the plot functions... some examples:
-
-- Vector-like (subtypes of AbstractArray{T,1})
-- Matrix-like (subtypes of AbstractArray{T,2})
-- Vectors of Vectors
-- Functions
-- Vectors of Functions
-- DataFrames with column symbols (initialize with `dataframes()`)
-
-In general, you can pass in a `y` only, or an `x` and `y`, both of whatever type(s) you want, and Plots will slice up the data as needed.
-For matrices, data is split by columns.  For functions, data is mapped.  For DataFrames, a Symbol/Symbols in place of x/y will map to
-the relevant column(s).
-
-Here are some example usages... remember you can always use `plot!` to update an existing plot, and that, unless specified, you will update the `current()`.
-
-```julia
-plot()                                    # empty plot object
-plot(4)                                   # initialize with 4 empty series
-plot(rand(10))                            # plot 1 series... x = 1:10
-plot(rand(10,5))                          # plot 5 series... x = 1:10
-plot(rand(10), rand(10))                  # plot 1 series
-plot(rand(10,5), rand(10))                # plot 5 series... y is the same for all
-plot(sin, rand(10))                       # y = sin(x)
-plot(rand(10), sin)                       # same... y = sin(x)
-plot([sin,cos], 0:0.1:π)                  # plot 2 series, sin(x) and cos(x)
-plot([sin,cos], 0, π)                     # plot sin and cos on the range [0, π]
-plot(1:10, Any[rand(10), sin])            # plot 2 series, y = rand(10) for the first, y = sin(x) for the second... x = 1:10 for both
-plot(dataset("Ecdat", "Airline"), :Cost)  # plot from a DataFrame (call `dataframes()` first to import DataFrames and initialize)
-```
-
-All plot methods accept a number of keyword arguments (see the tables below), which follow some rules:
-- Many arguments have aliases which are replaced during preprocessing.  `c` is the same as `color`, `m` is the same as `marker`, etc.  You can choose how verbose you'd like to be.  (see the tables below)
-- There are some special arguments (`xaxis`, `yaxis`, `line`, `marker`, `fill` and the aliases `l`, `m`, `f`) which magically set many related things at once.  (see the __Tip__ below)
-- If the argument is a "matrix-type", then each column will map to a series, cycling through columns if there are fewer columns than series.  Anything else will apply the argument value to every series.
-- Many arguments accept many different types... for example the `color` (also `markercolor`, `fillcolor`, etc) argument will accept strings or symbols with a color name, or any `Colors.Colorant`, or a `ColorScheme`, or a symbol representing a `ColorGradient`, or an AbstractVector of colors/symbols/etc...
-
-You can update certain plot settings after plot creation (not supported on all backends):
-
-```julia
-plot!(title = "New Title", xlabel = "New xlabel", ylabel = "New ylabel")
-plot!(xlims = (0, 5.5), ylims = (-2.2, 6), xticks = 0:0.5:10, yticks = [0,1,5,10])
-
-# using shorthands:
-xaxis!("mylabel", :log10, :flip)
-```
-
-With `subplot`, create multiple plots at once, with flexible layout options:
-
-```julia
-y = rand(100,3)
-subplot(y; n = 3)             # create an automatic grid, and let it figure out the shape
-subplot(y; n = 3, nr = 1)     # create an automatic grid, but fix the number of rows
-subplot(y; n = 3, nc = 1)     # create an automatic grid, but fix the number of columns
-subplot(y; layout = [1, 2])   # explicit layout.  Lists the number of plots in each row
-```
-
-__Tip__: You can call `subplot!(args...; kw...)` to add to an existing subplot.
-
-__Tip__: Calling `subplot!` on a `Plot` object, or `plot!` on a `Subplot` object will throw an error.
-
-Shorthands:
-
-```julia
-scatter(args...; kw...)    = plot(args...; kw...,  linetype = :scatter)
-scatter!(args...; kw...)   = plot!(args...; kw..., linetype = :scatter)
-bar(args...; kw...)        = plot(args...; kw...,  linetype = :bar)
-bar!(args...; kw...)       = plot!(args...; kw..., linetype = :bar)
-histogram(args...; kw...)  = plot(args...; kw...,  linetype = :hist)
-histogram!(args...; kw...) = plot!(args...; kw..., linetype = :hist)
-heatmap(args...; kw...)    = plot(args...; kw...,  linetype = :heatmap)
-heatmap!(args...; kw...)   = plot!(args...; kw..., linetype = :heatmap)
-sticks(args...; kw...)     = plot(args...; kw...,  linetype = :sticks, marker = :ellipse)
-sticks!(args...; kw...)    = plot!(args...; kw..., linetype = :sticks, marker = :ellipse)
-hline(args...; kw...)      = plot(args...; kw...,  linetype = :hline)
-hline!(args...; kw...)     = plot!(args...; kw..., linetype = :hline)
-vline(args...; kw...)      = plot(args...; kw...,  linetype = :vline)
-vline!(args...; kw...)     = plot!(args...; kw..., linetype = :vline)
-ohlc(args...; kw...)       = plot(args...; kw...,  linetype = :ohlc)
-ohlc!(args...; kw...)      = plot!(args...; kw..., linetype = :ohlc)
-
-title!(s::AbstractString)                 = plot!(title = s)
-xlabel!(s::AbstractString)                = plot!(xlabel = s)
-ylabel!(s::AbstractString)                = plot!(ylabel = s)
-xlims!{T<:Real,S<:Real}(lims::Tuple{T,S}) = plot!(xlims = lims)
-ylims!{T<:Real,S<:Real}(lims::Tuple{T,S}) = plot!(ylims = lims)
-xticks!{T<:Real}(v::AVec{T})              = plot!(xticks = v)
-yticks!{T<:Real}(v::AVec{T})              = plot!(yticks = v)
-xflip!(flip::Bool = true)                 = plot!(xflip = flip)
-yflip!(flip::Bool = true)                 = plot!(yflip = flip)
-xaxis!(args...)                           = plot!(xaxis = args)
-yaxis!(args...)                           = plot!(yaxis = args)
-annotate!(anns)                           = plot!(annotation = anns)
-```
-
-### Keyword arguments:
-
-Keyword | Default | Type | Aliases 
----- | ---- | ---- | ----
-`:annotation` | `nothing` | Series | `:ann`, `:annotate`, `:annotations`, `:anns`  
-`:axis` | `left` | Series | `:axiss`  
-`:background_color` | `RGB{U8}(1.0,1.0,1.0)` | Plot | `:background`, `:bg`, `:bg_color`, `:bgcolor`  
-`:color` | `auto` | Series | `:c`, `:colors`  
-`:color_palette` | `auto` | Plot | `:palette`  
-`:fill` | `nothing` | Series | `:area`, `:f`  
-`:fillcolor` | `match` | Series | `:fc`, `:fcolor`, `:fillcolors`  
-`:fillopacity` | `nothing` | Series | `:fillopacitys`, `:fo`  
-`:fillrange` | `nothing` | Series | `:fillranges`, `:fillrng`  
-`:foreground_color` | `auto` | Plot | `:fg`, `:fg_color`, `:fgcolor`, `:foreground`  
-`:grid` | `true` | Plot |   
-`:group` | `nothing` | Series | `:g`, `:groups`  
-`:guidefont` | `Plots.Font("Helvetica",11,:hcenter,:vcenter,0.0,RGB{U8}(0.0,0.0,0.0))` | Plot |   
-`:label` | `AUTO` | Series | `:lab`, `:labels`  
-`:layout` | `nothing` | Plot |   
-`:legend` | `true` | Plot | `:leg`  
-`:legendfont` | `Plots.Font("Helvetica",8,:hcenter,:vcenter,0.0,RGB{U8}(0.0,0.0,0.0))` | Plot |   
-`:line` | `nothing` | Series | `:l`  
-`:lineopacity` | `nothing` | Series | `:lineopacitys`, `:lo`  
-`:linestyle` | `solid` | Series | `:linestyles`, `:ls`, `:s`, `:style`  
-`:linetype` | `path` | Series | `:linetypes`, `:lt`, `:t`, `:type`  
-`:linewidth` | `1` | Series | `:linewidths`, `:lw`, `:w`, `:width`  
-`:link` | `false` | Plot |   
-`:linkfunc` | `nothing` | Plot |   
-`:linkx` | `false` | Plot | `:xlink`  
-`:linky` | `false` | Plot | `:ylink`  
-`:marker` | `nothing` | Series | `:m`, `:mark`  
-`:markercolor` | `match` | Series | `:markercolors`, `:mc`, `:mcolor`  
-`:markeropacity` | `nothing` | Series | `:alpha`, `:markeropacitys`, `:mo`, `:opacity`  
-`:markershape` | `none` | Series | `:markershapes`, `:shape`  
-`:markersize` | `6` | Series | `:markersizes`, `:ms`, `:msize`  
-`:n` | `-1` | Plot |   
-`:nbins` | `100` | Series | `:nb`, `:nbin`, `:nbinss`  
-`:nc` | `-1` | Plot |   
-`:nr` | `-1` | Plot |   
-`:pos` | `(0,0)` | Plot |   
-`:show` | `false` | Plot | `:display`, `:gui`  
-`:size` | `(500,300)` | Plot | `:windowsize`, `:wsize`  
-`:smooth` | `false` | Series | `:reg`, `:regression`, `:smooths`  
-`:tickfont` | `Plots.Font("Helvetica",8,:hcenter,:vcenter,0.0,RGB{U8}(0.0,0.0,0.0))` | Plot |   
-`:title` | `` | Plot |   
-`:windowtitle` | `Plots.jl` | Plot | `:wtitle`  
-`:xaxis` | `nothing` | Plot |   
-`:xflip` | `false` | Plot |   
-`:xlabel` | `` | Plot | `:xlab`  
-`:xlims` | `auto` | Plot | `:xlim`, `:xlimit`, `:xlimits`  
-`:xscale` | `identity` | Plot |   
-`:xticks` | `auto` | Plot | `:xtick`  
-`:yaxis` | `nothing` | Plot |   
-`:yflip` | `false` | Plot |   
-`:ylabel` | `` | Plot | `:ylab`  
-`:ylims` | `auto` | Plot | `:ylim`, `:ylimit`, `:ylimits`  
-`:yrightlabel` | `` | Plot | `:y2lab`, `:y2label`, `:ylab2`, `:ylabel2`, `:ylabelright`, `:ylabr`, `:yrlab`  
-`:yscale` | `identity` | Plot |   
-`:yticks` | `auto` | Plot | `:ytick`  
-`:z` | `nothing` | Series | `:zs`  
-
-
-### Plot types:
-
-Type | Desc | Aliases
----- | ---- | ----
-`:none` | No line | `:n`, `:no`  
-`:line` | Lines with sorted x-axis | `:l`  
-`:path` | Lines | `:p`  
-`:steppre` | Step plot (vertical then horizontal) | `:stepinv`, `:stepinverted`, `:stepsinv`, `:stepsinverted`  
-`:steppost` | Step plot (horizontal then vertical) | `:stair`, `:stairs`, `:step`, `:steps`  
-`:sticks` | Vertical lines | `:stem`, `:stems`  
-`:scatter` | Points, no lines | `:dots`  
-`:heatmap` | Colored regions by density |   
-`:hexbin` | Similar to heatmap |   
-`:hist` | Histogram (doesn't use x) | `:histogram`  
-`:bar` | Bar plot (centered on x values) |   
-`:hline` | Horizontal line (doesn't use x) |   
-`:vline` | Vertical line (doesn't use x) |   
-`:ohlc` | Open/High/Low/Close chart (expects y is AbstractVector{Plots.OHLC}) |   
-
-
-### Line styles:
-
-Type | Aliases
----- | ----
-`:auto` | `:a`  
-`:solid` | `:s`  
-`:dash` | `:d`  
-`:dot` |   
-`:dashdot` | `:dd`  
-`:dashdotdot` | `:ddd`  
-
-
-### Markers:
-
-Type | Aliases
----- | ----
-`:none` | `:n`, `:no`  
-`:auto` | `:a`  
-`:cross` | `:+`, `:plus`  
-`:diamond` | `:d`  
-`:dtriangle` | `:V`, `:downtri`, `:downtriangle`, `:dt`, `:dtri`, `:v`  
-`:ellipse` | `:c`, `:circle`  
-`:heptagon` | `:hep`  
-`:hexagon` | `:h`, `:hex`  
-`:octagon` | `:o`, `:oct`  
-`:pentagon` | `:p`, `:pent`  
-`:rect` | `:r`, `:sq`, `:square`  
-`:star4` |   
-`:star5` | `:s`, `:star`, `:star1`  
-`:star6` |   
-`:star7` |   
-`:star8` | `:s2`, `:star2`  
-`:utriangle` | `:^`, `:uptri`, `:uptriangle`, `:ut`, `:utri`  
-`:xcross` | `:X`, `:x`  
-
-
-__Tip__: With supported backends, you can pass a `Plots.Shape` object for the `marker`/`markershape` arguments.  `Shape` takes a vector of 2-tuples in the constructor, defining the points of the polygon's shape in a unit-scaled coordinate space.  To make a square, for example, you could do `Shape([(1,1),(1,-1),(-1,-1),(-1,1)])`
-
-__Tip__: You can see the default value for a given argument with `default(arg::Symbol)`, and set the default value with `default(arg::Symbol, value)` or `default(; kw...)`.  For example set the default window size and whether we should show a legend with `default(size=(600,400), leg=false)`.
-
-__Tip__: There are some helper arguments you can set:  `xaxis`, `yaxis`, `line`, `marker`, `fill`.  These go through special preprocessing to extract values into individual arguments.  The order doesn't matter, and if you pass a single value it's equivalent to wrapping it in a Tuple.  Examples:
-
-```
-plot(y, xaxis = ("mylabel", :log, :flip, (-1,1)))   # this sets the `xlabel`, `xscale`, `xflip`, and `xlims` arguments automatically
-plot(y, line = (:bar, :blue, :dot, 10))             # this sets the `linetype`, `color`, `linestyle`, and `linewidth` arguments automatically
-plot(y, marker = (:rect, :red, 10))                 # this sets the `markershape`, `markercolor`, and `markersize` arguments automatically
-plot(y, fill = (:green, 10))                        # this sets the `fillcolor` and `fillrange` arguments automatically
-                                                    # Note: `fillrange` can be:
-                                                              a number (fill to horizontal line)
-                                                              a vector of numbers (different for each data point)
-                                                              a tuple of vectors (fill a band)
-```
-
-__Tip__: When plotting multiple lines, you can set all series to use the same value, or pass in a matrix to cycle through values.  Example:
-
-```julia
-plot(rand(100,4); color = [:red RGB(0,0,1)],     # (Matrix) lines 1 and 3 are red, lines 2 and 4 are blue
-                  axis = :auto,                  # lines 1 and 3 are on the left axis, lines 2 and 4 are on the right
-                  markershape = [:rect, :star]   # (Vector) ALL lines are passed the vector [:rect, :star1]
-                  width = 5)                     # all lines have a width of 5
-```
-
-__Tip__: Not all features are supported for each backend, but you can see what's supported by calling the functions: `supportedArgs()`, `supportedAxes()`, `supportedTypes()`, `supportedStyles()`, `supportedMarkers()`, `subplotSupported()`
-
-__Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on backend.  Plotting at the REPL (without semicolon) implicitly calls `gui()`.
-
-### Animations
-
-Animations are created in 3 steps (see example #2):
-- Initialize an `Animation` object.
-- Save each frame of the animation with `frame(anim)`.
-- Convert the frames to an animated gif with `gif(anim, filename, fps=15)`
-
-
-## TODO features:
-
-- [x] Plot vectors/matrices/functions
-- [x] Plot DataFrames
-- [x] Histograms
-- [x] Grouping
-- [x] Annotations
-- [x] Scales
-- [x] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
-- [x] Custom markers
-- [x] Animations
-- [x] Subplots
-- [ ] Contours
-- [ ] Boxplots
-- [ ] 3D plotting
-- [ ] Scenes/Drawing
-- [ ] Graphs
-- [ ] Interactivity (GUIs)
-
-## TODO backends:
-
-- [x] Gadfly.jl
-- [x] Immerse.jl
-- [x] PyPlot.jl
-- [x] UnicodePlots.jl
-- [x] Qwt.jl
-- [x] Winston.jl (deprecated)
-- [ ] GLPlot.jl
-- [ ] Bokeh.jl
-- [ ] Vega.jl
-- [ ] Gaston.jl
-- [ ] Plotly.jl
-- [ ] GoogleCharts.jl
-- [ ] PLplot.jl
-- [ ] TextPlots.jl
-- [ ] ASCIIPlots.jl
-- [ ] Sparklines.jl
-- [ ] Hinton.jl
-- [ ] ImageTerm.jl
-- [ ] GraphViz.jl
-- [ ] TikzGraphs.jl
-- [ ] GraphLayout.jl
-
-## More information on backends (both supported and unsupported)
-
-See the wiki at: https://github.com/JuliaPlot/juliaplot_docs/wiki
-
+- **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).

REQUIRE

@@ -1,5 +1,9 @@
-julia 0.3
+julia 0.5
 
-Colors
+RecipesBase
+PlotUtils
+PlotThemes
 Reexport
-Compat
+FixedSizeArrays
+Measures
+Showoff

appveyor.yml

@@ -1,15 +1,10 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.3/julia-0.3-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.3/julia-0.3-latest-win64.exe"
+  - 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"
 
-branches:
-  only:
-    - master
-    - /release-.*/
-
 notifications:
   - provider: Email
     on_build_success: false
@@ -17,18 +12,21 @@ notifications:
     on_build_status_changed: false
 
 install:
+# 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")
+  - 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:
 # 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\")"
+  - C:\projects\julia\bin\julia -e "versioninfo(); Pkg.clone(pwd(), \"Plots\"); Pkg.build(\"Plots\")"
 
 test_script:
-  - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"Plots\")"
+  # - C:\projects\julia\bin\julia -e "Pkg.test(\"Plots\")"
+  - C:\projects\julia\bin\julia -e "include(Pkg.dir(\"Plots\", \"test\", \"travis_commands.jl\"))"

deps/build.jl

@@ -0,0 +1,8 @@
+
+#TODO: download https://cdn.plot.ly/plotly-latest.min.js to deps/ if it doesn't exist
+
+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

docs/example_generation.jl

@@ -1,383 +0,0 @@
-
-module PlotExamples
-
-using Plots
-using Colors
-using Compat
-
-const DOCDIR = Pkg.dir("Plots") * "/docs"
-const IMGDIR = Pkg.dir("Plots") * "/img"
-
-"""
-Holds all data needed for a documentation example... header, description, and plotting expression (Expr)
-"""
-type PlotExample
-  header::@compat(AbstractString)
-  desc::@compat(AbstractString)
-  exprs::Vector{Expr}
-end
-
-
-
-# the examples we'll run for each
-const examples = PlotExample[
-  PlotExample("Lines",
-              "A simple line plot of the columns.",
-              [
-                :(plot(Plots.fakedata(50,5), w=3))
-              ]),
-  PlotExample("Functions, adding data, and animations",
-              "Plot multiple functions.  You can also put the function first, or use the form `plot(f, xmin, xmax)` where f is a Function or AbstractVector{Function}.\n\nGet series data: `x, y = plt[i]`.  Set series data: `plt[i] = (x,y)`. Add to the series with `push!`/`append!`.\n\nEasily build animations.  (`convert` or `ffmpeg` must be available to generate the animation.)  Use command `gif(anim, filename, fps=15)` to save the animation.",
-              [
-                :(p = plot([sin,cos], zeros(0), leg=false)),
-                :(anim = Animation()),
-                :(for x in linspace(0, 10π, 200)
-                    push!(p, x, Float64[sin(x), cos(x)])
-                    frame(anim)
-                  end)
-              ]),
-  PlotExample("Parametric plots",
-              "Plot function pair (x(u), y(u)).",
-              [
-                :(plot(sin, x->sin(2x), 0, 2π, line=4, leg=false, fill=(0,:orange)))
-              ]),
-  PlotExample("Colors",
-              "Access predefined palettes (or build your own with the `colorscheme` method).  Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set the `z` argument to turn on series gradients.",
-              [
-                :(y = rand(100)),
-                :(plot(0:10:100,rand(11,4),lab="lines",w=3, palette=:grays, fill=(0.5,:auto))),
-                :(scatter!(y, z=abs(y-.5), m=(10,:heat), lab="grad"))
-              ]),
-  PlotExample("Global",
-              "Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow you to pass a tuple or value which will be mapped to the relevant args automatically.  The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`, `yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`",
-              [
-                :(plot(rand(20,3), xaxis=("XLABEL",(-5,30),0:2:20,:flip), background_color = RGB(0.2,0.2,0.2), leg=false)),
-                :(title!("TITLE")),
-                :(yaxis!("YLABEL", :log10))
-              ]),
-  PlotExample("Two-axis",
-              "Use the `axis` arguments.\n\nNote: Currently only supported with Qwt and PyPlot",
-              [
-                :(plot(Vector[randn(100), randn(100)*100], axis = [:l :r], ylabel="LEFT", yrightlabel="RIGHT"))
-              ]),
-  PlotExample("Arguments",
-              "Plot multiple series with different numbers of points.  Mix arguments that apply to all series (marker/markersize) with arguments unique to each series (colors).  Special arguments `line`, `marker`, and `fill` will automatically figure out what arguments to set (for example, we are setting the `linestyle`, `linewidth`, and `color` arguments with `line`.)  Note that we pass a matrix of colors, and this applies the colors to each series.",
-              [
-                :(plot(Vector[rand(10), rand(20)], marker=(:ellipse,8), line=(:dot,3,[:black :orange])))
-              ]),
-  PlotExample("Build plot in pieces",
-              "Start with a base plot...",
-              [
-                :(plot(rand(100)/3, reg=true, fill=(0,:green)))
-              ]),
-  PlotExample("",
-              "and add to it later.",
-              [
-                :(scatter!(rand(100), markersize=6, c=:orange))
-              ]),
-  PlotExample("Heatmaps",
-              "",
-              [
-                :(heatmap(randn(10000),randn(10000), nbins=100))
-              ]),
-  PlotExample("Line types",
-              "",
-              [
-                :(types = intersect(supportedTypes(), [:line, :path, :steppre, :steppost, :sticks, :scatter])'),
-                :(n = length(types)),
-                :(x = Vector[sort(rand(20)) for i in 1:n]),
-                :(y = rand(20,n)),
-                :(plot(x, y, line=(types,3), lab=map(string,types), ms=15))
-              ]),
-  PlotExample("Line styles",
-              "",
-              [
-                :(styles = setdiff(supportedStyles(), [:auto])'),
-                :(plot(cumsum(randn(20,length(styles)),1), style=:auto, label=map(string,styles), w=5))
-              ]),
-  PlotExample("Marker types",
-              "",
-              [
-                :(markers = setdiff(supportedMarkers(), [:none,:auto,Shape])'),
-                :(n = length(markers)),
-                :(x = linspace(0,10,n+2)[2:end-1]),
-                :(y = repmat(reverse(x)', n, 1)),
-                :(scatter(x, y, m=(8,:auto), lab=map(string,markers), bg=:linen))
-              ]),
-  PlotExample("Bar",
-              "x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)",
-              [
-                :(bar(randn(999)))
-              ]),
-  PlotExample("Histogram",
-              "",
-              [
-                :(histogram(randn(1000), nbins=50))
-              ]),
-  PlotExample("Subplots",
-              """
-                subplot and subplot! are distinct commands which create many plots and add series to them in a circular fashion.
-                You can define the layout with keyword params... either set the number of plots `n` (and optionally number of rows `nr` or 
-                number of columns `nc`), or you can set the layout directly with `layout`.
-              """,
-              [
-                :(subplot(randn(100,5), layout=[1,1,3], t=[:line :hist :scatter :step :bar], nbins=10, leg=false))
-              ]),
-  PlotExample("Adding to subplots",
-              "Note here the automatic grid layout, as well as the order in which new series are added to the plots.",
-              [
-                :(subplot(Plots.fakedata(100,10), n=4, palette=[:grays :blues :heat :lightrainbow], bg=[:orange :pink :darkblue :black]))
-              ]),
-  PlotExample("",
-              "",
-              [
-                :(subplot!(Plots.fakedata(100,10)))
-              ]),
-  PlotExample("Open/High/Low/Close",
-              "Create an OHLC chart.  Pass in a vector of OHLC objects as your `y` argument.  Adjust the tick width with arg `markersize`.",
-              [
-                :(n=20),
-                :(hgt=rand(n)+1),
-                :(bot=randn(n)),
-                :(openpct=rand(n)),
-                :(closepct=rand(n)),
-                :(y = [OHLC(openpct[i]*hgt[i]+bot[i], bot[i]+hgt[i], bot[i], closepct[i]*hgt[i]+bot[i]) for i in 1:n]),
-                :(ohlc(y; markersize=8))
-              ]),
-  PlotExample("Annotations",
-              "Currently only text annotations are supported.  Pass in a tuple or vector-of-tuples: (x,y,text).  `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`",
-              [
-                :(y = rand(10)),
-                :(plot(y, ann=(3,y[3],text("this is #3",:left)))),
-                :(annotate!([(5,y[5],text("this is #5",16,:red,:center)),
-                             (10,y[10],text("this is #10",:right,20,"courier"))]))
-              ]),
-  PlotExample("Custom Markers",
-              "A `Plots.Shape` is a light wrapper around vertices of a polygon.  For supported backends, pass arbitrary polygons as the marker shapes.  Note: The center is (0,0) and the size is expected to be rougly the area of the unit circle.",
-              [
-                :(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)])
-                :(plot(0.1:0.2:0.9, 0.7rand(5)+0.15,
-                       l=(3,:dash,:lightblue), 
-                       m=(Shape(verts),30,RGBA(0,0,0,0.2)),
-                       bg=:pink, fg=:darkblue,
-                       xlim = (0,1), ylim=(0,1), leg=false))
-              ])
-  
-]
-
-
-function createStringOfMarkDownCodeValues(arr, prefix = "")
-  string("`", prefix, join(sort(map(string, arr)), "`, `$prefix"), "`")
-end
-createStringOfMarkDownSymbols(arr) = isempty(arr) ? "" : createStringOfMarkDownCodeValues(arr, ":")
-
-
-function generate_markdown(pkgname::Symbol)
-
-  # set up the backend, and don't show the plots by default
-  pkg = backend(pkgname)
-  # default(:show, false)
-
-  # mkdir if necessary
-  try
-    mkdir("$IMGDIR/$pkgname")
-  end
-
-  # open the markdown file
-  md = open("$DOCDIR/$(pkgname)_examples.md", "w")
-
-  write(md, "## Examples for backend: $pkgname\n\n")
-
-  write(md, "### Initialize\n\n```julia\nusing Plots\n$(pkgname)()\n```\n\n")
-
-
-  for (i,example) in enumerate(examples)
-
-    try
-
-      # we want to always produce consistent results
-      srand(1234)
-
-      # run the code
-      map(eval, example.exprs)
-
-      # # save the png
-      # imgname = "$(pkgname)_example_$i.png"
-
-      # NOTE: uncomment this to overwrite the images as well
-      if i == 2
-        imgname = "$(pkgname)_example_$i.gif"
-        gif(anim, "$IMGDIR/$pkgname/$imgname", fps=15)
-      else
-        imgname = "$(pkgname)_example_$i.png"
-        png("$IMGDIR/$pkgname/$imgname")
-      end
-
-      # write out the header, description, code block, and image link
-      write(md, "### $(example.header)\n\n")
-      write(md, "$(example.desc)\n\n")
-      write(md, "```julia\n$(join(map(string, example.exprs), "\n"))\n```\n\n")
-      write(md, "![](../img/$pkgname/$imgname)\n\n")
-
-    catch ex
-      # TODO: put error info into markdown?
-      warn("Example $pkgname:$i failed with: $ex")
-    end
-
-    #
-  end
-
-  write(md, "- Supported arguments: $(createStringOfMarkDownCodeValues(supportedArgs(pkg)))\n")
-  write(md, "- Supported values for axis: $(createStringOfMarkDownSymbols(supportedAxes(pkg)))\n")
-  write(md, "- Supported values for linetype: $(createStringOfMarkDownSymbols(supportedTypes(pkg)))\n")
-  write(md, "- Supported values for linestyle: $(createStringOfMarkDownSymbols(supportedStyles(pkg)))\n")
-  write(md, "- Supported values for marker: $(createStringOfMarkDownSymbols(supportedMarkers(pkg)))\n")
-  write(md, "- Is `subplot`/`subplot!` supported? $(subplotSupported(pkg) ? "Yes" : "No")\n\n")
-
-  write(md, "(Automatically generated: $(now()))")
-  close(md)
-
-end
-
-
-# make and display one plot
-function test_examples(pkgname::Symbol, idx::Int; debug = true)
-  Plots._debugMode.on = debug
-  println("Testing plot: $pkgname:$idx:$(examples[idx].header)")
-  backend(pkgname)
-  backend()
-  map(eval, examples[idx].exprs)
-  plt = current()
-  gui(plt)
-  plt
-end
-
-# generate all plots and create a dict mapping idx --> plt
-function test_examples(pkgname::Symbol; debug = false)
-  Plots._debugMode.on = debug
-  plts = Dict()
-  for i in 1:length(examples)
-    # if examples[i].header == "Subplots" && !subplotSupported()
-    #   break
-    # end
-
-    try
-      plt = test_examples(pkgname, i, debug=debug)
-      plts[i] = plt
-    catch ex
-      # TODO: put error info into markdown?
-      warn("Example $pkgname:$i:$(examples[i].header) failed with: $ex")
-    end
-  end
-  plts
-end
-
-# axis            # :left or :right
-# color           # can be a string ("red") or a symbol (:red) or a ColorsTypes.jl 
-#                 #   Colorant (RGB(1,0,0)) or :auto (which lets the package pick)
-# label           # string or symbol, applies to that line, may go in a legend
-# width           # width of a line
-# linetype        # :line, :step, :stepinverted, :sticks, :scatter, :none, :heatmap, :hexbin, :hist, :bar
-# linestyle       # :solid, :dash, :dot, :dashdot, :dashdotdot
-# marker          # :none, :ellipse, :rect, :diamond, :utriangle, :dtriangle,
-#                 #   :cross, :xcross, :star1, :star2, :hexagon
-# markercolor     # same choices as `color`, or :match will set the color to be the same as `color`
-# markersize      # size of the marker
-# nbins           # number of bins for heatmap/hexbin and histograms
-# heatmap_c       # color cutoffs for Qwt heatmaps
-# fill          # fill value for area plots
-# title           # string or symbol, title of the plot
-# xlabel          # string or symbol, label on the bottom (x) axis
-# ylabel          # string or symbol, label on the left (y) axis
-# yrightlabel     # string or symbol, label on the right (y) axis
-# reg             # true or false, add a regression line for each line
-# size            # (Int,Int), resize the enclosing window
-# pos             # (Int,Int), move the enclosing window to this position
-# windowtitle     # string or symbol, set the title of the enclosing windowtitle
-# screen          # Integer, move enclosing window to this screen number (for multiscreen desktops)
-
-
-
-@compat const _ltdesc = Dict(
-    :none => "No line",
-    :line => "Lines with sorted x-axis",
-    :path => "Lines",
-    :steppre => "Step plot (vertical then horizontal)",
-    :steppost => "Step plot (horizontal then vertical)",
-    :sticks => "Vertical lines",
-    :scatter => "Points, no lines",
-    :heatmap => "Colored regions by density",
-    :hexbin => "Similar to heatmap",
-    :hist => "Histogram (doesn't use x)",
-    :bar => "Bar plot (centered on x values)",
-    :hline => "Horizontal line (doesn't use x)",
-    :vline => "Vertical line (doesn't use x)",
-    :ohlc => "Open/High/Low/Close chart (expects y is AbstractVector{Plots.OHLC})",
-  )
-
-function buildReadme()
-  readme = readall("$DOCDIR/readme_template.md")
-
-  # build keyword arg table
-  table = "Keyword | Default | Type | Aliases \n---- | ---- | ---- | ----\n"
-  allseries = merge(Plots._seriesDefaults, @compat(Dict(:line=>nothing, :marker=>nothing, :fill=>nothing)))
-  allplots = merge(Plots._plotDefaults, @compat(Dict(:xaxis=>nothing, :yaxis=>nothing)))
-  alldefs = merge(allseries, allplots)
-  for k in Plots.sortedkeys(alldefs)
-  # for d in (Plots._seriesDefaults, Plots._plotDefaults)
-  #   for k in Plots.sortedkeys(d)
-    aliasstr = createStringOfMarkDownSymbols(aliases(Plots._keyAliases, k))
-    table = string(table, "`:$k` | `$(alldefs[k])` | $(haskey(allseries,k) ? "Series" : "Plot") | $aliasstr  \n")
-    # end
-  end
-  readme = replace(readme, "[[KEYWORD_ARGS_TABLE]]", table)
-
-  # build linetypes table
-  table = "Type | Desc | Aliases\n---- | ---- | ----\n"
-  for lt in Plots._allTypes
-    aliasstr = createStringOfMarkDownSymbols(aliases(Plots._typeAliases, lt))
-    table = string(table, "`:$lt` | $(_ltdesc[lt]) | $aliasstr  \n")
-  end
-  readme = replace(readme, "[[LINETYPES_TABLE]]", table)
-
-  # build linestyles table
-  table = "Type | Aliases\n---- | ----\n"
-  for s in Plots._allStyles
-    aliasstr = createStringOfMarkDownSymbols(aliases(Plots._styleAliases, s))
-    table = string(table, "`:$s` | $aliasstr  \n")
-  end
-  readme = replace(readme, "[[LINESTYLES_TABLE]]", table)
-
-  # build markers table
-  table = "Type | Aliases\n---- | ----\n"
-  for s in Plots._allMarkers
-    aliasstr = createStringOfMarkDownSymbols(aliases(Plots._markerAliases, s))
-    table = string(table, "`:$s` | $aliasstr  \n")
-  end
-  readme = replace(readme, "[[MARKERS_TABLE]]", table)
-
-  readme_fn = Pkg.dir("Plots") * "/README.md"
-  f = open(readme_fn, "w")
-  write(f, readme)
-  close(f)
-
-  gadfly()
-  Plots.dumpSupportGraphs()
-end
-
-default(size=(500,300))
-
-# run it!
-# note: generate separately so it's easy to comment out
-# @osx_only generate_markdown(:unicodeplots)
-# generate_markdown(:qwt)
-# generate_markdown(:gadfly)
-# generate_markdown(:pyplot)
-# generate_markdown(:immerse)
-# generate_markdown(:winston)
-
-
-end # module
-

docs/readme_template.md

@@ -1,304 +0,0 @@
-# Plots
-
-[![Build Status](https://travis-ci.org/tbreloff/Plots.jl.svg?branch=master)](https://travis-ci.org/tbreloff/Plots.jl)
-[![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) -->
-
-#### Author: Thomas Breloff (@tbreloff)
-
-Plots is a plotting API and toolset.  My goals with the package are:
-
-- **Intuitive**.  Start generating complex plots without reading volumes of documentation.  Commands should "just work".
-- **Concise**.  Less code means fewer mistakes and more efficient development/analysis.
-- **Flexible**.  Produce your favorite plots from your favorite package, but quicker and simpler.
-- **Consistent**.  Don't commit to one graphics package.  Use the same code and access the strengths of all backends.
-- **Lightweight**.  Very few dependencies, since backends are loaded and initialized dynamically.
-
-Use the preprocessing pipeline in Plots to fully describe your visualization before it calls the backend code.  This maintains modularity and allows for efficient separation of front end code, algorithms, and backend graphics.  New graphical backends can be added with minimal effort.
-
-Check out the [summary graphs](https://github.com/tbreloff/ExamplePlots.jl/tree/master/img/supported/supported.md) for the features that each backend supports.
-
-Please add wishlist items, bugs, or any other comments/questions to the issues list.
-
-## Examples for each implemented backend:
-
-- [Gadfly.jl/Immerse.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/gadfly_examples.md)
-- [PyPlot.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/pyplot_examples.md)
-- [UnicodePlots.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/unicodeplots_examples.md)
-- [Qwt.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/qwt_examples.md)
-
-Also check out the many [IJulia notebooks](http://nbviewer.ipython.org/github/tbreloff/ExamplePlots.jl/tree/master/examples/) with many examples.
-
-## Installation
-
-First, add the package
-
-```julia
-Pkg.add("Plots")
-
-# if you want the latest features:
-Pkg.checkout("Plots")
-
-# or for the bleeding edge:
-Pkg.checkout("Plots", "dev")
-```
-
-then get any plotting packages you need (obviously, you should get at least one backend).
-
-```julia
-Pkg.add("Gadfly")
-Pkg.add("Immerse")
-Pkg.add("PyPlot")
-Pkg.add("UnicodePlots")
-Pkg.clone("https://github.com/tbreloff/Qwt.jl.git")
-```
-
-## Use
-
-Load it in.  The underlying plotting backends are not imported until `backend()` is called (which happens
-on your first call to `plot` or `subplot`).  This means that you don't need any backends to be installed when you call `using Plots`.
-
-Plots will try to figure out a good default backend for you automatically based on what backends are installed.
-
-```julia
-using Plots
-```
-
-Do a plot in Gadfly (inspired by [this example](http://gadflyjl.org/geom_point.html)), then save a png:
-
-```julia
-gadfly()        # switch to Gadfly as a backend
-dataframes()    # turn on support for DataFrames inputs
-
-# load some data
-using RDatasets
-iris = dataset("datasets", "iris");
-
-# This will bring up a browser window with the plot. Add a semicolon at the end to skip display. 
-scatter(iris, :SepalLength, :SepalWidth, group=:Species, m=([:+ :d :s], 12), smooth=0.99, bg=:black)
-
-# save a png (equivalent to png("gadfly1.png") and savefig("gadfly1.png"))
-png("gadfly1")
-```
-
-![gadfly_plt](img/gadfly1.png)
-
-## API
-
-Call `backend(backend::Symbol)` or the shorthands (`gadfly()`, `qwt()`, `unicodeplots()`, etc) to set the current plotting backend.
-Subsequent commands are converted into the relevant plotting commands for that package:
-
-```julia
-gadfly()
-plot(1:10)    # this effectively calls `y = 1:10; Gadfly.plot(x=1:length(y), y=y)`
-qwt()
-plot(1:10)    # this effectively calls `Qwt.plot(1:10)`
-```
-
-Use `plot` to create a new plot object, and `plot!` to add to an existing one:
-
-```julia
-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`
-```
-
-Now that you know which plot object you're updating (new, current, or other), I'll leave it off for simplicity.
-There are many ways to pass in data to the plot functions... some examples:
-
-- Vector-like (subtypes of AbstractArray{T,1})
-- Matrix-like (subtypes of AbstractArray{T,2})
-- Vectors of Vectors
-- Functions
-- Vectors of Functions
-- DataFrames with column symbols (initialize with `dataframes()`)
-
-In general, you can pass in a `y` only, or an `x` and `y`, both of whatever type(s) you want, and Plots will slice up the data as needed.
-For matrices, data is split by columns.  For functions, data is mapped.  For DataFrames, a Symbol/Symbols in place of x/y will map to
-the relevant column(s).
-
-Here are some example usages... remember you can always use `plot!` to update an existing plot, and that, unless specified, you will update the `current()`.
-
-```julia
-plot()                                    # empty plot object
-plot(4)                                   # initialize with 4 empty series
-plot(rand(10))                            # plot 1 series... x = 1:10
-plot(rand(10,5))                          # plot 5 series... x = 1:10
-plot(rand(10), rand(10))                  # plot 1 series
-plot(rand(10,5), rand(10))                # plot 5 series... y is the same for all
-plot(sin, rand(10))                       # y = sin(x)
-plot(rand(10), sin)                       # same... y = sin(x)
-plot([sin,cos], 0:0.1:π)                  # plot 2 series, sin(x) and cos(x)
-plot([sin,cos], 0, π)                     # plot sin and cos on the range [0, π]
-plot(1:10, Any[rand(10), sin])            # plot 2 series, y = rand(10) for the first, y = sin(x) for the second... x = 1:10 for both
-plot(dataset("Ecdat", "Airline"), :Cost)  # plot from a DataFrame (call `dataframes()` first to import DataFrames and initialize)
-```
-
-All plot methods accept a number of keyword arguments (see the tables below), which follow some rules:
-- Many arguments have aliases which are replaced during preprocessing.  `c` is the same as `color`, `m` is the same as `marker`, etc.  You can choose how verbose you'd like to be.  (see the tables below)
-- There are some special arguments (`xaxis`, `yaxis`, `line`, `marker`, `fill` and the aliases `l`, `m`, `f`) which magically set many related things at once.  (see the __Tip__ below)
-- If the argument is a "matrix-type", then each column will map to a series, cycling through columns if there are fewer columns than series.  Anything else will apply the argument value to every series.
-- Many arguments accept many different types... for example the `color` (also `markercolor`, `fillcolor`, etc) argument will accept strings or symbols with a color name, or any `Colors.Colorant`, or a `ColorScheme`, or a symbol representing a `ColorGradient`, or an AbstractVector of colors/symbols/etc...
-
-You can update certain plot settings after plot creation (not supported on all backends):
-
-```julia
-plot!(title = "New Title", xlabel = "New xlabel", ylabel = "New ylabel")
-plot!(xlims = (0, 5.5), ylims = (-2.2, 6), xticks = 0:0.5:10, yticks = [0,1,5,10])
-
-# using shorthands:
-xaxis!("mylabel", :log10, :flip)
-```
-
-With `subplot`, create multiple plots at once, with flexible layout options:
-
-```julia
-y = rand(100,3)
-subplot(y; n = 3)             # create an automatic grid, and let it figure out the shape
-subplot(y; n = 3, nr = 1)     # create an automatic grid, but fix the number of rows
-subplot(y; n = 3, nc = 1)     # create an automatic grid, but fix the number of columns
-subplot(y; layout = [1, 2])   # explicit layout.  Lists the number of plots in each row
-```
-
-__Tip__: You can call `subplot!(args...; kw...)` to add to an existing subplot.
-
-__Tip__: Calling `subplot!` on a `Plot` object, or `plot!` on a `Subplot` object will throw an error.
-
-Shorthands:
-
-```julia
-scatter(args...; kw...)    = plot(args...; kw...,  linetype = :scatter)
-scatter!(args...; kw...)   = plot!(args...; kw..., linetype = :scatter)
-bar(args...; kw...)        = plot(args...; kw...,  linetype = :bar)
-bar!(args...; kw...)       = plot!(args...; kw..., linetype = :bar)
-histogram(args...; kw...)  = plot(args...; kw...,  linetype = :hist)
-histogram!(args...; kw...) = plot!(args...; kw..., linetype = :hist)
-heatmap(args...; kw...)    = plot(args...; kw...,  linetype = :heatmap)
-heatmap!(args...; kw...)   = plot!(args...; kw..., linetype = :heatmap)
-sticks(args...; kw...)     = plot(args...; kw...,  linetype = :sticks, marker = :ellipse)
-sticks!(args...; kw...)    = plot!(args...; kw..., linetype = :sticks, marker = :ellipse)
-hline(args...; kw...)      = plot(args...; kw...,  linetype = :hline)
-hline!(args...; kw...)     = plot!(args...; kw..., linetype = :hline)
-vline(args...; kw...)      = plot(args...; kw...,  linetype = :vline)
-vline!(args...; kw...)     = plot!(args...; kw..., linetype = :vline)
-ohlc(args...; kw...)       = plot(args...; kw...,  linetype = :ohlc)
-ohlc!(args...; kw...)      = plot!(args...; kw..., linetype = :ohlc)
-
-title!(s::AbstractString)                 = plot!(title = s)
-xlabel!(s::AbstractString)                = plot!(xlabel = s)
-ylabel!(s::AbstractString)                = plot!(ylabel = s)
-xlims!{T<:Real,S<:Real}(lims::Tuple{T,S}) = plot!(xlims = lims)
-ylims!{T<:Real,S<:Real}(lims::Tuple{T,S}) = plot!(ylims = lims)
-xticks!{T<:Real}(v::AVec{T})              = plot!(xticks = v)
-yticks!{T<:Real}(v::AVec{T})              = plot!(yticks = v)
-xflip!(flip::Bool = true)                 = plot!(xflip = flip)
-yflip!(flip::Bool = true)                 = plot!(yflip = flip)
-xaxis!(args...)                           = plot!(xaxis = args)
-yaxis!(args...)                           = plot!(yaxis = args)
-annotate!(anns)                           = plot!(annotation = anns)
-```
-
-### Keyword arguments:
-
-[[KEYWORD_ARGS_TABLE]]
-
-### Plot types:
-
-[[LINETYPES_TABLE]]
-
-### Line styles:
-
-[[LINESTYLES_TABLE]]
-
-### Markers:
-
-[[MARKERS_TABLE]]
-
-__Tip__: With supported backends, you can pass a `Plots.Shape` object for the `marker`/`markershape` arguments.  `Shape` takes a vector of 2-tuples in the constructor, defining the points of the polygon's shape in a unit-scaled coordinate space.  To make a square, for example, you could do `Shape([(1,1),(1,-1),(-1,-1),(-1,1)])`
-
-__Tip__: You can see the default value for a given argument with `default(arg::Symbol)`, and set the default value with `default(arg::Symbol, value)` or `default(; kw...)`.  For example set the default window size and whether we should show a legend with `default(size=(600,400), leg=false)`.
-
-__Tip__: There are some helper arguments you can set:  `xaxis`, `yaxis`, `line`, `marker`, `fill`.  These go through special preprocessing to extract values into individual arguments.  The order doesn't matter, and if you pass a single value it's equivalent to wrapping it in a Tuple.  Examples:
-
-```
-plot(y, xaxis = ("mylabel", :log, :flip, (-1,1)))   # this sets the `xlabel`, `xscale`, `xflip`, and `xlims` arguments automatically
-plot(y, line = (:bar, :blue, :dot, 10))             # this sets the `linetype`, `color`, `linestyle`, and `linewidth` arguments automatically
-plot(y, marker = (:rect, :red, 10))                 # this sets the `markershape`, `markercolor`, and `markersize` arguments automatically
-plot(y, fill = (:green, 10))                        # this sets the `fillcolor` and `fillrange` arguments automatically
-                                                    # Note: `fillrange` can be:
-                                                              a number (fill to horizontal line)
-                                                              a vector of numbers (different for each data point)
-                                                              a tuple of vectors (fill a band)
-```
-
-__Tip__: When plotting multiple lines, you can set all series to use the same value, or pass in a matrix to cycle through values.  Example:
-
-```julia
-plot(rand(100,4); color = [:red RGB(0,0,1)],     # (Matrix) lines 1 and 3 are red, lines 2 and 4 are blue
-                  axis = :auto,                  # lines 1 and 3 are on the left axis, lines 2 and 4 are on the right
-                  markershape = [:rect, :star]   # (Vector) ALL lines are passed the vector [:rect, :star1]
-                  width = 5)                     # all lines have a width of 5
-```
-
-__Tip__: Not all features are supported for each backend, but you can see what's supported by calling the functions: `supportedArgs()`, `supportedAxes()`, `supportedTypes()`, `supportedStyles()`, `supportedMarkers()`, `subplotSupported()`
-
-__Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on backend.  Plotting at the REPL (without semicolon) implicitly calls `gui()`.
-
-### Animations
-
-Animations are created in 3 steps (see example #2):
-- Initialize an `Animation` object.
-- Save each frame of the animation with `frame(anim)`.
-- Convert the frames to an animated gif with `gif(anim, filename, fps=15)`
-
-
-## TODO features:
-
-- [x] Plot vectors/matrices/functions
-- [x] Plot DataFrames
-- [x] Histograms
-- [x] Grouping
-- [x] Annotations
-- [x] Scales
-- [x] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
-- [x] Custom markers
-- [x] Animations
-- [x] Subplots
-- [ ] Contours
-- [ ] Boxplots
-- [ ] 3D plotting
-- [ ] Scenes/Drawing
-- [ ] Graphs
-- [ ] Interactivity (GUIs)
-
-## TODO backends:
-
-- [x] Gadfly.jl
-- [x] Immerse.jl
-- [x] PyPlot.jl
-- [x] UnicodePlots.jl
-- [x] Qwt.jl
-- [x] Winston.jl (deprecated)
-- [ ] GLPlot.jl
-- [ ] Bokeh.jl
-- [ ] Vega.jl
-- [ ] Gaston.jl
-- [ ] Plotly.jl
-- [ ] GoogleCharts.jl
-- [ ] PLplot.jl
-- [ ] TextPlots.jl
-- [ ] ASCIIPlots.jl
-- [ ] Sparklines.jl
-- [ ] Hinton.jl
-- [ ] ImageTerm.jl
-- [ ] GraphViz.jl
-- [ ] TikzGraphs.jl
-- [ ] GraphLayout.jl
-
-## More information on backends (both supported and unsupported)
-
-See the wiki at: https://github.com/JuliaPlot/juliaplot_docs/wiki
-
-

img/supported/supported.md

@@ -1,23 +0,0 @@
-## Supported keyword arguments
-
-![args](Plots.supportGraphArgs.png)
-
-## Supported plot types
-
-![types](Plots.supportGraphTypes.png)
-
-## Supported markers
-
-![markers](Plots.supportGraphMarkers.png)
-
-## Supported line styles
-
-![styles](Plots.supportGraphStyles.png)
-
-## Supported scales
-
-![scales](Plots.supportGraphScales.png)
-
-## Supported axes
-
-![axes](Plots.supportGraphAxes.png)

src/Plots.jl

@@ -1,150 +1,186 @@
 
-if VERSION >= v"0.4-"
-  __precompile__()
-end
-
 module Plots
 
-using Compat
 using Reexport
-@reexport using Colors
+using FixedSizeArrays
+@reexport using RecipesBase
+using Base.Meta
+@reexport using PlotUtils
+@reexport using PlotThemes
+import Showoff
 
 export
-  plot,
-  plot!,
-  # plot_display,
-  # plot_display!,
-  subplot,
-  subplot!,
+    grid,
+    bbox,
+    plotarea,
+    @layout,
+    KW,
 
-  current,
-  default,
-  
-  scatter,
-  scatter!,
-  bar,
-  bar!,
-  histogram,
-  histogram!,
-  heatmap,
-  heatmap!,
-  sticks,
-  sticks!,
-  hline,
-  hline!,
-  vline,
-  vline!,
-  ohlc,
-  ohlc!,
+    wrap,
+    theme,
 
-  title!,
-  xlabel!,
-  ylabel!,
-  xlims!,
-  ylims!,
-  xticks!,
-  yticks!,
-  annotate!,
-  xflip!,
-  yflip!,
-  xaxis!,
-  yaxis!,
+    plot,
+    plot!,
+    attr!,
 
-  savefig,
-  png,
-  gui,
+    current,
+    default,
+    with,
+    twinx,
 
-  backend,
-  backends,
-  aliases,
-  dataframes,
+    @userplot,
+    @shorthands,
 
-  Shape,
-  text,
-  font,
-  OHLC,
+    pie,
+    pie!,
+    plot3d,
+    plot3d!,
 
-  colorscheme,
-  ColorScheme,
-  ColorGradient,
-  ColorVector,
-  ColorWrapper,
-  ColorFunction,
-  ColorZFunction,
-  getColor,
-  getColorZ,
+    title!,
+    xlabel!,
+    ylabel!,
+    xlims!,
+    ylims!,
+    zlims!,
+    xticks!,
+    yticks!,
+    annotate!,
+    xflip!,
+    yflip!,
+    xaxis!,
+    yaxis!,
 
-  debugplots,
+    xlims,
+    ylims,
+    zlims,
 
-  supportedArgs,
-  supportedAxes,
-  supportedTypes,
-  supportedStyles,
-  supportedMarkers,
-  subplotSupported,
+    savefig,
+    png,
+    gui,
+    closeall,
 
-  Animation,
-  frame,
-  gif,
+    backend,
+    backends,
+    backend_name,
+    backend_object,
+    add_backend,
+    aliases,
 
-  # recipes
-  PlotRecipe,
-  EllipseRecipe,
-  spy,
-  corrplot
+    Shape,
+    text,
+    font,
+    stroke,
+    brush,
+    Surface,
+    OHLC,
+    arrow,
+    Segments,
+    Formatted,
+
+    Animation,
+    frame,
+    gif,
+    animate,
+    @animate,
+    @gif,
+
+    test_examples,
+    iter_segments,
+    coords,
+
+    translate,
+    translate!,
+    rotate,
+    rotate!,
+    center,
+    P2,
+    P3,
+    BezierCurve
 
 # ---------------------------------------------------------
 
-
-const IMG_DIR = Pkg.dir("Plots") * "/img/"
-
+import Measures
+import Measures: Length, AbsoluteLength, Measure, BoundingBox, mm, cm, inch, pt, width, height, w, h
+typealias BBox Measures.Absolute2DBox
+export BBox, BoundingBox, mm, cm, inch, pt, px, pct, w, h
 
 # ---------------------------------------------------------
 
 include("types.jl")
 include("utils.jl")
-include("colors.jl")
-include("plotter.jl")
+include("components.jl")
+include("axes.jl")
 include("args.jl")
+include("backends.jl")
+include("themes.jl")
 include("plot.jl")
-include("subplot.jl")
+include("pipeline.jl")
+include("series.jl")
+include("layouts.jl")
+include("subplots.jl")
 include("recipes.jl")
 include("animation.jl")
 include("output.jl")
+include("examples.jl")
+include("arg_desc.jl")
 
 
 # ---------------------------------------------------------
 
-scatter(args...; kw...)    = plot(args...; kw...,  linetype = :scatter)
-scatter!(args...; kw...)   = plot!(args...; kw..., linetype = :scatter)
-bar(args...; kw...)        = plot(args...; kw...,  linetype = :bar)
-bar!(args...; kw...)       = plot!(args...; kw..., linetype = :bar)
-histogram(args...; kw...)  = plot(args...; kw...,  linetype = :hist)
-histogram!(args...; kw...) = plot!(args...; kw..., linetype = :hist)
-heatmap(args...; kw...)    = plot(args...; kw...,  linetype = :heatmap)
-heatmap!(args...; kw...)   = plot!(args...; kw..., linetype = :heatmap)
-sticks(args...; kw...)     = plot(args...; kw...,  linetype = :sticks, marker = :ellipse)
-sticks!(args...; kw...)    = plot!(args...; kw..., linetype = :sticks, marker = :ellipse)
-hline(args...; kw...)      = plot(args...; kw...,  linetype = :hline)
-hline!(args...; kw...)     = plot!(args...; kw..., linetype = :hline)
-vline(args...; kw...)      = plot(args...; kw...,  linetype = :vline)
-vline!(args...; kw...)     = plot!(args...; kw..., linetype = :vline)
-ohlc(args...; kw...)       = plot(args...; kw...,  linetype = :ohlc)
-ohlc!(args...; kw...)      = plot!(args...; kw..., linetype = :ohlc)
+# 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::@compat(AbstractString); kw...)                 = plot!(; title = s, kw...)
-xlabel!(s::@compat(AbstractString); kw...)                = plot!(; xlabel = s, kw...)
-ylabel!(s::@compat(AbstractString); kw...)                = plot!(; ylabel = s, kw...)
-xlims!{T<:Real,S<:Real}(lims::@compat(Tuple{T,S}); kw...) = plot!(; xlims = lims, kw...)
-ylims!{T<:Real,S<:Real}(lims::@compat(Tuple{T,S}); kw...) = plot!(; ylims = lims, kw...)
+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<:@compat(AbstractString)}(
+xticks!{T<:Real,S<:AbstractString}(
               ticks::AVec{T}, labels::AVec{S}; kw...)     = plot!(; xticks = (ticks,labels), kw...)
-yticks!{T<:Real,S<:@compat(AbstractString)}(
+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...)
@@ -153,58 +189,44 @@ yflip!(flip::Bool = true; kw...)                          = plot!(; yflip = flip
 xaxis!(args...; kw...)                                    = plot!(; xaxis = args, kw...)
 yaxis!(args...; kw...)                                    = plot!(; yaxis = args, kw...)
 
-title!(plt::Plot, s::@compat(AbstractString); kw...)                  = plot!(plt; title = s, kw...)
-xlabel!(plt::Plot, s::@compat(AbstractString); kw...)                 = plot!(plt; xlabel = s, kw...)
-ylabel!(plt::Plot, s::@compat(AbstractString); kw...)                 = plot!(plt; ylabel = s, kw...)
-xlims!{T<:Real,S<:Real}(plt::Plot, lims::@compat(Tuple{T,S}); kw...)  = plot!(plt; xlims = lims, kw...)
-ylims!{T<:Real,S<:Real}(plt::Plot, lims::@compat(Tuple{T,S}); kw...)  = plot!(plt; ylims = lims, kw...)
-xlims!(plt::Plot, xmin::Real, xmax::Real; kw...)                      = plot!(plt; xlims = (xmin,xmax), kw...)
-ylims!(plt::Plot, ymin::Real, ymax::Real; kw...)                      = plot!(plt; ylims = (ymin,ymax), kw...)
-xticks!{T<:Real}(plt::Plot, ticks::AVec{T}; kw...)                    = plot!(plt; xticks = ticks, kw...)
-yticks!{T<:Real}(plt::Plot, ticks::AVec{T}; kw...)                    = plot!(plt; yticks = ticks, kw...)
-xticks!{T<:Real,S<:@compat(AbstractString)}(plt::Plot,
-                          ticks::AVec{T}, labels::AVec{S}; kw...)     = plot!(plt; xticks = (ticks,labels), kw...)
-yticks!{T<:Real,S<:@compat(AbstractString)}(plt::Plot,
-                          ticks::AVec{T}, labels::AVec{S}; kw...)     = plot!(plt; yticks = (ticks,labels), kw...)
-annotate!(plt::Plot, anns...; kw...)                                  = plot!(plt; annotation = anns, kw...)
-annotate!{T<:Tuple}(plt::Plot, anns::AVec{T}; kw...)                  = plot!(plt; annotation = anns, kw...)
-xflip!(plt::Plot, flip::Bool = true; kw...)                           = plot!(plt; xflip = flip, kw...)
-yflip!(plt::Plot, flip::Bool = true; kw...)                           = plot!(plt; yflip = flip, kw...)
-xaxis!(plt::Plot, args...; kw...)                                     = plot!(plt; xaxis = args, kw...)
-yaxis!(plt::Plot, args...; kw...)                                     = plot!(plt; yaxis = args, kw...)
-
+let PlotOrSubplot = Union{Plot, Subplot}
+    title!(plt::PlotOrSubplot, s::AbstractString; kw...)                  = plot!(plt; title = s, kw...)
+    xlabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; xlabel = s, kw...)
+    ylabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; ylabel = s, kw...)
+    xlims!{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
 
 
 # ---------------------------------------------------------
 
-
-try
-  import DataFrames
-  dataframes()
-end
-
-# const CURRENT_BACKEND = pickDefaultBackend()
-
-# for be in backends()
-#   try
-#     backend(be)
-#     backend()
-#   catch err
-#     @show err
-#   end
-# end
-
+const CURRENT_BACKEND = CurrentBackend(:none)
 
 function __init__()
-  global const CURRENT_BACKEND = pickDefaultBackend()
-  # global CURRENT_BACKEND
-  # println("[Plots.jl] Default backend: ", CURRENT_BACKEND.sym)
+    setup_ijulia()
+    setup_atom()
 
-  # # auto init dataframes if the import statement doesn't error out
-  # try
-  #   @eval import DataFrames
-  #   dataframes()
-  # end
+    if isdefined(Main, :PLOTS_DEFAULTS)
+        for (k,v) in Main.PLOTS_DEFAULTS
+            default(k, v)
+        end
+    end
 end
 
 # ---------------------------------------------------------

src/animation.jl

@@ -1,44 +1,77 @@
 
-immutable Animation{P<:PlottingObject}
-  plt::P
-  dir::ASCIIString
-  frames::Vector{ASCIIString}
+immutable Animation
+  dir::String
+  frames::Vector{String}
 end
 
-function Animation(plt::PlottingObject)
-  Animation(plt, mktempdir(), ASCIIString[])
+function Animation()
+  tmpdir = convert(String, mktempdir())
+  Animation(tmpdir, String[])
 end
-Animation() = Animation(current())
 
-function frame(anim::Animation)
+function frame{P<:AbstractPlot}(anim::Animation, plt::P=current())
   i = length(anim.frames) + 1
   filename = @sprintf("%06d.png", i)
-  png(anim.plt, joinpath(anim.dir, filename))
+  png(plt, joinpath(anim.dir, filename))
   push!(anim.frames, filename)
 end
 
+giffn() = (isijulia() ? "tmp.gif" : tempname()*".gif")
+
+type FrameIterator
+    itr
+    every::Int
+    kw
+end
+FrameIterator(itr; every=1, kw...) = FrameIterator(itr, every, kw)
+
+"""
+Animate from an iterator which returns the plot args each iteration.
+"""
+function animate(fitr::FrameIterator, fn = giffn(); kw...)
+    anim = Animation()
+    for (i, plotargs) in enumerate(fitr.itr)
+        if mod1(i, fitr.every) == 1
+            plot(wraptuple(plotargs)...; fitr.kw...)
+            frame(anim)
+        end
+    end
+    gif(anim, fn; kw...)
+end
+
+# most things will implement this
+function animate(obj, fn = giffn(); every=1, fps=20, loop=0, kw...)
+    animate(FrameIterator(obj, every, kw), fn; fps=fps, loop=loop)
+end
 
 # -----------------------------------------------
 
 "Wraps the location of an animated gif so that it can be displayed"
 immutable AnimatedGif
-  filename::ASCIIString
+  filename::String
 end
 
-function gif(anim::Animation, fn::@compat(AbstractString) = "tmp.gif"; fps::Integer = 20)
+function gif(anim::Animation, fn = giffn(); fps::Integer = 20, loop::Integer = 0)
   fn = abspath(fn)
 
   try
-    
+
     # high quality
     speed = round(Int, 100 / fps)
-    run(`convert -delay $speed -loop 0 $(anim.dir)/*.png $fn`)
-  
+    file = joinpath(Pkg.dir("ImageMagick"), "deps","deps.jl")
+    if isfile(file) && !haskey(ENV, "MAGICK_CONFIGURE_PATH")
+        include(file)
+    end
+    # prefix = get(ENV, "MAGICK_CONFIGURE_PATH", "")
+    run(`convert -delay $speed -loop $loop $(joinpath(anim.dir, "*.png")) -alpha off $fn`)
+
   catch err
-    warn("Tried to create gif using convert (ImageMagick), but got error: $err\nWill try ffmpeg, but it's lower quality...)")
+    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 -i $(anim.dir)/%06d.png -y $fn`)
+    run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(anim.dir)/%06d.png -y $fn`)
     # run(`ffmpeg -v warning -i  "fps=$fps,scale=320:-1:flags=lanczos"`)
   end
 
@@ -49,6 +82,89 @@ end
 
 
 # write out html to view the gif... note the rand call which is a hack so the image doesn't get cached
-function Base.writemime(io::IO, ::MIME"text/html", agif::AnimatedGif)
-  write(io, "<img src=\"$(relpath(agif.filename))?$(rand())>\" />")
+function Base.show(io::IO, ::MIME"text/html", agif::AnimatedGif)
+    write(io, "<img src=\"$(relpath(agif.filename))?$(rand())>\" />")
+end
+
+
+# -----------------------------------------------
+
+function _animate(forloop::Expr, args...; callgif = false)
+  if forloop.head != :for
+    error("@animate macro expects a for-block. got: $(forloop.head)")
+  end
+
+  # add the call to frame to the end of each iteration
+  animsym = gensym("anim")
+  countersym = gensym("counter")
+  block = forloop.args[2]
+
+  # create filter
+  n = length(args)
+  filterexpr = if n == 0
+    # no filter... every iteration gets a frame
+    true
+
+  elseif args[1] == :every
+    # filter every `freq` frames (starting with the first frame)
+    @assert n == 2
+    freq = args[2]
+    @assert isa(freq, Integer) && freq > 0
+    :(mod1($countersym, $freq) == 1)
+
+  elseif args[1] == :when
+    # filter on custom expression
+    @assert n == 2
+    args[2]
+
+  else
+    error("Unsupported animate filter: $args")
+  end
+
+  push!(block.args, :(if $filterexpr; frame($animsym); end))
+  push!(block.args, :($countersym += 1))
+
+  # add a final call to `gif(anim)`?
+  retval = callgif ? :(gif($animsym)) : animsym
+
+  # full expression:
+  esc(quote
+    $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)
+end
+
+"""
+Builds an `Animation` using one frame per loop iteration, then create an animated GIF.
+
+Example:
+
+```
+  p = plot(1)
+  @gif for x=0:0.1:5
+    push!(p, 1, sin(x))
+  end
+```
+"""
+macro gif(forloop::Expr, args...)
+  _animate(forloop, args...; callgif = true)
+end
+
+"""
+Collect one frame per for-block iteration and return an `Animation` object.
+
+Example:
+
+```
+  p = plot(1)
+  anim = @animate for x=0:0.1:5
+    push!(p, 1, sin(x))
+  end
+  gif(anim)
+```
+"""
+macro animate(forloop::Expr, args...)
+  _animate(forloop, args...)
 end

src/arg_desc.jl

@@ -0,0 +1,113 @@
+
+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.",
+: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.",
+:linestyle 			=> "Symbol. Style of the line (for path and bar stroke).  Choose from $(_allStyles)",
+: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 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).",
+:markercolor       	=> "Color Type. Color of the interior of the marker or shape. `:match` will take the value from `:seriescolor`.",
+:markeralpha       	=> "Number in [0,1]. The alpha/opacity override for the marker interior.  `nothing` (the default) means it will take the alpha value of markercolor.",
+:markersize        	=> "Number or AbstractVector. Size (radius pixels) of the markers.",
+:markerstrokestyle 	=> "Symbol. Style of the marker stroke (border).  Choose from $(_allStyles)",
+: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. 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 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).",
+: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)",
+: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. Should normalize histogram types?  Trying for area == 1.",
+:weights           	=> "AbstractVector. Used in histogram types for weighted counts.",
+:contours          	=> "Bool. Add contours to the side-grids of 3D plots?  Used in surface/wireframe.",
+: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.",
+
+# plot args
+:plot_title               => "String. Title for the whole plot (not the subplots) (Note: Not currently implemented)",
+:background_color         => "Color Type.  Base color for all backgrounds.",
+:background_color_outside => "Color Type or `:match` (matches `:background_color`).  Color outside the plot area(s)",
+:foreground_color         => "Color Type.  Base color for all foregrounds.",
+:size                     => "NTuple{2,Int}. (width_px, height_px) of the whole Plot",
+:pos                      => "NTuple{2,Int}. (left_px, top_px) position of the GUI window (note: currently unimplemented)",
+:window_title             => "String. Title of the window.",
+:show                     => "Bool.  Should this command open/refresh a GUI/display?  This allows displaying in scripts or functions without explicitly calling `display`",
+:layout                   => "Integer (number of subplots), NTuple{2,Integer} (grid dimensions), AbstractLayout (for example `grid(2,2)`), or the return from the `@layout` macro.  This builds the layout of subplots.",
+: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.",
+: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`",
+: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)",
+: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.",
+: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 `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.",
+:right_margin             => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding to the right of the subplot.",
+: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.",
+
+# axis args
+: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).",
+
+)

src/axes.jl

@@ -0,0 +1,503 @@
+
+
+# xaxis(args...; kw...) = Axis(:x, args...; kw...)
+# yaxis(args...; kw...) = Axis(:y, args...; kw...)
+# zaxis(args...; kw...) = Axis(:z, args...; kw...)
+
+# -------------------------------------------------------------------------
+
+function Axis(sp::Subplot, letter::Symbol, args...; kw...)
+    # init with values from _plot_defaults
+    d = KW(
+        :letter => letter,
+        # :extrema => (Inf, -Inf),
+        :extrema => Extrema(),
+        :discrete_map => Dict(),   # map discrete values to discrete indices
+        :continuous_values => zeros(0),
+        :use_minor => false,
+        :show => true,  # show or hide the axis? (useful for linked subplots)
+    )
+
+    # get defaults from letter version, unless match
+    for (k,v) in _axis_defaults
+        lk = Symbol(letter, k)
+        lv = _axis_defaults_byletter[lk]
+        d[k] = (lv == :match ? v : lv)
+    end
+
+    # merge!(d, _axis_defaults)
+    d[:discrete_values] = []
+
+    # update the defaults
+    attr!(Axis([sp], d), args...; kw...)
+end
+
+function get_axis(sp::Subplot, letter::Symbol)
+    axissym = Symbol(letter, :axis)
+    if haskey(sp.attr, axissym)
+        sp.attr[axissym]
+    else
+        sp.attr[axissym] = Axis(sp, letter)
+    end::Axis
+end
+
+function process_axis_arg!(d::KW, arg, letter = "")
+    T = typeof(arg)
+    arg = get(_scaleAliases, arg, arg)
+
+    if typeof(arg) <: Font
+        d[Symbol(letter,:tickfont)] = arg
+        d[Symbol(letter,:guidefont)] = arg
+
+    elseif arg in _allScales
+        d[Symbol(letter,:scale)] = arg
+
+    elseif arg in (:flip, :invert, :inverted)
+        d[Symbol(letter,:flip)] = true
+
+    elseif T <: AbstractString
+        d[Symbol(letter,:guide)] = arg
+
+    # xlims/ylims
+    elseif (T <: Tuple || T <: AVec) && length(arg) == 2
+        sym = typeof(arg[1]) <: Number ? :lims : :ticks
+        d[Symbol(letter,sym)] = arg
+
+    # xticks/yticks
+    elseif T <: AVec
+        d[Symbol(letter,:ticks)] = arg
+
+    elseif arg == nothing
+        d[Symbol(letter,:ticks)] = []
+
+    elseif typeof(arg) <: Number
+        d[Symbol(letter,:rotation)] = arg
+
+    elseif typeof(arg) <: Function
+        d[Symbol(letter,:formatter)] = arg
+
+    else
+        warn("Skipped $(letter)axis arg $arg")
+
+    end
+end
+
+# update an Axis object with magic args and keywords
+function attr!(axis::Axis, args...; kw...)
+    # first process args
+    d = axis.d
+    for arg in args
+        process_axis_arg!(d, arg)
+    end
+
+    # then override for any keywords... only those keywords that already exists in d
+    for (k,v) in kw
+        if haskey(d, k)
+            if k == :discrete_values
+                # add these discrete values to the axis
+                for vi in v
+                    discrete_value!(axis, vi)
+                end
+            else
+                d[k] = v
+            end
+        end
+    end
+
+    # replace scale aliases
+    if haskey(_scaleAliases, d[:scale])
+        d[:scale] = _scaleAliases[d[:scale]]
+    end
+
+    axis
+end
+
+# -------------------------------------------------------------------------
+
+Base.show(io::IO, axis::Axis) = dumpdict(axis.d, "Axis", true)
+# Base.getindex(axis::Axis, k::Symbol) = getindex(axis.d, k)
+Base.setindex!(axis::Axis, v, ks::Symbol...) = setindex!(axis.d, v, ks...)
+Base.haskey(axis::Axis, k::Symbol) = haskey(axis.d, k)
+Base.extrema(axis::Axis) = (ex = axis[:extrema]; (ex.emin, ex.emax))
+
+
+const _scale_funcs = Dict{Symbol,Function}(
+    :log10 => log10,
+    :log2 => log2,
+    :ln => log,
+)
+const _inv_scale_funcs = Dict{Symbol,Function}(
+    :log10 => exp10,
+    :log2 => exp2,
+    :ln => exp,
+)
+
+# const _label_func = Dict{Symbol,Function}(
+#     :log10 => x -> "10^$x",
+#     :log2 => x -> "2^$x",
+#     :ln => x -> "e^$x",
+# )
+
+const _label_func = Dict{Symbol,Function}(
+    :log10 => x -> "10^$x",
+    :log2 => x -> "2^$x",
+    :ln => x -> "e^$x",
+)
+
+
+scalefunc(scale::Symbol) = x -> get(_scale_funcs, scale, identity)(Float64(x))
+invscalefunc(scale::Symbol) = x -> get(_inv_scale_funcs, scale, identity)(Float64(x))
+labelfunc(scale::Symbol, backend::AbstractBackend) = get(_label_func, scale, string)
+
+function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
+    amin,amax = axis_limits(axis)
+
+    # scale the limits
+    scale = axis[:scale]
+    sf = scalefunc(scale)
+
+    # get a list of well-laid-out ticks
+    scaled_ticks = if ticks == nothing
+        optimize_ticks(
+            sf(amin),
+            sf(amax);
+            k_min = 5, # minimum number of ticks
+            k_max = 8, # maximum number of ticks
+        )[1]
+    else
+        map(sf, filter(t -> amin <= t <= amax, ticks))
+    end
+    unscaled_ticks = map(invscalefunc(scale), scaled_ticks)
+
+    labels = if any(isfinite, unscaled_ticks)
+        formatter = axis[:formatter]
+        if formatter == :auto
+            # the default behavior is to make strings of the scaled values and then apply the labelfunc
+            map(labelfunc(scale, backend()), Showoff.showoff(scaled_ticks, :plain))
+        elseif formatter == :scientific
+            Showoff.showoff(unscaled_ticks, :scientific)
+        else
+            # there was an override for the formatter... use that on the unscaled ticks
+            map(formatter, unscaled_ticks)
+        end
+    else
+        # no finite ticks to show...
+        String[]
+    end
+
+    # @show unscaled_ticks labels
+    # labels = Showoff.showoff(unscaled_ticks, scale == :log10 ? :scientific : :auto)
+    unscaled_ticks, labels
+end
+
+# return (continuous_values, discrete_values) for the ticks on this axis
+function get_ticks(axis::Axis)
+    ticks = axis[:ticks]
+    ticks in (nothing, false) && return nothing
+
+    dvals = axis[:discrete_values]
+    cv, dv = if !isempty(dvals) && ticks == :auto
+        # discrete ticks...
+        axis[:continuous_values], dvals
+    elseif ticks == :auto
+        # compute optimal ticks and labels
+        optimal_ticks_and_labels(axis)
+    elseif typeof(ticks) <: AVec
+        # override ticks, but get the labels
+        optimal_ticks_and_labels(axis, ticks)
+    elseif typeof(ticks) <: NTuple{2}
+        # assuming we're passed (ticks, labels)
+        ticks
+    else
+        error("Unknown ticks type in get_ticks: $(typeof(ticks))")
+    end
+    # @show ticks dvals cv dv
+
+    # TODO: better/smarter cutoff values for sampling ticks
+    if length(cv) > 30
+        rng = Int[round(Int,i) for i in linspace(1, length(cv), 15)]
+        cv[rng], dv[rng]
+    else
+        cv, dv
+    end
+end
+
+# -------------------------------------------------------------------------
+
+
+function reset_extrema!(sp::Subplot)
+    for asym in (:x,:y,:z)
+        sp[Symbol(asym,:axis)][:extrema] = Extrema()
+    end
+    for series in sp.series_list
+        expand_extrema!(sp, series.d)
+    end
+end
+
+
+function expand_extrema!(ex::Extrema, v::Number)
+    ex.emin = min(v, ex.emin)
+    ex.emax = max(v, ex.emax)
+    ex
+end
+
+function expand_extrema!(axis::Axis, v::Number)
+    expand_extrema!(axis[:extrema], v)
+end
+
+# these shouldn't impact the extrema
+expand_extrema!(axis::Axis, ::Void) = axis[:extrema]
+expand_extrema!(axis::Axis, ::Bool) = axis[:extrema]
+
+
+function expand_extrema!{MIN<:Number,MAX<:Number}(axis::Axis, v::Tuple{MIN,MAX})
+    ex = axis[:extrema]
+    ex.emin = min(v[1], ex.emin)
+    ex.emax = max(v[2], ex.emax)
+    ex
+end
+function expand_extrema!{N<:Number}(axis::Axis, v::AVec{N})
+    ex = axis[:extrema]
+    for vi in v
+        expand_extrema!(ex, vi)
+    end
+    ex
+end
+
+
+function expand_extrema!(sp::Subplot, d::KW)
+    vert = isvertical(d)
+
+    # first expand for the data
+    for letter in (:x, :y, :z)
+        data = d[if vert
+            letter
+        else
+            letter == :x ? :y : letter == :y ? :x : :z
+        end]
+        axis = sp[Symbol(letter, "axis")]
+
+        if isa(data, Volume)
+            expand_extrema!(sp[:xaxis], data.x_extents)
+            expand_extrema!(sp[:yaxis], data.y_extents)
+            expand_extrema!(sp[:zaxis], data.z_extents)
+        elseif eltype(data) <: Number || (isa(data, Surface) && all(di -> isa(di, Number), data.surf))
+            if !(eltype(data) <: Number)
+                # huh... must have been a mis-typed surface? lets swap it out
+                data = d[letter] = Surface(Matrix{Float64}(data.surf))
+            end
+            expand_extrema!(axis, data)
+        elseif data != nothing
+            # TODO: need more here... gotta track the discrete reference value
+            #       as well as any coord offset (think of boxplot shape coords... they all
+            #       correspond to the same x-value)
+            d[letter], d[Symbol(letter,"_discrete_indices")] = discrete_value!(axis, data)
+            expand_extrema!(axis, d[letter])
+        end
+    end
+
+    # # expand for fillrange/bar_width
+    # fillaxis, baraxis = sp.attr[:yaxis], sp.attr[:xaxis]
+    # if isvertical(d)
+    #     fillaxis, baraxis = baraxis, fillaxis
+    # end
+
+    # expand for fillrange
+    fr = d[:fillrange]
+    if fr == nothing && d[:seriestype] == :bar
+        fr = 0.0
+    end
+    if fr != nothing
+        axis = sp.attr[vert ? :yaxis : :xaxis]
+        if typeof(fr) <: Tuple
+            for fri in fr
+                expand_extrema!(axis, fri)
+            end
+        else
+            expand_extrema!(axis, fr)
+        end
+    end
+
+    # expand for bar_width
+    if d[:seriestype] == :bar
+        dsym = vert ? :x : :y
+        data = d[dsym]
+
+        bw = d[:bar_width]
+        if bw == nothing
+            bw = d[:bar_width] = mean(diff(data))
+        end
+        axis = sp.attr[Symbol(dsym, :axis)]
+        expand_extrema!(axis, maximum(data) + 0.5maximum(bw))
+        expand_extrema!(axis, minimum(data) - 0.5minimum(bw))
+    end
+
+end
+
+function expand_extrema!(sp::Subplot, xmin, xmax, ymin, ymax)
+    expand_extrema!(sp[:xaxis], (xmin, xmax))
+    expand_extrema!(sp[:yaxis], (ymin, ymax))
+end
+
+# -------------------------------------------------------------------------
+
+# push the limits out slightly
+function widen(lmin, lmax)
+    span = lmax - lmin
+    # eps = max(1e-16, min(1e-2span, 1e-10))
+    eps = max(1e-16, 0.03span)
+    lmin-eps, lmax+eps
+end
+
+# figure out if widening is a good idea.  if there's a scale set it's too tricky,
+# so lazy out and don't widen
+function default_should_widen(axis::Axis)
+    should_widen = false
+    if axis[:scale] == :identity && !is_2tuple(axis[:lims])
+        for sp in axis.sps
+            for series in series_list(sp)
+                if series.d[:seriestype] in (:scatter,) || series.d[:markershape] != :none
+                    should_widen = true
+                end
+            end
+        end
+    end
+    should_widen
+end
+
+# using the axis extrema and limit overrides, return the min/max value for this axis
+function axis_limits(axis::Axis, should_widen::Bool = default_should_widen(axis))
+    ex = axis[:extrema]
+    amin, amax = ex.emin, ex.emax
+    lims = axis[:lims]
+    if (isa(lims, Tuple) || isa(lims, AVec)) && length(lims) == 2
+        if isfinite(lims[1])
+            amin = lims[1]
+        end
+        if isfinite(lims[2])
+            amax = lims[2]
+        end
+    end
+    if amax <= amin && isfinite(amin)
+        amax = amin + 1.0
+    end
+    if !isfinite(amin) && !isfinite(amax)
+        amin, amax = 0.0, 1.0
+    end
+    if should_widen
+        widen(amin, amax)
+    else
+        amin, amax
+    end
+end
+
+# -------------------------------------------------------------------------
+
+# these methods track the discrete (categorical) values which correspond to axis continuous values (cv)
+# whenever we have discrete values, we automatically set the ticks to match.
+# we return (continuous_value, discrete_index)
+function discrete_value!(axis::Axis, dv)
+    cv_idx = get(axis[:discrete_map], dv, -1)
+    # @show axis[:discrete_map], axis[:discrete_values], dv
+    if cv_idx == -1
+        ex = axis[:extrema]
+        cv = max(0.5, ex.emax + 1.0)
+        expand_extrema!(axis, cv)
+        push!(axis[:discrete_values], dv)
+        push!(axis[:continuous_values], cv)
+        cv_idx = length(axis[:discrete_values])
+        axis[:discrete_map][dv] = cv_idx
+        cv, cv_idx
+    else
+        cv = axis[:continuous_values][cv_idx]
+        cv, cv_idx
+    end
+end
+
+# continuous value... just pass back with axis negative index
+function discrete_value!(axis::Axis, cv::Number)
+    cv, -1
+end
+
+# add the discrete value for each item.  return the continuous values and the indices
+function discrete_value!(axis::Axis, v::AVec)
+    n = length(v)
+    cvec = zeros(n)
+    discrete_indices = zeros(Int, n)
+    for i=1:n
+        cvec[i], discrete_indices[i] = discrete_value!(axis, v[i])
+    end
+    cvec, discrete_indices
+end
+
+# add the discrete value for each item.  return the continuous values and the indices
+function discrete_value!(axis::Axis, v::AMat)
+    n,m = size(v)
+    cmat = zeros(n,m)
+    discrete_indices = zeros(Int, n, m)
+    for i=1:n, j=1:m
+        cmat[i,j], discrete_indices[i,j] = discrete_value!(axis, v[i,j])
+    end
+    cmat, discrete_indices
+end
+
+function discrete_value!(axis::Axis, v::Surface)
+    map(Surface, discrete_value!(axis, v.surf))
+end
+
+# -------------------------------------------------------------------------
+
+function pie_labels(sp::Subplot, series::Series)
+    d = series.d
+    if haskey(d,:x_discrete_indices)
+        dvals = sp.attr[:xaxis].d[:discrete_values]
+        [dvals[idx] for idx in d[:x_discrete_indices]]
+    else
+        d[:x]
+    end
+end
+
+# -------------------------------------------------------------------------
+
+# compute the line segments which should be drawn for this axis
+function axis_drawing_info(sp::Subplot)
+    xaxis, yaxis = sp[:xaxis], sp[:yaxis]
+    xmin, xmax = axis_limits(xaxis)
+    ymin, ymax = axis_limits(yaxis)
+    xticks = get_ticks(xaxis)
+    yticks = get_ticks(yaxis)
+    spine_segs = Segments(2)
+    grid_segs = Segments(2)
+
+    if !(xaxis[:ticks] in (nothing, false))
+        f = scalefunc(yaxis[:scale])
+        invf = invscalefunc(yaxis[:scale])
+        t1 = invf(f(ymin) + 0.015*(f(ymax)-f(ymin)))
+        t2 = invf(f(ymax) - 0.015*(f(ymax)-f(ymin)))
+
+        push!(spine_segs, (xmin,ymin), (xmax,ymin)) # bottom spine
+        # push!(spine_segs, (xmin,ymax), (xmax,ymax)) # top spine
+        for xtick in xticks[1]
+            push!(spine_segs, (xtick, ymin), (xtick, t1)) # bottom tick
+            push!(grid_segs,  (xtick, t1),   (xtick, t2)) # vertical grid
+            # push!(spine_segs, (xtick, ymax), (xtick, t2)) # top tick
+        end
+    end
+
+    if !(yaxis[:ticks] in (nothing, false))
+        f = scalefunc(xaxis[:scale])
+        invf = invscalefunc(xaxis[:scale])
+        t1 = invf(f(xmin) + 0.015*(f(xmax)-f(xmin)))
+        t2 = invf(f(xmax) - 0.015*(f(xmax)-f(xmin)))
+
+        push!(spine_segs, (xmin,ymin), (xmin,ymax)) # left spine
+        # push!(spine_segs, (xmax,ymin), (xmax,ymax)) # right spine
+        for ytick in yticks[1]
+            push!(spine_segs, (xmin, ytick), (t1, ytick)) # left tick
+            push!(grid_segs,  (t1, ytick),   (t2, ytick)) # horizontal grid
+            # push!(spine_segs, (xmax, ytick), (t2, ytick)) # right tick
+        end
+    end
+
+    xticks, yticks, spine_segs, grid_segs
+end

src/backends.jl

@@ -0,0 +1,305 @@
+
+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}()
+
+backends() = _backends
+backend_name() = CURRENT_BACKEND.sym
+_backend_instance(sym::Symbol) = haskey(_backendType, sym) ? _backendType[sym]() : error("Unsupported backend $sym")
+
+macro init_backend(s)
+    str = lowercase(string(s))
+    sym = Symbol(str)
+    T = Symbol(string(s) * "Backend")
+    esc(quote
+        immutable $T <: AbstractBackend end
+        export $sym
+        $sym(; kw...) = (default(; kw...); backend(Symbol($str)))
+        backend_name(::$T) = Symbol($str)
+        push!(_backends, Symbol($str))
+        _backendType[Symbol($str)] = $T
+        _backendSymbol[$T] = Symbol($str)
+        include("backends/" * $str * ".jl")
+    end)
+end
+
+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
+_initialize_subplot(plt::Plot, sp::Subplot) = nothing
+
+_series_added(plt::Plot, series::Series) = nothing
+_series_updated(plt::Plot, series::Series) = nothing
+
+_before_layout_calcs(plt::Plot) = nothing
+
+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)
+    # we need to compute the size of the ticks generically
+    # this means computing the bounding box and then getting the width/height
+    # note:
+    ptsz = sz * pt
+    width = 0.8lablen * ptsz
+
+    # now compute the generalized "height" after rotation as the "opposite+adjacent" of 2 triangles
+    height = abs(sind(rot)) * width + abs(cosd(rot)) * ptsz
+    width = abs(sind(rot+90)) * width + abs(cosd(rot+90)) * ptsz
+    width, height
+end
+text_size(lab::AbstractString, sz::Number, rot::Number = 0) = text_size(length(lab), sz, rot)
+
+# account for the size/length/rotation of tick labels
+function tick_padding(axis::Axis)
+    ticks = get_ticks(axis)
+    if ticks == nothing
+        0mm
+    else
+        vals, labs = ticks
+        isempty(labs) && return 0mm
+        # ptsz = axis[:tickfont].pointsize * pt
+        longest_label = maximum(length(lab) for lab in labs)
+
+        # generalize by "rotating" y labels
+        rot = axis[:rotation] + (axis[:letter] == :y ? 90 : 0)
+
+        # # we need to compute the size of the ticks generically
+        # # this means computing the bounding box and then getting the width/height
+        # labelwidth = 0.8longest_label * ptsz
+        #
+        #
+        # # now compute the generalized "height" after rotation as the "opposite+adjacent" of 2 triangles
+        # hgt = abs(sind(rot)) * labelwidth + abs(cosd(rot)) * ptsz + 1mm
+        # hgt
+
+        # get the height of the rotated label
+        text_size(longest_label, axis[:tickfont].pointsize, rot)[2]
+    end
+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)
+    # TODO: something different when `is3d(sp) == true`
+    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[:xaxis]) + sp[:bottom_margin] + guide_padding(sp[:xaxis])
+
+    # switch them?
+    if sp[:xaxis][:mirror]
+        bottompad, toppad = toppad, bottompad
+    end
+    if sp[:yaxis][:mirror]
+        leftpad, rightpad = rightpad, leftpad
+    end
+
+    # @show (leftpad, toppad, rightpad, bottompad)
+    sp.minpad = (leftpad, toppad, rightpad, bottompad)
+end
+
+_update_plot_object(plt::Plot) = nothing
+
+# ---------------------------------------------------------
+
+
+type CurrentBackend
+  sym::Symbol
+  pkg::AbstractBackend
+end
+CurrentBackend(sym::Symbol) = CurrentBackend(sym, _backend_instance(sym))
+
+# ---------------------------------------------------------
+
+function pickDefaultBackend()
+    env_default = get(ENV, "PLOTS_DEFAULT_BACKEND", "")
+    if env_default != ""
+        try
+            Pkg.installed(env_default)  # this will error if not installed
+            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
+    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 ("PyPlot", "GR", "PlotlyJS", "Immerse", "Gadfly", "UnicodePlots")
+        if Pkg.installed(pkgstr) != nothing
+            return backend(Symbol(lowercase(pkgstr)))
+        end
+    end
+
+    # the default if nothing else is installed
+    backend(:plotly)
+end
+
+
+# ---------------------------------------------------------
+
+"""
+Returns the current plotting package name.  Initializes package on first call.
+"""
+function 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
+
+    push!(_initialized_backends, sym)
+
+  end
+  CURRENT_BACKEND.pkg
+end
+
+"""
+Set the plot backend.
+"""
+function backend(pkg::AbstractBackend)
+    CURRENT_BACKEND.sym = backend_name(pkg)
+    warn_on_deprecated_backend(CURRENT_BACKEND.sym)
+    CURRENT_BACKEND.pkg = pkg
+    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]
+
+function warn_on_deprecated_backend(bsym::Symbol)
+    if bsym in _deprecated_backends
+        warn("Backend $bsym has been deprecated.  It may not work as originally intended.")
+    end
+end
+
+
+
+# ---------------------------------------------------------
+
+# these are args which every backend supports because they're not used in the backend code
+const _base_supported_args = [
+    :color_palette,
+    :background_color, :background_color_subplot,
+    :foreground_color, :foreground_color_subplot,
+    :group,
+    :seriestype,
+    :seriescolor, :seriesalpha,
+    :smooth,
+    :xerror, :yerror,
+    :subplot,
+    :x, :y, :z,
+    :show, :size,
+    :margin,
+    :left_margin,
+    :right_margin,
+    :top_margin,
+    :bottom_margin,
+    :html_output_format,
+    :layout,
+    :link,
+    :primary,
+    :series_annotations,
+    :subplot_index,
+    :discrete_values,
+    :projection,
+
+]
+
+function merge_with_base_supported(v::AVec)
+    v = vcat(v, _base_supported_args)
+    for vi in v
+        if haskey(_axis_defaults, vi)
+            for letter in (:x,:y,:z)
+                push!(v, Symbol(letter,vi))
+            end
+        end
+    end
+    Set(v)
+end
+
+
+
+# @init_backend Immerse
+# @init_backend Gadfly
+@init_backend PyPlot
+# @init_backend Qwt
+@init_backend UnicodePlots
+# @init_backend Winston
+# @init_backend Bokeh
+@init_backend Plotly
+@init_backend PlotlyJS
+@init_backend GR
+@init_backend GLVisualize
+@init_backend PGFPlots
+
+# ---------------------------------------------------------
+
+# 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())

src/backends/gadfly.jl

@@ -1,642 +0,0 @@
-
-# https://github.com/dcjones/Gadfly.jl
-
-# ---------------------------------------------------------------------------
-
-
-function createGadflyPlotObject(d::Dict)
-  gplt = Gadfly.Plot()
-  gplt.mapping = Dict()
-  gplt.data_source = DataFrames.DataFrame()
-  gplt.layers = gplt.layers[1:0]
-  gplt.guides = Gadfly.GuideElement[Gadfly.Guide.xlabel(d[:xlabel]),
-                                   Gadfly.Guide.ylabel(d[:ylabel]),
-                                   Gadfly.Guide.title(d[:title])]
-  gplt
-end
-
-# ---------------------------------------------------------------------------
-
-
-function getLineGeom(d::Dict)
-  lt = d[:linetype]
-  xbins, ybins = maketuple(d[:nbins])
-  if lt == :hexbin
-    Gadfly.Geom.hexbin(xbincount = xbins, ybincount = ybins)
-  elseif lt == :heatmap
-    Gadfly.Geom.histogram2d(xbincount = xbins, ybincount = ybins)
-  elseif lt == :hist
-    Gadfly.Geom.histogram(bincount = xbins)
-  elseif lt == :path
-    Gadfly.Geom.path
-  elseif lt in (:bar, :sticks)
-    Gadfly.Geom.bar
-  elseif lt == :steppost
-    Gadfly.Geom.step
-  elseif lt == :steppre
-    Gadfly.Geom.step(direction = :vh)
-  elseif lt == :hline
-    Gadfly.Geom.hline(color = getColor(d[:color]), size = d[:linewidth] * Gadfly.px)
-  elseif lt == :vline
-    Gadfly.Geom.vline(color = getColor(d[:color]), size = d[:linewidth] * Gadfly.px)
-  elseif lt == :contour
-    Gadfly.Geom.contour(levels = d[:nlevels])
-  else
-    nothing
-  end
-end
-
-function getGadflyLineTheme(d::Dict)
-  
-  lc = getColor(d[:color])
-  α = d[:lineopacity]
-  if α != nothing
-    lc = RGBA(lc, α)
-  end
-
-  fc = getColor(d[:fillcolor])
-  α = d[:fillopacity]
-  if α != nothing
-    fc = RGBA(fc, α)
-  end
-
-  Gadfly.Theme(;
-      default_color = lc,
-      line_width = (d[:linetype] == :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
-    )
-end
-
-# add a line as a new layer
-function addGadflyLine!(plt::Plot, d::Dict, geoms...)
-  gplt = getGadflyContext(plt)
-  gfargs = vcat(geoms...,
-                getGadflyLineTheme(d))
-  kwargs = Dict()
-  lt = d[:linetype]
-
-  # add a fill?
-  if d[:fillrange] != nothing && lt != :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
-
-  # h/vlines
-  if lt == :hline
-    kwargs[:yintercept] = d[:y]
-  elseif lt == :vline
-    kwargs[:xintercept] = d[:y]
-  elseif lt == :sticks
-    w = 0.01 * mean(diff(d[:x]))
-    kwargs[:xmin] = d[:x] - w
-    kwargs[:xmax] = d[:x] + w
-  elseif lt == :contour
-    d[:y] = reverse(d[:y])
-    kwargs[:z] = d[:surface]
-  end
-  
-  # add the layer
-  x = d[d[:linetype] == :hist ? :y : :x]
-  Gadfly.layer(gfargs...; x = x, y = d[:y], kwargs...)
-end
-
-
-# ---------------------------------------------------------------------------
-
-
-function getMarkerGeom(d::Dict)
-  shape = d[:markershape]
-  gadflyshape(isa(shape, Shape) ? shape : _shapes[shape])
-end
-
-
-function getGadflyMarkerTheme(d::Dict, initargs::Dict)
-  c = getColor(d[:markercolor])
-  α = d[:markeropacity]
-  if α != nothing
-    c = RGBA(RGB(c), α)
-  end
-
-  fg = getColor(initargs[:foreground_color])
-  Gadfly.Theme(
-      default_color = c,
-      default_point_size = d[:markersize] * Gadfly.px,
-      discrete_highlight_color = c -> RGB(fg),
-      highlight_width = d[:linewidth] * Gadfly.px,
-    )
-end
-
-function addGadflyMarker!(plt::Plot, d::Dict, initargs::Dict, geoms...)
-  gfargs = vcat(geoms...,
-                getGadflyMarkerTheme(d, initargs),
-                getMarkerGeom(d))
-  kwargs = Dict()
-
-  # handle continuous color scales for the markers
-  z = d[:z]
-  if z != nothing && typeof(z) <: AVec
-    kwargs[:color] = z
-    if !isa(d[:markercolor], ColorGradient)
-      d[:markercolor] = colorscheme(:bluesreds)
-    end
-    push!(getGadflyContext(plt).scales, Gadfly.Scale.ContinuousColorScale(p -> RGB(getColorZ(d[:markercolor], p))))
-  end
-
-  Gadfly.layer(gfargs...; x = d[:x], y = d[:y], kwargs...)
-end
-
-
-# ---------------------------------------------------------------------------
-
-function addToGadflyLegend(plt::Plot, d::Dict)
-
-  # add the legend?
-  if plt.initargs[:legend]
-    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("", @compat(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 ? :color : :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::Dict)
-
-  layers = Gadfly.Layer[]
-
-  # add a regression line?
-  # TODO: make more flexible
-  smooth = getGadflySmoothing(d[:smooth])
-
-  # lines
-  geom = getLineGeom(d)
-  if geom != nothing
-    prepend!(layers, addGadflyLine!(plt, d, geom, smooth...))
-
-    # don't add a regression for markers too
-    smooth = Any[]
-  end
-
-  # special handling for ohlc and scatter
-  lt = d[:linetype]
-  if lt == :ohlc
-    error("Haven't re-implemented after refactoring")
-  elseif lt == :scatter && d[:markershape] == :none
-    d[:markershape] = :ellipse
-  end
-
-  # markers
-  if d[:markershape] != :none
-    prepend!(layers, addGadflyMarker!(plt, d, plt.initargs, smooth...))
-  end
-
-  lt in (:hist, :heatmap, :hexbin, :contour) || addToGadflyLegend(plt, d)
-
-  # now save the layers that apply to this series
-  d[:gadflylayers] = layers
-  prepend!(getGadflyContext(plt).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[:color]
-#   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 = [(:color, 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
-  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 = ticks[1], 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::Dict, isx::Bool)
-  scalekey = isx ? :xscale : :yscale
-  hasScaleKey = haskey(d, scalekey)
-  if hasScaleKey
-    scale = d[scalekey]
-    scale == :log && return isx ? Gadfly.Scale.x_log : Gadfly.Scale.y_log, hasScaleKey
-    scale == :log2 && return isx ? Gadfly.Scale.x_log2 : Gadfly.Scale.y_log2, hasScaleKey
-    scale == :log10 && return isx ? Gadfly.Scale.x_log10 : Gadfly.Scale.y_log10, hasScaleKey
-    scale == :asinh && return isx ? Gadfly.Scale.x_asinh : Gadfly.Scale.y_asinh, hasScaleKey
-    scale == :sqrt && return isx ? Gadfly.Scale.x_sqrt : Gadfly.Scale.y_sqrt, hasScaleKey
-  end
-  isx ? Gadfly.Scale.x_continuous : Gadfly.Scale.y_continuous, hasScaleKey
-end
-
-
-function addGadflyLimitsScale(gplt, d::Dict, isx::Bool)
-
-  # get the correct scale function
-  gfunc, hasScaleKey = getGadflyScaleFunction(d, isx)
-  
-  # do we want to add min/max limits for the axis?
-  limsym = isx ? :xlims : :ylims
-  limargs = Any[]
-  lims = get(d, limsym, :auto)
-  lims == :auto && return
-
-  if limsType(lims) == :limits
-    push!(limargs, (:minvalue, min(lims...)))
-    push!(limargs, (:maxvalue, max(lims...)))
-  else
-    error("Invalid input for $(isx ? "xlims" : "ylims"): ", lims)
-  end
-
-  # replace any current scales with this one
-  if hasScaleKey || !isempty(limargs)
-    filterGadflyScale(gplt, isx)
-    push!(gplt.scales, gfunc(; limargs...))
-  end
-
-  lims
-end
-
-function updateGadflyAxisFlips(gplt, d::Dict, xlims, ylims)
-  if isa(gplt.coord, Gadfly.Coord.Cartesian)
-    gplt.coord = Gadfly.Coord.cartesian(
-        gplt.coord.xvars,
-        gplt.coord.yvars;
-        xmin = xlims == nothing ? gplt.coord.xmin : minimum(xlims),
-        xmax = xlims == nothing ? gplt.coord.xmax : maximum(xlims),
-        ymin = ylims == nothing ? gplt.coord.ymin : minimum(ylims),
-        ymax = ylims == nothing ? gplt.coord.ymax : 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...) #s::@compat(AbstractString))
-  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::Dict)
-  gplt = getGadflyContext(plt)
-  haskey(d, :title) && findGuideAndSet(gplt, Gadfly.Guide.title, string(d[:title]))
-  haskey(d, :xlabel) && findGuideAndSet(gplt, Gadfly.Guide.xlabel, string(d[:xlabel]))
-  haskey(d, :ylabel) && findGuideAndSet(gplt, Gadfly.Guide.ylabel, string(d[:ylabel]))
-
-  xlims = addGadflyLimitsScale(gplt, d, true)
-  ylims = addGadflyLimitsScale(gplt, d, false)
-
-  ticks = get(d, :xticks, :auto)
-  if ticks == :none
-    handleLinkInner(plt, true)
-  else
-    addGadflyTicksGuide(gplt, ticks, true)
-  end
-  ticks = get(d, :yticks, :auto)
-  if ticks == :none
-    handleLinkInner(plt, false)
-  else
-    addGadflyTicksGuide(gplt, ticks, false)
-  end
-  # haskey(d, :yticks) && addGadflyTicksGuide(gplt, d[:yticks], false)
-
-  updateGadflyAxisFlips(gplt, d, xlims, ylims)
-end
-
-function updateGadflyPlotTheme(plt::Plot, d::Dict)
-  kwargs = Dict()
-
-  # # get the full initargs, overriding any new settings
-  # # TODO: should this be part of the main `plot` command in plot.jl???
-  # d = merge!(plt.initargs, d)
-
-  # hide the legend?
-  if !get(d, :legend, true)
-    kwargs[:key_position] = :none
-  end
-
-  if !get(d, :grid, true)
-    kwargs[:grid_color] = getColor(d[:background_color])
-  end
-
-  # fonts
-  tfont, gfont, lfont = d[:tickfont], d[:guidefont], d[:legendfont]
-
-  fg = getColor(d[:foreground_color])
-  getGadflyContext(plt).theme = Gadfly.Theme(;
-          background_color = getColor(d[:background_color]),
-          minor_label_color = fg,
-          minor_label_font = tfont.family,
-          minor_label_font_size = tfont.pointsize * Gadfly.pt,
-          major_label_color = fg,
-          major_label_font = gfont.family,
-          major_label_font_size = gfont.pointsize * Gadfly.pt,
-          key_title_color = fg,
-          key_title_font = gfont.family,
-          key_title_font_size = gfont.pointsize * Gadfly.pt,
-          key_label_color = fg,
-          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::@compat(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 addAnnotations{X,Y,V}(plt::Plot{GadflyPackage}, anns::AVec{@compat(Tuple{X,Y,V})})
-  for ann in anns
-    push!(plt.o.guides, createGadflyAnnotationObject(ann...))
-  end
-end
-
-
-# ---------------------------------------------------------------------------
-
-# create a blank Gadfly.Plot object
-function plot(pkg::GadflyPackage; kw...)
-  d = Dict(kw)
-  gplt = createGadflyPlotObject(d)
-  Plot(gplt, pkg, 0, d, Dict[])
-end
-
-
-# plot one data series
-function plot!(::GadflyPackage, plt::Plot; kw...)
-  d = Dict(kw)
-  addGadflySeries!(plt, d)
-  push!(plt.seriesargs, d)
-  plt
-end
-
-
-
-function updatePlotItems(plt::Plot{GadflyPackage}, d::Dict)
-  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 Base.getindex(plt::Plot{GadflyPackage}, i::Integer)
-  mapping = getGadflyMappings(plt, i)[1]
-  mapping[:x], mapping[:y]
-end
-
-function Base.setindex!(plt::Plot{GadflyPackage}, xy::Tuple, 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 buildSubplotObject!(subplt::Subplot{GadflyPackage}, isbefore::Bool)
-  isbefore && return false # wait until after plotting to create the subplots
-  subplt.o = nothing
-  true
-end
-
-
-function handleLinkInner(plt::Plot{GadflyPackage}, 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 expandLimits!(lims, plt::Plot{GadflyPackage}, isx::Bool)
-  for l in getGadflyContext(plt).layers
-    expandLimits!(lims, l.mapping[isx ? :x : :y])
-  end
-end
-
-
-# ----------------------------------------------------------------
-
-
-getGadflyContext(plt::Plot{GadflyPackage}) = plt.o
-getGadflyContext(subplt::Subplot{GadflyPackage}) = 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.initargs[:size]...)
-setGadflyDisplaySize(subplt::Subplot) = setGadflyDisplaySize(getinitargs(subplt, 1)[:size]...)
-# -------------------------------------------------------------------------
-
-
-function dowritemime{P<:GadflyOrImmerse}(io::IO, func, plt::PlottingObject{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(m::MIME) = error("Unsupported in Gadfly/Immerse: ", m)
-
-for mime in (MIME"image/png", MIME"image/svg+xml", MIME"application/pdf", MIME"application/postscript")
-  @eval function Base.writemime{P<:GadflyOrImmerse}(io::IO, ::$mime, plt::PlottingObject{P})
-    func = getGadflyWriteFunc($mime())
-    dowritemime(io, func, plt)
-  end
-end
-
-
-
-function Base.display(::PlotsDisplay, plt::Plot{GadflyPackage})
-  setGadflyDisplaySize(plt.initargs[:size]...)
-  display(plt.o)
-end
-
-
-
-function Base.display(::PlotsDisplay, subplt::Subplot{GadflyPackage})
-  setGadflyDisplaySize(getinitargs(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

src/backends/immerse.jl

@@ -1,177 +0,0 @@
-
-# https://github.com/JuliaGraphics/Immerse.jl
-
-# immutable ImmersePackage <: PlottingPackage end
-
-# export immerse
-# immerse() = backend(:immerse)
-
-
-# supportedArgs(::ImmersePackage) = supportedArgs(GadflyPackage())
-# supportedAxes(::ImmersePackage) = supportedAxes(GadflyPackage())
-# supportedTypes(::ImmersePackage) = supportedTypes(GadflyPackage())
-# supportedStyles(::ImmersePackage) = supportedStyles(GadflyPackage())
-# supportedMarkers(::ImmersePackage) = supportedMarkers(GadflyPackage())
-# supportedScales(::ImmersePackage) = supportedScales(GadflyPackage())
-
-
-function createImmerseFigure(d::Dict)
-  w,h = d[:size]
-  figidx = Immerse.figure(; name = d[:windowtitle], width = w, height = h)
-  Immerse.Figure(figidx)
-end
-
-
-# create a blank Gadfly.Plot object
-function plot(pkg::ImmersePackage; kw...)
-  d = Dict(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, Dict[])
-end
-
-
-# plot one data series
-function plot!(::ImmersePackage, plt::Plot; kw...)
-  d = Dict(kw)
-  addGadflySeries!(plt, d)
-  push!(plt.seriesargs, d)
-  plt
-end
-
-
-function updatePlotItems(plt::Plot{ImmersePackage}, d::Dict)
-  updateGadflyGuides(plt, d)
-  updateGadflyPlotTheme(plt, d)
-end
-
-
-
-# ----------------------------------------------------------------
-
-function addAnnotations{X,Y,V}(plt::Plot{ImmersePackage}, anns::AVec{@compat(Tuple{X,Y,V})})
-  for ann in anns
-    push!(getGadflyContext(plt).guides, createGadflyAnnotationObject(ann...))
-  end
-end
-
-# ----------------------------------------------------------------
-
-# accessors for x/y data
-
-function Base.getindex(plt::Plot{ImmersePackage}, i::Integer)
-  mapping = getGadflyMappings(plt, i)[1]
-  mapping[:x], mapping[:y]
-end
-
-function Base.setindex!(plt::Plot{ImmersePackage}, xy::Tuple, i::Integer)
-  for mapping in getGadflyMappings(plt, i)
-    mapping[:x], mapping[:y] = xy
-  end
-  plt
-end
-
-
-# ----------------------------------------------------------------
-
-
-function buildSubplotObject!(subplt::Subplot{ImmersePackage}, isbefore::Bool)
-  return false
-  # isbefore && return false
-end
-
-function showSubplotObject(subplt::Subplot{ImmersePackage})
-  # create the Gtk window with vertical box vsep
-  d = getinitargs(subplt,1)
-  w,h = d[:size]
-  vsep = Gtk.GtkBoxLeaf(:v)
-  win = Gtk.GtkWindowLeaf(vsep, d[:windowtitle], 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 handleLinkInner(plt::Plot{ImmersePackage}, 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 expandLimits!(lims, plt::Plot{ImmersePackage}, isx::Bool)
-  for l in getGadflyContext(plt).layers
-    expandLimits!(lims, l.mapping[isx ? :x : :y])
-  end
-end
-
-
-# ----------------------------------------------------------------
-
-getGadflyContext(plt::Plot{ImmersePackage}) = plt.o[2]
-getGadflyContext(subplt::Subplot{ImmersePackage}) = buildGadflySubplotContext(subplt)
-
-
-function Base.display(::PlotsDisplay, plt::Plot{ImmersePackage})
-
-  fig, gplt = plt.o
-  if fig == nothing
-    fig = createImmerseFigure(plt.initargs)
-    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{ImmersePackage})
-
-  # 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

src/backends/pgfplots.jl

@@ -0,0 +1,336 @@
+# https://github.com/sisl/PGFPlots.jl
+
+# 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(
+    :solid => "solid",
+    :dash => "dashed",
+    :dot => "dotted",
+    :dashdot => "dashdotted",
+    :dashdotdot => "dashdotdotted",
+)
+
+const _pgfplots_markers = KW(
+    :none => "none",
+    :cross => "+",
+    :xcross => "x",
+    :+ => "+",
+    :x => "x",
+    :utriangle => "triangle*",
+    :dtriangle => "triangle*",
+    :circle => "*",
+    :rect => "square*",
+    :star5 => "star",
+    :star6 => "asterisk",
+    :diamond => "diamond*",
+    :pentagon => "pentagon*",
+)
+
+const _pgfplots_legend_pos = KW(
+    :bottomleft => "south west",
+    :bottomright => "south east",
+    :topright => "north east",
+    :topleft => "north west",
+)
+
+
+const _pgf_series_extrastyle = KW(
+    :steppre => "const plot mark right",
+    :stepmid => "const plot mark mid",
+    :steppost => "const plot",
+    :sticks => "ycomb",
+    :ysticks => "ycomb",
+    :xsticks => "xcomb",
+)
+
+# --------------------------------------------------------------------------------------
+
+# takes in color,alpha, and returns color and alpha appropriate for pgf style
+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_fillstyle(d::KW)
+    cstr,a = pgf_color(d[:fillcolor])
+    "fill = $cstr, fill opacity=$a"
+end
+
+function pgf_linestyle(d::KW)
+    cstr,a = pgf_color(d[:linecolor])
+    """
+    color = $cstr,
+    draw opacity=$a,
+    line width=$(d[:linewidth]),
+    $(get(_pgfplots_linestyles, d[:linestyle], "solid"))"""
+end
+
+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)
+    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
+        d[:z].surf, d[:x], d[:y]
+    elseif is3d(st)
+        d[:x], d[:y], d[:z]
+    else
+        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)
+    # for (i,a) in enumerate(args)
+    #     if typeof(a) <: AbstractVector && typeof(a) != Vector
+    #         args[i] = collect(a)
+    #     end
+    # end
+
+    # 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, ',')
+
+    # 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
+    func(args...; kw...)
+end
+
+
+# ----------------------------------------------------------------
+
+function pgf_axis(sp::Subplot, letter)
+    axis = sp[Symbol(letter,:axis)]
+    style = []
+    kw = KW()
+
+    # axis guide
+    kw[Symbol(letter,:label)] = axis[:guide]
+
+    # flip/reverse?
+    axis[:flip] && push!(style, "$letter dir=reverse")
+
+    # scale
+    scale = axis[:scale]
+    if scale in (:log2, :ln, :log10)
+        kw[Symbol(letter,:mode)] = "log"
+        scale == :ln || push!(style, "log basis $letter=$(scale == :log2 ? 2 : 10)")
+    end
+
+    # ticks on or off
+    if axis[:ticks] in (nothing, false)
+        push!(style, "$(letter)majorticks=false")
+    end
+
+    # limits
+    # TODO: support zlims
+    if letter != :z
+        lims = axis_limits(axis)
+        kw[Symbol(letter,:min)] = lims[1]
+        kw[Symbol(letter,:max)] = lims[2]
+    end
+
+    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
+    style, kw
+end
+
+# ----------------------------------------------------------------
+
+
+function _update_plot_object(plt::Plot{PGFPlotsBackend})
+    plt.o = PGFPlots.Axis[]
+    for sp in plt.subplots
+        # first build the PGFPlots.Axis object
+        style = ["unbounded coords=jump"]
+        kw = KW()
+
+        # add to style/kw for each axis
+        for letter in (:x, :y, :z)
+            if letter != :z || is3d(sp)
+                axisstyle, axiskw = pgf_axis(sp, letter)
+                append!(style, axisstyle)
+                merge!(kw, axiskw)
+            end
+        end
+
+        # bounding box values are in mm
+        # note: bb origin is top-left, pgf is bottom-left
+        bb = bbox(sp)
+        push!(style, """
+            xshift = $(left(bb).value)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"
+        kw[:height] = "$(height(bb).value)mm"
+
+        if sp[:title] != ""
+            kw[:title] = "$(sp[:title])"
+        end
+
+        sp[:grid] && push!(style, "grid = major")
+        if sp[:aspect_ratio] in (1, :equal)
+            kw[:axisEqual] = "true"
+        end
+
+        legpos = sp[:legend]
+        if haskey(_pgfplots_legend_pos, legpos)
+            kw[:legendPos] = _pgfplots_legend_pos[legpos]
+        end
+
+        o = PGFPlots.Axis(; style = style, kw...)
+
+        # add the series object to the PGFPlots.Axis
+        for series in series_list(sp)
+            push!(o, pgf_series(sp, series))
+        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
+
+function _show(io::IO, mime::MIME"application/pdf", plt::Plot{PGFPlotsBackend})
+    # prepare the object
+    pgfplt = PGFPlots.plot(plt.o)
+
+    # save a pdf
+    fn = tempname()*".pdf"
+    PGFPlots.save(PGFPlots.PDF(fn), pgfplt)
+
+    # read it into io
+    write(io, readall(open(fn)))
+
+    # cleanup
+    PGFPlots.cleanup(plt.o)
+end
+
+function _display(plt::Plot{PGFPlotsBackend})
+    # prepare the object
+    pgfplt = PGFPlots.plot(plt.o)
+
+    # save an svg
+    fn = string(tempname(), ".svg")
+    PGFPlots.save(PGFPlots.SVG(fn), pgfplt)
+
+    # show it
+    open_browser_window(fn)
+
+    # cleanup
+    PGFPlots.cleanup(plt.o)
+end

src/backends/plotly.jl

@@ -0,0 +1,674 @@
+
+# https://plot.ly/javascript/getting-started
+
+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, :titlefont,
+    :window_title,
+    :guide, :lims, :ticks, :scale, :flip, :rotation,
+    :tickfont, :guidefont, :legendfont,
+    :grid, :legend, :colorbar,
+    :marker_z, :levels,
+    :ribbon, :quiver,
+    :orientation,
+    # :overwrite_figure,
+    :polar,
+    :normalize, :weights,
+    # :contours,
+    :aspect_ratio,
+    :hover,
+    :inset_subplots,
+    :bar_width,
+  ])
+
+const _plotly_seriestype = [
+    :path, :scatter, :bar, :pie, :heatmap,
+    :contour, :surface, :wireframe, :path3d, :scatter3d, :shape, :scattergl,
+]
+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]
+is_subplot_supported(::PlotlyBackend) = true
+# is_string_supported(::PlotlyBackend) = true
+
+
+# --------------------------------------------------------------------------------------
+
+function add_backend_string(::PlotlyBackend)
+    """
+    Pkg.build("Plots")
+    """
+end
+
+
+const _plotly_js_path = joinpath(dirname(@__FILE__), "..", "..", "deps", "plotly-latest.min.js")
+
+function _initialize_backend(::PlotlyBackend; kw...)
+  @eval begin
+    import JSON
+
+    _js_code = open(readstring, _plotly_js_path, "r")
+
+    # borrowed from https://github.com/plotly/plotly.py/blob/2594076e29584ede2d09f2aa40a8a195b3f3fc66/plotly/offline/offline.py#L64-L71 c/o @spencerlyon2
+    _js_script = """
+        <script type='text/javascript'>
+            define('plotly', function(require, exports, module) {
+                $(_js_code)
+            });
+            require(['plotly'], function(Plotly) {
+                window.Plotly = Plotly;
+            });
+        </script>
+    """
+
+    # if we're in IJulia call setupnotebook to load js and css
+    if isijulia()
+        display("text/html", _js_script)
+    end
+
+    # if isatom()
+    #     import Atom
+    #     Atom.@msg evaljs(_js_code)
+    # end
+
+  end
+  # TODO: other initialization
+end
+
+
+# ----------------------------------------------------------------
+
+const _plotly_legend_pos = KW(
+    :right => [1., 0.5],
+    :left => [0., 0.5],
+    :top => [0.5, 1.],
+    :bottom => [0.5, 0.],
+    :bottomleft => [0., 0.],
+    :bottomright => [1., 0.],
+    :topright => [1., 1.],
+    :topleft => [0., 1.]
+    )
+
+plotly_legend_pos(pos::Symbol) = get(_plotly_legend_pos, pos, [1.,1.])
+plotly_legend_pos{S<:Real, T<:Real}(v::Tuple{S,T}) = v
+
+function plotly_font(font::Font, color = font.color)
+    KW(
+        :family => font.family,
+        :size   => round(Int, font.pointsize*1.4),
+        :color  => rgba_string(color),
+    )
+end
+
+
+function plotly_annotation_dict(x, y, val; xref="paper", yref="paper")
+    KW(
+        :text => val,
+        :xref => xref,
+        :x => x,
+        :yref => xref,
+        :y => y,
+        :showarrow => false,
+    )
+end
+
+function plotly_annotation_dict(x, y, ptxt::PlotText; xref="paper", yref="paper")
+    merge(plotly_annotation_dict(x, y, ptxt.str; xref=xref, yref=yref), KW(
+        :font => plotly_font(ptxt.font),
+        :xanchor => ptxt.font.halign == :hcenter ? :center : ptxt.font.halign,
+        :yanchor => ptxt.font.valign == :vcenter ? :middle : ptxt.font.valign,
+        :rotation => -ptxt.font.rotation,
+    ))
+end
+
+# function get_annotation_dict_for_arrow(d::KW, xyprev::Tuple, xy::Tuple, a::Arrow)
+#     xdiff = xyprev[1] - xy[1]
+#     ydiff = xyprev[2] - xy[2]
+#     dist = sqrt(xdiff^2 + ydiff^2)
+#     KW(
+#         :showarrow => true,
+#         :x => xy[1],
+#         :y => xy[2],
+#         # :ax => xyprev[1] - xy[1],
+#         # :ay => xy[2] - xyprev[2],
+#         # :ax => 0,
+#         # :ay => -40,
+#         :ax => 10xdiff / dist,
+#         :ay => -10ydiff / dist,
+#         :arrowcolor => rgba_string(d[:linecolor]),
+#         :xref => "x",
+#         :yref => "y",
+#         :arrowsize => 10a.headwidth,
+#         # :arrowwidth => a.headlength,
+#         :arrowwidth => 0.1,
+#     )
+# end
+
+function plotly_scale(scale::Symbol)
+    if scale == :log10
+        "log"
+    else
+        "-"
+    end
+end
+
+function shrink_by(lo, sz, ratio)
+    amt = 0.5 * (1.0 - ratio) * sz
+    lo + amt, sz - 2amt
+end
+
+function plotly_apply_aspect_ratio(sp::Subplot, plotarea, pcts)
+    aspect_ratio = sp[:aspect_ratio]
+    if aspect_ratio != :none
+        if aspect_ratio == :equal
+            aspect_ratio = 1.0
+        end
+        xmin,xmax = axis_limits(sp[:xaxis])
+        ymin,ymax = axis_limits(sp[:yaxis])
+        want_ratio = ((xmax-xmin) / (ymax-ymin)) / aspect_ratio
+        parea_ratio = width(plotarea) / height(plotarea)
+        if want_ratio > parea_ratio
+            # need to shrink y
+            ratio = parea_ratio / want_ratio
+            pcts[2], pcts[4] = shrink_by(pcts[2], pcts[4], ratio)
+        elseif want_ratio < parea_ratio
+            # need to shrink x
+            ratio = want_ratio / parea_ratio
+            pcts[1], pcts[3] = shrink_by(pcts[1], pcts[3], ratio)
+        end
+        pcts
+    end
+    pcts
+end
+
+
+# this method gets the start/end in percentage of the canvas for this axis direction
+function plotly_domain(sp::Subplot, letter)
+    figw, figh = sp.plt[:size]
+    pcts = bbox_to_pcts(sp.plotarea, figw*px, figh*px)
+    pcts = plotly_apply_aspect_ratio(sp, sp.plotarea, pcts)
+    i1,i2 = (letter == :x ? (1,3) : (2,4))
+    [pcts[i1], pcts[i1]+pcts[i2]]
+end
+
+
+function plotly_axis(axis::Axis, sp::Subplot)
+    letter = axis[:letter]
+    ax = KW(
+        :title      => axis[:guide],
+        :showgrid   => sp[:grid],
+        :zeroline   => false,
+        :ticks      => "inside",
+    )
+
+    if letter in (:x,:y)
+        ax[:domain] = plotly_domain(sp, letter)
+        ax[:anchor] = "$(letter==:x ? :y : :x)$(plotly_subplot_index(sp))"
+    end
+
+    ax[:tickangle] = -axis[:rotation]
+
+    if !(axis[:ticks] in (nothing, :none))
+        ax[:titlefont] = plotly_font(axis[:guidefont], axis[:foreground_color_guide])
+        ax[:type] = plotly_scale(axis[:scale])
+        ax[:tickfont] = plotly_font(axis[:tickfont], axis[:foreground_color_text])
+        ax[:tickcolor] = rgba_string(axis[:foreground_color_border])
+        ax[:linecolor] = rgba_string(axis[:foreground_color_border])
+
+        # lims
+        lims = axis[:lims]
+        if lims != :auto && limsType(lims) == :limits
+            ax[:range] = map(scalefunc(axis[:scale]), lims)
+        end
+
+        # flip
+        if axis[:flip]
+            ax[:autorange] = "reversed"
+        end
+
+        # ticks
+        ticks = get_ticks(axis)
+        if ticks != :auto
+            ttype = ticksType(ticks)
+            if ttype == :ticks
+                ax[:tickmode] = "array"
+                ax[:tickvals] = ticks
+            elseif ttype == :ticks_and_labels
+                ax[:tickmode] = "array"
+                ax[:tickvals], ax[:ticktext] = ticks
+            end
+        end
+    else
+        ax[:showticklabels] = false
+        ax[:showgrid] = false
+    end
+
+    ax
+end
+
+function plotly_layout(plt::Plot)
+    d_out = KW()
+
+    w, h = plt[:size]
+    d_out[:width], d_out[:height] = w, h
+    d_out[:paper_bgcolor] = rgba_string(plt[:background_color_outside])
+    d_out[:margin] = KW(:l=>0, :b=>0, :r=>0, :t=>20)
+
+    d_out[:annotations] = KW[]
+
+    for sp in plt.subplots
+        spidx = plotly_subplot_index(sp)
+
+
+        # add an annotation for the title... positioned horizontally relative to plotarea,
+        # but vertically just below the top of the subplot bounding box
+        if sp[:title] != ""
+            bb = plotarea(sp)
+            tpos = sp[:title_location]
+            xmm = if tpos == :left
+                left(bb)
+            elseif tpos == :right
+                right(bb)
+            else
+                0.5 * (left(bb) + right(bb))
+            end
+            titlex, titley = xy_mm_to_pcts(xmm, top(bbox(sp)), w*px, h*px)
+            titlefont = font(sp[:titlefont], :top, sp[:foreground_color_title])
+            push!(d_out[:annotations], plotly_annotation_dict(titlex, titley, text(sp[:title], titlefont)))
+        end
+
+        d_out[:plot_bgcolor] = rgba_string(sp[:background_color_inside])
+
+        # if any(is3d, seriesargs)
+        if is3d(sp)
+            d_out[:scene] = KW(
+                Symbol("xaxis$spidx") => plotly_axis(sp[:xaxis], sp),
+                Symbol("yaxis$spidx") => plotly_axis(sp[:yaxis], sp),
+                Symbol("zaxis$spidx") => plotly_axis(sp[:zaxis], sp),
+            )
+        else
+            d_out[Symbol("xaxis$spidx")] = plotly_axis(sp[:xaxis], sp)
+            d_out[Symbol("yaxis$spidx")] = plotly_axis(sp[:yaxis], sp)
+        end
+
+        # legend
+        d_out[:showlegend] = sp[:legend] != :none
+        xpos,ypos = plotly_legend_pos(sp[:legend])
+        if sp[:legend] != :none
+            d_out[:legend] = KW(
+                :bgcolor  => rgba_string(sp[:background_color_legend]),
+                :bordercolor => rgba_string(sp[:foreground_color_legend]),
+                :font     => plotly_font(sp[:legendfont], sp[:foreground_color_legend]),
+                :x => xpos,
+                :y => ypos
+            )
+        end
+
+        # annotations
+        append!(d_out[:annotations], KW[plotly_annotation_dict(ann...; xref = "x$spidx", yref = "y$spidx") for ann in sp[:annotations]])
+
+        # series_annotations
+        for series in series_list(sp)
+            anns = series[:series_annotations]
+            for (xi,yi,str,fnt) in EachAnn(anns, series[:x], series[:y])
+                push!(d_out[:annotations], plotly_annotation_dict(
+                    xi,
+                    yi,
+                    PlotText(str,fnt); xref = "x$spidx", yref = "y$spidx")
+                )
+            end
+        end
+
+        # # arrows
+        # for sargs in seriesargs
+        #     a = sargs[:arrow]
+        #     if sargs[:seriestype] in (:path, :line) && typeof(a) <: Arrow
+        #         add_arrows(sargs[:x], sargs[:y]) do xyprev, xy
+        #             push!(d_out[:annotations], get_annotation_dict_for_arrow(sargs, xyprev, xy, a))
+        #         end
+        #     end
+        # end
+
+        if ispolar(sp)
+            d_out[:direction] = "counterclockwise"
+        end
+
+        d_out
+    end
+
+    # turn off hover if nothing's using it
+    if all(series -> series.d[:hover] in (false,:none), plt.series_list)
+        d_out[:hovermode] = "none"
+    end
+
+    d_out
+end
+
+function plotly_layout_json(plt::Plot)
+    JSON.json(plotly_layout(plt))
+end
+
+
+function plotly_colorscale(grad::ColorGradient, α)
+    [[grad.values[i], rgb_string(grad.colors[i])] for i in 1:length(grad.colors)]
+end
+plotly_colorscale(c, α) = plotly_colorscale(cgrad(alpha=α), α)
+# plotly_colorscale(c, alpha = nothing) = plotly_colorscale(cgrad(), alpha)
+
+const _plotly_markers = KW(
+    :rect       => "square",
+    :xcross     => "x",
+    :x          => "x",
+    :utriangle  => "triangle-up",
+    :dtriangle  => "triangle-down",
+    :star5      => "star-triangle-up",
+    :vline      => "line-ns",
+    :hline      => "line-ew",
+)
+
+function plotly_subplot_index(sp::Subplot)
+    spidx = sp[:subplot_index]
+    spidx == 1 ? "" : spidx
+end
+
+
+# the Shape contructor will automatically close the shape. since we need it closed,
+# we split by NaNs and then construct/destruct the shapes to get the closed coords
+function plotly_close_shapes(x, y)
+    xs, ys = nansplit(x), nansplit(y)
+    for i=1:length(xs)
+        shape = Shape(xs[i], ys[i])
+        xs[i], ys[i] = coords(shape)
+    end
+    nanvcat(xs), nanvcat(ys)
+end
+
+plotly_data(v) = collect(v)
+plotly_data(surf::Surface) = surf.surf
+plotly_data{R<:Rational}(v::AbstractArray{R}) = float(v)
+
+plotly_surface_data(series::Series, a::AbstractVector) = a
+plotly_surface_data(series::Series, a::AbstractMatrix) = transpose_z(series, a, false)
+plotly_surface_data(series::Series, a::Surface) = plotly_surface_data(series, a.surf)
+
+# get a dictionary representing the series params (d is the Plots-dict, d_out is the Plotly-dict)
+function plotly_series(plt::Plot, series::Series)
+    st = series[:seriestype]
+    if st == :shape
+        return plotly_series_shapes(plt, series)
+    end
+
+    sp = series[:subplot]
+    d_out = KW()
+
+    # these are the axes that the series should be mapped to
+    spidx = plotly_subplot_index(sp)
+    d_out[:xaxis] = "x$spidx"
+    d_out[:yaxis] = "y$spidx"
+    d_out[:showlegend] = should_add_to_legend(series)
+
+    x, y = plotly_data(series[:x]), plotly_data(series[:y])
+    d_out[:name] = series[:label]
+
+    isscatter = st in (:scatter, :scatter3d, :scattergl)
+    hasmarker = isscatter || series[:markershape] != :none
+    hasline = st in (:path, :path3d)
+
+    # for surface types, set the data
+    if st in (:heatmap, :contour, :surface, :wireframe)
+        for letter in [:x,:y,:z]
+            d_out[letter] = plotly_surface_data(series, series[letter])
+        end
+    end
+
+    # set the "type"
+    if st in (:path, :scatter, :scattergl)
+        d_out[:type] = st==:scattergl ? "scattergl" : "scatter"
+        d_out[:mode] = if hasmarker
+            hasline ? "lines+markers" : "markers"
+        else
+            hasline ? "lines" : "none"
+        end
+        if series[:fillrange] == true || series[:fillrange] == 0
+            d_out[:fill] = "tozeroy"
+            d_out[:fillcolor] = rgba_string(series[:fillcolor])
+        elseif !(series[:fillrange] in (false, nothing))
+            warn("fillrange ignored... plotly only supports filling to zero. fillrange: $(series[:fillrange])")
+        end
+        d_out[:x], d_out[:y] = x, y
+
+    elseif st == :bar
+        d_out[:type] = "bar"
+        d_out[:x], d_out[:y], d_out[:orientation] = if isvertical(series)
+            x, y, "v"
+        else
+            y, x, "h"
+        end
+        d_out[:marker] = KW(:color => rgba_string(series[:fillcolor]))
+
+    elseif st == :heatmap
+        d_out[:type] = "heatmap"
+        # d_out[:x], d_out[:y], d_out[:z] = series[:x], series[:y], transpose_z(series, series[:z].surf, false)
+        d_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
+
+    elseif st == :contour
+        d_out[:type] = "contour"
+        # d_out[:x], d_out[:y], d_out[:z] = series[:x], series[:y], transpose_z(series, series[:z].surf, false)
+        # d_out[:showscale] = series[:colorbar] != :none
+        d_out[:ncontours] = series[:levels]
+        d_out[:contours] = KW(:coloring => series[:fillrange] != nothing ? "fill" : "lines")
+        d_out[:colorscale] = plotly_colorscale(series[:linecolor], series[:linealpha])
+
+    elseif st in (:surface, :wireframe)
+        d_out[:type] = "surface"
+        # d_out[:x], d_out[:y], d_out[:z] = series[:x], series[:y], transpose_z(series, series[:z].surf, false)
+        if st == :wireframe
+            d_out[:hidesurface] = true
+            wirelines = KW(
+                :show => true,
+                :color => rgba_string(series[:linecolor]),
+                :highlightwidth => series[:linewidth],
+            )
+            d_out[:contours] = KW(:x => wirelines, :y => wirelines, :z => wirelines)
+        else
+            d_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
+        end
+
+    elseif st == :pie
+        d_out[:type] = "pie"
+        d_out[:labels] = pie_labels(sp, series)
+        d_out[:values] = y
+        d_out[:hoverinfo] = "label+percent+name"
+
+    elseif st in (:path3d, :scatter3d)
+        d_out[:type] = "scatter3d"
+        d_out[:mode] = if hasmarker
+            hasline ? "lines+markers" : "markers"
+        else
+            hasline ? "lines" : "none"
+        end
+        d_out[:x], d_out[:y] = x, y
+        d_out[:z] = plotly_data(series[:z])
+
+    else
+        warn("Plotly: seriestype $st isn't supported.")
+        return KW()
+    end
+
+    # add "marker"
+    if hasmarker
+        d_out[:marker] = KW(
+            :symbol => get(_plotly_markers, series[:markershape], string(series[:markershape])),
+            # :opacity => series[:markeralpha],
+            :size => 2 * series[:markersize],
+            # :color => rgba_string(series[:markercolor]),
+            :line => KW(
+                :color => rgba_string(series[:markerstrokecolor]),
+                :width => series[:markerstrokewidth],
+            ),
+        )
+
+        # gotta hack this (for now?) since plotly can't handle rgba values inside the gradient
+        d_out[:marker][:color] = if series[:marker_z] == nothing
+            rgba_string(series[:markercolor])
+        else
+            # grad = ColorGradient(series[:markercolor], alpha=series[:markeralpha])
+            grad = series[:markercolor]
+            zmin, zmax = extrema(series[:marker_z])
+            [rgba_string(grad[(zi - zmin) / (zmax - zmin)]) for zi in series[:marker_z]]
+        end
+    end
+
+    # add "line"
+    if hasline
+        d_out[:line] = KW(
+            :color => rgba_string(series[:linecolor]),
+            :width => series[:linewidth],
+            :shape => if st == :steppre
+                "vh"
+            elseif st == :steppost
+                "hv"
+            else
+                "linear"
+            end,
+            :dash => string(series[:linestyle]),
+            # :dash => "solid",
+        )
+    end
+
+    plotly_polar!(d_out, series)
+    plotly_hover!(d_out, series[:hover])
+
+    [d_out]
+end
+
+function plotly_series_shapes(plt::Plot, series::Series)
+    d_outs = []
+
+    # TODO: create a d_out for each polygon
+    # x, y = series[:x], series[:y]
+
+    # these are the axes that the series should be mapped to
+    spidx = plotly_subplot_index(series[:subplot])
+    base_d = KW()
+    base_d[:xaxis] = "x$spidx"
+    base_d[:yaxis] = "y$spidx"
+    base_d[:name] = series[:label]
+    # base_d[:legendgroup] = series[:label]
+
+    x, y = plotly_data(series[:x]), plotly_data(series[:y])
+    for (i,rng) in enumerate(iter_segments(x,y))
+        length(rng) < 2 && continue
+
+        # to draw polygons, we actually draw lines with fill
+        d_out = merge(base_d, KW(
+            :type => "scatter",
+            :mode => "lines",
+            :x => vcat(x[rng], x[rng[1]]),
+            :y => vcat(y[rng], y[rng[1]]),
+            :fill => "tozeroy",
+            :fillcolor => rgba_string(cycle(series[:fillcolor], i)),
+        ))
+        if series[:markerstrokewidth] > 0
+            d_out[:line] = KW(
+                :color => rgba_string(cycle(series[:linecolor], i)),
+                :width => series[:linewidth],
+                :dash => string(series[:linestyle]),
+            )
+        end
+        d_out[:showlegend] = i==1 ? should_add_to_legend(series) : false
+        plotly_polar!(d_out, series)
+        plotly_hover!(d_out, cycle(series[:hover], i))
+        push!(d_outs, d_out)
+    end
+    d_outs
+end
+
+function plotly_polar!(d_out::KW, series::Series)
+    # convert polar plots x/y to theta/radius
+    if ispolar(series[:subplot])
+        d_out[:t] = rad2deg(pop!(d_out, :x))
+        d_out[:r] = pop!(d_out, :y)
+    end
+end
+
+function plotly_hover!(d_out::KW, hover)
+    # hover text
+    if hover in (:none, false)
+        d_out[:hoverinfo] = "none"
+    elseif hover != nothing
+        d_out[:hoverinfo] = "text"
+        d_out[:text] = hover
+    end
+end
+
+# get a list of dictionaries, each representing the series params
+function plotly_series_json(plt::Plot)
+    slist = []
+    for series in plt.series_list
+        append!(slist, plotly_series(plt, series))
+    end
+    JSON.json(slist)
+    # JSON.json(map(series -> plotly_series(plt, series), plt.series_list))
+end
+
+# ----------------------------------------------------------------
+
+function html_head(plt::Plot{PlotlyBackend})
+    "<script src=\"$(joinpath(dirname(@__FILE__),"..","..","deps","plotly-latest.min.js"))\"></script>"
+end
+
+function html_body(plt::Plot{PlotlyBackend}, style = nothing)
+    if style == nothing
+        w, h = plt[:size]
+        style = "width:$(w)px;height:$(h)px;"
+    end
+    uuid = Base.Random.uuid4()
+    html = """
+        <div id=\"$(uuid)\" style=\"$(style)\"></div>
+        <script>
+        PLOT = document.getElementById('$(uuid)');
+        Plotly.plot(PLOT, $(plotly_series_json(plt)), $(plotly_layout_json(plt)));
+        </script>
+    """
+    html
+end
+
+function js_body(plt::Plot{PlotlyBackend}, uuid)
+    js = """
+          PLOT = document.getElementById('$(uuid)');
+          Plotly.plot(PLOT, $(plotly_series_json(plt)), $(plotly_layout_json(plt)));
+    """
+end
+
+
+# ----------------------------------------------------------------
+
+
+function _show(io::IO, ::MIME"image/png", plt::Plot{PlotlyBackend})
+    # show_png_from_html(io, plt)
+    error("png output from the plotly backend is not supported.  Please use plotlyjs instead.")
+end
+
+function _show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyBackend})
+    write(io, html_head(plt) * html_body(plt))
+end
+
+function _display(plt::Plot{PlotlyBackend})
+    standalone_html_window(plt)
+end

src/backends/plotlyjs.jl

@@ -0,0 +1,110 @@
+
+# https://github.com/spencerlyon2/PlotlyJS.jl
+
+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
+    if !Plots.is_installed("Rsvg")
+        Pkg.add("Rsvg")
+    end
+    import Blink
+    Blink.AtomShell.install()
+    """
+end
+
+
+function _initialize_backend(::PlotlyJSBackend; kw...)
+    @eval begin
+        import PlotlyJS
+        export PlotlyJS
+    end
+
+    # # override IJulia inline display
+    # if isijulia()
+    #     IJulia.display_dict(plt::AbstractPlot{PlotlyJSBackend}) = IJulia.display_dict(plt.o)
+    # end
+end
+
+# ---------------------------------------------------------------------------
+
+
+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})
+    show(io, MIME("text/html"), plt.o)
+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

src/backends/qwt.jl

@@ -1,283 +0,0 @@
-
-# https://github.com/tbreloff/Qwt.jl
-
-
-# -------------------------------
-
-@compat const _qwtAliases = Dict(
-    :nbins => :heatmap_n,
-    :fillrange => :fillto,
-    :linewidth => :width,
-    :markershape => :marker,
-    :hexbin => :heatmap,
-    :path => :line,
-    :steppost => :step,
-    :steppre => :stepinverted,
-    :star5 => :star1,
-    :star8 => :star2,
-  )
-
-function fixcolors(d::Dict)
-  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{QwtPackage}, iscreating::Bool; kw...)
-  d = Dict(kw)
-  lt = d[:linetype]
-  if lt == :scatter
-    d[:linetype] = :none
-    if d[:markershape] == :none
-      d[:markershape] = :ellipse
-    end
-
-  elseif lt in (:hline, :vline)
-    addLineMarker(plt, d)
-    d[:linetype] = :none
-    d[:markershape] = :ellipse
-    d[:markersize] = 1
-    if lt == :vline
-      d[:x], d[:y] = d[:y], d[:x]
-    end
-
-  elseif !iscreating && lt == :bar
-    d = barHack(; kw...)
-  elseif !iscreating && lt == :hist
-    d = barHack(; histogramHack(; kw...)...)
-  end
-
-  replaceQwtAliases(d, :linetype)
-  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 plot(pkg::QwtPackage; kw...)
-  d = Dict(kw)
-  fixcolors(d)
-  dumpdict(d,"\n\n!!! plot")
-  o = Qwt.plot(zeros(0,0); d..., show=false)
-  plt = Plot(o, pkg, 0, d, Dict[])
-  plt
-end
-
-function plot!(::QwtPackage, plt::Plot; kw...)
-  d = adjustQwtKeywords(plt, false; kw...)
-  fixcolors(d)
-  dumpdict(d,"\n\n!!! plot!")
-  Qwt.oplot(plt.o; d...)
-  push!(plt.seriesargs, d)
-  plt
-end
-
-
-# ----------------------------------------------------------------
-
-function updateLimsAndTicks(plt::Plot{QwtPackage}, d::Dict, 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) <: @compat(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 supportedScales() || warn("Unsupported scale type: ", scaletype)
-  end
-
-end
-
-
-function updatePlotItems(plt::Plot{QwtPackage}, d::Dict)
-  haskey(d, :title) && Qwt.title(plt.o, d[:title])
-  haskey(d, :xlabel) && Qwt.xlabel(plt.o, d[:xlabel])
-  haskey(d, :ylabel) && Qwt.ylabel(plt.o, d[:ylabel])
-  updateLimsAndTicks(plt, d, true)
-  updateLimsAndTicks(plt, d, false)
-end
-
-function updatePositionAndSize(plt::PlottingObject{QwtPackage}, d::Dict)
-  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{QwtPackage}, d::Dict)
-  for yi in d[:y]
-    marker = Qwt.QWT.QwtPlotMarker()
-    ishorizontal = (d[:linetype] == :hline)
-    marker[:setLineStyle](ishorizontal ? 1 : 2)
-    marker[ishorizontal ? :setYValue : :setXValue](yi)
-    qcolor = Qwt.convertRGBToQColor(getColor(d[:color]))
-    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::@compat(AbstractString))
-  marker = Qwt.QWT.QwtPlotMarker()
-  marker[:setValue](x, y)
-  marker[:setLabel](Qwt.QWT.QwtText(val))
-  marker[:attach](plt.o.widget)
-end
-
-function addAnnotations{X,Y,V}(plt::Plot{QwtPackage}, anns::AVec{@compat(Tuple{X,Y,V})})
-  for ann in anns
-    createQwtAnnotation(plt, ann...)
-  end
-end
-
-# ----------------------------------------------------------------
-
-# accessors for x/y data
-
-function Base.getindex(plt::Plot{QwtPackage}, i::Int)
-  series = plt.o.lines[i]
-  series.x, series.y
-end
-
-function Base.setindex!(plt::Plot{QwtPackage}, xy::Tuple, i::Integer)
-  series = plt.o.lines[i]
-  series.x, series.y = xy
-  plt
-end
-
-
-# -------------------------------
-
-# savepng(::QwtPackage, plt::PlottingObject, fn::@compat(AbstractString), args...) = Qwt.savepng(plt.o, fn)
-
-# -------------------------------
-
-# create the underlying object (each backend will do this differently)
-function buildSubplotObject!(subplt::Subplot{QwtPackage}, 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, getinitargs(subplt,1)[:size]...)
-  # Qwt.moveToLastScreen(subplt.o)  # hack so it goes to my center monitor... sorry
-  true
-end
-
-function handleLinkInner(plt::Plot{QwtPackage}, isx::Bool)
-  warn("handleLinkInner isn't implemented for qwt")
-end
-
-function expandLimits!(lims, plt::Plot{QwtPackage}, isx::Bool)
-  for series in plt.o.lines
-    expandLimits!(lims, isx ? series.x : series.y)
-  end
-end
-
-
-function handleLinkInner(plt::Plot{QwtPackage}, isx::Bool)
-end
-
-
-# ----------------------------------------------------------------
-
-function Base.writemime(io::IO, ::MIME"image/png", plt::Plot{QwtPackage})
-  Qwt.refresh(plt.o)
-  Qwt.savepng(plt.o, "/tmp/dfskjdhfkh.png")
-  write(io, readall("/tmp/dfskjdhfkh.png"))
-end
-
-function Base.writemime(io::IO, ::MIME"image/png", subplt::Subplot{QwtPackage})
-  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{QwtPackage})
-  Qwt.refresh(plt.o)
-  Qwt.showwidget(plt.o)
-end
-
-function Base.display(::PlotsDisplay, subplt::Subplot{QwtPackage})
-  for plt in subplt.plts
-    Qwt.refresh(plt.o)
-  end
-  # iargs = getinitargs(subplt,1)
-  # # iargs = subplt.initargs
-  # Qwt.resizewidget(subplt.o, iargs[:size]...)
-  # Qwt.movewidget(subplt.o, iargs[:pos]...)
-  Qwt.showwidget(subplt.o)
-end
-

src/backends/supported.jl

@@ -1,313 +0,0 @@
-
-supportedArgs(::GadflyPackage) = [
-    :annotation,
-    # :axis,
-    :background_color,
-    :color,
-    :color_palette,
-    :fillrange,
-    :fillcolor,
-    :fillopacity,
-    :foreground_color,
-    :group,
-    :label,
-    :layout,
-    :legend,
-    :linestyle,
-    :linetype,
-    :linewidth,
-    :lineopacity,
-    :markershape,
-    :markercolor,
-    :markersize,
-    :markeropacity,
-    :n,
-    :nbins,
-    :nc,
-    :nr,
-    # :pos,
-    :smooth,
-    :show,
-    :size,
-    :title,
-    :windowtitle,
-    :x,
-    :xlabel,
-    :xlims,
-    :xticks,
-    :y,
-    :ylabel,
-    :ylims,
-    # :yrightlabel,
-    :yticks,
-    :xscale,
-    :yscale,
-    :xflip,
-    :yflip,
-    :z,
-    :tickfont,
-    :guidefont,
-    :legendfont,
-    :grid,
-    :surface,
-    :nlevels,
-  ]
-supportedAxes(::GadflyPackage) = [:auto, :left]
-supportedTypes(::GadflyPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :contour]
-supportedStyles(::GadflyPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
-supportedMarkers(::GadflyPackage) = vcat(_allMarkers, Shape)
-supportedScales(::GadflyPackage) = [:identity, :log, :log2, :log10, :asinh, :sqrt]
-
-
-# --------------------------------------------------------------------------------------
-
-
-supportedArgs(::ImmersePackage) = supportedArgs(GadflyPackage())
-supportedAxes(::ImmersePackage) = supportedAxes(GadflyPackage())
-supportedTypes(::ImmersePackage) = supportedTypes(GadflyPackage())
-supportedStyles(::ImmersePackage) = supportedStyles(GadflyPackage())
-supportedMarkers(::ImmersePackage) = supportedMarkers(GadflyPackage())
-supportedScales(::ImmersePackage) = supportedScales(GadflyPackage())
-
-# --------------------------------------------------------------------------------------
-
-
-
-supportedArgs(::PyPlotPackage) = [
-    :annotation,
-    :axis,
-    :background_color,
-    :color,
-    :color_palette,
-    :fillrange,
-    :fillcolor,
-    :foreground_color,
-    :group,
-    :label,
-    :layout,
-    :legend,
-    :linestyle,
-    :linetype,
-    :linewidth,
-    :markershape,
-    :markercolor,
-    :markersize,
-    :n,
-    :nbins,
-    :nc,
-    :nr,
-    # :pos,
-    :smooth,
-    # :ribbon,
-    :show,
-    :size,
-    :title,
-    :windowtitle,
-    :x,
-    :xlabel,
-    :xlims,
-    :xticks,
-    :y,
-    :ylabel,
-    :ylims,
-    :yrightlabel,
-    :yticks,
-    :xscale,
-    :yscale,
-    :xflip,
-    :yflip,
-    :z,
-    :tickfont,
-    :guidefont,
-    :legendfont,
-    :grid,
-    :surface,
-    :nlevels,
-    :fillopacity,
-    :lineopacity,
-    :markeropacity,
-  ]
-supportedAxes(::PyPlotPackage) = _allAxes
-supportedTypes(::PyPlotPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :contour]
-supportedStyles(::PyPlotPackage) = [:auto, :solid, :dash, :dot, :dashdot]
-# supportedMarkers(::PyPlotPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :hexagon]
-supportedMarkers(::PyPlotPackage) = vcat(_allMarkers, Shape)
-supportedScales(::PyPlotPackage) = [:identity, :log, :log2, :log10]
-subplotSupported(::PyPlotPackage) = true
-
-
-# --------------------------------------------------------------------------------------
-
-
-
-supportedArgs(::QwtPackage) = [
-    :annotation,
-    # :args,
-    :axis,
-    :background_color,
-    :color,
-    :color_palette,
-    :fillrange,
-    :fillcolor,
-    :foreground_color,
-    :group,
-    # :heatmap_c,
-    # :kwargs,
-    :label,
-    :layout,
-    :legend,
-    :linestyle,
-    :linetype,
-    :linewidth,
-    :markershape,
-    :markercolor,
-    :markersize,
-    :n,
-    :nbins,
-    :nc,
-    :nr,
-    :pos,
-    :smooth,
-    # :ribbon,
-    :show,
-    :size,
-    :title,
-    :windowtitle,
-    :x,
-    :xlabel,
-    :xlims,
-    :xticks,
-    :y,
-    :ylabel,
-    :ylims,
-    :yrightlabel,
-    :yticks,
-    :xscale,
-    :yscale,
-    # :xflip,
-    # :yflip,
-    # :z,
-  ]
-supportedTypes(::QwtPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline]
-supportedMarkers(::QwtPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :star8, :hexagon]
-supportedScales(::QwtPackage) = [:identity, :log10]
-
-
-# --------------------------------------------------------------------------------------
-
-
-supportedArgs(::UnicodePlotsPackage) = [
-    # :annotation,
-    # :args,
-    # :axis,
-    # :background_color,
-    # :color,
-    # :fill,
-    # :foreground_color,
-    :group,
-    # :heatmap_c,
-    # :kwargs,
-    :label,
-    # :layout,
-    :legend,
-    :linestyle,
-    :linetype,
-    # :linewidth,
-    :markershape,
-    # :markercolor,
-    # :markersize,
-    # :n,
-    :nbins,
-    # :nc,
-    # :nr,
-    # :pos,
-    # :reg,
-    # :ribbon,
-    :show,
-    :size,
-    :title,
-    :windowtitle,
-    :x,
-    :xlabel,
-    :xlims,
-    # :xticks,
-    :y,
-    :ylabel,
-    :ylims,
-    # :yrightlabel,
-    # :yticks,
-    # :xscale,
-    # :yscale,
-    # :xflip,
-    # :yflip,
-    # :z,
-  ]
-supportedAxes(::UnicodePlotsPackage) = [:auto, :left]
-supportedTypes(::UnicodePlotsPackage) = [:none, :line, :path, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline]
-supportedStyles(::UnicodePlotsPackage) = [:auto, :solid]
-supportedMarkers(::UnicodePlotsPackage) = [:none, :auto, :ellipse]
-supportedScales(::UnicodePlotsPackage) = [:identity]
-
-
-
-
-# --------------------------------------------------------------------------------------
-
-
-supportedArgs(::WinstonPackage) = [
-    :annotation,
-    # :args,
-    # :axis,
-    # :background_color,
-    :color,
-    :color_palette,
-    :fillrange,
-    :fillcolor,
-    # :foreground_color,
-    :group,
-    # :heatmap_c,
-    # :kwargs,
-    :label,
-    # :layout,
-    :legend,
-    :linestyle,
-    :linetype,
-    :linewidth,
-    :markershape,
-    :markercolor,
-    :markersize,
-    # :n,
-    :nbins,
-    # :nc,
-    # :nr,
-    # :pos,
-    :smooth,
-    # :ribbon,
-    :show,
-    :size,
-    :title,
-    :windowtitle,
-    :x,
-    :xlabel,
-    :xlims,
-    # :xticks,
-    :y,
-    :ylabel,
-    :ylims,
-    # :yrightlabel,
-    # :yticks,
-    :xscale,
-    :yscale,
-    # :xflip,
-    # :yflip,
-    # :z,
-  ]
-supportedAxes(::WinstonPackage) = [:auto, :left]
-supportedTypes(::WinstonPackage) = [:none, :line, :path, :sticks, :scatter, :hist, :bar]
-supportedStyles(::WinstonPackage) = [:auto, :solid, :dash, :dot, :dashdot]
-supportedMarkers(::WinstonPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5]
-supportedScales(::WinstonPackage) = [:identity, :log10]
-subplotSupported(::WinstonPackage) = false
-
-
-# --------------------------------------------------------------------------------------

src/backends/template.jl

@@ -1,104 +1,75 @@
 
-# TODO: find/replace all [PkgName] with CamelCase, all [pkgname] with lowercase
+# TODO: find/replace all [PkgName] with CamelCase
 
-# [WEBSITE]
+# [ADD BACKEND WEBSITE]
+
+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
 
 # ---------------------------------------------------------------------------
 
-# supportedArgs(::[PkgName]Package) = _allArgs
-supportedArgs(::[PkgName]Package) = [
-    :annotation,
-    # :args,
-    :axis,
-    :background_color,
-    :color,
-    :fillrange,
-    :fillcolor,
-    :foreground_color,
-    :group,
-    # :heatmap_c,
-    # :kwargs,
-    :label,
-    :layout,
-    :legend,
-    :linestyle,
-    :linetype,
-    :linewidth,
-    :markershape,
-    :markercolor,
-    :markersize,
-    :n,
-    :nbins,
-    :nc,
-    :nr,
-    # :pos,
-    :smooth,
-    # :ribbon,
-    :show,
-    :size,
-    :title,
-    :windowtitle,
-    :x,
-    :xlabel,
-    :xlims,
-    :xticks,
-    :y,
-    :ylabel,
-    :ylims,
-    # :yrightlabel,
-    :yticks,
-    # :xscale,
-    # :yscale,
-    # :xflip,
-    # :yflip,
-    # :z,
-  ]
-supportedAxes(::[PkgName]Package) = _allAxes
-supportedTypes(::[PkgName]Package) = _allTypes
-supportedStyles(::[PkgName]Package) = _allStyles
-supportedMarkers(::[PkgName]Package) = _allMarkers
-supportedScales(::[PkgName]Package) = _allScales
-subplotSupported(::[PkgName]Package) = false
+# Create the window/figure for this backend.
+function _create_backend_figure(plt::Plot{[PkgName]Backend})
+    nothing
+end
+
+# # this is called early in the pipeline, use it to make the plot current or something
+# function _prepare_plot_object(plt::Plot{[PkgName]Backend})
+# end
+
+# Set up the subplot within the backend object.
+function _initialize_subplot(plt::Plot{[PkgName]Backend}, sp::Subplot{[PkgName]Backend})
+end
 
 # ---------------------------------------------------------------------------
 
-function plot(pkg::[PkgName]Package; kw...)
-  d = Dict(kw)
-  # TODO: create the window/canvas/context that is the plot within the backend (call it `o`)
-  # TODO: initialize the plot... title, xlabel, bgcolor, etc
-  Plot(o, pkg, 0, d, Dict[])
+# Add one series to the underlying backend object.
+function _series_added(plt::Plot{[PkgName]Backend}, series::Series)
+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{[PkgName]Backend}, series::Series)
+end
+
+# ---------------------------------------------------------------------------
+
+# called just before updating layout bounding boxes... in case you need to prep
+# for the calcs
+function _before_layout_calcs(plt::Plot{[PkgName]Backend})
+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{[PkgName]Backend})
+    sp.minpad = (20mm, 5mm, 2mm, 10mm)
 end
 
 
-function plot!(::[PkgName]Package, plt::Plot; kw...)
-  d = Dict(kw)
-  # TODO: add one series to the underlying package
-  push!(plt.seriesargs, d)
-  plt
+# ----------------------------------------------------------------
+
+# Override this to update plot items (title, xlabel, etc), and add annotations (d[:annotations])
+function _update_plot_object(plt::Plot{[PkgName]Backend})
 end
 
 # ----------------------------------------------------------------
 
-# TODO: override this to update plot items (title, xlabel, etc) after creation
-function updatePlotItems(plt::Plot{[PkgName]Package}, d::Dict)
+# Write a png to io.  You could define methods for:
+    # "application/eps"         => "eps",
+    # "image/eps"               => "eps",
+    # "application/pdf"         => "pdf",
+    # "image/png"               => "png",
+    # "application/postscript"  => "ps",
+    # "image/svg+xml"           => "svg"
+function _show(io::IO, ::MIME"image/png", plt::Plot{[PkgName]Backend})
 end
 
-# ----------------------------------------------------------------
-
-function buildSubplotObject!(subplt::Subplot{[PkgName]Package})
-  # TODO: build the underlying Subplot object.  this is where you might layout the panes within a GUI window, for example
-end
-
-# ----------------------------------------------------------------
-
-function Base.writemime(io::IO, ::MIME"image/png", plt::PlottingObject{[PkgName]Package})
-  # TODO: write a png to io
-end
-
-function Base.display(::PlotsDisplay, plt::Plot{[PkgName]Package})
-  # TODO: display/show the plot
-end
-
-function Base.display(::PlotsDisplay, plt::Subplot{[PkgName]Package})
-  # TODO: display/show the subplot
+# Display/show the plot (open a GUI window, or browser page, for example).
+function _display(plt::Plot{[PkgName]Backend})
 end

src/backends/unicodeplots.jl

@@ -1,196 +1,214 @@
 
 # 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, 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()
+    KW(
+        :braille => UnicodePlots.BrailleCanvas,
+        :ascii => UnicodePlots.AsciiCanvas,
+        :block => UnicodePlots.BlockCanvas,
+        :dot => UnicodePlots.DotCanvas,
+        :density => UnicodePlots.DensityCanvas,
+    )
+end
+
 
 # do all the magic here... build it all at once, since we need to know about all the series at the very beginning
-function rebuildUnicodePlot!(plt::Plot)
+function rebuildUnicodePlot!(plt::Plot, width, height)
+    plt.o = []
 
-  # figure out the plotting area xlim = [xmin, xmax] and ylim = [ymin, ymax]
-  sargs = plt.seriesargs
-  iargs = plt.initargs
+    for sp in plt.subplots
+        xaxis = sp[:xaxis]
+        yaxis = sp[:yaxis]
+        xlim =  axis_limits(xaxis)
+        ylim =  axis_limits(yaxis)
 
-  # get the x/y limits
-  if get(iargs, :xlims, :auto) == :auto
-    xlim = [Inf, -Inf]
-    for d in sargs
-      expandLimits!(xlim, d[:x])
+        # make vectors
+        xlim = [xlim[1], xlim[2]]
+        ylim = [ylim[1], ylim[2]]
+
+        # we set x/y to have a single point, since we need to create the plot with some data.
+        # since this point is at the bottom left corner of the plot, it shouldn't actually be shown
+        x = Float64[xlim[1]]
+        y = Float64[ylim[1]]
+
+        # create a plot window with xlim/ylim set, but the X/Y vectors are outside the bounds
+        ct = _canvas_type[]
+        canvas_type = if ct == :auto
+            isijulia() ? UnicodePlots.AsciiCanvas : UnicodePlots.BrailleCanvas
+        else
+            _canvas_map()[ct]
+        end
+
+        # special handling for spy
+        if length(sp.series_list) == 1
+            series = sp.series_list[1]
+            if series[:seriestype] == :spy
+                push!(plt.o, UnicodePlots.spy(
+                    series[:z].surf,
+                    width = width,
+                    height = height,
+                    title = sp[:title],
+                    canvas = canvas_type
+                ))
+                continue
+            end
+        end
+
+        # # make it a bar canvas if plotting bar
+        # if any(series -> series[:seriestype] == :bar, series_list(sp))
+        #     canvas_type = UnicodePlots.BarplotGraphics
+        # end
+
+        o = UnicodePlots.Plot(x, y, canvas_type;
+            width = width,
+            height = height,
+            title = sp[:title],
+            xlim = xlim,
+            ylim = ylim,
+            border = isijulia() ? :ascii : :solid
+        )
+
+        # set the axis labels
+        UnicodePlots.xlabel!(o, xaxis[:guide])
+        UnicodePlots.ylabel!(o, yaxis[:guide])
+
+        # now use the ! functions to add to the plot
+        for series in series_list(sp)
+            addUnicodeSeries!(o, series.d, sp[:legend] != :none, xlim, ylim)
+        end
+
+        # save the object
+        push!(plt.o, o)
     end
-  else
-    xmin, xmax = iargs[:xlims]
-    xlim = [xmin, xmax]
-  end
-
-  if get(iargs, :ylims, :auto) == :auto
-    ylim = [Inf, -Inf]
-    for d in sargs
-      expandLimits!(ylim, d[:y])
-    end
-  else
-    ymin, ymax = iargs[:ylims]
-    ylim = [ymin, ymax]
-  end
-
-  # we set x/y to have a single point, since we need to create the plot with some data.
-  # since this point is at the bottom left corner of the plot, it shouldn't actually be shown
-  x = Float64[xlim[1]]
-  y = Float64[ylim[1]]
-
-  # create a plot window with xlim/ylim set, but the X/Y vectors are outside the bounds
-  width, height = iargs[:size]
-  o = UnicodePlots.createPlotWindow(x, y; width = width,
-                                height = height,
-                                title = iargs[:title],
-                                # labels = iargs[:legend],
-                                xlim = xlim,
-                                ylim = ylim)
-
-  # set the axis labels
-  UnicodePlots.xlabel!(o, iargs[:xlabel])
-  UnicodePlots.ylabel!(o, iargs[:ylabel])
-
-  # now use the ! functions to add to the plot
-  for d in sargs
-    addUnicodeSeries!(o, d, iargs[:legend], xlim, ylim)
-  end
-
-  # save the object
-  plt.o = o
 end
 
 
 # add a single series
-function addUnicodeSeries!(o, d::Dict, addlegend::Bool, xlim, ylim)
-
-  # get the function, or special handling for step/bar/hist
-  lt = d[:linetype]
-
-  # handle hline/vline separately
-  if lt in (:hline,:vline)
-    for yi in d[:y]
-      if lt == :hline
-        UnicodePlots.lineplot!(o, xlim, [yi,yi])
-      else
-        UnicodePlots.lineplot!(o, [yi,yi], ylim)
-      end
+function addUnicodeSeries!(o, d::KW, addlegend::Bool, xlim, ylim)
+    # get the function, or special handling for step/bar/hist
+    st = d[:seriestype]
+    if st == :histogram2d
+        UnicodePlots.densityplot!(o, d[:x], d[:y])
+        return
     end
-    return
-  end
 
-  stepstyle = :post
-  if lt == :path
-    func = UnicodePlots.lineplot!
-  elseif lt == :scatter || d[:markershape] != :none
-    func = UnicodePlots.scatterplot!
-  elseif lt == :steppost
-    func = UnicodePlots.stairs!
-  elseif lt == :steppre
-    func = UnicodePlots.stairs!
-    stepstyle = :pre
-  else
-    error("Linestyle $lt not supported by UnicodePlots")
-  end
-  
-  # get the series data and label
-  x, y = [collect(float(d[s])) for s in (:x, :y)]
-  label = addlegend ? d[:label] : ""
+    if st == :path
+        func = UnicodePlots.lineplot!
+    elseif st == :scatter || d[:markershape] != :none
+        func = UnicodePlots.scatterplot!
+    # elseif st == :bar
+    #     func = UnicodePlots.barplot!
+    elseif st == :shape
+        func = UnicodePlots.lineplot!
+    else
+        error("Linestyle $st not supported by UnicodePlots")
+    end
 
-  # if we happen to pass in allowed color symbols, great... otherwise let UnicodePlots decide
-  color = d[:color] in UnicodePlots.autoColors ? d[:color] : :auto
+    # get the series data and label
+    x, y = [collect(float(d[s])) for s in (:x, :y)]
+    label = addlegend ? d[:label] : ""
 
-  # add the series
-  func(o, x, y; color = color, name = label, style = stepstyle)
-end
+    # if we happen to pass in allowed color symbols, great... otherwise let UnicodePlots decide
+    color = d[:linecolor] in UnicodePlots.color_cycle ? d[:linecolor] : :auto
 
-
-function handlePlotColors(::UnicodePlotsPackage, d::Dict)
-  # TODO: something special for unicodeplots, since it doesn't take kindly to people messing with its color palette
-  d[:color_palette] = [RGB(0,0,0)]
+    # add the series
+    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
 
 # -------------------------------
 
+# since this is such a hack, it's only callable using `png`... should error during normal `show`
+function png(plt::AbstractPlot{UnicodePlotsBackend}, fn::AbstractString)
+    fn = addExtension(fn, "png")
 
-function plot(pkg::UnicodePlotsPackage; kw...)
-  plt = Plot(nothing, pkg, 0, Dict(kw), Dict[])
+    # make some whitespace and show the plot
+    println("\n\n\n\n\n\n")
+    gui(plt)
 
-  # do we want to give a new default size?
-  if !haskey(plt.initargs, :size) || plt.initargs[:size] == _plotDefaults[:size]
-    plt.initargs[:size] = (60,20)
-  end
+    # @osx_only begin
+    @static if is_apple()
+        # BEGIN HACK
 
-  plt
-end
+        # wait while the plot gets drawn
+        sleep(0.5)
 
-function plot!(::UnicodePlotsPackage, plt::Plot; kw...)
-  d = Dict(kw)
-  if d[:linetype] in (:sticks, :bar)
-    d = barHack(; d...)
-  elseif d[:linetype] == :hist
-    d = barHack(; histogramHack(; d...)...)
-  end
-  push!(plt.seriesargs, d)
-  plt
-end
+        # use osx screen capture when my terminal is maximized and cursor starts at the bottom (I know, right?)
+        # TODO: compute size of plot to adjust these numbers (or maybe implement something good??)
+        run(`screencapture -R50,600,700,420 $fn`)
 
-
-function updatePlotItems(plt::Plot{UnicodePlotsPackage}, d::Dict)
-  for k in (:title, :xlabel, :ylabel, :xlims, :ylims)
-    if haskey(d, k)
-      plt.initargs[k] = d[k]
+        # END HACK (phew)
+        return
     end
-  end
-end
 
-
-# -------------------------------
-
-# since this is such a hack, it's only callable using `png`... should error during normal `writemime`
-function png(plt::PlottingObject{UnicodePlotsPackage}, fn::@compat(AbstractString))
-  fn = addExtension(fn, "png")
-
-  # make some whitespace and show the plot
-  println("\n\n\n\n\n\n")
-  gui(plt)
-
-  @osx_only begin
-    # BEGIN HACK
-
-    # wait while the plot gets drawn
-    sleep(0.5)
-
-    # use osx screen capture when my terminal is maximized and cursor starts at the bottom (I know, right?)
-    # TODO: compute size of plot to adjust these numbers (or maybe implement something good??)
-    run(`screencapture -R50,600,700,420 $fn`)
-
-    # END HACK (phew)
-    return
-  end
-
-  error("Can only savepng on osx with UnicodePlots (though even then I wouldn't do it)")
+    error("Can only savepng on osx with UnicodePlots (though even then I wouldn't do it)")
 end
 
 # -------------------------------
 
 # we don't do very much for subplots... just stack them vertically
 
-function buildSubplotObject!(subplt::Subplot{UnicodePlotsPackage}, isbefore::Bool)
-  isbefore && return false
-  true
+function unicodeplots_rebuild(plt::Plot{UnicodePlotsBackend})
+    w, h = plt[:size]
+    plt.attr[:color_palette] = [RGB(0,0,0)]
+    rebuildUnicodePlot!(plt, div(w, 10), div(h, 20))
+end
+
+function _show(io::IO, ::MIME"text/plain", plt::Plot{UnicodePlotsBackend})
+    unicodeplots_rebuild(plt)
+    map(show, plt.o)
+    nothing
 end
 
 
-function Base.display(::PlotsDisplay, plt::Plot{UnicodePlotsPackage})
-  rebuildUnicodePlot!(plt)
-  show(plt.o)
+function _display(plt::Plot{UnicodePlotsBackend})
+    unicodeplots_rebuild(plt)
+    map(show, plt.o)
+    nothing
 end
-
-
-
-function Base.display(::PlotsDisplay, subplt::Subplot{UnicodePlotsPackage})
-  for plt in subplt.plts
-    gui(plt)
-  end
-end
-

src/backends/web.jl

@@ -0,0 +1,66 @@
+
+# NOTE:  backend should implement `html_body` and `html_head`
+
+# 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>
+            $(html_head(plt))
+        </head>
+        <body>
+            $(html_body(plt))
+        </body>
+    </html>
+    """
+end
+
+function open_browser_window(filename::AbstractString)
+    @static if is_apple()
+        return run(`open $(filename)`)
+    end
+    @static if is_linux()
+        return run(`xdg-open $(filename)`)
+    end
+    @static if is_windows()
+        return run(`$(ENV["COMSPEC"]) /c start $(filename)`)
+    end
+    warn("Unknown OS... cannot open browser window.")
+end
+
+function write_temp_html(plt::AbstractPlot)
+    html = standalone_html(plt; title = plt.attr[:window_title])
+    filename = string(tempname(), ".html")
+    output = open(filename, "w")
+    write(output, html)
+    close(output)
+    filename
+end
+
+function standalone_html_window(plt::AbstractPlot)
+    filename = write_temp_html(plt)
+    open_browser_window(filename)
+end
+
+# uses wkhtmltopdf/wkhtmltoimage: http://wkhtmltopdf.org/downloads.html
+function html_to_png(html_fn, png_fn, w, h)
+    run(`wkhtmltoimage -f png -q --width $w --height $h --disable-smart-width $html_fn $png_fn`)
+end
+
+function show_png_from_html(io::IO, plt::AbstractPlot)
+    # write html to a temporary file
+    html_fn = write_temp_html(plt)
+
+    # convert that html file to a temporary png file using wkhtmltoimage
+    png_fn = tempname() * ".png"
+    w, h = plt.attr[:size]
+    html_to_png(html_fn, png_fn, w, h)
+
+    # now read that file data into io
+    pngdata = readall(png_fn)
+    write(io, pngdata)
+end

src/components.jl

@@ -0,0 +1,666 @@
+
+
+typealias P2 FixedSizeArrays.Vec{2,Float64}
+typealias P3 FixedSizeArrays.Vec{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 = atan2(v[2], v[1]); angle < 0 ? 2π - angle : angle)
+
+# -------------------------------------------------------------
+
+immutable Shape
+    x::Vector{Float64}
+    y::Vector{Float64}
+    # function Shape(x::AVec, y::AVec)
+    #     # if x[1] != x[end] || y[1] != y[end]
+    #     #     new(vcat(x, x[1]), vcat(y, y[1]))
+    #     # else
+    #         new(x, y)
+    #     end
+    # end
+end
+Shape(verts::AVec) = Shape(unzip(verts)...)
+Shape(s::Shape) = deepcopy(s)
+
+get_xs(shape::Shape) = shape.x
+get_ys(shape::Shape) = shape.y
+vertices(shape::Shape) = collect(zip(shape.x, shape.y))
+
+#deprecated
+@deprecate shape_coords coords
+
+function coords(shape::Shape)
+    shape.x, shape.y
+end
+
+function coords(shapes::AVec{Shape})
+    length(shapes) == 0 && return zeros(0), zeros(0)
+    xs = map(get_xs, shapes)
+    ys = map(get_ys, shapes)
+    x, y = map(copy, coords(shapes[1]))
+    for shape in shapes[2:end]
+        nanappend!(x, shape.x)
+        nanappend!(y, shape.y)
+    end
+    x, y
+end
+
+"get an array of tuples of points on a circle with radius `r`"
+function partialcircle(start_θ, end_θ, n = 20, r=1)
+    Tuple{Float64,Float64}[(r*cos(u),r*sin(u)) for u in linspace(start_θ, end_θ, n)]
+end
+
+"interleave 2 vectors into each other (like a zipper's teeth)"
+function weave(x,y; ordering = Vector[x,y])
+  ret = eltype(x)[]
+  done = false
+  while !done
+    for o in ordering
+      try
+          push!(ret, shift!(o))
+      end
+    end
+    done = isempty(x) && isempty(y)
+  end
+  ret
+end
+
+
+"create a star by weaving together points from an outer and inner circle.  `n` is the number of arms"
+function makestar(n; offset = -0.5, radius = 1.0)
+    z1 = offset * π
+    z2 = z1 + π / (n)
+    outercircle = partialcircle(z1, z1 + 2π, n+1, radius)
+    innercircle = partialcircle(z2, z2 + 2π, n+1, 0.4radius)
+    Shape(weave(outercircle, innercircle))
+end
+
+"create a shape by picking points around the unit circle.  `n` is the number of point/sides, `offset` is the starting angle"
+function makeshape(n; offset = -0.5, radius = 1.0)
+    z = offset * π
+    Shape(partialcircle(z, z + 2π, n+1, radius))
+end
+
+
+function makecross(; offset = -0.5, radius = 1.0)
+    z2 = offset * π
+    z1 = z2 - π/8
+    outercircle = partialcircle(z1, z1 + 2π, 9, radius)
+    innercircle = partialcircle(z2, z2 + 2π, 5, 0.5radius)
+    Shape(weave(outercircle, innercircle,
+                ordering=Vector[outercircle,innercircle,outercircle]))
+end
+
+
+from_polar(angle, dist) = P2(dist*cos(angle), dist*sin(angle))
+
+function makearrowhead(angle; h = 2.0, w = 0.4)
+    tip = from_polar(angle, h)
+    Shape(P2[(0,0), from_polar(angle - 0.5π, w) - tip,
+        from_polar(angle + 0.5π, w) - tip, (0,0)])
+end
+
+const _shape_keys = Symbol[
+  :circle,
+  :rect,
+  :star5,
+  :diamond,
+  :hexagon,
+  :cross,
+  :xcross,
+  :utriangle,
+  :dtriangle,
+  :rtriangle,
+  :ltriangle,
+  :pentagon,
+  :heptagon,
+  :octagon,
+  :star4,
+  :star6,
+  :star7,
+  :star8,
+  :vline,
+  :hline,
+  :+,
+  :x,
+]
+
+const _shapes = KW(
+    :circle    => makeshape(20),
+    :rect       => makeshape(4, offset=-0.25),
+    :diamond    => makeshape(4),
+    :utriangle  => makeshape(3, offset=0.5),
+    :dtriangle  => makeshape(3, offset=-0.5),
+    :rtriangle  => makeshape(3, offset=0.0),
+    :ltriangle  => makeshape(3, offset=1.0),
+    :pentagon   => makeshape(5),
+    :hexagon    => makeshape(6),
+    :heptagon   => makeshape(7),
+    :octagon    => makeshape(8),
+    :cross      => makecross(offset=-0.25),
+    :xcross     => makecross(),
+    :vline      => Shape([(0,1),(0,-1)]),
+    :hline      => Shape([(1,0),(-1,0)]),
+  )
+
+for n in [4,5,6,7,8]
+  _shapes[Symbol("star$n")] = makestar(n)
+end
+
+Shape(k::Symbol) = deepcopy(_shapes[k])
+
+# -----------------------------------------------------------------------
+
+
+# uses the centroid calculation from https://en.wikipedia.org/wiki/Centroid#Centroid_of_polygon
+function center(shape::Shape)
+    x, y = coords(shape)
+    n = length(x)
+    A, Cx, Cy = 0.0, 0.0, 0.0
+    for i=1:n
+        ip1 = i==n ? 1 : i+1
+        A += x[i] * y[ip1] - x[ip1] * y[i]
+    end
+    A *= 0.5
+    for i=1:n
+        ip1 = i==n ? 1 : i+1
+        m = (x[i] * y[ip1] - x[ip1] * y[i])
+        Cx += (x[i] + x[ip1]) * m
+        Cy += (y[i] + y[ip1]) * m
+    end
+    Cx / 6A, Cy / 6A
+end
+
+function Base.scale!(shape::Shape, x::Real, y::Real = x, c = center(shape))
+    sx, sy = coords(shape)
+    cx, cy = c
+    for i=1:length(sx)
+        sx[i] = (sx[i] - cx) * x + cx
+        sy[i] = (sy[i] - cy) * y + cy
+    end
+    shape
+end
+
+function Base.scale(shape::Shape, x::Real, y::Real = x, c = center(shape))
+    shapecopy = deepcopy(shape)
+    scale!(shapecopy, x, y, c)
+end
+
+function translate!(shape::Shape, x::Real, y::Real = x)
+    sx, sy = coords(shape)
+    for i=1:length(sx)
+        sx[i] += x
+        sy[i] += y
+    end
+    shape
+end
+
+function translate(shape::Shape, x::Real, y::Real = x)
+    shapecopy = deepcopy(shape)
+    translate!(shapecopy, x, y)
+end
+
+function rotate_x(x::Real, y::Real, Θ::Real, centerx::Real, centery::Real)
+    (x - centerx) * cos(Θ) - (y - centery) * sin(Θ) + centerx
+end
+
+function rotate_y(x::Real, y::Real, Θ::Real, centerx::Real, centery::Real)
+    (y - centery) * cos(Θ) + (x - centerx) * sin(Θ) + centery
+end
+
+function rotate(x::Real, y::Real, θ::Real, c = center(shape))
+    cx, cy = c
+    rotate_x(x, y, Θ, cx, cy), rotate_y(x, y, Θ, cx, cy)
+end
+
+function rotate!(shape::Shape, Θ::Real, c = center(shape))
+    x, y = coords(shape)
+    cx, cy = c
+    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
+    end
+    shape
+end
+
+function rotate(shape::Shape, Θ::Real, c = center(shape))
+    shapecopy = deepcopy(shape)
+    rotate!(shapecopy, Θ, c)
+end
+
+# -----------------------------------------------------------------------
+
+
+type Font
+  family::AbstractString
+  pointsize::Int
+  halign::Symbol
+  valign::Symbol
+  rotation::Float64
+  color::Colorant
+end
+
+"Create a Font from a list of unordered features"
+function font(args...)
+
+  # defaults
+  family = "Helvetica"
+  pointsize = 14
+  halign = :hcenter
+  valign = :vcenter
+  rotation = 0.0
+  color = colorant"black"
+
+  for arg in args
+    T = typeof(arg)
+
+    if T == Font
+      family = arg.family
+      pointsize = arg.pointsize
+      halign = arg.halign
+      valign = arg.valign
+      rotation = arg.rotation
+      color = arg.color
+    elseif arg == :center
+      halign = :hcenter
+      valign = :vcenter
+    elseif arg in (:hcenter, :left, :right)
+      halign = arg
+    elseif arg in (:vcenter, :top, :bottom)
+      valign = arg
+    elseif T <: Colorant
+      color = arg
+    elseif T <: Symbol || T <: AbstractString
+      try
+        color = parse(Colorant, string(arg))
+      catch
+        family = string(arg)
+      end
+    elseif typeof(arg) <: Integer
+      pointsize = arg
+    elseif typeof(arg) <: Real
+      rotation = convert(Float64, arg)
+    else
+      warn("Unused font arg: $arg ($(typeof(arg)))")
+    end
+  end
+
+  Font(family, pointsize, halign, valign, rotation, color)
+end
+
+function scalefontsize(k::Symbol, factor::Number)
+    f = default(k)
+    f.pointsize = round(Int, factor * f.pointsize)
+    default(k, f)
+end
+function scalefontsizes(factor::Number)
+    for k in (:titlefont, :guidefont, :tickfont, :legendfont)
+        scalefontsize(k, factor)
+    end
+end
+
+"Wrap a string with font info"
+immutable PlotText
+  str::AbstractString
+  font::Font
+end
+PlotText(str) = PlotText(string(str), font())
+
+text(t::PlotText) = t
+text(str::AbstractString, f::Font) = PlotText(str, f)
+function text(str, args...)
+  PlotText(string(str), font(args...))
+end
+
+Base.length(t::PlotText) = length(t.str)
+
+# -----------------------------------------------------------------------
+
+# -----------------------------------------------------------------------
+
+immutable Stroke
+  width
+  color
+  alpha
+  style
+end
+
+function stroke(args...; alpha = nothing)
+  width = 1
+  color = :black
+  style = :solid
+
+  for arg in args
+    T = typeof(arg)
+
+    # if arg in _allStyles
+    if allStyles(arg)
+      style = arg
+    elseif T <: Colorant
+      color = arg
+    elseif T <: Symbol || T <: AbstractString
+      try
+        color = parse(Colorant, string(arg))
+      end
+    elseif allAlphas(arg)
+      alpha = arg
+    elseif allReals(arg)
+      width = arg
+    else
+      warn("Unused stroke arg: $arg ($(typeof(arg)))")
+    end
+  end
+
+  Stroke(width, color, alpha, style)
+end
+
+
+immutable Brush
+  size  # fillrange, markersize, or any other sizey attribute
+  color
+  alpha
+end
+
+function brush(args...; alpha = nothing)
+  size = 1
+  color = :black
+
+  for arg in args
+    T = typeof(arg)
+
+    if T <: Colorant
+      color = arg
+    elseif T <: Symbol || T <: AbstractString
+      try
+        color = parse(Colorant, string(arg))
+      end
+    elseif allAlphas(arg)
+      alpha = arg
+    elseif allReals(arg)
+      size = arg
+    else
+      warn("Unused brush arg: $arg ($(typeof(arg)))")
+    end
+  end
+
+  Brush(size, color, alpha)
+end
+
+# -----------------------------------------------------------------------
+
+type SeriesAnnotations
+    strs::AbstractVector  # the labels/names
+    font::Font
+    baseshape::Nullable
+    scalefactor::Tuple
+end
+function series_annotations(strs::AbstractVector, args...)
+    fnt = font()
+    shp = Nullable{Any}()
+    scalefactor = (1,1)
+    for arg in args
+        if isa(arg, Shape) || (isa(arg, AbstractVector) && eltype(arg) == Shape)
+            shp = Nullable(arg)
+        elseif isa(arg, Font)
+            fnt = arg
+        elseif isa(arg, Symbol) && haskey(_shapes, arg)
+            shp = _shapes[arg]
+        elseif isa(arg, Number)
+            scalefactor = (arg,arg)
+        elseif is_2tuple(arg)
+            scalefactor = arg
+        else
+            warn("Unused SeriesAnnotations arg: $arg ($(typeof(arg)))")
+        end
+    end
+    # if scalefactor != 1
+    #     for s in get(shp)
+    #         scale!(s, scalefactor, scalefactor, (0,0))
+    #     end
+    # end
+    SeriesAnnotations(strs, fnt, shp, scalefactor)
+end
+series_annotations(anns::SeriesAnnotations) = anns
+series_annotations(::Void) = nothing
+
+function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
+    anns = series[:series_annotations]
+    # msw,msh = anns.scalefactor
+    # ms = series[:markersize]
+    # msw,msh = if isa(ms, AbstractVector)
+    #     1,1
+    # elseif is_2tuple(ms)
+    #     ms
+    # else
+    #     ms,ms
+    # end
+
+    # @show msw msh
+    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 = 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)
+
+            # how much to scale the base shape?
+            # note: it's a rough assumption that the shape fills the unit box [-1,-1,1,1],
+            #       so we scale the length-2 shape by 1/2 the total length
+            scalar = (backend() == PyPlotBackend() ? 1.7 : 1.0)
+            xscale = 0.5to_pixels(sw) * scalar
+            yscale = 0.5to_pixels(sh) * scalar
+
+            # we save the size of the larger direction to the markersize list,
+            # and then re-scale a copy of baseshape to match the w/h ratio
+            maxscale = max(xscale, yscale)
+            push!(msize, maxscale)
+            baseshape = cycle(get(anns.baseshape),i)
+            shape = scale(baseshape, msw*xscale/maxscale, msh*yscale/maxscale, (0,0))
+        end for i=1:length(anns.strs)]
+        series[:markershape] = shapes
+        series[:markersize] = msize
+    end
+    return
+end
+
+type EachAnn
+    anns
+    x
+    y
+end
+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)
+end
+
+annotations(::Void) = []
+annotations(anns::AVec) = anns
+annotations(anns) = Any[anns]
+annotations(sa::SeriesAnnotations) = sa
+
+# -----------------------------------------------------------------------
+
+"type which represents z-values for colors and sizes (and anything else that might come up)"
+immutable ZValues
+  values::Vector{Float64}
+  zrange::Tuple{Float64,Float64}
+end
+
+function zvalues{T<:Real}(values::AVec{T}, zrange::Tuple{T,T} = (minimum(values), maximum(values)))
+  ZValues(collect(float(values)), map(Float64, zrange))
+end
+
+# -----------------------------------------------------------------------
+
+abstract AbstractSurface
+
+"represents a contour or surface mesh"
+immutable Surface{M<:AMat} <: AbstractSurface
+  surf::M
+end
+
+Surface(f::Function, x, y) = Surface(Float64[f(xi,yi) for yi in y, xi in x])
+
+Base.Array(surf::Surface) = surf.surf
+
+for f in (:length, :size)
+  @eval Base.$f(surf::Surface, args...) = $f(surf.surf, args...)
+end
+Base.copy(surf::Surface) = Surface{typeof(surf.surf)}(copy(surf.surf))
+Base.eltype{T}(surf::Surface{T}) = eltype(T)
+
+function expand_extrema!(a::Axis, surf::Surface)
+    ex = a[:extrema]
+    for vi in surf.surf
+        expand_extrema!(ex, vi)
+    end
+    ex
+end
+
+"For the case of representing a surface as a function of x/y... can possibly avoid allocations."
+immutable SurfaceFunction <: AbstractSurface
+    f::Function
+end
+
+
+# -----------------------------------------------------------------------
+
+# # I don't want to clash with ValidatedNumerics, but this would be nice:
+# ..(a::T, b::T) = (a,b)
+
+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{T}(::Type{T}) = (zero(T), one(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
+
+Base.Array(vol::Volume) = vol.v
+for f in (:length, :size)
+  @eval Base.$f(vol::Volume, args...) = $f(vol.v, args...)
+end
+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)
+immutable Arrow
+    style::Symbol
+    side::Symbol  # :head (default), :tail, or :both
+    headlength::Float64
+    headwidth::Float64
+end
+
+function arrow(args...)
+    style = :simple
+    side = :head
+    headlength = 0.3
+    headwidth = 0.3
+    setlength = false
+    for arg in args
+        T = typeof(arg)
+        if T == Symbol
+            if arg in (:head, :tail, :both)
+                side = arg
+            else
+                style = arg
+            end
+        elseif T <: Number
+            # first we apply to both, but if there's more, then only change width after the first number
+            headwidth = Float64(arg)
+            if !setlength
+                headlength = headwidth
+            end
+            setlength = true
+        elseif T <: Tuple && length(arg) == 2
+            headlength, headwidth = Float64(arg[1]), Float64(arg[2])
+        else
+            warn("Skipped arrow arg $arg")
+        end
+    end
+    Arrow(style, side, headlength, headwidth)
+end
+
+
+# allow for do-block notation which gets called on every valid start/end pair which
+# we need to draw an arrow
+function add_arrows(func::Function, x::AVec, y::AVec)
+    for i=2:length(x)
+        xyprev = (x[i-1], y[i-1])
+        xy = (x[i], y[i])
+        if ok(xyprev) && ok(xy)
+            if i==length(x) || !ok(x[i+1], y[i+1])
+                # add the arrow from xyprev to xy
+                func(xyprev, xy)
+            end
+        end
+    end
+end
+
+# -----------------------------------------------------------------------
+
+"Represents data values with formatting that should apply to the tick labels."
+immutable Formatted{T}
+    data::T
+    formatter::Function
+end
+
+# -----------------------------------------------------------------------
+
+type BezierCurve{T <: FixedSizeArrays.Vec}
+    control_points::Vector{T}
+end
+
+function (bc::BezierCurve)(t::Real)
+    p = zero(P2)
+    n = length(bc.control_points)-1
+    for i in 0:n
+        p += bc.control_points[i+1] * binomial(n, i) * (1-t)^(n-i) * t^i
+    end
+    p
+end
+
+Base.mean(x::Real, y::Real) = 0.5*(x+y)
+Base.mean{N,T<:Real}(ps::FixedSizeArrays.Vec{N,T}...) = sum(ps) / length(ps)
+
+@deprecate curve_points coords
+
+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]
+function directed_curve(args...; kw...)
+    error("directed_curve has been moved to PlotRecipes")
+end
+
+function extrema_plus_buffer(v, buffmult = 0.2)
+    vmin,vmax = extrema(v)
+    vdiff = vmax-vmin
+    buffer = vdiff * buffmult
+    vmin - buffer, vmax + buffer
+end

src/deprecated/backends/bokeh.jl

@@ -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

src/deprecated/backends/gadfly.jl

@@ -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

src/deprecated/backends/gadfly_shapes.jl

@@ -1,8 +1,9 @@
 
 
 # Geometry which displays arbitrary shapes at given (x, y) positions.
+# note: vertices is a list of shapes
 immutable ShapeGeometry <: Gadfly.GeometryElement
-    vertices::AbstractVector{@compat(Tuple{Float64,Float64})}
+    vertices::AbstractVector #{Tuple{Float64,Float64}}
     tag::Symbol
 
     function ShapeGeometry(shape; tag::Symbol=Gadfly.Geom.empty_tag)
@@ -66,24 +67,27 @@ function Gadfly.render(geom::ShapeGeometry, theme::Gadfly.Theme, aes::Gadfly.Aes
 end
 
 function gadflyshape(sv::Shape)
-  ShapeGeometry([(x,-y) for (x,y) in sv.vertices])
+  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 = @compat(Tuple{Compose.Measure, Compose.Measure})
+  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 geom.vertices]
+    polys[i] = T[(x + r * sx, y + r * sy) for (sx,sy) in cycle(geom.vertices, i)]
   end
   Gadfly.polygon(polys, geom.tag)
 end
 
 
 # ---------------------------------------------------------------------------------------------
-

src/deprecated/backends/immerse.jl

@@ -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

src/deprecated/backends/qwt.jl

@@ -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

src/deprecated/backends/winston.jl

@@ -3,20 +3,56 @@
 
 # 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.
-@compat const winston_linestyle =  Dict(:solid=>"solid",
+const winston_linestyle =  KW(:solid=>"solid",
                                 :dash=>"dash",
                                 :dot=>"dotted",
                                 :dashdot=>"dotdashed"
                                )
 
-@compat const winston_marker = Dict(:none=>".",
+const winston_marker = KW(:none=>".",
                             :rect => "square",
-                            :ellipse=>"circle",
+                            :circle=>"circle",
                             :diamond=>"diamond",
                             :utriangle=>"triangle",
                             :dtriangle=>"down-triangle",
@@ -25,23 +61,23 @@
                             :star5 => "asterisk"
                            )
 
-function preparePlotUpdate(plt::Plot{WinstonPackage})
+function _before_update(plt::Plot{WinstonBackend})
   Winston.ghf(plt.o)
 end
 
 # ---------------------------------------------------------------------------
 
-
-function plot(pkg::WinstonPackage; kw...)
-  d = Dict(kw)
-  wplt = Winston.FramedPlot(title = d[:title], xlabel = d[:xlabel], ylabel = d[:ylabel])
-  
-  Plot(wplt, pkg, 0, d, Dict[])
+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::Dict, s::Symbol) = delete!(copy(d), s)
+copy_remove(d::KW, s::Symbol) = delete!(copy(d), s)
 
-function addRegressionLineWinston(d::Dict, wplt)
+function addRegressionLineWinston(d::KW, wplt)
   xs, ys = regressionXY(d[:x], d[:y])
   Winston.add(wplt, Winston.Curve(xs, ys, kind="dotted"))
 end
@@ -56,19 +92,18 @@ function getWinstonItems(plt::Plot)
   window, canvas, wplt
 end
 
-function plot!(::WinstonPackage, plt::Plot; kw...)
-  d = Dict(kw)
-
+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[:linetype] == :bar
+  if d[:seriestype] == :bar
     d = barHack(;d...)
   end
 
 
-  e = Dict()
-  e[:color] = getColor(d[:color])
+  e = KW()
+  e[:color] = getColor(d[:linecolor])
   e[:linewidth] = d[:linewidth]
   e[:kind] = winston_linestyle[d[:linestyle]]
   e[:symbolkind] = winston_marker[d[:markershape]]
@@ -80,11 +115,11 @@ function plot!(::WinstonPackage, plt::Plot; kw...)
 
 
 
-  ## lintype :path, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar
-  if d[:linetype] == :none
+  ## 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[:linetype] == :path
+  elseif d[:seriestype] == :path
     x, y = d[:x], d[:y]
     Winston.add(wplt, Winston.Curve(x, y; e...))
 
@@ -98,38 +133,38 @@ function plot!(::WinstonPackage, plt::Plot; kw...)
       Winston.add(wplt, Winston.FillBetween(x, y, x, y2, fillcolor=getColor(d[:fillcolor])))
     end
 
-  elseif d[:linetype] == :scatter
+  elseif d[:seriestype] == :scatter
     if d[:markershape] == :none
-      d[:markershape] = :ellipse
+      d[:markershape] = :circle
     end
 
-  # elseif d[:linetype] == :step
+  # elseif d[:seriestype] == :step
   #     fn = Winston.XXX
 
-  # elseif d[:linetype] == :stepinverted
+  # elseif d[:seriestype] == :stepinverted
   #     fn = Winston.XXX
 
-  elseif d[:linetype] == :sticks
+  elseif d[:seriestype] == :sticks
       Winston.add(wplt, Winston.Stems(d[:x], d[:y]; e...))
 
-  # elseif d[:linetype] == :dots
+  # elseif d[:seriestype] == :dots
   #     fn = Winston.XXX
 
-  # elseif d[:linetype] == :heatmap
+  # elseif d[:seriestype] == :histogram2d
   #     fn = Winston.XXX
 
-  # elseif d[:linetype] == :hexbin
+  # elseif d[:seriestype] == :hexbin
   #     fn = Winston.XXX
 
-  elseif d[:linetype] == :hist
-      hst = hist(d[:y], d[:nbins])
-      Winston.add(wplt, Winston.Histogram(hst...; copy_remove(e, :nbins)...))
+  elseif d[:seriestype] == :histogram
+      hst = hist(d[:y], d[:bins])
+      Winston.add(wplt, Winston.Histogram(hst...; copy_remove(e, :bins)...))
 
-  # elseif d[:linetype] == :bar
+  # elseif d[:seriestype] == :bar
   #     # fn = Winston.XXX
 
   else
-    error("linetype $(d[:linetype]) not supported by Winston.")
+    error("seriestype $(d[:seriestype]) not supported by Winston.")
 
   end
 
@@ -141,25 +176,25 @@ function plot!(::WinstonPackage, plt::Plot; kw...)
 
 
   # optionally add a regression line
-  d[:smooth] && d[:linetype] != :hist && addRegressionLineWinston(d, wplt)
+  d[:smooth] && d[:seriestype] != :histogram && addRegressionLineWinston(d, wplt)
 
-  push!(plt.seriesargs, d)
-  plt
+  # push!(plt.seriesargs, d)
+  # plt
 end
 
 
 # ----------------------------------------------------------------
 
-@compat const _winstonNames = Dict(
+const _winstonNames = KW(
     :xlims => :xrange,
     :ylims => :yrange,
     :xscale => :xlog,
     :yscale => :ylog,
   )
 
-function updatePlotItems(plt::Plot{WinstonPackage}, d::Dict)
+function _update_plot_object(plt::Plot{WinstonBackend}, d::KW)
   window, canvas, wplt = getWinstonItems(plt)
-  for k in (:xlabel, :ylabel, :title, :xlims, :ylims)
+  for k in (:xguide, :yguide, :title, :xlims, :ylims)
     if haskey(d, k)
       Winston.setattr(wplt, string(get(_winstonNames, k, k)), d[k])
     end
@@ -178,11 +213,11 @@ end
 
 # ----------------------------------------------------------------
 
-function createWinstonAnnotationObject(plt::Plot{WinstonPackage}, x, y, val::@compat(AbstractString))
+function createWinstonAnnotationObject(plt::Plot{WinstonBackend}, x, y, val::AbstractString)
   Winston.text(x, y, val)
 end
 
-function addAnnotations{X,Y,V}(plt::Plot{WinstonPackage}, anns::AVec{@compat(Tuple{X,Y,V})})
+function _add_annotations{X,Y,V}(plt::Plot{WinstonBackend}, anns::AVec{Tuple{X,Y,V}})
   for ann in anns
     createWinstonAnnotationObject(plt, ann...)
   end
@@ -191,26 +226,26 @@ end
 
 # ----------------------------------------------------------------
 
-function buildSubplotObject!(subplt::Subplot{WinstonPackage}, isbefore::Bool)
-  # TODO: build the underlying Subplot object.  this is where you might layout the panes within a GUI window, for example
-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.initargs[:legend]
+  if plt.attr[:legend] != :none
     Winston.legend(wplt, [sd[:label] for sd in plt.seriesargs])
   end
 end
 
-function Base.writemime(io::IO, ::MIME"image/png", plt::PlottingObject{WinstonPackage})
+function Base.show(io::IO, ::MIME"image/png", plt::AbstractPlot{WinstonBackend})
   window, canvas, wplt = getWinstonItems(plt)
   addWinstonLegend(plt, wplt)
-  writemime(io, "image/png", wplt)
+  show(io, "image/png", wplt)
 end
 
 
-function Base.display(::PlotsDisplay, plt::Plot{WinstonPackage})
+function Base.display(::PlotsDisplay, plt::Plot{WinstonBackend})
 
   window, canvas, wplt = getWinstonItems(plt)
 
@@ -219,9 +254,9 @@ function Base.display(::PlotsDisplay, plt::Plot{WinstonPackage})
       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.initargs[:size]
+    w,h = plt.attr[:size]
     canvas = Gtk.GtkCanvasLeaf()
-    window = Gtk.GtkWindowLeaf(canvas, plt.initargs[:windowtitle], w, h)
+    window = Gtk.GtkWindowLeaf(canvas, plt.attr[:window_title], w, h)
     plt.o = (window, canvas, wplt)
   end
 
@@ -232,6 +267,6 @@ function Base.display(::PlotsDisplay, plt::Plot{WinstonPackage})
 end
 
 
-function Base.display(::PlotsDisplay, subplt::Subplot{WinstonPackage})
-  # TODO: display/show the Subplot object
-end
+# function Base.display(::PlotsDisplay, subplt::Subplot{WinstonBackend})
+#   # TODO: display/show the Subplot object
+# end

src/deprecated/colors.jl

@@ -1,73 +1,70 @@
 
-# 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,
-]
+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)
@@ -82,48 +79,11 @@ end
 
 # --------------------------------------------------------------
 
-
-abstract ColorScheme
-
-getColor(scheme::ColorScheme) = getColor(scheme, 1)
-getColorVector(scheme::ColorScheme) = [getColor(scheme)]
-
-colorscheme(scheme::ColorScheme) = scheme
-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::@compat(Union{AbstractString, Symbol})) = parse(Colorant, string(c))
-convertColor(c::Colorant) = c
-convertColor(cvec::AbstractVector) = map(convertColor, cvec)
-convertColor(c::ColorScheme) = c
-
-function convertColor(c, α::Real)
-  c = convertColor(c)
-  RGBA(RGB(c), α)
-end
-convertColor(cs::AVec, α::Real) = map(c -> convertColor(c, α), cs)
-convertColor(c, α::@compat(Void)) = convertColor(c)
-
-# backup... try to convert
-getColor(c) = convertColor(c)
-
-# --------------------------------------------------------------
-
-const _rainbowColors = [colorant"blue", colorant"purple", colorant"green", colorant"orange", colorant"red"]
+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)]
 
-@compat const _gradients = Dict(
+const _gradients = KW(
     :blues        => [colorant"lightblue", colorant"darkblue"],
     :reds         => [colorant"lightpink", colorant"darkred"],
     :greens       => [colorant"lightgreen", colorant"darkgreen"],
@@ -138,37 +98,66 @@ const _testColors = [colorant"darkblue", colorant"blueviolet",  colorant"darkcya
     :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{Colorant}
-  values::Vector{Float64}
+  colors::Vector
+  values::Vector
 
-  function ColorGradient{T<:Colorant,S<:Real}(cs::AVec{T}, vals::AVec{S} = 0:1; alpha = nothing)
+  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)
+
+    # # 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
 
-# create a gradient from a symbol (blues, reds, etc) and vector of boundary values
-function ColorGradient{T<:Real}(s::Symbol, vals::AVec{T} = 0:1; kw...)
-  haskey(_gradients, s) || error("Invalid gradient symbol.  Choose from: ", sort(collect(keys(_gradients))))
 
-  # if we passed in the right number of values, create the gradient directly
+
+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{Symbol}, vals::AVec{T} = 0:1; kw...)
-  ColorGradient(map(convertColor, cs), vals; kw...)
+# 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))]
@@ -232,7 +221,7 @@ immutable ColorZFunction <: ColorScheme
   f::Function
 end
 
-getColorZ(scheme::ColorFunction, z::Real) = scheme.f(z)
+getColorZ(scheme::ColorZFunction, z::Real) = scheme.f(z)
 
 # --------------------------------------------------------------
 
@@ -258,6 +247,7 @@ ColorWrapper(s::Symbol; alpha = nothing) = ColorWrapper(convertColor(parse(Color
 
 getColor(scheme::ColorWrapper, idx::Int) = scheme.c
 getColorZ(scheme::ColorWrapper, z::Real) = scheme.c
+convertColor(c::ColorWrapper, α::Void) = c.c
 
 # --------------------------------------------------------------
 
@@ -286,6 +276,16 @@ function convertHexToRGB(h::Unsigned)
   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)
@@ -337,7 +337,7 @@ function generate_colorgradient(bgcolor = colorant"white";
   gradient_from_list(colors)
 end
 
-function get_color_palette(palette, bgcolor::@compat(Union{Colorant,ColorWrapper}), numcolors::Integer)
+function get_color_palette(palette, bgcolor::Union{Colorant,ColorWrapper}, numcolors::Integer)
   grad = if palette == :auto
     generate_colorgradient(bgcolor)
   else
@@ -347,6 +347,11 @@ function get_color_palette(palette, bgcolor::@compat(Union{Colorant,ColorWrapper
   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
+
 # ----------------------------------------------------------------------------------
 
 
@@ -382,43 +387,27 @@ end
 
 # ----------------------------------------------------------------------------------
 
-# TODO: try to use the algorithms from https://github.com/timothyrenner/ColorBrewer.jl
-# TODO: allow the setting of the algorithm, either by passing a symbol (:colordiff, :fixed, etc) or a function? 
 
-# function getBackgroundRGBColor(c, d::Dict)
-function handlePlotColors(::PlottingPackage, d::Dict)
-  if :background_color in supportedArgs()
-    bgcolor = convertColor(d[:background_color])
-  else
-    bgcolor = _plotDefaults[:background_color]
-    if d[:background_color] != _plotDefaults[:background_color]
-      warn("Cannot set background_color with backend $(backend())")
-    end
-  end
+make255(x) = round(Int, 255 * x)
 
-
-  d[:color_palette] = get_color_palette(get(d, :color_palette, :auto), bgcolor, 100)
-
-
-  # set the foreground color (text, ticks, gridlines) to be white or black depending
-  # on how dark the background is.  
-  fgcolor = get(d, :foreground_color, :auto)
-  fgcolor = if fgcolor == :auto
-    isdark(bgcolor) ? colorant"white" : colorant"black"
-  else
-    convertColor(fgcolor)
-  end
-
-  # bgcolor
-  d[:background_color] = colorscheme(bgcolor)
-  d[:foreground_color] = colorscheme(fgcolor)
+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, initargs::Dict, n::Int)
+function getSeriesRGBColor(c, sp::Subplot, n::Int)
 
   if c == :auto
-    c = autopick(initargs[:color_palette], n)
+    c = autopick(sp[:color_palette], n)
   end
 
   # c should now be a subtype of ColorScheme

src/deprecated/series_args.jl

@@ -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!")
+
+# --------------------------------------------------------------------

src/examples.jl

@@ -0,0 +1,343 @@
+"""
+Holds all data needed for a documentation example... header, description, and plotting expression (Expr)
+"""
+type PlotExample
+  header::AbstractString
+  desc::AbstractString
+  exprs::Vector{Expr}
+end
+
+# the _examples we'll run for each
+const _examples = PlotExample[
+
+PlotExample("Lines",
+    "A simple line plot of the columns.",
+    [:(begin
+        plot(Plots.fakedata(50,5), w=3)
+    end)]
+),
+
+PlotExample("Functions, adding data, and animations",
+    "Plot multiple functions.  You can also put the function first, or use the form `plot(f, xmin, xmax)` where f is a Function or AbstractVector{Function}.\n\nGet series data: `x, y = plt[i]`.  Set series data: `plt[i] = (x,y)`. Add to the series with `push!`/`append!`.\n\nEasily build animations.  (`convert` or `ffmpeg` must be available to generate the animation.)  Use command `gif(anim, filename, fps=15)` to save the animation.",
+    [:(begin
+        p = plot([sin,cos], zeros(0), leg=false)
+        anim = Animation()
+        for x in linspace(0, 10π, 100)
+            push!(p, x, Float64[sin(x), cos(x)])
+            frame(anim)
+        end
+    end)]
+),
+
+PlotExample("Parametric plots",
+    "Plot function pair (x(u), y(u)).",
+    [:(begin
+        plot(sin, x->sin(2x), 0, 2π, line=4, leg=false, fill=(0,:orange))
+    end)]
+),
+
+PlotExample("Colors",
+    "Access predefined palettes (or build your own with the `colorscheme` method).  Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set the `z` argument to turn on series gradients.",
+    [:(begin
+        y = rand(100)
+        plot(0:10:100,rand(11,4),lab="lines",w=3,palette=:grays,fill=0, α=0.6)
+        scatter!(y, zcolor=abs(y-.5), m=(:heat,0.8,stroke(1,:green)), ms=10*abs(y-0.5)+4, lab="grad")
+    end)]
+),
+
+PlotExample("Global",
+    "Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow you to pass a tuple or value which will be mapped to the relevant args automatically.  The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`, `yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`",
+    [:(begin
+        y = rand(20,3)
+        plot(y, xaxis=("XLABEL",(-5,30),0:2:20,:flip), background_color = RGB(0.2,0.2,0.2), leg=false)
+        hline!(mean(y,1)+rand(1,3), line=(4,:dash,0.6,[:lightgreen :green :darkgreen]))
+        vline!([5,10])
+        title!("TITLE")
+        yaxis!("YLABEL", :log10)
+    end)]
+),
+
+# PlotExample("Two-axis",
+#             "Use the `axis` arguments.",
+#             [
+#               :(plot(Vector[randn(100), randn(100)*100], axis = [:l :r], ylabel="LEFT", yrightlabel="RIGHT", xlabel="X", title="TITLE"))
+#             ]),
+
+PlotExample("Images",
+    "Plot an image.  y-axis is set to flipped",
+    [:(begin
+        import Images
+        img = Images.load(Pkg.dir("PlotReferenceImages","Plots","pyplot","0.7.0","ref1.png"))
+        plot(img)
+    end)]
+),
+
+PlotExample("Arguments",
+    "Plot multiple series with different numbers of points.  Mix arguments that apply to all series (marker/markersize) with arguments unique to each series (colors).  Special arguments `line`, `marker`, and `fill` will automatically figure out what arguments to set (for example, we are setting the `linestyle`, `linewidth`, and `color` arguments with `line`.)  Note that we pass a matrix of colors, and this applies the colors to each series.",
+    [:(begin
+        ys = Vector[rand(10), rand(20)]
+        plot(ys, color=[:black :orange], line=(:dot,4), marker=([:hex :d],12,0.8,stroke(3,:gray)))
+    end)]
+),
+
+PlotExample("Build plot in pieces",
+    "Start with a base plot...",
+    [:(begin
+        plot(rand(100)/3, reg=true, fill=(0,:green))
+    end)]
+),
+
+PlotExample("",
+    "and add to it later.",
+    [:(begin
+        scatter!(rand(100), markersize=6, c=:orange)
+    end)]
+),
+
+PlotExample("Histogram2D",
+    "",
+    [:(begin
+        histogram2d(randn(10000), randn(10000), nbins=20)
+    end)]
+),
+
+PlotExample("Line types",
+    "",
+    [:(begin
+        linetypes = [:path :steppre :steppost :sticks :scatter]
+        n = length(linetypes)
+        x = Vector[sort(rand(20)) for i in 1:n]
+        y = rand(20,n)
+        plot(x, y, line=(linetypes,3), lab=map(string,linetypes), ms=15)
+    end)]
+),
+
+PlotExample("Line styles",
+    "",
+    [:(begin
+        styles = filter(s -> s in Plots.supported_styles(), [:solid, :dash, :dot, :dashdot, :dashdotdot])'
+        n = length(styles)
+        y = cumsum(randn(20,n),1)
+        plot(y, line = (5, styles), label = map(string,styles))
+    end)]
+),
+
+PlotExample("Marker types",
+    "",
+    [:(begin
+        markers = filter(m -> m in Plots.supported_markers(), Plots._shape_keys)'
+        n = length(markers)
+        x = linspace(0,10,n+2)[2:end-1]
+        y = repmat(reverse(x)', n, 1)
+        scatter(x, y, m=(8,:auto), lab=map(string,markers), bg=:linen, xlim=(0,10), ylim=(0,10))
+    end)]
+),
+
+PlotExample("Bar",
+    "x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)",
+    [:(begin
+        bar(randn(99))
+    end)]
+),
+
+PlotExample("Histogram",
+    "",
+    [:(begin
+        histogram(randn(1000), nbins=20)
+    end)]
+),
+
+PlotExample("Subplots",
+    """
+    Use the `layout` keyword, and optionally the convenient `@layout` macro to generate arbitrarily complex subplot layouts.
+    """,
+    [:(begin
+        l = @layout([a{0.1h}; b [c;d e]])
+        plot(randn(100,5), layout=l, t=[:line :histogram :scatter :steppre :bar], leg=false, ticks=nothing, border=false)
+    end)]
+),
+
+PlotExample("Adding to subplots",
+    "Note here the automatic grid layout, as well as the order in which new series are added to the plots.",
+    [:(begin
+        plot(Plots.fakedata(100,10), layout=4, palette=[:grays :blues :heat :lightrainbow], bg_inside=[:orange :pink :darkblue :black])
+    end)]
+),
+
+PlotExample("",
+    "",
+    [:(begin
+        srand(111)
+        plot!(Plots.fakedata(100,10))
+    end)]
+),
+
+PlotExample("Open/High/Low/Close",
+    "Create an OHLC chart.  Pass in a list of (open,high,low,close) tuples as your `y` argument.  This uses recipes to first convert the tuples to OHLC objects, and subsequently create a :path series with the appropriate line segments.",
+    [:(begin
+        n=20
+        hgt=rand(n)+1
+        bot=randn(n)
+        openpct=rand(n)
+        closepct=rand(n)
+        y = OHLC[(openpct[i]*hgt[i]+bot[i], bot[i]+hgt[i], bot[i], closepct[i]*hgt[i]+bot[i]) for i in 1:n]
+        ohlc(y)
+    end)]
+),
+
+PlotExample("Annotations",
+    "The `annotations` keyword is used for text annotations in data-coordinates.  Pass in a tuple (x,y,text) or a vector of annotations.  `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`.  Series annotations are used for annotating individual data points.  They require only the annotation... x/y values are computed.  A `PlotText` object can be build with the method `text(string, attr...)`, which wraps font and color attributes.",
+    [:(begin
+        y = rand(10)
+        plot(y, annotations = (3,y[3],text("this is #3",:left)), leg=false)
+        annotate!([(5, y[5], text("this is #5",16,:red,:center)), (10, y[10], text("this is #10",:right,20,"courier"))])
+        scatter!(linspace(2,8,6), rand(6), marker=(50,0.2,:orange), series_annotations = ["series","annotations","map","to","series",text("data",:green)])
+    end)]
+),
+
+PlotExample("Custom Markers",
+    "A `Plots.Shape` is a light wrapper around vertices of a polygon.  For supported backends, pass arbitrary polygons as the marker shapes.  Note: The center is (0,0) and the size is expected to be rougly the area of the unit circle.",
+    [:(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.7rand(5)+0.15
+        plot(x, y, line = (3,:dash,:lightblue), marker = (Shape(verts),30,RGBA(0,0,0,0.2)),
+                   bg=:pink, fg=:darkblue, xlim = (0,1), ylim=(0,1), leg=false)
+    end)]
+),
+
+PlotExample("Contours",
+    "Any value for fill works here.  We first build a filled contour from a function, then an unfilled contour from a matrix.",
+    [:(begin
+        x = 1:0.5:20
+        y = 1:0.5:10
+        f(x,y) = (3x+y^2)*abs(sin(x)+cos(y))
+        X = repmat(x', length(y), 1)
+        Y = repmat(y, 1, length(x))
+        Z = map(f, X, Y)
+        p1 = contour(x, y, f, fill=true)
+        p2 = contour(x, y, Z)
+        plot(p1, p2)
+    end)]
+),
+
+PlotExample("Pie",
+    "",
+    [:(begin
+        x = ["Nerds", "Hackers", "Scientists"]
+        y = [0.4, 0.35, 0.25]
+        pie(x, y, title="The Julia Community", l=0.5)
+    end)]
+),
+
+PlotExample("3D",
+    "",
+    [:(begin
+        n = 100
+        ts = linspace(0,8π,n)
+        x = ts .* map(cos,ts)
+        y = 0.1ts .* map(sin,ts)
+        z = 1:n
+        plot(x, y, z, zcolor=reverse(z), m=(10,0.8,:blues,stroke(0)), leg=false, cbar=true, w=5)
+        plot!(zeros(n),zeros(n),1:n, w=10)
+    end)]
+),
+
+PlotExample("DataFrames",
+    "Plot using DataFrame column symbols.",
+    [:(begin
+        import RDatasets
+        iris = RDatasets.dataset("datasets", "iris")
+        scatter(iris, :SepalLength, :SepalWidth, group=:Species,
+            title = "My awesome plot", xlabel = "Length", ylabel = "Width",
+            marker = (0.5, [:cross :hex :star7], 12), bg=RGB(.2,.2,.2))
+    end)]
+),
+
+PlotExample("Groups and Subplots",
+    "",
+    [:(begin
+        group = rand(map(i->"group $i",1:4),100)
+        plot(rand(100), layout=@layout([a b;c]), group=group, linetype=[:bar :scatter :steppre])
+    end)]
+),
+
+PlotExample("Polar Plots",
+    "",
+    [:(begin
+        Θ = linspace(0,1.5π,100)
+        r = abs(0.1randn(100)+sin(3Θ))
+        plot(Θ, r, proj=:polar, m=2)
+    end)]
+),
+
+PlotExample("Heatmap, categorical axes, and aspect_ratio",
+    "",
+    [:(begin
+        xs = [string("x",i) for i=1:10]
+        ys = [string("y",i) for i=1:4]
+        z = float((1:4)*(1:10)')
+        heatmap(xs, ys, z, aspect_ratio=1)
+    end)]
+),
+
+PlotExample("Layouts, margins, label rotation, title location",
+    "",
+    [:(begin
+        plot(rand(100,6),layout=@layout([a b; c]),title=["A" "B" "C"],
+                        title_location=:left, left_margin=[20mm 0mm],
+                        bottom_margin=50px, xrotation=60)
+    end)]
+),
+
+PlotExample("Boxplot and Violin series recipes",
+    "",
+    [:(begin
+        import RDatasets
+        singers = RDatasets.dataset("lattice", "singer")
+        violin(singers, :VoicePart, :Height, line = 0, fill = (0.2, :blue))
+        boxplot!(singers, :VoicePart, :Height, line = (2,:black), fill = (0.3, :orange))
+    end)]
+)
+
+]
+
+# ---------------------------------------------------------------------------------
+
+# make and display one plot
+function test_examples(pkgname::Symbol, idx::Int; debug = false, disp = true)
+  Plots._debugMode.on = debug
+  info("Testing plot: $pkgname:$idx:$(_examples[idx].header)")
+  backend(pkgname)
+  backend()
+  map(eval, _examples[idx].exprs)
+  plt = current()
+  if disp
+    gui(plt)
+  end
+  plt
+end
+
+# generate all plots and create a dict mapping idx --> plt
+function test_examples(pkgname::Symbol; debug = false, disp = true, sleep = nothing,
+                                        skip = [], only = nothing)
+  Plots._debugMode.on = debug
+  plts = Dict()
+  for i in 1:length(_examples)
+    only != nothing && !(i in only) && continue
+    i in skip && continue
+    try
+      plt = test_examples(pkgname, i, debug=debug, disp=disp)
+      plts[i] = plt
+    catch ex
+      # TODO: put error info into markdown?
+      warn("Example $pkgname:$i:$(_examples[i].header) failed with: $ex")
+    end
+    if sleep != nothing
+        Base.sleep(sleep)
+    end
+  end
+  plts
+end

src/layouts.jl

@@ -0,0 +1,792 @@
+
+# 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.:.*(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{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))
+# Base.:+(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value * (1 + m1.value))
+# Base.:-(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value * (1 - m2.value))
+# Base.:-(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value * (m1.value - 1))
+
+Base.:*(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value * m2.value)
+Base.:*(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value * m1.value)
+Base.:/(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value / m2.value)
+Base.:/(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value / m1.value)
+
+
+Base.zero(::Type{typeof(pct)}) = 0pct
+Base.one(::Type{typeof(pct)}) = 1pct
+Base.typemin(::typeof(pct)) = 0pct
+Base.typemax(::typeof(pct)) = 1pct
+
+const defaultbox = BoundingBox(0mm, 0mm, 0mm, 0mm)
+
+left(bbox::BoundingBox) = bbox.x0[1]
+top(bbox::BoundingBox) = bbox.x0[2]
+right(bbox::BoundingBox) = left(bbox) + width(bbox)
+bottom(bbox::BoundingBox) = top(bbox) + height(bbox)
+Base.size(bbox::BoundingBox) = (width(bbox), height(bbox))
+
+# Base.:*{T,N}(m1::Length{T,N}, m2::Length{T,N}) = Length{T,N}(m1.value * m2.value)
+ispositive(m::Measure) = m.value > 0
+
+# union together bounding boxes
+function Base.:+(bb1::BoundingBox, bb2::BoundingBox)
+    # empty boxes don't change the union
+    ispositive(width(bb1))  || return bb2
+    ispositive(height(bb1)) || return bb2
+    ispositive(width(bb2))  || return bb1
+    ispositive(height(bb2)) || return bb1
+
+    l = min(left(bb1), left(bb2))
+    t = min(top(bb1), top(bb2))
+    r = max(right(bb1), right(bb2))
+    b = max(bottom(bb1), bottom(bb2))
+    BoundingBox(l, t, r-l, b-t)
+end
+
+# this creates a bounding box in the parent's scope, where the child bounding box
+# is relative to the parent
+function crop(parent::BoundingBox, child::BoundingBox)
+    l = left(parent) + left(child)
+    t = top(parent) + top(child)
+    w = width(child)
+    h = height(child)
+    BoundingBox(l, t, w, h)
+end
+
+# convert x,y coordinates from absolute coords to percentages...
+# returns x_pct, y_pct
+function xy_mm_to_pcts(x::AbsoluteLength, y::AbsoluteLength, figw, figh, flipy = true)
+    xmm, ymm = x.value, y.value
+    if flipy
+        ymm = figh.value - ymm  # flip y when origin in bottom-left
+    end
+    xmm / figw.value, ymm / figh.value
+end
+
+# convert a bounding box from absolute coords to percentages...
+# returns an array of percentages of figure size: [left, bottom, width, height]
+function bbox_to_pcts(bb::BoundingBox, figw, figh, flipy = true)
+    mms = Float64[f(bb).value for f in (left,bottom,width,height)]
+    if flipy
+        mms[2] = figh.value - mms[2]  # flip y when origin in bottom-left
+    end
+    mms ./ Float64[figw.value, figh.value, figw.value, figh.value]
+end
+
+function Base.show(io::IO, bbox::BoundingBox)
+    print(io, "BBox{l,t,r,b,w,h = $(left(bbox)),$(top(bbox)), $(right(bbox)),$(bottom(bbox)), $(width(bbox)),$(height(bbox))}")
+end
+
+# -----------------------------------------------------------
+
+# points combined by x/y, pct, and length
+type MixedMeasures
+    xy::Float64
+    pct::Float64
+    len::AbsoluteLength
+end
+
+function resolve_mixed(mix::MixedMeasures, sp::Subplot, letter::Symbol)
+    xy = mix.xy
+    pct = mix.pct
+    if mix.len != 0mm
+        f = (letter == :x ? width : height)
+        totlen = f(plotarea(sp))
+        @show totlen
+        pct += mix.len / totlen
+    end
+    if pct != 0
+        amin, amax = axis_limits(sp[Symbol(letter,:axis)])
+        xy += pct * (amax-amin)
+    end
+    xy
+end
+
+
+# -----------------------------------------------------------
+# AbstractLayout
+
+Base.show(io::IO, layout::AbstractLayout) = print(io, "$(typeof(layout))$(size(layout))")
+
+make_measure_hor(n::Number) = n * w
+make_measure_hor(m::Measure) = m
+
+make_measure_vert(n::Number) = n * h
+make_measure_vert(m::Measure) = m
+
+
+function bbox(x, y, w, h, oarg1::Symbol, originargs::Symbol...)
+    oargs = vcat(oarg1, originargs...)
+    orighor = :left
+    origver = :top
+    for oarg in oargs
+        if oarg == :center
+            orighor = origver = oarg
+        elseif oarg in (:left, :right, :hcenter)
+            orighor = oarg
+        elseif oarg in (:top, :bottom, :vcenter)
+            origver = oarg
+        else
+            warn("Unused origin arg in bbox construction: $oarg")
+        end
+    end
+    bbox(x, y, w, h; h_anchor = orighor, v_anchor = origver)
+end
+
+# create a new bbox
+function bbox(x, y, width, height; h_anchor = :left, v_anchor = :top)
+    x = make_measure_hor(x)
+    y = make_measure_vert(y)
+    width = make_measure_hor(width)
+    height = make_measure_vert(height)
+    left = if h_anchor == :left
+        x
+    elseif h_anchor in (:center, :hcenter)
+        0.5w - 0.5width + x
+    else
+        1w - x - width
+    end
+    top = if v_anchor == :top
+        y
+    elseif v_anchor in (:center, :vcenter)
+        0.5h - 0.5height + y
+    else
+        1h - y - height
+    end
+    BoundingBox(left, top, width, height)
+end
+
+# this is the available area for drawing everything in this layout... as percentages of total canvas
+bbox(layout::AbstractLayout) = layout.bbox
+bbox!(layout::AbstractLayout, bb::BoundingBox) = (layout.bbox = bb)
+
+# layouts are recursive, tree-like structures, and most will have a parent field
+Base.parent(layout::AbstractLayout) = layout.parent
+parent_bbox(layout::AbstractLayout) = bbox(parent(layout))
+
+# padding_w(layout::AbstractLayout) = left_padding(layout) + right_padding(layout)
+# padding_h(layout::AbstractLayout) = bottom_padding(layout) + top_padding(layout)
+# padding(layout::AbstractLayout) = (padding_w(layout), padding_h(layout))
+
+update_position!(layout::AbstractLayout) = nothing
+update_child_bboxes!(layout::AbstractLayout, minimum_perimeter = [0mm,0mm,0mm,0mm]) = nothing
+
+left(layout::AbstractLayout) = left(bbox(layout))
+top(layout::AbstractLayout) = top(bbox(layout))
+right(layout::AbstractLayout) = right(bbox(layout))
+bottom(layout::AbstractLayout) = bottom(bbox(layout))
+width(layout::AbstractLayout) = width(bbox(layout))
+height(layout::AbstractLayout) = height(bbox(layout))
+
+# pass these through to the bbox methods if there's no plotarea
+plotarea(layout::AbstractLayout) = bbox(layout)
+plotarea!(layout::AbstractLayout, bb::BoundingBox) = bbox!(layout, bb)
+
+attr(layout::AbstractLayout, k::Symbol) = layout.attr[k]
+attr(layout::AbstractLayout, k::Symbol, v) = get(layout.attr, k, v)
+attr!(layout::AbstractLayout, v, k::Symbol) = (layout.attr[k] = v)
+hasattr(layout::AbstractLayout, k::Symbol) = haskey(layout.attr, k)
+
+leftpad(layout::AbstractLayout)   = 0mm
+toppad(layout::AbstractLayout)    = 0mm
+rightpad(layout::AbstractLayout)  = 0mm
+bottompad(layout::AbstractLayout) = 0mm
+
+# -----------------------------------------------------------
+# RootLayout
+
+# this is the parent of the top-level layout
+immutable RootLayout <: AbstractLayout end
+
+Base.parent(::RootLayout) = nothing
+parent_bbox(::RootLayout) = defaultbox
+bbox(::RootLayout) = defaultbox
+
+# -----------------------------------------------------------
+# EmptyLayout
+
+# contains blank space
+type EmptyLayout <: AbstractLayout
+    parent::AbstractLayout
+    bbox::BoundingBox
+    attr::KW  # store label, width, and height for initialization
+    # label  # this is the label that the subplot will take (since we create a layout before initialization)
+end
+EmptyLayout(parent = RootLayout(); kw...) = EmptyLayout(parent, defaultbox, KW(kw))
+
+Base.size(layout::EmptyLayout) = (0,0)
+Base.length(layout::EmptyLayout) = 0
+Base.getindex(layout::EmptyLayout, r::Int, c::Int) = nothing
+
+_update_min_padding!(layout::EmptyLayout) = nothing
+
+# -----------------------------------------------------------
+# GridLayout
+
+# nested, gridded layout with optional size percentages
+type GridLayout <: AbstractLayout
+    parent::AbstractLayout
+    minpad::Tuple # leftpad, toppad, rightpad, bottompad
+    bbox::BoundingBox
+    grid::Matrix{AbstractLayout} # Nested layouts. Each position is a AbstractLayout, which allows for arbitrary recursion
+    widths::Vector{Measure}
+    heights::Vector{Measure}
+    attr::KW
+end
+
+grid(args...; kw...) = GridLayout(args...; kw...)
+
+function GridLayout(dims...;
+                    parent = RootLayout(),
+                    widths = zeros(dims[2]),
+                    heights = zeros(dims[1]),
+                    kw...)
+    grid = Matrix{AbstractLayout}(dims...)
+    layout = GridLayout(
+        parent,
+        (20mm, 5mm, 2mm, 10mm),
+        defaultbox,
+        grid,
+        Measure[w*pct for w in widths],
+        Measure[h*pct for h in heights],
+        # convert(Vector{Float64}, widths),
+        # convert(Vector{Float64}, heights),
+        KW(kw))
+    for i in eachindex(grid)
+        grid[i] = EmptyLayout(layout)
+    end
+    layout
+end
+
+Base.size(layout::GridLayout) = size(layout.grid)
+Base.length(layout::GridLayout) = length(layout.grid)
+Base.getindex(layout::GridLayout, r::Int, c::Int) = layout.grid[r,c]
+function Base.setindex!(layout::GridLayout, v, r::Int, c::Int)
+    layout.grid[r,c] = v
+end
+
+leftpad(layout::GridLayout)   = layout.minpad[1]
+toppad(layout::GridLayout)    = layout.minpad[2]
+rightpad(layout::GridLayout)  = layout.minpad[3]
+bottompad(layout::GridLayout) = layout.minpad[4]
+
+
+# here's how this works... first we recursively "update the minimum padding" (which
+# means to calculate the minimum size needed from the edge of the subplot to plot area)
+# for the whole layout tree.  then we can compute the "padding borders" of this
+# layout as the biggest padding of the children on the perimeter.  then we need to
+# recursively pass those borders back down the tree, one side at a time, but ONLY
+# to those perimeter children.
+
+# leftpad, toppad, rightpad, bottompad
+function _update_min_padding!(layout::GridLayout)
+    map(_update_min_padding!, layout.grid)
+    layout.minpad = (
+        maximum(map(leftpad,   layout.grid[:,1])),
+        maximum(map(toppad,    layout.grid[1,:])),
+        maximum(map(rightpad,  layout.grid[:,end])),
+        maximum(map(bottompad, layout.grid[end,:]))
+    )
+end
+
+
+function update_position!(layout::GridLayout)
+    map(update_position!, layout.grid)
+end
+
+# some lengths are fixed... we have to split up the free space among the list v
+function recompute_lengths(v)
+    # dump(v)
+    tot = 0pct
+    cnt = 0
+    for vi in v
+        if vi == 0pct
+            cnt += 1
+        else
+            tot += vi
+        end
+    end
+    leftover = 1.0pct - tot
+    if cnt > 1 && leftover.value <= 0
+        error("Not enough length left over in layout!  v = $v, cnt = $cnt, leftover = $leftover")
+    end
+
+    # now fill in the blanks
+    Measure[(vi == 0pct ? leftover / cnt : vi) for vi in v]
+end
+
+# recursively compute the bounding boxes for the layout and plotarea (relative to canvas!)
+function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm,0mm,0mm,0mm])
+    nr, nc = size(layout)
+
+    # # create a matrix for each minimum padding direction
+    # _update_min_padding!(layout)
+
+    minpad_left   = map(leftpad,   layout.grid)
+    minpad_top    = map(toppad,    layout.grid)
+    minpad_right  = map(rightpad,  layout.grid)
+    minpad_bottom = map(bottompad, layout.grid)
+
+    # get the max horizontal (left and right) padding over columns,
+    # and max vertical (bottom and top) padding over rows
+    # TODO: add extra padding here
+    pad_left   = maximum(minpad_left,   1)
+    pad_top    = maximum(minpad_top,    2)
+    pad_right  = maximum(minpad_right,  1)
+    pad_bottom = maximum(minpad_bottom, 2)
+
+    # make sure the perimeter match the parent
+    pad_left[1]     = max(pad_left[1], minimum_perimeter[1])
+    pad_top[1]      = max(pad_top[1], minimum_perimeter[2])
+    pad_right[end]  = max(pad_right[end], minimum_perimeter[3])
+    pad_bottom[end] = max(pad_bottom[end], minimum_perimeter[4])
+
+    # scale this up to the total padding in each direction
+    total_pad_horizontal = sum(pad_left + pad_right)
+    total_pad_vertical   = sum(pad_top + pad_bottom)
+
+    # now we can compute the total plot area in each direction
+    total_plotarea_horizontal = width(layout)  - total_pad_horizontal
+    total_plotarea_vertical   = height(layout) - total_pad_vertical
+
+    # recompute widths/heights
+    layout.widths = recompute_lengths(layout.widths)
+    layout.heights = recompute_lengths(layout.heights)
+
+    # normalize widths/heights so they sum to 1
+    # denom_w = sum(layout.widths)
+    # denom_h = sum(layout.heights)
+
+    # we have all the data we need... lets compute the plot areas and set the bounding boxes
+    for r=1:nr, c=1:nc
+        child = layout[r,c]
+
+        # get the top-left corner of this child... the first one is top-left of the parent (i.e. layout)
+        child_left = (c == 1 ? left(layout.bbox) : right(layout[r, c-1].bbox))
+        child_top  = (r == 1 ? top(layout.bbox) : bottom(layout[r-1, c].bbox))
+
+        # compute plot area
+        plotarea_left   = child_left + pad_left[c]
+        plotarea_top    = child_top + pad_top[r]
+        plotarea_width  = total_plotarea_horizontal * layout.widths[c]
+        plotarea_height = total_plotarea_vertical * layout.heights[r]
+        plotarea!(child, BoundingBox(plotarea_left, plotarea_top, plotarea_width, plotarea_height))
+
+        # compute child bbox
+        child_width  = pad_left[c] + plotarea_width + pad_right[c]
+        child_height = pad_top[r] + plotarea_height + pad_bottom[r]
+        bbox!(child, BoundingBox(child_left, child_top, child_width, child_height))
+
+        # this is the minimum perimeter as decided by this child's parent, so that
+        # all children on this border have the same value
+        min_child_perimeter = [
+            c == 1  ? layout.minpad[1] : 0mm,
+            r == 1  ? layout.minpad[2] : 0mm,
+            c == nc ? layout.minpad[3] : 0mm,
+            r == nr ? layout.minpad[4] : 0mm
+        ]
+
+        # recursively update the child's children
+        update_child_bboxes!(child, min_child_perimeter)
+    end
+end
+
+# for each inset (floating) subplot, resolve the relative position
+# to absolute canvas coordinates, relative to the parent's plotarea
+function update_inset_bboxes!(plt::Plot)
+    for sp in plt.inset_subplots
+        p_area = Measures.resolve(plotarea(sp.parent), sp[:relative_bbox])
+        plotarea!(sp, p_area)
+
+        bbox!(sp, bbox(
+            left(p_area) - leftpad(sp),
+            top(p_area) - toppad(sp),
+            width(p_area) + leftpad(sp) + rightpad(sp),
+            height(p_area) + toppad(sp) + bottompad(sp)
+        ))
+    end
+end
+
+# ----------------------------------------------------------------------
+
+calc_num_subplots(layout::AbstractLayout) = 1
+function calc_num_subplots(layout::GridLayout)
+    tot = 0
+    for l in layout.grid
+        tot += calc_num_subplots(l)
+    end
+    tot
+end
+
+function compute_gridsize(numplts::Int, nr::Int, nc::Int)
+    # figure out how many rows/columns we need
+    if nr < 1
+        if nc < 1
+            nr = round(Int, sqrt(numplts))
+            nc = ceil(Int, numplts / nr)
+        else
+            nr = ceil(Int, numplts / nc)
+        end
+    else
+        nc = ceil(Int, numplts / nr)
+    end
+    nr, nc
+end
+
+# ----------------------------------------------------------------------
+# constructors
+
+# pass the layout arg through
+function layout_args(d::KW)
+    layout_args(get(d, :layout, default(:layout)))
+end
+
+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
+    layout, n
+end
+
+function layout_args(n::Integer)
+    nr, nc = compute_gridsize(n, -1, -1)
+    GridLayout(nr, nc), n
+end
+
+function layout_args{I<:Integer}(sztup::NTuple{2,I})
+    nr, nc = sztup
+    GridLayout(nr, nc), nr*nc
+end
+
+function layout_args{I<:Integer}(sztup::NTuple{3,I})
+    n, nr, nc = sztup
+    nr, nc = compute_gridsize(n, nr, nc)
+    GridLayout(nr, nc), n
+end
+
+# compute number of subplots
+function layout_args(layout::GridLayout)
+    # recursively get the size of the grid
+    n = calc_num_subplots(layout)
+    layout, n
+end
+
+layout_args(huh) = error("unhandled layout type $(typeof(huh)): $huh")
+
+
+# ----------------------------------------------------------------------
+
+
+function build_layout(args...)
+    layout, n = layout_args(args...)
+    build_layout(layout, n)
+end
+
+# # just a single subplot
+# function build_layout(sp::Subplot, n::Integer)
+#     sp, Subplot[sp], SubplotMap(gensym() => sp)
+# end
+
+# n is the number of subplots... build a grid and initialize the inner subplots recursively
+function build_layout(layout::GridLayout, n::Integer)
+    nr, nc = size(layout)
+    subplots = Subplot[]
+    spmap = SubplotMap()
+    i = 0
+    for r=1:nr, c=1:nc
+        l = layout[r,c]
+        if isa(l, EmptyLayout) && !get(l.attr, :blank, false)
+            sp = Subplot(backend(), parent=layout)
+            layout[r,c] = sp
+            push!(subplots, sp)
+            spmap[attr(l,:label,gensym())] = sp
+            if get(l.attr, :width, :auto) != :auto
+                layout.widths[c] = attr(l,:width)
+            end
+            if get(l.attr, :height, :auto) != :auto
+                layout.heights[r] = attr(l,:height)
+            end
+            i += 1
+        elseif isa(l, GridLayout)
+            # sub-grid
+            if get(l.attr, :width, :auto) != :auto
+                layout.widths[c] = attr(l,:width)
+            end
+            if get(l.attr, :height, :auto) != :auto
+                layout.heights[r] = attr(l,:height)
+            end
+            l, sps, m = build_layout(l, n-i)
+            append!(subplots, sps)
+            merge!(spmap, m)
+            i += length(sps)
+        elseif isa(l, Subplot)
+            error("Subplot exists. Cannot re-use existing layout.  Please make a new one.")
+        end
+        i >= n && break  # only add n subplots
+    end
+
+    layout, subplots, spmap
+end
+
+# build a layout from a list of existing Plot objects
+# TODO... much of the logic overlaps with the method above... can we merge?
+function build_layout(layout::GridLayout, numsp::Integer, plts::AVec{Plot})
+    nr, nc = size(layout)
+    subplots = Subplot[]
+    spmap = SubplotMap()
+    i = 0
+    for r=1:nr, c=1:nc
+        l = layout[r,c]
+        if isa(l, EmptyLayout) && !get(l.attr, :blank, false)
+            plt = shift!(plts)  # grab the first plot out of the list
+            layout[r,c] = plt.layout
+            append!(subplots, plt.subplots)
+            merge!(spmap, plt.spmap)
+            if get(l.attr, :width, :auto) != :auto
+                layout.widths[c] = attr(l,:width)
+            end
+            if get(l.attr, :height, :auto) != :auto
+                layout.heights[r] = attr(l,:height)
+            end
+            i += length(plt.subplots)
+        elseif isa(l, GridLayout)
+            # sub-grid
+            if get(l.attr, :width, :auto) != :auto
+                layout.widths[c] = attr(l,:width)
+            end
+            if get(l.attr, :height, :auto) != :auto
+                layout.heights[r] = attr(l,:height)
+            end
+            l, sps, m = build_layout(l, numsp-i, plts)
+            append!(subplots, sps)
+            merge!(spmap, m)
+            i += length(sps)
+        end
+        i >= numsp && break  # only add n subplots
+    end
+    layout, subplots, spmap
+end
+
+
+# ----------------------------------------------------------------------
+# @layout macro
+
+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] == :*
+        num = v.args[2]
+        if length(v.args) == 3 && isa(num, Number)
+            units = v.args[3]
+            if units == :h
+                return kw[:h] = num*pct
+            elseif units == :w
+                return kw[:w] = num*pct
+            elseif units in (:pct, :px, :mm, :cm, :inch)
+                idx == 1 && (kw[:w] = v)
+                (idx == 2 || nidx == 1) && (kw[:h] = v)
+                # return kw[idx == 1 ? :w : :h] = v
+            end
+        end
+    end
+    error("Couldn't match layout curly (idx=$idx): $v")
+end
+
+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)
+end
+
+isrow(v) = isa(v, Expr) && v.head in (:hcat,:row)
+iscol(v) = isa(v, Expr) && v.head == :vcat
+rowsize(v) = isrow(v) ? length(v.args) : 1
+
+
+function create_grid(expr::Expr)
+    if iscol(expr)
+        create_grid_vcat(expr)
+    elseif isrow(expr)
+        :(let cell = GridLayout(1, $(length(expr.args)))
+            $([:(cell[1,$i] = $(create_grid(v))) for (i,v) in enumerate(expr.args)]...)
+            cell
+        end)
+
+    elseif expr.head == :curly
+        create_grid_curly(expr)
+    else
+        # if it's something else, just return that (might be an existing layout?)
+        esc(expr)
+    end
+end
+
+function create_grid_vcat(expr::Expr)
+    rowsizes = map(rowsize, expr.args)
+    rmin, rmax = extrema(rowsizes)
+    if rmin > 0 && rmin == rmax
+        # we have a grid... build the whole thing
+        # note: rmin is the number of columns
+        nr = length(expr.args)
+        nc = rmin
+        body = Expr(:block)
+        for r=1:nr
+            arg = expr.args[r]
+            if isrow(arg)
+                for (c,item) in enumerate(arg.args)
+                    push!(body.args, :(cell[$r,$c] = $(create_grid(item))))
+                end
+            else
+                push!(body.args, :(cell[$r,1] = $(create_grid(arg))))
+            end
+        end
+        :(let cell = GridLayout($nr, $nc)
+            $body
+            cell
+        end)
+    else
+        # otherwise just build one row at a time
+        :(let cell = GridLayout($(length(expr.args)), 1)
+            $([:(cell[$i,1] = $(create_grid(v))) for (i,v) in enumerate(expr.args)]...)
+            cell
+        end)
+    end
+end
+
+function create_grid_curly(expr::Expr)
+    kw = KW()
+    for (i,arg) in enumerate(expr.args[2:end])
+        add_layout_pct!(kw, arg, i, length(expr.args)-1)
+    end
+    s = expr.args[1]
+    if isa(s, Expr) && s.head == :call && s.args[1] == :grid
+        create_grid(:(grid($(s.args[2:end]...), width = $(get(kw, :w, QuoteNode(:auto))), height = $(get(kw, :h, QuoteNode(:auto))))))
+    elseif isa(s, Symbol)
+        :(EmptyLayout(label = $(QuoteNode(s)), width = $(get(kw, :w, QuoteNode(:auto))), height = $(get(kw, :h, QuoteNode(:auto)))))
+    else
+        error("Unknown use of curly brackets: $expr")
+    end
+end
+
+function create_grid(s::Symbol)
+    :(EmptyLayout(label = $(QuoteNode(s)), blank = $(s == :_)))
+end
+
+macro layout(mat::Expr)
+    create_grid(mat)
+end
+
+
+# -------------------------------------------------------------------------
+
+# make all reference the same axis extrema/values.
+# merge subplot lists.
+function link_axes!(axes::Axis...)
+    a1 = axes[1]
+    for i=2:length(axes)
+        a2 = axes[i]
+        expand_extrema!(a1, extrema(a2))
+        for k in (:extrema, :discrete_values, :continuous_values, :discrete_map)
+            a2[k] = a1[k]
+        end
+
+        # make a2's subplot list refer to a1's and add any missing values
+        sps2 = a2.sps
+        for sp in sps2
+            sp in a1.sps || push!(a1.sps, sp)
+        end
+        a2.sps = a1.sps
+    end
+end
+
+# figure out which subplots to link
+function link_subplots(a::AbstractArray{AbstractLayout}, axissym::Symbol)
+    subplots = []
+    for l in a
+        if isa(l, Subplot)
+            push!(subplots, l)
+        elseif isa(l, GridLayout) && size(l) == (1,1)
+            push!(subplots, l[1,1])
+        end
+    end
+    subplots
+end
+
+# for some vector or matrix of layouts, filter only the Subplots and link those axes
+function link_axes!(a::AbstractArray{AbstractLayout}, axissym::Symbol)
+    subplots = link_subplots(a, axissym)
+    axes = [sp.attr[axissym] for sp in subplots]
+    if length(axes) > 0
+        link_axes!(axes...)
+    end
+end
+
+# don't do anything for most layout types
+function link_axes!(l::AbstractLayout, link::Symbol)
+end
+
+# process a GridLayout, recursively linking axes according to the link symbol
+function link_axes!(layout::GridLayout, link::Symbol)
+    nr, nc = size(layout)
+    if link in (:x, :both)
+        for c=1:nc
+            link_axes!(layout.grid[:,c], :xaxis)
+        end
+    end
+    if link in (:y, :both)
+        for r=1:nr
+            link_axes!(layout.grid[r,:], :yaxis)
+        end
+    end
+    if link == :square
+        sps = filter(l -> isa(l, Subplot), layout.grid)
+        if !isempty(sps)
+            base_axis = sps[1][:xaxis]
+            for sp in sps
+                link_axes!(base_axis, sp[:xaxis])
+                link_axes!(base_axis, sp[:yaxis])
+            end
+        end
+    end
+    if link == :all
+        link_axes!(layout.grid, :xaxis)
+        link_axes!(layout.grid, :yaxis)
+    end
+    for l in layout.grid
+        link_axes!(l, link)
+    end
+end
+
+# -------------------------------------------------------------------------
+
+"Adds a new, empty subplot overlayed on top of `sp`, with a mirrored y-axis and linked x-axis."
+function twinx(sp::Subplot)
+    sp[:right_margin] = max(sp[:right_margin], 30px)
+    plot!(sp.plt, inset = (sp[:subplot_index], bbox(0,0,1,1)))
+    twinsp = sp.plt.subplots[end]
+    twinsp[:yaxis][:mirror] = true
+    twinsp[:background_color_inside] = RGBA{Float64}(0,0,0,0)
+    link_axes!(sp[:xaxis], twinsp[:xaxis])
+    twinsp
+end
+
+twinx(plt::Plot = current()) = twinx(plt[1])

src/output.jl

@@ -1,53 +1,71 @@
 
 
-defaultOutputFormat(plt::PlottingObject) = "png"
+defaultOutputFormat(plt::Plot) = "png"
 
-function png(plt::PlottingObject, fn::@compat(AbstractString))
+function png(plt::Plot, fn::AbstractString)
   fn = addExtension(fn, "png")
   io = open(fn, "w")
-  writemime(io, MIME("image/png"), plt)
+  show(io, MIME("image/png"), plt)
   close(io)
 end
-png(fn::@compat(AbstractString)) = png(current(), fn)
+png(fn::AbstractString) = png(current(), fn)
 
-function svg(plt::PlottingObject, fn::@compat(AbstractString))
+function svg(plt::Plot, fn::AbstractString)
   fn = addExtension(fn, "svg")
   io = open(fn, "w")
-  writemime(io, MIME("image/svg+xml"), plt)
+  show(io, MIME("image/svg+xml"), plt)
   close(io)
 end
-svg(fn::@compat(AbstractString)) = svg(current(), fn)
+svg(fn::AbstractString) = svg(current(), fn)
 
 
-function pdf(plt::PlottingObject, fn::@compat(AbstractString))
+function pdf(plt::Plot, fn::AbstractString)
   fn = addExtension(fn, "pdf")
   io = open(fn, "w")
-  writemime(io, MIME("application/pdf"), plt)
+  show(io, MIME("application/pdf"), plt)
   close(io)
 end
-pdf(fn::@compat(AbstractString)) = pdf(current(), fn)
+pdf(fn::AbstractString) = pdf(current(), fn)
 
 
-function ps(plt::PlottingObject, fn::@compat(AbstractString))
+function ps(plt::Plot, fn::AbstractString)
   fn = addExtension(fn, "ps")
   io = open(fn, "w")
-  writemime(io, MIME("application/postscript"), plt)
+  show(io, MIME("application/postscript"), plt)
   close(io)
 end
-ps(fn::@compat(AbstractString)) = ps(current(), fn)
+ps(fn::AbstractString) = ps(current(), fn)
+
+function eps(plt::Plot, fn::AbstractString)
+  fn = addExtension(fn, "eps")
+  io = open(fn, "w")
+  writemime(io, MIME("image/eps"), plt)
+  close(io)
+end
+eps(fn::AbstractString) = eps(current(), fn)
+
+function tex(plt::Plot, fn::AbstractString)
+  fn = addExtension(fn, "tex")
+  io = open(fn, "w")
+  show(io, MIME("application/x-tex"), plt)
+  close(io)
+end
+tex(fn::AbstractString) = tex(current(), fn)
 
 
 # ----------------------------------------------------------------
 
 
-@compat const _savemap = Dict(
+const _savemap = Dict(
     "png" => png,
     "svg" => svg,
     "pdf" => pdf,
     "ps"  => ps,
+    "eps" => eps,
+    "tex" => tex,
   )
 
-function getExtension(fn::@compat(AbstractString))
+function getExtension(fn::AbstractString)
   pieces = split(fn, ".")
   length(pieces) > 1 || error("Can't extract file extension: ", fn)
   ext = pieces[end]
@@ -55,7 +73,7 @@ function getExtension(fn::@compat(AbstractString))
   ext
 end
 
-function addExtension(fn::@compat(AbstractString), ext::@compat(AbstractString))
+function addExtension(fn::AbstractString, ext::AbstractString)
   try
     oldext = getExtension(fn)
     if oldext == ext
@@ -68,8 +86,8 @@ function addExtension(fn::@compat(AbstractString), ext::@compat(AbstractString))
   end
 end
 
-function savefig(plt::PlottingObject, fn::@compat(AbstractString))
-  
+function savefig(plt::Plot, fn::AbstractString)
+
   # get the extension
   local ext
   try
@@ -86,19 +104,198 @@ function savefig(plt::PlottingObject, fn::@compat(AbstractString))
   end
   func(plt, fn)
 end
-savefig(fn::@compat(AbstractString)) = savefig(current(), fn)
-
-
-# savepng(args...; kw...) = savepng(current(), args...; kw...)
-# savepng(plt::PlottingObject, fn::@compat(AbstractString); kw...) = (io = open(fn, "w"); writemime(io, MIME("image/png"), plt); close(io))
-
-
+savefig(fn::AbstractString) = savefig(current(), fn)
 
 
 # ---------------------------------------------------------
 
-gui(plt::PlottingObject = current()) = display(PlotsDisplay(), plt)
+gui(plt::Plot = current()) = display(PlotsDisplay(), plt)
 
+function Base.display(::PlotsDisplay, plt::Plot)
+    prepare_output(plt)
+    _display(plt)
+end
 
 # override the REPL display to open a gui window
-Base.display(::Base.REPL.REPLDisplay, ::MIME"text/plain", plt::PlottingObject) = gui(plt)
+Base.display(::Base.REPL.REPLDisplay, ::MIME"text/plain", plt::Plot) = gui(plt)
+
+# ---------------------------------------------------------
+
+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",
+)
+
+const _best_html_output_type = KW(
+    :pyplot => :png,
+    :unicodeplots => :txt,
+    :glvisualize => :png
+)
+
+# a backup for html... passes to svg or png depending on the html_output_format arg
+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")
+        print(io, "<img src=\"data:image/png;base64,", base64encode(show, MIME("image/png"), plt), "\" />")
+    elseif output_type == :svg
+        # 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: $output_type")
+    end
+end
+
+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.")
+end
+
+# for writing to io streams... first prepare, then callback
+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
+
+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)
+#             print(io, "<img src=\"data:image/png;base64,", base64(show, MIME("image/png"), plt), "\" />")
+#         end
+#     elseif fmt == "svg"
+#         @eval function Base.show(io::IO, ::MIME"text/html", plt::Plot)
+#             show(io, MIME("image/svg+xml"), plt)
+#         end
+#     else
+#         error("only png or svg allowed. got: $fmt")
+#     end
+# end
+#
+# 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 setup_atom()
+    if isatom()
+        @eval import Atom, Media
+        Media.media(Plot, Media.Plot)
+
+        # 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
+
+        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

src/pipeline.jl

@@ -0,0 +1,414 @@
+
+
+# ------------------------------------------------------------------
+# preprocessing
+
+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(d::KW, args)
+    sts = get(d, :seriestype, :path)
+    if typeof(sts) <: AbstractArray
+        delete!(d, :seriestype)
+        RecipeData[begin
+            dc = copy(d)
+            dc[:seriestype] = sts[r:r,:]
+            RecipeData(dc, args)
+        end for r=1:size(sts,1)]
+    else
+        RecipeData[RecipeData(copy(d), args)]
+    end
+end
+
+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(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(d, args))
+    end
+
+    # remove subplot and axis args from d... they will be passed through in the kw_list
+    if !isempty(args)
+        for (k,v) in d
+            for defdict in (_subplot_defaults,
+                            _axis_defaults,
+                            _axis_defaults_byletter)
+                if haskey(defdict, k)
+                    delete!(d, k)
+                end
+            end
+        end
+    end
+
+    args
+end
+
+# ------------------------------------------------------------------
+# user recipes
+
+
+function _process_userrecipes(plt::Plot, d::KW, args)
+    still_to_process = RecipeData[]
+    args = _preprocess_args(d, args, still_to_process)
+
+    # for plotting recipes, swap out the args and update the parameter dictionary
+    # 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, 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 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
+    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.d
+    preprocessArgs!(kw)
+    _preprocess_userrecipe(kw)
+    warnOnUnsupported_scales(plt.backend, kw)
+
+    # add the plot index
+    plt.n += 1
+    kw[:series_plotindex] = plt.n
+
+    push!(kw_list, kw)
+    _add_errorbar_kw(kw_list, kw)
+    _add_smooth_kw(kw_list, kw)
+    return
+end
+
+function _preprocess_userrecipe(kw::KW)
+    _add_markershape(kw)
+
+    # if there was a grouping, filter the data here
+    _filter_input_data!(kw)
+
+    # 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] = 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] = map(kw[:line_z], kw[:x], kw[:y], kw[:z])
+    end
+
+    # convert a ribbon into a fillrange
+    if get(kw, :ribbon, nothing) != nothing
+        make_fillrange_from_ribbon(kw)
+    end
+    return
+end
+
+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
+            # we make a copy of the KW and apply an errorbar recipe
+            errkw = copy(kw)
+            errkw[:seriestype] = esym
+            errkw[:label] = ""
+            errkw[:primary] = false
+            push!(kw_list, errkw)
+        end
+    end
+end
+
+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 = [minimum(x), maximum(x)]
+        sy = β * sx + α
+        push!(kw_list, merge(copy(kw), KW(
+            :seriestype => :path,
+            :x => sx,
+            :y => sy,
+            :fillrange => nothing,
+            :label => "",
+            :primary => false,
+        )))
+    end
+end
+
+# ------------------------------------------------------------------
+# plot recipes
+
+# Grab the first in line to be processed and pass it through apply_recipe
+# 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::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)
+        return
+    end
+    try
+        st = kw[:seriestype]
+        st = kw[:seriestype] = get(_typeAliases, st, st)
+        datalist = RecipesBase.apply_recipe(kw, Val{st}, plt)
+        for data in datalist
+            preprocessArgs!(data.d)
+            if data.d[:seriestype] == st
+                error("Plot recipe $st returned the same seriestype: $(data.d)")
+            end
+            push!(still_to_process, data.d)
+        end
+    catch err
+        if isa(err, MethodError)
+            push!(kw_list, kw)
+        else
+            rethrow()
+        end
+    end
+    return
+end
+
+
+# ------------------------------------------------------------------
+# setup plot and subplot
+
+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) && (d[k] = pop!(kw, k))
+    end
+
+    # TODO: init subplots here
+    _update_plot_args(plt, d)
+    if !plt.init
+        plt.o = _create_backend_figure(plt)
+
+        # create the layout and subplots from the inputs
+        plt.layout, plt.subplots, plt.spmap = build_layout(plt.attr)
+        for (idx,sp) in enumerate(plt.subplots)
+            sp.plt = plt
+            sp.attr[:subplot_index] = idx
+        end
+
+        plt.init = true
+    end
+
+
+    # handle inset subplots
+    insets = plt[:inset_subplots]
+    if insets != nothing
+        if !(typeof(insets) <: AVec)
+            insets = [insets]
+        end
+        for inset in insets
+            parent, bb = is_2tuple(inset) ? inset : (nothing, inset)
+            P = typeof(parent)
+            if P <: Integer
+                parent = plt.subplots[parent]
+            elseif P == Symbol
+                parent = plt.spmap[parent]
+            else
+                parent = plt.layout
+            end
+            sp = Subplot(backend(), parent=parent)
+            sp.plt = plt
+            push!(plt.subplots, sp)
+            push!(plt.inset_subplots, sp)
+            sp.attr[:relative_bbox] = bb
+            sp.attr[:subplot_index] = length(plt.subplots)
+        end
+    end
+    plt[:inset_subplots] = nothing
+end
+
+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.
+    # TODO: allow matrices to still apply to all subplots
+    sp_attrs = Dict{Subplot,Any}()
+    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], 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 kw
+            if haskey(_subplot_defaults, k) || haskey(_axis_defaults_byletter, k)
+                attr[k] = pop!(kw, k)
+            end
+            if haskey(_axis_defaults, k)
+                v = pop!(kw, k)
+                for letter in (:x,:y,:z)
+                    attr[Symbol(letter,k)] = v
+                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(d, :subplot) || d[:subplot] == idx
+            merge(d, get(sp_attrs, sp, KW()))
+        else
+            get(sp_attrs, sp, KW())
+        end
+        _update_subplot_args(plt, sp, attr, idx, false)
+    end
+
+    # do we need to link any axes together?
+    link_axes!(plt.layout, plt[:link])
+end
+
+# getting ready to add the series... last update to subplot from anything
+# that might have been added during series recipes
+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, d, sp_idx, true)
+
+    st = _override_seriestype_check(d, st)
+
+    # change to a 3d projection for this subplot?
+    if is3d(st)
+        sp.attr[:projection] = "3d"
+    end
+
+    # initialize now that we know the first series type
+    if !haskey(sp.attr, :init)
+        _initialize_subplot(plt, sp)
+        sp.attr[:init] = true
+    end
+    sp
+end
+
+# ------------------------------------------------------------------
+# series types
+
+function _override_seriestype_check(d::KW, st::Symbol)
+    # do we want to override the series type?
+    if !is3d(st)
+        z = d[:z]
+        if !isa(z, Void) && (size(d[:x]) == size(d[:y]) == size(z))
+            st = (st == :scatter ? :scatter3d : :path3d)
+            d[:seriestype] = st
+        end
+    end
+    st
+end
+
+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!(d, :series_annotations, []))
+    # if isa(series_anns, SeriesAnnotations)
+    #     series_anns.x = d[:x]
+    #     series_anns.y = d[:y]
+    # elseif length(series_anns) > 0
+    #     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]
+    # end
+    # sp.attr[:annotations] = vcat(sp_anns, series_anns)
+end
+
+function _expand_subplot_extrema(sp::Subplot, d::KW, st::Symbol)
+    # adjust extrema and discrete info
+    if st == :image
+        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, 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)
+end
+
+# -------------------------------------------------------------------------------
+
+# this method recursively applies series recipes when the seriestype is not supported
+# natively by the backend
+function _process_seriesrecipe(plt::Plot, d::KW)
+    # replace seriestype aliases
+    st = Symbol(d[:seriestype])
+    st = d[:seriestype] = get(_typeAliases, st, st)
+
+    # shapes shouldn't have fillrange set
+    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, 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(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.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.d)
+            else
+                warn("Unhandled recipe: $(data)")
+                break
+            end
+        end
+    end
+    nothing
+end

src/plot.jl

@@ -1,18 +1,18 @@
 
 type CurrentPlot
-  nullableplot::Nullable{PlottingObject}
+    nullableplot::Nullable{AbstractPlot}
 end
-const CURRENT_PLOT = CurrentPlot(Nullable{PlottingObject}())
+const CURRENT_PLOT = CurrentPlot(Nullable{AbstractPlot}())
 
 isplotnull() = isnull(CURRENT_PLOT.nullableplot)
 
 function current()
-  if isplotnull()
-    error("No current plot/subplot")
-  end
-  get(CURRENT_PLOT.nullableplot)
+    if isplotnull()
+        error("No current plot/subplot")
+    end
+    get(CURRENT_PLOT.nullableplot)
 end
-current(plot::PlottingObject) = (CURRENT_PLOT.nullableplot = Nullable(plot))
+current(plot::AbstractPlot) = (CURRENT_PLOT.nullableplot = Nullable(plot))
 
 # ---------------------------------------------------------
 
@@ -22,7 +22,7 @@ Base.print(io::IO, plt::Plot) = print(io, string(plt))
 Base.show(io::IO, plt::Plot) = print(io, string(plt))
 
 getplot(plt::Plot) = plt
-getinitargs(plt::Plot, idx::Int = 1) = plt.initargs
+getattr(plt::Plot, idx::Int = 1) = plt.attr
 convertSeriesIndex(plt::Plot, n::Int) = n
 
 # ---------------------------------------------------------
@@ -32,9 +32,9 @@ 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:
 
 ```
-  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 window, and sets it to be the current
+    plot!(args...; kw...)                 # adds to the `current`
+    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.
@@ -43,390 +43,245 @@ When you pass in matrices, it splits by columns.  See the documentation for more
 
 # this creates a new plot with args/kw and sets it to be the current plot
 function plot(args...; kw...)
-  pkg = backend()
-  d = Dict(kw)
-  preprocessArgs!(d)
-  dumpdict(d, "After plot preprocessing")
+    d = KW(kw)
+    preprocessArgs!(d)
 
-  plotargs = getPlotArgs(pkg, d, 1)
-  dumpdict(plotargs, "Plot args")
-  plt = plot(pkg; plotargs...)  # create a new, blank plot
+    # create an empty Plot then process
+    plt = Plot()
+    # plt.user_attr = d
+    _plot!(plt, d, args)
+end
 
-  delete!(d, :background_color)
-  plot!(plt, args...; d...)  # add to it
+# 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...)
+    d = KW(kw)
+    preprocessArgs!(d)
+
+    # build our plot vector from the args
+    n = length(plts_tail) + 1
+    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(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.
+    # note: we create a new backend figure for this new plot object
+    # note: all subplots and series "belong" to this new plot...
+    plt = Plot()
+
+    # 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 d
+    for p in plts
+        _update_plot_args(plt, p.attr)
+        plt.n += p.n
+    end
+    _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 d
+        if haskey(_series_defaults, k)
+            series_attr[k] = pop!(d,k)
+        end
+    end
+
+    # create the layout and initialize the subplots
+    plt.layout, plt.subplots, plt.spmap = build_layout(layout, num_sp, copy(plts))
+    cmdidx = 1
+    for (idx, sp) in enumerate(plt.subplots)
+        _initialize_subplot(plt, sp)
+        serieslist = series_list(sp)
+        if sp in sp.plt.inset_subplots
+            push!(plt.inset_subplots, sp)
+        end
+        sp.plt = plt
+        sp.attr[:subplot_index] = idx
+        for series in serieslist
+            merge!(series.d, series_attr)
+            _add_defaults!(series.d, plt, sp, cmdidx)
+            push!(plt.series_list, series)
+            _series_added(plt, series)
+            cmdidx += 1
+        end
+    end
+
+    # first apply any args for the subplots
+    for (idx,sp) in enumerate(plt.subplots)
+        _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)
+    if get(d, :show, default(:show))
+        gui()
+    end
+    plt
 end
 
 
 
 # this adds to the current plot, or creates a new plot if none are current
 function  plot!(args...; kw...)
-  local plt
-  try
-    plt = current()
-  catch
-    return plot(args...; kw...)
-  end
-  plot!(current(), args...; kw...)
-end
-
-# not allowed:
-function plot!(subplt::Subplot, args...; kw...)
-  error("Can't call plot! on a Subplot!")
+    local plt
+    try
+        plt = current()
+    catch
+        return plot(args...; kw...)
+    end
+    plot!(current(), args...; kw...)
 end
 
 # this adds to a specific plot... most plot commands will flow through here
 function plot!(plt::Plot, args...; kw...)
-  d = Dict(kw)
-  preprocessArgs!(d)
+    d = KW(kw)
+    preprocessArgs!(d)
+    # merge!(plt.user_attr, d)
+    _plot!(plt, d, args)
+end
 
-  dumpdict(d, "After plot! preprocessing")
+# -------------------------------------------------------------------------------
 
-  warnOnUnsupportedArgs(plt.backend, d)
+# 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, d::KW, args::Tuple)
+    d[:plot_object] = plt
 
-  # grouping
-  groupargs = get(d, :group, nothing) == nothing ? [] : [extractGroupArgs(d[:group], args...)]
-
-  # just in case the backend needs to set up the plot (make it current or something)
-  preparePlotUpdate(plt)
-
-  # get the list of dictionaries, one per series
-  kwList, xmeta, ymeta = createKWargsList(plt, groupargs..., args...; d...)
-  
-  # if we were able to extract guide information from the series inputs, then update the plot
-  # @show xmeta, ymeta
-  updateDictWithMeta(d, plt.initargs, xmeta, true)
-  updateDictWithMeta(d, plt.initargs, ymeta, false)
-
-  # now we can plot the series
-  for (i,di) in enumerate(kwList)
-    plt.n += 1
-
-    setTicksFromStringVector(d, di, :x, :xticks)
-    setTicksFromStringVector(d, di, :y, :yticks)
-
-    # remove plot args
-    for k in keys(_plotDefaults)
-      delete!(di, k)
+    if !isempty(args) && !isdefined(Main, :StatPlots) &&
+            first(split(string(typeof(args[1])), ".")) == "DataFrames"
+        warn("You're trying to plot a DataFrame, but this functionality is provided by StatPlots")
     end
 
-    dumpdict(di, "Series $i")
+    # --------------------------------
+    # "USER RECIPES"
+    # --------------------------------
 
-    plot!(plt.backend, plt; di...)
-  end
+    kw_list = _process_userrecipes(plt, d, args)
 
-  addAnnotations(plt, d)
-
-  warnOnUnsupportedScales(plt.backend, d)
+    # info(1)
+    # map(DD, kw_list)
 
 
-  # add title, axis labels, ticks, etc
-  if !haskey(d, :subplot)
-    merge!(plt.initargs, d)
-    dumpdict(plt.initargs, "Updating plot items")
-    updatePlotItems(plt, plt.initargs)
-  end
+    # --------------------------------
+    # "PLOT RECIPES"
+    # --------------------------------
 
-  updatePositionAndSize(plt, d)
-
-  current(plt)
-
-  # NOTE: lets ignore the show param and effectively use the semicolon at the end of the REPL statement
-  # # do we want to show it?
-  if haskey(d, :show) && d[:show]
-    gui()
-  end
-
-  plt
-end
-
-# --------------------------------------------------------------------
-
-# if x or y are a vector of strings, we should create a list of unique strings,
-# and map x/y to be the index of the string... then set the x/y tick labels
-function setTicksFromStringVector(d::Dict, di::Dict, sym::Symbol, ticksym::Symbol)
-  # if the x or y values are strings, set ticks to the unique values, and x/y to the indices of the ticks
-
-  v = di[sym]
-  isa(v, AbstractArray) || return
-
-  T = eltype(v)
-  if T <: @compat(AbstractString) || (!isempty(T.types) && all(x -> x <: @compat(AbstractString), T.types))
-
-    ticks = unique(di[sym])
-    di[sym] = Int[findnext(ticks, v, 1) for v in di[sym]]
-
-    if !haskey(d, ticksym) || d[ticksym] == :auto
-      d[ticksym] = (collect(1:length(ticks)), UTF8String[t for t in ticks])
-    end
-  end
-end
-
-# --------------------------------------------------------------------
-
-preparePlotUpdate(plt::Plot) = nothing
-
-# --------------------------------------------------------------------
-
-# should we update the x/y label given the meta info during input slicing?
-function updateDictWithMeta(d::Dict, initargs::Dict, meta::Symbol, isx::Bool)
-  lsym = isx ? :xlabel : :ylabel
-  if initargs[lsym] == default(lsym)
-    d[lsym] = string(meta)
-  end
-end
-updateDictWithMeta(d::Dict, initargs::Dict, meta, isx::Bool) = nothing
-
-# --------------------------------------------------------------------
-
-annotations(::@compat(Void)) = []
-annotations{X,Y,V}(v::AVec{@compat(Tuple{X,Y,V})}) = v
-annotations{X,Y,V}(t::@compat(Tuple{X,Y,V})) = [t]
-annotations(anns) = error("Expecting a tuple (or vector of tuples) for annotations: ",
-                       "(x, y, annotation)\n    got: $(typeof(anns))")
-
-function addAnnotations(plt::Plot, d::Dict)
-  anns = annotations(get(d, :annotation, nothing))
-  if !isempty(anns)
-    addAnnotations(plt, anns)
-  end
-end
-
-
-# --------------------------------------------------------------------
-
-
-# create a new "createKWargsList" 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}})
-
-# missing
-convertToAnyVector(v::@compat(Void); kw...) = Any[nothing], nothing
-
-# fixed number of blank series
-convertToAnyVector(n::Integer; kw...) = Any[zeros(0) for i in 1:n], nothing
-
-# numeric vector
-convertToAnyVector{T<:Real}(v::AVec{T}; kw...) = Any[v], nothing
-
-# string vector
-convertToAnyVector{T<:@compat(AbstractString)}(v::AVec{T}; kw...) = Any[v], nothing
-
-# numeric matrix
-convertToAnyVector{T<:Real}(v::AMat{T}; kw...) = Any[v[:,i] for i in 1:size(v,2)], nothing
-
-# function
-convertToAnyVector(f::Function; kw...) = Any[f], nothing
-
-# vector of OHLC
-convertToAnyVector(v::AVec{OHLC}; kw...) = Any[v], nothing
-
-# list of things (maybe other vectors, functions, or something else)
-convertToAnyVector(v::AVec; kw...) = Any[vi for vi in v], nothing
-
-
-# --------------------------------------------------------------------
-
-# in computeXandY, we take in any of the possible items, convert into proper x/y vectors, then return.
-# this is also where all the "set x to 1:length(y)" happens, and also where we assert on lengths.
-computeX(x::@compat(Void), y) = 1:length(y)
-computeX(x, y) = copy(x)
-computeY(x, y::Function) = map(y, x)
-computeY(x, y) = copy(y)
-function computeXandY(x, y)
-  if x == nothing && isa(y, Function)
-    error("If you want to plot the function `$y`, you need to define the x values somehow!")
-  end
-  x, y = computeX(x,y), computeY(x,y)
-  @assert length(x) == length(y)
-  x, y
-end
-
-
-# --------------------------------------------------------------------
-
-# create n=max(mx,my) series arguments. the shorter list is cycled through
-# note: everything should flow through this
-function createKWargsList(plt::PlottingObject, x, y; kw...)
-  xs, xmeta = convertToAnyVector(x; kw...)
-  ys, ymeta = convertToAnyVector(y; kw...)
-
-  # _debugMode.on && dumpcallstack()
-
-  mx = length(xs)
-  my = length(ys)
-  ret = Any[]
-  for i in 1:max(mx, my)
-
-    # try to set labels using ymeta
-    d = Dict(kw)
-    if !haskey(d, :label) && ymeta != nothing
-      if isa(ymeta, Symbol)
-        d[:label] = string(ymeta)
-      elseif isa(ymeta, AVec{Symbol})
-        d[:label] = string(ymeta[mod1(i,length(ymeta))])
-      end
+    # "plot recipe", which acts like a series type, and is processed before
+    # the plot layout is created, which allows for setting layouts and other plot-wide attributes.
+    # we get inputs which have been fully processed by "user recipes" and "type recipes",
+    # so we can expect standard vectors, surfaces, etc.  No defaults have been set yet.
+    still_to_process = kw_list
+    kw_list = KW[]
+    while !isempty(still_to_process)
+        next_kw = shift!(still_to_process)
+        _process_plotrecipe(plt, next_kw, kw_list, still_to_process)
     end
 
-    # build the series arg dict
-    numUncounted = get(d, :numUncounted, 0)
-    n = plt.n + i + numUncounted
-    dumpdict(d, "before getSeriesArgs")
-    d = getSeriesArgs(plt.backend, getinitargs(plt, n), d, i + numUncounted, convertSeriesIndex(plt, n), n)
-    dumpdict(d, "after getSeriesArgs")
-    d[:x], d[:y] = computeXandY(xs[mod1(i,mx)], ys[mod1(i,my)])
+    # info(2)
+    # map(DD, kw_list)
 
-    if haskey(d, :idxfilter)
-      d[:x] = d[:x][d[:idxfilter]]
-      d[:y] = d[:y][d[:idxfilter]]
+    # --------------------------------
+    # Plot/Subplot/Layout setup
+    # --------------------------------
+    _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 !!!
+
+    # --------------------------------
+    # "SERIES RECIPES"
+    # --------------------------------
+
+    # info(3)
+    # map(DD, kw_list)
+
+    for kw in kw_list
+        sp::Subplot = kw[:subplot]
+        # idx = get_subplot_index(plt, sp)
+
+        # # 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))
+
+        # 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, kw)
     end
 
-    # for linetype `line`, need to sort by x values
-    if d[:linetype] == :line
-      # order by x
-      indices = sortperm(d[:x])
-      d[:x] = d[:x][indices]
-      d[:y] = d[:y][indices]
-      d[:linetype] = :path
+    # --------------------------------
+
+    current(plt)
+
+    # do we want to force display?
+    if plt[:show]
+        gui(plt)
     end
 
-    # cleanup those fields that were used only for generating kw args
-    for k in (:idxfilter, :numUncounted, :dataframe)
-      delete!(d, k)
+    plt
+end
+
+
+# we're getting ready to display/output.  prep for layout calcs, then update
+# the plot object after
+function prepare_output(plt::Plot)
+    _before_layout_calcs(plt)
+
+    w, h = plt.attr[:size]
+    plt.layout.bbox = BoundingBox(0mm, 0mm, w*px, h*px)
+
+    # One pass down and back up the tree to compute the minimum padding
+    # of the children on the perimeter.  This is an backend callback.
+    _update_min_padding!(plt.layout)
+    for sp in plt.inset_subplots
+        _update_min_padding!(sp)
     end
 
-    # add it to our series list
-    push!(ret, d)
-  end
+    # now another pass down, to update the bounding boxes
+    update_child_bboxes!(plt.layout)
 
-  ret, xmeta, ymeta
+    # update those bounding boxes of inset subplots
+    update_inset_bboxes!(plt)
+
+    # the backend callback, to reposition subplots, etc
+    _update_plot_object(plt)
 end
 
-# handle grouping
-function createKWargsList(plt::PlottingObject, groupby::GroupBy, args...; kw...)
-  ret = Any[]
-  for (i,glab) in enumerate(groupby.groupLabels)
-    # TODO: don't automatically overwrite labels
-    kwlist, xmeta, ymeta = createKWargsList(plt, args...; kw...,
-                                            idxfilter = groupby.groupIds[i],
-                                            label = string(glab),
-                                            numUncounted = length(ret))  # we count the idx from plt.n + numUncounted + i
-    append!(ret, kwlist)
-  end
-  ret, nothing, nothing # TODO: handle passing meta through
-end
-
-# pass it off to the x/y version
-function createKWargsList(plt::PlottingObject, y; kw...)
-  createKWargsList(plt, nothing, y; kw...)
-end
-
-# contours or surfaces... irregular data
-function createKWargsList(plt::PlottingObject, x::AVec, y::AVec, zvec::AVec; kw...)
-  error("TODO: contours or surfaces... irregular data")
-end
-
-# contours or surfaces... function grid
-function createKWargsList(plt::PlottingObject, x::AVec, y::AVec, zf::Function; kw...)
-  # only allow sorted x/y for now
-  # TODO: auto sort x/y/z properly
-  @assert x == sort(x)
-  @assert y == sort(y)
-  surface = Float64[zf(xi, yi) for xi in x, yi in y]
-  createKWargsList(plt, x, y, surface; kw...)  # passes it to the zmat version
-end
-
-# contours or surfaces... matrix grid
-function createKWargsList{T<:Real}(plt::PlottingObject, x::AVec, y::AVec, zmat::AMat{T}; kw...)
-  # only allow sorted x/y for now
-  # TODO: auto sort x/y/z properly
-  @assert x == sort(x)
-  @assert y == sort(y)
-  @assert size(zmat) == (length(x), length(y))
-  surf = Array(Any,1,1)
-  surf[1,1] = convert(Matrix{Float64}, zmat)
-  createKWargsList(plt, x, y; kw..., surface = surf, linetype = :contour)
-end
-
-function createKWargsList(plt::PlottingObject, f::FuncOrFuncs; kw...)
-  error("Can't pass a Function or Vector{Function} for y without also passing x")
-end
-
-# list of functions
-function createKWargsList(plt::PlottingObject, f::FuncOrFuncs, x; kw...)
-  @assert !(typeof(x) <: FuncOrFuncs)  # otherwise we'd hit infinite recursion here
-  createKWargsList(plt, x, f; kw...)
-end
-
-# special handling... xmin/xmax with function(s)
-function createKWargsList(plt::PlottingObject, f::FuncOrFuncs, xmin::Real, xmax::Real; kw...)
-  width = plt.initargs[:size][1]
-  x = collect(linspace(xmin, xmax, width))  # we don't need more than the width
-  createKWargsList(plt, x, f; kw...)
-end
-
-mapFuncOrFuncs(f::Function, u::AVec) = map(f, u)
-mapFuncOrFuncs(fs::AVec{Function}, u::AVec) = [map(f, u) for f in fs]
-
-# special handling... xmin/xmax with parametric function(s)
-createKWargsList{T<:Real}(plt::PlottingObject, fx::FuncOrFuncs, fy::FuncOrFuncs, u::AVec{T}; kw...) = createKWargsList(plt, mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u); kw...)
-createKWargsList{T<:Real}(plt::PlottingObject, u::AVec{T}, fx::FuncOrFuncs, fy::FuncOrFuncs; kw...) = createKWargsList(plt, mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u); kw...)
-createKWargsList(plt::PlottingObject, fx::FuncOrFuncs, fy::FuncOrFuncs, umin::Real, umax::Real, numPoints::Int = 1000; kw...) = createKWargsList(plt, fx, fy, linspace(umin, umax, numPoints); kw...)
-
-
-
-# special handling... no args... 1 series
-function createKWargsList(plt::PlottingObject; kw...)
-  d = Dict(kw)
-  if !haskey(d, :y)
-    # assume we just want to create an empty plot object which can be added to later
-    return [], nothing, nothing
-    # error("Called plot/subplot without args... must set y in the keyword args.  Example: plot(; y=rand(10))")
-  end
-  
-  if haskey(d, :x)
-    return createKWargsList(plt, d[:x], d[:y]; kw...)
-  else
-    return createKWargsList(plt, d[:y]; kw...)
-  end
+function backend_object(plt::Plot)
+    prepare_output(plt)
+    plt.o
 end
 
 # --------------------------------------------------------------------
+# plot to a Subplot
 
-"For DataFrame support.  Imports DataFrames and defines the necessary methods which support them."
-function dataframes()
-  @eval import DataFrames
-
-  @eval function createKWargsList(plt::PlottingObject, df::DataFrames.DataFrame, args...; kw...)
-    createKWargsList(plt, args...; kw..., dataframe = df)
-  end
-
-  # expecting the column name of a dataframe that was passed in... anything else should error
-  @eval function extractGroupArgs(s::Symbol, df::DataFrames.DataFrame, args...)
-    if haskey(df, s)
-      return extractGroupArgs(df[s])
-    else
-      error("Got a symbol, and expected that to be a key in d[:dataframe]. s=$s d=$d")
-    end
-  end
-
-  @eval function getDataFrameFromKW(; kw...)
-    for (k,v) in kw
-      if k == :dataframe
-        return v
-      end
-    end
-    error("Missing dataframe argument in arguments!")
-  end
-
-  # the conversion functions for when we pass symbols or vectors of symbols to reference dataframes
-  @eval convertToAnyVector(s::Symbol; kw...) = Any[getDataFrameFromKW(;kw...)[s]], s
-  @eval convertToAnyVector(v::AVec{Symbol}; kw...) = (df = getDataFrameFromKW(;kw...); Any[df[s] for s in v]), v
+function plot(sp::Subplot, args...; kw...)
+    plt = sp.plt
+    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(plt.subplots, sp))
 end
 
-
 # --------------------------------------------------------------------
-

src/plotter.jl

@@ -1,255 +0,0 @@
-
-
-immutable GadflyPackage <: PlottingPackage end
-immutable ImmersePackage <: PlottingPackage end
-immutable PyPlotPackage <: PlottingPackage end
-immutable QwtPackage <: PlottingPackage end
-immutable UnicodePlotsPackage <: PlottingPackage end
-immutable WinstonPackage <: PlottingPackage end
-
-typealias GadflyOrImmerse @compat(Union{GadflyPackage, ImmersePackage})
-
-export
-  gadfly,
-  immerse,
-  pyplot,
-  qwt,
-  unicodeplots
-  # winston
-
-gadfly() = backend(:gadfly)
-immerse() = backend(:immerse)
-pyplot() = backend(:pyplot)
-qwt() = backend(:qwt)
-unicodeplots() = backend(:unicodeplots)
-# winston() = backend(:winston)
-
-backend_name(::GadflyPackage)       = :gadfly
-backend_name(::ImmersePackage)      = :immerse
-backend_name(::PyPlotPackage)       = :pyplot
-backend_name(::UnicodePlotsPackage) = :unicodeplots
-backend_name(::QwtPackage)          = :qwt
-
-include("backends/supported.jl")
-
-include("backends/qwt.jl")
-include("backends/gadfly.jl")
-include("backends/unicodeplots.jl")
-include("backends/pyplot.jl")
-include("backends/immerse.jl")
-include("backends/winston.jl")
-
-
-# ---------------------------------------------------------
-
-
-plot(pkg::PlottingPackage; kw...) = error("plot($pkg; kw...) is not implemented")
-plot!(pkg::PlottingPackage, plt::Plot; kw...) = error("plot!($pkg, plt; kw...) is not implemented")
-updatePlotItems(pkg::PlottingPackage, plt::Plot, d::Dict) = error("updatePlotItems($pkg, plt, d) is not implemented")
-# Base.display(pkg::PlottingPackage, plt::Plot) = error("display($pkg, plt) is not implemented")
-
-updatePositionAndSize{P<:PlottingPackage}(plt::PlottingObject{P}, d::Dict) = nothing #error("updatePositionAndSize(plt,d) is not implemented for $P")
-
-subplot(pkg::PlottingPackage; kw...) = error("subplot($pkg; kw...) is not implemented")
-subplot!(pkg::PlottingPackage, subplt::Subplot; kw...) = error("subplot!($pkg, subplt; kw...) is not implemented")
-# Base.display(pkg::PlottingPackage, subplt::Subplot) = error("display($pkg, subplt) is not implemented")
-
-# ---------------------------------------------------------
-
-
-const BACKENDS = [:qwt, :gadfly, :unicodeplots, :pyplot, :immerse]
-const INITIALIZED_BACKENDS = Set{Symbol}()
-backends() = BACKENDS
-
-
-function backendInstance(sym::Symbol)
-  sym == :qwt && return QwtPackage()
-  sym == :gadfly && return GadflyPackage()
-  sym == :unicodeplots && return UnicodePlotsPackage()
-  sym == :pyplot && return PyPlotPackage()
-  sym == :immerse && return ImmersePackage()
-  sym == :winston && return WinstonPackage()
-  error("Unsupported backend $sym")
-end 
-
-
-type CurrentBackend
-  sym::Symbol
-  pkg::PlottingPackage
-end
-CurrentBackend(sym::Symbol) = CurrentBackend(sym, backendInstance(sym))
-
-# ---------------------------------------------------------
-
-function pickDefaultBackend()
-  try
-    if Pkg.installed("Immerse") != nothing
-      return CurrentBackend(:immerse)
-    end
-  end
-  try
-    if Pkg.installed("Qwt") != nothing
-      return CurrentBackend(:qwt)
-    end
-  end
-  try
-    if Pkg.installed("PyPlot") != nothing
-      return CurrentBackend(:pyplot)
-    end
-  end
-  try
-    if Pkg.installed("Gadfly") != nothing
-      return CurrentBackend(:gadfly)
-    end
-  end
-  try
-    if Pkg.installed("UnicodePlots") != nothing
-      return CurrentBackend(:unicodeplots)
-    end
-  end
-  try
-    if Pkg.installed("Winston") != nothing
-      return CurrentBackend(:winston)
-    end
-  end
-  warn("You don't have any of the supported backends installed!  Chose from ", backends())
-  return CurrentBackend(:gadfly)
-end
-# const CURRENT_BACKEND = pickDefaultBackend()
-# println("[Plots.jl] Default backend: ", CURRENT_BACKEND.sym)
-
-
-# ---------------------------------------------------------
-
-"""
-Returns the current plotting package name.  Initializes package on first call.
-"""
-function backend()
-  # error()
-
-  currentBackendSymbol = CURRENT_BACKEND.sym
-  if !(currentBackendSymbol in INITIALIZED_BACKENDS)
-
-    # initialize
-    println("[Plots.jl] Initializing backend: ", CURRENT_BACKEND.sym)
-    if currentBackendSymbol == :qwt
-      try
-        @eval import Qwt
-        @eval export Qwt
-      catch err
-        warn("Couldn't import Qwt.  Install it with: Pkg.clone(\"https://github.com/tbreloff/Qwt.jl.git\")\n  (Note: also requires pyqt and pyqwt).")
-        rethrow(err)
-      end
-
-    elseif currentBackendSymbol == :gadfly
-      try
-        @eval import Gadfly, Compose, DataFrames
-        @eval export Gadfly, Compose, DataFrames
-        @eval include(joinpath(Pkg.dir("Plots"), "src", "backends", "gadfly_shapes.jl"))
-      catch err
-        warn("Couldn't import Gadfly.  Install it with: Pkg.add(\"Gadfly\").")
-        rethrow(err)
-      end
-
-    elseif currentBackendSymbol == :unicodeplots
-      try
-        @eval import UnicodePlots
-        @eval export UnicodePlots
-      catch err
-        warn("Couldn't import UnicodePlots.  Install it with: Pkg.add(\"UnicodePlots\").")
-        rethrow(err)
-      end
-
-    elseif currentBackendSymbol == :pyplot
-      try
-        @eval import PyPlot
-        @eval export PyPlot
-        @eval const pycolors = PyPlot.pywrap(PyPlot.pyimport("matplotlib.colors"))
-        @eval const pypath = PyPlot.pywrap(PyPlot.pyimport("matplotlib.path"))
-        # @eval const pycolorbar = PyPlot.pywrap(PyPlot.pyimport("matplotlib.colorbar"))
-        if !isa(Base.Multimedia.displays[end], Base.REPL.REPLDisplay)
-          PyPlot.ioff()  # stops wierd behavior of displaying incomplete graphs in IJulia
-          
-          # # TODO: how the hell can I use PyQt4??
-          # "pyqt4"=>:qt_pyqt4
-          # PyPlot.backend[1] = "pyqt4"
-          # PyPlot.gui[1] = :qt_pyqt4
-          # PyPlot.switch_backend("Qt4Agg")
-
-          # only turn on the gui if we want it
-          if PyPlot.gui != :none
-            PyPlot.pygui(true)
-          end
-
-        end
-      catch err
-        warn("Couldn't import PyPlot.  Install it with: Pkg.add(\"PyPlot\").")
-        rethrow(err)
-      end
-
-    elseif currentBackendSymbol == :immerse
-      try
-        @eval import Immerse, Gadfly, Compose, Gtk
-        @eval export Immerse, Gadfly, Compose, Gtk
-        @eval include(joinpath(Pkg.dir("Plots"), "src", "backends", "gadfly_shapes.jl"))
-      catch err
-        # error("Couldn't import Immerse.  Install it with: Pkg.add(\"Immerse\").\n   Error: ", err)
-        warn("Couldn't import Immerse.  Install it with: Pkg.add(\"Immerse\").")
-        rethrow(err)
-      end
-
-    elseif currentBackendSymbol == :winston
-      warn("Winston support is deprecated and broken.  Try another backend: $BACKENDS")
-      try
-        @eval ENV["WINSTON_OUTPUT"] = "gtk"
-        @eval import Winston, Gtk
-        @eval export Winston, Gtk
-      catch err
-        warn("Couldn't import Winston.  Install it with: Pkg.add(\"Winston\").")
-        rethrow(err)
-      end
-
-    else
-      error("Unknown backend $currentBackendSymbol.  Choose from: $BACKENDS")
-    end
-    push!(INITIALIZED_BACKENDS, currentBackendSymbol)
-
-  end
-  CURRENT_BACKEND.pkg
-end
-
-"""
-Set the plot backend.  Choose from:  :qwt, :gadfly, :unicodeplots, :immerse, :pyplot
-"""
-function backend(pkg::PlottingPackage)
-
-  CURRENT_BACKEND.sym = backend_name(pkg)
-  CURRENT_BACKEND.pkg = pkg
-end
-
-function backend(modname)
-  
-  # set the PlottingPackage
-  if modname == :qwt
-    CURRENT_BACKEND.pkg = QwtPackage()
-  elseif modname == :gadfly
-    CURRENT_BACKEND.pkg = GadflyPackage()
-  elseif modname == :unicodeplots
-    CURRENT_BACKEND.pkg = UnicodePlotsPackage()
-  elseif modname == :pyplot
-    CURRENT_BACKEND.pkg = PyPlotPackage()
-  elseif modname == :immerse
-    CURRENT_BACKEND.pkg = ImmersePackage()
-  elseif modname == :winston
-    CURRENT_BACKEND.pkg = WinstonPackage()
-  else
-    error("Unknown backend $modname.  Choose from: $BACKENDS")
-  end
-
-  # update the symbol
-  CURRENT_BACKEND.sym = modname
-  # println("[Plots.jl] Switched to backend: ", modname)
-
-  # return the package
-  CURRENT_BACKEND.pkg
-end

src/precompile.jl

@@ -0,0 +1,3 @@
+function _precompile_()
+    ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
+end

src/recipes.jl

@@ -1,119 +1,805 @@
 
 
-# TODO: there should be a distinction between an object that will manage a full plot, vs a component of a plot.
-# the PlotRecipe as currently implemented is more of a "custom component"
-# a recipe should fully describe the plotting command(s) and call them, likewise for updating. 
-#   actually... maybe those should explicitly derive from PlottingObject???
 
-abstract PlotRecipe
+"""
+You can easily define your own plotting recipes with convenience methods:
 
-getRecipeXY(recipe::PlotRecipe) = Float64[], Float64[]
-getRecipeArgs(recipe::PlotRecipe) = ()
-
-plot(recipe::PlotRecipe, args...; kw...) = plot(getRecipeXY(recipe)..., args...; getRecipeArgs(recipe)..., kw...)
-plot!(recipe::PlotRecipe, args...; kw...) = plot!(getRecipeXY(recipe)..., args...; getRecipeArgs(recipe)..., kw...)
-plot!(plt::Plot, recipe::PlotRecipe, args...; kw...) = plot!(getRecipeXY(recipe)..., args...; getRecipeArgs(recipe)..., kw...)
-
-
-# -------------------------------------------------
-
-function rotate(x::Real, y::Real, θ::Real; center = (0,0))
-  cx = x - center[1]
-  cy = y - center[2]
-  xrot = cx * cos(θ) - cy * sin(θ)
-  yrot = cy * cos(θ) + cx * sin(θ)
-  xrot + center[1], yrot + center[2]
+```
+@userplot type GroupHist
+    args
 end
 
-# -------------------------------------------------
-
-type EllipseRecipe <: PlotRecipe
-  w::Float64
-  h::Float64
-  x::Float64
-  y::Float64
-  θ::Float64
-end
-EllipseRecipe(w,h,x,y) = EllipseRecipe(w,h,x,y,0)
-
-# return x,y coords of a rotated ellipse, centered at the origin
-function rotatedEllipse(w, h, x, y, θ, rotθ)
-  # # coord before rotation
-  xpre = w * cos(θ)
-  ypre = h * sin(θ)
-
-  # rotate and translate
-  r = rotate(xpre, ypre, rotθ)
-  x + r[1], y + r[2]
+@recipe function f(gh::GroupHist)
+    # set some attributes, add some series, using gh.args as input
 end
 
-function getRecipeXY(ep::EllipseRecipe)
-  x, y = unzip([rotatedEllipse(ep.w, ep.h, ep.x, ep.y, u, ep.θ) for u in linspace(0,2π,100)])
-  top = rotate(0, ep.h, ep.θ)
-  right = rotate(ep.w, 0, ep.θ)
-  linex = Float64[top[1], 0, right[1]] + ep.x
-  liney = Float64[top[2], 0, right[2]] + ep.y
-  Any[x, linex], Any[y, liney]
+# now you can plot like:
+grouphist(rand(1000,4))
+```
+"""
+macro userplot(expr)
+    _userplot(expr)
 end
 
-function getRecipeArgs(ep::EllipseRecipe)
-  [(:line, (3, [:dot :solid], [:red :blue], :path))]
-end
-
-# -------------------------------------------------
-
-
-"Correlation scatter matrix"
-function corrplot{T<:Real,S<:Real}(mat::AMat{T}, corrmat::AMat{S} = cor(mat);
-                                   colors = :redsblues,
-                                   labels = nothing, kw...)
-  m = size(mat,2)
-  centers = Float64[mean(extrema(mat[:,i])) for i in 1:m]
-
-  # might be a mistake? 
-  @assert m <= 20
-  @assert size(corrmat) == (m,m)
-
-  # create a subplot grid, and a gradient from -1 to 1
-  p = subplot(rand(0,m^2); n=m^2, leg=false, grid=false, kw...)
-  cgrad = ColorGradient(colors, [-1,1])
-
-  # make all the plots
-  for i in 1:m
-    for j in 1:m
-      idx = p.layout[i,j]
-      plt = p.plts[idx]
-      if i==j
-        # histogram on diagonal
-        histogram!(plt, mat[:,i], c=:black)
-        i > 1 && plot!(plt, yticks = :none)
-      elseif i < j
-        # annotate correlation value in upper triangle
-        mi, mj = centers[i], centers[j]
-        plot!(plt, [mj], [mi],
-                   ann = (mj, mi, text(@sprintf("Corr:\n%0.3f", corrmat[i,j]), 15)),
-                   yticks=:none)
-      else
-        # scatter plots in lower triangle; color determined by correlation
-        c = RGBA(RGB(getColorZ(cgrad, corrmat[i,j])), 0.3)
-        scatter!(plt, mat[:,j], mat[:,i], w=0, ms=3, c=c, smooth=true)
-      end
-
-      if labels != nothing && length(labels) >= m
-        i == m && xlabel!(plt, string(labels[j]))
-        j == 1 && ylabel!(plt, string(labels[i]))
-      end
+function _userplot(expr::Expr)
+    if expr.head != :type
+        errror("Must call userplot on a type/immutable expression.  Got: $expr")
     end
-  end
 
-  # link the axes
-  subplot!(p, link = (r,c) -> (true, r!=c))
+    typename = expr.args[2]
+    funcname = Symbol(lowercase(string(typename)))
+    funcname2 = Symbol(funcname, "!")
+
+    # return a code block with the type definition and convenience plotting methods
+    esc(quote
+        $expr
+        export $funcname, $funcname2
+        $funcname(args...; kw...) = plot($typename(args); kw...)
+        $funcname2(args...; kw...) = plot!($typename(args); kw...)
+    end)
+end
+
+function _userplot(sym::Symbol)
+    _userplot(:(type $sym
+            args
+    end))
 end
 
 
-"Sparsity plot... heatmap of non-zero values of a matrix"
-function spy{T<:Real}(y::AMat{T}; kw...)
-  I,J,V = findnz(y)
-  heatmap(J, I; leg=false, yflip=true, nbins=size(y), kw...)
+# ----------------------------------------------------------------------------------
+
+const _series_recipe_deps = Dict()
+
+function series_recipe_dependencies(st::Symbol, deps::Symbol...)
+    _series_recipe_deps[st] = deps
 end
 
+function seriestype_supported(st::Symbol)
+    seriestype_supported(backend(), st)
+end
+
+# returns :no, :native, or :recipe depending on how it's supported
+function seriestype_supported(pkg::AbstractBackend, st::Symbol)
+    # is it natively supported
+    if is_seriestype_supported(pkg, st)
+        return :native
+    end
+
+    haskey(_series_recipe_deps, st) || return :no
+
+    supported = true
+    for dep in _series_recipe_deps[st]
+        if seriestype_supported(pkg, dep) == :no
+            supported = false
+        end
+    end
+    supported ? :recipe : :no
+end
+
+macro deps(st, args...)
+    :(Plots.series_recipe_dependencies($(quot(st)), $(map(quot, args)...)))
+end
+
+# get a list of all seriestypes
+function all_seriestypes()
+    sts = Set{Symbol}(keys(_series_recipe_deps))
+    for bsym in backends()
+        btype = _backendType[bsym]
+        sts = union(sts, Set{Symbol}(supported_seriestypes(btype())))
+    end
+    sort(collect(sts))
+end
+
+
+# ----------------------------------------------------------------------------------
+
+num_series(x::AMat) = size(x,2)
+num_series(x) = 1
+
+RecipesBase.apply_recipe{T}(d::KW, ::Type{T}, plt::Plot) = throw(MethodError("Unmatched plot recipe: $T"))
+
+# ---------------------------------------------------------------------------
+
+
+# for seriestype `line`, need to sort by x values
+@recipe function f(::Type{Val{:line}}, x, y, z)
+    indices = sortperm(x)
+    x := x[indices]
+    y := y[indices]
+    if typeof(z) <: AVec
+        z := z[indices]
+    end
+    seriestype := :path
+    ()
+end
+@deps line path
+
+
+function hvline_limits(axis::Axis)
+    vmin, vmax = axis_limits(axis)
+    if vmin >= vmax
+        if isfinite(vmin)
+            vmax = vmin + 1
+        else
+            vmin, vmax = 0.0, 1.1
+        end
+    end
+    vmin, vmax
+end
+
+@recipe function f(::Type{Val{:hline}}, x, y, z)
+    xmin, xmax = hvline_limits(d[:subplot][:xaxis])
+    n = length(y)
+    newx = repmat(Float64[xmin, xmax, NaN], n)
+    newy = vec(Float64[yi for i=1:3,yi=y])
+    x := newx
+    y := newy
+    seriestype := :path
+    ()
+end
+@deps hline path
+
+@recipe function f(::Type{Val{:vline}}, x, y, z)
+    ymin, ymax = hvline_limits(d[:subplot][:yaxis])
+    n = length(y)
+    newx = vec(Float64[yi for i=1:3,yi=y])
+    newy = repmat(Float64[ymin, ymax, NaN], n)
+    x := newx
+    y := newy
+    seriestype := :path
+    ()
+end
+@deps vline path
+
+# ---------------------------------------------------------------------------
+# steps
+
+function make_steps(x, y, st)
+    n = length(x)
+    n == 0 && return zeros(0),zeros(0)
+    newx, newy = zeros(2n-1), zeros(2n-1)
+    for i=1:n
+        idx = 2i-1
+        newx[idx] = x[i]
+        newy[idx] = y[i]
+        if i > 1
+            newx[idx-1] = x[st == :steppre ? i-1 : i]
+            newy[idx-1] = y[st == :steppre ? i   : i-1]
+        end
+    end
+    newx, newy
+end
+
+# create a path from steps
+@recipe function f(::Type{Val{:steppre}}, x, y, z)
+    d[:x], d[:y] = make_steps(x, y, :steppre)
+    seriestype := :path
+
+    # create a secondary series for the markers
+    if d[:markershape] != :none
+        @series begin
+            seriestype := :scatter
+            x := x
+            y := y
+            label := ""
+            primary := false
+            ()
+        end
+        markershape := :none
+    end
+    ()
+end
+@deps steppre path scatter
+
+# create a path from steps
+@recipe function f(::Type{Val{:steppost}}, x, y, z)
+    d[:x], d[:y] = make_steps(x, y, :steppost)
+    seriestype := :path
+
+    # create a secondary series for the markers
+    if d[:markershape] != :none
+        @series begin
+            seriestype := :scatter
+            x := x
+            y := y
+            label := ""
+            primary := false
+            ()
+        end
+        markershape := :none
+    end
+    ()
+end
+@deps steppost path scatter
+
+
+# ---------------------------------------------------------------------------
+# sticks
+
+# create vertical line segments from fill
+@recipe function f(::Type{Val{:sticks}}, x, y, z)
+    n = length(x)
+    fr = d[:fillrange]
+    if fr == nothing
+        yaxis = d[:subplot][:yaxis]
+        fr = if yaxis[:scale] == :identity
+            0.0
+        else
+            min(axis_limits(yaxis)[1], minimum(y))
+        end
+    end
+    newx, newy = zeros(3n), zeros(3n)
+    for i=1:n
+        rng = 3i-2:3i
+        newx[rng] = [x[i], x[i], NaN]
+        newy[rng] = [cycle(fr,i), y[i], NaN]
+    end
+    x := newx
+    y := newy
+    fillrange := nothing
+    seriestype := :path
+
+    # create a secondary series for the markers
+    if d[:markershape] != :none
+        @series begin
+            seriestype := :scatter
+            x := x
+            y := y
+            label := ""
+            primary := false
+            ()
+        end
+        markershape := :none
+    end
+    ()
+end
+@deps sticks path scatter
+
+
+# ---------------------------------------------------------------------------
+# bezier curves
+
+# get the value of the curve point at position t
+function bezier_value(pts::AVec, t::Real)
+    val = 0.0
+    n = length(pts)-1
+    for (i,p) in enumerate(pts)
+        val += p * binomial(n, i-1) * (1-t)^(n-i+1) * t^(i-1)
+    end
+    val
+end
+
+# create segmented bezier curves in place of line segments
+@recipe function f(::Type{Val{:curves}}, x, y, z; npoints = 30)
+    args = z != nothing ? (x,y,z) : (x,y)
+    newx, newy = zeros(0), zeros(0)
+    fr = d[:fillrange]
+    newfr = fr != nothing ? zeros(0) : nothing
+    newz = z != nothing ? zeros(0) : nothing
+    # lz = d[:line_z]
+    # newlz = lz != nothing ? zeros(0) : nothing
+
+    # for each line segment (point series with no NaNs), convert it into a bezier curve
+    # where the points are the control points of the curve
+    for rng in iter_segments(args...)
+        length(rng) < 2 && continue
+        ts = linspace(0, 1, npoints)
+        nanappend!(newx, map(t -> bezier_value(cycle(x,rng), t), ts))
+        nanappend!(newy, map(t -> bezier_value(cycle(y,rng), t), ts))
+        if z != nothing
+            nanappend!(newz, map(t -> bezier_value(cycle(z,rng), t), ts))
+        end
+        if fr != nothing
+            nanappend!(newfr, map(t -> bezier_value(cycle(fr,rng), t), ts))
+        end
+        # if lz != nothing
+        #     lzrng = cycle(lz, rng) # the line_z's for this segment
+        #     push!(newlz, 0.0)
+        #     append!(newlz, map(t -> lzrng[1+floor(Int, t * (length(rng)-1))], ts))
+        # end
+    end
+
+    x := newx
+    y := newy
+    if z == nothing
+        seriestype := :path
+    else
+        seriestype := :path3d
+        z := newz
+    end
+    if fr != nothing
+        fillrange := newfr
+    end
+    # if lz != nothing
+    #     # line_z := newlz
+    #     linecolor := (isa(d[:linecolor], ColorGradient) ? d[:linecolor] : cgrad())
+    # end
+    # Plots.DD(d)
+    ()
+end
+@deps curves path
+
+# ---------------------------------------------------------------------------
+
+# create a bar plot as a filled step function
+@recipe function f(::Type{Val{:bar}}, x, y, z)
+    nx, ny = length(x), length(y)
+    axis = d[:subplot][isvertical(d) ? :xaxis : :yaxis]
+    cv = [discrete_value!(axis, xi)[1] for xi=x]
+    x = if nx == ny
+        cv
+    elseif nx == ny + 1
+        0.5diff(cv) + cv[1:end-1]
+    else
+        error("bar recipe: x must be same length as y (centers), or one more than y (edges).\n\t\tlength(x)=$(length(x)), length(y)=$(length(y))")
+    end
+
+    # compute half-width of bars
+    bw = d[:bar_width]
+    hw = if bw == nothing
+        0.5mean(diff(x))
+    else
+        Float64[0.5cycle(bw,i) for i=1:length(x)]
+    end
+
+    # make fillto a vector... default fills to 0
+    fillto = d[:fillrange]
+    if fillto == nothing
+        fillto = 0
+    end
+
+    # create the bar shapes by adding x/y segments
+    xseg, yseg = Segments(), Segments()
+    for i=1:ny
+        center = x[i]
+        hwi = cycle(hw,i)
+        yi = y[i]
+        fi = cycle(fillto,i)
+        push!(xseg, center-hwi, center-hwi, center+hwi, center+hwi, center-hwi)
+        push!(yseg, yi, fi, fi, yi, yi)
+    end
+
+    # widen limits out a bit
+    expand_extrema!(axis, widen(extrema(xseg.pts)...))
+
+    # switch back
+    if !isvertical(d)
+        xseg, yseg = yseg, xseg
+    end
+
+
+    # reset orientation
+    orientation := default(:orientation)
+
+    x := xseg.pts
+    y := yseg.pts
+    seriestype := :shape
+    ()
+end
+@deps bar shape
+
+# ---------------------------------------------------------------------------
+# Histograms
+
+# edges from number of bins
+function calc_edges(v, bins::Integer)
+    vmin, vmax = extrema(v)
+    linspace(vmin, vmax, bins+1)
+end
+
+# just pass through arrays
+calc_edges(v, bins::AVec) = bins
+
+# find the bucket index of this value
+function bucket_index(vi, edges)
+    for (i,e) in enumerate(edges)
+        if vi <= e
+            return max(1,i-1)
+        end
+    end
+    return length(edges)-1
+end
+
+function my_hist(v, bins; normed = false, weights = nothing)
+    edges = calc_edges(v, bins)
+    counts = zeros(length(edges)-1)
+
+    # add a weighted count
+    for (i,vi) in enumerate(v)
+        idx = bucket_index(vi, edges)
+        counts[idx] += (weights == nothing ? 1.0 : weights[i])
+    end
+
+    # normalize by bar area?
+    norm_denom = normed ? sum(diff(edges) .* counts) : 1.0
+    if norm_denom == 0
+        norm_denom = 1.0
+    end
+
+    edges, counts ./ norm_denom
+end
+
+
+@recipe function f(::Type{Val{:histogram}}, x, y, z)
+    edges, counts = my_hist(y, d[:bins],
+                               normed = d[:normalize],
+                               weights = d[:weights])
+    x := edges
+    y := counts
+    seriestype := :bar
+    ()
+end
+@deps histogram bar
+
+# ---------------------------------------------------------------------------
+# Histogram 2D
+
+# if tuple, map out bins, otherwise use the same for both
+calc_edges_2d(x, y, bins) = calc_edges(x, bins), calc_edges(y, bins)
+calc_edges_2d{X,Y}(x, y, bins::Tuple{X,Y}) = calc_edges(x, bins[1]), calc_edges(y, bins[2])
+
+# the 2D version
+function my_hist_2d(x, y, bins; normed = false, weights = nothing)
+    xedges, yedges = calc_edges_2d(x, y, bins)
+    counts = zeros(length(yedges)-1, length(xedges)-1)
+
+    # add a weighted count
+    for i=1:length(x)
+        r = bucket_index(y[i], yedges)
+        c = bucket_index(x[i], xedges)
+        counts[r,c] += (weights == nothing ? 1.0 : weights[i])
+    end
+
+    # normalize to cubic area of the imaginary surface towers
+    norm_denom = normed ? sum((diff(yedges) * diff(xedges)') .* counts) : 1.0
+    if norm_denom == 0
+        norm_denom = 1.0
+    end
+
+    xedges, yedges, counts ./ norm_denom
+end
+
+centers(v::AVec) = 0.5 * (v[1:end-1] + v[2:end])
+
+@recipe function f(::Type{Val{:histogram2d}}, x, y, z)
+    xedges, yedges, counts = my_hist_2d(x, y, d[:bins],
+                                              normed = d[:normalize],
+                                              weights = d[:weights])
+    for (i,c) in enumerate(counts)
+        if c == 0
+            counts[i] = NaN
+        end
+    end
+    x := centers(xedges)
+    y := centers(yedges)
+    z := Surface(counts)
+    linewidth := 0
+    seriestype := :heatmap
+    ()
+end
+@deps histogram2d heatmap
+
+
+# ---------------------------------------------------------------------------
+# scatter 3d
+
+@recipe function f(::Type{Val{:scatter3d}}, x, y, z)
+    seriestype := :path3d
+    if d[:markershape] == :none
+        markershape := :circle
+    end
+    linewidth := 0
+    linealpha := 0
+    ()
+end
+
+# note: don't add dependencies because this really isn't a drop-in replacement
+
+
+# ---------------------------------------------------------------------------
+# contourf - filled contours
+
+@recipe function f(::Type{Val{:contourf}}, x, y, z)
+    fillrange := true
+    seriestype := :contour
+    ()
+end
+
+# ---------------------------------------------------------------------------
+# Error Bars
+
+function error_style!(d::KW)
+    d[:seriestype] = :path
+    d[:linecolor] = d[:markerstrokecolor]
+    d[:linewidth] = d[:markerstrokewidth]
+    d[:label] = ""
+end
+
+# if we're passed a tuple of vectors, convert to a vector of tuples
+function error_zipit(ebar)
+    if istuple(ebar)
+        collect(zip(ebar...))
+    else
+        ebar
+    end
+end
+
+function error_coords(xorig, yorig, ebar)
+    # init empty x/y, and zip errors if passed Tuple{Vector,Vector}
+    x, y = zeros(0), zeros(0)
+
+    # for each point, create a line segment from the bottom to the top of the errorbar
+    for i = 1:max(length(xorig), length(yorig))
+        xi = cycle(xorig, i)
+        yi = cycle(yorig, i)
+        ebi = cycle(ebar, i)
+        nanappend!(x, [xi, xi])
+        e1, e2 = if istuple(ebi)
+            first(ebi), last(ebi)
+        elseif isscalar(ebi)
+            ebi, ebi
+        else
+            error("unexpected ebi type $(typeof(ebi)) for errorbar: $ebi")
+        end
+        nanappend!(y, [yi - e1, yi + e2])
+    end
+    x, y
+end
+
+# we will create a series of path segments, where each point represents one
+# side of an errorbar
+@recipe function f(::Type{Val{:yerror}}, x, y, z)
+    error_style!(d)
+    markershape := :hline
+    d[:x], d[:y] = error_coords(d[:x], d[:y], error_zipit(d[:yerror]))
+    ()
+end
+@deps yerror path
+
+@recipe function f(::Type{Val{:xerror}}, x, y, z)
+    error_style!(d)
+    markershape := :vline
+    d[:y], d[:x] = error_coords(d[:y], d[:x], error_zipit(d[:xerror]))
+    ()
+end
+@deps xerror path
+
+
+# TODO: move quiver to PlotRecipes
+
+# ---------------------------------------------------------------------------
+# quiver
+
+# function apply_series_recipe(d::KW, ::Type{Val{:quiver}})
+function quiver_using_arrows(d::KW)
+    d[:label] = ""
+    d[:seriestype] = :path
+    if !isa(d[:arrow], Arrow)
+        d[:arrow] = arrow()
+    end
+
+    velocity = error_zipit(d[:quiver])
+    xorig, yorig = d[:x], d[:y]
+
+    # for each point, we create an arrow of velocity vi, translated to the x/y coordinates
+    x, y = zeros(0), zeros(0)
+    for i = 1:max(length(xorig), length(yorig))
+        # get the starting position
+        xi = cycle(xorig, i)
+        yi = cycle(yorig, i)
+
+        # get the velocity
+        vi = cycle(velocity, i)
+        vx, vy = if istuple(vi)
+            first(vi), last(vi)
+        elseif isscalar(vi)
+            vi, vi
+        elseif isa(vi,Function)
+            vi(xi, yi)
+        else
+            error("unexpected vi type $(typeof(vi)) for quiver: $vi")
+        end
+
+        # add the points
+        nanappend!(x, [xi, xi+vx, NaN])
+        nanappend!(y, [yi, yi+vy, NaN])
+    end
+
+    d[:x], d[:y] = x, y
+    # KW[d]
+end
+
+# function apply_series_recipe(d::KW, ::Type{Val{:quiver}})
+function quiver_using_hack(d::KW)
+    d[:label] = ""
+    d[:seriestype] = :shape
+
+    velocity = error_zipit(d[:quiver])
+    xorig, yorig = d[:x], d[:y]
+
+    # for each point, we create an arrow of velocity vi, translated to the x/y coordinates
+    pts = P2[]
+    for i = 1:max(length(xorig), length(yorig))
+
+        # get the starting position
+        xi = cycle(xorig, i)
+        yi = cycle(yorig, i)
+        p = P2(xi, yi)
+
+        # get the velocity
+        vi = cycle(velocity, i)
+        vx, vy = if istuple(vi)
+            first(vi), last(vi)
+        elseif isscalar(vi)
+            vi, vi
+        elseif isa(vi,Function)
+            vi(xi, yi)
+        else
+            error("unexpected vi type $(typeof(vi)) for quiver: $vi")
+        end
+        v = P2(vx, vy)
+
+        dist = norm(v)
+        arrow_h = 0.1dist          # height of arrowhead
+        arrow_w = 0.5arrow_h       # halfwidth of arrowhead
+        U1 = v ./ dist             # vector of arrowhead height
+        U2 = P2(-U1[2], U1[1])     # vector of arrowhead halfwidth
+        U1 *= arrow_h
+        U2 *= arrow_w
+
+        ppv = p+v
+        nanappend!(pts, P2[p, ppv-U1, ppv-U1+U2, ppv, ppv-U1-U2, ppv-U1])
+    end
+
+    d[:x], d[:y] = Plots.unzip(pts[2:end])
+    # KW[d]
+end
+
+# function apply_series_recipe(d::KW, ::Type{Val{:quiver}})
+@recipe function f(::Type{Val{:quiver}}, x, y, z)
+    if :arrow in supported_attrs()
+        quiver_using_arrows(d)
+    else
+        quiver_using_hack(d)
+    end
+    ()
+end
+@deps quiver shape path
+
+
+# -------------------------------------------------
+
+# TODO: move OHLC to PlotRecipes finance.jl
+
+type OHLC{T<:Real}
+  open::T
+  high::T
+  low::T
+  close::T
+end
+Base.convert(::Type{OHLC}, tup::Tuple) = OHLC(tup...)
+# Base.tuple(ohlc::OHLC) = (ohlc.open, ohlc.high, ohlc.low, ohlc.close)
+
+# get one OHLC path
+function get_xy(o::OHLC, x, xdiff)
+    xl, xm, xr = x-xdiff, x, x+xdiff
+    ox = [xl, xm, NaN,
+          xm, xm, NaN,
+          xm, xr]
+    oy = [o.open, o.open, NaN,
+          o.low, o.high, NaN,
+          o.close, o.close]
+    ox, oy
+end
+
+# get the joined vector
+function get_xy(v::AVec{OHLC}, x = 1:length(v))
+    xdiff = 0.3mean(abs(diff(x)))
+    x_out, y_out = zeros(0), zeros(0)
+    for (i,ohlc) in enumerate(v)
+        ox,oy = get_xy(ohlc, x[i], xdiff)
+        nanappend!(x_out, ox)
+        nanappend!(y_out, oy)
+    end
+    x_out, y_out
+end
+
+# these are for passing in a vector of OHLC objects
+# TODO: when I allow `@recipe f(::Type{T}, v::T) = ...` definitions to replace convertToAnyVector,
+#       then I should replace these with one definition to convert to a vector of 4-tuples
+
+# to squash ambiguity warnings...
+@recipe f(x::AVec{Function}, v::AVec{OHLC}) = error()
+@recipe f{R1<:Number,R2<:Number,R3<:Number,R4<:Number}(x::AVec{Function}, v::AVec{Tuple{R1,R2,R3,R4}}) = error()
+
+# this must be OHLC?
+@recipe f{R1<:Number,R2<:Number,R3<:Number,R4<:Number}(x::AVec, ohlc::AVec{Tuple{R1,R2,R3,R4}}) = x, OHLC[OHLC(t...) for t in ohlc]
+
+@recipe function f(x::AVec, v::AVec{OHLC})
+    seriestype := :path
+    get_xy(v, x)
+end
+
+@recipe function f(v::AVec{OHLC})
+    seriestype := :path
+    get_xy(v)
+end
+
+# the series recipe, when passed vectors of 4-tuples
+
+# -------------------------------------------------
+
+# TODO: everything below here should be either changed to a
+#       series recipe or moved to PlotRecipes
+
+
+# "Sparsity plot... heatmap of non-zero values of a matrix"
+# function spy{T<:Real}(z::AMat{T}; kw...)
+#     mat = map(zi->float(zi!=0), z)'
+#     xn, yn = size(mat)
+#     heatmap(mat; leg=false, yflip=true, aspect_ratio=:equal,
+#         xlim=(0.5, xn+0.5), ylim=(0.5, yn+0.5),
+#         kw...)
+# end
+
+# Only allow matrices through, and make it seriestype :spy so the backend can
+# optionally handle it natively.
+
+@userplot Spy
+
+@recipe function f(g::Spy)
+    @assert length(g.args) == 1 && typeof(g.args[1]) <: AbstractMatrix
+    seriestype := :spy
+    mat = g.args[1]
+    n,m = size(mat)
+    Plots.SliceIt, 1:m, 1:n, Surface(mat)
+end
+
+@recipe function f(::Type{Val{:spy}}, x,y,z)
+    yflip := true
+    aspect_ratio := 1
+    rs, cs, zs = findnz(z.surf)
+    xlim := extrema(cs)
+    ylim := extrema(rs)
+    if d[:markershape] == :none
+        markershape := :circle
+    end
+    if d[:markersize] == default(:markersize)
+        markersize := 1
+    end
+    markerstrokewidth := 0
+    marker_z := zs
+    label := ""
+    x := cs
+    y := rs
+    z := nothing
+    seriestype := :scatter
+    ()
+end
+
+# -------------------------------------------------
+
+"Adds a+bx... straight line over the current plot"
+function abline!(plt::Plot, a, b; kw...)
+    plot!(plt, [extrema(plt)...], x -> b + a*x; kw...)
+end
+
+abline!(args...; kw...) = abline!(current(), args...; kw...)
+
+
+# -------------------------------------------------
+# Dates
+
+@recipe f(::Type{Date}, dt::Date) = (dt -> convert(Int,dt), dt -> string(convert(Date,dt)))
+@recipe f(::Type{DateTime}, dt::DateTime) = (dt -> convert(Int,dt), dt -> string(convert(DateTime,dt)))
+
+# -------------------------------------------------
+# Complex Numbers
+
+@userplot ComplexPlot
+@recipe function f(cp::ComplexPlot)
+    xguide --> "Real Part"
+    yguide --> "Imaginary Part"
+    linetype --> :scatter
+    real(cp.args[1]), imag(cp.args[1])
+end

src/series.jl

@@ -0,0 +1,493 @@
+
+
+# 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 Union{Function, AVec{Function}}
+
+all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image), get(d, :seriestype, :none))
+
+# missing
+convertToAnyVector(v::Void, d::KW) = Any[nothing], nothing
+
+# 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<: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, 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!")
+
+# --------------------------------------------------------------------
+
+
+# we are going to build recipes to do the processing and splitting of the args
+
+# ensure we dispatch to the slicer
+immutable SliceIt end
+
+# the catch-all recipes
+@recipe function f(::Type{SliceIt}, x, y, z)
+
+    # handle data with formatting attached
+    if typeof(x) <: Formatted
+        xformatter := x.formatter
+        x = x.data
+    end
+    if typeof(y) <: Formatted
+        yformatter := y.formatter
+        y = y.data
+    end
+    if typeof(z) <: Formatted
+        zformatter := z.formatter
+        z = z.data
+    end
+
+    xs, _ = convertToAnyVector(x, d)
+    ys, _ = convertToAnyVector(y, d)
+    zs, _ = convertToAnyVector(z, d)
+
+    fr = pop!(d, :fillrange, nothing)
+    fillranges, _ = if typeof(fr) <: Number
+        ([fr],nothing)
+    else
+        convertToAnyVector(fr, d)
+    end
+    mf = length(fillranges)
+
+    # @show zs
+
+    mx = length(xs)
+    my = length(ys)
+    mz = length(zs)
+    if mx > 0 && my > 0 && mz > 0
+        for i in 1:max(mx, my, mz)
+            # add a new series
+            di = copy(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)
+
+            # handle fillrange
+            fr = fillranges[mod1(i,mf)]
+            di[:fillrange] = isa(fr, Function) ? map(fr, di[:x]) : fr
+
+            push!(series_list, RecipeData(di, ()))
+        end
+    end
+    nothing  # don't add a series for the main block
+end
+
+# this is the default "type recipe"... just pass the object through
+@recipe f{T<:Any}(::Type{T}, v::T) = v
+
+# this should catch unhandled "series recipes" and error with a nice message
+@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(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(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)
+    else
+        v
+    end
+end
+
+# # special handling for Surface... need to properly unwrap and re-wrap
+# function _apply_type_recipe(d, v::Surface)
+#     T = eltype(v.surf)
+#     @show T
+#     if T <: Integer || T <: AbstractFloat
+#         v
+#     else
+#         ret = _apply_type_recipe(d, v.surf)
+#         if typeof(ret) <: Formatted
+#             Formatted(Surface(ret.data), ret.formatter)
+#         else
+#             v
+#         end
+#     end
+# end
+
+# don't do anything for ints or floats
+_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(d, x)
+    x === newx || (did_replace = true)
+    newy = _apply_type_recipe(d, y)
+    y === newy || (did_replace = true)
+    newz = _apply_type_recipe(d, z)
+    z === newz || (did_replace = true)
+    if did_replace
+        newx, newy, newz
+    else
+        SliceIt, x, y, z
+    end
+end
+@recipe function f(x, y)
+    did_replace = false
+    newx = _apply_type_recipe(d, x)
+    x === newx || (did_replace = true)
+    newy = _apply_type_recipe(d, y)
+    y === newy || (did_replace = true)
+    if did_replace
+        newx, newy
+    else
+        SliceIt, x, y, nothing
+    end
+end
+@recipe function f(y)
+    newy = _apply_type_recipe(d, y)
+    if y !== newy
+        newy
+    else
+        SliceIt, nothing, y, nothing
+    end
+end
+
+# if there's more than 3 inputs, it can't be passed directly to SliceIt
+# so we'll apply_type_recipe to all of them
+@recipe function f(v1, v2, v3, v4, vrest...)
+    did_replace = false
+    newargs = map(v -> begin
+        newv = _apply_type_recipe(d, v)
+        if newv !== v
+            did_replace = true
+        end
+        newv
+    end, (v1, v2, v3, v4, vrest...))
+    if !did_replace
+        error("Couldn't process recipe args: $(map(typeof, (v1, v2, v3, v4, vrest...)))")
+    end
+    newargs
+end
+
+
+# # --------------------------------------------------------------------
+# # 1 argument
+# # --------------------------------------------------------------------
+
+@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{T<:Union{Integer,AbstractFloat}}(mat::AMat{T})
+    if all3D(d)
+        n,m = size(mat)
+        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{T<:AbstractMatrix}(fmt::Formatted{T})
+    if all3D(d)
+        mat = fmt.data
+        n,m = size(mat)
+        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{T<:Number}(vol::AbstractArray{T,3}, args...)
+    seriestype := :volume
+    SliceIt, nothing, Volume(vol, args...), nothing
+end
+
+
+# # images - grays
+
+@recipe function f{T<:Gray}(mat::AMat{T})
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        n, m = size(mat)
+        SliceIt, 1:m, 1:n, Surface(mat)
+    else
+        seriestype := :heatmap
+        yflip --> true
+        fillcolor --> ColorGradient([:black, :white])
+        SliceIt, 1:m, 1:n, Surface(convert(Matrix{Float64}, mat))
+    end
+end
+
+# # images - colors
+
+@recipe function f{T<:Colorant}(mat::AMat{T})
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        n, m = size(mat)
+        SliceIt, 1:m, 1:n, Surface(mat)
+    else
+        seriestype := :heatmap
+        yflip --> true
+        z, d[:fillcolor] = replace_image_with_heatmap(mat)
+        SliceIt, 1:m, 1:n, Surface(z)
+    end
+end
+
+#
+# # plotting arbitrary shapes/polygons
+
+@recipe function f(shape::Shape)
+    seriestype --> :shape
+    coords(shape)
+end
+
+@recipe function f(shapes::AVec{Shape})
+    seriestype --> :shape
+    coords(shapes)
+end
+
+@recipe function f(shapes::AMat{Shape})
+    seriestype --> :shape
+    for j in 1:size(shapes,2)
+        @series coords(vec(shapes[:,j]))
+    end
+end
+
+
+
+# function without range... use the current range of the x-axis
+
+@recipe function f(f::FuncOrFuncs)
+    plt = d[:plot_object]
+    xmin,xmax = axis_limits(plt[1][:xaxis])
+    f, xmin, xmax
+end
+
+#
+# # --------------------------------------------------------------------
+# # 2 arguments
+# # --------------------------------------------------------------------
+#
+#
+# # if functions come first, just swap the order (not to be confused with parametric functions...
+# # as there would be more than one function passed in)
+
+@recipe function f(f::FuncOrFuncs, x)
+    @assert !(typeof(x) <: FuncOrFuncs)  # otherwise we'd hit infinite recursion here
+    x, f
+end
+
+#
+# # --------------------------------------------------------------------
+# # 3 arguments
+# # --------------------------------------------------------------------
+#
+#
+# # 3d line or scatter
+
+@recipe function f(x::AVec, y::AVec, z::AVec)
+    # st = get(d, :seriestype, :none)
+    # if st == :scatter
+    #     d[:seriestype] = :scatter3d
+    # elseif !is3d(st)
+    #     d[:seriestype] = :path3d
+    # end
+    SliceIt, x, y, z
+end
+
+@recipe function f(x::AMat, y::AMat, z::AMat)
+    # st = get(d, :seriestype, :none)
+    # if size(x) == size(y) == size(z)
+    #     if !is3d(st)
+    #         seriestype := :path3d
+    #     end
+    # end
+    SliceIt, x, y, z
+end
+
+#
+# # surface-like... function
+
+@recipe function f(x::AVec, y::AVec, zf::Function)
+    # x = X <: Number ? sort(x) : x
+    # y = Y <: Number ? sort(y) : y
+    SliceIt, x, y, Surface(zf, x, y)  # TODO: replace with SurfaceFunction when supported
+end
+
+#
+# # surface-like... matrix grid
+
+@recipe function f(x::AVec, y::AVec, z::AMat)
+    if !like_surface(get(d, :seriestype, :none))
+        d[:seriestype] = :contour
+    end
+    SliceIt, x, y, Surface(z)
+end
+
+#
+#
+# # --------------------------------------------------------------------
+# # Parametric functions
+# # --------------------------------------------------------------------
+
+#
+# # special handling... xmin/xmax with parametric function(s)
+@recipe f(f::FuncOrFuncs, xmin::Number, xmax::Number) = linspace(xmin, xmax, 100), f
+@recipe f(fx::FuncOrFuncs, fy::FuncOrFuncs, u::AVec)  = mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u)
+@recipe f(fx::FuncOrFuncs, fy::FuncOrFuncs, umin::Number, umax::Number, n = 200) = fx, fy, linspace(umin, umax, n)
+
+#
+# # special handling... 3D parametric function(s)
+@recipe function f(fx::FuncOrFuncs, fy::FuncOrFuncs, fz::FuncOrFuncs, u::AVec)
+    mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u), mapFuncOrFuncs(fz, u)
+end
+@recipe function f(fx::FuncOrFuncs, fy::FuncOrFuncs, fz::FuncOrFuncs, umin::Number, umax::Number, numPoints = 200)
+    fx, fy, fz, linspace(umin, umax, numPoints)
+end
+
+#
+#
+# # --------------------------------------------------------------------
+# # Lists of tuples and FixedSizeArrays
+# # --------------------------------------------------------------------
+#
+# # if we get an unhandled tuple, just splat it in
+@recipe f(tup::Tuple) = tup
+
+#
+# # (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]]
+
+#
+# # (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{FixedSizeArrays.Vec{2,T}}) = unzip(xy)
+@recipe f{T<:Number}(xy::FixedSizeArrays.Vec{2,T})       = [xy[1]], [xy[2]]
+
+#
+# # 3D FixedSizeArrays
+@recipe f{T<:Number}(xyz::AVec{FixedSizeArrays.Vec{3,T}}) = unzip(xyz)
+@recipe f{T<:Number}(xyz::FixedSizeArrays.Vec{3,T})       = [xyz[1]], [xyz[2]], [xyz[3]]
+
+#
+# # --------------------------------------------------------------------
+# # handle grouping
+# # --------------------------------------------------------------------
+
+# @recipe function f(groupby::GroupBy, args...)
+#     for (i,glab) in enumerate(groupby.groupLabels)
+#         # create a new series, with the label of the group, and an idxfilter (to be applied in slice_and_dice)
+#         # TODO: use @series instead
+#         @show i, glab, groupby.groupIds[i]
+#         di = copy(d)
+#         get!(di, :label, string(glab))
+#         get!(di, :idxfilter, groupby.groupIds[i])
+#         push!(series_list, RecipeData(di, args))
+#     end
+#     nothing
+# end
+
+# split the group into 1 series per group, and set the label and idxfilter for each
+@recipe function f(groupby::GroupBy, args...)
+    for (i,glab) in enumerate(groupby.groupLabels)
+        @series begin
+            label     --> string(glab)
+            idxfilter --> groupby.groupIds[i]
+            args
+        end
+    end
+end

src/subplot.jl

@@ -1,418 +0,0 @@
-
-function subplotlayout(sz::@compat(Tuple{Int,Int}))
-  GridLayout(sz...)
-end
-
-function subplotlayout(rowcounts::AVec{Int})
-  FlexLayout(sum(rowcounts), rowcounts)
-end
-
-function subplotlayout(numplts::Int, nr::Int, nc::Int)
-
-  # figure out how many rows/columns we need
-  if nr == -1
-    if nc == -1
-      nr = round(Int, sqrt(numplts))
-      nc = ceil(Int, numplts / nr)
-    else
-      nr = ceil(Int, numplts / nc)
-    end
-  else
-    nc = ceil(Int, numplts / nr)
-  end
-
-  # if it's a perfect rectangle, just create a grid
-  if numplts == nr * nc
-    return GridLayout(nr, nc)
-  end
-
-  # create the rowcounts vector
-  i = 0
-  rowcounts = Int[]
-  for r in 1:nr
-    cnt = min(nc, numplts - i)
-    push!(rowcounts, cnt)
-    i += cnt
-  end
-
-  FlexLayout(numplts, rowcounts)
-end
-
-
-
-Base.length(layout::FlexLayout) = layout.numplts
-Base.start(layout::FlexLayout) = 1
-Base.done(layout::FlexLayout, state) = state > length(layout)
-function Base.next(layout::FlexLayout, state)
-  r = 1
-  c = 0
-  for i = 1:state
-    c += 1
-    if c > layout.rowcounts[r]
-      r += 1
-      c = 1
-    end
-  end
-  (r,c), state + 1
-end
-
-nrows(layout::FlexLayout) = length(layout.rowcounts)
-ncols(layout::FlexLayout, row::Int) = row < 1 ? 0 : (row > nrows(layout) ? 0 : layout.rowcounts[row])
-
-# get the plot index given row and column
-Base.getindex(layout::FlexLayout, r::Int, c::Int) = sum(layout.rowcounts[1:r-1]) + c
-
-Base.length(layout::GridLayout) = layout.nr * layout.nc
-Base.start(layout::GridLayout) = 1
-Base.done(layout::GridLayout, state) = state > length(layout)
-function Base.next(layout::GridLayout, state)
-  r = div(state-1, layout.nc) + 1
-  c = mod1(state, layout.nc)
-  (r,c), state + 1
-end
-
-nrows(layout::GridLayout) = layout.nr
-ncols(layout::GridLayout) = layout.nc
-ncols(layout::GridLayout, row::Int) = layout.nc
-
-# get the plot index given row and column
-Base.getindex(layout::GridLayout, r::Int, c::Int) = (r-1) * layout.nc + c
-
-Base.getindex(subplt::Subplot, args...) = subplt.plts[subplt.layout[args...]]
-
-# handle "linking" the subplot axes together
-# each backend should implement the handleLinkInner and expandLimits! methods
-function linkAxis(subplt::Subplot, isx::Bool)
-
-  # collect the list of plots and the expanded limits for those plots that should be linked on this axis
-  includedPlots = Any[]
-  # lims = [Inf, -Inf]
-  lims = Dict{Int,Any}()  # maps column to xlim
-  for (i,(r,c)) in enumerate(subplt.layout)
-
-    # shouldlink will be a bool or nothing.  if nothing, then use linkx/y (which is true if we get to this code)
-    shouldlink = subplt.linkfunc(r,c)[isx ? 1 : 2]
-    if shouldlink == nothing || shouldlink
-      plt = subplt.plts[i]
-
-      # if we don't have this
-      k = isx ? c : r
-      if (firstone = !haskey(lims, k))
-        lims[k] = [Inf, -Inf]
-      end
-
-      isinner = (isx && r < nrows(subplt.layout)) || (!isx && !firstone)
-      push!(includedPlots, (plt, isinner, k))
-
-      expandLimits!(lims[k], plt, isx)
-    end
-
-  end
-
-  # do the axis adjustments
-  for (plt, isinner, k) in includedPlots
-    if isinner
-      handleLinkInner(plt, isx)
-    end
-    (isx ? xlims! : ylims!)(plt, lims[k]...)
-  end
-end
-
-
-
-# ------------------------------------------------------------
-
-
-Base.string(subplt::Subplot) = "Subplot{$(subplt.backend) p=$(subplt.p) n=$(subplt.n)}"
-Base.print(io::IO, subplt::Subplot) = print(io, string(subplt))
-Base.show(io::IO, subplt::Subplot) = print(io, string(subplt))
-
-getplot(subplt::Subplot, idx::Int = subplt.n) = subplt.plts[mod1(idx, subplt.p)]
-getinitargs(subplt::Subplot, idx::Int) = getplot(subplt, idx).initargs
-convertSeriesIndex(subplt::Subplot, n::Int) = ceil(Int, n / subplt.p)
-
-# ------------------------------------------------------------
-
-function validateSubplotSupported()
-  if !subplotSupported()
-    error(CURRENT_BACKEND.sym, " does not support the subplot/subplot! commands at this time.  Try one of: ", join(filter(pkg->subplotSupported(backendInstance(pkg)), backends()),", "))
-  end
-end
-
-"""
-Create a series of plots:
-```
-  y = rand(100,3)
-  subplot(y; n = 3)             # create an automatic grid, and let it figure out the nr/nc... will put plots 1 and 2 on the first row, and plot 3 by itself on the 2nd row
-  subplot(y; n = 3, nr = 1)     # create an automatic grid, but fix the number of rows to 1 (so there are n columns)
-  subplot(y; n = 3, nc = 1)     # create an automatic grid, but fix the number of columns to 1 (so there are n rows)
-  subplot(y; layout = [1, 2])   # explicit layout by row... plot #1 goes by itself in the first row, plots 2 and 3 split the 2nd row (note the n kw is unnecessary)
-  subplot(plts, n; nr = -1, nc = -1)  # build a layout from existing plots
-  subplot(plts, layout)               # build a layout from existing plots
-```
-"""
-function subplot(args...; kw...)
-  validateSubplotSupported()
-  d = Dict(kw)
-  preprocessArgs!(d)
-
-  # figure out the layout
-  layoutarg = get(d, :layout, nothing)
-  if layoutarg != nothing
-    layout = subplotlayout(layoutarg)
-  else
-    n = get(d, :n, -1)
-    if n < 0
-      error("You must specify either layout or n when creating a subplot: ", d)
-    end
-    layout = subplotlayout(n, get(d, :nr, -1), get(d, :nc, -1))
-  end
-
-  # initialize the individual plots
-  pkg = backend()
-  plts = Plot{typeof(pkg)}[]
-  for i in 1:length(layout)
-    di = getPlotArgs(pkg, d, i)
-    di[:subplot] = true
-    dumpdict(di, "Plot args (subplot $i)")
-    push!(plts, plot(pkg; di...))
-  end
-
-  # create the object and do the plotting
-  subplt = Subplot(nothing, plts, pkg, length(layout), 0, layout, d, false, false, false, (r,c) -> (nothing,nothing))
-  subplot!(subplt, args...; kw...)
-
-  subplt
-end
-
-# ------------------------------------------------------------------------------------------------
-
-# NOTE: for the subplot calls building from existing plots, we need the first plot to be separate to ensure dispatch calls this instead of the more general subplot(args...; kw...)
-
-# grid layout
-function subplot{P}(plt1::Plot{P}, plts::Plot{P}...; kw...)
-  d = Dict(kw)
-  layout = subplotlayout(length(plts)+1, get(d, :nr, -1), get(d, :nc, -1))
-  subplot(vcat(plt1, plts...), layout, d)
-end
-
-# explicit layout
-function subplot{P,I<:Integer}(pltsPerRow::AVec{I}, plt1::Plot{P}, plts::Plot{P}...; kw...)
-  layout = subplotlayout(pltsPerRow)
-  subplot(vcat(plt1, plts...), layout, Dict(kw))
-end
-
-# this will be called internally
-function subplot{P<:PlottingPackage}(plts::AVec{Plot{P}}, layout::SubplotLayout, d::Dict)
-  validateSubplotSupported()
-  p = length(layout)
-  n = sum([plt.n for plt in plts])
-  subplt = Subplot(nothing, collect(plts), P(), p, n, layout, Dict(), false, false, false, (r,c) -> (nothing,nothing))
-
-  # preprocessArgs!(d)
-
-  # # 
-  # for (i,plt) in enumerate(plts)
-  #   di = copy(plt.initargs)
-
-  #   for ck in (:background_color, :foreground_color, :color_palette)
-  #     # if we have a value to override, do it
-  #     if haskey(d, ck)
-  #       di[ck] = get_mod(d[ck], i)
-  #     end
-    
-
-
-  # # build a new dict from the initargs of the plots
-  # iargs = Dict()
-  # for k in keys(_plotDefaults)
-  #   iargs[k] = Any[plt.initargs[k] for plt in plts]'
-  # end
-  # merge!(iargs, d)
-
-  preprocessSubplot(subplt, d)
-  postprocessSubplot(subplt, d)
-
-  subplt
-end
-
-# TODO: hcat/vcat subplots and plots together arbitrarily
-
-# ------------------------------------------------------------------------------------------------
-
-
-function preprocessSubplot(subplt::Subplot, d::Dict)
-  validateSubplotSupported()
-  preprocessArgs!(d)
-  dumpdict(d, "After subplot! preprocessing")
-
-  # get the full initargs, overriding any new settings
-  # TODO: subplt.initargs should probably be merged sooner and actually used
-  #       for color selection, etc.  (i.e. if we overwrite the subplot palettes to [:heat :rainbow])
-  #       then we need to overwrite plt[1].initargs[:color_palette] to :heat before it's actually used
-  #       for color selection!
-
-  # first merge the new args into the subplot's initargs. then process the plot args and merge
-  # those into the plot's initargs.  (example... `palette = [:blues :reds]` goes into subplt.initargs,
-  # then the ColorGradient for :blues/:reds is merged into plot 1/2 initargs, which is then used for color selection)
-  for i in 1:length(subplt.layout)
-    # di = getPlotArgs(backend(), subplt.initargs, i)
-    # merge!(subplt.plts[i].initargs, di)
-    subplt.plts[i].initargs = getPlotArgs(backend(), merge(subplt.plts[i].initargs, d), i)
-  end
-  merge!(subplt.initargs, d)
-
-  # process links.  TODO: extract to separate function
-  for s in (:linkx, :linky, :linkfunc)
-    if haskey(d, s)
-      setfield!(subplt, s, d[s])
-      delete!(d, s)
-    end
-  end
-end
-
-function postprocessSubplot(subplt::Subplot, d::Dict)
-  # init (after plot creation)
-  if !subplt.initialized
-    subplt.initialized = buildSubplotObject!(subplt, false)
-  end
-
-  # add title, axis labels, ticks, etc
-  for (i,plt) in enumerate(subplt.plts)
-
-    # # # get the full initargs, overriding any new settings
-    # # di = copy(merge(plt.initargs, d))
-    # di = copy(d)
-
-    # for (k,v) in di
-    #   if typeof(v) <: AVec
-    #     di[k] = v[mod1(i, length(v))]
-    #   elseif typeof(v) <: AMat
-    #     m = size(v,2)
-    #     di[k] = (size(v,1) == 1 ? v[1, mod1(i, m)] : v[:, mod1(i, m)])
-    #   end
-    # end
-
-    # di = merge!(plt.initargs, di)
-
-    di = plt.initargs
-
-    dumpdict(di, "Updating sp $i")
-    updatePlotItems(plt, di)
-  end
-
-  updatePositionAndSize(subplt, d)
-
-  # handle links
-  subplt.linkx && linkAxis(subplt, true)
-  subplt.linky && linkAxis(subplt, false)
-
-  # set this to be current
-  current(subplt)
-end
-
-# ------------------------------------------------------------------------------------------------
-
-"""
-Adds to a subplot.
-"""
-
-# current subplot
-function subplot!(args...; kw...)
-  validateSubplotSupported()
-  subplot!(current(), args...; kw...)
-end
-
-
-# not allowed:
-function subplot!(plt::Plot, args...; kw...)
-  error("Can't call subplot! on a Plot!")
-end
-
-
-# # this adds to a specific subplot... most plot commands will flow through here
-function subplot!(subplt::Subplot, args...; kw...)
-  # validateSubplotSupported()
-
-  d = Dict(kw)
-  preprocessSubplot(subplt, d)
-
-  # create the underlying object (each backend will do this differently)
-  # note: we call it once before doing the individual plots, and once after
-  #       this is because some backends need to set up the subplots and then plot, 
-  #       and others need to do it the other way around
-  if !subplt.initialized
-    subplt.initialized = buildSubplotObject!(subplt, true)
-  end
-
-  # handle grouping
-  group = get(d, :group, nothing)
-  if group == nothing
-    groupargs = []
-  else
-    groupargs = [extractGroupArgs(d[:group], args...)]
-    delete!(d, :group)
-  end
-
-
-  kwList, xmeta, ymeta = createKWargsList(subplt, groupargs..., args...; d...)
-
-  # TODO: something useful with meta info?
-
-  for (i,di) in enumerate(kwList)
-
-    subplt.n += 1
-    plt = getplot(subplt)
-    plt.n += 1
-
-    # # update the plot's initargs for things such as palettes, etc
-    # for (k,v) in subplt.initargs
-    #   haskey(_plotDefaults, k) || continue
-    #   if typeof(v) <: AVec
-    #     plt.initargs[k] = v[mod1(i, length(v))]
-    #   elseif typeof(v) <: AMat
-    #     m = size(v,2)
-    #     plt.initargs[k] = (size(v,1) == 1 ? v[1, mod1(i, m)] : v[:, mod1(i, m)])
-    #   end
-    # end
-
-    # cleanup the dictionary that we pass into the plot! command
-    di[:show] = false
-    di[:subplot] = true
-    for k in (:title, :xlabel, :xticks, :xlims, :xscale, :xflip,
-                      :ylabel, :yticks, :ylims, :yscale, :yflip)
-      delete!(di, k)
-    end
-    dumpdict(di, "subplot! kwList $i")
-    dumpdict(plt.initargs, "plt.initargs before plotting")
-    
-    _plot_from_subplot!(plt; di...)
-  end
-
-  postprocessSubplot(subplt, d)
-
-  # show it automatically?
-  if haskey(d, :show) && d[:show]
-    gui()
-  end
-
-  subplt
-end
-
-
-
-function _plot_from_subplot!(plt::Plot, args...; kw...)
-  d = Dict(kw)
-
-  setTicksFromStringVector(d, d, :x, :xticks)
-  setTicksFromStringVector(d, d, :y, :yticks)
-
-  # dumpdict(d, "Plot from subplot")
-  plot!(plt.backend, plt; d...)
-  
-  addAnnotations(plt, d)
-  warnOnUnsupportedScales(plt.backend, d)
-end
-
-
-

src/subplots.jl

@@ -0,0 +1,48 @@
+
+
+function Subplot{T<:AbstractBackend}(::T; parent = RootLayout())
+    Subplot{T}(
+        parent,
+        Series[],
+        (20mm, 5mm, 2mm, 10mm),
+        defaultbox,
+        defaultbox,
+        KW(),
+        nothing,
+        nothing
+    )
+end
+
+plotarea(sp::Subplot) = sp.plotarea
+plotarea!(sp::Subplot, bbox::BoundingBox) = (sp.plotarea = bbox)
+
+
+Base.size(sp::Subplot) = (1,1)
+Base.length(sp::Subplot) = 1
+Base.getindex(sp::Subplot, r::Int, c::Int) = sp
+
+leftpad(sp::Subplot)   = sp.minpad[1]
+toppad(sp::Subplot)    = sp.minpad[2]
+rightpad(sp::Subplot)  = sp.minpad[3]
+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.d[:subplot]
+
+get_subplot_index(plt::Plot, idx::Integer) = Int(idx)
+get_subplot_index(plt::Plot, sp::Subplot) = findfirst(_ -> _ === sp, plt.subplots)
+
+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.d[:primary] && series.d[:label] != "" &&
+        !(series.d[:seriestype] in (
+            :hexbin,:histogram2d,:hline,:vline,
+            :contour,:contourf,:contour3d,:surface,:wireframe,
+            :heatmap, :pie, :image
+        ))
+end
+
+# ----------------------------------------------------------------------

src/themes.jl

@@ -0,0 +1,40 @@
+
+function theme(s::Symbol; kw...)
+    # 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
+
+    # update the default gradient and other defaults
+    thm = PlotThemes._themes[s]
+    if thm.gradient != nothing
+        PlotUtils._default_gradient[] = PlotThemes.gradient_name(s)
+    end
+    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)

src/types.jl

@@ -1,194 +1,99 @@
 
+# 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
+
 typealias AVec AbstractVector
 typealias AMat AbstractMatrix
+typealias KW Dict{Symbol,Any}
 
 immutable PlotsDisplay <: Display end
-  
-abstract PlottingPackage
-abstract PlottingObject{T<:PlottingPackage}
 
-type Plot{T<:PlottingPackage} <: PlottingObject{T}
-  o  # the underlying object
-  backend::T
-  n::Int  # number of series
+abstract AbstractBackend
+abstract AbstractPlot{T<:AbstractBackend}
+abstract AbstractLayout
 
-  # store these just in case
-  initargs::Dict
-  seriesargs::Vector{Dict} # args for each series
+# -----------------------------------------------------------
+
+immutable InputWrapper{T}
+    obj::T
+end
+wrap{T}(obj::T) = InputWrapper{T}(obj)
+Base.isempty(wrapper::InputWrapper) = false
+
+
+# -----------------------------------------------------------
+
+type Series
+    d::KW
 end
 
+attr(series::Series, k::Symbol) = series.d[k]
+attr!(series::Series, v, k::Symbol) = (series.d[k] = v)
 
-abstract SubplotLayout
+# -----------------------------------------------------------
 
-immutable GridLayout <: SubplotLayout
-  nr::Int
-  nc::Int
+# a single subplot
+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::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
 
-immutable FlexLayout <: SubplotLayout
-  numplts::Int
-  rowcounts::AbstractVector{Int}
+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
+type Axis
+    sps::Vector{Subplot}
+    d::KW
 end
 
+type Extrema
+    emin::Float64
+    emax::Float64
+end
+Extrema() = Extrema(Inf, -Inf)
 
-type Subplot{T<:PlottingPackage, L<:SubplotLayout} <: PlottingObject{T}
-  o                           # the underlying object
-  plts::Vector{Plot{T}}          # the individual plots
-  backend::T
-  p::Int                      # number of plots
-  n::Int                      # number of series
-  layout::L
-  # initargs::Vector{Dict}
-  initargs::Dict
-  initialized::Bool
-  linkx::Bool
-  linky::Bool
-  linkfunc::Function # maps (row,column) -> (BoolOrNothing, BoolOrNothing)... if xlink/ylink are nothing, then use subplt.linkx/y
+# -----------------------------------------------------------
+
+typealias SubplotMap Dict{Any, Subplot}
+
+# -----------------------------------------------------------
+
+
+type Plot{T<:AbstractBackend} <: AbstractPlot{T}
+    backend::T                   # the backend type
+    n::Int                       # number of series
+    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}
+    spmap::SubplotMap            # provide any label as a map to a subplot
+    layout::AbstractLayout
+    inset_subplots::Vector{Subplot}  # list of inset subplots
+    init::Bool
+end
+
+function Plot()
+    Plot(backend(), 0, KW(), KW(), Series[], nothing,
+         Subplot[], SubplotMap(), EmptyLayout(),
+         Subplot[], false)
 end
 
 # -----------------------------------------------------------------------
 
-immutable Shape
-  vertices::AVec
-end
+Base.getindex(plt::Plot, i::Integer) = plt.subplots[i]
+Base.getindex(plt::Plot, r::Integer, c::Integer) = plt.layout[r,c]
+# attr(plt::Plot, k::Symbol) = plt.attr[k]
+# attr!(plt::Plot, v, k::Symbol) = (plt.attr[k] = v)
 
-"get an array of tuples of points on a circle with radius `r`"
-function partialcircle(start_θ, end_θ, n = 20, r=1)
-  @compat(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)"
-function weave(x,y; ordering = Vector[x,y])
-  ret = eltype(x)[]
-  done = false
-  while !done
-    for o in ordering
-      try
-          push!(ret, shift!(o))
-      end
-      # try
-      #     push!(ret, shift!(y))
-      # end
-    end
-    done = isempty(x) && isempty(y)
-  end
-  ret
-end
-
-
-"create a star by weaving together points from an outer and inner circle.  `n` is the number of arms"
-function makestar(n; offset = -0.5, radius = 1.0)
-    z1 = offset * π
-    z2 = z1 + π / (n)
-    outercircle = partialcircle(z1, z1 + 2π, n+1, radius)
-    innercircle = partialcircle(z2, z2 + 2π, n+1, 0.4radius)
-    Shape(weave(outercircle, innercircle)[1:end-2])
-end
-
-"create a shape by picking points around the unit circle.  `n` is the number of point/sides, `offset` is the starting angle"
-function makeshape(n; offset = -0.5, radius = 1.0)
-    z = offset * π
-    Shape(partialcircle(z, z + 2π, n+1, radius)[1:end-1])
-end
-
-
-function makecross(; offset = -0.5, radius = 1.0)
-    z2 = offset * π
-    z1 = z2 - π/8
-    outercircle = partialcircle(z1, z1 + 2π, 9, radius)
-    innercircle = partialcircle(z2, z2 + 2π, 5, 0.5radius)
-    Shape(weave(outercircle, innercircle, 
-                ordering=Vector[outercircle,innercircle,outercircle])[1:end-2])
-end
-
-
-const _shapes = @compat Dict(
-    :ellipse => makeshape(20),
-    :rect => makeshape(4, offset=-0.25),
-    :diamond => makeshape(4),
-    :utriangle => makeshape(3),
-    :dtriangle => makeshape(3, offset=0.5),
-    :pentagon => makeshape(5),
-    :hexagon => makeshape(6),
-    :heptagon => makeshape(7),
-    :octagon => makeshape(8),
-    :cross => makecross(offset=-0.25),
-    :xcross => makecross(),
-  )
-
-for n in [4,5,6,7,8]
-  _shapes[symbol("star$n")] = makestar(n)
-end
+Base.getindex(sp::Subplot, i::Integer) = series_list(sp)[i]
 
 # -----------------------------------------------------------------------
-
-
-immutable Font
-  family::AbstractString
-  pointsize::Int
-  halign::Symbol
-  valign::Symbol
-  rotation::Float64
-  color::Colorant
-end
-
-"Create a Font from a list of unordered features"
-function font(args...)
-  
-  # defaults
-  family = "Helvetica"
-  pointsize = 14
-  halign = :hcenter
-  valign = :vcenter
-  rotation = 0.0
-  color = colorant"black"
-
-  for arg in args
-    T = typeof(arg)
-
-    if arg == :center
-      halign = :hcenter
-      valign = :vcenter
-    elseif arg in (:hcenter, :left, :right)
-      halign = arg
-    elseif arg in (:vcenter, :top, :bottom)
-      valign = arg
-    elseif T <: Colorant
-      color = arg
-    elseif T <: @compat Union{Symbol,AbstractString}
-      try
-        color = parse(Colorant, string(arg))
-      catch
-        family = string(arg)
-      end
-    elseif typeof(arg) <: Integer
-      pointsize = arg
-    elseif typeof(arg) <: Real
-      rotation = convert(Float64, arg)
-    else
-      warn("Unused font arg: $arg ($(typeof(arg)))")
-    end
-  end
-
-  Font(family, pointsize, halign, valign, rotation, color)
-end
-
-"Wrap a string with font info"
-immutable PlotText
-  str::@compat(AbstractString)
-  font::Font
-end
-
-function text(str, args...)
-  PlotText(string(str), font(args...))
-end
-  
-
-# -----------------------------------------------------------------------
-
-type OHLC{T<:Real}
-  open::T
-  high::T
-  low::T
-  close::T
-end

src/utils.jl

@@ -19,13 +19,13 @@ A hacky replacement for a histogram when the backend doesn't support histograms
 Convert it into a bar chart with the appropriate x/y values.
 """
 function histogramHack(; kw...)
-  d = Dict(kw)
+  d = KW(kw)
 
   # we assume that the y kwarg is set with the data to be binned, and nbins is also defined
-  edges, midpoints, buckets, counts = binData(d[:y], d[:nbins])
+  edges, midpoints, buckets, counts = binData(d[:y], d[:bins])
   d[:x] = midpoints
   d[:y] = float(counts)
-  d[:linetype] = :bar
+  d[:seriestype] = :bar
   d[:fillrange] = d[:fillrange] == nothing ? 0.0 : d[:fillrange]
   d
 end
@@ -35,7 +35,7 @@ A hacky replacement for a bar graph when the backend doesn't support bars direct
 Convert it into a line chart with fillrange set.
 """
 function barHack(; kw...)
-  d = Dict(kw)
+  d = KW(kw)
   midpoints = d[:x]
   heights = d[:y]
   fillrange = d[:fillrange] == nothing ? 0.0 : d[:fillrange]
@@ -64,7 +64,7 @@ function barHack(; kw...)
 
   d[:x] = x
   d[:y] = y
-  d[:linetype] = :path
+  d[:seriestype] = :path
   d[:fillrange] = fillrange
   d
 end
@@ -75,7 +75,7 @@ A hacky replacement for a sticks graph when the backend doesn't support sticks d
 Convert it into a line chart that traces the sticks, and a scatter that sets markers at the points.
 """
 function sticksHack(; kw...)
-  dLine = Dict(kw)
+  dLine = KW(kw)
   dScatter = copy(dLine)
 
   # these are the line vertices
@@ -94,12 +94,12 @@ function sticksHack(; kw...)
   # change the line args
   dLine[:x] = x
   dLine[:y] = y
-  dLine[:linetype] = :path
+  dLine[:seriestype] = :path
   dLine[:markershape] = :none
   dLine[:fillrange] = nothing
 
   # change the scatter args
-  dScatter[:linetype] = :none
+  dScatter[:seriestype] = :none
 
   dLine, dScatter
 end
@@ -114,24 +114,168 @@ function regressionXY(x, y)
   regx, regy
 end
 
+function replace_image_with_heatmap{T<:Colorant}(z::Array{T})
+    @show T, size(z)
+    n, m = size(z)
+    # idx = 0
+    colors = ColorGradient(vec(z))
+    newz = reshape(linspace(0, 1, n*m), n, m)
+    newz, colors
+    # newz = zeros(n, m)
+    # for i=1:n, j=1:m
+    #     push!(colors, T(z[i,j]...))
+    #     newz[i,j] = idx / (n*m-1)
+    #     idx += 1
+    # end
+    # newz, ColorGradient(colors)
+end
+
+function imageHack(d::KW)
+    is_seriestype_supported(:heatmap) || error("Neither :image or :heatmap are supported!")
+    d[:seriestype] = :heatmap
+    d[:z], d[:fillcolor] = replace_image_with_heatmap(d[:z].surf)
+end
+# ---------------------------------------------------------------
+
+
+type Segments{T}
+    pts::Vector{T}
+end
+
+# Segments() = Segments{Float64}(zeros(0))
+
+Segments() = Segments(Float64)
+Segments{T}(::Type{T}) = Segments(T[])
+Segments(p::Int) = Segments(NTuple{2,Float64}[])
+
+
+# Segments() = Segments(zeros(0))
+
+to_nan(::Type{Float64}) = NaN
+to_nan(::Type{NTuple{2,Float64}}) = (NaN, NaN)
+
+coords(segs::Segments{Float64}) = segs.pts
+coords(segs::Segments{NTuple{2,Float64}}) = Float64[p[1] for p in segs.pts], Float64[p[2] for p in segs.pts]
+
+function Base.push!{T}(segments::Segments{T}, vs...)
+    if !isempty(segments.pts)
+        push!(segments.pts, to_nan(T))
+    end
+    for v in vs
+        push!(segments.pts, convert(T,v))
+    end
+    segments
+end
+
+function Base.push!{T}(segments::Segments{T}, vs::AVec)
+    if !isempty(segments.pts)
+        push!(segments.pts, to_nan(T))
+    end
+    for v in vs
+        push!(segments.pts, convert(T,v))
+    end
+    segments
+end
+
+
+# -----------------------------------------------------
+# helper to manage NaN-separated segments
+
+type SegmentsIterator
+    args::Tuple
+    n::Int
+end
+function iter_segments(args...)
+    tup = Plots.wraptuple(args)
+    n = maximum(map(length, tup))
+    SegmentsIterator(tup, n)
+end
+
+# helpers to figure out if there are NaN values in a list of array types
+anynan(i::Int, args::Tuple) = any(a -> !isfinite(cycle(a,i)), args)
+anynan(istart::Int, iend::Int, args::Tuple) = any(i -> anynan(i, args), istart:iend)
+allnan(istart::Int, iend::Int, args::Tuple) = all(i -> anynan(i, args), istart:iend)
+
+function Base.start(itr::SegmentsIterator)
+    nextidx = 1
+    if anynan(1, itr.args)
+        _, nextidx = next(itr, 1)
+    end
+    nextidx
+end
+Base.done(itr::SegmentsIterator, nextidx::Int) = nextidx > itr.n
+function Base.next(itr::SegmentsIterator, nextidx::Int)
+    i = istart = iend = nextidx
+
+    # find the next NaN, and iend is the one before
+    while i <= itr.n + 1
+        if i > itr.n || anynan(i, itr.args)
+            # done... array end or found NaN
+            iend = i-1
+            break
+        end
+        i += 1
+    end
+
+    # find the next non-NaN, and set nextidx
+    while i <= itr.n
+        if !anynan(i, itr.args)
+            break
+        end
+        i += 1
+    end
+
+    istart:iend, i
+end
+
 # ------------------------------------------------------------------------------------
 
-get_mod(v::AVec, idx::Int) = v[mod1(idx, length(v))]
-get_mod(v::AMat, idx::Int) = size(v,1) == 1 ? v[1, mod1(idx, size(v,2))] : v[:, mod1(idx, size(v,2))]
-get_mod(v, idx::Int) = v
+
+nop() = nothing
+notimpl() = error("This has not been implemented yet")
+
+isnothing(x::Void) = true
+isnothing(x) = false
+
+cycle(wrapper::InputWrapper, idx::Int) = wrapper.obj
+cycle(wrapper::InputWrapper, idx::AVec{Int}) = wrapper.obj
+
+cycle(v::AVec, idx::Int) = v[mod1(idx, length(v))]
+cycle(v::AMat, idx::Int) = size(v,1) == 1 ? v[1, mod1(idx, size(v,2))] : v[:, mod1(idx, size(v,2))]
+cycle(v, idx::Int)       = v
+
+cycle(v::AVec, indices::AVec{Int}) = map(i -> cycle(v,i), indices)
+cycle(v::AMat, indices::AVec{Int}) = map(i -> cycle(v,i), indices)
+cycle(v, indices::AVec{Int})       = fill(v, length(indices))
+
+cycle(grad::ColorGradient, idx::Int) = cycle(grad.colors, idx)
+cycle(grad::ColorGradient, indices::AVec{Int}) = cycle(grad.colors, indices)
 
 makevec(v::AVec) = v
 makevec{T}(v::T) = T[v]
 
 "duplicate a single value, or pass the 2-tuple through"
-maketuple(x::Real) = (x,x)
-maketuple{T,S}(x::@compat(Tuple{T,S})) = x
+maketuple(x::Real)                     = (x,x)
+maketuple{T,S}(x::Tuple{T,S}) = x
 
+mapFuncOrFuncs(f::Function, u::AVec)        = map(f, u)
+mapFuncOrFuncs(fs::AVec{Function}, u::AVec) = [map(f, u) for f in fs]
 
-unzip{T,S}(v::AVec{@compat(Tuple{T,S})}) = [vi[1] for vi in v], [vi[2] for vi in v]
+unzip{X,Y}(xy::AVec{Tuple{X,Y}})              = [t[1] for t in xy], [t[2] for t in xy]
+unzip{X,Y,Z}(xyz::AVec{Tuple{X,Y,Z}})         = [t[1] for t in xyz], [t[2] for t in xyz], [t[3] for t in xyz]
+unzip{X,Y,U,V}(xyuv::AVec{Tuple{X,Y,U,V}})    = [t[1] for t in xyuv], [t[2] for t in xyuv], [t[3] for t in xyuv], [t[4] for t in xyuv]
+
+unzip{T}(xy::AVec{FixedSizeArrays.Vec{2,T}})  = T[t[1] for t in xy], T[t[2] for t in xy]
+unzip{T}(xy::FixedSizeArrays.Vec{2,T})        = T[xy[1]], T[xy[2]]
+
+unzip{T}(xyz::AVec{FixedSizeArrays.Vec{3,T}}) = T[t[1] for t in xyz], T[t[2] for t in xyz], T[t[3] for t in xyz]
+unzip{T}(xyz::FixedSizeArrays.Vec{3,T})       = T[xyz[1]], T[xyz[2]], T[xyz[3]]
+
+unzip{T}(xyuv::AVec{FixedSizeArrays.Vec{4,T}}) = T[t[1] for t in xyuv], T[t[2] for t in xyuv], T[t[3] for t in xyuv], T[t[4] for t in xyuv]
+unzip{T}(xyuv::FixedSizeArrays.Vec{4,T})       = T[xyuv[1]], T[xyuv[2]], T[xyuv[3]], T[xyuv[4]]
 
 # given 2-element lims and a vector of data x, widen lims to account for the extrema of x
-function expandLimits!(lims, x)
+function _expand_limits(lims, x)
   try
     e1, e2 = extrema(x)
     lims[1] = min(lims[1], e1)
@@ -142,6 +286,7 @@ function expandLimits!(lims, x)
   nothing
 end
 
+expand_data(v, n::Integer) = [cycle(v, i) for i=1:n]
 
 # if the type exists in a list, replace the first occurence.  otherwise add it to the end
 function addOrReplace(v::AbstractVector, t::DataType, args...; kw...)
@@ -160,45 +305,301 @@ function replaceType(vec, val)
   push!(vec, val)
 end
 
-function replaceAliases!(d::Dict, aliases::Dict)
+function replaceAlias!(d::KW, k::Symbol, aliases::Dict{Symbol,Symbol})
+  if haskey(aliases, k)
+    d[aliases[k]] = pop!(d, k)
+  end
+end
+
+function replaceAliases!(d::KW, aliases::Dict{Symbol,Symbol})
   ks = collect(keys(d))
-  # for (k,v) in d
   for k in ks
-    if haskey(aliases, k)
-      d[aliases[k]] = d[k]
-      delete!(d, k)
-    end
+      replaceAlias!(d, k, aliases)
   end
 end
 
 createSegments(z) = collect(repmat(z',2,1))[2:end]
+
 Base.first(c::Colorant) = c
+Base.first(x::Symbol) = x
 
 
 sortedkeys(d::Dict) = sort(collect(keys(d)))
 
+"create an (n+1) list of the outsides of heatmap rectangles"
+function heatmap_edges(v::AVec)
+  vmin, vmax = extrema(v)
+  extra = 0.5 * (vmax-vmin) / (length(v)-1)
+  vcat(vmin-extra, 0.5 * (v[1:end-1] + v[2:end]), vmax+extra)
+end
+
+
+function calc_r_extrema(x, y)
+    xmin, xmax = extrema(x)
+    ymin, ymax = extrema(y)
+    r = 0.5 * min(xmax - xmin, ymax - ymin)
+    extrema(r)
+end
+
+function convert_to_polar(x, y, r_extrema = calc_r_extrema(x, y))
+    rmin, rmax = r_extrema
+    phi, r = x, y
+    r = 0.5 * (r - rmin) / (rmax - rmin)
+    n = max(length(phi), length(r))
+    x = zeros(n)
+    y = zeros(n)
+    for i in 1:n
+        x[i] = cycle(r,i) * cos(cycle(phi,i))
+        y[i] = cycle(r,i) * sin(cycle(phi,i))
+    end
+    x, y
+end
 
 function fakedata(sz...)
   y = zeros(sz...)
   for r in 2:size(y,1)
-    y[r,:] = 0.95 * y[r-1,:] + randn(size(y,2))'
+    y[r,:] = 0.95 * vec(y[r-1,:]) + randn(size(y,2))
   end
   y
 end
 
+isijulia() = isdefined(Main, :IJulia) && Main.IJulia.inited
+isatom() = isdefined(Main, :Atom) && Main.Atom.isconnected()
+
+function is_installed(pkgstr::AbstractString)
+    try
+        Pkg.installed(pkgstr) === nothing ? false: true
+    catch
+        false
+    end
+end
+
+istuple(::Tuple) = true
+istuple(::Any)   = false
+isvector(::AVec) = true
+isvector(::Any)  = false
+ismatrix(::AMat) = true
+ismatrix(::Any)  = false
+isscalar(::Real) = true
+isscalar(::Any)  = false
+
+is_2tuple(v) = typeof(v) <: Tuple && length(v) == 2
 
 
-# ticksType{T<:Real,S<:Real}(ticks::@compat(Tuple{T,S})) = :limits
-ticksType{T<:Real}(ticks::AVec{T}) = :ticks
-ticksType{T<:AVec,S<:AVec}(ticks::@compat(Tuple{T,S})) = :ticks_and_labels
-ticksType(ticks) = :invalid
-
-limsType{T<:Real,S<:Real}(lims::@compat(Tuple{T,S})) = :limits
-limsType(lims::Symbol) = lims == :auto ? :auto : :invalid
-limsType(lims) = :invalid
+isvertical(d::KW) = get(d, :orientation, :vertical) in (:vertical, :v, :vert)
+isvertical(series::Series) = isvertical(series.d)
 
 
+ticksType{T<:Real}(ticks::AVec{T})                      = :ticks
+ticksType{T<:AbstractString}(ticks::AVec{T})            = :labels
+ticksType{T<:AVec,S<:AVec}(ticks::Tuple{T,S})  = :ticks_and_labels
+ticksType(ticks)                                        = :invalid
 
+limsType{T<:Real,S<:Real}(lims::Tuple{T,S})    = :limits
+limsType(lims::Symbol)                                  = lims == :auto ? :auto : :invalid
+limsType(lims)                                          = :invalid
+
+# axis_Symbol(letter, postfix) = Symbol(letter * postfix)
+# axis_symbols(letter, postfix...) = map(s -> axis_Symbol(letter, s), postfix)
+
+Base.convert{T<:Real}(::Type{Vector{T}}, rng::Range{T})         = T[x for x in rng]
+Base.convert{T<:Real,S<:Real}(::Type{Vector{T}}, rng::Range{S}) = T[x for x in rng]
+
+Base.merge(a::AbstractVector, b::AbstractVector) = sort(unique(vcat(a,b)))
+
+nanpush!(a::AbstractVector, b) = (push!(a, NaN); push!(a, b))
+nanappend!(a::AbstractVector, b) = (push!(a, NaN); append!(a, b))
+
+function nansplit(v::AVec)
+    vs = Vector{eltype(v)}[]
+    while true
+        idx = findfirst(isnan, v)
+        if idx <= 0
+            # no nans
+            push!(vs, v)
+            break
+        elseif idx > 1
+            push!(vs, v[1:idx-1])
+        end
+        v = v[idx+1:end]
+    end
+    vs
+end
+
+function nanvcat(vs::AVec)
+    v_out = zeros(0)
+    for v in vs
+        nanappend!(v_out, v)
+    end
+    v_out
+end
+
+# given an array of discrete values, turn it into an array of indices of the unique values
+# returns the array of indices (znew) and a vector of unique values (vals)
+function indices_and_unique_values(z::AbstractArray)
+    vals = sort(unique(z))
+    vmap = Dict([(v,i) for (i,v) in enumerate(vals)])
+    newz = map(zi -> vmap[zi], z)
+    newz, vals
+end
+
+# this is a helper function to determine whether we need to transpose a surface matrix.
+# it depends on whether the backend matches rows to x (transpose_on_match == true) or vice versa
+# for example: PyPlot sends rows to y, so transpose_on_match should be true
+function transpose_z(d, z, transpose_on_match::Bool = true)
+    if d[:match_dimensions] == transpose_on_match
+        # z'
+        permutedims(z, [2,1])
+    else
+        z
+    end
+end
+
+function ok(x::Number, y::Number, z::Number = 0)
+    isfinite(x) && isfinite(y) && isfinite(z)
+end
+ok(tup::Tuple) = ok(tup...)
+
+# compute one side of a fill range from a ribbon
+function make_fillrange_side(y, rib)
+    frs = zeros(length(y))
+    for (i, (yi, ri)) in enumerate(zip(y, Base.cycle(rib)))
+        frs[i] = yi + ri
+    end
+    frs
+end
+
+# turn a ribbon into a fillrange
+function make_fillrange_from_ribbon(kw::KW)
+    y, rib = kw[:y], kw[:ribbon]
+    rib = wraptuple(rib)
+    rib1, rib2 = -first(rib), last(rib)
+    kw[:ribbon] = nothing
+    kw[:fillrange] = make_fillrange_side(y, rib1), make_fillrange_side(y, rib2)
+end
+
+function get_sp_lims(sp::Subplot, letter::Symbol)
+    axis_limits(sp[Symbol(letter, :axis)])
+end
+xlims(sp::Subplot) = get_sp_lims(sp, :x)
+ylims(sp::Subplot) = get_sp_lims(sp, :y)
+zlims(sp::Subplot) = get_sp_lims(sp, :z)
+xlims(plt::Plot, sp_idx::Int = 1) = xlims(plt[sp_idx])
+ylims(plt::Plot, sp_idx::Int = 1) = ylims(plt[sp_idx])
+zlims(plt::Plot, sp_idx::Int = 1) = zlims(plt[sp_idx])
+xlims(sp_idx::Int = 1) = xlims(current(), sp_idx)
+ylims(sp_idx::Int = 1) = ylims(current(), sp_idx)
+zlims(sp_idx::Int = 1) = zlims(current(), sp_idx)
+
+# ---------------------------------------------------------------
+
+makekw(; kw...) = KW(kw)
+
+wraptuple(x::Tuple) = x
+wraptuple(x) = (x,)
+
+trueOrAllTrue(f::Function, x::AbstractArray) = all(f, x)
+trueOrAllTrue(f::Function, x) = f(x)
+
+allLineTypes(arg)   = trueOrAllTrue(a -> get(_typeAliases, a, a) in _allTypes, arg)
+allStyles(arg)      = trueOrAllTrue(a -> get(_styleAliases, a, a) in _allStyles, arg)
+allShapes(arg)      = trueOrAllTrue(a -> is_marker_supported(get(_markerAliases, a, a)), arg) ||
+                        trueOrAllTrue(a -> isa(a, Shape), arg)
+allAlphas(arg)      = trueOrAllTrue(a -> (typeof(a) <: Real && a > 0 && a < 1) ||
+                        (typeof(a) <: AbstractFloat && (a == zero(typeof(a)) || a == one(typeof(a)))), arg)
+allReals(arg)       = trueOrAllTrue(a -> typeof(a) <: Real, arg)
+allFunctions(arg)   = trueOrAllTrue(a -> isa(a, Function), arg)
+
+# ---------------------------------------------------------------
+# ---------------------------------------------------------------
+
+
+"""
+Allows temporary setting of backend and defaults for Plots. Settings apply only for the `do` block.  Example:
+```
+with(:gadfly, size=(400,400), type=:histogram) do
+  plot(rand(10))
+  plot(rand(10))
+end
+```
+"""
+function with(f::Function, args...; kw...)
+    newdefs = KW(kw)
+
+    if :canvas in args
+        newdefs[:xticks] = nothing
+        newdefs[:yticks] = nothing
+        newdefs[:grid] = false
+        newdefs[:legend] = false
+    end
+
+  # dict to store old and new keyword args for anything that changes
+  olddefs = KW()
+  for k in keys(newdefs)
+    olddefs[k] = default(k)
+  end
+
+  # save the backend
+  if CURRENT_BACKEND.sym == :none
+    pickDefaultBackend()
+  end
+  oldbackend = CURRENT_BACKEND.sym
+
+  for arg in args
+
+    # change backend?
+    if arg in backends()
+      backend(arg)
+    end
+
+    # # TODO: generalize this strategy to allow args as much as possible
+    # #       as in:  with(:gadfly, :scatter, :legend, :grid) do; ...; end
+    # # TODO: can we generalize this enough to also do something similar in the plot commands??
+
+    # k = :seriestype
+    # if arg in _allTypes
+    #   olddefs[k] = default(k)
+    #   newdefs[k] = arg
+    # elseif haskey(_typeAliases, arg)
+    #   olddefs[k] = default(k)
+    #   newdefs[k] = _typeAliases[arg]
+    # end
+
+    k = :legend
+    if arg in (k, :leg)
+      olddefs[k] = default(k)
+      newdefs[k] = true
+    end
+
+    k = :grid
+    if arg == k
+      olddefs[k] = default(k)
+      newdefs[k] = true
+    end
+  end
+
+  # display(olddefs)
+  # display(newdefs)
+
+  # now set all those defaults
+  default(; newdefs...)
+
+  # call the function
+  ret = f()
+
+  # put the defaults back
+  default(; olddefs...)
+
+  # revert the backend
+  if CURRENT_BACKEND.sym != oldbackend
+    backend(oldbackend)
+  end
+
+  # return the result of the function
+  ret
+end
+
+# ---------------------------------------------------------------
 # ---------------------------------------------------------------
 
 type DebugMode
@@ -213,8 +614,8 @@ end
 debugshow(x) = show(x)
 debugshow(x::AbstractArray) = print(summary(x))
 
-function dumpdict(d::Dict, prefix = "")
-  _debugMode.on || return
+function dumpdict(d::KW, prefix = "", alwaysshow = false)
+  _debugMode.on || alwaysshow || return
   println()
   if prefix != ""
     println(prefix, ":")
@@ -226,6 +627,7 @@ function dumpdict(d::Dict, prefix = "")
   end
   println()
 end
+DD(d::KW, prefix = "") = dumpdict(d, prefix, true)
 
 
 function dumpcallstack()
@@ -233,133 +635,239 @@ function dumpcallstack()
 end
 
 # ---------------------------------------------------------------
-
-
-# push/append/clear/set the underlying plot data
-# NOTE: backends should implement the getindex and setindex! methods to get/set the x/y data objects
-
-
-# index versions
-function Base.push!(plt::Plot, i::Integer, x::Real, y::Real)
-  xdata, ydata = plt[i]
-  plt[i] = (extendSeriesData(xdata, x), extendSeriesData(ydata, y))
-  plt
-end
-function Base.push!(plt::Plot, i::Integer, y::Real)
-  xdata, ydata = plt[i]
-  # if !isa(xdata, UnitRange)
-  #   error("Expected x is a UnitRange since you're trying to push a y value only. typeof(x) = $(typeof(xdata))")
-  # end
-  plt[i] = (extendSeriesByOne(xdata), extendSeriesData(ydata, y))
-  plt
-end
-
-Base.push!(plt::Plot, y::Real) = push!(plt, 1, y)
-
-# update all at once
-function Base.push!(plt::Plot, x::AVec, y::AVec)
-  nx = length(x)
-  ny = length(y)
-  for i in 1:plt.n
-    push!(plt, i, x[mod1(i,nx)], y[mod1(i,ny)])
-  end
-  plt
-end
-
-function Base.push!(plt::Plot, x::Real, y::AVec)
-  push!(plt, [x], y)
-end
-
-function Base.push!(plt::Plot, y::AVec)
-  ny = length(y)
-  for i in 1:plt.n
-    push!(plt, i, y[mod1(i,ny)])
-  end
-  plt
-end
-
-
-# append to index
-function Base.append!(plt::Plot, i::Integer, x::AVec, y::AVec)
-  @assert length(x) == length(y)
-  xdata, ydata = plt[i]
-  plt[i] = (extendSeriesData(xdata, x), extendSeriesData(ydata, y))
-  plt
-end
-
-function Base.append!(plt::Plot, i::Integer, y::AVec)
-  xdata, ydata = plt[i]
-  if !isa(xdata, UnitRange{Int})
-    error("Expected x is a UnitRange since you're trying to push a y value only")
-  end
-  plt[i] = (extendSeriesByOne(xdata, length(y)), extendSeriesData(ydata, y))
-  plt
-end
-
-
+# ---------------------------------------------------------------
 # used in updating an existing series
 
 extendSeriesByOne(v::UnitRange{Int}, n::Int = 1) = isempty(v) ? (1:n) : (minimum(v):maximum(v)+n)
-extendSeriesByOne(v::AVec, n::Integer = 1) = isempty(v) ? (1:n) : vcat(v, (1:n) + maximum(v))
-extendSeriesData{T}(v::Range{T}, z::Real) = extendSeriesData(float(collect(v)), z)
-extendSeriesData{T}(v::Range{T}, z::AVec) = extendSeriesData(float(collect(v)), z)
-extendSeriesData{T}(v::AVec{T}, z::Real) = (push!(v, convert(T, z)); v)
-extendSeriesData{T}(v::AVec{T}, z::AVec) = (append!(v, convert(Vector{T}, z)); v)
+extendSeriesByOne(v::AVec, n::Integer = 1)       = isempty(v) ? (1:n) : vcat(v, (1:n) + maximum(v))
+extendSeriesData{T}(v::Range{T}, z::Real)        = extendSeriesData(float(collect(v)), z)
+extendSeriesData{T}(v::Range{T}, z::AVec)        = extendSeriesData(float(collect(v)), z)
+extendSeriesData{T}(v::AVec{T}, z::Real)         = (push!(v, convert(T, z)); v)
+extendSeriesData{T}(v::AVec{T}, z::AVec)         = (append!(v, convert(Vector{T}, z)); v)
 
 
-# ---------------------------------------------------------------
+# -------------------------------------------------------
+# NOTE: backends should implement the following methods to get/set the x/y/z data objects
 
-function supportGraph(allvals, func)
-  vals = reverse(sort(allvals))
-  bs = sort(backends())
-  x = ASCIIString[]
-  y = ASCIIString[]
-  for val in vals
-    for b in bs
-        supported = func(Plots.backendInstance(b))
-        if val in supported
-            push!(x, string(b))
-            push!(y, string(val))
+tovec(v::AbstractVector) = v
+tovec(v::Void) = zeros(0)
+
+function getxy(plt::Plot, i::Integer)
+    d = plt.series_list[i].d
+    tovec(d[:x]), tovec(d[:y])
+end
+function getxyz(plt::Plot, i::Integer)
+    d = plt.series_list[i].d
+    tovec(d[:x]), tovec(d[:y]), tovec(d[:z])
+end
+
+function setxy!{X,Y}(plt::Plot, xy::Tuple{X,Y}, i::Integer)
+    series = plt.series_list[i]
+    series.d[:x], series.d[:y] = xy
+    sp = series.d[:subplot]
+    reset_extrema!(sp)
+    _series_updated(plt, series)
+end
+function setxyz!{X,Y,Z}(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer)
+    series = plt.series_list[i]
+    series.d[:x], series.d[:y], series.d[:z] = xyz
+    sp = series.d[:subplot]
+    reset_extrema!(sp)
+    _series_updated(plt, series)
+end
+
+function setxyz!{X,Y,Z<:AbstractMatrix}(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer)
+    setxyz!(plt, (xyz[1], xyz[2], Surface(xyz[3])), i)
+end
+
+
+# -------------------------------------------------------
+# indexing notation
+
+# Base.getindex(plt::Plot, i::Integer) = getxy(plt, i)
+Base.setindex!{X,Y}(plt::Plot, xy::Tuple{X,Y}, i::Integer) = (setxy!(plt, xy, i); plt)
+Base.setindex!{X,Y,Z}(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer) = (setxyz!(plt, xyz, i); plt)
+
+# -------------------------------------------------------
+
+# operate on individual series
+
+function push_x!(series::Series, xi)
+    push!(series[:x], xi)
+    expand_extrema!(series[:subplot][:xaxis], xi)
+    return
+end
+function push_y!(series::Series, yi)
+    push!(series[:y], yi)
+    expand_extrema!(series[:subplot][:yaxis], yi)
+    return
+end
+function push_z!(series::Series, zi)
+    push!(series[:z], zi)
+    expand_extrema!(series[:subplot][:zaxis], zi)
+    return
+end
+
+function Base.push!(series::Series, yi)
+    x = extendSeriesByOne(series[:x])
+    expand_extrema!(series[:subplot][:xaxis], x[end])
+    series[:x] = x
+    push_y!(series, yi)
+end
+Base.push!(series::Series, xi, yi) = (push_x!(series,xi); push_y!(series,yi))
+Base.push!(series::Series, xi, yi, zi) = (push_x!(series,xi); push_y!(series,yi); push_z!(series,zi))
+
+# -------------------------------------------------------
+
+function attr!(series::Series; kw...)
+    d = KW(kw)
+    preprocessArgs!(d)
+    for (k,v) in d
+        if haskey(_series_defaults, k)
+            series[k] = v
+        else
+            warn("unused key $k in series attr")
         end
-      end 
-  end
-  n = length(vals)
-  
-  scatter(x,y,
-          m=:rect,
-          ms=10,
-          size=(300,100+18*n),
-          # xticks=(collect(1:length(bs)), bs),
-          leg=false
-         )
+    end
+    _series_updated(series[:subplot].plt, series)
+    series
 end
 
-supportGraphArgs() = supportGraph(_allArgs, supportedArgs)
-supportGraphTypes() = supportGraph(_allTypes, supportedTypes)
-supportGraphStyles() = supportGraph(_allStyles, supportedStyles)
-supportGraphMarkers() = supportGraph(_allMarkers, supportedMarkers)
-supportGraphScales() = supportGraph(_allScales, supportedScales)
-supportGraphAxes() = supportGraph(_allAxes, supportedAxes)
-
-function dumpSupportGraphs()
-  for func in (supportGraphArgs, supportGraphTypes, supportGraphStyles,
-               supportGraphMarkers, supportGraphScales, supportGraphAxes)
-    plt = func()
-    png(IMG_DIR * "/supported/$(string(func))")
-  end
+function attr!(sp::Subplot; kw...)
+    d = KW(kw)
+    preprocessArgs!(d)
+    for (k,v) in d
+        if haskey(_subplot_defaults, k)
+            sp[k] = v
+        else
+            warn("unused key $k in subplot attr")
+        end
+    end
+    sp
 end
 
+# -------------------------------------------------------
+# push/append for one series
+
+# push value to first series
+Base.push!(plt::Plot, y::Real) = push!(plt, 1, y)
+Base.push!(plt::Plot, x::Real, y::Real) = push!(plt, 1, x, y)
+Base.push!(plt::Plot, x::Real, y::Real, z::Real) = push!(plt, 1, x, y, z)
+
+# y only
+function Base.push!(plt::Plot, i::Integer, y::Real)
+    xdata, ydata = getxy(plt, i)
+    setxy!(plt, (extendSeriesByOne(xdata), extendSeriesData(ydata, y)), i)
+    plt
+end
+function Base.append!(plt::Plot, i::Integer, y::AVec)
+    xdata, ydata = plt[i]
+    if !isa(xdata, UnitRange{Int})
+        error("Expected x is a UnitRange since you're trying to push a y value only")
+    end
+    plt[i] = (extendSeriesByOne(xdata, length(y)), extendSeriesData(ydata, y))
+    plt
+end
+
+# x and y
+function Base.push!(plt::Plot, i::Integer, x::Real, y::Real)
+    xdata, ydata = getxy(plt, i)
+    setxy!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y)), i)
+    plt
+end
+function Base.append!(plt::Plot, i::Integer, x::AVec, y::AVec)
+    @assert length(x) == length(y)
+    xdata, ydata = getxy(plt, i)
+    setxy!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y)), i)
+    plt
+end
+
+# x, y, and z
+function Base.push!(plt::Plot, i::Integer, x::Real, y::Real, z::Real)
+    # @show i, x, y, z
+    xdata, ydata, zdata = getxyz(plt, i)
+    # @show xdata, ydata, zdata
+    setxyz!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y), extendSeriesData(zdata, z)), i)
+    plt
+end
+function Base.append!(plt::Plot, i::Integer, x::AVec, y::AVec, z::AVec)
+    @assert length(x) == length(y) == length(z)
+    xdata, ydata, zdata = getxyz(plt, i)
+    setxyz!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y), extendSeriesData(zdata, z)), i)
+    plt
+end
+
+# tuples
+Base.push!{X,Y}(plt::Plot, xy::Tuple{X,Y})                  = push!(plt, 1, xy...)
+Base.push!{X,Y,Z}(plt::Plot, xyz::Tuple{X,Y,Z})             = push!(plt, 1, xyz...)
+Base.push!{X,Y}(plt::Plot, i::Integer, xy::Tuple{X,Y})      = push!(plt, i, xy...)
+Base.push!{X,Y,Z}(plt::Plot, i::Integer, xyz::Tuple{X,Y,Z}) = push!(plt, i, xyz...)
+
+# -------------------------------------------------------
+# push/append for all series
+
+# push y[i] to the ith series
+function Base.push!(plt::Plot, y::AVec)
+    ny = length(y)
+    for i in 1:plt.n
+        push!(plt, i, y[mod1(i,ny)])
+    end
+    plt
+end
+
+# push y[i] to the ith series
+# same x for each series
+function Base.push!(plt::Plot, x::Real, y::AVec)
+    push!(plt, [x], y)
+end
+
+# push (x[i], y[i]) to the ith series
+function Base.push!(plt::Plot, x::AVec, y::AVec)
+    nx = length(x)
+    ny = length(y)
+    for i in 1:plt.n
+        push!(plt, i, x[mod1(i,nx)], y[mod1(i,ny)])
+    end
+    plt
+end
+
+# push (x[i], y[i], z[i]) to the ith series
+function Base.push!(plt::Plot, x::AVec, y::AVec, z::AVec)
+    nx = length(x)
+    ny = length(y)
+    nz = length(z)
+    for i in 1:plt.n
+        push!(plt, i, x[mod1(i,nx)], y[mod1(i,ny)], z[mod1(i,nz)])
+    end
+    plt
+end
+
+
+
+
 # ---------------------------------------------------------------
 
 
 # Some conversion functions
 # note: I borrowed these conversion constants from Compose.jl's Measure
-const INCH_SCALAR = 25.4
-const PX_SCALAR = 1 / 3.78 
-inch2px(inches::Real) = float(inches * INCH_SCALAR / PX_SCALAR)
-px2inch(px::Real) = float(px * PX_SCALAR / INCH_SCALAR)
-inch2mm(inches::Real) = float(inches * INCH_SCALAR)
-mm2inch(mm::Real) = float(mm / INCH_SCALAR)
-px2mm(px::Real) = float(px * PX_SCALAR)
-mm2px(mm::Real) = float(px / PX_SCALAR)
 
+const PX_PER_INCH   = 100
+const DPI           = PX_PER_INCH
+const MM_PER_INCH   = 25.4
+const MM_PER_PX     = MM_PER_INCH / PX_PER_INCH
+
+inch2px(inches::Real)   = float(inches * PX_PER_INCH)
+px2inch(px::Real)       = float(px / PX_PER_INCH)
+inch2mm(inches::Real)   = float(inches * MM_PER_INCH)
+mm2inch(mm::Real)       = float(mm / MM_PER_INCH)
+px2mm(px::Real)         = float(px * MM_PER_PX)
+mm2px(mm::Real)         = float(px / MM_PER_PX)
+
+
+"Smallest x in plot"
+xmin(plt::Plot) = minimum([minimum(series.d[:x]) for series in plt.series_list])
+"Largest x in plot"
+xmax(plt::Plot) = maximum([maximum(series.d[:x]) for series in plt.series_list])
+
+"Extrema of x-values in plot"
+Base.extrema(plt::Plot) = (xmin(plt), xmax(plt))

test/REQUIRE

@@ -1,9 +1,10 @@
-julia 0.3
-
-Colors
-Reexport
+StatPlots
 FactCheck
-Gadfly
 Images
 ImageMagick
-PyPlot
+@osx QuartzImageIO
+GR
+RDatasets
+VisualRegressionTests
+UnicodePlots
+Glob

test/imgcomp.jl

@@ -1,182 +1,105 @@
 
-# include this first to help with crashing??
-try
-  @eval using Gtk
-end
+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
-end
-
-# macro test_approx_eq_sigma_eps(A, B, sigma, eps)
-
-include("../docs/example_generation.jl")
-
-
-# # make and display one plot
-# function test_examples(pkg::Symbol, idx::Int; debug = true)
-#   Plots._debugMode.on = debug
-#   println("Testing plot: $pkg:$idx:$(examples[idx].header)")
-#   backend(pkg)
-#   backend()
-#   map(eval, examples[idx].exprs)
-#   plt = current()
-#   gui(plt)
-#   plt
-# end
-
-using Plots, FactCheck
-import Images, ImageMagick
-
-# if !isdefined(ImageMagick, :init_deps)
-#   function ImageMagick.init_deps()
-#     ccall((:MagickWandGenesis,libwand), Void, ())
-#   end
-# end
-
-function makeImageWidget(fn)
-  img = Gtk.GtkImageLeaf(fn)
-  vbox = Gtk.GtkBoxLeaf(:v)
-  push!(vbox, Gtk.GtkLabelLeaf(fn))
-  push!(vbox, img)
-  show(img)
-  vbox
-end
-
-function replaceReferenceImage(tmpfn, reffn)
-  cmd = `cp $tmpfn $reffn`
-  run(cmd)
-  info("Replaced reference image with: $cmd")
-end
-
-"Show a Gtk popup with both images and a confirmation whether we should replace the new image with the old one"
-function compareToReferenceImage(tmpfn, reffn)
-  @eval import Gtk
-
-  # add the images
-  imgbox = Gtk.GtkBoxLeaf(:h)
-  push!(imgbox, makeImageWidget(tmpfn))
-  push!(imgbox, makeImageWidget(reffn))
-
-  # add the buttons
-  # doNothingButton = Gtk.GtkButtonLeaf("Skip")
-  # replaceReferenceButton = Gtk.GtkButtonLeaf("Replace reference image")
-  # btnbox = Gtk.GtkButtonBoxLeaf(:h)
-  # push!(btnbox, doNothingButton)
-  # push!(btnbox, replaceReferenceButton)
-
-  # # create the window
-  # box = Gtk.GtkBoxLeaf(:v)
-  # push!(box, imgbox)
-  # push!(box, btnbox)
-  win = Gtk.GtkWindowLeaf("Should we make this the new reference image?")
-  push!(win, Gtk.GtkFrameLeaf(imgbox))
-
-  showall(win)
-
-  # now ask the question
-  if Gtk.ask_dialog("Should we make this the new reference image?", "No", "Yes")
-    replaceReferenceImage(tmpfn, reffn)
-  end
-
-  destroy(win)
-
-  # # we'll wait on this condition
-  # c = Condition()
-  # Gtk.on_signal_destroy((x...) -> notify(c), win)
-
-  # Gtk.signal_connect(replaceReferenceButton, "clicked") do widget
-  #   replaceReferenceImage(tmpfn, reffn)
-  #   notify(c)
-  # end
-
-  # Gtk.signal_connect(doNothingButton, "clicked") do widget
-  #   notify(c)
-  # end
-
-  # # wait until a button is clicked, then close the window
-  # Gtk.showall(win)
-  # wait(c)
-  # Gtk.destroy(win)
+  info("Matplotlib version: $(PyPlot.matplotlib[:__version__])")
 end
 
 
-# TODO: use julia's Condition type and the wait() and notify() functions to initialize a Window, then wait() on a condition that 
+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)
 
-function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, sigma = [1,1], eps = 1e-2)
-  
-  # first 
-  Plots._debugMode.on = debug
-  info("Testing plot: $pkg:$idx:$(PlotExamples.examples[idx].header)")
-  backend(pkg)
-  backend()
+const _current_plots_version = v"0.9.6"
 
-  # ensure consistent results
-  srand(1234)
 
-  # run the example
-  map(eval, PlotExamples.examples[idx].exprs)
+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]
+    info("Testing plot: $pkg:$idx:$(example.header)")
+    backend(pkg)
+    backend()
 
-  # save the png
-  tmpfn = tempname() * ".png"
-  png(tmpfn)
+    # ensure consistent results
+    srand(1234)
 
-  # load the saved png
-  tmpimg = Images.load(tmpfn)
+    # reference image directory setup
+    # refdir = joinpath(Pkg.dir("ExamplePlots"), "test", "refimg", string(pkg))
+    refdir = Pkg.dir("PlotReferenceImages", "Plots", string(pkg))
+    fn = "ref$idx.png"
 
-  # reference image location
-  # refdir = joinpath(Pkg.dir("Plots"), "test", "refimg", "v$(VERSION.major).$(VERSION.minor)", string(pkg))
-  refdir = joinpath(Pkg.dir("Plots"), "test", "refimg", string(pkg))
-  try
-    run(`mkdir -p $refdir`)
-  catch err
-    display(err)
-  end
-  reffn = joinpath(refdir, "ref$idx.png")
+    # 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
 
-  try
+    newdir = joinpath(refdir, string(_current_plots_version))
+    newfn = joinpath(newdir, fn)
 
-    # info("Comparing $tmpfn to reference $reffn")
-  
-    # load the reference image
-    refimg = Images.load(reffn)
-
-    # run the comparison test... a difference will throw an error
-    # NOTE: sigma is a 2-length vector with x/y values for the number of pixels
-    #       to blur together when comparing images
-    diffpct = Images.test_approx_eq_sigma_eps(tmpimg, refimg, sigma, eps)
-
-    # we passed!
-    info("Reference image $reffn matches.  Difference: $diffpct")
-    return true
-
-  catch err
-    warn("Image did not match reference image $reffn. err: $err")
-    showerror(Base.STDERR, err)
-    
-    if isinteractive()
-
-      # if we're in interactive mode, open a popup and give us a chance to examine the images
-      warn("Should we make this the new reference image?")
-      compareToReferenceImage(tmpfn, reffn)
-      return
-      
-    else
-
-      # if we rejected the image, or if we're in automated tests, throw the error
-      rethrow(err)
+    # 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
 
-  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
+        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, eps=eps, newfn = newfn)
 end
 
-function image_comparison_tests(pkg::Symbol; skip = [], debug = false, sigma = [1,1], eps = 1e-2)
-  for i in 1:length(PlotExamples.examples)
+function image_comparison_facts(pkg::Symbol;
+                                skip = [],      # skip these examples (int index)
+                                only = nothing, # limit to these examples (int index)
+                                debug = false,  # print debug information?
+                                sigma = [1,1],  # number of pixels to "blur"
+                                eps = 1e-2)     # acceptable error (percent)
+  for i in 1:length(Plots._examples)
     i in skip && continue
-    @fact image_comparison_tests(pkg, i, debug=debug, sigma=sigma, eps=eps) --> true
+    if only == nothing || i in only
+      @fact image_comparison_tests(pkg, i, debug=debug, sigma=sigma, eps=eps) |> success --> true
+    end
   end
 end

test/install_wkhtmltoimage.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+set -ex
+
+# sudo add-apt-repository -y ppa:pov/wkhtmltopdf
+sudo apt-get -qq update
+# sudo apt-get install -y wkhtmltopdf
+
+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
+
+wkhtmltopdf -V
+wkhtmltoimage -V
+
+# echo 'exec xvfb-run -a -s "-screen 0 640x480x16" wkhtmltoimage "$@"' | sudo tee /usr/local/bin/wkhtmltoimage.sh >/dev/null
+# sudo chmod a+x /usr/local/bin/wkhtmltoimage.sh
+
+# export DISPLAY=:99.0
+# sh -e /etc/init.d/xvfb start
+# sleep 3 # give xvfb some time to start