@shadow-garden/bapbong-model 0.11.2 → 0.12.0

package/dist/index.cjs

@@ -102,6 +102,7 @@ function pastedImageAttrs(el) {
   return {
     src,
     alt: e.getAttribute("alt") ?? "",
+    title: e.getAttribute("title"),
     width: dim(e.getAttribute("width")),
     height: dim(e.getAttribute("height")),
     crop: dataJson(el, "data-crop"),
@@ -148,6 +149,11 @@ var schema = new import_prosemirror_model.Schema({
         // body w:sectPr. Edited via setDocAttribute (page-setup commands) so
         // orientation/paper-size changes undo cleanly. null → A4 default.
         page: { default: null },
+        // DocCompat (contracts) — the Word compatibility profile settings.xml
+        // declares (compatibilityMode + the compat flags), resolved to the
+        // answers layout rules ask. Importer-set on every story doc; null
+        // (an editor-authored doc) reads as current Word.
+        compat: { default: null },
         // CommentNode[] (contracts) — comment threads keyed to `comment` marks.
         // Edited via setDocAttribute so add/reply/resolve/delete undo cleanly.
         comments: { default: null },
@@ -223,10 +229,12 @@ var schema = new import_prosemirror_model.Schema({
         shading: { default: null },
         // The paragraph MARK's own font ({ family?, sizePt?, bold?, italic? }
         // or null) — w:pPr/w:rPr resolved through the same cascade a run gets.
-        // Set only on paragraphs imported EMPTY, where the mark is the only
-        // thing on the line and therefore sets its height. `carry.markRPr`
-        // keeps the same rPr verbatim for export; this is the measured
-        // reading of it, and nothing writes it back.
+        // The mark is a glyph on the paragraph's LAST line (the only glyph
+        // when the paragraph is empty), so it takes part in that line's
+        // height. Importer-set on every paragraph; the font commands edit it
+        // when the selection takes the mark in (Word: a ¶ inside the
+        // selection is re-sized with the text); the exporter writes it back
+        // into w:pPr/w:rPr ahead of `carry.markRPr` (the rest of that rPr).
         markFont: { default: null },
         // Carry-through fidelity (docx round-trip): OOXML paragraph
         // properties the model does NOT represent, preserved verbatim so a
@@ -293,6 +301,9 @@ var schema = new import_prosemirror_model.Schema({
       attrs: {
         src: {},
         alt: { default: "" },
+        // wp:docPr @title — the "Title" field of Word's alt-text pane, kept
+        // separate from `alt` (@descr) so both round-trip verbatim.
+        title: { default: null },
         width: { default: null },
         height: { default: null },
         // wp:anchor (floating image): { wrap: 'square'|'topAndBottom'|'none',
@@ -316,7 +327,10 @@ var schema = new import_prosemirror_model.Schema({
         // keeps its size; the selected region scales to fill it.
         crop: { default: null },
         // a:ln on pic:spPr — Word's picture border, as a BorderSide, or null.
-        outline: { default: null }
+        outline: { default: null },
+        // a:solidFill on pic:spPr — "#RRGGBB" painted behind the bitmap
+        // (shows through transparency), or null.
+        background: { default: null }
       },
       parseDOM: [{ tag: "img[src]", getAttrs: pastedImageAttrs }],
       toDOM(node) {
@@ -325,10 +339,13 @@ var schema = new import_prosemirror_model.Schema({
           src: a["src"],
           alt: a["alt"]
         };
+        if (a["title"]) attrs["title"] = a["title"];
         if (a["width"] != null) attrs["width"] = String(a["width"]);
         if (a["height"] != null) attrs["height"] = String(a["height"]);
         if (a["crop"]) attrs["data-crop"] = JSON.stringify(a["crop"]);
         if (a["outline"]) attrs["data-outline"] = JSON.stringify(a["outline"]);
+        if (a["background"])
+          attrs["data-background"] = a["background"];
         return ["img", attrs];
       }
     },
@@ -361,6 +378,11 @@ var schema = new import_prosemirror_model.Schema({
         borders: { default: null },
         // w:tblPr/w:jc — 'center' | 'right' table alignment, or null (left).
         align: { default: null },
+        // w:tblInd resolved to px: where a left-aligned table's leading
+        // border sits relative to the text margin (compat-mode aware — see
+        // the importer). null = Word's implicit outdent by the left cell
+        // margin. Importer-set; the element itself rides carry for export.
+        indent: { default: null },
         // Carry-through fidelity: unmodelled w:tblPr children (tblStyle,
         // tblLayout, tblLook, tblInd, floating tblpPr, …) as one raw XML
         // string ({ tblPr: string }), or null. Importer-set; the exporter
@@ -377,6 +399,7 @@ var schema = new import_prosemirror_model.Schema({
             borders: dataJson(el, "data-borders"),
             cellPadding: dataJson(el, "data-cell-padding"),
             align: el.getAttribute("data-align"),
+            indent: dataJson(el, "data-indent"),
             carry: dataJson(el, "data-carry")
           })
         }
@@ -388,6 +411,7 @@ var schema = new import_prosemirror_model.Schema({
         if (a["cellPadding"])
           dom["data-cell-padding"] = JSON.stringify(a["cellPadding"]);
         if (a["align"]) dom["data-align"] = String(a["align"]);
+        if (a["indent"] != null) dom["data-indent"] = String(a["indent"]);
         if (a["carry"]) dom["data-carry"] = JSON.stringify(a["carry"]);
         return ["table", dom, ["tbody", 0]];
       }
@@ -713,27 +737,37 @@ var schema = new import_prosemirror_model.Schema({
     },
     // w:footnoteReference — the carrier text is the superscript number; `num`
     // lets the layout engine match the reference to its page-bottom body.
+    // `id` is the ORIGINAL w:id from footnotes.xml: that part is carried
+    // byte-for-byte on save, so the exported reference must point at the
+    // source id, not the display number (Word reserves -1/0 and reuses ids
+    // freely — they rarely equal 1..N in document order).
     footnote: {
-      attrs: { num: {} },
+      attrs: { num: {}, id: { default: null } },
       inclusive: false,
       parseDOM: [
         {
           tag: "sup[data-footnote]",
           // `el` is an HTMLElement at runtime; this package has no DOM lib, so
           // narrow structurally rather than naming the type.
-          getAttrs: (el) => ({
-            num: Number(
-              el.getAttribute(
-                "data-footnote"
-              )
-            ) || 0
-          })
+          getAttrs: (el) => {
+            const get = (n) => el.getAttribute(
+              n
+            );
+            return {
+              num: Number(get("data-footnote")) || 0,
+              id: get("data-footnote-id")
+            };
+          }
         }
       ],
       toDOM(mark) {
+        const id = mark.attrs["id"];
         return [
           "sup",
-          { "data-footnote": String(mark.attrs["num"]) },
+          {
+            "data-footnote": String(mark.attrs["num"]),
+            ...id != null ? { "data-footnote-id": id } : {}
+          },
           0
         ];
       }

package/dist/index.js

@@ -70,6 +70,7 @@ function pastedImageAttrs(el) {
   return {
     src,
     alt: e.getAttribute("alt") ?? "",
+    title: e.getAttribute("title"),
     width: dim(e.getAttribute("width")),
     height: dim(e.getAttribute("height")),
     crop: dataJson(el, "data-crop"),
@@ -116,6 +117,11 @@ var schema = new Schema({
         // body w:sectPr. Edited via setDocAttribute (page-setup commands) so
         // orientation/paper-size changes undo cleanly. null → A4 default.
         page: { default: null },
+        // DocCompat (contracts) — the Word compatibility profile settings.xml
+        // declares (compatibilityMode + the compat flags), resolved to the
+        // answers layout rules ask. Importer-set on every story doc; null
+        // (an editor-authored doc) reads as current Word.
+        compat: { default: null },
         // CommentNode[] (contracts) — comment threads keyed to `comment` marks.
         // Edited via setDocAttribute so add/reply/resolve/delete undo cleanly.
         comments: { default: null },
@@ -191,10 +197,12 @@ var schema = new Schema({
         shading: { default: null },
         // The paragraph MARK's own font ({ family?, sizePt?, bold?, italic? }
         // or null) — w:pPr/w:rPr resolved through the same cascade a run gets.
-        // Set only on paragraphs imported EMPTY, where the mark is the only
-        // thing on the line and therefore sets its height. `carry.markRPr`
-        // keeps the same rPr verbatim for export; this is the measured
-        // reading of it, and nothing writes it back.
+        // The mark is a glyph on the paragraph's LAST line (the only glyph
+        // when the paragraph is empty), so it takes part in that line's
+        // height. Importer-set on every paragraph; the font commands edit it
+        // when the selection takes the mark in (Word: a ¶ inside the
+        // selection is re-sized with the text); the exporter writes it back
+        // into w:pPr/w:rPr ahead of `carry.markRPr` (the rest of that rPr).
         markFont: { default: null },
         // Carry-through fidelity (docx round-trip): OOXML paragraph
         // properties the model does NOT represent, preserved verbatim so a
@@ -261,6 +269,9 @@ var schema = new Schema({
       attrs: {
         src: {},
         alt: { default: "" },
+        // wp:docPr @title — the "Title" field of Word's alt-text pane, kept
+        // separate from `alt` (@descr) so both round-trip verbatim.
+        title: { default: null },
         width: { default: null },
         height: { default: null },
         // wp:anchor (floating image): { wrap: 'square'|'topAndBottom'|'none',
@@ -284,7 +295,10 @@ var schema = new Schema({
         // keeps its size; the selected region scales to fill it.
         crop: { default: null },
         // a:ln on pic:spPr — Word's picture border, as a BorderSide, or null.
-        outline: { default: null }
+        outline: { default: null },
+        // a:solidFill on pic:spPr — "#RRGGBB" painted behind the bitmap
+        // (shows through transparency), or null.
+        background: { default: null }
       },
       parseDOM: [{ tag: "img[src]", getAttrs: pastedImageAttrs }],
       toDOM(node) {
@@ -293,10 +307,13 @@ var schema = new Schema({
           src: a["src"],
           alt: a["alt"]
         };
+        if (a["title"]) attrs["title"] = a["title"];
         if (a["width"] != null) attrs["width"] = String(a["width"]);
         if (a["height"] != null) attrs["height"] = String(a["height"]);
         if (a["crop"]) attrs["data-crop"] = JSON.stringify(a["crop"]);
         if (a["outline"]) attrs["data-outline"] = JSON.stringify(a["outline"]);
+        if (a["background"])
+          attrs["data-background"] = a["background"];
         return ["img", attrs];
       }
     },
@@ -329,6 +346,11 @@ var schema = new Schema({
         borders: { default: null },
         // w:tblPr/w:jc — 'center' | 'right' table alignment, or null (left).
         align: { default: null },
+        // w:tblInd resolved to px: where a left-aligned table's leading
+        // border sits relative to the text margin (compat-mode aware — see
+        // the importer). null = Word's implicit outdent by the left cell
+        // margin. Importer-set; the element itself rides carry for export.
+        indent: { default: null },
         // Carry-through fidelity: unmodelled w:tblPr children (tblStyle,
         // tblLayout, tblLook, tblInd, floating tblpPr, …) as one raw XML
         // string ({ tblPr: string }), or null. Importer-set; the exporter
@@ -345,6 +367,7 @@ var schema = new Schema({
             borders: dataJson(el, "data-borders"),
             cellPadding: dataJson(el, "data-cell-padding"),
             align: el.getAttribute("data-align"),
+            indent: dataJson(el, "data-indent"),
             carry: dataJson(el, "data-carry")
           })
         }
@@ -356,6 +379,7 @@ var schema = new Schema({
         if (a["cellPadding"])
           dom["data-cell-padding"] = JSON.stringify(a["cellPadding"]);
         if (a["align"]) dom["data-align"] = String(a["align"]);
+        if (a["indent"] != null) dom["data-indent"] = String(a["indent"]);
         if (a["carry"]) dom["data-carry"] = JSON.stringify(a["carry"]);
         return ["table", dom, ["tbody", 0]];
       }
@@ -681,27 +705,37 @@ var schema = new Schema({
     },
     // w:footnoteReference — the carrier text is the superscript number; `num`
     // lets the layout engine match the reference to its page-bottom body.
+    // `id` is the ORIGINAL w:id from footnotes.xml: that part is carried
+    // byte-for-byte on save, so the exported reference must point at the
+    // source id, not the display number (Word reserves -1/0 and reuses ids
+    // freely — they rarely equal 1..N in document order).
     footnote: {
-      attrs: { num: {} },
+      attrs: { num: {}, id: { default: null } },
       inclusive: false,
       parseDOM: [
         {
           tag: "sup[data-footnote]",
           // `el` is an HTMLElement at runtime; this package has no DOM lib, so
           // narrow structurally rather than naming the type.
-          getAttrs: (el) => ({
-            num: Number(
-              el.getAttribute(
-                "data-footnote"
-              )
-            ) || 0
-          })
+          getAttrs: (el) => {
+            const get = (n) => el.getAttribute(
+              n
+            );
+            return {
+              num: Number(get("data-footnote")) || 0,
+              id: get("data-footnote-id")
+            };
+          }
         }
       ],
       toDOM(mark) {
+        const id = mark.attrs["id"];
         return [
           "sup",
-          { "data-footnote": String(mark.attrs["num"]) },
+          {
+            "data-footnote": String(mark.attrs["num"]),
+            ...id != null ? { "data-footnote-id": id } : {}
+          },
           0
         ];
       }

package/dist/lib/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAyF3C;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,yWAuoBjB,CAAC;AAEH,wEAAwE;AACxE,MAAM,MAAM,aAAa,GAAG,OAAO,MAAM,CAAC;AAE1C;;;;;GAKG;AACH,eAAO,MAAM,aAAa,yDA0CxB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC;AAEjD,qDAAqD;AACrD,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AAE5D;+EAC+E;AAC/E,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,2EAA2E;AAC3E,MAAM,WAAW,OAAO;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IACxC;;;6EAGyE;IACzE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAAC;CACvC;AA0BD;;;4EAG4E;AAC5E,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AA0F3C;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,yWAwqBjB,CAAC;AAEH,wEAAwE;AACxE,MAAM,MAAM,aAAa,GAAG,OAAO,MAAM,CAAC;AAE1C;;;;;GAKG;AACH,eAAO,MAAM,aAAa,yDA0CxB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC;AAEjD,qDAAqD;AACrD,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AAE5D;+EAC+E;AAC/E,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,2EAA2E;AAC3E,MAAM,WAAW,OAAO;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IACxC;;;6EAGyE;IACzE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAAC;CACvC;AA0BD;;;4EAG4E;AAC5E,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shadow-garden/bapbong-model",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "bapbong — ProseMirror document model / schema",
   "license": "MIT",
   "repository": {