rapier-markdown-kit 1.1.88 → 1.1.89

package/README.md

@@ -238,7 +238,10 @@ console.log('lines:', plan.lines.length, 'height:', plan.height); // lines: 4 he
 
 A heading, which the style pack balances, takes its font size as an eighth argument
 (`flowLines(flow, width, top, obstacles, lineHeight, minSlot, direction, fontSize)`): its lines come out as
-Chromium lays `text-wrap: balance`, and greedy wherever an obstacle narrows a line.
+Chromium lays `text-wrap: balance`, and greedy wherever an obstacle narrows a line. The block's `text-align` is the ninth
+argument (`'start'` by default). A picture moves a block's words only where its outline meets them: when no line of the
+block, laid and aligned in the whole column as with no picture, meets an obstacle, the plan is that layout (`x` 0, the
+column's width); otherwise every line flows around the obstacles.
 
 ## What the host supplies
 

package/dist/kit/render.mjs

@@ -1118,7 +1118,7 @@ function _rapierProjectArtifactLayout(root, metadata, geometry, pretext) {
 
   function project(record, width, top, obstacles) {
     const plan = geometry.flowLines(record.flow, width, top, obstacles, record.lineHeight,
-      metadata.wrapColumnFloor(record.fontSize), record.direction, record.balance);
+      metadata.wrapColumnFloor(record.fontSize), record.direction, record.balance, record.align);
     if (!plan) return false;
     const output = doc.createDocumentFragment();
     let previous = null;

package/dist/layout/model.mjs

@@ -373,8 +373,25 @@ export function slotsForBand(width, obstacles, top, height, minWidth = 40) {
   return slots;
 }
 
-export function flowLines(flow, width, top, obstacles, lineHeight, minWidth, direction = 'ltr', balance = 0) {
-  return linePlan(flow, width, top, obstacles, lineHeight, minWidth, direction, balance, slotsForBand, layoutNextRichInlineLineRange, materializeRichInlineLineRange);
+// A picture moves a block's words only where its outline (with its standoff) meets them. The block is laid as it lies with no
+// picture beside it, balanced and aligned in the whole column; when no line of words there meets an obstacle, that is its
+// layout. Otherwise its lines flow around the outline. A block set from the side its lines start on, and not balanced, lies
+// the same both ways whenever the outline misses its words, so it is laid once.
+export function flowLines(flow, width, top, obstacles, lineHeight, minWidth, direction = 'ltr', balance = 0, align = 'start') {
+  const plan = linePlan(flow, width, top, obstacles, lineHeight, minWidth, direction, balance, slotsForBand, layoutNextRichInlineLineRange, materializeRichInlineLineRange);
+  const side = align === 'center' ? 'center' : align === 'left' || align === 'right' ? align
+    : (align === 'end') === (direction === 'rtl') ? 'left' : 'right';
+  if (!plan || !obstacles?.length || !balance && side === (direction === 'rtl' ? 'right' : 'left')) return plan;
+  const free = linePlan(flow, width, top, [], lineHeight, minWidth, direction, balance, slotsForBand, layoutNextRichInlineLineRange, materializeRichInlineLineRange);
+  if (!free) return plan;
+  const meets = free.lines.some(line => {
+    const words = line.fragments.reduce((sum, fragment) => sum + (fragment.gapBefore || 0) + (fragment.occupiedWidth || 0), 0);
+    const left = side === 'left' ? 0 : side === 'right' ? width - words : (width - words) / 2;
+    const lineTop = top + line.y;
+    return obstacles.some(obstacle => obstacle.width > 0 && obstacle.height > 0 &&
+      obstacle.x < left + words && obstacle.x + obstacle.width > left && obstacle.y < lineTop + lineHeight && obstacle.y + obstacle.height > lineTop);
+  });
+  return meets ? plan : free;
 }
 
 // ---- The one wrap shape (live: globalThis.RapierImageLayout; export: modules["layout/model.mjs"]) ----

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rapier-markdown-kit",
-  "version": "1.1.88",
+  "version": "1.1.89",
   "description": "Read, render and write Self-contained Markdown: one .md file that carries its pictures, drawings and layout, and that any Markdown app can read. HTML renderer, stylesheet, text layout, Will/1 agent permissions, and an edit history with authorship and offline merge. MIT, no dependencies.",
   "keywords": [
     "markdown",