From 9db7de83737c0168d387b80156942055b290729e Mon Sep 17 00:00:00 2001
From: Thomas Breloff <tom@breloff.com>
Date: Tue, 9 Aug 2016 17:09:53 -0400
Subject: [PATCH] added skinny markers + and x; closes #436

---
 src/args.jl                 | 4 ++--
 src/backends/glvisualize.jl | 2 ++
 src/backends/gr.jl          | 2 ++
 src/backends/pgfplots.jl    | 2 ++
 src/backends/plotly.jl      | 1 +
 src/backends/pyplot.jl      | 4 ++--
 src/components.jl           | 2 ++
 src/examples.jl             | 2 +-
 test/imgcomp.jl             | 2 +-
 9 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/args.jl b/src/args.jl
index 35abb55d..f66ccf6d 100644
--- a/src/args.jl
+++ b/src/args.jl
@@ -123,9 +123,9 @@ const _markerAliases = Dict{Symbol,Symbol}(
     :dtri         => :dtriangle,
     :downtri      => :dtriangle,
     :downtriangle => :dtriangle,
-    :+            => :cross,
+    # :+            => :cross,
     :plus         => :cross,
-    :x            => :xcross,
+    # :x            => :xcross,
     :X            => :xcross,
     :star         => :star5,
     :s            => :star5,
diff --git a/src/backends/glvisualize.jl b/src/backends/glvisualize.jl
index 18c422b8..358367b4 100644
--- a/src/backends/glvisualize.jl
+++ b/src/backends/glvisualize.jl
@@ -80,6 +80,8 @@ const _gl_marker_map = KW(
   :hexagon => '⬢',
   :cross => '✚',
   :xcross => '❌',
+  :+ => '✚',
+  :x => '❌',
   :utriangle => '▲',
   :dtriangle => '▼',
   :pentagon => '⬟',
diff --git a/src/backends/gr.jl b/src/backends/gr.jl
index 75fc36c9..74b2c354 100644
--- a/src/backends/gr.jl
+++ b/src/backends/gr.jl
@@ -74,6 +74,8 @@ const gr_markertype = KW(
     :octagon => -24,
     :cross => 2,
     :xcross => 5,
+    :+ => 2,
+    :x => 5,
     :star4 => -25,
     :star5 => -26,
     :star6 => -27,
diff --git a/src/backends/pgfplots.jl b/src/backends/pgfplots.jl
index caac2e23..4acc82b7 100644
--- a/src/backends/pgfplots.jl
+++ b/src/backends/pgfplots.jl
@@ -64,6 +64,8 @@ const _pgfplots_markers = KW(
     :none => "none",
     :cross => "+",
     :xcross => "x",
+    :+ => "+",
+    :x => "x",
     :utriangle => "triangle*",
     :dtriangle => "triangle*",
     :circle => "*",
diff --git a/src/backends/plotly.jl b/src/backends/plotly.jl
index 347e972c..3b6799ab 100644
--- a/src/backends/plotly.jl
+++ b/src/backends/plotly.jl
@@ -307,6 +307,7 @@ plotly_colorscale(c, α) = plotly_colorscale(cgrad(alpha=α), α)
 const _plotly_markers = KW(
     :rect       => "square",
     :xcross     => "x",
+    :x          => "x",
     :utriangle  => "triangle-up",
     :dtriangle  => "triangle-down",
     :star5      => "star-triangle-up",
diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl
index 43590c1f..2fe4278f 100644
--- a/src/backends/pyplot.jl
+++ b/src/backends/pyplot.jl
@@ -174,8 +174,8 @@ function py_marker(marker::Symbol)
     marker == :diamond && return "D"
     marker == :utriangle && return "^"
     marker == :dtriangle && return "v"
-    # marker == :cross && return "+"
-    # marker == :xcross && return "x"
+    marker == :+ && return "+"
+    marker == :x && return "x"
     marker == :star5 && return "*"
     marker == :pentagon && return "p"
     marker == :hexagon && return "h"
diff --git a/src/components.jl b/src/components.jl
index 36caa781..d6efebb6 100644
--- a/src/components.jl
+++ b/src/components.jl
@@ -119,6 +119,8 @@ const _shape_keys = Symbol[
   :star8,
   :vline,
   :hline,
+  :+,
+  :x,
 ]
 
 const _shapes = KW(
diff --git a/src/examples.jl b/src/examples.jl
index 5297204d..b0416ad4 100644
--- a/src/examples.jl
+++ b/src/examples.jl
@@ -252,7 +252,7 @@ PlotExample("DataFrames",
         iris = RDatasets.dataset("datasets", "iris")
         scatter(iris, :SepalLength, :SepalWidth, group=:Species,
             title = "My awesome plot", xlabel = "Length", ylabel = "Width",
-            marker = (0.5, [:+ :h :star7], 12), bg=RGB(.2,.2,.2))
+            marker = (0.5, [:cross :hex :star7], 12), bg=RGB(.2,.2,.2))
     end)]
 ),
 
diff --git a/test/imgcomp.jl b/test/imgcomp.jl
index d0dbd315..c21835c9 100644
--- a/test/imgcomp.jl
+++ b/test/imgcomp.jl
@@ -45,7 +45,7 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is
     # firgure out version info
     G = glob(joinpath(relpath(refdir), "*"))
     # @show refdir fn G
-    slash = (@windows ? "\\" : "/")
+    slash = (@static is_windows() ? "\\" : "/")
     versions = map(fn -> VersionNumber(split(fn, slash)[end]), G)
     versions = reverse(sort(versions))
     versions = filter(v -> v <= _current_plots_version, versions)