@gmb/bitmark-parser-generator 5.35.0 → 5.37.0

package/dist/browser/cjs/index.cjs

@@ -1402,6 +1402,7 @@ var propertyKeys = {
   property_dateEnd: "@dateEnd",
   property_decimalPlaces: "@decimalPlaces",
   property_deeplink: "@deeplink",
+  property_displayName: "@displayName",
   property_diffContext: "@diffContext",
   property_diffOp: "@diffOp",
   property_diffRef: "@diffRef",
@@ -1614,6 +1615,8 @@ var propertyKeys = {
   property_trim: "@trim",
   property_unit: "@unit",
   property_unitAbbr: "@unitAbbr",
+  property_unitAbbrPlural: "@unitAbbrPlural",
+  property_unitPlural: "@unitPlural",
   property_vendorDashboardId: "@vendorDashboardId",
   property_vendorSurveyId: "@vendorSurveyId",
   property_vendorUrl: "@vendorUrl",
@@ -2551,9 +2554,30 @@ var CARDSETS = {
   [CardSetConfigKey.definitionList]: {
     jsonKey: "definitions",
     exportJsonKey: { definitions: "$" },
+    // PLAN-141 F1 (NISO import): each <def-item> is one card; the sides
+    // read <term>/<def>; the enclosing <legend>'s <title> lands on the
+    // term side's heading tag ([#Key] header card).
+    // PLAN-141 F3: a <tbx:langSet> is ALSO one card (a terminology entry —
+    // its enclosing <tbx:termEntry> is a transparent claim wrapper); its
+    // children compose the term/definition sides via the side rules below.
+    mappingKeys: {
+      "xml-niso-iec": [
+        { "@el": "def-item", "@children": "$" },
+        { "@el": "tbx:langSet", "@children": "$" }
+      ]
+    },
     sides: [
       {
         name: "term",
+        // F3: every <tbx:tig>'s <tbx:term> STACKS one-per-line onto the
+        // single term side (the "$\n" template's authored separator; the
+        // trailing one is trimmed) — the PDF's Maus/Mus/M/Müsli stack.
+        mappingKeys: {
+          "xml-niso-iec": [
+            { "@el": "term", "@text": "$" },
+            { "@el": "tbx:tig", "@children": { "@el": "tbx:term", "@text": "$\n" } }
+          ]
+        },
         variants: [
           {
             jsonKey: "term.text",
@@ -2569,7 +2593,8 @@ var CARDSETS = {
                 format: TagFormat.plainText,
                 nullable: true,
                 jsonKey: "^heading.forKeys",
-                exportJsonKey: { "@bit": { heading: { forKeys: "$" } } }
+                exportJsonKey: { "@bit": { heading: { forKeys: "$" } } },
+                mappingKeys: { "xml-niso-iec": { "@el": "title", "@text": "$" } }
               },
               {
                 key: ConfigKey.group_resourceIcon,
@@ -2595,6 +2620,24 @@ var CARDSETS = {
       },
       {
         name: "definition",
+        // F3: the definition side COMPOSES from the entry's fields in
+        // document order, with the ES-rendered locale affixes AUTHORED as
+        // value-position templates (never engine text): the subject field
+        // in ⟨⟩ glues (trailing space) onto the definition line; example /
+        // notes / source follow as blank-line-separated lines. The TBX
+        // grammar flags (normativeAuthorization, termType, partOfSpeech,
+        // grammaticalNumber) are unrendered machine-only data — dropped and
+        // recorded (catalog R-2, reviewed under D7 max-preservation).
+        mappingKeys: {
+          "xml-niso-iec": [
+            { "@el": "def", "@children": "$" },
+            { "@el": "tbx:subjectField", "@text": "\u27E8$\u27E9 " },
+            { "@el": "tbx:definition", "@children": "$" },
+            { "@el": "tbx:example", "@children": "BEISPIEL $" },
+            { "@el": "tbx:note", "@children": "Anmerkung zu Begriff: $" },
+            { "@el": "tbx:source", "@text": "[QUELLE: $]" }
+          ]
+        },
         variants: [
           {
             jsonKey: "definition.text",
@@ -3985,6 +4028,11 @@ var CARDSETS = {
           { table: { header: { rows: ["$"] } } }
         ],
         htmlKey: { "@el": "thead", "@children": { "@el": "tr", "@children": "$" } },
+        // PLAN-141 F2 (NISO import): the XHTML table model NISO uses — a
+        // <thead> SECTION whose <tr> rows are the header cards.
+        mappingKeys: {
+          "xml-niso-iec": { "@el": "thead", "@children": { "@el": "tr", "@children": "$" } }
+        },
         sideJsonKey: "cells[{s}]|set(title=true)",
         sideExportJsonKey: { cells: { $s: { title: true, $: "$" } } },
         // Header cells are `<th>`. The `width` attribute is contributed by the
@@ -3996,12 +4044,21 @@ var CARDSETS = {
         jsonKey: "table.body.rows",
         exportJsonKey: { table: { body: { rows: "$" } } },
         htmlKey: { "@el": "tbody", "@children": { "@el": "tr", "@children": "$" } },
+        // PLAN-141 F2 (NISO import): <tbody> rows are the (default) data cards.
+        mappingKeys: {
+          "xml-niso-iec": { "@el": "tbody", "@children": { "@el": "tr", "@children": "$" } }
+        },
         isDefault: true
       },
       "table-footer": {
         jsonKey: "table.footer.rows",
         exportJsonKey: { table: { footer: { rows: "$" } } },
         htmlKey: { "@el": "tfoot", "@children": { "@el": "tr", "@children": "$" } },
+        // PLAN-141 F2 (NISO import): NISO has no <tfoot> — the footer card's
+        // source is the <table-wrap-foot> block (CONTENT-shaped: no rows; its
+        // prose/notes flatten into one footer card — catalog table-wrap-foot
+        // row; a contained <def-list> promotes as a sibling legend bit).
+        mappingKeys: { "xml-niso-iec": { "@el": "table-wrap-foot", "@children": "$" } },
         sideJsonKey: "cells[{s}]|set(title=true)",
         sideExportJsonKey: { cells: { $s: { title: true, $: "$" } } },
         // Footer cells render as `<th>` (mirrors the header `title: true`
@@ -4018,6 +4075,8 @@ var CARDSETS = {
         // Default (body) cell → `<td>`; the header/footer sections override the
         // side to `<th>` via their sideHtmlKey (HTML.md §8).
         htmlKey: { "@el": "td", "@children": "$" },
+        // PLAN-141 F2 (NISO import): a <td> row child is a body cell side.
+        mappingKeys: { "xml-niso-iec": { "@el": "td", "@children": "$" } },
         variants: [
           {
             jsonKey: "content",
@@ -4035,7 +4094,11 @@ var CARDSETS = {
                 // cell with `title: true` automatically.
                 jsonKey: "content",
                 exportJsonKey: { content: "$" },
-                description: "Title text of the table cell (header rows)."
+                description: "Title text of the table cell (header rows).",
+                // PLAN-141 F2 (NISO import): a <th> row child is a TITLE cell —
+                // its content lands in the `[#…]` tag (an empty <th> keeps its
+                // slot as a bare `[#]`).
+                mappingKeys: { "xml-niso-iec": { "@el": "th", "@children": "$" } }
               },
               {
                 key: ConfigKey.property_tableCellType,
@@ -4054,6 +4117,9 @@ var CARDSETS = {
                 // HTML-C2: contribute a `rowspan` attribute onto the enclosing
                 // cell element (`<th>`/`<td>`).
                 htmlKey: { "@el": { "@attr": { rowspan: "$" } } },
+                // PLAN-141 F2 (NISO import): recover the source cell's own
+                // `rowspan` attribute (element-scope attr form).
+                mappingKeys: { "xml-niso-iec": { "@el": { "@attr": { rowspan: "$" } } } },
                 description: "Number of rows the cell spans.",
                 format: TagFormat.number
               },
@@ -4064,6 +4130,9 @@ var CARDSETS = {
                 // HTML-C2: contribute a `colspan` attribute onto the enclosing
                 // cell element (`<th>`/`<td>`).
                 htmlKey: { "@el": { "@attr": { colspan: "$" } } },
+                // PLAN-141 F2 (NISO import): recover the source cell's own
+                // `colspan` attribute (element-scope attr form).
+                mappingKeys: { "xml-niso-iec": { "@el": { "@attr": { colspan: "$" } } } },
                 description: "Number of columns the cell spans.",
                 format: TagFormat.number
               },
@@ -4085,6 +4154,13 @@ var CARDSETS = {
                 // HTML.md §8 + HTML-C2: contribute a `width` attribute onto the
                 // enclosing cell element (`<th>`/`<td>`).
                 htmlKey: { "@el": { "@attr": { width: "$" } } },
+                // PLAN-141 F2 (NISO import): NISO carries widths as PER-COLUMN
+                // <col width="…"> descriptors at container level, not on cells.
+                // The matched values distribute positionally onto the first
+                // (header) card's sides. Number format ⇒ only an integral
+                // percentage survives ("20.0000%" → 20); a fractional one
+                // (renderer-equalised "4.7619%") is dropped — catalog `col` row.
+                mappingKeys: { "xml-niso-iec": { "@el": "col", "@attr": { width: "$" } } },
                 description: "Width for the column.",
                 format: TagFormat.number
               }
@@ -4354,12 +4430,22 @@ var CARDSETS = {
               },
               {
                 key: ConfigKey.property_unit,
-                description: "Unit of measurement for the ingredient.",
+                description: "Unit of measurement for the ingredient (singular).",
+                format: TagFormat.plainText
+              },
+              {
+                key: ConfigKey.property_unitPlural,
+                description: "Unit of measurement for the ingredient (plural).",
                 format: TagFormat.plainText
               },
               {
                 key: ConfigKey.property_unitAbbr,
-                description: "Abbreviation for the unit of measurement.",
+                description: "Abbreviation for the unit of measurement (singular).",
+                format: TagFormat.plainText
+              },
+              {
+                key: ConfigKey.property_unitAbbrPlural,
+                description: "Abbreviation for the unit of measurement (plural).",
                 format: TagFormat.plainText
               },
               {
@@ -4458,7 +4544,22 @@ var GROUPS = {
         key: ConfigKey.property_externalId,
         description: "The external identifier for the bit",
         format: TagFormat.plainText,
-        maxCount: Count.infinity
+        maxCount: Count.infinity,
+        // PLAN-140 refs family (NISO import): the machine identifier of a
+        // referenced standard. NESTED content slot — the tag reads (and
+        // consumes) ONLY the <std-id> inside a <std> child; the remaining
+        // designation/title text stays bit body. A <std> without <std-id>
+        // does not fire the key.
+        // PLAN-141 F5: on the [.book] bit, the DATED <std-ref> designation
+        // is the document's external id. Safe rule order: <std-ref> is a
+        // direct bit-element child only under <std-meta> (everywhere else
+        // it nests inside <std>, which the tag spine never reaches).
+        mappingKeys: {
+          "xml-niso-iec": [
+            { "@el": "std", "@children": { "@el": "std-id", "@text": "$" } },
+            { "@el": "std-ref", "@attr": { type: "dated" }, "@text": "$" }
+          ]
+        }
       },
       {
         key: ConfigKey.property_sourceRL,
@@ -4520,6 +4621,11 @@ var GROUPS = {
         description: "Translation source reference",
         format: TagFormat.plainText
       },
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible",
+        format: TagFormat.boolean
+      },
       {
         key: ConfigKey.property_spansPageBreak,
         description: "If true, the bit spans a page break",
@@ -4599,7 +4705,8 @@ var GROUPS = {
       {
         key: ConfigKey.property_diffTime,
         description: "The diff time for the bit",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_ageRange,
@@ -4610,7 +4717,18 @@ var GROUPS = {
       {
         key: ConfigKey.property_lang,
         description: "The language for the bit",
-        format: TagFormat.plainText
+        format: TagFormat.plainText,
+        // PLAN-141 F3 (NISO import): a term-sec's language rides
+        // <tbx:termEntry><tbx:langSet xml:lang> — a nested content slot
+        // whose leaf is a $-in-ATTR-position slot (the nested counterpart
+        // of the value-attr slot). Only termEntry elements match, so the
+        // shared tag is inert everywhere else.
+        mappingKeys: {
+          "xml-niso-iec": {
+            "@el": "tbx:termEntry",
+            "@children": { "@el": "tbx:langSet", "@attr": { "xml:lang": "$" } }
+          }
+        }
       },
       {
         key: ConfigKey.property_publisher,
@@ -4809,6 +4927,9 @@ var GROUPS = {
         key: ConfigKey.tag_item,
         jsonKey: "item",
         exportJsonKey: { item: "$" },
+        // PLAN-140 W3 (NISO import): the clause/note label of a mapped
+        // source element ([%1], [%ANMERKUNG 1]).
+        mappingKeys: { "xml-niso-iec": { "@el": "label", "@text": "$" } },
         description: "The item for the bit",
         chain: [
           {
@@ -5771,7 +5892,20 @@ var GROUPS = {
         key: ConfigKey.property_language,
         description: "The language of the book",
         format: TagFormat.plainText,
-        maxCount: Count.infinity
+        maxCount: Count.infinity,
+        // PLAN-141 F5 (NISO import): only the PRIMARY (first)
+        // <content-language> survives — the maxEmits cap realises the
+        // catalog's document-language rule (extras drop, R-4).
+        mappingKeys: {
+          "xml-niso-iec": [
+            { predicates: [], maxEmits: 1, rule: { "@el": "content-language", "@text": "$" } }
+          ]
+        }
+      },
+      {
+        key: ConfigKey.property_displayName,
+        description: "The display name of the book",
+        format: TagFormat.plainText
       },
       {
         key: ConfigKey.property_customerExternalId,
@@ -5847,7 +5981,18 @@ var GROUPS = {
         description: "The title of the book",
         maxCount: 2,
         jsonKey: "title|multi(count=2, key=subtitle)",
-        exportJsonKey: [{ "@level=1": { title: "$" } }, { "@level=2": { subtitle: "$" } }]
+        exportJsonKey: [{ "@level=1": { title: "$" } }, { "@level=2": { subtitle: "$" } }],
+        // PLAN-141 F5 (NISO import): the PRIMARY (first) <title-wrap>'s
+        // assembled <full> title → [#]; the per-language extras drop (R-4).
+        mappingKeys: {
+          "xml-niso-iec": [
+            {
+              predicates: [],
+              maxEmits: 1,
+              rule: { "@el": "title-wrap", "@children": { "@el": "full", "@text": "$" } }
+            }
+          ]
+        }
       },
       {
         key: ConfigKey.property_subtype,
@@ -6160,17 +6305,20 @@ var GROUPS = {
       {
         key: ConfigKey.property_platformMargin,
         description: "The platform margin",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_platformBorderRadius,
         description: "The platform border radius",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_platformSelectionBorderRadius,
         description: "The platform selection border radius",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_platformNeedsShadow,
@@ -6277,7 +6425,13 @@ var GROUPS = {
       {
         key: ConfigKey.property_caption,
         description: "The caption for the resource",
-        format: TagFormat.bitmarkText
+        format: TagFormat.bitmarkText,
+        // PLAN-141 F1 (NISO import): a figure's <caption><title> — the
+        // nested content slot reads the title text; the caption rides the
+        // resource chain ([&image:…][@caption:…], catalog D5).
+        mappingKeys: {
+          "xml-niso-iec": { "@el": "caption", "@children": { "@el": "title", "@text": "$" } }
+        }
       },
       {
         key: ConfigKey.property_showInIndex,
@@ -6551,6 +6705,10 @@ var GROUPS = {
       {
         key: ConfigKey.resource_image,
         exportJsonKey: { resource: { type: "image", image: { src: "$" } } },
+        // PLAN-141 F1 (NISO import): the image URL rides the `$`-in-attr
+        // value slot — a <graphic xlink:href> child of the mapped bit
+        // element roots the [&image:URL] chain.
+        mappingKeys: { "xml-niso-iec": { "@el": "graphic", "@attr": { "xlink:href": "$" } } },
         description: "The image resource",
         chain: [
           {
@@ -7425,6 +7583,8 @@ var BITS = {
         maxCount: 2,
         jsonKey: "title|multi(count=2, key=subtitle)",
         exportJsonKey: [{ "@level=1": { title: "$" } }, { "@level=2": { subtitle: "$" } }],
+        // PLAN-140 W3 (NISO import): the title of a mapped source element.
+        mappingKeys: { "xml-niso-iec": { "@el": "title", "@text": "$" } },
         key: ConfigKey.tag_title,
         description: "The title of the article"
       }
@@ -7466,22 +7626,84 @@ var BITS = {
   [BitType2.smartStandardArticleNormative]: {
     since: "1.28.0",
     baseBitType: BitType2.standardArticleNormative,
-    description: "Smart standard normative article bit"
+    description: "Smart standard normative article bit",
+    // PLAN-140 W3 (NISO import, tranche 1): one article bit per NISO
+    // paragraph (catalog D1). CONTENT keys (@children): the subtree is the
+    // bit's body; nothing inside it promotes. (Ancestor-context normativity
+    // is the non-normative sibling's @ancestor key — plan Q4, resolved.)
+    //
+    // Second rule (catalog D1 push-down): a NUMBERED-PARAGRAPH sec is an
+    // article, not a chapter — the sec-type literal outranks the chapter
+    // key's plain sec|app rule (most-specific-wins). Content key: the sec's
+    // label rides [%] via the label tag key, its inner <p> is the body, its
+    // id is the bit's customerId, and the anchor slot marks it
+    // anchor-bearing.
+    mappingKeys: {
+      "xml-niso-iec": [
+        { "@el": "p", "@attr": { id: "$customerId" }, "@children": "$" },
+        {
+          "@el": "sec",
+          "@attr": { "sec-type": "numbered-paragraph", id: "$customerId" },
+          "@children": "$",
+          "\u25BC": "$anchor"
+        }
+      ]
+    }
   },
   [BitType2.smartStandardArticleNonNormative]: {
     since: "1.28.0",
     baseBitType: BitType2.standardArticleNonNormative,
-    description: "Smart standard non-normative article bit"
+    description: "Smart standard non-normative article bit",
+    // PLAN-140 Q4 (normativity inheritance): a <p> is non-normative because
+    // of an ANCESTOR element — a foreword/intro sec or an informative annex.
+    // @ancestor is a reverse-match-only constraint (forward emission ignores
+    // it); the rules are alternatives, first-satisfied wins, and the
+    // @ancestor literals give this key higher specificity than the plain
+    // normative-article <p> key wherever the context applies.
+    mappingKeys: {
+      "xml-niso-iec": [
+        {
+          "@el": "p",
+          "@attr": { id: "$customerId" },
+          "@ancestor": { "@attr": { "sec-type": "foreword|intro" } },
+          "@children": "$"
+        },
+        {
+          "@el": "p",
+          "@attr": { id: "$customerId" },
+          "@ancestor": { "@attr": { "content-type": "informative" } },
+          "@children": "$"
+        }
+      ]
+    }
   },
   [BitType2.smartStandardArticleNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardArticleNormative,
-    description: "Smart standard normative article bit that is collapsible"
+    description: "Smart standard normative article bit that is collapsible",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardArticleNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardArticleNonNormative,
-    description: "Smart standard non-normative article bit that is collapsible"
+    description: "Smart standard non-normative article bit that is collapsible",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.statement]: {
     since: "1.3.0",
@@ -8102,7 +8324,8 @@ var BITS = {
       {
         key: ConfigKey.property_maxCreatedBits,
         description: "The maximum number of bits that can be created from this bit",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       }
     ],
     textFormatDefault: TextFormat2.plainText
@@ -8232,6 +8455,13 @@ var BITS = {
     since: "1.3.0",
     baseBitType: BitType2._standard,
     description: "Book bit, used to represent a book",
+    // PLAN-141 F5 (NISO import): the <std-meta> front-matter container is
+    // the [.book] bit (STRUCTURAL, first in document order): primary
+    // title-wrap → [#], primary content-language → [@language], dated
+    // std-ref → [@externalId] (tag keys with maxEmits caps — the NISO
+    // convention puts the document language first). std-meta has no id, so
+    // no anchor/customerId. Remaining leaves drop as recorded loss (R-4).
+    mappingKeys: { "xml-niso-iec": { "@el": "std-meta" } },
     tags: [
       {
         key: ConfigKey.group_bookCommon,
@@ -8518,12 +8748,14 @@ var BITS = {
       {
         key: ConfigKey.property_focusX,
         description: "The X coordinate for focusing the image in the browser",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_focusY,
         description: "The Y coordinate for focusing the image in the browser",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       }
     ]
   },
@@ -8554,6 +8786,15 @@ var BITS = {
     since: "1.3.0",
     baseBitType: BitType2._standard,
     description: "Chapter bit, used to define chapters in books or articles",
+    // PLAN-140 W3 (NISO import, tranche 1): recover a chapter from a NISO
+    // section or annex. STRUCTURAL key (no @children content slot): the
+    // element carries no body of its own — tag children (label/title) map
+    // via tag keys, every mapped descendant promotes to a following sibling
+    // bit, and the chapter level derives from nesting depth (catalog D1).
+    // The source id lands as [@customerId] (two-id model, D2).
+    mappingKeys: {
+      "xml-niso-iec": { "@el": "sec|app", "@attr": { id: "$customerId" }, "\u25BC": "$anchor" }
+    },
     tags: [
       {
         exportJsonKey: { anchor: "$" },
@@ -8565,7 +8806,10 @@ var BITS = {
         key: ConfigKey.tag_title,
         description: "The title of the chapter",
         jsonKey: "title|setMulti(level)",
-        exportJsonKey: { title: "$", level: "$level" }
+        exportJsonKey: { title: "$", level: "$level" },
+        // PLAN-140 W3 (NISO import): the section/annex title; the heading
+        // level rides the normalizer-derived nesting depth (plan Q2).
+        mappingKeys: { "xml-niso-iec": { "@el": "title", "@text": "$" } }
       },
       {
         key: ConfigKey.property_toc,
@@ -8578,12 +8822,6 @@ var BITS = {
         description: "The progress of the chapter, used for tracking reading progress",
         format: TagFormat.boolean,
         defaultValue: "true"
-      },
-      {
-        key: ConfigKey.property_isCollapsible,
-        description: "If true, the chapter is collapsible",
-        format: TagFormat.boolean,
-        defaultValue: "false"
       }
     ]
   },
@@ -8771,11 +9009,28 @@ var BITS = {
     since: "1.3.0",
     baseBitType: BitType2._standard,
     description: "Code bit, used for code snippets in articles or documents",
+    // PLAN-141 F4 (NISO import): a <code> block is a CONTENT bit with a
+    // literal text body; @language recovers as [@computerLanguage] (absent
+    // attr → no tag). Anchor = the source id (D2 revised).
+    mappingKeys: {
+      "xml-niso-iec": {
+        "@el": "code",
+        "@attr": { id: "$customerId", language: "$computerLanguage" },
+        "\u25BC": "$anchor",
+        "@text": "$"
+      }
+    },
     tags: [
       {
         key: ConfigKey.property_computerLanguage,
         description: "The programming language of the code snippet",
-        format: TagFormat.plainText
+        format: TagFormat.plainText,
+        // PLAN-141 F4 (NISO import): the bit key's `language` sigil recovers
+        // a present attr; this `@absent` rule supplies the AUTHORED default
+        // when the source carries none (catalog code row — an untyped block
+        // is `[@computerLanguage:text]`). Fires only on foreign imports,
+        // never the carrier round-trip.
+        mappingKeys: { "xml-niso-iec": [{ "@absent": "text" }] }
       },
       {
         key: ConfigKey.property_codeLineNumbers,
@@ -8814,7 +9069,20 @@ var BITS = {
   [BitType2.smartStandardFormulaNormative]: {
     since: "3.11.0",
     baseBitType: BitType2.formula,
-    description: "Smart standard normative formula bit, used for mathematical formulas in smart standards that are normative"
+    description: "Smart standard normative formula bit, used for mathematical formulas in smart standards that are normative",
+    // PLAN-141 F4 (NISO import): a <disp-formula> is a CONTENT bit whose
+    // latex-format body carries the <mml:math> subtree VERBATIM (G1 — no
+    // MathML↔LaTeX transform; ids stripped); <label> → [%]; a contained
+    // <legend> PROMOTES as a sibling legend bit (cards cannot nest in a
+    // body). Anchor = the source id (D2 revised).
+    mappingKeys: {
+      "xml-niso-iec": {
+        "@el": "disp-formula",
+        "@attr": { id: "$customerId" },
+        "\u25BC": "$anchor",
+        "@children": "$"
+      }
+    }
   },
   [BitType2.smartStandardRemarkFormula]: {
     since: "3.11.0",
@@ -9160,12 +9428,22 @@ var BITS = {
         chain: [
           {
             key: ConfigKey.property_unit,
-            description: "The unit of measurement for the ingredients",
+            description: "The unit of measurement for the ingredients (singular)",
+            format: TagFormat.plainText
+          },
+          {
+            key: ConfigKey.property_unitPlural,
+            description: "The unit of measurement for the ingredients (plural)",
             format: TagFormat.plainText
           },
           {
             key: ConfigKey.property_unitAbbr,
-            description: "The abbreviation for the unit of measurement",
+            description: "The abbreviation for the unit of measurement (singular)",
+            format: TagFormat.plainText
+          },
+          {
+            key: ConfigKey.property_unitAbbrPlural,
+            description: "The abbreviation for the unit of measurement (plural)",
             format: TagFormat.plainText
           },
           {
@@ -9341,7 +9619,8 @@ var BITS = {
       {
         key: ConfigKey.property_reasonableNumOfChars,
         description: "The reasonable number of characters for the essay",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_sampleSolution,
@@ -9443,13 +9722,31 @@ var BITS = {
   },
   [BitType2.smartStandardExampleNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardExampleNormative,
-    description: "Smart standard normative example collapsible bit, used to provide normative examples in smart standards that can be collapsed"
+    description: "Smart standard normative example collapsible bit, used to provide normative examples in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardExampleNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardExampleNonNormative,
-    description: "Smart standard non-normative example collapsible bit, used to provide non-normative examples in smart standards that can be collapsed"
+    description: "Smart standard non-normative example collapsible bit, used to provide non-normative examples in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.authorContentBitGenerator]: {
     since: "4.2.0",
@@ -9774,12 +10071,28 @@ var BITS = {
   [BitType2.smartStandardList]: {
     since: "1.28.0",
     baseBitType: BitType2.standardList,
-    description: "Smart standard list bit, used to create smart standard lists in articles or books"
+    description: "Smart standard list bit, used to create smart standard lists in articles or books",
+    // PLAN-140 refs family (NISO import): a reference list is a STRUCTURAL
+    // bit (no @children — it takes a path ordinal anchor and its <ref>
+    // children promote to sibling list-item bits); its <title> rides [#]
+    // via the title tag key.
+    mappingKeys: {
+      "xml-niso-iec": { "@el": "ref-list", "@attr": { id: "$customerId" }, "\u25BC": "$anchor" }
+    }
   },
   [BitType2.smartStandardListCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardList,
-    description: "Smart standard list collapsible bit, used to create collapsible smart standard lists in articles or books"
+    description: "Smart standard list collapsible bit, used to create collapsible smart standard lists in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.message]: {
     since: "1.3.0",
@@ -9819,17 +10132,45 @@ var BITS = {
   [BitType2.smartStandardNoteNonNormative]: {
     since: "1.28.0",
     baseBitType: BitType2.standardNoteNonNormative,
-    description: "Smart standard non-normative note bit, used to provide non-normative notes in smart standards"
+    description: "Smart standard non-normative note bit, used to provide non-normative notes in smart standards",
+    // PLAN-140 W3 (NISO import, tranche 1). CONTENT key (@children): a
+    // note's inner paragraphs are note body, never separate bits.
+    mappingKeys: {
+      "xml-niso-iec": {
+        "@el": "non-normative-note",
+        "@attr": { id: "$customerId" },
+        "@children": "$",
+        "\u25BC": "$anchor"
+      }
+    }
   },
   [BitType2.smartStandardNoteNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardNoteNormative,
-    description: "Smart standard normative note collapsible bit, used to provide normative notes in smart standards that can be collapsed"
+    description: "Smart standard normative note collapsible bit, used to provide normative notes in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardNoteNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardNoteNonNormative,
-    description: "Smart standard non-normative note collapsible bit, used to provide non-normative notes in smart standards that can be collapsed"
+    description: "Smart standard non-normative note collapsible bit, used to provide non-normative notes in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.noteAi]: {
     since: "1.3.0",
@@ -9926,17 +10267,47 @@ var BITS = {
   [BitType2.smartStandardRemarkNonNormative]: {
     since: "1.28.0",
     baseBitType: BitType2.standardRemarkNonNormative,
-    description: "Smart standard non-normative remark bit, used to provide non-normative remarks in smart standards"
+    description: "Smart standard non-normative remark bit, used to provide non-normative remarks in smart standards",
+    // PLAN-140 Q4 rider: a warning/caution note routes to the remark bit —
+    // the same element as the note key, distinguished by the content-type
+    // attr literal (alias value: forward emits the first alternative,
+    // reverse accepts any). Most-specific-wins beats the plain note key.
+    mappingKeys: {
+      "xml-niso-iec": {
+        "@el": "non-normative-note",
+        "@attr": { "content-type": "warning|caution", id: "$customerId" },
+        "@children": "$",
+        "\u25BC": "$anchor"
+      }
+    }
   },
   [BitType2.smartStandardRemarkNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkNormative,
-    description: "Smart standard normative remark collapsible bit, used to provide normative remarks in smart standards that can be collapsed"
+    description: "Smart standard normative remark collapsible bit, used to provide normative remarks in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkNonNormative,
-    description: "Smart standard non-normative remark collapsible bit, used to provide non-normative remarks in smart standards that can be collapsed"
+    description: "Smart standard non-normative remark collapsible bit, used to provide non-normative remarks in smart standards that can be collapsed",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.selfAssessment]: {
     since: "1.3.0",
@@ -10007,53 +10378,143 @@ var BITS = {
   },
   [BitType2.collapsible]: {
     since: "1.21.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.article,
-    description: "Collapsible bit, used to create collapsible sections in articles or books"
+    description: "Collapsible bit, used to create collapsible sections in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.sideNoteCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Side note collapsible bit, used to create collapsible side notes in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.sideNote,
+    description: "Side note collapsible bit, used to create collapsible side notes in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.infoCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Info collapsible bit, used to create collapsible informational sections in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.info,
+    description: "Info collapsible bit, used to create collapsible informational sections in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.remarkCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Remark collapsible bit, used to create collapsible remarks in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.remark,
+    description: "Remark collapsible bit, used to create collapsible remarks in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.warningCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Warning collapsible bit, used to create collapsible warnings in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.warning,
+    description: "Warning collapsible bit, used to create collapsible warnings in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.dangerCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Danger collapsible bit, used to create collapsible danger sections in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.danger,
+    description: "Danger collapsible bit, used to create collapsible danger sections in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.noteCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Note collapsible bit, used to create collapsible notes in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.note,
+    description: "Note collapsible bit, used to create collapsible notes in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.exampleCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Example collapsible bit, used to create collapsible examples in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.example,
+    description: "Example collapsible bit, used to create collapsible examples in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.hintCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Hint collapsible bit, used to create collapsible hints in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.hint,
+    description: "Hint collapsible bit, used to create collapsible hints in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.bugCollapsible]: {
     since: "1.21.0",
-    baseBitType: BitType2.article,
-    description: "Bug collapsible bit, used to create collapsible bug reports in articles or books"
+    deprecated: "5.37.0",
+    baseBitType: BitType2.bug,
+    description: "Bug collapsible bit, used to create collapsible bug reports in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.platformPath]: {
     since: "3.14.1",
@@ -10275,8 +10736,17 @@ var BITS = {
   },
   [BitType2.extractorPageCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPage,
-    description: "Collapsible extractor page bit, used to extract pages from images with collapsible functionality"
+    description: "Collapsible extractor page bit, used to extract pages from images with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorPageWithBlocks]: {
     since: "1.5.21",
@@ -10285,8 +10755,17 @@ var BITS = {
   },
   [BitType2.extractorPageWithBlocksCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPageWithBlocks,
-    description: "Collapsible extractor page with blocks bit, used to extract pages with blocks from images with collapsible functionality"
+    description: "Collapsible extractor page with blocks bit, used to extract pages with blocks from images with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorConfiguration]: {
     since: "1.7.1",
@@ -10326,8 +10805,17 @@ var BITS = {
   },
   [BitType2.extractorImageCollapsible]: {
     since: "4.3.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorImage,
-    description: "Collapsible extractor images bit, used for  images extracted from PDFs"
+    description: "Collapsible extractor images bit, used for  images extracted from PDFs",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorBlueprint]: {
     since: "5.12.0",
@@ -10382,7 +10870,8 @@ var BITS = {
       {
         key: ConfigKey.property_pageNo,
         description: "Page number for the block, used to indicate the page on which the block appears",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_x,
@@ -10399,17 +10888,20 @@ var BITS = {
       {
         key: ConfigKey.property_width,
         description: "Width of the block, used to define the size of the block on the page",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_height,
         description: "Height of the block, used to define the size of the block on the page",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_index,
         description: "Index of the block, used to order blocks within the extractor page",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_classification,
@@ -10460,8 +10952,17 @@ var BITS = {
   },
   [BitType2.extractorPageNumberCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPageNumber,
-    description: "Collapsible extractor page number bit, used to define page numbers in extractor pages with collapsible functionality"
+    description: "Collapsible extractor page number bit, used to define page numbers in extractor pages with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorPageHeader]: {
     since: "1.5.21",
@@ -10470,8 +10971,17 @@ var BITS = {
   },
   [BitType2.extractorPageHeaderCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPageHeader,
-    description: "Collapsible extractor page header bit, used to define headers in extractor pages with collapsible functionality"
+    description: "Collapsible extractor page header bit, used to define headers in extractor pages with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.extractorPageFooter]: {
     since: "1.5.21",
@@ -10480,8 +10990,17 @@ var BITS = {
   },
   [BitType2.extractorPageFooterCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.extractorPageFooter,
-    description: "Collapsible extractor page footer bit, used to define footers in extractor pages with collapsible functionality"
+    description: "Collapsible extractor page footer bit, used to define footers in extractor pages with collapsible functionality",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.pageOpenBook]: {
     since: "1.5.10",
@@ -10719,7 +11238,20 @@ var BITS = {
   [BitType2.smartStandardLegendNormative]: {
     since: "3.12.0",
     baseBitType: BitType2.legend,
-    description: "Smart standard normative legend bit, used to provide normative smart standard legends in articles or books"
+    description: "Smart standard normative legend bit, used to provide normative smart standard legends in articles or books",
+    // PLAN-141 F2 (NISO import): a free-standing <legend> (a formula's) or
+    // bare <def-list> (a table footer's — no <legend> wrapper there) that is
+    // NOT the claimed card content of its enclosing bit is a legend bit:
+    // STRUCTURAL-shaped, its <title> and <def-item>s build the
+    // definition-list cards via the card set's authored keys. A <legend>
+    // inside a figure/table bit stays that bit's claimed card content and
+    // never reaches this key. Anchor = the source id (D2 revised).
+    mappingKeys: {
+      "xml-niso-iec": [
+        { "@el": "legend", "@attr": { id: "$customerId" }, "\u25BC": "$anchor" },
+        { "@el": "def-list", "@attr": { id: "$customerId" }, "\u25BC": "$anchor" }
+      ]
+    }
   },
   [BitType2.smartStandardRemarkLegend]: {
     since: "3.12.0",
@@ -10758,8 +11290,17 @@ var BITS = {
   },
   [BitType2.definitionListCollapsible]: {
     since: "5.25.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.definitionList,
-    description: "Collapsible definition list bit, used to create collapsible lists of definitions in articles or books"
+    description: "Collapsible definition list bit, used to create collapsible lists of definitions in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.standardDefinitionListNormative]: {
     since: "5.24.0",
@@ -10774,7 +11315,16 @@ var BITS = {
   [BitType2.smartStandardDefinitionListNormative]: {
     since: "5.24.0",
     baseBitType: BitType2.standardDefinitionListNormative,
-    description: "Smart standard normative definition list bit, used to create normative smart standard definition lists in articles or books"
+    description: "Smart standard normative definition list bit, used to create normative smart standard definition lists in articles or books",
+    // PLAN-141 F3 (NISO import): a terms-and-definitions clause. STRUCTURAL-
+    // shaped: <label> → [%], the tbx:termEntry/langSet subtree builds the
+    // definition-list card via the card set's authored keys (all tig terms
+    // stacked on the term side; definition/example/notes/source composed on
+    // the definition side with authored locale affixes), langSet @xml:lang →
+    // [@lang] (nested attr slot on the tag key). Anchor = the source id.
+    mappingKeys: {
+      "xml-niso-iec": { "@el": "term-sec", "@attr": { id: "$customerId" }, "\u25BC": "$anchor" }
+    }
   },
   [BitType2.smartStandardDefinitionListNonNormative]: {
     since: "5.24.0",
@@ -10843,12 +11393,14 @@ var BITS = {
       {
         key: ConfigKey.property_focusX,
         description: "X-coordinate for the focus point, used to define the focus area in the image",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_focusY,
         description: "Y-coordinate for the focus point, used to define the focus area in the image",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       }
     ]
   },
@@ -10955,7 +11507,15 @@ var BITS = {
   [BitType2.smartStandardImageFigureNormative]: {
     since: "1.28.0",
     baseBitType: BitType2.standardImageFigureNormative,
-    description: "Smart standard normative image figure bit, used to create smart standard normative image figures in articles or books"
+    description: "Smart standard normative image figure bit, used to create smart standard normative image figures in articles or books",
+    // PLAN-141 F1 (NISO import): a figure is STRUCTURAL-shaped (no
+    // @children — no body): <label> → [%], <caption>/<graphic> ride the
+    // [&image] resource chain, the <legend> def-list becomes the bit's
+    // definition-list cards, and an inner note PROMOTES as a sibling bit.
+    // Anchor = the source id (D2 revised).
+    mappingKeys: {
+      "xml-niso-iec": { "@el": "fig", "@attr": { id: "$customerId" }, "\u25BC": "$anchor" }
+    }
   },
   [BitType2.smartStandardImageFigureNonNormative]: {
     since: "1.28.0",
@@ -10964,13 +11524,31 @@ var BITS = {
   },
   [BitType2.smartStandardImageFigureNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardImageFigureNormative,
-    description: "Collapsible smart standard normative image figure bit, used to create collapsible smart standard normative image figures in articles or books"
+    description: "Collapsible smart standard normative image figure bit, used to create collapsible smart standard normative image figures in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardImageFigureNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardImageFigureNonNormative,
-    description: "Collapsible smart standard non-normative image figure bit, used to create collapsible smart standard non-normative image figures in articles or books"
+    description: "Collapsible smart standard non-normative image figure bit, used to create collapsible smart standard non-normative image figures in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.imageLandscape]: {
     since: "1.3.0",
@@ -11182,43 +11760,115 @@ var BITS = {
   },
   [BitType2.smartStandardTableImageNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableImageNormative,
-    description: "Collapsible smart standard normative table image bit, used to create collapsible smart standard normative images in tables in articles or books"
+    description: "Collapsible smart standard normative table image bit, used to create collapsible smart standard normative images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableImageNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableImageNonNormative,
-    description: "Collapsible smart standard non-normative table image bit, used to create collapsible smart standard non-normative images in tables in articles or books"
+    description: "Collapsible smart standard non-normative table image bit, used to create collapsible smart standard non-normative images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableImageNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableImageNormative,
-    description: "Collapsible smart standard normative remark table image bit, used to create collapsible smart standard normative remark images in tables in articles or books"
+    description: "Collapsible smart standard normative remark table image bit, used to create collapsible smart standard normative remark images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableImageNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableImageNonNormative,
-    description: "Collapsible smart standard non-normative remark table image bit, used to create collapsible smart standard non-normative remark images in tables in articles or books"
+    description: "Collapsible smart standard non-normative remark table image bit, used to create collapsible smart standard non-normative remark images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableExtendedImageNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableExtendedImageNormative,
-    description: "Collapsible smart standard normative extended table image bit, used to create collapsible smart standard normative extended images in tables in articles or books"
+    description: "Collapsible smart standard normative extended table image bit, used to create collapsible smart standard normative extended images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableExtendedImageNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableExtendedImageNonNormative,
-    description: "Collapsible smart standard non-normative extended table image bit, used to create collapsible smart standard non-normative extended images in tables in articles or books"
+    description: "Collapsible smart standard non-normative extended table image bit, used to create collapsible smart standard non-normative extended images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableExtendedImageNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableExtendedImageNormative,
-    description: "Collapsible smart standard normative remark extended table image bit, used to create collapsible smart standard normative remark extended images in tables in articles or books"
+    description: "Collapsible smart standard normative remark extended table image bit, used to create collapsible smart standard normative remark extended images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableExtendedImageNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableExtendedImageNonNormative,
-    description: "Collapsible smart standard non-normative remark extended table image bit, used to create collapsible smart standard non-normative remark extended images in tables in articles or books"
+    description: "Collapsible smart standard non-normative remark extended table image bit, used to create collapsible smart standard non-normative remark extended images in tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.imageLink]: {
     since: "1.3.0",
@@ -11683,12 +12333,33 @@ var BITS = {
   [BitType2.smartStandardListItem]: {
     since: "1.28.0",
     baseBitType: BitType2.standardListItem,
-    description: "Smart standard list item bit, used to create smart standard list items in articles or books"
+    description: "Smart standard list item bit, used to create smart standard list items in articles or books",
+    // PLAN-140 refs family (NISO import): one list-item bit per <ref> —
+    // CONTENT key (its citation subtree is the body), counter anchor scoped
+    // to the containing list, <label> → [%], nested <std-id> → [@externalId]
+    // (the externalId tag key's nested content slot).
+    mappingKeys: {
+      "xml-niso-iec": {
+        "@el": "ref",
+        "@attr": { id: "$customerId" },
+        "@children": "$",
+        "\u25BC": "$anchor"
+      }
+    }
   },
   [BitType2.smartStandardListItemCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardListItem,
-    description: "Collapsible smart standard list item bit, used to create collapsible smart standard list items in articles or books"
+    description: "Collapsible smart standard list item bit, used to create collapsible smart standard list items in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.mark]: {
     since: "1.3.0",
@@ -12021,8 +12692,17 @@ var BITS = {
   },
   [BitType2.pageCollapsible]: {
     since: "1.30.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.page,
-    description: "Collapsible page bit, used to create collapsible sections in pages"
+    description: "Collapsible page bit, used to create collapsible sections in pages",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.pageCoverImage]: {
     since: "1.22.0",
@@ -12790,7 +13470,13 @@ var BITS = {
         // `<caption>` — placed inside the idiomatic `<table>` container as
         // its first child. Outside a table context it falls back to the
         // residual carrier.
-        htmlKey: { "@el": "caption", "@children": "$" }
+        htmlKey: { "@el": "caption", "@children": "$" },
+        // PLAN-141 F2 (NISO import): a table-wrap's <caption><title> — the
+        // nested content slot reads the title text (catalog D5: the caption
+        // is a TOP-LEVEL bit property on table bits).
+        mappingKeys: {
+          "xml-niso-iec": { "@el": "caption", "@children": { "@el": "title", "@text": "$" } }
+        }
       },
       {
         key: ConfigKey.property_tableFixedHeader,
@@ -12963,7 +13649,16 @@ var BITS = {
   [BitType2.smartStandardTableExtendedNormative]: {
     since: "1.28.0",
     baseBitType: BitType2.standardTableExtendedNormative,
-    description: "Smart standard normative extended table bit, used to create smart standard normative extended tables in articles or books"
+    description: "Smart standard normative extended table bit, used to create smart standard normative extended tables in articles or books",
+    // PLAN-141 F2 (NISO import): a table-wrap is STRUCTURAL-shaped (no
+    // @children — no body): <label> → [%], <caption><title> → the bit-level
+    // [@caption] (D5), the inner <table>/<table-wrap-foot> build the
+    // table-extended card grid via the card set's authored keys, and a
+    // footer <def-list> PROMOTES as a sibling legend bit. Anchor = the
+    // source id (D2 revised).
+    mappingKeys: {
+      "xml-niso-iec": { "@el": "table-wrap", "@attr": { id: "$customerId" }, "\u25BC": "$anchor" }
+    }
   },
   [BitType2.smartStandardTableExtendedNonNormative]: {
     since: "1.28.0",
@@ -12982,43 +13677,115 @@ var BITS = {
   },
   [BitType2.smartStandardTableNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableNormative,
-    description: "Collapsible smart standard normative table bit, used to create collapsible smart standard normative tables in articles or books"
+    description: "Collapsible smart standard normative table bit, used to create collapsible smart standard normative tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableNonNormative,
-    description: "Collapsible smart standard non-normative table bit, used to create collapsible smart standard non-normative tables in articles or books"
+    description: "Collapsible smart standard non-normative table bit, used to create collapsible smart standard non-normative tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableNormative,
-    description: "Collapsible smart standard normative remark table bit, used to create collapsible smart standard normative remark tables in articles or books"
+    description: "Collapsible smart standard normative remark table bit, used to create collapsible smart standard normative remark tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableNonNormative,
-    description: "Collapsible smart standard non-normative remark table bit, used to create collapsible smart standard non-normative remark tables in articles or books"
+    description: "Collapsible smart standard non-normative remark table bit, used to create collapsible smart standard non-normative remark tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableExtendedNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableExtendedNormative,
-    description: "Collapsible smart standard normative extended table bit, used to create collapsible smart standard normative extended tables in articles or books"
+    description: "Collapsible smart standard normative extended table bit, used to create collapsible smart standard normative extended tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardTableExtendedNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardTableExtendedNonNormative,
-    description: "Collapsible smart standard non-normative extended table bit, used to create collapsible smart standard non-normative extended tables in articles or books"
+    description: "Collapsible smart standard non-normative extended table bit, used to create collapsible smart standard non-normative extended tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableExtendedNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableExtendedNormative,
-    description: "Collapsible smart standard normative remark extended table bit, used to create collapsible smart standard normative remark extended tables in articles or books"
+    description: "Collapsible smart standard normative remark extended table bit, used to create collapsible smart standard normative remark extended tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.smartStandardRemarkTableExtendedNonNormativeCollapsible]: {
     since: "1.28.0",
+    deprecated: "5.37.0",
     baseBitType: BitType2.smartStandardRemarkTableExtendedNonNormative,
-    description: "Collapsible smart standard non-normative remark extended table bit, used to create collapsible smart standard non-normative remark extended tables in articles or books"
+    description: "Collapsible smart standard non-normative remark extended table bit, used to create collapsible smart standard non-normative remark extended tables in articles or books",
+    tags: [
+      {
+        key: ConfigKey.property_isCollapsible,
+        description: "If true, the bit is collapsible (defaults true for this deprecated bit type)",
+        format: TagFormat.boolean,
+        defaultValue: "true"
+      }
+    ]
   },
   [BitType2.parameters]: {
     since: "1.18.0",
@@ -13038,7 +13805,8 @@ var BITS = {
       {
         key: ConfigKey.property_maxDisplayLevel,
         description: "Maximum display level for the chapter in the table of contents",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       }
     ]
   },
@@ -13050,7 +13818,8 @@ var BITS = {
       {
         key: ConfigKey.property_maxTocChapterLevel,
         description: "Maximum chapter level for the inline table of contents",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       }
     ]
   },
@@ -13473,13 +14242,15 @@ var BITS = {
         key: ConfigKey.property_width,
         // Same as image
         description: "Width for the embedded content, used to define the width in pixels",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_height,
         // Same as image
         description: "Height for the embedded content, used to define the height in pixels",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       },
       {
         key: ConfigKey.property_vendorUrl,
@@ -13517,7 +14288,8 @@ var BITS = {
       {
         key: ConfigKey.property_jupyterExecutionCount,
         description: "Execution count for the Jupyter output, used to define the execution order",
-        format: TagFormat.number
+        format: TagFormat.number,
+        nullable: true
       }
     ],
     textFormatDefault: TextFormat2.plainText
@@ -13725,11 +14497,13 @@ var BITS = {
 };
 
 // src/config/Config.ts
+var COLLAPSIBLE_BIT_TYPE_SUFFIX = "-collapsible";
 var Config = class {
   constructor() {
     __publicField(this, "bitLevelMin", 1);
     __publicField(this, "bitLevelMax", 7);
     __publicField(this, "bitCache", /* @__PURE__ */ new Map());
+    __publicField(this, "migratedBitCache", /* @__PURE__ */ new Map());
     __publicField(this, "allResourcesCache");
     __publicField(this, "comboResourcesCache", /* @__PURE__ */ new Map());
   }
@@ -13745,6 +14519,29 @@ var Config = class {
     if (bitType?.startsWith("|")) bitType = bitType.substring(1);
     return (0, import_superenum16.Enum)(BitType2).fromValue(bitType) ?? BitType2._error;
   }
+  /**
+   * PLAN-017: Return the migration target for a deprecated `*-collapsible` bit type.
+   *
+   * Every `*-collapsible` bit type declares its non-collapsible cousin as its `baseBitType`, so the
+   * target is read from the config rather than a hand-maintained table — a new `*-collapsible` bit
+   * type is covered automatically.
+   *
+   * `BitType.collapsible` is the one exclusion: it has no non-collapsible cousin (its `baseBitType`
+   * is `article`, which is not a migration target).
+   *
+   * @param bitType the bit type
+   * @returns the bit type to migrate to, or undefined if the bit type does not migrate
+   */
+  getMigratedBitType(bitType) {
+    const cached = this.migratedBitCache.get(bitType);
+    if (cached !== void 0 || this.migratedBitCache.has(bitType)) return cached;
+    let target;
+    if (bitType !== BitType2.collapsible && bitType.endsWith(COLLAPSIBLE_BIT_TYPE_SUFFIX)) {
+      target = BITS[bitType]?.baseBitType;
+    }
+    this.migratedBitCache.set(bitType, target);
+    return target;
+  }
   /**
    * Check if a bit type is and instance of the given root bit type.
    *
@@ -14067,7 +14864,7 @@ var instance2 = new Config();
 // src/generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@gmb/bitmark-parser-generator",
-  "version": "5.35.0",
+  "version": "5.37.0",
   "author": "Get More Brain Ltd",
   "license": "ISC",
   "description": "A bitmark parser and generator using Peggy.js"
@@ -14596,6 +15393,8 @@ var NodeType = {
   definition: "definition",
   definitions: "definitions",
   definitionsValue: "definitionsValue",
+  displayName: "displayName",
+  displayNameValue: "displayNameValue",
   diffContext: "diffContext",
   diffContextValue: "diffContextValue",
   diffOp: "diffOp",
@@ -15124,6 +15923,8 @@ var NodeType = {
   type: "type",
   unit: "unit",
   unitAbbr: "unitAbbr",
+  unitAbbrPlural: "unitAbbrPlural",
+  unitPlural: "unitPlural",
   url: "url",
   validationDate: "validationDate",
   validationDateValue: "validationDateValue",
@@ -28299,8 +29100,14 @@ var Builder = class extends BaseBuilder {
    */
   buildBit(data, options) {
     data = structuredClone(data);
+    const migratedBitType = instance2.getMigratedBitType(data.bitType);
+    if (migratedBitType) {
+      data.bitType = migratedBitType;
+      data.isCollapsible = data.isCollapsible ?? true;
+    }
     const bitType = data.bitType;
     const bitConfig = instance2.getBitConfig(bitType);
+    const isCollapsibleDefaultsTrue = bitConfig.tags[ConfigKey.property_isCollapsible]?.defaultValue === "true";
     const deprecatedTextFormat = (0, import_superenum30.Enum)(DeprecatedTextFormat).fromValue(data.textFormat);
     let textFormat = (0, import_superenum30.Enum)(TextFormat2).fromValue(data.textFormat) ?? bitConfig.textFormatDefault;
     if (deprecatedTextFormat === DeprecatedTextFormat.bitmarkMinusMinus) {
@@ -28518,6 +29325,12 @@ var Builder = class extends BaseBuilder {
         data.publisherName,
         options
       ),
+      displayName: this.toAstProperty(
+        bitType,
+        ConfigKey.property_displayName,
+        data.displayName,
+        options
+      ),
       theme: this.toAstProperty(bitType, ConfigKey.property_theme, data.theme, options),
       rtl: this.toAstProperty(bitType, ConfigKey.property_rtl, data.rtl, options),
       computerLanguage: this.toAstProperty(
@@ -29427,7 +30240,7 @@ var Builder = class extends BaseBuilder {
       isCollapsible: this.toAstProperty(
         bitType,
         ConfigKey.property_isCollapsible,
-        data.isCollapsible,
+        data.isCollapsible ?? (isCollapsibleDefaultsTrue ? true : void 0),
         options
       ),
       anchor: data.anchor,
@@ -30196,7 +31009,9 @@ var Builder = class extends BaseBuilder {
       ingredient: this.handleJsonText(context, TextLocation2.tag, data.ingredient),
       quantity: data.quantity ?? 0,
       unit: data.unit ?? "",
+      unitPlural: data.unitPlural ?? "",
       unitAbbr: data.unitAbbr ?? "",
+      unitAbbrPlural: data.unitAbbrPlural ?? "",
       decimalPlaces: data.decimalPlaces ?? 1,
       disableCalculation: data.disableCalculation ?? false,
       item: this.handleJsonText(context, TextLocation2.tag, data.item),
@@ -30793,11 +31608,22 @@ var Builder = class extends BaseBuilder {
    */
   buildServings(_context, data) {
     if (!data) return void 0;
-    const { servings, unit, unitAbbr, decimalPlaces, disableCalculation, hint } = data;
+    const {
+      servings,
+      unit,
+      unitPlural,
+      unitAbbr,
+      unitAbbrPlural,
+      decimalPlaces,
+      disableCalculation,
+      hint
+    } = data;
     const node = {
       servings: servings ?? 0,
       unit: unit ?? "",
+      unitPlural: unitPlural ?? "",
       unitAbbr: unitAbbr ?? "",
+      unitAbbrPlural: unitAbbrPlural ?? "",
       decimalPlaces: decimalPlaces ?? 1,
       disableCalculation: disableCalculation ?? false,
       hint: hint ?? ""
@@ -31734,7 +32560,16 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
     const nodeValue = node.value;
     const parent = this.getParentNode(route);
     if (parent?.key !== NodeType.bitsValue) return true;
-    const { servings, unit, unitAbbr, decimalPlaces, disableCalculation, hint } = nodeValue;
+    const {
+      servings,
+      unit,
+      unitPlural,
+      unitAbbr,
+      unitAbbrPlural,
+      decimalPlaces,
+      disableCalculation,
+      hint
+    } = nodeValue;
     this.writeProperty("servings", servings, route, {
       format: TagFormat.plainText
     });
@@ -31744,12 +32579,24 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
         forceChain: true
       });
     }
+    if (unitPlural != null) {
+      this.writeProperty("unitPlural", unitPlural, route, {
+        format: TagFormat.plainText,
+        forceChain: true
+      });
+    }
     if (unitAbbr != null) {
       this.writeProperty("unitAbbr", unitAbbr, route, {
         format: TagFormat.plainText,
         forceChain: true
       });
     }
+    if (unitAbbrPlural != null) {
+      this.writeProperty("unitAbbrPlural", unitAbbrPlural, route, {
+        format: TagFormat.plainText,
+        forceChain: true
+      });
+    }
     if (decimalPlaces != null) {
       this.writeProperty("decimalPlaces", decimalPlaces, route, {
         format: TagFormat.plainText,
@@ -32596,10 +33443,18 @@ var BitmarkGenerator = class extends AstWalkerGenerator {
         this.writeProperty("unit", ingredient.unit, route, {
           format: TagFormat.plainText
         });
+      if (ingredient.unitPlural != null)
+        this.writeProperty("unitPlural", ingredient.unitPlural, route, {
+          format: TagFormat.plainText
+        });
       if (ingredient.unitAbbr != null)
         this.writeProperty("unitAbbr", ingredient.unitAbbr, route, {
           format: TagFormat.plainText
         });
+      if (ingredient.unitAbbrPlural != null)
+        this.writeProperty("unitAbbrPlural", ingredient.unitAbbrPlural, route, {
+          format: TagFormat.plainText
+        });
       if (ingredient.decimalPlaces != null)
         this.writeProperty("decimalPlaces", ingredient.decimalPlaces, route, {
           format: TagFormat.plainText
@@ -34378,6 +35233,25 @@ var JsonGenerator = class extends AstWalkerGenerator {
     }
     return false;
   }
+  // bitmarkAst -> bits -> bitsValue -> isCollapsible
+  /**
+   * PLAN-016: `isCollapsible` is emitted only when true. `false` is the implied
+   * default for every bit, so it is never written to the JSON — an absent key
+   * means the bit's configured default (`true` for the deprecated
+   * `*-collapsible` bit types, `false` everywhere else).
+   *
+   * Defining these handlers suppresses the generic property handlers that
+   * `generatePropertyHandlers()` would otherwise install for this tag.
+   */
+  leaf_isCollapsible(node, route) {
+    const parent = this.getParentNode(route);
+    if (parent?.key !== NodeType.bitsValue) return false;
+    if (node.value === true) this.bitJson.isCollapsible = true;
+    return false;
+  }
+  enter_isCollapsible(node, route) {
+    return this.leaf_isCollapsible(node, route);
+  }
   // bitmarkAst -> bits -> bitsValue -> markConfig
   enter_markConfig(_node, _route) {
     return true;
@@ -35251,7 +36125,6 @@ var JsonGenerator = class extends AstWalkerGenerator {
       if (instance2.isOfBitType(bitType, BitType2.chapter)) {
         if (bitJson.toc == null) bitJson.toc = true;
         if (bitJson.progress == null) bitJson.progress = true;
-        if (bitJson.isCollapsible == null) bitJson.isCollapsible = false;
         if (bitJson.level == null) bitJson.level = 1;
         if (bitJson.body == null) bitJson.body = this.bodyDefault;
       }
@@ -38212,7 +39085,9 @@ function parseIngredients(_context, _bitType, cardSet) {
           title: titleArray,
           __instructionString,
           unit,
+          unitPlural,
           unitAbbr,
+          unitAbbrPlural,
           decimalPlaces,
           disableCalculation,
           cardBodyStr,
@@ -38242,7 +39117,9 @@ function parseIngredients(_context, _bitType, cardSet) {
           ingredient: cardBodyStr,
           quantity,
           unit: unit ?? instance3.EMPTY_STRING,
+          unitPlural,
           unitAbbr: unitAbbr ?? instance3.EMPTY_STRING,
+          unitAbbrPlural,
           decimalPlaces: decimalPlaces ?? 1,
           disableCalculation,
           ...tags2
@@ -38913,12 +39790,22 @@ function servingsChainContentProcessor(context, _contentDepth, tagsConfig, conte
   if (context.DEBUG_CHAIN_CONTENT) context.debugPrint("servings content", content);
   const tags2 = context.bitContentProcessor(ContentDepth.Chain, tagsConfig, content.chain);
   if (context.DEBUG_CHAIN_TAGS) context.debugPrint("servings TAGS", tags2);
-  const { unit, unitAbbr, decimalPlaces, disableCalculation, __hintString } = tags2;
+  const {
+    unit,
+    unitPlural,
+    unitAbbr,
+    unitAbbrPlural,
+    decimalPlaces,
+    disableCalculation,
+    __hintString
+  } = tags2;
   const servings = instance6.asNumber(content.value) ?? 1;
   const node = {
     servings,
     unit,
+    unitPlural,
     unitAbbr,
+    unitAbbrPlural,
     decimalPlaces: decimalPlaces ?? 1,
     disableCalculation,
     hint: __hintString