fixed subplot bug

README.md

@@ -15,6 +15,7 @@ Please add wishlist items, bugs, or any other comments/questions to the issues l
 - [UnicodePlots.jl](docs/unicodeplots_examples.md)
 - [PyPlot.jl](docs/pyplot_examples.md)
 - [Immerse.jl](docs/immerse_examples.md)
+- [Winston.jl](docs/winston_examples.md)
 
 ## Installation
 
@@ -32,6 +33,7 @@ Pkg.add("Immerse")
 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")
 ```
 
 ## Use
@@ -152,14 +154,16 @@ __Tip__: Calling `subplot!` on a `Plot` object, or `plot!` on a `Subplot` object
 Shorthands:
 
 ```julia
-scatter(args...; kw...)    = plot(args...; kw...,  linetype = :none, marker = :hexagon)
-scatter!(args...; kw...)   = plot!(args...; kw..., linetype = :none, marker = :hexagon)
+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)
 ```
 
 Some keyword arguments you can set:
@@ -170,7 +174,7 @@ 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, :dots, :none, :heatmap, :hexbin, :hist, :bar
+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
@@ -253,7 +257,7 @@ plot(rand(100,2); colors = [:red, RGB(.5,.5,0)],
 - [x] PyPlot.jl
 - [x] UnicodePlots.jl
 - [x] Qwt.jl
-- [ ] Winston.jl
+- [x] Winston.jl
 - [ ] GLPlot.jl
 - [ ] Bokeh.jl
 - [ ] Vega.jl

REQUIRE

@@ -1,4 +1,3 @@
 julia 0.4-
 
 Colors
-FactCheck

docs/example_generation.jl

@@ -11,8 +11,8 @@ doc"""
 Holds all data needed for a documentation example... header, description, and plotting expression (Expr)
 """
 type PlotExample
-  header::String
-  desc::String
+  header::AbstractString
+  desc::AbstractString
   exprs::Vector{Expr}
 end
 
@@ -23,19 +23,19 @@ const examples = PlotExample[
               "A simple line plot of the 3 columns.",
               [:(plot(rand(100,3)))]),
   PlotExample("Functions",
-              "Plot multiple functions.",
+              "Plot multiple functions.  You can also put the function first.",
               [:(plot(0:0.01:4π, [sin,cos]))]),
   PlotExample("",
               "You can also call it with plot(f, xmin, xmax).",
               [:(plot([sin,cos], 0, 4π))]),
   PlotExample("",
-              "Or make a parametric plot with plot(fx, fy, umin, umax).",
-              [:(plot(sin, x->sin(2x), 0, 2π))]),
+              "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π, legend=false))]),
   PlotExample("Global",
               "Change the guides/background without a separate call.",
               [:(plot(rand(10); title="TITLE", xlabel="XLABEL", ylabel="YLABEL", background_color = RGB(0.5,0.5,0.5)))]),
   PlotExample("Two-axis",
-              "Use the `axis` or `axiss` arguments.\n\nNote: This is only supported with Qwt right now",
+              "Use the `axis` or `axiss` arguments.\n\nNote: Currently only supported with Qwt and PyPlot",
               [:(plot(Vector[randn(100), randn(100)*100]; axiss = [:left,:right], ylabel="LEFT", yrightlabel="RIGHT"))]),
   PlotExample("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`).",
