winston: linestyle tweaks

extras/cairo.jl

@@ -297,6 +297,7 @@ function _set_line_type(ctx::CairoContext, nick::String)
  }
  # XXX:should be scaled by linewidth
  const name2dashes = {
+ "solid" => Float64[],
  "dotted" => [1.,3.],
  "dotdashed" => [1.,3.,4.,4.],
  "longdashed" => [6.,6.],
@@ -388,6 +389,7 @@ const __pl_style_func = {
  "color" => _set_color,
  "linecolor" => _set_color,
  "fillcolor" => _set_color,
+ "linestyle" => _set_line_type,
  "linetype" => _set_line_type,
  "linewidth" => set_line_width,
  "filltype" => set_fill_type,

extras/plot.jl

@@ -31,6 +31,7 @@ end
 const chartokens = {
  '-' => {"linestyle" => "solid"},
  ':' => {"linestyle" => "dotted"},
+ ';' => {"linestyle" => "dotdashed"},
  '+' => {"symboltype" => "plus"},
  'o' => {"symboltype" => "circle"},
  '*' => {"symboltype" => "asterisk"},
@@ -55,7 +56,13 @@ const chartokens = {
 function _parse_style(spec::String)
  style = HashTable()
 
- # TODO { "--" => "dashed", "-." => "dotdashed" }
+ for (k,v) in { "--" => "dashed", "-." => "dotdashed" }
+ splitspec = split(spec, k)
+ if length(splitspec) > 1
+ style["linestyle"] = v
+ spec = join(splitspec)
+ end
+ end
 
  for char in spec
  if has(chartokens, char)
@@ -96,7 +103,6 @@ function _plot(p::FramedPlot, args...)
  if length(args) > 0 && typeof(args[1]) <: String
  style = _parse_style(shift(args))
  end
- println(style)
  if has(style, "linestyle")
  add(p, Curve(x, y, style))
  end