@shadow-garden/bapbong-model 0.11.0 → 0.11.2

package/dist/index.cjs

@@ -87,6 +87,7 @@ function pastedParagraphAttrs(el, heading) {
     heading,
     align: m ? m[1].toLowerCase() : null,
     borders: dataJson(el, "data-borders"),
+    markFont: dataJson(el, "data-mark-font"),
     carry: dataJson(el, "data-carry")
   };
 }
@@ -220,6 +221,13 @@ var schema = new import_prosemirror_model.Schema({
         // null). Painted behind the paragraph's lines, in the same box the
         // borders use.
         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.
+        markFont: { default: null },
         // Carry-through fidelity (docx round-trip): OOXML paragraph
         // properties the model does NOT represent, preserved verbatim so a
         // customer's save never drops them. { pPr?: string, markRPr?: string }
@@ -247,6 +255,8 @@ var schema = new import_prosemirror_model.Schema({
           dom["data-borders"] = JSON.stringify(node.attrs["borders"]);
         if (node.attrs["shading"])
           dom["data-shading"] = String(node.attrs["shading"]);
+        if (node.attrs["markFont"])
+          dom["data-mark-font"] = JSON.stringify(node.attrs["markFont"]);
         if (node.attrs["carry"])
           dom["data-carry"] = JSON.stringify(node.attrs["carry"]);
         return [tag, dom, 0];
@@ -262,6 +272,18 @@ var schema = new import_prosemirror_model.Schema({
       parseDOM: [{ tag: "br" }],
       toDOM: () => ["br"]
     },
+    // A column break (w:br w:type="column"). Inline, not a paragraph flag:
+    // ST_BrType `column` restarts "the next character in the document … in a
+    // new text column", so it cuts WHERE IT SITS. A factsheet in the corpus
+    // proves the difference — its break has a floating table anchored in the
+    // run BEFORE it, which belongs to the column being left behind.
+    column_break: {
+      inline: true,
+      group: "inline",
+      selectable: false,
+      parseDOM: [{ tag: "br.column-break" }],
+      toDOM: () => ["br", { class: "column-break" }]
+    },
     // Inline image. `src` is typically a data URL (the importer inlines the
     // embedded media); width/height are CSS pixels, null if unspecified.
     image: {

package/dist/index.js

@@ -55,6 +55,7 @@ function pastedParagraphAttrs(el, heading) {
     heading,
     align: m ? m[1].toLowerCase() : null,
     borders: dataJson(el, "data-borders"),
+    markFont: dataJson(el, "data-mark-font"),
     carry: dataJson(el, "data-carry")
   };
 }
@@ -188,6 +189,13 @@ var schema = new Schema({
         // null). Painted behind the paragraph's lines, in the same box the
         // borders use.
         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.
+        markFont: { default: null },
         // Carry-through fidelity (docx round-trip): OOXML paragraph
         // properties the model does NOT represent, preserved verbatim so a
         // customer's save never drops them. { pPr?: string, markRPr?: string }
@@ -215,6 +223,8 @@ var schema = new Schema({
           dom["data-borders"] = JSON.stringify(node.attrs["borders"]);
         if (node.attrs["shading"])
           dom["data-shading"] = String(node.attrs["shading"]);
+        if (node.attrs["markFont"])
+          dom["data-mark-font"] = JSON.stringify(node.attrs["markFont"]);
         if (node.attrs["carry"])
           dom["data-carry"] = JSON.stringify(node.attrs["carry"]);
         return [tag, dom, 0];
@@ -230,6 +240,18 @@ var schema = new Schema({
       parseDOM: [{ tag: "br" }],
       toDOM: () => ["br"]
     },
+    // A column break (w:br w:type="column"). Inline, not a paragraph flag:
+    // ST_BrType `column` restarts "the next character in the document … in a
+    // new text column", so it cuts WHERE IT SITS. A factsheet in the corpus
+    // proves the difference — its break has a floating table anchored in the
+    // run BEFORE it, which belongs to the column being left behind.
+    column_break: {
+      inline: true,
+      group: "inline",
+      selectable: false,
+      parseDOM: [{ tag: "br.column-break" }],
+      toDOM: () => ["br", { class: "column-break" }]
+    },
     // Inline image. `src` is typically a data URL (the importer inlines the
     // embedded media); width/height are CSS pixels, null if unspecified.
     image: {

package/dist/lib/model.d.ts

@@ -8,7 +8,7 @@ import { Schema } from 'prosemirror-model';
  * extend THIS schema so the importer, layout engine, and (canvas) painter all
  * agree on one document model.
  */
-export declare const schema: Schema<"paragraph" | "doc" | "text" | "hard_break" | "image" | "page_field" | "table" | "table_row" | "table_cell", "strong" | "em" | "underline" | "strike" | "dstrike" | "smallCaps" | "textColor" | "fontSize" | "vertAlign" | "letterSpacing" | "kern" | "charScale" | "position" | "highlight" | "fontFamily" | "link" | "footnote" | "carryRPr">;
+export declare const schema: Schema<"paragraph" | "doc" | "text" | "hard_break" | "column_break" | "image" | "page_field" | "table" | "table_row" | "table_cell", "strong" | "em" | "underline" | "strike" | "dstrike" | "smallCaps" | "textColor" | "fontSize" | "vertAlign" | "letterSpacing" | "kern" | "charScale" | "position" | "highlight" | "fontFamily" | "link" | "footnote" | "carryRPr">;
 /** Concrete schema type, handy for typing Node/Mark across packages. */
 export type BapbongSchema = typeof schema;
 /**

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;AAwF3C;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,wVAinBjB,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;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"}

package/package.json

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