diff --git a/bits/80_parseods.js b/bits/80_parseods.js index 7715a6e..8c13717 100644 --- a/bits/80_parseods.js +++ b/bits/80_parseods.js @@ -219,6 +219,7 @@ var parse_content_xml = (function() { case 'scripts': // 3.12 case 'styles': // TODO case 'font-face-decls': // 3.14 + case 'master-styles': //3.15.4 -- relevant for FODS if(Rn[1]==='/'){if((tmp=state.pop())[0]!==Rn[3]) throw "Bad state: "+tmp;} else if(Rn[0].charAt(Rn[0].length-2) !== '/') state.push([Rn[3], true]); break; @@ -285,7 +286,6 @@ var parse_content_xml = (function() { case 'script': break; // 3.13 case 'libraries': break; // TODO: case 'automatic-styles': break; // 3.15.3 - case 'master-styles': break; // TODO: case 'default-style': // TODO: case 'page-layout': break; // TODO: @@ -382,6 +382,7 @@ var parse_content_xml = (function() { case 'line-break': break; // 6.1.5 case 'span': break; // 6.1.7 case 'p': case '文本串': // 5.1.3 + if(['master-styles'].indexOf(state[satte.length-1][0]) > -1) break; if(Rn[1]==='/' && (!ctag || !ctag['string-value'])) { var ptp = parse_text_p(str.slice(textpidx,Rn.index), textptag); textp = (textp.length > 0 ? textp + "\n" : "") + ptp[0];