office-viewer 0.1.0 → 0.1.3

package/lib/render/renderDrawing.js

@@ -2,41 +2,146 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
+var Paragraph = require('../openxml/word/Paragraph.js');
+var dom = require('../util/dom.js');
+var renderParagraph = require('./renderParagraph.js');
+var renderTable = require('./renderTable.js');
+var Table = require('../openxml/word/Table.js');
+var renderGeom = require('./renderGeom.js');
+var renderCustGeom = require('./renderCustGeom.js');
+
+/**
+ * 渲染图片
+ */
+function renderPic(pic, word, drawing) {
+    var _a, _b;
+    var blip = (_a = pic.blipFill) === null || _a === void 0 ? void 0 : _a.blip;
+    if (blip && blip.src) {
+        var img = document.createElement('img');
+        img.style.position = 'relative';
+        img.alt = pic.alt || '';
+        img.src = blip.src;
+        if (pic.alt && word.renderOptions.enableVar) {
+            if (pic.altVar) {
+                img.src = pic.altVar;
+            }
+            else if (pic.alt.startsWith('{{')) {
+                var src = word.replaceText(pic.alt);
+                if (src) {
+                    img.src = src;
+                }
+            }
+        }
+        var xfrm = (_b = pic.spPr) === null || _b === void 0 ? void 0 : _b.xfrm;
+        if (xfrm) {
+            var off = xfrm.off;
+            if (off) {
+                img.style.left = off.x;
+                img.style.top = off.y;
+            }
+            var ext = xfrm.ext;
+            if (ext) {
+                img.style.width = ext.cx;
+                img.style.height = ext.cy;
+            }
+            if (xfrm.rot) {
+                img.style.transform = "rotate(".concat(xfrm.rot, "deg)");
+            }
+        }
+        return img;
+    }
+    return null;
+}
 /**
  * 渲染图片，目前只支持 picture
  * http://officeopenxml.com/drwOverview.php
+ * @param inHeader，如果在 header 中，位置计算要特殊处理
  *
  */
