d3_rails 2.9.7 → 2.10.0

data/lib/d3_rails/version.rb

@@ -1,3 +1,3 @@
 module D3Rails
-  VERSION = "2.9.7"
+  VERSION = "2.10.0"
 end

data/vendor/assets/javascripts/d3.v2.js

@@ -11,7 +11,7 @@
     };
   }
   d3 = {
-    version: "2.9.7"
+    version: "2.10.0"
   };
   function d3_class(ctor, properties) {
     try {
@@ -183,9 +183,10 @@
     return [ a, c ];
   };
   d3.random = {
-    normal: function(mean, deviation) {
-      if (arguments.length < 2) deviation = 1;
-      if (arguments.length < 1) mean = 0;
+    normal: function(µ, σ) {
+      var n = arguments.length;
+      if (n < 2) σ = 1;
+      if (n < 1) µ = 0;
       return function() {
         var x, y, r;
         do {
@@ -193,7 +194,22 @@
           y = Math.random() * 2 - 1;
           r = x * x + y * y;
         } while (!r || r > 1);
-        return mean + deviation * x * Math.sqrt(-2 * Math.log(r) / r);
+        return µ + σ * x * Math.sqrt(-2 * Math.log(r) / r);
+      };
+    },
+    logNormal: function(µ, σ) {
+      var n = arguments.length;
+      if (n < 2) σ = 1;
+      if (n < 1) µ = 0;
+      var random = d3.random.normal();
+      return function() {
+        return Math.exp(µ + σ * random());
+      };
+    },
+    irwinHall: function(m) {
+      return function() {
+        for (var s = 0, j = 0; j < m; j++) s += Math.random();
+        return s / m;
       };
     }
   };
@@ -373,7 +389,7 @@
     return d == null;
   }
   function d3_collapse(s) {
-    return s.replace(/^\s+|\s+$/g, "").replace(/\s+/g, " ");
+    return s.trim().replace(/\s+/g, " ");
   }
   d3.range = function(start, stop, step) {
     if (arguments.length < 3) {
@@ -541,7 +557,7 @@
     type = d3_format_types.get(type) || d3_format_typeDefault;
     return function(value) {
       if (integer && value % 1) return "";
-      var negative = value < 0 && (value = -value) ? "−" : sign;
+      var negative = value < 0 && (value = -value) ? "-" : sign;
       if (scale < 0) {
         var prefix = d3.formatPrefix(value, precision);
         value = prefix.scale(value);
@@ -860,7 +876,6 @@
     };
   };
   d3.interpolateTransform = function(a, b) {
-    if (n = d3_interpolateTransformSimilar(a, b)) return n;
     var s = [], q = [], n, A = d3.transform(a), B = d3.transform(b), ta = A.translate, tb = B.translate, ra = A.rotate, rb = B.rotate, wa = A.skew, wb = B.skew, ka = A.scale, kb = B.scale;
     if (ta[0] != tb[0] || ta[1] != tb[1]) {
       s.push("translate(", null, ",", null, ")");
@@ -912,65 +927,6 @@
       return s.join("");
     };
   };
-  var d3_interpolateTransformTypes = [ "", "", "translate", "scale", "rotate", "skewX", "skewY" ];
-  var d3_interpolateTransformSimilar = function(a, b) {
-    var ga = document.createElementNS(d3.ns.prefix.svg, "g"), gb = document.createElementNS(d3.ns.prefix.svg, "g");
-    return (d3_interpolateTransformSimilar = function(a, b) {
-      ga.setAttribute("transform", a);
-      gb.setAttribute("transform", b);
-      a = ga.transform.baseVal;
-      b = gb.transform.baseVal;
-      var sa = [], sb = [], i = -1, n = a.numberOfItems, m = b.numberOfItems, ta, tb, type;
-      if (m !== n) {
-        if (!m) b = d3_interpolateTransformIdentity(a); else if (!n) a = d3_interpolateTransformIdentity(b), n = m; else return;
-      } else if (!m) return;
-      while (++i < n) {
-        ta = a.getItem(i);
-        tb = b.getItem(i);
-        type = ta.type;
-        if (type !== tb.type || !type) return;
-        switch (type) {
-         case 1:
-          {
-            sa.push(new d3_transform(ta.matrix));
-            sb.push(new d3_transform(tb.matrix));
-            continue;
-          }
-         case 2:
-          {
-            ra = ta.matrix.e + "," + ta.matrix.f;
-            rb = tb.matrix.e + "," + tb.matrix.f;
-            break;
-          }
-         case 3:
-          {
-            ra = ta.matrix.a + "," + ta.matrix.d;
-            rb = tb.matrix.a + "," + tb.matrix.d;
-            break;
-          }
-         default:
-          {
-            ra = ta.angle;
-            rb = tb.angle;
-          }
-        }
-        sa.push(type = d3_interpolateTransformTypes[type], "(", ra, ")");
-        sb.push(type, "(", rb, ")");
-      }
-      return d3.interpolateString(sa.join(""), sb.join(""));
-    })(a, b);
-  };
-  function d3_interpolateTransformIdentity(a) {
-    return {
-      getItem: function(i) {
-        return {
-          type: a.getItem(i).type,
-          angle: 0,
-          matrix: d3_transformIdentity
-        };
-      }
-    };
-  }
   d3.interpolateRgb = function(a, b) {
     a = d3.rgb(a);
     b = d3.rgb(b);
@@ -985,7 +941,24 @@
     var h0 = a.h, s0 = a.s, l0 = a.l, h1 = b.h - h0, s1 = b.s - s0, l1 = b.l - l0;
     if (h1 > 180) h1 -= 360; else if (h1 < -180) h1 += 360;
     return function(t) {
-      return d3_hsl_rgb(h0 + h1 * t, s0 + s1 * t, l0 + l1 * t).toString();
+      return d3_hsl_rgb(h0 + h1 * t, s0 + s1 * t, l0 + l1 * t) + "";
+    };
+  };
+  d3.interpolateLab = function(a, b) {
+    a = d3.lab(a);
+    b = d3.lab(b);
+    var al = a.l, aa = a.a, ab = a.b, bl = b.l - al, ba = b.a - aa, bb = b.b - ab;
+    return function(t) {
+      return d3_lab_rgb(al + bl * t, aa + ba * t, ab + bb * t) + "";
+    };
+  };
+  d3.interpolateHcl = function(a, b) {
+    a = d3.hcl(a);
+    b = d3.hcl(b);
+    var ah = a.h, ac = a.c, al = a.l, bh = b.h - ah, bc = b.c - ac, bl = b.l - al;
+    if (bh > 180) bh -= 360; else if (bh < -180) bh += 360;
+    return function(t) {
+      return d3_hcl_lab(ah + bh * t, ac + bc * t, al + bl * t) + "";
     };
   };
   d3.interpolateArray = function(a, b) {
@@ -1018,8 +991,8 @@
     };
   };
   var d3_interpolate_number = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g;
-  function d3_interpolateByName(n) {
-    return n == "transform" ? d3.interpolateTransform : d3.interpolate;
+  function d3_interpolateByName(name) {
+    return name == "transform" ? d3.interpolateTransform : d3.interpolate;
   }
   d3.interpolators = [ d3.interpolateObject, function(a, b) {
     return b instanceof Array && d3.interpolateArray(a, b);
@@ -1122,6 +1095,16 @@
     }
     return d3_hsl(h, s, l);
   }
+  function d3_rgb_lab(r, g, b) {
+    r = d3_rgb_xyz(r);
+    g = d3_rgb_xyz(g);
+    b = d3_rgb_xyz(b);
+    var x = d3_xyz_lab((.4124564 * r + .3575761 * g + .1804375 * b) / d3_lab_X), y = d3_xyz_lab((.2126729 * r + .7151522 * g + .072175 * b) / d3_lab_Y), z = d3_xyz_lab((.0193339 * r + .119192 * g + .9503041 * b) / d3_lab_Z);
+    return d3_lab(116 * y - 16, 500 * (x - y), 200 * (y - z));
+  }
+  function d3_rgb_xyz(r) {
+    return (r /= 255) <= .04045 ? r / 12.92 : Math.pow((r + .055) / 1.055, 2.4);
+  }
   function d3_rgb_parseNumber(c) {
     var f = parseFloat(c);
     return c.charAt(c.length - 1) === "%" ? Math.round(f * 2.55) : f;
@@ -1323,6 +1306,76 @@
     }
     return d3_rgb(vv(h + 120), vv(h), vv(h - 120));
   }
+  d3.hcl = function(h, c, l) {
+    return arguments.length === 1 ? h instanceof d3_Hcl ? d3_hcl(h.h, h.c, h.l) : h instanceof d3_Lab ? d3_lab_hcl(h.l, h.a, h.b) : d3_lab_hcl((h = d3_rgb_lab((h = d3.rgb(h)).r, h.g, h.b)).l, h.a, h.b) : d3_hcl(+h, +c, +l);
+  };
+  function d3_hcl(h, c, l) {
+    return new d3_Hcl(h, c, l);
+  }
+  function d3_Hcl(h, c, l) {
+    this.h = h;
+    this.c = c;
+    this.l = l;
+  }
+  d3_Hcl.prototype.brighter = function(k) {
+    return d3_hcl(this.h, this.c, Math.min(100, this.l + d3_lab_K * (arguments.length ? k : 1)));
+  };
+  d3_Hcl.prototype.darker = function(k) {
+    return d3_hcl(this.h, this.c, Math.max(0, this.l - d3_lab_K * (arguments.length ? k : 1)));
+  };
+  d3_Hcl.prototype.rgb = function() {
+    return d3_hcl_lab(this.h, this.c, this.l).rgb();
+  };
+  d3_Hcl.prototype.toString = function() {
+    return this.rgb() + "";
+  };
+  function d3_hcl_lab(h, c, l) {
+    return d3_lab(l, Math.cos(h *= Math.PI / 180) * c, Math.sin(h) * c);
+  }
+  d3.lab = function(l, a, b) {
+    return arguments.length === 1 ? l instanceof d3_Lab ? d3_lab(l.l, l.a, l.b) : l instanceof d3_Hcl ? d3_hcl_lab(l.l, l.c, l.h) : d3_rgb_lab((l = d3.rgb(l)).r, l.g, l.b) : d3_lab(+l, +a, +b);
+  };
+  function d3_lab(l, a, b) {
+    return new d3_Lab(l, a, b);
+  }
+  function d3_Lab(l, a, b) {
+    this.l = l;
+    this.a = a;
+    this.b = b;
+  }
+  var d3_lab_K = 18;
+  var d3_lab_X = .95047, d3_lab_Y = 1, d3_lab_Z = 1.08883;
+  d3_Lab.prototype.brighter = function(k) {
+    return d3_lab(Math.min(100, this.l + d3_lab_K * (arguments.length ? k : 1)), this.a, this.b);
+  };
+  d3_Lab.prototype.darker = function(k) {
+    return d3_lab(Math.max(0, this.l - d3_lab_K * (arguments.length ? k : 1)), this.a, this.b);
+  };
+  d3_Lab.prototype.rgb = function() {
+    return d3_lab_rgb(this.l, this.a, this.b);
+  };
+  d3_Lab.prototype.toString = function() {
+    return this.rgb() + "";
+  };
+  function d3_lab_rgb(l, a, b) {
+    var y = (l + 16) / 116, x = y + a / 500, z = y - b / 200;
+    x = d3_lab_xyz(x) * d3_lab_X;
+    y = d3_lab_xyz(y) * d3_lab_Y;
+    z = d3_lab_xyz(z) * d3_lab_Z;
+    return d3_rgb(d3_xyz_rgb(3.2404542 * x - 1.5371385 * y - .4985314 * z), d3_xyz_rgb(-.969266 * x + 1.8760108 * y + .041556 * z), d3_xyz_rgb(.0556434 * x - .2040259 * y + 1.0572252 * z));
+  }
+  function d3_lab_hcl(l, a, b) {
+    return d3_hcl(Math.atan2(b, a) / Math.PI * 180, Math.sqrt(a * a + b * b), l);
+  }
+  function d3_lab_xyz(x) {
+    return x > .206893034 ? x * x * x : (x - 4 / 29) / 7.787037;
+  }
+  function d3_xyz_lab(x) {
+    return x > .008856 ? Math.pow(x, 1 / 3) : 7.787037 * x + 4 / 29;
+  }
+  function d3_xyz_rgb(r) {
+    return Math.round(255 * (r <= .00304 ? 12.92 * r : 1.055 * Math.pow(r, 1 / 2.4) - .055));
+  }
   function d3_selection(groups) {
     d3_arraySubclass(groups, d3_selectionPrototype);
     return groups;
@@ -1389,11 +1442,19 @@
     };
   }
   d3_selectionPrototype.attr = function(name, value) {
-    name = d3.ns.qualify(name);
     if (arguments.length < 2) {
-      var node = this.node();
-      return name.local ? node.getAttributeNS(name.space, name.local) : node.getAttribute(name);
+      if (typeof name === "string") {
+        var node = this.node();
+        name = d3.ns.qualify(name);
+        return name.local ? node.getAttributeNS(name.space, name.local) : node.getAttribute(name);
+      }
+      for (value in name) this.each(d3_selection_attr(value, name[value]));
+      return this;
     }
+    return this.each(d3_selection_attr(name, value));
+  };
+  function d3_selection_attr(name, value) {
+    name = d3.ns.qualify(name);
     function attrNull() {
       this.removeAttribute(name);
     }
@@ -1414,52 +1475,73 @@
       var x = value.apply(this, arguments);
       if (x == null) this.removeAttributeNS(name.space, name.local); else this.setAttributeNS(name.space, name.local, x);
     }
-    return this.each(value == null ? name.local ? attrNullNS : attrNull : typeof value === "function" ? name.local ? attrFunctionNS : attrFunction : name.local ? attrConstantNS : attrConstant);
-  };
+    return value == null ? name.local ? attrNullNS : attrNull : typeof value === "function" ? name.local ? attrFunctionNS : attrFunction : name.local ? attrConstantNS : attrConstant;
+  }
   d3_selectionPrototype.classed = function(name, value) {
-    var names = d3_collapse(name).split(" "), n = names.length, i = -1;
-    if (arguments.length > 1) {
-      while (++i < n) d3_selection_classed.call(this, names[i], value);
+    if (arguments.length < 2) {
+      if (typeof name === "string") {
+        var node = this.node(), n = (name = name.trim().split(/^|\s+/g)).length, i = -1;
+        if (value = node.classList) {
+          while (++i < n) if (!value.contains(name[i])) return false;
+        } else {
+          value = node.className;
+          if (value.baseVal != null) value = value.baseVal;
+          while (++i < n) if (!d3_selection_classedRe(name[i]).test(value)) return false;
+        }
+        return true;
+      }
+      for (value in name) this.each(d3_selection_classed(value, name[value]));
       return this;
-    } else {
-      while (++i < n) if (!d3_selection_classed.call(this, names[i])) return false;
-      return true;
     }
+    return this.each(d3_selection_classed(name, value));
   };
+  function d3_selection_classedRe(name) {
+    return new RegExp("(?:^|\\s+)" + d3.requote(name) + "(?:\\s+|$)", "g");
+  }
   function d3_selection_classed(name, value) {
-    var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
-    if (arguments.length < 2) {
-      var node = this.node();
-      if (c = node.classList) return c.contains(name);
-      var c = node.className;
-      re.lastIndex = 0;
-      return re.test(c.baseVal != null ? c.baseVal : c);
-    }
-    function classedAdd() {
-      if (c = this.classList) return c.add(name);
-      var c = this.className, cb = c.baseVal != null, cv = cb ? c.baseVal : c;
-      re.lastIndex = 0;
-      if (!re.test(cv)) {
-        cv = d3_collapse(cv + " " + name);
-        if (cb) c.baseVal = cv; else this.className = cv;
-      }
-    }
-    function classedRemove() {
-      if (c = this.classList) return c.remove(name);
-      var c = this.className, cb = c.baseVal != null, cv = cb ? c.baseVal : c;
-      if (cv) {
-        cv = d3_collapse(cv.replace(re, " "));
-        if (cb) c.baseVal = cv; else this.className = cv;
-      }
+    name = name.trim().split(/\s+/).map(d3_selection_classedName);
+    var n = name.length;
+    function classedConstant() {
+      var i = -1;
+      while (++i < n) name[i](this, value);
     }
     function classedFunction() {
-      (value.apply(this, arguments) ? classedAdd : classedRemove).call(this);
-    }
-    return this.each(typeof value === "function" ? classedFunction : value ? classedAdd : classedRemove);
+      var i = -1, x = value.apply(this, arguments);
+      while (++i < n) name[i](this, x);
+    }
+    return typeof value === "function" ? classedFunction : classedConstant;
+  }
+  function d3_selection_classedName(name) {
+    var re = d3_selection_classedRe(name);
+    return function(node, value) {
+      if (c = node.classList) return value ? c.add(name) : c.remove(name);
+      var c = node.className, cb = c.baseVal != null, cv = cb ? c.baseVal : c;
+      if (value) {
+        re.lastIndex = 0;
+        if (!re.test(cv)) {
+          cv = d3_collapse(cv + " " + name);
+          if (cb) c.baseVal = cv; else node.className = cv;
+        }
+      } else if (cv) {
+        cv = d3_collapse(cv.replace(re, " "));
+        if (cb) c.baseVal = cv; else node.className = cv;
+      }
+    };
   }
   d3_selectionPrototype.style = function(name, value, priority) {
-    if (arguments.length < 3) priority = "";
-    if (arguments.length < 2) return window.getComputedStyle(this.node(), null).getPropertyValue(name);
+    var n = arguments.length;
+    if (n < 3) {
+      if (typeof name !== "string") {
+        if (n < 2) value = "";
+        for (priority in name) this.each(d3_selection_style(priority, name[priority], value));
+        return this;
+      }
+      if (n < 2) return window.getComputedStyle(this.node(), null).getPropertyValue(name);
+      priority = "";
+    }
+    return this.each(d3_selection_style(name, value, priority));
+  };
+  function d3_selection_style(name, value, priority) {
     function styleNull() {
       this.style.removeProperty(name);
     }
@@ -1470,10 +1552,17 @@
       var x = value.apply(this, arguments);
       if (x == null) this.style.removeProperty(name); else this.style.setProperty(name, x, priority);
     }
-    return this.each(value == null ? styleNull : typeof value === "function" ? styleFunction : styleConstant);
-  };
+    return value == null ? styleNull : typeof value === "function" ? styleFunction : styleConstant;
+  }
   d3_selectionPrototype.property = function(name, value) {
-    if (arguments.length < 2) return this.node()[name];
+    if (arguments.length < 2) {
+      if (typeof name === "string") return this.node()[name];
+      for (value in name) this.each(d3_selection_property(value, name[value]));
+      return this;
+    }
+    return this.each(d3_selection_property(name, value));
+  };
+  function d3_selection_property(name, value) {
     function propertyNull() {
       delete this[name];
     }
@@ -1484,8 +1573,8 @@
       var x = value.apply(this, arguments);
       if (x == null) delete this[name]; else this[name] = x;
     }
