proskomma-core 0.10.14 → 0.10.16

package/README.md

@@ -1,7 +1,3 @@
-# EXPERIMENTAL
-
-DISCLAIMER : if you want the production version please [click on this link](https://github.com/mvahowe/proskomma-js)
-
 # proskomma-core
 
 A Javascript Implementation of the Proskomma Scripture Processing Model.
@@ -50,4 +46,4 @@ Method to solve this problem :
   * normally it's listed in the link above
 * then replace `false` by `require.resolve('theNameOfTheNeededPackage')`
 
-If it doesn't work, I'm afraid you'll have to dig in the webpack documentation for `resolve` : https://webpack.js.org/configuration/resolve/ (or try to find a solution on StackOverflow !)
+If it doesn't work, I'm afraid you'll have to dig in the webpack documentation for `resolve` : https://webpack.js.org/configuration/resolve/ (or try to find a solution on StackOverflow !)

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.10.14";
+const version = "0.10.16";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -34086,7 +34086,10 @@ const makeVerses = (subclass, matchedBits) => {
 `
   };
   if (ret.numberString.includes("-")) {
-    const [fromV, toV] = ret.numberString.split("-").map((v) => parseInt(v));
+    let [fromV, toV] = ret.numberString.split("-").map((v) => parseInt(v));
+    if (!toV) {
+      toV = fromV;
+    }
     ret.numbers = Array.from(Array(toV - fromV + 1).keys()).map(
       (v) => v + fromV
     );
@@ -38520,8 +38523,12 @@ const Sequence = class {
       }
       return false;
     };
+    const blockGrafts = (blockItems) => {
+      const grafts = blockItems.filter((i) => i.type === "graft" && i.subType === "fig");
+      return grafts.length > 0;
+    };
     for (const blockRecord of this.blocks.entries()) {
-      if (blockRecord[1].tokens().length === 0 && !emptyMilestones(blockRecord[1].items) && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
+      if (blockRecord[1].tokens().length === 0 && !emptyMilestones(blockRecord[1].items) && !blockGrafts(blockRecord[1].items) && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
         emptyBlocks.push(blockRecord);
       }
     }
@@ -39797,7 +39804,7 @@ const Parser2 = class {
       if (seq.type === "sidebar") {
         this.substituteEsbCatScopes(seq);
       }
-      if (["footnote", "xref"].includes(seq.type)) {
+      if (["footnote", "xref", "fig"].includes(seq.type)) {
         seq.lastBlock().inlineToEnd();
       }
     }

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.10.14";
+const version = "0.10.16";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -34084,7 +34084,10 @@ const makeVerses = (subclass, matchedBits) => {
 `
   };
   if (ret.numberString.includes("-")) {
-    const [fromV, toV] = ret.numberString.split("-").map((v) => parseInt(v));
+    let [fromV, toV] = ret.numberString.split("-").map((v) => parseInt(v));
+    if (!toV) {
+      toV = fromV;
+    }
     ret.numbers = Array.from(Array(toV - fromV + 1).keys()).map(
       (v) => v + fromV
     );
@@ -38518,8 +38521,12 @@ const Sequence = class {
       }
       return false;
     };
+    const blockGrafts = (blockItems) => {
+      const grafts = blockItems.filter((i) => i.type === "graft" && i.subType === "fig");
+      return grafts.length > 0;
+    };
     for (const blockRecord of this.blocks.entries()) {
-      if (blockRecord[1].tokens().length === 0 && !emptyMilestones(blockRecord[1].items) && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
+      if (blockRecord[1].tokens().length === 0 && !emptyMilestones(blockRecord[1].items) && !blockGrafts(blockRecord[1].items) && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
         emptyBlocks.push(blockRecord);
       }
     }
@@ -39795,7 +39802,7 @@ const Parser2 = class {
       if (seq.type === "sidebar") {
         this.substituteEsbCatScopes(seq);
       }
-      if (["footnote", "xref"].includes(seq.type)) {
+      if (["footnote", "xref", "fig"].includes(seq.type)) {
         seq.lastBlock().inlineToEnd();
       }
     }

package/package.json

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