-function renderDrawing(word, drawing) {
-    var _a, _b, _c;
-    var pic = drawing.pic;
-    if (pic) {
-        var blip = (_a = pic.blipFill) === null || _a === void 0 ? void 0 : _a.blip;
-        if (blip && blip.embled) {
-            var img_1 = document.createElement('img');
-            img_1.style.position = 'relative';
-            (_b = word.loadImage(blip.embled)) === null || _b === void 0 ? void 0 : _b.then(function (url) {
-                if (url) {
-                    img_1.src = url;
+function renderDrawing(word, drawing, inHeader) {
+    var e_1, _a;
+    var container = document.createElement('div');
+    if (drawing.position === 'inline') {
+        container.style.display = 'inline-block';
+    }
+    else if (drawing.position === 'anchor') ;
+    if (drawing.pic) {
+        dom.appendChild(container, renderPic(drawing.pic, word));
+    }
+    if (drawing.relativeFromV === 'page') {
+        console.warn('暂不支持 drawing.relativeFromV === "page"');
+    }
+    dom.applyStyle(container, drawing.containerStyle);
+    container.dataset.id = drawing.id || '';
+    container.dataset.name = drawing.name || '';
+    if (drawing.wps) {
+        var wps = drawing.wps;
+        var wpsStyle = wps.wpsStyle;
+        var spPr = wps.spPr;
+        dom.applyStyle(container, wps.style);
+        if (wpsStyle === null || wpsStyle === void 0 ? void 0 : wpsStyle.fontColor) {
+            container.style.color = wpsStyle.fontColor;
+        }
+        if (spPr === null || spPr === void 0 ? void 0 : spPr.xfrm) {
+            var ext = spPr.xfrm.ext;
+            if (ext) {
+                container.style.width = ext.cx;
+                container.style.height = ext.cy;
+                if (spPr.geom) {
+                    var width = parseFloat(ext.cx.replace('px', ''));
+                    var height = parseFloat(ext.cy.replace('px', ''));
+                    dom.appendChild(container, renderGeom.renderGeom(spPr.geom, spPr, width, height, wps.wpsStyle));
                 }
-            });
-            var xfrm = (_c = pic.spPr) === null || _c === void 0 ? void 0 : _c.xfrm;
-            if (xfrm) {
-                var off = xfrm.off;
-                if (off) {
-                    img_1.style.left = off.x;
-                    img_1.style.top = off.y;
+                if (spPr.custGeom) {
+                    var width = parseFloat(ext.cx.replace('px', ''));
+                    var height = parseFloat(ext.cy.replace('px', ''));
+                    dom.appendChild(container, renderCustGeom.renderCustGeom(spPr.custGeom, spPr, width, height, wps.wpsStyle));
                 }
-                var ext = xfrm.ext;
-                if (ext) {
-                    img_1.style.width = ext.cx;
-                    img_1.style.height = ext.cy;
+            }
+            if (spPr.xfrm.rot) {
+                container.style.transform = "rotate(".concat(spPr.xfrm.rot, "deg)");
+            }
+        }
+        var txbxContent = wps.txbxContent;
+        if (txbxContent.length) {
+            // 为了实现垂直居中，将父容器改成 table 布局
+            var textContainer = document.createElement('div');
+            textContainer.dataset.name = 'textContainer';
+            container.style.display = 'table';
+            textContainer.style.display = 'table-cell';
+            textContainer.style.verticalAlign = 'middle';
+            if (wps.style && wps.style['vertical-align']) {
+                textContainer.style.verticalAlign = wps.style['vertical-align'];
+                // 容器的 vertical-align 需要去掉，虽然也不影响
+                container.style.verticalAlign = '';
+            }
+            dom.appendChild(container, textContainer);
+            try {
+                for (var txbxContent_1 = tslib.__values(txbxContent), txbxContent_1_1 = txbxContent_1.next(); !txbxContent_1_1.done; txbxContent_1_1 = txbxContent_1.next()) {
+                    var txbxContentChild = txbxContent_1_1.value;
+                    if (txbxContentChild instanceof Paragraph.Paragraph) {
+                        dom.appendChild(textContainer, renderParagraph["default"](word, txbxContentChild));
+                    }
+                    else if (txbxContentChild instanceof Table.Table) {
+                        dom.appendChild(textContainer, renderTable["default"](word, txbxContentChild));
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (txbxContent_1_1 && !txbxContent_1_1.done && (_a = txbxContent_1.return)) _a.call(txbxContent_1);
                 }
+                finally { if (e_1) throw e_1.error; }
             }
-            return img_1;
         }
     }
-    return null;
+    // 如果没内容就不渲染了，避免高度导致撑开父节点
+    if (container.children.length === 0) {
+        return null;
+    }
+    return container;
 }
 
 exports.renderDrawing = renderDrawing;

package/lib/render/renderFont.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 渲染自定义字体样式
+ */
+import { FontTable } from '../openxml/word/FontTable';
+export declare function renderFont(fontTable?: FontTable): HTMLElement | null;

package/lib/render/renderFont.js

@@ -0,0 +1,43 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var dom = require('../util/dom.js');
+
+/**
+ * 渲染自定义字体样式
+ */
+function renderFont(fontTable) {
+    var e_1, _a;
+    if (!fontTable) {
+        return null;
+    }
+    var fonts = fontTable.fonts;
+    if (!fonts || !fonts.length) {
+        return null;
+    }
+    var style = dom.createElement('style');
+    var fontContent = '/** embedded fonts **/';
+    try {
+        for (var _b = tslib.__values(fontTable.fonts), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var font = _c.value;
+            var fontName = font.name.replace(/['\\]/g, ''); // 简单防止 xss
+            var fontPath = font.url;
+            if (fontName && fontPath) {
+                fontContent += "\n      @font-face {\n        font-family: '".concat(fontName, "';\n        src: url('").concat(fontPath, "');\n      }\n      ");
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    style.innerHTML = fontContent;
+    return style;
+}
+
+exports.renderFont = renderFont;

package/lib/render/renderGeom.d.ts

@@ -0,0 +1,4 @@
+import { Geom } from '../openxml/drawing/Geom';
+import { ShapePr } from '../openxml/drawing/ShapeProperties';
+import { WPSStyle } from '../openxml/word/wps/WPSStyle';
+export declare function renderGeom(geom: Geom, shapePr: ShapePr, width: number, height: number, wpsStyle?: WPSStyle): SVGElement | null;

package/lib/render/renderGeom.js

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var presetShape = require('../openxml/drawing/presetShape.js');
+var shapeToSVG = require('../openxml/drawing/svg/shapeToSVG.js');
+
+function renderGeom(geom, shapePr, width, height, wpsStyle) {
+    if (geom.prst) {
+        var shape = presetShape.presetShape[geom.prst];
+        if (shape) {
+            return shapeToSVG.shapeToSVG(shape, geom.avLst || [], shapePr, width, height, wpsStyle);
+        }
+    }
+    return null;
+}
+
+exports.renderGeom = renderGeom;

package/lib/render/renderHeader.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 渲染 header 内容
+ */
+import Word from '../Word';
+import { Header } from '../openxml/word/Header';
+export declare function renderHeader(word: Word, header: Header): HTMLElement;

package/lib/render/renderHeader.js

@@ -0,0 +1,44 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var Paragraph = require('../openxml/word/Paragraph.js');
+var renderParagraph = require('./renderParagraph.js');
+var dom = require('../util/dom.js');
+var renderTable = require('./renderTable.js');
+var Table = require('../openxml/word/Table.js');
+
+/**
+ * 渲染 header 内容
+ */
+function renderHeader(word, header) {
+    var e_1, _a;
+    var headerEl = dom.createElement('div');
+    try {
+        for (var _b = tslib.__values(header.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var child = _c.value;
+            if (child instanceof Paragraph.Paragraph) {
+                var p = renderParagraph["default"](word, child, true, true);
+                dom.appendChild(headerEl, p);
+            }
+            else if (child instanceof Table.Table) {
+                var table = renderTable["default"](word, child);
+                dom.appendChild(headerEl, table);
+            }
+            else {
+                console.warn('unknown child', child);
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return headerEl;
+}
+
+exports.renderHeader = renderHeader;

package/lib/render/renderHyperLink.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var dom = require('../util/dom.js');
 var Run = require('../openxml/word/Run.js');
 var renderRun = require('./renderRun.js');
@@ -23,8 +23,11 @@ function renderHyperLink(word, hyperlink, paragraph) {
     if (hyperlink.anchor) {
         a.href = '#' + hyperlink.anchor;
     }
+    if (hyperlink.tooltip) {
+        a.title = hyperlink.tooltip;
+    }
     try {
-        for (var _b = tslib_es6.__values(hyperlink.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = tslib.__values(hyperlink.children), _c = _b.next(); !_c.done; _c = _b.next()) {
             var child = _c.value;
             if (child instanceof Run.Run) {
                 var span = renderRun["default"](word, child, paragraph);

package/lib/render/renderInlineText.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var dom = require('../util/dom.js');
 var Run = require('../openxml/word/Run.js');
 var Bookmark = require('../openxml/word/Bookmark.js');
@@ -17,7 +17,7 @@ var renderBookmark = require('./renderBookmark.js');
 function renderInlineText(word, inlineText, parent) {
     var e_1, _a;
     try {
-        for (var _b = tslib_es6.__values(inlineText.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = tslib.__values(inlineText.children), _c = _b.next(); !_c.done; _c = _b.next()) {
             var child = _c.value;
             if (child instanceof Run.Run) {
                 dom.appendChild(parent, renderRun["default"](word, child));

package/lib/render/renderInstrText.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var dom = require('../util/dom.js');
 var renderInlineText = require('./renderInlineText.js');
 
@@ -21,7 +21,7 @@ function renderInstrText(word, instrText) {
         try {
             // 其实不知道这样做是不是对的
             // 另外就是这里有很多指令还不支持 http://webapp.docx4java.org/OnlineDemo/ecma376/WordML/FILENAME.html
-            for (var fldSimples_1 = tslib_es6.__values(fldSimples), fldSimples_1_1 = fldSimples_1.next(); !fldSimples_1_1.done; fldSimples_1_1 = fldSimples_1.next()) {
+            for (var fldSimples_1 = tslib.__values(fldSimples), fldSimples_1_1 = fldSimples_1.next(); !fldSimples_1_1.done; fldSimples_1_1 = fldSimples_1.next()) {
                 var fldSimple = fldSimples_1_1.value;
                 if (fldSimple.instr === text.trim() ||
                     text.startsWith(fldSimple.instr + ' ')) {

package/lib/render/renderMath.d.ts

@@ -0,0 +1,3 @@
+import { OMath } from '../openxml/math/OMath';
+import Word from '../Word';
+export declare function renderOMath(word: Word, math: OMath): DocumentFragment;

package/lib/render/renderMath.js

@@ -0,0 +1,11 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var convertOOML = require('../openxml/math/convertOOML.js');
+
+function renderOMath(word, math) {
+    return convertOOML.convertOOXML(math.element);
+}
+
+exports.renderOMath = renderOMath;

package/lib/render/renderNoBreakHyphen.d.ts

@@ -0,0 +1 @@
+export declare function renderNoBreakHyphen(): HTMLElement;

package/lib/render/renderNoBreakHyphen.js

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var dom = require('../util/dom.js');
+
+function renderNoBreakHyphen() {
+    var softHyphen = dom.createElement('span');
+    softHyphen.innerHTML = '–';
+    return softHyphen;
+}
+
+exports.renderNoBreakHyphen = renderNoBreakHyphen;

package/lib/render/renderNotes.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 渲染 footnotes 和 endnotes，这个需要最后执行
+ */
+import Word from '../Word';
+export declare function renderNotes(word: Word): HTMLElement | null;

package/lib/render/renderNotes.js

@@ -0,0 +1,81 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var Paragraph = require('../openxml/word/Paragraph.js');
+var Table = require('../openxml/word/Table.js');
+var dom = require('../util/dom.js');
+var renderParagraph = require('./renderParagraph.js');
+var renderTable = require('./renderTable.js');
+
+/**
+ * 渲染 footnotes 和 endnotes，这个需要最后执行
+ */
+function renderNote(word, noteRoot, type, id, note) {
+    var e_1, _a;
+    var noteChild = note.children;
+    var noteElement = dom.createElement('div');
+    var mark = dom.createElement('a');
+    var fName = type + '-' + id;
+    mark.name = fName;
+    mark.id = fName;
+    noteRoot.appendChild(noteElement);
+    try {
+        for (var noteChild_1 = tslib.__values(noteChild), noteChild_1_1 = noteChild_1.next(); !noteChild_1_1.done; noteChild_1_1 = noteChild_1.next()) {
+            var child = noteChild_1_1.value;
+            if (child instanceof Paragraph.Paragraph) {
+                var p = renderParagraph["default"](word, child);
+                dom.appendChild(noteElement, p);
+            }
+            else if (child instanceof Table.Table) {
+                dom.appendChild(noteElement, renderTable["default"](word, child));
+            }
+            else {
+                console.warn('unknown child', child);
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (noteChild_1_1 && !noteChild_1_1.done && (_a = noteChild_1.return)) _a.call(noteChild_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+}
+/*
+ * 过滤掉 0 和 -1 后是否还有其他的值，没有的话就不需要渲染
+ */
+function hasNote(notes) {
+    if (!notes) {
+        return false;
+    }
+    for (var id in notes) {
+        if (id !== '0' && id !== '-1') {
+            return true;
+        }
+    }
+    return false;
+}
+function renderNotes(word) {
+    var noteRoot = dom.createElement('div');
+    if (hasNote(word.footNotes)) {
+        for (var fId in word.footNotes) {
+            renderNote(word, noteRoot, 'footnote', fId, word.footNotes[fId]);
+        }
+    }
+    if (hasNote(word.endNotes)) {
+        for (var fId in word.endNotes || {}) {
+            renderNote(word, noteRoot, 'endnote', fId, word.endNotes[fId]);
+        }
+    }
+    if (noteRoot.children.length) {
+        return noteRoot;
+    }
+    else {
+        return null;
+    }
+}
+
+exports.renderNotes = renderNotes;

package/lib/render/renderNumbering.js

@@ -2,9 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var dom = require('../util/dom.js');
-var Types = require('../openxml/Types.js');
 var setElementStyle = require('./setElementStyle.js');
 
 /**
@@ -40,17 +39,17 @@ function romanize(num) {
  */
 function convertNumToFormat(numFmt, num) {
     switch (numFmt) {
-        case Types.ST_NumberFormat.decimal:
+        case 'decimal':
             return num.toString();
-        case Types.ST_NumberFormat.lowerLetter:
+        case 'lowerLetter':
             return String.fromCharCode(96 + num);
-        case Types.ST_NumberFormat.upperLetter:
+        case 'upperLetter':
             return String.fromCharCode(64 + num);
-        case Types.ST_NumberFormat.lowerRoman:
+        case 'lowerRoman':
             return romanize(num).toLowerCase();
-        case Types.ST_NumberFormat.upperRoman:
+        case 'upperRoman':
             return romanize(num).toUpperCase();
-        case Types.ST_NumberFormat.bullet:
+        case 'bullet':
             // 原本其实是用
             return '•';
         default:
@@ -80,7 +79,7 @@ function renderNumbering(p, word, numPr) {
     var abstractNum = numbering.abstractNums[num.abstractNumId];
     var lvls = abstractNum.lvls;
     if (num.lvlOverride) {
-        lvls = tslib_es6.__assign(tslib_es6.__assign({}, lvls), num.lvlOverride.lvls);
+        lvls = tslib.__assign(tslib.__assign({}, lvls), num.lvlOverride.lvls);
     }
     var lvl = lvls[numPr.ilvl];
     if (!lvl) {
@@ -133,8 +132,7 @@ function renderNumbering(p, word, numPr) {
     // 还不支持 lvlJc
     // 还不支持 image
     // http://officeopenxml.com/WPnumbering-imagesAsSymbol.php
-    if (lvl.numFmt !== Types.ST_NumberFormat.bullet ||
-        word.renderOptions.bulletUseFont) {
+    if (lvl.numFmt !== 'bullet' || word.renderOptions.bulletUseFont) {
         element.innerText = lvlText;
     }
     else {

package/lib/render/renderParagraph.d.ts

@@ -4,4 +4,4 @@ import { Paragraph } from '../openxml/word/Paragraph';
  * 渲染段落
  * @param renderEmptySpace 如果是 true 的话，当内容为空时会自动加上  
  */
-export default function renderParagraph(word: Word, paragraph: Paragraph, renderEmptySpace?: boolean): HTMLElement;
+export default function renderParagraph(word: Word, paragraph: Paragraph, renderEmptySpace?: boolean, inHeader?: boolean): HTMLElement;

package/lib/render/renderParagraph.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var dom = require('../util/dom.js');
 var Run = require('../openxml/word/Run.js');
 var Bookmark = require('../openxml/word/Bookmark.js');
@@ -12,46 +12,40 @@ var renderHyperLink = require('./renderHyperLink.js');
 var renderBookmark = require('./renderBookmark.js');
 var renderNumbering = require('./renderNumbering.js');
 var setElementStyle = require('./setElementStyle.js');
-var renderTab = require('./renderTab.js');
-var SmartTag = require('../openxml/word/SmartTag.js');
-var renderInlineText = require('./renderInlineText.js');
+var OMath = require('../openxml/math/OMath.js');
+var renderMath = require('./renderMath.js');
 
 /**
  * 渲染段落
  * @param renderEmptySpace 如果是 true 的话，当内容为空时会自动加上  
  */
-function renderParagraph(word, paragraph, renderEmptySpace) {
-    var e_1, _a, e_2, _b;
+function renderParagraph(word, paragraph, renderEmptySpace, inHeader) {
+    var e_1, _a;
     if (renderEmptySpace === void 0) { renderEmptySpace = true; }
+    if (inHeader === void 0) { inHeader = false; }
     word.currentParagraph = paragraph;
     var p = dom.createElement('p');
     word.addClass(p, 'p');
     var properties = paragraph.properties;
     setElementStyle.setElementStyle(word, p, properties);
+    // 默认情况下 drawing 是相对段落的
+    p.style.position = 'relative';
     // 渲染列表前缀
     if (properties.numPr) {
         dom.appendChild(p, renderNumbering.renderNumbering(p, word, properties.numPr));
     }
-    if (properties.tabs) {
-        try {
-            for (var _c = tslib_es6.__values(properties.tabs), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var tab = _d.value;
-                dom.appendChild(p, renderTab.renderTab(word, tab));
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-    }
+    var inFldChar = false;
     try {
-        for (var _e = tslib_es6.__values(paragraph.children), _f = _e.next(); !_f.done; _f = _e.next()) {
-            var child = _f.value;
+        for (var _b = tslib.__values(paragraph.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var child = _c.value;
             if (child instanceof Run.Run) {
-                dom.appendChild(p, renderRun["default"](word, child, paragraph));
+                if (child.fldChar === 'begin') {
+                    inFldChar = true;
+                }
+                else if (child) {
+                    inFldChar = false;
+                }
+                dom.appendChild(p, renderRun["default"](word, child, paragraph, inFldChar, inHeader));
             }
             else if (child instanceof Bookmark.BookmarkStart) {
                 dom.appendChild(p, renderBookmark.renderBookmarkStart(word, child));
@@ -60,17 +54,20 @@ function renderParagraph(word, paragraph, renderEmptySpace) {
                 var hyperlink = renderHyperLink.renderHyperLink(word, child, paragraph);
                 dom.appendChild(p, hyperlink);
             }
-            else if (child instanceof SmartTag.SmartTag) {
-                renderInlineText["default"](word, child, p);
+            else if (child instanceof OMath.OMath) {
+                dom.appendChild(p, renderMath.renderOMath(word, child));
+            }
+            else {
+                console.warn('unknow pargraph type', child);
             }
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_1) throw e_1.error; }
     }
     // 空行自动加个空格，不然会没高度
     if (p.innerHTML === '' && renderEmptySpace) {