@manuscripts/transform 2.1.1-LEAN-3336-23 → 2.1.1-LEAN-3377-2

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

@@ -525,9 +525,23 @@ 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',
@@ -554,12 +568,12 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_header',
+        node: 'table_cell',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');
             const rowspan = element.getAttribute('rowspan');
-            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') });
+            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') });
         },
     },
     {

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

@@ -239,12 +239,8 @@ exports.jatsBodyTransformations = {
         }
     },
     fixTables(body, createElement) {
-        const tableWraps = body.querySelectorAll('table-wrap');
-        tableWraps.forEach((tableWrap) => {
-            const table = tableWrap.querySelector('table');
-            if (!table) {
-                return;
-            }
+        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) {
@@ -252,10 +248,33 @@ exports.jatsBodyTransformations = {
                 for (const col of cols) {
                     colgroup.appendChild(col);
                 }
-                tableWrap.insertBefore(colgroup, tableWrap.firstChild);
+                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);
+                }
             }
         });
     },
+    orderTableFootnote(doc, body) {
+        const tableInlineFootnotesIds = new Set(Array.from(body.querySelectorAll('tbody > tr > td > xref[ref-type="fn"]').values()).map((inlineFootnote) => inlineFootnote.getAttribute('rid')));
+        const fnGroups = doc.querySelectorAll('table-wrap-foot > fn-group');
+        fnGroups.forEach((fnGroup) => {
+            const orderedFootnotes = Array.from(fnGroup.querySelectorAll('fn')).sort((fn) => tableInlineFootnotesIds.has(fn.getAttribute('id'))
+                ? -1
+                : 0);
+            fnGroup.replaceChildren(...orderedFootnotes);
+        });
+    },
     moveFloatsGroupToBody(doc, body, createElement) {
         const group = doc.querySelector('floats-group');
         if (group) {

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

@@ -67,6 +67,7 @@ const parseJATSBody = (doc, body, references) => {
     jats_body_transformations_1.jatsBodyTransformations.createBackmatter(doc, body, createElement);
     jats_body_transformations_1.jatsBodyTransformations.createSuppleMaterials(doc, body, createElement);
     jats_body_transformations_1.jatsBodyTransformations.createKeywords(doc, body, createElement);
+    jats_body_transformations_1.jatsBodyTransformations.orderTableFootnote(doc, body);
     const node = jats_body_dom_parser_1.jatsBodyDOMParser.parse(body).firstChild;
     if (!node) {
         throw new Error('No content was parsed from the JATS article body');

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

@@ -873,13 +873,9 @@ class JATSExporter {
                     element.setAttribute('position', 'anchor');
                     return element;
                 },
+                table_body: () => ['tbody', 0],
                 table_cell: (node) => [
-                    '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',
+                    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,
                 ],
@@ -960,26 +956,6 @@ 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) {
@@ -1000,7 +976,7 @@ class JATSExporter {
                 const element = createElement(node, nodeName);
                 appendLabels(element, node);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.figcaption);
-                appendTable(element, node);
+                appendChildNodeOfType(element, node, node.type.schema.nodes.table);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.table_element_footer);
                 if ((0, node_types_1.isExecutableNodeType)(node.type)) {
                     processExecutableNode(node, element);

package/dist/cjs/schema/index.js

@@ -87,6 +87,7 @@ 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");
@@ -136,6 +137,7 @@ __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);
@@ -211,9 +213,10 @@ 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_cell: table_1.tableCell,
+        table_body: table_1.tableBody,
+        table_cell: table_row_1.tableCell,
         table_element: table_element_1.tableElement,
-        table_row: table_1.tableRow,
+        table_row: table_row_1.tableRow,
         table_col: table_col_1.tableCol,
         table_colgroup: table_col_1.tableColGroup,
         text: text_1.text,
@@ -227,6 +230,5 @@ 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/table.js

@@ -15,57 +15,20 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableHeader = exports.tableCell = exports.tableRow = exports.table = void 0;
-const prosemirror_tables_1 = require("prosemirror-tables");
-function createCellAttribute(attributeName, defaultValue = null, customGetFromDOM, customSetDOMAttr) {
-    return {
-        default: defaultValue,
-        getFromDOM(dom) {
-            if (customGetFromDOM) {
-                return customGetFromDOM(dom);
-            }
-            return dom.getAttribute(attributeName);
-        },
-        setDOMAttr(value, attrs) {
-            if (customSetDOMAttr) {
-                customSetDOMAttr(value, attrs);
-            }
-            else if (value) {
-                attrs[attributeName] = value;
-            }
-        },
-    };
-}
-const tableOptions = {
-    cellContent: 'inline*',
-    cellAttributes: {
-        placeholder: createCellAttribute('data-placeholder-text', 'Data', (dom) => dom.getAttribute('data-placeholder-text') || ''),
-        valign: createCellAttribute('valign'),
-        align: createCellAttribute('align'),
-        scope: createCellAttribute('scope'),
-        style: createCellAttribute('style'),
-        colspan: createCellAttribute('colspan', 1, (dom) => Number(dom.getAttribute('colspan') || 1), (value, attrs) => {
-            if (value && value !== 1) {
-                attrs['colspan'] = String(value);
-            }
-        }),
-        rowspan: createCellAttribute('rowspan', 1, (dom) => Number(dom.getAttribute('rowspan') || 1), (value, attrs) => {
-            if (value && value !== 1) {
-                attrs['rowspan'] = String(value);
-            }
-        }),
-    },
-};
-const tableNodes = (0, prosemirror_tables_1.tableNodes)(tableOptions);
+exports.tableBody = exports.table = void 0;
 exports.table = {
+    content: 'table_colgroup? table_body',
+    tableRole: 'table',
+    isolating: true,
+    group: 'block',
+    selectable: false,
     attrs: {
         id: { default: '' },
+        headerRows: { default: 1 },
+        footerRows: { default: 1 },
         dataTracked: { default: null },
+        comments: { default: null },
     },
-    content: 'table_row+',
-    tableRole: 'table',
-    isolating: true,
-    group: 'block',
     parseDOM: [
         {
             tag: 'table',
@@ -73,20 +36,35 @@ exports.table = {
                 const dom = p;
                 return {
                     id: dom.getAttribute('id'),
+                    headerRows: dom.dataset && dom.dataset['header-rows'],
+                    footerRows: dom.dataset && dom.dataset['footer-rows'],
                 };
             },
         },
     ],
-    toDOM(node) {
+    toDOM: (node) => {
+        const tableNode = node;
         return [
             'table',
             {
-                id: node.attrs.id,
+                id: tableNode.attrs.id,
+                'data-header-rows': String(node.attrs.headerRows),
+                'data-footer-rows': String(node.attrs.footerRows),
             },
-            ['tbody', 0],
+            0,
         ];
     },
 };
-exports.tableRow = Object.assign(Object.assign({}, tableNodes.table_row), { attrs: Object.assign(Object.assign({}, tableNodes.table_row.attrs), { dataTracked: { default: null } }) });
-exports.tableCell = Object.assign(Object.assign({}, tableNodes.table_cell), { attrs: Object.assign(Object.assign({}, tableNodes.table_cell.attrs), { dataTracked: { default: null } }) });
-exports.tableHeader = Object.assign(Object.assign({}, tableNodes.table_header), { attrs: Object.assign(Object.assign({}, tableNodes.table_header.attrs), { dataTracked: { default: null } }) });
+exports.tableBody = {
+    content: 'table_row+',
+    group: 'block',
+    tableRole: 'table',
+    parseDOM: [
+        {
+            tag: 'tbody',
+        },
+    ],
+    toDOM() {
+        return ['tbody', 0];
+    },
+};

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

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tableElement = void 0;
 exports.tableElement = {
-    content: 'table_colgroup? (table | placeholder) table_element_footer? figcaption? (listing | placeholder)',
+    content: '(table | placeholder) table_element_footer? figcaption? (listing | placeholder)',
     attrs: {
         id: { default: '' },
         paragraphStyle: { default: '' },

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

@@ -0,0 +1,123 @@
+"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.tableCell = exports.tableRow = void 0;
+const table_cell_styles_1 = require("../../lib/table-cell-styles");
+const getCellAttrs = (p) => {
+    const dom = p;
+    const celltype = dom.tagName.toLowerCase();
+    const widthAttr = dom.getAttribute('data-colwidth');
+    const widths = widthAttr && /^\d+(,\d+)*$/.test(widthAttr)
+        ? widthAttr.split(',').map((s) => Number(s))
+        : null;
+    const colspan = Number(dom.getAttribute('colspan') || 1);
+    const valign = dom.getAttribute('valign');
+    const align = dom.getAttribute('align');
+    const scope = dom.getAttribute('scope');
+    const style = dom.getAttribute('style');
+    return {
+        celltype,
+        colspan,
+        rowspan: Number(dom.getAttribute('rowspan') || 1),
+        colwidth: widths && widths.length === colspan ? widths : null,
+        placeholder: dom.getAttribute('data-placeholder-text') || '',
+        styles: (0, table_cell_styles_1.getTableCellStyles)(dom.style),
+        valign,
+        align,
+        scope,
+        style,
+    };
+};
+exports.tableRow = {
+    content: 'table_cell+',
+    tableRole: 'row',
+    attrs: {
+        placeholder: { default: '' },
+    },
+    parseDOM: [
+        {
+            tag: 'tr',
+            priority: 80,
+        },
+    ],
+    toDOM: (node) => {
+        const tableRowNode = node;
+        const attrs = {};
+        if (tableRowNode.attrs.placeholder) {
+            attrs['data-placeholder-text'] = tableRowNode.attrs.placeholder;
+        }
+        return ['tr', attrs, 0];
+    },
+};
+exports.tableCell = {
+    content: 'inline*',
+    attrs: {
+        celltype: { default: 'td' },
+        colspan: { default: 1 },
+        rowspan: { default: 1 },
+        colwidth: { default: null },
+        placeholder: { default: 'Data' },
+        styles: { default: {} },
+        valign: { default: null },
+        align: { default: null },
+        scope: { default: null },
+        style: { default: null },
+    },
+    tableRole: 'cell',
+    isolating: true,
+    parseDOM: [
+        { tag: 'td', getAttrs: getCellAttrs },
+        { tag: 'th', getAttrs: getCellAttrs },
+    ],
+    toDOM: (node) => {
+        const tableCellNode = node;
+        const attrs = {};
+        const tag = tableCellNode.attrs.celltype;
+        if (tableCellNode.attrs.colspan && tableCellNode.attrs.colspan !== 1) {
+            attrs.colspan = String(tableCellNode.attrs.colspan);
+        }
+        if (tableCellNode.attrs.rowspan && tableCellNode.attrs.rowspan !== 1) {
+            attrs.rowspan = String(tableCellNode.attrs.rowspan);
+        }
+        if (tableCellNode.attrs.colwidth) {
+            attrs['data-colwidth'] = tableCellNode.attrs.colwidth.join(',');
+        }
+        if (tableCellNode.attrs.placeholder) {
+            attrs['data-placeholder-text'] = tableCellNode.attrs.placeholder;
+        }
+        if (!tableCellNode.textContent) {
+            attrs.class = 'placeholder';
+        }
+        const styleString = (0, table_cell_styles_1.serializeTableCellStyles)(tableCellNode.attrs.styles);
+        if (styleString) {
+            attrs.style = styleString;
+        }
+        if (tableCellNode.attrs.valign) {
+            attrs.valign = tableCellNode.attrs.valign;
+        }
+        if (tableCellNode.attrs.align) {
+            attrs.align = tableCellNode.attrs.align;
+        }
+        if (tableCellNode.attrs.scope) {
+            attrs.scope = tableCellNode.attrs.scope;
+        }
+        if (tableCellNode.attrs.style) {
+            attrs.style = tableCellNode.attrs.style;
+        }
+        return [tag, attrs, 0];
+    },
+};

package/dist/cjs/transformer/builders.js

@@ -130,10 +130,11 @@ const buildFootnote = (containingObject, contents, kind = 'footnote') => ({
     kind,
 });
 exports.buildFootnote = buildFootnote;
-const buildFootnotesOrder = (footnotesList) => ({
+const buildFootnotesOrder = (footnotesList, containedObjectID) => ({
     _id: (0, id_1.generateID)(json_schema_1.ObjectTypes.FootnotesOrder),
     objectType: json_schema_1.ObjectTypes.FootnotesOrder,
     footnotesList,
+    containedObjectID,
 });
 exports.buildFootnotesOrder = buildFootnotesOrder;
 const buildCorresp = (contents) => ({

package/dist/cjs/transformer/decode.js

@@ -68,7 +68,6 @@ const getSupplements = (modelMap) => (0, exports.getModelsByType)(modelMap, json
 const getKeywordGroups = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.KeywordGroup);
 const getKeywords = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Keyword);
 const getTitles = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Titles)[0];
-const isFootnote = (0, object_types_1.hasObjectType)(json_schema_1.ObjectTypes.Footnote);
 const hasParentSection = (id) => (section) => section.path &&
     section.path.length > 1 &&
     section.path[section.path.length - 2] === id;
@@ -311,23 +310,25 @@ class Decoder {
             },
             [json_schema_1.ObjectTypes.FootnotesElement]: (data) => {
                 const foonotesElementModel = data;
-                const collateByKind = foonotesElementModel.collateByKind || 'footnote';
                 const footnotesOfKind = [];
-                for (const model of this.modelMap.values()) {
-                    if (isFootnote(model) &&
-                        model.kind === collateByKind &&
-                        model.containingObject === foonotesElementModel._id) {
-                        const comments = this.createCommentNodes(model);
-                        comments.forEach((c) => this.comments.set(c.attrs.id, c));
-                        const footnote = this.parseContents(model.contents || '<div></div>', undefined, this.getComments(model), {
-                            topNode: schema_1.schema.nodes.footnote.create({
-                                id: model._id,
-                                kind: model.kind,
-                                comments: comments.map((c) => c.attrs.id),
-                            }),
-                        });
-                        footnotesOfKind.push(footnote);
-                    }
+                const footnoteOrder = (0, exports.getModelsByType)(this.modelMap, json_schema_1.ObjectTypes.FootnotesOrder).find((model) => model.containedObjectID === data._id);
+                if (footnoteOrder) {
+                    footnoteOrder.footnotesList.map(({ id }) => {
+                        const model = this.modelMap.get(id);
+                        const collateByKind = foonotesElementModel.collateByKind || 'footnote';
+                        if (model.kind === collateByKind) {
+                            const comments = this.createCommentNodes(model);
+                            comments.forEach((c) => this.comments.set(c.attrs.id, c));
+                            const footnote = this.parseContents(model.contents || '<div></div>', undefined, this.getComments(model), {
+                                topNode: schema_1.schema.nodes.footnote.create({
+                                    id: model._id,
+                                    kind: model.kind,
+                                    comments: comments.map((c) => c.attrs.id),
+                                }),
+                            });
+                            footnotesOfKind.push(footnote);
+                        }
+                    });
                 }
                 return schema_1.schema.nodes.footnotes_element.create({
                     id: foonotesElementModel._id,
@@ -557,28 +558,25 @@ class Decoder {
             },
             [json_schema_1.ObjectTypes.Table]: (data) => {
                 const model = data;
-                return this.parseContents(model.contents, undefined, [], {
+                const comments = this.createCommentNodes(model);
+                comments.forEach((c) => this.comments.set(c.attrs.id, c));
+                return this.parseContents(model.contents, undefined, this.getComments(model), {
                     topNode: schema_1.schema.nodes.table.create({
                         id: model._id,
+                        comments: comments.map((c) => c.attrs.id),
                     }),
                 });
             },
             [json_schema_1.ObjectTypes.TableElement]: (data) => {
                 const model = data;
                 const table = this.createTable(model);
-                const tableColGroup = this.createTableColGroup(model);
                 const tableElementFooter = this.createTableElementFooter(model);
                 const figcaption = this.getFigcaption(model);
                 const comments = this.createCommentNodes(model);
                 comments.forEach((c) => this.comments.set(c.attrs.id, c));
-                const content = [table];
-                if (tableColGroup) {
-                    content.unshift(tableColGroup);
-                }
-                if (tableElementFooter) {
-                    content.push(tableElementFooter);
-                }
-                content.push(figcaption);
+                const content = tableElementFooter
+                    ? [table, tableElementFooter, figcaption]
+                    : [table, figcaption];
                 if (model.listingID) {
                     const listing = this.createListing(model.listingID);
                     content.push(listing);
@@ -792,16 +790,6 @@ class Decoder {
         }
         return table;
     }
-    createTableColGroup(model) {
-        const tableId = model.containedObjectID;
-        const tableModel = this.getModel(tableId);
-        if (!tableModel || !tableModel.contents.includes('<colgroup>')) {
-            return undefined;
-        }
-        return this.parseContents(tableModel.contents, undefined, [], {
-            topNode: schema_1.schema.nodes.table_colgroup.create(),
-        });
-    }
     createTableElementFooter(model) {
         const tableElementFooterID = model.tableElementFooterID;
         if (!tableElementFooterID) {

package/dist/cjs/transformer/encode.js

@@ -115,9 +115,8 @@ function buildTableColGroup(cols) {
 }
 const tableContents = (node, parent) => {
     const input = serializer.serializeNode(node);
-    const parentInput = serializer.serializeNode(parent);
     const output = document.createElement('table');
-    const colgroup = buildTableColGroup(Array.from(parentInput.querySelectorAll('col')));
+    const colgroup = buildTableColGroup(Array.from(input.querySelectorAll('col')));
     if (colgroup) {
         output.appendChild(colgroup);
     }
@@ -597,6 +596,9 @@ const encode = (node) => {
             child.type !== schema_1.schema.nodes.inline_equation) {
             return;
         }
+        if (child.type === schema_1.schema.nodes.footnotes_element) {
+            addFootnotesOrderModel(child, models);
+        }
         const { model, markers } = (0, exports.modelFromNode)(child, parent, path, priority);
         markers.forEach((marker) => {
             const comment = models.get(marker._id);
@@ -648,3 +650,9 @@ const generateElementOrder = (node, nodeType) => {
     order.elements = ids;
     return order;
 };
+const addFootnotesOrderModel = (child, models) => {
+    const footnoteList = [];
+    child.forEach((footnote, _, index) => footnoteList.push({ id: footnote.attrs.id, index }));
+    const footnotesOrder = (0, builders_1.buildFootnotesOrder)(footnoteList, child.attrs.id);
+    models.set(footnotesOrder._id, footnotesOrder);
+};

package/dist/cjs/transformer/footnotes-order.js

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEmptyFootnotesOrder = exports.handleFootnotesOrder = exports.createOrderedFootnotesIDs = void 0;
-const builders_1 = require("./builders");
+exports.handleFootnotesOrder = exports.createOrderedFootnotesIDs = void 0;
 const createOrderedFootnotesIDs = (doc) => {
     const footnotesRefs = [...doc.querySelectorAll('xref[ref-type="fn"][rid]')];
     const footnotes = [...doc.querySelectorAll('fn:not([fn-type])')];
@@ -59,5 +58,3 @@ const handleFootnotesOrder = (orderedFootnotesIDs, replacements, footnotesOrder)
     footnotesOrder.footnotesList = footnotesList;
 };
 exports.handleFootnotesOrder = handleFootnotesOrder;
-const createEmptyFootnotesOrder = () => (0, builders_1.buildFootnotesOrder)([]);
-exports.createEmptyFootnotesOrder = createEmptyFootnotesOrder;

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

@@ -519,9 +519,23 @@ 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',
@@ -548,12 +562,12 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_header',
+        node: 'table_cell',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');
             const rowspan = element.getAttribute('rowspan');
-            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') });
+            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') });
         },
     },
     {