Skip to content

Commit 20212e1

Browse files
committed
version bump 0.16.9: utf-8 codenames
1 parent f7835d6 commit 20212e1

21 files changed

+139
-72
lines changed

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,9 +1093,13 @@ In addition to the base sheet keys, worksheets also add:
10931093
will write all cells in the merge range if they exist, so be sure that only
10941094
the first cell (upper-left) in the range is set.
10951095

1096-
- `ws['!outline']`: configure how outlines should behave.
1097-
Example: `{above: true}` - equivalent of unchecking the Excel option "Summary rows below detail".
1098-
`{left: true}` - equivalent of unchecking the Excel option "Summary option to the right of detail."
1096+
- `ws['!outline']`: configure how outlines should behave. Options default to
1097+
the default settings in Excel 2019:
1098+
1099+
| key | Excel feature | default |
1100+
|:----------|:----------------------------------------------|:--------|
1101+
| `above` | Uncheck "Summary rows below detail" | `false` |
1102+
| `left` | Uncheck "Summary rows to the right of detail" | `false` |
10991103

11001104
- `ws['!protect']`: object of write sheet protection properties. The `password`
11011105
key specifies the password for formats that support password-protected sheets

bits/01_version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
XLSX.version = '0.16.8';
1+
XLSX.version = '0.16.9';

bits/67_wsxml.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function write_ws_xml_merges(merges/*:Array<Range>*/)/*:string*/ {
102102
function parse_ws_xml_sheetpr(sheetPr/*:string*/, s, wb/*:WBWBProps*/, idx/*:number*/) {
103103
var data = parsexmltag(sheetPr);
104104
if(!wb.Sheets[idx]) wb.Sheets[idx] = {};
105-
if(data.codeName) wb.Sheets[idx].CodeName = data.codeName;
105+
if(data.codeName) wb.Sheets[idx].CodeName = unescapexml(utf8read(data.codeName));
106106
}
107107
function write_ws_xml_sheetpr(ws, wb, idx, opts, o) {
108108
var needed = false;
@@ -111,7 +111,7 @@ function write_ws_xml_sheetpr(ws, wb, idx, opts, o) {
111111
var cname = wb.SheetNames[idx];
112112
try { if(wb.Workbook) cname = wb.Workbook.Sheets[idx].CodeName || cname; } catch(e) {}
113113
needed = true;
114-
props.codeName = escapexml(cname);
114+
props.codeName = utf8write(escapexml(cname));
115115
}
116116

117117
if(ws && ws["!outline"]) {

bits/80_parseods.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ var parse_content_xml = (function() {
382382
case 'line-break': break; // 6.1.5 <text:line-break>
383383
case 'span': break; // 6.1.7 <text:span>
384384
case 'p': case '文本串': // 5.1.3 <text:p>
385-
if(['master-styles'].indexOf(state[satte.length-1][0]) > -1) break;
385+
if(['master-styles'].indexOf(state[state.length-1][0]) > -1) break;
386386
if(Rn[1]==='/' && (!ctag || !ctag['string-value'])) {
387387
var ptp = parse_text_p(str.slice(textpidx,Rn.index), textptag);
388388
textp = (textp.length > 0 ? textp + "\n" : "") + ptp[0];

dist/xlsx.core.min.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/xlsx.core.min.map

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

dist/xlsx.extendscript.js

Lines changed: 13 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/xlsx.full.min.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/xlsx.full.min.map

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

dist/xlsx.js

Lines changed: 13 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)