@manuscripts/transform 2.1.1-LEAN-3092-1 → 2.1.1-LEAN-3336-6

package/dist/cjs/index.js

@@ -18,6 +18,7 @@ exports.isSectionLabelNode = void 0;
 __exportStar(require("./lib/section-group-type"), exports);
 __exportStar(require("./lib/table-cell-styles"), exports);
 __exportStar(require("./lib/utils"), exports);
+__exportStar(require("./mathjax"), exports);
 __exportStar(require("./schema"), exports);
 __exportStar(require("./transformer"), exports);
 __exportStar(require("./jats"), exports);

package/dist/cjs/jats/importer/jats-body-dom-parser.js

@@ -21,6 +21,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.jatsBodyDOMParser = void 0;
 const mime_1 = __importDefault(require("mime"));
 const prosemirror_model_1 = require("prosemirror-model");
+const mathml_to_svg_1 = require("../../mathjax/mathml-to-svg");
+const tex_to_svg_1 = require("../../mathjax/tex-to-svg");
 const schema_1 = require("../../schema");
 const transformer_1 = require("../../transformer");
 const XLINK_NAMESPACE = 'http://www.w3.org/1999/xlink';
@@ -37,24 +39,6 @@ const chooseContentType = (graphicNode) => {
         }
     }
 };