-    return this.each(value == null ? propertyNull : typeof value === "function" ? propertyFunction : propertyConstant);
-  };
+    return value == null ? propertyNull : typeof value === "function" ? propertyFunction : propertyConstant;
+  }
   d3_selectionPrototype.text = function(value) {
     return arguments.length < 1 ? this.node().textContent : this.each(typeof value === "function" ? function() {
       var v = value.apply(this, arguments);
@@ -1669,21 +1758,34 @@
     };
   }
   d3_selectionPrototype.on = function(type, listener, capture) {
-    if (arguments.length < 3) capture = false;
+    var n = arguments.length;
+    if (n < 3) {
+      if (typeof type !== "string") {
+        if (n < 2) listener = false;
+        for (capture in type) this.each(d3_selection_on(capture, type[capture], listener));
+        return this;
+      }
+      if (n < 2) return (n = this.node()["__on" + type]) && n._;
+      capture = false;
+    }
+    return this.each(d3_selection_on(type, listener, capture));
+  };
+  function d3_selection_on(type, listener, capture) {
     var name = "__on" + type, i = type.indexOf(".");
     if (i > 0) type = type.substring(0, i);
-    if (arguments.length < 2) return (i = this.node()[name]) && i._;
-    return this.each(function() {
-      var node = this, args = arguments, o = node[name];
-      if (o) {
-        node.removeEventListener(type, o, o.$);
-        delete node[name];
-      }
-      if (listener) {
-        node.addEventListener(type, node[name] = l, l.$ = capture);
-        l._ = listener;
-      }
-      function l(e) {
+    function onRemove() {
+      var wrapper = this[name];
+      if (wrapper) {
+        this.removeEventListener(type, wrapper, wrapper.$);
+        delete this[name];
+      }
+    }
+    function onAdd() {
+      var node = this, args = arguments;
+      onRemove.call(this);
+      this.addEventListener(type, this[name] = wrapper, wrapper.$ = capture);
+      wrapper._ = listener;
+      function wrapper(e) {
         var o = d3.event;
         d3.event = e;
         args[0] = node.__data__;
@@ -1693,8 +1795,9 @@
           d3.event = o;
         }
       }
-    });
-  };
+    }
+    return listener ? onAdd : onRemove;
+  }
   d3_selectionPrototype.each = function(callback) {
     return d3_selection_each(this, function(node, i, j) {
       callback.call(node, node.__data__, i, j);
@@ -1836,21 +1939,6 @@
     }, 0, time);
     return groups;
   }
