proskomma-core 0.11.4 → 0.11.5

package/dist/index.js

@@ -15992,7 +15992,7 @@ var bitset = { exports: {} };
 var bitsetExports = bitset.exports;
 const BitSet = /* @__PURE__ */ getDefaultExportFromCjs(bitsetExports);
 const name = "proskomma-core";
-const version = "0.11.4";
+const version = "0.11.5";
 const description$h = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -43377,6 +43377,16 @@ const Sequence = class {
     }
     this.activeScopes = [];
   }
+  closeCellScopes(parser) {
+    const firstCellIndex = this.activeScopes.findIndex((sc) => sc.label.startsWith("cell/"));
+    if (firstCellIndex < 0) {
+      return;
+    }
+    for (const activeScope of this.activeScopes.slice(firstCellIndex).reverse()) {
+      this.closeActiveScope(parser, activeScope);
+    }
+    this.activeScopes = this.activeScopes.slice(0, firstCellIndex);
+  }
   closeActiveScope(parser, sc) {
     this.addItem({
       type: "scope",
@@ -44272,6 +44282,8 @@ const specs = (pt) => [
     // ROW - Make new block
     contexts: [["startTag", "tagName", ["tr"]]],
     parser: {
+      // End open cells in the row they belong to, before the new row's block is created
+      before: (parser) => parser.closeActiveScopes("endBlock"),
       newBlock: true,
       newScopes: []
     }
@@ -44512,22 +44524,13 @@ const specs = (pt) => [
     // CELL - unpick tagName, add scope
     contexts: [["startTag", "tagName", ["th", "thr", "tc", "tcr"]]],
     parser: {
+      // Cells don't nest, so any cell marker (any column number or range) ends an open cell
+      before: (parser) => parser.closeActiveScopes("startCell"),
       newScopes: [
         {
           label: (pt2) => labelForScope$2("cell", [pt2.fullTagName]),
           endedBy: [
-            "startTag/th",
-            "startTag/thr",
-            "startTag/tc",
-            "startTag/tcr",
-            "startTag/th2",
-            "startTag/thr2",
-            "startTag/tc2",
-            "startTag/tcr2",
-            "startTag/th3",
-            "startTag/thr3",
-            "startTag/tc3",
-            "startTag/tcr3",
+            "startCell",
             "endBlock",
             "endTag/$fullTagName$"
           ]
@@ -44810,6 +44813,7 @@ const Parser2 = class {
       if (emptySequences) {
         seq.removeGraftsToEmptySequences(emptySequences);
       }
+      seq.closeCellScopes(this);
       seq.addTableScopes();
       seq.close(this);
       this.substitutePubNumberScopes(seq);

package/dist/index.mjs

@@ -15990,7 +15990,7 @@ var bitset = { exports: {} };
 var bitsetExports = bitset.exports;
 const BitSet = /* @__PURE__ */ getDefaultExportFromCjs(bitsetExports);
 const name = "proskomma-core";
-const version = "0.11.4";
+const version = "0.11.5";
 const description$h = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -43375,6 +43375,16 @@ const Sequence = class {
     }
     this.activeScopes = [];
   }
+  closeCellScopes(parser) {
+    const firstCellIndex = this.activeScopes.findIndex((sc) => sc.label.startsWith("cell/"));
+    if (firstCellIndex < 0) {
+      return;
+    }
+    for (const activeScope of this.activeScopes.slice(firstCellIndex).reverse()) {
+      this.closeActiveScope(parser, activeScope);
+    }
+    this.activeScopes = this.activeScopes.slice(0, firstCellIndex);
+  }
   closeActiveScope(parser, sc) {
     this.addItem({
       type: "scope",
@@ -44270,6 +44280,8 @@ const specs = (pt) => [
     // ROW - Make new block
     contexts: [["startTag", "tagName", ["tr"]]],
     parser: {
+      // End open cells in the row they belong to, before the new row's block is created
+      before: (parser) => parser.closeActiveScopes("endBlock"),
       newBlock: true,
       newScopes: []
     }
@@ -44510,22 +44522,13 @@ const specs = (pt) => [
     // CELL - unpick tagName, add scope
     contexts: [["startTag", "tagName", ["th", "thr", "tc", "tcr"]]],
     parser: {
+      // Cells don't nest, so any cell marker (any column number or range) ends an open cell
+      before: (parser) => parser.closeActiveScopes("startCell"),
       newScopes: [
         {
           label: (pt2) => labelForScope$2("cell", [pt2.fullTagName]),
           endedBy: [
-            "startTag/th",
-            "startTag/thr",
-            "startTag/tc",
-            "startTag/tcr",
-            "startTag/th2",
-            "startTag/thr2",
-            "startTag/tc2",
-            "startTag/tcr2",
-            "startTag/th3",
-            "startTag/thr3",
-            "startTag/tc3",
-            "startTag/tcr3",
+            "startCell",
             "endBlock",
             "endTag/$fullTagName$"
           ]
@@ -44808,6 +44811,7 @@ const Parser2 = class {
       if (emptySequences) {
         seq.removeGraftsToEmptySequences(emptySequences);
       }
+      seq.closeCellScopes(this);
       seq.addTableScopes();
       seq.close(this);
       this.substitutePubNumberScopes(seq);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proskomma-core",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "description": "A Scripture Runtime Engine",
   "files": [
     "dist"