-const getEquationContent = (p) => {
-    var _a;
-    const element = p;
-    const container = (_a = element.querySelector('alternatives')) !== null && _a !== void 0 ? _a : element;
-    let contents = '';
-    let format = '';
-    for (const child of container.childNodes) {
-        const nodeName = child.nodeName.replace(/^[a-z]:/, '');
-        switch (nodeName) {
-            case 'tex-math':
-            case 'mml:math':
-                contents = child.outerHTML;
-                format = nodeName === 'tex-math' ? 'tex' : 'mathml';
-                break;
-        }
-    }
-    return { format, contents };
-};
 const marks = [
     {
         tag: 'bold',
@@ -163,27 +147,91 @@ const nodes = [
         tag: 'inline-formula',
         node: 'inline_equation',
         getAttrs: (node) => {
+            var _a, _b, _c, _d, _e;
             const element = node;
-            return getEquationContent(element);
+            const attrs = {
+                id: element.getAttribute('id'),
+                MathMLRepresentation: '',
+                SVGRepresentation: '',
+                TeXRepresentation: '',
+            };
+            const container = (_a = element.querySelector('alternatives')) !== null && _a !== void 0 ? _a : element;
+            for (const child of container.childNodes) {
+                const nodeName = child.nodeName.replace(/^[a-z]:/, '');
+                switch (nodeName) {
+                    case 'tex-math':
+                        attrs.TeXRepresentation = (_c = (_b = child.textContent) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : '';
+                        if (attrs.TeXRepresentation) {
+                            attrs.SVGRepresentation =
+                                (_d = (0, tex_to_svg_1.convertTeXToSVG)(attrs.TeXRepresentation, true)) !== null && _d !== void 0 ? _d : '';
+                        }
+                        break;
+                    case 'mml:math':
+                        ;
+                        child.removeAttribute('id');
+                        attrs.MathMLRepresentation = transformer_1.xmlSerializer.serializeToString(child);
+                        if (attrs.MathMLRepresentation) {
+                            attrs.SVGRepresentation =
+                                (_e = (0, mathml_to_svg_1.convertMathMLToSVG)(attrs.MathMLRepresentation, true)) !== null && _e !== void 0 ? _e : '';
+                        }
+                        break;
+                }
+            }
+            return attrs;
         },
     },
     {
         tag: 'disp-formula',
         node: 'equation_element',
         getAttrs: (node) => {
-            var _a, _b;
             const element = node;
+            const caption = element.querySelector('figcaption');
             return {
                 id: element.getAttribute('id'),
-                label: (_b = (_a = element.querySelector('label')) === null || _a === void 0 ? void 0 : _a.textContent) !== null && _b !== void 0 ? _b : '',
+                suppressCaption: !caption,
             };
         },
         getContent: (node, schema) => {
+            var _a, _b, _c, _d, _e;
             const element = node;
-            const attrs = getEquationContent(element);
-            const id = element.getAttribute('id');
+            const attrs = {
+                MathMLStringRepresentation: '',
+                SVGStringRepresentation: '',
+                TeXRepresentation: '',
+            };
+            const container = (_a = element.querySelector('alternatives')) !== null && _a !== void 0 ? _a : element;
+            for (const child of container.childNodes) {
+                const nodeName = child.nodeName.replace(/^[a-z]:/, '');
+                switch (nodeName) {
+                    case 'tex-math':
+                        attrs.TeXRepresentation = (_c = (_b = child.textContent) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : '';
+                        if (attrs.TeXRepresentation) {
+                            attrs.SVGStringRepresentation =
+                                (_d = (0, tex_to_svg_1.convertTeXToSVG)(attrs.TeXRepresentation, true)) !== null && _d !== void 0 ? _d : '';
+                        }
+                        break;
+                    case 'mml:math':
+                        ;
+                        child.removeAttribute('id');
+                        attrs.MathMLStringRepresentation =
+                            transformer_1.xmlSerializer.serializeToString(child);
+                        if (attrs.MathMLStringRepresentation) {
+                            attrs.SVGStringRepresentation =
+                                (_e = (0, mathml_to_svg_1.convertMathMLToSVG)(attrs.MathMLStringRepresentation, true)) !== null && _e !== void 0 ? _e : '';
+                        }
+                        break;
+                }
+            }
+            const caption = element.querySelector('figcaption');
+            const figcaption = schema.nodes.figcaption.create();
             return prosemirror_model_1.Fragment.from([
-                schema.nodes.equation.createChecked(Object.assign({ id }, attrs)),
+                schema.nodes.equation.createChecked(attrs),
+                caption
+                    ?
+                        exports.jatsBodyDOMParser.parse(caption, {
+                            topNode: figcaption,
+                        })
+                    : figcaption,
             ]);
         },
     },
@@ -520,7 +568,7 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_cell',
+        node: 'table_header',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');
@@ -538,10 +586,6 @@ const nodes = [
             };
         },
     },
-    {
-        tag: 'colgroup',
-        node: 'table_colgroup',
-    },
     {
         tag: 'xref[ref-type="bibr"]',
         node: 'citation',

package/dist/cjs/jats/importer/jats-body-transformations.js

@@ -241,15 +241,6 @@ exports.jatsBodyTransformations = {
     fixTables(body, createElement) {
         const tables = body.querySelectorAll('table-wrap > table');
         tables.forEach((table) => {
-            const colgroup = table.querySelector('colgroup');
-            const cols = table.querySelectorAll('col');
-            if (!colgroup && table.firstChild && cols.length > 0) {
-                const colgroup = createElement('colgroup');
-                for (const col of cols) {
-                    colgroup.appendChild(col);
-                }
-                table.insertBefore(colgroup, table.firstChild);
-            }
             const tbody = table.querySelector('tbody');
             if (tbody) {
                 const headerRow = table.querySelector('thead > tr');

package/dist/cjs/jats/jats-exporter.js

@@ -164,7 +164,6 @@ class JATSExporter {
         };
         this.nodeFromJATS = (JATSFragment) => {
             JATSFragment = JATSFragment.trim();
-            JATSFragment = JATSFragment.replace(' ', ' ');
             if (!JATSFragment.length) {
                 return null;
             }
@@ -615,6 +614,11 @@ class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
+                table_header: (node) => [
+                    node.attrs.celltype,
+                    Object.assign(Object.assign({ valign: node.attrs.valign, align: node.attrs.align, scope: node.attrs.scope, style: node.attrs.style }, (node.attrs.rowspan > 1 && { rowspan: node.attrs.rowspan })), (node.attrs.colspan > 1 && { colspan: node.attrs.colspan })),
+                    0,
+                ],
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
@@ -687,23 +691,22 @@ class JATSExporter {
                 },
                 doc: () => '',
                 equation: (node) => {
-                    const math = this.nodeFromJATS(node.attrs.contents);
-                    const mathEl = math;
-                    mathEl.setAttribute('id', normalizeID(node.attrs.id));
-                    return mathEl;
-                },
-                inline_equation: (node) => {
-                    const eqElement = this.document.createElement('inline-formula');
-                    const math = this.nodeFromJATS(node.attrs.contents);
-                    eqElement.append(math);
-                    return eqElement;
-                },
-                equation_element: (node) => {
-                    const eqElement = this.document.createElement('disp-formula');
-                    eqElement.setAttribute('id', normalizeID(node.attrs.id));
-                    processChildNodes(eqElement, node, schema_1.schema.nodes.equation);
-                    return eqElement;
+                    const formula = this.document.createElement('disp-formula');
+                    formula.setAttribute('id', normalizeID(node.attrs.id));
+                    if (node.attrs.TeXRepresentation) {
+                        const math = this.document.createElement('tex-math');
+                        math.textContent = node.attrs.TeXRepresentation;
+                        formula.appendChild(math);
+                    }
+                    else if (node.attrs.MathMLStringRepresentation) {
+                        const math = this.nodeFromJATS(node.attrs.MathMLStringRepresentation);
+                        if (math) {
+                            formula.appendChild(math);
+                        }
+                    }
+                    return formula;
                 },
+                equation_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.equation, 'equation'),
                 figcaption: (node) => {
                     if (!node.textContent) {
                         return '';
@@ -753,6 +756,28 @@ class JATSExporter {
                 },
                 hard_break: () => '',
                 highlight_marker: () => '',
+                inline_equation: (node) => {
+                    const formula = this.document.createElement('inline-formula');
+                    formula.setAttribute('id', normalizeID(node.attrs.id));
+                    if (node.attrs.TeXRepresentation) {
+                        const math = this.document.createElement('tex-math');
+                        math.textContent = node.attrs.TeXRepresentation;
+                        formula.appendChild(math);
+                    }
+                    else if (node.attrs.MathMLRepresentation) {
+                        const math = this.nodeFromJATS(node.attrs.MathMLRepresentation);
+                        if (math) {
+                            formula.appendChild(math);
+                        }
+                    }
+                    else if (node.attrs.SVGRepresentation) {
+                        const math = this.nodeFromJATS(node.attrs.SVGRepresentation);
+                        if (math) {
+                            formula.appendChild(math);
+                        }
+                    }
+                    return formula;
+                },
                 inline_footnote: (node) => {
                     const xref = this.document.createElement('xref');
                     xref.setAttribute('ref-type', 'fn');
@@ -853,7 +878,6 @@ class JATSExporter {
                     element.setAttribute('position', 'anchor');
                     return element;
                 },
-                table_body: () => ['tbody', 0],
                 table_cell: (node) => [
                     node.attrs.celltype,
                     Object.assign(Object.assign({ valign: node.attrs.valign, align: node.attrs.align, scope: node.attrs.scope, style: node.attrs.style }, (node.attrs.rowspan > 1 && { rowspan: node.attrs.rowspan })), (node.attrs.colspan > 1 && { colspan: node.attrs.colspan })),

package/dist/cjs/mathjax/index.js

@@ -0,0 +1,41 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertTeXToSVG = exports.convertTeXToMathML = exports.convertMathMLToSVG = void 0;
+const convertMathMLToSVG = async (mathml, display) => {
+    const { convertMathMLToSVG } = await Promise.resolve().then(() => __importStar(require('./mathml-to-svg')));
+    return convertMathMLToSVG(mathml, display);
+};
+exports.convertMathMLToSVG = convertMathMLToSVG;
+const convertTeXToMathML = async (tex, display) => {
+    const { convertTeXToMathML } = await Promise.resolve().then(() => __importStar(require('./tex-to-mathml')));
+    return convertTeXToMathML(tex, display);
+};
+exports.convertTeXToMathML = convertTeXToMathML;
+const convertTeXToSVG = async (tex, display) => {
+    const { convertTeXToSVG } = await Promise.resolve().then(() => __importStar(require('./tex-to-svg')));
+    return convertTeXToSVG(tex, display);
+};
+exports.convertTeXToSVG = convertTeXToSVG;

package/dist/cjs/mathjax/mathjax-packages.js

@@ -0,0 +1,20 @@
+"use strict";
+/*!
+ * © 2019 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.packages = void 0;
+const AllPackages_1 = require("mathjax-full/js/input/tex/AllPackages");
+exports.packages = AllPackages_1.AllPackages.filter((name) => name !== 'html' && name !== 'bussproofs');

package/dist/cjs/mathjax/mathml-to-svg.js

@@ -0,0 +1,70 @@
+"use strict";
+/*!
+ * © 2019 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertMathMLToSVG = void 0;
+require("mathjax-full/js/util/entities/all");
+const HTMLAdaptor_1 = require("mathjax-full/js/adaptors/HTMLAdaptor");
+const MmlFactory_1 = require("mathjax-full/js/core/MmlTree/MmlFactory");
+const HTMLDocument_1 = require("mathjax-full/js/handlers/html/HTMLDocument");
+const mathml_1 = require("mathjax-full/js/input/mathml");
+const svg_1 = require("mathjax-full/js/output/svg");
+const transformer_1 = require("../transformer");
+class ManuscriptsMmlFactory extends MmlFactory_1.MmlFactory {
+    constructor() {
+        super();
+        this.nodeMap.set('image', this.nodeMap.get('none'));
+    }
+    create(kind, properties = {}, children = []) {
+        if (kind === 'image') {
+            return this.node['none'](properties, children);
+        }
+        return this.node[kind](properties, children);
+    }
+}
+class ManuscriptsHTMLAdaptor extends HTMLAdaptor_1.HTMLAdaptor {
+    setAttribute(node, name, value, ns) {
+        if (name !== 'xmlns') {
+            ns ? node.setAttributeNS(ns, name, value) : node.setAttribute(name, value);
+        }
+    }
+}
+const InputJax = new mathml_1.MathML();
+const OutputJax = new svg_1.SVG({
+    fontCache: 'none',
+});
+const adaptor = new ManuscriptsHTMLAdaptor(window);
+const doc = new HTMLDocument_1.HTMLDocument(document, adaptor, {
+    InputJax,
+    OutputJax,
+    MmlFactory: new ManuscriptsMmlFactory(),
+});
+doc.addStyleSheet();
+const convertMathMLToSVG = (mathml, display) => {
+    const item = doc.convert(mathml, {
+        display,
+        em: 16,
+        ex: 8,
+        containerWidth: 1000000,
+        lineWidth: 1000000,
+        scale: 1,
+    });
+    if (!item || !item.firstChild) {
+        return null;
+    }
+    return transformer_1.xmlSerializer.serializeToString(item.firstChild);
+};
+exports.convertMathMLToSVG = convertMathMLToSVG;

package/dist/cjs/mathjax/tex-to-mathml.js

@@ -0,0 +1,49 @@
+"use strict";
+/*!
+ * © 2019 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertTeXToMathML = void 0;
+require("mathjax-full/js/util/entities/all");
+const HTMLAdaptor_1 = require("mathjax-full/js/adaptors/HTMLAdaptor");
+const MathItem_js_1 = require("mathjax-full/js/core/MathItem.js");
+const SerializedMmlVisitor_1 = require("mathjax-full/js/core/MmlTree/SerializedMmlVisitor");
+const HTMLDocument_1 = require("mathjax-full/js/handlers/html/HTMLDocument");
+const tex_1 = require("mathjax-full/js/input/tex");
+const mathjax_packages_1 = require("./mathjax-packages");
+const InputJax = new tex_1.TeX({
+    packages: mathjax_packages_1.packages,
+});
+const adaptor = new HTMLAdaptor_1.HTMLAdaptor(window);
+const doc = new HTMLDocument_1.HTMLDocument(document, adaptor, {
+    InputJax,
+});
+const visitor = new SerializedMmlVisitor_1.SerializedMmlVisitor();
+const convertTeXToMathML = (tex, display) => {
+    const item = doc.convert(tex, {
+        display,
+        em: 16,
+        ex: 8,
+        containerWidth: 1000000,
+        lineWidth: 1000000,
+        scale: 1,
+        end: MathItem_js_1.STATE.CONVERT,
+    });
+    if (!item) {
+        return null;
+    }
+    return visitor.visitTree(item);
+};
+exports.convertTeXToMathML = convertTeXToMathML;

package/dist/cjs/mathjax/tex-to-svg.js

@@ -0,0 +1,59 @@
+"use strict";
+/*!
+ * © 2019 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertTeXToSVG = void 0;
+require("mathjax-full/js/util/entities/all");
+const HTMLAdaptor_1 = require("mathjax-full/js/adaptors/HTMLAdaptor");
+const HTMLDocument_1 = require("mathjax-full/js/handlers/html/HTMLDocument");
+const tex_1 = require("mathjax-full/js/input/tex");
+const svg_1 = require("mathjax-full/js/output/svg");
+const transformer_1 = require("../transformer");
+const mathjax_packages_1 = require("./mathjax-packages");
+class ManuscriptsHTMLAdaptor extends HTMLAdaptor_1.HTMLAdaptor {
+    setAttribute(node, name, value, ns) {
+        if (name !== 'xmlns') {
+            ns ? node.setAttributeNS(ns, name, value) : node.setAttribute(name, value);
+        }
+    }
+}
+const InputJax = new tex_1.TeX({
+    packages: mathjax_packages_1.packages,
+});
+const OutputJax = new svg_1.SVG({
+    fontCache: 'none',
+});
+const adaptor = new ManuscriptsHTMLAdaptor(window);
+const doc = new HTMLDocument_1.HTMLDocument(document, adaptor, {
+    InputJax,
+    OutputJax,
+});
+doc.addStyleSheet();
+const convertTeXToSVG = (tex, display) => {
+    const item = doc.convert(tex, {
+        display,
+        em: 16,
+        ex: 8,
+        containerWidth: 1000000,
+        lineWidth: 1000000,
+        scale: 1,
+    });
+    if (!item || !item.firstChild) {
+        return null;
+    }
+    return transformer_1.xmlSerializer.serializeToString(item.firstChild);
+};
+exports.convertTeXToSVG = convertTeXToSVG;

package/dist/cjs/schema/index.js

@@ -87,7 +87,6 @@ const table_1 = require("./nodes/table");
 const table_col_1 = require("./nodes/table_col");
 const table_element_1 = require("./nodes/table_element");
 const table_element_footer_1 = require("./nodes/table_element_footer");
-const table_row_1 = require("./nodes/table_row");
 const text_1 = require("./nodes/text");
 const title_1 = require("./nodes/title");
 const toc_element_1 = require("./nodes/toc_element");
@@ -117,6 +116,7 @@ __exportStar(require("./nodes/footnotes_section"), exports);
 __exportStar(require("./nodes/graphical_abstract_section"), exports);
 __exportStar(require("./nodes/hard_break"), exports);
 __exportStar(require("./nodes/highlight_marker"), exports);
+__exportStar(require("./nodes/inline_equation"), exports);
 __exportStar(require("./nodes/inline_footnote"), exports);
 __exportStar(require("./nodes/keyword"), exports);
 __exportStar(require("./nodes/keywords_element"), exports);
@@ -136,7 +136,6 @@ __exportStar(require("./nodes/section_title"), exports);
 __exportStar(require("./nodes/table"), exports);
 __exportStar(require("./nodes/table_col"), exports);
 __exportStar(require("./nodes/table_element"), exports);
-__exportStar(require("./nodes/table_row"), exports);
 __exportStar(require("./nodes/text"), exports);
 __exportStar(require("./nodes/toc_element"), exports);
 __exportStar(require("./nodes/toc_section"), exports);
@@ -212,10 +211,9 @@ exports.schema = new prosemirror_model_1.Schema({
         section_title: section_title_1.sectionTitle,
         section_title_plain: section_title_1.sectionTitle,
         table: table_1.table,
-        table_body: table_1.tableBody,
-        table_cell: table_row_1.tableCell,
+        table_cell: table_1.tableCell,
         table_element: table_element_1.tableElement,
-        table_row: table_row_1.tableRow,
+        table_row: table_1.tableRow,
         table_col: table_col_1.tableCol,
         table_colgroup: table_col_1.tableColGroup,
         text: text_1.text,
@@ -229,5 +227,6 @@ exports.schema = new prosemirror_model_1.Schema({
         contributors: contributors_1.contributors,
         supplements: supplements_1.supplements,
         supplement: supplement_1.supplement,
+        table_header: table_1.tableHeader,
     },
 });

package/dist/cjs/schema/nodes/equation.js

@@ -1,6 +1,6 @@
 "use strict";
 /*!
- * © 2023 Atypon Systems LLC
+ * © 2019 Atypon Systems LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@ const json_schema_1 = require("@manuscripts/json-schema");
 exports.equation = {
     attrs: {
         id: { default: '' },
-        contents: { default: '' },
-        format: { default: '' },
+        MathMLStringRepresentation: { default: '' },
+        SVGStringRepresentation: { default: '' },
+        TeXRepresentation: { default: '' },
         dataTracked: { default: null },
     },
     group: 'block',
@@ -29,25 +30,26 @@ exports.equation = {
         {
             tag: `div.${json_schema_1.ObjectTypes.Equation}`,
             getAttrs: (p) => {
-                const htmlEl = p;
+                const dom = p;
                 return {
-                    id: htmlEl.getAttribute('id'),
-                    format: htmlEl.getAttribute('data-equation-format'),
-                    contents: htmlEl.innerHTML,
+                    id: dom.getAttribute('id'),
+                    MathMLStringRepresentation: dom.getAttribute('data-mathml-string-representation'),
+                    SVGStringRepresentation: dom.innerHTML,
+                    TeXRepresentation: dom.getAttribute('data-tex-representation'),
                 };
             },
         },
     ],
     toDOM: (node) => {
         const equationNode = node;
-        const { id, contents, format } = equationNode.attrs;
         const dom = document.createElement('div');
+        dom.setAttribute('id', equationNode.attrs.id);
         dom.classList.add(json_schema_1.ObjectTypes.Equation);
-        dom.setAttribute('id', id);
-        if (format) {
-            dom.setAttribute('data-equation-format', format);
+        if (equationNode.attrs.MathMLStringRepresentation) {
+            dom.setAttribute('data-mathml-string-representation', equationNode.attrs.MathMLStringRepresentation);
         }
-        dom.innerHTML = contents;
+        dom.setAttribute('data-tex-representation', equationNode.attrs.TeXRepresentation);
+        dom.innerHTML = equationNode.attrs.SVGStringRepresentation;
         return dom;
     },
 };

package/dist/cjs/schema/nodes/equation_element.js

@@ -17,10 +17,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.equationElement = void 0;
 exports.equationElement = {
-    content: '(equation | placeholder)',
+    content: '(equation | placeholder) figcaption',
     attrs: {
         id: { default: '' },
-        label: { default: '' },
+        suppressCaption: { default: true },
+        suppressTitle: { default: undefined },
         dataTracked: { default: null },
         comments: { default: null },
     },
@@ -28,7 +29,7 @@ exports.equationElement = {
     group: 'block element',
     parseDOM: [
         {
-            tag: 'div.equation',
+            tag: 'figure.equation',
             getAttrs: (p) => {
                 const dom = p;
                 return {
@@ -40,7 +41,7 @@ exports.equationElement = {
     toDOM: (node) => {
         const equationElementNode = node;
         return [
-            'div',
+            'figure',
             {
                 class: 'equation',
                 id: equationElementNode.attrs.id,