0.3 fix

.gitignore

@@ -2,4 +2,5 @@
 *.jl.*.cov
 *.jl.mem
 .DS_Store
-examples/.ipynb_checkpoints/*
+examples/.ipynb_checkpoints/*
+examples/meetup/.ipynb_checkpoints/*

.travis.yml

@@ -4,12 +4,17 @@ os:
   - linux
   - osx
 julia:
-  - 0.3
   - 0.4
-  - nightly
+  #- nightly
 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(pwd()); Pkg.build("Plots"); Pkg.add("Gadfly"); Pkg.test("Plots"; coverage=true)'
+ - 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())'

README.md

@@ -3,29 +3,33 @@
 [![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)
-[![Plots](http://pkg.julialang.org/badges/Plots_0.5.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.5)
+<!-- [![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 interface and wrapper for several plotting packages.  My goals with the package are:
+Plots is a plotting API and toolset.  My goals with the package are:
 
-- Simple.  The interface should be intuitive enough that someone coming from Matlab, Python, etc can immediately start generating complex plots without reading volumes of documentation.
-- Automatic (if you want).  There should be smart defaults for the most common functionality, and simple, high-level ways to override complex functionality.
-- Flexible.  You should be able to produce your favorite plot in your favorite package, but quicker and simpler.
-- Consistent.  Don't commit to one graphics package.  One command will switch your backend, and the exact same plotting commands will work with a very different underlying backend.
+- **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.
 
-Check out the [summary graphs](img/supported/supported.md) for the features that each backend supports.
-
 ## Examples for each implemented backend:
 
-- [Qwt.jl](docs/qwt_examples.md)
-- [Gadfly.jl](docs/gadfly_examples.md)
-- [UnicodePlots.jl](docs/unicodeplots_examples.md)
-- [PyPlot.jl](docs/pyplot_examples.md)
-- [Immerse.jl](docs/immerse_examples.md)
-- [Winston.jl](docs/winston_examples.md)
+- [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
 
@@ -41,21 +45,21 @@ Pkg.checkout("Plots")
 Pkg.checkout("Plots", "dev")
 ```
 
-then get any plotting packages you need (obviously, you should get at least one backend):
+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.add("PyPlot")                                    # requires python and matplotlib
-Pkg.clone("https://github.com/tbreloff/Qwt.jl.git")  # requires pyqt and pyqwt
-Pkg.add("Winston")
+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
@@ -73,7 +77,7 @@ 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))
+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")
@@ -81,9 +85,6 @@ png("gadfly1")
 
 ![gadfly_plt](img/gadfly1.png)
 
-See the examples pages for lots of examples of plots, and what those commands produce for each supported backend.  
-Also check out the [IJulia notebooks](examples) and see how it works interactively.
-
 ## API
 
 Call `backend(backend::Symbol)` or the shorthands (`gadfly()`, `qwt()`, `unicodeplots()`, etc) to set the current plotting backend.
@@ -199,7 +200,7 @@ yaxis!(args...)                           = plot!(yaxis = args)
 annotate!(anns)                           = plot!(annotation = anns)
 ```
 
-Some keyword arguments you can set:
+### Keyword arguments:
 
 Keyword | Default | Type | Aliases 
 ---- | ---- | ---- | ----
@@ -210,19 +211,28 @@ Keyword | Default | Type | Aliases
 `: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`  
-`:heatmap_c` | `(0.15,0.5)` | Series | `:heatmap_cs`  
+`: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 |   
@@ -230,9 +240,10 @@ Keyword | Default | Type | Aliases
 `:nc` | `-1` | Plot |   
 `:nr` | `-1` | Plot |   
 `:pos` | `(0,0)` | Plot |   
-`:reg` | `false` | Series | `:regression`, `:regs`  
 `:show` | `false` | Plot | `:display`, `:gui`  
-`:size` | `(600,400)` | Plot | `:windowsize`, `:wsize`  
+`: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 |   
@@ -242,7 +253,7 @@ Keyword | Default | Type | Aliases
 `:xscale` | `identity` | Plot |   
 `:xticks` | `auto` | Plot | `:xtick`  
 `:yaxis` | `nothing` | Plot |   
-`:yflip` | `true` | Plot |   
+`:yflip` | `false` | Plot |   
 `:ylabel` | `` | Plot | `:ylab`  
 `:ylims` | `auto` | Plot | `:ylim`, `:ylimit`, `:ylimits`  
 `:yrightlabel` | `` | Plot | `:y2lab`, `:y2label`, `:ylab2`, `:ylabel2`, `:ylabelright`, `:ylabr`, `:yrlab`  
@@ -251,7 +262,7 @@ Keyword | Default | Type | Aliases
 `:z` | `nothing` | Series | `:zs`  
 
 
-Plot types:
+### Plot types:
 
 Type | Desc | Aliases
 ---- | ---- | ----
@@ -271,7 +282,7 @@ Type | Desc | Aliases
 `:ohlc` | Open/High/Low/Close chart (expects y is AbstractVector{Plots.OHLC}) |   
 
 
-Line styles:
+### Line styles:
 
 Type | Aliases
 ---- | ----
@@ -283,25 +294,31 @@ Type | Aliases
 `:dashdotdot` | `:ddd`  
 
 
-Markers:
+### Markers:
 
 Type | Aliases
 ---- | ----
 `:none` | `:n`, `:no`  
 `:auto` | `:a`  
-`:ellipse` | `:c`, `:circle`  
-`:rect` | `:r`, `:sq`, `:square`  
-`:diamond` | `:d`  
-`:utriangle` | `:^`, `:uptri`, `:uptriangle`, `:ut`, `:utri`  
-`:dtriangle` | `:V`, `:downtri`, `:downtriangle`, `:dt`, `:dtri`, `:v`  
 `:cross` | `:+`, `:plus`  
-`:xcross` | `:X`, `:x`  
-`:star1` | `:s`, `:star`  
-`:star2` | `:s2`  
+`: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)`.
 
@@ -323,7 +340,7 @@ __Tip__: When plotting multiple lines, you can set all series to use the same va
 ```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, :star1]  # (Vector) ALL lines are passed the vector [:rect, :star1]
+                  markershape = [:rect, :star]   # (Vector) ALL lines are passed the vector [:rect, :star1]
                   width = 5)                     # all lines have a width of 5
 ```
 
@@ -331,18 +348,28 @@ __Tip__: Not all features are supported for each backend, but you can see what's
 
 __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?)
-- [ ] Custom markers
-- [ ] Special plots (boxplot, ohlc?)
+- [x] Custom markers
+- [x] Animations
 - [x] Subplots
-- [x] Histograms
+- [ ] Contours
+- [ ] Boxplots
 - [ ] 3D plotting
 - [ ] Scenes/Drawing
 - [ ] Graphs
@@ -355,7 +382,7 @@ __Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on
 - [x] PyPlot.jl
 - [x] UnicodePlots.jl
 - [x] Qwt.jl
-- [x] Winston.jl
+- [x] Winston.jl (deprecated)
 - [ ] GLPlot.jl
 - [ ] Bokeh.jl
 - [ ] Vega.jl

docs/example_generation.jl

@@ -18,95 +18,158 @@ type PlotExample
 end
 
 
-function fakedata(sz...)
-  y = zeros(sz...)
-  for r in 2:size(y,1)
-    y[r,:] = 0.9 * y[r-1,:] + randn(size(y,2))'
-  end
-  y
-end
-
 
 # the examples we'll run for each
 const examples = PlotExample[
   PlotExample("Lines",
               "A simple line plot of the columns.",
-              [:(plot(fakedata(50,5), w=3))]),
-  PlotExample("Functions",
-              "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}.",
-              [:(plot(0:0.01:4π, [sin,cos]))]),
-  PlotExample("",
-              "Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).",
-              [:(plot(sin, x->sin(2x), 0, 2π, line=4, leg=false, fill=(0,:orange)))]),
+              [
+                :(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"))]),
+              [
+                :(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), title="TITLE", xaxis=("XLABEL",(-5,30),0:2:20,:flip), yaxis=("YLABEL",:log10), background_color = RGB(0.2,0.2,0.2), leg=false))]),
+              [
+                :(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"))]),
+              [
+                :(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])))]),
+              [
+                :(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)))]),
+              [
+                :(plot(rand(100)/3, reg=true, fill=(0,:green)))
+              ]),
   PlotExample("",
               "and add to it later.",
-              [:(scatter!(rand(100), markersize=6, c=:orange))]),
+              [
+                :(scatter!(rand(100), markersize=6, c=:orange))
+              ]),
   PlotExample("Heatmaps",
               "",
-              [:(heatmap(randn(10000),randn(10000), nbins=100))]),
+              [
+                :(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))]),
+              [
+                :(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))]),
+              [
+                :(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])'), :(scatter(0.5:9.5, [fill(i-0.5,10) for i=length(markers):-1:1]; marker=:auto, label=map(string,markers), ms=12))]),
+              [
+                :(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)))]),
+              [
+                :(bar(randn(999)))
+              ]),
   PlotExample("Histogram",
               "",
-              [:(histogram(randn(1000), nbins=50))]),
+              [
+                :(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))]),
+              [
+                :(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(fakedata(100,10), n=4, palette=[:grays :blues :heat :lightrainbow], bg=[:orange :pink :darkblue :black]))]),
+              [
+                :(subplot(Plots.fakedata(100,10), n=4, palette=[:grays :blues :heat :lightrainbow], bg=[:orange :pink :darkblue :black]))
+              ]),
   PlotExample("",
               "",
-              [:(subplot!(fakedata(100,10)))]),
+              [
+                :(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))]),
+              [
+                :(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],"this is #3"))),
-                :(annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #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(arr, "`, `$prefix"), "`")
+  string("`", prefix, join(sort(map(string, arr)), "`, `$prefix"), "`")
 end
 createStringOfMarkDownSymbols(arr) = isempty(arr) ? "" : createStringOfMarkDownCodeValues(arr, ":")
 
@@ -125,13 +188,7 @@ function generate_markdown(pkgname::Symbol)
   # open the markdown file
   md = open("$DOCDIR/$(pkgname)_examples.md", "w")
 
-  write(md, "# Examples for backend: $pkgname\n\n")
-  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, "## Examples for backend: $pkgname\n\n")
 
   write(md, "### Initialize\n\n```julia\nusing Plots\n$(pkgname)()\n```\n\n")
 
@@ -146,11 +203,17 @@ function generate_markdown(pkgname::Symbol)
       # run the code
       map(eval, example.exprs)
 
-      # save the png
-      imgname = "$(pkgname)_example_$i.png"
+      # # save the png
+      # imgname = "$(pkgname)_example_$i.png"
 
       # NOTE: uncomment this to overwrite the images as well
-      png("$IMGDIR/$pkgname/$imgname")
+      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")
@@ -166,6 +229,14 @@ function generate_markdown(pkgname::Symbol)
     #
   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
@@ -296,7 +367,7 @@ function buildReadme()
   Plots.dumpSupportGraphs()
 end
 
-default(size=(600,400))
+default(size=(500,300))
 
 # run it!
 # note: generate separately so it's easy to comment out

docs/gadfly_examples.md

@@ -1,239 +0,0 @@
-# Examples for backend: gadfly
-
-- Supported arguments: `annotation`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `group`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `reg`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z`
-- Supported values for axis: `:auto`, `:left`
-- Supported values for linetype: `:none`, `:line`, `:path`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`, `:ohlc`
-- Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`, `:dashdotdot`
-- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon`, `:octagon`
-- Is `subplot`/`subplot!` supported? Yes
-
-### Initialize
-
-```julia
-using Plots
-gadfly()
-```
-
-### Lines
-
-A simple line plot of the columns.
-
-```julia
-plot(fakedata(50,5),w=3)
-```
-
-![](../img/gadfly/gadfly_example_1.png)
-
-### Functions
-
-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}.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/gadfly/gadfly_example_2.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 40:
-            sin(2x)
-        end),0,2π,line=4,leg=false,fill=(0,:orange))
-```
-
-![](../img/gadfly/gadfly_example_3.png)
-
-### 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.
-
-```julia
-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 - 0.5),m=(10,:heat),lab="grad")
-```
-
-![](../img/gadfly/gadfly_example_4.png)
-
-### 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!`
-
-```julia
-plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
-```
-
-![](../img/gadfly/gadfly_example_5.png)
-
-### Two-axis
-
-Use the `axis` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/gadfly/gadfly_example_6.png)
-
-### 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.
-
-```julia
-plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
-```
-
-![](../img/gadfly/gadfly_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3,reg=true,fill=(0,:green))
-```
-
-![](../img/gadfly/gadfly_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100),markersize=6,c=:orange)
-```
-
-![](../img/gadfly/gadfly_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000),nbins=100)
-```
-
-![](../img/gadfly/gadfly_example_10.png)
-
-### Line types
-
-
-
-```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
-n = length(types)
-x = Vector[sort(rand(20)) for i = 1:n]
-y = rand(20,n)
-plot(x,y,line=(types,3),lab=map(string,types),ms=15)
-```
-
-![](../img/gadfly/gadfly_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])'
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/gadfly/gadfly_example_12.png)
-
-### Marker types
-
-
-
-```julia
-markers = setdiff(supportedMarkers(),[:none,:auto])'
-scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,label=map(string,markers),ms=12)
-```
-
-![](../img/gadfly/gadfly_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(999))
-```
-
-![](../img/gadfly/gadfly_example_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000),nbins=50)
-```
-
-![](../img/gadfly/gadfly_example_15.png)
-
-### 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`.
-
-
-```julia
-subplot(randn(100,5),layout=[1,1,3],t=[:line :hist :scatter :step :bar],nbins=10,leg=false)
-```
-
-![](../img/gadfly/gadfly_example_16.png)
-
-### Adding to subplots
-
-Note here the automatic grid layout, as well as the order in which new series are added to the plots.
-
-```julia
-subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
-```
-
-![](../img/gadfly/gadfly_example_17.png)
-
-### 
-
-
-
-```julia
-subplot!(fakedata(100,10))
-```
-
-![](../img/gadfly/gadfly_example_18.png)
-
-### 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`.
-
-```julia
-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 = 1:n]
-ohlc(y; markersize=8)
-```
-
-![](../img/gadfly/gadfly_example_19.png)
-
-### 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)`
-
-```julia
-y = rand(10)
-plot(y,ann=(3,y[3],"this is #3"))
-annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
-```
-
-![](../img/gadfly/gadfly_example_20.png)
-

docs/immerse_examples.md

@@ -1,239 +0,0 @@
-# Examples for backend: immerse
-
-- Supported arguments: `annotation`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `group`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `reg`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z`
-- Supported values for axis: `:auto`, `:left`
-- Supported values for linetype: `:none`, `:line`, `:path`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`, `:ohlc`
-- Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`, `:dashdotdot`
-- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon`, `:octagon`
-- Is `subplot`/`subplot!` supported? Yes
-
-### Initialize
-
-```julia
-using Plots
-immerse()
-```
-
-### Lines
-
-A simple line plot of the columns.
-
-```julia
-plot(fakedata(50,5),w=3)
-```
-
-![](../img/immerse/immerse_example_1.png)
-
-### Functions
-
-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}.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/immerse/immerse_example_2.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 40:
-            sin(2x)
-        end),0,2π,line=4,leg=false,fill=(0,:orange))
-```
-
-![](../img/immerse/immerse_example_3.png)
-
-### 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.
-
-```julia
-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 - 0.5),m=(10,:heat),lab="grad")
-```
-
-![](../img/immerse/immerse_example_4.png)
-
-### 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!`
-
-```julia
-plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
-```
-
-![](../img/immerse/immerse_example_5.png)
-
-### Two-axis
-
-Use the `axis` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/immerse/immerse_example_6.png)
-
-### 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.
-
-```julia
-plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
-```
-
-![](../img/immerse/immerse_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3,reg=true,fill=(0,:green))
-```
-
-![](../img/immerse/immerse_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100),markersize=6,c=:orange)
-```
-
-![](../img/immerse/immerse_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000),nbins=100)
-```
-
-![](../img/immerse/immerse_example_10.png)
-
-### Line types
-
-
-
-```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
-n = length(types)
-x = Vector[sort(rand(20)) for i = 1:n]
-y = rand(20,n)
-plot(x,y,line=(types,3),lab=map(string,types),ms=15)
-```
-
-![](../img/immerse/immerse_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])'
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/immerse/immerse_example_12.png)
-
-### Marker types
-
-
-
-```julia
-markers = setdiff(supportedMarkers(),[:none,:auto])'
-scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,label=map(string,markers),ms=12)
-```
-
-![](../img/immerse/immerse_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(999))
-```
-
-![](../img/immerse/immerse_example_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000),nbins=50)
-```
-
-![](../img/immerse/immerse_example_15.png)
-
-### 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`.
-
-
-```julia
-subplot(randn(100,5),layout=[1,1,3],t=[:line :hist :scatter :step :bar],nbins=10,leg=false)
-```
-
-![](../img/immerse/immerse_example_16.png)
-
-### Adding to subplots
-
-Note here the automatic grid layout, as well as the order in which new series are added to the plots.
-
-```julia
-subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
-```
-
-![](../img/immerse/immerse_example_17.png)
-
-### 
-
-
-
-```julia
-subplot!(fakedata(100,10))
-```
-
-![](../img/immerse/immerse_example_18.png)
-
-### 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`.
-
-```julia
-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 = 1:n]
-ohlc(y; markersize=8)
-```
-
-![](../img/immerse/immerse_example_19.png)
-
-### 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)`
-
-```julia
-y = rand(10)
-plot(y,ann=(3,y[3],"this is #3"))
-annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
-```
-
-![](../img/immerse/immerse_example_20.png)
-

docs/pyplot_examples.md

@@ -1,190 +0,0 @@
-# Examples for backend: pyplot
-
-- Supported arguments: `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`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yrightlabel`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z`
-- Supported values for axis: `:auto`, `:left`, `:right`
-- Supported values for linetype: `:none`, `:line`, `:path`, `:step`, `:stepinverted`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`
-- Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`
-- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:hexagon`
-- Is `subplot`/`subplot!` supported? No
-
-### Initialize
-
-```julia
-using Plots
-pyplot()
-```
-
-### Lines
-
-A simple line plot of the columns.
-
-```julia
-plot(fakedata(50,5),w=3)
-```
-
-![](../img/pyplot/pyplot_example_1.png)
-
-### Functions
-
-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}.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/pyplot/pyplot_example_2.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 40:
-            sin(2x)
-        end),0,2π,line=4,leg=false,fill=(0,:orange))
-```
-
-![](../img/pyplot/pyplot_example_3.png)
-
-### 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.
-
-```julia
-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 - 0.5),m=(10,:heat),lab="grad")
-```
-
-![](../img/pyplot/pyplot_example_4.png)
-
-### 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!`
-
-```julia
-plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
-```
-
-![](../img/pyplot/pyplot_example_5.png)
-
-### Two-axis
-
-Use the `axis` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/pyplot/pyplot_example_6.png)
-
-### 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.
-
-```julia
-plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
-```
-
-![](../img/pyplot/pyplot_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3,reg=true,fill=(0,:green))
-```
-
-![](../img/pyplot/pyplot_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100),markersize=6,c=:orange)
-```
-
-![](../img/pyplot/pyplot_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000),nbins=100)
-```
-
-![](../img/pyplot/pyplot_example_10.png)
-
-### Line types
-
-
-
-```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
-n = length(types)
-x = Vector[sort(rand(20)) for i = 1:n]
-y = rand(20,n)
-plot(x,y,line=(types,3),lab=map(string,types),ms=15)
-```
-
-![](../img/pyplot/pyplot_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])'
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/pyplot/pyplot_example_12.png)
-
-### Marker types
-
-
-
-```julia
-markers = setdiff(supportedMarkers(),[:none,:auto])'
-scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,label=map(string,markers),ms=12)
-```
-
-![](../img/pyplot/pyplot_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(999))
-```
-
-![](../img/pyplot/pyplot_example_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000),nbins=50)
-```
-
-![](../img/pyplot/pyplot_example_15.png)
-
-### 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)`
-
-```julia
-y = rand(10)
-plot(y,ann=(3,y[3],"this is #3"))
-annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
-```
-
-![](../img/pyplot/pyplot_example_20.png)
-

docs/qwt_examples.md

@@ -1,223 +0,0 @@
-# Examples for backend: qwt
-
-- Supported arguments: `annotation`, `axis`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `foreground_color`, `group`, `heatmap_c`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `pos`, `reg`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yrightlabel`, `yticks`, `xscale`, `yscale`
-- Supported values for axis: `:auto`, `:left`, `:right`
-- Supported values for linetype: `:none`, `:line`, `:path`, `:steppre`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`
-- Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`, `:dashdotdot`
-- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon`
-- Is `subplot`/`subplot!` supported? Yes
-
-### Initialize
-
-```julia
-using Plots
-qwt()
-```
-
-### Lines
-
-A simple line plot of the columns.
-
-```julia
-plot(fakedata(50,5),w=3)
-```
-
-![](../img/qwt/qwt_example_1.png)
-
-### Functions
-
-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}.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/qwt/qwt_example_2.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 40:
-            sin(2x)
-        end),0,2π,line=4,leg=false,fill=(0,:orange))
-```
-
-![](../img/qwt/qwt_example_3.png)
-
-### 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.
-
-```julia
-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 - 0.5),m=(10,:heat),lab="grad")
-```
-
-![](../img/qwt/qwt_example_4.png)
-
-### 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!`
-
-```julia
-plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
-```
-
-![](../img/qwt/qwt_example_5.png)
-
-### Two-axis
-
-Use the `axis` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/qwt/qwt_example_6.png)
-
-### 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.
-
-```julia
-plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
-```
-
-![](../img/qwt/qwt_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3,reg=true,fill=(0,:green))
-```
-
-![](../img/qwt/qwt_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100),markersize=6,c=:orange)
-```
-
-![](../img/qwt/qwt_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000),nbins=100)
-```
-
-![](../img/qwt/qwt_example_10.png)
-
-### Line types
-
-
-
-```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
-n = length(types)
-x = Vector[sort(rand(20)) for i = 1:n]
-y = rand(20,n)
-plot(x,y,line=(types,3),lab=map(string,types),ms=15)
-```
-
-![](../img/qwt/qwt_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])'
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/qwt/qwt_example_12.png)
-
-### Marker types
-
-
-
-```julia
-markers = setdiff(supportedMarkers(),[:none,:auto])'
-scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,label=map(string,markers),ms=12)
-```
-
-![](../img/qwt/qwt_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(999))
-```
-
-![](../img/qwt/qwt_example_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000),nbins=50)
-```
-
-![](../img/qwt/qwt_example_15.png)
-
-### 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`.
-
-
-```julia
-subplot(randn(100,5),layout=[1,1,3],t=[:line :hist :scatter :step :bar],nbins=10,leg=false)
-```
-
-![](../img/qwt/qwt_example_16.png)
-
-### Adding to subplots
-
-Note here the automatic grid layout, as well as the order in which new series are added to the plots.
-
-```julia
-subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
-```
-
-![](../img/qwt/qwt_example_17.png)
-
-### 
-
-
-
-```julia
-subplot!(fakedata(100,10))
-```
-
-![](../img/qwt/qwt_example_18.png)
-
-### 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)`
-
-```julia
-y = rand(10)
-plot(y,ann=(3,y[3],"this is #3"))
-annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
-```
-
-![](../img/qwt/qwt_example_20.png)
-

docs/readme_template.md

@@ -3,29 +3,33 @@
 [![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)
-[![Plots](http://pkg.julialang.org/badges/Plots_0.5.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.5)
+<!-- [![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 interface and wrapper for several plotting packages.  My goals with the package are:
+Plots is a plotting API and toolset.  My goals with the package are:
 
-- Simple.  The interface should be intuitive enough that someone coming from Matlab, Python, etc can immediately start generating complex plots without reading volumes of documentation.
-- Automatic (if you want).  There should be smart defaults for the most common functionality, and simple, high-level ways to override complex functionality.
-- Flexible.  You should be able to produce your favorite plot in your favorite package, but quicker and simpler.
-- Consistent.  Don't commit to one graphics package.  One command will switch your backend, and the exact same plotting commands will work with a very different underlying backend.
+- **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.
 
-Check out the [summary graphs](img/supported/supported.md) for the features that each backend supports.
-
 ## Examples for each implemented backend:
 
-- [Qwt.jl](docs/qwt_examples.md)
-- [Gadfly.jl](docs/gadfly_examples.md)
-- [UnicodePlots.jl](docs/unicodeplots_examples.md)
-- [PyPlot.jl](docs/pyplot_examples.md)
-- [Immerse.jl](docs/immerse_examples.md)
-- [Winston.jl](docs/winston_examples.md)
+- [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
 
@@ -41,21 +45,21 @@ Pkg.checkout("Plots")
 Pkg.checkout("Plots", "dev")
 ```
 
-then get any plotting packages you need (obviously, you should get at least one backend):
+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.add("PyPlot")                                    # requires python and matplotlib
-Pkg.clone("https://github.com/tbreloff/Qwt.jl.git")  # requires pyqt and pyqwt
-Pkg.add("Winston")
+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
@@ -73,7 +77,7 @@ 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))
+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")
@@ -81,9 +85,6 @@ png("gadfly1")
 
 ![gadfly_plt](img/gadfly1.png)
 
-See the examples pages for lots of examples of plots, and what those commands produce for each supported backend.  
-Also check out the [IJulia notebooks](examples) and see how it works interactively.
-
 ## API
 
 Call `backend(backend::Symbol)` or the shorthands (`gadfly()`, `qwt()`, `unicodeplots()`, etc) to set the current plotting backend.
@@ -199,22 +200,23 @@ yaxis!(args...)                           = plot!(yaxis = args)
 annotate!(anns)                           = plot!(annotation = anns)
 ```
 
-Some keyword arguments you can set:
+### Keyword arguments:
 
 [[KEYWORD_ARGS_TABLE]]
 
-Plot types:
+### Plot types:
 
 [[LINETYPES_TABLE]]
 
-Line styles:
+### Line styles:
 
 [[LINESTYLES_TABLE]]
 
-Markers:
+### 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)`.
 
@@ -236,7 +238,7 @@ __Tip__: When plotting multiple lines, you can set all series to use the same va
 ```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, :star1]  # (Vector) ALL lines are passed the vector [:rect, :star1]
+                  markershape = [:rect, :star]   # (Vector) ALL lines are passed the vector [:rect, :star1]
                   width = 5)                     # all lines have a width of 5
 ```
 
@@ -244,18 +246,28 @@ __Tip__: Not all features are supported for each backend, but you can see what's
 
 __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?)
-- [ ] Custom markers
-- [ ] Special plots (boxplot, ohlc?)
+- [x] Custom markers
+- [x] Animations
 - [x] Subplots
-- [x] Histograms
+- [ ] Contours
+- [ ] Boxplots
 - [ ] 3D plotting
 - [ ] Scenes/Drawing
 - [ ] Graphs
@@ -268,7 +280,7 @@ __Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on
 - [x] PyPlot.jl
 - [x] UnicodePlots.jl
 - [x] Qwt.jl
-- [x] Winston.jl
+- [x] Winston.jl (deprecated)
 - [ ] GLPlot.jl
 - [ ] Bokeh.jl
 - [ ] Vega.jl

docs/unicodeplots_examples.md

@@ -1,211 +0,0 @@
-# Examples for backend: unicodeplots
-
-- Supported arguments: `args`, `axis`, `color`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `ylabel`, `yrightlabel`
-- Supported values for axis: `:auto`, `:left`
-- Supported values for linetype: `:none`, `:line`, `:step`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`
-- Supported values for linestyle: `:auto`, `:solid`
-- Supported values for marker: `:none`, `:auto`, `:ellipse`
-- Is `subplot`/`subplot!` supported? Yes
-
-### Initialize
-
-```julia
-using Plots
-unicodeplots()
-```
-
-### Lines
-
-A simple line plot of the 3 columns.
-
-```julia
-plot(rand(100,3))
-```
-
-![](../img/unicodeplots/unicodeplots_example_1.png)
-
-### Functions
-
-Plot multiple functions.  You can also put the function first.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/unicodeplots/unicodeplots_example_2.png)
-
-### 
-
-You can also call it with plot(f, xmin, xmax).
-
-```julia
-plot([sin,cos],0,4π)
-```
-
-![](../img/unicodeplots/unicodeplots_example_3.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
-            sin(2x)
-        end),0,2π)
-```
-
-![](../img/unicodeplots/unicodeplots_example_4.png)
-
-### Global
-
-Change the guides/background without a separate call.
-
-```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.5,0.5,0.5))
-```
-
-![](../img/unicodeplots/unicodeplots_example_5.png)
-
-### Two-axis
-
-Use the `axis` or `axiss` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/unicodeplots/unicodeplots_example_6.png)
-
-### Vectors w/ pluralized args
-
-Plot multiple series with different numbers of points.  Mix arguments that apply to all series (singular... see `marker`) with arguments unique to each series (pluralized... see `colors`).
-
-```julia
-plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue])
-```
-
-![](../img/unicodeplots/unicodeplots_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3; reg=true,fillto=0)
-```
-
-![](../img/unicodeplots/unicodeplots_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100); markersize=6,color=:blue)
-```
-
-![](../img/unicodeplots/unicodeplots_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000); nbins=100)
-```
-
-![](../img/unicodeplots/unicodeplots_example_10.png)
-
-### Suported line types
-
-All options: (:line, :orderedline, :step, :stepinverted, :sticks, :scatter, :none, :heatmap, :hexbin, :hist, :bar)
-
-```julia
-types = intersect(supportedTypes(),[:line,:step,:stepinverted,:sticks,:scatter])
-n = length(types)
-x = Vector[sort(rand(20)) for i = 1:n]
-y = rand(20,n)
-plot(x,y; linetypes=types,labels=map(string,types))
-```
-
-![](../img/unicodeplots/unicodeplots_example_11.png)
-
-### Supported line styles
-
-All options: (:solid, :dash, :dot, :dashdot, :dashdotdot)
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])
-plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
-```
-
-![](../img/unicodeplots/unicodeplots_example_12.png)
-
-### Supported marker types
-
-All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)
-
-```julia
-markers = setdiff(supportedMarkers(),[:none,:auto])
-plot([fill(i,10) for i = 1:length(markers)]; marker=:auto,labels=map(string,markers),markersize=10)
-```
-
-![](../img/unicodeplots/unicodeplots_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(1000))
-```
-
-![](../img/unicodeplots/unicodeplots_example_14.png)
-
-### Histogram
-
-note: fillto isn't supported on all backends
-
-```julia
-histogram(randn(1000); nbins=50,fillto=20)
-```
-
-![](../img/unicodeplots/unicodeplots_example_15.png)
-
-### 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`.  
-
-  Note: Gadfly is not very friendly here, and although you can create a plot and save a PNG, I haven't been able to actually display it.
-
-
-```julia
-subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar],nbins=10,legend=false)
-```
-
-![](../img/unicodeplots/unicodeplots_example_16.png)
-
-### Adding to subplots
-
-Note here the automatic grid layout, as well as the order in which new series are added to the plots.
-
-```julia
-subplot(randn(100,5); n=4)
-```
-
-![](../img/unicodeplots/unicodeplots_example_17.png)
-
-### 
-
-
-
-```julia
-subplot!(randn(100,3))
-```
-
-![](../img/unicodeplots/unicodeplots_example_18.png)
-

docs/winston_examples.md

@@ -1,180 +0,0 @@
-# Examples for backend: winston
-
-- Supported arguments: `annotation`, `color`, `color_palette`, `fillrange`, `fillcolor`, `group`, `label`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `nbins`, `reg`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `y`, `ylabel`, `ylims`, `xscale`, `yscale`
-- Supported values for axis: `:auto`, `:left`
-- Supported values for linetype: `:none`, `:line`, `:path`, `:sticks`, `:scatter`, `:hist`, `:bar`
-- Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`
-- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`
-- Is `subplot`/`subplot!` supported? No
-
-### Initialize
-
-```julia
-using Plots
-winston()
-```
-
-### Lines
-
-A simple line plot of the columns.
-
-```julia
-plot(fakedata(50,5),w=3)
-```
-
-![](../img/winston/winston_example_1.png)
-
-### Functions
-
-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}.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/winston/winston_example_2.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 39:
-            sin(2x)
-        end),0,2π,line=4,leg=false,fill=(0,:orange))
-```
-
-![](../img/winston/winston_example_3.png)
-
-### 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.
-
-```julia
-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 - 0.5),m=(10,:heat),lab="grad")
-```
-
-![](../img/winston/winston_example_4.png)
-
-### 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!`
-
-```julia
-plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
-```
-
-![](../img/winston/winston_example_5.png)
-
-### Two-axis
-
-Use the `axis` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/winston/winston_example_6.png)
-
-### 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.
-
-```julia
-plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
-```
-
-![](../img/winston/winston_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3,reg=true,fill=(0,:green))
-```
-
-![](../img/winston/winston_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100),markersize=6,c=:orange)
-```
-
-![](../img/winston/winston_example_9.png)
-
-### Line types
-
-
-
-```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
-n = length(types)
-x = Vector[sort(rand(20)) for i = 1:n]
-y = rand(20,n)
-plot(x,y,line=(types,3),lab=map(string,types),ms=15)
-```
-
-![](../img/winston/winston_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])'
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/winston/winston_example_12.png)
-
-### Marker types
-
-
-
-```julia
-markers = setdiff(supportedMarkers(),[:none,:auto])'
-scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,label=map(string,markers),ms=12)
-```
-
-![](../img/winston/winston_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(999))
-```
-
-![](../img/winston/winston_example_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000),nbins=50)
-```
-
-![](../img/winston/winston_example_15.png)
-
-### 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)`
-
-```julia
-y = rand(10)
-plot(y,ann=(3,y[3],"this is #3"))
-annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
-```
-
-![](../img/winston/winston_example_20.png)
-