JavaScriptCollection
diff --git a/‎d3.js‎
Lines changed: 3 additions & 3 deletions b/‎d3.js‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎d3.min.js‎
Lines changed: 1 addition & 1 deletion b/‎d3.min.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/scale/log.js‎
Lines changed: 4 additions & 3 deletions b/‎src/scale/log.js‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎test/scale/log-test.js‎
Lines changed: 22 additions & 0 deletions b/‎test/scale/log-test.js‎
Lines changed: 22 additions & 0 deletions
@@ -2460,12 +2460,12 @@ d3 = function() {
     scale.ticks = function() {
       var extent = d3_scaleExtent(linear.domain()), ticks = [];
       if (extent.every(isFinite)) {
-        var b = Math.log(base), i = Math.floor(extent[0] / b), j = Math.ceil(extent[1] / b), u = pow(extent[0]), v = pow(extent[1]);
+        var b = Math.log(base), i = Math.floor(extent[0] / b), j = Math.ceil(extent[1] / b), u = pow(extent[0]), v = pow(extent[1]), n = base % 1 ? 2 : base;
         if (log === d3_scale_logn) {
           ticks.push(-Math.pow(base, -i));
-          for (;i++ < j; ) for (var k = 9; k > 0; k--) ticks.push(-Math.pow(base, -i) * k);
+          for (;i++ < j; ) for (var k = n - 1; k > 0; k--) ticks.push(-Math.pow(base, -i) * k);
         } else {
-          for (;i < j; i++) for (var k = 1; k < 10; k++) ticks.push(Math.pow(base, i) * k);
+          for (;i < j; i++) for (var k = 1; k < n; k++) ticks.push(Math.pow(base, i) * k);
           ticks.push(Math.pow(base, i));
         }
         for (i = 0; ticks[i] < u; i++) {}
 
@@ -39,12 +39,13 @@ function d3_scale_log(linear, base, log, pow) {
           i = Math.floor(extent[0] / b),
           j = Math.ceil(extent[1] / b),
           u = pow(extent[0]),
-          v = pow(extent[1]);
+          v = pow(extent[1]),
+          n = base % 1 ? 2 : base;
       if (log === d3_scale_logn) {
         ticks.push(-Math.pow(base, -i));
-        for (; i++ < j;) for (var k = 9; k > 0; k--) ticks.push(-Math.pow(base, -i) * k);
+        for (; i++ < j;) for (var k = n - 1; k > 0; k--) ticks.push(-Math.pow(base, -i) * k);
       } else {
-        for (; i < j; i++) for (var k = 1; k < 10; k++) ticks.push(Math.pow(base, i) * k);
+        for (; i < j; i++) for (var k = 1; k < n; k++) ticks.push(Math.pow(base, i) * k);
         ticks.push(Math.pow(base, i));
       }
       for (i = 0; ticks[i] < u; i++) {} // strip small values
 
@@ -216,6 +216,28 @@ suite.addBatch({
       }
     },
 
+    "base two": {
+      topic: function(log) {
+        return log().domain([1, 32]).base(2);
+      },
+      "generates ticks at powers of two": function(x) {
+        assert.deepEqual(x.ticks().map(x.tickFormat(10, d3.format("+,d"))), [
+          "+1", "+2", "+4", "+8", "+16", "+32"
+        ]);
+      }
+    },
+
+    "base e": {
+      topic: function(log) {
+        return log().domain([1, 32]).base(Math.E);
+      },
+      "generates ticks at powers of e": function(x) {
+        assert.deepEqual(x.ticks().map(x.tickFormat(10, d3.format("+.6r"))), [
+          "+1.00000", "+2.71828", "+7.38906", "+20.0855"
+        ]);
+      }
+    },
+
     "nice": {
       "can nice the domain, extending it to powers of ten": function(log) {
         var x = log().domain([1.1, 10.9]).nice();