From 70ec8b076948058e2680c03b801d1d5a918edbe7 Mon Sep 17 00:00:00 2001 From: SheetJS Date: Thu, 27 Mar 2014 12:50:19 -0700 Subject: [PATCH] version bump 0.6.0: proper time rounding based on the actual time format, date codes are properly rounded. All time tests pass :) --- package.json | 2 +- ssf.js | 46 +++++++++++++++++++++++++------------- ssf.md | 62 ++++++++++++++++++++++++++++++++++++++++------------ test/date.js | 2 +- 4 files changed, 81 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index ed33534..dbea344 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ssf", - "version": "0.5.12", + "version": "0.6.0", "author": "SheetJS", "description": "pure-JS library to format data using ECMA-376 spreadsheet Format Codes", "keywords": [ "format", "sprintf", "spreadsheet" ], diff --git a/ssf.js b/ssf.js index d11e341..563aa9f 100644 --- a/ssf.js +++ b/ssf.js @@ -5,7 +5,7 @@ var _strrev = function(x) { return String(x).split("").reverse().join("");}; function fill(c,l) { return new Array(l+1).join(c); } function pad(v,d,c){var t=String(v);return t.length>=d?t:(fill(c||0,d-t.length)+t);} function rpad(v,d,c){var t=String(v);return t.length>=d?t:(t+fill(c||0,d-t.length));} -SSF.version = '0.5.12'; +SSF.version = '0.6.0'; /* Options */ var opts_fmt = {}; function fixopts(o){for(var y in opts_fmt) if(o[y]===undefined) o[y]=opts_fmt[y];} @@ -122,7 +122,7 @@ var parse_date_code = function parse_date_code(v,opts) { if(date > 2958465) return null; if(out.u > .999) { out.u = 0; - ++time; + if(++time == 86400) { time = 0; ++date; } } if(date === 60) {dout = [1900,2,29]; dow=3;} else if(date === 0) {dout = [1900,1,0]; dow=6;} @@ -146,7 +146,7 @@ SSF.parse_date_code = parse_date_code; /*jshint -W086 */ var write_date = function(type, fmt, val) { if(val < 0) return ""; - var o; + var o, ss; switch(type) { case 'y': switch(fmt) { /* year */ case 'y': case 'yy': return pad(val.y % 100,2); @@ -181,11 +181,11 @@ var write_date = function(type, fmt, val) { default: throw 'bad minute format: ' + fmt; } case 's': switch(fmt) { /* seconds */ - case 's': return Math.round(val.S+val.u); - case 'ss': return pad(Math.round(val.S+val.u), 2); - case 'ss.0': o = pad(Math.round(10*(val.S+val.u)),3); return o.substr(0,2)+"." + o.substr(2); - case 'ss.00': o = pad(Math.round(100*(val.S+val.u)),4); return o.substr(0,2)+"." + o.substr(2); - case 'ss.000': o = pad(Math.round(1000*(val.S+val.u)),5); return o.substr(0,2)+"." + o.substr(2); + case 's': ss=Math.round(val.S+val.u); return ss >= 60 ? 0 : ss; + case 'ss': ss=Math.round(val.S+val.u); if(ss>=60) ss=0; return pad(ss,2); + case 'ss.0': ss=Math.round(10*(val.S+val.u)); if(ss>=600) ss = 0; o = pad(ss,3); return o.substr(0,2)+"." + o.substr(2); + case 'ss.00': ss=Math.round(100*(val.S+val.u)); if(ss>=6000) ss = 0; o = pad(ss,4); return o.substr(0,2)+"." + o.substr(2); + case 'ss.000': ss=Math.round(1000*(val.S+val.u)); if(ss>=60000) ss = 0; o = pad(ss,5); return o.substr(0,2)+"." + o.substr(2); default: throw 'bad second format: ' + fmt; } case 'Z': switch(fmt) { @@ -362,22 +362,38 @@ function eval_fmt(fmt, v, opts, flen) { out.push({t:'t', v:c}); ++i; break; } } - - /* walk backwards */ + var bt = 0; for(i=out.length-1, lst='t'; i >= 0; --i) { switch(out[i].t) { - case 'h': case 'H': out[i].t = hr; lst='h'; break; - case 'd': case 'y': case 's': case 'M': case 'e': lst=out[i].t; break; - case 'm': if(lst === 's') out[i].t = 'M'; break; + case 'h': case 'H': out[i].t = hr; lst='h'; if(bt < 1) bt = 1; break; + case 's': if(bt < 3) bt = 3; + /* falls through */ + case 'd': case 'y': case 'M': case 'e': lst=out[i].t; break; + case 'm': if(lst === 's') { out[i].t = 'M'; if(bt < 2) bt = 2; } break; + case 'Z': + if(bt < 1 && out[i].v.match(/[Hh]/)) bt = 1; + if(bt < 2 && out[i].v.match(/[Mm]/)) bt = 2; + if(bt < 3 && out[i].v.match(/[Ss]/)) bt = 3; } } - + switch(bt) { + case 0: break; + case 1: + if(dt.u >= .5) { dt.u = 0; ++dt.S; } + if(dt.S >= 60) { dt.S = 0; ++dt.M; } + if(dt.M >= 60) { dt.M = 0; ++dt.H; } + break; + case 2: + if(dt.u >= .5) { dt.u = 0; ++dt.S; } + if(dt.S >= 60) { dt.S = 0; ++dt.M; } + break; + } /* replace fields */ for(i=0; i < out.length; ++i) { switch(out[i].t) { case 't': case 'T': case ' ': case 'D': break; case 'd': case 'm': case 'y': case 'h': case 'H': case 'M': case 's': case 'e': case 'Z': - out[i].v = write_date(out[i].t, out[i].v, dt); + out[i].v = write_date(out[i].t, out[i].v, dt, bt); out[i].t = 't'; break; case 'n': case '(': case '?': var jj = i+1; diff --git a/ssf.md b/ssf.md index acc9b8a..149c66d 100644 --- a/ssf.md +++ b/ssf.md @@ -298,7 +298,7 @@ Due to floating point issues, correct for subseconds: ``` if(out.u > .999) { out.u = 0; - ++time; + if(++time == 86400) { time = 0; ++date; } } ``` @@ -678,21 +678,55 @@ The default magic characters are listed in subsubsections 18.8.30-31 of ECMA376: } } - /* walk backwards */ +``` + +In order to identify cases like `MMSS`, where the fact that this is a minute +appears after the minute itself, scan backwards. At the same time, we can +identify the smallest time unit (0 = no time, 1 = hour, 2 = minute, 3 = second): + +``` + var bt = 0; for(i=out.length-1, lst='t'; i >= 0; --i) { switch(out[i].t) { - case 'h': case 'H': out[i].t = hr; lst='h'; break; - case 'd': case 'y': case 's': case 'M': case 'e': lst=out[i].t; break; - case 'm': if(lst === 's') out[i].t = 'M'; break; + case 'h': case 'H': out[i].t = hr; lst='h'; if(bt < 1) bt = 1; break; + case 's': if(bt < 3) bt = 3; + /* falls through */ + case 'd': case 'y': case 'M': case 'e': lst=out[i].t; break; + case 'm': if(lst === 's') { out[i].t = 'M'; if(bt < 2) bt = 2; } break; + case 'Z': + if(bt < 1 && out[i].v.match(/[Hh]/)) bt = 1; + if(bt < 2 && out[i].v.match(/[Mm]/)) bt = 2; + if(bt < 3 && out[i].v.match(/[Ss]/)) bt = 3; } } +``` +Having determined the smallest time unit, round appropriately: + +``` + switch(bt) { + case 0: break; + case 1: + if(dt.u >= .5) { dt.u = 0; ++dt.S; } + if(dt.S >= 60) { dt.S = 0; ++dt.M; } + if(dt.M >= 60) { dt.M = 0; ++dt.H; } + break; + case 2: + if(dt.u >= .5) { dt.u = 0; ++dt.S; } + if(dt.S >= 60) { dt.S = 0; ++dt.M; } + break; + } +``` + +Finally, actually write the numbers: + +``` /* replace fields */ for(i=0; i < out.length; ++i) { switch(out[i].t) { case 't': case 'T': case ' ': case 'D': break; case 'd': case 'm': case 'y': case 'h': case 'H': case 'M': case 's': case 'e': case 'Z': - out[i].v = write_date(out[i].t, out[i].v, dt); + out[i].v = write_date(out[i].t, out[i].v, dt, bt); out[i].t = 't'; break; case 'n': case '(': case '?': var jj = i+1; @@ -734,7 +768,7 @@ display minutes instead of the month. /*jshint -W086 */ var write_date = function(type, fmt, val) { if(val < 0) return ""; - var o; + var o, ss; switch(type) { case 'y': switch(fmt) { /* year */ case 'y': case 'yy': return pad(val.y % 100,2); @@ -784,11 +818,11 @@ Strangely enough, `dddddddddddddddddddd` is treated as the full day name: default: throw 'bad minute format: ' + fmt; } case 's': switch(fmt) { /* seconds */ - case 's': return Math.round(val.S+val.u); - case 'ss': return pad(Math.round(val.S+val.u), 2); - case 'ss.0': o = pad(Math.round(10*(val.S+val.u)),3); return o.substr(0,2)+"." + o.substr(2); - case 'ss.00': o = pad(Math.round(100*(val.S+val.u)),4); return o.substr(0,2)+"." + o.substr(2); - case 'ss.000': o = pad(Math.round(1000*(val.S+val.u)),5); return o.substr(0,2)+"." + o.substr(2); + case 's': ss=Math.round(val.S+val.u); return ss >= 60 ? 0 : ss; + case 'ss': ss=Math.round(val.S+val.u); if(ss>=60) ss=0; return pad(ss,2); + case 'ss.0': ss=Math.round(10*(val.S+val.u)); if(ss>=600) ss = 0; o = pad(ss,3); return o.substr(0,2)+"." + o.substr(2); + case 'ss.00': ss=Math.round(100*(val.S+val.u)); if(ss>=6000) ss = 0; o = pad(ss,4); return o.substr(0,2)+"." + o.substr(2); + case 'ss.000': ss=Math.round(1000*(val.S+val.u)); if(ss>=60000) ss = 0; o = pad(ss,5); return o.substr(0,2)+"." + o.substr(2); default: throw 'bad second format: ' + fmt; } ``` @@ -1023,7 +1057,7 @@ coveralls: ```json>package.json { "name": "ssf", - "version": "0.5.12", + "version": "0.6.0", "author": "SheetJS", "description": "pure-JS library to format data using ECMA-376 spreadsheet Format Codes", "keywords": [ "format", "sprintf", "spreadsheet" ], @@ -1159,7 +1193,7 @@ function doit(data) { } }); } -describe('time formats', function() { doit(times.slice(0,1000)); }); +describe('time formats', function() { doit(process.env.MINTEST ? times.slice(0,4000) : times); }); describe('date formats', function() { doit(process.env.MINTEST ? dates.slice(0,1000) : dates); it('should fail for bad formats', function() { diff --git a/test/date.js b/test/date.js index ed523e1..f32ad67 100644 --- a/test/date.js +++ b/test/date.js @@ -21,7 +21,7 @@ function doit(data) { } }); } -describe('time formats', function() { doit(times.slice(0,1000)); }); +describe('time formats', function() { doit(process.env.MINTEST ? times.slice(0,4000) : times); }); describe('date formats', function() { doit(process.env.MINTEST ? dates.slice(0,1000) : dates); it('should fail for bad formats', function() {