Fix errors due to new behavior of Zip

Author: shashi

src/Gadfly.jl

@@ -860,8 +860,7 @@ function render_prepared(plot::Plot,
     # IV. Geometries
     themes = Theme[layer.theme === nothing ? plot.theme : layer.theme
                    for layer in plot.layers]
-
-    zips = zip(plot.layers, layer_aess,
+    zips = trim_zip(plot.layers, layer_aess,
                                                    layer_subplot_aess,
                                                    layer_subplot_datas,
                themes)

src/geom/boxplot.jl

@@ -34,7 +34,7 @@ function render(geom::BoxplotGeometry, theme::Gadfly.Theme, aes::Gadfly.Aestheti
 
     bw = 1w / n - theme.boxplot_spacing # boxplot width
     if length(aes.x) > 1
-        minspan = minimum([xj - xi for (xi, xj) in zip(aes.x, aes.x[2:end])])
+        minspan = minimum([xj - xi for (xi, xj) in zip(aes.x[1:end-1], aes.x[2:end])])
         bw = minspan*cx - theme.boxplot_spacing
     end
 

src/misc.jl

@@ -433,3 +433,18 @@ function group_color_isless{S, T <: Colorant}(a::(@compat Tuple{S, T}),
         return false
     end
 end
+
+
+"""
+trim longer arrays to the size of the smallest one
+and zip the arrays.
+"""
+function trim_zip(xs...)
+    mx = max(map(length, xs)...)
+    mn = min(map(length, xs)...)
+    if mx == mn
+        zip(xs...)
+    else
+        zip([length(x) == mn ? x : x[1:mn] for x in xs]...)
+    end
+end

src/scale.jl

@@ -710,7 +710,7 @@ function apply_scale(scale::ContinuousColorScale,
         color_key_labels = Dict{Color, AbstractString}()
 
         tick_labels = scale.trans.label(ticks)
-        for (i, j, label) in zip(ticks, ticks[2:end], tick_labels)
+        for (i, j, label) in zip(ticks, ticks[2:end], tick_labels[1:end-1])
             r = (i - cmin) / cspan
             c = scale.f(r)
             color_key_colors[c] = r

src/statistics.jl

@@ -1077,7 +1077,7 @@ function apply_statistic(stat::BoxplotStatistic,
 
     if length(aes.x) > 1 && (haskey(scales, :x) && isa(scales[:x], Scale.ContinuousScale))
         xmin, xmax = minimum(aes.x), maximum(aes.x)
-        minspan = minimum([xj - xi for (xi, xj) in zip(aes.x, aes.x[2:end])])
+        minspan = minimum([xj - xi for (xi, xj) in zip(aes.x[1:end-1], aes.x[2:end])])
 
         xviewmin = xmin - minspan / 2
         xviewmax = xmax + minspan / 2