@manuscripts/transform 2.1.3 → 2.1.5-LEAN-3376-0

package/dist/cjs/index.js

@@ -18,7 +18,6 @@ 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,8 +21,6 @@ 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';
@@ -39,6 +37,28 @@ const chooseContentType = (graphicNode) => {
         }
     }
 };
+const getEquationContent = (p) => {
+    var _a;
+    const element = p;
+    const id = element.getAttribute('id');
+    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':
+                contents = child.innerHTML;
+                format = 'tex';
+                break;
+            case 'mml:math':
+                contents = child.outerHTML;
+                format = 'mathml';
+                break;
+        }
+    }
+    return { id, format, contents };
+};
 const marks = [
     {
         tag: 'bold',
@@ -147,91 +167,26 @@ const nodes = [
         tag: 'inline-formula',
         node: 'inline_equation',
         getAttrs: (node) => {
-            var _a, _b, _c, _d, _e;
             const element = node;
-            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;
+            return getEquationContent(element);
         },
     },
     {
         tag: 'disp-formula',
         node: 'equation_element',
         getAttrs: (node) => {
+            var _a, _b;
             const element = node;
-            const caption = element.querySelector('figcaption');
             return {
                 id: element.getAttribute('id'),
-                suppressCaption: !caption,
+                label: (_b = (_a = element.querySelector('label')) === null || _a === void 0 ? void 0 : _a.textContent) !== null && _b !== void 0 ? _b : '',
             };
         },
         getContent: (node, schema) => {
-            var _a, _b, _c, _d, _e;
             const element = node;
-            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();
+            const attrs = getEquationContent(element);
             return prosemirror_model_1.Fragment.from([
-                schema.nodes.equation.createChecked(attrs),
-                caption
-                    ?
-                        exports.jatsBodyDOMParser.parse(caption, {
-                            topNode: figcaption,
-                        })
-                    : figcaption,
+                schema.nodes.equation.createChecked(Object.assign({}, attrs)),
             ]);
         },
     },
@@ -525,23 +480,9 @@ const nodes = [
             const element = node;
             return {
                 id: element.getAttribute('id'),
-                suppressFooter: !element.querySelector('table > tfoot > tr'),
-                suppressHeader: !element.querySelector('table > thead > tr'),
             };
         },
     },
-    {
-        tag: 'tbody',
-        skip: true,
-    },
-    {
-        tag: 'tfoot',
-        skip: true,
-    },
-    {
-        tag: 'thead',
-        skip: true,
-    },
     {
         tag: 'title',
         node: 'section_title',
@@ -568,12 +509,12 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_cell',
+        node: 'table_header',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');
             const rowspan = element.getAttribute('rowspan');
-            return Object.assign(Object.assign(Object.assign({ celltype: 'th' }, (colspan && { colspan })), (rowspan && { rowspan })), { valign: element.getAttribute('valign'), align: element.getAttribute('align'), scope: element.getAttribute('scope'), style: element.getAttribute('style') });
+            return Object.assign(Object.assign(Object.assign({}, (colspan && { colspan })), (rowspan && { rowspan })), { valign: element.getAttribute('valign'), align: element.getAttribute('align'), scope: element.getAttribute('scope'), style: element.getAttribute('style') });
         },
     },
     {

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

@@ -202,7 +202,9 @@ exports.jatsBodyTransformations = {
         }
     },
     moveFootnotes(doc, group, createElement) {
-        const footnotes = [...doc.querySelectorAll('fn:not(table-wrap-foot fn)')];
+        const footnotes = [
+            ...doc.querySelectorAll('fn:not(table-wrap-foot fn, author-notes fn)'),
+        ];
         const footnotesSection = doc.querySelector('sec[sec-type="endnotes"]');
         const footnotesSectionGroup = footnotesSection === null || footnotesSection === void 0 ? void 0 : footnotesSection.querySelector('fn-group');
         const containingGroup = footnotesSectionGroup || createElement('fn-group');
@@ -239,8 +241,12 @@ exports.jatsBodyTransformations = {
         }
     },
     fixTables(body, createElement) {
-        const tables = body.querySelectorAll('table-wrap > table');
-        tables.forEach((table) => {
+        const tableWraps = body.querySelectorAll('table-wrap');
+        tableWraps.forEach((tableWrap) => {
+            const table = tableWrap.querySelector('table');
+            if (!table) {
+                return;
+            }
             const colgroup = table.querySelector('colgroup');
             const cols = table.querySelectorAll('col');
             if (!colgroup && table.firstChild && cols.length > 0) {
@@ -248,20 +254,7 @@ exports.jatsBodyTransformations = {
                 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');
-                if (!headerRow) {
-                    const tr = createElement('tr');
-                    tbody.insertBefore(tr, tbody.firstElementChild);
-                }
-                const footerRow = table.querySelector('tfoot > tr');
-                if (!footerRow) {
-                    const tr = createElement('tr');
-                    tbody.appendChild(tr);
-                }
+                tableWrap.insertBefore(colgroup, table.nextSibling);
             }
         });
     },

package/dist/cjs/jats/importer/jats-front-parser.js

@@ -179,7 +179,45 @@ exports.jatsFrontParser = {
             affiliationIDs,
         };
     },
-    parseAuthorNotes(elements) {
+    parseAuthorNotes(element) {
+        if (!element) {
+            return {
+                footnotes: [],
+                footnoteIDs: new Map(),
+                authorNotes: [],
+                authorNotesParagraphs: [],
+                correspondingIDs: new Map(),
+                correspondingList: [],
+            };
+        }
+        const { footnotes, footnoteIDs } = this.parseFootnotes([
+            ...element.querySelectorAll('fn:not([fn-type])'),
+        ]);
+        const authorNotesParagraphs = this.parseParagraphs([
+            ...element.querySelectorAll(':scope > p'),
+        ]);
+        const { correspondingList, correspondingIDs } = this.parseCorresp([
+            ...element.querySelectorAll('corresp'),
+        ]);
+        const authorNotes = [
+            (0, transformer_1.buildAuthorNotes)([
+                ...footnoteIDs.values(),
+                ...authorNotesParagraphs.map((p) => p._id),
+            ]),
+        ];
+        return {
+            footnotes,
+            footnoteIDs,
+            authorNotesParagraphs,
+            authorNotes,
+            correspondingIDs,
+            correspondingList,
+        };
+    },
+    parseParagraphs(elements) {
+        return elements.map((p) => (0, transformer_1.buildParagraph)(p.innerHTML));
+    },
+    parseFootnotes(elements) {
         const footnoteIDs = new Map();
         const footnotes = elements.map((element) => {
             const fn = (0, transformer_1.buildFootnote)('', element.innerHTML);

package/dist/cjs/jats/importer/jats-parser-utils.js

@@ -16,6 +16,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.htmlFromJatsNode = exports.updateDocumentIDs = void 0;
+const uuid_1 = require("uuid");
+const schema_1 = require("../../schema");
 const transformer_1 = require("../../transformer");
 const updateDocumentIDs = (node, replacements) => {
     const warnings = [];
@@ -30,6 +32,10 @@ function recurseDoc(node, fn) {
     node.descendants((n) => fn(n));
 }
 const updateNodeID = (node, replacements, warnings) => {
+    if (node.type === schema_1.schema.nodes.inline_equation) {
+        node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `InlineMathFragment:${(0, uuid_1.v4)()}` });
+        return;
+    }
     if (!('id' in node.attrs)) {
         return;
     }

package/dist/cjs/jats/importer/parse-jats-article.js

@@ -35,12 +35,7 @@ const parseJATSFront = (doc, front) => {
     const { affiliations, affiliationIDs } = jats_front_parser_1.jatsFrontParser.parseAffiliations([
         ...front.querySelectorAll('article-meta > contrib-group > aff'),
     ]);
-    const { footnotes, footnoteIDs } = jats_front_parser_1.jatsFrontParser.parseAuthorNotes([
-        ...front.querySelectorAll('article-meta > author-notes > fn:not([fn-type])'),
-    ]);
-    const { correspondingList, correspondingIDs } = jats_front_parser_1.jatsFrontParser.parseCorresp([
-        ...front.querySelectorAll('article-meta > author-notes > corresp'),
-    ]);
+    const { footnotes, footnoteIDs, authorNotes, authorNotesParagraphs, correspondingIDs, correspondingList, } = jats_front_parser_1.jatsFrontParser.parseAuthorNotes(front.querySelector('article-meta > author-notes'));
     const authors = jats_front_parser_1.jatsFrontParser.parseContributors([
         ...front.querySelectorAll('article-meta > contrib-group > contrib[contrib-type="author"]'),
     ], affiliationIDs, footnoteIDs, correspondingIDs);
@@ -51,6 +46,8 @@ const parseJATSFront = (doc, front) => {
         manuscript,
         titles,
         journal,
+        ...authorNotesParagraphs,
+        ...authorNotes,
         ...footnotes,
         ...authors,
         ...affiliations,

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

@@ -95,7 +95,7 @@ const createDefaultIdGenerator = () => {
     const counter = (0, exports.createCounter)();
     return async (element) => {
         const value = String(counter.increment(element.nodeName));
-        return `${element.nodeName}-${value}`;
+        return `${element.localName}-${value}`;
     };
 };
 const chooseRefType = (objectType) => {
@@ -164,6 +164,7 @@ class JATSExporter {
         };
         this.nodeFromJATS = (JATSFragment) => {
             JATSFragment = JATSFragment.trim();
+            JATSFragment = JATSFragment.replace(' ', ' ');
             if (!JATSFragment.length) {
                 return null;
             }
@@ -614,6 +615,7 @@ class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
+                author_notes: () => ['author-notes', 0],
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
@@ -686,22 +688,20 @@ class JATSExporter {
                 },
                 doc: () => '',
                 equation: (node) => {
-                    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;
+                    return this.createEquation(node);
+                },
+                inline_equation: (node) => {
+                    const eqElement = this.document.createElement('inline-formula');
+                    const equation = this.createEquation(node, true);
+                    eqElement.append(equation);
+                    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;
                 },
-                equation_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.equation, 'equation'),
                 figcaption: (node) => {
                     if (!node.textContent) {
                         return '';
@@ -751,28 +751,6 @@ 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');
@@ -873,9 +851,13 @@ class JATSExporter {
                     element.setAttribute('position', 'anchor');
                     return element;
                 },
-                table_body: () => ['tbody', 0],
                 table_cell: (node) => [
-                    node.attrs.celltype,
+                    'td',
+                    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,
+                ],
+                table_header: (node) => [
+                    'th',
                     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,
                 ],
@@ -956,6 +938,26 @@ class JATSExporter {
                     element.appendChild(this.serializeNode(childNode));
                 }
             };
+            const appendTable = (element, node) => {
+                const tableNode = findChildNodeOfType(node, node.type.schema.nodes.table);
+                const colGroupNode = findChildNodeOfType(node, node.type.schema.nodes.table_colgroup);
+                if (!tableNode) {
+                    return;
+                }
+                const table = this.serializeNode(tableNode);
+                const tbodyElement = this.document.createElement('tbody');
+                while (table.firstChild) {
+                    const child = table.firstChild;
+                    table.removeChild(child);
+                    tbodyElement.appendChild(child);
+                }
+                table.appendChild(tbodyElement);
+                if (colGroupNode) {
+                    const colGroup = this.serializeNode(colGroupNode);
+                    table.insertBefore(colGroup, table.firstChild);
+                }
+                element.appendChild(table);
+            };
             const createFigureElement = (node, nodeName, contentNodeType, figType) => {
                 const element = createElement(node, nodeName);
                 if (figType) {
@@ -976,7 +978,7 @@ class JATSExporter {
                 const element = createElement(node, nodeName);
                 appendLabels(element, node);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.figcaption);
-                appendChildNodeOfType(element, node, node.type.schema.nodes.table);
+                appendTable(element, node);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.table_element_footer);
                 if ((0, node_types_1.isExecutableNodeType)(node.type)) {
                     processExecutableNode(node, element);
@@ -1034,6 +1036,7 @@ class JATSExporter {
             }
         };
         this.buildContributors = (articleMeta) => {
+            var _a;
             const contributors = this.models.filter(isContributor);
             const authorContributors = contributors
                 .filter((contributor) => contributor.role === 'author')
@@ -1252,56 +1255,59 @@ class JATSExporter {
                         }
                     });
                 }
-                const noteIDs = [];
-                for (const contributor of [...authorContributors, ...otherContributors]) {
-                    if (contributor.footnote) {
-                        const ids = contributor.footnote.map((note) => {
-                            return note.noteID;
-                        });
-                        noteIDs.push(...ids);
-                    }
-                    if (contributor.corresp) {
-                        const ids = contributor.corresp.map((corresp) => {
-                            return corresp.correspID;
-                        });
-                        noteIDs.push(...ids);
-                    }
-                }
-                const footnotes = [];
-                footnotes.push(...this.models.filter((0, object_types_1.hasObjectType)(json_schema_1.ObjectTypes.Footnote)));
-                const correspodings = [];
-                correspodings.push(...this.models.filter((0, object_types_1.hasObjectType)(json_schema_1.ObjectTypes.Corresponding)));
-                if (footnotes || correspodings) {
-                    const authorNotesEl = this.document.createElement('author-notes');
-                    const usedFootnotes = footnotes.filter((footnote) => {
-                        return noteIDs.includes(footnote._id);
-                    });
-                    const usedCorrespodings = correspodings.filter((corresp) => {
-                        return noteIDs.includes(corresp._id);
-                    });
-                    usedFootnotes.forEach((footnote) => {
-                        const authorFootNote = this.document.createElement('fn');
-                        authorFootNote.setAttribute('id', normalizeID(footnote._id));
-                        authorFootNote.innerHTML = footnote.contents;
-                        authorNotesEl.appendChild(authorFootNote);
-                    });
-                    usedCorrespodings.forEach((corresponding) => {
-                        const correspondingEl = this.document.createElement('corresp');
-                        correspondingEl.setAttribute('id', normalizeID(corresponding._id));
-                        if (corresponding.label) {
-                            const labelEl = this.document.createElement('label');
-                            labelEl.textContent = corresponding.label;
-                            correspondingEl.appendChild(labelEl);
+                const authorNotesEl = this.document.createElement('author-notes');
+                const usedCorrespodings = this.getUsedCorrespondings([
+                    ...authorContributors,
+                    ...otherContributors,
+                ]);
+                usedCorrespodings.forEach((corresp) => {
+                    this.appendCorrespondingToElement(corresp, authorNotesEl);
+                });
+                const authorNotes = (_a = (0, json_schema_1.getModelsByType)(this.modelMap, json_schema_1.ObjectTypes.AuthorNotes)) === null || _a === void 0 ? void 0 : _a[0];
+                if (authorNotes) {
+                    authorNotes.containedObjectIDs.forEach((id) => {
+                        const model = this.modelMap.get(id);
+                        if (!model) {
+                            return;
+                        }
+                        if (id.startsWith('MPParagraphElement')) {
+                            this.appendParagraphToElement(model, authorNotesEl);
+                        }
+                        else if (id.startsWith('MPFootnote')) {
+                            this.appendFootnoteToElement(model, authorNotesEl);
                         }
-                        correspondingEl.append(corresponding.contents);
-                        authorNotesEl.appendChild(correspondingEl);
                     });
-                    if (authorNotesEl.childNodes.length > 0) {
-                        articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
-                    }
                 }
+                if (authorNotesEl.childNodes.length > 0) {
+                    articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
+                }
+            }
+        };
+        this.appendCorrespondingToElement = (corresponding, element) => {
+            const correspondingEl = this.document.createElement('corresp');
+            correspondingEl.setAttribute('id', normalizeID(corresponding._id));
+            if (corresponding.label) {
+                const labelEl = this.document.createElement('label');
+                labelEl.textContent = corresponding.label;
+                correspondingEl.appendChild(labelEl);
+            }
+            correspondingEl.append(corresponding.contents);
+            element.appendChild(correspondingEl);
+        };
+        this.appendParagraphToElement = (paragraph, element) => {
+            const parser = new DOMParser();
+            const xmlDoc = parser.parseFromString(paragraph.contents, 'text/xml');
+            const paragraphEl = xmlDoc.firstChild;
+            if (paragraphEl && paragraphEl.nodeName === 'p') {
+                element.appendChild(paragraphEl);
             }
         };
+        this.appendFootnoteToElement = (footnote, element) => {
+            const footnoteEl = this.document.createElement('fn');
+            footnoteEl.setAttribute('id', normalizeID(footnote._id));
+            footnoteEl.innerHTML = footnote.contents;
+            element.appendChild(footnoteEl);
+        };
         this.fixBody = (body, fragment) => {
             fragment.descendants((node) => {
                 if (node.attrs.id) {
@@ -1589,6 +1595,27 @@ class JATSExporter {
             this.citationTexts.set(id, output);
         });
     }
+    createEquation(node, isInline = false) {
+        if (node.attrs.format === 'tex') {
+            const texMath = this.document.createElement('tex-math');
+            texMath.innerHTML = node.attrs.contents;
+            return texMath;
+        }
+        else {
+            const math = this.nodeFromJATS(node.attrs.contents);
+            const mathml = math;
+            if (!isInline) {
+                mathml.setAttribute('id', normalizeID(node.attrs.id));
+            }
+            return mathml;
+        }
+    }
+    getUsedCorrespondings(contributors) {
+        return contributors
+            .flatMap((c) => { var _a; return (_a = c.corresp) !== null && _a !== void 0 ? _a : []; })
+            .map((corresp) => this.modelMap.get(corresp.correspID))
+            .filter((corresp) => !!corresp);
+    }
     buildKeywords(articleMeta) {
         const keywords = [...this.modelMap.values()].filter((model) => model.objectType === json_schema_1.ObjectTypes.Keyword);
         const keywordGroups = new Map();
@@ -1660,6 +1687,9 @@ class JATSExporter {
                             }
                         }
                     }
+                    if (!fnGroup.hasChildNodes()) {
+                        fnGroup.remove();
+                    }
                 }
             }
         });

package/dist/cjs/schema/index.js

@@ -36,6 +36,7 @@ const abstracts_1 = require("./nodes/abstracts");
 const affiliation_1 = require("./nodes/affiliation");
 const affiliations_1 = require("./nodes/affiliations");
 const attribution_1 = require("./nodes/attribution");
+const author_notes_1 = require("./nodes/author_notes");
 const backmatter_1 = require("./nodes/backmatter");
 const bibliography_element_1 = require("./nodes/bibliography_element");
 const bibliography_item_1 = require("./nodes/bibliography_item");
@@ -87,7 +88,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,7 +117,6 @@ __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);
@@ -137,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);
@@ -213,12 +211,12 @@ 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,
+        table_header: table_1.tableHeader,
         text: text_1.text,
         toc_element: toc_element_1.tocElement,
         toc_section: toc_section_1.tocSection,
@@ -230,5 +228,6 @@ exports.schema = new prosemirror_model_1.Schema({
         contributors: contributors_1.contributors,
         supplements: supplements_1.supplements,
         supplement: supplement_1.supplement,
+        author_notes: author_notes_1.authorNotes,
     },
 });