usfm-grammar-web 3.2.0-beta.4 → 3.2.1

package/dist/bundle.mjs

@@ -3468,6 +3468,175 @@ module.exports = new URL("tree-sitter.0080292a.wasm", import.meta.url).toString(
 
 
 var $dc2P8 = parcelRequire("dc2P8");
+const $28b0061e56e1edf2$export$3ea3efefd6f5792b = [
+    'ide',
+    'usfm',
+    'h',
+    'toc',
+    'toca',
+    'imt',
+    'is',
+    'ip',
+    'ipi',
+    'im',
+    'imi',
+    'ipq',
+    'imq',
+    'ipr',
+    'ipc',
+    'iq',
+    'ib',
+    'ili',
+    'iot',
+    'io',
+    'iex',
+    'imte',
+    'ie',
+    'mt',
+    'mte',
+    'cl',
+    'cd',
+    'ms',
+    'mr',
+    's',
+    'sr',
+    'r',
+    'd',
+    'sp',
+    'sd',
+    'q',
+    'qr',
+    'qc',
+    'qa',
+    'qm',
+    'qd',
+    'lh',
+    'li',
+    'lf',
+    'lim',
+    'sts',
+    'rem',
+    'lit',
+    'restore'
+];
+const $28b0061e56e1edf2$export$bfe3d604e5046dbb = [
+    'f',
+    'fe',
+    'ef',
+    'efe',
+    'x',
+    'ex'
+];
+const $28b0061e56e1edf2$export$32d1909bfb943eb0 = [
+    'add',
+    'bk',
+    'dc',
+    'ior',
+    'iqt',
+    'k',
+    'litl',
+    'nd',
+    'ord',
+    'pn',
+    'png',
+    'qac',
+    'qs',
+    'qt',
+    'rq',
+    'sig',
+    'sls',
+    'tl',
+    'ta',
+    'wj',
+    'em',
+    'bd',
+    'bdit',
+    'it',
+    'no',
+    'sc',
+    'sup',
+    'rb',
+    'pro',
+    'w',
+    'wh',
+    'wa',
+    'wl',
+    'wg',
+    'lik',
+    'liv',
+    'jmp',
+    'fr',
+    'ft',
+    'fk',
+    'fq',
+    'fqa',
+    'fl',
+    'fw',
+    'fp',
+    'fv',
+    'fdc',
+    'xo',
+    'xop',
+    'xt',
+    'xta',
+    'xk',
+    'xq',
+    'xot',
+    'xnt',
+    'xdc'
+];
+const $28b0061e56e1edf2$export$ec3044778745fabd = $28b0061e56e1edf2$export$32d1909bfb943eb0.map((item)=>`${item}Nested`);
+const $28b0061e56e1edf2$export$38bc6f52843beb2a = {
+    w: 'lemma',
+    rb: 'gloss',
+    xt: 'href',
+    fig: 'alt',
+    xt_standalone: 'href',
+    xtNested: 'href',
+    ref: 'loc',
+    milestone: 'who',
+    k: 'key',
+    wl: 'lang',
+    tl: 'lang',
+    vid: 'ref'
+};
+const $28b0061e56e1edf2$export$af42bd8f70df8555 = [
+    'tc',
+    'th',
+    'tcr',
+    'thr',
+    'tcc',
+    'thc'
+];
+const $28b0061e56e1edf2$export$c4d2f24f22330b2a = [
+    'fig',
+    'cat',
+    'esb',
+    'b',
+    'ph',
+    'pi'
+];
+const $28b0061e56e1edf2$export$d19275a111c0e9e6 = {
+    TABLE_CELL_MARKERS: new Set($28b0061e56e1edf2$export$af42bd8f70df8555),
+    CHAR_STYLE_MARKERS: new Set($28b0061e56e1edf2$export$32d1909bfb943eb0),
+    NESTED_CHAR_STYLE_MARKERS: new Set($28b0061e56e1edf2$export$ec3044778745fabd),
+    OTHER_PARA_NESTABLES: new Set([
+        'text',
+        'footnote',
+        'crossref',
+        'verseText',
+        'v',
+        'b',
+        'milestone',
+        'zNameSpace'
+    ]),
+    NOTE_MARKERS: new Set($28b0061e56e1edf2$export$bfe3d604e5046dbb),
+    PARA_STYLE_MARKERS: new Set($28b0061e56e1edf2$export$3ea3efefd6f5792b)
+};
+const $28b0061e56e1edf2$export$8e480ab8367e6dbc = /(\w+) (\d+):([\d\w]+(?:-[\d\w]+)?)/;
+const $28b0061e56e1edf2$export$7dc487a0fa1a604f = '3.1.2';
+
+
 const $142605215cbb4f88$export$b32929182cc4fefe = [
     'USJ',
     'table'
@@ -3484,25 +3653,35 @@ const $142605215cbb4f88$export$aa24f570494ce8d0 = [
     'content',
     'number',
     'sid',
+    'eid',
+    'closed',
+    'status',
     'code',
     'caller',
     'align',
     'version',
     'altnumber',
     'pubnumber',
-    'category'
+    'category',
+    'vid',
+    'h'
 ];
 const $142605215cbb4f88$export$1790a88fa433c8d6 = [
-    'style',
     'number',
-    'sid',
     'code',
     'caller',
     'align',
+    'sid',
+    'eid',
+    'style',
+    'closed',
+    'status',
     'version',
     'altnumber',
     'pubnumber',
-    'category'
+    'category',
+    'vid',
+    'h'
 ];
 const $142605215cbb4f88$export$c63c0b6e358f0774 = [
     'char',
@@ -3521,6 +3700,9 @@ const $142605215cbb4f88$export$1187115108c84d45 = [
 class $ce44dcc4919407eb$var$USFMGenerator {
     constructor(){
         this.usfmString = '';
+        this.currentBook = null;
+        this.currentChapter = null;
+        this.currentVerse = null;
     }
     usjToUsfm(usjObj, nested = false) {
         if (usjObj.type === 'optbreak') {
@@ -3533,11 +3715,28 @@ class $ce44dcc4919407eb$var$USFMGenerator {
             this.usfmString += '// ';
             return;
         }
-        if (usjObj.type === 'ref') usjObj.marker = 'ref';
+        let marker = null;
+        if (usjObj.marker) marker = usjObj.marker;
+        else if (usjObj.type === 'ref') marker = 'ref';
+        else if (usjObj.type === 'list') marker = 'list-s\\*\n';
+        else marker = usjObj.type;
+        if (usjObj.code) this.currentBook = usjObj.code;
+        else if (marker === 'c') {
+            this.currentChapter = usjObj.number;
+            this.currentVerse = null; // Reset currentVerse when a new chapter starts for vid
+        } else if (marker === 'v') this.currentVerse = usjObj.number;
+        if (usjObj.vid) {
+            const currentRef = `${this.currentBook} ${this.currentChapter}:${this.currentVerse}`;
+            if (currentRef !== usjObj.vid) {
+                this.usfmString += `\\vid|ref=\"${usjObj.vid}\" `;
+                if (usjObj.h) this.usfmString += `h="${usjObj.h}" `;
+                this.usfmString += '\\*\n';
+            }
+        }
         if (!(0, $142605215cbb4f88$export$b32929182cc4fefe).includes(usjObj.type)) {
             this.usfmString += '\\';
             if (nested && usjObj.type === 'char') this.usfmString += '+';
-            this.usfmString += `${usjObj.marker} `;
+            this.usfmString += `${marker} `;
         }
         [
             'code',
@@ -3548,12 +3747,12 @@ class $ce44dcc4919407eb$var$USFMGenerator {
         });
         if (usjObj.category) this.usfmString += `\\cat ${usjObj.category}\\cat*\n`;
         if (usjObj.altnumber) {
-            if (usjObj.marker === 'c') this.usfmString += `\\ca ${usjObj.altnumber} \\ca*\n`;
-            else if (usjObj.marker === 'v') this.usfmString += `\\va ${usjObj.altnumber} \\va* `;
+            if (marker === 'c') this.usfmString += `\\ca ${usjObj.altnumber} \\ca*\n`;
+            else if (marker === 'v') this.usfmString += `\\va ${usjObj.altnumber} \\va* `;
         }
         if (usjObj.pubnumber) {
-            if (usjObj.marker === 'c') this.usfmString += `\\cp ${usjObj.pubnumber}\n`;
-            else if (usjObj.marker === 'v') this.usfmString += `\\vp ${usjObj.pubnumber} \\vp* `;
+            if (marker === 'c') this.usfmString += `\\cp ${usjObj.pubnumber}\n`;
+            else if (marker === 'v') this.usfmString += `\\vp ${usjObj.pubnumber} \\vp* `;
         }
         if (Array.isArray(usjObj.content)) usjObj.content.forEach((item)=>{
             if (typeof item === 'string') this.usfmString += item;
@@ -3571,7 +3770,7 @@ class $ce44dcc4919407eb$var$USFMGenerator {
         if ((0, $142605215cbb4f88$export$75b2f422ff60acaf).includes(usjObj.type)) {
             this.usfmString += '\\';
             if (nested && usjObj.type === 'char') this.usfmString += '+';
-            this.usfmString += `${usjObj.marker}* `;
+            this.usfmString += `${marker}* `;
         }
         if (usjObj.type === 'ms') {
             if ('sid' in usjObj) {
@@ -3581,7 +3780,9 @@ class $ce44dcc4919407eb$var$USFMGenerator {
             this.usfmString = `${this.usfmString.trim()}\\*`;
         }
         if (usjObj.type === 'sidebar') this.usfmString += '\\esbe';
+        else if (usjObj.type === 'list') this.usfmString += '\\list-e\\*';
         if (!(0, $142605215cbb4f88$export$c63c0b6e358f0774).includes(usjObj.type) && this.usfmString[this.usfmString.length - 1] !== '\n') this.usfmString += '\n';
+        if (marker === 'id') this.usfmString += `\\usfm ${0, $28b0061e56e1edf2$export$7dc487a0fa1a604f}\n`;
         return this.usfmString;
     }
     usxToUsfm(xmlObj, nested = false) {
@@ -3597,6 +3798,19 @@ class $ce44dcc4919407eb$var$USFMGenerator {
             'verse',
             'chapter'
         ].includes(objType) && xmlObj.hasAttribute('eid')) return;
+        if (xmlObj.hasAttribute('code')) this.currentBook = xmlObj.getAttribute('code');
+        else if (xmlObj.getAttribute('style') === 'c') {
+            this.currentChapter = xmlObj.getAttribute('number');
+            this.currentVerse = null; // Reset currentVerse when a new chapter starts for vid
+        } else if (xmlObj.getAttribute('style') === 'v') this.currentVerse = xmlObj.getAttribute('number');
+        if (xmlObj.hasAttribute('vid')) {
+            const currentReference = `${this.currentBook} ${this.currentChapter}:${this.currentVerse}`;
+            if (currentReference !== xmlObj.getAttribute('vid')) {
+                this.usfmString += `\n\\vid|ref="${xmlObj.getAttribute('vid')}" `;
+                if (xmlObj.hasAttribute('h')) this.usfmString += `h="${xmlObj.getAttribute('h')}" `;
+                this.usfmString += '\\*\n';
+            }
+        }
         if (!(0, $142605215cbb4f88$export$1187115108c84d45).includes(objType)) this.usfmString += '\n';
         if (objType === 'optbreak') {
             if (this.usfmString !== '' && ![
@@ -3606,8 +3820,8 @@ class $ce44dcc4919407eb$var$USFMGenerator {
                 '\t'
             ].includes(this.usfmString.slice(-1))) this.usfmString += ' ';
             this.usfmString += '// ';
-        }
-        if (xmlObj.hasAttribute('style')) {
+        } else if (objType === 'list') this.usfmString += '\\list-s\\*\n';
+        else if (xmlObj.hasAttribute('style')) {
             marker = xmlObj.getAttribute('style');
             if (nested && objType === 'char' && ![
                 'xt',
@@ -3667,6 +3881,11 @@ class $ce44dcc4919407eb$var$USFMGenerator {
             else this.usfmString += `\\${marker}*`;
         }
         if (objType === 'sidebar') this.usfmString += '\n\\esbe\n';
+        else if (objType === 'list') this.usfmString += '\n\\list-e\\*\n';
+        if (marker === 'id') {
+            if (!this.usfmString.endsWith('\n')) this.usfmString += '\n';
+            this.usfmString += `\\usfm ${0, $28b0061e56e1edf2$export$7dc487a0fa1a604f}\n`;
+        }
     }
     bibleNlptoUsfm(bibleNlpObj) {
         const vrefPattern = /([a-zA-Z0-9]{3}) (\d+):(.*)/;
@@ -3693,7 +3912,8 @@ class $ce44dcc4919407eb$var$USFMGenerator {
                 currChapter = chap;
             }
             if (!this.usfmString.endsWith('\n')) this.usfmString += ' ';
-            this.usfmString += `\\v ${verse} ${verseText}`;
+            if (verse.trim() !== '') this.usfmString += `\\v ${verse} ${verseText}`;
+            else this.usfmString += ` ${verseText}`;
         }
     }
 }
@@ -3701,166 +3921,6 @@ var $ce44dcc4919407eb$export$2e2bcd8739ae039 = $ce44dcc4919407eb$var$USFMGenerat
 
 
 //Logics for syntax-tree to dict(USJ) conversions
-const $28b0061e56e1edf2$export$3ea3efefd6f5792b = [
-    'ide',
-    'usfm',
-    'h',
-    'toc',
-    'toca',
-    'imt',
-    'is',
-    'ip',
-    'ipi',
-    'im',
-    'imi',
-    'ipq',
-    'imq',
-    'ipr',
-    'iq',
-    'ib',
-    'ili',
-    'iot',
-    'io',
-    'iex',
-    'imte',
-    'ie',
-    'mt',
-    'mte',
-    'cl',
-    'cd',
-    'ms',
-    'mr',
-    's',
-    'sr',
-    'r',
-    'd',
-    'sp',
-    'sd',
-    'q',
-    'qr',
-    'qc',
-    'qa',
-    'qm',
-    'qd',
-    'lh',
-    'li',
-    'lf',
-    'lim',
-    'sts',
-    'rem',
-    'lit',
-    'restore'
-];
-const $28b0061e56e1edf2$export$bfe3d604e5046dbb = [
-    'f',
-    'fe',
-    'ef',
-    'efe',
-    'x',
-    'ex'
-];
-const $28b0061e56e1edf2$export$32d1909bfb943eb0 = [
-    'add',
-    'bk',
-    'dc',
-    'ior',
-    'iqt',
-    'k',
-    'litl',
-    'nd',
-    'ord',
-    'pn',
-    'png',
-    'qac',
-    'qs',
-    'qt',
-    'rq',
-    'sig',
-    'sls',
-    'tl',
-    'wj',
-    'em',
-    'bd',
-    'bdit',
-    'it',
-    'no',
-    'sc',
-    'sup',
-    'rb',
-    'pro',
-    'w',
-    'wh',
-    'wa',
-    'wg',
-    'lik',
-    'liv',
-    'jmp',
-    'fr',
-    'ft',
-    'fk',
-    'fq',
-    'fqa',
-    'fl',
-    'fw',
-    'fp',
-    'fv',
-    'fdc',
-    'xo',
-    'xop',
-    'xt',
-    'xta',
-    'xk',
-    'xq',
-    'xot',
-    'xnt',
-    'xdc'
-];
-const $28b0061e56e1edf2$export$ec3044778745fabd = $28b0061e56e1edf2$export$32d1909bfb943eb0.map((item)=>`${item}Nested`);
-const $28b0061e56e1edf2$export$38bc6f52843beb2a = {
-    w: 'lemma',
-    rb: 'gloss',
-    xt: 'href',
-    fig: 'alt',
-    xt_standalone: 'href',
-    xtNested: 'href',
-    ref: 'loc',
-    milestone: 'who',
-    k: 'key'
-};
-const $28b0061e56e1edf2$export$af42bd8f70df8555 = [
-    'tc',
-    'th',
-    'tcr',
-    'thr',
-    'tcc',
-    'thc'
-];
-const $28b0061e56e1edf2$export$c4d2f24f22330b2a = [
-    'fig',
-    'cat',
-    'esb',
-    'b',
-    'ph',
-    'pi'
-];
-const $28b0061e56e1edf2$export$d19275a111c0e9e6 = {
-    TABLE_CELL_MARKERS: new Set($28b0061e56e1edf2$export$af42bd8f70df8555),
-    CHAR_STYLE_MARKERS: new Set($28b0061e56e1edf2$export$32d1909bfb943eb0),
-    NESTED_CHAR_STYLE_MARKERS: new Set($28b0061e56e1edf2$export$ec3044778745fabd),
-    OTHER_PARA_NESTABLES: new Set([
-        'text',
-        'footnote',
-        'crossref',
-        'verseText',
-        'v',
-        'b',
-        'milestone',
-        'zNameSpace'
-    ]),
-    NOTE_MARKERS: new Set($28b0061e56e1edf2$export$bfe3d604e5046dbb),
-    PARA_STYLE_MARKERS: new Set($28b0061e56e1edf2$export$3ea3efefd6f5792b)
-};
-
 
 
 var $dc2P8 = parcelRequire("dc2P8");
@@ -3889,7 +3949,6 @@ function $6dfa97aa668afc29$export$2d0a2b758e44ba4e(lang) {
     (milestoneTag)
     (milestoneStartTag)
     (milestoneEndTag)
-    (zSpaceTag)
 ] @ms-name)`);
 }
 function $6dfa97aa668afc29$export$8ae82a3cc175562e(lang) {
@@ -3930,9 +3989,11 @@ class $1bdca1468aa54399$var$USJGenerator {
     constructor(treeSitterLanguageObj, usfmString, usjRootObj = null){
         this.usfmLanguage = treeSitterLanguageObj;
         this.usfm = usfmString;
+        this.warnings = []; // Initialize warnings array to store any warnings during processing
+        this.errors = [];
         this.jsonRootObj = usjRootObj || {
             type: 'USJ',
-            version: '3.1',
+            version: (0, $28b0061e56e1edf2$export$7dc487a0fa1a604f),
             content: []
         };
         // Cache for the query objects
@@ -3947,7 +4008,10 @@ class $1bdca1468aa54399$var$USJGenerator {
         this.markerSets = (0, $28b0061e56e1edf2$export$d19275a111c0e9e6);
         this.parseState = {
             bookSlug: null,
-            currentChapter: null
+            currentChapter: null,
+            prevVerseSid: null,
+            vidH: null,
+            vidRef: null
         };
         // maps and id to a fn;
         this.dispatchMap = this.populateDispatchMap();
@@ -3985,6 +4049,7 @@ class $1bdca1468aa54399$var$USJGenerator {
             sid: chapRef
         };
         this.parseState.currentChapter = chapNum;
+        this.parseState.prevVerseSid = null; // Reset prevVerseSid when a new chapter starts
         chapCap.forEach((cap)=>{
             if (cap.name === 'alt-num') chapJsonObj.altnumber = this.usfm.substring(cap.node.startIndex, cap.node.endIndex).trim();
             if (cap.name === 'pub-num') chapJsonObj.pubnumber = this.usfm.substring(cap.node.startIndex, cap.node.endIndex).trim();
@@ -4025,6 +4090,7 @@ class $1bdca1468aa54399$var$USJGenerator {
         });
         const ref = `${this.parseState.bookSlug} ${this.parseState.currentChapter}:${verseNum}`;
         vJsonObj.sid = ref.trim();
+        this.parseState.prevVerseSid = vJsonObj.sid; // Update prevVerseSid for vid attribute handling
         parentJsonObj.content.push(vJsonObj);
     }
     nodeToUSJCaVa(node, parentJsonObj) {
@@ -4040,6 +4106,46 @@ class $1bdca1468aa54399$var$USJGenerator {
         charJsonObj.altnumber = altNum;
         parentJsonObj.content.push(charJsonObj);
     }
+    node2UsxVid(node, _parentJsonObj) {
+        // Build elements for vid and h attributes
+        this.parseState.vidH = null;
+        this.parseState.vidRef = null;
+        for (const child of node.children){
+            let attribValue = null;
+            for (const innerChild of child.children)if (innerChild.type === 'attributeValue') {
+                attribValue = this.usfm.slice(innerChild.startIndex, innerChild.endIndex).trim();
+                break;
+            }
+            if (child.type === 'hAttribute') this.parseState.vidH = attribValue;
+            else if (child.type === 'refAttribute') this.parseState.vidRef = attribValue;
+            else if (child.type === 'defaultAttribute') this.parseState.vidRef = attribValue;
+        }
+        if (this.parseState.vidRef) {
+            const refMatch = this.parseState.vidRef.match((0, $28b0061e56e1edf2$export$8e480ab8367e6dbc));
+            if (refMatch) {
+                this.parseState.bookSlug = refMatch[1];
+                this.parseState.currentChapter = refMatch[2];
+            } else {
+                this.warnings.push(`vid-ref attribute value does not match expected pattern: ${this.parseState.vidRef}`);
+                this.parseState.vidRef = null; // Reset vidRef if it doesn't match the expected pattern
+            }
+        }
+    }
+    addVidAttributesToNode(parentJsonObj) {
+        //Add vid attributes to the given xml node if they exist in parse state
+        if (this.parseState.vidH) {
+            parentJsonObj.h = this.parseState.vidH;
+            this.parseState.vidH = null; // Reset after use
+        }
+        if (this.parseState.vidRef) {
+            parentJsonObj.vid = this.parseState.vidRef;
+            this.parseState.vidRef = null; // Reset after use
+        }
+    }
+    addVidAttributeSecondAttempt(parentJsonObj, firstChild) {
+        // Add vid attributes to the given json node if firstChild is not a verse tag
+        if (!parentJsonObj.vid && this.parseState.prevVerseSid && firstChild && firstChild.type !== 'v') parentJsonObj.vid = this.parseState.prevVerseSid;
+    }
     nodeToUSJPara(node, parentJsonObj) {
         // Build paragraph nodes in USJ
         if (node.children[0].type.endsWith('Block')) node.children[0].children.forEach((child)=>{
@@ -4049,16 +4155,20 @@ class $1bdca1468aa54399$var$USJGenerator {
             const paraTagCap = this.getQuery('para').captures(node)[0];
             // const paraTagCap = this.queries.para.captures(node)[0];
             const paraMarker = paraTagCap.node.type;
-            if (paraMarker === 'b') parentJsonObj.content.push({
-                type: 'para',
-                marker: paraMarker
-            });
-            else if (!paraMarker.endsWith('Block')) {
+            if (paraMarker === 'b') {
+                parentJsonObj.content.push({
+                    type: 'para',
+                    marker: paraMarker
+                });
+                this.addVidAttributesToNode(parentJsonObj.content[parentJsonObj.content.length - 1]);
+            } else if (!paraMarker.endsWith('Block')) {
                 const paraJsonObj = {
                     type: 'para',
                     marker: paraMarker,
                     content: []
                 };
+                this.addVidAttributesToNode(paraJsonObj);
+                this.addVidAttributeSecondAttempt(paraJsonObj, paraTagCap.node.children[1]);
                 paraTagCap.node.children.forEach((child)=>{
                     this.nodeToUSJ(child, paraJsonObj);
                 });
@@ -4074,6 +4184,8 @@ class $1bdca1468aa54399$var$USJGenerator {
                 marker: paraMarker,
                 content: []
             };
+            this.addVidAttributesToNode(paraJsonObj);
+            this.addVidAttributeSecondAttempt(paraJsonObj, node.children[1]);
             node.children.slice(1).forEach((child)=>{
                 this.nodeToUSJ(child, paraJsonObj);
             });
@@ -4091,6 +4203,7 @@ class $1bdca1468aa54399$var$USJGenerator {
             content: []
         };
         noteJsonObj.caller = this.usfm.substring(callerNode.startIndex, callerNode.endIndex).trim();
+        this.addVidAttributesToNode(noteJsonObj);
         for(let i = 2; i < node.children.length - 1; i++)this.nodeToUSJ(node.children[i], noteJsonObj);
         parentJsonObj.content.push(noteJsonObj);
     }
@@ -4127,6 +4240,8 @@ class $1bdca1468aa54399$var$USJGenerator {
                 marker: 'tr',
                 content: []
             };
+            this.addVidAttributesToNode(rowJsonObj);
+            this.addVidAttributeSecondAttempt(rowJsonObj, node.children[1]);
             node.children.slice(1).forEach((child)=>{
                 this.nodeToUSJ(child, rowJsonObj);
             });
@@ -4146,6 +4261,20 @@ class $1bdca1468aa54399$var$USJGenerator {
             parentJsonObj.content.push(cellJsonObj);
         }
     }
+    nodeToUSJList(node, parentJsonObj) {
+        const firstChild = node.children.length > 0 ? node.children[0] : null;
+        if (firstChild && firstChild.type === 'list_s') {
+            const listJsonObj = {
+                type: 'list',
+                content: []
+            };
+            this.addVidAttributesToNode(listJsonObj);
+            for(let i = 1; i < node.children.length - 1; i++)this.nodeToUSJ(node.children[i], listJsonObj);
+            parentJsonObj.content.push(listJsonObj);
+        } else node.children.forEach((child)=>{
+            this.nodeToUSJ(child, parentJsonObj);
+        });
+    }
     nodeToUSJAttrib(node, parentJsonObj) {
         // Add attribute values to USJ elements
         const attribNameNode = node.children[0];
@@ -4175,6 +4304,7 @@ class $1bdca1468aa54399$var$USJGenerator {
             marker: style,
             content: []
         };
+        this.addVidAttributesToNode(msJsonObj);
         node.children.forEach((child)=>{
             if (child.type.endsWith('Attribute')) this.nodeToUSJ(child, msJsonObj);
         });
@@ -4190,6 +4320,7 @@ class $1bdca1468aa54399$var$USJGenerator {
                 marker: 'esb',
                 content: []
             };
+            this.addVidAttributesToNode(sidebarJsonObj);
             node.children.slice(1, -1).forEach((child)=>{
                 this.nodeToUSJ(child, sidebarJsonObj);
             });
@@ -4205,6 +4336,7 @@ class $1bdca1468aa54399$var$USJGenerator {
                 marker: 'fig',
                 content: []
             };
+            this.addVidAttributesToNode(figJsonObj);
             node.children.slice(1, -1).forEach((child)=>{
                 this.nodeToUSJ(child, figJsonObj);
             });
@@ -4220,9 +4352,57 @@ class $1bdca1468aa54399$var$USJGenerator {
             parentJsonObj.content.push(refJsonObj);
         }
     }
+    nodeToUSJCustom(node, parentJsonObj) {
+        const nodeTypeMap = {
+            zNameSpacePara: 'para',
+            zNameSpaceChar: 'char',
+            zNameSpaceNote: 'note',
+            zNameSpaceMS: 'ms',
+            zNameSpaceRegular: 'para',
+            zNameSpaceCharNested: 'char',
+            zNameSpaceClosed: 'ms'
+        };
+        let currNode = node;
+        let nodeType = null;
+        if (node.type === 'zNameSpaceUndefined' && node.children.length > 0) currNode = node.children[0];
+        if (currNode.type === 'zNameSpaceClosed' && currNode.children.length > 0) {
+            // Undefined marker: take the closing as the cue for the type.
+            // Closed with \marker* implies char, closed with only \* implies ms.
+            const lastChild = currNode.children[currNode.children.length - 1];
+            if (lastChild.type.startsWith('zSpaceClose')) nodeType = 'char';
+        }
+        if (nodeType === null) nodeType = nodeTypeMap[currNode.type];
+        if (nodeType === undefined) {
+            this.errors.push(`Unknown custom node type: ${currNode.type}`);
+            return;
+        }
+        const customJsonObj = {
+            type: nodeType,
+            content: []
+        };
+        // Consume any vid/h pending from a preceding \vid marker, as the other
+        // node handlers do, so it is not left to attach to a later node
+        this.addVidAttributesToNode(customJsonObj);
+        for (const child of currNode.children){
+            if (child.type.startsWith('zSpaceTag')) {
+                // A nested tag keeps its + between the backslash and the type prefix
+                const marker = this.usfm.slice(child.startIndex, child.endIndex).trim().replace('\\', '').replace(/^\+/, '');
+                if (marker.startsWith('custom')) customJsonObj.marker = marker.split('_').slice(1).join('_');
+                else customJsonObj.marker = marker;
+            } else if (child.type.endsWith('Attribute')) this.nodeToUSJ(child, customJsonObj);
+            else if (child.type.startsWith('zSpaceClose')) {
+                const closeMarker = this.usfm.slice(child.startIndex, child.endIndex).trim().replace('\\', '').replace(/^\+/, '');
+                let closedMarker = closeMarker.replace(/\*$/, '');
+                if (closedMarker.startsWith('custom')) closedMarker = closedMarker.split('_').slice(1).join('_');
+                if (closedMarker !== customJsonObj.marker) this.warnings.push(`Custom node closed with a different marker: ${closedMarker} ` + `instead of ${customJsonObj.marker}`);
+            } else if (child.type === 'caller') customJsonObj.caller = this.usfm.slice(child.startIndex, child.endIndex).trim();
+            else this.nodeToUSJ(child, customJsonObj);
+        }
+        parentJsonObj.content.push(customJsonObj);
+    }
     nodeToUSJGeneric(node, parentJsonObj) {
         // Build nodes for para style markers in USJ
-        const tagNode = node.children[0];
+        const tagNode = node.children[0] ? node.children[0] : node;
         let style = this.usfm.substring(tagNode.startIndex, tagNode.endIndex);
         if (style.startsWith('\\')) style = style.replace('\\', '').trim();
         else style = node.type;
@@ -4238,6 +4418,8 @@ class $1bdca1468aa54399$var$USJGenerator {
             marker: style,
             content: []
         };
+        this.addVidAttributesToNode(paraJsonObj);
+        this.addVidAttributeSecondAttempt(paraJsonObj, node.children[childrenRangeStart]);
         parentJsonObj.content.push(paraJsonObj);
         for(let i = childrenRangeStart; i < node.children.length; i++){
             const child = node.children[i];
@@ -4270,6 +4452,8 @@ class $1bdca1468aa54399$var$USJGenerator {
         thisMap.set('v', bindToClass(this.nodeToUSJVerse));
         thisMap.set('id', this.nodeToUSJId.bind(this));
         thisMap.set('chapter', this.nodeToUSJChapter.bind(this));
+        thisMap.set('list', this.nodeToUSJList.bind(this));
+        thisMap.set('vid', this.node2UsxVid.bind(this));
         // nooop
         thisMap.set('usfm', ()=>{});
         addHandlers([
@@ -4291,9 +4475,18 @@ class $1bdca1468aa54399$var$USJGenerator {
             'tr'
         ], this.nodeToUSJTable);
         addHandlers([
-            'milestone',
-            'zNameSpace'
+            'milestone'
         ], this.nodeToUSJMilestone);
+        addHandlers([
+            'zNameSpacePara',
+            'zNameSpaceChar',
+            'zNameSpaceNote',
+            'zNameSpaceMS',
+            'zNameSpaceUndefined',
+            'zNameSpaceClosed',
+            'zNameSpaceRegular',
+            'zNameSpaceCharNested'
+        ], this.nodeToUSJCustom);
         addHandlers([
             'esb',
             'cat',
@@ -4373,6 +4566,14 @@ class $0143e94dfd2d689d$var$ListGenerator {
             if (excludeMarkers && excludeMarkers.includes('id') || includeMarkers && !includeMarkers.includes('id')) return;
         } else if (obj.type === 'chapter') this.usjToListC(obj);
         else if (obj.type === 'verse') this.usjToListV(obj);
+        else if (obj.type === 'list' && excludeMarkers && !excludeMarkers.includes('list-s/e') || includeMarkers && includeMarkers.includes('list-s/e')) this.list.push([
+            this.book,
+            this.currentChapter,
+            this.currentVerse,
+            '',
+            'list',
+            'list-s'
+        ]);
         let markerType = obj.type;
         const markerName = obj.marker ? obj.marker : '';
         if (markerType === 'USJ') // This would occur if the JSON got flattened after removing paragraph markers
@@ -4397,6 +4598,22 @@ class $0143e94dfd2d689d$var$ListGenerator {
             markerType,
             markerName
         ]);
+        if (obj.type === 'list' && excludeMarkers && !excludeMarkers.includes('list-s/e') || includeMarkers && includeMarkers.includes('list-s/e')) this.list.push([
+            this.book,
+            this.currentChapter,
+            this.currentVerse,
+            '',
+            'list',
+            'list-e'
+        ]);
+        else if (obj.type === 'sidebar' && excludeMarkers && !excludeMarkers.includes('esbe') || includeMarkers && includeMarkers.includes('esbe')) this.list.push([
+            this.book,
+            this.currentChapter,
+            this.currentVerse,
+            '',
+            'sidebar',
+            'esbe'
+        ]);
     }
     usjToBibleNlpFormat(obj) {
         // Traverse the USJ object and build a dictionary for Bible NLP format
@@ -4433,11 +4650,13 @@ class $02bc2da10d8b76e8$var$USXGenerator {
    */ constructor(treeSitterLanguageObj, usfmString, usxRootElement = null){
         this.usfmLanguage = treeSitterLanguageObj;
         this.usfm = usfmString;
+        this.warnings = []; // Initialize warnings array to store any warnings during processing
+        this.errors = [];
         const domImpl = new (0, $5OpyM$DOMImplementation)();
         const doc = domImpl.createDocument(null, 'usx', null);
         if (usxRootElement === null) {
             this.xmlRootNode = doc.documentElement;
-            this.xmlRootNode.setAttribute('version', '3.1');
+            this.xmlRootNode.setAttribute('version', (0, $28b0061e56e1edf2$export$7dc487a0fa1a604f));
         } else this.xmlRootNode = usxRootElement;
         // Cache for the query objects
         this.queries = {};
@@ -4452,7 +4671,9 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             currentChapter: null,
             prevVerseSid: null,
             prevChapterSid: null,
-            prevVerse: null
+            prevVerse: null,
+            vidH: null,
+            vidRef: null
         };
         // maps and id to a fn;
         this.dispatchMap = this.populateDispatchMap();
@@ -4470,6 +4691,8 @@ class $02bc2da10d8b76e8$var$USXGenerator {
         thisMap.set('v', bindToClass(this.node2UsxVerse));
         thisMap.set('id', this.node2UsxId.bind(this));
         thisMap.set('chapter', this.node2UsxChapter.bind(this));
+        thisMap.set('list', this.node2UsxList.bind(this));
+        thisMap.set('vid', this.node2UsxVid.bind(this));
         // nooop
         thisMap.set('usfm', ()=>{});
         addHandlers([
@@ -4492,9 +4715,18 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             'tr'
         ], this.node2UsxTable);
         addHandlers([
-            'milestone',
-            'zNameSpace'
+            'milestone'
         ], this.node2UsxMilestone);
+        addHandlers([
+            'zNameSpacePara',
+            'zNameSpaceChar',
+            'zNameSpaceNote',
+            'zNameSpaceMS',
+            'zNameSpaceUndefined',
+            'zNameSpaceClosed',
+            'zNameSpaceRegular',
+            'zNameSpaceCharNested'
+        ], this.node2UsxCustom);
         addHandlers([
             'esb',
             'cat',
@@ -4661,6 +4893,45 @@ class $02bc2da10d8b76e8$var$USXGenerator {
         // Append the 'char' element to the parent XML node
         parentXmlNode.appendChild(charXmlNode);
     }
+    node2UsxVid(node, _parentXmlNode) {
+        // Build elements for vid and h attributes
+        this.parseState.vidH = null;
+        for (const child of node.children){
+            let attribValue = null;
+            for (const innerChild of child.children)if (innerChild.type === 'attributeValue') {
+                attribValue = this.usfm.slice(innerChild.startIndex, innerChild.endIndex).trim();
+                break;
+            }
+            if (child.type === 'hAttribute') this.parseState.vidH = attribValue;
+            else if (child.type === 'refAttribute') this.parseState.vidRef = attribValue;
+            else if (child.type === 'defaultAttribute') this.parseState.vidRef = attribValue;
+        }
+        if (this.parseState.vidRef) {
+            const refMatch = this.parseState.vidRef.match((0, $28b0061e56e1edf2$export$8e480ab8367e6dbc));
+            if (refMatch) {
+                this.parseState.bookSlug = refMatch[1];
+                this.parseState.currentChapter = refMatch[2];
+            } else {
+                this.warnings.push(`vid-ref attribute value does not match expected pattern: ${this.parseState.vidRef}`);
+                this.parseState.vidRef = null; // Reset vidRef if it doesn't match the expected pattern
+            }
+        }
+    }
+    addVidAttributesToNode(parentXmlNode) {
+        //Add vid attributes to the given xml node if they exist in parse state
+        if (this.parseState.vidH) {
+            parentXmlNode.setAttribute('h', this.parseState.vidH);
+            this.parseState.vidH = null; // Reset after use
+        }
+        if (this.parseState.vidRef) {
+            parentXmlNode.setAttribute('vid', this.parseState.vidRef);
+            this.parseState.vidRef = null; // Reset after use
+        }
+    }
+    addVidAttributesSecondAttempt(xmlNode, firstChild) {
+        // Add vid attributes to the given xml node if firstChild is not a verse tag
+        if (!xmlNode.hasAttribute('vid') && this.parseState.prevVerseSid && firstChild && firstChild.type !== 'v') xmlNode.setAttribute('vid', this.parseState.prevVerseSid);
+    }
     node2UsxPara(node, parentXmlNode) {
         // Build paragraph nodes in USX
         if (node.children[0].type.endsWith('Block')) for (const child of node.children[0].children)this.node2UsxPara(child, parentXmlNode);
@@ -4670,6 +4941,8 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             if (!paraMarker.endsWith('Block')) {
                 const paraXmlNode = parentXmlNode.ownerDocument.createElement('para');
                 paraXmlNode.setAttribute('style', paraMarker);
+                this.addVidAttributesToNode(paraXmlNode);
+                this.addVidAttributesSecondAttempt(paraXmlNode, paraTagCap.node.children[1]);
                 parentXmlNode.appendChild(paraXmlNode);
                 for (const child of paraTagCap.node.children.slice(1))this.node2Usx(child, paraXmlNode);
             }
@@ -4680,6 +4953,8 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             const paraMarker = this.usfm.slice(node.children[0].startIndex, node.children[0].endIndex).replace('\\', '').trim();
             const paraXmlNode = parentXmlNode.ownerDocument.createElement('para');
             paraXmlNode.setAttribute('style', paraMarker);
+            this.addVidAttributesToNode(paraXmlNode);
+            this.addVidAttributesSecondAttempt(paraXmlNode, node.children[1]);
             parentXmlNode.appendChild(paraXmlNode);
             for (const child of node.children.slice(1))this.node2Usx(child, paraXmlNode);
         }
@@ -4693,6 +4968,7 @@ class $02bc2da10d8b76e8$var$USXGenerator {
         noteXmlNode.setAttribute('style', style);
         const caller = this.usfm.substring(callerNode.startIndex, callerNode.endIndex).trim();
         noteXmlNode.setAttribute('caller', caller);
+        this.addVidAttributesToNode(noteXmlNode);
         parentXmlNode.appendChild(noteXmlNode);
         for(let i = 2; i < node.children.length - 1; i++)this.node2Usx(node.children[i], noteXmlNode);
     }
@@ -4700,10 +4976,18 @@ class $02bc2da10d8b76e8$var$USXGenerator {
         // Build USJ nodes for character markups, both regular and nested
         const tagNode = node.children[0];
         let childrenRange = node.children.length;
-        for(let i = node.children.length - 1; i > 0; i--)if (node.children[i].type.startsWith('\\') || node.children[i].type === '*' || node.children[i].type.endsWith('Tag')) childrenRange -= 1;
+        let closingNode = null;
+        for(let i = node.children.length - 1; i > 0; i--){
+            if (node.children[i].type.startsWith('\\') || node.children[i].type === '*' || node.children[i].type.endsWith('Tag')) {
+                childrenRange -= 1;
+                closingNode = node.children[i];
+            } else break;
+        }
         const charXmlNode = parentXmlNode.ownerDocument.createElement('char');
         const style = this.usfm.substring(tagNode.startIndex, tagNode.endIndex).replace('\\', '').replace('+', '').trim();
         charXmlNode.setAttribute('style', style);
+        if (closingNode) charXmlNode.setAttribute('closed', 'true');
+        else charXmlNode.setAttribute('closed', 'false');
         parentXmlNode.appendChild(charXmlNode);
         for(let i = 1; i < childrenRange; i++)this.node2Usx(node.children[i], charXmlNode);
     }
@@ -4736,6 +5020,8 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             const rowXmlNode = parentXmlNode.ownerDocument.createElement('row');
             rowXmlNode.setAttribute('style', 'tr');
             parentXmlNode.appendChild(rowXmlNode);
+            this.addVidAttributesToNode(rowXmlNode);
+            this.addVidAttributesSecondAttempt(rowXmlNode, node.children[1]);
             node.children.slice(1).forEach((child)=>{
                 this.node2Usx(child, rowXmlNode);
             });
@@ -4751,22 +5037,78 @@ class $02bc2da10d8b76e8$var$USXGenerator {
             });
         }
     }
+    node2UsxList(node, parentXmlNode) {
+        const firstChild = node.children.length > 0 ? node.children[0] : null;
+        if (firstChild && firstChild.type === 'list_s') {
+            const listXmlNode = parentXmlNode.ownerDocument.createElement('list');
+            this.addVidAttributesToNode(listXmlNode);
+            for(let i = 1; i < node.children.length - 1; i++)this.node2Usx(node.children[i], listXmlNode);
+            parentXmlNode.appendChild(listXmlNode);
+        } else for (const child of node.children)this.node2Usx(child, parentXmlNode);
+    }
     node2UsxMilestone(node, parentXmlNode) {
         // Create ms node in USJ
         const msNameCap = this.getQuery('milestone').captures(node)[0]; //
         const style = this.usfm.slice(msNameCap.node.startIndex, msNameCap.node.endIndex).replace('\\', '').trim();
         const msXmlNode = parentXmlNode.ownerDocument.createElement('ms');
         msXmlNode.setAttribute('style', style);
+        this.addVidAttributesToNode(msXmlNode);
         parentXmlNode.appendChild(msXmlNode);
         node.children.forEach((child)=>{
             if (child.type.endsWith('Attribute')) this.node2Usx(child, msXmlNode);
         });
     }
+    node2UsxCustom(node, parentXmlNode) {
+        const nodeTypeMap = {
+            zNameSpacePara: 'para',
+            zNameSpaceChar: 'char',
+            zNameSpaceNote: 'note',
+            zNameSpaceMS: 'ms',
+            zNameSpaceRegular: 'para',
+            zNameSpaceCharNested: 'char',
+            zNameSpaceClosed: 'ms'
+        };
+        let currNode = node;
+        let nodeType = null;
+        if (node.type === 'zNameSpaceUndefined' && node.children.length > 0) currNode = node.children[0];
+        if (currNode.type === 'zNameSpaceClosed' && currNode.children.length > 0) {
+            // Undefined marker: take the closing as the cue for the type.
+            // Closed with \marker* implies char, closed with only \* implies ms.
+            const lastChild = currNode.children[currNode.children.length - 1];
+            if (lastChild.type.startsWith('zSpaceClose')) nodeType = 'char';
+        }
+        if (nodeType === null) nodeType = nodeTypeMap[currNode.type];
+        if (nodeType === undefined) {
+            this.errors.push(`Unknown custom node type: ${node.type}`);
+            return;
+        }
+        const customXmlNode = parentXmlNode.ownerDocument.createElement(nodeType);
+        // Consume any vid/h pending from a preceding \vid marker, as the other
+        // node handlers do, so it is not left to attach to a later node
+        this.addVidAttributesToNode(customXmlNode);
+        for (const child of currNode.children){
+            if (child.type.startsWith('zSpaceTag')) {
+                // A nested tag keeps its + between the backslash and the type prefix
+                let marker = this.usfm.slice(child.startIndex, child.endIndex).trim().replace('\\', '').replace(/^\+/, '');
+                if (marker.startsWith('custom')) marker = marker.split('_').slice(1).join('_');
+                customXmlNode.setAttribute('style', marker);
+            } else if (child.type.endsWith('Attribute')) this.node2Usx(child, customXmlNode);
+            else if (child.type.startsWith('zSpaceClose')) {
+                const closeMarker = this.usfm.slice(child.startIndex, child.endIndex).trim().replace('\\', '').replace(/^\+/, '');
+                let closedMarker = closeMarker.replace(/\*$/, '');
+                if (closeMarker.startsWith('custom')) closedMarker = closedMarker.split('_').slice(1).join('_');
+                if (closedMarker !== customXmlNode.getAttribute('style')) this.warnings.push(`Custom node closed with a different marker: ${closedMarker} ` + `instead of ${customXmlNode.getAttribute('style')}`);
+            } else if (child.type === 'caller') customXmlNode.setAttribute('caller', this.usfm.slice(child.startIndex, child.endIndex).trim());
+            else this.node2Usx(child, customXmlNode);
+        }
+        parentXmlNode.appendChild(customXmlNode);
+    }
     node2UsxSpecial(node, parentXmlNode) {
         // Build nodes for esb, cat, fig, optbreak in USJ
         if (node.type === 'esb') {
             const sidebarXmlNode = parentXmlNode.ownerDocument.createElement('sidebar');
             sidebarXmlNode.setAttribute('style', 'esb');
+            this.addVidAttributesToNode(sidebarXmlNode);
             parentXmlNode.appendChild(sidebarXmlNode);
             node.children.slice(1, -1).forEach((child)=>{
                 this.node2Usx(child, sidebarXmlNode);
@@ -4778,6 +5120,7 @@ class $02bc2da10d8b76e8$var$USXGenerator {
         } else if (node.type === 'fig') {
             const figXmlNode = parentXmlNode.ownerDocument.createElement('figure');
             figXmlNode.setAttribute('style', 'fig');
+            this.addVidAttributesToNode(figXmlNode);
             parentXmlNode.appendChild(figXmlNode);
             node.children.slice(1, -1).forEach((child)=>{
                 this.node2Usx(child, figXmlNode);
@@ -4791,7 +5134,7 @@ class $02bc2da10d8b76e8$var$USXGenerator {
         }
     }
     node2UsxGeneric(node, parentXmlNode) {
-        const tagNode = node.children[0];
+        const tagNode = node.children[0] ? node.children[0] : node;
         let style = this.usfm.slice(tagNode.startIndex, tagNode.endIndex).trim();
         // Strip leading backslashes from the style or use node type
         if (style.startsWith('\\')) style = style.replace('\\', '');
@@ -4802,6 +5145,8 @@ class $02bc2da10d8b76e8$var$USXGenerator {
         const paraXmlNode = parentXmlNode.ownerDocument.createElement('para');
         paraXmlNode.setAttribute('style', style);
         parentXmlNode.appendChild(paraXmlNode);
+        this.addVidAttributesToNode(paraXmlNode);
+        this.addVidAttributesSecondAttempt(paraXmlNode, node.children[childrenRangeStart]);
         // Loop through the child nodes and recursively process them
         for(let i = childrenRangeStart; i < node.children.length; i++){
             const child = node.children[i];
@@ -46766,6 +47111,7 @@ const $ab5c81e737a0c6a6$var$MARKERS_WITH_DISCARDABLE_CONTENTS = [
     'ipq',
     'imq',
     'ipr',
+    'ipc',
     'iq',
     'ib',
     'ili',
@@ -46819,11 +47165,13 @@ const $ab5c81e737a0c6a6$var$MARKERS_WITH_DISCARDABLE_CONTENTS = [
     'fig',
     'cat',
     'esb',
-    'b'
+    'b',
+    'user-extension'
 ];
 const $ab5c81e737a0c6a6$var$trailingNumPattern = /\d+$/;
 const $ab5c81e737a0c6a6$var$punctPatternNoSpaceBefore = /^[,.\-—/;:!?@$%^)}\]>”»]/;
 const $ab5c81e737a0c6a6$var$punctPatternNoSpaceAfter = /[\-—/`@^&({[<“«]$/;
+const $ab5c81e737a0c6a6$var$znamespacePattern = /^z[\w\-]+/;
 function $ab5c81e737a0c6a6$var$combineConsecutiveTextContents(contentsList) {
     const textCombinedContents = [];
     let textContents = '';
@@ -46842,6 +47190,28 @@ function $ab5c81e737a0c6a6$var$combineConsecutiveTextContents(contentsList) {
     if (textContents !== '') textCombinedContents.push(textContents);
     return textCombinedContents;
 }
+function $ab5c81e737a0c6a6$var$deepCopyValue(value) {
+    // Plain-JSON deep copy; primitives are immutable so they are returned as is
+    if (value === null || typeof value !== 'object') return value;
+    if (Array.isArray(value)) return value.map($ab5c81e737a0c6a6$var$deepCopyValue);
+    const copied = {};
+    Object.keys(value).forEach((key)=>{
+        copied[key] = $ab5c81e737a0c6a6$var$deepCopyValue(value[key]);
+    });
+    return copied;
+}
+function $ab5c81e737a0c6a6$var$copyUsjNode(inputUsj, cleanedKids) {
+    // Build a copy, rather than mutate the caller's USJ object.
+    // 'content' is already rebuilt from the filtered children, so only the other
+    // values need a deep copy. That keeps the copying linear, and keeps any
+    // non-primitive value from being shared between the input and the output.
+    const cleanedUsj = {};
+    Object.keys(inputUsj).forEach((key)=>{
+        cleanedUsj[key] = key === 'content' ? inputUsj[key] : $ab5c81e737a0c6a6$var$deepCopyValue(inputUsj[key]);
+    });
+    cleanedUsj.content = cleanedKids;
+    return cleanedUsj;
+}
 function $ab5c81e737a0c6a6$var$excludeMarkersInUsj(inputUsj, excludeMarkers, combineTexts = true, excludedParent = false) {
     let cleanedKids = [];
     if (typeof inputUsj === 'string') {
@@ -46851,8 +47221,10 @@ function $ab5c81e737a0c6a6$var$excludeMarkersInUsj(inputUsj, excludeMarkers, com
         ];
     }
     let thisMarker = '';
+    if (inputUsj.type === 'list') thisMarker = 'list-s/e';
     if ('marker' in inputUsj) thisMarker = inputUsj.marker.replace($ab5c81e737a0c6a6$var$trailingNumPattern, '');
     else if (inputUsj.type === 'ref') thisMarker = 'ref';
+    if ($ab5c81e737a0c6a6$var$znamespacePattern.test(thisMarker)) thisMarker = 'user-extension';
     let thisMarkerNeeded = true;
     let innerContentNeeded = true;
     excludedParent = false;
@@ -46869,10 +47241,7 @@ function $ab5c81e737a0c6a6$var$excludeMarkersInUsj(inputUsj, excludeMarkers, com
         });
         if (combineTexts) cleanedKids = $ab5c81e737a0c6a6$var$combineConsecutiveTextContents(cleanedKids);
     }
-    if (thisMarkerNeeded) {
-        inputUsj.content = cleanedKids;
-        return inputUsj;
-    }
+    if (thisMarkerNeeded) return $ab5c81e737a0c6a6$var$copyUsjNode(inputUsj, cleanedKids);
     if (innerContentNeeded) return cleanedKids;
     return [];
 }
@@ -46885,8 +47254,10 @@ function $ab5c81e737a0c6a6$var$includeMarkersInUsj(inputUsj, includeMarkers, com
         ];
     }
     let thisMarker = '';
+    if (inputUsj.type === 'list') thisMarker = 'list-s/e';
     if ('marker' in inputUsj) thisMarker = inputUsj.marker.replace($ab5c81e737a0c6a6$var$trailingNumPattern, '');
     else if (inputUsj.type === 'ref') thisMarker = 'ref';
+    if ($ab5c81e737a0c6a6$var$znamespacePattern.test(thisMarker)) thisMarker = 'user-extension';
     const thisMarkerNeeded = includeMarkers.includes(thisMarker) || thisMarker === '';
     const innerContentNeeded = thisMarkerNeeded || !$ab5c81e737a0c6a6$var$MARKERS_WITH_DISCARDABLE_CONTENTS.includes(thisMarker);
     if (innerContentNeeded && 'content' in inputUsj) {
@@ -46897,16 +47268,16 @@ function $ab5c81e737a0c6a6$var$includeMarkersInUsj(inputUsj, includeMarkers, com
         });
         if (combineTexts) cleanedKids = $ab5c81e737a0c6a6$var$combineConsecutiveTextContents(cleanedKids);
     }
-    if (thisMarker === 'c') {
-        if (!includeMarkers.includes('ca')) delete inputUsj.altnumber;
-        if (!includeMarkers.includes('cp')) delete inputUsj.pubnumber;
-    } else if (thisMarker === 'v') {
-        if (!includeMarkers.includes('va')) delete inputUsj.altnumber;
-        if (!includeMarkers.includes('vp')) delete inputUsj.pubnumber;
-    }
     if (thisMarkerNeeded) {
-        inputUsj.content = cleanedKids;
-        return inputUsj;
+        const cleanedUsj = $ab5c81e737a0c6a6$var$copyUsjNode(inputUsj, cleanedKids);
+        if (thisMarker === 'c') {
+            if (!includeMarkers.includes('ca')) delete cleanedUsj.altnumber;
+            if (!includeMarkers.includes('cp')) delete cleanedUsj.pubnumber;
+        } else if (thisMarker === 'v') {
+            if (!includeMarkers.includes('va')) delete cleanedUsj.altnumber;
+            if (!includeMarkers.includes('vp')) delete cleanedUsj.pubnumber;
+        }
+        return cleanedUsj;
     }
     if (innerContentNeeded) return cleanedKids;
     return [];
@@ -46928,6 +47299,7 @@ class $ab5c81e737a0c6a6$export$ec91da630f36d5ea {
         'ipq',
         'imq',
         'ipr',
+        'ipc',
         'iq',
         'ib',
         'ili',
@@ -47011,6 +47383,8 @@ class $ab5c81e737a0c6a6$export$ec91da630f36d5ea {
         'sls',
         'tl',
         'wj',
+        'ta',
+        'wl',
         'em',
         'bd',
         'bdit',
@@ -47064,10 +47438,23 @@ class $ab5c81e737a0c6a6$export$ec91da630f36d5ea {
         'c',
         'v'
     ];
+    static LISTS = [
+        'list-s',
+        'list-e',
+        'lh',
+        'li',
+        'lf',
+        'lim',
+        'lik',
+        'liv'
+    ];
     static TEXT = [
         'text-in-excluded-parent',
         'text'
     ];
+    static ZNAMESPACES = [
+        'user-extension'
+    ];
     static keepOnly(inputUsj, includeMarkers, combineTexts = true) {
         // let flattenedList = [].concat(...includeMarkers);
         const cleanedMarkers = includeMarkers.map((marker)=>marker.replace($ab5c81e737a0c6a6$var$trailingNumPattern, ''));
@@ -47083,6 +47470,115 @@ class $ab5c81e737a0c6a6$export$ec91da630f36d5ea {
 }
 
 
+const $b0abb17ac2d74d5e$export$ca0f3793b4450a5d = {
+    para: 'para',
+    header: 'para',
+    title: 'para',
+    introduction: 'para',
+    section: 'para',
+    versepara: 'para',
+    list: 'para',
+    otherpara: 'para',
+    note: 'note',
+    crossreference: 'note',
+    footnote: 'note',
+    char: 'char',
+    introchar: 'char',
+    listchar: 'char',
+    footnotechar: 'char',
+    crossreferencechar: 'char',
+    milestone: 'milestone'
+};
+const $b0abb17ac2d74d5e$export$15add78feb2cf2fb = {
+    para: 'customPara_',
+    char: 'customChar_',
+    note: 'customNote_',
+    milestone: 'customMS_'
+};
+const $b0abb17ac2d74d5e$var$linePattern = /^\\([\w-]+)\s+(.*)$/;
+// A marker name ends at the first whitespace
+const $b0abb17ac2d74d5e$var$markerNamePattern = /^\S+/;
+// \, * and | are USFM structural characters and are never part of a marker name
+const $b0abb17ac2d74d5e$var$invalidMarkerChars = /[\\*|]/;
+// The grammar accepts z followed by one or more word or hyphen characters, so
+// anything else would be rewritten into a tag the parser cannot match
+const $b0abb17ac2d74d5e$var$customMarkerPattern = /^z[\w-]+$/;
+// Take the marker name up to the first whitespace and validate it
+function $b0abb17ac2d74d5e$var$readMarkerName(value) {
+    const nameMatch = value.match($b0abb17ac2d74d5e$var$markerNamePattern);
+    const markerName = nameMatch === null ? '' : nameMatch[0];
+    const invalidMatch = markerName.match($b0abb17ac2d74d5e$var$invalidMarkerChars);
+    if (invalidMatch !== null) throw new Error(`Invalid character '${invalidMatch[0]}' in marker name ` + `'${markerName}'. A marker name cannot contain \\, * or |.`);
+    if (markerName.startsWith('z') && !$b0abb17ac2d74d5e$var$customMarkerPattern.test(markerName)) throw new Error(`Invalid custom marker name '${markerName}'. A custom marker name must be ` + "'z' followed by one or more letters, digits, underscores or hyphens.");
+    return markerName;
+}
+// Trim the category value and check that it is one we know
+function $b0abb17ac2d74d5e$var$readCategory(value) {
+    const category = value.trim();
+    if (!Object.prototype.hasOwnProperty.call($b0abb17ac2d74d5e$export$ca0f3793b4450a5d, category)) throw new Error(`Invalid category '${category}'. Expected one of: ` + `${Object.keys($b0abb17ac2d74d5e$export$ca0f3793b4450a5d).sort().join(', ')}.`);
+    return category;
+}
+// Every custom marker block must declare a category
+function $b0abb17ac2d74d5e$var$checkCategoriesPresent(extensions) {
+    const missing = Object.keys(extensions).filter((name)=>!Object.prototype.hasOwnProperty.call(extensions[name], 'category'));
+    if (missing.length > 0) throw new Error(`Missing category for custom marker(s): ${missing.join(', ')}. ` + 'Every marker block needs a category line.');
+}
+// Marker names come from free text in markers.ext, so they may contain regex
+// metacharacters. Escape them before building a pattern.
+function $b0abb17ac2d74d5e$var$escapeRegExp(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+class $b0abb17ac2d74d5e$export$a014771799102136 {
+    constructor(){
+        this.lines = [];
+        this.extensions = {};
+    }
+    readToObject(fileContent = null, filePath = null) {
+        this.lines = [];
+        this.extensions = {};
+        if (fileContent === null && filePath !== null) throw new Error('Reading from a file path is not supported in the browser.');
+        if (fileContent === null) throw new TypeError('fileContent is required.');
+        this.lines = fileContent.split(/\r?\n/);
+        // Build into a local object so a validation error leaves no partial state
+        const extensions = {};
+        let currentMarker = null;
+        for (const line of this.lines){
+            const lineMatch = line.match($b0abb17ac2d74d5e$var$linePattern);
+            if (lineMatch === null) continue;
+            const [, key, value] = lineMatch;
+            if (key === 'marker') {
+                const markerName = $b0abb17ac2d74d5e$var$readMarkerName(value);
+                if (markerName.startsWith('z')) {
+                    extensions[markerName] = {};
+                    currentMarker = markerName;
+                } else currentMarker = null;
+            } else if (currentMarker !== null) extensions[currentMarker][key] = key === 'category' ? $b0abb17ac2d74d5e$var$readCategory(value) : value;
+        }
+        $b0abb17ac2d74d5e$var$checkCategoriesPresent(extensions);
+        this.extensions = extensions;
+        return this.extensions;
+    }
+    replaceCustomMarkers(usfmString) {
+        let modifiedUsfm = usfmString;
+        for (const marker of Object.keys(this.extensions)){
+            const category = this.extensions[marker].category;
+            const markerType = $b0abb17ac2d74d5e$export$ca0f3793b4450a5d[category];
+            if (markerType === undefined) continue;
+            const replacement = $b0abb17ac2d74d5e$export$15add78feb2cf2fb[markerType];
+            // Only char markers have a nested (\+marker) form in the grammar, so
+            // only those may carry a + through to the prefixed tag
+            const nestedPrefix = markerType === 'char' ? '\\+?' : '';
+            const markerPattern = new RegExp(`\\\\(${nestedPrefix})${$b0abb17ac2d74d5e$var$escapeRegExp(marker)}(?=[^\\w-]|$)`, 'g');
+            // A function replacement keeps `$` patterns in the marker name literal
+            const replacementTag = `${replacement}${marker}`;
+            modifiedUsfm = modifiedUsfm.replace(markerPattern, (match, plus)=>`\\${plus}${replacementTag}`);
+        }
+        return modifiedUsfm;
+    }
+}
+var $b0abb17ac2d74d5e$export$2e2bcd8739ae039 = $b0abb17ac2d74d5e$export$a014771799102136;
+
+
 class $236d01ba6f80be5e$export$db89aa78daab09ca {
     static language = null;
     static async init(grammarPath = 'node_modules/usfm-grammar/tree-sitter-usfm.wasm', parserPath = 'node_modules/usfm-grammar/tree-sitter.wasm') {
@@ -47093,10 +47589,11 @@ class $236d01ba6f80be5e$export$db89aa78daab09ca {
         });
         $236d01ba6f80be5e$export$db89aa78daab09ca.language = await (0, $dc2P8.Language).load(grammarPath);
     }
-    constructor(usfmString = null, fromUsj = null, fromUsx = null, fromBibleNlp = null, bookCode = null){
+    constructor(usfmString = null, fromUsj = null, fromUsx = null, fromBibleNlp = null, bookCode = null, markersExt = null){
         this.syntaxTree = null;
         this.errors = [];
         this.warnings = [];
+        this.markerExtensions = null;
         let inputsGiven = 0;
         if (usfmString !== null) inputsGiven += 1;
         if (fromUsj !== null) inputsGiven += 1;
@@ -47118,6 +47615,11 @@ Only one of USFM, USJ, USX or BibleNLP is supported in one object.`);
             this.bibleNlp = fromBibleNlp;
             this.usfm = this.convertBibleNLPtoUSFM(bookCode);
         }
+        if (markersExt !== null) {
+            this.markerExtensions = new (0, $b0abb17ac2d74d5e$export$2e2bcd8739ae039)();
+            this.markerExtensions.readToObject(markersExt);
+            if (Object.keys(this.markerExtensions.extensions).length > 0) this.usfm = this.markerExtensions.replaceCustomMarkers(this.usfm);
+        }
         this.parser = null;
         this.initializeParser();
         this.parseUSFM();
@@ -47149,7 +47651,7 @@ Only one of USFM, USJ, USX or BibleNLP is supported in one object.`);
             if (!(1 <= this.usx.nodeType && this.usx.nodeType <= 12)) throw new Error('Input must be an instance of xmldom Document or Element');
             if (this.usx.tagName !== 'usx') {
                 if (!(this.usx.getElementsByTagName('usx').length === 1)) throw new Error(`Expects a <usx> node.
-Refer docs: https://docs.usfm.bible/usfm/3.1/syntax.html#_usx_usfm_xml`);
+Refer docs: https://docs.usfm.bible/usfm/3.1.2/syntax.html#_usx_usfm_xml`);
                 this.usx = this.usx.getElementsByTagName('usx')[0];
             }
         // assert(this.usx.childNodes[0].tagName === 'book', "<book> expected as first element in <usx>")
@@ -47194,11 +47696,31 @@ Refer docs: https://docs.usfm.bible/usfm/3.1/syntax.html#_usx_usfm_xml`);
         return null;
     }
     checkforMissing(node) {
-        for (const n of node.children){
-            if (n.isMissing) this.errors.push(`At ${n.startPosition.row + 1}:${n.startPosition.column}, Error: Missing ${n.type}`);
-            this.checkforMissing(n);
-        }
+        const cursor = node.walk();
+        do {
+            const currentNode = cursor.currentNode;
+            if (currentNode.isMissing) this.errors.push(`At ${currentNode.startPosition.row + 1}:${currentNode.startPosition.column}, Error: Missing ${currentNode.type}`);
+            if (cursor.gotoFirstChild()) continue;
+            while(!cursor.gotoNextSibling()){
+                if (!cursor.gotoParent()) return;
+            }
+        }while (true);
     }
+    // checkforMissing(node) {
+    //   console.log('Checking for missing nodes in:', node.type, 'at');
+    //   console.log(node.children.map(nod => nod.type).join(', '));
+    //   for (const n of node.children) {
+    //     if (n.isMissing) {
+    //       console.log(`Missing node found: ${n.type} `);
+    //       this.errors.push(
+    //         `At ${n.startPosition.row + 1}:${
+    //           n.startPosition.column
+    //         }, Error: Missing ${n.type}`,
+    //       );
+    //     }
+    //     this.checkforMissing(n);
+    //   }
+    // }
     convertUSJToUSFM() {
         const outputUSFM = new (0, $ce44dcc4919407eb$export$2e2bcd8739ae039)().usjToUsfm(this.usj); // Simulated conversion
         return outputUSFM;
@@ -47254,6 +47776,8 @@ Use ignoreErrors = true, as third parameter of toUSJ(), to generate output despi
             const usjGenerator = new (0, $1bdca1468aa54399$export$2e2bcd8739ae039)($236d01ba6f80be5e$export$db89aa78daab09ca.language, this.usfm);
             usjGenerator.nodeToUSJ(this.syntaxTree, usjGenerator.jsonRootObj);
             outputUSJ = usjGenerator.jsonRootObj;
+            this.warnings.push(...usjGenerator.warnings);
+            this.errors.push(...usjGenerator.errors);
         } catch (err) {
             let message = 'Unable to do the conversion.';
             if (this.errors) {
@@ -47264,11 +47788,25 @@ Use ignoreErrors = true, as third parameter of toUSJ(), to generate output despi
                 error: message
             };
         }
-        if (includeMarkers) outputUSJ = (0, $ab5c81e737a0c6a6$export$ec91da630f36d5ea).keepOnly(outputUSJ, [
-            ...includeMarkers,
-            'USJ'
-        ], combineTexts);
-        if (excludeMarkers) outputUSJ = (0, $ab5c81e737a0c6a6$export$ec91da630f36d5ea).remove(outputUSJ, excludeMarkers, combineTexts);
+        if (includeMarkers) {
+            // Copy first: Filter members are shared arrays, and must not be appended to
+            const includeList = [
+                ...includeMarkers
+            ];
+            if (includeList.includes('list-s') || includeList.includes('list-e')) includeList.push('list-s/e');
+            outputUSJ = (0, $ab5c81e737a0c6a6$export$ec91da630f36d5ea).keepOnly(outputUSJ, [
+                ...includeList,
+                'USJ'
+            ], combineTexts);
+        }
+        if (excludeMarkers) {
+            // Copy first: Filter members are shared arrays, and must not be appended to
+            const excludeList = [
+                ...excludeMarkers
+            ];
+            if (excludeList.includes('list-s') || excludeList.includes('list-e')) excludeList.push('list-s/e');
+            outputUSJ = (0, $ab5c81e737a0c6a6$export$ec91da630f36d5ea).remove(outputUSJ, excludeList, combineTexts);
+        }
         return outputUSJ;
     }
     toList(excludeMarkers = null, includeMarkers = null, ignoreErrors = false, combineTexts = true) {
@@ -47341,6 +47879,8 @@ Use ignoreErrors=true to generate output despite errors`);
             usxGenerator.node2Usx(this.syntaxTree, usxGenerator.xmlRootNode);
             // xmlContent = usxSerializer.serializeToString(usxGenerator.xmlRootNode);
             xmlContent = usxGenerator.xmlRootNode;
+            this.warnings.push(...usxGenerator.warnings);
+            this.errors.push(...usxGenerator.errors);
         } catch (exe) {
             let message = 'Unable to do the conversion. ';
             if (this.errors.length > 0) {