@manuscripts/transform 1.2.4-LEAN-2066 → 1.2.5

package/dist/cjs/transformer/section-category.js

@@ -14,8 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chooseSectionCategoryFromTitle = exports.chooseSectionCategory = exports.chooseSectionCategoryByType = exports.chooseSecType = exports.buildSectionCategory = exports.guessSectionCategory = exports.chooseSectionLableName = exports.chooseSectionNodeType = exports.isAnySectionNode = void 0;
+exports.chooseSectionCategoryFromTitle = exports.chooseSectionCategory = exports.chooseSectionCategoryByType = exports.chooseSecType = exports.buildSectionCategory = exports.guessSectionCategory = exports.chooseSectionLableName = exports.chooseSectionNodeType = exports.isAnySectionNode = exports.getSectionTitles = void 0;
+const section_categories_json_1 = __importDefault(require("@manuscripts/data/dist/shared/section-categories.json"));
 const json_schema_1 = require("@manuscripts/json-schema");
 const schema_1 = require("../schema");
 const sectionNodeTypes = [
@@ -25,6 +29,18 @@ const sectionNodeTypes = [
     schema_1.schema.nodes.section,
     schema_1.schema.nodes.toc_section,
 ];
+const sectionCategoriesMap = new Map(section_categories_json_1.default.map((section) => [
+    section._id,
+    section,
+]));
+const getSectionTitles = (sectionCategory) => {
+    const category = sectionCategoriesMap.get(sectionCategory);
+    if (category) {
+        return category.titles.length ? category.titles : [' '];
+    }
+    throw new Error(`${sectionCategory} not found in section categories`);
+};
+exports.getSectionTitles = getSectionTitles;
 const isAnySectionNode = (node) => sectionNodeTypes.includes(node.type);
 exports.isAnySectionNode = isAnySectionNode;
 const chooseSectionNodeType = (category) => {
@@ -161,6 +177,12 @@ const chooseSectionCategoryByType = (secType) => {
             return 'MPSectionCategory:supported-by';
         case 'ethics-statement':
             return 'MPSectionCategory:ethics-statement';
+        case 'body':
+            return 'MPSectionCategory:body';
+        case 'backmatter':
+            return 'MPSectionCategory:backmatter';
+        case 'abstracts':
+            return 'MPSectionCategory:abstracts';
         default:
             return undefined;
     }

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

@@ -499,22 +499,6 @@ const nodes = [
             };
         },
     },
-    {
-        tag: 'sec[sec-type="keywords"]',
-        node: 'keywords_section',
-        getAttrs: (node) => {
-            const element = node;
-            return {
-                id: element.getAttribute('id'),
-                category: chooseSectionCategory(element),
-            };
-        },
-    },
-    {
-        tag: 'kwd-group-list',
-        context: 'keywords_section/',
-        node: 'keywords_element',
-    },
     {
         tag: 'sec',
         node: 'section',
@@ -526,22 +510,6 @@ const nodes = [
             };
         },
     },
