Skip to content

Commit da3131c

Browse files
mbostockmbostock
committed
Use hyphen instead of unicode minus for negatives.
Although the unicode minus is typographically correct, using the standard hyphen is more conventional (and is compatible with standard parsing).
1 parent 108d65d commit da3131c

6 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎d3.v2.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@
541541
type = d3_format_types.get(type) || d3_format_typeDefault;
542542
return function(value) {
543543
if (integer && value % 1) return "";
544-
var negative = value < 0 && (value = -value) ? "−" : sign;
544+
var negative = value < 0 && (value = -value) ? "-" : sign;
545545
if (scale < 0) {
546546
var prefix = d3.formatPrefix(value, precision);
547547
value = prefix.scale(value);

‎d3.v2.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/format.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ d3.format = function(specifier) {
3838
if (integer && (value % 1)) return "";
3939

4040
// Convert negative to positive, and record the sign prefix.
41-
var negative = (value < 0) && (value = -value) ? "\u2212" : sign;
41+
var negative = (value < 0) && (value = -value) ? "-" : sign;
4242

4343
// Apply the scale, computing it from the value's exponent for si format.
4444
if (scale < 0) {

‎test/core/format-test.js‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ suite.addBatch({
1919
assert.strictEqual(f(42), "00000042");
2020
assert.strictEqual(f(42000000), "42000000");
2121
assert.strictEqual(f(420000000), "420000000");
22-
assert.strictEqual(f(-4), "−0000004");
23-
assert.strictEqual(f(-42), "−0000042");
24-
assert.strictEqual(f(-4200000), "−4200000");
25-
assert.strictEqual(f(-42000000), "−42000000");
22+
assert.strictEqual(f(-4), "-0000004");
23+
assert.strictEqual(f(-42), "-0000042");
24+
assert.strictEqual(f(-4200000), "-4200000");
25+
assert.strictEqual(f(-42000000), "-42000000");
2626
},
2727
"can space fill": function(format) {
2828
var f = format("8d");
2929
assert.strictEqual(f(0), " 0");
3030
assert.strictEqual(f(42), " 42");
3131
assert.strictEqual(f(42000000), "42000000");
3232
assert.strictEqual(f(420000000), "420000000");
33-
assert.strictEqual(f(-4), " −4");
34-
assert.strictEqual(f(-42), " −42");
35-
assert.strictEqual(f(-4200000), "−4200000");
36-
assert.strictEqual(f(-42000000), "−42000000");
33+
assert.strictEqual(f(-4), " -4");
34+
assert.strictEqual(f(-42), " -42");
35+
assert.strictEqual(f(-4200000), "-4200000");
36+
assert.strictEqual(f(-42000000), "-42000000");
3737
},
3838
"can output fixed-point notation": function(format) {
3939
assert.strictEqual(format(".1f")(0.49), "0.5");
@@ -64,10 +64,10 @@ suite.addBatch({
6464
assert.strictEqual(f(42), "4.2e+1");
6565
assert.strictEqual(f(42000000), "4.2e+7");
6666
assert.strictEqual(f(420000000), "4.2e+8");
67-
assert.strictEqual(f(-4), "−4e+0");
68-
assert.strictEqual(f(-42), "−4.2e+1");
69-
assert.strictEqual(f(-4200000), "−4.2e+6");
70-
assert.strictEqual(f(-42000000), "−4.2e+7");
67+
assert.strictEqual(f(-4), "-4e+0");
68+
assert.strictEqual(f(-42), "-4.2e+1");
69+
assert.strictEqual(f(-4200000), "-4.2e+6");
70+
assert.strictEqual(f(-42000000), "-4.2e+7");
7171
},
7272
"can output SI prefix notation": function(format) {
7373
var f = format("s");
@@ -108,20 +108,20 @@ suite.addBatch({
108108
assert.strictEqual(f(.042), "4%");
109109
assert.strictEqual(f(.42), "42%");
110110
assert.strictEqual(f(4.2), "420%");
111-
assert.strictEqual(f(-.042), "−4%");
112-
assert.strictEqual(f(-.42), "−42%");
113-
assert.strictEqual(f(-4.2), "−420%");
111+
assert.strictEqual(f(-.042), "-4%");
112+
assert.strictEqual(f(-.42), "-42%");
113+
assert.strictEqual(f(-4.2), "-420%");
114114
},
115115
"can output a percentage with rounding and sign": function(format) {
116116
var f = format("+.2p");
117117
assert.strictEqual(f(.00123), "+0.12%");
118118
assert.strictEqual(f(.0123), "+1.2%");
119119
assert.strictEqual(f(.123), "+12%");
120120
assert.strictEqual(f(1.23), "+120%");
121-
assert.strictEqual(f(-.00123), "−0.12%");
122-
assert.strictEqual(f(-.0123), "−1.2%");
123-
assert.strictEqual(f(-.123), "−12%");
124-
assert.strictEqual(f(-1.23), "−120%");
121+
assert.strictEqual(f(-.00123), "-0.12%");
122+
assert.strictEqual(f(-.0123), "-1.2%");
123+
assert.strictEqual(f(-.123), "-12%");
124+
assert.strictEqual(f(-1.23), "-120%");
125125
},
126126
"can round to significant digits": function(format) {
127127
assert.strictEqual(format(".2r")(0), "0.0");
@@ -150,10 +150,10 @@ suite.addBatch({
150150
assert.strictEqual(f(42), "42");
151151
assert.strictEqual(f(42000000), "42,000,000");
152152
assert.strictEqual(f(420000000), "420,000,000");
153-
assert.strictEqual(f(-4), "−4");
154-
assert.strictEqual(f(-42), "−42");
155-
assert.strictEqual(f(-4200000), "−4,200,000");
156-
assert.strictEqual(f(-42000000), "−42,000,000");
153+
assert.strictEqual(f(-4), "-4");
154+
assert.strictEqual(f(-42), "-42");
155+
assert.strictEqual(f(-4200000), "-4,200,000");
156+
assert.strictEqual(f(-42000000), "-42,000,000");
157157
},
158158
"can group thousands and zero fill": function(format) {
159159
assert.strictEqual(format("01,d")(0), "0");
@@ -199,10 +199,10 @@ suite.addBatch({
199199
assert.strictEqual(f(42), "42");
200200
assert.strictEqual(f(42000000), "42,000,000");
201201
assert.strictEqual(f(420000000), "420,000,000");
202-
assert.strictEqual(f(-4), "−4");
203-
assert.strictEqual(f(-42), "−42");
204-
assert.strictEqual(f(-4200000), "−4,200,000");
205-
assert.strictEqual(f(-42000000), "−42,000,000");
202+
assert.strictEqual(f(-4), "-4");
203+
assert.strictEqual(f(-42), "-42");
204+
assert.strictEqual(f(-4200000), "-4,200,000");
205+
assert.strictEqual(f(-42000000), "-42,000,000");
206206
},
207207
"can group thousands, space fill, and round to significant digits": function(format) {
208208
assert.strictEqual(format("10,.1f")(123456.49), " 123,456.5");
@@ -228,10 +228,10 @@ suite.addBatch({
228228
assert.strictEqual(f(42), "42");
229229
assert.strictEqual(f(42000000), "42,000,000");
230230
assert.strictEqual(f(420000000), "420,000,000");
231-
assert.strictEqual(f(-4), "−4");
232-
assert.strictEqual(f(-42), "−42");
233-
assert.strictEqual(f(-4200000), "−4,200,000");
234-
assert.strictEqual(f(-42000000), "−42,000,000");
231+
assert.strictEqual(f(-4), "-4");
232+
assert.strictEqual(f(-42), "-42");
233+
assert.strictEqual(f(-4200000), "-4,200,000");
234+
assert.strictEqual(f(-42000000), "-42,000,000");
235235
}
236236
}
237237
});

‎test/scale/log-test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ suite.addBatch({
3939
"can specify negative domain values": function(log) {
4040
var x = log().domain([-100, -1]);
4141
assert.deepEqual(x.ticks().map(x.tickFormat()), [
42-
"−1e+2",
43-
"−9e+1", "−8e+1", "−7e+1", "−6e+1", "−5e+1", "−4e+1", "−3e+1", "−2e+1", "−1e+1",
44-
"−9e+0", "−8e+0", "−7e+0", "−6e+0", "−5e+0", "−4e+0", "−3e+0", "−2e+0", "−1e+0"
42+
"-1e+2",
43+
"-9e+1", "-8e+1", "-7e+1", "-6e+1", "-5e+1", "-4e+1", "-3e+1", "-2e+1", "-1e+1",
44+
"-9e+0", "-8e+0", "-7e+0", "-6e+0", "-5e+0", "-4e+0", "-3e+0", "-2e+0", "-1e+0"
4545
]);
4646
assert.inDelta(x(-50), 0.150515, 1e-6);
4747
},

‎test/scale/sqrt-test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ suite.addBatch({
188188
var x = sqrt().domain([1.1, 1, 2, 3, 10.9]).nice(), f = d3.format(".6f");
189189
assert.deepEqual(x.domain().map(f), [1, 1, 2, 3, 11]);
190190
var x = sqrt().domain([123.1, 1, 2, 3, -.9]).nice();
191-
assert.deepEqual(x.domain().map(f), [130, 1, 2, 3, "−10.000000"]);
191+
assert.deepEqual(x.domain().map(f), [130, 1, 2, 3, "-10.000000"]);
192192
}
193193
},
194194

0 commit comments

Comments
 (0)