-  var d3_transitionRemove = {};
-  function d3_transitionNull(d, i, a) {
-    return a != "" && d3_transitionRemove;
-  }
-  function d3_transitionTween(name, b) {
-    var interpolate = d3_interpolateByName(name);
-    function transitionFunction(d, i, a) {
-      var v = b.call(this, d, i);
-      return v == null ? a != "" && d3_transitionRemove : a != v && interpolate(a, v);
-    }
-    function transitionString(d, i, a) {
-      return a != b && interpolate(a, b);
-    }
-    return typeof b === "function" ? transitionFunction : b == null ? d3_transitionNull : (b += "", transitionString);
-  }
   var d3_transitionPrototype = [], d3_transitionNextId = 0, d3_transitionId = 0, d3_transitionDefaultDelay = 0, d3_transitionDefaultDuration = 250, d3_transitionDefaultEase = d3.ease("cubic-in-out"), d3_transitionDelay = d3_transitionDefaultDelay, d3_transitionDuration = d3_transitionDefaultDuration, d3_transitionEase = d3_transitionDefaultEase;
   d3_transitionPrototype.call = d3_selectionPrototype.call;
   d3.transition = function(selection) {
@@ -1911,33 +1999,45 @@
     return d3_transition(subgroups, this.id, this.time).ease(this.ease());
   };
   d3_transitionPrototype.attr = function(name, value) {
-    return this.attrTween(name, d3_transitionTween(name, value));
+    if (arguments.length < 2) {
+      for (value in name) this.attrTween(value, d3_tweenByName(name[value], value));
+      return this;
+    }
+    return this.attrTween(name, d3_tweenByName(value, name));
   };
   d3_transitionPrototype.attrTween = function(nameNS, tween) {
     var name = d3.ns.qualify(nameNS);
     function attrTween(d, i) {
       var f = tween.call(this, d, i, this.getAttribute(name));
-      return f === d3_transitionRemove ? (this.removeAttribute(name), null) : f && function(t) {
+      return f === d3_tweenRemove ? (this.removeAttribute(name), null) : f && function(t) {
         this.setAttribute(name, f(t));
       };
     }
     function attrTweenNS(d, i) {
       var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
-      return f === d3_transitionRemove ? (this.removeAttributeNS(name.space, name.local), null) : f && function(t) {
+      return f === d3_tweenRemove ? (this.removeAttributeNS(name.space, name.local), null) : f && function(t) {
         this.setAttributeNS(name.space, name.local, f(t));
       };
     }
     return this.tween("attr." + nameNS, name.local ? attrTweenNS : attrTween);
   };
   d3_transitionPrototype.style = function(name, value, priority) {
-    if (arguments.length < 3) priority = "";
-    return this.styleTween(name, d3_transitionTween(name, value), priority);
+    var n = arguments.length;
+    if (n < 3) {
+      if (typeof name !== "string") {
+        if (n < 2) value = "";
+        for (priority in name) this.styleTween(priority, d3_tweenByName(name[priority], priority), value);
+        return this;
+      }
+      priority = "";
+    }
+    return this.styleTween(name, d3_tweenByName(value, name), priority);
   };
   d3_transitionPrototype.styleTween = function(name, tween, priority) {
     if (arguments.length < 3) priority = "";
     return this.tween("style." + name, function(d, i) {
       var f = tween.call(this, d, i, window.getComputedStyle(this, null).getPropertyValue(name));
-      return f === d3_transitionRemove ? (this.style.removeProperty(name), null) : f && function(t) {
+      return f === d3_tweenRemove ? (this.style.removeProperty(name), null) : f && function(t) {
         this.style.setProperty(name, f(t), priority);
       };
     });
@@ -1985,6 +2085,23 @@
   d3_transitionPrototype.transition = function() {
     return this.select(d3_this);
   };
+  d3.tween = function(b, interpolate) {
+    function tweenFunction(d, i, a) {
+      var v = b.call(this, d, i);
+      return v == null ? a != "" && d3_tweenRemove : a != v && interpolate(a, v);
+    }
+    function tweenString(d, i, a) {
+      return a != b && interpolate(a, b);
+    }
+    return typeof b === "function" ? tweenFunction : b == null ? d3_tweenNull : (b += "", tweenString);
+  };
+  var d3_tweenRemove = {};
+  function d3_tweenNull(d, i, a) {
+    return a != "" && d3_tweenRemove;
+  }
+  function d3_tweenByName(b, name) {
+    return d3.tween(b, d3_interpolateByName(name));
+  }
   var d3_timer_queue = null, d3_timer_interval, d3_timer_timeout;
   d3.timer = function(callback, delay, then) {
     var found = false, t0, t1 = d3_timer_queue;
@@ -2104,15 +2221,10 @@
   function d3_scale_nice(domain, nice) {
     var i0 = 0, i1 = domain.length - 1, x0 = domain[i0], x1 = domain[i1], dx;
     if (x1 < x0) {
-      dx = i0;
-      i0 = i1;
-      i1 = dx;
-      dx = x0;
-      x0 = x1;
-      x1 = dx;
-    }
-    if (dx = x1 - x0) {
-      nice = nice(dx);
+      dx = i0, i0 = i1, i1 = dx;
+      dx = x0, x0 = x1, x1 = dx;
+    }
+    if (nice = nice(x1 - x0)) {
       domain[i0] = nice.floor(x0);
       domain[i1] = nice.ceil(x1);
     }
@@ -2181,7 +2293,7 @@
   }
   function d3_scale_linearNice(dx) {
     dx = Math.pow(10, Math.round(Math.log(dx) / Math.LN10) - 1);
-    return {
+    return dx && {
       floor: function(x) {
         return Math.floor(x / dx) * dx;
       },
@@ -2338,7 +2450,7 @@
   d3.scale.ordinal = function() {
     return d3_scale_ordinal([], {
       t: "range",
-      x: []
+      a: [ [] ]
     });
   };
   function d3_scale_ordinal(domain, ranger) {
@@ -2357,7 +2469,7 @@
       index = new d3_Map;
       var i = -1, n = x.length, xi;
       while (++i < n) if (!index.has(xi = x[i])) index.set(xi, domain.push(xi));
-      return scale[ranger.t](ranger.x, ranger.p);
+      return scale[ranger.t].apply(scale, ranger.a);
     };
     scale.range = function(x) {
       if (!arguments.length) return range;
@@ -2365,7 +2477,7 @@
       rangeBand = 0;
       ranger = {
         t: "range",
-        x: x
+        a: arguments
       };
       return scale;
     };
@@ -2376,34 +2488,33 @@
       rangeBand = 0;
       ranger = {
         t: "rangePoints",
-        x: x,
-        p: padding
+        a: arguments
       };
       return scale;
     };
-    scale.rangeBands = function(x, padding) {
+    scale.rangeBands = function(x, padding, outerPadding) {
       if (arguments.length < 2) padding = 0;
-      var reverse = x[1] < x[0], start = x[reverse - 0], stop = x[1 - reverse], step = (stop - start) / (domain.length + padding);
-      range = steps(start + step * padding, step);
+      if (arguments.length < 3) outerPadding = padding;
+      var reverse = x[1] < x[0], start = x[reverse - 0], stop = x[1 - reverse], step = (stop - start) / (domain.length - padding + 2 * outerPadding);
+      range = steps(start + step * outerPadding, step);
       if (reverse) range.reverse();
       rangeBand = step * (1 - padding);
       ranger = {
         t: "rangeBands",
-        x: x,
-        p: padding
+        a: arguments
       };
       return scale;
     };
-    scale.rangeRoundBands = function(x, padding) {
+    scale.rangeRoundBands = function(x, padding, outerPadding) {
       if (arguments.length < 2) padding = 0;
-      var reverse = x[1] < x[0], start = x[reverse - 0], stop = x[1 - reverse], step = Math.floor((stop - start) / (domain.length + padding)), error = stop - start - (domain.length - padding) * step;
+      if (arguments.length < 3) outerPadding = padding;
+      var reverse = x[1] < x[0], start = x[reverse - 0], stop = x[1 - reverse], step = Math.floor((stop - start) / (domain.length - padding + 2 * outerPadding)), error = stop - start - (domain.length - padding) * step;
       range = steps(start + Math.round(error / 2), step);
       if (reverse) range.reverse();
       rangeBand = Math.round(step * (1 - padding));
       ranger = {
         t: "rangeRoundBands",
-        x: x,
-        p: padding
+        a: arguments
       };
       return scale;
     };
@@ -2411,7 +2522,7 @@
       return rangeBand;
     };
     scale.rangeExtent = function() {
-      return d3_scaleExtent(ranger.x);
+      return d3_scaleExtent(ranger.a[0]);
     };
     scale.copy = function() {
       return d3_scale_ordinal(domain, ranger);
@@ -2498,6 +2609,28 @@
     };
     return rescale();
   }
+  d3.scale.threshold = function() {
+    return d3_scale_threshold([ .5 ], [ 0, 1 ]);
+  };
+  function d3_scale_threshold(domain, range) {
+    function scale(x) {
+      return range[d3.bisect(domain, x)];
+    }
+    scale.domain = function(_) {
+      if (!arguments.length) return domain;
+      domain = _;
+      return scale;
+    };
+    scale.range = function(_) {
+      if (!arguments.length) return range;
+      range = _;
+      return scale;
+    };
+    scale.copy = function() {
+      return d3_scale_threshold(domain, range);
+    };
+    return scale;
+  }
   d3.scale.identity = function() {
     return d3_scale_identity([ 0, 1 ]);
   };
@@ -2569,11 +2702,11 @@
     return d.endAngle;
   }
   function d3_svg_line(projection) {
-    var x = d3_svg_lineX, y = d3_svg_lineY, defined = d3_true, interpolate = d3_svg_lineInterpolatorDefault, interpolator = d3_svg_lineLinear, tension = .7;
+    var x = d3_svg_lineX, y = d3_svg_lineY, defined = d3_true, interpolate = d3_svg_lineLinear, interpolateKey = interpolate.key, tension = .7;
     function line(data) {
       var segments = [], points = [], i = -1, n = data.length, d, fx = d3_functor(x), fy = d3_functor(y);
       function segment() {
-        segments.push("M", interpolator(projection(points), tension));
+        segments.push("M", interpolate(projection(points), tension));
       }
       while (++i < n) {
         if (defined.call(this, d = data[i], i)) {
@@ -2602,9 +2735,8 @@
       return line;
     };
     line.interpolate = function(_) {
-      if (!arguments.length) return interpolate;
-      if (!d3_svg_lineInterpolators.has(_ += "")) _ = d3_svg_lineInterpolatorDefault;
-      interpolator = d3_svg_lineInterpolators.get(interpolate = _);
+      if (!arguments.length) return interpolateKey;
+      if (typeof _ === "function") interpolateKey = interpolate = _; else interpolateKey = (interpolate = d3_svg_lineInterpolators.get(_) || d3_svg_lineLinear).key;
       return line;
     };
     line.tension = function(_) {
@@ -2623,7 +2755,6 @@
   function d3_svg_lineY(d) {
     return d[1];
   }
-  var d3_svg_lineInterpolatorDefault = "linear";
   var d3_svg_lineInterpolators = d3.map({
     linear: d3_svg_lineLinear,
     "linear-closed": d3_svg_lineLinearClosed,
@@ -2638,6 +2769,10 @@
     "cardinal-closed": d3_svg_lineCardinalClosed,
     monotone: d3_svg_lineMonotone
   });
+  d3_svg_lineInterpolators.forEach(function(key, value) {
+    value.key = key;
+    value.closed = /-closed$/.test(key);
+  });
   function d3_svg_lineLinear(points) {
     return points.join("L");
   }
@@ -2787,7 +2922,7 @@
   function d3_svg_lineFiniteDifferences(points) {
     var i = 0, j = points.length - 1, m = [], p0 = points[0], p1 = points[1], d = m[0] = d3_svg_lineSlope(p0, p1);
     while (++i < j) {
-      m[i] = d + (d = d3_svg_lineSlope(p0 = p1, p1 = points[i + 1]));
+      m[i] = (d + (d = d3_svg_lineSlope(p0 = p1, p1 = points[i + 1]))) / 2;
     }
     m[i] = d;
     return m;
@@ -2837,7 +2972,7 @@
     return points;
   }
   function d3_svg_area(projection) {
-    var x0 = d3_svg_lineX, x1 = d3_svg_lineX, y0 = 0, y1 = d3_svg_lineY, defined = d3_true, interpolate = d3_svg_lineInterpolatorDefault, i0 = d3_svg_lineLinear, i1 = d3_svg_lineLinear, L = "L", tension = .7;
+    var x0 = d3_svg_lineX, x1 = d3_svg_lineX, y0 = 0, y1 = d3_svg_lineY, defined = d3_true, interpolate = d3_svg_lineLinear, interpolateKey = interpolate.key, interpolateReverse = interpolate, L = "L", tension = .7;
     function area(data) {
       var segments = [], points0 = [], points1 = [], i = -1, n = data.length, d, fx0 = d3_functor(x0), fy0 = d3_functor(y0), fx1 = x0 === x1 ? function() {
         return x;
@@ -2845,7 +2980,7 @@
         return y;
       } : d3_functor(y1), x, y;
       function segment() {
-        segments.push("M", i0(projection(points1), tension), L, i1(projection(points0.reverse()), tension), "Z");
+        segments.push("M", interpolate(projection(points1), tension), L, interpolateReverse(projection(points0.reverse()), tension), "Z");
       }
       while (++i < n) {
         if (defined.call(this, d = data[i], i)) {
@@ -2896,11 +3031,10 @@
       return area;
     };
     area.interpolate = function(_) {
-      if (!arguments.length) return interpolate;
-      if (!d3_svg_lineInterpolators.has(_ += "")) _ = d3_svg_lineInterpolatorDefault;
-      i0 = d3_svg_lineInterpolators.get(interpolate = _);
-      i1 = i0.reverse || i0;
-      L = /-closed$/.test(_) ? "M" : "L";
+      if (!arguments.length) return interpolateKey;
+      if (typeof _ === "function") interpolateKey = interpolate = _; else interpolateKey = (interpolate = d3_svg_lineInterpolators.get(_) || d3_svg_lineLinear).key;
+      interpolateReverse = interpolate.reverse || interpolate;
+      L = interpolate.closed ? "M" : "L";
       return area;
     };
     area.tension = function(_) {
@@ -2913,7 +3047,7 @@
   d3_svg_lineStepBefore.reverse = d3_svg_lineStepAfter;
   d3_svg_lineStepAfter.reverse = d3_svg_lineStepBefore;
   d3.svg.area = function() {
-    return d3_svg_area(Object);
+    return d3_svg_area(d3_identity);
   };
   d3.svg.area.radial = function() {
     var area = d3_svg_area(d3_svg_lineRadial);
@@ -4474,14 +4608,28 @@
   }
   var d3_layout_hierarchyInline = false;
   d3.layout.pack = function() {
-    var hierarchy = d3.layout.hierarchy().sort(d3_layout_packSort), size = [ 1, 1 ];
+    var hierarchy = d3.layout.hierarchy().sort(d3_layout_packSort), padding = 0, size = [ 1, 1 ];
     function pack(d, i) {
       var nodes = hierarchy.call(this, d, i), root = nodes[0];
       root.x = 0;
       root.y = 0;
-      d3_layout_packTree(root);
-      var w = size[0], h = size[1], k = 1 / Math.max(2 * root.r / w, 2 * root.r / h);
-      d3_layout_packTransform(root, w / 2, h / 2, k);
+      d3_layout_treeVisitAfter(root, function(d) {
+        d.r = Math.sqrt(d.value);
+      });
+      d3_layout_treeVisitAfter(root, d3_layout_packSiblings);
+      var w = size[0], h = size[1], k = Math.max(2 * root.r / w, 2 * root.r / h);
+      if (padding > 0) {
+        var dr = padding * k / 2;
+        d3_layout_treeVisitAfter(root, function(d) {
+          d.r += dr;
+        });
+        d3_layout_treeVisitAfter(root, d3_layout_packSiblings);
+        d3_layout_treeVisitAfter(root, function(d) {
+          d.r -= dr;
+        });
+        k = Math.max(2 * root.r / w, 2 * root.r / h);
+      }
+      d3_layout_packTransform(root, w / 2, h / 2, 1 / k);
       return nodes;
     }
     pack.size = function(x) {
@@ -4489,6 +4637,11 @@
       size = x;
       return pack;
     };
+    pack.padding = function(_) {
+      if (!arguments.length) return padding;
+      padding = +_;
+      return pack;
+    };
     return d3_layout_hierarchyRebind(pack, hierarchy);
   };
   function d3_layout_packSort(a, b) {
@@ -4509,8 +4662,9 @@
     var dx = b.x - a.x, dy = b.y - a.y, dr = a.r + b.r;
     return dr * dr - dx * dx - dy * dy > .001;
   }
-  function d3_layout_packCircle(nodes) {
-    var xMin = Infinity, xMax = -Infinity, yMin = Infinity, yMax = -Infinity, n = nodes.length, a, b, c, j, k;
+  function d3_layout_packSiblings(node) {
+    if (!(nodes = node.children) || !(n = nodes.length)) return;
+    var nodes, xMin = Infinity, xMax = -Infinity, yMin = Infinity, yMax = -Infinity, a, b, c, i, j, k, n;
     function bound(node) {
       xMin = Math.min(node.x - node.r, xMin);
       xMax = Math.max(node.x + node.r, xMax);
@@ -4535,7 +4689,7 @@
         a._pack_prev = c;
         d3_layout_packInsert(c, b);
         b = a._pack_next;
-        for (var i = 3; i < n; i++) {
+        for (i = 3; i < n; i++) {
           d3_layout_packPlace(a, b, c = nodes[i]);
           var isect = 0, s1 = 1, s2 = 1;
           for (j = b._pack_next; j !== b; j = j._pack_next, s1++) {
@@ -4563,14 +4717,14 @@
       }
     }
     var cx = (xMin + xMax) / 2, cy = (yMin + yMax) / 2, cr = 0;
-    for (var i = 0; i < n; i++) {
-      var node = nodes[i];
-      node.x -= cx;
-      node.y -= cy;
-      cr = Math.max(cr, node.r + Math.sqrt(node.x * node.x + node.y * node.y));
+    for (i = 0; i < n; i++) {
+      c = nodes[i];
+      c.x -= cx;
+      c.y -= cy;
+      cr = Math.max(cr, c.r + Math.sqrt(c.x * c.x + c.y * c.y));
     }
+    node.r = cr;
     nodes.forEach(d3_layout_packUnlink);
-    return cr;
   }
   function d3_layout_packLink(node) {
     node._pack_next = node._pack_prev = node;
@@ -4579,15 +4733,6 @@
     delete node._pack_next;
     delete node._pack_prev;
   }
-  function d3_layout_packTree(node) {
-    var children = node.children;
-    if (children && children.length) {
-      children.forEach(d3_layout_packTree);
-      node.r = d3_layout_packCircle(children);
-    } else {
-      node.r = Math.sqrt(node.value);
-    }
-  }
   function d3_layout_packTransform(node, x, y, k) {
     var children = node.children;
     node.x = x += k * node.x;
@@ -5001,80 +5146,86 @@
       dy: dy
     };
   }
-  d3.csv = function(url, callback) {
-    d3.text(url, "text/csv", function(text) {
-      callback(text && d3.csv.parse(text));
-    });
-  };
-  d3.csv.parse = function(text) {
-    var header;
-    return d3.csv.parseRows(text, function(row, i) {
-      if (i) {
-        var o = {}, j = -1, m = header.length;
-        while (++j < m) o[header[j]] = row[j];
-        return o;
-      } else {
-        header = row;
-        return null;
-      }
-    });
-  };
-  d3.csv.parseRows = function(text, f) {
-    var EOL = {}, EOF = {}, rows = [], re = /\r\n|[,\r\n]/g, n = 0, t, eol;
-    re.lastIndex = 0;
-    function token() {
-      if (re.lastIndex >= text.length) return EOF;
-      if (eol) {
-        eol = false;
-        return EOL;
-      }
-      var j = re.lastIndex;
-      if (text.charCodeAt(j) === 34) {
-        var i = j;
-        while (i++ < text.length) {
-          if (text.charCodeAt(i) === 34) {
-            if (text.charCodeAt(i + 1) !== 34) break;
-            i++;
+  function d3_dsv(delimiter, mimeType) {
+    var reParse = new RegExp("\r\n|[" + delimiter + "\r\n]", "g"), reFormat = new RegExp('["' + delimiter + "\n]"), delimiterCode = delimiter.charCodeAt(0);
+    function dsv(url, callback) {
+      d3.text(url, mimeType, function(text) {
+        callback(text && dsv.parse(text));
+      });
+    }
+    dsv.parse = function(text) {
+      var header;
+      return dsv.parseRows(text, function(row, i) {
+        if (i) {
+          var o = {}, j = -1, m = header.length;
+          while (++j < m) o[header[j]] = row[j];
+          return o;
+        } else {
+          header = row;
+          return null;
+        }
+      });
+    };
+    dsv.parseRows = function(text, f) {
+      var EOL = {}, EOF = {}, rows = [], n = 0, t, eol;
+      reParse.lastIndex = 0;
+      function token() {
+        if (reParse.lastIndex >= text.length) return EOF;
+        if (eol) {
+          eol = false;
+          return EOL;
+        }
+        var j = reParse.lastIndex;
+        if (text.charCodeAt(j) === 34) {
+          var i = j;
+          while (i++ < text.length) {
+            if (text.charCodeAt(i) === 34) {
+              if (text.charCodeAt(i + 1) !== 34) break;
+              i++;
+            }
+          }
+          reParse.lastIndex = i + 2;
+          var c = text.charCodeAt(i + 1);
+          if (c === 13) {
+            eol = true;
+            if (text.charCodeAt(i + 2) === 10) reParse.lastIndex++;
+          } else if (c === 10) {
+            eol = true;
           }
+          return text.substring(j + 1, i).replace(/""/g, '"');
         }
-        re.lastIndex = i + 2;
-        var c = text.charCodeAt(i + 1);
-        if (c === 13) {
-          eol = true;
-          if (text.charCodeAt(i + 2) === 10) re.lastIndex++;
-        } else if (c === 10) {
-          eol = true;
+        var m = reParse.exec(text);
+        if (m) {
+          eol = m[0].charCodeAt(0) !== delimiterCode;
+          return text.substring(j, m.index);
         }
-        return text.substring(j + 1, i).replace(/""/g, '"');
-      }
-      var m = re.exec(text);
-      if (m) {
-        eol = m[0].charCodeAt(0) !== 44;
-        return text.substring(j, m.index);
+        reParse.lastIndex = text.length;
+        return text.substring(j);
+      }
+      while ((t = token()) !== EOF) {
+        var a = [];
+        while (t !== EOL && t !== EOF) {
+          a.push(t);
+          t = token();
+        }
+        if (f && !(a = f(a, n++))) continue;
+        rows.push(a);
       }
-      re.lastIndex = text.length;
-      return text.substring(j);
+      return rows;
+    };
+    dsv.format = function(rows) {
+      return rows.map(formatRow).join("\n");
+    };
+    function formatRow(row) {
+      return row.map(formatValue).join(delimiter);
     }
-    while ((t = token()) !== EOF) {
-      var a = [];
-      while (t !== EOL && t !== EOF) {
-        a.push(t);
-        t = token();
-      }
-      if (f && !(a = f(a, n++))) continue;
-      rows.push(a);
+    function formatValue(text) {
+      return reFormat.test(text) ? '"' + text.replace(/\"/g, '""') + '"' : text;
     }
-    return rows;
-  };
-  d3.csv.format = function(rows) {
-    return rows.map(d3_csv_formatRow).join("\n");
-  };
-  function d3_csv_formatRow(row) {
-    return row.map(d3_csv_formatValue).join(",");
-  }
-  function d3_csv_formatValue(text) {
-    return /[",\n]/.test(text) ? '"' + text.replace(/\"/g, '""') + '"' : text;
+    return dsv;
   }
+  d3.csv = d3_dsv(",", "text/csv");
+  d3.tsv = d3_dsv("\t", "text/tab-separated-values");
   d3.geo = {};
   var d3_geo_radians = Math.PI / 180;
   d3.geo.azimuthal = function() {
@@ -6273,7 +6424,7 @@
     };
   }
   d3.time = {};
-  var d3_time = Date;
+  var d3_time = Date, d3_time_daySymbols = [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ];
   function d3_time_utc() {
     this._ = new Date(arguments.length > 1 ? Date.UTC.apply(this, arguments) : arguments[0]);
   }
@@ -6340,6 +6491,11 @@
     }
   };
   var d3_time_prototype = Date.prototype;
+  var d3_time_formatDateTime = "%a %b %e %H:%M:%S %Y", d3_time_formatDate = "%m/%d/%y", d3_time_formatTime = "%H:%M:%S";
+  var d3_time_days = d3_time_daySymbols, d3_time_dayAbbreviations = d3_time_days.map(d3_time_formatAbbreviate), d3_time_months = [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ], d3_time_monthAbbreviations = d3_time_months.map(d3_time_formatAbbreviate);
+  function d3_time_formatAbbreviate(name) {
+    return name.substring(0, 3);
+  }
   d3.time.format = function(template) {
     var n = template.length;
     function format(date) {
@@ -6389,21 +6545,30 @@
     }
     return j;
   }
+  function d3_time_formatRe(names) {
+    return new RegExp("^(?:" + names.map(d3.requote).join("|") + ")", "i");
+  }
+  function d3_time_formatLookup(names) {
+    var map = new d3_Map, i = -1, n = names.length;
+    while (++i < n) map.set(names[i].toLowerCase(), i);
+    return map;
+  }
   var d3_time_zfill2 = d3.format("02d"), d3_time_zfill3 = d3.format("03d"), d3_time_zfill4 = d3.format("04d"), d3_time_sfill2 = d3.format("2d");
+  var d3_time_dayRe = d3_time_formatRe(d3_time_days), d3_time_dayAbbrevRe = d3_time_formatRe(d3_time_dayAbbreviations), d3_time_monthRe = d3_time_formatRe(d3_time_months), d3_time_monthLookup = d3_time_formatLookup(d3_time_months), d3_time_monthAbbrevRe = d3_time_formatRe(d3_time_monthAbbreviations), d3_time_monthAbbrevLookup = d3_time_formatLookup(d3_time_monthAbbreviations);
   var d3_time_formats = {
     a: function(d) {
-      return d3_time_weekdays[d.getDay()].substring(0, 3);
+      return d3_time_dayAbbreviations[d.getDay()];
     },
     A: function(d) {
-      return d3_time_weekdays[d.getDay()];
+      return d3_time_days[d.getDay()];
     },
     b: function(d) {
-      return d3_time_months[d.getMonth()].substring(0, 3);
+      return d3_time_monthAbbreviations[d.getMonth()];
     },
     B: function(d) {
       return d3_time_months[d.getMonth()];
     },
-    c: d3.time.format("%a %b %e %H:%M:%S %Y"),
+    c: d3.time.format(d3_time_formatDateTime),
     d: function(d) {
       return d3_time_zfill2(d.getDate());
     },
@@ -6443,8 +6608,8 @@
     W: function(d) {
       return d3_time_zfill2(d3.time.mondayOfYear(d));
     },
-    x: d3.time.format("%m/%d/%y"),
-    X: d3.time.format("%H:%M:%S"),
+    x: d3.time.format(d3_time_formatDate),
+    X: d3.time.format(d3_time_formatTime),
     y: function(d) {
       return d3_time_zfill2(d.getFullYear() % 100);
     },
@@ -6477,53 +6642,25 @@
     Y: d3_time_parseFullYear
   };
   function d3_time_parseWeekdayAbbrev(date, string, i) {
-    return d3_time_weekdayAbbrevRe.test(string.substring(i, i += 3)) ? i : -1;
+    d3_time_dayAbbrevRe.lastIndex = 0;
+    var n = d3_time_dayAbbrevRe.exec(string.substring(i));
+    return n ? i += n[0].length : -1;
   }
   function d3_time_parseWeekday(date, string, i) {
-    d3_time_weekdayRe.lastIndex = 0;
-    var n = d3_time_weekdayRe.exec(string.substring(i, i + 10));
+    d3_time_dayRe.lastIndex = 0;
+    var n = d3_time_dayRe.exec(string.substring(i));
     return n ? i += n[0].length : -1;
   }
-  var d3_time_weekdayAbbrevRe = /^(?:sun|mon|tue|wed|thu|fri|sat)/i, d3_time_weekdayRe = /^(?:Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday)/i, d3_time_weekdays = [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ];
   function d3_time_parseMonthAbbrev(date, string, i) {
-    var n = d3_time_monthAbbrevLookup.get(string.substring(i, i += 3).toLowerCase());
-    return n == null ? -1 : (date.m = n, i);
-  }
-  var d3_time_monthAbbrevLookup = d3.map({
-    jan: 0,
-    feb: 1,
-    mar: 2,
-    apr: 3,
-    may: 4,
-    jun: 5,
-    jul: 6,
-    aug: 7,
-    sep: 8,
-    oct: 9,
-    nov: 10,
-    dec: 11
-  });
+    d3_time_monthAbbrevRe.lastIndex = 0;
+    var n = d3_time_monthAbbrevRe.exec(string.substring(i));
+    return n ? (date.m = d3_time_monthAbbrevLookup.get(n[0].toLowerCase()), i += n[0].length) : -1;
+  }
   function d3_time_parseMonth(date, string, i) {
     d3_time_monthRe.lastIndex = 0;
-    var n = d3_time_monthRe.exec(string.substring(i, i + 12));
+    var n = d3_time_monthRe.exec(string.substring(i));
     return n ? (date.m = d3_time_monthLookup.get(n[0].toLowerCase()), i += n[0].length) : -1;
   }
-  var d3_time_monthRe = /^(?:January|February|March|April|May|June|July|August|September|October|November|December)/ig;
-  var d3_time_monthLookup = d3.map({
-    january: 0,
-    february: 1,
-    march: 2,
-    april: 3,
-    may: 4,
-    june: 5,
-    july: 6,
-    august: 7,
-    september: 8,
-    october: 9,
-    november: 10,
-    december: 11
-  });
-  var d3_time_months = [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ];
   function d3_time_parseLocaleFull(date, string, i) {
     return d3_time_parse(date, d3_time_formats.c.toString(), string, i);
   }
@@ -6576,7 +6713,7 @@
     var n = d3_time_numberRe.exec(string.substring(i, i + 3));
     return n ? (date.L = +n[0], i += n[0].length) : -1;
   }
-  var d3_time_numberRe = /\s*\d+/;
+  var d3_time_numberRe = /^\s*\d+/;
   function d3_time_parseAmPm(date, string, i) {
     var n = d3_time_amPmLookup.get(string.substring(i, i += 2).toLowerCase());
     return n == null ? -1 : (date.p = n, i);
@@ -6726,7 +6863,7 @@
     var year = d3.time.year(date);
     return Math.floor((date - year - (date.getTimezoneOffset() - year.getTimezoneOffset()) * 6e4) / 864e5);
   };
-  d3_time_weekdays.forEach(function(day, i) {
+  d3_time_daySymbols.forEach(function(day, i) {
     day = day.toLowerCase();
     i = 7 - i;
     var interval = d3.time[day] = d3_time_interval(function(date) {
@@ -6784,8 +6921,9 @@
       return scale;
     };
     scale.nice = function(m) {
-      var extent = d3_time_scaleExtent(scale.domain());
-      return scale.domain([ m.floor(extent[0]), m.ceil(extent[1]) ]);
+      return scale.domain(d3_scale_nice(scale.domain(), function() {
+        return m;
+      }));
     };
     scale.ticks = function(m, k) {
       var extent = d3_time_scaleExtent(scale.domain());