support for LO Calc's 'GENERAL' format

This commit is contained in:
SheetJS 2014-01-03 11:45:11 -05:00
parent e9482bfa26
commit acdc0d5fff
3 changed files with 13 additions and 5 deletions

4
ssf.js

@ -350,12 +350,12 @@ function choose_fmt(fmt, v, o) {
if(typeof v !== "number") return [fmt.length, fmt[3]];
return [l, v > 0 ? fmt[0] : v < 0 ? fmt[1] : fmt[2]];
}
var format = function format(fmt,v,o) {
fixopts(o = (o||{}));
if(fmt === 0) return general_fmt(v, o);
if(fmt === 0 || (typeof fmt === "string" && fmt.toLowerCase() === "general")) return general_fmt(v, o);
if(typeof fmt === 'number') fmt = table_fmt[fmt];
var f = choose_fmt(fmt, v, o);
if(f[1].toLowerCase() === "general") return general_fmt(v,o);
return eval_fmt(f[1], v, o, f[0]);
};

11
ssf.md

@ -699,10 +699,19 @@ function choose_fmt(fmt, v, o) {
if(typeof v !== "number") return [fmt.length, fmt[3]];
return [l, v > 0 ? fmt[0] : v < 0 ? fmt[1] : fmt[2]];
}
```
Finally, the format wrapper brings everything together:
```
var format = function format(fmt,v,o) {
fixopts(o = (o||{}));
if(fmt === 0) return general_fmt(v, o);
```
LibreOffice appears to emit the format "GENERAL" for general:
```
if(fmt === 0 || (typeof fmt === "string" && fmt.toLowerCase() === "general")) return general_fmt(v, o);
if(typeof fmt === 'number') fmt = table_fmt[fmt];
var f = choose_fmt(fmt, v, o);
return eval_fmt(f[1], v, o, f[0]);

@ -350,10 +350,9 @@ function choose_fmt(fmt, v, o) {
if(typeof v !== "number") return [fmt.length, fmt[3]];
return [l, v > 0 ? fmt[0] : v < 0 ? fmt[1] : fmt[2]];
}
var format = function format(fmt,v,o) {
fixopts(o = (o||{}));
if(fmt === 0) return general_fmt(v, o);
if(fmt === 0 || (typeof fmt === "string" && fmt.toLowerCase() === "general")) return general_fmt(v, o);
if(typeof fmt === 'number') fmt = table_fmt[fmt];
var f = choose_fmt(fmt, v, o);
return eval_fmt(f[1], v, o, f[0]);