@@ -49,17 +49,19 @@ const examples = PlotExample[
   PlotExample("Heatmaps",
               "",
               [:(heatmap(randn(10000),randn(10000); nbins=100))]),
-  PlotExample("Lots of line types",
-              "Options: (:line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar)  \nNote: some may not work with all backends",
-              [:(plot(rand(20,4); linetypes=[:line, :step, :sticks, :dots], labels=["line","step","sticks","dots"]))]),
-  PlotExample("Lots of line styles",
-              "Options: (:solid, :dash, :dot, :dashdot, :dashdotdot)  \nNote: some may not work with all backends",
-              [:(plot(rand(20,5); linestyles=[:solid, :dash, :dot, :dashdot, :dashdotdot], labels=["solid", "dash", "dot", "dashdot", "dashdotdot"]))]),
-  PlotExample("Lots of marker types",
-              "Options: (:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)  \nNote: some may not work with all backends",
-              [:(plot(repmat(collect(1:10)',10,1); markers=[:ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon],
-                                         labels=["ellipse", "rect", "diamond", "utriangle", "dtriangle", "cross", "xcross", "star1", "star2", "hexagon"],
-                                         markersize=10))]),
+  PlotExample("Line types",
+              "",
+              [:(types = intersect(supportedTypes(), [:line, :step, :stepinverted, :sticks, :scatter])),
+                  :(n = length(types)),
+                  :(x = Vector[sort(rand(20)) for i in 1:n]),
+                  :(y = rand(20,n)),
+                  :(plot(x, y; linetypes=types, labels=map(string,types)))]),
+  PlotExample("Line styles",
+              "",
+              [:(styles = setdiff(supportedStyles(), [:auto])), :(plot(cumsum(randn(20,length(styles)),1); linestyle=:auto, labels=map(string,styles), width=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, labels=map(string,markers), markersize=10))]),
   PlotExample("Bar",
               "x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)",
               [:(bar(randn(1000)))]),
@@ -74,22 +76,31 @@ const examples = PlotExample[
 
                 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.
               """,
-              [:(subplot(randn(100,5); layout=[1,1,3], linetypes=[:line,:hist,:dots,:step,:bar], nbins=10, legend=false))]),
+              [:(subplot(randn(100,5); layout=[1,1,3], linetypes=[:line,:hist,:scatter,:step,:bar], nbins=10, legend=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(randn(100,5); n=4))]),
   PlotExample("",
               "",
               [:(subplot!(randn(100,3)))]),
+  PlotExample("Open/High/Low/Close",
+              "Create an OHLC chart.  Pass in a vector of 4-tuples 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 = [(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))]),
 
   
 ]
 
 
+function createStringOfMarkDownCodeValues(arr, prefix = "")
+  string("`", prefix, join(arr, "`, `$prefix"), "`")
+end
+createStringOfMarkDownSymbols(arr) = createStringOfMarkDownCodeValues(arr, ":")
+
+
 function generate_markdown(pkgname::Symbol)
 
   # set up the plotter, and don't show the plots by default
-  plotter!(pkgname)
+  pkg = plotter!(pkgname)
   # plotDefault!(:show, false)
 
   # mkdir if necessary
@@ -100,6 +111,17 @@ 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, "### Initialize\n\n```julia\nusing Plots\n$(pkgname)!()\n```\n\n")
+
+
   for (i,example) in enumerate(examples)
 
     try
@@ -109,7 +131,9 @@ function generate_markdown(pkgname::Symbol)
 
       # save the png
       imgname = "$(pkgname)_example_$i.png"
-      savepng("$IMGDIR/$pkgname/$imgname")
+
+      # NOTE: uncomment this to overwrite the images as well
+      # savepng("$IMGDIR/$pkgname/$imgname")
 
       # write out the header, description, code block, and image link
       write(md, "### $(example.header)\n\n")
@@ -129,13 +153,45 @@ function generate_markdown(pkgname::Symbol)
 
 end
 
+
+# make and display one plot
+function test_example(pkgname::Symbol, idx::Int)
+  println("Testing plot: $pkgname:$idx:$(examples[idx].header)")
+  plotter!(pkgname)
+  plotter()
+  map(eval, examples[idx].exprs)
+  plt = currentPlot()
+  display(plt)
+  plt
+end
+
+# generate all plots and create a dict mapping idx --> plt
+function test_all_examples(pkgname::Symbol)
+  plts = Dict()
+  for i in 1:length(examples)
+    if examples[i].header == "Subplots" && !subplotSupported()
+      break
+    end
+
+    try
+      plt = test_example(pkgname, i)
+      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
+
 # run it!
 # note: generate separately so it's easy to comment out
-# generate_markdown(:qwt)
-generate_markdown(:gadfly)
 # @osx_only generate_markdown(:unicodeplots)
+# generate_markdown(:qwt)
+# generate_markdown(:gadfly)
 # generate_markdown(:pyplot)
-generate_markdown(:immerse)
+# generate_markdown(:immerse)
+# generate_markdown(:winston)
 
 
 end # module

docs/gadfly_examples.md

@@ -1,3 +1,19 @@
+# Examples for backend: gadfly
+
+- Supported arguments: `args`, `axis`, `color`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `reg`, `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`, `:hline`, `:vline`, `:ohlc`
+- Supported values for linestyle: `:auto`, `:solid`
+- 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
+gadfly!()
+```
+
 ### Lines
 
 A simple line plot of the 3 columns.
@@ -10,7 +26,7 @@ plot(rand(100,3))
 
 ### Functions
 
-Plot multiple functions.
+Plot multiple functions.  You can also put the function first.
 
 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -30,12 +46,12 @@ plot([sin,cos],0,4π)
 
 ### 
 
-Or make a parametric plot with plot(fx, fy, umin, umax).
+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π)
+        end),0,2π,legend=false)
 ```
 
 ![](../img/gadfly/gadfly_example_4.png)
@@ -54,7 +70,7 @@ plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RG
 
 Use the `axis` or `axiss` arguments.
 
-Note: This is only supported with Qwt right now
+Note: Currently only supported with Qwt and PyPlot
 
 ```julia
 plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right],ylabel="LEFT",yrightlabel="RIGHT")
@@ -102,35 +118,38 @@ heatmap(randn(10000),randn(10000); nbins=100)
 
 ![](../img/gadfly/gadfly_example_10.png)
 
-### Lots of line types
+### Line types
+
 
-Options: (:line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar)  
-Note: some may not work with all backends
 
 ```julia
-plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots],labels=["line","step","sticks","dots"])
+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/gadfly/gadfly_example_11.png)
 
-### Lots of line styles
+### Line styles
+
 
-Options: (:solid, :dash, :dot, :dashdot, :dashdotdot)  
-Note: some may not work with all backends
 
 ```julia
-plot(rand(20,5); linestyles=[:solid,:dash,:dot,:dashdot,:dashdotdot],labels=["solid","dash","dot","dashdot","dashdotdot"])
+styles = setdiff(supportedStyles(),[:auto])
+plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 ```
 
 ![](../img/gadfly/gadfly_example_12.png)
 
-### Lots of marker types
+### Marker types
+
 
-Options: (:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)  
-Note: some may not work with all backends
 
 ```julia
-plot(repmat(collect(1:10)',10,1); markers=[:ellipse,:rect,:diamond,:utriangle,:dtriangle,:cross,:xcross,:star1,:star2,:hexagon],labels=["ellipse","rect","diamond","utriangle","dtriangle","cross","xcross","star1","star2","hexagon"],markersize=10)
+markers = setdiff(supportedMarkers(),[:none,:auto])
+scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
 ```
 
 ![](../img/gadfly/gadfly_example_13.png)
@@ -165,7 +184,7 @@ histogram(randn(1000); nbins=50,fillto=20)
 
 
 ```julia
-subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:dots,:step,:bar],nbins=10,legend=false)
+subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar],nbins=10,legend=false)
 ```
 
 ![](../img/gadfly/gadfly_example_16.png)
@@ -190,3 +209,19 @@ subplot!(randn(100,3))
 
 ![](../img/gadfly/gadfly_example_18.png)
 
+### Open/High/Low/Close
+
+Create an OHLC chart.  Pass in a vector of 4-tuples 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 = [(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)
+

docs/immerse_examples.md

@@ -1,3 +1,19 @@
+# Examples for backend: immerse
+
+- Supported arguments: `args`, `axis`, `color`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `reg`, `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`, `:hline`, `:vline`, `:ohlc`
+- Supported values for linestyle: `:auto`, `:solid`
+- 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
+immerse!()
+```
+
 ### Lines
 
 A simple line plot of the 3 columns.
@@ -10,7 +26,7 @@ plot(rand(100,3))
 
 ### Functions
 
-Plot multiple functions.
+Plot multiple functions.  You can also put the function first.
 
 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -30,12 +46,12 @@ plot([sin,cos],0,4π)
 
 ### 
 
-Or make a parametric plot with plot(fx, fy, umin, umax).
+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π)
+        end),0,2π,legend=false)
 ```
 
 ![](../img/immerse/immerse_example_4.png)
@@ -54,7 +70,7 @@ plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RG
 
 Use the `axis` or `axiss` arguments.
 
-Note: This is only supported with Qwt right now
+Note: Currently only supported with Qwt and PyPlot
 
 ```julia
 plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right],ylabel="LEFT",yrightlabel="RIGHT")
@@ -102,35 +118,38 @@ heatmap(randn(10000),randn(10000); nbins=100)
 
 ![](../img/immerse/immerse_example_10.png)
 
-### Lots of line types
+### Line types
+
 
-Options: (:line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar)  
-Note: some may not work with all backends
 
 ```julia
-plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots],labels=["line","step","sticks","dots"])
+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/immerse/immerse_example_11.png)
 
-### Lots of line styles
+### Line styles
+
 
-Options: (:solid, :dash, :dot, :dashdot, :dashdotdot)  
-Note: some may not work with all backends
 
 ```julia
-plot(rand(20,5); linestyles=[:solid,:dash,:dot,:dashdot,:dashdotdot],labels=["solid","dash","dot","dashdot","dashdotdot"])
+styles = setdiff(supportedStyles(),[:auto])
+plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 ```
 
 ![](../img/immerse/immerse_example_12.png)
 
-### Lots of marker types
+### Marker types
+
 
-Options: (:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)  
-Note: some may not work with all backends
 
 ```julia
-plot(repmat(collect(1:10)',10,1); markers=[:ellipse,:rect,:diamond,:utriangle,:dtriangle,:cross,:xcross,:star1,:star2,:hexagon],labels=["ellipse","rect","diamond","utriangle","dtriangle","cross","xcross","star1","star2","hexagon"],markersize=10)
+markers = setdiff(supportedMarkers(),[:none,:auto])
+scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
 ```
 
 ![](../img/immerse/immerse_example_13.png)
@@ -165,7 +184,7 @@ histogram(randn(1000); nbins=50,fillto=20)
 
 
 ```julia
-subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:dots,:step,:bar],nbins=10,legend=false)
+subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar],nbins=10,legend=false)
 ```
 
 ![](../img/immerse/immerse_example_16.png)
@@ -190,3 +209,19 @@ subplot!(randn(100,3))
 
 ![](../img/immerse/immerse_example_18.png)
 
+### Open/High/Low/Close
+
+Create an OHLC chart.  Pass in a vector of 4-tuples 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 = [(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)
+

docs/pyplot_examples.md

@@ -1,3 +1,19 @@
+# Examples for backend: pyplot
+
+- 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`, `:right`
+- Supported values for linetype: `:none`, `:line`, `:step`, `:stepinverted`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `: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`, `:hexagon`
+- Is `subplot`/`subplot!` supported? No
+
+### Initialize
+
+```julia
+using Plots
+pyplot!()
+```
+
 ### Lines
 
 A simple line plot of the 3 columns.
@@ -10,7 +26,7 @@ plot(rand(100,3))
 
 ### Functions
 
-Plot multiple functions.
+Plot multiple functions.  You can also put the function first.
 
 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -30,12 +46,12 @@ plot([sin,cos],0,4π)
 
 ### 
 
-Or make a parametric plot with plot(fx, fy, umin, umax).
+Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
 
 ```julia
-plot(sin,(x->begin  # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
             sin(2x)
-        end),0,2π)
+        end),0,2π,legend=false)
 ```
 
 ![](../img/pyplot/pyplot_example_4.png)
@@ -54,7 +70,7 @@ plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RG
 
 Use the `axis` or `axiss` arguments.
 
-Note: This is only supported with Qwt right now
+Note: Currently only supported with Qwt and PyPlot
 
 ```julia
 plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right],ylabel="LEFT",yrightlabel="RIGHT")
@@ -102,35 +118,38 @@ heatmap(randn(10000),randn(10000); nbins=100)
 
 ![](../img/pyplot/pyplot_example_10.png)
 
-### Lots of line types
+### Line types
+
 
-Options: (:line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar)  
-Note: some may not work with all backends
 
 ```julia
-plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots],labels=["line","step","sticks","dots"])
+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/pyplot/pyplot_example_11.png)
 
-### Lots of line styles
+### Line styles
+
 
-Options: (:solid, :dash, :dot, :dashdot, :dashdotdot)  
-Note: some may not work with all backends
 
 ```julia
-plot(rand(20,5); linestyles=[:solid,:dash,:dot,:dashdot,:dashdotdot],labels=["solid","dash","dot","dashdot","dashdotdot"])
+styles = setdiff(supportedStyles(),[:auto])
+plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 ```
 
 ![](../img/pyplot/pyplot_example_12.png)
 
-### Lots of marker types
+### Marker types
+
 
-Options: (:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)  
-Note: some may not work with all backends
 
 ```julia
-plot(repmat(collect(1:10)',10,1); markers=[:ellipse,:rect,:diamond,:utriangle,:dtriangle,:cross,:xcross,:star1,:star2,:hexagon],labels=["ellipse","rect","diamond","utriangle","dtriangle","cross","xcross","star1","star2","hexagon"],linetype=:none,markersize=10)
+markers = setdiff(supportedMarkers(),[:none,:auto])
+scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
 ```
 
 ![](../img/pyplot/pyplot_example_13.png)

docs/qwt_examples.md

@@ -1,3 +1,19 @@
+# Examples for backend: qwt
+
+- Supported arguments: `args`, `axis`, `color`, `fillto`, `heatmap_c`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `reg`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `ylabel`, `yrightlabel`
+- Supported values for axis: `:auto`, `:left`, `:right`
+- Supported values for linetype: `:none`, `:line`, `:step`, `:stepinverted`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`
+- Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`, `:dashdotdot`
+- Supported values for marker: `:none`, `:auto`, `:ellipse`, `:rect`, `: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 3 columns.
@@ -10,7 +26,7 @@ plot(rand(100,3))
 
 ### Functions
 
-Plot multiple functions.
+Plot multiple functions.  You can also put the function first.
 
 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -30,12 +46,12 @@ plot([sin,cos],0,4π)
 
 ### 
 
-Or make a parametric plot with plot(fx, fy, umin, umax).
+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π)
+        end),0,2π,legend=false)
 ```
 
 ![](../img/qwt/qwt_example_4.png)
@@ -54,7 +70,7 @@ plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RG
 
 Use the `axis` or `axiss` arguments.
 
-Note: This is only supported with Qwt right now
+Note: Currently only supported with Qwt and PyPlot
 
 ```julia
 plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right],ylabel="LEFT",yrightlabel="RIGHT")
@@ -102,35 +118,38 @@ heatmap(randn(10000),randn(10000); nbins=100)
 
 ![](../img/qwt/qwt_example_10.png)
 
-### Lots of line types
+### Line types
+
 
-Options: (:line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar)  
-Note: some may not work with all backends
 
 ```julia
-plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots],labels=["line","step","sticks","dots"])
+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/qwt/qwt_example_11.png)
 
-### Lots of line styles
+### Line styles
+
 
-Options: (:solid, :dash, :dot, :dashdot, :dashdotdot)  
-Note: some may not work with all backends
 
 ```julia
-plot(rand(20,5); linestyles=[:solid,:dash,:dot,:dashdot,:dashdotdot],labels=["solid","dash","dot","dashdot","dashdotdot"])
+styles = setdiff(supportedStyles(),[:auto])
+plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 ```
 
 ![](../img/qwt/qwt_example_12.png)
 
-### Lots of marker types
+### Marker types
+
 
-Options: (:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)  
-Note: some may not work with all backends
 
 ```julia
-plot(repmat(collect(1:10)',10,1); markers=[:ellipse,:rect,:diamond,:utriangle,:dtriangle,:cross,:xcross,:star1,:star2,:hexagon],labels=["ellipse","rect","diamond","utriangle","dtriangle","cross","xcross","star1","star2","hexagon"],linetype=:none,markersize=10)
+markers = setdiff(supportedMarkers(),[:none,:auto])
+scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10)
 ```
 
 ![](../img/qwt/qwt_example_13.png)
@@ -165,7 +184,7 @@ histogram(randn(1000); nbins=50,fillto=20)
 
 
 ```julia
-subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:dots,:step,:bar],nbins=10,legend=false)
+subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar],nbins=10,legend=false)
 ```
 
 ![](../img/qwt/qwt_example_16.png)

docs/unicodeplots_examples.md

@@ -1,3 +1,19 @@
+# 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.
@@ -10,7 +26,7 @@ plot(rand(100,3))
 
 ### Functions
 
-Plot multiple functions.
+Plot multiple functions.  You can also put the function first.
 
 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -30,10 +46,10 @@ plot([sin,cos],0,4π)
 
 ### 
 
-Or make a parametric plot with plot(fx, fy, umin, umax).
+Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
 
 ```julia
-plot(sin,(x->begin  # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
             sin(2x)
         end),0,2π)
 ```
@@ -54,7 +70,7 @@ plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RG
 
 Use the `axis` or `axiss` arguments.
 
-Note: This is only supported with Qwt right now
+Note: Currently only supported with Qwt and PyPlot
 
 ```julia
 plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right],ylabel="LEFT",yrightlabel="RIGHT")
@@ -92,35 +108,48 @@ scatter!(rand(100); markersize=6,color=:blue)
 
 ![](../img/unicodeplots/unicodeplots_example_9.png)
 
-### Lots of line types
+### Heatmaps
+
 
-Options: (:line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar)  
-Note: some may not work with all backends
 
 ```julia
-plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots],labels=["line","step","sticks","dots"])
+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)
 
-### Lots of line styles
+### Supported line styles
 
-Options: (:solid, :dash, :dot, :dashdot, :dashdotdot)  
-Note: some may not work with all backends
+All options: (:solid, :dash, :dot, :dashdot, :dashdotdot)
 
 ```julia
-plot(rand(20,5); linestyles=[:solid,:dash,:dot,:dashdot,:dashdotdot],labels=["solid","dash","dot","dashdot","dashdotdot"])
+styles = setdiff(supportedStyles(),[:auto])
+plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
 ```
 
 ![](../img/unicodeplots/unicodeplots_example_12.png)
 
-### Lots of marker types
+### Supported marker types
 
-Options: (:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)  
-Note: some may not work with all backends
+All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)
 
 ```julia
-plot(repmat(collect(1:10)',10,1); markers=[:ellipse,:rect,:diamond,:utriangle,:dtriangle,:cross,:xcross,:star1,:star2,:hexagon],labels=["ellipse","rect","diamond","utriangle","dtriangle","cross","xcross","star1","star2","hexagon"],linetype=:none,markersize=10)
+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)
@@ -155,7 +184,7 @@ histogram(randn(1000); nbins=50,fillto=20)
 
 
 ```julia
-subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:dots,:step,:bar],nbins=10,legend=false)
+subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar],nbins=10,legend=false)
 ```
 
 ![](../img/unicodeplots/unicodeplots_example_16.png)

docs/winston_examples.md

@@ -0,0 +1,166 @@
+# Examples for backend: winston
+
+- Supported arguments: `args`, `axis`, `color`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markersize`, `nbins`, `reg`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `ylabel`, `yrightlabel`
+- Supported values for axis: `:auto`, `:left`
+- Supported values for linetype: `:none`, `:line`, `:sticks`, `:scatter`, `:hist`, `:bar`
+- Supported values for linestyle: `:solid`, `:dash`, `:dot`, `:dashdot`
+- Supported values for marker: `:none`, `:ellipse`, `:rect`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`
+- Is `subplot`/`subplot!` supported? No
+
+### Initialize
+
+```julia
+using Plots
+winston!()
+```
+
+### Lines
+
+A simple line plot of the 3 columns.
+
+```julia
+plot(rand(100,3))
+```
+
+![](../img/winston/winston_example_1.png)
+
+### Functions
+
+Plot multiple functions.  You can also put the function first.
+
+```julia
+plot(0:0.01:4π,[sin,cos])
+```
+
+![](../img/winston/winston_example_2.png)
+
+### 
+
+You can also call it with plot(f, xmin, xmax).
+
+```julia
+plot([sin,cos],0,4π)
+```
+
+![](../img/winston/winston_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π,legend=false)
+```
+
+![](../img/winston/winston_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/winston/winston_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/winston/winston_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/winston/winston_example_7.png)
+
+### Build plot in pieces
+
+Start with a base plot...
+
+```julia
+plot(rand(100) / 3; reg=true,fillto=0)
+```
+
+![](../img/winston/winston_example_8.png)
+
+### 
+
+and add to it later.
+
+```julia
+scatter!(rand(100); markersize=6,color=:blue)
+```
+
+![](../img/winston/winston_example_9.png)
+
+### Line types
+
+
+
+```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/winston/winston_example_11.png)
+
+### Line styles
+
+
+
+```julia
+styles = setdiff(supportedStyles(),[:auto])
+plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
+```
+
+![](../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,labels=map(string,markers),markersize=10)
+```
+
+![](../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(1000))
+```
+
+![](../img/winston/winston_example_14.png)
+
+### Histogram
+
+note: fillto isn't supported on all backends
+
+```julia
+histogram(randn(1000); nbins=50,fillto=20)
+```
+
+![](../img/winston/winston_example_15.png)
+