-    {
-        tag: 'kwd-group',
-        context: 'keywords_element/',
-        node: 'keywords_group',
-        getAttrs: (node) => {
-            const element = node;
-            return {
-                type: element.getAttribute('kwd-group-type'),
-            };
-        },
-    },
-    {
-        tag: 'kwd',
-        context: 'keywords_group//',
-        node: 'keyword',
-    },
     {
         tag: 'label',
         context: 'section/',
@@ -594,7 +562,7 @@ const nodes = [
     {
         tag: 'title',
         node: 'section_title',
-        context: 'section/|footnotes_section/|bibliography_section/|keywords_section/',
+        context: 'section/|footnotes_section/|bibliography_section/',
     },
     {
         tag: 'title',

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

@@ -13,9 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { chooseSectionCategoryByType, chooseSecType } from '../../transformer';
+import { chooseSectionCategoryByType, chooseSecType, getSectionTitles, } from '../../transformer';
 const removeNodeFromParent = (node) => node.parentNode && node.parentNode.removeChild(node);
 const capitalizeFirstLetter = (str) => str.charAt(0).toUpperCase() + str.slice(1);
+const createSectionContainer = (type, createElement) => {
+    const sectionContainer = createElement('sec');
+    const sectionCategory = chooseSectionCategoryByType(type);
+    sectionContainer.setAttribute('sec-type', sectionCategory ? chooseSecType(sectionCategory) : '');
+    const title = createElement('title');
+    title.textContent = sectionCategory
+        ? getSectionTitles(sectionCategory)[0]
+        : ' ';
+    sectionContainer.appendChild(title);
+    return sectionContainer;
+};
 export const jatsBodyTransformations = {
     ensureSection(body, createElement) {
         let section = createElement('sec');
@@ -143,34 +154,64 @@ export const jatsBodyTransformations = {
         section.append(...floatsGroup.children);
         return section;
     },
-    moveSectionsToBody(doc, body, references, createElement) {
+    moveAbstractsIntoContainer(doc, abstractsContainer, createElement) {
         const abstractNodes = doc.querySelectorAll('front > article-meta > abstract');
-        for (const abstractNode of abstractNodes) {
+        abstractNodes.forEach((abstractNode) => {
             const abstract = this.createAbstract(abstractNode, createElement);
             removeNodeFromParent(abstractNode);
-            body.insertBefore(abstract, body.firstChild);
-        }
+            abstractsContainer.appendChild(abstract);
+        });
+    },
+    wrapBodySections(doc, bodyContainer) {
+        const bodySections = doc.querySelectorAll('body > sec:not([sec-type="backmatter"]), body > sec:not([sec-type])');
+        bodySections.forEach((section) => {
+            removeNodeFromParent(section);
+            bodyContainer.appendChild(section);
+        });
+    },
+    moveBackSectionsIntoContainer(doc, backmatterContainer) {
         for (const section of doc.querySelectorAll('back > sec')) {
             removeNodeFromParent(section);
-            body.appendChild(section);
+            backmatterContainer.appendChild(section);
         }
+    },
+    moveAcknowledgmentsIntoContainer(doc, backmatterContainer, createElement) {
         const ackNode = doc.querySelector('back > ack');
         if (ackNode) {
             const acknowledgements = this.createAcknowledgments(ackNode, createElement);
             removeNodeFromParent(ackNode);
-            body.appendChild(acknowledgements);
+            backmatterContainer.appendChild(acknowledgements);
         }
+    },
+    moveAppendicesIntoContainer(doc, backmatterContainer, createElement) {
         const appGroup = doc.querySelectorAll('back > app-group > app');
         for (const app of appGroup) {
             const appendix = this.createAppendixSection(app, createElement);
             removeNodeFromParent(app);
-            body.appendChild(appendix);
+            backmatterContainer.appendChild(appendix);
         }
+    },
+    moveBibliographyIntoContainer(doc, backmatterContainer, references, createElement) {
         if (references) {
-            body.appendChild(this.createBibliography(doc, references, createElement));
+            backmatterContainer.appendChild(this.createBibliography(doc, references, createElement));
         }
     },
-    mapFootnotesToSections(doc, body, createElement) {
+    moveSectionsToBody(doc, body, references, createElement) {
+        const bodyContainer = createSectionContainer('body', createElement);
+        const abstractsContainer = createSectionContainer('abstracts', createElement);
+        const backmatterContainer = createSectionContainer('backmatter', createElement);
+        this.mapFootnotesToSections(doc, backmatterContainer, createElement);
+        this.wrapBodySections(doc, bodyContainer);
+        this.moveAbstractsIntoContainer(doc, abstractsContainer, createElement);
+        this.moveBackSectionsIntoContainer(doc, backmatterContainer);
+        this.moveAcknowledgmentsIntoContainer(doc, backmatterContainer, createElement);
+        this.moveAppendicesIntoContainer(doc, backmatterContainer, createElement);
+        this.moveBibliographyIntoContainer(doc, backmatterContainer, references, createElement);
+        body.insertBefore(abstractsContainer, body.firstChild);
+        body.insertBefore(bodyContainer, abstractsContainer.nextSibling);
+        body.append(backmatterContainer);
+    },
+    mapFootnotesToSections(doc, backmatterContainer, createElement) {
         const footnoteGroups = [...doc.querySelectorAll('fn[fn-type]')];
         for (const footnote of footnoteGroups) {
             const type = footnote.getAttribute('fn-type') || '';
@@ -187,7 +228,7 @@ export const jatsBodyTransformations = {
                 section.append(...footnote.children);
                 removeNodeFromParent(footnote);
                 section.setAttribute('sec-type', chooseSecType(category));
-                body.append(section);
+                backmatterContainer.append(section);
             }
         }
         const footnotes = [...doc.querySelectorAll('fn')];
@@ -202,7 +243,7 @@ export const jatsBodyTransformations = {
         }
         if (!footnotesSection && containingGroup.innerHTML) {
             const section = this.createFootnotes([containingGroup], createElement);
-            body.append(section);
+            backmatterContainer.append(section);
         }
         let regularFootnoteGroups = [
             ...doc.querySelectorAll('back > fn-group:not([fn-type])'),
@@ -215,7 +256,7 @@ export const jatsBodyTransformations = {
         if (regularFootnoteGroups.length > 0) {
             regularFootnoteGroups.map((g) => removeNodeFromParent(g));
             const footnotes = this.createFootnotes(regularFootnoteGroups, createElement);
-            body.appendChild(footnotes);
+            backmatterContainer.appendChild(footnotes);
         }
     },
     moveCaptionsToEnd(body) {
@@ -263,18 +304,4 @@ export const jatsBodyTransformations = {
             paragraph === null || paragraph === void 0 ? void 0 : paragraph.replaceWith(parent);
         });
     },
-    moveKeywordsToBody(document, body, createElement) {
-        const keywordGroups = [...document.querySelectorAll('kwd-group')];
-        if (keywordGroups.length > 0) {
-            const section = createElement('sec');
-            section.setAttribute('sec-type', 'keywords');
-            const title = createElement('title');
-            title.textContent = 'Keywords';
-            section.append(title);
-            const kwdGroupsEl = createElement('kwd-group-list');
-            kwdGroupsEl.append(keywordGroups[0]);
-            section.append(kwdGroupsEl);
-            body.prepend(section);
-        }
-    },
 };

package/dist/es/jats/importer/jats-comments.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { v4 as uuidv4 } from 'uuid';
-import { buildComment, buildContribution, isCommentAnnotation, isHighlightableModel, isKeyword, } from '../../transformer';
+import { buildComment, buildContribution, isCommentAnnotation, isHighlightableModel, } from '../../transformer';
 const DEFAULT_ANNOTATION_COLOR = 'rgb(250, 224, 150)';
 const DEFAULT_PROFILE_ID = 'MPUserProfile:0000000000000000000000000000000000000001';
 export const parseProcessingInstruction = (node) => {
@@ -58,21 +58,6 @@ const insertToken = (doc, processingInstructionNode, authorQueriesMap) => {
         return parentElement.insertBefore(tokenNode, processingInstructionNode);
     }
 };
-const extractCommentsFromKeywords = (tokens, model, authorQueriesMap) => {
-    var _a;
-    const commentAnnotations = [];
-    const name = model.name;
-    const filteredTokens = filterAndSortTokens(tokens, name);
-    let content = name;
-    for (const token of filteredTokens) {
-        content = name.replace(token, '');
-        const query = authorQueriesMap.get(token);
-        const commentAnnotation = buildComment((_a = model.containedGroup) !== null && _a !== void 0 ? _a : uuidv4(), `${query}`, undefined, [buildContribution(DEFAULT_PROFILE_ID)], DEFAULT_ANNOTATION_COLOR);
-        model['name'] = content;
-        commentAnnotations.push(commentAnnotation);
-    }
-    return commentAnnotations;
-};
 export const createComments = (authorQueriesMap, manuscriptModels) => {
     const tokens = [...authorQueriesMap.keys()];
     const commentAnnotations = [];
@@ -81,18 +66,9 @@ export const createComments = (authorQueriesMap, manuscriptModels) => {
             const comments = addCommentsFromMarkedProcessingInstructions(tokens, model, authorQueriesMap);
             commentAnnotations.push(...comments);
         }
-        else if (isKeyword(model)) {
-            const comments = extractCommentsFromKeywords(tokens, model, authorQueriesMap);
-            commentAnnotations.push(...comments);
-        }
     }
     return commentAnnotations;
 };
-function filterAndSortTokens(tokens, content) {
-    return tokens
-        .filter((token) => content.indexOf(token) >= 0)
-        .sort((a, b) => content.indexOf(a) - content.indexOf(b));
-}
 const addCommentsFromMarkedProcessingInstructions = (tokens, model, authorQueriesMap) => {
     const commentAnnotations = [];
     for (const field of ['contents', 'caption', 'title']) {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import debug from 'debug';
-import { buildAffiliation, buildBibliographicName, buildContributor, buildCorresp, buildFootnote, buildSupplementaryMaterial, } from '../../transformer/builders';
+import { buildAffiliation, buildBibliographicName, buildContributor, buildCorresp, buildFootnote, buildKeyword, buildKeywordGroup, buildSupplementaryMaterial, } from '../../transformer/builders';
 import { parseJournalMeta } from './jats-journal-meta-parser';
 const warn = debug('manuscripts-transform');
 const XLINK_NAMESPACE = 'http://www.w3.org/1999/xlink';
@@ -62,6 +62,31 @@ export const jatsFrontParser = {
         }
         return parseJournalMeta(journalMeta);
     },
+    parseKeywords(keywordGroupNodes) {
+        var _a, _b;
+        if (!keywordGroupNodes) {
+            return { groups: [], keywords: [] };
+        }
+        let keywordPriority = 1;
+        const keywordGroups = { groups: [], keywords: [] };
+        for (const keywordGroupNode of keywordGroupNodes) {
+            const manuscriptKeywordGroup = buildKeywordGroup({
+                title: ((_a = keywordGroupNode.querySelector('title')) === null || _a === void 0 ? void 0 : _a.textContent) || undefined,
+                label: ((_b = keywordGroupNode.querySelector('label')) === null || _b === void 0 ? void 0 : _b.textContent) || undefined,
+                type: keywordGroupNode.getAttribute('kwd-group-type') || undefined,
+            });
+            keywordGroups.groups.push(manuscriptKeywordGroup);
+            for (const keywordNode of keywordGroupNode.querySelectorAll('kwd')) {
+                if (keywordNode.textContent) {
+                    const keyword = buildKeyword(keywordNode.textContent);
+                    keyword.priority = keywordPriority++;
+                    keyword.containedGroup = manuscriptKeywordGroup._id;
+                    keywordGroups.keywords.push(keyword);
+                }
+            }
+        }
+        return keywordGroups;
+    },
     parseDates(historyNode) {
         if (!historyNode) {
             return undefined;

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

@@ -51,6 +51,9 @@ export const parseJATSFront = async (front) => {
     const manuscriptMeta = Object.assign({ title: title ? inlineContentsFromJATSTitle(title) : undefined, subtitle: subtitle ? inlineContentsFromJATSTitle(subtitle) : undefined, runningTitle: runningTitle
             ? inlineContentsFromJATSTitle(runningTitle)
             : undefined }, jatsFrontParser.parseCounts(articleMeta === null || articleMeta === void 0 ? void 0 : articleMeta.querySelector('counts')));
+    const keywordGroupNodes = articleMeta === null || articleMeta === void 0 ? void 0 : articleMeta.querySelectorAll('kwd-group');
+    const { keywords, groups: keywordGroups } = jatsFrontParser.parseKeywords(keywordGroupNodes);
+    const manuscript_keywordIDs = keywords.length > 0 ? keywords.map((k) => k._id) : undefined;
     const { affiliations, affiliationIDs } = jatsFrontParser.parseAffiliationNodes([
         ...front.querySelectorAll('article-meta > contrib-group > aff'),
     ]);
@@ -67,12 +70,14 @@ export const parseJATSFront = async (front) => {
     const supplements = jatsFrontParser.parseSupplements([
         ...front.querySelectorAll('article-meta > supplementary-material'),
     ]);
-    const manuscript = Object.assign(Object.assign(Object.assign({}, buildManuscript()), manuscriptMeta), history);
+    const manuscript = Object.assign(Object.assign(Object.assign(Object.assign({}, buildManuscript()), manuscriptMeta), { keywordIDs: manuscript_keywordIDs }), history);
     return {
         models: generateModelIDs([
             manuscript,
+            ...keywords,
             ...affiliations,
             ...authors,
+            ...keywordGroups,
             ...footnotes,
             ...correspondingList,
             journal,
@@ -106,12 +111,10 @@ export const parseJATSBody = (document, body, bibliographyItems, refModels, refe
     const orderedFootnotesIDs = createOrderedFootnotesIDs(document);
     jatsBodyTransformations.moveFloatsGroupToBody(document, body, createElement);
     jatsBodyTransformations.ensureSection(body, createElement);
-    jatsBodyTransformations.mapFootnotesToSections(document, body, createElement);
     jatsBodyTransformations.moveSectionsToBody(document, body, bibliographyItems, createElement);
     jatsBodyTransformations.moveCaptionsToEnd(body);
     jatsBodyTransformations.moveTableFooterToEnd(body);
     jatsBodyTransformations.moveBlockNodesFromParagraph(document, body, createElement);
-    jatsBodyTransformations.moveKeywordsToBody(document, body, createElement);
     const node = jatsBodyDOMParser.parse(body);
     if (!node.firstChild) {
         throw new Error('No content was parsed from the JATS article body');

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

@@ -129,8 +129,10 @@ export class JATSExporter {
                 article.appendChild(body);
                 const back = this.buildBack(body);
                 article.appendChild(back);
+                this.unwrapBody(body);
                 this.moveAbstracts(front, body);
                 this.moveFloatsGroup(body, article);
+                this.removeBackContainer(body);
             }
             await this.rewriteIDs(idGenerator);
             if (mediaPathGenerator) {
@@ -391,7 +393,9 @@ export class JATSExporter {
             if (history.childElementCount) {
                 articleMeta.appendChild(history);
             }
-            this.buildKeywords(articleMeta);
+            if (manuscript.keywordIDs) {
+                this.buildKeywords(articleMeta, manuscript.keywordIDs);
+            }
             let countingElements = [];
             if (manuscript.genericCounts) {
                 const elements = manuscript.genericCounts.map((el) => {
@@ -615,7 +619,6 @@ export class JATSExporter {
                 bibliography_element: () => '',
                 bibliography_item: () => '',
                 comment_list: () => '',
-                keywords_group: () => '',
                 bibliography_section: (node) => [
                     'ref-list',
                     { id: normalizeID(node.attrs.id) },
@@ -1384,21 +1387,49 @@ export class JATSExporter {
                 table.insertBefore(tfoot, tbody);
             }
         };
-        this.moveAbstracts = (front, body) => {
-            const sections = body.querySelectorAll(':scope > sec');
-            const abstractSections = Array.from(sections).filter((section) => {
-                const sectionType = section.getAttribute('sec-type');
-                if (sectionType === 'abstract' ||
-                    sectionType === 'abstract-teaser' ||
-                    sectionType === 'abstract-graphical') {
-                    return true;
-                }
-                const sectionTitle = section.querySelector(':scope > title');
-                if (!sectionTitle) {
-                    return false;
-                }
-                return sectionTitle.textContent === 'Abstract';
+        this.unwrapBody = (body) => {
+            const container = body.querySelector(':scope > sec[sec-type="body"]');
+            if (!container) {
+                return;
+            }
+            const sections = container.querySelectorAll(':scope > sec');
+            sections.forEach((section) => {
+                body.appendChild(section.cloneNode(true));
             });
+            body.removeChild(container);
+        };
+        this.removeBackContainer = (body) => {
+            const container = body.querySelector(':scope > sec[sec-type="backmatter"]');
+            if (!container) {
+                return;
+            }
+            const isContainerEmpty = container.children.length === 0;
+            if (!isContainerEmpty) {
+                warn('Backmatter section is not empty.');
+            }
+            body.removeChild(container);
+        };
+        this.moveAbstracts = (front, body) => {
+            const container = body.querySelector(':scope > sec[sec-type="abstracts"]');
+            let abstractSections;
+            if (container) {
+                abstractSections = Array.from(container.querySelectorAll(':scope > sec'));
+            }
+            else {
+                abstractSections = Array.from(body.querySelectorAll(':scope > sec')).filter((section) => {
+                    const sectionType = section.getAttribute('sec-type');
+                    if (sectionType === 'abstract' ||
+                        sectionType === 'abstract-teaser' ||
+                        sectionType === 'abstract-graphical') {
+                        return true;
+                    }
+                    const sectionTitle = section.querySelector(':scope > title');
+                    if (!sectionTitle) {
+                        return false;
+                    }
+                    return sectionTitle.textContent === 'Abstract';
+                });
+            }
             if (abstractSections.length) {
                 for (const abstractSection of abstractSections) {
                     const abstractNode = this.document.createElement('abstract');
@@ -1419,6 +1450,9 @@ export class JATSExporter {
                     }
                 }
             }
+            if (container) {
+                body.removeChild(container);
+            }
         };
         this.moveSectionsToBack = (back, body) => {
             const availabilitySection = body.querySelector('sec[sec-type="availability"]');
@@ -1521,8 +1555,10 @@ export class JATSExporter {
             return name;
         };
     }
-    buildKeywords(articleMeta) {
-        const keywords = [...this.modelMap.values()].filter((model) => model.objectType === ObjectTypes.Keyword);
+    buildKeywords(articleMeta, keywordIDs) {
+        const keywords = keywordIDs
+            .map((id) => this.modelMap.get(id))
+            .filter((model) => model && model.name);
         const keywordGroups = new Map();
         keywords.forEach((keyword) => {
             const containedGroup = keyword.containedGroup || '';
@@ -1556,7 +1592,6 @@ export class JATSExporter {
                 kwd.textContent = keyword.name;
                 kwdGroup.appendChild(kwd);
             }
-            articleMeta.appendChild(kwdGroup);
         }
     }
 }

package/dist/es/schema/index.js

@@ -42,7 +42,6 @@ import { inlineEquation } from './nodes/inline_equation';
 import { inlineFootnote } from './nodes/inline_footnote';
 import { keyword } from './nodes/keyword';
 import { keywordsElement } from './nodes/keywords_element';
-import { keywordsGroup } from './nodes/keywords_group';
 import { keywordsSection } from './nodes/keywords_section';
 import { link } from './nodes/link';
 import { bulletList, listItem, orderedList } from './nodes/list';
@@ -157,7 +156,6 @@ export const schema = new Schema({
         keyword,
         keywords_element: keywordsElement,
         keywords_section: keywordsSection,
-        keywords_group: keywordsGroup,
         link,
         list_item: listItem,
         listing,

package/dist/es/schema/nodes/keyword.js

@@ -22,7 +22,8 @@ export const keyword = {
         dataTracked: { default: null },
         comments: { default: null },
     },
-    group: 'block',
+    inline: true,
+    group: 'inline',
     selectable: false,
     parseDOM: [
         {

package/dist/es/schema/nodes/keywords_element.js

@@ -15,12 +15,11 @@
  */
 export const keywordsElement = {
     atom: true,
-    content: 'keywords_group*',
+    content: 'keyword*',
     attrs: {
         id: { default: '' },
         contents: { default: '' },
         paragraphStyle: { default: '' },
-        type: { default: '' },
         dataTracked: { default: null },
     },
     group: 'block element',

package/dist/es/schema/nodes/keywords_section.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const keywordsSection = {
-    content: 'section_title (keywords_element | placeholder_element)',
+    content: 'section_title_plain (keywords_element | placeholder_element)',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

package/dist/es/schema/nodes/section.js

@@ -32,7 +32,7 @@ const choosePageBreakStyle = (element) => {
     return PAGE_BREAK_NONE;
 };
 export const section = {
-    content: 'section_label? section_title (paragraph | element)* section*',
+    content: 'section_label? section_title (paragraph | element)* sections*',
     attrs: {
         id: { default: '' },
         category: { default: '' },

package/dist/es/transformer/decode.js

@@ -265,11 +265,11 @@ export class Decoder {
             },
             [ObjectTypes.KeywordsElement]: (data) => {
                 const model = data;
-                const keywordGroups = this.getKeywordGroups();
+                const keywords = this.getKeywords();
                 return schema.nodes.keywords_element.create({
                     id: model._id,
                     paragraphStyle: model.paragraphStyle,
-                }, keywordGroups);
+                }, keywords);
             },
             [ObjectTypes.Keyword]: (data) => {
                 const model = data;
@@ -416,7 +416,9 @@ export class Decoder {
                 const elementNodes = elements
                     .map(this.decode)
                     .filter(isManuscriptNode);
-                const sectionTitle = 'section_title';
+                const sectionTitle = isKeywordsSection
+                    ? 'section_title_plain'
+                    : 'section_title';
                 const sectionTitleNode = model.title
                     ? this.parseContents(model.title, 'h1', this.getComments(model), {
                         topNode: schema.nodes[sectionTitle].create(),
@@ -560,6 +562,19 @@ export class Decoder {
                     id: generateNodeID(schema.nodes.section),
                 }));
             }
+            const keywordsSection = getSections(this.modelMap).filter((section) => section.category === 'MPSectionCategory:keywords');
+            const keywords = this.getKeywords();
+            if (keywordsSection.length === 0 && keywords.length > 0) {
+                const keywordsSection = schema.nodes.keywords_section.createAndFill({
+                    id: generateNodeID(schema.nodes.keywords_section),
+                }, [
+                    schema.nodes.section_title_plain.create({}, schema.text('Keywords')),
+                    schema.nodes.keywords_element.create({
+                        id: generateNodeID(schema.nodes.keywords_element),
+                    }, keywords),
+                ]);
+                rootSectionNodes.unshift(keywordsSection);
+            }
             const contents = rootSectionNodes;
             if (this.comments.size) {
                 const comments = schema.nodes.comment_list.createAndFill({
@@ -607,16 +622,17 @@ export class Decoder {
             }
             return parser.parse(template.content.firstElementChild, options);
         };
-        this.getKeywords = (id) => {
+        this.getKeywords = () => {
             const keywordsOfKind = [];
-            const keywordsByGroup = [...this.modelMap.values()].filter((m) => m.objectType === ObjectTypes.Keyword &&
-                m.containedGroup === id);
-            for (const model of keywordsByGroup) {
+            for (const model of this.modelMap.values()) {
+                const commentNodes = this.createCommentsNode(model);
+                commentNodes.forEach((c) => this.comments.set(c.attrs.id, c));
                 if (isKeyword(model)) {
                     const keyword = this.parseContents(model.name || '', 'div', this.getComments(model), {
                         topNode: schema.nodes.keyword.create({
                             id: model._id,
                             contents: model.name,
+                            comments: commentNodes.map((c) => c.attrs.id),
                         }),
                     });
                     keywordsOfKind.push(keyword);
@@ -663,26 +679,4 @@ export class Decoder {
         this.modelMap = modelMap;
         this.allowMissingElements = allowMissingElements;
     }
-    getKeywordGroups() {
-        const kwdGroupNodes = [];
-        const kwdGroupsModels = [
-            ...this.modelMap.values(),
-        ].filter((model) => model.objectType === ObjectTypes.KeywordGroup);
-        if (kwdGroupsModels.length > 0) {
-            for (const kwdGroupModel of kwdGroupsModels) {
-                const keywords = this.getKeywords(kwdGroupModel._id);
-                const commentNodes = this.createCommentsNode(kwdGroupModel);
-                commentNodes.forEach((c) => this.comments.set(c.attrs.id, c));
-                const contents = [];
-                contents.push(...keywords);
-                const kwdGroupNode = schema.nodes.keywords_group.create({
-                    id: kwdGroupModel._id,
-                    type: kwdGroupModel.type,
-                    comments: commentNodes.map((c) => c.attrs.id),
-                }, contents);
-                kwdGroupNodes.push(kwdGroupNode);
-            }
-        }
-        return kwdGroupNodes;
-    }
 }